From 6799c31705d0b6e5895659f39f6bf9491b3e86a7 Mon Sep 17 00:00:00 2001
From: sgiarols <sgiarols@users.noreply.github.com>
Date: Mon, 18 Dec 2023 00:14:38 +0000
Subject: [PATCH 001/419] chore: update pre-commit hooks

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a3340b81..ef6885f3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,12 +7,12 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/timothycrosley/isort
-    rev: "5.13.0"
+    rev: "5.13.2"
     hooks:
       - id: isort
         additional_dependencies: [toml]
   - repo: https://github.com/psf/black
-    rev: "23.11.0"
+    rev: "23.12.0"
     hooks:
       - id: black
         exclude: docs/

From 6a68cb9328827566e68c9f0111061b3d3eb57d9c Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Mon, 18 Dec 2023 10:12:33 +0000
Subject: [PATCH 002/419] Separate pubslish workflow and add upload of
 executable

---
 .github/workflows/ci.yml      | 105 ++-----------------------------
 .github/workflows/publish.yml | 113 ++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 101 deletions(-)
 create mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f4e8d3e..ab1f32d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,12 +1,12 @@
-name: QA, tests and publishing
+name: QA and tests
 
 on:
     pull_request:
         types: [opened, synchronize, reopened]
     push:
       branches: [main, develop]
-      tags:
-        - '*'
+    workflow_call:
+
 jobs:
   # Checks the style using the pre-commit hooks
   qa:
@@ -83,101 +83,4 @@ jobs:
 
       # The regression tests (with non coverage)
       - name: Regression tests
-        run: pytest tests/test_fullsim_regression.py
-
-  # If all tests pass, we try to build a wheel
-  build-wheel:
-    # needs: [regression-tests, unit-tests]
-    name: Build source distribution
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build sdist
-        run: |
-          python -m pip install --upgrade build
-          python -m build
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: dist/MUSE*
-
-  # And if we are pushing a tag, then we try to publish it
-  publish-TestPyPI:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    needs: build-wheel
-    name: Publish MUSE to TestPyPI
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-
-    steps:
-
-      - name: Download sdist artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: dist
-
-      - name: Display structure of downloaded files
-        run: ls -R dist
-
-      - name: Publish package distributions to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          skip-existing: true
-
-  publish-PyPI:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    needs: publish-TestPyPI
-    name: Publish MUSE to PyPI
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-
-    steps:
-
-      - name: Download sdist artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: dist
-
-      - name: Display structure of downloaded files
-        run: ls -R dist
-
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-
-  build-standalone:
-    needs: publish-PyPI
-    name: Build standalone executables
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ windows-latest ]
-        python-version: [ "3.9" ]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install pyinstaller
-          python -m pip install -e .[dev,gui]
-
-      - name: Build directory-based standalone
-        run: pyinstaller muse_dir.spec --distpath standalone
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: standalone/MUSE*
-          name: MUSE
\ No newline at end of file
+        run: pytest tests/test_fullsim_regression.py
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000..4a3987d6
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,113 @@
+name: Publishing
+
+on: [release]
+
+jobs:
+  test:
+    uses: ./.github/workflows/ci.yml
+
+  # If tests are successful, we build the wheel and push it to the release
+  build-wheel:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: |
+          python -m pip install --upgrade build
+          python -m build
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: dist/MUSE*
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: dist/MUSE*
+
+  # If building of the wheel is successful, then we try to publish it
+  # First, in TestPyPI
+  publish-TestPyPI:
+    needs: build-wheel
+    name: Publish MUSE to TestPyPI
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+
+    steps:
+
+      - name: Download sdist artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+
+      - name: Display structure of downloaded files
+        run: ls -R dist
+
+      - name: Publish package distributions to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+          skip-existing: true
+
+  # And if all goes well, in PyPI
+  publish-PyPI:
+    needs: publish-TestPyPI
+    name: Publish MUSE to PyPI
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+
+    steps:
+
+      - name: Download sdist artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+
+      - name: Display structure of downloaded files
+        run: ls -R dist
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+  # Finally, if all of these went well, we build the standalone executable
+  # And publish it to the release page, as well
+  build-standalone:
+    needs: publish-PyPI
+    name: Build standalone executables
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest ]
+        python-version: [ "3.9" ]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pyinstaller
+          python -m pip install -e .[dev,gui]
+
+      - name: Build directory-based standalone
+        run: pyinstaller muse_dir.spec --distpath standalone
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: standalone/MUSE*
+          name: MUSE
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: standalone/MUSE*
\ No newline at end of file

From bebbf6963f0dc79daa2d2460d543306d2925c148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:50:02 +0000
Subject: [PATCH 003/419] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40b8ffbc..73a94847 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Version - Development
 
 ## Features
-
+- Separate publish workflow and add upload of executable to release ([#231](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/231))
 - Update main branch ([#225](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/225))
 - Notebooks in the documentation are run as tests ([#178](https://github.com/SGIModel/MUSE_OS/pull/178))
 - Tutorials in the documentation are run as tests ([#177](https://github.com/SGIModel/MUSE_OS/pull/177))

From 88b9e2e42e8433bff998102f87a142ebe103045e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:37:31 +0000
Subject: [PATCH 004/419] Bump actions/setup-python from 4 to 5

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml                    | 4 ++--
 .github/workflows/documentation.yml         | 2 +-
 .github/workflows/pre-commit_autoupdate.yml | 2 +-
 .github/workflows/publish.yml               | 2 +-
 .github/workflows/regression_tests.yml      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab1f32d4..ce7179d8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -71,7 +71,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 7f458d5e..3ff34a98 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies
diff --git a/.github/workflows/pre-commit_autoupdate.yml b/.github/workflows/pre-commit_autoupdate.yml
index cd3de34d..9a218063 100644
--- a/.github/workflows/pre-commit_autoupdate.yml
+++ b/.github/workflows/pre-commit_autoupdate.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
       - uses: browniebroke/pre-commit-autoupdate-action@main
       - uses: peter-evans/create-pull-request@v5
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4a3987d6..768bcc48 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -90,7 +90,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml
index 2599c760..9b997a9c 100644
--- a/.github/workflows/regression_tests.yml
+++ b/.github/workflows/regression_tests.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

From 0f86967a4aba7ee682c605aab0fb594e595afab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:53:37 +0000
Subject: [PATCH 005/419] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml | 4 ++--
 .github/workflows/publish.yml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 7f458d5e..8187ffef 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -32,12 +32,12 @@ jobs:
         cd docs/build/latex
         latexmk -interaction=nonstopmode -pdf muse
     - name: Upload HTML
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: DocumentationHTML
         path: docs/build/html
     - name: Upload PDF
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: DocumentationPDF
         path: docs/build/latex/muse.pdf
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4a3987d6..fc7e01ec 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,7 +18,7 @@ jobs:
           python -m pip install --upgrade build
           python -m build
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/MUSE*
 
@@ -103,7 +103,7 @@ jobs:
       - name: Build directory-based standalone
         run: pyinstaller muse_dir.spec --distpath standalone
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: standalone/MUSE*
           name: MUSE

From bd45b7daeb010cd9ec95166bd4753a0d87fe2193 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:53:39 +0000
Subject: [PATCH 006/419] Bump actions/download-artifact from 3 to 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4a3987d6..d31f5cce 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
 
       - name: Download sdist artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist
@@ -63,7 +63,7 @@ jobs:
     steps:
 
       - name: Download sdist artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist

From d503827b702754d6af93defa2d9068321db595a0 Mon Sep 17 00:00:00 2001
From: sgiarols <sgiarols@users.noreply.github.com>
Date: Mon, 25 Dec 2023 00:14:19 +0000
Subject: [PATCH 007/419] chore: update pre-commit hooks

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ef6885f3..f7221c8b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: isort
         additional_dependencies: [toml]
   - repo: https://github.com/psf/black
-    rev: "23.12.0"
+    rev: "23.12.1"
     hooks:
       - id: black
         exclude: docs/

From cd94640bc8f32c853600bd96fa346059dec9a12e Mon Sep 17 00:00:00 2001
From: sgiarols <sgiarols@users.noreply.github.com>
Date: Mon, 8 Jan 2024 00:14:43 +0000
Subject: [PATCH 008/419] chore: update pre-commit hooks

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7221c8b..b4feab44 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
       - id: black
         exclude: docs/
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
   # - repo: https://github.com/pre-commit/mirrors-mypy

From 6fb9bb5b68bfade378d5986fd87a55c6d9ef5fcb Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP.station>
Date: Mon, 8 Jan 2024 16:30:49 +0100
Subject: [PATCH 009/419] Edited formatting when reading inputs

---
 src/muse/readers/csv.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index e780c420..23bed198 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -87,10 +87,17 @@ def to_agent_share(name):
     result = xr.Dataset.from_dataframe(data.sort_index())
     if "fuel" in result.variables:
         result["fuel"] = result.fuel.isel(region=0, year=0)
+        result["fuel"].values = [camel_to_snake(name) for name in result["fuel"].values]
     if "type" in result.variables:
         result["tech_type"] = result.type.isel(region=0, year=0)
+        result["tech_type"].values = [
+            camel_to_snake(name) for name in result["tech_type"].values
+        ]
     if "enduse" in result.variables:
         result["enduse"] = result.enduse.isel(region=0, year=0)
+        result["enduse"].values = [
+            camel_to_snake(name) for name in result["enduse"].values
+        ]
 
     units = csv[csv.process_name == "Unit"].drop(
         ["process_name", "region_name", "time", "level"], axis=1
@@ -171,8 +178,10 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
     data.index = ts
     data.columns.name = "commodity"
     data.index.name = "technology"
-
+    print("====")
+    print(data, "first")
     data = data.rename(columns=camel_to_snake)
+    print(data, "after")
     data = data.apply(partial(pd.to_numeric, errors="ignore"), axis=0)
 
     fixed_set = xr.Dataset.from_dataframe(data[data.level == "fixed"]).drop_vars(

From a7af34b6d75ffbf1bdef29547742190c4330f71a Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP.station>
Date: Mon, 8 Jan 2024 16:48:13 +0100
Subject: [PATCH 010/419] Updated CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73a94847..024e7da4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Version - Development
 
 ## Features
+
+- Formatting commodity names in technodata enduse ([#237](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/237))
 - Separate publish workflow and add upload of executable to release ([#231](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/231))
 - Update main branch ([#225](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/225))
 - Notebooks in the documentation are run as tests ([#178](https://github.com/SGIModel/MUSE_OS/pull/178))

From 01e84657f64e581e15eff77425c6c594ff01e327 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP.station>
Date: Mon, 8 Jan 2024 16:53:32 +0100
Subject: [PATCH 011/419] Removed unused printouts

---
 src/muse/readers/csv.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 23bed198..97d6ea4a 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -178,10 +178,7 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
     data.index = ts
     data.columns.name = "commodity"
     data.index.name = "technology"
-    print("====")
-    print(data, "first")
     data = data.rename(columns=camel_to_snake)
-    print(data, "after")
     data = data.apply(partial(pd.to_numeric, errors="ignore"), axis=0)
 
     fixed_set = xr.Dataset.from_dataframe(data[data.level == "fixed"]).drop_vars(

From a941efeaf70d304bd94aa251da1ed28101731c98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:17:48 +0000
Subject: [PATCH 012/419] Bump peter-evans/create-pull-request from 5 to 6

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit_autoupdate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit_autoupdate.yml b/.github/workflows/pre-commit_autoupdate.yml
index 9a218063..0b353a85 100644
--- a/.github/workflows/pre-commit_autoupdate.yml
+++ b/.github/workflows/pre-commit_autoupdate.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
       - uses: browniebroke/pre-commit-autoupdate-action@main
-      - uses: peter-evans/create-pull-request@v5
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-hooks

From b2c7601edba3360a4e0520d9f14b367e8d02d151 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:17:51 +0000
Subject: [PATCH 013/419] Bump codecov/codecov-action from 3 to 4

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce7179d8..5c0e511f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: success() && (runner.os == 'Linux' && matrix.python-version == 3.9)
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
 
     - name: Unit tests (not linux)
       if: (runner.os != 'Linux')

From 67599087b1a220225454680b68051dae1452aec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Fri, 9 Feb 2024 09:30:16 +0000
Subject: [PATCH 014/419] Fix bug log level not changed

---
 src/muse/examples.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/muse/examples.py b/src/muse/examples.py
index 19a8df37..172c63e5 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -58,7 +58,9 @@ def model(name: Text = "default") -> MCA:
     # That way, there is only one function to get a model.
     with TemporaryDirectory() as tmpdir:
         path = copy_model(name, tmpdir)
-        return MCA.factory(read_settings(path / "settings.toml"))
+        settings = read_settings(path / "settings.toml")
+        getLogger("muse").setLevel(settings.log_level)
+        return MCA.factory(settings)
 
 
 def copy_model(

From 772cd1c352d737461f66b6935ae3b5c84f05156e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Fri, 9 Feb 2024 09:34:35 +0000
Subject: [PATCH 015/419] Update examples.py

---
 src/muse/examples.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/muse/examples.py b/src/muse/examples.py
index 172c63e5..c97ff978 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -24,6 +24,7 @@
     model = example.model("default")
     model.run()
 """
+from logging import getLogger
 from pathlib import Path
 from typing import List, Optional, Text, Union, cast
 

From 2ba772036a9d1fd5443553531c45b0e5837556ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:22:36 +0000
Subject: [PATCH 016/419] Update pyproject.toml

---
 pyproject.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8c5fefc9..d1a0cc4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,6 @@ dev = [
     "pytest>4.0.2",
     "flake8!=3.8.1,!=3.8.0,<4.0.0",
     "black",
-    "pytest-flake8",
     "IPython",
     "jupyter",
     "nbconvert",
@@ -93,7 +92,7 @@ configurationsources = ["flake8"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests", "src/muse"]
-addopts = "--doctest-modules --flake8 -rfE -n auto --dist=loadscope"
+addopts = "--doctest-modules -rfE -n auto --dist=loadscope"
 markers = [
     "sgidata: test that require legacy data",
     "legacy: test that require legacy modules",

From dad63953f248570c1c58fbf1e7aa3fc73477e7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:30:04 +0000
Subject: [PATCH 017/419] Update pyproject.toml

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index d1a0cc4a..8bd47f1c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ dynamic = ["version"]
 all = ["MUSE_OS[dev,doc,excel]"]
 dev = [
     "pytest>4.0.2",
-    "flake8!=3.8.1,!=3.8.0,<4.0.0",
+    "flake8",
     "black",
     "IPython",
     "jupyter",

From e82db315be7e84ed20661b1e799bb04303ef32b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:49:02 +0000
Subject: [PATCH 018/419] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28276aa3..82ef4f13 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/MUSE-OS.svg)](https://pypi.python.org/pypi/MUSE-OS/)
 [![PyPI license](https://img.shields.io/pypi/l/MUSE-OS.svg)](https://pypi.python.org/pypi/MUSE-OS/)
 [![QA, tests and publishing](https://github.com/SGIModel/MUSE_OS/actions/workflows/ci.yml/badge.svg)](https://github.com/SGIModel/MUSE_OS/actions/workflows/ci.yml)
-[![codecov.io](https://codecov.io/github/SGIModel/MUSE_OS/coverage.svg?branch=develop)](https://codecov.io/github/SGIModel/MUSE_OS?branch=develop)
+[![codecov](https://codecov.io/gh/EnergySystemsModellingLab/MUSE_OS/graph/badge.svg?token=KJFHOHMKWK)](https://codecov.io/gh/EnergySystemsModellingLab/MUSE_OS)
 
 # ModUlar energy system Simulation Environment: MUSE
 

From e13ad605af089d7071d5f297ed95cdf95133ff2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 13:04:17 +0000
Subject: [PATCH 019/419] Bump pre-commit/action from 3.0.0 to 3.0.1

Bumps [pre-commit/action](https://github.com/pre-commit/action) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/pre-commit/action/releases)
- [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: pre-commit/action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce7179d8..9ee38608 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pre-commit/action@v3.0.0
+      - uses: pre-commit/action@v3.0.1
 
   # Only then, normal testing proceeds
   unit-tests:

From d9c0f8169daf6489134d630fed8024dc78c46520 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Sat, 2 Mar 2024 22:43:25 +0100
Subject: [PATCH 020/419] Edited flake error

---
 src/muse/quantities.py   | 12 +++++++-----
 tests/test_quantities.py |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index 5f5c5f66..cf07f815 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -165,17 +165,19 @@ def gross_margin(
     fixed_outputs = tech.fixed_outputs
     fixed_inputs = tech.fixed_inputs
 
-    # Hours ratio
-    variable_costs = convert_timeslice(
-        var_par * capacity**var_exp, prices.timeslice, QuantityType.EXTENSIVE
-    )
-
     prices = prices.sel(region=capacity.region).interp(year=capacity.year)
 
     # Filters
     environmentals = is_pollutant(technologies.comm_usage)
     enduses = is_enduse(technologies.comm_usage)
 
+    # Hours ratio
+    variable_costs = convert_timeslice(
+        var_par * ((fixed_outputs.sel(commodity=enduses)).sum("commodity")) ** var_exp,
+        prices.timeslice,
+        QuantityType.EXTENSIVE,
+    )
+
     # The individual prices
     consumption_costs = (prices * fixed_inputs).sum("commodity")
     production_costs = prices * fixed_outputs
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index a50ff94b..7847e845 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -89,8 +89,6 @@ def test_gross_margin(technologies, capacity, market):
 
     # we modify the variables to have just the values we want for the testing
     technologies = technologies.sel(technology=technologies.technology == "soda_shaker")
-    capacity = capacity.sel(asset=capacity.technology == "soda_shaker")
-    capacity[:] = capa = 9
 
     # This will leave 2 environmental outputs and 4 fuel inputs.
     usage = technologies.comm_usage
@@ -109,7 +107,12 @@ def test_gross_margin(technologies, capacity, market):
     revenues = prices * prod * sum(is_enduse(usage))
     env_costs = env_prices * envs * sum(is_pollutant(usage))
     cons_costs = prices * fuels * sum(is_fuel(usage))
-    var_costs = vp * (capa**ve) * market.represent_hours / sum(market.represent_hours)
+    var_costs = (
+        vp
+        * ((prod * sum(is_enduse(usage))) ** ve)
+        * market.represent_hours
+        / sum(market.represent_hours)
+    )
     expected = revenues - env_costs - cons_costs - var_costs
 
     expected, actual = xr.broadcast(expected, actual)

From b4d1a7baa8cd81772c036febc89eac9f1a21850b Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Sat, 2 Mar 2024 22:49:47 +0100
Subject: [PATCH 021/419] Edited documentation

---
 docs/inputs/technodata.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 9e2a61aa..0d4e70ff 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -63,18 +63,19 @@ fix_par, fix_exp
    .. math::
 
       \text{fix$\_$par} = \left(
-         \frac{\text{FOMref}}{\text{Capref}}
+         \text{FOMref}
+         \frac{1}{\text{Capref}}
       \right)^{\text{fix$\_$exp}}
 
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
 var_par, var_exp
-   are used in the variable costs estimation. These variable costs are capacity
+   are used in the variable costs estimation. These variable costs are production
    dependent Variable costs are calculated as:
 
    .. math::
    
-      \text{VAREX} = \text{cap$\_$par} * \text{(Capacity)}^{\text{cap$\_$exp}}
+      \text{VAREX} = \text{var$\_$par} * \text{(Production)}^{\text{var$\_$exp}}
 
    where the parameter var_par is estimated at a selected reference size (i.e. Capref),
    such as:
@@ -82,10 +83,11 @@ var_par, var_exp
    .. math::
 
       \text{var$\_$par} = \left(
-         \frac{\text{VARref}}{\text{Capref}}
+         \text{VARref} *
+         \frac{1}{\text{Productionref}}
       \right)^{\text{var$\_$exp}}
 
-   Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
+   Productionref is the production for a reference size for the cost estimate decided by the modeller before filling the input data files.
 
 Growith constraints
    MaxCapacityAddition

From 2bc5223779bc7f982fa8c47e969b3d908b17a098 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Sat, 2 Mar 2024 22:55:07 +0100
Subject: [PATCH 022/419] Updated CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 024e7da4..733a50c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 
 ## Bug fixes
 
+- Update variable costs definition ([#247](https://github.com/SGIModel/MUSE_OS/pull/247))
 - Solves missing forecast update in agents ([#212](https://github.com/SGIModel/MUSE_OS/pull/212))
 - Solves missing file in tutorial 5 ([#182](https://github.com/SGIModel/MUSE_OS/pull/182))
 - Solves missing subsectors in documentation ([#146](https://github.com/SGIModel/MUSE_OS/pull/146))

From f9d1753ad736edce3236199d4dee6b84b4ce9432 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 18:01:06 +0100
Subject: [PATCH 023/419] Flake8 error fixes

---
 src/muse/quantities.py   | 9 +++++++--
 tests/test_quantities.py | 8 ++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index cf07f815..07bc5a23 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -164,8 +164,13 @@ def gross_margin(
     var_exp = tech.var_exp
     fixed_outputs = tech.fixed_outputs
     fixed_inputs = tech.fixed_inputs
-
-    prices = prices.sel(region=capacity.region).interp(year=capacity.year)
+    # We separate the case where we have one or more regions
+    caparegions = np.array(capacity.region.values).reshape(-1)
+    if len(caparegions) > 1:
+        prices.sel(region=capacity.region)
+    else:
+        prices = prices.where(prices.region == capacity.region, drop=True)
+    prices = prices.interp(year=capacity.year.values)
 
     # Filters
     environmentals = is_pollutant(technologies.comm_usage)
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index 7847e845..ce00022d 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -88,7 +88,10 @@ def test_gross_margin(technologies, capacity, market):
     from muse.quantities import gross_margin
 
     # we modify the variables to have just the values we want for the testing
-    technologies = technologies.sel(technology=technologies.technology == "soda_shaker")
+    selected = capacity.technology.values[0]
+
+    technologies = technologies.sel(technology=technologies.technology == selected)
+    capa = capacity.where(capacity.technology == selected, drop=True)
 
     # This will leave 2 environmental outputs and 4 fuel inputs.
     usage = technologies.comm_usage
@@ -102,7 +105,7 @@ def test_gross_margin(technologies, capacity, market):
     market.prices[:] = prices = 3
     market.prices[{"commodity": is_pollutant(usage)}] = env_prices = 6
     # We expect a xr.DataArray with 1 replacement technology
-    actual = gross_margin(technologies, capacity, market.prices)
+    actual = gross_margin(technologies, capa, market.prices)
 
     revenues = prices * prod * sum(is_enduse(usage))
     env_costs = env_prices * envs * sum(is_pollutant(usage))
@@ -113,6 +116,7 @@ def test_gross_margin(technologies, capacity, market):
         * market.represent_hours
         / sum(market.represent_hours)
     )
+    print(var_costs, "varcosts")
     expected = revenues - env_costs - cons_costs - var_costs
 
     expected, actual = xr.broadcast(expected, actual)

From d2928d3216448d0bedce5daf38e63c768f707cb6 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 18:22:56 +0100
Subject: [PATCH 024/419] Edited docs

---
 docs/inputs/technodata.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 0d4e70ff..10e9172c 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -63,7 +63,7 @@ fix_par, fix_exp
    .. math::
 
       \text{fix$\_$par} = \left(
-         \text{FOMref}
+         \text{FOMref} *
          \frac{1}{\text{Capref}}
       \right)^{\text{fix$\_$exp}}
 

From bfb0d3e9970c0ad25949d2528417a8a1dd5dbffe Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 18:40:39 +0100
Subject: [PATCH 025/419] Edited docs

---
 docs/inputs/technodata.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 10e9172c..b180b078 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -62,10 +62,10 @@ fix_par, fix_exp
 
    .. math::
 
-      \text{fix$\_$par} = \left(
+      \text{fix$\_$par} = 
          \text{FOMref} *
-         \frac{1}{\text{Capref}}
-      \right)^{\text{fix$\_$exp}}
+         \left(\text{Capref}}
+      \right)^{\text{-fix$\_$exp}}
 
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 

From 2ccaff5fb0a8332732b5329323adfbfbc0330607 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 20:50:58 +0100
Subject: [PATCH 026/419] Edited docs

---
 docs/inputs/technodata.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index b180b078..a6f15d81 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -63,9 +63,8 @@ fix_par, fix_exp
    .. math::
 
       \text{fix$\_$par} = 
-         \text{FOMref} *
-         \left(\text{Capref}}
-      \right)^{\text{-fix$\_$exp}}
+         \left(\text{FOMref}) *
+         \right(\text{Capref}})^{\text{-fix$\_$exp}}
 
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 

From 768d1053530ef5b71189522844d55457847f23a0 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 21:01:34 +0100
Subject: [PATCH 027/419] Edited docs

---
 docs/inputs/technodata.rst | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index a6f15d81..cb837ea5 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -63,8 +63,7 @@ fix_par, fix_exp
    .. math::
 
       \text{fix$\_$par} = 
-         \left(\text{FOMref}) *
-         \right(\text{Capref}})^{\text{-fix$\_$exp}}
+         \text{FOMref} * \text{Capref}^{\text{-fix$\_$exp}}
 
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
@@ -75,16 +74,13 @@ var_par, var_exp
    .. math::
    
       \text{VAREX} = \text{var$\_$par} * \text{(Production)}^{\text{var$\_$exp}}
-
+            \text{FOMref} * \text{Capref}^{\text{-fix$\_$exp}}
    where the parameter var_par is estimated at a selected reference size (i.e. Capref),
    such as:
    
    .. math::
 
-      \text{var$\_$par} = \left(
-         \text{VARref} *
-         \frac{1}{\text{Productionref}}
-      \right)^{\text{var$\_$exp}}
+      \text{var$\_$par} = \text{VARref} * \text{Productionref}^{\text{var$\_$exp}}
 
    Productionref is the production for a reference size for the cost estimate decided by the modeller before filling the input data files.
 

From 60b54d1fc4a6db5a7e8bcc22289d9827f8e17592 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 21:08:12 +0100
Subject: [PATCH 028/419] Edited docs

---
 docs/inputs/technodata.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index cb837ea5..d0a006e2 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -63,7 +63,7 @@ fix_par, fix_exp
    .. math::
 
       \text{fix$\_$par} = 
-         \text{FOMref} * \text{Capref}^{\text{-fix$\_$exp}}
+         \text{FOMref} * \text{Capref}^{\text{ -fix$\_$exp}}
 
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
@@ -80,7 +80,7 @@ var_par, var_exp
    
    .. math::
 
-      \text{var$\_$par} = \text{VARref} * \text{Productionref}^{\text{var$\_$exp}}
+      \text{var$\_$par} = \text{VARref} * \text{Productionref}^{\text{ -var$\_$exp}}
 
    Productionref is the production for a reference size for the cost estimate decided by the modeller before filling the input data files.
 

From dd9237cde0cb36e5285d78dcf1892f5dff127cca Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 21:24:04 +0100
Subject: [PATCH 029/419] Edited docs

---
 docs/inputs/technodata.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index d0a006e2..3200cfcf 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -57,6 +57,7 @@ fix_par, fix_exp
    
       \text{FOM} = \text{fix$\_$par} * (\text{Capacity})^\text{fix$\_$exp}
 
+
    where the parameter fix_par is estimated at a selected reference size (i.e. Capref),
    such as:
 
@@ -65,6 +66,10 @@ fix_par, fix_exp
       \text{fix$\_$par} = 
          \text{FOMref} * \text{Capref}^{\text{ -fix$\_$exp}}
 
+   .. math::
+   
+      \text{fix$\_$par}= \frac{\text{fix$\_$par}}{(\text{Capacity})^\text{fix$\_$exp}}
+
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
 var_par, var_exp
@@ -74,7 +79,7 @@ var_par, var_exp
    .. math::
    
       \text{VAREX} = \text{var$\_$par} * \text{(Production)}^{\text{var$\_$exp}}
-            \text{FOMref} * \text{Capref}^{\text{-fix$\_$exp}}
+           
    where the parameter var_par is estimated at a selected reference size (i.e. Capref),
    such as:
    

From f504287a1f25f6a4a32b829608ff32a07709329f Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 21:33:01 +0100
Subject: [PATCH 030/419] Edited docs

---
 docs/inputs/technodata.rst | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 3200cfcf..fad32fa8 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -61,14 +61,9 @@ fix_par, fix_exp
    where the parameter fix_par is estimated at a selected reference size (i.e. Capref),
    such as:
 
-   .. math::
-
-      \text{fix$\_$par} = 
-         \text{FOMref} * \text{Capref}^{\text{ -fix$\_$exp}}
-
    .. math::
    
-      \text{fix$\_$par}= \frac{\text{fix$\_$par}}{(\text{Capacity})^\text{fix$\_$exp}}
+      \text{fix$\_$par}= \frac{\text{FOMref}}{(\text{Capref})^\text{fix$\_$exp}}
 
    Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
@@ -85,7 +80,7 @@ var_par, var_exp
    
    .. math::
 
-      \text{var$\_$par} = \text{VARref} * \text{Productionref}^{\text{ -var$\_$exp}}
+      \text{fix$\_$par}= \frac{\text{VARref}}{(\text{Productionref})^\text{var$\_$exp}}
 
    Productionref is the production for a reference size for the cost estimate decided by the modeller before filling the input data files.
 

From 2345d8b2f432ff22988abc32d1d35fb90fb25cc3 Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Wed, 6 Mar 2024 21:45:11 +0100
Subject: [PATCH 031/419] Edited docs

---
 docs/inputs/technodata.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index fad32fa8..02f192c2 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -37,16 +37,16 @@ cap_par, cap_exp
    
       \text{CAPEX} = \text{cap$\_$par} * \text{(Capacity)}^\text{cap$\_$exp}
 
-   where the parameter cap_par is estimated at a selected reference size (i.e. Capref),
+   where the parameter cap_par is estimated at a selected reference size (i.e. CapRef),
    such as:
    
    .. math::
 
       \text{cap$\_$par} = \left(
-         \frac{\text{CAPEXref}}{\text{Capref}}
+         \frac{\text{CAPEXref}}{\text{CapRef}}
       \right)^{\text{cap$\_$exp}}
 
-   Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
+   CapRef is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
    This allows the model to take into account economies of scale. ie. As `Capacity` increases, the price of the technology decreases. This does not include technological learning parameters, where prices may come down due to learning.
 
@@ -58,14 +58,14 @@ fix_par, fix_exp
       \text{FOM} = \text{fix$\_$par} * (\text{Capacity})^\text{fix$\_$exp}
 
 
-   where the parameter fix_par is estimated at a selected reference size (i.e. Capref),
+   where the parameter fix_par is estimated at a selected reference capacity (i.e. CapRef),
    such as:
 
    .. math::
    
-      \text{fix$\_$par}= \frac{\text{FOMref}}{(\text{Capref})^\text{fix$\_$exp}}
+      \text{fix$\_$par}= \frac{\text{FOMref}}{(\text{CapRef})^\text{fix$\_$exp}}
 
-   Capref is a reference size for the cost estimate decided by the modeller before filling the input data files.
+   CapRef is a reference size for the cost estimate decided by the modeller before filling the input data files.
 
 var_par, var_exp
    are used in the variable costs estimation. These variable costs are production
@@ -75,14 +75,14 @@ var_par, var_exp
    
       \text{VAREX} = \text{var$\_$par} * \text{(Production)}^{\text{var$\_$exp}}
            
-   where the parameter var_par is estimated at a selected reference size (i.e. Capref),
+   where the parameter var_par is estimated at a selected reference size (i.e. CapRef),
    such as:
    
    .. math::
 
-      \text{fix$\_$par}= \frac{\text{VARref}}{(\text{Productionref})^\text{var$\_$exp}}
+      \text{var$\_$par}= \frac{\text{VARref}}{(\text{ProductionRef})^\text{var$\_$exp}}
 
-   Productionref is the production for a reference size for the cost estimate decided by the modeller before filling the input data files.
+   ProductionRef is the production of a reference capacity (CapRef) for the cost estimate decided by the modeller before filling the input data files.
 
 Growith constraints
    MaxCapacityAddition

From e147b13b42a7b50be97d060c605694664bf571da Mon Sep 17 00:00:00 2001
From: Sara <sara@Saras-MBP-2.station>
Date: Thu, 7 Mar 2024 18:13:30 +0100
Subject: [PATCH 032/419] Edited Flake8

---
 src/muse/quantities.py   | 21 +++++++++++++++------
 tests/test_quantities.py | 10 ++++++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index 07bc5a23..ebf6424c 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -132,8 +132,11 @@ def emission(production: xr.DataArray, fixed_outputs: xr.DataArray):
 def gross_margin(
     technologies: xr.Dataset, capacity: xr.DataArray, prices: xr.Dataset
 ) -> xr.DataArray:
-    """profit of increasing the production by one unit.
-
+    """The percentage of revenue after direct expenses have been subtracted
+    .. _reference:
+    https://www.investopedia.com/terms/g/grossmargin.asp
+    We first calculate the revenues, which depend on prices
+    We then deduct the direct expenses
     - energy commodities INPUTS are related to fuel costs
     - environmental commodities OUTPUTS are related to environmental costs
     - variable costs is given as technodata inputs
@@ -172,27 +175,33 @@ def gross_margin(
         prices = prices.where(prices.region == capacity.region, drop=True)
     prices = prices.interp(year=capacity.year.values)
 
-    # Filters
+    # Filters for pollutants and output commodities
     environmentals = is_pollutant(technologies.comm_usage)
     enduses = is_enduse(technologies.comm_usage)
 
-    # Hours ratio
+    # Variable costs depend on factors such as labour
     variable_costs = convert_timeslice(
         var_par * ((fixed_outputs.sel(commodity=enduses)).sum("commodity")) ** var_exp,
         prices.timeslice,
         QuantityType.EXTENSIVE,
     )
 
-    # The individual prices
+    # The individual prices are selected
+    # costs due to consumables, direct inputs
     consumption_costs = (prices * fixed_inputs).sum("commodity")
+    # costs due to pollutants
     production_costs = prices * fixed_outputs
     environmental_costs = (production_costs.sel(commodity=environmentals)).sum(
         ("commodity")
     )
-
+    # revenues due to product sales
     revenues = (production_costs.sel(commodity=enduses)).sum("commodity")
 
+    # Gross margin is the net between revenues and all costs
     result = revenues - environmental_costs - variable_costs - consumption_costs
+
+    # Gross margin is defined as a ratio on revenues and as a percentage
+    result *= 100 / revenues
     return result
 
 
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index ce00022d..17e1b8fe 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -87,13 +87,18 @@ def test_gross_margin(technologies, capacity, market):
     from muse.commodities import is_enduse, is_fuel, is_pollutant
     from muse.quantities import gross_margin
 
+    """
+    Gross margin refers to the calculation
+    .. _here:
+    https://www.investopedia.com/terms/g/grossmargin.asp
+    """
     # we modify the variables to have just the values we want for the testing
     selected = capacity.technology.values[0]
 
     technologies = technologies.sel(technology=technologies.technology == selected)
     capa = capacity.where(capacity.technology == selected, drop=True)
 
-    # This will leave 2 environmental outputs and 4 fuel inputs.
+    # Filtering commodity outputs
     usage = technologies.comm_usage
 
     technologies.var_par[:] = vp = 2
@@ -116,8 +121,9 @@ def test_gross_margin(technologies, capacity, market):
         * market.represent_hours
         / sum(market.represent_hours)
     )
-    print(var_costs, "varcosts")
+
     expected = revenues - env_costs - cons_costs - var_costs
+    expected *= 100 / revenues
 
     expected, actual = xr.broadcast(expected, actual)
     assert actual.values == approx(expected.values)

From d5035c81663a417411b1488ba3f939517916db9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 13:58:17 +0000
Subject: [PATCH 033/419] Bump softprops/action-gh-release from 1 to 2

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4b41145b..1cbef647 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           path: dist/MUSE*
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           files: dist/MUSE*
 
@@ -108,6 +108,6 @@ jobs:
           path: standalone/MUSE*
           name: MUSE
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           files: standalone/MUSE*
\ No newline at end of file

From 52c1971b228b4e56d313c73d1692cf60a626cb72 Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:41:47 +0100
Subject: [PATCH 034/419] Update demand_share.py _inner_split function

This commit includes the minor change to the _inner_split function in the demand_share.py file, described in the related issue.

It solves the error, however, doubts about its sensibility from a modelling perspective remain.
---
 src/muse/demand_share.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 5ab0a1b5..0fe6a834 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -472,12 +472,12 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
-        total = sum(shares.values()).sum("asset")  # type: ignore
+        total = xr.concat(shares.values(), dim='concat_dim').sum('concat_dim').sum("asset")  # type: ignore
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
     unassigned = (
-        demand / (len(shares) * len(cast(xr.DataArray, sum(shares.values())).asset))
+        demand / (len(shares) * len(cast(xr.DataArray, xr.concat(shares.values(), dim='concat_dim').sum('concat_dim')).asset))
     ).where(logical_and(demand > 1e-12, total <= 1e-12), 0)
 
     totals = {

From 001ef7a101c4966f3bb03be6b0c41b48a736b5b8 Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Mon, 18 Mar 2024 14:51:27 +0100
Subject: [PATCH 035/419] Update demand_share.py

Added comments explaining the previously commited changes.
---
 src/muse/demand_share.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 0fe6a834..92f4297d 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -472,10 +472,12 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
+        # calculates the total demand assigned in the previous step with the "method" function across agents and assets. The previous version of this calculation only calculated the sum of assets present in all "shares.values()" (which contain agents). 
         total = xr.concat(shares.values(), dim='concat_dim').sum('concat_dim').sum("asset")  # type: ignore
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
+    # calculates the demand divided by the number of assets times the number of agents if the demand is bigger than zero and the total demand assigned with the "method" function is zero. In the previous version, the demand was divided by the number of agents times the number of assets present in all "shares.values()" (which represent agents) and thus could become inf if all agents owned different assets.
     unassigned = (
         demand / (len(shares) * len(cast(xr.DataArray, xr.concat(shares.values(), dim='concat_dim').sum('concat_dim')).asset))
     ).where(logical_and(demand > 1e-12, total <= 1e-12), 0)

From 16a6c85cdfe7e8701a97966b278a716e10edb516 Mon Sep 17 00:00:00 2001
From: martinstringer <116901130+martinstringer@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:45:19 +0000
Subject: [PATCH 036/419] Reduced comment line length to pass checks

---
 src/muse/demand_share.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 92f4297d..14c02d9f 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -472,12 +472,14 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
-        # calculates the total demand assigned in the previous step with the "method" function across agents and assets. The previous version of this calculation only calculated the sum of assets present in all "shares.values()" (which contain agents). 
+        # calculates the total demand assigned in the previous step with the "method" function across agents and assets. 
+        # The previous version of this calculation only calculated the sum of assets present in all "shares.values()" (which contain agents). 
         total = xr.concat(shares.values(), dim='concat_dim').sum('concat_dim').sum("asset")  # type: ignore
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
-    # calculates the demand divided by the number of assets times the number of agents if the demand is bigger than zero and the total demand assigned with the "method" function is zero. In the previous version, the demand was divided by the number of agents times the number of assets present in all "shares.values()" (which represent agents) and thus could become inf if all agents owned different assets.
+    # calculates the demand divided by the number of assets times the number of agents if the demand is bigger than zero and the total demand assigned with the "method" function is zero. 
+    # In the previous version, the demand was divided by the number of agents times the number of assets present in all "shares.values()" (which represent agents) and thus could become inf if all agents owned different assets.
     unassigned = (
         demand / (len(shares) * len(cast(xr.DataArray, xr.concat(shares.values(), dim='concat_dim').sum('concat_dim')).asset))
     ).where(logical_and(demand > 1e-12, total <= 1e-12), 0)

From c36c07ce81e3b193feca6e8758d78678ec384129 Mon Sep 17 00:00:00 2001
From: martinstringer <116901130+martinstringer@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:52:02 +0000
Subject: [PATCH 037/419] Reduce line lengths

---
 src/muse/demand_share.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 14c02d9f..c0b88443 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -472,16 +472,23 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
-        # calculates the total demand assigned in the previous step with the "method" function across agents and assets. 
-        # The previous version of this calculation only calculated the sum of assets present in all "shares.values()" (which contain agents). 
-        total = xr.concat(shares.values(), dim='concat_dim').sum('concat_dim').sum("asset")  # type: ignore
+        # calculates the total demand assigned in the previous step with the "method" function 
+        # across agents and assets. The previous version of this calculation only calculated 
+        # the sum of assets present in all "shares.values()" (which contain agents). 
+        total = xr.concat(shares.values(), dim='concat_dim').sum('concat_dim').sum("asset")  
+        # type: ignore
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
-    # calculates the demand divided by the number of assets times the number of agents if the demand is bigger than zero and the total demand assigned with the "method" function is zero. 
-    # In the previous version, the demand was divided by the number of agents times the number of assets present in all "shares.values()" (which represent agents) and thus could become inf if all agents owned different assets.
+    # calculates the demand divided by the number of assets times the number of agents if 
+    # the demand is bigger than zero and the total demand assigned with the "method" 
+    # function is zero. In the previous version, the demand was divided by the number of 
+    # agents times the number of assets present in all "shares.values()" 
+    # (which represent agents) and thus could become inf if all agents owned different assets.
     unassigned = (
-        demand / (len(shares) * len(cast(xr.DataArray, xr.concat(shares.values(), dim='concat_dim').sum('concat_dim')).asset))
+        demand / (len(shares) * 
+                  len(cast(xr.DataArray, xr.concat(shares.values(), dim='concat_dim')
+                                         .sum('concat_dim')).asset))
     ).where(logical_and(demand > 1e-12, total <= 1e-12), 0)
 
     totals = {

From b787647975d539f4974f54043d71aecf94cbddbd Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:47:03 +0100
Subject: [PATCH 038/419] Update returned search_space of maturity and
 spend_limit filter

The two added lines in the maturity and the spend_limit filter are identical. With them, the filters, instead of removing the columns that correspond to replacements that should not be considered, turn the boolean values to False.

This solves the related bug as it removes the possibility of an error if the filters are put in a row and makes the with_asset_technology filter work normally.

Finally, this makes the maturity and spend_limit filters also more in line with other filters like same_fuel or similar_technology in how they manipulate the search space as they also just change the boolean values of the search_space DataArray, while keeping the dimensions identical.
---
 src/muse/filters.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/muse/filters.py b/src/muse/filters.py
index bb8dc905..bd26179f 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -348,7 +348,13 @@ def maturity(
     techs = (
         condition.technology.where(condition, drop=True).drop_vars("technology").values
     )
-    replacement = search_space.sel(replacement=techs)
+    
+    # Generate a boolean mask where 'True' corresponds to entries in 'search_space.replacement' that are in 'techs'
+    mask = search_space.replacement.isin(techs)
+
+    # Apply this mask to 'search_space', turning all fields where the condition is not met to False
+    replacement = search_space.where(mask, False)
+    
     return search_space & replacement
 
 
@@ -371,7 +377,13 @@ def spend_limit(
     techs = (
         condition.technology.where(condition, drop=True).drop_vars("technology").values
     )
-    replacement = search_space.sel(replacement=techs)
+    
+    # Generate a boolean mask where 'True' corresponds to entries in 'search_space.replacement' that are in 'techs'
+    mask = search_space.replacement.isin(techs)
+
+    # Apply this mask to 'search_space', turning all fields where the condition is not met to False
+    replacement = search_space.where(mask, False)
+    
     return search_space & replacement
 
 

From 949d487023bf106a144f99a59582a56cb7daa11e Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:49:46 +0100
Subject: [PATCH 039/419] Change Budget column name to SpendLimit in Agents.csv

---
 src/muse/data/example/default/technodata/Agents.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/data/example/default/technodata/Agents.csv b/src/muse/data/example/default/technodata/Agents.csv
index f2a72ba7..26315bf8 100644
--- a/src/muse/data/example/default/technodata/Agents.csv
+++ b/src/muse/data/example/default/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit

From 7efaee05b4d6c8805fe5aff2608b61aa1319a2c3 Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:50:25 +0100
Subject: [PATCH 040/419] Change Budget column name to SpendLimit in Agents.csv

---
 src/muse/data/example/default_timeslice/technodata/Agents.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/data/example/default_timeslice/technodata/Agents.csv b/src/muse/data/example/default_timeslice/technodata/Agents.csv
index f2a72ba7..26315bf8 100644
--- a/src/muse/data/example/default_timeslice/technodata/Agents.csv
+++ b/src/muse/data/example/default_timeslice/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit

From 3ecf05f195b4f7a02027a3dd87f5c19fe7328507 Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:51:32 +0100
Subject: [PATCH 041/419] Change Budget column name to SpendLimit in Agents.csv

---
 src/muse/data/example/minimum_service/technodata/Agents.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/data/example/minimum_service/technodata/Agents.csv b/src/muse/data/example/minimum_service/technodata/Agents.csv
index f2a72ba7..26315bf8 100644
--- a/src/muse/data/example/minimum_service/technodata/Agents.csv
+++ b/src/muse/data/example/minimum_service/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit

From 7fbddcf718414ca0e051bfd7ad1b088b2728b505 Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:51:59 +0100
Subject: [PATCH 042/419] Update Agents.csv

---
 src/muse/data/example/multiple_agents/Agents.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/data/example/multiple_agents/Agents.csv b/src/muse/data/example/multiple_agents/Agents.csv
index 1288fe00..a2fc3917 100644
--- a/src/muse/data/example/multiple_agents/Agents.csv
+++ b/src/muse/data/example/multiple_agents/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New

From 7425ff69e7fe7e94fc937a3711b3bd1fcd7f686e Mon Sep 17 00:00:00 2001
From: Lennart Morlock <65287302+LennartMorlock@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:52:46 +0100
Subject: [PATCH 043/419] Change Budget column name to SpendLimit in Agents.csv

---
 src/muse/data/example/trade/technodata/Agents.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/data/example/trade/technodata/Agents.csv b/src/muse/data/example/trade/technodata/Agents.csv
index 44098b7b..42fd21d1 100644
--- a/src/muse/data/example/trade/technodata/Agents.csv
+++ b/src/muse/data/example/trade/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective,ObjData,Objsort,SearchRule,DecisionMethod,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective,ObjData,Objsort,SearchRule,DecisionMethod,MaturityThreshold,SpendLimit,Type
 agent_share,A1,R1,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
-agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
\ No newline at end of file
+agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default

From 05ceeab3aae360a9756374e8214dba5dcd2abaa4 Mon Sep 17 00:00:00 2001
From: Giarola <sg2410@ic.ac.uk>
Date: Tue, 2 Apr 2024 16:17:54 +0100
Subject: [PATCH 044/419] Balck applied lines too long

---
 src/muse/demand_share.py | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index c0b88443..c9299d63 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -36,6 +36,7 @@ def demand_share(
     the :py:attr:`~muse.agents.agent.AbstractAgent.uuid` of the agent, then agents will
     only service that par of the demand.
 """
+
 __all__ = [
     "new_and_retro",
     "factory",
@@ -472,23 +473,32 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
-        # calculates the total demand assigned in the previous step with the "method" function 
-        # across agents and assets. The previous version of this calculation only calculated 
-        # the sum of assets present in all "shares.values()" (which contain agents). 
-        total = xr.concat(shares.values(), dim='concat_dim').sum('concat_dim').sum("asset")  
+        # calculates the total demand assigned in the previous step with the "method" function  # noqa: E501
+        # across agents and assets. The previous version of this calculation only calculated  # noqa: E501
+        # the sum of assets present in all "shares.values()" (which contain agents).
+        total = (
+            xr.concat(shares.values(), dim="concat_dim").sum("concat_dim").sum("asset")
+        )
         # type: ignore
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
-    # calculates the demand divided by the number of assets times the number of agents if 
-    # the demand is bigger than zero and the total demand assigned with the "method" 
-    # function is zero. In the previous version, the demand was divided by the number of 
-    # agents times the number of assets present in all "shares.values()" 
-    # (which represent agents) and thus could become inf if all agents owned different assets.
+    # calculates the demand divided by the number of assets times the number of agents if  # noqa: E501
+    # the demand is bigger than zero and the total demand assigned with the "method"
+    # function is zero. In the previous version, the demand was divided by the number of
+    # agents times the number of assets present in all "shares.values()"
+    # (which represent agents) and thus could become inf if all agents owned different assets.  # noqa: E501
     unassigned = (
-        demand / (len(shares) * 
-                  len(cast(xr.DataArray, xr.concat(shares.values(), dim='concat_dim')
-                                         .sum('concat_dim')).asset))
+        demand
+        / (
+            len(shares)
+            * len(
+                cast(
+                    xr.DataArray,
+                    xr.concat(shares.values(), dim="concat_dim").sum("concat_dim"),
+                ).asset
+            )
+        )
     ).where(logical_and(demand > 1e-12, total <= 1e-12), 0)
 
     totals = {

From 34654bbf0a19ca2ea34e75fd67d7c9708e11a45b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:27:02 +0000
Subject: [PATCH 045/419] Bump peaceiris/actions-gh-pages from 3 to 4

Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 1de8262c..0b4881c3 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -42,7 +42,7 @@ jobs:
         name: DocumentationPDF
         path: docs/build/latex/muse.pdf
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       if: github.ref == 'refs/heads/master'
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}

From 66396e469489f7a8971324fdd438255bc4a1be62 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 18 Apr 2024 11:50:43 +0100
Subject: [PATCH 046/419] Update example output, re-run model

---
 docs/Results/Residential/Supply/2020.csv | 56 ++++++++++--------
 docs/Results/Residential/Supply/2025.csv | 68 ++++++++++++++--------
 docs/Results/Residential/Supply/2030.csv | 74 ++++++++++++++++--------
 docs/Results/Residential/Supply/2035.csv | 74 ++++++++++++++++--------
 docs/Results/Residential/Supply/2040.csv | 74 ++++++++++++++++--------
 docs/Results/Residential/Supply/2045.csv | 56 ++++++++++++------
 docs/Results/Residential/Supply/2050.csv | 38 +++++++-----
 docs/example-output.ipynb                |  2 +-
 8 files changed, 284 insertions(+), 158 deletions(-)

diff --git a/docs/Results/Residential/Supply/2020.csv b/docs/Results/Residential/Supply/2020.csv
index 42f558a2..a44059a3 100644
--- a/docs/Results/Residential/Supply/2020.csv
+++ b/docs/Results/Residential/Supply/2020.csv
@@ -1,25 +1,31 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2020,all-year,all-week,night,1.00000000000
-R1,0,heat,2025,all-year,all-week,night,1.33330000000
-R1,0,CO2f,2020,all-year,all-week,night,64.71000000000
-R1,0,CO2f,2025,all-year,all-week,night,17.97500000000
-R1,1,heat,2020,all-year,all-week,morning,1.50000000000
-R1,1,heat,2025,all-year,all-week,morning,2.00000000000
-R1,1,CO2f,2020,all-year,all-week,morning,97.06500000000
-R1,1,CO2f,2025,all-year,all-week,morning,26.96250000000
-R1,2,heat,2020,all-year,all-week,afternoon,1.00000000000
-R1,2,heat,2025,all-year,all-week,afternoon,1.33330000000
-R1,2,CO2f,2020,all-year,all-week,afternoon,64.71000000000
-R1,2,CO2f,2025,all-year,all-week,afternoon,17.97500000000
-R1,3,heat,2020,all-year,all-week,early-peak,1.50000000000
-R1,3,heat,2025,all-year,all-week,early-peak,2.00000000000
-R1,3,CO2f,2020,all-year,all-week,early-peak,97.06500000000
-R1,3,CO2f,2025,all-year,all-week,early-peak,26.96250000000
-R1,4,heat,2020,all-year,all-week,late-peak,3.00000000000
-R1,4,heat,2025,all-year,all-week,late-peak,4.00000000000
-R1,4,CO2f,2020,all-year,all-week,late-peak,194.13000000000
-R1,4,CO2f,2025,all-year,all-week,late-peak,53.92500000000
-R1,5,heat,2020,all-year,all-week,evening,2.00000000000
-R1,5,heat,2025,all-year,all-week,evening,2.66670000000
-R1,5,CO2f,2020,all-year,all-week,evening,129.42000000000
-R1,5,CO2f,2025,all-year,all-week,evening,35.95000000000
+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
diff --git a/docs/Results/Residential/Supply/2025.csv b/docs/Results/Residential/Supply/2025.csv
index 3bc0c0f3..c9ed8c00 100644
--- a/docs/Results/Residential/Supply/2025.csv
+++ b/docs/Results/Residential/Supply/2025.csv
@@ -1,25 +1,43 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2025,all-year,all-week,night,1.33330000000
-R1,0,heat,2030,all-year,all-week,night,1.66670000000
-R1,0,CO2f,2025,all-year,all-week,night,17.97500000000
-R1,0,CO2f,2030,all-year,all-week,night,14.73950000000
-R1,1,heat,2025,all-year,all-week,morning,2.00000000000
-R1,1,heat,2030,all-year,all-week,morning,2.50000000000
-R1,1,CO2f,2025,all-year,all-week,morning,26.96250000000
-R1,1,CO2f,2030,all-year,all-week,morning,22.10920000000
-R1,2,heat,2025,all-year,all-week,afternoon,1.33330000000
-R1,2,heat,2030,all-year,all-week,afternoon,1.66670000000
-R1,2,CO2f,2025,all-year,all-week,afternoon,17.97500000000
-R1,2,CO2f,2030,all-year,all-week,afternoon,14.73950000000
-R1,3,heat,2025,all-year,all-week,early-peak,2.00000000000
-R1,3,heat,2030,all-year,all-week,early-peak,2.50000000000
-R1,3,CO2f,2025,all-year,all-week,early-peak,26.96250000000
-R1,3,CO2f,2030,all-year,all-week,early-peak,22.10920000000
-R1,4,heat,2025,all-year,all-week,late-peak,4.00000000000
-R1,4,heat,2030,all-year,all-week,late-peak,5.00000000000
-R1,4,CO2f,2025,all-year,all-week,late-peak,53.92500000000
-R1,4,CO2f,2030,all-year,all-week,late-peak,44.21850000000
-R1,5,heat,2025,all-year,all-week,evening,2.66670000000
-R1,5,heat,2030,all-year,all-week,evening,3.33330000000
-R1,5,CO2f,2025,all-year,all-week,evening,35.95000000000
-R1,5,CO2f,2030,all-year,all-week,evening,29.47900000000
+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
diff --git a/docs/Results/Residential/Supply/2030.csv b/docs/Results/Residential/Supply/2030.csv
index a99ff521..61ae1198 100644
--- a/docs/Results/Residential/Supply/2030.csv
+++ b/docs/Results/Residential/Supply/2030.csv
@@ -1,25 +1,49 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2030,all-year,all-week,night,1.66670000000
-R1,0,heat,2035,all-year,all-week,night,2.00000000000
-R1,0,CO2f,2030,all-year,all-week,night,14.73950000000
-R1,0,CO2f,2035,all-year,all-week,night,14.73950000000
-R1,1,heat,2030,all-year,all-week,morning,2.50000000000
-R1,1,heat,2035,all-year,all-week,morning,3.00000000000
-R1,1,CO2f,2030,all-year,all-week,morning,22.10920000000
-R1,1,CO2f,2035,all-year,all-week,morning,22.10920000000
-R1,2,heat,2030,all-year,all-week,afternoon,1.66670000000
-R1,2,heat,2035,all-year,all-week,afternoon,2.00000000000
-R1,2,CO2f,2030,all-year,all-week,afternoon,14.73950000000
-R1,2,CO2f,2035,all-year,all-week,afternoon,14.73950000000
-R1,3,heat,2030,all-year,all-week,early-peak,2.50000000000
-R1,3,heat,2035,all-year,all-week,early-peak,3.00000000000
-R1,3,CO2f,2030,all-year,all-week,early-peak,22.10920000000
-R1,3,CO2f,2035,all-year,all-week,early-peak,22.10920000000
-R1,4,heat,2030,all-year,all-week,late-peak,5.00000000000
-R1,4,heat,2035,all-year,all-week,late-peak,6.00000000000
-R1,4,CO2f,2030,all-year,all-week,late-peak,44.21850000000
-R1,4,CO2f,2035,all-year,all-week,late-peak,44.21850000000
-R1,5,heat,2030,all-year,all-week,evening,3.33330000000
-R1,5,heat,2035,all-year,all-week,evening,4.00000000000
-R1,5,CO2f,2030,all-year,all-week,evening,29.47900000000
-R1,5,CO2f,2035,all-year,all-week,evening,29.47900000000
+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
diff --git a/docs/Results/Residential/Supply/2035.csv b/docs/Results/Residential/Supply/2035.csv
index 32af094e..89e0bd4e 100644
--- a/docs/Results/Residential/Supply/2035.csv
+++ b/docs/Results/Residential/Supply/2035.csv
@@ -1,25 +1,49 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2035,all-year,all-week,night,2.00000000000
-R1,0,heat,2040,all-year,all-week,night,2.33330000000
-R1,0,CO2f,2035,all-year,all-week,night,14.73950000000
-R1,0,CO2f,2040,all-year,all-week,night,3.27140000000
-R1,1,heat,2035,all-year,all-week,morning,3.00000000000
-R1,1,heat,2040,all-year,all-week,morning,3.50000000000
-R1,1,CO2f,2035,all-year,all-week,morning,22.10920000000
-R1,1,CO2f,2040,all-year,all-week,morning,4.90720000000
-R1,2,heat,2035,all-year,all-week,afternoon,2.00000000000
-R1,2,heat,2040,all-year,all-week,afternoon,2.33330000000
-R1,2,CO2f,2035,all-year,all-week,afternoon,14.73950000000
-R1,2,CO2f,2040,all-year,all-week,afternoon,3.27140000000
-R1,3,heat,2035,all-year,all-week,early-peak,3.00000000000
-R1,3,heat,2040,all-year,all-week,early-peak,3.50000000000
-R1,3,CO2f,2035,all-year,all-week,early-peak,22.10920000000
-R1,3,CO2f,2040,all-year,all-week,early-peak,4.90720000000
-R1,4,heat,2035,all-year,all-week,late-peak,6.00000000000
-R1,4,heat,2040,all-year,all-week,late-peak,7.00000000000
-R1,4,CO2f,2035,all-year,all-week,late-peak,44.21850000000
-R1,4,CO2f,2040,all-year,all-week,late-peak,9.81430000000
-R1,5,heat,2035,all-year,all-week,evening,4.00000000000
-R1,5,heat,2040,all-year,all-week,evening,4.66670000000
-R1,5,CO2f,2035,all-year,all-week,evening,29.47900000000
-R1,5,CO2f,2040,all-year,all-week,evening,6.54290000000
+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
diff --git a/docs/Results/Residential/Supply/2040.csv b/docs/Results/Residential/Supply/2040.csv
index 61d3a7ee..663e47a5 100644
--- a/docs/Results/Residential/Supply/2040.csv
+++ b/docs/Results/Residential/Supply/2040.csv
@@ -1,25 +1,49 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2040,all-year,all-week,night,2.33330000000
-R1,0,heat,2045,all-year,all-week,night,2.66670000000
-R1,0,CO2f,2040,all-year,all-week,night,3.27140000000
-R1,0,CO2f,2045,all-year,all-week,night,3.27140000000
-R1,1,heat,2040,all-year,all-week,morning,3.50000000000
-R1,1,heat,2045,all-year,all-week,morning,4.00000000000
-R1,1,CO2f,2040,all-year,all-week,morning,4.90720000000
-R1,1,CO2f,2045,all-year,all-week,morning,4.90720000000
-R1,2,heat,2040,all-year,all-week,afternoon,2.33330000000
-R1,2,heat,2045,all-year,all-week,afternoon,2.66670000000
-R1,2,CO2f,2040,all-year,all-week,afternoon,3.27140000000
-R1,2,CO2f,2045,all-year,all-week,afternoon,3.27140000000
-R1,3,heat,2040,all-year,all-week,early-peak,3.50000000000
-R1,3,heat,2045,all-year,all-week,early-peak,4.00000000000
-R1,3,CO2f,2040,all-year,all-week,early-peak,4.90720000000
-R1,3,CO2f,2045,all-year,all-week,early-peak,4.90720000000
-R1,4,heat,2040,all-year,all-week,late-peak,7.00000000000
-R1,4,heat,2045,all-year,all-week,late-peak,8.00000000000
-R1,4,CO2f,2040,all-year,all-week,late-peak,9.81430000000
-R1,4,CO2f,2045,all-year,all-week,late-peak,9.81430000000
-R1,5,heat,2040,all-year,all-week,evening,4.66670000000
-R1,5,heat,2045,all-year,all-week,evening,5.33330000000
-R1,5,CO2f,2040,all-year,all-week,evening,6.54290000000
-R1,5,CO2f,2045,all-year,all-week,evening,6.54290000000
+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
diff --git a/docs/Results/Residential/Supply/2045.csv b/docs/Results/Residential/Supply/2045.csv
index 5791841b..6e2884e6 100644
--- a/docs/Results/Residential/Supply/2045.csv
+++ b/docs/Results/Residential/Supply/2045.csv
@@ -1,19 +1,37 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2045,all-year,all-week,night,2.66670000000
-R1,0,heat,2050,all-year,all-week,night,3.00000000000
-R1,0,CO2f,2045,all-year,all-week,night,3.27140000000
-R1,1,heat,2045,all-year,all-week,morning,4.00000000000
-R1,1,heat,2050,all-year,all-week,morning,4.50000000000
-R1,1,CO2f,2045,all-year,all-week,morning,4.90720000000
-R1,2,heat,2045,all-year,all-week,afternoon,2.66670000000
-R1,2,heat,2050,all-year,all-week,afternoon,3.00000000000
-R1,2,CO2f,2045,all-year,all-week,afternoon,3.27140000000
-R1,3,heat,2045,all-year,all-week,early-peak,4.00000000000
-R1,3,heat,2050,all-year,all-week,early-peak,4.50000000000
-R1,3,CO2f,2045,all-year,all-week,early-peak,4.90720000000
-R1,4,heat,2045,all-year,all-week,late-peak,8.00000000000
-R1,4,heat,2050,all-year,all-week,late-peak,9.00000000000
-R1,4,CO2f,2045,all-year,all-week,late-peak,9.81430000000
-R1,5,heat,2045,all-year,all-week,evening,5.33330000000
-R1,5,heat,2050,all-year,all-week,evening,6.00000000000
-R1,5,CO2f,2045,all-year,all-week,evening,6.54290000000
+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
diff --git a/docs/Results/Residential/Supply/2050.csv b/docs/Results/Residential/Supply/2050.csv
index 4fe7c5ee..61004cae 100644
--- a/docs/Results/Residential/Supply/2050.csv
+++ b/docs/Results/Residential/Supply/2050.csv
@@ -1,13 +1,25 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2050,all-year,all-week,night,3.00000000000
-R1,0,heat,2055,all-year,all-week,night,3.00000000000
-R1,1,heat,2050,all-year,all-week,morning,4.50000000000
-R1,1,heat,2055,all-year,all-week,morning,4.50000000000
-R1,2,heat,2050,all-year,all-week,afternoon,3.00000000000
-R1,2,heat,2055,all-year,all-week,afternoon,3.00000000000
-R1,3,heat,2050,all-year,all-week,early-peak,4.50000000000
-R1,3,heat,2055,all-year,all-week,early-peak,4.50000000000
-R1,4,heat,2050,all-year,all-week,late-peak,9.00000000000
-R1,4,heat,2055,all-year,all-week,late-peak,9.00000000000
-R1,5,heat,2050,all-year,all-week,evening,6.00000000000
-R1,5,heat,2055,all-year,all-week,evening,6.00000000000
+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
diff --git a/docs/example-output.ipynb b/docs/example-output.ipynb
index 76c3cfe2..121d86a5 100644
--- a/docs/example-output.ipynb
+++ b/docs/example-output.ipynb
@@ -13,7 +13,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!python -m muse settings.toml"
+    "!python -m muse --model default"
    ]
   }
  ],

From 5225f535e8ae1b712c8bb125be7877680773fec5 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:20:50 +0100
Subject: [PATCH 047/419] Remove commented-out pre-commit hook

---
 .pre-commit-config.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b4feab44..ed57e89e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,10 +20,6 @@ repos:
     rev: 7.0.0
     hooks:
       - id: flake8
-  # - repo: https://github.com/pre-commit/mirrors-mypy
-  #   rev: "v0.910-1"
-  #   hooks:
-  #     - id: mypy
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.38.0
     hooks:

From 157c8493854d5114aeec534daa4d8aaf62096304 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:21:46 +0100
Subject: [PATCH 048/419] pre-commit: Add some whitespace-related hooks

Fixes #270.
---
 .pre-commit-config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed57e89e..35a9172e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,8 @@ repos:
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
   - repo: https://github.com/timothycrosley/isort
     rev: "5.13.2"
     hooks:

From e7a1fb74806ac0302072b84de3a91470f767200c Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:28:07 +0100
Subject: [PATCH 049/419] Apply new pre-commit hooks

---
 .flake8                                       |  4 +-
 .github/workflows/ci.yml                      |  2 +-
 .github/workflows/documentation.yml           |  2 +-
 .github/workflows/pre-commit_autoupdate.yml   |  2 +-
 .github/workflows/publish.yml                 |  2 +-
 .github/workflows/regression_tests.yml        |  2 +-
 .gitignore                                    |  2 +-
 .vscode/extensions.json                       |  2 +-
 .vscode/settings.json                         |  2 +-
 CITATION.cff                                  |  2 +-
 docs/_config.yml                              |  2 +-
 .../ResidentialConsumption_Zero2020.txt       | 38 +++++++++----------
 .../ResidentialConsumption_Zero2025.txt       | 38 +++++++++----------
 .../ResidentialConsumption_Zero2030.txt       | 38 +++++++++----------
 .../ResidentialConsumption_Zero2035.txt       | 38 +++++++++----------
 .../ResidentialConsumption_Zero2040.txt       | 38 +++++++++----------
 .../ResidentialConsumption_Zero2045.txt       | 38 +++++++++----------
 .../ResidentialConsumption_Zero2050.txt       | 38 +++++++++----------
 docs/advanced-guide/index.rst                 |  3 --
 docs/api.rst                                  |  2 +-
 docs/application-flow.rst                     |  4 --
 docs/getting-help.rst                         |  2 +-
 docs/glossary.rst                             | 22 +++++------
 docs/inputs/agents.rst                        | 14 +++----
 docs/inputs/commodities.rst                   | 12 +++---
 docs/inputs/commodities_io.rst                |  8 ++--
 docs/inputs/correlation_files.rst             | 10 ++---
 docs/inputs/existing_capacity.rst             |  4 +-
 docs/inputs/index.rst                         |  2 +-
 docs/inputs/inputs_csv.rst                    |  3 --
 docs/inputs/projections.rst                   |  4 +-
 docs/inputs/technodata.rst                    | 38 +++++++++----------
 docs/inputs/technodata_timeslices.rst         |  8 ++--
 docs/inputs/toml.rst                          | 36 +++++++++---------
 docs/inputs/toml_primer.rst                   |  2 +-
 docs/installation/index.rst                   |  2 +-
 docs/installation/virtual-env-based.rst       |  2 +-
 docs/muse-components.rst                      | 13 +++----
 docs/overview.rst                             | 19 +++++-----
 docs/requirements.txt                         |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../input/Projections.csv                     |  2 +-
 .../0-new-decision-metric/settings.toml       | 10 ++---
 .../technodata/Agents.csv                     |  2 +-
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../1-introduction/input/BaseYearExport.csv   |  2 +-
 .../1-introduction/input/BaseYearImport.csv   |  2 +-
 .../1-introduction/input/Projections.csv      |  2 +-
 .../1-introduction/settings.toml              | 10 ++---
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../2-scenario/input/BaseYearExport.csv       |  2 +-
 .../2-scenario/input/BaseYearImport.csv       |  2 +-
 .../2-scenario/input/Projections.csv          |  2 +-
 .../2-scenario/settings.toml                  | 10 ++---
 .../2-scenario/technodata/gas/Technodata.csv  |  2 +-
 .../2-scenario/technodata/power/CommIn.csv    |  2 +-
 .../2-scenario/technodata/power/CommOut.csv   |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../input/Projections.csv                     |  2 +-
 .../1-multiple-objective/settings.toml        | 10 ++---
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommIn.csv               |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/residential/Agents.csv         |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../2-single-objective/input/Projections.csv  |  2 +-
 .../2-single-objective/settings.toml          | 10 ++---
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommIn.csv               |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/residential/Agents.csv         |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../3-add-region/input/BaseYearExport.csv     |  2 +-
 .../3-add-region/input/BaseYearImport.csv     |  2 +-
 .../3-add-region/input/Projections.csv        |  2 +-
 docs/tutorial-code/3-add-region/settings.toml | 10 ++---
 .../3-add-region/technodata/Agents.csv        |  2 +-
 .../3-add-region/technodata/gas/CommIn.csv    |  2 +-
 .../3-add-region/technodata/gas/CommOut.csv   |  2 +-
 .../technodata/gas/ExistingCapacity.csv       |  2 +-
 .../technodata/gas/Technodata.csv             |  2 +-
 .../3-add-region/technodata/power/CommIn.csv  |  2 +-
 .../3-add-region/technodata/power/CommOut.csv |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../preset/Residential2020Consumption.csv     |  2 +-
 .../preset/Residential2050Consumption.csv     |  2 +-
 .../technodata/residential/Agents.csv         |  2 +-
 .../technodata/residential/CommIn.csv         |  2 +-
 .../technodata/residential/CommOut.csv        |  2 +-
 .../residential/ExistingCapacity.csv          |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../1-modify-timeslices/input/Projections.csv |  2 +-
 .../1-modify-timeslices/settings.toml         | 10 ++---
 .../1-modify-timeslices/technodata/Agents.csv |  2 +-
 .../technodata/gas/CommIn.csv                 |  2 +-
 .../technodata/gas/CommOut.csv                |  2 +-
 .../technodata/gas/ExistingCapacity.csv       |  2 +-
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommIn.csv               |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../preset/Residential2020Consumption.csv     |  2 +-
 .../preset/Residential2050Consumption.csv     |  2 +-
 .../technodata/residential/Agents.csv         |  2 +-
 .../technodata/residential/CommIn.csv         |  2 +-
 .../technodata/residential/CommOut.csv        |  2 +-
 .../residential/ExistingCapacity.csv          |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../input/Projections.csv                     |  2 +-
 .../2-modify-time-framework/settings.toml     | 16 ++++----
 .../technodata/Agents.csv                     |  2 +-
 .../technodata/gas/CommIn.csv                 |  2 +-
 .../technodata/gas/CommOut.csv                |  2 +-
 .../technodata/gas/ExistingCapacity.csv       |  2 +-
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommIn.csv               |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../preset/Residential2020Consumption.csv     |  2 +-
 .../preset/Residential2050Consumption.csv     |  2 +-
 .../technodata/residential/Agents.csv         |  2 +-
 .../technodata/residential/CommIn.csv         |  2 +-
 .../technodata/residential/CommOut.csv        |  2 +-
 .../residential/ExistingCapacity.csv          |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../input/GlobalCommodities.csv               |  2 +-
 .../input/Projections.csv                     |  2 +-
 .../5-add-service-demand/settings.toml        | 10 ++---
 .../technodata/Agents.csv                     |  2 +-
 .../technodata/gas/CommIn.csv                 |  2 +-
 .../technodata/gas/CommOut.csv                |  2 +-
 .../technodata/gas/ExistingCapacity.csv       |  2 +-
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommIn.csv               |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../preset/Residential2020Consumption.csv     |  2 +-
 .../preset/Residential2050Consumption.csv     |  2 +-
 .../technodata/residential/Agents.csv         |  2 +-
 .../technodata/residential/CommIn.csv         |  2 +-
 .../technodata/residential/CommOut.csv        |  2 +-
 .../residential/ExistingCapacity.csv          |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../input/BaseYearExport.csv                  |  2 +-
 .../input/BaseYearImport.csv                  |  2 +-
 .../input/Projections.csv                     |  2 +-
 .../6-add-correlation-demand/settings.toml    | 10 ++---
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/CommOut.csv              |  2 +-
 .../technodata/power/ExistingCapacity.csv     |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../preset/TimesliceSharepreset.csv           |  2 +-
 .../preset/regressionparameters.csv           |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../1-min-constraint/settings.toml            | 10 ++---
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/power/TechnodataTimeslices.csv |  2 +-
 .../2-max-constraint/settings.toml            | 10 ++---
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../technodata/power/TechnodataTimeslices.csv |  2 +-
 .../residential/TechnodataTimeslices.csv      |  2 +-
 docs/user-guide/index.rst                     |  4 +-
 src/muse/data/README.md                       |  9 ++---
 src/muse/data/example/default/settings.toml   |  4 +-
 .../example/default_timeslice/settings.toml   |  4 +-
 .../technodata/gas/Technodata.csv             |  2 +-
 .../technodata/power/Technodata.csv           |  2 +-
 .../residential/TechnodataTimeslices.csv      |  2 +-
 .../data/example/medium/input/Projections.csv |  2 +-
 .../preset/Residential2020Consumption.csv     |  2 +-
 .../preset/Residential2050Consumption.csv     |  2 +-
 .../medium/technodata/residential/CommIn.csv  |  2 +-
 .../medium/technodata/residential/CommOut.csv |  2 +-
 .../residential/ExistingCapacity.csv          |  2 +-
 .../technodata/residential/Technodata.csv     |  2 +-
 .../example/minimum_service/settings.toml     |  2 +-
 .../residential/Technodata.csv                |  2 +-
 .../data/example/trade/technodata/Agents.csv  |  2 +-
 .../trade/technodata/gas/Technodata.csv       |  2 +-
 .../trade/technodata/power/Technodata.csv     |  2 +-
 211 files changed, 471 insertions(+), 488 deletions(-)

diff --git a/.flake8 b/.flake8
index 0e75ca2d..1593c0e5 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 88
-exclude = 
+exclude =
 	.tox,
 	.git,
     .venv,
@@ -8,4 +8,4 @@ exclude =
 	build,
 	__pycache__,
 extend-ignore =
-	E203,W503
\ No newline at end of file
+	E203,W503
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1ec5c85..ddacafda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,4 +83,4 @@ jobs:
 
       # The regression tests (with non coverage)
       - name: Regression tests
-        run: pytest tests/test_fullsim_regression.py
\ No newline at end of file
+        run: pytest tests/test_fullsim_regression.py
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 0b4881c3..a46dd5a7 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -16,7 +16,7 @@ jobs:
         python-version: 3.9
     - name: Install dependencies
       run: |
-        sudo apt update -y 
+        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
diff --git a/.github/workflows/pre-commit_autoupdate.yml b/.github/workflows/pre-commit_autoupdate.yml
index 0b353a85..5afce103 100644
--- a/.github/workflows/pre-commit_autoupdate.yml
+++ b/.github/workflows/pre-commit_autoupdate.yml
@@ -17,4 +17,4 @@ jobs:
           branch: update/pre-commit-hooks
           title: Update pre-commit hooks
           commit-message: "chore: update pre-commit hooks"
-          body: Update versions of pre-commit hooks to latest version.
\ No newline at end of file
+          body: Update versions of pre-commit hooks to latest version.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1cbef647..ca119d65 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -110,4 +110,4 @@ jobs:
 
       - uses: softprops/action-gh-release@v2
         with:
-          files: standalone/MUSE*
\ No newline at end of file
+          files: standalone/MUSE*
diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml
index 9b997a9c..82aa3097 100644
--- a/.github/workflows/regression_tests.yml
+++ b/.github/workflows/regression_tests.yml
@@ -27,4 +27,4 @@ jobs:
           pip install -e .[all]
 
       - name: Regression tests
-        run: pytest pytest tests/test_fullsim_regression.py
\ No newline at end of file
+        run: pytest pytest tests/test_fullsim_regression.py
diff --git a/.gitignore b/.gitignore
index 2341c4c7..90eea441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,4 +167,4 @@ model/
 
 *.html
 
-.idea/
\ No newline at end of file
+.idea/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 571866cb..c32598b6 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -11,4 +11,4 @@
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []
-}
\ No newline at end of file
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index df79c4e4..1f074ac8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,4 +8,4 @@
     "python.testing.pytestEnabled": true,
     "restructuredtext.confPath": "${workspaceFolder}/docs",
     "python.pythonPath": "/opt/anaconda3/envs/muse/bin/python",
-}
\ No newline at end of file
+}
diff --git a/CITATION.cff b/CITATION.cff
index 2ade52d6..12d541bd 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -10,4 +10,4 @@ authors:
 
 title: SGIModel/MUSE_OS: v1.0.1
 version: v1.0.1
-date-released: 2022-03-25
\ No newline at end of file
+date-released: 2022-03-25
diff --git a/docs/_config.yml b/docs/_config.yml
index c4192631..277f1f2c 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1 +1 @@
-theme: jekyll-theme-cayman
\ No newline at end of file
+theme: jekyll-theme-cayman
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt
index 5d7fe8a4..2ef9b3b1 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2020 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2025 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2020 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2025 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2020 electricity       0.0000  
-            gas              11.6000  
-            heat              0.0000  
-            CO2f              0.0000  
-       2025 electricity       4.2222  
-            gas               3.2222  
-            heat              0.0000  
-            CO2f              0.0000  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2020 electricity       0.0000
+            gas              11.6000
+            heat              0.0000
+            CO2f              0.0000
+       2025 electricity       4.2222
+            gas               3.2222
+            heat              0.0000
+            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt
index 28426c68..061f72d4 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2025 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2030 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2025 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2030 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2025 electricity       4.2222  
-            gas               3.2222  
-            heat              0.0000  
-            CO2f              0.0000  
-       2030 electricity       5.7556  
-            gas               2.6422  
-            heat              0.0000  
-            CO2f              0.0000  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2025 electricity       4.2222
+            gas               3.2222
+            heat              0.0000
+            CO2f              0.0000
+       2030 electricity       5.7556
+            gas               2.6422
+            heat              0.0000
+            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt
index a6e578cd..46755cc5 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2030 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2035 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2030 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2035 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2030 electricity       5.7556  
-            gas               2.6422  
-            heat              0.0000  
-            CO2f              0.0000  
-       2035 electricity       7.0889  
-            gas               2.6422  
-            heat              0.0000  
-            CO2f              0.0000  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2030 electricity       5.7556
+            gas               2.6422
+            heat              0.0000
+            CO2f              0.0000
+       2035 electricity       7.0889
+            gas               2.6422
+            heat              0.0000
+            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt
index 97bc4a7b..501217f4 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2035 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2040 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2035 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2040 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2035 electricity       7.0889  
-            gas               2.6422  
-            heat              0.0000  
-            CO2f              0.0000  
-       2040 electricity       9.1311  
-            gas               0.5864  
-            heat              0.0000  
-            CO2f              0.0000  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2035 electricity       7.0889
+            gas               2.6422
+            heat              0.0000
+            CO2f              0.0000
+       2040 electricity       9.1311
+            gas               0.5864
+            heat              0.0000
+            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt
index f78925b0..83dd3b29 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2040 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2045 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2040 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2045 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2040 electricity       9.1311  
-            gas               0.5864  
-            heat              0.0000  
-            CO2f              0.0000  
-       2045 electricity      10.4644  
-            gas               0.5864  
-            heat              0.0000  
-            CO2f              0.0000  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2040 electricity       9.1311
+            gas               0.5864
+            heat              0.0000
+            CO2f              0.0000
+       2045 electricity      10.4644
+            gas               0.5864
+            heat              0.0000
+            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt
index 88d9eebf..abd1d805 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2045 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2050 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2045 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2050 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2045 electricity      10.4644  
-            gas               0.5864  
-            heat              0.0000  
-            CO2f              0.0000  
-       2050 electricity      12.0000  
-            gas               0.0000  
-            heat              0.0000  
-            CO2f              0.0000  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2045 electricity      10.4644
+            gas               0.5864
+            heat              0.0000
+            CO2f              0.0000
+       2050 electricity      12.0000
+            gas               0.0000
+            heat              0.0000
+            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt
index f6c896e4..599283b1 100644
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt
+++ b/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt
@@ -1,23 +1,23 @@
 Hello, you!
 
                         units_prices                            comm_usage  \
-region year commodity                                                        
-R1     2050 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
-       2055 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE   
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT   
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT   
+region year commodity
+R1     2050 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
+       2055 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
+            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
+            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
 
-                         consumption  
-region year commodity                 
-R1     2050 electricity         12.0  
-            gas                  0.0  
-            heat                 0.0  
-            CO2f                 0.0  
-       2055 electricity         12.0  
-            gas                  0.0  
-            heat                 0.0  
-            CO2f                 0.0  
\ No newline at end of file
+                         consumption
+region year commodity
+R1     2050 electricity         12.0
+            gas                  0.0
+            heat                 0.0
+            CO2f                 0.0
+       2055 electricity         12.0
+            gas                  0.0
+            heat                 0.0
+            CO2f                 0.0
diff --git a/docs/advanced-guide/index.rst b/docs/advanced-guide/index.rst
index 467deba0..54d75246 100644
--- a/docs/advanced-guide/index.rst
+++ b/docs/advanced-guide/index.rst
@@ -7,6 +7,3 @@ Advanced guide
 
    extending-muse
    further-extending-muse
-
-
-
diff --git a/docs/api.rst b/docs/api.rst
index 2433fe82..1d1828be 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -231,4 +231,4 @@ Examples
 ~~~~~~~~
 
 .. automodule:: muse.examples
-   :members:
\ No newline at end of file
+   :members:
diff --git a/docs/application-flow.rst b/docs/application-flow.rst
index 4b075811..4ed4a63a 100644
--- a/docs/application-flow.rst
+++ b/docs/application-flow.rst
@@ -512,7 +512,3 @@ The typical choice used in most examples in MUSE is ``share``, where the utiliza
 Once the supply is obtained, the consumed commodities required to achieve that production level are calculated. The cheapest fuel for flexible technologies is used.
 
 Finally, the cost associated with that supply is calculated as the weighted average *annual LCOE* over assets, where the weights are the supply. This is later used to set the new prices.
-
-
-
-
diff --git a/docs/getting-help.rst b/docs/getting-help.rst
index b9d913be..2a963a90 100644
--- a/docs/getting-help.rst
+++ b/docs/getting-help.rst
@@ -13,4 +13,4 @@ Using MUSE can be daunting at first. It is a very powerful tool, but unleashing
 
 - `Opening a bug report in GitHub <https://github.com/SGIModel/MUSE_OS/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=%5BBUG%5D+>`_ is the right move if you are sure you have found something in MUSE that is plainly wrong. In such a complex, it is not unusual to find errors and counting with the collaboration of the community to spot them is essential to keep improving. Ideally, before opening a bug report, send your problem to the mailing list in case someone has already found that issue and has a solution for it or, on the contrary, can confirm that is indeed a bug. Keep in mind that it will take a while for bugs to be fixed, so this will rarely be a short term source of support. **You will need a GitHub account (it is free) to open a bug report**.
 
-- `Open a feature request in GitHub <https://github.com/SGIModel/MUSE_OS/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.md&title=>`_ if, despite al the functionality built in MUSE, there is something that is missing and that you think will be useful. As before, it would be ideal if this is sent before to the mailing list to get an idea of the appetite for such a new feature in the community. **You will need a GitHub account (it is free) to open a feature request**.
\ No newline at end of file
+- `Open a feature request in GitHub <https://github.com/SGIModel/MUSE_OS/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.md&title=>`_ if, despite al the functionality built in MUSE, there is something that is missing and that you think will be useful. As before, it would be ideal if this is sent before to the mailing list to get an idea of the appetite for such a new feature in the community. **You will need a GitHub account (it is free) to open a feature request**.
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 85e9f692..bf331eeb 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -12,16 +12,16 @@ Here we provide a glossary for some of the frequently used terms in this documen
         Anaconda prompt is a command line shell. This is much like terminal for mac or cmd for windows. However, Anaconda Prompt allows you to run anaconda and conda commands from the prompt, without the need to change directories or your path.
 
     Benchmark years
-        These are the years which the model solves and presents outputs for. This can be set by the user and represents the evolution of the system in each time step. This, for example, can be set for every year or every five years, depending on the granularity required by the user. 
+        These are the years which the model solves and presents outputs for. This can be set by the user and represents the evolution of the system in each time step. This, for example, can be set for every year or every five years, depending on the granularity required by the user.
 
     Energy system
         An energy system is a system which is primarily designed to supply energy services to end-users. This can be defined as all components related to the production, conversion, delivery, and use of energy.
 
-    End-use demand 
+    End-use demand
         The end-use demand is the demand for energy required to produce an energy service. For example, the gas required by a gas boiler to produce hot water, for the energy service of space heating.
 
     Energy service
-        The energy service is the service which a technology is used for. An example of an energy service could be cooking from a cooker. 
+        The energy service is the service which a technology is used for. An example of an energy service could be cooking from a cooker.
 
     End-use technology
         An end-use technology is a technology which service an energy service.  Examples of these include boiler, heaters and stoves which service hot water, heating and cooking.
@@ -30,13 +30,13 @@ Here we provide a glossary for some of the frequently used terms in this documen
         An endogenous quantity is one which develops within the model, as opposed to an exogenous quantity which is specified by the user and not influenced by the model.
 
     Equilibrium
-        An equilibrium is a situation in which economic forces, such as supply and demand are balanced. This means that, in the absence of external forces, the value of economic variables will not change. 
+        An equilibrium is a situation in which economic forces, such as supply and demand are balanced. This means that, in the absence of external forces, the value of economic variables will not change.
 
     Exogenous quantity
         An exogenous quantity is a quantity which is set by the user, and does not change based upon the simulation.
 
     Imperfect information
-        This is where an agent does not know everything needed to make a perfect decision. 
+        This is where an agent does not know everything needed to make a perfect decision.
 
     Levelised cost of electricity
         The levelised cost of electricty is a measure of the average net present cost of electricity generation for a generating plant over its lifetime.
@@ -45,13 +45,13 @@ Here we provide a glossary for some of the frequently used terms in this documen
         Limited foresight is the condition that an agent is unable to predict the entire future perfectly. The agent is only able to predict the future either imperfectly, or a limited time ahead.
 
     Open-source
-        Open-source is a source code that is made freely available for users to modify and redistribute. 
-      
+        Open-source is a source code that is made freely available for users to modify and redistribute.
+
     Pandas
         Pandas is a data manipulation library for python.
-    
+
     Petajoules (PJ)
-        A petajoule is equal to 1.0E+15 joules. A joule is a unit of energy and is equal to the energy transferred to an object. 
+        A petajoule is equal to 1.0E+15 joules. A joule is a unit of energy and is equal to the energy transferred to an object.
 
     Seaborn
         Seaborn is a visualisation library in python.
@@ -60,7 +60,7 @@ Here we provide a glossary for some of the frequently used terms in this documen
         Scenario analysis is a process of analysing the future by considering different possibilities of a future. Through this analysis multiple alternative future developments are presented, as opposed to a single prediction.
 
     Simulation
-        A simulation is computer software which models, or imitates a process or system. They can be used to observe what the effect of changes are over time to the system in question. 
+        A simulation is computer software which models, or imitates a process or system. They can be used to observe what the effect of changes are over time to the system in question.
 
     Timeslice
-        A timeslice is the way in which a benchmark year is split into various different sections. For example, a benchmark year could be split into four seasons, or as far as for each hour within a benchmark year.
\ No newline at end of file
+        A timeslice is the way in which a benchmark year is split into various different sections. For example, a benchmark year could be split into four seasons, or as far as for each hour within a benchmark year.
diff --git a/docs/inputs/agents.rst b/docs/inputs/agents.rst
index 95659924..ccdc22dd 100644
--- a/docs/inputs/agents.rst
+++ b/docs/inputs/agents.rst
@@ -128,18 +128,18 @@ ObjData3
 .. _Objsort1:
 
 Objsort1
-   Sets whether :ref:`first objective <Objective1>` is maximized or minimized. For both 
-   "adhoc" and "scipy" solvers this should be set to "True" for minimization and 
+   Sets whether :ref:`first objective <Objective1>` is maximized or minimized. For both
+   "adhoc" and "scipy" solvers this should be set to "True" for minimization and
    "False" for maximisation.
 
 Objsort2
-   Sets whether :ref:`second objective <Objective2>` is maximized or minimized. For both 
-   "adhoc" and "scipy" solvers this should be set to "True" for minimization and 
+   Sets whether :ref:`second objective <Objective2>` is maximized or minimized. For both
+   "adhoc" and "scipy" solvers this should be set to "True" for minimization and
    "False" for maximisation.
 
 Objsort3
-   Sets whether :ref:`third objective <Objective3>` is maximized or minimized. For both 
-   "adhoc" and "scipy" solvers this should be set to "True" for minimization and 
+   Sets whether :ref:`third objective <Objective3>` is maximized or minimized. For both
+   "adhoc" and "scipy" solvers this should be set to "True" for minimization and
    "False" for maximisation.
 
 .. py:currentmodule:: muse.filters
@@ -223,4 +223,4 @@ MaturityThreshold
    Parameter for the search rule :py:func:`maturity <muse.filters.maturity>`.
 
 SpendLimit
-   Parameter for the search rule :py:func:`spend_limit <muse.filters.spend_limit>`.
\ No newline at end of file
+   Parameter for the search rule :py:func:`spend_limit <muse.filters.spend_limit>`.
diff --git a/docs/inputs/commodities.rst b/docs/inputs/commodities.rst
index 167c5625..56ddc83b 100644
--- a/docs/inputs/commodities.rst
+++ b/docs/inputs/commodities.rst
@@ -20,19 +20,19 @@ Commodity
 
 CommodityType
    defines the type of a commodity (i.e. Energy, Service, Material, or Environmental).
-   
+
    The "energy" type includes the energy commodities, such as biomass, electricity, gasoline, and hydrogen,
    which are either extracted, transformed from one to another, or used in the energy system.
-   
+
    The "service" type includes commodities such as space heating or hot water which correspond to selected
    poples' needs whose fulflment requires energy uses.
-   
+
    The "material" type represent non-energy inputs for energy technologies, such as limestone or oxygen.
    The "environmental" type refers to non-energy commodities whichare used to quantify an inpact on the environment,
    such as greenhouse gases or CO2. They can be subjected to different types of environmental fees or taxes.
 
 CommodityName
-   is the internal name used for a commodity inside the model. 
+   is the internal name used for a commodity inside the model.
 
 CommodityEmissionFactor_CO2
    is CO2 emission per unit of commodity flow.
@@ -40,10 +40,10 @@ CommodityEmissionFactor_CO2
    for any subsequent development of the code.
 
 HeatRate
-   represents the lower heating value of an energy commodity 
+   represents the lower heating value of an energy commodity
    This commodity property is not directly used in the MUSE core set of equations, but can be further referred to
    for any subsequent development of the code.
-   
+
 Unit
    is the unit used as a basis for all the input data. More specifically the model allows
    a totally flexible way of defining the commodities. CommodityName is currently the
diff --git a/docs/inputs/commodities_io.rst b/docs/inputs/commodities_io.rst
index 2f345055..c927e9ec 100644
--- a/docs/inputs/commodities_io.rst
+++ b/docs/inputs/commodities_io.rst
@@ -17,7 +17,7 @@ Output commodities are the commodities produced by each
 technology.  They are defined in a csv file which describes the commodity outputs from
 each technology, defined per unit of technology activity. Emissions, such as CO2
 (produced from fuel combustion and reactions), CH4, N2O, F-gases, can also be accounted
-for in this file. 
+for in this file.
 
 
 General features
@@ -44,7 +44,7 @@ heater.
 
 .. csv-table:: Commodities used as consumables - Input commodities
    :header: ProcessName, RegionName, Time, Level, electricity
-       
+
    Unit, -, Year, -, GWh/PJ
    resBoilerElectric, region1, 2010, fixed, 300
    resBoilerElectric, region1, 2030, fixed, 290
@@ -70,7 +70,7 @@ Unit
 
 The input data has to be provided for the base year. Additional years within the time
 framework of the overall simulation can be defined. In this case, MUSE would interpolate
-the values between the provided periods and assume a constant value afterwards. The additional 
+the values between the provided periods and assume a constant value afterwards. The additional
 years at which input data for input/output commodities, are defined needs to equal for :ref:`inputs-technodata` and :ref:`inputs-technodata-ts`.
 
-Interpolation is activated only if the feature *interpolation_mode = 'Active'* is defined in the TOML file.
\ No newline at end of file
+Interpolation is activated only if the feature *interpolation_mode = 'Active'* is defined in the TOML file.
diff --git a/docs/inputs/correlation_files.rst b/docs/inputs/correlation_files.rst
index 0b771339..0438b63f 100644
--- a/docs/inputs/correlation_files.rst
+++ b/docs/inputs/correlation_files.rst
@@ -44,7 +44,7 @@ An example of a shortened macrodriver file is shown below. This file contains th
 Variable
     This is the variable that you would like to use in the regression for the service demand.
 
-RegionName 
+RegionName
     This is the region that the data applies to. This must correlate with the regions set in the rest of your input files, as well as the toml file.
 
 Unit
@@ -63,7 +63,7 @@ An example file is shown below:
 
 .. csv-table:: Regression Parameters File
    :header: SectorName,FunctionType,Coeff,RegionName,electricity,gas,heat,CO2f
-        
+
    Residential,logistic-sigmoid,GDPexp,R1,0,0,9.94E-02,0
    Residential,logistic-sigmoid,constant,R1,0,0,0.0000434,0
    Residential,logistic-sigmoid,GDPscaleLess,R1,0,0,753.1068725,0
@@ -81,7 +81,7 @@ FunctionType
         - Loglog
         - LogisticSigmoid
         - Linear
-        - endogenous_demand 
+        - endogenous_demand
 
     Your own functions can be created using the `@register_regression` hook, from the `regressions.py` file.
 
@@ -98,13 +98,13 @@ Energy service (electricity, gas, heat, CO2f)
 Timeslice share
 ---------------
 
-In this file, you are able to split the energy service proportionally by timeslice. 
+In this file, you are able to split the energy service proportionally by timeslice.
 
 An example file is shown below:
 
 .. csv-table:: Timeslice share
    :header: SN,RegionName,electricity,gas,heat,CO2f,wind
-        
+
     1,R1,0,0,0.034835,0,0
     2,R1,0,0,0.064546,0,0
     3,R1,0,0,0.044569,0,0
diff --git a/docs/inputs/existing_capacity.rst b/docs/inputs/existing_capacity.rst
index 3834ec30..c43a8cb3 100644
--- a/docs/inputs/existing_capacity.rst
+++ b/docs/inputs/existing_capacity.rst
@@ -15,7 +15,7 @@ follow the structure reported in the table.
    :header: ProcessName, RegionName, Unit, 2010, 2020, 2030, 2040, 2050
 
    resBoilerElectric, region1, PJ/y, 5, 0.5, 0, 0, 0
-   resBoilerElectric, region2, PJ/y, 39, 3.5, 1, 0.3, 0       
+   resBoilerElectric, region2, PJ/y, 39, 3.5, 1, 0.3, 0
 
 
 ProcessName
@@ -28,4 +28,4 @@ Unit
    reports the unit of the technology capacity; it is for the user internal reference only.
 
 2010,..., 2050
-   represent the simulated periods.
\ No newline at end of file
+   represent the simulated periods.
diff --git a/docs/inputs/index.rst b/docs/inputs/index.rst
index 0eb83686..3fa89a74 100644
--- a/docs/inputs/index.rst
+++ b/docs/inputs/index.rst
@@ -21,4 +21,4 @@ Indices and tables
 
 - :ref:`genindex`
 - :ref:`modindex`
-- :ref:`search`
\ No newline at end of file
+- :ref:`search`
diff --git a/docs/inputs/inputs_csv.rst b/docs/inputs/inputs_csv.rst
index 41585695..621ef91a 100644
--- a/docs/inputs/inputs_csv.rst
+++ b/docs/inputs/inputs_csv.rst
@@ -23,6 +23,3 @@ Indices and tables
 - :ref:`genindex`
 - :ref:`modindex`
 - :ref:`search`
-
-
-
diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst
index a041355e..62d7bc02 100644
--- a/docs/inputs/projections.rst
+++ b/docs/inputs/projections.rst
@@ -35,7 +35,7 @@ The forward price trajectory should follow the structure reported in the table b
 
 .. csv-table:: Initial market projections
    :header: RegionName, Attribute, Time, com1, com2, com3
-                     
+
 
    Unit, -, Year, MUS$2010/PJ, MUS$2010/PJ, MUS$2010/PJ
    region1, CommodityPrice, 2010, 20, 1.9583, 2
@@ -64,4 +64,4 @@ com1, ..., comN
    Any further columns represent the commodities modelled, as defined in the global
    commodities the row Unit reports the unit in which the technology consumption is
    defined; it is for the user internal reference only. The names *comX* should be
-   replaced with the names of the commodities.
\ No newline at end of file
+   replaced with the names of the commodities.
diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 02f192c2..06b0a3ae 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -12,7 +12,7 @@ the electric boiler used in households is taken as an example for a generic regi
 
 .. csv-table:: Techno-data: cost inputs
    :header: ProcessName, RegionName, Time, Level, cap_par, cap_exp, fix_par, ...
-       
+
    resBoilerElectric, region1, 2010, fixed, 3.81, 1.00, 0.38, ...
    resBoilerElectric, region1, 2030, fixed, 3.81, 1.00, 0.38, ...
 
@@ -32,14 +32,14 @@ Level
 
 cap_par, cap_exp
    are used in the capital cost estimation. Capital costs are calculated as:
-   
+
    .. math::
-   
+
       \text{CAPEX} = \text{cap$\_$par} * \text{(Capacity)}^\text{cap$\_$exp}
 
    where the parameter cap_par is estimated at a selected reference size (i.e. CapRef),
    such as:
-   
+
    .. math::
 
       \text{cap$\_$par} = \left(
@@ -52,9 +52,9 @@ cap_par, cap_exp
 
 fix_par, fix_exp
    are used in the fixed cost estimation. Fixed costs are calculated as:
-   
+
    .. math::
-   
+
       \text{FOM} = \text{fix$\_$par} * (\text{Capacity})^\text{fix$\_$exp}
 
 
@@ -62,7 +62,7 @@ fix_par, fix_exp
    such as:
 
    .. math::
-   
+
       \text{fix$\_$par}= \frac{\text{FOMref}}{(\text{CapRef})^\text{fix$\_$exp}}
 
    CapRef is a reference size for the cost estimate decided by the modeller before filling the input data files.
@@ -72,12 +72,12 @@ var_par, var_exp
    dependent Variable costs are calculated as:
 
    .. math::
-   
+
       \text{VAREX} = \text{var$\_$par} * \text{(Production)}^{\text{var$\_$exp}}
-           
+
    where the parameter var_par is estimated at a selected reference size (i.e. CapRef),
    such as:
-   
+
    .. math::
 
       \text{var$\_$par}= \frac{\text{VARref}}{(\text{ProductionRef})^\text{var$\_$exp}}
@@ -101,11 +101,11 @@ Growith constraints
 
    In this example, MaxCapacityAddition,	MaxCapacityGrowth, and TotalCapacityLimit equal to 10 PJ, 0.2 (corresponding to 20 \%), and 100 PJ.
    Assuming a 5-year time step, the *MaxCapacityAddition* introduces a constraint on the maximum capacity which can be added in the investment year:
-   it constrains the new capacity which can be installed in a modelled period as being equal to *10 * 5 = 50 PJ*. 
+   it constrains the new capacity which can be installed in a modelled period as being equal to *10 * 5 = 50 PJ*.
    The *MaxCapacityGrowth* applies a constraint on the capacity which can be installed in a modelled period, which depends on the
    decommissioning profile. Assuming that 7.7 PJ of resBoilerElectric is available in the year when the decision is made (investment year), and that 4.9 PJ of
    resBoilerElectric is available in the year at which capacities invested in, will be online, then the constraint applies as follows *7.7 * (0.2 * 5 + 1) - 4.9 = 10.5 PJ*.
-   The *TotalCapacityLimit* applies a constraint on the maximum capacity of a technology in the investment year; it depends on the decommissioning profile and equals *100 - 4.9 = 95.1 PJ*. 
+   The *TotalCapacityLimit* applies a constraint on the maximum capacity of a technology in the investment year; it depends on the decommissioning profile and equals *100 - 4.9 = 95.1 PJ*.
 
    Growth constraints are applied for each single agent in a multi-agent simulation. When only one agent is present, the growth constraints
    apply individually to the "New" and "Retrofit" agent, when present.
@@ -124,7 +124,7 @@ efficiency
    represents the technology efficiency used as agents' objective to sort investment according to their energy or material efficiency (see :ref:`inputs-agents`).
 
 Type
-   defines the type of a technology. This variable is used for the search space in the agents csv file. It allows for the agents to filter for technologies of a similar type, for example.     
+   defines the type of a technology. This variable is used for the search space in the agents csv file. It allows for the agents to filter for technologies of a similar type, for example.
 
 Fuel
    defines the fuel used by a technology, defined to restrict the new investments of each agent to selected technologies using selected fuels (see :ref:`inputs-agents`).
@@ -139,7 +139,7 @@ InterestRate
 Agent_0, ..., Agent_N
    represent the allocation of the initial capacity to the each agent.
    The column heading refers each retrofit agent "AgentShare" as defined in the agents' definition (see :ref:`inputs-agents`).
-   The value corresponds to the ownership of the initial stock, as defined in the :ref:`inputs-existing-capacity` for the starting year of the simulation. 
+   The value corresponds to the ownership of the initial stock, as defined in the :ref:`inputs-existing-capacity` for the starting year of the simulation.
    For example, if an initial boiler stock of 10 PJ is available, this is allocated to each agent according to the "AgentShare".
 
    In a one-agent simulation, assuming that the *AgentShare* equals to *Agent_2* for the retrofit agent, the technodata should indicate the stock ownership as follows.
@@ -147,7 +147,7 @@ Agent_0, ..., Agent_N
 
    .. csv-table:: Techno-data: AgentShare - 1 agent
       :header: ProcessName, RegionName, Time, ..., Agent_2
-         
+
       resBoilerElectric, region1, 2010, ..., 1
       resBoilerElectric, region1, 2030, ..., 1
 
@@ -159,13 +159,13 @@ Agent_0, ..., Agent_N
 
    .. csv-table:: Techno-data: AgentShare - 2 agents
       :header: ProcessName, RegionName, Time, ..., Agent_2, Agent_4
-         
+
       resBoilerElectric, region1, 2010, ..., 0.3, 0.7
       resBoilerElectric, region1, 2030, ..., 0.3, 0.7
-   
+
 The input data has to be provided for the base year. Additional years within the time
 framework of the overall simulation can be defined. In this case, MUSE would interpolate
-the values between the provided periods and assume a constant value afterwards. The additional 
+the values between the provided periods and assume a constant value afterwards. The additional
 years at which input data for techno-data are defined need to equal for :ref:`inputs-iocomms` and :ref:`inputs-technodata-ts`.
 
-Interpolation is activated only if the feature *interpolation_mode = 'Active'* is defined in the TOML file.
\ No newline at end of file
+Interpolation is activated only if the feature *interpolation_mode = 'Active'* is defined in the TOML file.
diff --git a/docs/inputs/technodata_timeslices.rst b/docs/inputs/technodata_timeslices.rst
index d536503d..9c251611 100644
--- a/docs/inputs/technodata_timeslices.rst
+++ b/docs/inputs/technodata_timeslices.rst
@@ -8,7 +8,7 @@ The techno-data timeslices is an optinal file which contains information on tech
 
 .. csv-table:: Techno-data
    :header: ProcessName,RegionName,Time,month,day,hour,UtilizationFactor,MinimumServiceFactor
-       
+
    Unit,-,Year,-,-,-,-,-
    gasCCGT,R1,2020,all-year,all-week,night,1,1
    gasCCGT,R1,2020,all-year,all-week,morning,1,2
@@ -31,7 +31,7 @@ day
    represents the second level of the timeslice. Again, this input is dynamic, and thus does not necessarily need to be a day - as long as it matches with the toml file.
 
 hour
-   represents the third level of the timeslice. 
+   represents the third level of the timeslice.
 
 UtilizationFactor
    represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year per timeslice. This overwrites the UtilizationFactor in the technodata file.
@@ -42,7 +42,7 @@ MinimumServiceFactor
 
 The input data has to be provided for the base year. Additional years within the time
 framework of the overall simulation can be defined. In this case, MUSE would interpolate
-the values between the provided periods and assume a constant value afterwards. The additional 
+the values between the provided periods and assume a constant value afterwards. The additional
 years at which input data for techno-data timeslices, need to equal those for :ref:`inputs-iocomms` and :ref:`inputs-technodata`.
 
-Interpolation is activated only if the feature *interpolation_mode = 'Active'* is defined in the TOML file.
\ No newline at end of file
+Interpolation is activated only if the feature *interpolation_mode = 'Active'* is defined in the TOML file.
diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index c70b1ec4..a1a6a307 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -109,11 +109,11 @@ Example
 *method*
    Method used to equilibrate the carbon market. Available options are `fitting` and `bisection`, however this can be expanded with the `@register_carbon_budget_method` hook in `muse.carbon_budget`.
 
-   The market-clearing algortihm iterates over the sectors until the market reaches an equilibrium in the foresight period (the period next to the one analysed). 
-   This is represented by a stable variation of a commodity demand (or price) between iterations below a defined tolerance. 
+   The market-clearing algortihm iterates over the sectors until the market reaches an equilibrium in the foresight period (the period next to the one analysed).
+   This is represented by a stable variation of a commodity demand (or price) between iterations below a defined tolerance.
    The market-clearing algorithm samples a user-defined set of carbon prices.
 
-   When the `fitting` method is selected, this command builds a regression model of the emissions as a function of the carbon price. 
+   When the `fitting` method is selected, this command builds a regression model of the emissions as a function of the carbon price.
    It applies to a pool of emissions for all the modelled regions. Therefore, the estimated carbon price applies to all the modelled regions.
    The regression model, the method calculates iteratively the emissions at pre-defined carbon price sample values.
    The emissions-carbon price couples are used to used to fit the emission-carbon price relation, is uer-defined (ie. linear or exponential fitter).
@@ -123,10 +123,10 @@ Example
    When the `bisection` method is selected, this command applies a bisection method to solve the carbon market.
    Similarly to the `fitting` method, the carbon market includes a pool of all the modelled regions. The obtained carbon price
    applies to all the regions, as above. This method solves as a typical bisection algorithm.
-   It is coded independently to use the internal signature of the `register_carbon_budget_method`. The algorithm aims to find a root of 
-   the function emissions-carbon price, as for the carbon price at which the carbon budget is met. 
+   It is coded independently to use the internal signature of the `register_carbon_budget_method`. The algorithm aims to find a root of
+   the function emissions-carbon price, as for the carbon price at which the carbon budget is met.
    The algorithm iteratively modifies the carbon price and estimates the corresponding emissions.
-   It stops when the convergence or stop criteria are met. 
+   It stops when the convergence or stop criteria are met.
    This happens for example either when the carbon budget or the maximum number of iterations are met.
    Alongside the selection of the method, the user can define a `sample_size`, representing the number of iterations of the bisection method.
 
@@ -141,7 +141,7 @@ Example
 
 *method_options*
    Additional options for the specific carbon method. In particular, the `refine_price` activate a sanity check on the adjusted carbon price.
-   The sanity check applies an upper limit on the carbon price obtained from the algorithm (either `fitting` or `bisection`), called 
+   The sanity check applies an upper limit on the carbon price obtained from the algorithm (either `fitting` or `bisection`), called
    `price_too_high_threshold`, a user-defined threshold based on heuristics on the values of the carbon price, reflecting typical historical trends.
 
 *fitter*
@@ -253,7 +253,7 @@ aggregates such as:
     nightlife = ["evening", "night"]
 
  It is possible to specify a timeslice level for the mca by adding an
-`mca.timeslice_levels` section, using an inline table format. 
+`mca.timeslice_levels` section, using an inline table format.
 See section on `Timeslices_`.
 
 *outputs_cache*
@@ -315,13 +315,13 @@ A sector accepts these atributes:
    - "conversion": 20
    - "supply": 30
    - "last": 100
-   
+
    Defaults to "last".
 
 *interpolation*
    Interpolation method user when filling in missing values. Available interpolation
    methods depend on the underlying `scipy method's kind attribute`_.
-   
+
    .. _scipy method's kind attribute: https://docs.scipy.org/doc/scipy/reference/generated/scipy.interpolate.interp1d.html
 
 *investment_production*
@@ -338,7 +338,7 @@ A sector accepts these atributes:
       costing = "prices"
 
    MUSE provides two methods in :py:mod:`muse.production`:
-   
+
    - share: the production is the maximum production for the existing capacity and
       the technology's utilization factor.
       See :py:func:`muse.production.maximum_production`.
@@ -371,7 +371,7 @@ Sectors contain a number of subsections:
 
    *interactions* are specified as a :ref:`TOML array<toml-array>`, e.g. with double
    brackets. Each sector can specify an arbitrary number of interactaction, simply by
-   adding an extra interaction row.    
+   adding an extra interaction row.
 
    There are two orthogonal concepts to interactions:
 
@@ -446,7 +446,7 @@ to define the timeslice simply by refering to the slices it will use at each lev
 .. _sector-timeslices:
 
 *timeslice_levels*
-   Optional. These define the timeslices of a sector. If not specified, the finest timeslice levels will be used 
+   Optional. These define the timeslices of a sector. If not specified, the finest timeslice levels will be used
    (See `Timeslices`_).
    It can be implemented with the following rows:
 
@@ -578,7 +578,7 @@ to define the timeslice simply by refering to the slices it will use at each lev
       be added by interested users, and registered with MUSE via
       :py:func:`muse.outputs.register_output_sink`. See
       :py:mod:`muse.outputs` for more details.
-   
+
    - *filename*: defines the format of the file where to save the data. There are several
       standard values that are automatically substituted:
 
@@ -622,7 +622,7 @@ Preset sectors
 
 The commodity production, commodity consumption and product prices of preset sectors are determined
 exogeneously. They are know from the start of the simulation and are not affected by the
-simulation. 
+simulation.
 
 Preset sectors are defined in :py:class:`~muse.sectors.PresetSector`.
 
@@ -719,7 +719,7 @@ The following attributes are accepted:
 
 *timeslice_shares_path*
    Incompatible with :ref:`consumption_path<preset-consumption>` or
-   :ref:`demand_path<preset-demand>`. Optional csv file giving shares per timeslice. 
+   :ref:`demand_path<preset-demand>`. Optional csv file giving shares per timeslice.
    The timeslice share definition needs to have a consistent number of timeslices as the
    sectoral level time slices.
    Requires
@@ -740,7 +740,7 @@ Legacy Sectors
 --------------
 
 Legacy sectors wrap sectors developed for a previous version of MUSE to the open-source
-version. 
+version.
 
 Preset sectors are defined in :py:class:`~muse.sectors.PresetSector`.
 
@@ -787,4 +787,4 @@ itself can use the following attributes.
    Path to a technodata CSV file. See. :ref:`inputs-technodata`.
 
 *output_path*
-   Path to a diretory where the sector will write output files.
\ No newline at end of file
+   Path to a diretory where the sector will write output files.
diff --git a/docs/inputs/toml_primer.rst b/docs/inputs/toml_primer.rst
index 3484b8f3..7a1669ab 100644
--- a/docs/inputs/toml_primer.rst
+++ b/docs/inputs/toml_primer.rst
@@ -80,4 +80,4 @@ cwd
    refers to the directory from which the muse simulation is launched
 
 muse_sectors
-   refers to the directory where default sectoral data is located
\ No newline at end of file
+   refers to the directory where default sectoral data is located
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 40b09314..0efeb5e0 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -35,4 +35,4 @@ The :ref:`developers` method should only by used by developers, i.e. those who w
    standalone-muse
    pipx-based
    virtual-env-based
-   developers
\ No newline at end of file
+   developers
diff --git a/docs/installation/virtual-env-based.rst b/docs/installation/virtual-env-based.rst
index 0fbe3a79..f30b4f5d 100644
--- a/docs/installation/virtual-env-based.rst
+++ b/docs/installation/virtual-env-based.rst
@@ -96,4 +96,4 @@ Regardless of the method used, **once it has been created and activated**, you c
 
     python -m pip install muse-os
 
-And then use it by invoking ``muse`` with the relevant input arguments. Keep in mind that, contrary to using ``pipx``, in this case **you will need to manually activate the environment every time you want to use MUSE**.
\ No newline at end of file
+And then use it by invoking ``muse`` with the relevant input arguments. Keep in mind that, contrary to using ``pipx``, in this case **you will need to manually activate the environment every time you want to use MUSE**.
diff --git a/docs/muse-components.rst b/docs/muse-components.rst
index 974aece2..8a00bd90 100644
--- a/docs/muse-components.rst
+++ b/docs/muse-components.rst
@@ -36,7 +36,7 @@ Each of the technologies are placed in their regions of interest, such as the US
 
 * Capital costs
 
-* Fixed costs 
+* Fixed costs
 
 * Maximum capacity limit
 
@@ -53,7 +53,7 @@ Technologies, and their parameters are defined in the Technodata.csv file. For a
 Sectors
 -------
 
-Sectors typically group areas of economic activity together, such as the residential sector, which might include all energy conusming activies of households. Possible examples of sectors are: 
+Sectors typically group areas of economic activity together, such as the residential sector, which might include all energy conusming activies of households. Possible examples of sectors are:
 
 - Gas sector
 
@@ -61,16 +61,16 @@ Sectors typically group areas of economic activity together, such as the residen
 
 - Residential sector
 
-- Industrial sector 
+- Industrial sector
 
 Each of these sectors contain their respective technologies which consume energy commodities. For example, the residential sector may consume electricity, gas or oil for a variety of different energy demands such as lighting, cooking and heating.
 
-Each of the technologies, which consume a commodity, also output a different commodity or service. For example, a gas boiler consumes gas, but outputs heat and hot water. 
+Each of the technologies, which consume a commodity, also output a different commodity or service. For example, a gas boiler consumes gas, but outputs heat and hot water.
 
 Agents
 ------
 
-Agents represent the investment decision makers in an energy system, for example consumers or companies. They invest in technologies that meet service demands, like heating, or produce other needed energy commodities, like electricity. These agents can be heterogenous, meaning that their investment priorities have the ability to differ. 
+Agents represent the investment decision makers in an energy system, for example consumers or companies. They invest in technologies that meet service demands, like heating, or produce other needed energy commodities, like electricity. These agents can be heterogenous, meaning that their investment priorities have the ability to differ.
 
 As an example, a generation company could compare potential power generators based on their levelized cost of electricity, their net present value, by minimising the total capital cost, a mixture of these and/or any user-defined approach. This approach more closely matches the behaviour of real-life agents in the energy market, where companies, or people, have different priorities and constraints.
 
@@ -82,6 +82,3 @@ The market clearing algorithm (MCA) is the central component between the differe
 For a hypothetical example, the price of electricity is set in a first iteration to $70/MWh. However, at this price, the majority of residential agents prefer to heat their homes using gas. As a result of this, residential agents consume less electricity and more gas. This reduction in demand reduces the electricity price to $50/MWh in the second iteration. However, at this lower electricity price, some agents decide to invest in electric heating as opposed to gas. Eventually, the price converges on $60/MWh, where supply and demand for both electricity and gas are equal.
 
 This is the principle of the MCA. It finds an equilibrium by iterating through each of the different sectors until an overall equilibrium is reached for each of the commodities. It is possible to run the MCA in a carbon budget mode, as well as exogenous mode. The carbon budget mode ensures that an endogenous carbon price is calculated to limit the emissions of the energy system to be below a user-defined value. Whereas, the exogenous mode allows the carbon price to be set by the user.
-
-
-
diff --git a/docs/overview.rst b/docs/overview.rst
index 11172646..934ab879 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -18,16 +18,16 @@ There are a huge number of ways that MUSE could be used. The energy field is var
 
 .. #. **Market clearing algorithm** is the algorithm which determines global commodity prices based upon the balancing of supply and demand from each of the sectors. It must be noted, however, that only the conversion and supply sectors are able to modify prices; the demand sectors are price-takers, and so do not modify prices.
 
-.. #. **Equilibrium prices** are the prices determined by the market clearing algorithm and can determine the investments made by agents in various sectors. This allows for the model to project how the system may develop over a time period. 
+.. #. **Equilibrium prices** are the prices determined by the market clearing algorithm and can determine the investments made by agents in various sectors. This allows for the model to project how the system may develop over a time period.
 
 .. These features are described in more detail in the rest of this documentation.
 
 .. What is MUSE?
 .. -------------
 
-MUSE is an open source agent-based modelling environment that can be used to simulate change in an energy system over time. An example of the type of question MUSE can help in answering is: 
+MUSE is an open source agent-based modelling environment that can be used to simulate change in an energy system over time. An example of the type of question MUSE can help in answering is:
 
-- How may a carbon budget affect investments made in the power sector over the next 30 years? 
+- How may a carbon budget affect investments made in the power sector over the next 30 years?
 
 MUSE can incorporate residential, power, industrial and conversion sectors, meaning many questions can be explored using MUSE, as per the wishes of the user.
 
@@ -38,19 +38,19 @@ MUSE is technology rich and can model energy production, conversion and end-use
 Every sector is a user configurable module. This means that a user can configure any number of sectors, cointaining custom, user-defined technologies and commodities. MUSE is fully data-driven, meaning that the configuration of the model is carried out using a selection of :ref:`input-files`. This means that you are able to customise MUSE to your wishes by modifying these input files. Within a benchmark year, MUSE allows for a user-defined temporal granularity. This allows for the benchmark year to be split into different seasons and times, where energy demand may differ. Thus allowing us to model diurnal peaks in the demand, varying weekly and seasonally.
 
 
-MUSE is highly configurable, but it has been built with medium and long-term scenarios in mind; for the short-term, MUSE can be linked with more detailed models. As the number of time steps and regions increase, the computational time also increases, which is something to keep in mind when building highly complex models. 
+MUSE is highly configurable, but it has been built with medium and long-term scenarios in mind; for the short-term, MUSE can be linked with more detailed models. As the number of time steps and regions increase, the computational time also increases, which is something to keep in mind when building highly complex models.
 
 .. MUSE differs from the vast majority of energy systems models, which are intertemporal optimisation, by allowing agents to have "limited foresight". This enables these agents to invest under uncertainty of the future, as in the real world. In addition, MUSE is a "partial equilibrium" model, in the sense that it balances supply and demand of each energy commodity in the system.
 
 
-Most energy systems models are based on cost optimisation and assume that all actors choose the cheapest available options. MUSE, however, uses a simulation framework which allows for the modelling of each sector according to the specific drivers triggering new investments in the sector. Despite the heterogeneity of these sectors, they interact with each other via the partial equilibrium approach which balances supply and demand of each commodity in the energy system. 
+Most energy systems models are based on cost optimisation and assume that all actors choose the cheapest available options. MUSE, however, uses a simulation framework which allows for the modelling of each sector according to the specific drivers triggering new investments in the sector. Despite the heterogeneity of these sectors, they interact with each other via the partial equilibrium approach which balances supply and demand of each commodity in the energy system.
 
 As opposed to the majority of energy systems models, which assume that investors have full knowledge of future changes in the energy system across decades (intertemporal optimisation), MUSE uses a limited foresight approach. This allows a user to define a configurable number of years over which the investors have knowledge of future commodity prices and demand. This more closely models the real-life case, we believe.
 
 What questions can MUSE answer?
 -------------------------------
 
-MUSE allows for users to investigate how an energy system may evolve over a time period, based upon investors using different decision metrics or objectives such as the `net present value <https://en.wikipedia.org/wiki/Net_present_value>`_, `levelized cost of electricity <https://en.wikipedia.org/wiki/Levelized_cost_of_energy>`_ or a custom-defined function. In addition to this, it can simulate how investors search for technology options, and how different objectives are combined to reach an investment decision. 
+MUSE allows for users to investigate how an energy system may evolve over a time period, based upon investors using different decision metrics or objectives such as the `net present value <https://en.wikipedia.org/wiki/Net_present_value>`_, `levelized cost of electricity <https://en.wikipedia.org/wiki/Levelized_cost_of_energy>`_ or a custom-defined function. In addition to this, it can simulate how investors search for technology options, and how different objectives are combined to reach an investment decision.
 
 The search for new technologies can depend on several factors such as agents' budgets, technology maturity or preferences on the fuel-type. For instance, an investor in the power sector may decide that they want to focus on renewable energy, whereas another may prefer the perceived most profitable option.
 
@@ -62,13 +62,13 @@ Examples of the questions MUSE can answer include:
 
 - How might a carbon tax impact investments made in the power sector?
 
-.. Of course, these are just three examples and the questions that can be answered in the energy field are diverse and varied. 
+.. Of course, these are just three examples and the questions that can be answered in the energy field are diverse and varied.
 
 
 What are MUSE's unique features?
 --------------------------------
 
-MUSE is a generalisable agent-based modelling environment and simulates energy transitions from the point of view of the investor and consumer agents. This means that users can define their own agents based upon their needs. The fact that MUSE is an agent-based model means that each of these agents can have different investment behaviours. 
+MUSE is a generalisable agent-based modelling environment and simulates energy transitions from the point of view of the investor and consumer agents. This means that users can define their own agents based upon their needs. The fact that MUSE is an agent-based model means that each of these agents can have different investment behaviours.
 
 Additionally, agent-based models allow for agents to model imperfect information and limited foresight. An example of limited foresight is the ability to model the uncertainty residential users face when predicting the price of gas over the next 25 years. An example of imperfection information is that the technologies that agents invest in are tailored to represent the agents' attitude towards novel technologies and might not include all the technologies available. This is a unique feature to agent-based models when compared to intertemporal optimisation models and more closely models the real world. Many energy systems models are intertemporal optimisation models, which consider the viewpoint of a single benevolent decision maker, with perfect foresight and knowledge. These models optimise energy system investment and operation.
 
@@ -76,7 +76,7 @@ Whilst such intertemporal optimisation models are certainly useful, MUSE is diff
 
 MUSE is completely open source, and ready for development.
 
-Visualisation of MUSE 
+Visualisation of MUSE
 ---------------------
 
 .. image:: figures/MUSE-diagram-carbon-budget-colour.png
@@ -158,4 +158,3 @@ This whole process repeats itself at every timestep until the specified number o
         first -> invFirst [style=invis]
         second -> invSecond [style=invis]
     }
-
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7155829f..1e975dc8 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,6 +1,6 @@
 setuptools
 wheel
-pip 
+pip
 sphinx==5.0.2
 ipykernel
 nbsphinx
diff --git a/docs/tutorial-code/0-new-decision-metric/input/BaseYearExport.csv b/docs/tutorial-code/0-new-decision-metric/input/BaseYearExport.csv
index db26b072..38c886d3 100644
--- a/docs/tutorial-code/0-new-decision-metric/input/BaseYearExport.csv
+++ b/docs/tutorial-code/0-new-decision-metric/input/BaseYearExport.csv
@@ -18,4 +18,4 @@ R1,Exports,2080,0,0,0,0,0,0
 R1,Exports,2085,0,0,0,0,0,0
 R1,Exports,2090,0,0,0,0,0,0
 R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/input/BaseYearImport.csv b/docs/tutorial-code/0-new-decision-metric/input/BaseYearImport.csv
index 80c35faf..9c9cc695 100644
--- a/docs/tutorial-code/0-new-decision-metric/input/BaseYearImport.csv
+++ b/docs/tutorial-code/0-new-decision-metric/input/BaseYearImport.csv
@@ -18,4 +18,4 @@ R1,Imports,2080,0,0,0,0,0,0
 R1,Imports,2085,0,0,0,0,0,0
 R1,Imports,2090,0,0,0,0,0,0
 R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/input/Projections.csv b/docs/tutorial-code/0-new-decision-metric/input/Projections.csv
index 93957f45..6a013889 100644
--- a/docs/tutorial-code/0-new-decision-metric/input/Projections.csv
+++ b/docs/tutorial-code/0-new-decision-metric/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index cd7728b4..077b2dd1 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -56,7 +56,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -64,10 +64,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -88,7 +88,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -108,7 +108,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv b/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv
index 3829f2b5..a6cfbe9f 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv
@@ -1,3 +1,3 @@
 AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
 Agent1,A1,1,R1,LCOE,EAC,NPV,1,,,TRUE,TRUE,FALSE,all,median_objective,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,EAC,NPV,1,,,TRUE,TRUE,FALSE,all,median_objective,1,-1,inf,Retrofit
\ No newline at end of file
+Agent2,A1,2,R1,LCOE,EAC,NPV,1,,,TRUE,TRUE,FALSE,all,median_objective,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
index 6d651052..57f66da8 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv b/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv
index 70a6fc0a..b1a8d48f 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
 gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
 windturbine,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,2020,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/0-new-decision-metric/technodata/power/ExistingCapacity.csv
index 01525b3e..56b7b1fc 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
index 299ede02..de511a38 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_ex
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
index 09055e19..6d2c3cb3 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearExport.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearExport.csv
index db26b072..38c886d3 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearExport.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearExport.csv
@@ -18,4 +18,4 @@ R1,Exports,2080,0,0,0,0,0,0
 R1,Exports,2085,0,0,0,0,0,0
 R1,Exports,2090,0,0,0,0,0,0
 R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearImport.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearImport.csv
index 80c35faf..9c9cc695 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearImport.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/input/BaseYearImport.csv
@@ -18,4 +18,4 @@ R1,Imports,2080,0,0,0,0,0,0
 R1,Imports,2085,0,0,0,0,0,0
 R1,Imports,2090,0,0,0,0,0,0
 R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/input/Projections.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/input/Projections.csv
index 93957f45..6a013889 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/input/Projections.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index b44ce43e..18edad41 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -63,10 +63,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -87,7 +87,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -107,7 +107,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
index 6d651052..57f66da8 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv
index 70a6fc0a..b1a8d48f 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
 gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
 windturbine,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,2020,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/ExistingCapacity.csv
index 01525b3e..56b7b1fc 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
index 299ede02..de511a38 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_ex
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
index 09055e19..6d2c3cb3 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearExport.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearExport.csv
index db26b072..38c886d3 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearExport.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearExport.csv
@@ -18,4 +18,4 @@ R1,Exports,2080,0,0,0,0,0,0
 R1,Exports,2085,0,0,0,0,0,0
 R1,Exports,2090,0,0,0,0,0,0
 R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearImport.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearImport.csv
index 80c35faf..9c9cc695 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearImport.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/input/BaseYearImport.csv
@@ -18,4 +18,4 @@ R1,Imports,2080,0,0,0,0,0,0
 R1,Imports,2085,0,0,0,0,0,0
 R1,Imports,2090,0,0,0,0,0,0
 R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/input/Projections.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/input/Projections.csv
index 93957f45..6a013889 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/input/Projections.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 271604e7..48ca2828 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -54,7 +54,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -62,10 +62,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -85,7 +85,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -105,7 +105,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
index 6d651052..57f66da8 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommIn.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommIn.csv
index 38cc10d0..7fe44c8a 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommIn.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
 windturbine,R1,2020,fixed,0,0,0,0,1,0
 windturbine,R1,2040,fixed,0,0,0,0,1,0
 solarPV,R1,2020,fixed,0,0,0,0,0,1
-solarPV,R1,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R1,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv
index 64f4bbba..0960c997 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
 windturbine,R1,2020,fixed,1,0,0,0,0,0
 windturbine,R1,2040,fixed,1,0,0,0,0,0
 solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/ExistingCapacity.csv
index 01525b3e..56b7b1fc 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
index a0e9db37..39be7e0b 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
index baf3d806..1433a48a 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearExport.csv
index db26b072..38c886d3 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearExport.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearExport.csv
@@ -18,4 +18,4 @@ R1,Exports,2080,0,0,0,0,0,0
 R1,Exports,2085,0,0,0,0,0,0
 R1,Exports,2090,0,0,0,0,0,0
 R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearImport.csv
index 80c35faf..9c9cc695 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearImport.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearImport.csv
@@ -18,4 +18,4 @@ R1,Imports,2080,0,0,0,0,0,0
 R1,Imports,2085,0,0,0,0,0,0
 R1,Imports,2090,0,0,0,0,0,0
 R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/Projections.csv
index 93957f45..6a013889 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/Projections.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index 5ceb2830..5c7052d6 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -56,7 +56,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -64,10 +64,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -87,7 +87,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -107,7 +107,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
index 6d651052..57f66da8 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommIn.csv
index 38cc10d0..7fe44c8a 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommIn.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
 windturbine,R1,2020,fixed,0,0,0,0,1,0
 windturbine,R1,2040,fixed,0,0,0,0,1,0
 solarPV,R1,2020,fixed,0,0,0,0,0,1
-solarPV,R1,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R1,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommOut.csv
index 64f4bbba..0960c997 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommOut.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
 windturbine,R1,2020,fixed,1,0,0,0,0,0
 windturbine,R1,2040,fixed,1,0,0,0,0,0
 solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/ExistingCapacity.csv
index 01525b3e..56b7b1fc 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
index a0e9db37..39be7e0b 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv
index ec64670b..405e9f79 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv
@@ -2,4 +2,4 @@ AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1
 Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,1,R1,LCOE,EAC,,0.75,0.25,,TRUE,,,all,weighted_sum,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,EAC,,0.75,0.25,,TRUE,,,all,weighted_sum,0.5,-1,inf,Retrofit
\ No newline at end of file
+Agent4,A2,2,R1,LCOE,EAC,,0.75,0.25,,TRUE,,,all,weighted_sum,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
index c69738c3..4bbd17fe 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearExport.csv
index db26b072..38c886d3 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearExport.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearExport.csv
@@ -18,4 +18,4 @@ R1,Exports,2080,0,0,0,0,0,0
 R1,Exports,2085,0,0,0,0,0,0
 R1,Exports,2090,0,0,0,0,0,0
 R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearImport.csv
index 80c35faf..9c9cc695 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearImport.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearImport.csv
@@ -18,4 +18,4 @@ R1,Imports,2080,0,0,0,0,0,0
 R1,Imports,2085,0,0,0,0,0,0
 R1,Imports,2090,0,0,0,0,0,0
 R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/2-single-objective/input/Projections.csv
index 93957f45..6a013889 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/input/Projections.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index 6f86a60f..3694f2e4 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -63,10 +63,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -87,7 +87,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -107,7 +107,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
index 6d651052..57f66da8 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommIn.csv
index 38cc10d0..7fe44c8a 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommIn.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
 windturbine,R1,2020,fixed,0,0,0,0,1,0
 windturbine,R1,2040,fixed,0,0,0,0,1,0
 solarPV,R1,2020,fixed,0,0,0,0,0,1
-solarPV,R1,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R1,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommOut.csv
index 64f4bbba..0960c997 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommOut.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
 windturbine,R1,2020,fixed,1,0,0,0,0,0
 windturbine,R1,2040,fixed,1,0,0,0,0,0
 solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/ExistingCapacity.csv
index 01525b3e..56b7b1fc 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
index a0e9db37..39be7e0b 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
@@ -5,4 +5,4 @@ gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv
index aa5a1633..b3d025a3 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv
@@ -2,4 +2,4 @@ AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1
 Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
\ No newline at end of file
+Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
index c69738c3..4bbd17fe 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/3-add-region/input/BaseYearExport.csv b/docs/tutorial-code/3-add-region/input/BaseYearExport.csv
index 3bc5687d..d5d66ba2 100644
--- a/docs/tutorial-code/3-add-region/input/BaseYearExport.csv
+++ b/docs/tutorial-code/3-add-region/input/BaseYearExport.csv
@@ -37,4 +37,4 @@ R2,Exports,2080,0,0,0,0,0,0
 R2,Exports,2085,0,0,0,0,0,0
 R2,Exports,2090,0,0,0,0,0,0
 R2,Exports,2095,0,0,0,0,0,0
-R2,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R2,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/input/BaseYearImport.csv b/docs/tutorial-code/3-add-region/input/BaseYearImport.csv
index 51e7df0e..eb064aa9 100644
--- a/docs/tutorial-code/3-add-region/input/BaseYearImport.csv
+++ b/docs/tutorial-code/3-add-region/input/BaseYearImport.csv
@@ -37,4 +37,4 @@ R2,Imports,2080,0,0,0,0,0,0
 R2,Imports,2085,0,0,0,0,0,0
 R2,Imports,2090,0,0,0,0,0,0
 R2,Imports,2095,0,0,0,0,0,0
-R2,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R2,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/input/Projections.csv b/docs/tutorial-code/3-add-region/input/Projections.csv
index 9aecd458..dd25bbad 100644
--- a/docs/tutorial-code/3-add-region/input/Projections.csv
+++ b/docs/tutorial-code/3-add-region/input/Projections.csv
@@ -37,4 +37,4 @@ R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/3-add-region/settings.toml b/docs/tutorial-code/3-add-region/settings.toml
index 4789381b..66efcde9 100644
--- a/docs/tutorial-code/3-add-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/settings.toml
@@ -54,7 +54,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -62,10 +62,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -86,7 +86,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -106,7 +106,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/3-add-region/technodata/Agents.csv b/docs/tutorial-code/3-add-region/technodata/Agents.csv
index e5cdf7de..3050e067 100644
--- a/docs/tutorial-code/3-add-region/technodata/Agents.csv
+++ b/docs/tutorial-code/3-add-region/technodata/Agents.csv
@@ -2,4 +2,4 @@ AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1
 Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
\ No newline at end of file
+Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv b/docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv
index 8a96d57e..913d062f 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,0,0,0,0
-gassupply1,R2,2020,fixed,0,0,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv b/docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv
index f05a0c2a..bb45c4b4 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv
index c83a5f0d..8142f5e5 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
-gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
\ No newline at end of file
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv b/docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv
index f0129aef..f7d15839 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/3-add-region/technodata/power/CommIn.csv b/docs/tutorial-code/3-add-region/technodata/power/CommIn.csv
index e216b2ad..b5ca96ca 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/3-add-region/technodata/power/CommIn.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
 windturbine,R2,2020,fixed,0,0,0,0,1,0
 windturbine,R2,2040,fixed,0,0,0,0,1,0
 solarPV,R2,2020,fixed,0,0,0,0,0,1
-solarPV,R2,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/3-add-region/technodata/power/CommOut.csv b/docs/tutorial-code/3-add-region/technodata/power/CommOut.csv
index 6487f128..7edb7454 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/technodata/power/CommOut.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
 windturbine,R2,2020,fixed,1,0,0,0,0,0
 windturbine,R2,2040,fixed,1,0,0,0,0,0
 solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv
index 4f23b6b2..15edcaec 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv
@@ -4,4 +4,4 @@ windturbine,R1,PJ/y,0,0,0,0,0,0,0
 solarPV,R1,PJ/y,0,0,0,0,0,0,0
 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
 windturbine,R2,PJ/y,0,0,0,0,0,0,0
-solarPV,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/technodata/power/Technodata.csv
index de73d4db..53c509d2 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/technodata/power/Technodata.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv
index cfa3ea8f..83278025 100644
--- a/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv
@@ -10,4 +10,4 @@
 2,R2,gasboiler,3,0,0,1,0,0
 3,R2,gasboiler,4,0,0,1.5,0,0
 4,R2,gasboiler,5,0,0,3,0,0
-5,R2,gasboiler,6,0,0,2,0,0
\ No newline at end of file
+5,R2,gasboiler,6,0,0,2,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv
index 6269b4a2..bd084a5c 100644
--- a/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv
@@ -10,4 +10,4 @@
 2,R2,gasboiler,3,0,0,3,0,0
 3,R2,gasboiler,4,0,0,4.5,0,0
 4,R2,gasboiler,5,0,0,9,0,0
-5,R2,gasboiler,6,0,0,6,0,0
\ No newline at end of file
+5,R2,gasboiler,6,0,0,6,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv b/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv
index e01eebc1..1a179abe 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv
+++ b/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv
@@ -6,4 +6,4 @@ Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
\ No newline at end of file
+Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv b/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv
index a2d6db4a..50e0921c 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,1.16,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0
 gasboiler,R2,2020,fixed,0,1.16,0,0,0
-heatpump,R2,2020,fixed,0.4,0,0,0,0
\ No newline at end of file
+heatpump,R2,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv b/docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv
index 8411c859..4fac2bf4 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,0,1,64.71,0
 heatpump,R1,2020,fixed,0,0,1,0,0
 gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
\ No newline at end of file
+heatpump,R2,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv
index 45fa693c..9c70c6f0 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasboiler,R1,PJ/y,10,5,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasboiler,R2,PJ/y,10,5,0,0,0,0,0
-heatpump,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv b/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv
index 403fc9f4..23529b2d 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
 heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
 gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
\ No newline at end of file
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv
index 3bc5687d..d5d66ba2 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv
@@ -37,4 +37,4 @@ R2,Exports,2080,0,0,0,0,0,0
 R2,Exports,2085,0,0,0,0,0,0
 R2,Exports,2090,0,0,0,0,0,0
 R2,Exports,2095,0,0,0,0,0,0
-R2,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R2,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv
index 51e7df0e..eb064aa9 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv
@@ -37,4 +37,4 @@ R2,Imports,2080,0,0,0,0,0,0
 R2,Imports,2085,0,0,0,0,0,0
 R2,Imports,2090,0,0,0,0,0,0
 R2,Imports,2095,0,0,0,0,0,0
-R2,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R2,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv
index 9aecd458..dd25bbad 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv
@@ -37,4 +37,4 @@ R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index eebb99ed..b7093c8e 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -63,10 +63,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -87,7 +87,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -107,7 +107,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
index e5cdf7de..3050e067 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
@@ -2,4 +2,4 @@ AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1
 Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
\ No newline at end of file
+Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv
index 8a96d57e..913d062f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,0,0,0,0
-gassupply1,R2,2020,fixed,0,0,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
index f05a0c2a..bb45c4b4 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv
index c83a5f0d..8142f5e5 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
-gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
\ No newline at end of file
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
index f0129aef..f7d15839 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv
index e216b2ad..b5ca96ca 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
 windturbine,R2,2020,fixed,0,0,0,0,1,0
 windturbine,R2,2040,fixed,0,0,0,0,1,0
 solarPV,R2,2020,fixed,0,0,0,0,0,1
-solarPV,R2,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
index 6487f128..7edb7454 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
 windturbine,R2,2020,fixed,1,0,0,0,0,0
 windturbine,R2,2040,fixed,1,0,0,0,0,0
 solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv
index 4f23b6b2..15edcaec 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv
@@ -4,4 +4,4 @@ windturbine,R1,PJ/y,0,0,0,0,0,0,0
 solarPV,R1,PJ/y,0,0,0,0,0,0,0
 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
 windturbine,R2,PJ/y,0,0,0,0,0,0,0
-solarPV,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
index de73d4db..53c509d2 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
index a9445278..bce744a6 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
@@ -14,4 +14,4 @@
 4,R2,gasboiler,5,0,0,2.143,0,0
 5,R2,gasboiler,6,0,0,1.429,0,0
 6,R2,gasboiler,7,0,0,1.429,0,0
-7,R2,gasboiler,8,0,0,1.429,0,0
\ No newline at end of file
+7,R2,gasboiler,8,0,0,1.429,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
index ed7c6a67..b79af2c9 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
@@ -14,4 +14,4 @@
 4,R2,gasboiler,5,0,0,6.429,0,0
 5,R2,gasboiler,6,0,0,4.287,0,0
 6,R2,gasboiler,7,0,0,4.287,0,0
-7,R2,gasboiler,8,0,0,4.287,0,0
\ No newline at end of file
+7,R2,gasboiler,8,0,0,4.287,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv
index e01eebc1..1a179abe 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv
@@ -6,4 +6,4 @@ Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
\ No newline at end of file
+Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv
index a2d6db4a..50e0921c 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,1.16,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0
 gasboiler,R2,2020,fixed,0,1.16,0,0,0
-heatpump,R2,2020,fixed,0.4,0,0,0,0
\ No newline at end of file
+heatpump,R2,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
index 8411c859..4fac2bf4 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,0,1,64.71,0
 heatpump,R1,2020,fixed,0,0,1,0,0
 gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
\ No newline at end of file
+heatpump,R2,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv
index 45fa693c..9c70c6f0 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasboiler,R1,PJ/y,10,5,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasboiler,R2,PJ/y,10,5,0,0,0,0,0
-heatpump,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
index 403fc9f4..23529b2d 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
 heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
 gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
\ No newline at end of file
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv
index 3bc5687d..d5d66ba2 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv
@@ -37,4 +37,4 @@ R2,Exports,2080,0,0,0,0,0,0
 R2,Exports,2085,0,0,0,0,0,0
 R2,Exports,2090,0,0,0,0,0,0
 R2,Exports,2095,0,0,0,0,0,0
-R2,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R2,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv
index 51e7df0e..eb064aa9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv
@@ -37,4 +37,4 @@ R2,Imports,2080,0,0,0,0,0,0
 R2,Imports,2085,0,0,0,0,0,0
 R2,Imports,2090,0,0,0,0,0,0
 R2,Imports,2095,0,0,0,0,0,0
-R2,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R2,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv
index 9aecd458..dd25bbad 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv
@@ -37,4 +37,4 @@ R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 166d9183..9c447844 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -54,7 +54,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -62,10 +62,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 2  # Optional, defaults to 5 
+forecast = 2  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -83,10 +83,10 @@ commodities_out = '{path}/technodata/power/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
-forecast = 2  # Optional, defaults to 5 
+forecast = 2  # Optional, defaults to 5
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -104,10 +104,10 @@ commodities_out = '{path}/technodata/gas/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
-forecast = 2  # Optional, defaults to 5 
+forecast = 2  # Optional, defaults to 5
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -115,7 +115,7 @@ interaction = 'transfer'
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-forecast = 2  # Optional, defaults to 5 
+forecast = 2  # Optional, defaults to 5
 consumption_path= "{path}/technodata/preset/*Consumption.csv"
 
 
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
index e5cdf7de..3050e067 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
@@ -2,4 +2,4 @@ AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1
 Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
\ No newline at end of file
+Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv
index 8a96d57e..913d062f 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,0,0,0,0
-gassupply1,R2,2020,fixed,0,0,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
index f05a0c2a..bb45c4b4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv
index c83a5f0d..8142f5e5 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
-gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
\ No newline at end of file
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
index f0129aef..f7d15839 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv
index e216b2ad..b5ca96ca 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
 windturbine,R2,2020,fixed,0,0,0,0,1,0
 windturbine,R2,2040,fixed,0,0,0,0,1,0
 solarPV,R2,2020,fixed,0,0,0,0,0,1
-solarPV,R2,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
index 6487f128..7edb7454 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
 windturbine,R2,2020,fixed,1,0,0,0,0,0
 windturbine,R2,2040,fixed,1,0,0,0,0,0
 solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv
index 4f23b6b2..15edcaec 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv
@@ -4,4 +4,4 @@ windturbine,R1,PJ/y,0,0,0,0,0,0,0
 solarPV,R1,PJ/y,0,0,0,0,0,0,0
 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
 windturbine,R2,PJ/y,0,0,0,0,0,0,0
-solarPV,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index e9494549..4958747b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.2,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
index a9445278..bce744a6 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
@@ -14,4 +14,4 @@
 4,R2,gasboiler,5,0,0,2.143,0,0
 5,R2,gasboiler,6,0,0,1.429,0,0
 6,R2,gasboiler,7,0,0,1.429,0,0
-7,R2,gasboiler,8,0,0,1.429,0,0
\ No newline at end of file
+7,R2,gasboiler,8,0,0,1.429,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
index ed7c6a67..b79af2c9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
@@ -14,4 +14,4 @@
 4,R2,gasboiler,5,0,0,6.429,0,0
 5,R2,gasboiler,6,0,0,4.287,0,0
 6,R2,gasboiler,7,0,0,4.287,0,0
-7,R2,gasboiler,8,0,0,4.287,0,0
\ No newline at end of file
+7,R2,gasboiler,8,0,0,4.287,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv
index e01eebc1..1a179abe 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv
@@ -6,4 +6,4 @@ Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
\ No newline at end of file
+Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv
index a2d6db4a..50e0921c 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,1.16,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0
 gasboiler,R2,2020,fixed,0,1.16,0,0,0
-heatpump,R2,2020,fixed,0.4,0,0,0,0
\ No newline at end of file
+heatpump,R2,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
index 8411c859..4fac2bf4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,0,1,64.71,0
 heatpump,R1,2020,fixed,0,0,1,0,0
 gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
\ No newline at end of file
+heatpump,R2,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv
index 45fa693c..9c70c6f0 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasboiler,R1,PJ/y,10,5,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasboiler,R2,PJ/y,10,5,0,0,0,0,0
-heatpump,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 403fc9f4..23529b2d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
 heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
 gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
\ No newline at end of file
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv b/docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv
index 54e69d97..35070fbe 100644
--- a/docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv
+++ b/docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv
@@ -37,4 +37,4 @@ R2,Exports,2080,0,0,0,0,0,0,0
 R2,Exports,2085,0,0,0,0,0,0,0
 R2,Exports,2090,0,0,0,0,0,0,0
 R2,Exports,2095,0,0,0,0,0,0,0
-R2,Exports,2100,0,0,0,0,0,0,0
\ No newline at end of file
+R2,Exports,2100,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv b/docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv
index d9dfeee5..d7a9581b 100644
--- a/docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv
+++ b/docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv
@@ -37,4 +37,4 @@ R2,Imports,2080,0,0,0,0,0,0,0
 R2,Imports,2085,0,0,0,0,0,0,0
 R2,Imports,2090,0,0,0,0,0,0,0
 R2,Imports,2095,0,0,0,0,0,0,0
-R2,Imports,2100,0,0,0,0,0,0,0
\ No newline at end of file
+R2,Imports,2100,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv b/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv
index bb0e70e5..9cd98111 100644
--- a/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv
@@ -5,4 +5,4 @@ Heat,Energy,heat,0,1,PJ
 Wind,Energy,wind,0,1,PJ
 CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
 Solar,Energy,solar,0,1,PJ
-Cook,Energy,cook,0,1,PJ
\ No newline at end of file
+Cook,Energy,cook,0,1,PJ
diff --git a/docs/tutorial-code/5-add-service-demand/input/Projections.csv b/docs/tutorial-code/5-add-service-demand/input/Projections.csv
index 5ffe8650..cfa76100 100644
--- a/docs/tutorial-code/5-add-service-demand/input/Projections.csv
+++ b/docs/tutorial-code/5-add-service-demand/input/Projections.csv
@@ -37,4 +37,4 @@ R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
 R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
 R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
 R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
-R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
\ No newline at end of file
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
diff --git a/docs/tutorial-code/5-add-service-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/settings.toml
index 36a90145..af39c8a9 100644
--- a/docs/tutorial-code/5-add-service-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/settings.toml
@@ -56,7 +56,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -64,10 +64,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -87,7 +87,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -107,7 +107,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv
index e5cdf7de..3050e067 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv
@@ -2,4 +2,4 @@ AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1
 Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
\ No newline at end of file
+Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv b/docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv
index 8a96d57e..913d062f 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,0,0,0,0
-gassupply1,R2,2020,fixed,0,0,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv
index f05a0c2a..bb45c4b4 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv
index c83a5f0d..8142f5e5 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
-gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
\ No newline at end of file
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv
index f0129aef..f7d15839 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv b/docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv
index e216b2ad..b5ca96ca 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
 windturbine,R2,2020,fixed,0,0,0,0,1,0
 windturbine,R2,2040,fixed,0,0,0,0,1,0
 solarPV,R2,2020,fixed,0,0,0,0,0,1
-solarPV,R2,2040,fixed,0,0,0,0,0,1
\ No newline at end of file
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv b/docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv
index 6487f128..7edb7454 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
 windturbine,R2,2020,fixed,1,0,0,0,0,0
 windturbine,R2,2040,fixed,1,0,0,0,0,0
 solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv
index 4f23b6b2..15edcaec 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv
@@ -4,4 +4,4 @@ windturbine,R1,PJ/y,0,0,0,0,0,0,0
 solarPV,R1,PJ/y,0,0,0,0,0,0,0
 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
 windturbine,R2,PJ/y,0,0,0,0,0,0,0
-solarPV,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv
index 57ca7b6a..e47e0d75 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,en
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv
index 9f45bc72..2d6ab112 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv
@@ -14,4 +14,4 @@
 4,R2,gasboiler,5,0,0,2.143,0,0,2.143
 5,R2,gasboiler,6,0,0,1.429,0,0,1.429
 6,R2,gasboiler,7,0,0,1.429,0,0,1.429
-7,R2,gasboiler,8,0,0,1.429,0,0,1.429
\ No newline at end of file
+7,R2,gasboiler,8,0,0,1.429,0,0,1.429
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv
index be7bd5ed..a4f178dd 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv
@@ -14,4 +14,4 @@
 4,R2,gasboiler,5,0,0,6.429,0,0,5.143
 5,R2,gasboiler,6,0,0,4.287,0,0,3.43
 6,R2,gasboiler,7,0,0,4.287,0,0,3.43
-7,R2,gasboiler,8,0,0,4.287,0,0,3.43
\ No newline at end of file
+7,R2,gasboiler,8,0,0,4.287,0,0,3.43
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv
index e01eebc1..1a179abe 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv
@@ -6,4 +6,4 @@ Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
 Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
 Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
\ No newline at end of file
+Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv
index 00bc6492..91ff0a40 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv
@@ -7,4 +7,4 @@ heatpump,R2,2020,fixed,0.4,0,0,0,0,0
 estove,R1,2020,fixed,0.36,0,0,0,0,0
 gasstove,R1,2020,fixed,0,1,0,0,0,0
 estove,R2,2020,fixed,0.36,0,0,0,0,0
-gasstove,R2,2020,fixed,0,1,0,0,0,0
\ No newline at end of file
+gasstove,R2,2020,fixed,0,1,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv
index a8d284f3..80c7e904 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv
@@ -7,4 +7,4 @@ heatpump,R2,2020,fixed,0,0,1,0,0,0
 estove,R1,2020,fixed,0,0,0,0,0,1
 gasstove,R1,2020,fixed,0,0,0,50,0,1
 estove,R2,2020,fixed,0,0,0,0,0,1
-gasstove,R2,2020,fixed,0,0,0,50,0,1
\ No newline at end of file
+gasstove,R2,2020,fixed,0,0,0,50,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv
index 2cb19f07..7d9bc45e 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv
@@ -6,4 +6,4 @@ heatpump,R2,PJ/y,0,0,0,0,0,0,0
 gasstove,R1,PJ/y,10,5,0,0,0,0,0
 estove,R1,PJ/y,0,0,0,0,0,0,0
 gasstove,R2,PJ/y,10,5,0,0,0,0,0
-estove,R2,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+estove,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv
index 39549ee3..b0aeaa39 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv
@@ -7,4 +7,4 @@ heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,ener
 estove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,0.5,0.5
 gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,0.5,0.5
 estove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,0.5,0.5
-gasstove,R2,2020,fixed,8.866666667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,0.5,0.5
\ No newline at end of file
+gasstove,R2,2020,fixed,8.866666667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,0.5,0.5
diff --git a/docs/tutorial-code/6-add-correlation-demand/input/BaseYearExport.csv b/docs/tutorial-code/6-add-correlation-demand/input/BaseYearExport.csv
index db26b072..38c886d3 100644
--- a/docs/tutorial-code/6-add-correlation-demand/input/BaseYearExport.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/input/BaseYearExport.csv
@@ -18,4 +18,4 @@ R1,Exports,2080,0,0,0,0,0,0
 R1,Exports,2085,0,0,0,0,0,0
 R1,Exports,2090,0,0,0,0,0,0
 R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/input/BaseYearImport.csv b/docs/tutorial-code/6-add-correlation-demand/input/BaseYearImport.csv
index 80c35faf..9c9cc695 100644
--- a/docs/tutorial-code/6-add-correlation-demand/input/BaseYearImport.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/input/BaseYearImport.csv
@@ -18,4 +18,4 @@ R1,Imports,2080,0,0,0,0,0,0
 R1,Imports,2085,0,0,0,0,0,0
 R1,Imports,2090,0,0,0,0,0,0
 R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
\ No newline at end of file
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/input/Projections.csv b/docs/tutorial-code/6-add-correlation-demand/input/Projections.csv
index 93957f45..6a013889 100644
--- a/docs/tutorial-code/6-add-correlation-demand/input/Projections.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/settings.toml b/docs/tutorial-code/6-add-correlation-demand/settings.toml
index 3b4646f5..cd129b5b 100644
--- a/docs/tutorial-code/6-add-correlation-demand/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/settings.toml
@@ -57,7 +57,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -65,10 +65,10 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -88,7 +88,7 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -108,7 +108,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/gas/Technodata.csv
index 6d651052..57f66da8 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/power/CommOut.csv
index 70a6fc0a..b1a8d48f 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/power/CommOut.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
 gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
 windturbine,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,2020,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/power/ExistingCapacity.csv
index 01525b3e..56b7b1fc 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv
index 299ede02..de511a38 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_ex
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
\ No newline at end of file
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv
index 07ec142d..23687fb0 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv
@@ -6,4 +6,4 @@ SN,RegionName,electricity,gas,heat,CO2f,wind
 5,R1,0,0,0.214,0,0
 6,R1,0,0,0.143,0,0
 7,R1,0,0,0.143,0,0
-8,R1,0,0,0.143,0,0
\ No newline at end of file
+8,R1,0,0,0.143,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv
index ba4ff85b..d67265e4 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv
@@ -2,4 +2,4 @@ SectorName,FunctionType,Coeff,RegionName,electricity,gas,heat,CO2f
 Residential,logistic-sigmoid,GDPexp,R1,0,0,9.94E-02,0
 Residential,logistic-sigmoid,constant,R1,0,0,1.01039E-05,0
 Residential,logistic-sigmoid,GDPscaleLess,R1,0,0,753.1068725,0
-Residential,logistic-sigmoid,GDPscaleGreater,R1,0,0,672.9316672,0
\ No newline at end of file
+Residential,logistic-sigmoid,GDPscaleGreater,R1,0,0,672.9316672,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv
index 09055e19..6d2c3cb3 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 10cc285b..47f9e8ab 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -48,7 +48,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -56,7 +56,7 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -74,7 +74,7 @@ sink = 'csv'
 overwrite = true
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -137,7 +137,7 @@ keep_columns = [ "timeslice",
                  "hour",
                  "consumption"]
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -164,7 +164,7 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
index 6a39e123..21c1ceea 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
index bb2bad21..e87ff661 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
\ No newline at end of file
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
index ad78f32d..7381e299 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
@@ -11,4 +11,4 @@ windturbine,R1,2020,all-year,all-week,morning,1,1
 windturbine,R1,2020,all-year,all-week,afternoon,1,1
 windturbine,R1,2020,all-year,all-week,early-peak,1,1
 windturbine,R1,2020,all-year,all-week,late-peak,1,1
-windturbine,R1,2020,all-year,all-week,evening,1,1
\ No newline at end of file
+windturbine,R1,2020,all-year,all-week,evening,1,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 53463310..81a011fd 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -47,7 +47,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc" 
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [  # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -55,7 +55,7 @@ constraints = [  # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5 
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -73,7 +73,7 @@ sink = 'csv'
 overwrite = true
 
 
-[[sectors.residential.interactions]] 
+[[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -137,7 +137,7 @@ keep_columns = [ "timeslice",
                  "hour",
                  "consumption"]
 
-[[sectors.power.interactions]] 
+[[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
@@ -164,7 +164,7 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]] 
+[[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
index 6a39e123..21c1ceea 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
index bb2bad21..e87ff661 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
\ No newline at end of file
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
index d95bd3c0..2005515e 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
@@ -11,4 +11,4 @@ windturbine,R1,2020,all-year,all-week,morning,0.5,0
 windturbine,R1,2020,all-year,all-week,afternoon,0.5,0
 windturbine,R1,2020,all-year,all-week,early-peak,1,0
 windturbine,R1,2020,all-year,all-week,late-peak,1,0
-windturbine,R1,2020,all-year,all-week,evening,1,0
\ No newline at end of file
+windturbine,R1,2020,all-year,all-week,evening,1,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv
index 17a0dd3d..a21c49c0 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv
@@ -11,4 +11,4 @@ gasboiler,R1,2020,upper,all-year,all-week,morning,0.9
 gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9
 gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9
 gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
\ No newline at end of file
+gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst
index 0c43f7e7..d4d14de4 100644
--- a/docs/user-guide/index.rst
+++ b/docs/user-guide/index.rst
@@ -3,7 +3,7 @@
 Customising MUSE Tutorials
 ==========================
 
-Next, we show you how to customise MUSE to create your own scenarios. 
+Next, we show you how to customise MUSE to create your own scenarios.
 
 We recommend following the tutorials step by step, as the files build on the previous examples. If you prefer to jump straight in, your results may be different to the ones presented. To help you, we have provided the code to generate the various examples in case you want to compare your code to ours. Links to this code can be found in the table below, in the `Tutorial Information`_ section.
 
@@ -88,4 +88,4 @@ In the table below, you will notice a x2 after some of the technology tuples. Th
       - [gasboiler, heatpump]
       - [gasCCGT, windturbine]
       - [gassuply1]
-      - `[7] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/7-min-max-timeslice-constraints>`_
\ No newline at end of file
+      - `[7] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/7-min-max-timeslice-constraints>`_
diff --git a/src/muse/data/README.md b/src/muse/data/README.md
index 0e61952a..dc48be0d 100644
--- a/src/muse/data/README.md
+++ b/src/muse/data/README.md
@@ -1,5 +1,5 @@
 # Demo examples
-    
+
 ## default
 This is a 3-sector one-region model.
 It contains a residential, conversion, and gas supply sectors.
@@ -7,11 +7,11 @@ The time framework covers 2020-2050.
 It uses 6 timeslices.
 
 ## default_timeslice
-This is developed from the default model. 
+This is developed from the default model.
 Timesliced technodata are given for the power sector.
 
 ## medium
-This is developed from the default model. 
+This is developed from the default model.
 Demand for cooking is added in the residential sector.
 
 ## multiple_agents
@@ -30,6 +30,3 @@ It contains a residential, conversion, and gas supply sectors.
 The regions can trade gas and electricity.
 The time framework covers 2020-2035.
 It uses 6 timeslices.
-
-
-
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index fcbd95e1..06f5bb5f 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy" # Optional, defaults to "adhoc" 
+lpsolver = "scipy" # Optional, defaults to "adhoc"
 constraints = [ # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -63,7 +63,7 @@ constraints = [ # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro" # Optional, default to new_and_retro
-forecast = 5 # Optional, defaults to 5 
+forecast = 5 # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index f34f1e73..ce799f5b 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -57,7 +57,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy" # Optional, defaults to "adhoc" 
+lpsolver = "scipy" # Optional, defaults to "adhoc"
 constraints = [ # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
@@ -65,7 +65,7 @@ constraints = [ # Optional, defaults to the constraints below
     "search_space",
 ]
 demand_share = "new_and_retro" # Optional, default to new_and_retro
-forecast = 5 # Optional, defaults to 5 
+forecast = 5 # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
diff --git a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
index 6a39e123..21c1ceea 100644
--- a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
\ No newline at end of file
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
index bb2bad21..e87ff661 100644
--- a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
\ No newline at end of file
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv b/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv
index 17a0dd3d..a21c49c0 100644
--- a/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv
+++ b/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv
@@ -11,4 +11,4 @@ gasboiler,R1,2020,upper,all-year,all-week,morning,0.9
 gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9
 gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9
 gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
\ No newline at end of file
+gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
diff --git a/src/muse/data/example/medium/input/Projections.csv b/src/muse/data/example/medium/input/Projections.csv
index 8ec7c60d..42f38845 100644
--- a/src/muse/data/example/medium/input/Projections.csv
+++ b/src/muse/data/example/medium/input/Projections.csv
@@ -18,4 +18,4 @@ R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,100
 R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,100
 R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,100
 R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,100
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,100
\ No newline at end of file
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,100
diff --git a/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv b/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv
index b8edcbee..9454e2d1 100644
--- a/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv
+++ b/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv
@@ -4,4 +4,4 @@
 2,R1,gasboiler,3,0,0,0.5,0.5,0,0
 3,R1,gasboiler,4,0,0,0.75,0.75,0,0
 4,R1,gasboiler,5,0,0,1.5,1.5,0,0
-5,R1,gasboiler,6,0,0,1,1,0,0
\ No newline at end of file
+5,R1,gasboiler,6,0,0,1,1,0,0
diff --git a/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv b/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv
index 1349fa09..beb805a7 100644
--- a/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv
+++ b/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv
@@ -4,4 +4,4 @@
 2,R1,gasboiler,3,0,0,1.5,1.5,0,0
 3,R1,gasboiler,4,0,0,2.25,2.25,0,0
 4,R1,gasboiler,5,0,0,4.5,4.5,0,0
-5,R1,gasboiler,6,0,0,3,3,0,0
\ No newline at end of file
+5,R1,gasboiler,6,0,0,3,3,0,0
diff --git a/src/muse/data/example/medium/technodata/residential/CommIn.csv b/src/muse/data/example/medium/technodata/residential/CommIn.csv
index dd271aab..0b1c1ab6 100644
--- a/src/muse/data/example/medium/technodata/residential/CommIn.csv
+++ b/src/muse/data/example/medium/technodata/residential/CommIn.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,1.162790698,0,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0,0
 estove,R1,2020,fixed,0.36,0,0,0,0,0
-gasstove,R1,2020,fixed,0,1,0,0,0,0
\ No newline at end of file
+gasstove,R1,2020,fixed,0,1,0,0,0,0
diff --git a/src/muse/data/example/medium/technodata/residential/CommOut.csv b/src/muse/data/example/medium/technodata/residential/CommOut.csv
index a05a6db6..0ad0e9a5 100644
--- a/src/muse/data/example/medium/technodata/residential/CommOut.csv
+++ b/src/muse/data/example/medium/technodata/residential/CommOut.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,0,1,64.70588235,0,0
 heatpump,R1,2020,fixed,0,0,1,0,0,0
 estove,R1,2020,fixed,0,0,0,50,1,0
-gasstove,R1,2020,fixed,0,0,0,0,1,0
\ No newline at end of file
+gasstove,R1,2020,fixed,0,0,0,0,1,0
diff --git a/src/muse/data/example/medium/technodata/residential/ExistingCapacity.csv b/src/muse/data/example/medium/technodata/residential/ExistingCapacity.csv
index d4093ce2..72b6b1a2 100644
--- a/src/muse/data/example/medium/technodata/residential/ExistingCapacity.csv
+++ b/src/muse/data/example/medium/technodata/residential/ExistingCapacity.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasboiler,R1,PJ/y,10,8,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasstove,R1,PJ/y,10,8,0,0,0,0,0
-estove,R1,PJ/y,0,0,0,0,0,0,0
\ No newline at end of file
+estove,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/src/muse/data/example/medium/technodata/residential/Technodata.csv b/src/muse/data/example/medium/technodata/residential/Technodata.csv
index 2753a164..8070b952 100644
--- a/src/muse/data/example/medium/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/medium/technodata/residential/Technodata.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
 heatpump,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
 estove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
\ No newline at end of file
+gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index bdd80356..fd806b25 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -63,7 +63,7 @@ constraints = [ # Optional, defaults to the constraints below
     "minimum_service",
 ]
 demand_share = "new_and_retro" # Optional, default to new_and_retro
-forecast = 5 # Optional, defaults to 5 
+forecast = 5 # Optional, defaults to 5
 
 [[sectors.industry.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
diff --git a/src/muse/data/example/multiple_agents/residential/Technodata.csv b/src/muse/data/example/multiple_agents/residential/Technodata.csv
index 52341d98..9041d072 100644
--- a/src/muse/data/example/multiple_agents/residential/Technodata.csv
+++ b/src/muse/data/example/multiple_agents/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
\ No newline at end of file
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/src/muse/data/example/trade/technodata/Agents.csv b/src/muse/data/example/trade/technodata/Agents.csv
index 44098b7b..9ff03ce9 100644
--- a/src/muse/data/example/trade/technodata/Agents.csv
+++ b/src/muse/data/example/trade/technodata/Agents.csv
@@ -1,3 +1,3 @@
 AgentShare,Name,RegionName,Objective,ObjData,Objsort,SearchRule,DecisionMethod,MaturityThreshold,Budget,Type
 agent_share,A1,R1,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
-agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
\ No newline at end of file
+agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
diff --git a/src/muse/data/example/trade/technodata/gas/Technodata.csv b/src/muse/data/example/trade/technodata/gas/Technodata.csv
index 6e54352a..8a8dc5c8 100644
--- a/src/muse/data/example/trade/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/trade/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,AgentShare
 Unit,-,Year,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,-
 gassupply1,R1,2010,fixed,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
-gassupply1,R2,2010,fixed,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
\ No newline at end of file
+gassupply1,R2,2010,fixed,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/trade/technodata/power/Technodata.csv b/src/muse/data/example/trade/technodata/power/Technodata.csv
index dd8d893c..7bf47fdb 100644
--- a/src/muse/data/example/trade/technodata/power/Technodata.csv
+++ b/src/muse/data/example/trade/technodata/power/Technodata.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,-,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,
 gasCCGT,R1,2010,fixed,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2010,fixed,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 gasCCGT,R2,2010,fixed,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2010,fixed,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
\ No newline at end of file
+windturbine,R2,2010,fixed,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1

From 3a6242204d8fdc45ff4bf4867dcf81f5b06a08c9 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:50:25 +0100
Subject: [PATCH 050/419] pre-commit: Fix markdownlint hook

Also change to using the markdownlint-fix hook,
which is more useful.

Fixes #275.
---
 .markdownlint.json      | 4 ++++
 .pre-commit-config.yaml | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .markdownlint.json

diff --git a/.markdownlint.json b/.markdownlint.json
new file mode 100644
index 00000000..8081267f
--- /dev/null
+++ b/.markdownlint.json
@@ -0,0 +1,4 @@
+{
+    "MD013": false,
+    "MD041": false
+}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 35a9172e..4a11d6e4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,8 +25,7 @@ repos:
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.38.0
     hooks:
-      - id: markdownlint
-        args: ["--disable", "MD013"]
+      - id: markdownlint-fix
   - repo: https://github.com/kynan/nbstripout
     rev: 0.6.1
     hooks:

From cbd720fca438ed9461737112f1ad685543a32068 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:51:56 +0100
Subject: [PATCH 051/419] Apply fixed markdownlint hook

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 6 ++++--
 .github/ISSUE_TEMPLATE/feature_request.md | 6 +++++-
 .github/ISSUE_TEMPLATE/usage-support.md   | 2 --
 CHANGELOG.md                              | 4 ++--
 src/muse/data/README.md                   | 6 ++++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ce3ac8e4..77bb7e3b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,17 +8,19 @@ assignees: ''
 ---
 
 ## Describe the bug
-A clear and concise description of what the bug is, including error messages.
 
+A clear and concise description of what the bug is, including error messages.
 
 ## To Reproduce
-Steps to reproduce the behavior. Attache any input file that might be required.
 
+Steps to reproduce the behavior. Attache any input file that might be required.
 
 ## Expected behavior
+
 A clear and concise description of what you expected to happen.
 
 ## Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
 ## Context
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index a8cbe430..dba78d7c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,18 @@ assignees: ''
 
 ---
 
-## Is your feature request related to a problem? Please describe.
+## Is your feature request related to a problem? Please describe
+
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 ## Describe the solution you'd like
+
 A clear and concise description of what you want to happen.
 
 ## Describe alternatives you've considered
+
 A clear and concise description of any alternative solutions or features you've considered.
 
 ## Additional context
+
 Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/usage-support.md b/.github/ISSUE_TEMPLATE/usage-support.md
index 9e591f40..ebf70d5a 100644
--- a/.github/ISSUE_TEMPLATE/usage-support.md
+++ b/.github/ISSUE_TEMPLATE/usage-support.md
@@ -11,12 +11,10 @@ assignees: ''
 
 (Please, describe in detail what you want to achieve and what parts of the documentation you have checked to do so)
 
-
 ## What you have tried
 
 (If you have already taken some steps, please, describe here what you have tried. Provide any input files you are trying to use).
 
-
 ## Context
 
 Please, complete the following to better understand the system you are using to run MUSE.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 733a50c2..12910cfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,8 +59,8 @@
 - Solves missing file in tutorial 5 ([#182](https://github.com/SGIModel/MUSE_OS/pull/182))
 - Solves missing subsectors in documentation ([#146](https://github.com/SGIModel/MUSE_OS/pull/146))
 - Solves broken links in the documentation ([#137](https://github.com/SGIModel/MUSE_OS/pull/137))
-- NPV fails to align timeslices ([#135]https://github.com/SGIModel/MUSE_OS/pull/135)
-- OS case studies had obsolete output function removed ([#101]https://github.com/SGIModel/MUSE_OS/pull/101)
+- NPV fails to align timeslices ([#135]<https://github.com/SGIModel/MUSE_OS/pull/135>)
+- OS case studies had obsolete output function removed ([#101]<https://github.com/SGIModel/MUSE_OS/pull/101>)
 - Growth constraints with destination and source region ([#96](https://github.com/SGIModel/MUSE_OS/pull/96))
 - Harmonise time dimension for asset interpolation before merging them ([#94](https://github.com/SGIModel/MUSE_OS/pull/94))
 - Error in costs reporting ([#92](https://github.com/SGIModel/MUSE_OS/pull/92))
diff --git a/src/muse/data/README.md b/src/muse/data/README.md
index dc48be0d..f68887d1 100644
--- a/src/muse/data/README.md
+++ b/src/muse/data/README.md
@@ -1,30 +1,36 @@
 # Demo examples
 
 ## default
+
 This is a 3-sector one-region model.
 It contains a residential, conversion, and gas supply sectors.
 The time framework covers 2020-2050.
 It uses 6 timeslices.
 
 ## default_timeslice
+
 This is developed from the default model.
 Timesliced technodata are given for the power sector.
 
 ## medium
+
 This is developed from the default model.
 Demand for cooking is added in the residential sector.
 
 ## multiple_agents
+
 This is developed from the default model.
 Two agents, each one assigned half of the heat demand, are modelled.
 
 ## minimum_service
+
 This is a one-sector one-region model.
 It models an industry sector with a minimum service constraint.
 The time framework covers 2020-2050.
 It uses 6 timeslices.
 
 ## trade
+
 This is a 3-sector two-region model.
 It contains a residential, conversion, and gas supply sectors.
 The regions can trade gas and electricity.

From 9c88c6bafe4d59b2e9fc63736dfd24a5f9f497cf Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:53:36 +0100
Subject: [PATCH 052/419] VS Code: Recommend editorconfig extension

---
 .vscode/extensions.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index c32598b6..9047ec73 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -7,7 +7,8 @@
 		"janisdd.vscode-edit-csv",
 		"github.vscode-pull-request-github",
 		"ms-python.python",
-		"mechatroner.rainbow-csv"
+		"mechatroner.rainbow-csv",
+		"editorconfig.editorconfig"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []

From fdd15f52736b5f20400bffc26320fef095e63b7c Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 22 Apr 2024 18:54:34 +0100
Subject: [PATCH 053/419] VS Code: Recommend markdownlint extension

---
 .vscode/extensions.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 9047ec73..f1298fba 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,7 +8,8 @@
 		"github.vscode-pull-request-github",
 		"ms-python.python",
 		"mechatroner.rainbow-csv",
-		"editorconfig.editorconfig"
+		"editorconfig.editorconfig",
+		"davidanson.vscode-markdownlint"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []

From 59ac9605634620b04241894616c9db899e530f1b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 23 Apr 2024 11:41:52 +0100
Subject: [PATCH 054/419] Create stacked bar chart

---
 docs/running-muse-example.ipynb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index 538d04fb..b0934211 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -195,7 +195,8 @@
    "source": [
     "for sector_name, results in capacity_results.groupby(\"sector\"):\n",
     "    print(\"{} sector\".format(sector_name))\n",
-    "    sns.lineplot(data=results, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "    results = results.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
+    "    results.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(kind='bar', stacked=True)\n",
     "    plt.ylabel(\"capacity (PJ)\")\n",
     "    plt.show()\n",
     "    plt.close()"
@@ -236,7 +237,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.13"
+   "version": "3.9.18"
   }
  },
  "nbformat": 4,

From ec8be43b2931fbfef04a652da8d4f9a3d3442926 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 23 Apr 2024 11:49:59 +0100
Subject: [PATCH 055/419] Remove seaborn import

---
 docs/running-muse-example.ipynb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index b0934211..de899f80 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -157,8 +157,7 @@
    "outputs": [],
    "source": [
     "import pandas as pd\n",
-    "import matplotlib.pyplot as plt\n",
-    "import seaborn as sns"
+    "import matplotlib.pyplot as plt"
    ]
   },
   {

From de82884e3a98123ccfe55285abe97b169ab91ea5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 23 Apr 2024 11:56:14 +0100
Subject: [PATCH 056/419] Modify description

---
 docs/running-muse-example.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index de899f80..1738a5cd 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -183,7 +183,7 @@
    "source": [
     "Using the ```head``` command we print the first five rows of our dataset. Next, we will visualise each of the sectors, with capacity on the y-axis and year on the x-axis.\n",
     "\n",
-    "Don't worry too much about the code if some of it is unfamiliar. We effectively split the data into each sector and then plot a line plot for each."
+    "Don't worry too much about the code if some of it is unfamiliar. We effectively split the data into each sector and then create a stacked bar chart for each."
    ]
   },
   {

From 4fd0b404a999b64e79a553f8e20daeadb49038b1 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 23 Apr 2024 15:40:01 +0100
Subject: [PATCH 057/419] Pseudocode for generating tutorial models

---
 .../1-introduction/generate_model.py          | 66 +++++++++++++++++++
 .../2-scenario/generate_model.py              | 23 +++++++
 .../1-multiple-objective/generate_model.py    | 23 +++++++
 .../3-add-region/generate_model.py            | 55 ++++++++++++++++
 .../1-modify-timeslices/generate_model.py     | 16 +++++
 .../5-add-service-demand/generate_model.py    |  1 +
 6 files changed, 184 insertions(+)
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
 create mode 100644 docs/tutorial-code/3-add-region/generate_model.py
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
 create mode 100644 docs/tutorial-code/5-add-service-demand/generate_model.py

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
new file mode 100644
index 00000000..b3089aff
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
@@ -0,0 +1,66 @@
+# Starting point: copy default model
+
+"""
+ADD A NEW COMMODITY
+
+commodity_name: solar
+sector: power
+
+copy_from: wind
+
+"""
+
+# File: technodata/power/CommIn.csv
+# Add new column {commodity_name} as copy of {copy_from}
+# >>> No values changed
+
+# File: technodata/{sector}/CommOut.csv
+# Add new column {commodity_name} as copy of {copy_from}
+# >>> No values changed
+
+# File: input/BaseYearImport.csv
+# Add new column {commodity_name} as copy of {copy_from}
+# >>> No values changed
+
+# File: input/BaseYearExport.csv
+# Add new column {commodity_name} as copy of {copy_from}
+# >>> No values changed
+
+# File: input/GlobalCommodities.csv
+# Copy row for {copy_from.capitalize()}, changing Commidity to
+#     {commodity_name.capitalize()} and CommodityName to {commodity_name}
+# >>> No values changed
+
+# File: input/Projections.csv
+# Add new column {commodity_name} as copy of {copy_from}
+# >>> No values changed
+
+
+"""
+ADD A NEW PROCESS
+
+process_name: solarPV
+sector: power
+
+copy_from: windturbine
+
+"""
+
+
+# File: technodata/{sector}/CommIn.csv
+# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# >>> Change solar value to 1
+# >>> Change wind value to 0
+
+# File: technodata/{sector}/CommOut.csv
+# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# >>> No values changed
+
+# File: technodata/{sector}/ExistingCapacity.csv
+# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# >>> No values changed
+
+# File: technodata/{sector}/technodata.csv
+# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# >>> Change cap_par to 30
+# >>> Change Fuel to 'solar'
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py b/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
new file mode 100644
index 00000000..8f4cbdd4
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
@@ -0,0 +1,23 @@
+# Starting point: copy model from 1-introduction
+
+"""
+ADD PRICE DATA FOR NEW YEAR:
+
+year: 2040
+sector: power
+
+copy_from: 2030
+
+"""
+
+# File: technodata/{sector}/technodata.csv
+# Copy rows from {copy_from}, replacing Time with {year}
+# >>> Change 'cap_par' for solarPV,2040 to 30
+
+# File: technodata/{sector}/CommIn.csv
+# Copy rows from {copy_from}, replacing Time with {year}
+# >>> No values changed
+
+# File: technodata/{sector}/CommOut.csv
+# Copy rows from {copy_from}, replacing Time with {year}
+# >>> No values changed
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py b/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
new file mode 100644
index 00000000..34a94d0b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
@@ -0,0 +1,23 @@
+"""
+ADD AN AGENT
+
+agent_name: A2
+- agentshare_new = Agent3
+- agentshare_retrofit = Agent4
+
+copy_from: 'A1'
+
+"""
+
+# File: technodata/Agents.csv
+# Create new rows for {agent_name} as copy of {copy_from}
+# Copy rows from {copy_from}, changing Name to {agent_name}
+# Rename AgentShare for new rows to {agentshare_new} and {agentshare_retrofit}
+# >>> Change Objective2 to 'EAC'
+# >>> Change ObjData1 and ObjData2 to 0.5
+# >>> Change DecisionMethod to 'weighted_sum'
+
+# For every sector
+# File: technodata/{sector}/technodata.csv
+# Create column {agentshare_retrofit} as copy of {copy_from.agentshare_retrofit}
+# >>> No values changed
diff --git a/docs/tutorial-code/3-add-region/generate_model.py b/docs/tutorial-code/3-add-region/generate_model.py
new file mode 100644
index 00000000..c45a90ea
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/generate_model.py
@@ -0,0 +1,55 @@
+# starting point: unclear?
+
+"""
+ADD A NEW REGION
+
+region_name: R2
+
+copy_from: R1
+
+"""
+
+# File: settings.toml
+# Append {region_name} to regions
+
+# For every sector
+# File: technodata/{sector}/technodata.csv
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> For sector 'power': MaxCapacityAddition for {windturbine,R2} changed to 5
+# >>> For sector 'power': MaxCapacityGrowth for {windturbine,R2} changed to 0.05
+# >>> For sector 'power': TotalCapacityLimit for {windturbine,R2} changed to 100
+
+# For every sector
+# File: technodata/{sector}/CommIn.csv
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# For every sector
+# File: technodata/{sector}/CommOut.csv
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# For every sector
+# File: technodata/{sector}/ExistingCapacity.csv
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# File: technodata/Agents.csv (undocumented)
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# File: input/BaseYearImport.csv (undocumented)
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# File: input/BaseYearExport.csv (undocumented)
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# File: input/Projections.csv (undocumented)
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
+
+# For all files in technodata/preset (undocumented)
+# Copy rows for {copy_from}, changing RegionName to {region_name}
+# >>> No values changed
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
new file mode 100644
index 00000000..33ee584a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
@@ -0,0 +1,16 @@
+"""
+ADD A NEW TIMESLICE
+
+timeslice_name: early-morning and late-afternoon
+timeslice_number: 7 and 8
+
+copy_from: evening (6)
+
+"""
+
+# File: settings.toml
+# Append {timeslice_name} to timeslices
+
+# For all files in technodata/preset
+# Copy rows for {timeslice_name.number}, changing Timeslice to {timeslice_number}
+# >>> No values changed
diff --git a/docs/tutorial-code/5-add-service-demand/generate_model.py b/docs/tutorial-code/5-add-service-demand/generate_model.py
new file mode 100644
index 00000000..ae8395c1
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/generate_model.py
@@ -0,0 +1 @@
+# Follows similar process as 1-add-new-technology

From f22dc106f0d8db8190fec1105f1eaca92d32485d Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 12:02:28 +0100
Subject: [PATCH 058/419] Fix CITATION.cff file

The syntax was mangled
---
 CITATION.cff | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index 12d541bd..09479c0a 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -2,12 +2,12 @@ cff-version: 1.1.0
 message: "If you use this software, please cite it as below."
 authors:
   - family-names: Giarola
-	given-names: Sara
+    given-names: Sara
   - family-names: Kell
-	given-names: Alexander
+    given-names: Alexander
   - family-names: Hawkes
-	given-names: Adam
+    given-names: Adam
 
-title: SGIModel/MUSE_OS: v1.0.1
+title: SGIModel/MUSE_OS
 version: v1.0.1
 date-released: 2022-03-25

From fcb4cefa98cea67413f1b2c480b55bd2c8ac38a5 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 12:08:29 +0100
Subject: [PATCH 059/419] Minor tweaks to .editorconfig file

In particular, we want to fix the indent sizes for
certain file types.
---
 .editorconfig | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index c2319908..7ec55f10 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,21 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
 root = true
 
-[*.py]
-indent_style = space
-indent_size = 4
-tab_width = 4
+[*]
 charset = utf-8
-max_line_length=88
 insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+max_line_length = 88
+
+[*.md]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

From 137c09eb4d5294abb694689789861a6774d8b38d Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 11:58:23 +0100
Subject: [PATCH 060/419] pre-commit: Add prettier hook

---
 .pre-commit-config.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4a11d6e4..96d689ad 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,3 +31,8 @@ repos:
     hooks:
       - id: nbstripout
         files: ".ipynb"
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v3.1.0"
+    hooks:
+      - id: prettier
+        types_or: [yaml, json]

From cc40798e65c72945c06b0890f89ba9fc1cffa190 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 12:30:39 +0100
Subject: [PATCH 061/419] Run prettier pre-commit hook

---
 .github/workflows/broken-link-check.yml     |  2 +-
 .github/workflows/ci.yml                    | 61 ++++++++-------
 .github/workflows/documentation.yml         | 84 ++++++++++-----------
 .github/workflows/pre-commit_autoupdate.yml |  2 +-
 .github/workflows/publish.yml               |  6 +-
 .github/workflows/regression_tests.yml      |  1 -
 .github/workflows/remove_old_artifacts.yml  | 14 ++--
 .readthedocs.yaml                           | 12 +--
 .vscode/launch.json                         | 21 ++----
 .vscode/settings.json                       |  2 +-
 CITATION.cff                                | 12 +--
 11 files changed, 101 insertions(+), 116 deletions(-)

diff --git a/.github/workflows/broken-link-check.yml b/.github/workflows/broken-link-check.yml
index f69a34f8..d68af071 100644
--- a/.github/workflows/broken-link-check.yml
+++ b/.github/workflows/broken-link-check.yml
@@ -14,4 +14,4 @@ jobs:
         uses: ruzickap/action-my-broken-link-checker@v2
         with:
           url: https://muse-os.readthedocs.io/en/latest/
-          cmd_params: '--timeout=20 --buffer-size=8192 --max-connections=3 --color=always --skip-tls-verification --header="User-Agent:curl/7.54.0"'  # muffet parameters
+          cmd_params: '--timeout=20 --buffer-size=8192 --max-connections=3 --color=always --skip-tls-verification --header="User-Agent:curl/7.54.0"' # muffet parameters
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ddacafda..fc7443cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,11 @@
 name: QA and tests
 
 on:
-    pull_request:
-        types: [opened, synchronize, reopened]
-    push:
-      branches: [main, develop]
-    workflow_call:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  push:
+    branches: [main, develop]
+  workflow_call:
 
 jobs:
   # Checks the style using the pre-commit hooks
@@ -20,7 +20,6 @@ jobs:
     needs: qa
     runs-on: ${{ matrix.os }}
 
-
     strategy:
       fail-fast: false
       matrix:
@@ -28,35 +27,35 @@ jobs:
         python-version: ["3.8", "3.9"]
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          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]
+      - 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]
 
-    # The unit tests, with coverage under linux
-    - name: Unit tests (linux)
-      if: (runner.os == 'Linux')
-      run: |
-        pip install pytest-cov
-        pytest -m "not regression and not notebook" --junitxml=junit/pytest.xml \
-            --cov=muse \
-            --cov-branch \
-            --cov-report=xml
+      # The unit tests, with coverage under linux
+      - name: Unit tests (linux)
+        if: (runner.os == 'Linux')
+        run: |
+          pip install pytest-cov
+          pytest -m "not regression and not notebook" --junitxml=junit/pytest.xml \
+              --cov=muse \
+              --cov-branch \
+              --cov-report=xml
 
-    - name: Upload coverage to Codecov
-      if: success() && (runner.os == 'Linux' && matrix.python-version == 3.9)
-      uses: codecov/codecov-action@v4
+      - name: Upload coverage to Codecov
+        if: success() && (runner.os == 'Linux' && matrix.python-version == 3.9)
+        uses: codecov/codecov-action@v4
 
-    - name: Unit tests (not linux)
-      if: (runner.os != 'Linux')
-      run: pytest -m "not regression and not notebook"
+      - name: Unit tests (not linux)
+        if: (runner.os != 'Linux')
+        run: pytest -m "not regression and not notebook"
 
   regression-tests:
     needs: qa
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index a46dd5a7..497335a6 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,49 +1,49 @@
 name: "Build and publish documentation"
 on:
-    pull_request:
-        types: [opened, synchronize, reopened]
-    push:
-        branches: ["main"]
+  pull_request:
+    types: [opened, synchronize, reopened]
+  push:
+    branches: ["main"]
 
 jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-    - 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: Test notebooks and tutorials
-      run: pytest -m "notebook"
-    - name: Build HTML documentation
-      run: python -m sphinx -b html docs docs/build/html
-    - name: Build PDF documentation
-      run: |
-        python -m sphinx -b latex docs docs/build/latex
-        cd docs/build/latex
-        latexmk -interaction=nonstopmode -pdf muse
-    - name: Upload HTML
-      uses: actions/upload-artifact@v4
-      with:
-        name: DocumentationHTML
-        path: docs/build/html
-    - name: Upload PDF
-      uses: actions/upload-artifact@v4
-      with:
-        name: DocumentationPDF
-        path: docs/build/latex/muse.pdf
-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@v4
-      if: github.ref == 'refs/heads/master'
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: docs/build/html
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+      - 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: Test notebooks and tutorials
+        run: pytest -m "notebook"
+      - name: Build HTML documentation
+        run: python -m sphinx -b html docs docs/build/html
+      - name: Build PDF documentation
+        run: |
+          python -m sphinx -b latex docs docs/build/latex
+          cd docs/build/latex
+          latexmk -interaction=nonstopmode -pdf muse
+      - name: Upload HTML
+        uses: actions/upload-artifact@v4
+        with:
+          name: DocumentationHTML
+          path: docs/build/html
+      - name: Upload PDF
+        uses: actions/upload-artifact@v4
+        with:
+          name: DocumentationPDF
+          path: docs/build/latex/muse.pdf
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        if: github.ref == 'refs/heads/master'
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: docs/build/html
diff --git a/.github/workflows/pre-commit_autoupdate.yml b/.github/workflows/pre-commit_autoupdate.yml
index 5afce103..ab62addd 100644
--- a/.github/workflows/pre-commit_autoupdate.yml
+++ b/.github/workflows/pre-commit_autoupdate.yml
@@ -2,7 +2,7 @@ name: Pre-commit auto-update
 
 on:
   schedule:
-    - cron: "0 0 * * 1"  # midnight every Monday
+    - cron: "0 0 * * 1" # midnight every Monday
 
 jobs:
   auto-update:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ca119d65..c4eadd69 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -36,7 +36,6 @@ jobs:
       id-token: write
 
     steps:
-
       - name: Download sdist artifact
         uses: actions/download-artifact@v4
         with:
@@ -61,7 +60,6 @@ jobs:
       id-token: write
 
     steps:
-
       - name: Download sdist artifact
         uses: actions/download-artifact@v4
         with:
@@ -84,8 +82,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest ]
-        python-version: [ "3.9" ]
+        os: [windows-latest]
+        python-version: ["3.9"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml
index 82aa3097..fe11bd57 100644
--- a/.github/workflows/regression_tests.yml
+++ b/.github/workflows/regression_tests.yml
@@ -3,7 +3,6 @@ on:
     - cron: 0 0 * * 0 # At 12:00 AM, only on Sunday
 
 jobs:
-
   regression-tests:
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/remove_old_artifacts.yml b/.github/workflows/remove_old_artifacts.yml
index 40046ea5..6f9d6698 100644
--- a/.github/workflows/remove_old_artifacts.yml
+++ b/.github/workflows/remove_old_artifacts.yml
@@ -2,7 +2,7 @@ name: Remove old artifacts
 
 on:
   schedule:
-    - cron: '0 0 1 * *'
+    - cron: "0 0 1 * *"
 
 jobs:
   remove-old-artifacts:
@@ -10,9 +10,9 @@ jobs:
     timeout-minutes: 10
 
     steps:
-    - name: Remove old artifacts
-      uses: c-hive/gha-remove-artifacts@v1
-      with:
-        age: '15 days'
-        skip-tags: true
-        skip-recent: 5
+      - name: Remove old artifacts
+        uses: c-hive/gha-remove-artifacts@v1
+        with:
+          age: "15 days"
+          skip-tags: true
+          skip-recent: 5
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 74156d84..36c1bfa5 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -16,7 +16,7 @@ build:
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-   configuration: docs/conf.py
+  configuration: docs/conf.py
 
 # If using Sphinx, optionally build your docs in additional formats such as PDF
 # formats:
@@ -24,8 +24,8 @@ sphinx:
 
 # Optionally declare the Python requirements required to build your docs
 python:
-   install:
-   - method: pip
-     path: .
-     extra_requirements:
-         - doc
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 79eeeaa2..d43f2171 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,39 +9,28 @@
             "type": "python",
             "request": "launch",
             "module": "muse",
-            "args": [
-                "--model",
-                "default"
-            ]
+            "args": ["--model", "default"]
         },
         {
             "name": "Model: multiple_agents",
             "type": "python",
             "request": "launch",
             "module": "muse",
-            "args": [
-                "--model",
-                "multiple_agents"
-            ]
+            "args": ["--model", "multiple_agents"]
         },
         {
             "name": "model/settings.toml",
             "type": "python",
             "request": "launch",
             "module": "muse",
-            "args": [
-                "model/settings.toml",
-            ]
+            "args": ["model/settings.toml"]
         },
         {
             "name": "Model: minimum_service",
             "type": "python",
             "request": "launch",
             "module": "muse",
-            "args": [
-                "--model",
-                "minimum_service"
-            ]
-        },
+            "args": ["--model", "minimum_service"]
+        }
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1f074ac8..351a9965 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,5 +7,5 @@
     "python.linting.mypyEnabled": true,
     "python.testing.pytestEnabled": true,
     "restructuredtext.confPath": "${workspaceFolder}/docs",
-    "python.pythonPath": "/opt/anaconda3/envs/muse/bin/python",
+    "python.pythonPath": "/opt/anaconda3/envs/muse/bin/python"
 }
diff --git a/CITATION.cff b/CITATION.cff
index 09479c0a..5bd98db8 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,12 +1,12 @@
 cff-version: 1.1.0
 message: "If you use this software, please cite it as below."
 authors:
-  - family-names: Giarola
-    given-names: Sara
-  - family-names: Kell
-    given-names: Alexander
-  - family-names: Hawkes
-    given-names: Adam
+    - family-names: Giarola
+      given-names: Sara
+    - family-names: Kell
+      given-names: Alexander
+    - family-names: Hawkes
+      given-names: Adam
 
 title: SGIModel/MUSE_OS
 version: v1.0.1

From e2554c8c8e64b2ca882af5c4abb7450385dd8ad0 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 12:12:28 +0100
Subject: [PATCH 062/419] pre-commit: Add pretty-format-toml hook

---
 .pre-commit-config.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 96d689ad..850623f1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -36,3 +36,8 @@ repos:
     hooks:
       - id: prettier
         types_or: [yaml, json]
+  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+    rev: v2.13.0
+    hooks:
+      - id: pretty-format-toml
+        args: [--autofix, --indent, "4", --no-sort]

From c898050424d4adb51a6f0581cf7e428ddfe2ffeb Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 12:24:25 +0100
Subject: [PATCH 063/419] Run pretty-format-toml hook

---
 .../0-new-decision-metric/settings.toml       | 24 ++----
 .../1-introduction/settings.toml              | 25 ++----
 .../2-scenario/settings.toml                  | 24 ++----
 .../1-multiple-objective/settings.toml        | 26 ++----
 .../2-single-objective/settings.toml          | 26 ++----
 docs/tutorial-code/3-add-region/settings.toml | 25 ++----
 .../1-modify-timeslices/settings.toml         | 26 ++----
 .../2-modify-time-framework/settings.toml     | 24 ++----
 .../5-add-service-demand/settings.toml        | 26 ++----
 .../6-add-correlation-demand/settings.toml    | 28 ++-----
 .../1-min-constraint/settings.toml            | 83 +++++++++----------
 .../2-max-constraint/settings.toml            | 82 +++++++++---------
 pyproject.toml                                | 10 +--
 src/muse/data/default_settings.toml           |  9 +-
 src/muse/data/example/default/settings.toml   | 33 +++-----
 .../example/default_timeslice/settings.toml   | 36 +++-----
 .../example/minimum_service/settings.toml     | 20 ++---
 src/muse/data/example/trade/settings.toml     | 26 +++---
 18 files changed, 199 insertions(+), 354 deletions(-)

diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index 077b2dd1..3e0e8f9c 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -1,13 +1,12 @@
 plugins = "{path}/new_decision.py"
 # Global settings - most REQUIRED
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -43,12 +42,10 @@ method = "fitting"
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -57,27 +54,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -87,17 +81,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -107,23 +98,20 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 18edad41..b6e8d70b 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -42,12 +42,10 @@ method = "fitting"
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -56,27 +54,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -86,17 +81,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -106,23 +98,20 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 48ca2828..832cd3a3 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -41,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -55,26 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -84,17 +80,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -104,23 +97,20 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index 5c7052d6..dedf9362 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -1,19 +1,18 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
-
 [[outputs]]
 quantity = "prices"
 sink = "aggregate"
@@ -34,7 +33,6 @@ quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 # Carbon budget control
 [carbon_budget_control]
 budget = []
@@ -43,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -57,26 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -86,17 +80,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -106,23 +97,20 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index 3694f2e4..dedf9362 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -33,7 +33,6 @@ quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 # Carbon budget control
 [carbon_budget_control]
 budget = []
@@ -42,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -56,27 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -86,17 +80,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -106,23 +97,20 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/3-add-region/settings.toml b/docs/tutorial-code/3-add-region/settings.toml
index 66efcde9..8f81d260 100644
--- a/docs/tutorial-code/3-add-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1", "R2"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -41,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -55,27 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -85,17 +80,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -105,23 +97,20 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index b7093c8e..06144269 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1", "R2"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -33,7 +33,6 @@ quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 # Carbon budget control
 [carbon_budget_control]
 budget = []
@@ -42,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -56,27 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -86,17 +80,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -106,19 +97,17 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1095
 all-year.all-week.morning = 1095
 all-year.all-week.mid-afternoon = 1095
@@ -127,4 +116,3 @@ all-year.all-week.late-peak = 1095
 all-year.all-week.evening = 1095
 all-year.all-week.early-morning = 1095
 all-year.all-week.late-afternoon = 1095
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 9c447844..607482a9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]
-foresight = 2   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 2  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1", "R2"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -41,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -55,26 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 2  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -85,17 +81,14 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 forecast = 2  # Optional, defaults to 5
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -106,20 +99,18 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 forecast = 2  # Optional, defaults to 5
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
 forecast = 2  # Optional, defaults to 5
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1095
 all-year.all-week.morning = 1095
 all-year.all-week.mid-afternoon = 1095
@@ -128,4 +119,3 @@ all-year.all-week.late-peak = 1095
 all-year.all-week.evening = 1095
 all-year.all-week.early-morning = 1095
 all-year.all-week.late-afternoon = 1095
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/5-add-service-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/settings.toml
index af39c8a9..06144269 100644
--- a/docs/tutorial-code/5-add-service-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1", "R2"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -23,7 +23,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 [[outputs]]
 quantity = "timeslice_consumption"
 sink = "aggregate"
@@ -34,7 +33,6 @@ quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 # Carbon budget control
 [carbon_budget_control]
 budget = []
@@ -43,12 +41,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -57,26 +53,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -86,17 +80,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -106,19 +97,17 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1095
 all-year.all-week.morning = 1095
 all-year.all-week.mid-afternoon = 1095
@@ -127,4 +116,3 @@ all-year.all-week.late-peak = 1095
 all-year.all-week.evening = 1095
 all-year.all-week.early-morning = 1095
 all-year.all-week.late-afternoon = 1095
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/6-add-correlation-demand/settings.toml b/docs/tutorial-code/6-add-correlation-demand/settings.toml
index cd129b5b..86cae5e3 100644
--- a/docs/tutorial-code/6-add-correlation-demand/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/settings.toml
@@ -1,19 +1,18 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
-
 [[outputs]]
 quantity = "prices"
 sink = "aggregate"
@@ -24,7 +23,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 [[outputs]]
 quantity = "timeslice_consumption"
 sink = "aggregate"
@@ -44,12 +42,10 @@ method = "fitting"
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -58,26 +54,24 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
-
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -87,17 +81,14 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -107,13 +98,10 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
@@ -122,11 +110,10 @@ timeslice_shares_path = '{path}/TimesliceSharepreset.csv'
 macrodrivers_path = '{path}/Macrodrivers.csv'
 regression_path = '{path}/regressionparameters.csv'
 forecast = 0
-filters = {sector="residential", region=["R1"]}
-
-
+filters = {sector = "residential", region = ["R1"]}
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1095
 all-year.all-week.morning = 1095
 all-year.all-week.mid-afternoon = 1095
@@ -135,4 +122,3 @@ all-year.all-week.late-peak = 1095
 all-year.all-week.evening = 1095
 all-year.all-week.early-morning = 1095
 all-year.all-week.late-afternoon = 1095
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 47f9e8ab..89618ec5 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -1,21 +1,18 @@
 plugins = "{path}/output.py"
-
 # Global settings - most REQUIRED
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities=["solar", "wind"]
-
+excluded_commodities = ["solar", "wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
-
 [[outputs]]
 quantity = "prices"
 sink = "aggregate"
@@ -26,7 +23,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
 
-
 # Carbon budget control
 [carbon_budget_control]
 budget = []
@@ -35,12 +31,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -49,11 +43,12 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
@@ -67,23 +62,20 @@ index = false
 
 [[sectors.residential.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
-sink = 'csv'
-overwrite = true
-
 
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'costed'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
@@ -106,47 +98,49 @@ filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "supply_timeslice"
 sink = "csv"
 overwrite = true
-index=false
-keep_columns = [ "timeslice",
-                 "asset",
-                 "year",
-                 "commodity",
-                 "region",
-                 "installed",
-                 "technology",
-                 "month",
-                 "day",
-                 "hour",
-                 "supply"]
+index = false
+keep_columns = [
+    "timeslice",
+    "asset",
+    "year",
+    "commodity",
+    "region",
+    "installed",
+    "technology",
+    "month",
+    "day",
+    "hour",
+    "supply"
+]
 
 [[sectors.power.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "consumption_timeslice"
 sink = "csv"
 overwrite = true
-index=false
-keep_columns = [ "timeslice",
-                 "asset",
-                 "year",
-                 "commodity",
-                 "region",
-                 "installed",
-                 "technology",
-                 "month",
-                 "day",
-                 "hour",
-                 "consumption"]
+index = false
+keep_columns = [
+    "timeslice",
+    "asset",
+    "year",
+    "commodity",
+    "region",
+    "installed",
+    "technology",
+    "month",
+    "day",
+    "hour",
+    "consumption"
+]
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -156,7 +150,6 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
@@ -168,18 +161,16 @@ index = false
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 81a011fd..18c1eabe 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -1,14 +1,12 @@
 plugins = "{path}/output.py"
-
 # Global settings - most REQUIRED
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5   # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities=["solar", "wind"]
-
+excluded_commodities = ["solar", "wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -34,12 +32,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -48,11 +44,12 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [  # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
@@ -66,23 +63,20 @@ index = false
 
 [[sectors.residential.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
-sink = 'csv'
-overwrite = true
-
 
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'costed'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
@@ -105,48 +99,49 @@ filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "supply_timeslice"
 sink = "csv"
 overwrite = true
-index=false
-keep_columns = [ "timeslice",
-                 "asset",
-                 "year",
-                 "commodity",
-                 "region",
-                 "installed",
-                 "technology",
-                 "month",
-                 "day",
-                 "hour",
-                 "supply"]
-
+index = false
+keep_columns = [
+    "timeslice",
+    "asset",
+    "year",
+    "commodity",
+    "region",
+    "installed",
+    "technology",
+    "month",
+    "day",
+    "hour",
+    "supply"
+]
 
 [[sectors.power.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "consumption_timeslice"
 sink = "csv"
 overwrite = true
-index=false
-keep_columns = [ "timeslice",
-                 "asset",
-                 "year",
-                 "commodity",
-                 "region",
-                 "installed",
-                 "technology",
-                 "month",
-                 "day",
-                 "hour",
-                 "consumption"]
+index = false
+keep_columns = [
+    "timeslice",
+    "asset",
+    "year",
+    "commodity",
+    "region",
+    "installed",
+    "technology",
+    "month",
+    "day",
+    "hour",
+    "consumption"
+]
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -156,7 +151,6 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.outputs]]
 filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
@@ -168,18 +162,16 @@ index = false
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-consumption_path= "{path}/technodata/preset/*Consumption.csv"
-
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/pyproject.toml b/pyproject.toml
index 8bd47f1c..65c55334 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "MUSE_OS"
 authors = [
-    {name = "Sustainable Gas Institute", email = "sgi@imperial.ac.uk"},
+    {name = "Sustainable Gas Institute", email = "sgi@imperial.ac.uk"}
 ]
 description = "Energy System Model"
 readme = "README.md"
@@ -18,7 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Intended Audience :: Science/Research",
     "Intended Audience :: Other Audience",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
 ]
 dependencies = [
     "numpy==1.23.0",
@@ -30,7 +30,7 @@ dependencies = [
     "toml",
     "xlrd==1.2.0",
     "mypy-extensions",
-    "pypubsub",
+    "pypubsub"
 ]
 dynamic = ["version"]
 
@@ -63,7 +63,7 @@ doc = [
 ]
 excel = ["openpyxl"]
 gui = [
-    "gooey",
+    "gooey"
 ]
 
 [project.urls]
@@ -97,7 +97,7 @@ 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",
+    "notebook: a test which consist in running a jupyter notebook"
 ]
 
 [tool.mypy]
diff --git a/src/muse/data/default_settings.toml b/src/muse/data/default_settings.toml
index a4b50344..83998517 100644
--- a/src/muse/data/default_settings.toml
+++ b/src/muse/data/default_settings.toml
@@ -1,4 +1,5 @@
 # Global settings
+
 time_framework = 'REQUIRED'
 # foresight must  be a multiple of the minimum separation between the years in time
 # framework
@@ -7,7 +8,6 @@ regions = 'REQUIRED'
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-
 # Convergence parameters
 equilibrium = true
 equilibrium_variable = 'demand'
@@ -18,7 +18,7 @@ excluded_commodities = []
 
 # Carbon budget control
 [carbon_budget_control]
-budget = []          # Same length as time_framework
+budget = []  # Same length as time_framework
 commodities = []
 method = 'fitting'
 debug = true
@@ -49,6 +49,7 @@ base_year_export = "OPTIONAL"
 base_year_import = "OPTIONAL"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 winter.weekday.night = 396
 winter.weekday.morning = 396
 winter.weekday.afternoon = 264
@@ -70,7 +71,7 @@ spring-autumn.weekend.morning = 300
 spring-autumn.weekend.afternoon = 300
 spring-autumn.weekend.evening = 300
 summer.weekday.night = 396
-summer.weekday.morning  = 396
+summer.weekday.morning = 396
 summer.weekday.afternoon = 264
 summer.weekday.early-peak = 66
 summer.weekday.late-peak = 66
@@ -79,8 +80,6 @@ summer.weekend.night = 150
 summer.weekend.morning = 150
 summer.weekend.afternoon = 150
 summer.weekend.evening = 150
-level_names = ["month", "day", "hour"]
-
 
 [timeslices.aggregates]
 all-day = ["night", "morning", "afternoon", "early-peak", "late-peak", "evening"]
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 06f5bb5f..0e5e1145 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5                                               # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 1
@@ -31,7 +31,7 @@ keep_columns = [
     'sector',
     'type',
     'year',
-    'capacity',
+    'capacity'
 ]
 
 # Carbon budget control
@@ -42,12 +42,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -55,15 +53,16 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy" # Optional, defaults to "adhoc"
-constraints = [ # Optional, defaults to the constraints below
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
-demand_share = "new_and_retro" # Optional, default to new_and_retro
-forecast = 5 # Optional, defaults to 5
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -74,23 +73,20 @@ index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
-sink = 'csv'
-overwrite = true
-
 
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
@@ -111,12 +107,10 @@ index = false
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -126,7 +120,6 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
@@ -138,18 +131,16 @@ index = false
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
-
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index ce799f5b..585d142d 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5                                               # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -44,12 +44,10 @@ budget = []
 projections = '{path}/input/Projections.csv'
 global_commodities = '{path}/input/GlobalCommodities.csv'
 
-
 [sectors.residential]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
@@ -57,15 +55,16 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 [sectors.residential.subsectors.retro_and_new]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy" # Optional, defaults to "adhoc"
-constraints = [ # Optional, defaults to the constraints below
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
-demand_share = "new_and_retro" # Optional, default to new_and_retro
-forecast = 5 # Optional, defaults to 5
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -76,23 +75,20 @@ index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
-sink = 'csv'
-overwrite = true
-
 
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.power]
 type = 'default'
 priority = 2
 dispatch_production = 'costed'
-
 technodata = '{path}/technodata/power/Technodata.csv'
 technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
@@ -112,22 +108,19 @@ index = false
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-quantity.name = "supply"
-quantity.drop = ["comm_usage", "units_prices"]
 sink = 'csv'
 overwrite = true
-
+quantity.name = "supply"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.gas]
 type = 'default'
 priority = 3
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
@@ -137,7 +130,6 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
@@ -149,18 +141,16 @@ index = false
 net = 'new_to_retro'
 interaction = 'transfer'
 
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
-
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index fd806b25..5a696a3c 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -1,4 +1,5 @@
 # Global settings - most REQUIRED
+
 time_framework = [2010, 2015, 2020, 2025, 2030, 2035, 2040, 2045, 2050]
 # Has to be a multiple of the minimum separation between the years in time framework
 foresight = 5
@@ -7,7 +8,6 @@ interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["fuel1", "fuel2", "fuel3"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 2
@@ -39,14 +39,13 @@ keep_columns = [
     'sector',
     'type',
     'year',
-    'capacity',
+    'capacity'
 ]
 
 [sectors.industry]
 type = 'default'
 priority = 1
 dispatch_production = 'share'
-
 technodata = '{path}/technodata/industry/Technodata.csv'
 commodities_in = '{path}/technodata/industry/CommIn.csv'
 commodities_out = '{path}/technodata/industry/CommOut.csv'
@@ -55,15 +54,16 @@ commodities_out = '{path}/technodata/industry/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/industry/Existing.csv'
 lpsolver = "scipy"
-constraints = [ # Optional, defaults to the constraints below
+constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service",
+    "minimum_service"
 ]
-demand_share = "new_and_retro" # Optional, default to new_and_retro
-forecast = 5 # Optional, defaults to 5
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.industry.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -74,11 +74,11 @@ index = false
 
 [[sectors.industry.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
 quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
-sink = 'csv'
-overwrite = true
 
 [[sectors.industry.interactions]]
 net = 'new_to_retro'
@@ -90,7 +90,7 @@ priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
+level_names = ["month", "day", "hour"]
 winter.all-week.all-day = 2920
 summer.all-week.all-day = 2920
 spring-autumn.all-week.all-day = 2920
-level_names = ["month", "day", "hour"]
diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
index 19b08686..0929d083 100644
--- a/src/muse/data/example/trade/settings.toml
+++ b/src/muse/data/example/trade/settings.toml
@@ -1,12 +1,12 @@
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035]
-foresight = 5                             # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1", "R2"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
 excluded_commodities = ["wind"]
-
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -15,19 +15,20 @@ tolerance_unmet_demand = -0.1
 
 [[outputs]]
 quantity = "prices"
+filename = "{cwd}/Results/Prices.csv"
 sink.name = "aggregate"
 sink.sink.name = "csv"
 sink.sink.set_index = ["region", "commodity", "year", "timeslice"]
 sink.sink.sort_index = true
 sink.sink.keep_columns = ["prices"]
-filename = "{cwd}/Results/Prices.csv"
 
 [[outputs]]
 quantity = "capacity"
+index = false
+filename = "{cwd}/Results/Capacities.csv"
 sink.name = "aggregate"
 sink.sink.name = "csv"
 sink.sink.sort_index = true
-index = false
 sink.sink.keep_columns = [
     'technology',
     'dst_region',
@@ -36,9 +37,8 @@ sink.sink.keep_columns = [
     'sector',
     'type',
     'year',
-    'capacity',
+    'capacity'
 ]
-filename = "{cwd}/Results/Capacities.csv"
 
 [carbon_budget_control]
 budget = []
@@ -71,13 +71,12 @@ constraints = [
     "max_capacity_expansion",
     "minimum_service",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "new_and_retro"
 forecast = 5
 asset_threshhold = 1e-4
 
-
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
@@ -109,7 +108,7 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "unmet_forecasted_demand"
 forecast = 5
@@ -127,7 +126,7 @@ columns = [
     "region",
     "technology",
     "installed",
-    "capacity",
+    "capacity"
 ]
 index = false
 
@@ -150,7 +149,7 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space",
+    "search_space"
 ]
 demand_share = "unmet_forecasted_demand"
 forecast = 5
@@ -168,16 +167,15 @@ columns = [
     "region",
     "technology",
     "installed",
-    "capacity",
+    "capacity"
 ]
 index = false
 
-
 [timeslices]
+level_names = ["month", "day", "hour"]
 all-year.all-week.night = 1460
 all-year.all-week.morning = 1460
 all-year.all-week.afternoon = 1460
 all-year.all-week.early-peak = 1460
 all-year.all-week.late-peak = 1460
 all-year.all-week.evening = 1460
-level_names = ["month", "day", "hour"]

From cef821b097a208248bfe1ce0b96e9b46088dcde4 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 15:56:57 +0100
Subject: [PATCH 064/419] Recommend prettier VS Code extension

---
 .vscode/extensions.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index f1298fba..93778c28 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -9,7 +9,8 @@
 		"ms-python.python",
 		"mechatroner.rainbow-csv",
 		"editorconfig.editorconfig",
-		"davidanson.vscode-markdownlint"
+		"davidanson.vscode-markdownlint",
+        "esbenp.prettier-vscode"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []

From bba364f1761da77fd0aafd23d331d765b289fd7a Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 11:49:01 +0100
Subject: [PATCH 065/419] pre-commit: Replace various Python tools with ruff

Fixes #267.
---
 .flake8                 | 11 -----------
 .pre-commit-config.yaml | 13 +++++--------
 pyproject.toml          | 23 +++++++++--------------
 3 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 .flake8

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 1593c0e5..00000000
--- a/.flake8
+++ /dev/null
@@ -1,11 +0,0 @@
-[flake8]
-max-line-length = 88
-exclude =
-	.tox,
-	.git,
-    .venv,
-    venv,
-	build,
-	__pycache__,
-extend-ignore =
-	E203,W503
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 850623f1..8ff07bf4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,20 +8,17 @@ repos:
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
-  - repo: https://github.com/timothycrosley/isort
-    rev: "5.13.2"
-    hooks:
-      - id: isort
-        additional_dependencies: [toml]
   - repo: https://github.com/psf/black
     rev: "23.12.1"
     hooks:
       - id: black
         exclude: docs/
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.1
     hooks:
-      - id: flake8
+      - id: ruff
+        types_or: [python, pyi, jupyter]
+        args: [--fix]
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.38.0
     hooks:
diff --git a/pyproject.toml b/pyproject.toml
index 65c55334..d3af4b19 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,10 +3,8 @@ requires = ["setuptools>=61", "wheel", "setuptools_scm>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
+authors = [{name = "Sustainable Gas Institute", email = "sgi@imperial.ac.uk"}]
 name = "MUSE_OS"
-authors = [
-    {name = "Sustainable Gas Institute", email = "sgi@imperial.ac.uk"}
-]
 description = "Energy System Model"
 readme = "README.md"
 license = {file = "LICENSE"}
@@ -38,7 +36,6 @@ dynamic = ["version"]
 all = ["MUSE_OS[dev,doc,excel]"]
 dev = [
     "pytest>4.0.2",
-    "flake8",
     "black",
     "IPython",
     "jupyter",
@@ -62,9 +59,7 @@ doc = [
     "seaborn"
 ]
 excel = ["openpyxl"]
-gui = [
-    "gooey"
-]
+gui = ["gooey"]
 
 [project.urls]
 Homepage = "http://www.sustainablegasinstitute.org/home/muse-energy-model/"
@@ -87,9 +82,6 @@ version = {attr = "muse.VERSION"}
 
 [tool.setuptools_scm]
 
-[tool.pyls]
-configurationsources = ["flake8"]
-
 [tool.pytest.ini_options]
 testpaths = ["tests", "src/muse"]
 addopts = "--doctest-modules -rfE -n auto --dist=loadscope"
@@ -109,7 +101,10 @@ files = ["src/**/*.py", "tests/**/*.py"]
 module = ["setup"]
 ignore_errors = true
 
-[tool.isort]
-line_length = 88
-multi_line_output = 3
-include_trailing_comma = true
+[tool.ruff.lint]
+select = [
+    "E",  # pycodestyle
+    "F",  # Pyflakes
+    "I"  # isort
+]
+ignore = []

From 283d7f90ea409c4e7648f83073d41dc03458a85d Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 15:40:31 +0100
Subject: [PATCH 066/419] pre-commit: Add ruff-format hook

---
 .pre-commit-config.yaml | 7 ++-----
 pyproject.toml          | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8ff07bf4..1f36b368 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,14 +8,11 @@ repos:
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
-  - repo: https://github.com/psf/black
-    rev: "23.12.1"
-    hooks:
-      - id: black
-        exclude: docs/
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.4.1
     hooks:
+      - id: ruff-format
+        types_or: [python, pyi, jupyter]
       - id: ruff
         types_or: [python, pyi, jupyter]
         args: [--fix]
diff --git a/pyproject.toml b/pyproject.toml
index d3af4b19..16455c45 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,6 @@ dynamic = ["version"]
 all = ["MUSE_OS[dev,doc,excel]"]
 dev = [
     "pytest>4.0.2",
-    "black",
     "IPython",
     "jupyter",
     "nbconvert",

From 94d98e532e1860d52be854f21ba9d14a0e167710 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 15:47:35 +0100
Subject: [PATCH 067/419] Run ruff pre-commit hooks

---
 docs/advanced-guide/extending-muse.ipynb      | 65 +++++++++----------
 .../further-extending-muse.ipynb              | 35 +++++-----
 docs/advanced-guide/mynewfunctions.py         |  1 +
 docs/running-muse-example.ipynb               |  2 +-
 .../0-new-decision-metric/new_decision.py     |  3 +-
 .../visualisation-of-results.ipynb            | 14 ++--
 .../2-scenario/solar-scenario-results.ipynb   | 12 ++--
 ...sualise-new-agent-multiple-objective.ipynb |  9 ++-
 ...visualise-new-agent-single-objective.ipynb |  9 ++-
 .../3-add-region/visualise-new-region.ipynb   | 18 +++--
 .../visualise-timing-result-changes.ipynb     | 31 +++++++--
 .../visualise-time-framework-changes.ipynb    | 33 +++++++---
 .../visualise-service-demand-addition.ipynb   | 33 +++++++---
 .../visualise-correlation-demand.ipynb        | 13 +++-
 .../1-min-constraint/output.py                |  1 -
 .../visualise-min-service.ipynb               | 34 ++++++----
 .../2-max-constraint/output.py                |  1 -
 .../visualise-max-service.ipynb               | 26 ++++++--
 docs/user-guide/add-agent.ipynb               | 17 +++--
 .../add-gdp-correlation-demand.ipynb          | 12 ++--
 docs/user-guide/add-region.ipynb              |  4 +-
 docs/user-guide/add-solar.ipynb               | 20 +++---
 docs/user-guide/addition-service-demand.ipynb | 26 ++++++--
 .../min-max-timeslice-constraints.ipynb       | 42 ++++++++----
 docs/user-guide/modify-timing-data.ipynb      | 12 ++--
 src/muse/__init__.py                          |  1 +
 src/muse/__main__.py                          |  1 +
 src/muse/agents/agent.py                      |  1 +
 src/muse/agents/factories.py                  |  1 +
 src/muse/carbon_budget.py                     |  4 +-
 src/muse/commodities.py                       |  1 +
 src/muse/constraints.py                       |  9 ++-
 .../data/example/default_timeslice/output.py  |  1 -
 src/muse/decisions.py                         |  1 +
 src/muse/defaults.py                          |  1 +
 src/muse/demand_matching.py                   |  1 +
 src/muse/demand_share.py                      |  3 +-
 src/muse/examples.py                          |  7 +-
 src/muse/filters.py                           |  1 +
 src/muse/hooks.py                             |  5 +-
 src/muse/interactions.py                      |  3 +-
 src/muse/investments.py                       |  1 +
 src/muse/mca.py                               | 14 ++--
 src/muse/objectives.py                        |  6 +-
 src/muse/outputs/cache.py                     |  1 +
 src/muse/outputs/mca.py                       |  1 +
 src/muse/outputs/sector.py                    |  1 +
 src/muse/outputs/sinks.py                     |  2 +-
 src/muse/production.py                        |  1 +
 src/muse/quantities.py                        |  1 +
 src/muse/readers/csv.py                       | 13 ++--
 src/muse/readers/toml.py                      |  3 +-
 src/muse/registration.py                      |  1 +
 src/muse/regressions.py                       |  5 +-
 src/muse/sectors/__init__.py                  |  1 +
 src/muse/sectors/legacy_sector.py             |  1 +
 src/muse/sectors/preset_sector.py             |  1 +
 src/muse/timeslices.py                        |  1 +
 src/muse/utilities.py                         |  1 +
 tests/conftest.py                             | 10 +--
 tests/test_agents.py                          |  7 +-
 tests/test_aggregoutput.py                    |  6 +-
 tests/test_decisions.py                       |  6 +-
 tests/test_demand_matching.py                 | 15 ++---
 tests/test_demand_share.py                    |  3 +-
 tests/test_filters.py                         |  9 ++-
 tests/test_fullsim_regression.py              |  9 +--
 tests/test_investments.py                     |  9 +--
 tests/test_legacy_sector.py                   | 11 ++--
 tests/test_mca.py                             | 11 ++--
 tests/test_minimum_service.py                 |  1 -
 tests/test_objectives.py                      | 11 +---
 tests/test_outputs.py                         | 22 ++-----
 tests/test_presets.py                         | 15 ++---
 tests/test_quantities.py                      |  9 +--
 tests/test_readers.py                         | 15 ++---
 tests/test_regressions.py                     |  6 +-
 tests/test_timeslice_output.py                |  2 -
 tests/test_timeslices.py                      | 16 ++---
 tests/test_utilities.py                       |  3 +-
 80 files changed, 439 insertions(+), 326 deletions(-)

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 54a6e50d..6590fede 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -89,10 +89,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from muse.outputs.sector import register_output_quantity\n",
-    "from muse.outputs.sector import market_quantity\n",
-    "from xarray import Dataset, DataArray\n",
-    "from typing import Optional, List, Text\n",
+    "from typing import List, Optional, Text\n",
+    "\n",
+    "from muse.outputs.sector import market_quantity, register_output_quantity\n",
+    "from xarray import DataArray, Dataset\n",
+    "\n",
     "\n",
     "@register_output_quantity\n",
     "def consumption_zero(\n",
@@ -129,13 +130,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import Any, Text\n",
+    "from typing import Any\n",
+    "\n",
     "from muse.outputs.sinks import register_output_sink, sink_to_file\n",
     "\n",
+    "\n",
     "@register_output_sink(name=\"txt\")\n",
     "@sink_to_file(\".txt\")\n",
     "def text_dump(data: Any, filename: Text) -> None:\n",
     "    from pathlib import Path\n",
+    "\n",
     "    Path(filename).write_text(f\"Hello world!\\n\\n{data}\")"
    ]
   },
@@ -177,14 +181,15 @@
    "outputs": [],
    "source": [
     "from pathlib import Path\n",
-    "from toml import load, dump\n",
+    "\n",
     "from muse import examples\n",
+    "from toml import dump, load\n",
     "\n",
     "model_path = examples.copy_model(overwrite=True)\n",
     "settings = load(model_path / \"settings.toml\")\n",
     "new_output = {\n",
     "    \"quantity\": \"consumption_zero\",\n",
-    "    \"sink\":  \"txt\",\n",
+    "    \"sink\": \"txt\",\n",
     "    \"overwrite\": True,\n",
     "    \"filename\": \"{cwd}/{default_output_dir}/{Sector}{Quantity}{year}{suffix}\",\n",
     "}\n",
@@ -211,7 +216,9 @@
    "outputs": [],
    "source": [
     "import logging\n",
+    "\n",
     "from muse.mca import MCA\n",
+    "\n",
     "logging.getLogger(\"muse\").setLevel(0)\n",
     "mca = MCA.factory(model_path / \"modified_settings.toml\")\n",
     "mca.run();"
@@ -279,12 +286,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import MutableMapping, Text, List\n",
+    "from typing import MutableMapping, Text\n",
     "\n",
-    "import xarray as xr\n",
     "import pandas as pd\n",
-    "\n",
-    "from muse.outputs.cache import register_cached_quantity, consolidate_quantity\n",
+    "import xarray as xr\n",
+    "from muse.outputs.cache import consolidate_quantity, register_cached_quantity\n",
     "\n",
     "\n",
     "@register_cached_quantity(overwrite=True)\n",
@@ -356,14 +362,15 @@
    "outputs": [],
    "source": [
     "from pathlib import Path\n",
-    "from toml import load, dump\n",
+    "\n",
     "from muse import examples\n",
+    "from toml import dump, load\n",
     "\n",
     "model_path = examples.copy_model(overwrite=True)\n",
     "settings = load(model_path / \"settings.toml\")\n",
     "new_output = {\n",
     "    \"quantity\": \"capacity\",\n",
-    "    \"sink\":  \"aggregate\",\n",
+    "    \"sink\": \"aggregate\",\n",
     "    \"index\": False,\n",
     "    \"filename\": \"{cwd}/{default_output_dir}/Cache{Quantity}.csv\",\n",
     "}\n",
@@ -391,7 +398,9 @@
    "outputs": [],
    "source": [
     "import logging\n",
+    "\n",
     "from muse.mca import MCA\n",
+    "\n",
     "logging.getLogger(\"muse\").setLevel(0)\n",
     "mca = MCA.factory(model_path / \"modified_settings.toml\")\n",
     "mca.run();"
@@ -414,7 +423,7 @@
     "cache_files = sorted((Path() / \"Results\").glob(\"Cache*\"))\n",
     "assert len(cache_files) == 1\n",
     "cached = pd.read_csv(cache_files[0])\n",
-    "assert tuple(cached.category.unique()) == ('retrofit',)"
+    "assert tuple(cached.category.unique()) == (\"retrofit\",)"
    ]
   },
   {
@@ -440,7 +449,7 @@
    "outputs": [],
    "source": [
     "@register_output_quantity(overwrite=True)\n",
-    "def consumption_zero(\n",
+    "def consumption_zero(  # noqa: F811\n",
     "    market: Dataset,\n",
     "    capacity: DataArray,\n",
     "    technologies: Dataset,\n",
@@ -460,12 +469,9 @@
     "\n",
     "@register_output_sink(name=\"txt\", overwrite=True)\n",
     "@sink_to_file(\".txt\")\n",
-    "def text_dump(\n",
-    "    data: Any,\n",
-    "    filename: Text,\n",
-    "    msg : Optional[Text] = \"Hello, world!\"\n",
-    ") -> None:\n",
+    "def text_dump(data: Any, filename: Text, msg: Optional[Text] = \"Hello, world!\") -> None:  # noqa: F811\n",
     "    from pathlib import Path\n",
+    "\n",
     "    Path(filename).write_text(f\"{msg}\\n\\n{data}\")"
    ]
   },
@@ -499,24 +505,21 @@
    "outputs": [],
    "source": [
     "from pathlib import Path\n",
-    "from toml import load, dump\n",
+    "\n",
     "from muse import examples\n",
+    "from toml import dump, load\n",
     "\n",
     "model_path = examples.copy_model(overwrite=True)\n",
     "settings = load(model_path / \"settings.toml\")\n",
     "settings[\"sectors\"][\"residential\"][\"outputs\"] = [\n",
     "    {\n",
-    "        \"quantity\":{\n",
-    "            \"name\": \"consumption_zero\",\n",
-    "            \"sum_over\": \"timeslice\"\n",
-    "        },\n",
-    "        \"sink\":{\n",
+    "        \"quantity\": {\"name\": \"consumption_zero\", \"sum_over\": \"timeslice\"},\n",
+    "        \"sink\": {\n",
     "            \"name\": \"txt\",\n",
     "            \"filename\": \"{cwd}/{default_output_dir}/{Sector}{Quantity}{year}{suffix}\",\n",
     "            \"msg\": \"Hello, you!\",\n",
     "            \"overwrite\": True,\n",
-    "        }\n",
-    "        \n",
+    "        },\n",
     "    }\n",
     "]\n",
     "\n",
@@ -627,11 +630,7 @@
     "settings = load(model_path / \"settings.toml\")\n",
     "settings[\"plugins\"] = [\"{cwd}/mynewfunctions.py\"]\n",
     "settings[\"sectors\"][\"residential\"][\"outputs\"] = [\n",
-    "    {\n",
-    "        \"quantity\": \"capacity\",\n",
-    "        \"sink\":  \"dummy\",\n",
-    "        \"overwrite\": \"true\"\n",
-    "    }\n",
+    "    {\"quantity\": \"capacity\", \"sink\": \"dummy\", \"overwrite\": \"true\"}\n",
     "]\n",
     "dump(settings, (model_path / \"modified_settings.toml\").open(\"w\"))\n",
     "settings"
diff --git a/docs/advanced-guide/further-extending-muse.ipynb b/docs/advanced-guide/further-extending-muse.ipynb
index 9c2e0a13..2ede01ee 100644
--- a/docs/advanced-guide/further-extending-muse.ipynb
+++ b/docs/advanced-guide/further-extending-muse.ipynb
@@ -20,17 +20,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from xarray import Dataset, DataArray\n",
-    "\n",
     "from muse.agents import Agent\n",
     "from muse.filters import register_filter\n",
+    "from xarray import DataArray, Dataset\n",
+    "\n",
     "\n",
     "@register_filter\n",
     "def no_ccgt_filter(\n",
-    "    agent: Agent,\n",
-    "    search_space: DataArray,\n",
-    "    technologies: Dataset,\n",
-    "    market: Dataset\n",
+    "    agent: Agent, search_space: DataArray, technologies: Dataset, market: Dataset\n",
     ") -> DataArray:\n",
     "    \"\"\"Excludes gasCCGT.\"\"\"\n",
     "    dropped_tech = search_space.where(search_space.replacement != \"windturbine\")\n",
@@ -45,8 +42,9 @@
    "source": [
     "import logging\n",
     "import os\n",
-    "from muse.mca import MCA\n",
+    "\n",
     "from muse import examples\n",
+    "from muse.mca import MCA\n",
     "\n",
     "model_path = examples.copy_model(overwrite=True)\n",
     "logging.getLogger(\"muse\").setLevel(0)\n",
@@ -62,11 +60,12 @@
    "source": [
     "import pandas as pd\n",
     "import seaborn as sns\n",
-    "import matplotlib.pyplot\n",
     "\n",
     "results = pd.read_csv(\"Results/MCACapacity.csv\")\n",
     "results\n",
-    "sns.lineplot(data=results[results.sector==\"power\"], x='year', y='capacity', hue='technology')"
+    "sns.lineplot(\n",
+    "    data=results[results.sector == \"power\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
+    ")"
    ]
   },
   {
@@ -93,17 +92,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from muse.decisions import register_decision\n",
     "from typing import Any\n",
-    "from xarray import Dataset, DataArray\n",
+    "\n",
+    "from muse.decisions import register_decision\n",
+    "from xarray import DataArray, Dataset\n",
+    "\n",
     "\n",
     "@register_decision\n",
-    "def median_objective(\n",
-    "    objectives: Dataset,\n",
-    "    parameters: Any,\n",
-    "    **kwargs\n",
-    ") -> DataArray:\n",
+    "def median_objective(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:\n",
     "    from xarray import concat\n",
+    "\n",
     "    allobjectives = concat(objectives.data_vars.values(), dim=\"concat_var\")\n",
     "    return allobjectives.median(set(allobjectives.dims) - {\"asset\", \"replacement\"})"
    ]
@@ -162,11 +160,12 @@
    "source": [
     "import pandas as pd\n",
     "import seaborn as sns\n",
-    "import matplotlib.pyplot\n",
     "\n",
     "results = pd.read_csv(\"../tutorial-code/0-new-decision-metric/Results/MCACapacity.csv\")\n",
     "results = results.groupby([\"year\", \"sector\", \"technology\"]).sum().reset_index()\n",
-    "sns.lineplot(data=results[results.sector==\"power\"], x='year', y='capacity', hue='technology')"
+    "sns.lineplot(\n",
+    "    data=results[results.sector == \"power\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
+    ")"
    ]
   },
   {
diff --git a/docs/advanced-guide/mynewfunctions.py b/docs/advanced-guide/mynewfunctions.py
index 9c16fab6..3dd9be3e 100644
--- a/docs/advanced-guide/mynewfunctions.py
+++ b/docs/advanced-guide/mynewfunctions.py
@@ -7,4 +7,5 @@
 @sink_to_file(".txt")
 def text_dump(data: Any, filename: Text) -> None:
     from pathlib import Path
+
     Path(filename).write_text(f"Hello world!\n\n{data}")
diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index 538d04fb..7b881e7b 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -156,8 +156,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pandas as pd\n",
     "import matplotlib.pyplot as plt\n",
+    "import pandas as pd\n",
     "import seaborn as sns"
    ]
   },
diff --git a/docs/tutorial-code/0-new-decision-metric/new_decision.py b/docs/tutorial-code/0-new-decision-metric/new_decision.py
index f04b9d36..db3a1640 100644
--- a/docs/tutorial-code/0-new-decision-metric/new_decision.py
+++ b/docs/tutorial-code/0-new-decision-metric/new_decision.py
@@ -1,8 +1,7 @@
 from typing import Any
 
-from xarray import DataArray, Dataset
-
 from muse.decisions import register_decision
+from xarray import DataArray, Dataset
 
 
 @register_decision
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb b/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
index 98d1a67a..7166f93a 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
@@ -7,8 +7,7 @@
    "outputs": [],
    "source": [
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -18,9 +17,14 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "print (mca_capacity.head())\n",
-    "power_capacity = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"technology\",\"year\"]).sum().reset_index()\n",
-    "sns.lineplot(data=power_capacity, x='year', y='capacity', hue=\"technology\")"
+    "print(mca_capacity.head())\n",
+    "power_capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   }
  ],
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb b/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
index b1448ab1..0f07d338 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
@@ -7,8 +7,7 @@
    "outputs": [],
    "source": [
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -18,8 +17,13 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "power_capacity = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"technology\", \"year\"]).sum().reset_index()\n",
-    "sns.lineplot(data=power_capacity, x='year', y='capacity', hue=\"technology\")"
+    "power_capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   }
  ],
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb b/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
index 4104c47a..ac77e240 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
@@ -17,7 +17,12 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "power_sector = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"technology\",\"year\", \"agent\"]).sum().reset_index()\n",
+    "power_sector = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "power_sector.head()"
    ]
   },
@@ -27,7 +32,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "g=sns.FacetGrid(power_sector, row='agent')\n",
+    "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb b/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
index 4104c47a..ac77e240 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
@@ -17,7 +17,12 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "power_sector = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"technology\",\"year\", \"agent\"]).sum().reset_index()\n",
+    "power_sector = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "power_sector.head()"
    ]
   },
@@ -27,7 +32,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "g=sns.FacetGrid(power_sector, row='agent')\n",
+    "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
diff --git a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
index 91ae7d1e..fc9f4542 100644
--- a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
+++ b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
@@ -6,9 +6,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import seaborn as sns\n",
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -18,7 +18,12 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "power_sector = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"year\",\"region\"]).sum().reset_index()\n",
+    "power_sector = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"year\", \"region\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "power_sector.head()"
    ]
   },
@@ -28,7 +33,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\").groupby([\"year\",\"technology\",\"region\", \"sector\"]).sum().reset_index()\n",
+    "mca_capacity = (\n",
+    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    .groupby([\"year\", \"technology\", \"region\", \"sector\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
index f66c1d22..d4adcf19 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
@@ -6,9 +6,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -17,14 +17,31 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\").groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"]).sum().reset_index()\n",
+    "mca_capacity = (\n",
+    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    .groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    \n",
-    "    fig, ax =plt.subplots(1,2)\n",
-    "    sns.lineplot(data=sector[sector.region==\"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[0])\n",
-    "    sns.lineplot(data=sector[sector.region==\"R2\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[1])\n",
+    "\n",
+    "    fig, ax = plt.subplots(1, 2)\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[0],\n",
+    "    )\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R2\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[1],\n",
+    "    )\n",
     "    plt.show()\n",
     "    plt.close()"
    ]
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
index 6f1210e1..b36044af 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
@@ -6,9 +6,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -17,18 +17,35 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\").groupby([\"technology\", \"sector\", \"region\", \"year\"]).sum().reset_index()\n",
-    "limits = [20, 20,60]\n",
+    "mca_capacity = (\n",
+    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    .groupby([\"technology\", \"sector\", \"region\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "limits = [20, 20, 60]\n",
     "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    fig, ax =plt.subplots(1,2)\n",
-    "    sns.lineplot(data=sector[sector.region==\"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[0])\n",
-    "    sns.lineplot(data=sector[sector.region==\"R2\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[1])\n",
+    "    fig, ax = plt.subplots(1, 2)\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[0],\n",
+    "    )\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R2\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[1],\n",
+    "    )\n",
     "    ax[0].set_ylim(0, limits[sec_list.index(name)])\n",
     "    ax[1].set_ylim(0, limits[sec_list.index(name)])\n",
     "    plt.show()\n",
-    "    plt.close()\n"
+    "    plt.close()"
    ]
   }
  ],
diff --git a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
index cac20d04..9ffa23d8 100644
--- a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
+++ b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
@@ -6,9 +6,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -17,18 +17,35 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\").groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"]).sum().reset_index()\n",
-    "limits = [20, 70,60]\n",
+    "mca_capacity = (\n",
+    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    .groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "limits = [20, 70, 60]\n",
     "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    fig, ax =plt.subplots(1,2)\n",
-    "    sns.lineplot(data=sector[sector.region==\"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[0])\n",
-    "    sns.lineplot(data=sector[sector.region==\"R2\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[1])\n",
+    "    fig, ax = plt.subplots(1, 2)\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[0],\n",
+    "    )\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R2\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[1],\n",
+    "    )\n",
     "    ax[0].set_ylim(0, limits[sec_list.index(name)])\n",
     "    ax[1].set_ylim(0, limits[sec_list.index(name)])\n",
     "    plt.show()\n",
-    "    plt.close()\n"
+    "    plt.close()"
    ]
   }
  ],
diff --git a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
index 6d318182..297fb7f7 100644
--- a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
+++ b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
@@ -6,8 +6,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pandas as pd\n",
     "import matplotlib.pyplot as plt\n",
+    "import pandas as pd\n",
     "import seaborn as sns"
    ]
   },
@@ -17,7 +17,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\").groupby([\"technology\", \"region\", \"year\", \"sector\"]).sum().reset_index()\n",
+    "mca_capacity = (\n",
+    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    .groupby([\"technology\", \"region\", \"year\", \"sector\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -29,7 +34,9 @@
    "source": [
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    sns.lineplot(data=sector[sector.region==\"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
+    "    )\n",
     "    plt.show()\n",
     "#     plt.close()"
    ]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
index fe6c251c..e6e04bb5 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
@@ -2,7 +2,6 @@
 
 import pandas as pd
 import xarray as xr
-
 from muse.outputs.sector import market_quantity, register_output_quantity
 
 
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
index 17b4cc12..05d89c23 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
@@ -6,9 +6,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -19,10 +19,15 @@
    "source": [
     "# share with minimum service\n",
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "print (mca_capacity.head())\n",
+    "print(mca_capacity.head())\n",
     "\n",
-    "capacity = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"technology\",\"year\"]).sum().reset_index()\n",
-    "sns.lineplot(data=capacity, x='year', y='capacity', hue=\"technology\")"
+    "capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "sns.lineplot(data=capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   },
   {
@@ -33,11 +38,18 @@
    "source": [
     "power_supply_2020 = pd.read_csv(\"Results/Power/Supply_Timeslice/2020.csv\")\n",
     "\n",
-    "sns.lineplot(data=power_supply_2020[(power_supply_2020.commodity==\"electricity\") & (power_supply_2020.year==2025) ], \n",
-    "hue=\"technology\", x=\"timeslice\", y=\"supply\")\n",
+    "sns.lineplot(\n",
+    "    data=power_supply_2020[\n",
+    "        (power_supply_2020.commodity == \"electricity\")\n",
+    "        & (power_supply_2020.year == 2025)\n",
+    "    ],\n",
+    "    hue=\"technology\",\n",
+    "    x=\"timeslice\",\n",
+    "    y=\"supply\",\n",
+    ")\n",
     "plt.title(\"Supply versus timeslice for the year 2025\")\n",
     "\n",
-    "plt.ylim(0,10)\n"
+    "plt.ylim(0, 10)"
    ]
   },
   {
@@ -48,7 +60,7 @@
    "source": [
     "from pathlib import Path\n",
     "\n",
-    "path = 'Results/Residential/Capacity/'\n",
+    "path = \"Results/Residential/Capacity/\"\n",
     "\n",
     "all_files = Path(path).glob(\"*.csv\")\n",
     "\n",
@@ -57,7 +69,7 @@
     "for filename in all_files:\n",
     "    df = pd.read_csv(filename, index_col=None, header=0)\n",
     "    year_needed = filename.stem\n",
-    "    filtered_year = df[df.year==int(year_needed)]\n",
+    "    filtered_year = df[df.year == int(year_needed)]\n",
     "    li.append(filtered_year)\n",
     "\n",
     "frame = pd.concat(li, axis=0, ignore_index=True)\n",
@@ -70,7 +82,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "grouped_by = frame.groupby([\"year\", \"technology\",\"region\"]).sum().reset_index()\n",
+    "grouped_by = frame.groupby([\"year\", \"technology\", \"region\"]).sum().reset_index()\n",
     "grouped_by\n",
     "\n",
     "g = sns.FacetGrid(data=grouped_by, row=\"region\")\n",
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
index fe6c251c..e6e04bb5 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
@@ -2,7 +2,6 @@
 
 import pandas as pd
 import xarray as xr
-
 from muse.outputs.sector import market_quantity, register_output_quantity
 
 
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
index 32f13437..e34ce9a1 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
@@ -6,9 +6,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -19,10 +19,15 @@
    "source": [
     "# share with minimum service\n",
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "print (mca_capacity.head())\n",
+    "print(mca_capacity.head())\n",
     "\n",
-    "capacity = mca_capacity[mca_capacity.sector==\"power\"].groupby([\"technology\",\"year\"]).sum().reset_index()\n",
-    "sns.lineplot(data=capacity, x='year', y='capacity', hue=\"technology\")"
+    "capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "sns.lineplot(data=capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   },
   {
@@ -33,10 +38,17 @@
    "source": [
     "power_supply = pd.read_csv(\"Results/Power/Supply_Timeslice/2025.csv\")\n",
     "\n",
-    "sns.lineplot(data=power_supply[(power_supply.commodity==\"electricity\") & (power_supply.year==2030)], x=\"timeslice\", hue=\"technology\", y=\"supply\")\n",
+    "sns.lineplot(\n",
+    "    data=power_supply[\n",
+    "        (power_supply.commodity == \"electricity\") & (power_supply.year == 2030)\n",
+    "    ],\n",
+    "    x=\"timeslice\",\n",
+    "    hue=\"technology\",\n",
+    "    y=\"supply\",\n",
+    ")\n",
     "plt.title(\"Supply versus timeslice for the year 2030\")\n",
     "\n",
-    "plt.ylim(0,10)\n"
+    "plt.ylim(0, 10)"
    ]
   }
  ],
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 22195092..4b31f265 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -74,7 +74,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pathlib import Path\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -85,8 +84,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv\")\n",
-    "power_sector = mca_capacity[mca_capacity.sector==\"power\"]\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv\"\n",
+    ")\n",
+    "power_sector = mca_capacity[mca_capacity.sector == \"power\"]\n",
     "power_sector.head()"
    ]
   },
@@ -104,7 +105,7 @@
    "outputs": [],
    "source": [
     "power_sector = power_sector.groupby([\"agent\", \"technology\", \"year\"]).sum().reset_index()\n",
-    "g=sns.FacetGrid(power_sector, row='agent')\n",
+    "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
@@ -145,10 +146,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv\")\n",
-    "power_sector = mca_capacity[mca_capacity.sector==\"power\"]\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv\"\n",
+    ")\n",
+    "power_sector = mca_capacity[mca_capacity.sector == \"power\"]\n",
     "power_sector = power_sector.groupby([\"agent\", \"technology\", \"year\"]).sum().reset_index()\n",
-    "g=sns.FacetGrid(power_sector, row='agent')\n",
+    "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 3b0df855..6fadbb80 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -140,9 +140,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -151,7 +151,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv\"\n",
+    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -163,7 +165,9 @@
    "source": [
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    sns.lineplot(data=sector[sector.region==\"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
+    "    )\n",
     "    plt.show()"
    ]
   },
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 0f07049c..be6d9a0b 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -86,9 +86,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import seaborn as sns\n",
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index f51027ac..60b47747 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -292,8 +292,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import seaborn as sns\n",
-    "import pandas as pd"
+    "import pandas as pd\n",
+    "import seaborn as sns"
    ]
   },
   {
@@ -311,7 +311,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv\"\n",
+    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -328,8 +330,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_capacity = mca_capacity[mca_capacity.sector==\"power\"]\n",
-    "sns.lineplot(data=power_capacity, x='year', y='capacity', hue=\"technology\")"
+    "power_capacity = mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   },
   {
@@ -411,9 +413,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv\")\n",
-    "power_capacity = mca_capacity[mca_capacity.sector==\"power\"]\n",
-    "sns.lineplot(data=power_capacity, x='year', y='capacity', hue=\"technology\")"
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv\"\n",
+    ")\n",
+    "power_capacity = mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   },
   {
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index db68d8c7..1138a387 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -228,9 +228,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -239,7 +239,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\"\n",
+    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -251,9 +253,21 @@
    "source": [
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    fig, ax =plt.subplots(1,2)\n",
-    "    sns.lineplot(data=sector[sector.region==\"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[0])\n",
-    "    sns.lineplot(data=sector[sector.region==\"R2\"], x=\"year\", y=\"capacity\", hue=\"technology\", ax=ax[1])\n",
+    "    fig, ax = plt.subplots(1, 2)\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[0],\n",
+    "    )\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R2\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[1],\n",
+    "    )\n",
     "    plt.show()\n",
     "    plt.close()"
    ]
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 7f8bad55..a1a48ca4 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -90,9 +90,7 @@
     "from typing import List, Optional, Text\n",
     "\n",
     "import xarray as xr\n",
-    "\n",
-    "from muse.outputs.sector import register_output_quantity\n",
-    "from muse.outputs.sector import market_quantity\n",
+    "from muse.outputs.sector import market_quantity, register_output_quantity\n",
     "\n",
     "\n",
     "@register_output_quantity\n",
@@ -145,9 +143,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -156,13 +154,22 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2020 = pd.read_csv(\"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv\")\n",
+    "power_supply_2020 = pd.read_csv(\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv\"\n",
+    ")\n",
     "\n",
-    "sns.lineplot(data=power_supply_2020[(power_supply_2020.commodity==\"electricity\") & (power_supply_2020.year==2020) ], \n",
-    "hue=\"technology\", x=\"timeslice\", y=\"supply\")\n",
+    "sns.lineplot(\n",
+    "    data=power_supply_2020[\n",
+    "        (power_supply_2020.commodity == \"electricity\")\n",
+    "        & (power_supply_2020.year == 2020)\n",
+    "    ],\n",
+    "    hue=\"technology\",\n",
+    "    x=\"timeslice\",\n",
+    "    y=\"supply\",\n",
+    ")\n",
     "plt.title(\"Supply versus timeslice for the year 2020\")\n",
     "\n",
-    "plt.ylim(0,10)"
+    "plt.ylim(0, 10)"
    ]
   },
   {
@@ -215,13 +222,22 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2025 = pd.read_csv(\"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv\")\n",
+    "power_supply_2025 = pd.read_csv(\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv\"\n",
+    ")\n",
     "\n",
-    "sns.lineplot(data=power_supply_2025[(power_supply_2025.commodity==\"electricity\") & (power_supply_2025.year==2030)], \n",
-    "x=\"timeslice\", hue=\"technology\", y=\"supply\")\n",
+    "sns.lineplot(\n",
+    "    data=power_supply_2025[\n",
+    "        (power_supply_2025.commodity == \"electricity\")\n",
+    "        & (power_supply_2025.year == 2030)\n",
+    "    ],\n",
+    "    x=\"timeslice\",\n",
+    "    hue=\"technology\",\n",
+    "    y=\"supply\",\n",
+    ")\n",
     "plt.title(\"Supply versus timeslice for the year 2030\")\n",
     "\n",
-    "plt.ylim(0,10)"
+    "plt.ylim(0, 10)"
    ]
   },
   {
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 9b37262d..bdfb8984 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -91,9 +91,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
-    "import seaborn as sns\n",
-    "import matplotlib.pyplot as plt"
+    "import seaborn as sns"
    ]
   },
   {
@@ -109,7 +109,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv\"\n",
+    ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
@@ -197,7 +199,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv\"\n",
+    ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
diff --git a/src/muse/__init__.py b/src/muse/__init__.py
index 9cbec515..58d60839 100644
--- a/src/muse/__init__.py
+++ b/src/muse/__init__.py
@@ -1,4 +1,5 @@
 """MUSE model"""
+
 import os
 
 VERSION = "1.1.0"
diff --git a/src/muse/__main__.py b/src/muse/__main__.py
index 7586cb41..a71bc7f0 100644
--- a/src/muse/__main__.py
+++ b/src/muse/__main__.py
@@ -1,4 +1,5 @@
 """Makes MUSE executable."""
+
 import pathlib
 from argparse import ArgumentParser
 
diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 3daaf432..21f1ffc8 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -1,4 +1,5 @@
 """Holds all building agents."""
+
 from abc import ABC, abstractmethod
 from typing import Callable, Optional, Sequence, Text, Union
 
diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py
index 770039b9..6c257587 100644
--- a/src/muse/agents/factories.py
+++ b/src/muse/agents/factories.py
@@ -1,4 +1,5 @@
 """Holds all building agents."""
+
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence, Text, Union
 
diff --git a/src/muse/carbon_budget.py b/src/muse/carbon_budget.py
index a4150631..4403db87 100644
--- a/src/muse/carbon_budget.py
+++ b/src/muse/carbon_budget.py
@@ -132,7 +132,9 @@ def fitting(
 
     # Based on these results, we finally adjust the carbon price
     new_price = CARBON_BUDGET_FITTERS[fitter](
-        sample_prices, sample_emissions, threshold  # type: ignore
+        sample_prices,
+        sample_emissions,
+        threshold,  # type: ignore
     )
 
     if refine_price and new_market is not None:
diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 573b58a4..162d4f7a 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -1,4 +1,5 @@
 """Methods and types around commodities."""
+
 from enum import IntFlag, auto
 from typing import Sequence, Text, Union
 
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 439175fe..dc901fb2 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -95,6 +95,7 @@ def constraints(
 ``**kwargs``:
     Any other parameter.
 """
+
 from __future__ import annotations
 
 from dataclasses import dataclass
@@ -215,7 +216,7 @@ def decorated(
 def factory(
     settings: Optional[
         Union[Text, Mapping, Sequence[Text], Sequence[Union[Text, Mapping]]]
-    ] = None
+    ] = None,
 ) -> Callable:
     """Creates a list of constraints from standard settings.
 
@@ -745,7 +746,8 @@ def lp_constraint_matrix(
          >>> search = examples.search_space("residential", model="medium")
          >>> assets = next(a.assets for a in res.agents if a.category == "retrofit")
          >>> demand = None # not used in max production
-         >>> constraint = cs.max_production(demand, assets, search, market, technologies) # noqa: E501
+         >>> constraint = cs.max_production(demand, assets, search, market,
+         ...                                technologies) # noqa: E501
          >>> lpcosts = cs.lp_costs(
          ...     (
          ...         technologies
@@ -787,7 +789,8 @@ def lp_constraint_matrix(
          ... )
          >>> decision_dims = {f"d({x})" for x in lpcosts.capacity.dims}
          >>> constraint_dims = {
-         ...     f"c({x})" for x in set(lpcosts.production.dims).union(constraint.b.dims) # noqa: E501
+         ...     f"c({x})"
+         ...     for x in set(lpcosts.production.dims).union(constraint.b.dims)
          ... }
          >>> assert set(result.dims) == decision_dims.union(constraint_dims)
 
diff --git a/src/muse/data/example/default_timeslice/output.py b/src/muse/data/example/default_timeslice/output.py
index 38b933a9..1b5785cb 100644
--- a/src/muse/data/example/default_timeslice/output.py
+++ b/src/muse/data/example/default_timeslice/output.py
@@ -1,7 +1,6 @@
 from typing import List, Optional, Text
 
 import xarray as xr
-
 from muse.outputs.sector import market_quantity, register_output_quantity
 
 
diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index c433318c..8017d89a 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -25,6 +25,7 @@ def weighted_sum(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:
 Returns:
     A data array with ranked replacement technologies.
 """
+
 __all__ = [
     "register_decision",
     "mean",
diff --git a/src/muse/defaults.py b/src/muse/defaults.py
index 8e134086..4249e306 100644
--- a/src/muse/defaults.py
+++ b/src/muse/defaults.py
@@ -1,4 +1,5 @@
 """Default global values used in keyword arguments."""
+
 from pathlib import Path
 
 try:
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index b30d4b57..d871f46b 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -42,6 +42,7 @@
 on production :math:`\sum_d X_{d, i} \leq M_i`. The algorithms in this module try and
 solve these constrained problems one way or another.
 """
+
 __all__ = ["demand_matching"]
 
 
diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 5ab0a1b5..6a68fd26 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -36,6 +36,7 @@ def demand_share(
     the :py:attr:`~muse.agents.agent.AbstractAgent.uuid` of the agent, then agents will
     only service that par of the demand.
 """
+
 __all__ = [
     "new_and_retro",
     "factory",
@@ -83,7 +84,7 @@ def register_demand_share(function: DEMAND_SHARE_SIGNATURE):
 
 
 def factory(
-    settings: Optional[Union[Text, Mapping[Text, Any]]] = None
+    settings: Optional[Union[Text, Mapping[Text, Any]]] = None,
 ) -> DEMAND_SHARE_SIGNATURE:
     if settings is None or isinstance(settings, Text):
         name = settings or "new_and_retro"
diff --git a/src/muse/examples.py b/src/muse/examples.py
index c97ff978..bd0f1f56 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -24,6 +24,7 @@
     model = example.model("default")
     model.run()
 """
+
 from logging import getLogger
 from pathlib import Path
 from typing import List, Optional, Text, Union, cast
@@ -309,9 +310,9 @@ def _copy_multiple_agents(path: Path):
     copytree(example_data_dir() / "default" / "input", path / "input")
     copytree(example_data_dir() / "default" / "technodata", path / "technodata")
     toml = load(example_data_dir() / "default" / "settings.toml")
-    toml["sectors"]["residential"]["subsectors"]["retro_and_new"][
-        "agents"
-    ] = "{path}/technodata/residential/Agents.csv"
+    toml["sectors"]["residential"]["subsectors"]["retro_and_new"]["agents"] = (
+        "{path}/technodata/residential/Agents.csv"
+    )
     with (path / "settings.toml").open("w") as fileobj:
         dump(toml, fileobj)
     copyfile(
diff --git a/src/muse/filters.py b/src/muse/filters.py
index bb8dc905..dd7e1233 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -72,6 +72,7 @@ def search_space_initializer(
 Returns:
     An initial search space
 """
+
 __all__ = [
     "factory",
     "register_filter",
diff --git a/src/muse/hooks.py b/src/muse/hooks.py
index 35e94842..cf88b263 100644
--- a/src/muse/hooks.py
+++ b/src/muse/hooks.py
@@ -1,4 +1,5 @@
 """Pre and post hooks on agents."""
+
 __all__ = [
     "register_initial_asset_transform",
     "register_final_asset_transform",
@@ -77,7 +78,7 @@ def final_assets_transform(old_assets: Dataset, new_assets):
 
 @registrator(registry=INITIAL_ASSET_TRANSFORM, loglevel="info")
 def register_initial_asset_transform(
-    function: Callable[[Agent, Dataset], Dataset]
+    function: Callable[[Agent, Dataset], Dataset],
 ) -> Callable:
     """Decorator to register a function for cleaning or transforming assets.
 
@@ -91,7 +92,7 @@ def register_initial_asset_transform(
 
 @registrator(registry=FINAL_ASSET_TRANSFORM, loglevel="info")
 def register_final_asset_transform(
-    function: Callable[[Dataset, Dataset], Dataset]
+    function: Callable[[Dataset, Dataset], Dataset],
 ) -> Callable:
     """Decorator to register a function to merge new investments into current assets.
 
diff --git a/src/muse/interactions.py b/src/muse/interactions.py
index f26a49e5..998ed00d 100644
--- a/src/muse/interactions.py
+++ b/src/muse/interactions.py
@@ -13,6 +13,7 @@
 interaction. The second registrator registers the interaction proper: it takes agents as
 arguments and returns nothing. It is expected to modify the agents in-place.
 """
+
 __all__ = [
     "register_interaction_net",
     "register_agent_interaction",
@@ -85,7 +86,7 @@ def register_agent_interaction(function: AGENT_INTERACTION_SIGNATURE):
 
 
 def factory(
-    inputs: Optional[Sequence[Union[Mapping, Tuple[Text, Text]]]] = None
+    inputs: Optional[Sequence[Union[Mapping, Tuple[Text, Text]]]] = None,
 ) -> Callable[[Sequence[AbstractAgent]], None]:
     """Creates an interaction functor."""
 
diff --git a/src/muse/investments.py b/src/muse/investments.py
index 8ffb063a..af110928 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -40,6 +40,7 @@ def investment(
     A data array with dimensions `asset` and `technology` specifying the amount
     of newly invested capacity.
 """
+
 __all__ = [
     "adhoc_match_demand",
     "cliff_retirement_profile",
diff --git a/src/muse/mca.py b/src/muse/mca.py
index 64e0b4b2..ae742b90 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -333,11 +333,11 @@ def run(self) -> None:
                 if new_price is not None:
                     future_price = DataArray(new_price, coords=dict(year=years[1]))
 
-                    new_market.prices.loc[
-                        dict(commodity=self.carbon_commodities)
-                    ] = future_propagation(
-                        new_market.prices.sel(commodity=self.carbon_commodities),
-                        future_price,
+                    new_market.prices.loc[dict(commodity=self.carbon_commodities)] = (
+                        future_propagation(
+                            new_market.prices.sel(commodity=self.carbon_commodities),
+                            future_price,
+                        )
                     )
                     self.carbon_price = future_propagation(
                         self.carbon_price, future_price
@@ -361,9 +361,7 @@ def run(self) -> None:
                 self.market.prices.sel(dims), new_market.prices.sel(year=years[1])
             )
 
-            self.outputs(
-                self.market, self.sectors, year=self.time_framework[year_idx]
-            )  # type: ignore
+            self.outputs(self.market, self.sectors, year=self.time_framework[year_idx])  # type: ignore
             self.outputs_cache.consolidate_cache(year=self.time_framework[year_idx])
             getLogger(__name__).info(
                 f"Finish simulation year {years[0]} ({year_idx+1}/{nyear})!"
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index db6c769c..729a167f 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -55,6 +55,7 @@ def comfort(
     Other dimensions can be present, as long as the subsequent decision function nows
     how to reduce them.
 """
+
 __all__ = [
     "register_objective",
     "comfort",
@@ -103,7 +104,7 @@ def objective_factory(settings=Union[Text, Mapping]):
 
 
 def factory(
-    settings: Union[Text, Mapping, Sequence[Union[Text, Mapping]]] = "LCOE"
+    settings: Union[Text, Mapping, Sequence[Union[Text, Mapping]]] = "LCOE",
 ) -> Callable:
     """Creates a function computing multiple objectives.
 
@@ -682,7 +683,8 @@ def net_present_value(
     a Component earns over its lifetime minus all the costs of installing and operating
     it. Follows the definition of the `net present cost`_ given by HOMER Energy.
     Metrics are calculated
-    .. _net present cost: https://www.homerenergy.com/products/pro/docs/3.11/net_present_cost.html # noqa
+    .. _net present cost:
+    ..      https://www.homerenergy.com/products/pro/docs/3.11/net_present_cost.html
 
     - energy commodities INPUTS are related to fuel costs
     - environmental commodities OUTPUTS are related to environmental costs
diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index 4dfb480f..29179817 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -24,6 +24,7 @@
 further output quantities by registering with MUSE via
 :py:func:`muse.outputs.cache.register_cached_quantity`.
 """
+
 from __future__ import annotations
 
 from collections import ChainMap
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 27717683..530ec660 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -15,6 +15,7 @@ def quantity(
 The function should never modify it's arguments. It can return either a pandas dataframe
 or an xarray xr.DataArray.
 """
+
 from operator import attrgetter
 from pathlib import Path
 from typing import (
diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py
index 88cdc586..673fd016 100644
--- a/src/muse/outputs/sector.py
+++ b/src/muse/outputs/sector.py
@@ -19,6 +19,7 @@ def quantity(
 
 The function should never modify it's arguments.
 """
+
 from typing import Any, Callable, List, Mapping, MutableMapping, Optional, Text, Union
 
 import pandas as pd
diff --git a/src/muse/outputs/sinks.py b/src/muse/outputs/sinks.py
index 77d8b8b4..683caadd 100644
--- a/src/muse/outputs/sinks.py
+++ b/src/muse/outputs/sinks.py
@@ -164,7 +164,7 @@ def decorated(
 
 
 def standardize_quantity(
-    function: Callable[[Union[pd.DataFrame, xr.DataArray], Text], None]
+    function: Callable[[Union[pd.DataFrame, xr.DataArray], Text], None],
 ):
     """Helps standardize how the quantities are specified.
 
diff --git a/src/muse/production.py b/src/muse/production.py
index 558b3b77..62710316 100644
--- a/src/muse/production.py
+++ b/src/muse/production.py
@@ -29,6 +29,7 @@ def production(
 Returns:
     A `xr.DataArray` with the amount produced for each good from each asset.
 """
+
 __all__ = [
     "demand_matched_production",
     "factory",
diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index ebf6424c..843dbf7c 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -4,6 +4,7 @@
 e.g. lcoe, maximum production for a given capacity, etc, especially where these
 functions are used in different areas of the model.
 """
+
 from typing import Callable, Optional, Sequence, Text, Tuple, Union, cast
 
 import numpy as np
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 97d6ea4a..b53348d4 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -1,4 +1,5 @@
 """Ensemble of functions to read MUSE data."""
+
 __all__ = [
     "read_technodictionary",
     "read_io_technodata",
@@ -287,7 +288,9 @@ def read_technologies(
         sector = technodata_path_or_sector
         assert sector is None or isinstance(sector, Text)
         tpath = find_sectors_file(
-            f"technodata{sector.title()}.csv", sector, sectors_directory  # type: ignore
+            f"technodata{sector.title()}.csv",
+            sector,
+            sectors_directory,  # type: ignore
         )
         opath = find_sectors_file(
             f"commOUTtechnodata{sector.title()}.csv",  # type: ignore
@@ -910,9 +913,7 @@ def check_utilization_not_all_zero(data, filename):
     if "utilization_factor" not in data.columns:
         raise ValueError(
             """A technology needs to have a utilization factor defined for every
-             timeslice. Please check file {}.""".format(
-                filename
-            )
+             timeslice. Please check file {}.""".format(filename)
         )
     else:
         utilization_sum = data.groupby(["technology", "region", "year"]).sum()
@@ -924,8 +925,6 @@ def check_utilization_not_all_zero(data, filename):
             )
             raise ValueError(
                 """A technology can not have a utilization factor of 0 for every
-                 timeslice. Please check file {}.""".format(
-                    filename
-                )
+                 timeslice. Please check file {}.""".format(filename)
             )
     return data
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index 49b0c9bb..1ac7fc52 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -1,4 +1,5 @@
 """Ensemble of functions to read MUSE data."""
+
 __all__ = ["read_settings"]
 
 import importlib.util as implib
@@ -711,7 +712,7 @@ def check_budget_parameters(settings: Dict) -> None:
     length = len(settings["carbon_budget_control"]["budget"])
     if length > 0:
         msg = "ERROR - budget_check must have the same length that time_framework"
-        if type(settings["time_framework"]) is list:
+        if isinstance(settings["time_framework"], list):
             assert length == len(settings["time_framework"]), msg
             coords = settings["time_framework"]
         else:
diff --git a/src/muse/registration.py b/src/muse/registration.py
index 16fe173d..4b62f726 100644
--- a/src/muse/registration.py
+++ b/src/muse/registration.py
@@ -1,4 +1,5 @@
 """Registrators that allow pluggable data to logic transforms."""
+
 __all__ = ["registrator"]
 
 from typing import Callable, MutableMapping, Optional, Sequence, Text, Union
diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index b0ef0632..a60e59ee 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -1,4 +1,5 @@
 """Functions and functors to compute macro-drivers."""
+
 from __future__ import annotations
 
 from abc import abstractmethod
@@ -333,9 +334,7 @@ def __call__(
         doc = """Regression function: {name}
 
         This functor is a regression function registered with MUSE as '{name}'.
-        """.format(
-            name=name_
-        )
+        """.format(name=name_)
 
         Self = type(
             classname,
diff --git a/src/muse/sectors/__init__.py b/src/muse/sectors/__init__.py
index 7196ddd2..499e11ba 100644
--- a/src/muse/sectors/__init__.py
+++ b/src/muse/sectors/__init__.py
@@ -28,6 +28,7 @@
 New sectors can be registered with the MUSE input files using
 :func:`muse.sectors.register.register_sector`.
 """
+
 __all__ = [
     "AbstractSector",
     "Sector",
diff --git a/src/muse/sectors/legacy_sector.py b/src/muse/sectors/legacy_sector.py
index 6e9f1b2f..2a859ba5 100644
--- a/src/muse/sectors/legacy_sector.py
+++ b/src/muse/sectors/legacy_sector.py
@@ -3,6 +3,7 @@
 
 It can be deleted once accessing those sectors is no longer needed.
 """
+
 from dataclasses import dataclass
 from itertools import chain
 from logging import getLogger
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index de36dd6a..5e0a7077 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -1,4 +1,5 @@
 """Sector with preset behaviours."""
+
 from __future__ import annotations
 
 from typing import Any, Text
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index e36c9403..f470f38f 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -1,4 +1,5 @@
 """Timeslice utility functions."""
+
 __all__ = [
     "reference_timeslice",
     "aggregate_transforms",
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index 8ba83ddc..1561a7de 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -1,4 +1,5 @@
 """Collection of functions and stand-alone algorithms."""
+
 from typing import (
     Any,
     Callable,
diff --git a/tests/conftest.py b/tests/conftest.py
index a5cb3f5c..6e3ceedb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,12 +1,11 @@
 from pathlib import Path
 from typing import Callable, Mapping, Optional, Sequence, Text
 
+from muse.agents import Agent
 from pandas import DataFrame
 from pytest import fixture, mark
 from xarray import DataArray, Dataset
 
-from muse.agents import Agent
-
 
 @fixture(autouse=True)
 def logger():
@@ -225,11 +224,10 @@ def agent_args(coords) -> Mapping:
 @fixture
 def technologies(coords) -> Dataset:
     """randomly generated technology characteristics."""
+    from muse.commodities import CommodityUsage
     from numpy import nonzero, sum
     from numpy.random import choice, rand, randint
 
-    from muse.commodities import CommodityUsage
-
     result = Dataset(coords=coords)
 
     result["comm_type"] = ("commodity", coords["comm_type"])
@@ -353,9 +351,8 @@ def var(*dims, factor=100.0):
 
 
 def create_agent(agent_args, technologies, stock, agent_type="retrofit") -> Agent:
-    from numpy.random import choice
-
     from muse.agents.factories import create_agent
+    from numpy.random import choice
 
     agent = create_agent(
         agent_type=agent_type,
@@ -532,7 +529,6 @@ def capacity(technologies: Dataset) -> DataArray:
 def settings(tmpdir) -> dict:
     """Creates a dummy settings dictionary out of the default settings."""
     import toml
-
     from muse.readers import DEFAULT_SETTINGS_PATH
     from muse.readers.toml import format_paths
 
diff --git a/tests/test_agents.py b/tests/test_agents.py
index 19a60aec..9c71eb10 100644
--- a/tests/test_agents.py
+++ b/tests/test_agents.py
@@ -1,16 +1,16 @@
 """Test buildings agents."""
+
 from pytest import fixture
 
 
 @fixture
 def assets():
     """Creates assets with believable capacity profile."""
+    from muse.utilities import avoid_repetitions
     from numpy import ones
     from numpy.random import choice, randint
     from xarray import Dataset  # noqa
 
-    from muse.utilities import avoid_repetitions
-
     result = Dataset()
     result["year"] = "year", range(2010, 2031)
     assets = set((randint(2010, 2020), choice(list("technology"))) for i in range(30))
@@ -167,9 +167,8 @@ def test_merge_assets(assets):
 
 
 def test_clean_assets(assets):
-    from numpy.random import choice
-
     from muse.utilities import clean_assets
+    from numpy.random import choice
 
     current_year = choice(range(assets.year.min().values, assets.year.max().values))
     iempties = assets.asset[range(0, len(assets.asset), 3)].asset
diff --git a/tests/test_aggregoutput.py b/tests/test_aggregoutput.py
index 0abc715e..7771d758 100644
--- a/tests/test_aggregoutput.py
+++ b/tests/test_aggregoutput.py
@@ -37,9 +37,8 @@ def test_aggregate_sector():
 
 def test_aggregate_sectors():
     """Test for aggregate_sectors function."""
-    from pandas import DataFrame, concat
-
     from muse.outputs.mca import _aggregate_sectors
+    from pandas import DataFrame, concat
 
     mca = examples.model("multiple_agents")
     year = [2020, 2025, 2030]
@@ -75,9 +74,8 @@ def test_aggregate_sectors():
 def test_aggregate_sector_manyregions():
     """Test for aggregate_sector function with two regions check colum titles, number of
     agents/region/technologies and assets capacities."""
-    from pandas import DataFrame, concat
-
     from muse.outputs.mca import _aggregate_sectors
+    from pandas import DataFrame, concat
 
     mca = examples.model("multiple_agents")
     residential = next(
diff --git a/tests/test_decisions.py b/tests/test_decisions.py
index 324135a5..9a024b85 100644
--- a/tests/test_decisions.py
+++ b/tests/test_decisions.py
@@ -50,13 +50,12 @@ def normalize(objective):
 
 def test_lexical():
     """Test lexical comparison against hand-constructed tuples."""
+    from muse.decisions import lexical_comparison
     from numpy import floor, zeros
     from numpy.random import choice, rand
     from scipy.stats import rankdata
     from xarray import Dataset
 
-    from muse.decisions import lexical_comparison
-
     a = rand(5, 10) * 10 - 5
     b = rand(5, 10) * 10 - 5
     c = rand(5, 10) * 10 - 5
@@ -90,11 +89,10 @@ def test_lexical():
 
 
 def test_epsilon_constraints(objectives):
+    from muse.decisions import epsilon_constraints, retro_epsilon_constraints
     from numpy import array, isnan
     from numpy.random import choice
 
-    from muse.decisions import epsilon_constraints, retro_epsilon_constraints
-
     objectives.b[:] = array(range(1, objectives.b.size + 1)).reshape(objectives.b.shape)
     objectives.c[:] = array(range(1, objectives.c.size + 1)).reshape(objectives.c.shape)
 
diff --git a/tests/test_demand_matching.py b/tests/test_demand_matching.py
index 4cf25425..9069e241 100644
--- a/tests/test_demand_matching.py
+++ b/tests/test_demand_matching.py
@@ -60,11 +60,10 @@ def dataset(timeslice):
 
 
 def test_cost_order(dataset):
+    from muse.demand_matching import demand_matching
     from numpy import arange
     from xarray import broadcast
 
-    from muse.demand_matching import demand_matching
-
     # simplify dataset. bail out if size is too small for test.
     ds = dataset.sum(set(dataset.dims).difference(("dm", "cm")))
     if ds.cm.size < 2:
@@ -100,9 +99,8 @@ def test_cost_order(dataset):
 
 
 def test_no_constraints_no_i_dims(demand, cost):
-    from xarray import broadcast
-
     from muse.demand_matching import demand_matching
+    from xarray import broadcast
 
     x = demand_matching(demand, cost.sum("b"))
     assert set(x.dims) == set(demand.dims)
@@ -121,9 +119,8 @@ def test_no_constraints_no_i_dims(demand, cost):
 
 
 def test_no_constraints_i_dims(demand, cost):
-    from xarray import broadcast
-
     from muse.demand_matching import demand_matching
+    from xarray import broadcast
 
     x = demand_matching(demand.sum("a"), cost, protected_dims={"a"})
     assert set(x.dims) == set(demand.dims)
@@ -138,9 +135,8 @@ def test_no_constraints_i_dims(demand, cost):
 
 def test_one_non_binding_constraint(demand, cost):
     """Constraint where excess is always 0."""
-    from xarray import broadcast
-
     from muse.demand_matching import demand_matching
+    from xarray import broadcast
 
     x = demand_matching(demand, cost, 2 * demand)
     assert set(x.dims) == set(demand.dims)
@@ -155,9 +151,8 @@ def test_one_non_binding_constraint(demand, cost):
 
 def test_one_cutting_constraint(demand, cost):
     """Constraint where excess is not always 0."""
-    from xarray import broadcast
-
     from muse.demand_matching import demand_matching
+    from xarray import broadcast
 
     constraint = demand.sum("a") * 0.5
 
diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py
index 2b263994..3686dd8b 100644
--- a/tests/test_demand_share.py
+++ b/tests/test_demand_share.py
@@ -14,10 +14,9 @@ def matching_market(technologies, stock, timeslice):
 
 def _matching_market(technologies, stock, timeslice):
     """A market which matches stocks exactly."""
-    from numpy.random import random
-
     from muse.quantities import consumption, maximum_production
     from muse.timeslices import QuantityType, convert_timeslice
+    from numpy.random import random
 
     market = xr.Dataset()
     production = convert_timeslice(
diff --git a/tests/test_filters.py b/tests/test_filters.py
index 785aa5a1..d47f28d4 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -1,8 +1,7 @@
 import numpy as np
 import xarray as xr
-from pytest import fixture, mark
-
 from muse.filters import factory, register_filter, register_initializer
+from pytest import fixture, mark
 
 
 @fixture
@@ -80,9 +79,9 @@ def test_same_enduse(retro_agent, technologies, search_space):
         for tech in result.replacement:
             tech_enduses = finputs.sel(technology=tech)
             tech_enduses = set(tech_enduses.commodity.loc[tech_enduses].values)
-            expected.loc[
-                {"replacement": tech, "asset": asset}
-            ] = asset_enduses.issubset(tech_enduses)
+            expected.loc[{"replacement": tech, "asset": asset}] = (
+                asset_enduses.issubset(tech_enduses)
+            )
 
     assert sorted(result.dims) == sorted(search_space.dims)
     assert (result == expected).all()
diff --git a/tests/test_fullsim_regression.py b/tests/test_fullsim_regression.py
index cb0553d0..54e41dbc 100644
--- a/tests/test_fullsim_regression.py
+++ b/tests/test_fullsim_regression.py
@@ -1,8 +1,7 @@
 from pathlib import Path
 
-from pytest import mark
-
 from muse.examples import available_examples
+from pytest import mark
 
 
 @mark.usefixtures("save_timeslice_globals")
@@ -11,10 +10,9 @@
 def test_fullsim_regression(model, tmpdir, compare_dirs):
     from warnings import simplefilter
 
-    from pandas.errors import DtypeWarning
-
     from muse.examples import copy_model
     from muse.mca import MCA
+    from pandas.errors import DtypeWarning
 
     # fail the test if this warning crops up
     simplefilter("error", DtypeWarning)
@@ -46,9 +44,8 @@ def test_tutorial_regression(tutorial_path, tmpdir, compare_dirs):
     import shutil
     from warnings import simplefilter
 
-    from pandas.errors import DtypeWarning
-
     from muse.mca import MCA
+    from pandas.errors import DtypeWarning
 
     # fail the test if this warning crops up
     simplefilter("error", DtypeWarning)
diff --git a/tests/test_investments.py b/tests/test_investments.py
index 92b9abbb..2125eb41 100644
--- a/tests/test_investments.py
+++ b/tests/test_investments.py
@@ -3,12 +3,11 @@
 
 @fixture
 def capacity_expansion():
+    from muse.investments import CapacityAddition
     from numpy import arange
     from numpy.random import rand
     from xarray import Dataset
 
-    from muse.investments import CapacityAddition
-
     data = Dataset()
     data["asset"] = "asset", arange(5, 10)
     data["replacement"] = "replacement", arange(0, 6)
@@ -31,11 +30,10 @@ def add_var(coordinates, *dims, factor=100.0):
 
 
 def test_cliff_retirement_known_profile():
+    from muse.investments import cliff_retirement_profile
     from numpy import array
     from xarray import DataArray
 
-    from muse.investments import cliff_retirement_profile
-
     technology = ["a", "b", "c"]
     lifetime = DataArray(
         range(1, 1 + len(technology)),
@@ -58,11 +56,10 @@ def test_cliff_retirement_known_profile():
 
 @mark.parametrize("protected", range(12))
 def test_cliff_retirement_random_profile(protected):
+    from muse.investments import cliff_retirement_profile
     from numpy.random import randint
     from xarray import DataArray
 
-    from muse.investments import cliff_retirement_profile
-
     technology = list("abcde")
 
     lifetime = DataArray(
diff --git a/tests/test_legacy_sector.py b/tests/test_legacy_sector.py
index 4ea1e7db..01e7d219 100644
--- a/tests/test_legacy_sector.py
+++ b/tests/test_legacy_sector.py
@@ -87,7 +87,6 @@ def test_legacy_sector_creation(sector, filepath):
 
 def test_xarray_to_array(market):
     import numpy as np
-
     from muse.sectors.legacy_sector import xarray_to_ndarray
     from muse.timeslices import QuantityType
 
@@ -106,11 +105,10 @@ def test_xarray_to_array(market):
 
 
 def test_array_to_xarray(market):
-    from numpy import array
-    from xarray import broadcast
-
     from muse.sectors.legacy_sector import ndarray_to_xarray
     from muse.timeslices import QuantityType
+    from numpy import array
+    from xarray import broadcast
 
     dims = ("commodity", "region", "year", "timeslice")
     arr = market.supply.transpose(*dims).values
@@ -131,11 +129,10 @@ def test_array_to_xarray(market):
 
 
 def test_round_trip(market):
-    from numpy import array
-    from xarray import broadcast
-
     from muse.sectors.legacy_sector import ndarray_to_xarray, xarray_to_ndarray
     from muse.timeslices import QuantityType
+    from numpy import array
+    from xarray import broadcast
 
     dims = ("commodity", "region", "year", "timeslice")
 
diff --git a/tests/test_mca.py b/tests/test_mca.py
index ca80d200..8f69177c 100644
--- a/tests/test_mca.py
+++ b/tests/test_mca.py
@@ -1,8 +1,7 @@
 from typing import Sequence
 
-from xarray import Dataset
-
 from muse.commodities import CommodityUsage
+from xarray import Dataset
 
 
 def test_check_equilibrium(market: Dataset):
@@ -48,11 +47,10 @@ def test_check_demand_fulfillment(market):
 
 def sector_market(market: Dataset, comm_usage: Sequence[CommodityUsage]) -> Dataset:
     """Creates a likely return market from a sector."""
+    from muse.commodities import is_consumable, is_enduse, is_other
     from numpy.random import randint
     from xarray import DataArray
 
-    from muse.commodities import is_consumable, is_enduse, is_other
-
     shape = (
         len(market.year),
         len(market.commodity),
@@ -85,13 +83,12 @@ def test_find_equilibrium(market: Dataset):
     from copy import deepcopy
     from unittest.mock import patch
 
+    from muse.commodities import is_enduse, is_other
+    from muse.mca import find_equilibrium
     from numpy.random import choice
     from pytest import approx
     from xarray import broadcast
 
-    from muse.commodities import is_enduse, is_other
-    from muse.mca import find_equilibrium
-
     market = market.interp(year=[2010, 2015])
     a_enduses = choice(market.commodity.values, 5, replace=False).tolist()
     b_enduses = [a_enduses.pop(), a_enduses.pop()]
diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index b3bdd4b3..ded2b50d 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -27,7 +27,6 @@ def modify_minimum_service_factors(
 )
 def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
     import pandas as pd
-
     from muse import examples
     from muse.mca import MCA
 
diff --git a/tests/test_objectives.py b/tests/test_objectives.py
index 70a08fde..37b17767 100644
--- a/tests/test_objectives.py
+++ b/tests/test_objectives.py
@@ -77,7 +77,6 @@ def test_comfort(search_space, demand_share, technologies, retro_agent):
 
 def test_capital_costs(demand_share, search_space, technologies, retro_agent):
     import numpy as np
-
     from muse.objectives import capital_costs
 
     technologies["cap_par"] = add_var(technologies, "technology", "region", "year")
@@ -136,10 +135,9 @@ def test_capital_costs(demand_share, search_space, technologies, retro_agent):
 def test_emission_cost(
     demand_share, search_space, technologies, retro_agent, agent_market
 ):
-    from xarray import broadcast
-
     from muse.commodities import is_enduse, is_pollutant
     from muse.objectives import emission_cost
+    from xarray import broadcast
 
     fouts = technologies.fixed_outputs.sel(
         commodity=is_pollutant(technologies.comm_usage)
@@ -179,7 +177,6 @@ def test_capacity_fulfilling_demand(
     search_space, demand_share, technologies, retro_agent, agent_market
 ):
     import numpy as np
-
     from muse.objectives import capacity_to_service_demand, fixed_costs
 
     minyear = technologies.year.values.min()
@@ -240,11 +237,10 @@ def test_capacity_fulfilling_demand(
 def test_fuel_consumption(
     demand_share, search_space, technologies, retro_agent, agent_market
 ):
-    from xarray import broadcast
-
     from muse.commodities import is_fuel
     from muse.objectives import fuel_consumption_cost
     from muse.quantities import consumption
+    from xarray import broadcast
 
     actual = fuel_consumption_cost(
         retro_agent, demand_share, search_space, technologies, agent_market
@@ -289,7 +285,6 @@ def test_net_present_value(
     .
     """
     import xarray
-
     from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant
     from muse.objectives import (
         capacity_to_service_demand,
@@ -398,7 +393,7 @@ def test_net_present_value(
     non_env_production = production.sel(commodity=is_enduse(tech.comm_usage)).sum(
         "commodity"
     )
-    fix_costs = ((rates * hours_ratio * fix_par * capacity**fix_exp)).sum("year")
+    fix_costs = (rates * hours_ratio * fix_par * capacity**fix_exp).sum("year")
 
     variable_costs = (rates * var_par * (non_env_production**var_exp)).sum("year")
     fixed_and_variable_costs = fix_costs + variable_costs
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index 0dbab9d7..8f76a786 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -1,4 +1,5 @@
 """Test saving outputs to file."""
+
 from pathlib import Path
 from typing import Dict, Text
 from unittest.mock import patch
@@ -6,9 +7,8 @@
 import numpy as np
 import pandas as pd
 import xarray as xr
-from pytest import approx, fixture, importorskip, mark, raises
-
 from muse.outputs.sector import factory
+from pytest import approx, fixture, importorskip, mark, raises
 
 
 @fixture
@@ -276,10 +276,9 @@ def test_yearly_aggregate_no_outputs(tmpdir):
 
 
 def test_mca_aggregate_outputs(tmpdir):
-    from toml import dump, load
-
     from muse import examples
     from muse.mca import MCA
+    from toml import dump, load
 
     examples.copy_model(path=str(tmpdir))
     settings = load(str(tmpdir / "model" / "settings.toml"))
@@ -299,12 +298,11 @@ def test_mca_aggregate_outputs(tmpdir):
 
 @mark.usefixtures("save_registries")
 def test_path_formatting(tmpdir):
-    from toml import dump, load
-
     from muse.examples import copy_model
     from muse.mca import MCA
     from muse.outputs.mca import register_output_quantity
     from muse.outputs.sinks import register_output_sink, sink_to_file
+    from toml import dump, load
 
     # Copy the data to tmpdir
     copy_model(path=tmpdir)
@@ -366,12 +364,11 @@ def test_finite_resources_quantity(limits_path):
 
 
 def test_finite_resources_in_sim(tmp_path, limits_path):
-    from toml import dump, load
-
     from muse import examples
     from muse.mca import MCA
     from muse.outputs.sinks import FiniteResourceException
     from muse.readers.toml import read_settings
+    from toml import dump, load
 
     examples.copy_model("default", path=tmp_path)
     toml = load(tmp_path / "model" / "settings.toml")
@@ -423,7 +420,6 @@ def test_init(self, mock_factory, mock_subscribe):
     @patch("muse.outputs.sector._factory")
     def test_cache(self, mock_factory, mock_subscribe):
         import xarray as xr
-
         from muse.outputs.cache import OutputCache
 
         param = [dict(quantity="height"), dict(quantity="width")]
@@ -444,7 +440,6 @@ def test_cache(self, mock_factory, mock_subscribe):
     @patch("muse.outputs.sector._factory")
     def test_consolidate_cache(self, mock_factory, mock_subscribe):
         import xarray as xr
-
         from muse.outputs.cache import OutputCache
 
         param = [dict(quantity="height"), dict(quantity="width")]
@@ -495,7 +490,6 @@ def fun2():
 
 def test_match_quantities():
     import xarray as xr
-
     from muse.outputs.cache import match_quantities
 
     q = "mass"
@@ -575,9 +569,8 @@ def test_extract_agents_internal(newcapa_agent, retro_agent):
 def test_aggregate_cache():
     import numpy as np
     import xarray as xr
-    from pandas.testing import assert_frame_equal
-
     from muse.outputs.cache import _aggregate_cache
+    from pandas.testing import assert_frame_equal
 
     quantity = "heigth"
 
@@ -653,7 +646,6 @@ def test_consolidate_quantity(newcapa_agent, retro_agent):
 @patch("muse.outputs.cache.consolidate_quantity")
 def test_output_capacity(mock_consolidate):
     import xarray as xr
-
     from muse.outputs.cache import capacity
 
     cached = [xr.DataArray() for _ in range(3)]
@@ -666,7 +658,6 @@ def test_output_capacity(mock_consolidate):
 @patch("muse.outputs.cache.consolidate_quantity")
 def test_output_production(mock_consolidate):
     import xarray as xr
-
     from muse.outputs.cache import production
 
     cached = [xr.DataArray() for _ in range(3)]
@@ -679,7 +670,6 @@ def test_output_production(mock_consolidate):
 @patch("muse.outputs.cache.consolidate_quantity")
 def test_output_lcoe(mock_consolidate):
     import xarray as xr
-
     from muse.outputs.cache import lcoe
 
     cached = [xr.DataArray() for _ in range(3)]
diff --git a/tests/test_presets.py b/tests/test_presets.py
index 70be1b9b..451d5dbd 100644
--- a/tests/test_presets.py
+++ b/tests/test_presets.py
@@ -16,10 +16,9 @@ def commercial_path():
 
 @mark.legacy
 def test_presets_fails_on_missing_data(commercial_path):
-    from pytest import raises
-
     from muse.readers.toml import convert
     from muse.sectors import PresetSector
+    from pytest import raises
 
     nested = convert(dict(sectors=dict(preset=dict())))
     with raises(IOError):
@@ -40,10 +39,9 @@ def test_presets_from_single(commercial_path):
 
 @mark.legacy
 def test_presets_from_outputs(commercial_path):
-    from xarray import Dataset
-
     from muse.readers.toml import convert
     from muse.sectors import PresetSector
+    from xarray import Dataset
 
     settings = dict(
         consumption_path=str(commercial_path / "*Consumption.csv"),
@@ -63,10 +61,9 @@ def test_presets_from_outputs(commercial_path):
 @mark.sgidata
 @mark.legacy
 def test_presets_from_regression(sectors_dir, commercial_path):
-    from xarray import Dataset
-
     from muse.readers.toml import convert
     from muse.sectors import PresetSector
+    from xarray import Dataset
 
     settings = dict(
         macrodrivers_path=sectors_dir.join("Macrodrivers.csv"),
@@ -85,10 +82,9 @@ def test_presets_from_regression(sectors_dir, commercial_path):
 @mark.sgidata
 @mark.legacy
 def test_presets_from_regression_with_forecast(sectors_dir, commercial_path):
-    from xarray import Dataset
-
     from muse.readers.toml import convert
     from muse.sectors import PresetSector
+    from xarray import Dataset
 
     settings = dict(
         macrodrivers_path=sectors_dir.join("Macrodrivers.csv"),
@@ -109,10 +105,9 @@ def test_presets_from_regression_with_forecast(sectors_dir, commercial_path):
 
 @mark.legacy
 def test_presets_from_projection(commercial_path):
-    from xarray import Dataset
-
     from muse.readers.toml import convert
     from muse.sectors import PresetSector
+    from xarray import Dataset
 
     settings = dict(costs_path=str(commercial_path / "prices.csv"))
     nested = convert(dict(sectors=dict(residential=settings)))
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index 17e1b8fe..da99c3db 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -41,10 +41,9 @@ def make_array(array):
 
 def test_supply_enduse(technologies, capacity, timeslice):
     """End-use part of supply."""
-    from numpy.random import random
-
     from muse.commodities import is_enduse
     from muse.quantities import maximum_production, supply
+    from numpy.random import random
 
     production = maximum_production(technologies, capacity)
     share = xr.DataArray(
@@ -332,11 +331,10 @@ def test_capacity_in_use(production: xr.DataArray, technologies: xr.Dataset):
 
 
 def test_supply_cost(production: xr.DataArray, timeslice: xr.Dataset):
+    from muse.quantities import supply_cost
     from numpy import average
     from numpy.random import random
 
-    from muse.quantities import supply_cost
-
     timeslice = timeslice.timeslice
     production = production.sel(year=production.year.min(), drop=True)
     # no zero production, because it does not sit well with np.average
@@ -372,9 +370,8 @@ def test_supply_cost(production: xr.DataArray, timeslice: xr.Dataset):
 
 
 def test_supply_cost_zero_prod(production: xr.DataArray, timeslice: xr.Dataset):
-    from numpy.random import randn
-
     from muse.quantities import supply_cost
+    from numpy.random import randn
 
     timeslice = timeslice.timeslice
     production = production.sel(year=production.year.min(), drop=True)
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 91a408d7..a6715890 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -227,9 +227,8 @@ def test_format_paths_path():
 
 
 def test_split_toml_one_down(tmpdir):
-    from toml import dumps
-
     from muse.readers.toml import read_split_toml
+    from toml import dumps
 
     (tmpdir / "outer.toml").write(
         dumps(
@@ -252,9 +251,8 @@ def test_split_toml_one_down(tmpdir):
 
 
 def test_split_toml_nested(tmpdir):
-    from toml import dumps
-
     from muse.readers.toml import read_split_toml
+    from toml import dumps
 
     (tmpdir / "outer.toml").write(
         dumps(
@@ -278,11 +276,10 @@ def test_split_toml_nested(tmpdir):
 
 
 def test_split_toml_too_manyops_in_outer(tmpdir):
+    from muse.readers.toml import IncorrectSettings, read_split_toml
     from pytest import raises
     from toml import dumps
 
-    from muse.readers.toml import IncorrectSettings, read_split_toml
-
     (tmpdir / "outer.toml").write(
         dumps(
             {
@@ -302,11 +299,10 @@ def test_split_toml_too_manyops_in_outer(tmpdir):
 
 
 def test_split_toml_too_manyops_in_inner(tmpdir):
+    from muse.readers.toml import IncorrectSettings, read_split_toml
     from pytest import raises
     from toml import dumps
 
-    from muse.readers.toml import IncorrectSettings, read_split_toml
-
     (tmpdir / "outer.toml").write(
         dumps(
             {
@@ -326,11 +322,10 @@ def test_split_toml_too_manyops_in_inner(tmpdir):
 
 
 def test_split_toml_incorrect_inner_name(tmpdir):
+    from muse.readers.toml import MissingSettings, read_split_toml
     from pytest import raises
     from toml import dumps
 
-    from muse.readers.toml import MissingSettings, read_split_toml
-
     (tmpdir / "outer.toml").write(
         dumps(
             {
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index cc93c969..cafe2b12 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -41,11 +41,10 @@ def drivers():
 
 
 def test_exponential(regression_params, drivers):
+    from muse.regressions import Exponential
     from numpy import exp
     from xarray import broadcast
 
-    from muse.regressions import Exponential
-
     rp = regression_params.drop_vars(("c", "w", "b0", "b1"))
     functor = Exponential(**(rp.data_vars))
     actual = functor(drivers)
@@ -60,9 +59,8 @@ def test_exponential(regression_params, drivers):
 
 
 def test_linear(regression_params, drivers):
-    from xarray import DataArray, broadcast
-
     from muse.regressions import Linear
+    from xarray import DataArray, broadcast
 
     rp = regression_params.drop_vars(("c", "w", "b"))
     functor = Linear(**rp.data_vars)
diff --git a/tests/test_timeslice_output.py b/tests/test_timeslice_output.py
index 65b19e53..65b9e8ba 100644
--- a/tests/test_timeslice_output.py
+++ b/tests/test_timeslice_output.py
@@ -25,7 +25,6 @@ def test_fullsim_timeslices(tmpdir, utilization_factors, process_name):
     from operator import ge, le
 
     import pandas as pd
-
     from muse import examples
     from muse.mca import MCA
 
@@ -85,7 +84,6 @@ def test_zero_utilization_factor_supply_timeslice(
     tmpdir, utilization_factors, process_name, output
 ):
     import pandas as pd
-
     from muse import examples
     from muse.mca import MCA
 
diff --git a/tests/test_timeslices.py b/tests/test_timeslices.py
index 2a0c1a13..ed7b89cc 100644
--- a/tests/test_timeslices.py
+++ b/tests/test_timeslices.py
@@ -1,8 +1,8 @@
 """Test timeslice utilities."""
-from pytest import approx, fixture
-from xarray import DataArray
 
 from muse.timeslices import QuantityType, convert_timeslice
+from pytest import approx, fixture
+from xarray import DataArray
 
 
 @fixture
@@ -104,9 +104,8 @@ def test_convert_intensive_timeslice(reference, rough, transforms):
 
 
 def test_reference_timeslice():
-    from toml import loads
-
     from muse.timeslices import reference_timeslice
+    from toml import loads
 
     inputs = loads(
         """
@@ -138,9 +137,8 @@ def test_reference_timeslice():
 
 
 def test_no_overlap():
-    from pytest import raises
-
     from muse.timeslices import reference_timeslice
+    from pytest import raises
 
     with raises(ValueError):
         reference_timeslice(
@@ -160,9 +158,8 @@ def test_aggregate_transforms_no_aggregates():
     from itertools import product
     from typing import Dict
 
-    from numpy import ndarray, zeros
-
     from muse.timeslices import aggregate_transforms, reference_timeslice
+    from numpy import ndarray, zeros
 
     reference = reference_timeslice(
         """
@@ -190,9 +187,8 @@ def test_aggregate_transforms_with_aggregates():
     from itertools import product
     from typing import Dict
 
-    from toml import loads
-
     from muse.timeslices import aggregate_transforms, reference_timeslice
+    from toml import loads
 
     toml = loads(
         """
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index eed21c33..60219802 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -217,9 +217,8 @@ def test_lexical_nobin(order):
 
 
 def test_merge_assets():
-    from numpy import arange
-
     from muse.utilities import merge_assets
+    from numpy import arange
 
     def fake(year, order=("installed", "technology")):
         result = xr.Dataset()

From ef2b6a7250ae58f1d4556c0510d51ea68a069757 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 16:30:15 +0100
Subject: [PATCH 068/419] VS Code: Recommend ruff extension

---
 .vscode/extensions.json | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 93778c28..7f428979 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,17 +1,18 @@
 {
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		"bungcip.better-toml",
-		"janisdd.vscode-edit-csv",
-		"github.vscode-pull-request-github",
-		"ms-python.python",
-		"mechatroner.rainbow-csv",
-		"editorconfig.editorconfig",
-		"davidanson.vscode-markdownlint",
-        "esbenp.prettier-vscode"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": []
+    // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+    // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+    // List of extensions which should be recommended for users of this workspace.
+    "recommendations": [
+        "bungcip.better-toml",
+        "janisdd.vscode-edit-csv",
+        "github.vscode-pull-request-github",
+        "ms-python.python",
+        "mechatroner.rainbow-csv",
+        "editorconfig.editorconfig",
+        "davidanson.vscode-markdownlint",
+        "esbenp.prettier-vscode",
+        "charliermarsh.ruff"
+    ],
+    // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+    "unwantedRecommendations": []
 }

From 48263c69a383cbeea1780830b1f7b16805a500a8 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 16:29:16 +0100
Subject: [PATCH 069/419] VS Code: Update settings.json

---
 .vscode/settings.json | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 351a9965..9329ef54 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,11 +1,24 @@
 {
-    "python.linting.pylintEnabled": false,
-    "python.linting.flake8Enabled": true,
-    "python.linting.enabled": true,
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    },
+    "[json]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[jsonc]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[yaml]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[toml]": {
+        "editor.formatOnSave": false
+    },
     "editor.formatOnSave": true,
-    "python.formatting.provider": "black",
-    "python.linting.mypyEnabled": true,
-    "python.testing.pytestEnabled": true,
-    "restructuredtext.confPath": "${workspaceFolder}/docs",
-    "python.pythonPath": "/opt/anaconda3/envs/muse/bin/python"
+    "editor.rulers": [88],
+
+    // --no-cov needed so that breakpoints work: https://github.com/microsoft/vscode-python/issues/693
+    "python.testing.pytestArgs": ["--no-cov"],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }

From 866b40e553632e285ec1d1ca0af4a05a777e8d05 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 24 Apr 2024 10:21:34 +0100
Subject: [PATCH 070/419] Improvements to pseudocode

---
 .../1-introduction/generate_model.py           | 10 +++++-----
 .../2-scenario/generate_model.py               |  6 +++---
 .../1-multiple-objective/generate_model.py     |  6 +++---
 .../3-add-region/generate_model.py             | 18 +++++++++---------
 .../1-modify-timeslices/generate_model.py      |  5 +++--
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
index b3089aff..283c7d0b 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
@@ -27,7 +27,7 @@
 # >>> No values changed
 
 # File: input/GlobalCommodities.csv
-# Copy row for {copy_from.capitalize()}, changing Commidity to
+# Copy row(s) where Commodity={copy_from.capitalize()}, changing Commidity to
 #     {commodity_name.capitalize()} and CommodityName to {commodity_name}
 # >>> No values changed
 
@@ -48,19 +48,19 @@
 
 
 # File: technodata/{sector}/CommIn.csv
-# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
 # >>> Change solar value to 1
 # >>> Change wind value to 0
 
 # File: technodata/{sector}/CommOut.csv
-# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
 # >>> No values changed
 
 # File: technodata/{sector}/ExistingCapacity.csv
-# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
 # >>> No values changed
 
 # File: technodata/{sector}/technodata.csv
-# Copy row(s) for {copy_from}, changing ProcessName to {process_name}
+# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
 # >>> Change cap_par to 30
 # >>> Change Fuel to 'solar'
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py b/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
index 8f4cbdd4..7333a25d 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
@@ -11,13 +11,13 @@
 """
 
 # File: technodata/{sector}/technodata.csv
-# Copy rows from {copy_from}, replacing Time with {year}
+# Copy rows where Time={copy_from}, replacing Time with {year}
 # >>> Change 'cap_par' for solarPV,2040 to 30
 
 # File: technodata/{sector}/CommIn.csv
-# Copy rows from {copy_from}, replacing Time with {year}
+# Copy rows where Time={copy_from}, replacing Time with {year}
 # >>> No values changed
 
 # File: technodata/{sector}/CommOut.csv
-# Copy rows from {copy_from}, replacing Time with {year}
+# Copy rows where Time={copy_from}, replacing Time with {year}
 # >>> No values changed
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py b/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
index 34a94d0b..cfe40c26 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
@@ -10,9 +10,9 @@
 """
 
 # File: technodata/Agents.csv
-# Create new rows for {agent_name} as copy of {copy_from}
-# Copy rows from {copy_from}, changing Name to {agent_name}
-# Rename AgentShare for new rows to {agentshare_new} and {agentshare_retrofit}
+# Copy rows where Name={copy_from}, changing Name to {agent_name}
+# Rename AgentShare for new rows to {agentshare_new} (where Type=New)
+#   and {agentshare_retrofit} (where Type=Retrofit)
 # >>> Change Objective2 to 'EAC'
 # >>> Change ObjData1 and ObjData2 to 0.5
 # >>> Change DecisionMethod to 'weighted_sum'
diff --git a/docs/tutorial-code/3-add-region/generate_model.py b/docs/tutorial-code/3-add-region/generate_model.py
index c45a90ea..a25c8e4c 100644
--- a/docs/tutorial-code/3-add-region/generate_model.py
+++ b/docs/tutorial-code/3-add-region/generate_model.py
@@ -14,42 +14,42 @@
 
 # For every sector
 # File: technodata/{sector}/technodata.csv
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> For sector 'power': MaxCapacityAddition for {windturbine,R2} changed to 5
 # >>> For sector 'power': MaxCapacityGrowth for {windturbine,R2} changed to 0.05
 # >>> For sector 'power': TotalCapacityLimit for {windturbine,R2} changed to 100
 
 # For every sector
 # File: technodata/{sector}/CommIn.csv
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # For every sector
 # File: technodata/{sector}/CommOut.csv
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # For every sector
 # File: technodata/{sector}/ExistingCapacity.csv
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # File: technodata/Agents.csv (undocumented)
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # File: input/BaseYearImport.csv (undocumented)
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # File: input/BaseYearExport.csv (undocumented)
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # File: input/Projections.csv (undocumented)
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
 
 # For all files in technodata/preset (undocumented)
-# Copy rows for {copy_from}, changing RegionName to {region_name}
+# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
 # >>> No values changed
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
index 33ee584a..428bf834 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
@@ -4,7 +4,7 @@
 timeslice_name: early-morning and late-afternoon
 timeslice_number: 7 and 8
 
-copy_from: evening (6)
+copy_from: evening (number=6)
 
 """
 
@@ -12,5 +12,6 @@
 # Append {timeslice_name} to timeslices
 
 # For all files in technodata/preset
-# Copy rows for {timeslice_name.number}, changing Timeslice to {timeslice_number}
+# Copy rows for where Timeslice={copy_from.number},
+#   changing Timeslice to {timeslice_number}
 # >>> No values changed

From bfb676340ec1ffabacbcf8017ce3470b8638098f Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 16:03:04 +0100
Subject: [PATCH 071/419] pre-commit: Add codespell hook

---
 .pre-commit-config.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1f36b368..a80d7b6b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,3 +35,7 @@ repos:
     hooks:
       - id: pretty-format-toml
         args: [--autofix, --indent, "4", --no-sort]
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+      - id: codespell

From 6c343655c785cf9a79bcd26b6df1627fad7a082c Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 23 Apr 2024 16:24:11 +0100
Subject: [PATCH 072/419] Run codespell hook

---
 .codespell_ignore.txt                         |  3 +++
 .github/ISSUE_TEMPLATE/bug_report.md          |  2 +-
 .pre-commit-config.yaml                       |  1 +
 CHANGELOG.md                                  |  4 +--
 docs/advanced-guide/extending-muse.ipynb      | 10 ++++---
 docs/application-flow.rst                     |  2 +-
 docs/glossary.rst                             |  2 +-
 docs/inputs/agents.rst                        |  2 +-
 docs/inputs/commodities.rst                   |  4 +--
 docs/inputs/technodata.rst                    |  4 +--
 docs/inputs/technodata_timeslices.rst         |  2 +-
 docs/inputs/toml.rst                          | 26 +++++++++----------
 docs/inputs/toml_primer.rst                   |  4 +--
 docs/installation/pipx-based.rst              |  6 ++++-
 docs/muse-components.rst                      |  4 +--
 docs/overview.rst                             |  4 +--
 .../add-gdp-correlation-demand.ipynb          |  2 +-
 docs/user-guide/add-solar.ipynb               |  2 +-
 .../min-max-timeslice-constraints.ipynb       |  2 +-
 docs/user-guide/modify-timing-data.ipynb      |  2 +-
 src/muse/agents/agent.py                      | 18 ++++++-------
 src/muse/carbon_budget.py                     |  4 +--
 src/muse/commodities.py                       |  2 +-
 src/muse/constraints.py                       | 16 ++++++------
 src/muse/decisions.py                         |  8 +++---
 src/muse/demand_matching.py                   | 16 ++++++------
 src/muse/demand_share.py                      |  2 +-
 src/muse/errors.py                            |  6 ++---
 src/muse/examples.py                          |  2 +-
 src/muse/hooks.py                             |  6 ++---
 src/muse/investments.py                       |  2 +-
 src/muse/mca.py                               |  2 +-
 src/muse/objectives.py                        |  4 +--
 src/muse/outputs/cache.py                     |  4 +--
 src/muse/production.py                        |  6 ++---
 src/muse/quantities.py                        |  6 ++---
 src/muse/readers/csv.py                       |  6 ++---
 src/muse/readers/toml.py                      | 10 +++----
 src/muse/registration.py                      |  2 +-
 src/muse/regressions.py                       |  6 ++---
 src/muse/sectors/__init__.py                  |  2 +-
 src/muse/sectors/legacy_sector.py             | 10 +++----
 src/muse/sectors/sector.py                    |  2 +-
 src/muse/sectors/subsector.py                 |  2 +-
 src/muse/timeslices.py                        |  2 +-
 src/muse/utilities.py                         | 22 ++++++++--------
 tests/conftest.py                             |  4 +--
 tests/test_aggregoutput.py                    |  6 ++---
 tests/test_decisions.py                       |  2 +-
 tests/test_demand_share.py                    |  2 +-
 tests/test_mca.py                             |  2 +-
 tests/test_outputs.py                         |  4 +--
 52 files changed, 143 insertions(+), 133 deletions(-)
 create mode 100644 .codespell_ignore.txt

diff --git a/.codespell_ignore.txt b/.codespell_ignore.txt
new file mode 100644
index 00000000..e8de7e0e
--- /dev/null
+++ b/.codespell_ignore.txt
@@ -0,0 +1,3 @@
+datas
+raison
+fom
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 77bb7e3b..ab0814cf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -13,7 +13,7 @@ A clear and concise description of what the bug is, including error messages.
 
 ## To Reproduce
 
-Steps to reproduce the behavior. Attache any input file that might be required.
+Steps to reproduce the behavior. Attach any input file that might be required.
 
 ## Expected behavior
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a80d7b6b..5d98ff04 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,3 +39,4 @@ repos:
     rev: v2.2.6
     hooks:
       - id: codespell
+        args: [--ignore-words, .codespell_ignore.txt]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12910cfc..343aec3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,8 @@
 - Tutorials in the documentation are run as tests ([#177](https://github.com/SGIModel/MUSE_OS/pull/177))
 - Clean notebooks before running them as tests in the documentaition ([#173](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/173))
 - Add technology-granularity to sectoral outputs ([#214](https://github.com/SGIModel/MUSE_OS/pull/214))
-- Add descripion to bisection method ([#149](https://github.com/SGIModel/MUSE_OS/pull/149))
-- Add descripion to demo cases ([#139](https://github.com/SGIModel/MUSE_OS/pull/139))
+- Add description to bisection method ([#149](https://github.com/SGIModel/MUSE_OS/pull/149))
+- Add description to demo cases ([#139](https://github.com/SGIModel/MUSE_OS/pull/139))
 - Run link-checker only once a week ([#148](https://github.com/SGIModel/MUSE_OS/pull/148))
 - Update documentation for installing MUSE ([#138](https://github.com/SGIModel/MUSE_OS/pull/138))
 - Updating pyproject.toml with valid python versions ([#121](https://github.com/SGIModel/MUSE_OS/pull/121))
diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 6590fede..67b92467 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -255,12 +255,12 @@
    "source": [
     "### Cached quantities\n",
     "\n",
-    "The result of intermediate calculations are often useful for post-morten analysis or\n",
+    "The result of intermediate calculations are often useful for post-mortem analysis or\n",
     "simply to have a more detailed picture of the evolution of the calculation over time.\n",
     "The process of adding a new quantity to cache and output has three steps:\n",
     "\n",
     "1. Register the function with `register_cached_quantity` that will deal with the \n",
-    "  consolidation of the cached quantity prior to outputing in such a way it can be\n",
+    "  consolidation of the cached quantity prior to outputting in such a way it can be\n",
     "  accepted by one of the sinks. It can also be used to modify what is saved, filtering\n",
     "  by technologies or agents, for example.\n",
     "2. Cache the quantity in each iteration of the market using\n",
@@ -318,7 +318,7 @@
    "source": [
     "The above function is nearly identical to `muse.outputs.cache.capacity` but filtering\n",
     "the output such that only information related to retorfit agents is included in the\n",
-    "output. As a function with the same name intended to chache the `capacity` already\n",
+    "output. As a function with the same name intended to cache the `capacity` already\n",
     "exists, we have to set `overwrite = True` in the decorator, so that it replaces the\n",
     "built in version.\n",
     "\n",
@@ -581,7 +581,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "As previously demonstrated, we can easily add new functionality to MUSE. However, running a jupyter notebook is not always the best approach. It is also possible to store functions in an arbitrary pthon file, such as the following:"
+    "As previously demonstrated, we can easily add new functionality to MUSE. However,\n",
+    "running a jupyter notebook is not always the best approach. It is also possible to store\n",
+    "functions in an arbitrary Python file, such as the following:"
    ]
   },
   {
diff --git a/docs/application-flow.rst b/docs/application-flow.rst
index 4ed4a63a..6e20a742 100644
--- a/docs/application-flow.rst
+++ b/docs/application-flow.rst
@@ -318,7 +318,7 @@ An overall picture of this process can be seen in the following chart, but there
             {node [shape=""]; start; end;}
             exclude [label="Exclude\ncommodities\nfrom market"];
             single_year [label="Single year\niteration", fillcolor="lightgrey", style="rounded,filled"]
-            maxiter [label="Maxium iter?", shape=diamond, style=""]
+            maxiter [label="Maximum iter?", shape=diamond, style=""]
             converged [label="Converged?", shape=diamond, style=""]
             prices [label="Update with\nconverged prices"]
             {node [label="Update with not\nconverged prices"]; prices1; prices2;}
diff --git a/docs/glossary.rst b/docs/glossary.rst
index bf331eeb..e188558a 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -39,7 +39,7 @@ Here we provide a glossary for some of the frequently used terms in this documen
         This is where an agent does not know everything needed to make a perfect decision.
 
     Levelised cost of electricity
-        The levelised cost of electricty is a measure of the average net present cost of electricity generation for a generating plant over its lifetime.
+        The levelised cost of electricity is a measure of the average net present cost of electricity generation for a generating plant over its lifetime.
 
     Limited foresight
         Limited foresight is the condition that an agent is unable to predict the entire future perfectly. The agent is only able to predict the future either imperfectly, or a limited time ahead.
diff --git a/docs/inputs/agents.rst b/docs/inputs/agents.rst
index ccdc22dd..97740963 100644
--- a/docs/inputs/agents.rst
+++ b/docs/inputs/agents.rst
@@ -41,7 +41,7 @@ Type
    technologies they can consider (by :ref:`SearchRule <SearchRule>`). "New" agents
    invest on the rest of the demand, and can often consider more general sets of
    technologies. If only "New" agents are included, they will also invest to make up for
-   decomissioned assets, but the end mix might be different than using a specialised
+   decommissioned assets, but the end mix might be different than using a specialised
    "Retrofit" agent for that.
 
 AgentShare
diff --git a/docs/inputs/commodities.rst b/docs/inputs/commodities.rst
index 56ddc83b..fe9c8b45 100644
--- a/docs/inputs/commodities.rst
+++ b/docs/inputs/commodities.rst
@@ -25,10 +25,10 @@ CommodityType
    which are either extracted, transformed from one to another, or used in the energy system.
 
    The "service" type includes commodities such as space heating or hot water which correspond to selected
-   poples' needs whose fulflment requires energy uses.
+   poples' needs whose fulfillment requires energy uses.
 
    The "material" type represent non-energy inputs for energy technologies, such as limestone or oxygen.
-   The "environmental" type refers to non-energy commodities whichare used to quantify an inpact on the environment,
+   The "environmental" type refers to non-energy commodities whichare used to quantify an impact on the environment,
    such as greenhouse gases or CO2. They can be subjected to different types of environmental fees or taxes.
 
 CommodityName
diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 06b0a3ae..913d8a8c 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -151,11 +151,11 @@ Agent_0, ..., Agent_N
       resBoilerElectric, region1, 2010, ..., 1
       resBoilerElectric, region1, 2030, ..., 1
 
-   In a two-agent simulation, a new column neeeds to be added for each retrofit agent belonging to the new-retrofit agent pair.
+   In a two-agent simulation, a new column needs to be added for each retrofit agent belonging to the new-retrofit agent pair.
    The column heading refers each retrofit agent "AgentShare" as defined in the agents' definition (see :ref:`inputs-agents`).
    Assuming a split of the initial capacity into 30 \% and 70 \% for each retrofit agent, the model table would be setup as follows.
    The values of the "AgetnShare" needs to reflect the demand split represented by the "Quantity" attribute (see :ref:`inputs-agents`),
-   to make sure that the initial demand is fullfilled with the initial stock.
+   to make sure that the initial demand is fulfilled with the initial stock.
 
    .. csv-table:: Techno-data: AgentShare - 2 agents
       :header: ProcessName, RegionName, Time, ..., Agent_2, Agent_4
diff --git a/docs/inputs/technodata_timeslices.rst b/docs/inputs/technodata_timeslices.rst
index 9c251611..3e2b9e29 100644
--- a/docs/inputs/technodata_timeslices.rst
+++ b/docs/inputs/technodata_timeslices.rst
@@ -3,7 +3,7 @@
 ======================
 Techno-data Timeslices
 ======================
-The techno-data timeslices is an optinal file which contains information on technologies, their region, timeslices, utilization factors and minimum service factor. The objective of this file is to link the utilization factor and minimum service factor to timeslices. For instance, if you were to model solar photovoltaics, you would probably want to specify that they can not produce any electricty at night, or if you're modelling a nuclear power plant, that they must generate a minimum amount of electricity. The techno-data timeslice file enables you to do that. Note, that if this file is not present, the utilization facto will be used from the technodata file.
+The techno-data timeslices is an optional file which contains information on technologies, their region, timeslices, utilization factors and minimum service factor. The objective of this file is to link the utilization factor and minimum service factor to timeslices. For instance, if you were to model solar photovoltaics, you would probably want to specify that they can not produce any electricity at night, or if you're modelling a nuclear power plant, that they must generate a minimum amount of electricity. The techno-data timeslice file enables you to do that. Note, that if this file is not present, the utilization facto will be used from the technodata file.
 
 
 .. csv-table:: Techno-data
diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index a1a6a307..9a0653b1 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -11,7 +11,7 @@ described in this :ref:`previous section <toml-primer>`. Here, however, we focus
 attributes that are specific to MUSE.
 
 The TOML file can be read using :py:func:`~readers.toml.read_settings`. The resulting
-data is used to construt the market clearing algorithm directly in the :py:meth:`MCA's
+data is used to construct the market clearing algorithm directly in the :py:meth:`MCA's
 factory function <mca.MCA.factory>`.
 
 ------------
@@ -90,7 +90,7 @@ a whole.
 Carbon market
 -------------
 
-This section containts the settings related to the modelling of the carbon market. If omitted, it defaults to not
+This section contains the settings related to the modelling of the carbon market. If omitted, it defaults to not
 including the carbon market in the simulation.
 
 Example
@@ -109,7 +109,7 @@ Example
 *method*
    Method used to equilibrate the carbon market. Available options are `fitting` and `bisection`, however this can be expanded with the `@register_carbon_budget_method` hook in `muse.carbon_budget`.
 
-   The market-clearing algortihm iterates over the sectors until the market reaches an equilibrium in the foresight period (the period next to the one analysed).
+   The market-clearing algorithm iterates over the sectors until the market reaches an equilibrium in the foresight period (the period next to the one analysed).
    This is represented by a stable variation of a commodity demand (or price) between iterations below a defined tolerance.
    The market-clearing algorithm samples a user-defined set of carbon prices.
 
@@ -145,7 +145,7 @@ Example
    `price_too_high_threshold`, a user-defined threshold based on heuristics on the values of the carbon price, reflecting typical historical trends.
 
 *fitter*
-   `fitter` specifies the regression model fit. The regresion approximates the model emissions. Predefined options are `linear` and `exponential`. Further options can be defined using the `@register_carbon_budget_fitter` hook in `muse.carbon_budget`.
+   `fitter` specifies the regression model fit. The regression approximates the model emissions. Predefined options are `linear` and `exponential`. Further options can be defined using the `@register_carbon_budget_fitter` hook in `muse.carbon_budget`.
 
 ------------------
 Global input files
@@ -259,7 +259,7 @@ See section on `Timeslices_`.
 *outputs_cache*
    This option behaves exactly like `outputs` for sectors and accepts the same options but
    controls the output of cached quantities instead. This option is NOT available for
-   sectors themselves (i.e using `[[sector.comercial.outputs_cache]]` will have no effect). See
+   sectors themselves (i.e using `[[sector.commercial.outputs_cache]]` will have no effect). See
    :py:mod:`muse.outputs.cache` for more details.
 
    A single row looks like this:
@@ -292,13 +292,13 @@ the user, since it will not affect the model itself.
 
 Sectors are defined in :py:class:`~muse.sectors.Sector`.
 
-A sector accepts these atributes:
+A sector accepts these attributes:
 
 .. _sector-type:
 
 *type*
    Defines the kind of sector this is. *Standard* sectors are those with type
-   "default". This value corresponds to the name with which a sector class is registerd
+   "default". This value corresponds to the name with which a sector class is registered
    with MUSE, via :py:meth:`~muse.sectors.register_sector`. [INSERT OTHER OPTIONS HERE]
 
 .. _sector-priority:
@@ -441,7 +441,7 @@ Sectors contain a number of subsections:
       See :ref:`inputs-iocomms`.
 
    Once the finest timeslice and its aggregates are given, it is  possible for each sector
-to define the timeslice simply by refering to the slices it will use at each level.
+to define the timeslice simply by referring to the slices it will use at each level.
 
 .. _sector-timeslices:
 
@@ -508,7 +508,7 @@ to define the timeslice simply by refering to the slices it will use at each lev
         writing, three are available:
 
         - an "adhoc" solver: Simple in-house solver that ranks the technologies
-          according to cost and sevice the demand incrementally.
+          according to cost and service the demand incrementally.
 
         - "scipy" solver: Formulates investment as a true LP problem and solves it using
           the `scipy solver`_.
@@ -518,7 +518,7 @@ to define the timeslice simply by refering to the slices it will use at each lev
           Users can install it with ``pip install cvxopt`` or ``conda install cvxopt``.
 
     *demand_share*
-        A method used to split the MCA demand into seperate parts to be serviced by
+        A method used to split the MCA demand into separate parts to be serviced by
         specific agents. A basic distinction is between *new* and *retrofit* agents: the
         former asked to respond to an increase of commodity demand investing in new
         assets; the latter asked to invest in new asset to balance the decommissined
@@ -626,7 +626,7 @@ simulation.
 
 Preset sectors are defined in :py:class:`~muse.sectors.PresetSector`.
 
-The three components, production, consumption, and prices, can be set independantly and
+The three components, production, consumption, and prices, can be set independently and
 not all three need to be set. Production and consumption default to zero, and prices
 default to leaving things unchanged.
 
@@ -661,7 +661,7 @@ The following attributes are accepted:
 
 *consumption_path*
    CSV output files, one per year. This attribute can include wild cards, i.e. '*',
-   which can match anything. For instance: `consumption_path = "{cwd}/Consumtion*.csv"` will match any csv file starting with "Consumption" in the
+   which can match anything. For instance: `consumption_path = "{cwd}/Consumption*.csv"` will match any csv file starting with "Consumption" in the
    current working directory. The file names must include the year for which it defines
    the consumption, e.g. `Consumption2015.csv`.
 
@@ -787,4 +787,4 @@ itself can use the following attributes.
    Path to a technodata CSV file. See. :ref:`inputs-technodata`.
 
 *output_path*
-   Path to a diretory where the sector will write output files.
+   Path to a directory where the sector will write output files.
diff --git a/docs/inputs/toml_primer.rst b/docs/inputs/toml_primer.rst
index 7a1669ab..90a220f1 100644
--- a/docs/inputs/toml_primer.rst
+++ b/docs/inputs/toml_primer.rst
@@ -58,13 +58,13 @@ dictionary).
    [[some_table_of_data]]
    a_key = "another value"
 
-.. Since MUSE requires a number of data files, paths to file can be formated quite
+.. Since MUSE requires a number of data files, paths to file can be formatted quite
 .. flexibly. A `path` any key-value where the value ends with `.csv` or `.toml`,
 .. as well any key which ends in `_path`, `_file`, or `_dir`, e.g. `data_path` or
 .. `sector_dir`.  Paths can be formatted with shorthands for specific directories.
 .. Shorth-hands are specified by curly-brackets:
 
-As MUSE requires a number of data file, paths to files can be formated in a flexible manner. Paths can be formatted with shorthands for specific directories and are defined with curly-brackets. For example:
+As MUSE requires a number of data file, paths to files can be formatted in a flexible manner. Paths can be formatted with shorthands for specific directories and are defined with curly-brackets. For example:
 
 
 .. code-block:: TOML
diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 3e4d7a62..bbcf5e01 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -71,7 +71,11 @@ MUSE needs Python to run but, for now, it only works with versions 3.8 and 3.9,
 
 .. note::
 
-    Windows users should disable the alias for Python that comes by default with Windows and that will try to install Python from the Microsoft Store everytime we write ``python`` in the terminal. To do so, press the ``Windows key`` and start typing ``alias``, when it shows up, click in ``Manage app execution aliases``. In the window that opens, disable all the entries related to Python, like in the image.
+    Windows users should disable the alias for Python that comes by default with Windows
+    and that will try to install Python from the Microsoft Store every time we write
+    ``python`` in the terminal. To do so, press the ``Windows key`` and start typing
+    ``alias``, when it shows up, click in ``Manage app execution aliases``. In the
+    window that opens, disable all the entries related to Python, like in the image.
 
     .. image:: ../figures/disable_python_alias.png
         :width: 400
diff --git a/docs/muse-components.rst b/docs/muse-components.rst
index 8a00bd90..75422795 100644
--- a/docs/muse-components.rst
+++ b/docs/muse-components.rst
@@ -53,7 +53,7 @@ Technologies, and their parameters are defined in the Technodata.csv file. For a
 Sectors
 -------
 
-Sectors typically group areas of economic activity together, such as the residential sector, which might include all energy conusming activies of households. Possible examples of sectors are:
+Sectors typically group areas of economic activity together, such as the residential sector, which might include all energy conusming activities of households. Possible examples of sectors are:
 
 - Gas sector
 
@@ -70,7 +70,7 @@ Each of the technologies, which consume a commodity, also output a different com
 Agents
 ------
 
-Agents represent the investment decision makers in an energy system, for example consumers or companies. They invest in technologies that meet service demands, like heating, or produce other needed energy commodities, like electricity. These agents can be heterogenous, meaning that their investment priorities have the ability to differ.
+Agents represent the investment decision makers in an energy system, for example consumers or companies. They invest in technologies that meet service demands, like heating, or produce other needed energy commodities, like electricity. These agents can be heterogeneous, meaning that their investment priorities have the ability to differ.
 
 As an example, a generation company could compare potential power generators based on their levelized cost of electricity, their net present value, by minimising the total capital cost, a mixture of these and/or any user-defined approach. This approach more closely matches the behaviour of real-life agents in the energy market, where companies, or people, have different priorities and constraints.
 
diff --git a/docs/overview.rst b/docs/overview.rst
index 934ab879..115032d9 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -31,11 +31,11 @@ MUSE is an open source agent-based modelling environment that can be used to sim
 
 MUSE can incorporate residential, power, industrial and conversion sectors, meaning many questions can be explored using MUSE, as per the wishes of the user.
 
-MUSE is an agent-based modelling environment, where the agents are investors and consumers. In MUSE, this means that investment decisions are made from the point of view of the investor and consumer. These agents can be heterogenous, enabling for differering investment strategies between agents, as in the real world.
+MUSE is an agent-based modelling environment, where the agents are investors and consumers. In MUSE, this means that investment decisions are made from the point of view of the investor and consumer. These agents can be heterogeneous, enabling for differering investment strategies between agents, as in the real world.
 
 MUSE is technology rich and can model energy production, conversion and end-use technologies. So, for example, MUSE can enable the user to develop a power sector with solar photovoltaics, wind turbines and gas power plants which produce energy for appliances like electric stoves, heaters and lighting in the residential sector. Agents invest within these sectors, investing in technologies such as electric stoves in the residential sector or gas power plants in the power sectors. The investments made depend on the agent's investment strategies.
 
-Every sector is a user configurable module. This means that a user can configure any number of sectors, cointaining custom, user-defined technologies and commodities. MUSE is fully data-driven, meaning that the configuration of the model is carried out using a selection of :ref:`input-files`. This means that you are able to customise MUSE to your wishes by modifying these input files. Within a benchmark year, MUSE allows for a user-defined temporal granularity. This allows for the benchmark year to be split into different seasons and times, where energy demand may differ. Thus allowing us to model diurnal peaks in the demand, varying weekly and seasonally.
+Every sector is a user configurable module. This means that a user can configure any number of sectors, containing custom, user-defined technologies and commodities. MUSE is fully data-driven, meaning that the configuration of the model is carried out using a selection of :ref:`input-files`. This means that you are able to customise MUSE to your wishes by modifying these input files. Within a benchmark year, MUSE allows for a user-defined temporal granularity. This allows for the benchmark year to be split into different seasons and times, where energy demand may differ. Thus allowing us to model diurnal peaks in the demand, varying weekly and seasonally.
 
 
 MUSE is highly configurable, but it has been built with medium and long-term scenarios in mind; for the short-term, MUSE can be linked with more detailed models. As the number of time steps and regions increase, the computational time also increases, which is something to keep in mind when building highly complex models.
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 6fadbb80..f10f528a 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -71,7 +71,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Editting the TOML file to include this can be done relatively quickly if we know the variable names.\n",
+    "Editing the TOML file to include this can be done relatively quickly if we know the variable names.\n",
     "\n",
     "In the second bottom section of the toml file, you will see the following section: \n",
     "\n",
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 60b47747..6249687a 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -146,7 +146,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Finally, the ```technodata.csv``` containts parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version."
+    "Finally, the ```technodata.csv``` contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version."
    ]
   },
   {
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index a1a48ca4..613a9451 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -22,7 +22,7 @@
    "source": [
     "## Minimum timeslice\n",
     "\n",
-    "In this tutorial we will be amending the default example, which you can find [here](https://github.com/SGIModel/MUSE_OS/tree/main/src/muse/data/example/default). Firstly, we will be imposing a minimium service factor for gasCCGT in the power sector. This is the minimum that a technology can output per timeslice. \n",
+    "In this tutorial we will be amending the default example, which you can find [here](https://github.com/SGIModel/MUSE_OS/tree/main/src/muse/data/example/default). Firstly, we will be imposing a minimum service factor for gasCCGT in the power sector. This is the minimum that a technology can output per timeslice. \n",
     "\n",
     "To do this, we will need to create a new `csv` file that specifies the minimum service factor per timeslice.\n",
     "\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index bdfb8984..e0f7bd78 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -185,7 +185,7 @@
     "|gasboiler|R2|2020|…|**60**|**0.5**|**120**|…|0|\n",
     "|heatpump|R2|2020|…|**60**|**0.5**|**120**|…|0|\n",
     "\n",
-    "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constriants remain realistic.\n",
+    "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",
     "For the full power sector ```technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n",
     "\n",
diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 21f1ffc8..4a2a545f 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -126,14 +126,14 @@ def __init__(
             region: Region where the agent operates, used for cross-referencing
                 external tables.
             search_rules: method used to filter the search space
-            maturity_threshhold: threshhold when filtering replacement
+            maturity_threshhold: threshold when filtering replacement
                 technologies with respect to market share
             year: year the agent is created / current year
             forecast: Number of years the agent will forecast
             housekeeping: transform applied to the assets at the start of
                 iteration. Defaults to doing nothing.
             merge_transform: transform merging current and newly invested assets
-                together. Defaults to replacing old assets completly.
+                together. Defaults to replacing old assets completely.
             demand_threshhold: criteria below which the demand is zero.
             category: optional attribute that could be used to classify
                 different agents together.
@@ -155,7 +155,7 @@ def __init__(
         self.year = year
         """ Current year.
 
-        The year is incremented by one everytime next is called.
+        The year is incremented by one every time next is called.
         """
         self.forecast = forecast
         """Number of years to look into the future for forecating purposed."""
@@ -170,9 +170,9 @@ def __init__(
         used to filter the search space.
         """
         self.maturity_threshhold = maturity_threshhold
-        """ Market share threshhold.
+        """ Market share threshold.
 
-        Threshhold when and if filtering replacement technologies with respect
+        Threshold when and if filtering replacement technologies with respect
         to market share.
         """
         if kwargs is not None:
@@ -189,7 +189,7 @@ def __init__(
         if housekeeping is None:
             housekeeping = housekeeping_factory()
         self._housekeeping = housekeeping
-        """Tranforms applied on the assets at the start of each iteration.
+        """Transforms applied on the assets at the start of each iteration.
 
         It could mean keeping the assets as are, or removing assets with no
         capacity in the current year and beyond, etc...
@@ -199,20 +199,20 @@ def __init__(
         if merge_transform is None:
             merge_transform = asset_merge_factory()
         self.merge_transform = merge_transform
-        """Tranforms applied on the old and new assets.
+        """Transforms applied on the old and new assets.
 
         It could mean using only the new assets, or merging old and new, etc...
         It can be any function registered with
         :py:func:`~muse.hooks.register_final_asset_transform`.
         """
         self.demand_threshhold = demand_threshhold
-        """Threshhold below which the demand share is zero.
+        """Threshold below which the demand share is zero.
 
         This criteria avoids fulfilling demand for very small values. If None,
         then the criteria is not applied.
         """
         self.asset_threshhold = asset_threshhold
-        """Threshhold below which assets are not added."""
+        """Threshold below which assets are not added."""
 
     @property
     def forecast_year(self):
diff --git a/src/muse/carbon_budget.py b/src/muse/carbon_budget.py
index 4403db87..3f647af9 100644
--- a/src/muse/carbon_budget.py
+++ b/src/muse/carbon_budget.py
@@ -44,7 +44,7 @@ def update_carbon_budget(
     under: bool = True,
 ) -> float:
     """Adjust the carbon budget in the far future if emissions too high or low.
-    This feature can allow to simulate overshoot shifing.
+    This feature can allow to simulate overshoot shifting.
     Arguments:
         carbon_budget: budget for future year,
         emissions: emission for future year,
@@ -498,7 +498,7 @@ def min_max_bisect(
     threshold: float,
 ):
     """Refines bisection algorithm to escalate carbon price and meet the budget.
-    As emissions can be a discontinuous fucntion of the carbon price,
+    As emissions can be a discontinuous function of the carbon price,
     this method is used to improve the solution search when discountinuities
     are met, improving the bounds search.
 
diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 162d4f7a..c0fa8ecb 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -12,7 +12,7 @@ class CommodityUsage(IntFlag):
 
     For details on how ``enum``'s work, see `python's documentation`__. In practice,
     :py:class:`CommodityUsage` centralizes in one place the different kinds of
-    commodities that are meaningfull to the generalized sector, e.g. commodities that
+    commodities that are meaningful to the generalized sector, e.g. commodities that
     are consumed by the sector, and commodities that produced by the sectors, as well
     commodities that are, somehow, *environmental*.
 
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index dc901fb2..4f4ba2b8 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -49,7 +49,7 @@
   reduction or matrix multiplication.
 
 There are two additional rules. However, they are likely to be the result of an
-inefficient defininition of :math:`A_c`, :math:`A_p` and :math:`b`.
+inefficient definition of :math:`A_c`, :math:`A_p` and :math:`b`.
 
 - Any dimension in :math:`A_c` (:math:`A_b`) that is neither in :math:`b` nor in
   :math:`x_c` (:math:`x_p`) is reduced by summation before consideration for the
@@ -139,7 +139,7 @@ class ConstraintKind(Enum):
 Where :math:`~` is one of :math:`=,\\leq,\\geq`.
 
 A constraint should contain a data-array `b` corresponding to right-hand-side vector
-of the contraint. It should also contain a data-array `capacity` corresponding to the
+of the constraint. It should also contain a data-array `capacity` corresponding to the
 left-hand-side matrix operator which will be applied to the capacity-related decision
 variables.  It should contain a similar matrix `production` corresponding to
 the left-hand-side matrix operator which will be applied to the production-related
@@ -558,7 +558,7 @@ def lp_costs(
 
     Example:
 
-        We can now construct example inputs to the funtion from the sample model. The
+        We can now construct example inputs to the function from the sample model. The
         costs will be a matrix where each assets has a candidate replacement technology.
 
         >>> from muse import examples
@@ -897,7 +897,7 @@ class ScipyAdapter:
         >>> assert constraint.capacity.data == np.array(1)
         >>> assert len(constraint.capacity.dims) == 0
 
-        And the upperbound is exanded over the replacement technologies,
+        And the upperbound is expanded over the replacement technologies,
         but not over the assets. Hence the assets will be summed over in the final
         constraint:
 
@@ -907,9 +907,9 @@ class ScipyAdapter:
 
         As shown above, it does not bind the production decision variables. Hence,
         production is zero. The matrix operator for the capacity is simply the identity.
-        Hence it can be inputed as the dimensionless scalar 1. The upper bound is simply
-        the maximum for replacement technology (and region, if that particular dimension
-        exists in the problem).
+        Hence it can be inputted as the dimensionless scalar 1. The upper bound is
+        simply the maximum for replacement technology (and region, if that particular
+        dimension exists in the problem).
 
         The lp problem then becomes:
 
@@ -1010,7 +1010,7 @@ def kwargs(self):
     def _unified_dataset(
         technologies: xr.Dataset, lpcosts: xr.Dataset, *constraints: Constraint
     ) -> xr.Dataset:
-        """Creates single xr.Dataset from costs and contraints."""
+        """Creates single xr.Dataset from costs and constraints."""
         from xarray import merge
 
         assert "year" not in technologies.dims
diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index 8017d89a..307974a5 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -12,7 +12,7 @@ def weighted_sum(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:
 
 Arguments:
     objectives: An dataset where each array is a separate objective
-    parameters: parameters, such as weigths, whether to minimize or maximize, the names
+    parameters: parameters, such as weights, whether to minimize or maximize, the names
         of objectives to consider, etc.
     kwargs: Extra input parameters. These parameters are expected to be set from the
         input file.
@@ -183,7 +183,7 @@ def lexical_comparison(
     Finally, the objectives are ranked lexographically, in the order given by the
     parameters.
 
-    The result is an array of tuples which can subsquently be compared
+    The result is an array of tuples which can subsequently be compared
     lexicographically.
     """
     from muse.utilities import lexical_comparison
@@ -211,7 +211,7 @@ def retro_lexical_comparison(
     largest constraint.  Finally, the objectives are ranked lexographically, in
     the order given by the parameters.
 
-    The result is an array of tuples which can subsquently be compared
+    The result is an array of tuples which can subsequently be compared
     lexicographically.
     """
     from muse.utilities import lexical_comparison
@@ -252,7 +252,7 @@ def epsilon_constraints(
     r"""Minimizes first objective subject to constraints on other objectives.
 
     The parameters are a sequence of tuples `(name, minimize, epsilon)`, where
-    `name` is the name of the objective, `minimze` is `True` if minimizing and
+    `name` is the name of the objective, `minimize` is `True` if minimizing and
     false if maximizing that objective, and `epsilon` is the constraint. The
     first objective is the one that will be minimized according to:
 
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index d871f46b..e4793655 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -18,7 +18,7 @@
 
 The basic algorithm proceeds as follows:
 
-#. sort all costs :math:`C_{d, i}` accross both :math:`d` and :math:`i`
+#. sort all costs :math:`C_{d, i}` across both :math:`d` and :math:`i`
 
 #. for each cost :math:`c_0` in order:
 
@@ -57,7 +57,7 @@ def demand_matching(
     *constraints: DataArray,
     protected_dims: Optional[Set] = None,
 ) -> DataArray:
-    r"""Demand matching over heterogenous dimensions.
+    r"""Demand matching over heterogeneous dimensions.
 
     This algorithm enables demand matching while enforcing constraints on how much an
     asset can produce. Any set of dimensions can be matched. The algorithm is general
@@ -86,7 +86,7 @@ def demand_matching(
     constraint. Hence, the solution will depend on the order in which the constraints
     are given.
 
-    #. sort all costs :math:`C_{d, m}` accross both :math:`d` and :math:`m`
+    #. sort all costs :math:`C_{d, m}` across both :math:`d` and :math:`m`
 
     #. for each cost :math:`c_0` in order:
 
@@ -142,7 +142,7 @@ def demand_matching(
             #. Set :math:`\delta X = \max(0, \delta X - \delta X\prime)`
 
 
-    A more complex problem would see independant dimensions for each quantity. In that,
+    A more complex problem would see independent dimensions for each quantity. In that,
     case we can reduce to the original problem as shown here
 
     .. math::
@@ -158,17 +158,17 @@ def demand_matching(
             \frac{M\prime_{r, m}}{M_r} \frac{D\prime_{d, d\prime}}{D_d} X_{d, i}
 
     A dimension could be shared by all quantities, in which case each point along that
-    dimension is treated as independant.
+    dimension is treated as independent.
 
     Similarly, if a dimension is shared only by the demand and a constraint but not by
-    the cost, then the problem can be reduced a set of problems independant along that
+    the cost, then the problem can be reduced a set of problems independent along that
     direction.
 
     Arguments:
         demand: Demand to match with production. It should have the same physical units
             as `max_production`.
-        cost: Cost to minimize while fulfiling the demand.
-        *constraints: each item is a seperate constraint :math:`M_r`.
+        cost: Cost to minimize while fulfilling the demand.
+        *constraints: each item is a separate constraint :math:`M_r`.
 
     Returns:
         An array with the joint dimensionality of `max_production`, `cost`, and
diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 6a68fd26..0b99c977 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -535,7 +535,7 @@ def new_consumption(
 ) -> xr.DataArray:
     r"""Computes share of the demand attributed to new agents.
 
-    The new agents service the demand that can be attributed specificaly to growth and
+    The new agents service the demand that can be attributed specifically to growth and
     that cannot be serviced by existing assets. In other words:
 
     .. math::
diff --git a/src/muse/errors.py b/src/muse/errors.py
index 86714510..2e9ce422 100644
--- a/src/muse/errors.py
+++ b/src/muse/errors.py
@@ -17,7 +17,7 @@ class UnitsConflictInCommodities(Exception):
     """Indicates that there is a conflcit in the commodity units between files."""
 
     msg = """The units of “CommIn” “CommOut” and “GlobalCommodities” files must be the
-same, including the casing. Check the consistency of the units across those thre files.
+same, including the casing. Check the consistency of the units across those three files.
 """
 
     def __str__(self):
@@ -71,7 +71,7 @@ def __str__(self):
 
 class AgentWithNoAssetsInDemandShare(Exception):
     msg = """This error refers to an agent with no assets. To fix this error, check the
-capacity assigment to the agents. One possibility is that you have decided not
+capacity assignment to the agents. One possibility is that you have decided not
 to use "Retrofit" agents, as such you may have already removed them from the
 agent definition file and the file of technodata, the system TOML file should
 change the demand_share to "standard_demand" function in each subsector
@@ -84,7 +84,7 @@ def __str__(self):
 class NoInteractionsFound(Exception):
     msg = """A network with no interactions has been found. This might be the case if
 there are no retrofit agents and yet a 'new_to_retro' network has been defined for a
-particular sector. Asses the existance of both new and retrofit agents for all sectors
+particular sector. Asses the existence of both new and retrofit agents for all sectors
 and remove the new_to_retro interacton network if it is not needed """
 
     def __str__(self):
diff --git a/src/muse/examples.py b/src/muse/examples.py
index bd0f1f56..e52a7223 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -16,7 +16,7 @@
 
     python -m muse --help
 
-The same models can be instanciated in a python script as follows:
+The same models can be instantiated in a python script as follows:
 
 .. code-block:: Python
 
diff --git a/src/muse/hooks.py b/src/muse/hooks.py
index cf88b263..eaca96c7 100644
--- a/src/muse/hooks.py
+++ b/src/muse/hooks.py
@@ -19,9 +19,9 @@
 from muse.registration import registrator
 
 INITIAL_ASSET_TRANSFORM: MutableMapping[Text, Callable] = {}
-""" Tranform at the start of each step. """
+""" Transform at the start of each step. """
 FINAL_ASSET_TRANSFORM: MutableMapping[Text, Callable] = {}
-""" Tranform at the end of each step, including new assets. """
+""" Transform at the end of each step, including new assets. """
 
 
 def housekeeping_factory(settings: Union[Text, Mapping] = "noop") -> Callable:
@@ -149,7 +149,7 @@ def old_assets_only(old_assets: Dataset, new_assets: Dataset) -> Dataset:
 def merge_assets(old_assets: Dataset, new_assets: Dataset) -> Dataset:
     """Adds new assets to old along asset dimension.
 
-    New assets are assumed to be unequivalent to any old_assets. Indeed,
+    New assets are assumed to be nonequivalent to any old_assets. Indeed,
     it is expected that the asset dimension does not have coordinates (i.e.
     it is a combination of coordinates, such as technology and installation
     year).
diff --git a/src/muse/investments.py b/src/muse/investments.py
index af110928..5970d8a1 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -195,7 +195,7 @@ def cliff_retirement_profile(
     rewritten as ``technical_life * n`` with ``n = int(protected // technical_life) +
     1``.
 
-    We could just return an array where each year is repesented. Instead, to save
+    We could just return an array where each year is represented. Instead, to save
     memory, we return a compact view of the same where years where no change happens are
     removed.
 
diff --git a/src/muse/mca.py b/src/muse/mca.py
index ae742b90..0f6d862b 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -368,7 +368,7 @@ def run(self) -> None:
             )
 
     def calibrate_legacy_sectors(self):
-        """Run a calibration step in the lagacy sectors
+        """Run a calibration step in the legacy sectors
         Run historical years
         """
         from copy import deepcopy
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 729a167f..cd9acee5 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -481,7 +481,7 @@ def annual_levelized_cost_of_energy(
     """Annual cost of energy (LCOE) of technologies - not dependent on production.
     It needs to be used for trade agents where the actual service is unknown
 
-    It follows the `simpified LCOE` given by NREL.
+    It follows the `simplified LCOE` given by NREL.
 
     Arguments:
         agent: The agent of interest
@@ -542,7 +542,7 @@ def lifetime_levelized_cost_of_energy(
 ):
     """Levelized cost of energy (LCOE) of technologies over their lifetime.
 
-    It follows the `simpified LCOE` given by NREL.
+    It follows the `simplified LCOE` given by NREL.
 
     Arguments:
         agent: The agent of interest
diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index 29179817..f657f09a 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -15,7 +15,7 @@
     cache_quantity(quantity_name=some_data)
 
 If the quantity has been set as something to cache, the data will be stored and,
-eventually, save to disk after - possibly - agregating the data and removing those
+eventually, save to disk after - possibly - aggregating the data and removing those
 entries corresponding to non-convergent investment attempts. This process of cleaning
 and aggregation is quantity specific.
 
@@ -86,7 +86,7 @@ def cache_quantity(
     must be set, or directly called with any number of keyword arguments. In the former
     case, the matching between quantities and values to cached is done by the function
     'match_quantities'. When used in combination with other decorators, care must be
-    taken to decide the order in which they are applied to make sure the approrpriate
+    taken to decide the order in which they are applied to make sure the appropriate
     output is cached.
 
     Note that if the quantity has NOT been selected to be cached when configuring the
diff --git a/src/muse/production.py b/src/muse/production.py
index 62710316..109647cd 100644
--- a/src/muse/production.py
+++ b/src/muse/production.py
@@ -1,7 +1,7 @@
 """Various ways and means to compute production.
 
 Production is the amount of commodities produced by an asset. However, depending on the
-context, it could be computed several ways. For  instace, it can be obtained straight
+context, it could be computed several ways. For  instance, it can be obtained straight
 from the capacity of the asset. Or it can be obtained by matching for the same
 commodities with a set of assets.
 
@@ -102,7 +102,7 @@ def maximum_production(
 ) -> xr.DataArray:
     """Production when running at full capacity.
 
-    *Full capacity* is limited by the utilitization factor. For more details, see
+    *Full capacity* is limited by the utilization factor. For more details, see
     :py:func:`muse.quantities.maximum_production`.
     """
     from muse.quantities import maximum_production
@@ -168,7 +168,7 @@ def costed_production(
     The assets are ranked according to their cost. The cost can be provided as an
     xarray, a callable creating an xarray, or as "alcoe". The asset with least cost are
     allowed to service the demand first, up to the maximum production. By default, the
-    mininum service is applied first.
+    minimum service is applied first.
     """
 
     from muse.commodities import CommodityUsage, check_usage, is_pollutant
diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index 843dbf7c..dda878ea 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -439,7 +439,7 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte
             shape is matched to `capacity` using `muse.utilities.broadcast_techs`.
         filters: keyword arguments are used to filter down the capacity and
             technologies. Filters not relevant to the quantities of interest, i.e.
-            filters that are not a dimension of `capacity` or `techologies`, are
+            filters that are not a dimension of `capacity` or `technologies`, are
             silently ignored.
     Return:
         `capacity * fixed_outputs * utilization_factor`, whittled down according to the
@@ -511,7 +511,7 @@ def capacity_in_use(
             None, then no reduction is performed.
         filters: keyword arguments are used to filter down the capacity and
             technologies. Filters not relevant to the quantities of interest, i.e.
-            filters that are not a dimension of `capacity` or `techologies`, are
+            filters that are not a dimension of `capacity` or `technologies`, are
             silently ignored.
     Return:
         Capacity-in-use for each technology, whittled down by the filters.
@@ -583,7 +583,7 @@ def costed_production(
 ) -> xr.DataArray:
     """Computes production from ranked assets.
     The assets are ranked according to their cost. The asset with least cost are allowed
-    to service the demand first, up to the maximum production. By default, the mininum
+    to service the demand first, up to the maximum production. By default, the minimum
     service is applied first.
     """
 
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index b53348d4..f30f899d 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -156,7 +156,7 @@ def read_technodata_timeslices(filename: Union[Text, Path]) -> xr.Dataset:
 
 
 def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
-    """Reads process inputs or ouputs.
+    """Reads process inputs or outputs.
 
     There are four axes: (technology, region, year, commodity)
     """
@@ -452,7 +452,7 @@ def read_timeslice_shares(
 ) -> xr.Dataset:
     """Reads sliceshare information into a xr.Dataset.
 
-    Additionaly, this function will try and recover the timeslice multi- index from a
+    Additionally, this function will try and recover the timeslice multi- index from a
     import file "Timeslices{sector}.csv" in the same directory as the timeslice shares.
     Pass `None` if this behaviour is not required.
     """
@@ -713,7 +713,7 @@ def read_regression_parameters(path: Union[Text, Path]) -> xr.Dataset:
     getLogger(__name__).info(f"Reading regression parameters from {path}.")
     table = pd.read_csv(path, float_precision="high", low_memory=False)
 
-    # Normalize clumn names
+    # Normalize column names
     table.columns.name = "commodity"
     table = table.rename(
         columns={
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index 1ac7fc52..f3273981 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -117,7 +117,7 @@ def format_paths(
 ):
     """Format paths passed to settings.
 
-    A setting is recongnized as a path if it's name ends in `_path`, `_file`, or `_dir`,
+    A setting is recognized as a path if it's name ends in `_path`, `_file`, or `_dir`,
     or if the associated value is text object and ends with `.csv, as well as settings
     called `path`.
 
@@ -216,7 +216,7 @@ def format_paths(
     }
 
     def format(path: Text) -> Text:
-        if path.lower() in ("optional", "reqired"):
+        if path.lower() in ("optional", "required"):
             return path
         return format_path(path, **patterns)  # type: ignore
 
@@ -412,7 +412,7 @@ def read_ts_multiindex(
 
         The timeslices are read from ``timeslice_levels``. The levels (keyword) and
         slice (list of values) correspond to the level, slices and slice aggregates
-        defined  inthe the ``timeslices`` section.
+        defined  in the the ``timeslices`` section.
 
         >>> toml = \"\"\"
         ...     ["timeslices"]
@@ -505,12 +505,12 @@ def read_timeslices(
         settings: TOML dictionary. It should contain a ``timeslice_levels`` section.
             Otherwise, the timeslices will default to the global (finest) timeslices.
         timeslice: Finest timeslices. Defaults to the global in
-            :py:mod:`~muse.timeslices`. If using the default, then this funtion
+            :py:mod:`~muse.timeslices`. If using the default, then this function
             should be called *after* the timeslice module has been setup with a call to
             :py:func:`~muse.timeslice.setup_module`.
         transforms: Transforms from desired timeslices to the finest timeslice. Defaults
             to the global in :py:mod:`~muse.timeslices`. If using the default,
-            then this funtion should be called *after* the timeslice module has been
+            then this function should be called *after* the timeslice module has been
             setup with a call to :py:func:`~muse.timeslice.setup_module`.
     Returns:
         A xr.Dataset with the timeslice coordinates.
diff --git a/src/muse/registration.py b/src/muse/registration.py
index 4b62f726..540626b2 100644
--- a/src/muse/registration.py
+++ b/src/muse/registration.py
@@ -55,7 +55,7 @@ def registrator(
     this function) will emit a standardized log-call.
 
     Example:
-        At it's simplest, creating a registrator and registrating happens by
+        At it's simplest, creating a registrator and registering happens by
         first declaring a registry.
 
         >>> REGISTRY = {}
diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index a60e59ee..ef7ff756 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -60,12 +60,12 @@ class Regression(Callable):
     """ Maps from input names to coefficient names
 
     Maps the coefficients names in the class to their names in the input data
-    tables. This class attribute must be overriden.
+    tables. This class attribute must be overridden.
     """
     __regression__ = ""
     """ Name of the regression function.
 
-    This class attribute must be overriden.
+    This class attribute must be overridden.
     """
 
     def __init__(self, interpolation: Text = "linear", base_year: int = 2010, **kwargs):
@@ -250,7 +250,7 @@ def regression_functor(
         mappings: a dictionary mapping from the functions expected coefficients
             (e.g. a, b, c) to the name in the input csv data tables (.e.g.
             constant, GDPexp, GDPscale).
-        name: name by which the function is refered to in the input data table.
+        name: name by which the function is referred to in the input data table.
     """
     from logging import getLogger
 
diff --git a/src/muse/sectors/__init__.py b/src/muse/sectors/__init__.py
index 499e11ba..94370517 100644
--- a/src/muse/sectors/__init__.py
+++ b/src/muse/sectors/__init__.py
@@ -23,7 +23,7 @@
 - :meth:`AbstractSector.factory`: Creates a sector from input data
 - :meth:`AbstractSector.next`: A function which takes a market (demand, supply,
   prices) and returns a market.  What happens within could be anything, though it will
-  likely constists of dispatch and investment.
+  likely consists of dispatch and investment.
 
 New sectors can be registered with the MUSE input files using
 :func:`muse.sectors.register.register_sector`.
diff --git a/src/muse/sectors/legacy_sector.py b/src/muse/sectors/legacy_sector.py
index 2a859ba5..421dcc33 100644
--- a/src/muse/sectors/legacy_sector.py
+++ b/src/muse/sectors/legacy_sector.py
@@ -257,20 +257,20 @@ def runprocessmodule(self, consumption, supplycost, supply, t):
             self.mode,
         ]
 
-        inouts = {"output_dir": self.output_dir, "sectors_dir": self.sectors_dir}
+        inputs = {"output_dir": self.output_dir, "sectors_dir": self.sectors_dir}
 
         if self.name == "Power":
             if self.mode == "Calibration":
                 params += [self.market_iterative]
-                result = self.old_sector.power_calibration(*params, **inouts)
+                result = self.old_sector.power_calibration(*params, **inputs)
                 self.mode = "Iteration"
             else:
                 self.mode = "Iteration"
                 params += [self.old_sector.instance, self.market_iterative, self.excess]
-                result = self.old_sector.runprocessmodule(*params, **inouts)
+                result = self.old_sector.runprocessmodule(*params, **inputs)
         else:
             params += [self.market_iterative, self.excess]
-            result = self.old_sector.runprocessmodule(*params, **inouts)
+            result = self.old_sector.runprocessmodule(*params, **inputs)
 
         self.old_sector.report(result, t[1], self.output_dir)
 
@@ -427,7 +427,7 @@ def xarray_to_ndarray(
 
 
 def commodities_idx(sector, comm: Text) -> Sequence:
-    """Gets the indeces of the commodities involved in the processes of the
+    """Gets the indices of the commodities involved in the processes of the
     sector.
 
     Arguments:
diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py
index e8be5df8..cb544ed6 100644
--- a/src/muse/sectors/sector.py
+++ b/src/muse/sectors/sector.py
@@ -148,7 +148,7 @@ def __init__(
         self.outputs: Callable = (
             cast(Callable, ofactory()) if outputs is None else outputs
         )
-        """A function for outputing data for post-mortem analysis."""
+        """A function for outputting data for post-mortem analysis."""
         self.supply_prod = (
             supply_prod if supply_prod is not None else maximum_production
         )
diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py
index f0ba4057..dd088e04 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -46,7 +46,7 @@ def __init__(
         self.forecast = forecast
         self.name = name
         self.expand_market_prices = expand_market_prices
-        """Wether to expand prices to include destination region.
+        """Whether to expand prices to include destination region.
 
         If ``True``, the input market prices are expanded of the missing "dst_region"
         dimension by setting them to the maximum between the source and destination
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index f470f38f..bae01ea1 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -150,7 +150,7 @@ def aggregate_transforms(
     settings: Optional[Union[Mapping, Text]] = None,
     timeslice: Optional[DataArray] = None,
 ) -> Dict[Tuple, ndarray]:
-    """Creates dictionay of transforms for aggregate levels.
+    """Creates dictionary of transforms for aggregate levels.
 
     The transforms are used to create the projectors towards the finest timeslice.
 
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index 1561a7de..f1f1278b 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -60,7 +60,7 @@ def reduce_assets(
 ) -> Union[xr.DataArray, xr.Dataset]:
     r"""Combine assets along given asset dimension.
 
-    This method simplifies combining assets accross multiple agents, or combining assets
+    This method simplifies combining assets across multiple agents, or combining assets
     across a given dimension. By default, it will sum together assets from the same
     region which have the same technology and the same installation date. In other
     words, assets are identified by the technology, installation year and region. The
@@ -193,10 +193,10 @@ def broadcast_techs(
     capacity, are often flattened out with coordinates 'region', 'installed',
     and 'technology' represented in a single 'asset' dimension. This latter
     representation is sparse if not all combinations of 'region', 'installed',
-    and 'technology' are present, whereas the former represention makes it
+    and 'technology' are present, whereas the former representation makes it
     easier to select a subset of the same.
 
-    This function broadcast the first represention to the shape and coordinates
+    This function broadcast the first representation to the shape and coordinates
     of the second.
 
     Arguments:
@@ -370,7 +370,7 @@ def lexical_comparison(
             no turning to integer.)
 
     Result:
-        An array of tuples which can subsquently be compared lexicographically.
+        An array of tuples which can subsequently be compared lexicographically.
     """
     if order is None:
         order = [u for u in binsize.data_vars]
@@ -466,7 +466,7 @@ def nametuple_to_dict(nametup: Union[Mapping, NamedTuple]) -> Mapping:
 def future_propagation(
     data: xr.DataArray,
     future: xr.DataArray,
-    threshhold: float = 1e-12,
+    threshold: float = 1e-12,
     dim: Text = "year",
 ) -> xr.DataArray:
     """Propagates values into the future.
@@ -491,10 +491,10 @@ def future_propagation(
         ... )
 
         This function propagates into ``data`` values from ``future``, but only if those
-        values differed for the current year beyond a given threshhold:
+        values differed for the current year beyond a given threshold:
 
         >>> from muse.utilities import future_propagation
-        >>> future_propagation(data, future, threshhold=0.1)
+        >>> future_propagation(data, future, threshold=0.1)
         <xarray.DataArray (fuel: 2, year: 4)>
         array([[ 0. ,  1.2,  1.2,  1.2],
                [-5. , -4. , -3. , -2. ]])
@@ -502,20 +502,20 @@ def future_propagation(
           * year     (year) ... 2020 2025 2030 2035
           * fuel     (fuel) <U4 'gas' 'coal'
 
-        Above, the data for coal is not sufficiently different given the threshhold.
+        Above, the data for coal is not sufficiently different given the threshold.
         hence, the future values for coal remain as they where.
 
         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), threshhold=0.1)
+        >>> future_propagation(data, future.sel(fuel="gas", drop=True), threshold=0.1)
         <xarray.DataArray (fuel: 2, year: 4)>
         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), threshhold=0.1)
+        >>> future_propagation(data, future.sel(fuel="coal", drop=True), threshold=0.1)
         <xarray.DataArray (fuel: 2, year: 4)>
         array([[ 0.  , -3.95, -3.95, -3.95],
                [-5.  , -4.  , -3.  , -2.  ]])
@@ -535,7 +535,7 @@ def future_propagation(
     year = future[dim].values
     return data.where(
         np.logical_or(
-            data.year < year, np.abs(data.loc[{dim: year}] - future) < threshhold
+            data.year < year, np.abs(data.loc[{dim: year}] - future) < threshold
         ),
         future,
     )
diff --git a/tests/conftest.py b/tests/conftest.py
index 6e3ceedb..77a6c3ed 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -123,14 +123,14 @@ def pytest_collection_modifyitems(config, items):
     try:
         __import__("SGIModelData")
     except ImportError:
-        skip_sgi_data = mark.skip(reason="Test reqires private data")
+        skip_sgi_data = mark.skip(reason="Test requires private data")
         for item in items:
             if "sgidata" in item.keywords:
                 item.add_marker(skip_sgi_data)
     try:
         __import__("muse_legacy")
     except ImportError:
-        skip_legacy = mark.skip(reason="Test reqires legacy code")
+        skip_legacy = mark.skip(reason="Test requires legacy code")
         for item in items:
             if "legacy" in item.keywords:
                 item.add_marker(skip_legacy)
diff --git a/tests/test_aggregoutput.py b/tests/test_aggregoutput.py
index 7771d758..b0e85b3d 100644
--- a/tests/test_aggregoutput.py
+++ b/tests/test_aggregoutput.py
@@ -3,7 +3,7 @@
 
 
 def test_aggregate_sector():
-    """Test for aggregate_sector function check colum titles, number of
+    """Test for aggregate_sector function check column titles, number of
     agents/region/technologies and assets capacities."""
     from pandas import DataFrame, concat
 
@@ -72,8 +72,8 @@ def test_aggregate_sectors():
 
 
 def test_aggregate_sector_manyregions():
-    """Test for aggregate_sector function with two regions check colum titles, number of
-    agents/region/technologies and assets capacities."""
+    """Test for aggregate_sector function with two regions check column titles, number
+    of agents/region/technologies and assets capacities."""
     from muse.outputs.mca import _aggregate_sectors
     from pandas import DataFrame, concat
 
diff --git a/tests/test_decisions.py b/tests/test_decisions.py
index 9a024b85..fae36c25 100644
--- a/tests/test_decisions.py
+++ b/tests/test_decisions.py
@@ -143,7 +143,7 @@ def test_single_objectives(objectives):
     assert actual.values == approx(-objectives.b.values)
 
 
-# when developping/debugging, these few lines help setup the input for the
+# when developing/debugging, these few lines help setup the input for the
 # different tests
 if __name__ == "main":
     # fmt: off
diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py
index 3686dd8b..642c6879 100644
--- a/tests/test_demand_share.py
+++ b/tests/test_demand_share.py
@@ -370,7 +370,7 @@ class Agent:
     assert set(result.dims) == set(market.consumption.dims) - {"year"}
     assert result.values == approx(0)
 
-    # Then try too litte capacity
+    # Then try too little capacity
     agents = [
         Agent(0.5 * usa_stock.squeeze("region")),
         Agent(0.5 * asia_stock.squeeze("region")),
diff --git a/tests/test_mca.py b/tests/test_mca.py
index 8f69177c..b82fac82 100644
--- a/tests/test_mca.py
+++ b/tests/test_mca.py
@@ -28,7 +28,7 @@ def test_check_equilibrium(market: Dataset):
 
 
 def test_check_demand_fulfillment(market):
-    """Test for the demand fulfilment function of the MCA."""
+    """Test for the demand fulfillment function of the MCA."""
     from muse.mca import check_demand_fulfillment
 
     tolerance_unmet_demand = -0.1
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index 8f76a786..4c743a99 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -572,7 +572,7 @@ def test_aggregate_cache():
     from muse.outputs.cache import _aggregate_cache
     from pandas.testing import assert_frame_equal
 
-    quantity = "heigth"
+    quantity = "height"
 
     a = xr.DataArray(np.ones((3, 4, 5)), name=quantity)
     b = a.copy()
@@ -605,7 +605,7 @@ def test_consolidate_quantity(newcapa_agent, retro_agent):
     sector = SimpleNamespace(name="IT", agents=[newcapa_agent, retro_agent])
     agents = extract_agents_internal(sector)
 
-    quantity = "heigth"
+    quantity = "height"
     a = xr.DataArray(
         np.ones((3, 4, 5)),
         dims=("agent", "replacement", "asset"),

From cf522c8f2e21d2fcd7b8b2f283e7434723e35d6f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Apr 2024 10:22:12 +0100
Subject: [PATCH 073/419] Fix syntax error

---
 docs/running-muse-example.ipynb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index f8916ec1..f024f41b 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -157,7 +157,7 @@
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
-    "import pandas as pd",
+    "import pandas as pd"
    ]
   },
   {
@@ -195,7 +195,9 @@
     "for sector_name, results in capacity_results.groupby(\"sector\"):\n",
     "    print(\"{} sector\".format(sector_name))\n",
     "    results = results.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    results.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(kind='bar', stacked=True)\n",
+    "    results.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "        kind=\"bar\", stacked=True\n",
+    "    )\n",
     "    plt.ylabel(\"capacity (PJ)\")\n",
     "    plt.show()\n",
     "    plt.close()"

From 2e5b5ed78df9260c7911fe2b692114667b73c668 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Apr 2024 15:53:45 +0100
Subject: [PATCH 074/419] Update tutorial graphs to match notebooks in
 tutorial-code

---
 docs/running-muse-example.ipynb               |  6 +--
 .../visualisation-of-results.ipynb            |  2 +-
 .../2-scenario/solar-scenario-results.ipynb   |  2 +-
 ...sualise-new-agent-multiple-objective.ipynb |  2 +-
 ...visualise-new-agent-single-objective.ipynb |  2 +-
 .../3-add-region/visualise-new-region.ipynb   |  2 +-
 .../visualise-timing-result-changes.ipynb     |  2 +-
 .../visualise-time-framework-changes.ipynb    |  2 +-
 .../visualise-service-demand-addition.ipynb   |  2 +-
 .../visualise-correlation-demand.ipynb        |  2 +-
 .../visualise-min-service.ipynb               |  2 +-
 .../visualise-max-service.ipynb               |  2 +-
 docs/user-guide/add-agent.ipynb               | 18 +++++--
 .../add-gdp-correlation-demand.ipynb          |  5 +-
 docs/user-guide/add-region.ipynb              |  5 +-
 docs/user-guide/add-solar.ipynb               | 17 +++++--
 docs/user-guide/addition-service-demand.ipynb | 11 +++-
 .../min-max-timeslice-constraints.ipynb       |  6 +--
 docs/user-guide/modify-timing-data.ipynb      | 51 ++++++++++++++++---
 19 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index f024f41b..67b5a664 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -194,11 +194,11 @@
    "source": [
     "for sector_name, results in capacity_results.groupby(\"sector\"):\n",
     "    print(\"{} sector\".format(sector_name))\n",
-    "    results = results.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    results.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "    results_sum = results.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
+    "    results_sum.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
     "        kind=\"bar\", stacked=True\n",
     "    )\n",
-    "    plt.ylabel(\"capacity (PJ)\")\n",
+    "    plt.ylabel(\"Capacity (PJ)\")\n",
     "    plt.show()\n",
     "    plt.close()"
    ]
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb b/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
index 7166f93a..e18d4a1a 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
@@ -44,7 +44,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb b/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
index 0f07d338..ac97cf11 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
@@ -43,7 +43,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb b/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
index ac77e240..2e5b8cb1 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
@@ -54,7 +54,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb b/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
index ac77e240..2e5b8cb1 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
@@ -54,7 +54,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
index fc9f4542..7963687c 100644
--- a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
+++ b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
@@ -65,7 +65,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
index d4adcf19..b2327dda 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
@@ -63,7 +63,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
index b36044af..a1ad4a1b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
@@ -65,7 +65,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
index 9ffa23d8..930f6d8e 100644
--- a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
+++ b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
@@ -65,7 +65,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
index 297fb7f7..54fd05de 100644
--- a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
+++ b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
@@ -58,7 +58,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
index 05d89c23..0f9c430e 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
@@ -107,7 +107,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
index e34ce9a1..b8aa4153 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
@@ -68,7 +68,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 4b31f265..56f4dc5d 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -87,7 +87,12 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv\"\n",
     ")\n",
-    "power_sector = mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "power_sector = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "power_sector.head()"
    ]
   },
@@ -104,7 +109,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_sector = power_sector.groupby([\"agent\", \"technology\", \"year\"]).sum().reset_index()\n",
     "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
@@ -149,8 +153,12 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv\"\n",
     ")\n",
-    "power_sector = mca_capacity[mca_capacity.sector == \"power\"]\n",
-    "power_sector = power_sector.groupby([\"agent\", \"technology\", \"year\"]).sum().reset_index()\n",
+    "power_sector = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
@@ -198,7 +206,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.9.18"
   }
  },
  "nbformat": 4,
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index f10f528a..2d106032 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -154,6 +154,9 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv\"\n",
     ")\n",
+    "mca_capacity = (\n",
+    "    mca_capacity.groupby([\"technology\", \"region\", \"year\", \"sector\"]).sum().reset_index()\n",
+    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -204,7 +207,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index be6d9a0b..e5934e6e 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -98,6 +98,9 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"../tutorial-code/3-add-region/Results/MCACapacity.csv\")\n",
+    "mca_capacity = (\n",
+    "    mca_capacity.groupby([\"year\", \"technology\", \"region\", \"sector\"]).sum().reset_index()\n",
+    ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
@@ -151,7 +154,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.9.18"
   }
  },
  "nbformat": 4,
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 6249687a..c4a79369 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -330,7 +330,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_capacity = mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "power_capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "\n",
     "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   },
@@ -416,7 +422,12 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv\"\n",
     ")\n",
-    "power_capacity = mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "power_capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
   },
@@ -460,7 +471,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.9.18"
   }
  },
  "nbformat": 4,
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 1138a387..2e775068 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -242,6 +242,11 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\"\n",
     ")\n",
+    "mca_capacity = (\n",
+    "    mca_capacity.groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -251,6 +256,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "limits = [20, 70, 60]\n",
+    "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
     "    fig, ax = plt.subplots(1, 2)\n",
@@ -268,6 +275,8 @@
     "        hue=\"technology\",\n",
     "        ax=ax[1],\n",
     "    )\n",
+    "    ax[0].set_ylim(0, limits[sec_list.index(name)])\n",
+    "    ax[1].set_ylim(0, limits[sec_list.index(name)])\n",
     "    plt.show()\n",
     "    plt.close()"
    ]
@@ -310,7 +319,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 613a9451..7fa5e3c2 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -161,13 +161,13 @@
     "sns.lineplot(\n",
     "    data=power_supply_2020[\n",
     "        (power_supply_2020.commodity == \"electricity\")\n",
-    "        & (power_supply_2020.year == 2020)\n",
+    "        & (power_supply_2020.year == 2025)\n",
     "    ],\n",
     "    hue=\"technology\",\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
     ")\n",
-    "plt.title(\"Supply versus timeslice for the year 2020\")\n",
+    "plt.title(\"Supply versus timeslice for the year 2025\")\n",
     "\n",
     "plt.ylim(0, 10)"
    ]
@@ -270,7 +270,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index e0f7bd78..c22cd192 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -112,12 +112,30 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv\"\n",
     ")\n",
+    "mca_capacity = (\n",
+    "    mca_capacity.groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    g = sns.FacetGrid(data=sector, col=\"region\")\n",
-    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
-    "    g.add_legend()\n",
+    "\n",
+    "    fig, ax = plt.subplots(1, 2)\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[0],\n",
+    "    )\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R2\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[1],\n",
+    "    )\n",
     "    plt.show()\n",
     "    plt.close()"
    ]
@@ -202,12 +220,31 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv\"\n",
     ")\n",
+    "mca_capacity = (\n",
+    "    mca_capacity.groupby([\"technology\", \"sector\", \"region\", \"year\"]).sum().reset_index()\n",
+    ")\n",
     "\n",
+    "limits = [20, 20, 60]\n",
+    "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
     "    print(\"{} sector:\".format(name))\n",
-    "    g = sns.FacetGrid(data=sector, col=\"region\")\n",
-    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
-    "    g.add_legend()\n",
+    "    fig, ax = plt.subplots(1, 2)\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[0],\n",
+    "    )\n",
+    "    sns.lineplot(\n",
+    "        data=sector[sector.region == \"R2\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
+    "        ax=ax[1],\n",
+    "    )\n",
+    "    ax[0].set_ylim(0, limits[sec_list.index(name)])\n",
+    "    ax[1].set_ylim(0, limits[sec_list.index(name)])\n",
     "    plt.show()\n",
     "    plt.close()"
    ]
@@ -250,7 +287,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.9.18"
   }
  },
  "nbformat": 4,

From 8c0c47ec3505e6db55ec21932b3ba69c56ab6a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 3 May 2024 09:22:13 +0100
Subject: [PATCH 075/419] First pass to use upgraded dependencies

---
 pyproject.toml                    | 10 +++++-----
 src/muse/constraints.py           | 20 ++++++++++++++------
 src/muse/demand_matching.py       |  4 +++-
 src/muse/examples.py              | 10 +++++++---
 src/muse/filters.py               |  9 ++++++---
 src/muse/mca.py                   | 26 ++++++++++++++++++--------
 src/muse/outputs/cache.py         |  2 +-
 src/muse/readers/csv.py           | 29 ++++++++++++++++++++++-------
 src/muse/sectors/preset_sector.py | 14 +++++++-------
 src/muse/sectors/subsector.py     |  2 +-
 src/muse/timeslices.py            | 19 ++++++++++++++++---
 src/muse/utilities.py             |  6 +++---
 tests/test_constraints.py         |  7 ++++++-
 tests/test_demand_share.py        |  2 +-
 tests/test_mca.py                 | 19 +++++++++++++++----
 tests/test_quantities.py          | 18 +++++++++++++-----
 16 files changed, 138 insertions(+), 59 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 16455c45..81219a0c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ name = "MUSE_OS"
 description = "Energy System Model"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">= 3.8, <3.10"
+requires-python = ">= 3.8, <3.13"
 keywords = ["energy", "modelling"]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -19,14 +19,14 @@ classifiers = [
     "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"
 ]
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 4f4ba2b8..423a36cb 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
         )
@@ -630,6 +630,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))
@@ -696,6 +697,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})
@@ -824,10 +826,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)
 
@@ -850,8 +856,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 e4793655..bcceaf34 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
 
 
@@ -246,7 +247,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 e52a7223..2cac5d79 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -193,8 +193,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)
 
@@ -265,7 +269,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 dd7e1233..66e9f06e 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -460,7 +460,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/mca.py b/src/muse/mca.py
index 0f6d862b..2611fbd4 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 = []
@@ -459,7 +463,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:
@@ -547,12 +553,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
@@ -576,7 +586,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            )
+            ).drop_vars(["timeslice", "month", "day", "hour"])
 
             break
 
@@ -593,7 +603,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
@@ -620,7 +630,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/outputs/cache.py b/src/muse/outputs/cache.py
index f657f09a..e05db23f 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -395,7 +395,7 @@ 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)
+        .T.groupby(check_col)
         .last(),
         data,
     )
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index f30f899d..0a90fe62 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -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,7 +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
 
@@ -180,7 +194,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"
@@ -659,7 +673,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
 
@@ -828,7 +844,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
 
@@ -843,7 +858,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/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 5e0a7077..e3bf1ce6 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,7 +69,6 @@ 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
@@ -80,7 +78,7 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
                 consumption = consumption * shares.sel(
                     region=consumption.region, commodity=consumption.commodity
                 )
-            presets["consumption"] = consumption
+            presets["consumption"] = consumption.assign_coords(timeslice=timeslice)
 
         if getattr(sector_conf, "supply_path", None) is not None:
             supply = read_csv_outputs(sector_conf.supply_path)
@@ -110,7 +108,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 +161,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 dd088e04..4c8f221f 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 bae01ea1..e3cb4751 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
@@ -549,13 +550,25 @@ 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(
+            ["finest_timeslice", "month", "day", "hour"]
+        ).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")
+    P = (
+        proj1.rename(
+            timeslice="final_ts", month="month_ts", day="day_ts", hour="hour_ts"
+        )
+        * proj0
+    ).sum("finest_timeslice")
+    return (
+        (P * x)
+        .sum("timeslice")
+        .rename(final_ts="timeslice", month_ts="month", day_ts="day", hour_ts="hour")
+    )
 
 
 def new_to_old_timeslice(ts: DataArray, ag_level="Month") -> dict:
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index f1f1278b..be1377c5 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,8 +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
+    mindex_coords = xr.Coordinates.from_pandas_multiindex(index, dimension)
+    result = data.drop_vars(names).assign_coords(mindex_coords)
     return result
 
 
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index 9c0b957c..1139a4df 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -170,6 +170,7 @@ 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)
+
     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 +404,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 642c6879..cb9ccbd6 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_mca.py b/tests/test_mca.py
index b82fac82..d1b4fb8e 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 da99c3db..de16b0c0 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

From bc9dbf6d0902e9918ae54fbbb048cff82baccc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 3 May 2024 09:28:58 +0100
Subject: [PATCH 076/419] update CI

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc7443cb..d839bbbf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4

From 2fc362717c04f25e4af96dc6e773acda2f2229ae Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 3 May 2024 15:54:37 +0100
Subject: [PATCH 077/419] Make plots more consistent

---
 docs/running-muse-example.ipynb               | 17 +++--
 docs/user-guide/add-agent.ipynb               | 25 ++++---
 .../add-gdp-correlation-demand.ipynb          | 16 +++--
 docs/user-guide/add-region.ipynb              | 16 ++---
 docs/user-guide/add-solar.ipynb               |  8 ++-
 docs/user-guide/addition-service-demand.ipynb | 37 +++-------
 .../min-max-timeslice-constraints.ipynb       |  8 +--
 docs/user-guide/modify-timing-data.ipynb      | 69 +++++--------------
 8 files changed, 76 insertions(+), 120 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index 67b5a664..a2e38d63 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -173,8 +173,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "capacity_results = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "capacity_results.head()"
+    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity.head()"
    ]
   },
   {
@@ -183,7 +183,7 @@
    "source": [
     "Using the ```head``` command we print the first five rows of our dataset. Next, we will visualise each of the sectors, with capacity on the y-axis and year on the x-axis.\n",
     "\n",
-    "Don't worry too much about the code if some of it is unfamiliar. We effectively split the data into each sector and then create a stacked bar chart for each."
+    "Don't worry too much about the code if some of it is unfamiliar. We effectively split the data into each sector, sum the capacity for each technology, and then create a stacked bar chart for each."
    ]
   },
   {
@@ -192,15 +192,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for sector_name, results in capacity_results.groupby(\"sector\"):\n",
-    "    print(\"{} sector\".format(sector_name))\n",
-    "    results_sum = results.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    results_sum.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
+    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
     "        kind=\"bar\", stacked=True\n",
     "    )\n",
+    "    plt.title(\"{} Sector\".format(sector_name.capitalize()))\n",
     "    plt.ylabel(\"Capacity (PJ)\")\n",
-    "    plt.show()\n",
-    "    plt.close()"
+    "    plt.xticks(rotation=0)"
    ]
   },
   {
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 56f4dc5d..442e4157 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -87,13 +87,7 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv\"\n",
     ")\n",
-    "power_sector = (\n",
-    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
-    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
-    ")\n",
-    "power_sector.head()"
+    "mca_capacity.head()"
    ]
   },
   {
@@ -109,9 +103,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
+    "power_sector = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "\n",
+    "g = sns.FacetGrid(power_sector, col=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
-    "g.add_legend()"
+    "g.add_legend()\n",
+    "g.set_ylabels(\"Capacity (PJ)\")"
    ]
   },
   {
@@ -159,9 +161,10 @@
     "    .sum()\n",
     "    .reset_index()\n",
     ")\n",
-    "g = sns.FacetGrid(power_sector, row=\"agent\")\n",
+    "g = sns.FacetGrid(power_sector, col=\"agent\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
-    "g.add_legend()"
+    "g.add_legend()\n",
+    "g.set_ylabels(\"Capacity (PJ)\")"
    ]
   },
   {
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 2d106032..d0f9af52 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -154,9 +154,6 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv\"\n",
     ")\n",
-    "mca_capacity = (\n",
-    "    mca_capacity.groupby([\"technology\", \"region\", \"year\", \"sector\"]).sum().reset_index()\n",
-    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -166,11 +163,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
+    "    )\n",
     "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
+    "        data=sector_capacity[sector_capacity.region == \"R1\"],\n",
+    "        x=\"year\",\n",
+    "        y=\"capacity\",\n",
+    "        hue=\"technology\",\n",
     "    )\n",
+    "    plt.ylabel(\"Capacity (PJ)\")\n",
+    "    plt.title(\"{} Sector:\".format(sector_name.capitalize()))\n",
     "    plt.show()"
    ]
   },
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index e5934e6e..b444a0be 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -86,7 +86,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -98,16 +97,17 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\"../tutorial-code/3-add-region/Results/MCACapacity.csv\")\n",
-    "mca_capacity = (\n",
-    "    mca_capacity.groupby([\"year\", \"technology\", \"region\", \"sector\"]).sum().reset_index()\n",
-    ")\n",
     "\n",
-    "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
-    "    g = sns.FacetGrid(data=sector, col=\"region\")\n",
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"year\", \"region\", \"technology\"]).sum().reset_index()\n",
+    "    )\n",
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
     "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "    g.add_legend()\n",
-    "    plt.show()"
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
   {
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index c4a79369..9243b068 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -321,7 +321,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will only visualise the power sector in this example, as this was the only sector we changed. Therefore, we filter for this sector, and then visualise it using ```seaborn```:"
+    "We will only visualise the power sector in this example, as this was the only sector we changed. Therefore, we filter for this sector, sum the capacity for each technology, and then visualise it using ```seaborn```:"
    ]
   },
   {
@@ -337,7 +337,8 @@
     "    .reset_index()\n",
     ")\n",
     "\n",
-    "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
+    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")"
    ]
   },
   {
@@ -428,7 +429,8 @@
     "    .sum()\n",
     "    .reset_index()\n",
     ")\n",
-    "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
+    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")"
    ]
   },
   {
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 2e775068..18eb7e53 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -228,7 +228,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -242,11 +241,6 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\"\n",
     ")\n",
-    "mca_capacity = (\n",
-    "    mca_capacity.groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
-    ")\n",
     "mca_capacity.head()"
    ]
   },
@@ -256,29 +250,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "limits = [20, 70, 60]\n",
-    "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
-    "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
-    "    fig, ax = plt.subplots(1, 2)\n",
-    "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R1\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
-    "        ax=ax[0],\n",
-    "    )\n",
-    "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R2\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
-    "        ax=ax[1],\n",
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"technology\", \"region\", \"year\"]).sum().reset_index()\n",
     "    )\n",
-    "    ax[0].set_ylim(0, limits[sec_list.index(name)])\n",
-    "    ax[1].set_ylim(0, limits[sec_list.index(name)])\n",
-    "    plt.show()\n",
-    "    plt.close()"
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
+    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.add_legend()\n",
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
   {
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 7fa5e3c2..af441988 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -117,7 +117,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To link to our new output `supply_timeslice` we must past the following code in our `settings.toml` file.\n",
+    "To link to our new output `supply_timeslice` we must paste the following code in our `settings.toml` file.\n",
     "\n",
     "    [[sectors.power.outputs]]\n",
     "    filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'\n",
@@ -163,12 +163,11 @@
     "        (power_supply_2020.commodity == \"electricity\")\n",
     "        & (power_supply_2020.year == 2025)\n",
     "    ],\n",
-    "    hue=\"technology\",\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
+    "    hue=\"technology\",\n",
     ")\n",
     "plt.title(\"Supply versus timeslice for the year 2025\")\n",
-    "\n",
     "plt.ylim(0, 10)"
    ]
   },
@@ -232,11 +231,10 @@
     "        & (power_supply_2025.year == 2030)\n",
     "    ],\n",
     "    x=\"timeslice\",\n",
-    "    hue=\"technology\",\n",
     "    y=\"supply\",\n",
+    "    hue=\"technology\",\n",
     ")\n",
     "plt.title(\"Supply versus timeslice for the year 2030\")\n",
-    "\n",
     "plt.ylim(0, 10)"
    ]
   },
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index c22cd192..1df2d3f1 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -91,7 +91,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -112,32 +111,17 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv\"\n",
     ")\n",
-    "mca_capacity = (\n",
-    "    mca_capacity.groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
-    ")\n",
-    "\n",
-    "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
     "\n",
-    "    fig, ax = plt.subplots(1, 2)\n",
-    "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R1\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
-    "        ax=ax[0],\n",
-    "    )\n",
-    "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R2\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
-    "        ax=ax[1],\n",
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
     "    )\n",
-    "    plt.show()\n",
-    "    plt.close()"
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
+    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.add_legend()\n",
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
   {
@@ -220,33 +204,18 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv\"\n",
     ")\n",
-    "mca_capacity = (\n",
-    "    mca_capacity.groupby([\"technology\", \"sector\", \"region\", \"year\"]).sum().reset_index()\n",
-    ")\n",
     "\n",
-    "limits = [20, 20, 60]\n",
-    "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
-    "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
-    "    fig, ax = plt.subplots(1, 2)\n",
-    "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R1\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
-    "        ax=ax[0],\n",
-    "    )\n",
-    "    sns.lineplot(\n",
-    "        data=sector[sector.region == \"R2\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
-    "        ax=ax[1],\n",
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
     "    )\n",
-    "    ax[0].set_ylim(0, limits[sec_list.index(name)])\n",
-    "    ax[1].set_ylim(0, limits[sec_list.index(name)])\n",
-    "    plt.show()\n",
-    "    plt.close()"
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
+    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.add_legend()\n",
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)\n",
+    "    g.set(ylim=(0, None))"
    ]
   },
   {

From 1699a7831d637fedf17bcf234c7bd94ca2c66297 Mon Sep 17 00:00:00 2001
From: sgiarols <11628582+sgiarols@users.noreply.github.com>
Date: Mon, 6 May 2024 00:14:46 +0000
Subject: [PATCH 078/419] chore: update pre-commit hooks

---
 .pre-commit-config.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5d98ff04..9bdbfd91 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,14 +2,14 @@
 #   python: python3.8
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.1
+    rev: v0.4.3
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]
@@ -17,16 +17,16 @@ repos:
         types_or: [python, pyi, jupyter]
         args: [--fix]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.38.0
+    rev: v0.40.0
     hooks:
       - id: markdownlint-fix
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.6.1
+    rev: 0.7.1
     hooks:
       - id: nbstripout
         files: ".ipynb"
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.1.0"
+    rev: "v4.0.0-alpha.8"
     hooks:
       - id: prettier
         types_or: [yaml, json]

From 2f305e7fa74b84dfaceac3ec58e03743f3139c1c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 7 May 2024 10:39:16 +0100
Subject: [PATCH 079/419] Figures for further tutorial

---
 .../Results/Residential/Supply/2020.csv       | 56 +++++++-------
 .../Results/Residential/Supply/2025.csv       | 68 ++++++++++-------
 .../Results/Residential/Supply/2030.csv       | 74 ++++++++++++-------
 .../Results/Residential/Supply/2035.csv       | 74 ++++++++++++-------
 .../Results/Residential/Supply/2040.csv       | 74 ++++++++++++-------
 .../Results/Residential/Supply/2045.csv       | 56 +++++++++-----
 .../Results/Residential/Supply/2050.csv       | 38 ++++++----
 .../further-extending-muse.ipynb              | 32 +++++---
 8 files changed, 304 insertions(+), 168 deletions(-)

diff --git a/docs/advanced-guide/Results/Residential/Supply/2020.csv b/docs/advanced-guide/Results/Residential/Supply/2020.csv
index 42f558a2..a44059a3 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2020.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2020.csv
@@ -1,25 +1,31 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2020,all-year,all-week,night,1.00000000000
-R1,0,heat,2025,all-year,all-week,night,1.33330000000
-R1,0,CO2f,2020,all-year,all-week,night,64.71000000000
-R1,0,CO2f,2025,all-year,all-week,night,17.97500000000
-R1,1,heat,2020,all-year,all-week,morning,1.50000000000
-R1,1,heat,2025,all-year,all-week,morning,2.00000000000
-R1,1,CO2f,2020,all-year,all-week,morning,97.06500000000
-R1,1,CO2f,2025,all-year,all-week,morning,26.96250000000
-R1,2,heat,2020,all-year,all-week,afternoon,1.00000000000
-R1,2,heat,2025,all-year,all-week,afternoon,1.33330000000
-R1,2,CO2f,2020,all-year,all-week,afternoon,64.71000000000
-R1,2,CO2f,2025,all-year,all-week,afternoon,17.97500000000
-R1,3,heat,2020,all-year,all-week,early-peak,1.50000000000
-R1,3,heat,2025,all-year,all-week,early-peak,2.00000000000
-R1,3,CO2f,2020,all-year,all-week,early-peak,97.06500000000
-R1,3,CO2f,2025,all-year,all-week,early-peak,26.96250000000
-R1,4,heat,2020,all-year,all-week,late-peak,3.00000000000
-R1,4,heat,2025,all-year,all-week,late-peak,4.00000000000
-R1,4,CO2f,2020,all-year,all-week,late-peak,194.13000000000
-R1,4,CO2f,2025,all-year,all-week,late-peak,53.92500000000
-R1,5,heat,2020,all-year,all-week,evening,2.00000000000
-R1,5,heat,2025,all-year,all-week,evening,2.66670000000
-R1,5,CO2f,2020,all-year,all-week,evening,129.42000000000
-R1,5,CO2f,2025,all-year,all-week,evening,35.95000000000
+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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2025.csv b/docs/advanced-guide/Results/Residential/Supply/2025.csv
index 3bc0c0f3..c9ed8c00 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2025.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2025.csv
@@ -1,25 +1,43 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2025,all-year,all-week,night,1.33330000000
-R1,0,heat,2030,all-year,all-week,night,1.66670000000
-R1,0,CO2f,2025,all-year,all-week,night,17.97500000000
-R1,0,CO2f,2030,all-year,all-week,night,14.73950000000
-R1,1,heat,2025,all-year,all-week,morning,2.00000000000
-R1,1,heat,2030,all-year,all-week,morning,2.50000000000
-R1,1,CO2f,2025,all-year,all-week,morning,26.96250000000
-R1,1,CO2f,2030,all-year,all-week,morning,22.10920000000
-R1,2,heat,2025,all-year,all-week,afternoon,1.33330000000
-R1,2,heat,2030,all-year,all-week,afternoon,1.66670000000
-R1,2,CO2f,2025,all-year,all-week,afternoon,17.97500000000
-R1,2,CO2f,2030,all-year,all-week,afternoon,14.73950000000
-R1,3,heat,2025,all-year,all-week,early-peak,2.00000000000
-R1,3,heat,2030,all-year,all-week,early-peak,2.50000000000
-R1,3,CO2f,2025,all-year,all-week,early-peak,26.96250000000
-R1,3,CO2f,2030,all-year,all-week,early-peak,22.10920000000
-R1,4,heat,2025,all-year,all-week,late-peak,4.00000000000
-R1,4,heat,2030,all-year,all-week,late-peak,5.00000000000
-R1,4,CO2f,2025,all-year,all-week,late-peak,53.92500000000
-R1,4,CO2f,2030,all-year,all-week,late-peak,44.21850000000
-R1,5,heat,2025,all-year,all-week,evening,2.66670000000
-R1,5,heat,2030,all-year,all-week,evening,3.33330000000
-R1,5,CO2f,2025,all-year,all-week,evening,35.95000000000
-R1,5,CO2f,2030,all-year,all-week,evening,29.47900000000
+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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2030.csv b/docs/advanced-guide/Results/Residential/Supply/2030.csv
index a99ff521..61ae1198 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2030.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2030.csv
@@ -1,25 +1,49 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2030,all-year,all-week,night,1.66670000000
-R1,0,heat,2035,all-year,all-week,night,2.00000000000
-R1,0,CO2f,2030,all-year,all-week,night,14.73950000000
-R1,0,CO2f,2035,all-year,all-week,night,14.73950000000
-R1,1,heat,2030,all-year,all-week,morning,2.50000000000
-R1,1,heat,2035,all-year,all-week,morning,3.00000000000
-R1,1,CO2f,2030,all-year,all-week,morning,22.10920000000
-R1,1,CO2f,2035,all-year,all-week,morning,22.10920000000
-R1,2,heat,2030,all-year,all-week,afternoon,1.66670000000
-R1,2,heat,2035,all-year,all-week,afternoon,2.00000000000
-R1,2,CO2f,2030,all-year,all-week,afternoon,14.73950000000
-R1,2,CO2f,2035,all-year,all-week,afternoon,14.73950000000
-R1,3,heat,2030,all-year,all-week,early-peak,2.50000000000
-R1,3,heat,2035,all-year,all-week,early-peak,3.00000000000
-R1,3,CO2f,2030,all-year,all-week,early-peak,22.10920000000
-R1,3,CO2f,2035,all-year,all-week,early-peak,22.10920000000
-R1,4,heat,2030,all-year,all-week,late-peak,5.00000000000
-R1,4,heat,2035,all-year,all-week,late-peak,6.00000000000
-R1,4,CO2f,2030,all-year,all-week,late-peak,44.21850000000
-R1,4,CO2f,2035,all-year,all-week,late-peak,44.21850000000
-R1,5,heat,2030,all-year,all-week,evening,3.33330000000
-R1,5,heat,2035,all-year,all-week,evening,4.00000000000
-R1,5,CO2f,2030,all-year,all-week,evening,29.47900000000
-R1,5,CO2f,2035,all-year,all-week,evening,29.47900000000
+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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2035.csv b/docs/advanced-guide/Results/Residential/Supply/2035.csv
index 32af094e..89e0bd4e 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2035.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2035.csv
@@ -1,25 +1,49 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2035,all-year,all-week,night,2.00000000000
-R1,0,heat,2040,all-year,all-week,night,2.33330000000
-R1,0,CO2f,2035,all-year,all-week,night,14.73950000000
-R1,0,CO2f,2040,all-year,all-week,night,3.27140000000
-R1,1,heat,2035,all-year,all-week,morning,3.00000000000
-R1,1,heat,2040,all-year,all-week,morning,3.50000000000
-R1,1,CO2f,2035,all-year,all-week,morning,22.10920000000
-R1,1,CO2f,2040,all-year,all-week,morning,4.90720000000
-R1,2,heat,2035,all-year,all-week,afternoon,2.00000000000
-R1,2,heat,2040,all-year,all-week,afternoon,2.33330000000
-R1,2,CO2f,2035,all-year,all-week,afternoon,14.73950000000
-R1,2,CO2f,2040,all-year,all-week,afternoon,3.27140000000
-R1,3,heat,2035,all-year,all-week,early-peak,3.00000000000
-R1,3,heat,2040,all-year,all-week,early-peak,3.50000000000
-R1,3,CO2f,2035,all-year,all-week,early-peak,22.10920000000
-R1,3,CO2f,2040,all-year,all-week,early-peak,4.90720000000
-R1,4,heat,2035,all-year,all-week,late-peak,6.00000000000
-R1,4,heat,2040,all-year,all-week,late-peak,7.00000000000
-R1,4,CO2f,2035,all-year,all-week,late-peak,44.21850000000
-R1,4,CO2f,2040,all-year,all-week,late-peak,9.81430000000
-R1,5,heat,2035,all-year,all-week,evening,4.00000000000
-R1,5,heat,2040,all-year,all-week,evening,4.66670000000
-R1,5,CO2f,2035,all-year,all-week,evening,29.47900000000
-R1,5,CO2f,2040,all-year,all-week,evening,6.54290000000
+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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2040.csv b/docs/advanced-guide/Results/Residential/Supply/2040.csv
index 61d3a7ee..663e47a5 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2040.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2040.csv
@@ -1,25 +1,49 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2040,all-year,all-week,night,2.33330000000
-R1,0,heat,2045,all-year,all-week,night,2.66670000000
-R1,0,CO2f,2040,all-year,all-week,night,3.27140000000
-R1,0,CO2f,2045,all-year,all-week,night,3.27140000000
-R1,1,heat,2040,all-year,all-week,morning,3.50000000000
-R1,1,heat,2045,all-year,all-week,morning,4.00000000000
-R1,1,CO2f,2040,all-year,all-week,morning,4.90720000000
-R1,1,CO2f,2045,all-year,all-week,morning,4.90720000000
-R1,2,heat,2040,all-year,all-week,afternoon,2.33330000000
-R1,2,heat,2045,all-year,all-week,afternoon,2.66670000000
-R1,2,CO2f,2040,all-year,all-week,afternoon,3.27140000000
-R1,2,CO2f,2045,all-year,all-week,afternoon,3.27140000000
-R1,3,heat,2040,all-year,all-week,early-peak,3.50000000000
-R1,3,heat,2045,all-year,all-week,early-peak,4.00000000000
-R1,3,CO2f,2040,all-year,all-week,early-peak,4.90720000000
-R1,3,CO2f,2045,all-year,all-week,early-peak,4.90720000000
-R1,4,heat,2040,all-year,all-week,late-peak,7.00000000000
-R1,4,heat,2045,all-year,all-week,late-peak,8.00000000000
-R1,4,CO2f,2040,all-year,all-week,late-peak,9.81430000000
-R1,4,CO2f,2045,all-year,all-week,late-peak,9.81430000000
-R1,5,heat,2040,all-year,all-week,evening,4.66670000000
-R1,5,heat,2045,all-year,all-week,evening,5.33330000000
-R1,5,CO2f,2040,all-year,all-week,evening,6.54290000000
-R1,5,CO2f,2045,all-year,all-week,evening,6.54290000000
+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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2045.csv b/docs/advanced-guide/Results/Residential/Supply/2045.csv
index 5791841b..6e2884e6 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2045.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2045.csv
@@ -1,19 +1,37 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2045,all-year,all-week,night,2.66670000000
-R1,0,heat,2050,all-year,all-week,night,3.00000000000
-R1,0,CO2f,2045,all-year,all-week,night,3.27140000000
-R1,1,heat,2045,all-year,all-week,morning,4.00000000000
-R1,1,heat,2050,all-year,all-week,morning,4.50000000000
-R1,1,CO2f,2045,all-year,all-week,morning,4.90720000000
-R1,2,heat,2045,all-year,all-week,afternoon,2.66670000000
-R1,2,heat,2050,all-year,all-week,afternoon,3.00000000000
-R1,2,CO2f,2045,all-year,all-week,afternoon,3.27140000000
-R1,3,heat,2045,all-year,all-week,early-peak,4.00000000000
-R1,3,heat,2050,all-year,all-week,early-peak,4.50000000000
-R1,3,CO2f,2045,all-year,all-week,early-peak,4.90720000000
-R1,4,heat,2045,all-year,all-week,late-peak,8.00000000000
-R1,4,heat,2050,all-year,all-week,late-peak,9.00000000000
-R1,4,CO2f,2045,all-year,all-week,late-peak,9.81430000000
-R1,5,heat,2045,all-year,all-week,evening,5.33330000000
-R1,5,heat,2050,all-year,all-week,evening,6.00000000000
-R1,5,CO2f,2045,all-year,all-week,evening,6.54290000000
+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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2050.csv b/docs/advanced-guide/Results/Residential/Supply/2050.csv
index 4fe7c5ee..61004cae 100644
--- a/docs/advanced-guide/Results/Residential/Supply/2050.csv
+++ b/docs/advanced-guide/Results/Residential/Supply/2050.csv
@@ -1,13 +1,25 @@
-region,timeslice,commodity,year,month,day,hour,supply
-R1,0,heat,2050,all-year,all-week,night,3.00000000000
-R1,0,heat,2055,all-year,all-week,night,3.00000000000
-R1,1,heat,2050,all-year,all-week,morning,4.50000000000
-R1,1,heat,2055,all-year,all-week,morning,4.50000000000
-R1,2,heat,2050,all-year,all-week,afternoon,3.00000000000
-R1,2,heat,2055,all-year,all-week,afternoon,3.00000000000
-R1,3,heat,2050,all-year,all-week,early-peak,4.50000000000
-R1,3,heat,2055,all-year,all-week,early-peak,4.50000000000
-R1,4,heat,2050,all-year,all-week,late-peak,9.00000000000
-R1,4,heat,2055,all-year,all-week,late-peak,9.00000000000
-R1,5,heat,2050,all-year,all-week,evening,6.00000000000
-R1,5,heat,2055,all-year,all-week,evening,6.00000000000
+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
diff --git a/docs/advanced-guide/further-extending-muse.ipynb b/docs/advanced-guide/further-extending-muse.ipynb
index 2ede01ee..5269dde6 100644
--- a/docs/advanced-guide/further-extending-muse.ipynb
+++ b/docs/advanced-guide/further-extending-muse.ipynb
@@ -61,11 +61,15 @@
     "import pandas as pd\n",
     "import seaborn as sns\n",
     "\n",
-    "results = pd.read_csv(\"Results/MCACapacity.csv\")\n",
-    "results\n",
-    "sns.lineplot(\n",
-    "    data=results[results.sector == \"power\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
-    ")"
+    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "power_capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")"
    ]
   },
   {
@@ -161,11 +165,17 @@
     "import pandas as pd\n",
     "import seaborn as sns\n",
     "\n",
-    "results = pd.read_csv(\"../tutorial-code/0-new-decision-metric/Results/MCACapacity.csv\")\n",
-    "results = results.groupby([\"year\", \"sector\", \"technology\"]).sum().reset_index()\n",
-    "sns.lineplot(\n",
-    "    data=results[results.sector == \"power\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
-    ")"
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/0-new-decision-metric/Results/MCACapacity.csv\"\n",
+    ")\n",
+    "power_capacity = (\n",
+    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
+    "    .groupby([\"technology\", \"year\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
+    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")"
    ]
   },
   {
@@ -203,7 +213,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {

From 5c7f43b07f345ae55bbb41196dcb0c5cb77685d6 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 7 May 2024 16:26:11 +0100
Subject: [PATCH 080/419] Switch plots to stacked bar charts

---
 .../further-extending-muse.ipynb              | 16 ++++++++-----
 docs/running-muse-example.ipynb               | 13 +++++------
 docs/user-guide/add-agent.ipynb               | 14 +++++++++--
 .../add-gdp-correlation-demand.ipynb          | 19 +++++++--------
 docs/user-guide/add-region.ipynb              |  7 +++++-
 docs/user-guide/add-solar.ipynb               | 23 +++++++++++--------
 docs/user-guide/addition-service-demand.ipynb |  7 +++++-
 docs/user-guide/modify-timing-data.ipynb      | 13 +++++++++--
 8 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/docs/advanced-guide/further-extending-muse.ipynb b/docs/advanced-guide/further-extending-muse.ipynb
index 5269dde6..548e76f5 100644
--- a/docs/advanced-guide/further-extending-muse.ipynb
+++ b/docs/advanced-guide/further-extending-muse.ipynb
@@ -59,7 +59,6 @@
    "outputs": [],
    "source": [
     "import pandas as pd\n",
-    "import seaborn as sns\n",
     "\n",
     "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
     "power_capacity = (\n",
@@ -68,8 +67,11 @@
     "    .sum()\n",
     "    .reset_index()\n",
     ")\n",
-    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
-    "ax.set_ylabel(\"Capacity (PJ)\")"
+    "ax = power_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "    kind=\"bar\", stacked=True\n",
+    ")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "ax.tick_params(axis=\"x\", labelrotation=0)"
    ]
   },
   {
@@ -163,7 +165,6 @@
    "outputs": [],
    "source": [
     "import pandas as pd\n",
-    "import seaborn as sns\n",
     "\n",
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/0-new-decision-metric/Results/MCACapacity.csv\"\n",
@@ -174,8 +175,11 @@
     "    .sum()\n",
     "    .reset_index()\n",
     ")\n",
-    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
-    "ax.set_ylabel(\"Capacity (PJ)\")"
+    "ax = power_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "    kind=\"bar\", stacked=True\n",
+    ")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "ax.tick_params(axis=\"x\", labelrotation=0)"
    ]
   },
   {
diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index a2e38d63..b4c5499d 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -156,7 +156,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
     "import pandas as pd"
    ]
   },
@@ -194,12 +193,12 @@
    "source": [
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
-    "        kind=\"bar\", stacked=True\n",
-    "    )\n",
-    "    plt.title(\"{} Sector\".format(sector_name.capitalize()))\n",
-    "    plt.ylabel(\"Capacity (PJ)\")\n",
-    "    plt.xticks(rotation=0)"
+    "    ax = sector_capacity.pivot(\n",
+    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "    ).plot(kind=\"bar\", stacked=True)\n",
+    "    ax.set_title(\"{} Sector\".format(sector_name.capitalize()))\n",
+    "    ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "    ax.tick_params(axis=\"x\", labelrotation=0)"
    ]
   },
   {
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 442e4157..2c90398b 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -74,6 +74,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -111,7 +112,11 @@
     ")\n",
     "\n",
     "g = sns.FacetGrid(power_sector, col=\"agent\")\n",
-    "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "g.map_dataframe(\n",
+    "    lambda data, **kwargs: data.pivot(\n",
+    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "    ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    ")\n",
     "g.add_legend()\n",
     "g.set_ylabels(\"Capacity (PJ)\")"
    ]
@@ -161,8 +166,13 @@
     "    .sum()\n",
     "    .reset_index()\n",
     ")\n",
+    "\n",
     "g = sns.FacetGrid(power_sector, col=\"agent\")\n",
-    "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "g.map_dataframe(\n",
+    "    lambda data, **kwargs: data.pivot(\n",
+    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "    ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    ")\n",
     "g.add_legend()\n",
     "g.set_ylabels(\"Capacity (PJ)\")"
    ]
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index d0f9af52..c9a69a5b 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -140,9 +140,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
-    "import pandas as pd\n",
-    "import seaborn as sns"
+    "import pandas as pd"
    ]
   },
   {
@@ -167,15 +165,14 @@
     "    sector_capacity = (\n",
     "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
     "    )\n",
-    "    sns.lineplot(\n",
-    "        data=sector_capacity[sector_capacity.region == \"R1\"],\n",
-    "        x=\"year\",\n",
-    "        y=\"capacity\",\n",
-    "        hue=\"technology\",\n",
+    "    ax = (\n",
+    "        sector_capacity[sector_capacity.region == \"R1\"]\n",
+    "        .pivot(index=\"year\", columns=\"technology\", values=\"capacity\")\n",
+    "        .plot(kind=\"bar\", stacked=True)\n",
     "    )\n",
-    "    plt.ylabel(\"Capacity (PJ)\")\n",
-    "    plt.title(\"{} Sector:\".format(sector_name.capitalize()))\n",
-    "    plt.show()"
+    "    ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    ax.tick_params(axis=\"x\", labelrotation=0)"
    ]
   },
   {
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index b444a0be..82b54912 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -86,6 +86,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -103,7 +104,11 @@
     "        sector_data.groupby([\"year\", \"region\", \"technology\"]).sum().reset_index()\n",
     "    )\n",
     "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
-    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
     "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 9243b068..2ff2cce6 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -283,7 +283,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "If the simulation has run successfully, you should now have a folder in the same location as your `settings.toml` file called `Results`. The next step is to visualise the results using the python visualisation package ```seaborn``` as well as the data analysis library ```pandas```."
+    "If the simulation has run successfully, you should now have a folder in the same location as your `settings.toml` file called `Results`. The next step is to visualise the results using the data analysis library ```pandas```."
    ]
   },
   {
@@ -292,8 +292,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pandas as pd\n",
-    "import seaborn as sns"
+    "import pandas as pd"
    ]
   },
   {
@@ -321,7 +320,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will only visualise the power sector in this example, as this was the only sector we changed. Therefore, we filter for this sector, sum the capacity for each technology, and then visualise it using ```seaborn```:"
+    "We will only visualise the power sector in this example, as this was the only sector we changed. Therefore, we filter for this sector, sum the capacity for each technology, and then plot a stacked bar chart:"
    ]
   },
   {
@@ -337,8 +336,11 @@
     "    .reset_index()\n",
     ")\n",
     "\n",
-    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
-    "ax.set_ylabel(\"Capacity (PJ)\")"
+    "ax = power_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "    kind=\"bar\", stacked=True\n",
+    ")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "ax.tick_params(axis=\"x\", labelrotation=0)"
    ]
   },
   {
@@ -429,15 +431,18 @@
     "    .sum()\n",
     "    .reset_index()\n",
     ")\n",
-    "ax = sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")\n",
-    "ax.set_ylabel(\"Capacity (PJ)\")"
+    "ax = power_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "    kind=\"bar\", stacked=True\n",
+    ")\n",
+    "ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "ax.tick_params(axis=\"x\", labelrotation=0)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "From the results, we can see that `windturbine` increases rapidly between 2025 and 2040. However, between the years 2030 and 2050 `solarPV` increases. This is because of the changing cost of `solarPV` during these years. A crossover can be seen around the year 2038.\n",
+    "From the results, we can see that `windturbine` increases rapidly between 2025 and 2040. However, between the years 2030 and 2050 `solarPV` increases. This is because of the changing cost of `solarPV` during these years. \n",
     "\n",
     "For the full example with the completed input files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)"
    ]
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 18eb7e53..c1f9aad1 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -228,6 +228,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -255,7 +256,11 @@
     "        sector_data.groupby([\"technology\", \"region\", \"year\"]).sum().reset_index()\n",
     "    )\n",
     "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
-    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
     "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 1df2d3f1..7e1a5097 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -91,6 +91,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -117,7 +118,11 @@
     "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
     "    )\n",
     "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
-    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
     "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
@@ -210,7 +215,11 @@
     "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
     "    )\n",
     "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
-    "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
     "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",

From 98253a22de444d3c1ea966ad76ee508398298ef3 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 7 May 2024 17:15:07 +0100
Subject: [PATCH 081/419] Bar charts for supply figures

---
 docs/user-guide/min-max-timeslice-constraints.ipynb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index af441988..975c309d 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -143,7 +143,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import seaborn as sns"
    ]
@@ -158,17 +157,16 @@
     "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv\"\n",
     ")\n",
     "\n",
-    "sns.lineplot(\n",
+    "ax = sns.barplot(\n",
     "    data=power_supply_2020[\n",
     "        (power_supply_2020.commodity == \"electricity\")\n",
-    "        & (power_supply_2020.year == 2025)\n",
+    "        & (power_supply_2020.year == 2020)\n",
     "    ],\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
     "    hue=\"technology\",\n",
     ")\n",
-    "plt.title(\"Supply versus timeslice for the year 2025\")\n",
-    "plt.ylim(0, 10)"
+    "ax.set_title(\"Supply versus timeslice for the year 2020\")"
    ]
   },
   {
@@ -225,7 +223,7 @@
     "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv\"\n",
     ")\n",
     "\n",
-    "sns.lineplot(\n",
+    "ax = sns.barplot(\n",
     "    data=power_supply_2025[\n",
     "        (power_supply_2025.commodity == \"electricity\")\n",
     "        & (power_supply_2025.year == 2030)\n",
@@ -234,8 +232,7 @@
     "    y=\"supply\",\n",
     "    hue=\"technology\",\n",
     ")\n",
-    "plt.title(\"Supply versus timeslice for the year 2030\")\n",
-    "plt.ylim(0, 10)"
+    "ax.set_title(\"Supply versus timeslice for the year 2030\")"
    ]
   },
   {

From 2dbf8f40f9bbd69f16e364b960517e0dab18c9bc Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 8 May 2024 11:39:06 +0100
Subject: [PATCH 082/419] Add note about dual source-code/pipx installation

---
 docs/installation/developers.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 2824428a..da55cc40 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -29,6 +29,14 @@ Once you have your environment created, **activate it** and install MUSE within
 
 Depending on your system, you might need to add quotation marks around ``[dev,doc]`` as in ``"[dev,doc]"``. This will install MUSE and all the dependencies required for its development. The downloaded code can be modified and the changes will be automatically reflected in the environment.
 
+.. note::
+
+    The source-code installation will only be accessible whilst the virtual environment is active, and can be called from the command line using the `muse` command with the relevant input arguments.
+
+    If you have also installed MUSE globally using `pipx`, the global installation will take precedence when outside the virtual environment (using the same `muse` commands).
+
+
+
 Installing pre-commit hooks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From 89e8f2298ad78326cb2e89ec27a970952460a759 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 8 May 2024 13:37:23 +0100
Subject: [PATCH 083/419] Better note

---
 docs/installation/developers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index da55cc40..4b7f936e 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -31,9 +31,9 @@ Depending on your system, you might need to add quotation marks around ``[dev,do
 
 .. note::
 
-    The source-code installation will only be accessible whilst the virtual environment is active, and can be called from the command line using the `muse` command with the relevant input arguments.
+    The source-code installation will only be accessible whilst the virtual environment is active, and can be called from the command line using the ``muse`` command with the relevant input arguments.
 
-    If you have also installed MUSE globally using `pipx`, the global installation will take precedence when outside the virtual environment (using the same `muse` commands).
+    If you have also installed MUSE globally using ``pipx``, this can still be used outside the virtual environment (using the same ``muse`` command), but the source-code installation will take precedence when the virtual environment is active.
 
 
 

From 5468add2330e052f181cb019640d1f0d2a4d0e52 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 8 May 2024 13:41:02 +0100
Subject: [PATCH 084/419] Remove blank lines

---
 docs/installation/developers.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 4b7f936e..905d849c 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -35,8 +35,6 @@ Depending on your system, you might need to add quotation marks around ``[dev,do
 
     If you have also installed MUSE globally using ``pipx``, this can still be used outside the virtual environment (using the same ``muse`` command), but the source-code installation will take precedence when the virtual environment is active.
 
-
-
 Installing pre-commit hooks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From 0b272761d01625f36a634bc519ce86ae2a902b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 10 May 2024 05:28:13 +0100
Subject: [PATCH 085/419] Add launcher for default_timeslices

---
 .vscode/launch.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index d43f2171..32ebfe38 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,6 +18,13 @@
             "module": "muse",
             "args": ["--model", "multiple_agents"]
         },
+        {
+            "name": "Model: default_timeslice",
+            "type": "python",
+            "request": "launch",
+            "module": "muse",
+            "args": ["--model", "default_timeslice"]
+        },
         {
             "name": "model/settings.toml",
             "type": "python",

From 33de1dab17468de6950648a65075102670d1c2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 10 May 2024 05:28:48 +0100
Subject: [PATCH 086/419] Give more details when investment fails

---
 src/muse/investments.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/investments.py b/src/muse/investments.py
index af110928..c2719fa5 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -346,7 +346,7 @@ def scipy_match_demand(
         )
         if not res.success:
             getLogger(__name__).critical(res.message)
-            print(f"in sector containing {df_technologies.technology[0]}")
+            print(f"in sector containing {df_technologies.technology.unique()}")
             raise GrowthOfCapacityTooConstrained
 
     solution = cast(Callable[[np.ndarray], xr.Dataset], adapter.to_muse)(res.x)

From bcec3a18c51fa678222ea855fa670ad9140b2ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 10 May 2024 05:29:17 +0100
Subject: [PATCH 087/419] Change inf entries to zero in LCOE

---
 src/muse/objectives.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 729a167f..01ab84a5 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -229,6 +229,25 @@ def efficiency(
     return result
 
 
+def _represent_hours(market: xr.Dataset, search_space: xr.DataArray) -> xr.DataArray:
+    """Retrieves the appropriate value for represent_hours.
+
+    Args:
+        market: The simulation market.
+        search_space: The search space for new tehcnologies.
+
+    Returns:
+        DataArray with the hours of each timeslice.
+    """
+    from muse.timeslices import represent_hours
+
+    if "represent_hours" in market:
+        return market.represent_hours
+    if "represent_hours" in search_space.coords:
+        return search_space.represent_hours
+    return represent_hours(market.timeslice)
+
+
 @register_objective(name="capacity")
 def capacity_to_service_demand(
     agent: Agent,
@@ -240,7 +259,6 @@ def capacity_to_service_demand(
     **kwargs,
 ) -> xr.DataArray:
     """Minimum capacity required to fulfill the demand."""
-    from muse.timeslices import represent_hours
 
     params = agent.filter_input(
         technologies[["utilization_factor", "fixed_outputs"]],
@@ -248,13 +266,7 @@ def capacity_to_service_demand(
         region=agent.region,
         technology=search_space.replacement,
     ).drop_vars("technology")
-    if "represent_hours" in market:
-        hours = market.represent_hours
-    elif "represent_hours" in search_space.coords:
-        hours = search_space.represent_hours
-    else:
-        hours = represent_hours(market.timeslice)
-
+    hours = _represent_hours(market, search_space)
     max_hours = hours.max() / hours.sum()
 
     commodity_output = params.fixed_outputs.sel(commodity=demand.commodity)
@@ -664,6 +676,7 @@ def lifetime_levelized_cost_of_energy(
         + fixed_and_variable_costs
     ) / (denominator.sel(commodity=products).sum("commodity") * rates).sum("year")
 
+    results = results.where(np.isfinite(results)).fillna(0.0)
     return results
 
 

From b9639126b065f2a49cd919e0ec3746a0b6afddb5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 10 May 2024 10:00:56 +0100
Subject: [PATCH 088/419] Change to allow zero starting capacity

---
 src/muse/agents/factories.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py
index 6c257587..91620cbe 100644
--- a/src/muse/agents/factories.py
+++ b/src/muse/agents/factories.py
@@ -357,6 +357,8 @@ def _shared_capacity(
 
     techs = (existing > 0) & (shares > 0)
     techs = techs.any([u for u in techs.dims if u != "asset"])
+    if not any(techs):
+        return (capacity * shares).copy()
     return (capacity * shares).sel(asset=techs.values).copy()
 
 

From 972cdded8d0d96859ca1535c85e5f7b9a0e6cac8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 09:48:46 +0000
Subject: [PATCH 089/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .../1-add-new-technology/1-introduction/generate_model.py        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
index 283c7d0b..340f5726 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
@@ -35,7 +35,6 @@
 # Add new column {commodity_name} as copy of {copy_from}
 # >>> No values changed
 
-
 """
 ADD A NEW PROCESS
 

From 5dee0f49bbea8b5d0136d8c6aeeb4cb1a907daf8 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 10 May 2024 15:32:11 +0100
Subject: [PATCH 090/419] Code to generate models for tutorial 1

---
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../1-introduction/Results/MCACapacity.csv    | 120 ++---
 .../Results/MCAMetric_Consumption.csv         | 319 ------------
 .../Results/MCAMetric_Supply.csv              | 481 ------------------
 .../1-introduction/Results/MCAPrices.csv      | 216 ++++----
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  21 +
 .../Results/Power/Capacity/2030.csv           |  26 +
 .../Results/Power/Capacity/2035.csv           |  32 ++
 .../Results/Power/Capacity/2040.csv           |  38 ++
 .../Results/Power/Capacity/2045.csv           |  53 ++
 .../Results/Power/Capacity/2050.csv           |  51 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 ++
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../1-introduction/generate_model.py          |  65 ---
 .../input/GlobalCommodities.csv               |  10 +-
 .../1-introduction/settings.toml              |  61 ++-
 .../1-introduction/technodata/Agents.csv      |   6 +-
 .../technodata/power/Technodata.csv           |   4 +-
 .../technodata/residential/Technodata.csv     |   4 +-
 .../2-scenario/Results/Gas/Capacity/2020.csv  |   4 +
 .../2-scenario/Results/Gas/Capacity/2025.csv  |   3 +
 .../2-scenario/Results/Gas/Capacity/2030.csv  |   7 +
 .../2-scenario/Results/Gas/Capacity/2035.csv  |   6 +
 .../2-scenario/Results/Gas/Capacity/2040.csv  |   5 +
 .../2-scenario/Results/Gas/Capacity/2045.csv  |   4 +
 .../2-scenario/Results/Gas/Capacity/2050.csv  |   4 +
 .../2-scenario/Results/MCACapacity.csv        | 117 ++---
 .../Results/MCAMetric_Consumption.csv         | 301 -----------
 .../2-scenario/Results/MCAMetric_Supply.csv   | 445 ----------------
 .../2-scenario/Results/MCAPrices.csv          | 216 ++++----
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  21 +
 .../Results/Power/Capacity/2030.csv           |  26 +
 .../Results/Power/Capacity/2035.csv           |  32 ++
 .../Results/Power/Capacity/2040.csv           |  38 ++
 .../Results/Power/Capacity/2045.csv           |  53 ++
 .../Results/Power/Capacity/2050.csv           |  51 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 ++
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../2-scenario/generate_model.py              |  23 -
 .../2-scenario/input/GlobalCommodities.csv    |  10 +-
 .../2-scenario/settings.toml                  |  58 ++-
 .../2-scenario/technodata/Agents.csv          |   6 +-
 .../technodata/power/Technodata.csv           |   6 +-
 .../1-add-new-technology/generate_models.py   |  97 ++++
 .../solar-scenario-results.ipynb              |   9 +-
 .../visualisation-of-results.ipynb            |   9 +-
 .../2-add-agent/generate_models.py            |  47 ++
 src/muse/wizard.py                            | 168 ++++++
 80 files changed, 2046 insertions(+), 2036 deletions(-)
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
 create mode 100644 docs/tutorial-code/1-add-new-technology/generate_models.py
 rename docs/tutorial-code/1-add-new-technology/{2-scenario => }/solar-scenario-results.ipynb (85%)
 rename docs/tutorial-code/1-add-new-technology/{1-introduction => }/visualisation-of-results.ipynb (86%)
 create mode 100644 docs/tutorial-code/2-add-agent/generate_models.py
 create mode 100644 src/muse/wizard.py

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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,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
new file mode 100644
index 00000000..46ed388e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,installed,technology,capacity
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..4a49ec7f
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+asset,year,region,installed,technology,capacity
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..54d8f5f5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+asset,year,region,installed,technology,capacity
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..18de09c4
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+asset,year,region,installed,technology,capacity
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..efec1bce
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+asset,year,region,installed,technology,capacity
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 1def068e..fa454d8e 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
@@ -1,67 +1,53 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,6.75000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,6.75000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-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
-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
-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
-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
-0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
+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,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.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,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index c6cacd79..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,319 +0,0 @@
-,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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Supply.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Supply.csv
deleted file mode 100644
index 93ccbd1e..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,481 +0,0 @@
-,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
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 f4d602c4..a86a6756 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
-"('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')",electricity,R1,11.44430000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,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')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08340000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,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')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.14110000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,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')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08340000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,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')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14110000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,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')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37940000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.32640000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,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')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.20970000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.21250000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,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')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,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')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,5.87400000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.63150000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,5.93600000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,26.84220000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,5.87400000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.63150000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.93600000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.84220000000,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')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.12180000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.48290000000,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')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,5.99790000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.05440000000,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
new file mode 100644
index 00000000..beea1d34
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..849d1bde
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2025,R1,windturbine,2020,6.75000000000
+3,2030,R1,windturbine,2020,6.75000000000
+3,2035,R1,windturbine,2020,6.75000000000
+3,2040,R1,windturbine,2020,6.75000000000
+3,2045,R1,windturbine,2020,6.75000000000
+3,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
new file mode 100644
index 00000000..b8d11565
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
@@ -0,0 +1,26 @@
+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,solarPV,9.15000000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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
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
new file mode 100644
index 00000000..bb2bda0b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
@@ -0,0 +1,32 @@
+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,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
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
new file mode 100644
index 00000000..2f4caa4e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
@@ -0,0 +1,38 @@
+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,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+6,2045,R1,2040,solarPV,6.00000000000
+6,2049,R1,2040,solarPV,6.00000000000
+6,2050,R1,2040,solarPV,6.00000000000
+6,2054,R1,2040,solarPV,6.00000000000
+6,2055,R1,2040,solarPV,6.00000000000
+6,2059,R1,2040,solarPV,6.00000000000
+6,2060,R1,2040,solarPV,6.00000000000
+6,2064,R1,2040,solarPV,6.00000000000
+6,2065,R1,2040,solarPV,6.00000000000
+6,2069,R1,2040,solarPV,6.00000000000
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
new file mode 100644
index 00000000..324548ca
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
@@ -0,0 +1,53 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,solarPV,2020,10.00000000000
+0,2049,R1,solarPV,2020,10.00000000000
+1,2045,R1,solarPV,2025,9.15000000000
+1,2049,R1,solarPV,2025,9.15000000000
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2035,9.19000000000
+3,2049,R1,solarPV,2035,9.19000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2045,R1,windturbine,2020,6.75000000000
+6,2049,R1,windturbine,2020,6.75000000000
+7,2050,R1,windturbine,2045,6.75000000000
+7,2054,R1,windturbine,2045,6.75000000000
+7,2055,R1,windturbine,2045,6.75000000000
+7,2059,R1,windturbine,2045,6.75000000000
+7,2060,R1,windturbine,2045,6.75000000000
+7,2064,R1,windturbine,2045,6.75000000000
+7,2065,R1,windturbine,2045,6.75000000000
+7,2069,R1,windturbine,2045,6.75000000000
+7,2070,R1,windturbine,2045,6.75000000000
+7,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
new file mode 100644
index 00000000..470b2a93
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
@@ -0,0 +1,51 @@
+asset,year,region,installed,technology,capacity
+2,2050,R1,2025,solarPV,9.15000000000
+2,2054,R1,2025,solarPV,9.15000000000
+3,2050,R1,2030,solarPV,6.00000000000
+3,2054,R1,2030,solarPV,6.00000000000
+3,2055,R1,2030,solarPV,6.00000000000
+3,2059,R1,2030,solarPV,6.00000000000
+4,2050,R1,2035,solarPV,9.19000000000
+4,2054,R1,2035,solarPV,9.19000000000
+4,2055,R1,2035,solarPV,9.19000000000
+4,2059,R1,2035,solarPV,9.19000000000
+4,2060,R1,2035,solarPV,9.19000000000
+4,2064,R1,2035,solarPV,9.19000000000
+5,2050,R1,2040,solarPV,6.00000000000
+5,2054,R1,2040,solarPV,6.00000000000
+5,2055,R1,2040,solarPV,6.00000000000
+5,2059,R1,2040,solarPV,6.00000000000
+5,2060,R1,2040,solarPV,6.00000000000
+5,2064,R1,2040,solarPV,6.00000000000
+5,2065,R1,2040,solarPV,6.00000000000
+5,2069,R1,2040,solarPV,6.00000000000
+6,2050,R1,2045,solarPV,16.91000000000
+6,2054,R1,2045,solarPV,16.91000000000
+6,2055,R1,2045,solarPV,16.91000000000
+6,2059,R1,2045,solarPV,16.91000000000
+6,2060,R1,2045,solarPV,16.91000000000
+6,2064,R1,2045,solarPV,16.91000000000
+6,2065,R1,2045,solarPV,16.91000000000
+6,2069,R1,2045,solarPV,16.91000000000
+6,2070,R1,2045,solarPV,16.91000000000
+6,2074,R1,2045,solarPV,16.91000000000
+7,2050,R1,2045,windturbine,6.75000000000
+7,2054,R1,2045,windturbine,6.75000000000
+7,2055,R1,2045,windturbine,6.75000000000
+7,2059,R1,2045,windturbine,6.75000000000
+7,2060,R1,2045,windturbine,6.75000000000
+7,2064,R1,2045,windturbine,6.75000000000
+7,2065,R1,2045,windturbine,6.75000000000
+7,2069,R1,2045,windturbine,6.75000000000
+7,2070,R1,2045,windturbine,6.75000000000
+7,2074,R1,2045,windturbine,6.75000000000
+8,2055,R1,2050,solarPV,9.15000000000
+8,2059,R1,2050,solarPV,9.15000000000
+8,2060,R1,2050,solarPV,9.15000000000
+8,2064,R1,2050,solarPV,9.15000000000
+8,2065,R1,2050,solarPV,9.15000000000
+8,2069,R1,2050,solarPV,9.15000000000
+8,2070,R1,2050,solarPV,9.15000000000
+8,2074,R1,2050,solarPV,9.15000000000
+8,2075,R1,2050,solarPV,9.15000000000
+8,2079,R1,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..305b627b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a44059a3
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9ed8c00
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61ae1198
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89e0bd4e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..663e47a5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6e2884e6
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61004cae
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py b/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
deleted file mode 100644
index 340f5726..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/generate_model.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Starting point: copy default model
-
-"""
-ADD A NEW COMMODITY
-
-commodity_name: solar
-sector: power
-
-copy_from: wind
-
-"""
-
-# File: technodata/power/CommIn.csv
-# Add new column {commodity_name} as copy of {copy_from}
-# >>> No values changed
-
-# File: technodata/{sector}/CommOut.csv
-# Add new column {commodity_name} as copy of {copy_from}
-# >>> No values changed
-
-# File: input/BaseYearImport.csv
-# Add new column {commodity_name} as copy of {copy_from}
-# >>> No values changed
-
-# File: input/BaseYearExport.csv
-# Add new column {commodity_name} as copy of {copy_from}
-# >>> No values changed
-
-# File: input/GlobalCommodities.csv
-# Copy row(s) where Commodity={copy_from.capitalize()}, changing Commidity to
-#     {commodity_name.capitalize()} and CommodityName to {commodity_name}
-# >>> No values changed
-
-# File: input/Projections.csv
-# Add new column {commodity_name} as copy of {copy_from}
-# >>> No values changed
-
-"""
-ADD A NEW PROCESS
-
-process_name: solarPV
-sector: power
-
-copy_from: windturbine
-
-"""
-
-
-# File: technodata/{sector}/CommIn.csv
-# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
-# >>> Change solar value to 1
-# >>> Change wind value to 0
-
-# File: technodata/{sector}/CommOut.csv
-# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
-# >>> No values changed
-
-# File: technodata/{sector}/ExistingCapacity.csv
-# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
-# >>> No values changed
-
-# File: technodata/{sector}/technodata.csv
-# Copy row(s) where ProcessName={copy_from}, changing ProcessName to {process_name}
-# >>> Change cap_par to 30
-# >>> Change Fuel to 'solar'
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/input/GlobalCommodities.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/input/GlobalCommodities.csv
index 253b75ef..9691db73 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/input/GlobalCommodities.csv
@@ -1,7 +1,7 @@
 Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
+Electricity,Energy,electricity,0.0,1,PJ
 Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index b6e8d70b..0e5e1145 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -6,37 +6,37 @@ regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities = ["wind", "solar"]
+excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 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"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{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"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
 
 # Carbon budget control
 [carbon_budget_control]
-# budget = []
-method = "fitting"
+budget = []
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
@@ -64,6 +64,21 @@ constraints = [
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -81,6 +96,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -98,6 +120,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
index f6ab761e..f2a72ba7 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
index de511a38..a71a48d0 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
index 6d2c3cb3..663288ae 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,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
new file mode 100644
index 00000000..46ed388e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,installed,technology,capacity
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..4a49ec7f
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+asset,year,region,installed,technology,capacity
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..54d8f5f5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+asset,year,region,installed,technology,capacity
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..18de09c4
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+asset,year,region,installed,technology,capacity
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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
new file mode 100644
index 00000000..efec1bce
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+asset,year,region,installed,technology,capacity
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 2dd88793..fa454d8e 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
@@ -1,64 +1,53 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,6.75000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,10.00000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,6.75000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,10.00000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-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
-10,A1,6.75000000000,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,10.00000000000,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
-9,A1,6.75000000000,R1,10,2020,R1,power,solarPV,retrofit,2040
-10,A1,2.40000000000,R1,11,2025,R1,power,solarPV,retrofit,2040
-11,A1,6.00000000000,R1,12,2030,R1,power,solarPV,retrofit,2040
-12,A1,10.00000000000,R1,13,2035,R1,power,solarPV,retrofit,2040
-33,A1,10.00000000000,R1,50,2020,R1,power,windturbine,retrofit,2040
-34,A1,8.38000000000,R1,51,2035,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
-10,A1,6.75000000000,R1,11,2020,R1,power,solarPV,retrofit,2045
-11,A1,2.40000000000,R1,12,2025,R1,power,solarPV,retrofit,2045
-12,A1,6.00000000000,R1,13,2030,R1,power,solarPV,retrofit,2045
-13,A1,10.00000000000,R1,14,2035,R1,power,solarPV,retrofit,2045
-38,A1,10.00000000000,R1,66,2020,R1,power,windturbine,retrofit,2045
-39,A1,8.38000000000,R1,67,2035,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
-6,A1,2.40000000000,R1,11,2025,R1,power,solarPV,retrofit,2050
-7,A1,6.00000000000,R1,12,2030,R1,power,solarPV,retrofit,2050
-8,A1,10.00000000000,R1,13,2035,R1,power,solarPV,retrofit,2050
-9,A1,16.91000000000,R1,14,2045,R1,power,solarPV,retrofit,2050
-34,A1,8.38000000000,R1,66,2035,R1,power,windturbine,retrofit,2050
-35,A1,3.56000000000,R1,67,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
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
+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,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.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,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index d32307b3..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,301 +0,0 @@
-,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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.15000000000,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.22222222222,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.22500000000,R1,39,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.33333333333,R1,43,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,46,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,54,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,59,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.15000000000,R1,74,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.22222222222,R1,78,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,81,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,89,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,94,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.22500000000,R1,109,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.33333333333,R1,113,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,116,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,124,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,129,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.45000000000,R1,144,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.66666666667,R1,148,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,151,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,159,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,164,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.30000000000,R1,179,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.44444444444,R1,183,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,186,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,194,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,199,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.12258353222,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.18160523292,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,solar,0.18160523292,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15218518519,R1,33,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18387529833,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27240784938,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.30707174821,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06537788385,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16344470963,R1,59,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27240784938,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22827777778,R1,68,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12258353222,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18160523292,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20471449881,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04358525590,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10896313975,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18160523292,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15218518519,R1,103,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18387529833,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27240784938,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.30707174821,R1,116,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06537788385,R1,124,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16344470963,R1,129,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27240784938,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22827777778,R1,138,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36775059666,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.54481569875,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.61414349642,R1,151,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13075576770,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32688941925,R1,164,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54481569875,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.45655555556,R1,173,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.24516706444,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36321046584,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40942899761,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08717051180,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21792627950,R1,199,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36321046584,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30437037037,R1,208,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.14048329356,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.20812339786,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,solar,0.20812339786,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17440740741,R1,33,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21072494033,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31218509679,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35191065036,R1,56,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07492442323,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18731105807,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31218509679,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26161111111,R1,78,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14048329356,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20812339786,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23460710024,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04994961549,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12487403872,R1,114,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20812339786,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17440740741,R1,123,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21072494033,R1,139,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31218509679,R1,143,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35191065036,R1,146,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07492442323,R1,154,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18731105807,R1,159,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31218509679,R1,164,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26161111111,R1,168,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.42144988067,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.62437019358,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.70382130072,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14984884646,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.37462211615,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.62437019358,R1,209,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.52322222222,R1,213,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28096658711,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41624679572,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.46921420048,R1,236,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09989923097,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.24974807743,R1,249,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41624679572,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34881481481,R1,258,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,solar,0.22222222222,R1,19,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18622222222,R1,23,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07911111111,R1,33,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,59,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27933333333,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11866666667,R1,73,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18622222222,R1,103,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07911111111,R1,113,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,139,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27933333333,R1,143,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11866666667,R1,153,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,179,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.55866666667,R1,183,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23733333333,R1,193,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,219,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37244444444,R1,223,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15822222222,R1,233,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Supply.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Supply.csv
deleted file mode 100644
index d4252d3c..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,445 +0,0 @@
-,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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.15000000000,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.22222222222,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,16,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,35,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,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,38,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,39,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,51,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,70,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,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,73,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,74,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,86,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,105,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,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,108,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,109,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,121,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,140,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,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,143,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,144,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,156,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,175,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,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,178,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,179,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,191,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.12258353222,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.18160523292,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.18160523292,solarPV,"('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.15218518519,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2025.00000000000,R1,power,11.23723239857,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.18387529833,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.27240784938,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2025.00000000000,R1,power,0.18387529833,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2025.00000000000,R1,power,0.06537788385,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,39,2030.00000000000,R1,power,0.16344470963,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2035.00000000000,R1,power,0.27240784938,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2035.00000000000,R1,power,0.22827777778,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2025.00000000000,R1,power,16.85584859785,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.12258353222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.18160523292,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2025.00000000000,R1,power,0.12258353222,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.04358525590,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2030.00000000000,R1,power,0.10896313975,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.18160523292,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2035.00000000000,R1,power,0.15218518519,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,86,2025.00000000000,R1,power,11.23723239857,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.18387529833,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.27240784938,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2025.00000000000,R1,power,0.18387529833,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2025.00000000000,R1,power,0.06537788385,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,109,2030.00000000000,R1,power,0.16344470963,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2035.00000000000,R1,power,0.27240784938,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,111,2035.00000000000,R1,power,0.22827777778,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,121,2025.00000000000,R1,power,16.85584859785,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.36775059666,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.54481569875,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2025.00000000000,R1,power,0.36775059666,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2025.00000000000,R1,power,0.13075576770,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2030.00000000000,R1,power,0.32688941925,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2035.00000000000,R1,power,0.54481569875,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,146,2035.00000000000,R1,power,0.45655555556,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,156,2025.00000000000,R1,power,33.71169719570,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.24516706444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.36321046584,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2025.00000000000,R1,power,0.24516706444,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.08717051180,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,179,2030.00000000000,R1,power,0.21792627950,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2035.00000000000,R1,power,0.36321046584,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2035.00000000000,R1,power,0.30437037037,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2025.00000000000,R1,power,22.47446479714,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.07148923284,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.19186971041,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.10723384926,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.28780456561,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.07148923284,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.19186971041,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.10723384926,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.28780456561,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.21446769852,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.57560913123,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.14297846568,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.38373942082,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.14048329356,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.20812339786,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.20812339786,solarPV,"('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.17440740741,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2025.00000000000,R1,power,12.87810352029,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2020.00000000000,R1,power,0.21072494033,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2020.00000000000,R1,power,0.31218509679,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,47,2025.00000000000,R1,power,0.21072494033,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.07492442323,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2030.00000000000,R1,power,0.18731105807,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.31218509679,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2035.00000000000,R1,power,0.26161111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2025.00000000000,R1,power,19.31715528043,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.14048329356,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.20812339786,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2025.00000000000,R1,power,0.14048329356,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.04994961549,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2030.00000000000,R1,power,0.12487403872,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2035.00000000000,R1,power,0.20812339786,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2035.00000000000,R1,power,0.17440740741,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2025.00000000000,R1,power,12.87810352029,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2020.00000000000,R1,power,0.21072494033,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2020.00000000000,R1,power,0.31218509679,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,137,2025.00000000000,R1,power,0.21072494033,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2025.00000000000,R1,power,0.07492442323,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,139,2030.00000000000,R1,power,0.18731105807,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2035.00000000000,R1,power,0.31218509679,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2035.00000000000,R1,power,0.26161111111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,155,2025.00000000000,R1,power,19.31715528043,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.42144988067,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.62437019358,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2025.00000000000,R1,power,0.42144988067,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.14984884646,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2030.00000000000,R1,power,0.37462211615,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2035.00000000000,R1,power,0.62437019358,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,186,2035.00000000000,R1,power,0.52322222222,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,200,2025.00000000000,R1,power,38.63431056086,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.28096658711,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.41624679572,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2025.00000000000,R1,power,0.28096658711,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2025.00000000000,R1,power,0.09989923097,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,229,2030.00000000000,R1,power,0.24974807743,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2035.00000000000,R1,power,0.41624679572,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,231,2035.00000000000,R1,power,0.34881481481,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,245,2025.00000000000,R1,power,25.75620704057,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.07960363032,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.21364791437,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.11940544547,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.32047187155,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.07960363032,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.21364791437,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.11940544547,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.32047187155,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.23881089095,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.64094374310,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.15920726063,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.42729582873,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.22222222222,solarPV,"('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.18622222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2045.00000000000,R1,power,0.07911111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2035.00000000000,R1,power,0.27933333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2045.00000000000,R1,power,0.11866666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2035.00000000000,R1,power,0.18622222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,86,2045.00000000000,R1,power,0.07911111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2035.00000000000,R1,power,0.27933333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2045.00000000000,R1,power,0.11866666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2035.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2035.00000000000,R1,power,0.55866666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,166,2045.00000000000,R1,power,0.23733333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2035.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2035.00000000000,R1,power,0.37244444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2045.00000000000,R1,power,0.15822222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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/1-add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
index d29309c0..a86a6756 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.51720000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17730000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77730000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27810000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51720000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17730000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77730000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27810000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56390000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62930000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38710000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56240000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84490000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31400000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56240000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84490000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31400000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69720000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.12810000000,2035
-"('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')",electricity,R1,11.44430000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,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')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08410000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,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')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.14290000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,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')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08410000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,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')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14290000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,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')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38630000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.32640000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,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')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.21280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.21250000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08640000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14400000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08640000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14400000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,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')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37480000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,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')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.21120000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04750000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,5.87400000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.63150000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.08880000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,5.93600000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,26.84220000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04750000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,5.87400000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.63150000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08880000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.93600000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.84220000000,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')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28370000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.12180000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.48290000000,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')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14190000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,5.99790000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.05440000000,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
new file mode 100644
index 00000000..beea1d34
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..849d1bde
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2025,R1,windturbine,2020,6.75000000000
+3,2030,R1,windturbine,2020,6.75000000000
+3,2035,R1,windturbine,2020,6.75000000000
+3,2040,R1,windturbine,2020,6.75000000000
+3,2045,R1,windturbine,2020,6.75000000000
+3,2049,R1,windturbine,2020,6.75000000000
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
new file mode 100644
index 00000000..b8d11565
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
@@ -0,0 +1,26 @@
+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,solarPV,9.15000000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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
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
new file mode 100644
index 00000000..bb2bda0b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
@@ -0,0 +1,32 @@
+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,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
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
new file mode 100644
index 00000000..2f4caa4e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
@@ -0,0 +1,38 @@
+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,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+6,2045,R1,2040,solarPV,6.00000000000
+6,2049,R1,2040,solarPV,6.00000000000
+6,2050,R1,2040,solarPV,6.00000000000
+6,2054,R1,2040,solarPV,6.00000000000
+6,2055,R1,2040,solarPV,6.00000000000
+6,2059,R1,2040,solarPV,6.00000000000
+6,2060,R1,2040,solarPV,6.00000000000
+6,2064,R1,2040,solarPV,6.00000000000
+6,2065,R1,2040,solarPV,6.00000000000
+6,2069,R1,2040,solarPV,6.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
new file mode 100644
index 00000000..324548ca
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
@@ -0,0 +1,53 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,solarPV,2020,10.00000000000
+0,2049,R1,solarPV,2020,10.00000000000
+1,2045,R1,solarPV,2025,9.15000000000
+1,2049,R1,solarPV,2025,9.15000000000
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2035,9.19000000000
+3,2049,R1,solarPV,2035,9.19000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2045,R1,windturbine,2020,6.75000000000
+6,2049,R1,windturbine,2020,6.75000000000
+7,2050,R1,windturbine,2045,6.75000000000
+7,2054,R1,windturbine,2045,6.75000000000
+7,2055,R1,windturbine,2045,6.75000000000
+7,2059,R1,windturbine,2045,6.75000000000
+7,2060,R1,windturbine,2045,6.75000000000
+7,2064,R1,windturbine,2045,6.75000000000
+7,2065,R1,windturbine,2045,6.75000000000
+7,2069,R1,windturbine,2045,6.75000000000
+7,2070,R1,windturbine,2045,6.75000000000
+7,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
new file mode 100644
index 00000000..470b2a93
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
@@ -0,0 +1,51 @@
+asset,year,region,installed,technology,capacity
+2,2050,R1,2025,solarPV,9.15000000000
+2,2054,R1,2025,solarPV,9.15000000000
+3,2050,R1,2030,solarPV,6.00000000000
+3,2054,R1,2030,solarPV,6.00000000000
+3,2055,R1,2030,solarPV,6.00000000000
+3,2059,R1,2030,solarPV,6.00000000000
+4,2050,R1,2035,solarPV,9.19000000000
+4,2054,R1,2035,solarPV,9.19000000000
+4,2055,R1,2035,solarPV,9.19000000000
+4,2059,R1,2035,solarPV,9.19000000000
+4,2060,R1,2035,solarPV,9.19000000000
+4,2064,R1,2035,solarPV,9.19000000000
+5,2050,R1,2040,solarPV,6.00000000000
+5,2054,R1,2040,solarPV,6.00000000000
+5,2055,R1,2040,solarPV,6.00000000000
+5,2059,R1,2040,solarPV,6.00000000000
+5,2060,R1,2040,solarPV,6.00000000000
+5,2064,R1,2040,solarPV,6.00000000000
+5,2065,R1,2040,solarPV,6.00000000000
+5,2069,R1,2040,solarPV,6.00000000000
+6,2050,R1,2045,solarPV,16.91000000000
+6,2054,R1,2045,solarPV,16.91000000000
+6,2055,R1,2045,solarPV,16.91000000000
+6,2059,R1,2045,solarPV,16.91000000000
+6,2060,R1,2045,solarPV,16.91000000000
+6,2064,R1,2045,solarPV,16.91000000000
+6,2065,R1,2045,solarPV,16.91000000000
+6,2069,R1,2045,solarPV,16.91000000000
+6,2070,R1,2045,solarPV,16.91000000000
+6,2074,R1,2045,solarPV,16.91000000000
+7,2050,R1,2045,windturbine,6.75000000000
+7,2054,R1,2045,windturbine,6.75000000000
+7,2055,R1,2045,windturbine,6.75000000000
+7,2059,R1,2045,windturbine,6.75000000000
+7,2060,R1,2045,windturbine,6.75000000000
+7,2064,R1,2045,windturbine,6.75000000000
+7,2065,R1,2045,windturbine,6.75000000000
+7,2069,R1,2045,windturbine,6.75000000000
+7,2070,R1,2045,windturbine,6.75000000000
+7,2074,R1,2045,windturbine,6.75000000000
+8,2055,R1,2050,solarPV,9.15000000000
+8,2059,R1,2050,solarPV,9.15000000000
+8,2060,R1,2050,solarPV,9.15000000000
+8,2064,R1,2050,solarPV,9.15000000000
+8,2065,R1,2050,solarPV,9.15000000000
+8,2069,R1,2050,solarPV,9.15000000000
+8,2070,R1,2050,solarPV,9.15000000000
+8,2074,R1,2050,solarPV,9.15000000000
+8,2075,R1,2050,solarPV,9.15000000000
+8,2079,R1,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..305b627b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a44059a3
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9ed8c00
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61ae1198
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89e0bd4e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..663e47a5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6e2884e6
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61004cae
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py b/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
deleted file mode 100644
index 7333a25d..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/generate_model.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Starting point: copy model from 1-introduction
-
-"""
-ADD PRICE DATA FOR NEW YEAR:
-
-year: 2040
-sector: power
-
-copy_from: 2030
-
-"""
-
-# File: technodata/{sector}/technodata.csv
-# Copy rows where Time={copy_from}, replacing Time with {year}
-# >>> Change 'cap_par' for solarPV,2040 to 30
-
-# File: technodata/{sector}/CommIn.csv
-# Copy rows where Time={copy_from}, replacing Time with {year}
-# >>> No values changed
-
-# File: technodata/{sector}/CommOut.csv
-# Copy rows where Time={copy_from}, replacing Time with {year}
-# >>> No values changed
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/input/GlobalCommodities.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/input/GlobalCommodities.csv
index 253b75ef..9691db73 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/input/GlobalCommodities.csv
@@ -1,7 +1,7 @@
 Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
+Electricity,Energy,electricity,0.0,1,PJ
 Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 832cd3a3..0e5e1145 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -6,32 +6,33 @@ regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities = ["wind", "solar"]
+excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 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"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{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"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
 
 # Carbon budget control
 [carbon_budget_control]
@@ -63,6 +64,21 @@ constraints = [
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -80,6 +96,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -97,6 +120,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
index f6ab761e..f2a72ba7 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
index 39be7e0b..9b908038 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
new file mode 100644
index 00000000..c66f4353
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -0,0 +1,97 @@
+import os
+import shutil
+import sys
+
+import pandas as pd
+from muse import examples
+from muse.wizard import (
+    add_agent_allocation,
+    add_new_commodity,
+    add_new_process,
+    add_price_data_for_new_year,
+    get_sectors,
+)
+
+# WORK IN PROGRESS
+
+"""
+Model 1 - Introduction
+
+"""
+
+
+def generate_model_1():
+    model_name = "1-introduction"
+    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+
+    # Starting point: copy default model
+    examples.copy_model(name="default", path=parent_path, overwrite=True)
+    os.rename(os.path.join(parent_path, "model"), model_path)
+
+    # Global change: modify MaxCapacityGrowth (Undocumented in notebook)
+    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityGrowth"] = 0.2
+    df.to_csv(technodata_file, index=False)
+
+    # Global change: Add Agent 1 to technodata files (Undocumented in notebook)
+    add_agent_allocation(model_path, "Agent1", "Agent2")
+    for sector in get_sectors(model_path):
+        technodata_file = os.path.join(
+            model_path, f"technodata/{sector}/technodata.csv"
+        )
+        df = pd.read_csv(technodata_file)
+        df.loc[0, "Agent1"] = "New"
+        df.loc[1:, "Agent1"] = 0
+        df.to_csv(technodata_file, index=False)
+
+    ### Tutorial
+
+    # Copy wind commodity in power sector -> solar
+    add_new_commodity(model_path, "solar", "power", "wind")
+
+    # Copy windturbine process in power sector -> solarPV
+    add_new_process(model_path, "solarPV", "power", "windturbine")
+
+    # Special handling for CommIn.csv
+    commin_file = os.path.join(model_path, "technodata/power/CommIn.csv")
+    df = pd.read_csv(commin_file)
+    df.loc[(df["ProcessName"] == "solarPV"), "solar"] = 1
+    df.loc[(df["ProcessName"] == "solarPV"), "wind"] = 0
+    df.loc[(df["ProcessName"] == "windturbine"), "solar"] = 0
+    df.to_csv(commin_file, index=False)
+
+    # Special handling for technodata.csv
+    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[df["ProcessName"] == "solarPV", "cap_par"] = 30
+    df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
+    df.to_csv(technodata_file, index=False)
+
+
+def generate_model_2():
+    model_name = "2-scenario"
+    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+
+    # Starting point: copy model from 1-introduction
+    shutil.copytree(os.path.join(parent_path, "1-introduction"), model_path)
+
+    # Copy price data for 2020 -> 2040
+    add_price_data_for_new_year(model_path, "2040", "power", "2020")
+
+    # Special handling for technodata.csv
+    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2040"), "cap_par"] = 30
+    df.to_csv(technodata_file, index=False)
+
+
+if __name__ == "__main__":
+    generate_model_1()
+    generate_model_2()
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb b/docs/tutorial-code/1-add-new-technology/solar-scenario-results.ipynb
similarity index 85%
rename from docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
rename to docs/tutorial-code/1-add-new-technology/solar-scenario-results.ipynb
index ac97cf11..99e83447 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/solar-scenario-results.ipynb
+++ b/docs/tutorial-code/1-add-new-technology/solar-scenario-results.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"2-scenario/Results/MCACapacity.csv\")\n",
     "power_capacity = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\"])\n",
@@ -25,6 +25,13 @@
     ")\n",
     "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb b/docs/tutorial-code/1-add-new-technology/visualisation-of-results.ipynb
similarity index 86%
rename from docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
rename to docs/tutorial-code/1-add-new-technology/visualisation-of-results.ipynb
index e18d4a1a..0452bce6 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/visualisation-of-results.ipynb
+++ b/docs/tutorial-code/1-add-new-technology/visualisation-of-results.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"1-introduction/Results/MCACapacity.csv\")\n",
     "print(mca_capacity.head())\n",
     "power_capacity = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
@@ -26,6 +26,13 @@
     ")\n",
     "sns.lineplot(data=power_capacity, x=\"year\", y=\"capacity\", hue=\"technology\")"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
new file mode 100644
index 00000000..1bbcd59e
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -0,0 +1,47 @@
+import os
+import shutil
+import sys
+
+import pandas as pd
+from muse.wizard import add_agent
+
+parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+
+"""
+Model 1 - Multiple objective
+
+"""
+
+
+def generate_model_1():
+    model_name = "1-multiple-objective"
+
+    # Starting point: copy model from previous tutorial
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+    shutil.copytree(
+        os.path.join(parent_path, "../1-add-new-technology/2-scenario"), model_path
+    )
+
+    # Copy agent A1 -> A2
+    add_agent(
+        model_path,
+        agent_name="A2",
+        copy_from="A1",
+        agentshare_new="Agent3",
+        agentshare_retrofit="Agent4",
+    )
+
+    # Special handling for Agents.csv
+    agents_file = os.path.join(model_path, "technodata/Agents.csv")
+    df = pd.read_csv(agents_file)
+    df.loc[df["Name"] == "A2", "Objective2"] = "EAC"
+    df.loc[df["Name"] == "A2", "DecisionMethod"] = "weighted_sum"
+    df.loc[df["Name"] == "A2", ["ObjData1", "ObjData2"]] = 0.5
+    df.to_csv(agents_file, index=False)
+
+
+if __name__ == "__main__":
+    generate_model_1()
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
new file mode 100644
index 00000000..a347e442
--- /dev/null
+++ b/src/muse/wizard.py
@@ -0,0 +1,168 @@
+import os
+
+import pandas as pd
+
+
+def get_sectors(model_path: str) -> list[str]:
+    """Get a list of sector names for a model.
+
+    Args:
+        model_path: Path to the model folder.
+
+    Returns:
+        List of sector names
+    """
+    return [
+        s
+        for s in os.listdir(os.path.join(model_path, "technodata"))
+        if os.path.isfile(os.path.join(model_path, "technodata", s, "technodata.csv"))
+    ]
+
+
+def add_new_commodity(
+    model_path: str, commodity_name: str, sector: str, copy_from: str
+) -> None:
+    """Add a new commodity to a sector by copying an existing one.
+
+    Args:
+        model_path: Path to the model folder.
+        commodity_name: Name of the new commodity.
+        sector: Sector to add the commodity to.
+        copy_from: Name of the commodity to copy from.
+    """
+    files_to_update = [
+        os.path.join(model_path, file)
+        for file in [
+            f"technodata/{sector}/CommIn.csv",
+            f"technodata/{sector}/CommOut.csv",
+            "input/BaseYearImport.csv",
+            "input/BaseYearExport.csv",
+            "input/Projections.csv",
+        ]
+    ]
+
+    for file in files_to_update:
+        df = pd.read_csv(file)
+        df[commodity_name] = df[copy_from]
+        df.to_csv(file, index=False)
+
+    global_commodities_file = os.path.join(model_path, "input/GlobalCommodities.csv")
+    df = pd.read_csv(global_commodities_file)
+    new_rows = df[df["Commodity"] == copy_from.capitalize()].copy()
+    new_rows["Commodity"] = commodity_name.capitalize()
+    new_rows["CommodityName"] = commodity_name
+    df = pd.concat([df, new_rows])
+    df.to_csv(global_commodities_file, index=False)
+
+
+def add_new_process(
+    model_path: str, process_name: str, sector: str, copy_from: str
+) -> None:
+    """Add a new process to a sector by copying an existing one.
+
+    Args:
+        model_path: Path to the model folder.
+        process_name: Name of the new process.
+        sector: Sector to add the process to.
+        copy_from: Name of the process to copy from.
+    """
+    files_to_update = [
+        os.path.join(model_path, file)
+        for file in [
+            f"technodata/{sector}/CommIn.csv",
+            f"technodata/{sector}/CommOut.csv",
+            f"technodata/{sector}/ExistingCapacity.csv",
+            f"technodata/{sector}/technodata.csv",
+        ]
+    ]
+
+    for file in files_to_update:
+        df = pd.read_csv(file)
+        new_rows = df[df["ProcessName"] == copy_from].copy()
+        new_rows["ProcessName"] = process_name
+        df = pd.concat([df, new_rows])
+        df.to_csv(file, index=False)
+
+
+def add_price_data_for_new_year(
+    model_path: str, year: str, sector: str, copy_from: str
+) -> None:
+    """Add price data for a new year by copying from an existing year.
+
+    Args:
+        model_path: Path to the model folder.
+        year: Year to add the price data to.
+        sector: Sector to add the price data to.
+        copy_from: Year to copy the price data from.
+    """
+    files_to_update = [
+        os.path.join(model_path, f"technodata/{sector}/{file}")
+        for file in ["technodata.csv", "CommIn.csv", "CommOut.csv"]
+    ]
+
+    for file in files_to_update:
+        df = pd.read_csv(file)
+        df["index"] = df.index
+        new_rows = df[df["Time"] == copy_from].copy()
+        new_rows["Time"] = year
+        df = pd.concat([df, new_rows], ignore_index=True)
+        df.sort_values(by=["index", "Time"], inplace=True)
+        df.drop(columns=["index"], inplace=True)
+        df.to_csv(file, index=False)
+
+
+def add_agent(
+    model_path: str,
+    agent_name: str,
+    copy_from: str,
+    agentshare_new: str,
+    agentshare_retrofit: str,
+) -> None:
+    """Add a new agent to the model by copying an existing one.
+
+    Args:
+        model_path: Path to the model folder.
+        agent_name: Name of the new agent.
+        copy_from: Name of the agent to copy from.
+        agentshare_new: Name of the new agent share for new agent.
+        agentshare_retrofit: Name of the retrofit agent share for new agent.
+    """
+    agents_file = os.path.join(model_path, "technodata/Agents.csv")
+    df = pd.read_csv(agents_file)
+    new_rows = df[df["Name"] == copy_from].copy()
+    new_rows["Name"] = agent_name
+    new_rows.loc[new_rows["Type"] == "New", "AgentShare"] = agentshare_new
+    new_rows.loc[new_rows["Type"] == "Retrofit", "AgentShare"] = agentshare_retrofit
+    df = pd.concat([df, new_rows])
+    df.to_csv(agents_file, index=False)
+
+    copy_from_new = df.loc[
+        (df["Name"] == copy_from) & (df["Type"] == "New"), "AgentShare"
+    ].values[0]
+    copy_from_retrofit = df.loc[
+        (df["Name"] == copy_from) & (df["Type"] == "Retrofit"), "AgentShare"
+    ].values[0]
+
+    add_agent_allocation(model_path, agentshare_retrofit, copy_from_retrofit)
+    add_agent_allocation(model_path, agentshare_new, copy_from_new)
+
+
+def add_agent_allocation(
+    model_path: str,
+    agentshare_name: str,
+    copy_from: str,
+) -> None:
+    """Add an agent allocation to technodata files by copying from an existing one.
+
+    Args:
+        model_path: Path to the model folder.
+        agentshare_name: Name of the agent share to add.
+        copy_from: Name of the agent share to copy from.
+    """
+    for sector in get_sectors(model_path):
+        technodata_file = os.path.join(
+            model_path, f"technodata/{sector}/technodata.csv"
+        )
+        df = pd.read_csv(technodata_file)
+        df[agentshare_name] = df[copy_from]
+        df.to_csv(technodata_file, index=False)

From 15f08650015380181dfce91a17980fc0b2a500a5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 10 May 2024 17:55:27 +0100
Subject: [PATCH 091/419] Fixing remaining model inconsistencies

---
 .../Results/Gas/Capacity/2025.csv             |  12 +-
 .../Results/Gas/Capacity/2030.csv             |  18 +-
 .../Results/Gas/Capacity/2035.csv             |  17 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  11 +-
 .../Results/Gas/Capacity/2050.csv             |  11 +-
 .../1-introduction/Results/MCACapacity.csv    |  42 ++--
 .../1-introduction/Results/MCAPrices.csv      | 216 +++++++++---------
 .../Results/Power/Capacity/2025.csv           |  47 ++--
 .../Results/Power/Capacity/2030.csv           |  41 ++--
 .../Results/Power/Capacity/2035.csv           |  76 ++++--
 .../Results/Power/Capacity/2040.csv           |  81 ++++---
 .../Results/Power/Capacity/2045.csv           | 116 +++++-----
 .../Results/Power/Capacity/2050.csv           | 106 +++++----
 .../1-introduction/settings.toml              | 164 ++++++-------
 .../technodata/gas/Technodata.csv             |   6 +-
 .../technodata/power/Technodata.csv           |  10 +-
 .../technodata/residential/Technodata.csv     |   8 +-
 .../2-scenario/Results/Gas/Capacity/2025.csv  |  12 +-
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  18 +-
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  17 +-
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  14 +-
 .../2-scenario/Results/Gas/Capacity/2045.csv  |  11 +-
 .../2-scenario/Results/Gas/Capacity/2050.csv  |  11 +-
 .../2-scenario/Results/MCACapacity.csv        |  61 +++--
 .../2-scenario/Results/MCAPrices.csv          | 216 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  24 +-
 .../Results/Power/Capacity/2025.csv           |  47 ++--
 .../Results/Power/Capacity/2030.csv           |  61 +++--
 .../Results/Power/Capacity/2035.csv           |  81 ++++---
 .../Results/Power/Capacity/2040.csv           |  82 ++++---
 .../Results/Power/Capacity/2045.csv           |  90 ++++----
 .../Results/Power/Capacity/2050.csv           |  98 ++++----
 .../2-scenario/settings.toml                  | 164 ++++++-------
 .../2-scenario/technodata/gas/Technodata.csv  |   6 +-
 .../technodata/power/Technodata.csv           |  16 +-
 .../technodata/residential/Technodata.csv     |   8 +-
 .../1-add-new-technology/generate_models.py   |  49 ++--
 .../2-add-agent/generate_models.py            |   1 +
 src/muse/wizard.py                            |  17 ++
 40 files changed, 1169 insertions(+), 931 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
index f2ad7b02..d1fb99f5 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,9 @@
-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
+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/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 46ed388e..298f6c89 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,7 +1,15 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,5.28440000000
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 4a49ec7f..e368dd50 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,6 +1,13 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,5.28440000000
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 54d8f5f5..4d55f6f7 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,5 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 18de09c4..e5d560fc 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,4 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 efec1bce..4a7d05fa 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,4 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2055,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 fa454d8e..9d868b1d 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
@@ -11,43 +11,57 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
 windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 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,9.15000000000
+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,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
 windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
+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
 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,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,9.19000000000
+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
 windturbine,R1,R1,A1,power,retrofit,2045,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+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
-solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.19000000000
+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,16.91000000000
 windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
+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 a86a6756..f4d602c4 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.44430000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
+"('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,9.09860000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.54820000000,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,9.15550000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.82330000000,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,9.09860000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54820000000,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,9.15550000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82330000000,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,9.32640000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65240000000,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,9.21250000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.09900000000,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,7.30720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.67220000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.00930000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.67220000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00930000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.02460000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.34710000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,5.87400000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.63150000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.74920000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,5.93600000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.84220000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.12470000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,5.87400000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.63150000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.74920000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.93600000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.84220000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12470000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.12180000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.48290000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.25490000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,5.99790000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.05440000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.50080000000,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')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
index 849d1bde..35de2d84 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -1,21 +1,30 @@
 asset,year,region,technology,installed,capacity
 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,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
-3,2025,R1,windturbine,2020,6.75000000000
-3,2030,R1,windturbine,2020,6.75000000000
-3,2035,R1,windturbine,2020,6.75000000000
-3,2040,R1,windturbine,2020,6.75000000000
-3,2045,R1,windturbine,2020,6.75000000000
-3,2049,R1,windturbine,2020,6.75000000000
+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,2064,R1,gasCCGT,2025,3.00000000000
+2,2025,R1,solarPV,2020,10.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,2025,R1,windturbine,2020,6.75000000000
+4,2030,R1,windturbine,2020,6.75000000000
+4,2035,R1,windturbine,2020,6.75000000000
+4,2040,R1,windturbine,2020,6.75000000000
+4,2045,R1,windturbine,2020,6.75000000000
+4,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 b8d11565..26ce8db8 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
@@ -9,18 +9,29 @@ asset,year,region,installed,technology,capacity
 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,solarPV,9.15000000000
-3,2035,R1,2025,solarPV,9.15000000000
-3,2040,R1,2025,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2035,R1,2030,solarPV,6.00000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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
+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
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 bb2bda0b..3f21815e 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
@@ -7,26 +7,56 @@ asset,year,region,installed,technology,capacity
 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,solarPV,9.15000000000
-3,2040,R1,2025,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2035,R1,2030,solarPV,6.00000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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,2040,R1,2035,solarPV,9.19000000000
-5,2045,R1,2035,solarPV,9.19000000000
-5,2049,R1,2035,solarPV,9.19000000000
-5,2050,R1,2035,solarPV,9.19000000000
-5,2054,R1,2035,solarPV,9.19000000000
-5,2055,R1,2035,solarPV,9.19000000000
-5,2059,R1,2035,solarPV,9.19000000000
-5,2060,R1,2035,solarPV,9.19000000000
-5,2064,R1,2035,solarPV,9.19000000000
+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
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 2f4caa4e..0ab7f9bf 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
@@ -5,34 +5,53 @@ asset,year,region,installed,technology,capacity
 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,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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,2040,R1,2035,solarPV,9.19000000000
-5,2045,R1,2035,solarPV,9.19000000000
-5,2049,R1,2035,solarPV,9.19000000000
-5,2050,R1,2035,solarPV,9.19000000000
-5,2054,R1,2035,solarPV,9.19000000000
-5,2055,R1,2035,solarPV,9.19000000000
-5,2059,R1,2035,solarPV,9.19000000000
-5,2060,R1,2035,solarPV,9.19000000000
-5,2064,R1,2035,solarPV,9.19000000000
-6,2045,R1,2040,solarPV,6.00000000000
-6,2049,R1,2040,solarPV,6.00000000000
-6,2050,R1,2040,solarPV,6.00000000000
-6,2054,R1,2040,solarPV,6.00000000000
-6,2055,R1,2040,solarPV,6.00000000000
-6,2059,R1,2040,solarPV,6.00000000000
-6,2060,R1,2040,solarPV,6.00000000000
-6,2064,R1,2040,solarPV,6.00000000000
-6,2065,R1,2040,solarPV,6.00000000000
-6,2069,R1,2040,solarPV,6.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,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
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 324548ca..3d2ca0a4 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
@@ -1,53 +1,65 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2020,10.00000000000
-0,2049,R1,solarPV,2020,10.00000000000
-1,2045,R1,solarPV,2025,9.15000000000
-1,2049,R1,solarPV,2025,9.15000000000
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2035,9.19000000000
-3,2049,R1,solarPV,2035,9.19000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
-5,2070,R1,solarPV,2045,16.91000000000
-5,2074,R1,solarPV,2045,16.91000000000
-6,2045,R1,windturbine,2020,6.75000000000
-6,2049,R1,windturbine,2020,6.75000000000
-7,2050,R1,windturbine,2045,6.75000000000
-7,2054,R1,windturbine,2045,6.75000000000
-7,2055,R1,windturbine,2045,6.75000000000
-7,2059,R1,windturbine,2045,6.75000000000
-7,2060,R1,windturbine,2045,6.75000000000
-7,2064,R1,windturbine,2045,6.75000000000
-7,2065,R1,windturbine,2045,6.75000000000
-7,2069,R1,windturbine,2045,6.75000000000
-7,2070,R1,windturbine,2045,6.75000000000
-7,2074,R1,windturbine,2045,6.75000000000
+0,2045,R1,gasCCGT,2025,3.00000000000
+0,2049,R1,gasCCGT,2025,3.00000000000
+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
+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
+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,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
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 470b2a93..43ea9b82 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,51 +1,57 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,9.15000000000
-2,2054,R1,2025,solarPV,9.15000000000
-3,2050,R1,2030,solarPV,6.00000000000
-3,2054,R1,2030,solarPV,6.00000000000
-3,2055,R1,2030,solarPV,6.00000000000
-3,2059,R1,2030,solarPV,6.00000000000
-4,2050,R1,2035,solarPV,9.19000000000
-4,2054,R1,2035,solarPV,9.19000000000
-4,2055,R1,2035,solarPV,9.19000000000
-4,2059,R1,2035,solarPV,9.19000000000
-4,2060,R1,2035,solarPV,9.19000000000
-4,2064,R1,2035,solarPV,9.19000000000
-5,2050,R1,2040,solarPV,6.00000000000
-5,2054,R1,2040,solarPV,6.00000000000
-5,2055,R1,2040,solarPV,6.00000000000
-5,2059,R1,2040,solarPV,6.00000000000
-5,2060,R1,2040,solarPV,6.00000000000
-5,2064,R1,2040,solarPV,6.00000000000
-5,2065,R1,2040,solarPV,6.00000000000
-5,2069,R1,2040,solarPV,6.00000000000
-6,2050,R1,2045,solarPV,16.91000000000
-6,2054,R1,2045,solarPV,16.91000000000
-6,2055,R1,2045,solarPV,16.91000000000
-6,2059,R1,2045,solarPV,16.91000000000
-6,2060,R1,2045,solarPV,16.91000000000
-6,2064,R1,2045,solarPV,16.91000000000
-6,2065,R1,2045,solarPV,16.91000000000
-6,2069,R1,2045,solarPV,16.91000000000
-6,2070,R1,2045,solarPV,16.91000000000
-6,2074,R1,2045,solarPV,16.91000000000
-7,2050,R1,2045,windturbine,6.75000000000
-7,2054,R1,2045,windturbine,6.75000000000
-7,2055,R1,2045,windturbine,6.75000000000
-7,2059,R1,2045,windturbine,6.75000000000
-7,2060,R1,2045,windturbine,6.75000000000
-7,2064,R1,2045,windturbine,6.75000000000
-7,2065,R1,2045,windturbine,6.75000000000
-7,2069,R1,2045,windturbine,6.75000000000
-7,2070,R1,2045,windturbine,6.75000000000
-7,2074,R1,2045,windturbine,6.75000000000
-8,2055,R1,2050,solarPV,9.15000000000
-8,2059,R1,2050,solarPV,9.15000000000
-8,2060,R1,2050,solarPV,9.15000000000
-8,2064,R1,2050,solarPV,9.15000000000
-8,2065,R1,2050,solarPV,9.15000000000
-8,2069,R1,2050,solarPV,9.15000000000
-8,2070,R1,2050,solarPV,9.15000000000
-8,2074,R1,2050,solarPV,9.15000000000
-8,2075,R1,2050,solarPV,9.15000000000
-8,2079,R1,2050,solarPV,9.15000000000
+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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 0e5e1145..54b52362 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -1,15 +1,12 @@
-# Global settings - most REQUIRED
-
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = 'Active'
-log_level = 'info'
-excluded_commodities = ["wind"]
-# Convergence parameters
-equilibrium_variable = 'demand'
-maximum_iterations = 1
+interpolation_mode = "Active"
+log_level = "info"
+excluded_commodities = ["wind", "solar"]
+equilibrium_variable = "demand"
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
@@ -23,124 +20,113 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
-
-# Carbon budget control
+keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
+
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
-projections = '{path}/input/Projections.csv'
-global_commodities = '{path}/input/GlobalCommodities.csv'
+projections = "{path}/input/Projections.csv"
+global_commodities = "{path}/input/GlobalCommodities.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
 
 [sectors.residential]
-type = 'default'
+type = "default"
 priority = 1
-dispatch_production = 'share'
-technodata = '{path}/technodata/residential/Technodata.csv'
-commodities_in = '{path}/technodata/residential/CommIn.csv'
-commodities_out = '{path}/technodata/residential/CommOut.csv'
-
-[sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [
-    # Optional, defaults to the constraints below
-    "max_production",
-    "max_capacity_expansion",
-    "demand",
-    "search_space"
-]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5
+dispatch_production = "share"
+technodata = "{path}/technodata/residential/Technodata.csv"
+commodities_in = "{path}/technodata/residential/CommIn.csv"
+commodities_out = "{path}/technodata/residential/CommOut.csv"
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
 quantity = "capacity"
-sink = 'csv'
+sink = "csv"
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+sink = "csv"
 overwrite = true
-quantity.name = "supply"
-quantity.sum_over = "timeslice"
-quantity.drop = ["comm_usage", "units_prices"]
+
+[sectors.residential.outputs.quantity]
+name = "supply"
+sum_over = "timeslice"
+drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.residential.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
+lpsolver = "scipy"
+constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
+demand_share = "new_and_retro"
+forecast = 5
 
 [sectors.power]
-type = 'default'
+type = "default"
 priority = 2
-dispatch_production = 'share'
-technodata = '{path}/technodata/power/Technodata.csv'
-commodities_in = '{path}/technodata/power/CommIn.csv'
-commodities_out = '{path}/technodata/power/CommOut.csv'
-
-[sectors.power.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
-lpsolver = "scipy"
+dispatch_production = "share"
+technodata = "{path}/technodata/power/Technodata.csv"
+commodities_in = "{path}/technodata/power/CommIn.csv"
+commodities_out = "{path}/technodata/power/CommOut.csv"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
 quantity = "capacity"
-sink = 'csv'
+sink = "csv"
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.power.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.gas]
-type = 'default'
+type = "default"
 priority = 3
-dispatch_production = 'share'
-technodata = '{path}/technodata/gas/Technodata.csv'
-commodities_in = '{path}/technodata/gas/CommIn.csv'
-commodities_out = '{path}/technodata/gas/CommOut.csv'
-
-[sectors.gas.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
-lpsolver = "scipy"
+dispatch_production = "share"
+technodata = "{path}/technodata/gas/Technodata.csv"
+commodities_in = "{path}/technodata/gas/CommIn.csv"
+commodities_out = "{path}/technodata/gas/CommOut.csv"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
 quantity = "capacity"
-sink = 'csv'
+sink = "csv"
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.gas.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.residential_presets]
-type = 'presets'
+type = "presets"
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
index 57f66da8..25614cf7 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
index a71a48d0..52699888 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
index 663288ae..3ecb1c70 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
index f2ad7b02..d1fb99f5 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,9 @@
-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
+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/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 46ed388e..298f6c89 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,7 +1,15 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,5.28440000000
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 4a49ec7f..e368dd50 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,6 +1,13 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,5.28440000000
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 54d8f5f5..4d55f6f7 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,5 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 18de09c4..e5d560fc 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,4 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 efec1bce..4a7d05fa 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,4 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2055,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
+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
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 fa454d8e..5f93911e 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
@@ -5,49 +5,60 @@ gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 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
-solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
+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,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
+solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+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
 heatpump,R1,R1,A1,residential,retrofit,2045,16.09000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,31.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
+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,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,5.28440000000
+solarPV,R1,R1,A1,power,retrofit,2045,10.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
 heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.19000000000
+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,16.91000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
+windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
+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/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
index a86a6756..d29309c0 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.51720000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17730000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77730000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27810000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51720000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17730000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77730000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27810000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56390000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62930000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38710000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.56240000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19980000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.84490000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31400000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56240000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19980000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84490000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31400000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69720000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.44430000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.12810000000,2035
+"('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,9.09860000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.48550000000,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,9.15550000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.72900000000,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,9.09860000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.48550000000,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,9.15550000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.72900000000,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,9.32640000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.46280000000,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,9.21250000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.97310000000,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,7.30720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.58540000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.87890000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.58540000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87890000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.76260000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.17290000000,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')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,5.87400000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.63150000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.63840000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,5.93600000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.84220000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95840000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,5.87400000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.63150000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63840000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.93600000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.84220000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95840000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.12180000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.48290000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.92120000000,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')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,5.99790000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.05440000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.27880000000,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')",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 beea1d34..f194e742 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,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
+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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
index 849d1bde..6611dc7e 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -1,21 +1,30 @@
 asset,year,region,technology,installed,capacity
 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,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
-3,2025,R1,windturbine,2020,6.75000000000
-3,2030,R1,windturbine,2020,6.75000000000
-3,2035,R1,windturbine,2020,6.75000000000
-3,2040,R1,windturbine,2020,6.75000000000
-3,2045,R1,windturbine,2020,6.75000000000
-3,2049,R1,windturbine,2020,6.75000000000
+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,2064,R1,gasCCGT,2025,3.00000000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2025,R1,windturbine,2020,10.00000000000
+4,2030,R1,windturbine,2020,10.00000000000
+4,2035,R1,windturbine,2020,10.00000000000
+4,2040,R1,windturbine,2020,10.00000000000
+4,2045,R1,windturbine,2020,10.00000000000
+4,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 b8d11565..3739f2ea 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,26 +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,solarPV,9.15000000000
-3,2035,R1,2025,solarPV,9.15000000000
-3,2040,R1,2025,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2035,R1,2030,solarPV,6.00000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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
+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
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 bb2bda0b..94a5d1ab 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,32 +1,51 @@
 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,solarPV,9.15000000000
-3,2040,R1,2025,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2035,R1,2030,solarPV,6.00000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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,2040,R1,2035,solarPV,9.19000000000
-5,2045,R1,2035,solarPV,9.19000000000
-5,2049,R1,2035,solarPV,9.19000000000
-5,2050,R1,2035,solarPV,9.19000000000
-5,2054,R1,2035,solarPV,9.19000000000
-5,2055,R1,2035,solarPV,9.19000000000
-5,2059,R1,2035,solarPV,9.19000000000
-5,2060,R1,2035,solarPV,9.19000000000
-5,2064,R1,2035,solarPV,9.19000000000
+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
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 2f4caa4e..5e8f56bc 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,38 +1,46 @@
 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,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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,2040,R1,2035,solarPV,9.19000000000
-5,2045,R1,2035,solarPV,9.19000000000
-5,2049,R1,2035,solarPV,9.19000000000
-5,2050,R1,2035,solarPV,9.19000000000
-5,2054,R1,2035,solarPV,9.19000000000
-5,2055,R1,2035,solarPV,9.19000000000
-5,2059,R1,2035,solarPV,9.19000000000
-5,2060,R1,2035,solarPV,9.19000000000
-5,2064,R1,2035,solarPV,9.19000000000
-6,2045,R1,2040,solarPV,6.00000000000
-6,2049,R1,2040,solarPV,6.00000000000
-6,2050,R1,2040,solarPV,6.00000000000
-6,2054,R1,2040,solarPV,6.00000000000
-6,2055,R1,2040,solarPV,6.00000000000
-6,2059,R1,2040,solarPV,6.00000000000
-6,2060,R1,2040,solarPV,6.00000000000
-6,2064,R1,2040,solarPV,6.00000000000
-6,2065,R1,2040,solarPV,6.00000000000
-6,2069,R1,2040,solarPV,6.00000000000
+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
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 324548ca..c64073d2 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
@@ -1,34 +1,32 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2020,10.00000000000
-0,2049,R1,solarPV,2020,10.00000000000
-1,2045,R1,solarPV,2025,9.15000000000
-1,2049,R1,solarPV,2025,9.15000000000
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2035,9.19000000000
-3,2049,R1,solarPV,2035,9.19000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
+0,2045,R1,gasCCGT,2025,3.00000000000
+0,2049,R1,gasCCGT,2025,3.00000000000
+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
+1,2045,R1,solarPV,2020,6.75000000000
+1,2049,R1,solarPV,2020,6.75000000000
+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,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
@@ -36,18 +34,22 @@ asset,year,region,technology,installed,capacity
 5,2060,R1,solarPV,2045,16.91000000000
 5,2064,R1,solarPV,2045,16.91000000000
 5,2065,R1,solarPV,2045,16.91000000000
-5,2069,R1,solarPV,2045,16.91000000000
-5,2070,R1,solarPV,2045,16.91000000000
 5,2074,R1,solarPV,2045,16.91000000000
-6,2045,R1,windturbine,2020,6.75000000000
-6,2049,R1,windturbine,2020,6.75000000000
-7,2050,R1,windturbine,2045,6.75000000000
-7,2054,R1,windturbine,2045,6.75000000000
-7,2055,R1,windturbine,2045,6.75000000000
-7,2059,R1,windturbine,2045,6.75000000000
-7,2060,R1,windturbine,2045,6.75000000000
-7,2064,R1,windturbine,2045,6.75000000000
-7,2065,R1,windturbine,2045,6.75000000000
-7,2069,R1,windturbine,2045,6.75000000000
-7,2070,R1,windturbine,2045,6.75000000000
-7,2074,R1,windturbine,2045,6.75000000000
+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
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 470b2a93..fbf5711d 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,51 +1,49 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,9.15000000000
-2,2054,R1,2025,solarPV,9.15000000000
-3,2050,R1,2030,solarPV,6.00000000000
-3,2054,R1,2030,solarPV,6.00000000000
-3,2055,R1,2030,solarPV,6.00000000000
-3,2059,R1,2030,solarPV,6.00000000000
-4,2050,R1,2035,solarPV,9.19000000000
-4,2054,R1,2035,solarPV,9.19000000000
-4,2055,R1,2035,solarPV,9.19000000000
-4,2059,R1,2035,solarPV,9.19000000000
-4,2060,R1,2035,solarPV,9.19000000000
-4,2064,R1,2035,solarPV,9.19000000000
-5,2050,R1,2040,solarPV,6.00000000000
-5,2054,R1,2040,solarPV,6.00000000000
-5,2055,R1,2040,solarPV,6.00000000000
-5,2059,R1,2040,solarPV,6.00000000000
-5,2060,R1,2040,solarPV,6.00000000000
-5,2064,R1,2040,solarPV,6.00000000000
-5,2065,R1,2040,solarPV,6.00000000000
-5,2069,R1,2040,solarPV,6.00000000000
-6,2050,R1,2045,solarPV,16.91000000000
-6,2054,R1,2045,solarPV,16.91000000000
-6,2055,R1,2045,solarPV,16.91000000000
-6,2059,R1,2045,solarPV,16.91000000000
-6,2060,R1,2045,solarPV,16.91000000000
-6,2064,R1,2045,solarPV,16.91000000000
-6,2065,R1,2045,solarPV,16.91000000000
-6,2069,R1,2045,solarPV,16.91000000000
-6,2070,R1,2045,solarPV,16.91000000000
-6,2074,R1,2045,solarPV,16.91000000000
-7,2050,R1,2045,windturbine,6.75000000000
-7,2054,R1,2045,windturbine,6.75000000000
-7,2055,R1,2045,windturbine,6.75000000000
-7,2059,R1,2045,windturbine,6.75000000000
-7,2060,R1,2045,windturbine,6.75000000000
-7,2064,R1,2045,windturbine,6.75000000000
-7,2065,R1,2045,windturbine,6.75000000000
-7,2069,R1,2045,windturbine,6.75000000000
-7,2070,R1,2045,windturbine,6.75000000000
-7,2074,R1,2045,windturbine,6.75000000000
-8,2055,R1,2050,solarPV,9.15000000000
-8,2059,R1,2050,solarPV,9.15000000000
-8,2060,R1,2050,solarPV,9.15000000000
-8,2064,R1,2050,solarPV,9.15000000000
-8,2065,R1,2050,solarPV,9.15000000000
-8,2069,R1,2050,solarPV,9.15000000000
-8,2070,R1,2050,solarPV,9.15000000000
-8,2074,R1,2050,solarPV,9.15000000000
-8,2075,R1,2050,solarPV,9.15000000000
-8,2079,R1,2050,solarPV,9.15000000000
+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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 0e5e1145..54b52362 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -1,15 +1,12 @@
-# Global settings - most REQUIRED
-
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = 'Active'
-log_level = 'info'
-excluded_commodities = ["wind"]
-# Convergence parameters
-equilibrium_variable = 'demand'
-maximum_iterations = 1
+interpolation_mode = "Active"
+log_level = "info"
+excluded_commodities = ["wind", "solar"]
+equilibrium_variable = "demand"
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
@@ -23,124 +20,113 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
-
-# Carbon budget control
+keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
+
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
-projections = '{path}/input/Projections.csv'
-global_commodities = '{path}/input/GlobalCommodities.csv'
+projections = "{path}/input/Projections.csv"
+global_commodities = "{path}/input/GlobalCommodities.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
 
 [sectors.residential]
-type = 'default'
+type = "default"
 priority = 1
-dispatch_production = 'share'
-technodata = '{path}/technodata/residential/Technodata.csv'
-commodities_in = '{path}/technodata/residential/CommIn.csv'
-commodities_out = '{path}/technodata/residential/CommOut.csv'
-
-[sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [
-    # Optional, defaults to the constraints below
-    "max_production",
-    "max_capacity_expansion",
-    "demand",
-    "search_space"
-]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5
+dispatch_production = "share"
+technodata = "{path}/technodata/residential/Technodata.csv"
+commodities_in = "{path}/technodata/residential/CommIn.csv"
+commodities_out = "{path}/technodata/residential/CommOut.csv"
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
 quantity = "capacity"
-sink = 'csv'
+sink = "csv"
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-sink = 'csv'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+sink = "csv"
 overwrite = true
-quantity.name = "supply"
-quantity.sum_over = "timeslice"
-quantity.drop = ["comm_usage", "units_prices"]
+
+[sectors.residential.outputs.quantity]
+name = "supply"
+sum_over = "timeslice"
+drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.residential.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
+lpsolver = "scipy"
+constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
+demand_share = "new_and_retro"
+forecast = 5
 
 [sectors.power]
-type = 'default'
+type = "default"
 priority = 2
-dispatch_production = 'share'
-technodata = '{path}/technodata/power/Technodata.csv'
-commodities_in = '{path}/technodata/power/CommIn.csv'
-commodities_out = '{path}/technodata/power/CommOut.csv'
-
-[sectors.power.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
-lpsolver = "scipy"
+dispatch_production = "share"
+technodata = "{path}/technodata/power/Technodata.csv"
+commodities_in = "{path}/technodata/power/CommIn.csv"
+commodities_out = "{path}/technodata/power/CommOut.csv"
 
 [[sectors.power.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
 quantity = "capacity"
-sink = 'csv'
+sink = "csv"
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.power.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.gas]
-type = 'default'
+type = "default"
 priority = 3
-dispatch_production = 'share'
-technodata = '{path}/technodata/gas/Technodata.csv'
-commodities_in = '{path}/technodata/gas/CommIn.csv'
-commodities_out = '{path}/technodata/gas/CommOut.csv'
-
-[sectors.gas.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
-lpsolver = "scipy"
+dispatch_production = "share"
+technodata = "{path}/technodata/gas/Technodata.csv"
+commodities_in = "{path}/technodata/gas/CommIn.csv"
+commodities_out = "{path}/technodata/gas/CommOut.csv"
 
 [[sectors.gas.outputs]]
-filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
 quantity = "capacity"
-sink = 'csv'
+sink = "csv"
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.gas.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.residential_presets]
-type = 'presets'
+type = "presets"
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
index 57f66da8..25614cf7 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
index 9b908038..f165e7e2 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
index 1433a48a..aa4eb867 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index c66f4353..e702b3be 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -5,22 +5,23 @@
 import pandas as pd
 from muse import examples
 from muse.wizard import (
-    add_agent_allocation,
     add_new_commodity,
     add_new_process,
     add_price_data_for_new_year,
-    get_sectors,
+    modify_toml,
 )
 
-# WORK IN PROGRESS
-
 """
 Model 1 - Introduction
 
 """
 
 
-def generate_model_1():
+def generate_model_1() -> None:
+    """
+    Code to generate model 1-introduction.
+
+    """
     model_name = "1-introduction"
     parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
     model_path = os.path.join(parent_path, model_name)
@@ -31,22 +32,25 @@ def generate_model_1():
     examples.copy_model(name="default", path=parent_path, overwrite=True)
     os.rename(os.path.join(parent_path, "model"), model_path)
 
-    # Global change: modify MaxCapacityGrowth (Undocumented in notebook)
+    # Modify MaxCapacityGrowth (Undocumented)
     technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.2
     df.to_csv(technodata_file, index=False)
 
-    # Global change: Add Agent 1 to technodata files (Undocumented in notebook)
-    add_agent_allocation(model_path, "Agent1", "Agent2")
-    for sector in get_sectors(model_path):
-        technodata_file = os.path.join(
-            model_path, f"technodata/{sector}/technodata.csv"
-        )
-        df = pd.read_csv(technodata_file)
-        df.loc[0, "Agent1"] = "New"
-        df.loc[1:, "Agent1"] = 0
-        df.to_csv(technodata_file, index=False)
+    # Change maximum_iterations to 100 (Undocumented)
+    settings_file = os.path.join(model_path, "settings.toml")
+    modify_toml(
+        settings_file, lambda settings: settings.update({"maximum_iterations": 100})
+    )
+
+    # Change carbon budget method (Undocumented)
+    modify_toml(
+        settings_file,
+        lambda settings: settings["carbon_budget_control"].update(
+            {"method": "fitting"}
+        ),
+    )
 
     ### Tutorial
 
@@ -71,8 +75,18 @@ def generate_model_1():
     df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
     df.to_csv(technodata_file, index=False)
 
+    # Add solar to excluded commodities (Undocumented)
+    settings_file = os.path.join(model_path, "settings.toml")
+    modify_toml(
+        settings_file, lambda settings: settings["excluded_commodities"].append("solar")
+    )
+
+
+def generate_model_2() -> None:
+    """
+    Code to generate model 2-scenario.
 
-def generate_model_2():
+    """
     model_name = "2-scenario"
     parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
     model_path = os.path.join(parent_path, model_name)
@@ -88,6 +102,7 @@ def generate_model_2():
     # Special handling for technodata.csv
     technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
     df = pd.read_csv(technodata_file)
+    df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2020"), "cap_par"] = 40
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2040"), "cap_par"] = 30
     df.to_csv(technodata_file, index=False)
 
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 1bbcd59e..1f44e9e2 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -7,6 +7,7 @@
 
 parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
 
+# WORK IN PROGRESS
 
 """
 Model 1 - Multiple objective
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index a347e442..c15baaf8 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,6 +1,23 @@
 import os
 
 import pandas as pd
+import toml
+
+
+def modify_toml(path_to_toml, function):
+    """Apply the specified function to modify a toml file
+
+    Args:
+        path_to_toml: Path to the toml file
+        function: Function to apply to the toml data. Must take a dictionary as a single
+            input.
+
+    """
+    with open(path_to_toml, "r") as file:
+        data = toml.load(file)
+    function(data)
+    with open(path_to_toml, "w") as file:
+        toml.dump(data, file)
 
 
 def get_sectors(model_path: str) -> list[str]:

From 27d1e67ae432770608b95e816e8d1ede9d27968e Mon Sep 17 00:00:00 2001
From: sgiarols <11628582+sgiarols@users.noreply.github.com>
Date: Mon, 13 May 2024 00:15:02 +0000
Subject: [PATCH 092/419] chore: update pre-commit hooks

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9bdbfd91..38aa6702 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.3
+    rev: v0.4.4
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]

From 5e9853403107bcdd0bb625a27f114489afebd602 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 13:51:32 +0000
Subject: [PATCH 093/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/muse/filters.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/muse/filters.py b/src/muse/filters.py
index 7028a383..bfd09176 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -349,13 +349,13 @@ def maturity(
     techs = (
         condition.technology.where(condition, drop=True).drop_vars("technology").values
     )
-    
+
     # Generate a boolean mask where 'True' corresponds to entries in 'search_space.replacement' that are in 'techs'
     mask = search_space.replacement.isin(techs)
 
     # Apply this mask to 'search_space', turning all fields where the condition is not met to False
     replacement = search_space.where(mask, False)
-    
+
     return search_space & replacement
 
 
@@ -378,13 +378,13 @@ def spend_limit(
     techs = (
         condition.technology.where(condition, drop=True).drop_vars("technology").values
     )
-    
+
     # Generate a boolean mask where 'True' corresponds to entries in 'search_space.replacement' that are in 'techs'
     mask = search_space.replacement.isin(techs)
 
     # Apply this mask to 'search_space', turning all fields where the condition is not met to False
     replacement = search_space.where(mask, False)
-    
+
     return search_space & replacement
 
 

From 004f9661e6f1d94ce1752b732f496d4cdee42cf2 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 13 May 2024 15:20:45 +0100
Subject: [PATCH 094/419] Wrap a few overly long comments

---
 src/muse/filters.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/muse/filters.py b/src/muse/filters.py
index bfd09176..536824bf 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -350,10 +350,12 @@ def maturity(
         condition.technology.where(condition, drop=True).drop_vars("technology").values
     )
 
-    # Generate a boolean mask where 'True' corresponds to entries in 'search_space.replacement' that are in 'techs'
+    # Generate a boolean mask where 'True' corresponds to entries in
+    # 'search_space.replacement' that are in 'techs'
     mask = search_space.replacement.isin(techs)
 
-    # Apply this mask to 'search_space', turning all fields where the condition is not met to False
+    # Apply this mask to 'search_space', turning all fields where the condition is not
+    # met to False
     replacement = search_space.where(mask, False)
 
     return search_space & replacement
@@ -379,10 +381,12 @@ def spend_limit(
         condition.technology.where(condition, drop=True).drop_vars("technology").values
     )
 
-    # Generate a boolean mask where 'True' corresponds to entries in 'search_space.replacement' that are in 'techs'
+    # Generate a boolean mask where 'True' corresponds to entries in
+    # 'search_space.replacement' that are in 'techs'
     mask = search_space.replacement.isin(techs)
 
-    # Apply this mask to 'search_space', turning all fields where the condition is not met to False
+    # Apply this mask to 'search_space', turning all fields where the condition is not
+    # met to False
     replacement = search_space.where(mask, False)
 
     return search_space & replacement

From 3ee02214c0cfad7bcb77e5a528182320bdc24594 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 14 May 2024 08:48:42 +0100
Subject: [PATCH 095/419] Tutorial 2

---
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../Results/MCACapacity.csv                   | 173 +++---
 .../Results/MCAMetric_Consumption.csv         | 355 ------------
 .../Results/MCAMetric_Supply.csv              | 535 ------------------
 .../Results/MCAPrices.csv                     | 144 ++---
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  37 ++
 .../Results/Power/Capacity/2030.csv           |  34 ++
 .../Results/Power/Capacity/2035.csv           |  36 ++
 .../Results/Power/Capacity/2040.csv           |  47 ++
 .../Results/Power/Capacity/2045.csv           |  67 +++
 .../Results/Power/Capacity/2050.csv           |  51 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |   5 +
 .../Results/Residential/Capacity/2030.csv     |   9 +
 .../Results/Residential/Capacity/2035.csv     |   7 +
 .../Results/Residential/Capacity/2040.csv     |  11 +
 .../Results/Residential/Capacity/2045.csv     |   7 +
 .../Results/Residential/Capacity/2050.csv     |   9 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  25 +
 .../Results/Residential/Supply/2030.csv       |  25 +
 .../Results/Residential/Supply/2035.csv       |  37 ++
 .../Results/Residential/Supply/2040.csv       |  37 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  37 ++
 .../1-multiple-objective/generate_model.py    |  23 -
 .../input/GlobalCommodities.csv               |  10 +-
 .../1-multiple-objective/settings.toml        | 164 +++---
 .../technodata/Agents.csv                     |   8 +-
 .../technodata/gas/Technodata.csv             |   6 +-
 .../technodata/power/Technodata.csv           |  16 +-
 .../technodata/residential/Agents.csv         |   5 -
 .../technodata/residential/Technodata.csv     |   4 +-
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../Results/MCACapacity.csv                   | 155 ++---
 .../Results/MCAMetric_Consumption.csv         | 373 ------------
 .../Results/MCAMetric_Supply.csv              | 529 -----------------
 .../2-single-objective/Results/MCAPrices.csv  | 144 ++---
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  24 +
 .../Results/Power/Capacity/2030.csv           |  22 +
 .../Results/Power/Capacity/2035.csv           |  19 +
 .../Results/Power/Capacity/2040.csv           |  16 +
 .../Results/Power/Capacity/2045.csv           |  33 ++
 .../Results/Power/Capacity/2050.csv           |  27 +
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |   5 +
 .../Results/Residential/Capacity/2030.csv     |   9 +
 .../Results/Residential/Capacity/2035.csv     |   7 +
 .../Results/Residential/Capacity/2040.csv     |  11 +
 .../Results/Residential/Capacity/2045.csv     |   7 +
 .../Results/Residential/Capacity/2050.csv     |   9 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  25 +
 .../Results/Residential/Supply/2030.csv       |  25 +
 .../Results/Residential/Supply/2035.csv       |  37 ++
 .../Results/Residential/Supply/2040.csv       |  37 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  37 ++
 .../input/GlobalCommodities.csv               |  10 +-
 .../2-single-objective/settings.toml          | 164 +++---
 .../2-single-objective/technodata/Agents.csv  |   8 +-
 .../technodata/gas/Technodata.csv             |   6 +-
 .../technodata/power/Technodata.csv           |  16 +-
 .../technodata/residential/Agents.csv         |   5 -
 .../technodata/residential/Technodata.csv     |   4 +-
 .../2-add-agent/generate_models.py            |  45 +-
 ...sualise-new-agent-multiple-objective.ipynb |   2 +-
 ...visualise-new-agent-single-objective.ipynb |   2 +-
 src/muse/wizard.py                            |  21 +-
 83 files changed, 1665 insertions(+), 2331 deletions(-)
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => }/visualise-new-agent-multiple-objective.ipynb (94%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => }/visualise-new-agent-single-objective.ipynb (94%)

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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..0e008ed8
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..39ffacce
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..cc87d2bd
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c7248804
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..90a0f85e
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
index bc1ae726..b926de76 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
@@ -1,72 +1,101 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-9,A2,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-0,A1,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-1,A1,9.50000000000,R1,7,2020,R1,residential,heatpump,retrofit,2025
-4,A2,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-5,A2,100.00000000000,R1,7,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.31200000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-23,A1,10.00000000000,R1,26,2020,R1,power,solarPV,retrofit,2025
-36,A1,10.00000000000,R1,52,2020,R1,power,windturbine,retrofit,2025
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-5,A1,9.50000000000,R1,7,2020,R1,residential,heatpump,retrofit,2030
-12,A2,100.00000000000,R1,0,2020,R1,residential,heatpump,retrofit,2030
-0,A1,0.31200000000,R1,0,2020,R1,power,gasCCGT,retrofit,2030
-1,A1,3.31200000000,R1,1,2025,R1,power,gasCCGT,retrofit,2030
-20,A1,10.00000000000,R1,24,2020,R1,power,solarPV,retrofit,2030
-21,A1,1.84610000000,R1,25,2025,R1,power,solarPV,retrofit,2030
-40,A1,10.00000000000,R1,60,2020,R1,power,windturbine,retrofit,2030
-2,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-0,A1,3.60000000000,R1,0,2030,R1,residential,gasboiler,retrofit,2035
-3,A1,14.40000000000,R1,5,2030,R1,residential,heatpump,retrofit,2035
-6,A2,100.00000000000,R1,0,2030,R1,residential,heatpump,retrofit,2035
-0,A1,0.31200000000,R1,0,2020,R1,power,gasCCGT,retrofit,2035
-1,A1,3.31200000000,R1,1,2025,R1,power,gasCCGT,retrofit,2035
-18,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2035
-19,A1,1.84610000000,R1,23,2025,R1,power,solarPV,retrofit,2035
-20,A1,4.90170000000,R1,24,2030,R1,power,solarPV,retrofit,2035
-45,A1,10.00000000000,R1,66,2020,R1,power,windturbine,retrofit,2035
-0,A1,7.46760000000,R1,0,2030,R1,gas,gassupply1,retrofit,2035
-2,A1,3.60000000000,R1,0,2030,R1,residential,gasboiler,retrofit,2040
-7,A1,14.40000000000,R1,12,2030,R1,residential,heatpump,retrofit,2040
-14,A2,100.00000000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-0,A1,0.31200000000,R1,0,2020,R1,power,gasCCGT,retrofit,2040
-1,A1,3.31200000000,R1,1,2025,R1,power,gasCCGT,retrofit,2040
-16,A1,10.00000000000,R1,24,2020,R1,power,solarPV,retrofit,2040
-17,A1,1.84610000000,R1,25,2025,R1,power,solarPV,retrofit,2040
-18,A1,4.90170000000,R1,26,2030,R1,power,solarPV,retrofit,2040
-19,A1,5.81690000000,R1,27,2035,R1,power,solarPV,retrofit,2040
-50,A1,10.00000000000,R1,84,2020,R1,power,windturbine,retrofit,2040
-0,A1,7.46760000000,R1,0,2030,R1,gas,gassupply1,retrofit,2040
-1,A1,0.23590000000,R1,1,2035,R1,gas,gassupply1,retrofit,2040
-0,A1,3.72000000000,R1,0,2040,R1,residential,gasboiler,retrofit,2045
-3,A1,20.28000000000,R1,4,2040,R1,residential,heatpump,retrofit,2045
-6,A2,100.00000000000,R1,0,2040,R1,residential,heatpump,retrofit,2045
-2,A1,0.31200000000,R1,0,2020,R1,power,gasCCGT,retrofit,2045
-3,A1,3.31200000000,R1,1,2025,R1,power,gasCCGT,retrofit,2045
-16,A1,10.00000000000,R1,26,2020,R1,power,solarPV,retrofit,2045
-17,A1,1.84610000000,R1,27,2025,R1,power,solarPV,retrofit,2045
-18,A1,4.90170000000,R1,28,2030,R1,power,solarPV,retrofit,2045
-19,A1,5.81690000000,R1,29,2035,R1,power,solarPV,retrofit,2045
-20,A1,10.00000000000,R1,30,2040,R1,power,solarPV,retrofit,2045
-56,A1,10.00000000000,R1,104,2020,R1,power,windturbine,retrofit,2045
-57,A1,1.68270000000,R1,105,2040,R1,power,windturbine,retrofit,2045
-0,A1,7.46760000000,R1,0,2030,R1,gas,gassupply1,retrofit,2045
-1,A1,0.23590000000,R1,1,2035,R1,gas,gassupply1,retrofit,2045
-0,A1,3.72000000000,R1,0,2040,R1,residential,gasboiler,retrofit,2050
-4,A1,20.28000000000,R1,10,2040,R1,residential,heatpump,retrofit,2050
-8,A2,100.00000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-0,A1,0.31200000000,R1,0,2020,R1,power,gasCCGT,retrofit,2050
-1,A1,3.31200000000,R1,1,2025,R1,power,gasCCGT,retrofit,2050
-10,A1,1.84610000000,R1,26,2025,R1,power,solarPV,retrofit,2050
-11,A1,4.90170000000,R1,27,2030,R1,power,solarPV,retrofit,2050
-12,A1,5.81690000000,R1,28,2035,R1,power,solarPV,retrofit,2050
-13,A1,10.00000000000,R1,29,2040,R1,power,solarPV,retrofit,2050
-14,A1,15.82000000000,R1,30,2045,R1,power,solarPV,retrofit,2050
-50,A1,1.68270000000,R1,104,2040,R1,power,windturbine,retrofit,2050
-51,A1,4.15860000000,R1,105,2045,R1,power,windturbine,retrofit,2050
-0,A1,7.46760000000,R1,0,2030,R1,gas,gassupply1,retrofit,2050
-1,A1,0.23590000000,R1,1,2035,R1,gas,gassupply1,retrofit,2050
-2,A1,0.43650000000,R1,2,2045,R1,gas,gassupply1,retrofit,2050
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
+solarPV,R1,R1,A1,power,retrofit,2025,0.39110000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
+solarPV,R1,R1,A2,power,retrofit,2025,0.39110000000
+windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.32660000000
+solarPV,R1,R1,A2,power,retrofit,2030,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2030,2.64110000000
+windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2030,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.32660000000
+solarPV,R1,R1,A2,power,retrofit,2035,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2035,2.64110000000
+windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2035,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,47.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.41900000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.32660000000
+solarPV,R1,R1,A2,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2040,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2040,3.03230000000
+windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2040,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,47.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.41900000000
+solarPV,R1,R1,A1,power,retrofit,2045,1.20130000000
+windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.32660000000
+windturbine,R1,R1,A1,power,retrofit,2045,0.98720000000
+solarPV,R1,R1,A2,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2045,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.03230000000
+solarPV,R1,R1,A2,power,retrofit,2045,6.06450000000
+windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2045,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,47.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,1.17930000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.41900000000
+solarPV,R1,R1,A1,power,retrofit,2050,1.20130000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.49210000000
+windturbine,R1,R1,A1,power,retrofit,2050,4.32660000000
+windturbine,R1,R1,A1,power,retrofit,2050,0.98720000000
+windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A2,power,retrofit,2050,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.03230000000
+solarPV,R1,R1,A2,power,retrofit,2050,6.06450000000
+solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
+windturbine,R1,R1,A2,power,retrofit,2050,6.57660000000
+windturbine,R1,R1,A2,power,retrofit,2050,5.44720000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,47.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index e067c7d8..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,355 +0,0 @@
-,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,0.58000000000,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,0.87000000000,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,0.58000000000,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,0.87000000000,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,1.74000000000,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,1.16000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-7,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-8,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-9,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-10,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-11,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,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.16111111111,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.21111111111,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.24166666667,R1,9,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.31666666667,R1,12,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.16111111111,R1,17,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.21111111111,R1,20,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.24166666667,R1,25,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.31666666667,R1,28,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.48333333333,R1,33,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,0.63333333333,R1,36,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.32222222222,R1,41,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.42222222222,R1,44,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01886178862,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.26016260163,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02829268293,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39024390244,R1,12,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01886178862,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.26016260163,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02829268293,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39024390244,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05658536585,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.78048780488,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03772357724,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.52032520325,R1,44,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.10955070354,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.22222222222,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.16432605531,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.33333333333,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.10955070354,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.22222222222,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.16432605531,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.33333333333,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.32865211063,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.66666666667,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.21910140708,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.44444444444,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.33333333333,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.50000000000,R1,12,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.33333333333,R1,24,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.50000000000,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.00000000000,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.66666666667,R1,60,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-6,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.33333333333,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-7,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.50000000000,R1,8,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.33333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-9,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.50000000000,R1,24,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-10,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.00000000000,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-11,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.66666666667,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.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,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,31,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,69,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,73,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,76,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,84,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,91,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,99,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,106,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,114,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07815211063,R1,121,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82965211063,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12307132460,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05210140708,R1,151,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,159,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,163,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.55310140708,R1,166,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08204754973,R1,174,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.23200000000,R1,1,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.32000000000,R1,4,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.34800000000,R1,9,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48000000000,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23200000000,R1,17,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.32000000000,R1,20,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.34800000000,R1,25,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48000000000,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.69600000000,R1,33,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.96000000000,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.46400000000,R1,41,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.64000000000,R1,44,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.40000000000,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60000000000,R1,4,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.40000000000,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60000000000,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.20000000000,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.80000000000,R1,20,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.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,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10892655367,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,36,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.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
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,51,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,59,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16338983051,R1,64,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,71,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,79,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,86,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,94,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10892655367,R1,99,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,106,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,114,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,118,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,121,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16338983051,R1,134,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07815211063,R1,141,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,149,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,153,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82965211063,R1,156,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12307132460,R1,164,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32677966102,R1,169,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05210140708,R1,176,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.55310140708,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08204754973,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21785310734,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27066666667,R1,1,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37333333333,R1,4,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40600000000,R1,17,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56000000000,R1,20,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27066666667,R1,33,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37333333333,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40600000000,R1,49,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56000000000,R1,52,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.81200000000,R1,65,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.12000000000,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.54133333333,R1,81,2030.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.74666666667,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46666666667,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.70000000000,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46666666667,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.70000000000,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.40000000000,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.93333333333,R1,40,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.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,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10892655367,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12926553672,R1,34,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,46,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,69,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16338983051,R1,74,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19389830508,R1,79,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,91,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,99,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,106,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,114,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10892655367,R1,119,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12926553672,R1,124,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,136,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,151,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16338983051,R1,164,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19389830508,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07815211063,R1,181,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,189,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,193,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82965211063,R1,196,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12307132460,R1,204,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32677966102,R1,209,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.38779661017,R1,214,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05210140708,R1,226,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,234,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,238,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.55310140708,R1,241,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08204754973,R1,249,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21785310734,R1,254,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25853107345,R1,259,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23973333333,R1,1,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45066666667,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35960000000,R1,9,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.67600000000,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23973333333,R1,17,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45066666667,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35960000000,R1,25,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.67600000000,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71920000000,R1,33,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.35200000000,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.47946666667,R1,41,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.90133333333,R1,44,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53333333333,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.80000000000,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53333333333,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.80000000000,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.60000000000,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.06666666667,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02314674373,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19745036140,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19745036140,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24572266362,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03645071628,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09678414325,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11485587124,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,solar,0.19745036140,R1,39,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03322520658,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03472011560,R1,56,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.29617554210,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29617554210,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-12,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36858399543,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05467607442,R1,79,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-14,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14517621487,R1,84,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-15,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.17228380686,R1,89,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-16,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.29617554210,R1,94,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-17,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.04983780986,R1,98,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02314674373,R1,111,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19745036140,R1,119,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19745036140,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24572266362,R1,126,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03645071628,R1,134,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09678414325,R1,139,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-24,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11485587124,R1,144,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-25,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19745036140,R1,149,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-26,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03322520658,R1,153,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03472011560,R1,166,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.29617554210,R1,174,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29617554210,R1,178,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-30,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36858399543,R1,181,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05467607442,R1,189,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-32,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14517621487,R1,194,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-33,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.17228380686,R1,199,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-34,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.29617554210,R1,204,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-35,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.04983780986,R1,208,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06944023119,R1,221,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.59235108420,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.59235108420,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.73716799086,R1,236,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10935214884,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.29035242975,R1,249,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-42,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.34456761372,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-43,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.59235108420,R1,259,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-44,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09967561973,R1,263,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.04629348746,R1,276,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39490072280,R1,284,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.39490072280,R1,288,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.49144532724,R1,291,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07290143256,R1,299,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19356828650,R1,304,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-51,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22971174248,R1,309,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-52,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39490072280,R1,314,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-53,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.06645041315,R1,318,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26970000000,R1,1,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.50700000000,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40455000000,R1,17,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76050000000,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26970000000,R1,33,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.50700000000,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40455000000,R1,49,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76050000000,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.80910000000,R1,65,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.52100000000,R1,68,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53940000000,R1,81,2040.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.01400000000,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60000000000,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.90000000000,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60000000000,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.90000000000,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.80000000000,R1,32,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.20000000000,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,6,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,14,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10892655367,R1,19,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12926553672,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,solar,0.22222222222,R1,29,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03739359699,R1,33,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35155555556,R1,39,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09241431262,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,56,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-12,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16338983051,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19389830508,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-14,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,79,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-15,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05609039548,R1,83,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-16,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52733333333,R1,89,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-17,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13862146893,R1,93,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02605070354,R1,101,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27655070354,R1,106,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04102377487,R1,114,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10892655367,R1,119,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12926553672,R1,124,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,129,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-24,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03739359699,R1,133,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-25,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35155555556,R1,139,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-26,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09241431262,R1,143,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03907605531,R1,151,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41482605531,R1,156,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06153566230,R1,164,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-30,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16338983051,R1,169,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19389830508,R1,174,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-32,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,179,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-33,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05609039548,R1,183,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-34,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52733333333,R1,189,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-35,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13862146893,R1,193,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07815211063,R1,201,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82965211063,R1,206,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12307132460,R1,214,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32677966102,R1,219,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.38779661017,R1,224,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,229,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-42,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11218079096,R1,233,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-43,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,1.05466666667,R1,239,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-44,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27724293785,R1,243,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05210140708,R1,251,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.55310140708,R1,256,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08204754973,R1,264,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21785310734,R1,269,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25853107345,R1,274,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,279,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-51,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07478719397,R1,283,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-52,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.70311111111,R1,289,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-53,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18482862524,R1,293,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Supply.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Supply.csv
deleted file mode 100644
index 4d8e23f6..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,535 +0,0 @@
-,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,0.50000000000,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,32.35500000000,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,0.75000000000,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,48.53250000000,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,0.50000000000,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,32.35500000000,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,0.75000000000,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,48.53250000000,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,1.50000000000,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,97.06500000000,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,1.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,64.71000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,64.71000000000,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,4,2020.00000000000,R1,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,5,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,29,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,37,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.01626016260,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,5,2020.00000000000,R1,residential,0.65040650407,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,1.05219512195,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.02439024390,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-22,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2020.00000000000,R1,residential,0.97560975610,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,1.57829268293,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.01626016260,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2020.00000000000,R1,residential,0.65040650407,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,1.05219512195,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.02439024390,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-28,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,29,2020.00000000000,R1,residential,0.97560975610,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-29,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,1.57829268293,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,0.04878048780,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,37,2020.00000000000,R1,residential,1.95121951220,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,3.15658536585,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,0.03252032520,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-34,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2020.00000000000,R1,residential,1.30081300813,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-35,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,2.10439024390,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.06559922368,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.22222222222,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,6.01348083455,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.09839883552,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.33333333333,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,9.02022125182,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.06559922368,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.22222222222,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,6.01348083455,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.09839883552,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.33333333333,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,9.02022125182,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.19679767103,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.66666666667,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,18.04044250364,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.13119844736,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.44444444444,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,12.02696166909,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.17709073265,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,0.26563609898,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.17709073265,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.26563609898,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.53127219796,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,0.35418146531,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2020.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2020.00000000000,R1,residential,1.25000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2020.00000000000,R1,residential,1.25000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2020.00000000000,R1,residential,2.50000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2020.00000000000,R1,residential,1.66666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-6,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-7,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,1.25000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-9,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,1.25000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-10,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,2.50000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-11,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,1.66666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('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.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.22222222222,windturbine,"('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.16559922368,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-6,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,30,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,42,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2025.00000000000,R1,power,0.16559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-20,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,102,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.04679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.49679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2025.00000000000,R1,power,0.12307132460,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,132,2020.00000000000,R1,power,4.28994250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-34,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2025.00000000000,R1,power,45.54144250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.03119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.33119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2025.00000000000,R1,power,0.08204754973,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2020.00000000000,R1,power,2.85996166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,165,2025.00000000000,R1,power,30.36096166909,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.30260140708,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.45390211063,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.30260140708,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.45390211063,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.90780422125,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.60520281417,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2030.00000000000,R1,residential,0.20000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,5,2030.00000000000,R1,residential,0.80000000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2030.00000000000,R1,residential,12.94200000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2030.00000000000,R1,residential,0.30000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2030.00000000000,R1,residential,1.20000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2030.00000000000,R1,residential,19.41300000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2030.00000000000,R1,residential,0.20000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2030.00000000000,R1,residential,0.80000000000,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2030.00000000000,R1,residential,12.94200000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2030.00000000000,R1,residential,0.30000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,29,2030.00000000000,R1,residential,1.20000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2030.00000000000,R1,residential,19.41300000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2030.00000000000,R1,residential,0.60000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,37,2030.00000000000,R1,residential,2.40000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2030.00000000000,R1,residential,38.82600000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2030.00000000000,R1,residential,0.40000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2030.00000000000,R1,residential,1.60000000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2030.00000000000,R1,residential,25.88400000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,2,2030.00000000000,R1,residential,1.00000000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2030.00000000000,R1,residential,1.50000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,1.00000000000,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2030.00000000000,R1,residential,1.50000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,3.00000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,22,2030.00000000000,R1,residential,2.00000000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('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.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.22222222222,windturbine,"('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.16559922368,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2030.00000000000,R1,power,0.10892655367,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,17,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,39,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2030.00000000000,R1,power,0.16338983051,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,49,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.16559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2030.00000000000,R1,power,0.10892655367,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,84,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,87,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,109,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2030.00000000000,R1,power,0.16338983051,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,119,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,122,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.04679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2025.00000000000,R1,power,0.49679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2025.00000000000,R1,power,0.12307132460,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2030.00000000000,R1,power,0.32677966102,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,154,2020.00000000000,R1,power,4.28994250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,157,2025.00000000000,R1,power,45.54144250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.03119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.33119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,179,2025.00000000000,R1,power,0.08204754973,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2030.00000000000,R1,power,0.21785310734,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-46,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,189,2020.00000000000,R1,power,2.85996166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,192,2025.00000000000,R1,power,30.36096166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2030.00000000000,R1,gas,0.37338106810,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2030.00000000000,R1,gas,0.56007160215,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2030.00000000000,R1,gas,0.37338106810,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2030.00000000000,R1,gas,0.56007160215,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,1.12014320430,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2030.00000000000,R1,gas,0.74676213620,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,0.23333333333,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2030.00000000000,R1,residential,0.93333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2030.00000000000,R1,residential,15.09900000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2030.00000000000,R1,residential,0.35000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2030.00000000000,R1,residential,1.40000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2030.00000000000,R1,residential,22.64850000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2030.00000000000,R1,residential,0.23333333333,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2030.00000000000,R1,residential,0.93333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2030.00000000000,R1,residential,15.09900000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2030.00000000000,R1,residential,0.35000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2030.00000000000,R1,residential,1.40000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2030.00000000000,R1,residential,22.64850000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,0.70000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2030.00000000000,R1,residential,2.80000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2030.00000000000,R1,residential,45.29700000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2030.00000000000,R1,residential,0.46666666667,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2030.00000000000,R1,residential,1.86666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2030.00000000000,R1,residential,30.19800000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2030.00000000000,R1,residential,1.16666666667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2030.00000000000,R1,residential,1.75000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2030.00000000000,R1,residential,1.16666666667,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2030.00000000000,R1,residential,1.75000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2030.00000000000,R1,residential,3.50000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2030.00000000000,R1,residential,2.33333333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('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.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.22222222222,windturbine,"('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.16559922368,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2030.00000000000,R1,power,0.10892655367,solarPV,"('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.12926553672,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,47,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-14,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.16338983051,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2035.00000000000,R1,power,0.19389830508,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,63,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.16559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2030.00000000000,R1,power,0.10892655367,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-24,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2035.00000000000,R1,power,0.12926553672,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-26,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,111,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,137,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,139,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2030.00000000000,R1,power,0.16338983051,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-33,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2035.00000000000,R1,power,0.19389830508,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,153,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,156,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.04679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.49679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2025.00000000000,R1,power,0.12307132460,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2030.00000000000,R1,power,0.32677966102,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-42,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,186,2035.00000000000,R1,power,0.38779661017,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,198,2020.00000000000,R1,power,4.28994250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-44,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,201,2025.00000000000,R1,power,45.54144250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.03119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2025.00000000000,R1,power,0.33119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,229,2025.00000000000,R1,power,0.08204754973,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2030.00000000000,R1,power,0.21785310734,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-51,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,231,2035.00000000000,R1,power,0.25853107345,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,243,2020.00000000000,R1,power,2.85996166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,246,2025.00000000000,R1,power,30.36096166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2030.00000000000,R1,gas,0.37338106810,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2035.00000000000,R1,gas,0.01179661017,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2030.00000000000,R1,gas,0.56007160215,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2035.00000000000,R1,gas,0.01769491525,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2030.00000000000,R1,gas,0.37338106810,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2035.00000000000,R1,gas,0.01179661017,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2030.00000000000,R1,gas,0.56007160215,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2035.00000000000,R1,gas,0.01769491525,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,1.12014320430,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2035.00000000000,R1,gas,0.03538983051,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2030.00000000000,R1,gas,0.74676213620,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2035.00000000000,R1,gas,0.02359322034,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2040.00000000000,R1,residential,0.20666666667,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,5,2040.00000000000,R1,residential,1.12666666667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2040.00000000000,R1,residential,13.37340000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2040.00000000000,R1,residential,0.31000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2040.00000000000,R1,residential,1.69000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2040.00000000000,R1,residential,20.06010000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2040.00000000000,R1,residential,0.20666666667,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2040.00000000000,R1,residential,1.12666666667,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2040.00000000000,R1,residential,13.37340000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2040.00000000000,R1,residential,0.31000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,29,2040.00000000000,R1,residential,1.69000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2040.00000000000,R1,residential,20.06010000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2040.00000000000,R1,residential,0.62000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,37,2040.00000000000,R1,residential,3.38000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2040.00000000000,R1,residential,40.12020000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2040.00000000000,R1,residential,0.41333333333,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2040.00000000000,R1,residential,2.25333333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2040.00000000000,R1,residential,26.74680000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,2,2040.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,2.00000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2040.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2040.00000000000,R1,residential,2.00000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,4.00000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,22,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.01386032559,gasCCGT,"('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.19745036140,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.19745036140,windturbine,"('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.14713931953,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2025.00000000000,R1,power,0.03645071628,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2030.00000000000,R1,power,0.09678414325,solarPV,"('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.11485587124,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2040.00000000000,R1,power,0.19745036140,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,8,2040.00000000000,R1,power,0.03322520658,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,power,1.27057604659,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2025.00000000000,R1,power,13.48826142154,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,55,2020.00000000000,R1,power,0.02079048838,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,56,2020.00000000000,R1,power,0.29617554210,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,57,2020.00000000000,R1,power,0.29617554210,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,58,2025.00000000000,R1,power,0.22070897930,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,59,2025.00000000000,R1,power,0.05467607442,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2030.00000000000,R1,power,0.14517621487,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-17,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2035.00000000000,R1,power,0.17228380686,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-18,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2040.00000000000,R1,power,0.29617554210,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-19,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2040.00000000000,R1,power,0.04983780986,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2020.00000000000,R1,power,1.90586406989,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,80,2025.00000000000,R1,power,20.23239213230,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2020.00000000000,R1,power,0.01386032559,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,111,2020.00000000000,R1,power,0.19745036140,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,112,2020.00000000000,R1,power,0.19745036140,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,113,2025.00000000000,R1,power,0.14713931953,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-26,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,114,2025.00000000000,R1,power,0.03645071628,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-27,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,115,2030.00000000000,R1,power,0.09678414325,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-28,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,116,2035.00000000000,R1,power,0.11485587124,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-29,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,117,2040.00000000000,R1,power,0.19745036140,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-30,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,118,2040.00000000000,R1,power,0.03322520658,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,132,2020.00000000000,R1,power,1.27057604659,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-32,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2025.00000000000,R1,power,13.48826142154,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2020.00000000000,R1,power,0.02079048838,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,166,2020.00000000000,R1,power,0.29617554210,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,167,2020.00000000000,R1,power,0.29617554210,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,168,2025.00000000000,R1,power,0.22070897930,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-37,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,169,2025.00000000000,R1,power,0.05467607442,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,170,2030.00000000000,R1,power,0.14517621487,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-39,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,171,2035.00000000000,R1,power,0.17228380686,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-40,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,172,2040.00000000000,R1,power,0.29617554210,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-41,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,173,2040.00000000000,R1,power,0.04983780986,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2020.00000000000,R1,power,1.90586406989,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,190,2025.00000000000,R1,power,20.23239213230,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,220,2020.00000000000,R1,power,0.04158097676,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,221,2020.00000000000,R1,power,0.59235108420,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,222,2020.00000000000,R1,power,0.59235108420,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,223,2025.00000000000,R1,power,0.44141795860,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-48,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,224,2025.00000000000,R1,power,0.10935214884,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-49,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2030.00000000000,R1,power,0.29035242975,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-50,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2035.00000000000,R1,power,0.34456761372,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-51,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2040.00000000000,R1,power,0.59235108420,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-52,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2040.00000000000,R1,power,0.09967561973,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-53,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,242,2020.00000000000,R1,power,3.81172813978,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-54,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,245,2025.00000000000,R1,power,40.46478426461,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,275,2020.00000000000,R1,power,0.02772065117,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,276,2020.00000000000,R1,power,0.39490072280,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,277,2020.00000000000,R1,power,0.39490072280,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,278,2025.00000000000,R1,power,0.29427863906,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,279,2025.00000000000,R1,power,0.07290143256,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-60,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,280,2030.00000000000,R1,power,0.19356828650,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-61,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,281,2035.00000000000,R1,power,0.22971174248,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-62,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,282,2040.00000000000,R1,power,0.39490072280,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-63,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,283,2040.00000000000,R1,power,0.06645041315,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,297,2020.00000000000,R1,power,2.54115209319,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-65,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,300,2025.00000000000,R1,power,26.97652284307,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2030.00000000000,R1,gas,0.35059277117,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2035.00000000000,R1,gas,0.01107663618,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.52588915675,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2035.00000000000,R1,gas,0.01661495428,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2030.00000000000,R1,gas,0.35059277117,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2035.00000000000,R1,gas,0.01107663618,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.52588915675,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2035.00000000000,R1,gas,0.01661495428,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2030.00000000000,R1,gas,1.05177831350,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2035.00000000000,R1,gas,0.03322990855,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.70118554233,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2035.00000000000,R1,gas,0.02215327237,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2040.00000000000,R1,residential,0.23250000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2040.00000000000,R1,residential,1.26750000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2040.00000000000,R1,residential,15.04507500000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2040.00000000000,R1,residential,0.34875000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2040.00000000000,R1,residential,1.90125000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2040.00000000000,R1,residential,22.56761250000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2040.00000000000,R1,residential,0.23250000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2040.00000000000,R1,residential,1.26750000000,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2040.00000000000,R1,residential,15.04507500000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2040.00000000000,R1,residential,0.34875000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2040.00000000000,R1,residential,1.90125000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2040.00000000000,R1,residential,22.56761250000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2040.00000000000,R1,residential,0.69750000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2040.00000000000,R1,residential,3.80250000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2040.00000000000,R1,residential,45.13522500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2040.00000000000,R1,residential,0.46500000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2040.00000000000,R1,residential,2.53500000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2040.00000000000,R1,residential,30.09015000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2040.00000000000,R1,residential,1.50000000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2040.00000000000,R1,residential,2.25000000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2040.00000000000,R1,residential,1.50000000000,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2040.00000000000,R1,residential,2.25000000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2040.00000000000,R1,residential,4.50000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2040.00000000000,R1,residential,3.00000000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.01559922368,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.16559922368,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2030.00000000000,R1,power,0.10892655367,solarPV,"('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.12926553672,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2040.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2040.00000000000,R1,power,0.03739359699,windturbine,"('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.35155555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,8,2045.00000000000,R1,power,0.09241431262,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2030.00000000000,R1,power,0.16338983051,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,54,2035.00000000000,R1,power,0.19389830508,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,55,2040.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-17,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,56,2040.00000000000,R1,power,0.05609039548,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-18,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,57,2045.00000000000,R1,power,0.52733333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-19,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,58,2045.00000000000,R1,power,0.13862146893,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,70,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,71,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.01559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2025.00000000000,R1,power,0.16559922368,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2025.00000000000,R1,power,0.04102377487,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2030.00000000000,R1,power,0.10892655367,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-26,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,104,2035.00000000000,R1,power,0.12926553672,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-27,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2040.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-28,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2040.00000000000,R1,power,0.03739359699,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-29,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2045.00000000000,R1,power,0.35155555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-30,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2045.00000000000,R1,power,0.09241431262,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,120,2020.00000000000,R1,power,1.42998083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-32,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,121,2025.00000000000,R1,power,15.18048083455,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.02339883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2025.00000000000,R1,power,0.24839883552,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.06153566230,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2030.00000000000,R1,power,0.16338983051,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-37,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2035.00000000000,R1,power,0.19389830508,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,155,2040.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-39,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,156,2040.00000000000,R1,power,0.05609039548,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-40,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,157,2045.00000000000,R1,power,0.52733333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-41,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,158,2045.00000000000,R1,power,0.13862146893,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,170,2020.00000000000,R1,power,2.14497125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,171,2025.00000000000,R1,power,22.77072125182,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.04679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2025.00000000000,R1,power,0.49679767103,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2025.00000000000,R1,power,0.12307132460,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2030.00000000000,R1,power,0.32677966102,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-48,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2035.00000000000,R1,power,0.38779661017,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-49,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2040.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-50,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2040.00000000000,R1,power,0.11218079096,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-51,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,207,2045.00000000000,R1,power,1.05466666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-52,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,208,2045.00000000000,R1,power,0.27724293785,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-53,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,220,2020.00000000000,R1,power,4.28994250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-54,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,221,2025.00000000000,R1,power,45.54144250364,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2020.00000000000,R1,power,0.03119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,251,2025.00000000000,R1,power,0.33119844736,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,252,2025.00000000000,R1,power,0.08204754973,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,253,2030.00000000000,R1,power,0.21785310734,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,254,2035.00000000000,R1,power,0.25853107345,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-60,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,255,2040.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-61,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,256,2040.00000000000,R1,power,0.07478719397,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-62,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,257,2045.00000000000,R1,power,0.70311111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-63,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,258,2045.00000000000,R1,power,0.18482862524,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,270,2020.00000000000,R1,power,2.85996166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,271,2025.00000000000,R1,power,30.36096166909,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2030.00000000000,R1,gas,0.37338106810,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2035.00000000000,R1,gas,0.01179661017,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2045.00000000000,R1,gas,0.02182372881,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2030.00000000000,R1,gas,0.56007160215,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2035.00000000000,R1,gas,0.01769491525,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2045.00000000000,R1,gas,0.03273559322,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,0.37338106810,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2035.00000000000,R1,gas,0.01179661017,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2045.00000000000,R1,gas,0.02182372881,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2030.00000000000,R1,gas,0.56007160215,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2035.00000000000,R1,gas,0.01769491525,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2045.00000000000,R1,gas,0.03273559322,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2030.00000000000,R1,gas,1.12014320430,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2035.00000000000,R1,gas,0.03538983051,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2045.00000000000,R1,gas,0.06547118644,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2030.00000000000,R1,gas,0.74676213620,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2035.00000000000,R1,gas,0.02359322034,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2045.00000000000,R1,gas,0.04364745763,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
index c00b2ede..15e6634e 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.47420000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.39520000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.93750000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.93480000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.71130000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.59280000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.40630000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.40220000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.47420000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.39520000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.93750000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.93480000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.71130000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.59280000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.40630000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.40220000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.42250000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18560000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.81260000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.80430000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.94830000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.79040000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.87510000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.86950000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.53310000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.31960000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04300000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.03990000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.80120000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.48010000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07880000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07160000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.53310000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.31960000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04300000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03990000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.80120000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48010000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07880000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07160000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.61210000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96420000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24290000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21440000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.07040000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.64100000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.12400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11130000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.60470000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.38050000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08690000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.10930000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.90850000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.57140000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.14610000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.17330000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.60470000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38050000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08690000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10930000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.90850000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57140000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14610000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17330000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.82530000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.14680000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38720000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40300000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.21320000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.76270000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.21580000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.24360000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.64590000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.41770000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.10110000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.13150000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.97000000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.62720000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.16940000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.20830000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.64590000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41770000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10110000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.13150000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.97000000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62720000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16940000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20830000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.94720000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.25810000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44630000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.48320000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.29500000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.83710000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.24970000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.64930000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.43870000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.11760000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.15460000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.97490000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.65850000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19540000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.24410000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.64930000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43870000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11760000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.15460000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.97490000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65850000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19540000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.24410000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.95540000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.32020000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50520000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56140000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.30110000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.87870000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.28580000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.34170000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.75340000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.51390000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.13350000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.18180000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13110000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77140000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.21930000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.28550000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75340000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51390000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.13350000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18180000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13110000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77140000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21930000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.28550000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.26760000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.54620000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55340000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.64770000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.50930000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.02930000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.31780000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.39770000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..48bcd2e6
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..32bf32ef
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
@@ -0,0 +1,37 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+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,2025,R1,solarPV,2020,0.78230000000
+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,2025,R1,windturbine,2020,20.00000000000
+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/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..68b049a3
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a511e19c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
@@ -0,0 +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.45130000000
+6,2045,R1,2035,solarPV,3.45130000000
+6,2049,R1,2035,solarPV,3.45130000000
+6,2050,R1,2035,solarPV,3.45130000000
+6,2054,R1,2035,solarPV,3.45130000000
+6,2055,R1,2035,solarPV,3.45130000000
+6,2064,R1,2035,solarPV,3.45130000000
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
new file mode 100644
index 00000000..463af80c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
@@ -0,0 +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.45130000000
+6,2045,R1,2035,solarPV,3.45130000000
+6,2049,R1,2035,solarPV,3.45130000000
+6,2050,R1,2035,solarPV,3.45130000000
+6,2054,R1,2035,solarPV,3.45130000000
+6,2055,R1,2035,solarPV,3.45130000000
+6,2064,R1,2035,solarPV,3.45130000000
+7,2045,R1,2040,solarPV,7.26580000000
+7,2049,R1,2040,solarPV,7.26580000000
+7,2050,R1,2040,solarPV,7.26580000000
+7,2054,R1,2040,solarPV,7.26580000000
+7,2055,R1,2040,solarPV,7.26580000000
+7,2064,R1,2040,solarPV,7.26580000000
+7,2065,R1,2040,solarPV,7.26580000000
+7,2069,R1,2040,solarPV,7.26580000000
+8,2045,R1,2040,windturbine,0.98720000000
+8,2049,R1,2040,windturbine,0.98720000000
+8,2050,R1,2040,windturbine,0.98720000000
+8,2054,R1,2040,windturbine,0.98720000000
+8,2055,R1,2040,windturbine,0.98720000000
+8,2064,R1,2040,windturbine,0.98720000000
+8,2065,R1,2040,windturbine,0.98720000000
+8,2069,R1,2040,windturbine,0.98720000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..9e366045
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
@@ -0,0 +1,67 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasCCGT,2025,2.00000000000
+0,2049,R1,gasCCGT,2025,2.00000000000
+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.17930000000
+1,2054,R1,gasCCGT,2045,1.17930000000
+1,2055,R1,gasCCGT,2045,1.17930000000
+1,2064,R1,gasCCGT,2045,1.17930000000
+1,2065,R1,gasCCGT,2045,1.17930000000
+1,2069,R1,gasCCGT,2045,1.17930000000
+1,2070,R1,gasCCGT,2045,1.17930000000
+1,2074,R1,gasCCGT,2045,1.17930000000
+1,2075,R1,gasCCGT,2045,1.17930000000
+1,2084,R1,gasCCGT,2045,1.17930000000
+2,2045,R1,solarPV,2020,0.78230000000
+2,2049,R1,solarPV,2020,0.78230000000
+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,2045,R1,solarPV,2035,3.45130000000
+4,2049,R1,solarPV,2035,3.45130000000
+4,2050,R1,solarPV,2035,3.45130000000
+4,2054,R1,solarPV,2035,3.45130000000
+4,2055,R1,solarPV,2035,3.45130000000
+4,2064,R1,solarPV,2035,3.45130000000
+5,2045,R1,solarPV,2040,7.26580000000
+5,2049,R1,solarPV,2040,7.26580000000
+5,2050,R1,solarPV,2040,7.26580000000
+5,2054,R1,solarPV,2040,7.26580000000
+5,2055,R1,solarPV,2040,7.26580000000
+5,2064,R1,solarPV,2040,7.26580000000
+5,2065,R1,solarPV,2040,7.26580000000
+5,2069,R1,solarPV,2040,7.26580000000
+6,2050,R1,solarPV,2045,28.49210000000
+6,2054,R1,solarPV,2045,28.49210000000
+6,2055,R1,solarPV,2045,28.49210000000
+6,2064,R1,solarPV,2045,28.49210000000
+6,2065,R1,solarPV,2045,28.49210000000
+6,2069,R1,solarPV,2045,28.49210000000
+6,2070,R1,solarPV,2045,28.49210000000
+6,2074,R1,solarPV,2045,28.49210000000
+7,2045,R1,windturbine,2020,20.00000000000
+7,2049,R1,windturbine,2020,20.00000000000
+8,2045,R1,windturbine,2025,10.90320000000
+8,2049,R1,windturbine,2025,10.90320000000
+8,2050,R1,windturbine,2025,10.90320000000
+8,2054,R1,windturbine,2025,10.90320000000
+9,2045,R1,windturbine,2040,0.98720000000
+9,2049,R1,windturbine,2040,0.98720000000
+9,2050,R1,windturbine,2040,0.98720000000
+9,2054,R1,windturbine,2040,0.98720000000
+9,2055,R1,windturbine,2040,0.98720000000
+9,2064,R1,windturbine,2040,0.98720000000
+9,2065,R1,windturbine,2040,0.98720000000
+9,2069,R1,windturbine,2040,0.98720000000
+10,2050,R1,windturbine,2045,15.44720000000
+10,2054,R1,windturbine,2045,15.44720000000
+10,2055,R1,windturbine,2045,15.44720000000
+10,2064,R1,windturbine,2045,15.44720000000
+10,2065,R1,windturbine,2045,15.44720000000
+10,2069,R1,windturbine,2045,15.44720000000
+10,2070,R1,windturbine,2045,15.44720000000
+10,2074,R1,windturbine,2045,15.44720000000
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
new file mode 100644
index 00000000..137b6b00
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
@@ -0,0 +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.45130000000
+5,2054,R1,2035,solarPV,3.45130000000
+5,2055,R1,2035,solarPV,3.45130000000
+5,2064,R1,2035,solarPV,3.45130000000
+6,2050,R1,2040,solarPV,7.26580000000
+6,2054,R1,2040,solarPV,7.26580000000
+6,2055,R1,2040,solarPV,7.26580000000
+6,2064,R1,2040,solarPV,7.26580000000
+6,2065,R1,2040,solarPV,7.26580000000
+6,2069,R1,2040,solarPV,7.26580000000
+7,2050,R1,2040,windturbine,0.98720000000
+7,2054,R1,2040,windturbine,0.98720000000
+7,2055,R1,2040,windturbine,0.98720000000
+7,2064,R1,2040,windturbine,0.98720000000
+7,2065,R1,2040,windturbine,0.98720000000
+7,2069,R1,2040,windturbine,0.98720000000
+8,2050,R1,2045,gasCCGT,1.17930000000
+8,2054,R1,2045,gasCCGT,1.17930000000
+8,2055,R1,2045,gasCCGT,1.17930000000
+8,2064,R1,2045,gasCCGT,1.17930000000
+8,2065,R1,2045,gasCCGT,1.17930000000
+8,2069,R1,2045,gasCCGT,1.17930000000
+8,2070,R1,2045,gasCCGT,1.17930000000
+8,2074,R1,2045,gasCCGT,1.17930000000
+8,2075,R1,2045,gasCCGT,1.17930000000
+8,2084,R1,2045,gasCCGT,1.17930000000
+9,2050,R1,2045,solarPV,28.49210000000
+9,2054,R1,2045,solarPV,28.49210000000
+9,2055,R1,2045,solarPV,28.49210000000
+9,2064,R1,2045,solarPV,28.49210000000
+9,2065,R1,2045,solarPV,28.49210000000
+9,2069,R1,2045,solarPV,28.49210000000
+9,2070,R1,2045,solarPV,28.49210000000
+9,2074,R1,2045,solarPV,28.49210000000
+10,2050,R1,2045,windturbine,15.44720000000
+10,2054,R1,2045,windturbine,15.44720000000
+10,2055,R1,2045,windturbine,15.44720000000
+10,2064,R1,2045,windturbine,15.44720000000
+10,2065,R1,2045,windturbine,15.44720000000
+10,2069,R1,2045,windturbine,15.44720000000
+10,2070,R1,2045,windturbine,15.44720000000
+10,2074,R1,2045,windturbine,15.44720000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..9458be5c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+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/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..db6e6073
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..1434998a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,9 @@
+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
+1,2030,R1,heatpump,2020,119.00000000000
+1,2034,R1,heatpump,2020,119.00000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..6d888046
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..0e46259b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2030,7.20000000000
+0,2044,R1,gasboiler,2030,7.20000000000
+1,2045,R1,gasboiler,2040,7.44000000000
+1,2050,R1,gasboiler,2040,7.44000000000
+1,2054,R1,gasboiler,2040,7.44000000000
+2,2040,R1,heatpump,2030,128.80000000000
+2,2044,R1,heatpump,2030,128.80000000000
+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/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..799a0664
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..85bfbefa
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..57fe2699
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..1339d7d2
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9c87f423
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f8de2157
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9a26b20d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..cf942a49
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9d4b068a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py b/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
deleted file mode 100644
index cfe40c26..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/generate_model.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-ADD AN AGENT
-
-agent_name: A2
-- agentshare_new = Agent3
-- agentshare_retrofit = Agent4
-
-copy_from: 'A1'
-
-"""
-
-# File: technodata/Agents.csv
-# Copy rows where Name={copy_from}, changing Name to {agent_name}
-# Rename AgentShare for new rows to {agentshare_new} (where Type=New)
-#   and {agentshare_retrofit} (where Type=Retrofit)
-# >>> Change Objective2 to 'EAC'
-# >>> Change ObjData1 and ObjData2 to 0.5
-# >>> Change DecisionMethod to 'weighted_sum'
-
-# For every sector
-# File: technodata/{sector}/technodata.csv
-# Create column {agentshare_retrofit} as copy of {copy_from.agentshare_retrofit}
-# >>> No values changed
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/GlobalCommodities.csv
index 253b75ef..9691db73 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/input/GlobalCommodities.csv
@@ -1,7 +1,7 @@
 Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
+Electricity,Energy,electricity,0.0,1,PJ
 Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index dedf9362..54b52362 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -1,14 +1,11 @@
-# Global settings - most REQUIRED
-
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = 'Active'
-log_level = 'info'
+interpolation_mode = "Active"
+log_level = "info"
 excluded_commodities = ["wind", "solar"]
-# Convergence parameters
-equilibrium_variable = 'demand'
+equilibrium_variable = "demand"
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -16,101 +13,120 @@ 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"
+index = false
+keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
 
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-[[outputs]]
-quantity = "timeslice_supply"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-# Carbon budget control
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
-projections = '{path}/input/Projections.csv'
-global_commodities = '{path}/input/GlobalCommodities.csv'
+projections = "{path}/input/Projections.csv"
+global_commodities = "{path}/input/GlobalCommodities.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
 
 [sectors.residential]
-type = 'default'
+type = "default"
 priority = 1
-dispatch_production = 'share'
-technodata = '{path}/technodata/residential/Technodata.csv'
-commodities_in = '{path}/technodata/residential/CommIn.csv'
-commodities_out = '{path}/technodata/residential/CommOut.csv'
+dispatch_production = "share"
+technodata = "{path}/technodata/residential/Technodata.csv"
+commodities_in = "{path}/technodata/residential/CommIn.csv"
+commodities_out = "{path}/technodata/residential/CommOut.csv"
 
-[sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/residential/Agents.csv'
-existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [
-    # Optional, defaults to the constraints below
-    "max_production",
-    "max_capacity_expansion",
-    "demand",
-    "search_space"
-]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5
+[[sectors.residential.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+sink = "csv"
+overwrite = true
+
+[sectors.residential.outputs.quantity]
+name = "supply"
+sum_over = "timeslice"
+drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.residential.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
+lpsolver = "scipy"
+constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
+demand_share = "new_and_retro"
+forecast = 5
 
 [sectors.power]
-type = 'default'
+type = "default"
 priority = 2
-dispatch_production = 'share'
-technodata = '{path}/technodata/power/Technodata.csv'
-commodities_in = '{path}/technodata/power/CommIn.csv'
-commodities_out = '{path}/technodata/power/CommOut.csv'
+dispatch_production = "share"
+technodata = "{path}/technodata/power/Technodata.csv"
+commodities_in = "{path}/technodata/power/CommIn.csv"
+commodities_out = "{path}/technodata/power/CommOut.csv"
 
-[sectors.power.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
-lpsolver = "scipy"
+[[sectors.power.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
 
 [[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.power.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.gas]
-type = 'default'
+type = "default"
 priority = 3
-dispatch_production = 'share'
-technodata = '{path}/technodata/gas/Technodata.csv'
-commodities_in = '{path}/technodata/gas/CommIn.csv'
-commodities_out = '{path}/technodata/gas/CommOut.csv'
+dispatch_production = "share"
+technodata = "{path}/technodata/gas/Technodata.csv"
+commodities_in = "{path}/technodata/gas/CommIn.csv"
+commodities_out = "{path}/technodata/gas/CommOut.csv"
 
-[sectors.gas.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
-lpsolver = "scipy"
+[[sectors.gas.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
 
 [[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.gas.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.residential_presets]
-type = 'presets'
+type = "presets"
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
index f6ab761e..7f266b04 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
@@ -1,3 +1,5 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent3,A2,R1,LCOE,EAC,,0.5,0.5,,True,,,all,weighted_sum,1,-1,inf,New
+Agent4,A2,R1,LCOE,EAC,,0.5,0.5,,True,,,all,weighted_sum,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
index 57f66da8..05f7c836 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
index 39be7e0b..c80af575 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv
deleted file mode 100644
index 405e9f79..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Agents.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R1,LCOE,EAC,,0.75,0.25,,TRUE,,,all,weighted_sum,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,EAC,,0.75,0.25,,TRUE,,,all,weighted_sum,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
index 4bbd17fe..1799e1f4 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..15698c78
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..d5dee8bb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..08966a42
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fe3133ab
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f3a800dd
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
index aee4e2a4..8823691a 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
@@ -1,76 +1,79 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-9,A2,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,9.50000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-16,A2,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-21,A2,9.50000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,6.75000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,10.00000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,9.50000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,4.40000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-18,A2,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-22,A2,9.50000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-23,A2,4.40000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,6.75000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,4.30000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,10.00000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,0.34560000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-2,A1,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-4,A1,4.40000000000,R1,7,2025,R1,residential,heatpump,retrofit,2035
-5,A1,12.50000000000,R1,8,2030,R1,residential,heatpump,retrofit,2035
-16,A2,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-18,A2,4.40000000000,R1,7,2025,R1,residential,heatpump,retrofit,2035
-19,A2,12.50000000000,R1,8,2030,R1,residential,heatpump,retrofit,2035
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-10,A1,6.75000000000,R1,11,2020,R1,power,solarPV,retrofit,2035
-11,A1,4.30000000000,R1,12,2025,R1,power,solarPV,retrofit,2035
-12,A1,6.00000000000,R1,13,2030,R1,power,solarPV,retrofit,2035
-37,A1,10.00000000000,R1,55,2020,R1,power,windturbine,retrofit,2035
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
-2,A1,12.50000000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-3,A1,8.50000000000,R1,1,2035,R1,residential,heatpump,retrofit,2040
-14,A2,12.50000000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-15,A2,8.50000000000,R1,1,2035,R1,residential,heatpump,retrofit,2040
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-9,A1,6.75000000000,R1,12,2020,R1,power,solarPV,retrofit,2040
-10,A1,4.30000000000,R1,13,2025,R1,power,solarPV,retrofit,2040
-11,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2040
-12,A1,8.20000000000,R1,15,2035,R1,power,solarPV,retrofit,2040
-43,A1,10.00000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
-2,A1,8.50000000000,R1,0,2035,R1,residential,heatpump,retrofit,2045
-3,A1,15.50000000000,R1,1,2040,R1,residential,heatpump,retrofit,2045
-14,A2,8.50000000000,R1,0,2035,R1,residential,heatpump,retrofit,2045
-15,A2,15.50000000000,R1,1,2040,R1,residential,heatpump,retrofit,2045
-2,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-10,A1,6.75000000000,R1,13,2020,R1,power,solarPV,retrofit,2045
-11,A1,4.30000000000,R1,14,2025,R1,power,solarPV,retrofit,2045
-12,A1,6.00000000000,R1,15,2030,R1,power,solarPV,retrofit,2045
-13,A1,8.20000000000,R1,16,2035,R1,power,solarPV,retrofit,2045
-14,A1,6.00000000000,R1,17,2040,R1,power,solarPV,retrofit,2045
-50,A1,10.00000000000,R1,91,2020,R1,power,windturbine,retrofit,2045
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
-0,A1,15.50000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-1,A1,11.50000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-10,A2,15.50000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-11,A2,11.50000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-6,A1,4.30000000000,R1,13,2025,R1,power,solarPV,retrofit,2050
-7,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2050
-8,A1,8.20000000000,R1,15,2035,R1,power,solarPV,retrofit,2050
-9,A1,6.00000000000,R1,16,2040,R1,power,solarPV,retrofit,2050
-10,A1,16.00000000000,R1,17,2045,R1,power,solarPV,retrofit,2050
-46,A1,6.75000000000,R1,91,2045,R1,power,windturbine,retrofit,2050
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A1,power,retrofit,2025,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A2,power,retrofit,2025,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2030,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2030,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2030,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2030,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
+gasboiler,R1,R1,A2,residential,retrofit,2035,7.20000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,28.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2035,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2035,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2035,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2035,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,13.96760000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
+gasboiler,R1,R1,A2,residential,retrofit,2040,7.20000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,28.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2040,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2040,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2040,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2040,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,13.96760000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
+gasboiler,R1,R1,A2,residential,retrofit,2045,7.44000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,40.56000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2045,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2045,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2045,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2045,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,13.96760000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
+gasboiler,R1,R1,A2,residential,retrofit,2050,7.44000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,40.56000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,0.86130000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.54070000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.61070000000
+windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
+gasCCGT,R1,R1,A2,power,retrofit,2050,2.00000000000
+gasCCGT,R1,R1,A2,power,retrofit,2050,0.86130000000
+solarPV,R1,R1,A2,power,retrofit,2050,6.54070000000
+solarPV,R1,R1,A2,power,retrofit,2050,11.61070000000
+windturbine,R1,R1,A2,power,retrofit,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,13.96760000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index e2eb0e7d..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,373 +0,0 @@
-,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,0.58000000000,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,0.87000000000,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,0.58000000000,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,0.87000000000,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,1.74000000000,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,1.16000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-7,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-8,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-9,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-10,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-11,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,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.16111111111,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.21111111111,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.24166666667,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.31666666667,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.16111111111,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.21111111111,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.24166666667,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.31666666667,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.48333333333,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,0.63333333333,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.32222222222,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.42222222222,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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.21111111111,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.07088888889,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.09777777778,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.31666666667,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.10633333333,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.14666666667,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.21111111111,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.07088888889,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.09777777778,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.31666666667,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.10633333333,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.14666666667,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,0.63333333333,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.21266666667,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.29333333333,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.42222222222,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.14177777778,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.19555555556,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-20,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-22,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-23,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-26,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-28,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-29,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-32,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-34,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-35,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.45000000000,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.66666666667,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.28666666667,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.30000000000,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.44444444444,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.19111111111,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.07088888889,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.09777777778,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.27777777778,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.10633333333,R1,17,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.14666666667,R1,20,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.41666666667,R1,24,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.07088888889,R1,33,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.09777777778,R1,36,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.27777777778,R1,40,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.10633333333,R1,49,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.14666666667,R1,52,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.41666666667,R1,56,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.21266666667,R1,65,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.29333333333,R1,68,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,0.83333333333,R1,72,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.14177777778,R1,81,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.19555555556,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-20,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,17,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-22,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,20,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-23,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,33,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,36,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-26,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,40,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,49,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-28,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,52,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-29,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,56,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R1,65,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-32,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-35,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,88,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.15000000000,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.22222222222,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.09555555556,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.22500000000,R1,34,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.33333333333,R1,38,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,41,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.14333333333,R1,49,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,54,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.15000000000,R1,64,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.22222222222,R1,68,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,71,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.09555555556,R1,79,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,84,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.22500000000,R1,94,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.33333333333,R1,98,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,101,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.14333333333,R1,109,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,114,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.45000000000,R1,124,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.66666666667,R1,128,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,131,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.28666666667,R1,139,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,144,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.30000000000,R1,154,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.44444444444,R1,158,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,161,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.19111111111,R1,169,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,174,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.27777777778,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,electricity,0.18888888889,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,28,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,28,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,64,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.15000000000,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.22222222222,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.25050000000,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.09555555556,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.13333333333,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,solar,0.18222222222,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,124,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,0,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,12,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,48,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,60,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,64,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,0,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,12,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,48,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,60,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,64,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.15000000000,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.22222222222,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.25050000000,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.09555555556,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.13333333333,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,solar,0.18222222222,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,139,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,143,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,154,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,164,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R1,209,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,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.25555555556,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,0.51666666667,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.38333333333,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.34444444444,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.25555555556,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,0.51666666667,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.38333333333,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,1.03333333333,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,0.76666666667,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,0.68888888889,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,0.51111111111,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,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.09555555556,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,solar,0.18222222222,R1,19,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35555555556,R1,29,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,49,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,59,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.53333333333,R1,69,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35555555556,R1,109,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,139,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.53333333333,R1,149,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R1,179,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,1.06666666667,R1,189,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R1,209,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R1,219,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.71111111111,R1,229,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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/2-add-agent/2-single-objective/Results/MCAMetric_Supply.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Supply.csv
deleted file mode 100644
index b7e943b8..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,529 +0,0 @@
-,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,0.50000000000,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,32.35500000000,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,0.75000000000,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,48.53250000000,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,0.50000000000,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,32.35500000000,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,0.75000000000,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,48.53250000000,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,1.50000000000,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,97.06500000000,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,1.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,64.71000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,64.71000000000,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.13888888889,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,0.52777777778,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,8.98750000000,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.20833333333,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,0.79166666667,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,13.48125000000,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.13888888889,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,0.52777777778,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,8.98750000000,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.20833333333,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,0.79166666667,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,13.48125000000,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.41666666667,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,1.58333333333,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,26.96250000000,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.27777777778,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,1.05555555556,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,17.97500000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-22,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-28,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-29,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-34,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-35,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,17.97500000000,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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,0.52777777778,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.06111111111,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.24444444444,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,3.95450000000,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,0.79166666667,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.09166666667,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.36666666667,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,5.93175000000,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,0.52777777778,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.06111111111,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.24444444444,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,3.95450000000,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,0.79166666667,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.09166666667,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.36666666667,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,5.93175000000,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,1.58333333333,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.18333333333,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,0.73333333333,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,11.86350000000,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,1.05555555556,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.12222222222,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.48888888889,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,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-26,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-30,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-34,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-38,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-42,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-46,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,7.90900000000,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.45000000000,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.66666666667,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.28666666667,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.30000000000,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.44444444444,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.19111111111,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.01727777778,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.02591666667,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.01727777778,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.02591666667,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.05183333333,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.03455555556,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2025.00000000000,R1,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2025.00000000000,R1,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2025.00000000000,R1,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2025.00000000000,R1,residential,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-26,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-30,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-31,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-34,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-35,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-38,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2025.00000000000,R1,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-42,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-43,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2025.00000000000,R1,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2025.00000000000,R1,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-46,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-47,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2025.00000000000,R1,residential,7.90900000000,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.15000000000,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.22222222222,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.09555555556,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,14,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,30,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.01727777778,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.02591666667,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.01727777778,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.02591666667,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.05183333333,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.03455555556,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,6,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15000000000,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.22222222222,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.15000000000,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.09555555556,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.13333333333,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.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2035.00000000000,R1,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2035.00000000000,R1,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.01103321059,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.23946678941,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.01654981589,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.35920018411,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.03309963178,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.71840036822,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.02206642119,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.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15000000000,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.22222222222,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.15000000000,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.09555555556,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.13333333333,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.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2035.00000000000,R1,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2035.00000000000,R1,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2035.00000000000,R1,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.01103321059,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.23946678941,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.01654981589,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.35920018411,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.03309963178,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.71840036822,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.02206642119,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.47893357881,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,0.86111111111,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,0.63888888889,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,1.29166666667,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,0.95833333333,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,0.86111111111,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,0.63888888889,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,1.29166666667,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,0.95833333333,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,2.58333333333,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,1.91666666667,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,1.72222222222,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,1.27777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-13,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-17,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-19,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-21,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,1.27777777778,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.09555555556,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.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2045.00000000000,R1,power,0.35555555556,solarPV,"('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.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2045.00000000000,R1,power,0.53333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2045.00000000000,R1,power,0.35555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2045.00000000000,R1,power,0.53333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2035.00000000000,R1,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2045.00000000000,R1,power,1.06666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2035.00000000000,R1,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2045.00000000000,R1,power,0.71111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.01103321059,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.23946678941,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.01654981589,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.35920018411,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.03309963178,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.71840036822,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.02206642119,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.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
index e4395be0..a198a4be 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.41420000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.99750000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.62130000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.49630000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41420000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.99750000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62130000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.49630000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.24260000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.99260000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.82840000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.99500000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49360000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.45920000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.11460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04060000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74180000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.69010000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.18470000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07340000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49360000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.45920000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04060000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74180000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.69010000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18470000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07340000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.49230000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.38800000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44600000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22130000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.99100000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.92190000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.26330000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11440000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54050000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.57560000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.12710000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.31520000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81190000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.86460000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.20480000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.48470000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54050000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57560000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.12710000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31520000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81190000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86460000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20480000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.48470000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63080000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73710000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.49570000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.04130000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08410000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.15460000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.29210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.66220000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.54930000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.69190000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04570000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.39380000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.82500000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.03920000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08480000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.60540000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54930000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69190000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04570000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.39380000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82500000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.03920000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08480000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.60540000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65560000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.08610000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.26790000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.29950000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.10120000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.38730000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.82690000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.60260000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.85510000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.40120000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.90470000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.28400000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.08560000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.62000000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.60260000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85510000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.40120000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.90470000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28400000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08560000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.62000000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.81430000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57580000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27080000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.35000000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.20730000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.71370000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.13620000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.85100000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63650000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.87940000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04820000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.48810000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95540000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.32010000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09040000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.75460000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63650000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.87940000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04820000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.48810000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95540000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.32010000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09040000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.75460000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91530000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.64690000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28990000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.64390000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27490000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.76170000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14470000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,1.03600000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..e51bf8d5
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..9042b648
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
@@ -0,0 +1,24 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+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,2025,R1,windturbine,2020,18.95930000000
+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/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..a3e0e3c7
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e66e2fa3
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c4711009
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..7507d45f
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
@@ -0,0 +1,33 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasCCGT,2025,4.00000000000
+0,2049,R1,gasCCGT,2025,4.00000000000
+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,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,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
+4,2045,R1,windturbine,2020,18.95930000000
+4,2049,R1,windturbine,2020,18.95930000000
+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/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..e4440602
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..4122d90b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+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/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..08d92bf4
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..0ee56685
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,9 @@
+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
+1,2030,R1,heatpump,2020,38.00000000000
+1,2034,R1,heatpump,2020,38.00000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..2363ffb8
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..cd28d615
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2030,14.40000000000
+0,2044,R1,gasboiler,2030,14.40000000000
+1,2045,R1,gasboiler,2040,14.88000000000
+1,2050,R1,gasboiler,2040,14.88000000000
+1,2054,R1,gasboiler,2040,14.88000000000
+2,2040,R1,heatpump,2030,57.60000000000
+2,2044,R1,heatpump,2030,57.60000000000
+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/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..939e3e56
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6aff1325
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..62937431
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f9894bba
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..514bc0ff
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..80e72327
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..2c074d4d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..aa751b65
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..79dedd79
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/2-single-objective/input/GlobalCommodities.csv
index 253b75ef..9691db73 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/input/GlobalCommodities.csv
@@ -1,7 +1,7 @@
 Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
+Electricity,Energy,electricity,0.0,1,PJ
 Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index dedf9362..54b52362 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -1,14 +1,11 @@
-# Global settings - most REQUIRED
-
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+foresight = 5
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = 'Active'
-log_level = 'info'
+interpolation_mode = "Active"
+log_level = "info"
 excluded_commodities = ["wind", "solar"]
-# Convergence parameters
-equilibrium_variable = 'demand'
+equilibrium_variable = "demand"
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -16,101 +13,120 @@ 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"
+index = false
+keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
 
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-[[outputs]]
-quantity = "timeslice_supply"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-# Carbon budget control
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
-projections = '{path}/input/Projections.csv'
-global_commodities = '{path}/input/GlobalCommodities.csv'
+projections = "{path}/input/Projections.csv"
+global_commodities = "{path}/input/GlobalCommodities.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
 
 [sectors.residential]
-type = 'default'
+type = "default"
 priority = 1
-dispatch_production = 'share'
-technodata = '{path}/technodata/residential/Technodata.csv'
-commodities_in = '{path}/technodata/residential/CommIn.csv'
-commodities_out = '{path}/technodata/residential/CommOut.csv'
+dispatch_production = "share"
+technodata = "{path}/technodata/residential/Technodata.csv"
+commodities_in = "{path}/technodata/residential/CommIn.csv"
+commodities_out = "{path}/technodata/residential/CommOut.csv"
 
-[sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/residential/Agents.csv'
-existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [
-    # Optional, defaults to the constraints below
-    "max_production",
-    "max_capacity_expansion",
-    "demand",
-    "search_space"
-]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5
+[[sectors.residential.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+sink = "csv"
+overwrite = true
+
+[sectors.residential.outputs.quantity]
+name = "supply"
+sum_over = "timeslice"
+drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.residential.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
+lpsolver = "scipy"
+constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
+demand_share = "new_and_retro"
+forecast = 5
 
 [sectors.power]
-type = 'default'
+type = "default"
 priority = 2
-dispatch_production = 'share'
-technodata = '{path}/technodata/power/Technodata.csv'
-commodities_in = '{path}/technodata/power/CommIn.csv'
-commodities_out = '{path}/technodata/power/CommOut.csv'
+dispatch_production = "share"
+technodata = "{path}/technodata/power/Technodata.csv"
+commodities_in = "{path}/technodata/power/CommIn.csv"
+commodities_out = "{path}/technodata/power/CommOut.csv"
 
-[sectors.power.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
-lpsolver = "scipy"
+[[sectors.power.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
 
 [[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.power.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.gas]
-type = 'default'
+type = "default"
 priority = 3
-dispatch_production = 'share'
-technodata = '{path}/technodata/gas/Technodata.csv'
-commodities_in = '{path}/technodata/gas/CommIn.csv'
-commodities_out = '{path}/technodata/gas/CommOut.csv'
+dispatch_production = "share"
+technodata = "{path}/technodata/gas/Technodata.csv"
+commodities_in = "{path}/technodata/gas/CommIn.csv"
+commodities_out = "{path}/technodata/gas/CommOut.csv"
 
-[sectors.gas.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
-lpsolver = "scipy"
+[[sectors.gas.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
 
 [[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.gas.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
+lpsolver = "scipy"
 
 [sectors.residential_presets]
-type = 'presets'
+type = "presets"
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
index f6ab761e..57a6732d 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
@@ -1,3 +1,5 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent3,A2,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent4,A2,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
index 57f66da8..05f7c836 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
index 39be7e0b..c80af575 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv
deleted file mode 100644
index b3d025a3..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Agents.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
index 4bbd17fe..1799e1f4 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
 gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 1f44e9e2..e21b815c 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -3,20 +3,22 @@
 import sys
 
 import pandas as pd
-from muse.wizard import add_agent
+from muse.wizard import add_agent, get_sectors
 
 parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
 
-# WORK IN PROGRESS
 
 """
-Model 1 - Multiple objective
+Model 2 - Single objective
+
+Note: Generating the models in reverse order as this makes more sense programmatically.
+Consider changing the tutorial
 
 """
 
 
-def generate_model_1():
-    model_name = "1-multiple-objective"
+def generate_model_2():
+    model_name = "2-single-objective"
 
     # Starting point: copy model from previous tutorial
     model_path = os.path.join(parent_path, model_name)
@@ -26,6 +28,12 @@ def generate_model_1():
         os.path.join(parent_path, "../1-add-new-technology/2-scenario"), model_path
     )
 
+    # Modify MaxCapacityGrowth (Undocumented)
+    technodata_file = os.path.join(model_path, "technodata/residential/technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityGrowth"] = 0.04
+    df.to_csv(technodata_file, index=False)
+
     # Copy agent A1 -> A2
     add_agent(
         model_path,
@@ -35,6 +43,32 @@ def generate_model_1():
         agentshare_retrofit="Agent4",
     )
 
+    # Split capacity equally between the two agents
+    for sector in get_sectors(model_path):
+        technodata_file = os.path.join(
+            model_path, f"technodata/{sector}/technodata.csv"
+        )
+        df = pd.read_csv(technodata_file)
+        df.loc[1:, "Agent2"] = 0.5
+        df.loc[1:, "Agent4"] = 0.5
+        df.to_csv(technodata_file, index=False)
+
+
+"""
+Model 1 - Multiple objective
+
+"""
+
+
+def generate_model_1():
+    model_name = "1-multiple-objective"
+
+    # Starting point: copy model from previous tutorial
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+    shutil.copytree(os.path.join(parent_path, "2-single-objective"), model_path)
+
     # Special handling for Agents.csv
     agents_file = os.path.join(model_path, "technodata/Agents.csv")
     df = pd.read_csv(agents_file)
@@ -45,4 +79,5 @@ def generate_model_1():
 
 
 if __name__ == "__main__":
+    generate_model_2()
     generate_model_1()
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb b/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
similarity index 94%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
rename to docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
index 2e5b8cb1..fddbd7f0 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/visualise-new-agent-multiple-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"1-multiple-objective/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\", \"agent\"])\n",
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb b/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
similarity index 94%
rename from docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
rename to docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
index 2e5b8cb1..1c30c78b 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/visualise-new-agent-single-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"2-single-objective/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\", \"agent\"])\n",
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index c15baaf8..455603db 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -160,26 +160,13 @@ def add_agent(
         (df["Name"] == copy_from) & (df["Type"] == "Retrofit"), "AgentShare"
     ].values[0]
 
-    add_agent_allocation(model_path, agentshare_retrofit, copy_from_retrofit)
-    add_agent_allocation(model_path, agentshare_new, copy_from_new)
-
-
-def add_agent_allocation(
-    model_path: str,
-    agentshare_name: str,
-    copy_from: str,
-) -> None:
-    """Add an agent allocation to technodata files by copying from an existing one.
-
-    Args:
-        model_path: Path to the model folder.
-        agentshare_name: Name of the agent share to add.
-        copy_from: Name of the agent share to copy from.
-    """
     for sector in get_sectors(model_path):
         technodata_file = os.path.join(
             model_path, f"technodata/{sector}/technodata.csv"
         )
         df = pd.read_csv(technodata_file)
-        df[agentshare_name] = df[copy_from]
+        if copy_from_retrofit in df.columns:
+            df[agentshare_retrofit] = df[copy_from_retrofit]
+        if copy_from_new in df.columns:
+            df[agentshare_new] = df[copy_from_new]
         df.to_csv(technodata_file, index=False)

From 96ef4f2e962dbfb51345f165793de42d146dbbc5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 14 May 2024 10:35:05 +0100
Subject: [PATCH 096/419] Tutorial 3

---
 .../2-add-agent/generate_models.py            |    2 +-
 .../Results/Gas/Capacity/2020.csv             |    7 +
 .../Results/Gas/Capacity/2025.csv             |   17 +
 .../Results/Gas/Capacity/2030.csv             |   29 +
 .../Results/Gas/Capacity/2035.csv             |   25 +
 .../Results/Gas/Capacity/2040.csv             |   21 +
 .../Results/Gas/Capacity/2045.csv             |   17 +
 .../Results/Gas/Capacity/2050.csv             |   17 +
 .../1-new-region/Results/MCACapacity.csv      |  128 ++
 .../{ => 1-new-region}/Results/MCAPrices.csv  |  264 ++--
 .../Results/Power/Capacity/2020.csv           |   23 +
 .../Results/Power/Capacity/2025.csv           |   53 +
 .../Results/Power/Capacity/2030.csv           |   76 ++
 .../Results/Power/Capacity/2035.csv           |  105 ++
 .../Results/Power/Capacity/2040.csv           |  105 ++
 .../Results/Power/Capacity/2045.csv           |  131 ++
 .../Results/Power/Capacity/2050.csv           |  121 ++
 .../Results/Residential/Capacity/2020.csv     |   11 +
 .../Results/Residential/Capacity/2025.csv     |   25 +
 .../Results/Residential/Capacity/2030.csv     |   29 +
 .../Results/Residential/Capacity/2035.csv     |   33 +
 .../Results/Residential/Capacity/2040.csv     |   29 +
 .../Results/Residential/Capacity/2045.csv     |   25 +
 .../Results/Residential/Capacity/2050.csv     |   21 +
 .../Results/Residential/Supply/2020.csv       |  121 ++
 .../Results/Residential/Supply/2025.csv       |  169 +++
 .../Results/Residential/Supply/2030.csv       |  193 +++
 .../Results/Residential/Supply/2035.csv       |  193 +++
 .../Results/Residential/Supply/2040.csv       |  193 +++
 .../Results/Residential/Supply/2045.csv       |  145 +++
 .../Results/Residential/Supply/2050.csv       |   97 ++
 .../input/BaseYearExport.csv                  |   78 +-
 .../input/BaseYearImport.csv                  |   78 +-
 .../1-new-region/input/GlobalCommodities.csv  |    7 +
 .../{ => 1-new-region}/input/Projections.csv  |   78 +-
 .../3-add-region/1-new-region/settings.toml   |  132 ++
 .../1-new-region/technodata/Agents.csv        |    5 +
 .../technodata/gas/CommIn.csv                 |    6 +-
 .../technodata/gas/CommOut.csv                |    6 +-
 .../technodata/gas/ExistingCapacity.csv       |    4 +-
 .../technodata/gas/Technodata.csv             |    8 +-
 .../technodata/power/CommIn.csv               |   26 +-
 .../technodata/power/CommOut.csv              |   26 +-
 .../technodata/power/ExistingCapacity.csv     |   12 +-
 .../technodata/power/Technodata.csv           |   28 +-
 .../preset/Residential2020Consumption.csv     |   13 +
 .../preset/Residential2050Consumption.csv     |   13 +
 .../technodata/residential/CommIn.csv         |   10 +-
 .../technodata/residential/CommOut.csv        |   10 +-
 .../residential/ExistingCapacity.csv          |    8 +-
 .../technodata/residential/Technodata.csv     |    6 +
 .../3-add-region/Results/MCACapacity.csv      |  151 ---
 .../Results/MCAMetric_Consumption.csv         |  745 ------------
 .../3-add-region/Results/MCAMetric_Supply.csv | 1057 -----------------
 .../3-add-region/generate_model.py            |   55 -
 .../3-add-region/generate_models.py           |   42 +
 .../3-add-region/input/GlobalCommodities.csv  |    7 -
 docs/tutorial-code/3-add-region/settings.toml |  116 --
 .../3-add-region/technodata/Agents.csv        |    5 -
 .../preset/Residential2020Consumption.csv     |   13 -
 .../preset/Residential2050Consumption.csv     |   13 -
 .../technodata/residential/Agents.csv         |    9 -
 .../technodata/residential/Technodata.csv     |    6 -
 .../3-add-region/visualise-new-region.ipynb   |    4 +-
 docs/user-guide/add-region.ipynb              |    4 +-
 src/muse/wizard.py                            |   37 +
 66 files changed, 2741 insertions(+), 2502 deletions(-)
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/Results/MCAPrices.csv (62%)
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/input/BaseYearExport.csv (96%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/input/BaseYearImport.csv (96%)
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/input/Projections.csv (98%)
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/settings.toml
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/gas/CommIn.csv (98%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/gas/CommOut.csv (98%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/gas/ExistingCapacity.csv (98%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/gas/Technodata.csv (73%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/power/CommIn.csv (97%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/power/CommOut.csv (97%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/power/ExistingCapacity.csv (97%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/power/Technodata.csv (51%)
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/residential/CommIn.csv (98%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/residential/CommOut.csv (98%)
 rename docs/tutorial-code/3-add-region/{ => 1-new-region}/technodata/residential/ExistingCapacity.csv (97%)
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
 delete mode 100644 docs/tutorial-code/3-add-region/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/3-add-region/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/3-add-region/Results/MCAMetric_Supply.csv
 delete mode 100644 docs/tutorial-code/3-add-region/generate_model.py
 create mode 100644 docs/tutorial-code/3-add-region/generate_models.py
 delete mode 100644 docs/tutorial-code/3-add-region/input/GlobalCommodities.csv
 delete mode 100644 docs/tutorial-code/3-add-region/settings.toml
 delete mode 100644 docs/tutorial-code/3-add-region/technodata/Agents.csv
 delete mode 100644 docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv
 delete mode 100644 docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv
 delete mode 100644 docs/tutorial-code/3-add-region/technodata/residential/Agents.csv
 delete mode 100644 docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv

diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index e21b815c..ebc025d7 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -46,7 +46,7 @@ def generate_model_2():
     # Split capacity equally between the two agents
     for sector in get_sectors(model_path):
         technodata_file = os.path.join(
-            model_path, f"technodata/{sector}/technodata.csv"
+            model_path, f"technodata/{sector}/Technodata.csv"
         )
         df = pd.read_csv(technodata_file)
         df.loc[1:, "Agent2"] = 0.5
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..57ef9d5d
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,17 @@
+asset,year,technology,region,installed,capacity
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2025,2.79440000000
+1,2035,gassupply1,R1,2025,2.79440000000
+1,2040,gassupply1,R1,2025,2.79440000000
+1,2045,gassupply1,R1,2025,2.79440000000
+1,2050,gassupply1,R1,2025,2.79440000000
+1,2064,gassupply1,R1,2025,2.79440000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2030,gassupply1,R2,2025,2.79440000000
+3,2035,gassupply1,R2,2025,2.79440000000
+3,2040,gassupply1,R2,2025,2.79440000000
+3,2045,gassupply1,R2,2025,2.79440000000
+3,2050,gassupply1,R2,2025,2.79440000000
+3,2064,gassupply1,R2,2025,2.79440000000
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
new file mode 100644
index 00000000..223a9793
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..be63ee95
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..301ed041
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..33d01ddd
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..59af6136
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c1b43bb2
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
@@ -0,0 +1,128 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.40000000000
+windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,2.79440000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
+windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
+windturbine,R2,R2,A1,power,retrofit,2035,3.60000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+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
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
+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
+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
+solarPV,R2,R2,A1,power,retrofit,2040,4.80000000000
+windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
+windturbine,R2,R2,A1,power,retrofit,2040,3.60000000000
+windturbine,R2,R2,A1,power,retrofit,2040,4.39000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+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
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
+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
+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
+solarPV,R2,R2,A1,power,retrofit,2045,4.80000000000
+solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
+windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
+windturbine,R2,R2,A1,power,retrofit,2045,3.60000000000
+windturbine,R2,R2,A1,power,retrofit,2045,4.39000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
+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,16.91000000000
+windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
+windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
+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
+solarPV,R2,R2,A1,power,retrofit,2050,4.80000000000
+solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
+windturbine,R2,R2,A1,power,retrofit,2050,3.60000000000
+windturbine,R2,R2,A1,power,retrofit,2050,4.39000000000
+windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/Results/MCAPrices.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
similarity index 62%
rename from docs/tutorial-code/3-add-region/Results/MCAPrices.csv
rename to docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
index 1c58fa58..ce14d096 100644
--- a/docs/tutorial-code/3-add-region/Results/MCAPrices.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
@@ -47,291 +47,291 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.44900000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.67350000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44900000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.67350000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34700000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89800000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49360000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.49360000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.51500000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.51500000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.11460000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.11460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17720000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.17720000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74180000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.74180000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77400000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.77400000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.18470000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.18470000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27790000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.27790000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49360000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.49360000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51500000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.51500000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.11460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.17720000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74180000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.74180000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77400000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77400000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18470000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.18470000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27790000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.27790000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.49230000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.49230000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.55730000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.55730000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44600000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.44600000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62840000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.62840000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.99100000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.99100000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.03410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.03410000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.26330000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.26330000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38660000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.38660000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54050000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.54050000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.56090000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.56090000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.12710000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.12710000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19970000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.19970000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81190000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.81190000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.84270000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.84270000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.20480000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.20480000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31380000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.31380000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54050000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.54050000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56090000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.56090000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.12710000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.12710000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19970000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.19970000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81190000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.81190000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84270000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.84270000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20480000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.20480000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31380000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.31380000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63080000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.63080000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69290000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.69290000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.49570000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.49570000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71370000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.71370000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08410000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.08410000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.12520000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.12520000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.29210000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.29210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.43750000000,2035
+"('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.54930000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.54930000000,2040
+"('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')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04570000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.04570000000,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.82500000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.82500000000,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')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08480000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.08480000000,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.54930000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.54930000000,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')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04570000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.04570000000,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.82500000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.82500000000,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')",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.08480000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08480000000,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.65560000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.65560000000,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')",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.26790000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.26790000000,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.10120000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.10120000000,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')",gas,R1,0.09440000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.13480000000,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.60260000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.60260000000,2045
+"('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')",gas,R1,0.04720000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.04600000000,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')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.90470000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.90470000000,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')",gas,R1,0.07080000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.08560000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.08560000000,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')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.60260000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.60260000000,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')",gas,R1,0.04720000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.04600000000,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')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.90470000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.90470000000,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')",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.08560000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08560000000,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')",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.81430000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.81430000000,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')",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.27080000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27080000000,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')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.20730000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.20730000000,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')",gas,R1,0.09440000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.13620000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.13620000000,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')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63650000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.63650000000,2050
+"('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')",gas,R1,0.04720000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04820000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.04820000000,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')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95540000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.95540000000,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')",gas,R1,0.07080000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09040000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.09040000000,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')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63650000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.63650000000,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')",gas,R1,0.04720000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04820000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.04820000000,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')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95540000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.95540000000,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')",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.09040000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.09040000000,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')",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.91530000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.91530000000,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')",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.28990000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28990000000,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')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27490000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.27490000000,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')",gas,R1,0.09440000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.14470000000,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')",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
new file mode 100644
index 00000000..b5425c1b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..0b9e6c57
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -0,0 +1,53 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,3.00000000000
+1,2035,gasCCGT,R1,2025,3.00000000000
+1,2040,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R1,2025,3.00000000000
+1,2049,gasCCGT,R1,2025,3.00000000000
+1,2050,gasCCGT,R1,2025,3.00000000000
+1,2054,gasCCGT,R1,2025,3.00000000000
+1,2055,gasCCGT,R1,2025,3.00000000000
+1,2064,gasCCGT,R1,2025,3.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,3.00000000000
+3,2035,gasCCGT,R2,2025,3.00000000000
+3,2040,gasCCGT,R2,2025,3.00000000000
+3,2045,gasCCGT,R2,2025,3.00000000000
+3,2049,gasCCGT,R2,2025,3.00000000000
+3,2050,gasCCGT,R2,2025,3.00000000000
+3,2054,gasCCGT,R2,2025,3.00000000000
+3,2055,gasCCGT,R2,2025,3.00000000000
+3,2064,gasCCGT,R2,2025,3.00000000000
+4,2025,solarPV,R1,2020,6.75000000000
+4,2030,solarPV,R1,2020,6.75000000000
+4,2035,solarPV,R1,2020,6.75000000000
+4,2040,solarPV,R1,2020,6.75000000000
+4,2045,solarPV,R1,2020,6.75000000000
+4,2049,solarPV,R1,2020,6.75000000000
+5,2030,solarPV,R1,2025,2.40000000000
+5,2035,solarPV,R1,2025,2.40000000000
+5,2040,solarPV,R1,2025,2.40000000000
+5,2045,solarPV,R1,2025,2.40000000000
+5,2049,solarPV,R1,2025,2.40000000000
+5,2050,solarPV,R1,2025,2.40000000000
+5,2054,solarPV,R1,2025,2.40000000000
+6,2030,solarPV,R2,2025,2.40000000000
+6,2035,solarPV,R2,2025,2.40000000000
+6,2040,solarPV,R2,2025,2.40000000000
+6,2045,solarPV,R2,2025,2.40000000000
+6,2049,solarPV,R2,2025,2.40000000000
+6,2050,solarPV,R2,2025,2.40000000000
+6,2054,solarPV,R2,2025,2.40000000000
+7,2025,windturbine,R1,2020,10.00000000000
+7,2030,windturbine,R1,2020,10.00000000000
+7,2035,windturbine,R1,2020,10.00000000000
+7,2040,windturbine,R1,2020,10.00000000000
+7,2045,windturbine,R1,2020,10.00000000000
+7,2049,windturbine,R1,2020,10.00000000000
+8,2025,windturbine,R2,2020,16.75000000000
+8,2030,windturbine,R2,2020,16.75000000000
+8,2035,windturbine,R2,2020,16.75000000000
+8,2040,windturbine,R2,2020,16.75000000000
+8,2045,windturbine,R2,2020,16.75000000000
+8,2049,windturbine,R2,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
new file mode 100644
index 00000000..ca265d0a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..bc71a6d4
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
@@ -0,0 +1,105 @@
+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
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
new file mode 100644
index 00000000..bda10415
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
@@ -0,0 +1,105 @@
+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
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
new file mode 100644
index 00000000..b04feb4a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
@@ -0,0 +1,131 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,3.00000000000
+0,2049,gasCCGT,R1,2025,3.00000000000
+0,2050,gasCCGT,R1,2025,3.00000000000
+0,2054,gasCCGT,R1,2025,3.00000000000
+0,2055,gasCCGT,R1,2025,3.00000000000
+0,2059,gasCCGT,R1,2025,3.00000000000
+0,2060,gasCCGT,R1,2025,3.00000000000
+0,2064,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R2,2025,3.00000000000
+1,2049,gasCCGT,R2,2025,3.00000000000
+1,2050,gasCCGT,R2,2025,3.00000000000
+1,2054,gasCCGT,R2,2025,3.00000000000
+1,2055,gasCCGT,R2,2025,3.00000000000
+1,2059,gasCCGT,R2,2025,3.00000000000
+1,2060,gasCCGT,R2,2025,3.00000000000
+1,2064,gasCCGT,R2,2025,3.00000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2045,solarPV,R1,2025,2.40000000000
+3,2049,solarPV,R1,2025,2.40000000000
+3,2050,solarPV,R1,2025,2.40000000000
+3,2054,solarPV,R1,2025,2.40000000000
+4,2045,solarPV,R1,2030,6.00000000000
+4,2049,solarPV,R1,2030,6.00000000000
+4,2050,solarPV,R1,2030,6.00000000000
+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
+15,2045,windturbine,R2,2020,16.75000000000
+15,2049,windturbine,R2,2020,16.75000000000
+16,2045,windturbine,R2,2030,3.60000000000
+16,2049,windturbine,R2,2030,3.60000000000
+16,2050,windturbine,R2,2030,3.60000000000
+16,2054,windturbine,R2,2030,3.60000000000
+16,2055,windturbine,R2,2030,3.60000000000
+16,2059,windturbine,R2,2030,3.60000000000
+17,2045,windturbine,R2,2035,4.39000000000
+17,2049,windturbine,R2,2035,4.39000000000
+17,2050,windturbine,R2,2035,4.39000000000
+17,2054,windturbine,R2,2035,4.39000000000
+17,2055,windturbine,R2,2035,4.39000000000
+17,2059,windturbine,R2,2035,4.39000000000
+17,2060,windturbine,R2,2035,4.39000000000
+17,2064,windturbine,R2,2035,4.39000000000
+18,2050,windturbine,R2,2045,6.75000000000
+18,2054,windturbine,R2,2045,6.75000000000
+18,2055,windturbine,R2,2045,6.75000000000
+18,2059,windturbine,R2,2045,6.75000000000
+18,2060,windturbine,R2,2045,6.75000000000
+18,2064,windturbine,R2,2045,6.75000000000
+18,2065,windturbine,R2,2045,6.75000000000
+18,2069,windturbine,R2,2045,6.75000000000
+18,2070,windturbine,R2,2045,6.75000000000
+18,2074,windturbine,R2,2045,6.75000000000
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
new file mode 100644
index 00000000..37b2c93a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
@@ -0,0 +1,121 @@
+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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..06bad92b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,11 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2025,heatpump,R1,2020,19.00000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2025,heatpump,R2,2020,19.00000000000
+3,2030,heatpump,R2,2020,19.00000000000
+3,2034,heatpump,R2,2020,19.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..34d42206
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,4.10000000000
+1,2034,gasboiler,R1,2025,4.10000000000
+1,2035,gasboiler,R1,2025,4.10000000000
+1,2039,gasboiler,R1,2025,4.10000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,4.10000000000
+3,2034,gasboiler,R2,2025,4.10000000000
+3,2035,gasboiler,R2,2025,4.10000000000
+3,2039,gasboiler,R2,2025,4.10000000000
+4,2025,heatpump,R1,2020,19.00000000000
+4,2030,heatpump,R1,2020,19.00000000000
+4,2034,heatpump,R1,2020,19.00000000000
+5,2030,heatpump,R1,2025,6.90000000000
+5,2034,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2025,6.90000000000
+5,2039,heatpump,R1,2025,6.90000000000
+6,2025,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2020,19.00000000000
+6,2034,heatpump,R2,2020,19.00000000000
+7,2030,heatpump,R2,2025,6.90000000000
+7,2034,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..559a80d8
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,4.10000000000
+0,2034,gasboiler,R1,2025,4.10000000000
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2030,gasboiler,R2,2025,4.10000000000
+1,2034,gasboiler,R2,2025,4.10000000000
+1,2035,gasboiler,R2,2025,4.10000000000
+1,2039,gasboiler,R2,2025,4.10000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2030,heatpump,R1,2025,6.90000000000
+3,2034,heatpump,R1,2025,6.90000000000
+3,2035,heatpump,R1,2025,6.90000000000
+3,2039,heatpump,R1,2025,6.90000000000
+4,2035,heatpump,R1,2030,25.00000000000
+4,2039,heatpump,R1,2030,25.00000000000
+4,2040,heatpump,R1,2030,25.00000000000
+4,2044,heatpump,R1,2030,25.00000000000
+5,2030,heatpump,R2,2020,19.00000000000
+5,2034,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2025,6.90000000000
+6,2034,heatpump,R2,2025,6.90000000000
+6,2035,heatpump,R2,2025,6.90000000000
+6,2039,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2030,25.00000000000
+7,2039,heatpump,R2,2030,25.00000000000
+7,2040,heatpump,R2,2030,25.00000000000
+7,2044,heatpump,R2,2030,25.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..fa9e8bca
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2040,gasboiler,R1,2035,0.91000000000
+1,2044,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R1,2035,0.91000000000
+1,2049,gasboiler,R1,2035,0.91000000000
+2,2035,gasboiler,R2,2025,4.10000000000
+2,2039,gasboiler,R2,2025,4.10000000000
+3,2040,gasboiler,R2,2035,0.91000000000
+3,2044,gasboiler,R2,2035,0.91000000000
+3,2045,gasboiler,R2,2035,0.91000000000
+3,2049,gasboiler,R2,2035,0.91000000000
+4,2035,heatpump,R1,2025,6.90000000000
+4,2039,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2030,25.00000000000
+5,2039,heatpump,R1,2030,25.00000000000
+5,2040,heatpump,R1,2030,25.00000000000
+5,2044,heatpump,R1,2030,25.00000000000
+6,2040,heatpump,R1,2035,16.09000000000
+6,2044,heatpump,R1,2035,16.09000000000
+6,2045,heatpump,R1,2035,16.09000000000
+6,2049,heatpump,R1,2035,16.09000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
+8,2035,heatpump,R2,2030,25.00000000000
+8,2039,heatpump,R2,2030,25.00000000000
+8,2040,heatpump,R2,2030,25.00000000000
+8,2044,heatpump,R2,2030,25.00000000000
+9,2040,heatpump,R2,2035,16.09000000000
+9,2044,heatpump,R2,2035,16.09000000000
+9,2045,heatpump,R2,2035,16.09000000000
+9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..eb1a544b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2040,gasboiler,R1,2035,0.91000000000
+0,2044,gasboiler,R1,2035,0.91000000000
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2040,gasboiler,R2,2035,0.91000000000
+1,2044,gasboiler,R2,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2040,heatpump,R1,2030,25.00000000000
+2,2044,heatpump,R1,2030,25.00000000000
+3,2040,heatpump,R1,2035,16.09000000000
+3,2044,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2035,16.09000000000
+3,2049,heatpump,R1,2035,16.09000000000
+4,2045,heatpump,R1,2040,31.00000000000
+4,2049,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2040,31.00000000000
+4,2054,heatpump,R1,2040,31.00000000000
+5,2040,heatpump,R2,2030,25.00000000000
+5,2044,heatpump,R2,2030,25.00000000000
+6,2040,heatpump,R2,2035,16.09000000000
+6,2044,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2035,16.09000000000
+6,2049,heatpump,R2,2035,16.09000000000
+7,2045,heatpump,R2,2040,31.00000000000
+7,2049,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2040,31.00000000000
+7,2054,heatpump,R2,2040,31.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..0b5fe3de
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2045,heatpump,R1,2035,16.09000000000
+2,2049,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2040,31.00000000000
+3,2049,heatpump,R1,2040,31.00000000000
+3,2050,heatpump,R1,2040,31.00000000000
+3,2054,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2045,23.00000000000
+4,2054,heatpump,R1,2045,23.00000000000
+4,2055,heatpump,R1,2045,23.00000000000
+4,2059,heatpump,R1,2045,23.00000000000
+5,2045,heatpump,R2,2035,16.09000000000
+5,2049,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2040,31.00000000000
+6,2049,heatpump,R2,2040,31.00000000000
+6,2050,heatpump,R2,2040,31.00000000000
+6,2054,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2045,23.00000000000
+7,2054,heatpump,R2,2045,23.00000000000
+7,2055,heatpump,R2,2045,23.00000000000
+7,2059,heatpump,R2,2045,23.00000000000
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
new file mode 100644
index 00000000..eb21c442
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..8e6f8adf
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..eb9ddd9d
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..af0c152b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..21119f08
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..503b4b8c
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..98be95de
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..26d4aa26
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/3-add-region/input/BaseYearExport.csv b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv
similarity index 96%
rename from docs/tutorial-code/3-add-region/input/BaseYearExport.csv
rename to docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv
index d5d66ba2..bb5b862d 100644
--- a/docs/tutorial-code/3-add-region/input/BaseYearExport.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearExport.csv
@@ -1,40 +1,40 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
-R1,Exports,2010,0,0,0,0,0,0
-R1,Exports,2015,0,0,0,0,0,0
-R1,Exports,2020,0,0,0,0,0,0
-R1,Exports,2025,0,0,0,0,0,0
-R1,Exports,2030,0,0,0,0,0,0
-R1,Exports,2035,0,0,0,0,0,0
-R1,Exports,2040,0,0,0,0,0,0
-R1,Exports,2045,0,0,0,0,0,0
-R1,Exports,2050,0,0,0,0,0,0
-R1,Exports,2055,0,0,0,0,0,0
-R1,Exports,2060,0,0,0,0,0,0
-R1,Exports,2065,0,0,0,0,0,0
-R1,Exports,2070,0,0,0,0,0,0
-R1,Exports,2075,0,0,0,0,0,0
-R1,Exports,2080,0,0,0,0,0,0
-R1,Exports,2085,0,0,0,0,0,0
-R1,Exports,2090,0,0,0,0,0,0
-R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
-R2,Exports,2010,0,0,0,0,0,0
-R2,Exports,2015,0,0,0,0,0,0
-R2,Exports,2020,0,0,0,0,0,0
-R2,Exports,2025,0,0,0,0,0,0
-R2,Exports,2030,0,0,0,0,0,0
-R2,Exports,2035,0,0,0,0,0,0
-R2,Exports,2040,0,0,0,0,0,0
-R2,Exports,2045,0,0,0,0,0,0
-R2,Exports,2050,0,0,0,0,0,0
-R2,Exports,2055,0,0,0,0,0,0
-R2,Exports,2060,0,0,0,0,0,0
-R2,Exports,2065,0,0,0,0,0,0
-R2,Exports,2070,0,0,0,0,0,0
-R2,Exports,2075,0,0,0,0,0,0
-R2,Exports,2080,0,0,0,0,0,0
-R2,Exports,2085,0,0,0,0,0,0
-R2,Exports,2090,0,0,0,0,0,0
-R2,Exports,2095,0,0,0,0,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
+R1,Exports,2010,0,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0,0
+R2,Exports,2010,0,0,0,0,0,0
+R2,Exports,2015,0,0,0,0,0,0
+R2,Exports,2020,0,0,0,0,0,0
+R2,Exports,2025,0,0,0,0,0,0
+R2,Exports,2030,0,0,0,0,0,0
+R2,Exports,2035,0,0,0,0,0,0
+R2,Exports,2040,0,0,0,0,0,0
+R2,Exports,2045,0,0,0,0,0,0
+R2,Exports,2050,0,0,0,0,0,0
+R2,Exports,2055,0,0,0,0,0,0
+R2,Exports,2060,0,0,0,0,0,0
+R2,Exports,2065,0,0,0,0,0,0
+R2,Exports,2070,0,0,0,0,0,0
+R2,Exports,2075,0,0,0,0,0,0
+R2,Exports,2080,0,0,0,0,0,0
+R2,Exports,2085,0,0,0,0,0,0
+R2,Exports,2090,0,0,0,0,0,0
+R2,Exports,2095,0,0,0,0,0,0
 R2,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/input/BaseYearImport.csv b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv
similarity index 96%
rename from docs/tutorial-code/3-add-region/input/BaseYearImport.csv
rename to docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv
index eb064aa9..50d94f1d 100644
--- a/docs/tutorial-code/3-add-region/input/BaseYearImport.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/input/BaseYearImport.csv
@@ -1,40 +1,40 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
-R1,Imports,2010,0,0,0,0,0,0
-R1,Imports,2015,0,0,0,0,0,0
-R1,Imports,2020,0,0,0,0,0,0
-R1,Imports,2025,0,0,0,0,0,0
-R1,Imports,2030,0,0,0,0,0,0
-R1,Imports,2035,0,0,0,0,0,0
-R1,Imports,2040,0,0,0,0,0,0
-R1,Imports,2045,0,0,0,0,0,0
-R1,Imports,2050,0,0,0,0,0,0
-R1,Imports,2055,0,0,0,0,0,0
-R1,Imports,2060,0,0,0,0,0,0
-R1,Imports,2065,0,0,0,0,0,0
-R1,Imports,2070,0,0,0,0,0,0
-R1,Imports,2075,0,0,0,0,0,0
-R1,Imports,2080,0,0,0,0,0,0
-R1,Imports,2085,0,0,0,0,0,0
-R1,Imports,2090,0,0,0,0,0,0
-R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
-R2,Imports,2010,0,0,0,0,0,0
-R2,Imports,2015,0,0,0,0,0,0
-R2,Imports,2020,0,0,0,0,0,0
-R2,Imports,2025,0,0,0,0,0,0
-R2,Imports,2030,0,0,0,0,0,0
-R2,Imports,2035,0,0,0,0,0,0
-R2,Imports,2040,0,0,0,0,0,0
-R2,Imports,2045,0,0,0,0,0,0
-R2,Imports,2050,0,0,0,0,0,0
-R2,Imports,2055,0,0,0,0,0,0
-R2,Imports,2060,0,0,0,0,0,0
-R2,Imports,2065,0,0,0,0,0,0
-R2,Imports,2070,0,0,0,0,0,0
-R2,Imports,2075,0,0,0,0,0,0
-R2,Imports,2080,0,0,0,0,0,0
-R2,Imports,2085,0,0,0,0,0,0
-R2,Imports,2090,0,0,0,0,0,0
-R2,Imports,2095,0,0,0,0,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
+R1,Imports,2010,0,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0,0
+R2,Imports,2010,0,0,0,0,0,0
+R2,Imports,2015,0,0,0,0,0,0
+R2,Imports,2020,0,0,0,0,0,0
+R2,Imports,2025,0,0,0,0,0,0
+R2,Imports,2030,0,0,0,0,0,0
+R2,Imports,2035,0,0,0,0,0,0
+R2,Imports,2040,0,0,0,0,0,0
+R2,Imports,2045,0,0,0,0,0,0
+R2,Imports,2050,0,0,0,0,0,0
+R2,Imports,2055,0,0,0,0,0,0
+R2,Imports,2060,0,0,0,0,0,0
+R2,Imports,2065,0,0,0,0,0,0
+R2,Imports,2070,0,0,0,0,0,0
+R2,Imports,2075,0,0,0,0,0,0
+R2,Imports,2080,0,0,0,0,0,0
+R2,Imports,2085,0,0,0,0,0,0
+R2,Imports,2090,0,0,0,0,0,0
+R2,Imports,2095,0,0,0,0,0,0
 R2,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv b/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv
new file mode 100644
index 00000000..9691db73
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/input/GlobalCommodities.csv
@@ -0,0 +1,7 @@
+Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
+Electricity,Energy,electricity,0.0,1,PJ
+Gas,Energy,gas,56.1,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/3-add-region/input/Projections.csv b/docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv
similarity index 98%
rename from docs/tutorial-code/3-add-region/input/Projections.csv
rename to docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv
index dd25bbad..e9344e61 100644
--- a/docs/tutorial-code/3-add-region/input/Projections.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/input/Projections.csv
@@ -1,40 +1,40 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt
-R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
-R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
-R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
-R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
-R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
-R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
-R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
-R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
-R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
-R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
-R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
-R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
-R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
-R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
-R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
-R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
-R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
-R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
-R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
-R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
-R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
-R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
-R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
-R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
-R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
-R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
-R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
-R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
-R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
-R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
-R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
-R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
-R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
-R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
-R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
-R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
+R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
+R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
+R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
+R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
+R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
+R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
+R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
+R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
+R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
+R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
+R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
+R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
+R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
+R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
+R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
+R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
+R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
+R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
 R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
new file mode 100644
index 00000000..4998e564
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -0,0 +1,132 @@
+time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
+foresight = 5
+regions = ["R1", "R2"]
+interest_rate = 0.1
+interpolation_mode = "Active"
+log_level = "info"
+excluded_commodities = ["wind", "solar"]
+equilibrium_variable = "demand"
+maximum_iterations = 100
+tolerance = 0.1
+tolerance_unmet_demand = -0.1
+
+[[outputs]]
+quantity = "prices"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+
+[[outputs]]
+quantity = "capacity"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
+
+[carbon_budget_control]
+budget = []
+method = "fitting"
+
+[global_input_files]
+projections = "{path}/input/Projections.csv"
+global_commodities = "{path}/input/GlobalCommodities.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
+
+[sectors.residential]
+type = "default"
+priority = 1
+dispatch_production = "share"
+technodata = "{path}/technodata/residential/Technodata.csv"
+commodities_in = "{path}/technodata/residential/CommIn.csv"
+commodities_out = "{path}/technodata/residential/CommOut.csv"
+
+[[sectors.residential.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+sink = "csv"
+overwrite = true
+
+[sectors.residential.outputs.quantity]
+name = "supply"
+sum_over = "timeslice"
+drop = ["comm_usage", "units_prices"]
+
+[[sectors.residential.interactions]]
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.residential.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
+lpsolver = "scipy"
+constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
+demand_share = "new_and_retro"
+forecast = 5
+
+[sectors.power]
+type = "default"
+priority = 2
+dispatch_production = "share"
+technodata = "{path}/technodata/power/Technodata.csv"
+commodities_in = "{path}/technodata/power/CommIn.csv"
+commodities_out = "{path}/technodata/power/CommOut.csv"
+
+[[sectors.power.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
+
+[[sectors.power.interactions]]
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.power.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
+lpsolver = "scipy"
+
+[sectors.gas]
+type = "default"
+priority = 3
+dispatch_production = "share"
+technodata = "{path}/technodata/gas/Technodata.csv"
+commodities_in = "{path}/technodata/gas/CommIn.csv"
+commodities_out = "{path}/technodata/gas/CommOut.csv"
+
+[[sectors.gas.outputs]]
+filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+quantity = "capacity"
+sink = "csv"
+overwrite = true
+index = false
+
+[[sectors.gas.interactions]]
+net = "new_to_retro"
+interaction = "transfer"
+
+[sectors.gas.subsectors.retro_and_new]
+agents = "{path}/technodata/Agents.csv"
+existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
+lpsolver = "scipy"
+
+[sectors.residential_presets]
+type = "presets"
+priority = 0
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
new file mode 100644
index 00000000..5074779a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
@@ -0,0 +1,5 @@
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommIn.csv
similarity index 98%
rename from docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommIn.csv
index 913d062f..0e85ade1 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,0,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,0,0,0,0
 gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv
similarity index 98%
rename from docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv
index bb45c4b4..cc721c76 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,1,0,0,0
 gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/ExistingCapacity.csv
similarity index 98%
rename from docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/gas/ExistingCapacity.csv
index 8142f5e5..3cd9976f 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
-gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
 gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
similarity index 73%
rename from docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
index f7d15839..a10e7473 100644
--- a/docs/tutorial-code/3-add-region/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/3-add-region/technodata/power/CommIn.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv
similarity index 97%
rename from docs/tutorial-code/3-add-region/technodata/power/CommIn.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv
index b5ca96ca..7e636149 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommIn.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
-gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
-windturbine,R1,2020,fixed,0,0,0,0,1,0
-windturbine,R1,2040,fixed,0,0,0,0,1,0
-solarPV,R1,2020,fixed,0,0,0,0,0,1
-solarPV,R1,2040,fixed,0,0,0,0,0,1
-gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0
-gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
-windturbine,R2,2020,fixed,0,0,0,0,1,0
-windturbine,R2,2040,fixed,0,0,0,0,1,0
-solarPV,R2,2020,fixed,0,0,0,0,0,1
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1,0
+windturbine,R1,2040,fixed,0,0,0,0,1,0
+solarPV,R1,2020,fixed,0,0,0,0,0,1
+solarPV,R1,2040,fixed,0,0,0,0,0,1
+gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
+windturbine,R2,2020,fixed,0,0,0,0,1,0
+windturbine,R2,2040,fixed,0,0,0,0,1,0
+solarPV,R2,2020,fixed,0,0,0,0,0,1
 solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/3-add-region/technodata/power/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv
similarity index 97%
rename from docs/tutorial-code/3-add-region/technodata/power/CommOut.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv
index 7edb7454..b0b03543 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
-gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
-windturbine,R2,2020,fixed,1,0,0,0,0,0
-windturbine,R2,2040,fixed,1,0,0,0,0,0
-solarPV,R2,2020,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
+windturbine,R1,2020,fixed,1,0,0,0,0,0
+windturbine,R1,2040,fixed,1,0,0,0,0,0
+solarPV,R1,2020,fixed,1,0,0,0,0,0
+solarPV,R1,2040,fixed,1,0,0,0,0,0
+gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
+windturbine,R2,2020,fixed,1,0,0,0,0,0
+windturbine,R2,2040,fixed,1,0,0,0,0,0
+solarPV,R2,2020,fixed,1,0,0,0,0,0
 solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv
similarity index 97%
rename from docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv
index 15edcaec..073ccdd5 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/ExistingCapacity.csv
@@ -1,7 +1,7 @@
-ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
-gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
-windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
-gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
-windturbine,R2,PJ/y,0,0,0,0,0,0,0
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
+windturbine,R1,PJ/y,0,0,0,0,0,0,0
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
+gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
+windturbine,R2,PJ/y,0,0,0,0,0,0,0
 solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
similarity index 51%
rename from docs/tutorial-code/3-add-region/technodata/power/Technodata.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
index 53c509d2..df1bc687 100644
--- a/docs/tutorial-code/3-add-region/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
new file mode 100644
index 00000000..7e461e3f
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
@@ -0,0 +1,13 @@
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+0,R1,gasboiler,1,0,0,1.0,0,0
+1,R1,gasboiler,2,0,0,1.5,0,0
+2,R1,gasboiler,3,0,0,1.0,0,0
+3,R1,gasboiler,4,0,0,1.5,0,0
+4,R1,gasboiler,5,0,0,3.0,0,0
+5,R1,gasboiler,6,0,0,2.0,0,0
+0,R2,gasboiler,1,0,0,1.0,0,0
+1,R2,gasboiler,2,0,0,1.5,0,0
+2,R2,gasboiler,3,0,0,1.0,0,0
+3,R2,gasboiler,4,0,0,1.5,0,0
+4,R2,gasboiler,5,0,0,3.0,0,0
+5,R2,gasboiler,6,0,0,2.0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
new file mode 100644
index 00000000..ada625fa
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
@@ -0,0 +1,13 @@
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+0,R1,gasboiler,1,0,0,3.0,0,0
+1,R1,gasboiler,2,0,0,4.5,0,0
+2,R1,gasboiler,3,0,0,3.0,0,0
+3,R1,gasboiler,4,0,0,4.5,0,0
+4,R1,gasboiler,5,0,0,9.0,0,0
+5,R1,gasboiler,6,0,0,6.0,0,0
+0,R2,gasboiler,1,0,0,3.0,0,0
+1,R2,gasboiler,2,0,0,4.5,0,0
+2,R2,gasboiler,3,0,0,3.0,0,0
+3,R2,gasboiler,4,0,0,4.5,0,0
+4,R2,gasboiler,5,0,0,9.0,0,0
+5,R2,gasboiler,6,0,0,6.0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv
similarity index 98%
rename from docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv
index 50e0921c..d55fd41f 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,1.16,0,0,0
-heatpump,R1,2020,fixed,0.4,0,0,0,0
-gasboiler,R2,2020,fixed,0,1.16,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,1.16,0,0,0
+heatpump,R1,2020,fixed,0.4,0,0,0,0
+gasboiler,R2,2020,fixed,0,1.16,0,0,0
 heatpump,R2,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv
similarity index 98%
rename from docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv
index 4fac2bf4..f4ae2886 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
-gasboiler,R2,2020,fixed,0,0,1,64.71,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,0,1,64.71,0
+heatpump,R1,2020,fixed,0,0,1,0,0
+gasboiler,R2,2020,fixed,0,0,1,64.71,0
 heatpump,R2,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/ExistingCapacity.csv
similarity index 97%
rename from docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv
rename to docs/tutorial-code/3-add-region/1-new-region/technodata/residential/ExistingCapacity.csv
index 9c70c6f0..90cd566a 100644
--- a/docs/tutorial-code/3-add-region/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/ExistingCapacity.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
-gasboiler,R1,PJ/y,10,5,0,0,0,0,0
-heatpump,R1,PJ/y,0,0,0,0,0,0,0
-gasboiler,R2,PJ/y,10,5,0,0,0,0,0
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasboiler,R1,PJ/y,10,5,0,0,0,0,0
+heatpump,R1,PJ/y,0,0,0,0,0,0,0
+gasboiler,R2,PJ/y,10,5,0,0,0,0,0
 heatpump,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
new file mode 100644
index 00000000..889cba24
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
@@ -0,0 +1,6 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/3-add-region/Results/MCACapacity.csv b/docs/tutorial-code/3-add-region/Results/MCACapacity.csv
deleted file mode 100644
index 989ef0ff..00000000
--- a/docs/tutorial-code/3-add-region/Results/MCACapacity.csv
+++ /dev/null
@@ -1,151 +0,0 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-9,A1,5.00000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2020
-16,A2,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-23,A2,5.00000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-14,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-3,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2020
-2,A1,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,9.50000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-16,A1,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2025
-21,A1,9.50000000000,R2,16,2020,R2,residential,heatpump,retrofit,2025
-30,A2,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-35,A2,9.50000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-44,A2,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2025
-49,A2,9.50000000000,R2,16,2020,R2,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,6.75000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,10.00000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-33,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2025
-43,A1,6.75000000000,R2,22,2020,R2,power,solarPV,retrofit,2025
-56,A1,10.00000000000,R2,44,2020,R2,power,windturbine,retrofit,2025
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-8,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2025
-2,A1,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,9.50000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,4.40000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-18,A1,1.10000000000,R2,0,2025,R2,residential,gasboiler,retrofit,2030
-22,A1,9.50000000000,R2,8,2020,R2,residential,heatpump,retrofit,2030
-23,A1,4.40000000000,R2,9,2025,R2,residential,heatpump,retrofit,2030
-34,A2,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-38,A2,9.50000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-39,A2,4.40000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-50,A2,1.10000000000,R2,0,2025,R2,residential,gasboiler,retrofit,2030
-54,A2,9.50000000000,R2,8,2020,R2,residential,heatpump,retrofit,2030
-55,A2,4.40000000000,R2,9,2025,R2,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,6.75000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,4.30000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,10.00000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-36,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2030
-47,A1,6.75000000000,R2,12,2020,R2,power,solarPV,retrofit,2030
-48,A1,4.30000000000,R2,13,2025,R2,power,solarPV,retrofit,2030
-67,A1,10.00000000000,R2,48,2020,R2,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,0.34560000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-14,A1,7.50000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2030
-15,A1,0.34560000000,R2,1,2025,R2,gas,gassupply1,retrofit,2030
-2,A1,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-4,A1,4.40000000000,R1,7,2025,R1,residential,heatpump,retrofit,2035
-5,A1,12.50000000000,R1,8,2030,R1,residential,heatpump,retrofit,2035
-16,A1,1.10000000000,R2,0,2025,R2,residential,gasboiler,retrofit,2035
-18,A1,4.40000000000,R2,7,2025,R2,residential,heatpump,retrofit,2035
-19,A1,12.50000000000,R2,8,2030,R2,residential,heatpump,retrofit,2035
-30,A2,1.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-32,A2,4.40000000000,R1,7,2025,R1,residential,heatpump,retrofit,2035
-33,A2,12.50000000000,R1,8,2030,R1,residential,heatpump,retrofit,2035
-44,A2,1.10000000000,R2,0,2025,R2,residential,gasboiler,retrofit,2035
-46,A2,4.40000000000,R2,7,2025,R2,residential,heatpump,retrofit,2035
-47,A2,12.50000000000,R2,8,2030,R2,residential,heatpump,retrofit,2035
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-10,A1,6.75000000000,R1,11,2020,R1,power,solarPV,retrofit,2035
-11,A1,4.30000000000,R1,12,2025,R1,power,solarPV,retrofit,2035
-12,A1,6.00000000000,R1,13,2030,R1,power,solarPV,retrofit,2035
-37,A1,10.00000000000,R1,55,2020,R1,power,windturbine,retrofit,2035
-41,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2035
-51,A1,6.75000000000,R2,11,2020,R2,power,solarPV,retrofit,2035
-52,A1,4.30000000000,R2,12,2025,R2,power,solarPV,retrofit,2035
-53,A1,6.00000000000,R2,13,2030,R2,power,solarPV,retrofit,2035
-78,A1,10.00000000000,R2,55,2020,R2,power,windturbine,retrofit,2035
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
-12,A1,0.34560000000,R2,0,2025,R2,gas,gassupply1,retrofit,2035
-13,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2035
-2,A1,12.50000000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-3,A1,8.50000000000,R1,1,2035,R1,residential,heatpump,retrofit,2040
-14,A1,12.50000000000,R2,0,2030,R2,residential,heatpump,retrofit,2040
-15,A1,8.50000000000,R2,1,2035,R2,residential,heatpump,retrofit,2040
-26,A2,12.50000000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-27,A2,8.50000000000,R1,1,2035,R1,residential,heatpump,retrofit,2040
-38,A2,12.50000000000,R2,0,2030,R2,residential,heatpump,retrofit,2040
-39,A2,8.50000000000,R2,1,2035,R2,residential,heatpump,retrofit,2040
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-9,A1,6.75000000000,R1,12,2020,R1,power,solarPV,retrofit,2040
-10,A1,4.30000000000,R1,13,2025,R1,power,solarPV,retrofit,2040
-11,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2040
-12,A1,8.20000000000,R1,15,2035,R1,power,solarPV,retrofit,2040
-43,A1,10.00000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
-46,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2040
-55,A1,6.75000000000,R2,12,2020,R2,power,solarPV,retrofit,2040
-56,A1,4.30000000000,R2,13,2025,R2,power,solarPV,retrofit,2040
-57,A1,6.00000000000,R2,14,2030,R2,power,solarPV,retrofit,2040
-58,A1,8.20000000000,R2,15,2035,R2,power,solarPV,retrofit,2040
-89,A1,10.00000000000,R2,72,2020,R2,power,windturbine,retrofit,2040
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
-10,A1,0.34560000000,R2,0,2025,R2,gas,gassupply1,retrofit,2040
-11,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2040
-2,A1,8.50000000000,R1,0,2035,R1,residential,heatpump,retrofit,2045
-3,A1,15.50000000000,R1,1,2040,R1,residential,heatpump,retrofit,2045
-14,A1,8.50000000000,R2,0,2035,R2,residential,heatpump,retrofit,2045
-15,A1,15.50000000000,R2,1,2040,R2,residential,heatpump,retrofit,2045
-26,A2,8.50000000000,R1,0,2035,R1,residential,heatpump,retrofit,2045
-27,A2,15.50000000000,R1,1,2040,R1,residential,heatpump,retrofit,2045
-38,A2,8.50000000000,R2,0,2035,R2,residential,heatpump,retrofit,2045
-39,A2,15.50000000000,R2,1,2040,R2,residential,heatpump,retrofit,2045
-2,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-10,A1,6.75000000000,R1,13,2020,R1,power,solarPV,retrofit,2045
-11,A1,4.30000000000,R1,14,2025,R1,power,solarPV,retrofit,2045
-12,A1,6.00000000000,R1,15,2030,R1,power,solarPV,retrofit,2045
-13,A1,8.20000000000,R1,16,2035,R1,power,solarPV,retrofit,2045
-14,A1,6.00000000000,R1,17,2040,R1,power,solarPV,retrofit,2045
-50,A1,10.00000000000,R1,91,2020,R1,power,windturbine,retrofit,2045
-64,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2045
-72,A1,6.75000000000,R2,13,2020,R2,power,solarPV,retrofit,2045
-73,A1,4.30000000000,R2,14,2025,R2,power,solarPV,retrofit,2045
-74,A1,6.00000000000,R2,15,2030,R2,power,solarPV,retrofit,2045
-75,A1,8.20000000000,R2,16,2035,R2,power,solarPV,retrofit,2045
-76,A1,6.00000000000,R2,17,2040,R2,power,solarPV,retrofit,2045
-112,A1,10.00000000000,R2,91,2020,R2,power,windturbine,retrofit,2045
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
-8,A1,0.34560000000,R2,0,2025,R2,gas,gassupply1,retrofit,2045
-9,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2045
-0,A1,15.50000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-1,A1,11.50000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-10,A1,15.50000000000,R2,0,2040,R2,residential,heatpump,retrofit,2050
-11,A1,11.50000000000,R2,1,2045,R2,residential,heatpump,retrofit,2050
-20,A2,15.50000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-21,A2,11.50000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-30,A2,15.50000000000,R2,0,2040,R2,residential,heatpump,retrofit,2050
-31,A2,11.50000000000,R2,1,2045,R2,residential,heatpump,retrofit,2050
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-6,A1,4.30000000000,R1,13,2025,R1,power,solarPV,retrofit,2050
-7,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2050
-8,A1,8.20000000000,R1,15,2035,R1,power,solarPV,retrofit,2050
-9,A1,6.00000000000,R1,16,2040,R1,power,solarPV,retrofit,2050
-10,A1,16.00000000000,R1,17,2045,R1,power,solarPV,retrofit,2050
-46,A1,6.75000000000,R1,91,2045,R1,power,windturbine,retrofit,2050
-56,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2050
-62,A1,4.30000000000,R2,13,2025,R2,power,solarPV,retrofit,2050
-63,A1,6.00000000000,R2,14,2030,R2,power,solarPV,retrofit,2050
-64,A1,8.20000000000,R2,15,2035,R2,power,solarPV,retrofit,2050
-65,A1,6.00000000000,R2,16,2040,R2,power,solarPV,retrofit,2050
-66,A1,16.00000000000,R2,17,2045,R2,power,solarPV,retrofit,2050
-102,A1,6.75000000000,R2,91,2045,R2,power,windturbine,retrofit,2050
-0,A1,0.34560000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
-8,A1,0.34560000000,R2,0,2025,R2,gas,gassupply1,retrofit,2050
-9,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2050
diff --git a/docs/tutorial-code/3-add-region/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/3-add-region/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index 41cef8fc..00000000
--- a/docs/tutorial-code/3-add-region/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,745 +0,0 @@
-,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,0.58000000000,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,0.87000000000,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,0.58000000000,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,0.87000000000,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,1.74000000000,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,1.16000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R2,9,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-12,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-13,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-14,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-15,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R2,9,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.58000000000,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.87000000000,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,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.21111111111,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.24166666667,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.31666666667,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.16111111111,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.21111111111,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.24166666667,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.31666666667,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.48333333333,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,0.63333333333,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.32222222222,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.42222222222,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,20,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,36,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,52,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R2,65,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R2,68,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,20,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16111111111,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,36,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24166666667,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,52,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R2,65,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R2,68,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R2,84,2020.00000000000,R2,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08350000000,R2,1,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,9,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,13,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12525000000,R2,26,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08350000000,R2,51,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,59,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,63,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12525000000,R2,76,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,84,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,88,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,101,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16700000000,R2,126,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R2,134,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R2,138,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,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.07088888889,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.09777777778,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.31666666667,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.10633333333,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.14666666667,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.21111111111,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.07088888889,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.09777777778,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.31666666667,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.10633333333,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.14666666667,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,0.63333333333,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.21266666667,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.29333333333,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.42222222222,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.14177777778,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.19555555556,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,5,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,8,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,16,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,21,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,24,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,32,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,37,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,40,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,48,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,53,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,56,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R2,69,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R2,72,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R2,80,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R2,85,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R2,88,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-38,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-40,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-41,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-44,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-45,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-46,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-47,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-53,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,5,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-56,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,8,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,16,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,21,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-59,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,24,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21111111111,R2,32,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,37,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,40,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.31666666667,R2,48,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,53,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-65,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,56,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R2,69,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-68,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R2,72,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R2,80,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R2,85,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R2,88,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.45000000000,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.66666666667,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.28666666667,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.30000000000,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.44444444444,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.19111111111,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,29,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,33,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,36,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,44,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,54,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,58,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,61,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,69,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,79,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,83,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,86,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,94,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R2,104,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R2,108,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,111,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R2,119,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R2,129,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R2,133,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R2,136,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R2,144,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,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.09777777778,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.27777777778,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.10633333333,R1,17,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.14666666667,R1,20,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.41666666667,R1,24,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.07088888889,R1,33,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.09777777778,R1,36,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.27777777778,R1,40,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.10633333333,R1,49,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.14666666667,R1,52,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.41666666667,R1,56,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.21266666667,R1,65,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.29333333333,R1,68,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,0.83333333333,R1,72,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.14177777778,R1,81,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.19555555556,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,1,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,4,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,8,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,17,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,20,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,33,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,36,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,40,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,49,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,52,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,56,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R2,65,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R2,68,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R2,72,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R2,81,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R2,84,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R2,88,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-38,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,17,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-40,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,20,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-41,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R1,33,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R1,36,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-44,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,40,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-45,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R1,49,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-46,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R1,52,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-47,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,56,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R1,65,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-53,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,1,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,4,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-56,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,8,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,17,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,20,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-59,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07088888889,R2,33,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09777777778,R2,36,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,40,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10633333333,R2,49,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14666666667,R2,52,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-65,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,56,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.21266666667,R2,65,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29333333333,R2,68,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-68,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R2,72,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14177777778,R2,81,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19555555556,R2,84,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R2,88,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,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.22222222222,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.09555555556,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.22500000000,R1,34,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.33333333333,R1,38,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,41,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.14333333333,R1,49,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,54,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.15000000000,R1,64,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.22222222222,R1,68,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,71,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.09555555556,R1,79,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,84,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.22500000000,R1,94,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.33333333333,R1,98,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,101,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.14333333333,R1,109,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,114,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.45000000000,R1,124,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.66666666667,R1,128,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,131,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.28666666667,R1,139,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,144,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.30000000000,R1,154,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.44444444444,R1,158,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,161,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.19111111111,R1,169,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,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,41,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,49,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,54,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,64,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,68,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,71,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,79,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,84,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,101,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,109,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,114,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R2,124,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R2,128,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,131,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R2,139,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R2,144,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R2,174,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,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,electricity,0.18888888889,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,28,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,0,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,4,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,12,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,16,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,28,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,36,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,40,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R2,52,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R2,60,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R2,64,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,28,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,0,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,4,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,12,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,16,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27777777778,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,28,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41666666667,R2,36,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,40,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R2,52,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R2,60,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R2,64,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,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.22222222222,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.25050000000,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.09555555556,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.13333333333,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,solar,0.18222222222,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,124,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R2,29,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,39,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,43,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,46,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,54,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,59,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R2,64,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,74,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,78,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,81,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,89,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,94,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R2,99,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,116,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,124,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,129,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R2,134,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R2,144,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R2,148,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,151,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R2,159,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R2,164,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R2,169,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R2,179,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R2,183,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R2,186,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R2,194,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R2,199,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R2,204,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,0,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,12,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,48,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,60,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,64,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,0,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,4,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,12,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,16,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,24,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,28,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,36,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,40,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R2,48,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R2,52,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R2,60,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R2,64,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,0,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,12,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R1,48,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R1,60,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,64,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,0,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,4,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,12,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,16,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18888888889,R2,24,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,28,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.28333333333,R2,36,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,40,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.56666666667,R2,48,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R2,52,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37777777778,R2,60,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R2,64,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,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.22222222222,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.25050000000,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.09555555556,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.13333333333,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,solar,0.18222222222,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R1,139,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R1,143,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,154,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,164,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R1,209,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R1,259,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R2,29,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,34,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,49,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,53,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,56,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,64,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,69,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R2,74,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,79,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15000000000,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22222222222,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,101,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,109,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,114,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R2,119,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,124,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22500000000,R2,139,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33333333333,R2,143,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,146,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,154,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,159,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R2,164,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,169,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.45000000000,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66666666667,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,191,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R2,199,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R2,204,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R2,209,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R2,214,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.30000000000,R2,229,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44444444444,R2,233,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R2,236,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R2,244,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R2,249,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R2,254,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R2,259,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,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.25555555556,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,0.51666666667,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.38333333333,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.34444444444,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.25555555556,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,0.51666666667,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.38333333333,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,1.03333333333,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,0.76666666667,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,0.68888888889,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,0.51111111111,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,0,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R2,4,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,12,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R2,16,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,24,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R2,28,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,36,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R2,40,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R2,48,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R2,52,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R2,60,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R2,64,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,0,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R2,4,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,12,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R2,16,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.34444444444,R2,24,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25555555556,R2,28,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51666666667,R2,36,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38333333333,R2,40,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R2,48,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R2,52,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R2,60,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R2,64,2045.00000000000,R2,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.09555555556,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,solar,0.18222222222,R1,19,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35555555556,R1,29,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,49,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,59,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.53333333333,R1,69,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35555555556,R1,109,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R1,139,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.53333333333,R1,149,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R1,179,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,1.06666666667,R1,189,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R1,209,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R1,219,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.71111111111,R1,229,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30000000000,R1,233,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,1,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,9,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,14,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R2,19,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,24,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35555555556,R2,29,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R2,33,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,41,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,49,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,54,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R2,59,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,64,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.53333333333,R2,69,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R2,73,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R2,81,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09555555556,R2,89,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,94,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18222222222,R2,99,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R2,104,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.35555555556,R2,109,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R2,113,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R2,121,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14333333333,R2,129,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,134,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27333333333,R2,139,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R2,144,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.53333333333,R2,149,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R2,153,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28666666667,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R2,174,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54666666667,R2,179,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R2,184,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,1.06666666667,R2,189,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.45000000000,R2,193,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R2,201,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19111111111,R2,209,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R2,214,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36444444444,R2,219,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R2,224,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.71111111111,R2,229,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30000000000,R2,233,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/3-add-region/Results/MCAMetric_Supply.csv b/docs/tutorial-code/3-add-region/Results/MCAMetric_Supply.csv
deleted file mode 100644
index b6b06f4c..00000000
--- a/docs/tutorial-code/3-add-region/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,1057 +0,0 @@
-,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,0.50000000000,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,32.35500000000,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,0.75000000000,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,48.53250000000,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,0.50000000000,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,32.35500000000,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,0.75000000000,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,48.53250000000,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,1.50000000000,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,97.06500000000,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,1.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,64.71000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,4,2020.00000000000,R2,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,6,2020.00000000000,R2,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2020.00000000000,R2,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2020.00000000000,R2,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2020.00000000000,R2,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2020.00000000000,R2,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2020.00000000000,R2,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2020.00000000000,R2,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2020.00000000000,R2,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-25,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-29,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-31,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-35,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,4,2020.00000000000,R2,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-37,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,6,2020.00000000000,R2,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2020.00000000000,R2,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2020.00000000000,R2,residential,0.50000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-41,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2020.00000000000,R2,residential,32.35500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.75000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-43,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2020.00000000000,R2,residential,48.53250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-45,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2020.00000000000,R2,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2020.00000000000,R2,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-47,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2020.00000000000,R2,residential,64.71000000000,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
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,1.16000000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2020.00000000000,R2,gas,1.74000000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,1.16000000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,1.74000000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,3.48000000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2020.00000000000,R2,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.13888888889,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,0.52777777778,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,8.98750000000,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.20833333333,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,0.79166666667,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,13.48125000000,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.13888888889,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,0.52777777778,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,8.98750000000,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.20833333333,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,0.79166666667,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,13.48125000000,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.41666666667,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,1.58333333333,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,26.96250000000,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.27777777778,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,1.05555555556,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,17.97500000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2020.00000000000,R2,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2020.00000000000,R2,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2020.00000000000,R2,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2020.00000000000,R2,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2020.00000000000,R2,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2020.00000000000,R2,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-40,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-41,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-45,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-46,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-47,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-53,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-59,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2020.00000000000,R2,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.13888888889,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2020.00000000000,R2,residential,8.98750000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.20833333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-65,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,residential,13.48125000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2020.00000000000,R2,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2020.00000000000,R2,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2020.00000000000,R2,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-71,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2020.00000000000,R2,residential,17.97500000000,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.15000000000,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.22222222222,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.22500000000,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.33333333333,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.45000000000,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.66666666667,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.30000000000,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.44444444444,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
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.05000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,10,2020.00000000000,R2,power,4.58350000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.07500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2020.00000000000,R2,power,6.87525000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.05000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,power,4.58350000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.07500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,85,2020.00000000000,R2,power,6.87525000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2020.00000000000,R2,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2020.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.10000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2020.00000000000,R2,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2020.00000000000,R2,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
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.40572222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.60858333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,0.40572222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.60858333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2020.00000000000,R2,gas,1.21716666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2020.00000000000,R2,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,0.52777777778,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.06111111111,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.24444444444,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,3.95450000000,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,0.79166666667,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.09166666667,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.36666666667,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,5.93175000000,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,0.52777777778,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.06111111111,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.24444444444,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,3.95450000000,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,0.79166666667,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.09166666667,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.36666666667,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,5.93175000000,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,1.58333333333,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.18333333333,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,0.73333333333,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,11.86350000000,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,1.05555555556,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.12222222222,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.48888888889,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,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,13,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,29,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-35,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-39,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,61,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2025.00000000000,R2,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2025.00000000000,R2,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2025.00000000000,R2,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-47,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2025.00000000000,R2,residential,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-54,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-58,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-71,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-75,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,13,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,29,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.52777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-83,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.79166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-87,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,61,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2025.00000000000,R2,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2025.00000000000,R2,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2025.00000000000,R2,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-95,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2025.00000000000,R2,residential,7.90900000000,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.15000000000,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.22222222222,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.09555555556,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.22500000000,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.33333333333,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.14333333333,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.45000000000,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.66666666667,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.28666666667,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.30000000000,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.44444444444,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.19111111111,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
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,28,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,37,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,53,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,78,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-49,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,87,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,103,2025.00000000000,R2,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,112,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2025.00000000000,R2,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,128,2025.00000000000,R2,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2025.00000000000,R2,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.01727777778,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.02591666667,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.01727777778,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.02591666667,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.05183333333,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.03455555556,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2025.00000000000,R2,gas,0.01727777778,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.02591666667,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2025.00000000000,R2,gas,0.01727777778,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2020.00000000000,R2,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.02591666667,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,1.12500000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2025.00000000000,R2,gas,0.05183333333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2020.00000000000,R2,gas,0.75000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2025.00000000000,R2,gas,0.03455555556,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2025.00000000000,R1,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2025.00000000000,R1,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2025.00000000000,R1,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2025.00000000000,R1,residential,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2025.00000000000,R2,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2030.00000000000,R2,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2025.00000000000,R2,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2025.00000000000,R2,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2030.00000000000,R2,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2025.00000000000,R2,residential,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-54,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-55,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2025.00000000000,R1,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-58,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-59,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2025.00000000000,R1,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2025.00000000000,R1,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2025.00000000000,R1,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-67,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2025.00000000000,R1,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2025.00000000000,R1,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-71,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2025.00000000000,R1,residential,7.90900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-79,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2025.00000000000,R2,residential,0.06111111111,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.24444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-83,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,residential,3.95450000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2025.00000000000,R2,residential,0.09166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.36666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2025.00000000000,R2,residential,5.93175000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2025.00000000000,R2,residential,0.18333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.73333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2030.00000000000,R2,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-91,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2025.00000000000,R2,residential,11.86350000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2025.00000000000,R2,residential,0.12222222222,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.48888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2030.00000000000,R2,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2025.00000000000,R2,residential,7.90900000000,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.15000000000,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.22222222222,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.09555555556,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,14,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,30,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,30,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,31,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,32,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,33,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,34,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,60,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,61,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,62,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,63,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,64,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-53,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,74,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2025.00000000000,R2,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2030.00000000000,R2,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,134,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2025.00000000000,R2,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2025.00000000000,R2,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2030.00000000000,R2,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2025.00000000000,R2,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.01727777778,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.02591666667,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.01727777778,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.02591666667,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.05183333333,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.03455555556,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
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.01727777778,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.02591666667,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.01727777778,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.02591666667,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.05183333333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,1.12500000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.03455555556,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.75000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2030.00000000000,R2,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2035.00000000000,R2,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2030.00000000000,R2,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2035.00000000000,R2,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2030.00000000000,R1,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2030.00000000000,R2,residential,0.69444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,1.04166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2030.00000000000,R2,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2035.00000000000,R2,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2030.00000000000,R2,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2035.00000000000,R2,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15000000000,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.22222222222,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.15000000000,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.09555555556,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.13333333333,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.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2035.00000000000,R1,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2035.00000000000,R1,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2035.00000000000,R2,power,0.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,35,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,36,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,37,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,38,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,39,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2035.00000000000,R2,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,70,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,71,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,72,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,73,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,74,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2035.00000000000,R2,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,86,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,105,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,106,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,107,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,108,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,109,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,110,2035.00000000000,R2,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,121,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2020.00000000000,R2,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2020.00000000000,R2,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,142,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,143,2025.00000000000,R2,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,144,2030.00000000000,R2,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,145,2035.00000000000,R2,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-76,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,156,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2025.00000000000,R2,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,178,2025.00000000000,R2,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,179,2030.00000000000,R2,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2035.00000000000,R2,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2025.00000000000,R2,power,27.50100000000,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.03309963178,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.71840036822,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.02206642119,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.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.01103321059,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.23946678941,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.01654981589,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.35920018411,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.01103321059,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.23946678941,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.01654981589,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.35920018411,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.03309963178,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.71840036822,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.02206642119,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2035.00000000000,R2,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2040.00000000000,R2,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2035.00000000000,R2,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2040.00000000000,R2,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2035.00000000000,R1,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2035.00000000000,R1,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2035.00000000000,R1,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2035.00000000000,R2,residential,0.47222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2035.00000000000,R2,residential,0.70833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2035.00000000000,R2,residential,1.41666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2040.00000000000,R2,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2035.00000000000,R2,residential,0.94444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2040.00000000000,R2,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15000000000,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.22222222222,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.15000000000,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.09555555556,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.13333333333,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.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2035.00000000000,R1,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2020.00000000000,R1,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2035.00000000000,R1,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2035.00000000000,R1,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,245,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2035.00000000000,R2,power,0.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2040.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,20,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,47,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,48,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,49,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2035.00000000000,R2,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2040.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-63,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.15000000000,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,95,2035.00000000000,R2,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,96,2040.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,135,2020.00000000000,R2,power,0.22500000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,136,2020.00000000000,R2,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,137,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,138,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,139,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2035.00000000000,R2,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2040.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,155,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.45000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2025.00000000000,R2,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2030.00000000000,R2,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,185,2035.00000000000,R2,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,186,2040.00000000000,R2,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-87,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,200,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,225,2020.00000000000,R2,power,0.30000000000,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,226,2020.00000000000,R2,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,227,2025.00000000000,R2,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,228,2025.00000000000,R2,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,229,2030.00000000000,R2,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,230,2035.00000000000,R2,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,231,2040.00000000000,R2,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,245,2025.00000000000,R2,power,27.50100000000,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.03309963178,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.71840036822,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.02206642119,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.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.01103321059,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.23946678941,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.01654981589,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.35920018411,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.01103321059,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.23946678941,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.01654981589,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.35920018411,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.03309963178,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.71840036822,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.02206642119,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.47893357881,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,0.86111111111,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,0.63888888889,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,1.29166666667,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,0.95833333333,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,0.86111111111,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,0.63888888889,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,1.29166666667,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,0.95833333333,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,2.58333333333,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,1.91666666667,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,1.72222222222,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,1.27777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2045.00000000000,R2,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2045.00000000000,R2,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2045.00000000000,R2,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2045.00000000000,R2,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2040.00000000000,R2,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2045.00000000000,R2,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2040.00000000000,R2,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2045.00000000000,R2,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-25,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-27,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-29,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-31,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2045.00000000000,R2,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2045.00000000000,R2,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2040.00000000000,R2,residential,0.86111111111,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2045.00000000000,R2,residential,0.63888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2040.00000000000,R2,residential,1.29166666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2045.00000000000,R2,residential,0.95833333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2040.00000000000,R2,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2045.00000000000,R2,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2040.00000000000,R2,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2045.00000000000,R2,residential,1.27777777778,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.09555555556,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.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2045.00000000000,R1,power,0.35555555556,solarPV,"('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.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2045.00000000000,R1,power,0.53333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2045.00000000000,R1,power,0.35555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2045.00000000000,R1,power,0.53333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2025.00000000000,R1,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2035.00000000000,R1,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2045.00000000000,R1,power,1.06666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2025.00000000000,R1,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2035.00000000000,R1,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2045.00000000000,R1,power,0.71111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,216,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2035.00000000000,R2,power,0.18222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2040.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2045.00000000000,R2,power,0.35555555556,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2045.00000000000,R2,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,41,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,42,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,43,2035.00000000000,R2,power,0.27333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,44,2040.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2045.00000000000,R2,power,0.53333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2045.00000000000,R2,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,56,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,80,2025.00000000000,R2,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,81,2025.00000000000,R2,power,0.09555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,82,2030.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,83,2035.00000000000,R2,power,0.18222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,84,2040.00000000000,R2,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,85,2045.00000000000,R2,power,0.35555555556,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,86,2045.00000000000,R2,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-71,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,96,2025.00000000000,R2,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2025.00000000000,R2,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2025.00000000000,R2,power,0.14333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2030.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2035.00000000000,R2,power,0.27333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2040.00000000000,R2,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2045.00000000000,R2,power,0.53333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2045.00000000000,R2,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-79,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,136,2025.00000000000,R2,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,160,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,161,2025.00000000000,R2,power,0.28666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,162,2030.00000000000,R2,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,163,2035.00000000000,R2,power,0.54666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,164,2040.00000000000,R2,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,165,2045.00000000000,R2,power,1.06666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,166,2045.00000000000,R2,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-87,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,176,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,200,2025.00000000000,R2,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,201,2025.00000000000,R2,power,0.19111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,202,2030.00000000000,R2,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,203,2035.00000000000,R2,power,0.36444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,204,2040.00000000000,R2,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,205,2045.00000000000,R2,power,0.71111111111,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,206,2045.00000000000,R2,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-95,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,216,2025.00000000000,R2,power,27.50100000000,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.01103321059,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.23946678941,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.01654981589,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.35920018411,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.03309963178,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.71840036822,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.02206642119,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.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.01103321059,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.23946678941,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.01654981589,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.35920018411,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.01103321059,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.23946678941,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.01654981589,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.35920018411,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.03309963178,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.71840036822,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.02206642119,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.47893357881,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/3-add-region/generate_model.py b/docs/tutorial-code/3-add-region/generate_model.py
deleted file mode 100644
index a25c8e4c..00000000
--- a/docs/tutorial-code/3-add-region/generate_model.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# starting point: unclear?
-
-"""
-ADD A NEW REGION
-
-region_name: R2
-
-copy_from: R1
-
-"""
-
-# File: settings.toml
-# Append {region_name} to regions
-
-# For every sector
-# File: technodata/{sector}/technodata.csv
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> For sector 'power': MaxCapacityAddition for {windturbine,R2} changed to 5
-# >>> For sector 'power': MaxCapacityGrowth for {windturbine,R2} changed to 0.05
-# >>> For sector 'power': TotalCapacityLimit for {windturbine,R2} changed to 100
-
-# For every sector
-# File: technodata/{sector}/CommIn.csv
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# For every sector
-# File: technodata/{sector}/CommOut.csv
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# For every sector
-# File: technodata/{sector}/ExistingCapacity.csv
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# File: technodata/Agents.csv (undocumented)
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# File: input/BaseYearImport.csv (undocumented)
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# File: input/BaseYearExport.csv (undocumented)
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# File: input/Projections.csv (undocumented)
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
-
-# For all files in technodata/preset (undocumented)
-# Copy rows where RegionName={copy_from}, changing RegionName to {region_name}
-# >>> No values changed
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
new file mode 100644
index 00000000..74290c62
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -0,0 +1,42 @@
+import os
+import shutil
+import sys
+
+import pandas as pd
+from muse.wizard import add_region
+
+parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+
+"""
+Model 1 - New region
+
+"""
+
+
+def generate_model_1():
+    model_name = "1-new-region"
+
+    # Starting point: copy model from tutorial 1
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+    shutil.copytree(
+        os.path.join(parent_path, "../1-add-new-technology/2-scenario"), model_path
+    )
+
+    # Add region R2
+    add_region(model_path, region_name="R2", copy_from="R1")
+
+    # Special handling for power/Technodata.csv
+    technodata_file = os.path.join(model_path, "technodata/power/Technodata.csv")
+    df = pd.read_csv(technodata_file)
+    mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "windturbine")
+    df.loc[mask, "MaxCapacityAddition"] = 5
+    df.loc[mask, "MaxCapacityGrowth"] = 0.5  # incorrect in notebook
+    df.loc[mask, "TotalCapacityLimit"] = 100
+    df.to_csv(technodata_file, index=False)
+
+
+if __name__ == "__main__":
+    generate_model_1()
diff --git a/docs/tutorial-code/3-add-region/input/GlobalCommodities.csv b/docs/tutorial-code/3-add-region/input/GlobalCommodities.csv
deleted file mode 100644
index 253b75ef..00000000
--- a/docs/tutorial-code/3-add-region/input/GlobalCommodities.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
-Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
diff --git a/docs/tutorial-code/3-add-region/settings.toml b/docs/tutorial-code/3-add-region/settings.toml
deleted file mode 100644
index 8f81d260..00000000
--- a/docs/tutorial-code/3-add-region/settings.toml
+++ /dev/null
@@ -1,116 +0,0 @@
-# Global settings - most REQUIRED
-
-time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
-regions = ["R1", "R2"]
-interest_rate = 0.1
-interpolation_mode = 'Active'
-log_level = 'info'
-excluded_commodities = ["wind", "solar"]
-# Convergence parameters
-equilibrium_variable = 'demand'
-maximum_iterations = 100
-tolerance = 0.1
-tolerance_unmet_demand = -0.1
-
-[[outputs]]
-quantity = "prices"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-[[outputs]]
-quantity = "capacity"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-[[outputs]]
-quantity = "timeslice_supply"
-sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
-
-# Carbon budget control
-[carbon_budget_control]
-budget = []
-
-[global_input_files]
-projections = '{path}/input/Projections.csv'
-global_commodities = '{path}/input/GlobalCommodities.csv'
-
-[sectors.residential]
-type = 'default'
-priority = 1
-dispatch_production = 'share'
-technodata = '{path}/technodata/residential/Technodata.csv'
-commodities_in = '{path}/technodata/residential/CommIn.csv'
-commodities_out = '{path}/technodata/residential/CommOut.csv'
-
-[sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/residential/Agents.csv'
-existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
-lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [
-    # Optional, defaults to the constraints below
-    "max_production",
-    "max_capacity_expansion",
-    "demand",
-    "search_space"
-]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
-forecast = 5  # Optional, defaults to 5
-
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
-[sectors.power]
-type = 'default'
-priority = 2
-dispatch_production = 'share'
-technodata = '{path}/technodata/power/Technodata.csv'
-commodities_in = '{path}/technodata/power/CommIn.csv'
-commodities_out = '{path}/technodata/power/CommOut.csv'
-
-[sectors.power.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
-lpsolver = "scipy"
-
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
-[sectors.gas]
-type = 'default'
-priority = 3
-dispatch_production = 'share'
-technodata = '{path}/technodata/gas/Technodata.csv'
-commodities_in = '{path}/technodata/gas/CommIn.csv'
-commodities_out = '{path}/technodata/gas/CommOut.csv'
-
-[sectors.gas.subsectors.retro_and_new]
-agents = '{path}/technodata/Agents.csv'
-existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
-lpsolver = "scipy"
-
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
-[sectors.residential_presets]
-type = 'presets'
-priority = 0
-consumption_path = "{path}/technodata/preset/*Consumption.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/3-add-region/technodata/Agents.csv b/docs/tutorial-code/3-add-region/technodata/Agents.csv
deleted file mode 100644
index 3050e067..00000000
--- a/docs/tutorial-code/3-add-region/technodata/Agents.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv
deleted file mode 100644
index 83278025..00000000
--- a/docs/tutorial-code/3-add-region/technodata/preset/Residential2020Consumption.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
-0,R2,gasboiler,1,0,0,1,0,0
-1,R2,gasboiler,2,0,0,1.5,0,0
-2,R2,gasboiler,3,0,0,1,0,0
-3,R2,gasboiler,4,0,0,1.5,0,0
-4,R2,gasboiler,5,0,0,3,0,0
-5,R2,gasboiler,6,0,0,2,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv
deleted file mode 100644
index bd084a5c..00000000
--- a/docs/tutorial-code/3-add-region/technodata/preset/Residential2050Consumption.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
-0,R2,gasboiler,1,0,0,3,0,0
-1,R2,gasboiler,2,0,0,4.5,0,0
-2,R2,gasboiler,3,0,0,3,0,0
-3,R2,gasboiler,4,0,0,4.5,0,0
-4,R2,gasboiler,5,0,0,9,0,0
-5,R2,gasboiler,6,0,0,6,0,0
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv b/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv
deleted file mode 100644
index 1a179abe..00000000
--- a/docs/tutorial-code/3-add-region/technodata/residential/Agents.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv b/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv
deleted file mode 100644
index 23529b2d..00000000
--- a/docs/tutorial-code/3-add-region/technodata/residential/Technodata.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
index 7963687c..46ca83e1 100644
--- a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
+++ b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
@@ -17,7 +17,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"1-new-region/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"year\", \"region\"])\n",
@@ -34,7 +34,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = (\n",
-    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    pd.read_csv(\"1-new-region/Results/MCACapacity.csv\")\n",
     "    .groupby([\"year\", \"technology\", \"region\", \"sector\"])\n",
     "    .sum()\n",
     "    .reset_index()\n",
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 82b54912..5224bdf0 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -97,7 +97,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"../tutorial-code/3-add-region/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv\"\n",
+    ")\n",
     "\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 455603db..0f6b899b 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -170,3 +170,40 @@ def add_agent(
         if copy_from_new in df.columns:
             df[agentshare_new] = df[copy_from_new]
         df.to_csv(technodata_file, index=False)
+
+
+def add_region(model_path, region_name, copy_from) -> None:
+    # Append region to settings.toml
+    settings_file = os.path.join(model_path, "settings.toml")
+    modify_toml(settings_file, lambda x: x["regions"].append(region_name))
+
+    # Modify csv files
+    sector_files = [
+        os.path.join(model_path, "technodata", sector, file)
+        for sector in get_sectors(model_path)
+        for file in [
+            "technodata.csv",
+            "CommIn.csv",
+            "CommOut.csv",
+            "ExistingCapacity.csv",
+        ]
+    ]
+    preset_files = [
+        os.path.join(model_path, "technodata", "preset", file)
+        for file in os.listdir(os.path.join(model_path, "technodata", "preset"))
+    ]
+    global_files = [
+        os.path.join(model_path, file)
+        for file in [
+            "technodata/Agents.csv",
+            "input/BaseYearImport.csv",
+            "input/BaseYearExport.csv",
+            "input/Projections.csv",
+        ]
+    ]
+    for file_path in sector_files + preset_files + global_files:
+        df = pd.read_csv(file_path)
+        new_rows = df[df["RegionName"] == copy_from].copy()
+        new_rows["RegionName"] = region_name
+        df = pd.concat([df, new_rows])
+        df.to_csv(file_path, index=False)

From 22677f51100f60a2782eb2ad7cdc3a18b0607512 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 14 May 2024 11:11:49 +0100
Subject: [PATCH 097/419] Use tomlkit for settings files

---
 .../1-introduction/settings.toml              | 159 ++++++++++--------
 .../2-scenario/settings.toml                  | 159 ++++++++++--------
 .../1-multiple-objective/settings.toml        | 159 ++++++++++--------
 .../2-single-objective/settings.toml          | 159 ++++++++++--------
 .../3-add-region/1-new-region/settings.toml   | 159 ++++++++++--------
 src/muse/wizard.py                            |  32 +++-
 6 files changed, 464 insertions(+), 363 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 54b52362..83d410e0 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -1,11 +1,14 @@
+# Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = "Active"
-log_level = "info"
+interpolation_mode = 'Active'
+log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-equilibrium_variable = "demand"
+# Convergence parameters
+equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -20,113 +23,125 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
-
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
 [carbon_budget_control]
 budget = []
 method = "fitting"
 
 [global_input_files]
-projections = "{path}/input/Projections.csv"
-global_commodities = "{path}/input/GlobalCommodities.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-
-[timeslices.all-year.all-week]
-night = 1460
-morning = 1460
-afternoon = 1460
-early-peak = 1460
-late-peak = 1460
-evening = 1460
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
 
 [sectors.residential]
-type = "default"
+type = 'default'
 priority = 1
-dispatch_production = "share"
-technodata = "{path}/technodata/residential/Technodata.csv"
-commodities_in = "{path}/technodata/residential/CommIn.csv"
-commodities_out = "{path}/technodata/residential/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-
-[sectors.residential.outputs.quantity]
-name = "supply"
-sum_over = "timeslice"
-drop = ["comm_usage", "units_prices"]
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.residential.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
-lpsolver = "scipy"
-constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
-demand_share = "new_and_retro"
-forecast = 5
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.power]
-type = "default"
+type = 'default'
 priority = 2
-dispatch_production = "share"
-technodata = "{path}/technodata/power/Technodata.csv"
-commodities_in = "{path}/technodata/power/CommIn.csv"
-commodities_out = "{path}/technodata/power/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.power.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.gas]
-type = "default"
+type = 'default'
 priority = 3
-dispatch_production = "share"
-technodata = "{path}/technodata/gas/Technodata.csv"
-commodities_in = "{path}/technodata/gas/CommIn.csv"
-commodities_out = "{path}/technodata/gas/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.gas.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.residential_presets]
-type = "presets"
+type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+all-year.all-week.night = 1460
+all-year.all-week.morning = 1460
+all-year.all-week.afternoon = 1460
+all-year.all-week.early-peak = 1460
+all-year.all-week.late-peak = 1460
+all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 54b52362..83d410e0 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -1,11 +1,14 @@
+# Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = "Active"
-log_level = "info"
+interpolation_mode = 'Active'
+log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-equilibrium_variable = "demand"
+# Convergence parameters
+equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -20,113 +23,125 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
-
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
 [carbon_budget_control]
 budget = []
 method = "fitting"
 
 [global_input_files]
-projections = "{path}/input/Projections.csv"
-global_commodities = "{path}/input/GlobalCommodities.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-
-[timeslices.all-year.all-week]
-night = 1460
-morning = 1460
-afternoon = 1460
-early-peak = 1460
-late-peak = 1460
-evening = 1460
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
 
 [sectors.residential]
-type = "default"
+type = 'default'
 priority = 1
-dispatch_production = "share"
-technodata = "{path}/technodata/residential/Technodata.csv"
-commodities_in = "{path}/technodata/residential/CommIn.csv"
-commodities_out = "{path}/technodata/residential/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-
-[sectors.residential.outputs.quantity]
-name = "supply"
-sum_over = "timeslice"
-drop = ["comm_usage", "units_prices"]
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.residential.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
-lpsolver = "scipy"
-constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
-demand_share = "new_and_retro"
-forecast = 5
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.power]
-type = "default"
+type = 'default'
 priority = 2
-dispatch_production = "share"
-technodata = "{path}/technodata/power/Technodata.csv"
-commodities_in = "{path}/technodata/power/CommIn.csv"
-commodities_out = "{path}/technodata/power/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.power.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.gas]
-type = "default"
+type = 'default'
 priority = 3
-dispatch_production = "share"
-technodata = "{path}/technodata/gas/Technodata.csv"
-commodities_in = "{path}/technodata/gas/CommIn.csv"
-commodities_out = "{path}/technodata/gas/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.gas.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.residential_presets]
-type = "presets"
+type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+all-year.all-week.night = 1460
+all-year.all-week.morning = 1460
+all-year.all-week.afternoon = 1460
+all-year.all-week.early-peak = 1460
+all-year.all-week.late-peak = 1460
+all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index 54b52362..83d410e0 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -1,11 +1,14 @@
+# Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = "Active"
-log_level = "info"
+interpolation_mode = 'Active'
+log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-equilibrium_variable = "demand"
+# Convergence parameters
+equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -20,113 +23,125 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
-
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
 [carbon_budget_control]
 budget = []
 method = "fitting"
 
 [global_input_files]
-projections = "{path}/input/Projections.csv"
-global_commodities = "{path}/input/GlobalCommodities.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-
-[timeslices.all-year.all-week]
-night = 1460
-morning = 1460
-afternoon = 1460
-early-peak = 1460
-late-peak = 1460
-evening = 1460
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
 
 [sectors.residential]
-type = "default"
+type = 'default'
 priority = 1
-dispatch_production = "share"
-technodata = "{path}/technodata/residential/Technodata.csv"
-commodities_in = "{path}/technodata/residential/CommIn.csv"
-commodities_out = "{path}/technodata/residential/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-
-[sectors.residential.outputs.quantity]
-name = "supply"
-sum_over = "timeslice"
-drop = ["comm_usage", "units_prices"]
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.residential.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
-lpsolver = "scipy"
-constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
-demand_share = "new_and_retro"
-forecast = 5
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.power]
-type = "default"
+type = 'default'
 priority = 2
-dispatch_production = "share"
-technodata = "{path}/technodata/power/Technodata.csv"
-commodities_in = "{path}/technodata/power/CommIn.csv"
-commodities_out = "{path}/technodata/power/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.power.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.gas]
-type = "default"
+type = 'default'
 priority = 3
-dispatch_production = "share"
-technodata = "{path}/technodata/gas/Technodata.csv"
-commodities_in = "{path}/technodata/gas/CommIn.csv"
-commodities_out = "{path}/technodata/gas/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.gas.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.residential_presets]
-type = "presets"
+type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+all-year.all-week.night = 1460
+all-year.all-week.morning = 1460
+all-year.all-week.afternoon = 1460
+all-year.all-week.early-peak = 1460
+all-year.all-week.late-peak = 1460
+all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index 54b52362..83d410e0 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -1,11 +1,14 @@
+# Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
-interpolation_mode = "Active"
-log_level = "info"
+interpolation_mode = 'Active'
+log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-equilibrium_variable = "demand"
+# Convergence parameters
+equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -20,113 +23,125 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
-
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
 [carbon_budget_control]
 budget = []
 method = "fitting"
 
 [global_input_files]
-projections = "{path}/input/Projections.csv"
-global_commodities = "{path}/input/GlobalCommodities.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-
-[timeslices.all-year.all-week]
-night = 1460
-morning = 1460
-afternoon = 1460
-early-peak = 1460
-late-peak = 1460
-evening = 1460
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
 
 [sectors.residential]
-type = "default"
+type = 'default'
 priority = 1
-dispatch_production = "share"
-technodata = "{path}/technodata/residential/Technodata.csv"
-commodities_in = "{path}/technodata/residential/CommIn.csv"
-commodities_out = "{path}/technodata/residential/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-
-[sectors.residential.outputs.quantity]
-name = "supply"
-sum_over = "timeslice"
-drop = ["comm_usage", "units_prices"]
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.residential.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
-lpsolver = "scipy"
-constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
-demand_share = "new_and_retro"
-forecast = 5
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.power]
-type = "default"
+type = 'default'
 priority = 2
-dispatch_production = "share"
-technodata = "{path}/technodata/power/Technodata.csv"
-commodities_in = "{path}/technodata/power/CommIn.csv"
-commodities_out = "{path}/technodata/power/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.power.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.gas]
-type = "default"
+type = 'default'
 priority = 3
-dispatch_production = "share"
-technodata = "{path}/technodata/gas/Technodata.csv"
-commodities_in = "{path}/technodata/gas/CommIn.csv"
-commodities_out = "{path}/technodata/gas/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.gas.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.residential_presets]
-type = "presets"
+type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+all-year.all-week.night = 1460
+all-year.all-week.morning = 1460
+all-year.all-week.afternoon = 1460
+all-year.all-week.early-peak = 1460
+all-year.all-week.late-peak = 1460
+all-year.all-week.evening = 1460
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 4998e564..68e33075 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -1,11 +1,14 @@
+# Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
-foresight = 5
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1", "R2"]
 interest_rate = 0.1
-interpolation_mode = "Active"
-log_level = "info"
+interpolation_mode = 'Active'
+log_level = 'info'
 excluded_commodities = ["wind", "solar"]
-equilibrium_variable = "demand"
+# Convergence parameters
+equilibrium_variable = 'demand'
 maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
@@ -20,113 +23,125 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = ["technology", "dst_region", "region", "agent", "sector", "type", "year", "capacity"]
-
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
 [carbon_budget_control]
 budget = []
 method = "fitting"
 
 [global_input_files]
-projections = "{path}/input/Projections.csv"
-global_commodities = "{path}/input/GlobalCommodities.csv"
-
-[timeslices]
-level_names = ["month", "day", "hour"]
-
-[timeslices.all-year.all-week]
-night = 1460
-morning = 1460
-afternoon = 1460
-early-peak = 1460
-late-peak = 1460
-evening = 1460
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
 
 [sectors.residential]
-type = "default"
+type = 'default'
 priority = 1
-dispatch_production = "share"
-technodata = "{path}/technodata/residential/Technodata.csv"
-commodities_in = "{path}/technodata/residential/CommIn.csv"
-commodities_out = "{path}/technodata/residential/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-
-[sectors.residential.outputs.quantity]
-name = "supply"
-sum_over = "timeslice"
-drop = ["comm_usage", "units_prices"]
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.residential.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.residential.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/residential/ExistingCapacity.csv"
-lpsolver = "scipy"
-constraints = ["max_production", "max_capacity_expansion", "demand", "search_space"]
-demand_share = "new_and_retro"
-forecast = 5
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.power]
-type = "default"
+type = 'default'
 priority = 2
-dispatch_production = "share"
-technodata = "{path}/technodata/power/Technodata.csv"
-commodities_in = "{path}/technodata/power/CommIn.csv"
-commodities_out = "{path}/technodata/power/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.power.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/power/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.gas]
-type = "default"
+type = 'default'
 priority = 3
-dispatch_production = "share"
-technodata = "{path}/technodata/gas/Technodata.csv"
-commodities_in = "{path}/technodata/gas/CommIn.csv"
-commodities_out = "{path}/technodata/gas/CommOut.csv"
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = "{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
-sink = "csv"
+sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.gas.interactions]]
-net = "new_to_retro"
-interaction = "transfer"
-
-[sectors.gas.subsectors.retro_and_new]
-agents = "{path}/technodata/Agents.csv"
-existing_capacity = "{path}/technodata/gas/ExistingCapacity.csv"
-lpsolver = "scipy"
+net = 'new_to_retro'
+interaction = 'transfer'
 
 [sectors.residential_presets]
-type = "presets"
+type = 'presets'
 priority = 0
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+all-year.all-week.night = 1460
+all-year.all-week.morning = 1460
+all-year.all-week.afternoon = 1460
+all-year.all-week.early-peak = 1460
+all-year.all-week.late-peak = 1460
+all-year.all-week.evening = 1460
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 0f6b899b..17ebd51f 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,7 +1,7 @@
 import os
 
 import pandas as pd
-import toml
+from tomlkit import dumps, parse
 
 
 def modify_toml(path_to_toml, function):
@@ -14,10 +14,11 @@ def modify_toml(path_to_toml, function):
 
     """
     with open(path_to_toml, "r") as file:
-        data = toml.load(file)
+        lines = file.readlines()
+        data = parse("".join(lines))
     function(data)
     with open(path_to_toml, "w") as file:
-        toml.dump(data, file)
+        file.write(dumps(data))
 
 
 def get_sectors(model_path: str) -> list[str]:
@@ -207,3 +208,28 @@ def add_region(model_path, region_name, copy_from) -> None:
         new_rows["RegionName"] = region_name
         df = pd.concat([df, new_rows])
         df.to_csv(file_path, index=False)
+
+
+def add_timeslice(model_path, timeslice_name, timeslice_number, copy_from):
+    ## WORK IN PROGRESS
+
+    # Append timeslice_name to timeslices in settings.toml
+    settings_file = os.path.join(model_path, "settings.toml")
+    modify_toml(
+        settings_file,
+        lambda x: x["timeslices"]["all-year"]["all-week"].append(timeslice_name),
+    )
+
+    # Get all preset file paths
+    preset_files = [
+        os.path.join(model_path, "technodata", "preset", file)
+        for file in os.listdir(os.path.join(model_path, "technodata", "preset"))
+    ]
+
+    # Loop through all preset files
+    for file_path in preset_files:
+        df = pd.read_csv(file_path)
+        new_rows = df[df["Timeslice"] == copy_from].copy()
+        new_rows["Timeslice"] = timeslice_number
+        df = pd.concat([df, new_rows])
+        df.to_csv(file_path, index=False)

From d4ee343c423419601052f77326a70b5ebd762542 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 13 May 2024 14:34:58 +0100
Subject: [PATCH 098/419] Remove files autogenerated by Sphinx

We don't need simulation results etc. stored in the repo. They are used for the documentation, but are generated as needed anyway. They don't appear to be used for anything else and will likely just get out of sync when the code changes.

I've left the Results folders for the tutorial code for now as they are seemingly used by various notebooks. Maybe they can be removed in future.
---
 .gitignore                                    |   4 +-
 docs/Results/Gas/Capacity/2020.csv            |   4 -
 docs/Results/Gas/Capacity/2025.csv            |   9 -
 docs/Results/Gas/Capacity/2030.csv            |  15 --
 docs/Results/Gas/Capacity/2035.csv            |  13 --
 docs/Results/Gas/Capacity/2040.csv            |  11 --
 docs/Results/Gas/Capacity/2045.csv            |   9 -
 docs/Results/Gas/Capacity/2050.csv            |   9 -
 docs/Results/MCACapacity.csv                  |  57 ------
 docs/Results/MCAPrices.csv                    | 169 ------------------
 docs/Results/Power/Capacity/2020.csv          |  16 --
 docs/Results/Power/Capacity/2025.csv          |  24 ---
 docs/Results/Power/Capacity/2030.csv          |  30 ----
 docs/Results/Power/Capacity/2035.csv          |  36 ----
 docs/Results/Power/Capacity/2040.csv          |  42 -----
 docs/Results/Power/Capacity/2045.csv          |  47 -----
 docs/Results/Power/Capacity/2050.csv          |  45 -----
 docs/Results/Residential/Capacity/2020.csv    |   6 -
 docs/Results/Residential/Capacity/2025.csv    |  13 --
 docs/Results/Residential/Capacity/2030.csv    |  15 --
 docs/Results/Residential/Capacity/2035.csv    |  17 --
 docs/Results/Residential/Capacity/2040.csv    |  15 --
 docs/Results/Residential/Capacity/2045.csv    |  13 --
 docs/Results/Residential/Capacity/2050.csv    |  11 --
 docs/Results/Residential/Supply/2020.csv      |  31 ----
 docs/Results/Residential/Supply/2025.csv      |  43 -----
 docs/Results/Residential/Supply/2030.csv      |  49 -----
 docs/Results/Residential/Supply/2035.csv      |  49 -----
 docs/Results/Residential/Supply/2040.csv      |  49 -----
 docs/Results/Residential/Supply/2045.csv      |  37 ----
 docs/Results/Residential/Supply/2050.csv      |  25 ---
 docs/advanced-guide/.gitignore                |   1 +
 docs/advanced-guide/Results/CacheCapacity.csv |   5 -
 .../Results/Gas/Capacity/2020.csv             |   4 -
 .../Results/Gas/Capacity/2025.csv             |   9 -
 .../Results/Gas/Capacity/2030.csv             |  15 --
 .../Results/Gas/Capacity/2035.csv             |  13 --
 .../Results/Gas/Capacity/2040.csv             |  11 --
 .../Results/Gas/Capacity/2045.csv             |   9 -
 .../Results/Gas/Capacity/2050.csv             |   9 -
 docs/advanced-guide/Results/MCACapacity.csv   |  57 ------
 docs/advanced-guide/Results/MCAPrices.csv     | 169 ------------------
 .../Results/Power/Capacity/2020.csv           |  16 --
 .../Results/Power/Capacity/2025.csv           |  24 ---
 .../Results/Power/Capacity/2030.csv           |  30 ----
 .../Results/Power/Capacity/2035.csv           |  36 ----
 .../Results/Power/Capacity/2040.csv           |  42 -----
 .../Results/Power/Capacity/2045.csv           |  47 -----
 .../Results/Power/Capacity/2050.csv           |  45 -----
 .../Results/Residential/Capacity/2020.csv     |   6 -
 .../Results/Residential/Capacity/2025.csv     |  13 --
 .../Results/Residential/Capacity/2030.csv     |  15 --
 .../Results/Residential/Capacity/2035.csv     |  17 --
 .../Results/Residential/Capacity/2040.csv     |  15 --
 .../Results/Residential/Capacity/2045.csv     |  13 --
 .../Results/Residential/Capacity/2050.csv     |  11 --
 .../Results/Residential/Supply/2020.csv       |  31 ----
 .../Results/Residential/Supply/2025.csv       |  43 -----
 .../Results/Residential/Supply/2030.csv       |  49 -----
 .../Results/Residential/Supply/2035.csv       |  49 -----
 .../Results/Residential/Supply/2040.csv       |  49 -----
 .../Results/Residential/Supply/2045.csv       |  37 ----
 .../Results/Residential/Supply/2050.csv       |  25 ---
 .../ResidentialConsumption_Zero2020.txt       |  23 ---
 .../ResidentialConsumption_Zero2025.txt       |  23 ---
 .../ResidentialConsumption_Zero2030.txt       |  23 ---
 .../ResidentialConsumption_Zero2035.txt       |  23 ---
 .../ResidentialConsumption_Zero2040.txt       |  23 ---
 .../ResidentialConsumption_Zero2045.txt       |  23 ---
 .../ResidentialConsumption_Zero2050.txt       |  23 ---
 docs/advanced-guide/mynewfunctions.py         |  11 --
 71 files changed, 3 insertions(+), 1997 deletions(-)
 delete mode 100644 docs/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/Results/MCACapacity.csv
 delete mode 100644 docs/Results/MCAPrices.csv
 delete mode 100644 docs/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/Results/Residential/Supply/2050.csv
 create mode 100644 docs/advanced-guide/.gitignore
 delete mode 100644 docs/advanced-guide/Results/CacheCapacity.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/advanced-guide/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/advanced-guide/Results/MCACapacity.csv
 delete mode 100644 docs/advanced-guide/Results/MCAPrices.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/advanced-guide/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/advanced-guide/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt
 delete mode 100644 docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt
 delete mode 100644 docs/advanced-guide/mynewfunctions.py

diff --git a/.gitignore b/.gitignore
index 90eea441..905fab36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,7 +126,8 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-/Results/
+**/Results/
+!docs/tutorial-code/**/Results
 /FileLog.txt
 /Power/Data/MusePower/Data/
 /MUSEGlobalSettings.csv/
@@ -147,7 +148,6 @@ other/
 JUnits.xml
 .DS_Store
 docs/developer_guide/tutorial/*.md
-docs/developer_guide/tutorial/Results
 docs/developer_guide/tutorial/model/
 docs/developer_guide/tutorial/mynewfunctions.py
 .vim/
diff --git a/docs/Results/Gas/Capacity/2020.csv b/docs/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index fdbb2d27..00000000
--- a/docs/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docs/Results/Gas/Capacity/2025.csv b/docs/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 33746c9c..00000000
--- a/docs/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/Results/Gas/Capacity/2030.csv b/docs/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 298f6c89..00000000
--- a/docs/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/docs/Results/Gas/Capacity/2035.csv b/docs/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index e368dd50..00000000
--- a/docs/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/docs/Results/Gas/Capacity/2040.csv b/docs/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 4d55f6f7..00000000
--- a/docs/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/docs/Results/Gas/Capacity/2045.csv b/docs/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index e5d560fc..00000000
--- a/docs/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/Results/Gas/Capacity/2050.csv b/docs/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 4a7d05fa..00000000
--- a/docs/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/Results/MCACapacity.csv b/docs/Results/MCACapacity.csv
deleted file mode 100644
index f5198d91..00000000
--- a/docs/Results/MCACapacity.csv
+++ /dev/null
@@ -1,57 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-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
-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
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-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
-windturbine,R1,R1,A1,power,retrofit,2050,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/Results/MCAPrices.csv b/docs/Results/MCAPrices.csv
deleted file mode 100644
index d72a9e0c..00000000
--- a/docs/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.31130000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.05690000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.40060000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34750000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.58170000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52260000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.40060000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34750000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.58170000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52260000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.12530000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.05330000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.76290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69860000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.66880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.63000000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.88800000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84810000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.66880000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.63000000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.88800000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84810000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.54600000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.51430000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.10730000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.06810000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.46950000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40980000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.71210000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.63980000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.46950000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40980000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.71210000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.63980000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.44080000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.34960000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.95490000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.87300000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.71450000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21710000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.97820000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.44850000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.71450000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21710000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.97820000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.44850000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.77020000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.17030000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.24200000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.68450000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.31290000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.64020000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.59450000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.86180000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.31290000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.64020000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.59450000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.86180000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.44070000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.56120000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.87640000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.08910000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/Results/Power/Capacity/2020.csv b/docs/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 62349ecf..00000000
--- a/docs/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-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
diff --git a/docs/Results/Power/Capacity/2025.csv b/docs/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 55cc9842..00000000
--- a/docs/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-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,2054,R1,gasCCGT,2020,3.00000000000
-0,2055,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
-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
diff --git a/docs/Results/Power/Capacity/2030.csv b/docs/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 62db4566..00000000
--- a/docs/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-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
diff --git a/docs/Results/Power/Capacity/2035.csv b/docs/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 048c07ae..00000000
--- a/docs/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/docs/Results/Power/Capacity/2040.csv b/docs/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 715ec9ef..00000000
--- a/docs/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-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
diff --git a/docs/Results/Power/Capacity/2045.csv b/docs/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 69e55cf6..00000000
--- a/docs/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,47 +0,0 @@
-asset,year,region,technology,installed,capacity
-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,2045,R1,windturbine,2020,10.00000000000
-1,2049,R1,windturbine,2020,10.00000000000
-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,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,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
-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
diff --git a/docs/Results/Power/Capacity/2050.csv b/docs/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 6fa217fc..00000000
--- a/docs/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,45 +0,0 @@
-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
diff --git a/docs/Results/Residential/Capacity/2020.csv b/docs/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c..00000000
--- a/docs/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/Results/Residential/Capacity/2025.csv b/docs/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 2eb0ec15..00000000
--- a/docs/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/Results/Residential/Capacity/2030.csv b/docs/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 22334ba5..00000000
--- a/docs/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/Results/Residential/Capacity/2035.csv b/docs/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 452c6c8a..00000000
--- a/docs/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/Results/Residential/Capacity/2040.csv b/docs/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index e3ecc1d0..00000000
--- a/docs/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/Results/Residential/Capacity/2045.csv b/docs/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 82b22d9b..00000000
--- a/docs/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
diff --git a/docs/Results/Residential/Capacity/2050.csv b/docs/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 305b627b..00000000
--- a/docs/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2020.csv b/docs/Results/Residential/Supply/2020.csv
deleted file mode 100644
index a44059a3..00000000
--- a/docs/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2025.csv b/docs/Results/Residential/Supply/2025.csv
deleted file mode 100644
index c9ed8c00..00000000
--- a/docs/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2030.csv b/docs/Results/Residential/Supply/2030.csv
deleted file mode 100644
index 61ae1198..00000000
--- a/docs/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2035.csv b/docs/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 89e0bd4e..00000000
--- a/docs/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2040.csv b/docs/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 663e47a5..00000000
--- a/docs/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2045.csv b/docs/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 6e2884e6..00000000
--- a/docs/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
diff --git a/docs/Results/Residential/Supply/2050.csv b/docs/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 61004cae..00000000
--- a/docs/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
diff --git a/docs/advanced-guide/.gitignore b/docs/advanced-guide/.gitignore
new file mode 100644
index 00000000..226d9bec
--- /dev/null
+++ b/docs/advanced-guide/.gitignore
@@ -0,0 +1 @@
+mynewfunctions.py
diff --git a/docs/advanced-guide/Results/CacheCapacity.csv b/docs/advanced-guide/Results/CacheCapacity.csv
deleted file mode 100644
index 5adb1f38..00000000
--- a/docs/advanced-guide/Results/CacheCapacity.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-agent,capacity,category,dst_region,installed,region,sector,technology,year
-A1,4.10000000000,retrofit,R1,2020.00000000000,R1,residential,gasboiler,2025
-A1,2.79444444444,retrofit,R1,2020.00000000000,R1,gas,gassupply1,2025
-A1,1.90000000000,retrofit,R1,2020.00000000000,R1,residential,heatpump,2025
-A1,6.90000000000,retrofit,R1,2020.00000000000,R1,power,windturbine,2025
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2020.csv b/docs/advanced-guide/Results/Gas/Capacity/2020.csv
deleted file mode 100644
index fdbb2d27..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2025.csv b/docs/advanced-guide/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 33746c9c..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2030.csv b/docs/advanced-guide/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 298f6c89..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2035.csv b/docs/advanced-guide/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index e368dd50..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2040.csv b/docs/advanced-guide/Results/Gas/Capacity/2040.csv
deleted file mode 100644
index 4d55f6f7..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2045.csv b/docs/advanced-guide/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index e5d560fc..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Gas/Capacity/2050.csv b/docs/advanced-guide/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 4a7d05fa..00000000
--- a/docs/advanced-guide/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/MCACapacity.csv b/docs/advanced-guide/Results/MCACapacity.csv
deleted file mode 100644
index f5198d91..00000000
--- a/docs/advanced-guide/Results/MCACapacity.csv
+++ /dev/null
@@ -1,57 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-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
-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
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-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
-windturbine,R1,R1,A1,power,retrofit,2050,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/advanced-guide/Results/MCAPrices.csv b/docs/advanced-guide/Results/MCAPrices.csv
deleted file mode 100644
index d72a9e0c..00000000
--- a/docs/advanced-guide/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.31130000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.05690000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.40060000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34750000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.58170000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52260000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.40060000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34750000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.58170000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52260000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.12530000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.05330000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.76290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69860000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.66880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.63000000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.88800000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84810000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.66880000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.63000000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.88800000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84810000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.54600000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.51430000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.10730000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.06810000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.46950000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40980000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.71210000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.63980000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.46950000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40980000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.71210000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.63980000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.44080000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.34960000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.95490000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.87300000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.71450000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21710000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.97820000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.44850000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.71450000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21710000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.97820000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.44850000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.77020000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.17030000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.24200000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.68450000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.31290000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.64020000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.59450000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.86180000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.31290000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.64020000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.59450000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.86180000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.44070000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.56120000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.87640000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.08910000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/advanced-guide/Results/Power/Capacity/2020.csv b/docs/advanced-guide/Results/Power/Capacity/2020.csv
deleted file mode 100644
index 62349ecf..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Power/Capacity/2025.csv b/docs/advanced-guide/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 55cc9842..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-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,2054,R1,gasCCGT,2020,3.00000000000
-0,2055,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
-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
diff --git a/docs/advanced-guide/Results/Power/Capacity/2030.csv b/docs/advanced-guide/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 62db4566..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Power/Capacity/2035.csv b/docs/advanced-guide/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 048c07ae..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Power/Capacity/2040.csv b/docs/advanced-guide/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 715ec9ef..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Power/Capacity/2045.csv b/docs/advanced-guide/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 69e55cf6..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,47 +0,0 @@
-asset,year,region,technology,installed,capacity
-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,2045,R1,windturbine,2020,10.00000000000
-1,2049,R1,windturbine,2020,10.00000000000
-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,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,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
-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
diff --git a/docs/advanced-guide/Results/Power/Capacity/2050.csv b/docs/advanced-guide/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 6fa217fc..00000000
--- a/docs/advanced-guide/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,45 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2020.csv b/docs/advanced-guide/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2025.csv b/docs/advanced-guide/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 2eb0ec15..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2030.csv b/docs/advanced-guide/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 22334ba5..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2035.csv b/docs/advanced-guide/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 452c6c8a..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2040.csv b/docs/advanced-guide/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index e3ecc1d0..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2045.csv b/docs/advanced-guide/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 82b22d9b..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
diff --git a/docs/advanced-guide/Results/Residential/Capacity/2050.csv b/docs/advanced-guide/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 305b627b..00000000
--- a/docs/advanced-guide/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2020.csv b/docs/advanced-guide/Results/Residential/Supply/2020.csv
deleted file mode 100644
index a44059a3..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2025.csv b/docs/advanced-guide/Results/Residential/Supply/2025.csv
deleted file mode 100644
index c9ed8c00..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2030.csv b/docs/advanced-guide/Results/Residential/Supply/2030.csv
deleted file mode 100644
index 61ae1198..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2035.csv b/docs/advanced-guide/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 89e0bd4e..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2040.csv b/docs/advanced-guide/Results/Residential/Supply/2040.csv
deleted file mode 100644
index 663e47a5..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2045.csv b/docs/advanced-guide/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 6e2884e6..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/Residential/Supply/2050.csv b/docs/advanced-guide/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 61004cae..00000000
--- a/docs/advanced-guide/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt
deleted file mode 100644
index 2ef9b3b1..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2020.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2020 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2025 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2020 electricity       0.0000
-            gas              11.6000
-            heat              0.0000
-            CO2f              0.0000
-       2025 electricity       4.2222
-            gas               3.2222
-            heat              0.0000
-            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt
deleted file mode 100644
index 061f72d4..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2025.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2025 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2030 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2025 electricity       4.2222
-            gas               3.2222
-            heat              0.0000
-            CO2f              0.0000
-       2030 electricity       5.7556
-            gas               2.6422
-            heat              0.0000
-            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt
deleted file mode 100644
index 46755cc5..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2030.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2030 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2035 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2030 electricity       5.7556
-            gas               2.6422
-            heat              0.0000
-            CO2f              0.0000
-       2035 electricity       7.0889
-            gas               2.6422
-            heat              0.0000
-            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt
deleted file mode 100644
index 501217f4..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2035.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2035 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2040 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2035 electricity       7.0889
-            gas               2.6422
-            heat              0.0000
-            CO2f              0.0000
-       2040 electricity       9.1311
-            gas               0.5864
-            heat              0.0000
-            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt
deleted file mode 100644
index 83dd3b29..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2040.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2040 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2045 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2040 electricity       9.1311
-            gas               0.5864
-            heat              0.0000
-            CO2f              0.0000
-       2045 electricity      10.4644
-            gas               0.5864
-            heat              0.0000
-            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt
deleted file mode 100644
index abd1d805..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2045.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2045 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2050 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2045 electricity      10.4644
-            gas               0.5864
-            heat              0.0000
-            CO2f              0.0000
-       2050 electricity      12.0000
-            gas               0.0000
-            heat              0.0000
-            CO2f              0.0000
diff --git a/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt b/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt
deleted file mode 100644
index 599283b1..00000000
--- a/docs/advanced-guide/Results/ResidentialConsumption_Zero2050.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Hello, you!
-
-                        units_prices                            comm_usage  \
-region year commodity
-R1     2050 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-       2055 electricity  MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            gas          MUS$2010/PJ      CommodityUsage.ENERGY|CONSUMABLE
-            heat         MUS$2010/PJ         CommodityUsage.ENERGY|PRODUCT
-            CO2f         MUS$2010/kt  CommodityUsage.ENVIRONMENTAL|PRODUCT
-
-                         consumption
-region year commodity
-R1     2050 electricity         12.0
-            gas                  0.0
-            heat                 0.0
-            CO2f                 0.0
-       2055 electricity         12.0
-            gas                  0.0
-            heat                 0.0
-            CO2f                 0.0
diff --git a/docs/advanced-guide/mynewfunctions.py b/docs/advanced-guide/mynewfunctions.py
deleted file mode 100644
index 3dd9be3e..00000000
--- a/docs/advanced-guide/mynewfunctions.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from typing import Any, Text
-
-from muse.outputs.sinks import register_output_sink, sink_to_file
-
-
-@register_output_sink(name="txt")
-@sink_to_file(".txt")
-def text_dump(data: Any, filename: Text) -> None:
-    from pathlib import Path
-
-    Path(filename).write_text(f"Hello world!\n\n{data}")

From 32f6eb0d8bf248cde086081df6da7750078f2cbe Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 14 May 2024 09:43:51 +0100
Subject: [PATCH 099/419] CI: Generate results for default model before running
 notebooks

---
 .github/workflows/documentation.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 497335a6..b7ff0af9 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -22,6 +22,13 @@ jobs:
           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: |
+          muse --model default
+
+          # Create a symlink in the docs folder as running-muse-example.ipynb assumes
+          # they will be there
+          ln -s ../Results docs/
       - name: Test notebooks and tutorials
         run: pytest -m "notebook"
       - name: Build HTML documentation

From 65e95be7070639be98cda618c55c7cb590b68f13 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 14 May 2024 14:06:46 +0100
Subject: [PATCH 100/419] .vscode/launch.json: Change types to debugpy

It seems that using a type of `python` is deprecated and we should all be using `debugpy` instead. I'm not sure if VS Code's error message means that the debugging configs are currently being run with the old Python extension, but either way we should fix it.
---
 .vscode/launch.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index d43f2171..b389cbf2 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,28 +6,28 @@
     "configurations": [
         {
             "name": "Model: default",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "muse",
             "args": ["--model", "default"]
         },
         {
             "name": "Model: multiple_agents",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "muse",
             "args": ["--model", "multiple_agents"]
         },
         {
             "name": "model/settings.toml",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "muse",
             "args": ["model/settings.toml"]
         },
         {
             "name": "Model: minimum_service",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "muse",
             "args": ["--model", "minimum_service"]

From e51e5a766395a45211ee4cb805519d59120b94ca Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 14 May 2024 15:19:06 +0100
Subject: [PATCH 101/419] Tidy comments

---
 src/muse/demand_share.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index bb3c0ad6..9b34f545 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -473,21 +473,17 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
-        # calculates the total demand assigned in the previous step with the "method" function  # noqa: E501
-        # across agents and assets. The previous version of this calculation only calculated  # noqa: E501
-        # the sum of assets present in all "shares.values()" (which contain agents).
+        # Calculates the total demand assigned in the previous step with the "method"
+        # function across agents and assets.
         total = (
             xr.concat(shares.values(), dim="concat_dim").sum("concat_dim").sum("asset")
         )
-        # type: ignore
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
-    # calculates the demand divided by the number of assets times the number of agents if  # noqa: E501
-    # the demand is bigger than zero and the total demand assigned with the "method"
-    # function is zero. In the previous version, the demand was divided by the number of
-    # agents times the number of assets present in all "shares.values()"
-    # (which represent agents) and thus could become inf if all agents owned different assets.  # noqa: E501
+    # Calculates the demand divided by the number of assets times the number of agents
+    # if the demand is bigger than zero and the total demand assigned with the "method"
+    # function is zero.
     unassigned = (
         demand
         / (

From a674edbbba2d5a847bed9a433ee9e5da6b273809 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 14 May 2024 15:26:55 +0100
Subject: [PATCH 102/419] Tidy code by extracting expressions into vars

---
 src/muse/demand_share.py | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 9b34f545..756ca814 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -465,7 +465,7 @@ def _inner_split(
     """
     from numpy import logical_and
 
-    shares = {
+    shares: Mapping[Hashable, xr.DataArray] = {
         key: method(capacity=capacity)
         .groupby("technology")
         .sum("asset")
@@ -473,29 +473,22 @@ def _inner_split(
         for key, capacity in assets.items()
     }
     try:
+        summed_shares: xr.DataArray = xr.concat(shares.values(), dim="concat_dim").sum(
+            "concat_dim"
+        )
+
         # Calculates the total demand assigned in the previous step with the "method"
         # function across agents and assets.
-        total = (
-            xr.concat(shares.values(), dim="concat_dim").sum("concat_dim").sum("asset")
-        )
+        total: xr.DataArray = summed_shares.sum("asset")
     except AttributeError:
         raise AgentWithNoAssetsInDemandShare()
 
     # Calculates the demand divided by the number of assets times the number of agents
     # if the demand is bigger than zero and the total demand assigned with the "method"
     # function is zero.
-    unassigned = (
-        demand
-        / (
-            len(shares)
-            * len(
-                cast(
-                    xr.DataArray,
-                    xr.concat(shares.values(), dim="concat_dim").sum("concat_dim"),
-                ).asset
-            )
-        )
-    ).where(logical_and(demand > 1e-12, total <= 1e-12), 0)
+    unassigned = (demand / (len(shares) * len(summed_shares))).where(
+        logical_and(demand > 1e-12, total <= 1e-12), 0
+    )
 
     totals = {
         key: (share / share.sum("asset")).fillna(0) for key, share in shares.items()

From a46acb8334e157b383386a016948525118cc53a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 14 May 2024 15:52:42 +0100
Subject: [PATCH 103/419] Fix odd-looking, probably masked bug

---
 .../technodata/power/TechnodataTimeslices.csv          | 10 +++++-----
 src/muse/readers/csv.py                                |  6 +-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv b/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv
index 0b0629b4..824ff170 100644
--- a/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv
+++ b/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv
@@ -1,11 +1,11 @@
 ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
 Unit,-,Year,-,-,-,-,-,-
 gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,2
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,3
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,4
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,5
-gasCCGT,R1,2020,upper,all-year,all-week,evening,1,6
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
 windturbine,R1,2020,upper,all-year,all-week,night,1,1
 windturbine,R1,2020,upper,all-year,all-week,morning,1,1
 windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index b53348d4..2e16c227 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -918,11 +918,7 @@ def check_utilization_not_all_zero(data, filename):
     else:
         utilization_sum = data.groupby(["technology", "region", "year"]).sum()
 
-        # Add small value to 0 utilization factors to avoid numerical problems
-        if utilization_sum.utilization_factor.any() == 0:
-            data.loc[data.utilization_factor == 0, "utilization_factor"] = (
-                data.loc[data.utilization_factor == 0, "utilization_factor"] + 0.01
-            )
+        if (utilization_sum.utilization_factor == 0).any():
             raise ValueError(
                 """A technology can not have a utilization factor of 0 for every
                  timeslice. Please check file {}.""".format(filename)

From 4b16b9f76dfa42a9a1832e9fbeed27154b04c3e5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 14 May 2024 15:53:39 +0100
Subject: [PATCH 104/419] Tutorial 4 (4.2 still faulty)

---
 .../1-introduction/settings.toml              |   14 +-
 .../2-scenario/settings.toml                  |   14 +-
 .../1-multiple-objective/settings.toml        |   14 +-
 .../2-single-objective/settings.toml          |   14 +-
 .../3-add-region/1-new-region/settings.toml   |   14 +-
 .../Results/Gas/Capacity/2020.csv             |    7 +
 .../Results/Gas/Capacity/2025.csv             |   17 +
 .../Results/Gas/Capacity/2030.csv             |   29 +
 .../Results/Gas/Capacity/2035.csv             |   25 +
 .../Results/Gas/Capacity/2040.csv             |   21 +
 .../Results/Gas/Capacity/2045.csv             |   17 +
 .../Results/Gas/Capacity/2050.csv             |   17 +
 .../Results/MCACapacity.csv                   |  271 +-
 .../Results/MCAMetric_Consumption.csv         |  993 ----
 .../Results/MCAMetric_Supply.csv              | 1409 -----
 .../1-modify-timeslices/Results/MCAPrices.csv |  272 +-
 .../Results/Power/Capacity/2020.csv           |   23 +
 .../Results/Power/Capacity/2025.csv           |   53 +
 .../Results/Power/Capacity/2030.csv           |   76 +
 .../Results/Power/Capacity/2035.csv           |   87 +
 .../Results/Power/Capacity/2040.csv           |   97 +
 .../Results/Power/Capacity/2045.csv           |  125 +
 .../Results/Power/Capacity/2050.csv           |  117 +
 .../Results/Residential/Capacity/2020.csv     |   11 +
 .../Results/Residential/Capacity/2025.csv     |   25 +
 .../Results/Residential/Capacity/2030.csv     |   29 +
 .../Results/Residential/Capacity/2035.csv     |   25 +
 .../Results/Residential/Capacity/2040.csv     |   21 +
 .../Results/Residential/Capacity/2045.csv     |   21 +
 .../Results/Residential/Capacity/2050.csv     |   21 +
 .../Results/Residential/Supply/2020.csv       |  161 +
 .../Results/Residential/Supply/2025.csv       |  225 +
 .../Results/Residential/Supply/2030.csv       |  257 +
 .../Results/Residential/Supply/2035.csv       |  193 +
 .../Results/Residential/Supply/2040.csv       |  129 +
 .../Results/Residential/Supply/2045.csv       |  129 +
 .../Results/Residential/Supply/2050.csv       |  129 +
 .../1-modify-timeslices/generate_model.py     |   17 -
 .../input/BaseYearExport.csv                  |    2 +-
 .../input/BaseYearImport.csv                  |    2 +-
 .../input/GlobalCommodities.csv               |   10 +-
 .../1-modify-timeslices/input/Projections.csv |    2 +-
 .../1-modify-timeslices/settings.toml         |   75 +-
 .../1-modify-timeslices/technodata/Agents.csv |   10 +-
 .../technodata/gas/CommIn.csv                 |    2 +-
 .../technodata/gas/CommOut.csv                |    2 +-
 .../technodata/gas/ExistingCapacity.csv       |    2 +-
 .../technodata/gas/Technodata.csv             |    8 +-
 .../technodata/power/CommIn.csv               |    2 +-
 .../technodata/power/CommOut.csv              |    2 +-
 .../technodata/power/ExistingCapacity.csv     |    2 +-
 .../technodata/power/Technodata.csv           |   28 +-
 .../preset/Residential2020Consumption.csv     |   10 +-
 .../preset/Residential2050Consumption.csv     |   14 +-
 .../technodata/residential/Agents.csv         |    9 -
 .../technodata/residential/CommIn.csv         |    2 +-
 .../technodata/residential/CommOut.csv        |    2 +-
 .../residential/ExistingCapacity.csv          |    2 +-
 .../technodata/residential/Technodata.csv     |   12 +-
 .../Results/Gas/Capacity/2020.csv             |    7 +
 .../Results/Gas/Capacity/2025.csv             |   17 +
 .../Results/Gas/Capacity/2030.csv             |   29 +
 .../Results/Gas/Capacity/2035.csv             |   25 +
 .../Results/Gas/Capacity/2040.csv             |   21 +
 .../Results/Gas/Capacity/2045.csv             |   17 +
 .../Results/Gas/Capacity/2050.csv             |   17 +
 .../Results/MCACapacity.csv                   |  452 +-
 .../Results/MCAMetric_Consumption.csv         | 2961 -----------
 .../Results/MCAMetric_Supply.csv              | 4545 -----------------
 .../Results/MCAPrices.csv                     |  640 ---
 .../Results/Power/Capacity/2020.csv           |   21 +
 .../Results/Power/Capacity/2025.csv           |   53 +
 .../Results/Power/Capacity/2030.csv           |   76 +
 .../Results/Power/Capacity/2035.csv           |  105 +
 .../Results/Power/Capacity/2040.csv           |  105 +
 .../Results/Power/Capacity/2045.csv           |  131 +
 .../Results/Power/Capacity/2050.csv           |  121 +
 .../Results/Residential/Capacity/2020.csv     |   15 +
 .../Results/Residential/Capacity/2025.csv     |   25 +
 .../Results/Residential/Capacity/2030.csv     |   29 +
 .../Results/Residential/Capacity/2035.csv     |   33 +
 .../Results/Residential/Capacity/2040.csv     |   29 +
 .../Results/Residential/Capacity/2045.csv     |   25 +
 .../Results/Residential/Capacity/2050.csv     |   21 +
 .../Results/Residential/Supply/2020.csv       |  161 +
 .../Results/Residential/Supply/2025.csv       |  169 +
 .../Results/Residential/Supply/2030.csv       |  193 +
 .../Results/Residential/Supply/2035.csv       |  193 +
 .../Results/Residential/Supply/2040.csv       |  193 +
 .../Results/Residential/Supply/2045.csv       |  145 +
 .../Results/Residential/Supply/2050.csv       |   97 +
 .../input/BaseYearExport.csv                  |    2 +-
 .../input/BaseYearImport.csv                  |    2 +-
 .../input/GlobalCommodities.csv               |   10 +-
 .../input/Projections.csv                     |    2 +-
 .../2-modify-time-framework/settings.toml     |   78 +-
 .../technodata/Agents.csv                     |   10 +-
 .../technodata/gas/CommIn.csv                 |    2 +-
 .../technodata/gas/CommOut.csv                |    2 +-
 .../technodata/gas/ExistingCapacity.csv       |    2 +-
 .../technodata/gas/Technodata.csv             |    8 +-
 .../technodata/power/CommIn.csv               |    2 +-
 .../technodata/power/CommOut.csv              |    2 +-
 .../technodata/power/ExistingCapacity.csv     |    2 +-
 .../technodata/power/Technodata.csv           |   28 +-
 .../preset/Residential2020Consumption.csv     |   10 +-
 .../preset/Residential2050Consumption.csv     |   14 +-
 .../technodata/residential/Agents.csv         |    9 -
 .../technodata/residential/CommIn.csv         |    2 +-
 .../technodata/residential/CommOut.csv        |    2 +-
 .../residential/ExistingCapacity.csv          |    2 +-
 .../technodata/residential/Technodata.csv     |   12 +-
 .../4-modify-timing-data/generate_models.py   |  116 +
 .../visualise-time-framework-changes.ipynb    |    2 +-
 .../visualise-timing-result-changes.ipynb     |    2 +-
 src/muse/data/example/default/settings.toml   |   14 +-
 src/muse/wizard.py                            |   35 +-
 117 files changed, 4829 insertions(+), 11533 deletions(-)
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/generate_models.py
 rename docs/tutorial-code/4-modify-timing-data/{2-modify-time-framework => }/visualise-time-framework-changes.ipynb (96%)
 rename docs/tutorial-code/4-modify-timing-data/{1-modify-timeslices => }/visualise-timing-result-changes.ipynb (95%)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 83d410e0..e41a4bf7 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -139,9 +139,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 83d410e0..e41a4bf7 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -139,9 +139,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index 83d410e0..e41a4bf7 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -139,9 +139,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index 83d410e0..e41a4bf7 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -139,9 +139,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 68e33075..02de7018 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -139,9 +139,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3c032c34
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..8951d4a9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a056e261
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..0c2112af
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..20d6c8b3
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..857dfbd4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index cc4362d8..06b99912 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -1,151 +1,120 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-9,A1,5.00000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2020
-16,A2,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-23,A2,5.00000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-14,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-3,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2020
-2,A1,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,8.92930000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-16,A1,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2025
-21,A1,8.92930000000,R2,16,2020,R2,residential,heatpump,retrofit,2025
-30,A2,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-35,A2,8.92930000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-44,A2,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2025
-49,A2,8.92930000000,R2,16,2020,R2,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,5.60870000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,10.00000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-33,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2025
-43,A1,5.60870000000,R2,22,2020,R2,power,solarPV,retrofit,2025
-56,A1,10.00000000000,R2,44,2020,R2,power,windturbine,retrofit,2025
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-8,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2025
-2,A1,1.07150000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,8.92930000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,4.28590000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-18,A1,1.07150000000,R2,0,2025,R2,residential,gasboiler,retrofit,2030
-22,A1,8.92930000000,R2,8,2020,R2,residential,heatpump,retrofit,2030
-23,A1,4.28590000000,R2,9,2025,R2,residential,heatpump,retrofit,2030
-34,A2,1.07150000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-38,A2,8.92930000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-39,A2,4.28590000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-50,A2,1.07150000000,R2,0,2025,R2,residential,gasboiler,retrofit,2030
-54,A2,8.92930000000,R2,8,2020,R2,residential,heatpump,retrofit,2030
-55,A2,4.28590000000,R2,9,2025,R2,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,5.60870000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,4.07170000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,10.00000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-36,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2030
-47,A1,5.60870000000,R2,12,2020,R2,power,solarPV,retrofit,2030
-48,A1,4.07170000000,R2,13,2025,R2,power,solarPV,retrofit,2030
-67,A1,10.00000000000,R2,48,2020,R2,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,0.27200000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-14,A1,7.50000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2030
-15,A1,0.27200000000,R2,1,2025,R2,gas,gassupply1,retrofit,2030
-2,A1,1.07150000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-4,A1,4.28590000000,R1,7,2025,R1,residential,heatpump,retrofit,2035
-5,A1,11.78670000000,R1,8,2030,R1,residential,heatpump,retrofit,2035
-16,A1,1.07150000000,R2,0,2025,R2,residential,gasboiler,retrofit,2035
-18,A1,4.28590000000,R2,7,2025,R2,residential,heatpump,retrofit,2035
-19,A1,11.78670000000,R2,8,2030,R2,residential,heatpump,retrofit,2035
-30,A2,1.07150000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-32,A2,4.28590000000,R1,7,2025,R1,residential,heatpump,retrofit,2035
-33,A2,11.78670000000,R1,8,2030,R1,residential,heatpump,retrofit,2035
-44,A2,1.07150000000,R2,0,2025,R2,residential,gasboiler,retrofit,2035
-46,A2,4.28590000000,R2,7,2025,R2,residential,heatpump,retrofit,2035
-47,A2,11.78670000000,R2,8,2030,R2,residential,heatpump,retrofit,2035
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-10,A1,5.60870000000,R1,11,2020,R1,power,solarPV,retrofit,2035
-11,A1,4.07170000000,R1,12,2025,R1,power,solarPV,retrofit,2035
-12,A1,5.71470000000,R1,13,2030,R1,power,solarPV,retrofit,2035
-37,A1,10.00000000000,R1,55,2020,R1,power,windturbine,retrofit,2035
-41,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2035
-51,A1,5.60870000000,R2,11,2020,R2,power,solarPV,retrofit,2035
-52,A1,4.07170000000,R2,12,2025,R2,power,solarPV,retrofit,2035
-53,A1,5.71470000000,R2,13,2030,R2,power,solarPV,retrofit,2035
-78,A1,10.00000000000,R2,55,2020,R2,power,windturbine,retrofit,2035
-0,A1,0.27200000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
-12,A1,0.27200000000,R2,0,2025,R2,gas,gassupply1,retrofit,2035
-13,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2035
-2,A1,11.78670000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-3,A1,8.21470000000,R1,1,2035,R1,residential,heatpump,retrofit,2040
-14,A1,11.78670000000,R2,0,2030,R2,residential,heatpump,retrofit,2040
-15,A1,8.21470000000,R2,1,2035,R2,residential,heatpump,retrofit,2040
-26,A2,11.78670000000,R1,0,2030,R1,residential,heatpump,retrofit,2040
-27,A2,8.21470000000,R1,1,2035,R1,residential,heatpump,retrofit,2040
-38,A2,11.78670000000,R2,0,2030,R2,residential,heatpump,retrofit,2040
-39,A2,8.21470000000,R2,1,2035,R2,residential,heatpump,retrofit,2040
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-9,A1,5.60870000000,R1,12,2020,R1,power,solarPV,retrofit,2040
-10,A1,4.07170000000,R1,13,2025,R1,power,solarPV,retrofit,2040
-11,A1,5.71470000000,R1,14,2030,R1,power,solarPV,retrofit,2040
-12,A1,7.85760000000,R1,15,2035,R1,power,solarPV,retrofit,2040
-43,A1,10.00000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
-46,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2040
-55,A1,5.60870000000,R2,12,2020,R2,power,solarPV,retrofit,2040
-56,A1,4.07170000000,R2,13,2025,R2,power,solarPV,retrofit,2040
-57,A1,5.71470000000,R2,14,2030,R2,power,solarPV,retrofit,2040
-58,A1,7.85760000000,R2,15,2035,R2,power,solarPV,retrofit,2040
-89,A1,10.00000000000,R2,72,2020,R2,power,windturbine,retrofit,2040
-0,A1,0.27200000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
-10,A1,0.27200000000,R2,0,2025,R2,gas,gassupply1,retrofit,2040
-11,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2040
-2,A1,8.21470000000,R1,0,2035,R1,residential,heatpump,retrofit,2045
-3,A1,14.64400000000,R1,1,2040,R1,residential,heatpump,retrofit,2045
-14,A1,8.21470000000,R2,0,2035,R2,residential,heatpump,retrofit,2045
-15,A1,14.64400000000,R2,1,2040,R2,residential,heatpump,retrofit,2045
-26,A2,8.21470000000,R1,0,2035,R1,residential,heatpump,retrofit,2045
-27,A2,14.64400000000,R1,1,2040,R1,residential,heatpump,retrofit,2045
-38,A2,8.21470000000,R2,0,2035,R2,residential,heatpump,retrofit,2045
-39,A2,14.64400000000,R2,1,2040,R2,residential,heatpump,retrofit,2045
-2,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-10,A1,5.60870000000,R1,13,2020,R1,power,solarPV,retrofit,2045
-11,A1,4.07170000000,R1,14,2025,R1,power,solarPV,retrofit,2045
-12,A1,5.71470000000,R1,15,2030,R1,power,solarPV,retrofit,2045
-13,A1,7.85760000000,R1,16,2035,R1,power,solarPV,retrofit,2045
-14,A1,5.71470000000,R1,17,2040,R1,power,solarPV,retrofit,2045
-50,A1,10.00000000000,R1,91,2020,R1,power,windturbine,retrofit,2045
-64,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2045
-72,A1,5.60870000000,R2,13,2020,R2,power,solarPV,retrofit,2045
-73,A1,4.07170000000,R2,14,2025,R2,power,solarPV,retrofit,2045
-74,A1,5.71470000000,R2,15,2030,R2,power,solarPV,retrofit,2045
-75,A1,7.85760000000,R2,16,2035,R2,power,solarPV,retrofit,2045
-76,A1,5.71470000000,R2,17,2040,R2,power,solarPV,retrofit,2045
-112,A1,10.00000000000,R2,91,2020,R2,power,windturbine,retrofit,2045
-0,A1,0.27200000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
-8,A1,0.27200000000,R2,0,2025,R2,gas,gassupply1,retrofit,2045
-9,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2045
-0,A1,14.64400000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-1,A1,11.07200000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-10,A1,14.64400000000,R2,0,2040,R2,residential,heatpump,retrofit,2050
-11,A1,11.07200000000,R2,1,2045,R2,residential,heatpump,retrofit,2050
-20,A2,14.64400000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-21,A2,11.07200000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-30,A2,14.64400000000,R2,0,2040,R2,residential,heatpump,retrofit,2050
-31,A2,11.07200000000,R2,1,2045,R2,residential,heatpump,retrofit,2050
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-6,A1,4.07170000000,R1,13,2025,R1,power,solarPV,retrofit,2050
-7,A1,5.71470000000,R1,14,2030,R1,power,solarPV,retrofit,2050
-8,A1,7.85760000000,R1,15,2035,R1,power,solarPV,retrofit,2050
-9,A1,5.71470000000,R1,16,2040,R1,power,solarPV,retrofit,2050
-10,A1,15.71470000000,R1,17,2045,R1,power,solarPV,retrofit,2050
-46,A1,5.60870000000,R1,91,2045,R1,power,windturbine,retrofit,2050
-56,A1,3.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2050
-62,A1,4.07170000000,R2,13,2025,R2,power,solarPV,retrofit,2050
-63,A1,5.71470000000,R2,14,2030,R2,power,solarPV,retrofit,2050
-64,A1,7.85760000000,R2,15,2035,R2,power,solarPV,retrofit,2050
-65,A1,5.71470000000,R2,16,2040,R2,power,solarPV,retrofit,2050
-66,A1,15.71470000000,R2,17,2045,R2,power,solarPV,retrofit,2050
-102,A1,5.60870000000,R2,91,2045,R2,power,windturbine,retrofit,2050
-0,A1,0.27200000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
-8,A1,0.27200000000,R2,0,2025,R2,gas,gassupply1,retrofit,2050
-9,A1,7.50000000000,R2,1,2030,R2,gas,gassupply1,retrofit,2050
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,5.60870000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,15.60870000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
+heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
+heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2030,4.07170000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,4.07170000000
+windturbine,R2,R2,A1,power,retrofit,2030,15.60870000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,0.27200000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
+heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
+heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2035,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.71470000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
+windturbine,R2,R2,A1,power,retrofit,2035,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2035,1.64290000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2040,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2040,7.85760000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2040,7.85760000000
+windturbine,R2,R2,A1,power,retrofit,2040,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2040,1.64290000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
+heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
+heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2045,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2045,7.85760000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
+windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2045,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2045,7.85760000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
+windturbine,R2,R2,A1,power,retrofit,2045,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2045,1.64290000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
+heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
+heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
+heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2050,7.85760000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.71470000000
+windturbine,R1,R1,A1,power,retrofit,2050,5.60870000000
+gasCCGT,R2,R2,A1,power,retrofit,2050,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2050,7.85760000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.71470000000
+windturbine,R2,R2,A1,power,retrofit,2050,1.64290000000
+windturbine,R2,R2,A1,power,retrofit,2050,5.60870000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index 45924853..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,993 +0,0 @@
-,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,0.41412000000,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,0.62118000000,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,0.41412000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,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,1.24294000000,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,0.82882000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,57,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,9,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,57,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,57,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-25,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,9,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-29,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-31,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,57,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,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.14875277648,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.18116542231,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.22312916472,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.12077694820,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,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.22312916472,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.36250000000,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,0.44646666667,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.24172305180,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.29771389019,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,97,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,100,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,113,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,116,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,20,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,36,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,52,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R2,65,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,68,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,97,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,100,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,113,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,116,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,97,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,100,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,113,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,116,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,20,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,36,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,52,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R2,65,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,68,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,97,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,100,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,113,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,116,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,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.09343415772,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.16658889407,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.09389366542,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.14015123658,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.24988334111,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.06259577695,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R1,59,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,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.14015123658,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.24988334111,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.18787500000,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.28043333333,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.50000000000,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.12527922305,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.18699917561,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.33341110593,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,151,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,159,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,163,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,176,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R2,1,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,9,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,13,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R2,26,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R2,51,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,59,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,63,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R2,76,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,84,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,88,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18787500000,R2,101,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,126,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,134,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,138,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,151,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,159,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,163,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,176,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,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.05176338964,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.07139777881,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.22312916472,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.07764508446,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.10709666822,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.14875277648,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,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.07764508446,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.10709666822,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,0.44646666667,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.15536266667,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.21429333333,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.29771389019,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.10359927703,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.14289555452,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,96,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,112,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,117,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,120,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,5,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,8,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,16,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,21,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,24,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,32,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,37,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,40,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,48,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,53,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,56,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,69,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,72,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,80,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,85,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,88,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,96,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,101,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,104,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,112,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,117,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,120,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-53,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-56,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-59,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-65,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,96,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-68,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,112,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,117,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,120,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,5,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,8,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,16,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,21,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-77,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,24,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,32,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,37,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-80,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,40,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-81,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,48,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-82,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,53,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-83,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,56,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,69,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,72,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,80,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,85,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-89,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,88,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,96,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,101,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-92,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,104,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-93,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,112,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-94,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,117,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-95,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,120,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,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.16658889407,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.18778733084,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.06783055530,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.14015123658,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.24988334111,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.28168099627,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.10174583294,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.09343415772,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R1,69,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,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.24988334111,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.28168099627,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.10174583294,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.28043333333,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.50000000000,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.56362500000,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.20358666667,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.18699917561,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.33341110593,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.37583766916,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.13575611137,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,29,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,33,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,36,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,44,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,54,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,58,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,61,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,69,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,79,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,83,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,86,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,94,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R2,104,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R2,108,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R2,111,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R2,119,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,129,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,133,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,136,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,144,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,179,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,183,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,186,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,194,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,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.07139777881,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.19635277648,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.07764508446,R1,17,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.10709666822,R1,20,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.29452916472,R1,24,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.05176338964,R1,33,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,36,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,40,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,49,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.10709666822,R1,52,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.29452916472,R1,56,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.15536266667,R1,65,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.21429333333,R1,68,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,0.58933333333,R1,72,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.10359927703,R1,81,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.14289555452,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,97,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,100,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,104,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,113,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,116,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,120,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,1,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,4,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,8,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,17,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,20,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,33,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,36,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,40,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,49,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,52,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,56,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,65,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,68,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,72,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,81,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,84,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,88,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,97,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,100,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,104,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,113,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,116,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,120,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,17,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,20,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-53,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,33,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,36,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-56,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,40,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,49,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,52,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-59,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,56,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R1,65,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-65,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,97,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,100,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-68,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,104,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,113,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,116,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,120,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,1,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,4,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,8,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,17,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,20,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-77,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,33,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,36,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-80,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,40,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-81,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,49,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-82,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,52,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-83,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,56,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,65,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,68,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,72,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,81,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,84,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-89,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,88,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,97,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,100,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-92,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,104,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-93,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,113,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-94,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,116,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-95,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,120,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,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.16658889407,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.18778733084,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.06783055530,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.09520000000,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.14015123658,R1,34,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.24988334111,R1,38,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.28168099627,R1,41,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.10174583294,R1,49,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.14280000000,R1,54,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.09343415772,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R1,79,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,84,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R1,94,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.24988334111,R1,98,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.28168099627,R1,101,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.10174583294,R1,109,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.14280000000,R1,114,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.28043333333,R1,124,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.50000000000,R1,128,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.56362500000,R1,131,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.20358666667,R1,139,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.28573333333,R1,144,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.18699917561,R1,154,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.33341110593,R1,158,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.37583766916,R1,161,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.13575611137,R1,169,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.19053333333,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,221,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,229,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,234,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,41,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,49,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,54,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,64,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,68,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,71,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,79,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,84,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,101,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,109,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,114,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R2,124,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R2,128,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R2,131,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R2,139,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R2,144,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,174,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,191,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,199,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,204,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,221,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,229,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,234,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,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,electricity,0.13684722352,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,28,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,76,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,0,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,4,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,12,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,16,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,28,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,36,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,40,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,52,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,60,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,64,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,72,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,76,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,84,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,88,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,24,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,28,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,76,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,0,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,4,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,12,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,16,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,24,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,28,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,36,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,40,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,52,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,60,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,64,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,72,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,76,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,84,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,88,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,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.16658889407,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.18778733084,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.06783055530,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.09520000000,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,solar,0.13089888941,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,59,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R1,116,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R1,124,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,129,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R1,151,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R1,164,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39288000000,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,199,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,221,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,229,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,234,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,239,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,249,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,253,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,256,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,264,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,269,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,274,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R2,29,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,39,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,43,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,46,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,54,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,59,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R2,64,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,74,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,78,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,81,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,89,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,94,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R2,99,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,116,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,124,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,129,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R2,134,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R2,144,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R2,148,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R2,151,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R2,159,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R2,164,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39288000000,R2,169,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,179,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,183,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,186,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,194,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,199,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,204,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,221,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,229,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,234,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,239,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,249,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,253,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,256,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,264,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,269,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,274,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,0,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,12,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,48,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,60,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,64,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,76,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,0,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,4,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,12,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,16,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,24,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,28,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,36,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,40,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,48,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,52,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,60,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,64,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,72,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,76,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,84,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,88,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,0,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,4,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,12,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,16,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,28,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,48,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,60,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,64,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,76,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,0,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,4,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,12,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,16,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,24,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,28,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,36,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,40,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,48,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,52,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,60,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,64,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,72,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,76,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,84,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,88,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,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.16658889407,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.18778733084,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.06783055530,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.09520000000,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,solar,0.13089888941,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,34,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R1,56,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,79,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,114,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,124,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R1,139,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R1,143,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R1,146,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R1,154,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,159,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R1,164,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,169,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39288000000,R1,209,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R1,214,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,236,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,249,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,259,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,274,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,278,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,281,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,289,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,294,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,299,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,304,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R1,319,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R1,323,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,326,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,334,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,339,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,344,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,349,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R2,29,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,34,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,49,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,53,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,56,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,64,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,69,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R2,74,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,79,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09343415772,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16658889407,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,101,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,109,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,114,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R2,119,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,124,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14015123658,R2,139,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24988334111,R2,143,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,146,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,154,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,159,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R2,164,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,169,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28043333333,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50000000000,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R2,191,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R2,199,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R2,204,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39288000000,R2,209,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R2,214,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,229,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,233,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,236,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,244,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,249,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,254,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,259,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,274,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,278,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,281,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,289,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,294,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,299,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-104,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,304,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18699917561,R2,319,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33341110593,R2,323,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,326,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,334,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,339,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,344,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-111,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,349,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,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.18444722352,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,0.36592916472,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.27667083528,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.24395277648,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,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.27667083528,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,0.73220000000,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,0.55360000000,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,0.48824722352,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,0.36915277648,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,76,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,0,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,4,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,12,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,16,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,24,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,28,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,36,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,40,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,48,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R2,52,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,60,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,64,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,72,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,76,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,84,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,88,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,76,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,0,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,4,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,12,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,16,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,24,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,28,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,36,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,40,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,48,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R2,52,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,60,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,64,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,72,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,76,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,84,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,88,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,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.06783055530,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.09520000000,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,solar,0.13089888941,R1,19,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,24,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26178889407,R1,29,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09343415772,R1,33,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R1,41,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R1,49,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,54,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R1,59,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,64,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39268334111,R1,69,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14015123658,R1,73,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R1,104,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26178889407,R1,109,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09343415772,R1,113,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R1,121,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,134,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R1,139,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R1,144,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39268334111,R1,149,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14015123658,R1,153,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39288000000,R1,179,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R1,184,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.78573333333,R1,189,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28043333333,R1,193,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,201,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,209,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,214,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,219,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,224,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52394443926,R1,229,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18699917561,R1,233,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,241,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,249,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,254,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,259,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,264,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52394443926,R1,269,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18699917561,R1,273,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R1,281,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R1,289,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,294,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R1,299,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R1,304,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52394443926,R1,309,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18699917561,R1,313,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,1,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,9,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,14,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R2,19,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,24,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26178889407,R2,29,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09343415772,R2,33,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,41,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,49,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,54,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R2,59,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,64,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39268334111,R2,69,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14015123658,R2,73,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18778733084,R2,81,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06783055530,R2,89,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,94,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13089888941,R2,99,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09520000000,R2,104,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26178889407,R2,109,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.09343415772,R2,113,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.28168099627,R2,121,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10174583294,R2,129,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,134,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19634833411,R2,139,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14280000000,R2,144,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39268334111,R2,149,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14015123658,R2,153,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.56362500000,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20358666667,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R2,174,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.39288000000,R2,179,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28573333333,R2,184,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.78573333333,R2,189,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28043333333,R2,193,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,201,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,209,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,214,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,219,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,224,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52394443926,R2,229,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18699917561,R2,233,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,241,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,249,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,254,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,259,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,264,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52394443926,R2,269,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-104,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18699917561,R2,273,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37583766916,R2,281,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13575611137,R2,289,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,294,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26198111059,R2,299,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19053333333,R2,304,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.52394443926,R2,309,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-111,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18699917561,R2,313,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Supply.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Supply.csv
deleted file mode 100644
index d10e534f..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,1409 +0,0 @@
-,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,0.35700000000,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,23.10147000000,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,0.53550000000,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,34.65220500000,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,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.53550000000,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,34.65220500000,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,1.07150000000,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,69.33676500000,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,0.71450000000,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,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,4,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,6,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2020.00000000000,R2,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,54,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,60,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-35,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-37,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-41,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-43,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-45,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-47,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,4,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-49,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,6,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-53,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-55,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2020.00000000000,R2,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-59,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-61,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,54,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,60,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.82824000000,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.24236000000,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,0.82824000000,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.24236000000,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,2.48588000000,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,1.65764000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2020.00000000000,R1,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.82824000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2020.00000000000,R2,gas,1.24236000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.82824000000,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,1.24236000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,2.48588000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2020.00000000000,R2,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2020.00000000000,R2,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.10411805880,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,0.37188194120,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,6.73747958469,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.15617708819,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,0.55782291181,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,10.10621937704,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.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.15617708819,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,0.55782291181,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,10.10621937704,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.31250000000,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,1.11616666667,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,20.22187500000,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.20838194120,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,0.74428472546,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,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2020.00000000000,R2,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-41,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,104,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,120,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,121,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,124,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-53,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-59,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-65,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-71,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-74,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-77,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-81,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-82,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-83,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-86,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2020.00000000000,R2,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-89,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,104,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-93,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,120,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-94,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,121,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,124,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.03748250117,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.09343415772,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.16658889407,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,3.43602088194,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.05622375175,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.14015123658,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.24988334111,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,5.15403132291,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.03748250117,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2020.00000000000,R1,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.05622375175,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.14015123658,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.24988334111,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,5.15403132291,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.11250000000,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.28043333333,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.50000000000,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,10.31287500000,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.07501749883,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.18699917561,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.33341110593,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,6.87685411806,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,160,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,10,2020.00000000000,R2,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2020.00000000000,R2,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,85,2020.00000000000,R2,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2020.00000000000,R2,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-51,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2020.00000000000,R2,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-59,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,160,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.30414967336,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.45622451003,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.30414967336,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.45622451003,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,0.91287500000,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.60872532664,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2020.00000000000,R1,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.30414967336,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.45622451003,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,0.30414967336,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.45622451003,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2020.00000000000,R2,gas,0.91287500000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2020.00000000000,R2,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2020.00000000000,R2,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.37188194120,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.04462361176,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.17849444704,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,2.88759391694,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,0.55782291181,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.06693541764,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.26774167056,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,4.33139087541,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,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.55782291181,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.06693541764,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.26774167056,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,4.33139087541,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,1.11616666667,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.13393333333,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,0.53573333333,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,8.66682600000,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,0.74428472546,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.08930972157,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.35723888630,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,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,125,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-35,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,13,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-39,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,29,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-47,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,61,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,104,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,106,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-59,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,109,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,120,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,121,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,122,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,125,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-71,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-75,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-83,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-87,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-95,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,125,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-99,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,13,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,29,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-107,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-111,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,61,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-119,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,104,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,106,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-123,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,109,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,120,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,121,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,122,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,125,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.09343415772,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.16658889407,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.11244750350,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.06783055530,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,10.30806264582,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.14015123658,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.24988334111,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.16867125525,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.10174583294,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,15.46209396874,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.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2025.00000000000,R1,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2025.00000000000,R1,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.14015123658,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.24988334111,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.16867125525,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.10174583294,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,15.46209396874,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.28043333333,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.50000000000,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.33750000000,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.20358666667,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,30.93862500000,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.18699917561,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.33341110593,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.22505249650,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.13575611137,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,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,28,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-49,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,37,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,53,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,78,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,87,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2025.00000000000,R2,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,103,2025.00000000000,R2,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-64,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,112,2025.00000000000,R2,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,128,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,162,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,178,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,187,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.28111875875,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.01019535138,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.42167813812,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.01529302706,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.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2025.00000000000,R1,gas,0.01019535138,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2020.00000000000,R1,gas,0.42167813812,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.01529302706,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,0.84375000000,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.03060033333,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.56263124125,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.02040498196,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2025.00000000000,R1,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2025.00000000000,R1,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2025.00000000000,R2,gas,0.01019535138,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.01529302706,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2025.00000000000,R2,gas,0.01019535138,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.01529302706,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2025.00000000000,R2,gas,0.03060033333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2025.00000000000,R2,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2025.00000000000,R2,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2025.00000000000,R2,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-51,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,104,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,106,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-59,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,120,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,121,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,122,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,124,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-67,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-71,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-79,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-83,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-91,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,9,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-99,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,24,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,25,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,26,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-103,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,41,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-107,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,58,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-111,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-115,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,89,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,104,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,106,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-123,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,120,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,121,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,122,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-127,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,124,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.09343415772,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.16658889407,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.11244750350,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.06783055530,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.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,30,2020.00000000000,R1,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2025.00000000000,R1,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2025.00000000000,R1,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2030.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,74,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2025.00000000000,R1,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2030.00000000000,R1,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,134,2025.00000000000,R1,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,194,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-53,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,30,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,31,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,32,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,33,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,34,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,60,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,61,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,62,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,63,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,64,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,74,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2025.00000000000,R2,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2025.00000000000,R2,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2030.00000000000,R2,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,134,2025.00000000000,R2,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-89,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,194,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,224,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.01019535138,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.28111875875,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.01529302706,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.42167813812,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.01019535138,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.01529302706,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.42167813812,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.03060033333,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,0.84375000000,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.02040498196,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.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.01019535138,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.01529302706,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.01019535138,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.01529302706,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.03060033333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.02040498196,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.09343415772,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.16658889407,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.11244750350,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.06783055530,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.09520000000,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.13089888941,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,39,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2035.00000000000,R1,power,0.19634833411,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2025.00000000000,R1,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2030.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.13089888941,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,86,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,109,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2035.00000000000,R1,power,0.19634833411,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,121,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2025.00000000000,R1,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2025.00000000000,R1,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2030.00000000000,R1,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2035.00000000000,R1,power,0.39288000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,156,2025.00000000000,R1,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,179,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,215,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,247,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,248,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,249,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,261,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2035.00000000000,R2,power,0.13089888941,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,35,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,36,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,37,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,38,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,39,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2035.00000000000,R2,power,0.19634833411,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,70,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,71,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,72,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,73,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,74,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2035.00000000000,R2,power,0.13089888941,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-76,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,86,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,105,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,106,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,107,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,108,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,109,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,110,2035.00000000000,R2,power,0.19634833411,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,121,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2020.00000000000,R2,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2020.00000000000,R2,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,142,2025.00000000000,R2,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,143,2025.00000000000,R2,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,144,2030.00000000000,R2,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,145,2035.00000000000,R2,power,0.39288000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,156,2025.00000000000,R2,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,178,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,179,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-97,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,215,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-104,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,247,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,248,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,249,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,250,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-111,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,261,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.00657214242,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.18121518842,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.00985821364,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.27182278263,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.00657214242,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.00985821364,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.27182278263,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.01972563195,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.54389936805,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.01315348953,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.36268417963,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.00657214242,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.00985821364,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.27182278263,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.00657214242,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.00985821364,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.27182278263,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.01972563195,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.54389936805,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.09343415772,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.16658889407,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.11244750350,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.06783055530,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.09520000000,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.13089888941,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2040.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2020.00000000000,R1,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2020.00000000000,R1,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,47,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.19634833411,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2040.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2025.00000000000,R1,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2030.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2035.00000000000,R1,power,0.13089888941,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2040.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2020.00000000000,R1,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2020.00000000000,R1,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,137,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,139,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2035.00000000000,R1,power,0.19634833411,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2040.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,155,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2025.00000000000,R1,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2030.00000000000,R1,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2035.00000000000,R1,power,0.39288000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,186,2040.00000000000,R1,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,200,2025.00000000000,R1,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,229,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,231,2040.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,245,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,270,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,271,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,272,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,273,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,274,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,275,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,276,2040.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,290,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,315,2020.00000000000,R1,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,316,2020.00000000000,R1,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,317,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,318,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,319,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,320,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,321,2040.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-63,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,335,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2035.00000000000,R2,power,0.13089888941,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2040.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,20,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,47,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,48,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,49,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2035.00000000000,R2,power,0.19634833411,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2040.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.09343415772,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.16658889407,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,95,2035.00000000000,R2,power,0.13089888941,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,96,2040.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-87,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,135,2020.00000000000,R2,power,0.14015123658,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,136,2020.00000000000,R2,power,0.24988334111,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,137,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,138,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,139,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2035.00000000000,R2,power,0.19634833411,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2040.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,155,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.28043333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.50000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2025.00000000000,R2,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2025.00000000000,R2,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2030.00000000000,R2,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,185,2035.00000000000,R2,power,0.39288000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,186,2040.00000000000,R2,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-103,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,200,2025.00000000000,R2,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,225,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,226,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,227,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,228,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,229,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,230,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,231,2040.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-111,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,245,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,270,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,271,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,272,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,273,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,274,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,275,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,276,2040.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-119,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,290,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,315,2020.00000000000,R2,power,0.18699917561,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,316,2020.00000000000,R2,power,0.33341110593,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,317,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,318,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,319,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,320,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,321,2040.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-127,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,335,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.00657214242,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.18121518842,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.00985821364,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.27182278263,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.00657214242,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.00985821364,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.27182278263,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.01972563195,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.54389936805,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.01315348953,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.36268417963,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.00657214242,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.00985821364,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.27182278263,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.00657214242,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.00985821364,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.27182278263,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.01972563195,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.54389936805,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,0.60988194120,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,0.46111805880,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,0.91482291181,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,0.69167708819,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,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,0.91482291181,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,0.69167708819,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,1.83050000000,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,1.38400000000,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,1.22061805880,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,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2045.00000000000,R2,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2045.00000000000,R2,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.11244750350,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.06783055530,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.09520000000,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.13089888941,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2040.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2045.00000000000,R1,power,0.26178889407,solarPV,"('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.09343415772,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.19634833411,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2040.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2045.00000000000,R1,power,0.39268334111,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2045.00000000000,R1,power,0.14015123658,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,56,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2025.00000000000,R1,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.13089888941,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2040.00000000000,R1,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2045.00000000000,R1,power,0.26178889407,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,86,2045.00000000000,R1,power,0.09343415772,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,96,2025.00000000000,R1,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2025.00000000000,R1,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2030.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.19634833411,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2040.00000000000,R1,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2045.00000000000,R1,power,0.39268334111,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2045.00000000000,R1,power,0.14015123658,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,136,2025.00000000000,R1,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,160,2025.00000000000,R1,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2025.00000000000,R1,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2030.00000000000,R1,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2035.00000000000,R1,power,0.39288000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2040.00000000000,R1,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2045.00000000000,R1,power,0.78573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,166,2045.00000000000,R1,power,0.28043333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,176,2025.00000000000,R1,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2040.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2045.00000000000,R1,power,0.52394443926,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2045.00000000000,R1,power,0.18699917561,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,216,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,240,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,241,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,242,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,243,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,244,2040.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2045.00000000000,R1,power,0.52394443926,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2045.00000000000,R1,power,0.18699917561,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,256,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,280,2025.00000000000,R1,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,281,2025.00000000000,R1,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,282,2030.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,283,2035.00000000000,R1,power,0.26198111059,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,284,2040.00000000000,R1,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,285,2045.00000000000,R1,power,0.52394443926,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,286,2045.00000000000,R1,power,0.18699917561,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,296,2025.00000000000,R1,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2035.00000000000,R2,power,0.13089888941,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2040.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2045.00000000000,R2,power,0.26178889407,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2045.00000000000,R2,power,0.09343415772,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-71,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,41,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,42,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,43,2035.00000000000,R2,power,0.19634833411,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,44,2040.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2045.00000000000,R2,power,0.39268334111,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2045.00000000000,R2,power,0.14015123658,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-79,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,56,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,80,2025.00000000000,R2,power,0.11244750350,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,81,2025.00000000000,R2,power,0.06783055530,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,82,2030.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,83,2035.00000000000,R2,power,0.13089888941,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,84,2040.00000000000,R2,power,0.09520000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,85,2045.00000000000,R2,power,0.26178889407,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,86,2045.00000000000,R2,power,0.09343415772,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-87,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,96,2025.00000000000,R2,power,10.30806264582,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2025.00000000000,R2,power,0.16867125525,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2025.00000000000,R2,power,0.10174583294,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2030.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2035.00000000000,R2,power,0.19634833411,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2040.00000000000,R2,power,0.14280000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2045.00000000000,R2,power,0.39268334111,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2045.00000000000,R2,power,0.14015123658,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-95,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,136,2025.00000000000,R2,power,15.46209396874,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,160,2025.00000000000,R2,power,0.33750000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,161,2025.00000000000,R2,power,0.20358666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,162,2030.00000000000,R2,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,163,2035.00000000000,R2,power,0.39288000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,164,2040.00000000000,R2,power,0.28573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,165,2045.00000000000,R2,power,0.78573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,166,2045.00000000000,R2,power,0.28043333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-103,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,176,2025.00000000000,R2,power,30.93862500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,200,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,201,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,202,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,203,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,204,2040.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,205,2045.00000000000,R2,power,0.52394443926,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,206,2045.00000000000,R2,power,0.18699917561,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-111,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,216,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,240,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,241,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,242,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,243,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,244,2040.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2045.00000000000,R2,power,0.52394443926,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2045.00000000000,R2,power,0.18699917561,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-119,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,256,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,280,2025.00000000000,R2,power,0.22505249650,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,281,2025.00000000000,R2,power,0.13575611137,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,282,2030.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,283,2035.00000000000,R2,power,0.26198111059,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,284,2040.00000000000,R2,power,0.19053333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,285,2045.00000000000,R2,power,0.52394443926,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,286,2045.00000000000,R2,power,0.18699917561,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-127,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,296,2025.00000000000,R2,power,20.63056235418,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.00657214242,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.18121518842,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.00985821364,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.27182278263,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.00657214242,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.00985821364,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.27182278263,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.01972563195,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.54389936805,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.01315348953,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.36268417963,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.00657214242,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.00985821364,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.27182278263,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.00657214242,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.18121518842,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.00985821364,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.27182278263,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.01972563195,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.54389936805,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.01315348953,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.36268417963,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index ac6fc59f..54105605 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,332 +63,332 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.30470000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.30470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.30330000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.30330000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
 "('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.45710000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.45710000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.45500000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.45500000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
 "('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30470000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30470000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30330000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.45710000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.45710000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.45500000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.45500000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.91460000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.91460000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.91030000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.91030000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.60990000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.60990000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.60700000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.60700000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
 "('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.60990000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.60990000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.60700000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.60700000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
 "('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
 "('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.60990000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.60990000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.60700000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.60700000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.33830000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.33830000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.33730000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.33730000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'night')",heat,R2,0.07490000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.50800000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.50800000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.50660000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.50660000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11860000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.11860000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.11850000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.11850000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.33830000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.33830000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.33730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.33730000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07490000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.50800000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.50800000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.50660000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.50660000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11860000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11860000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11850000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11850000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.01990000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.01990000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.01710000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.01710000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27420000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27420000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27390000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27390000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.67860000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.67860000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.67670000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.67670000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.16640000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.16640000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.16630000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.16630000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.67860000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.67860000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.67670000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.67670000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16640000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16640000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16630000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16630000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.67860000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.67860000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.67670000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.67670000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16640000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16640000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16630000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.37300000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.37300000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.37230000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.37230000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08370000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08370000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08360000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08360000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.56000000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56000000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.55890000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.55890000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.13240000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.13240000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.13230000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.13230000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37230000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37230000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08370000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08370000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08360000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08360000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56000000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56000000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.55890000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.55890000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13240000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13240000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13230000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13230000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.12330000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.12330000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.12120000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.12120000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30660000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30660000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30640000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.30640000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.74780000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.74780000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.74630000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.74630000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.18590000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.18590000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.18580000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.18580000000,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', 'early-morning')",electricity,R1,0.74780000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.74780000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.74630000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.74630000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18590000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18590000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18580000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18580000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.74780000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.74780000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.74630000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.74630000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18590000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18590000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18580000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18580000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.37930000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.37930000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.37880000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.37880000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.02350000000,2040
 "('all-year', 'all-week', 'night')",heat,R2,0.02350000000,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.56940000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56940000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.56850000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.56850000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.04330000000,2040
 "('all-year', 'all-week', 'morning')",heat,R2,0.04330000000,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', 'mid-afternoon')",electricity,R1,0.37930000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37880000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37880000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02350000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02350000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56940000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56940000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56850000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56850000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04330000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.04330000000,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.14160000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.14160000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.13990000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.13990000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13490000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13490000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13480000000,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,0.76020000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.76020000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.75910000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.75910000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.06850000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.06850000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.06840000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.06840000000,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', 'early-morning')",electricity,R1,0.76020000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.76020000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.75910000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.75910000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06850000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06850000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.06840000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.06840000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.76020000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.76020000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.75910000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.75910000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06850000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06850000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06840000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06840000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.41960000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.41960000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.41910000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.41910000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
 "('all-year', 'all-week', 'night')",heat,R1,0.02370000000,2045
 "('all-year', 'all-week', 'night')",heat,R2,0.02370000000,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.62970000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.62970000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.62900000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.62900000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
 "('all-year', 'all-week', 'morning')",heat,R1,0.04370000000,2045
 "('all-year', 'all-week', 'morning')",heat,R2,0.04370000000,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', 'mid-afternoon')",electricity,R1,0.41960000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41960000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.41910000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41910000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02370000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02370000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62970000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.62970000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62900000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.62900000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04370000000,2045
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.04370000000,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.26210000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.26210000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.26060000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.26060000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13650000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13650000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13640000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13640000000,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,0.84070000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.84070000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.83970000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.83970000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
 "('all-year', 'all-week', 'evening')",heat,R1,0.06920000000,2045
 "('all-year', 'all-week', 'evening')",heat,R2,0.06920000000,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', 'early-morning')",electricity,R1,0.84070000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.84070000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.83970000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.83970000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.06920000000,2045
 "('all-year', 'all-week', 'early-morning')",heat,R2,0.06920000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.84070000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.84070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.83970000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.83970000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06920000000,2045
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06920000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.44690000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.44690000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.44700000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.44700000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02490000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.02490000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02480000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.02480000000,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.67070000000,2050
@@ -399,12 +399,12 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'morning')",heat,R2,0.04630000000,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', 'mid-afternoon')",electricity,R1,0.44690000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44690000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44700000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44700000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02490000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02490000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02480000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.67070000000,2050
@@ -415,32 +415,32 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.04630000000,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.34370000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34370000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34390000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34390000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.14680000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.14680000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.14670000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.14670000000,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,0.89520000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89520000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89530000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89530000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
 "('all-year', 'all-week', 'evening')",heat,R1,0.07380000000,2050
 "('all-year', 'all-week', 'evening')",heat,R2,0.07380000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89520000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89520000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89530000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89530000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.07380000000,2050
 "('all-year', 'all-week', 'early-morning')",heat,R2,0.07380000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89520000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89520000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89530000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89530000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.07380000000,2050
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
new file mode 100644
index 00000000..fa374881
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..ea8602ea
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -0,0 +1,53 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,3.00000000000
+1,2035,gasCCGT,R1,2025,3.00000000000
+1,2040,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R1,2025,3.00000000000
+1,2049,gasCCGT,R1,2025,3.00000000000
+1,2050,gasCCGT,R1,2025,3.00000000000
+1,2054,gasCCGT,R1,2025,3.00000000000
+1,2055,gasCCGT,R1,2025,3.00000000000
+1,2064,gasCCGT,R1,2025,3.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,3.00000000000
+3,2035,gasCCGT,R2,2025,3.00000000000
+3,2040,gasCCGT,R2,2025,3.00000000000
+3,2045,gasCCGT,R2,2025,3.00000000000
+3,2049,gasCCGT,R2,2025,3.00000000000
+3,2050,gasCCGT,R2,2025,3.00000000000
+3,2054,gasCCGT,R2,2025,3.00000000000
+3,2055,gasCCGT,R2,2025,3.00000000000
+3,2064,gasCCGT,R2,2025,3.00000000000
+4,2025,solarPV,R1,2020,5.60870000000
+4,2030,solarPV,R1,2020,5.60870000000
+4,2035,solarPV,R1,2020,5.60870000000
+4,2040,solarPV,R1,2020,5.60870000000
+4,2045,solarPV,R1,2020,5.60870000000
+4,2049,solarPV,R1,2020,5.60870000000
+5,2030,solarPV,R1,2025,4.07170000000
+5,2035,solarPV,R1,2025,4.07170000000
+5,2040,solarPV,R1,2025,4.07170000000
+5,2045,solarPV,R1,2025,4.07170000000
+5,2049,solarPV,R1,2025,4.07170000000
+5,2050,solarPV,R1,2025,4.07170000000
+5,2054,solarPV,R1,2025,4.07170000000
+6,2030,solarPV,R2,2025,4.07170000000
+6,2035,solarPV,R2,2025,4.07170000000
+6,2040,solarPV,R2,2025,4.07170000000
+6,2045,solarPV,R2,2025,4.07170000000
+6,2049,solarPV,R2,2025,4.07170000000
+6,2050,solarPV,R2,2025,4.07170000000
+6,2054,solarPV,R2,2025,4.07170000000
+7,2025,windturbine,R1,2020,10.00000000000
+7,2030,windturbine,R1,2020,10.00000000000
+7,2035,windturbine,R1,2020,10.00000000000
+7,2040,windturbine,R1,2020,10.00000000000
+7,2045,windturbine,R1,2020,10.00000000000
+7,2049,windturbine,R1,2020,10.00000000000
+8,2025,windturbine,R2,2020,15.60870000000
+8,2030,windturbine,R2,2020,15.60870000000
+8,2035,windturbine,R2,2020,15.60870000000
+8,2040,windturbine,R2,2020,15.60870000000
+8,2045,windturbine,R2,2020,15.60870000000
+8,2049,windturbine,R2,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
new file mode 100644
index 00000000..91268246
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9eb83457
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f78b605a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..797266c4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -0,0 +1,125 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,3.00000000000
+0,2049,gasCCGT,R1,2025,3.00000000000
+0,2050,gasCCGT,R1,2025,3.00000000000
+0,2054,gasCCGT,R1,2025,3.00000000000
+0,2055,gasCCGT,R1,2025,3.00000000000
+0,2059,gasCCGT,R1,2025,3.00000000000
+0,2060,gasCCGT,R1,2025,3.00000000000
+0,2064,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R2,2025,3.00000000000
+1,2049,gasCCGT,R2,2025,3.00000000000
+1,2050,gasCCGT,R2,2025,3.00000000000
+1,2054,gasCCGT,R2,2025,3.00000000000
+1,2055,gasCCGT,R2,2025,3.00000000000
+1,2059,gasCCGT,R2,2025,3.00000000000
+1,2060,gasCCGT,R2,2025,3.00000000000
+1,2064,gasCCGT,R2,2025,3.00000000000
+2,2045,solarPV,R1,2020,5.60870000000
+2,2049,solarPV,R1,2020,5.60870000000
+3,2045,solarPV,R1,2025,4.07170000000
+3,2049,solarPV,R1,2025,4.07170000000
+3,2050,solarPV,R1,2025,4.07170000000
+3,2054,solarPV,R1,2025,4.07170000000
+4,2045,solarPV,R1,2030,5.71470000000
+4,2049,solarPV,R1,2030,5.71470000000
+4,2050,solarPV,R1,2030,5.71470000000
+4,2054,solarPV,R1,2030,5.71470000000
+4,2055,solarPV,R1,2030,5.71470000000
+4,2059,solarPV,R1,2030,5.71470000000
+5,2045,solarPV,R1,2035,7.85760000000
+5,2049,solarPV,R1,2035,7.85760000000
+5,2050,solarPV,R1,2035,7.85760000000
+5,2054,solarPV,R1,2035,7.85760000000
+5,2055,solarPV,R1,2035,7.85760000000
+5,2059,solarPV,R1,2035,7.85760000000
+5,2060,solarPV,R1,2035,7.85760000000
+5,2064,solarPV,R1,2035,7.85760000000
+6,2045,solarPV,R1,2040,5.71470000000
+6,2049,solarPV,R1,2040,5.71470000000
+6,2050,solarPV,R1,2040,5.71470000000
+6,2054,solarPV,R1,2040,5.71470000000
+6,2055,solarPV,R1,2040,5.71470000000
+6,2059,solarPV,R1,2040,5.71470000000
+6,2060,solarPV,R1,2040,5.71470000000
+6,2064,solarPV,R1,2040,5.71470000000
+6,2065,solarPV,R1,2040,5.71470000000
+6,2069,solarPV,R1,2040,5.71470000000
+7,2050,solarPV,R1,2045,15.71470000000
+7,2054,solarPV,R1,2045,15.71470000000
+7,2055,solarPV,R1,2045,15.71470000000
+7,2059,solarPV,R1,2045,15.71470000000
+7,2060,solarPV,R1,2045,15.71470000000
+7,2064,solarPV,R1,2045,15.71470000000
+7,2065,solarPV,R1,2045,15.71470000000
+7,2069,solarPV,R1,2045,15.71470000000
+7,2070,solarPV,R1,2045,15.71470000000
+7,2074,solarPV,R1,2045,15.71470000000
+8,2045,solarPV,R2,2025,4.07170000000
+8,2049,solarPV,R2,2025,4.07170000000
+8,2050,solarPV,R2,2025,4.07170000000
+8,2054,solarPV,R2,2025,4.07170000000
+9,2045,solarPV,R2,2030,4.07170000000
+9,2049,solarPV,R2,2030,4.07170000000
+9,2050,solarPV,R2,2030,4.07170000000
+9,2054,solarPV,R2,2030,4.07170000000
+9,2055,solarPV,R2,2030,4.07170000000
+9,2059,solarPV,R2,2030,4.07170000000
+10,2045,solarPV,R2,2035,7.85760000000
+10,2049,solarPV,R2,2035,7.85760000000
+10,2050,solarPV,R2,2035,7.85760000000
+10,2054,solarPV,R2,2035,7.85760000000
+10,2055,solarPV,R2,2035,7.85760000000
+10,2059,solarPV,R2,2035,7.85760000000
+10,2060,solarPV,R2,2035,7.85760000000
+10,2064,solarPV,R2,2035,7.85760000000
+11,2045,solarPV,R2,2040,5.71470000000
+11,2049,solarPV,R2,2040,5.71470000000
+11,2050,solarPV,R2,2040,5.71470000000
+11,2054,solarPV,R2,2040,5.71470000000
+11,2055,solarPV,R2,2040,5.71470000000
+11,2059,solarPV,R2,2040,5.71470000000
+11,2060,solarPV,R2,2040,5.71470000000
+11,2064,solarPV,R2,2040,5.71470000000
+11,2065,solarPV,R2,2040,5.71470000000
+11,2069,solarPV,R2,2040,5.71470000000
+12,2050,solarPV,R2,2045,15.71470000000
+12,2054,solarPV,R2,2045,15.71470000000
+12,2055,solarPV,R2,2045,15.71470000000
+12,2059,solarPV,R2,2045,15.71470000000
+12,2060,solarPV,R2,2045,15.71470000000
+12,2064,solarPV,R2,2045,15.71470000000
+12,2065,solarPV,R2,2045,15.71470000000
+12,2069,solarPV,R2,2045,15.71470000000
+12,2070,solarPV,R2,2045,15.71470000000
+12,2074,solarPV,R2,2045,15.71470000000
+13,2045,windturbine,R1,2020,10.00000000000
+13,2049,windturbine,R1,2020,10.00000000000
+14,2050,windturbine,R1,2045,5.60870000000
+14,2054,windturbine,R1,2045,5.60870000000
+14,2055,windturbine,R1,2045,5.60870000000
+14,2059,windturbine,R1,2045,5.60870000000
+14,2060,windturbine,R1,2045,5.60870000000
+14,2064,windturbine,R1,2045,5.60870000000
+14,2065,windturbine,R1,2045,5.60870000000
+14,2069,windturbine,R1,2045,5.60870000000
+14,2070,windturbine,R1,2045,5.60870000000
+14,2074,windturbine,R1,2045,5.60870000000
+15,2045,windturbine,R2,2020,15.60870000000
+15,2049,windturbine,R2,2020,15.60870000000
+16,2045,windturbine,R2,2030,1.64290000000
+16,2049,windturbine,R2,2030,1.64290000000
+16,2050,windturbine,R2,2030,1.64290000000
+16,2054,windturbine,R2,2030,1.64290000000
+16,2055,windturbine,R2,2030,1.64290000000
+16,2059,windturbine,R2,2030,1.64290000000
+17,2050,windturbine,R2,2045,5.60870000000
+17,2054,windturbine,R2,2045,5.60870000000
+17,2055,windturbine,R2,2045,5.60870000000
+17,2059,windturbine,R2,2045,5.60870000000
+17,2060,windturbine,R2,2045,5.60870000000
+17,2064,windturbine,R2,2045,5.60870000000
+17,2065,windturbine,R2,2045,5.60870000000
+17,2069,windturbine,R2,2045,5.60870000000
+17,2070,windturbine,R2,2045,5.60870000000
+17,2074,windturbine,R2,2045,5.60870000000
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
new file mode 100644
index 00000000..db2da871
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bba2293b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,11 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2025,heatpump,R1,2020,17.85870000000
+2,2030,heatpump,R1,2020,17.85870000000
+2,2034,heatpump,R1,2020,17.85870000000
+3,2025,heatpump,R2,2020,17.85870000000
+3,2030,heatpump,R2,2020,17.85870000000
+3,2034,heatpump,R2,2020,17.85870000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..b5155356
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,2.14290000000
+1,2034,gasboiler,R1,2025,2.14290000000
+1,2035,gasboiler,R1,2025,2.14290000000
+1,2039,gasboiler,R1,2025,2.14290000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,2.14290000000
+3,2034,gasboiler,R2,2025,2.14290000000
+3,2035,gasboiler,R2,2025,2.14290000000
+3,2039,gasboiler,R2,2025,2.14290000000
+4,2025,heatpump,R1,2020,17.85870000000
+4,2030,heatpump,R1,2020,17.85870000000
+4,2034,heatpump,R1,2020,17.85870000000
+5,2030,heatpump,R1,2025,8.57170000000
+5,2034,heatpump,R1,2025,8.57170000000
+5,2035,heatpump,R1,2025,8.57170000000
+5,2039,heatpump,R1,2025,8.57170000000
+6,2025,heatpump,R2,2020,17.85870000000
+6,2030,heatpump,R2,2020,17.85870000000
+6,2034,heatpump,R2,2020,17.85870000000
+7,2030,heatpump,R2,2025,8.57170000000
+7,2034,heatpump,R2,2025,8.57170000000
+7,2035,heatpump,R2,2025,8.57170000000
+7,2039,heatpump,R2,2025,8.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..8a37b512
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,2.14290000000
+0,2034,gasboiler,R1,2025,2.14290000000
+0,2035,gasboiler,R1,2025,2.14290000000
+0,2039,gasboiler,R1,2025,2.14290000000
+1,2030,gasboiler,R2,2025,2.14290000000
+1,2034,gasboiler,R2,2025,2.14290000000
+1,2035,gasboiler,R2,2025,2.14290000000
+1,2039,gasboiler,R2,2025,2.14290000000
+2,2030,heatpump,R1,2020,17.85870000000
+2,2034,heatpump,R1,2020,17.85870000000
+3,2030,heatpump,R1,2025,8.57170000000
+3,2034,heatpump,R1,2025,8.57170000000
+3,2035,heatpump,R1,2025,8.57170000000
+3,2039,heatpump,R1,2025,8.57170000000
+4,2035,heatpump,R1,2030,23.57330000000
+4,2039,heatpump,R1,2030,23.57330000000
+4,2040,heatpump,R1,2030,23.57330000000
+4,2044,heatpump,R1,2030,23.57330000000
+5,2030,heatpump,R2,2020,17.85870000000
+5,2034,heatpump,R2,2020,17.85870000000
+6,2030,heatpump,R2,2025,8.57170000000
+6,2034,heatpump,R2,2025,8.57170000000
+6,2035,heatpump,R2,2025,8.57170000000
+6,2039,heatpump,R2,2025,8.57170000000
+7,2035,heatpump,R2,2030,23.57330000000
+7,2039,heatpump,R2,2030,23.57330000000
+7,2040,heatpump,R2,2030,23.57330000000
+7,2044,heatpump,R2,2030,23.57330000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..d34aa52e
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,2.14290000000
+0,2039,gasboiler,R1,2025,2.14290000000
+1,2035,gasboiler,R2,2025,2.14290000000
+1,2039,gasboiler,R2,2025,2.14290000000
+2,2035,heatpump,R1,2025,8.57170000000
+2,2039,heatpump,R1,2025,8.57170000000
+3,2035,heatpump,R1,2030,23.57330000000
+3,2039,heatpump,R1,2030,23.57330000000
+3,2040,heatpump,R1,2030,23.57330000000
+3,2044,heatpump,R1,2030,23.57330000000
+4,2040,heatpump,R1,2035,16.42930000000
+4,2044,heatpump,R1,2035,16.42930000000
+4,2045,heatpump,R1,2035,16.42930000000
+4,2049,heatpump,R1,2035,16.42930000000
+5,2035,heatpump,R2,2025,8.57170000000
+5,2039,heatpump,R2,2025,8.57170000000
+6,2035,heatpump,R2,2030,23.57330000000
+6,2039,heatpump,R2,2030,23.57330000000
+6,2040,heatpump,R2,2030,23.57330000000
+6,2044,heatpump,R2,2030,23.57330000000
+7,2040,heatpump,R2,2035,16.42930000000
+7,2044,heatpump,R2,2035,16.42930000000
+7,2045,heatpump,R2,2035,16.42930000000
+7,2049,heatpump,R2,2035,16.42930000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..ca3f6cfa
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,21 @@
+asset,year,technology,region,installed,capacity
+0,2040,heatpump,R1,2030,23.57330000000
+0,2044,heatpump,R1,2030,23.57330000000
+1,2040,heatpump,R1,2035,16.42930000000
+1,2044,heatpump,R1,2035,16.42930000000
+1,2045,heatpump,R1,2035,16.42930000000
+1,2049,heatpump,R1,2035,16.42930000000
+2,2045,heatpump,R1,2040,29.28800000000
+2,2049,heatpump,R1,2040,29.28800000000
+2,2050,heatpump,R1,2040,29.28800000000
+2,2054,heatpump,R1,2040,29.28800000000
+3,2040,heatpump,R2,2030,23.57330000000
+3,2044,heatpump,R2,2030,23.57330000000
+4,2040,heatpump,R2,2035,16.42930000000
+4,2044,heatpump,R2,2035,16.42930000000
+4,2045,heatpump,R2,2035,16.42930000000
+4,2049,heatpump,R2,2035,16.42930000000
+5,2045,heatpump,R2,2040,29.28800000000
+5,2049,heatpump,R2,2040,29.28800000000
+5,2050,heatpump,R2,2040,29.28800000000
+5,2054,heatpump,R2,2040,29.28800000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..7f9d122a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,21 @@
+asset,year,technology,region,installed,capacity
+0,2045,heatpump,R1,2035,16.42930000000
+0,2049,heatpump,R1,2035,16.42930000000
+1,2045,heatpump,R1,2040,29.28800000000
+1,2049,heatpump,R1,2040,29.28800000000
+1,2050,heatpump,R1,2040,29.28800000000
+1,2054,heatpump,R1,2040,29.28800000000
+2,2050,heatpump,R1,2045,22.14400000000
+2,2054,heatpump,R1,2045,22.14400000000
+2,2055,heatpump,R1,2045,22.14400000000
+2,2059,heatpump,R1,2045,22.14400000000
+3,2045,heatpump,R2,2035,16.42930000000
+3,2049,heatpump,R2,2035,16.42930000000
+4,2045,heatpump,R2,2040,29.28800000000
+4,2049,heatpump,R2,2040,29.28800000000
+4,2050,heatpump,R2,2040,29.28800000000
+4,2054,heatpump,R2,2040,29.28800000000
+5,2050,heatpump,R2,2045,22.14400000000
+5,2054,heatpump,R2,2045,22.14400000000
+5,2055,heatpump,R2,2045,22.14400000000
+5,2059,heatpump,R2,2045,22.14400000000
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
new file mode 100644
index 00000000..02533b47
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..2cf8d713
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e03b6acf
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..ed5f57f1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f705f5ab
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e83a6d96
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..79c2096b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..bff478f6
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
deleted file mode 100644
index 428bf834..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/generate_model.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""
-ADD A NEW TIMESLICE
-
-timeslice_name: early-morning and late-afternoon
-timeslice_number: 7 and 8
-
-copy_from: evening (number=6)
-
-"""
-
-# File: settings.toml
-# Append {timeslice_name} to timeslices
-
-# For all files in technodata/preset
-# Copy rows for where Timeslice={copy_from.number},
-#   changing Timeslice to {timeslice_number}
-# >>> No values changed
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv
index d5d66ba2..578ab646 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearExport.csv
@@ -37,4 +37,4 @@ R2,Exports,2080,0,0,0,0,0,0
 R2,Exports,2085,0,0,0,0,0,0
 R2,Exports,2090,0,0,0,0,0,0
 R2,Exports,2095,0,0,0,0,0,0
-R2,Exports,2100,0,0,0,0,0,0
+R2,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv
index eb064aa9..1f9b8f3e 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/BaseYearImport.csv
@@ -37,4 +37,4 @@ R2,Imports,2080,0,0,0,0,0,0
 R2,Imports,2085,0,0,0,0,0,0
 R2,Imports,2090,0,0,0,0,0,0
 R2,Imports,2095,0,0,0,0,0,0
-R2,Imports,2100,0,0,0,0,0,0
+R2,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv
index 253b75ef..9691db73 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/GlobalCommodities.csv
@@ -1,7 +1,7 @@
 Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
+Electricity,Energy,electricity,0.0,1,PJ
 Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv
index dd25bbad..eb6950dd 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/input/Projections.csv
@@ -37,4 +37,4 @@ R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 06144269..1ffcec63 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -16,26 +16,28 @@ 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"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{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"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
 
 # Carbon budget control
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
@@ -50,7 +52,7 @@ commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
 [sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/residential/Agents.csv'
+agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [
@@ -63,6 +65,21 @@ constraints = [
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -80,6 +97,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -97,6 +121,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -108,11 +139,13 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1095
-all-year.all-week.morning = 1095
-all-year.all-week.mid-afternoon = 1095
-all-year.all-week.early-peak = 1095
-all-year.all-week.late-peak = 1095
-all-year.all-week.evening = 1095
-all-year.all-week.early-morning = 1095
-all-year.all-week.late-afternoon = 1095
+
+[timeslices.all-year.all-week]
+night = 1095
+morning = 1095
+mid-afternoon = 1095
+early-peak = 1095
+late-peak = 1095
+evening = 1095
+early-morning = 1095
+late-afternoon = 1095
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
index 3050e067..9ab1349d 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
@@ -1,5 +1,5 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv
index 913d062f..8e98856f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,0,0,0,0
-gassupply1,R2,2020,fixed,0,0,0,0,0
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
index bb45c4b4..cdeddecf 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv
index 8142f5e5..2e95999a 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
-gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
index f7d15839..b368d952 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv
index b5ca96ca..7a8e8503 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommIn.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
 windturbine,R2,2020,fixed,0,0,0,0,1,0
 windturbine,R2,2040,fixed,0,0,0,0,1,0
 solarPV,R2,2020,fixed,0,0,0,0,0,1
-solarPV,R2,2040,fixed,0,0,0,0,0,1
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
index 7edb7454..8ab0fef9 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
 windturbine,R2,2020,fixed,1,0,0,0,0,0
 windturbine,R2,2040,fixed,1,0,0,0,0,0
 solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv
index 15edcaec..5c648dca 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/ExistingCapacity.csv
@@ -4,4 +4,4 @@ windturbine,R1,PJ/y,0,0,0,0,0,0,0
 solarPV,R1,PJ/y,0,0,0,0,0,0,0
 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
 windturbine,R2,PJ/y,0,0,0,0,0,0,0
-solarPV,R2,PJ/y,0,0,0,0,0,0,0
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
index 53c509d2..70d10b89 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
index bce744a6..4bc0cede 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
 0,R1,gasboiler,1,0,0,0.714,0,0
 1,R1,gasboiler,2,0,0,1.071,0,0
 2,R1,gasboiler,3,0,0,0.714,0,0
 3,R1,gasboiler,4,0,0,1.071,0,0
 4,R1,gasboiler,5,0,0,2.143,0,0
 5,R1,gasboiler,6,0,0,1.429,0,0
-6,R1,gasboiler,7,0,0,1.429,0,0
-7,R1,gasboiler,8,0,0,1.429,0,0
+5,R1,gasboiler,7,0,0,1.429,0,0
+5,R1,gasboiler,8,0,0,1.429,0,0
 0,R2,gasboiler,1,0,0,0.714,0,0
 1,R2,gasboiler,2,0,0,1.071,0,0
 2,R2,gasboiler,3,0,0,0.714,0,0
 3,R2,gasboiler,4,0,0,1.071,0,0
 4,R2,gasboiler,5,0,0,2.143,0,0
 5,R2,gasboiler,6,0,0,1.429,0,0
-6,R2,gasboiler,7,0,0,1.429,0,0
-7,R2,gasboiler,8,0,0,1.429,0,0
+5,R2,gasboiler,7,0,0,1.429,0,0
+5,R2,gasboiler,8,0,0,1.429,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
index b79af2c9..5e1ea746 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
 0,R1,gasboiler,1,0,0,2.142,0,0
 1,R1,gasboiler,2,0,0,3.213,0,0
 2,R1,gasboiler,3,0,0,2.142,0,0
 3,R1,gasboiler,4,0,0,3.213,0,0
-4,R1,gasboiler,5,0,0,6.429,0,0
+4,R1,gasboiler,5,0,0,6.428999999999999,0,0
 5,R1,gasboiler,6,0,0,4.287,0,0
-6,R1,gasboiler,7,0,0,4.287,0,0
-7,R1,gasboiler,8,0,0,4.287,0,0
+5,R1,gasboiler,7,0,0,4.287,0,0
+5,R1,gasboiler,8,0,0,4.287,0,0
 0,R2,gasboiler,1,0,0,2.142,0,0
 1,R2,gasboiler,2,0,0,3.213,0,0
 2,R2,gasboiler,3,0,0,2.142,0,0
 3,R2,gasboiler,4,0,0,3.213,0,0
-4,R2,gasboiler,5,0,0,6.429,0,0
+4,R2,gasboiler,5,0,0,6.428999999999999,0,0
 5,R2,gasboiler,6,0,0,4.287,0,0
-6,R2,gasboiler,7,0,0,4.287,0,0
-7,R2,gasboiler,8,0,0,4.287,0,0
+5,R2,gasboiler,7,0,0,4.287,0,0
+5,R2,gasboiler,8,0,0,4.287,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv
deleted file mode 100644
index 1a179abe..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Agents.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv
index 50e0921c..3eedce97 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommIn.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,1.16,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0
 gasboiler,R2,2020,fixed,0,1.16,0,0,0
-heatpump,R2,2020,fixed,0.4,0,0,0,0
+heatpump,R2,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
index 4fac2bf4..bc310414 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,0,1,64.71,0
 heatpump,R1,2020,fixed,0,0,1,0,0
 gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
+heatpump,R2,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv
index 9c70c6f0..d57d56eb 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/ExistingCapacity.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasboiler,R1,PJ/y,10,5,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasboiler,R2,PJ/y,10,5,0,0,0,0,0
-heatpump,R2,PJ/y,0,0,0,0,0,0,0
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
index 23529b2d..94fe36a0 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..57ef9d5d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,17 @@
+asset,year,technology,region,installed,capacity
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2025,2.79440000000
+1,2035,gassupply1,R1,2025,2.79440000000
+1,2040,gassupply1,R1,2025,2.79440000000
+1,2045,gassupply1,R1,2025,2.79440000000
+1,2050,gassupply1,R1,2025,2.79440000000
+1,2064,gassupply1,R1,2025,2.79440000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2030,gassupply1,R2,2025,2.79440000000
+3,2035,gassupply1,R2,2025,2.79440000000
+3,2040,gassupply1,R2,2025,2.79440000000
+3,2045,gassupply1,R2,2025,2.79440000000
+3,2050,gassupply1,R2,2025,2.79440000000
+3,2064,gassupply1,R2,2025,2.79440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..223a9793
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..be63ee95
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..301ed041
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..33d01ddd
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..59af6136
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 2cc31660..377c773d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -1,445 +1,7 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-11,A1,5.00000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2020
-20,A2,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-29,A2,5.00000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-17,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-4,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2020
-0,A1,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2022
-3,A1,7.21490000000,R1,12,2020,R1,residential,heatpump,retrofit,2022
-14,A1,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2022
-17,A1,7.21490000000,R2,12,2020,R2,residential,heatpump,retrofit,2022
-28,A2,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2022
-31,A2,7.21490000000,R1,12,2020,R1,residential,heatpump,retrofit,2022
-42,A2,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2022
-45,A2,7.21490000000,R2,12,2020,R2,residential,heatpump,retrofit,2022
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2022
-15,A1,4.17990000000,R1,28,2020,R1,power,solarPV,retrofit,2022
-23,A1,8.00000000000,R1,42,2020,R1,power,windturbine,retrofit,2022
-40,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2022
-55,A1,4.17990000000,R2,28,2020,R2,power,solarPV,retrofit,2022
-63,A1,8.00000000000,R2,42,2020,R2,power,windturbine,retrofit,2022
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2022
-4,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2022
-2,A1,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2024
-11,A1,7.21490000000,R1,26,2020,R1,residential,heatpump,retrofit,2024
-12,A1,0.57150000000,R1,27,2022,R1,residential,heatpump,retrofit,2024
-32,A1,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2024
-41,A1,7.21490000000,R2,26,2020,R2,residential,heatpump,retrofit,2024
-42,A1,0.57150000000,R2,27,2022,R2,residential,heatpump,retrofit,2024
-62,A2,2.50000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2024
-71,A2,7.21490000000,R1,26,2020,R1,residential,heatpump,retrofit,2024
-72,A2,0.57150000000,R1,27,2022,R1,residential,heatpump,retrofit,2024
-92,A2,2.50000000000,R2,0,2020,R2,residential,gasboiler,retrofit,2024
-101,A2,7.21490000000,R2,26,2020,R2,residential,heatpump,retrofit,2024
-102,A2,0.57150000000,R2,27,2022,R2,residential,heatpump,retrofit,2024
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2024
-3,A1,0.40000000000,R1,1,2022,R1,power,gasCCGT,retrofit,2024
-30,A1,4.17990000000,R1,48,2020,R1,power,solarPV,retrofit,2024
-38,A1,8.00000000000,R1,64,2020,R1,power,windturbine,retrofit,2024
-39,A1,1.10810000000,R1,65,2022,R1,power,windturbine,retrofit,2024
-58,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2024
-59,A1,0.40000000000,R2,1,2022,R2,power,gasCCGT,retrofit,2024
-86,A1,4.17990000000,R2,48,2020,R2,power,solarPV,retrofit,2024
-94,A1,8.00000000000,R2,64,2020,R2,power,windturbine,retrofit,2024
-95,A1,1.10810000000,R2,65,2022,R2,power,windturbine,retrofit,2024
-2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2024
-15,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2024
-0,A1,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2026
-8,A1,7.21490000000,R1,14,2020,R1,residential,heatpump,retrofit,2026
-9,A1,0.57150000000,R1,15,2022,R1,residential,heatpump,retrofit,2026
-10,A1,1.76580000000,R1,16,2024,R1,residential,heatpump,retrofit,2026
-35,A1,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2026
-43,A1,7.21490000000,R2,14,2020,R2,residential,heatpump,retrofit,2026
-44,A1,0.57150000000,R2,15,2022,R2,residential,heatpump,retrofit,2026
-45,A1,1.76580000000,R2,16,2024,R2,residential,heatpump,retrofit,2026
-70,A2,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2026
-78,A2,7.21490000000,R1,14,2020,R1,residential,heatpump,retrofit,2026
-79,A2,0.57150000000,R1,15,2022,R1,residential,heatpump,retrofit,2026
-80,A2,1.76580000000,R1,16,2024,R1,residential,heatpump,retrofit,2026
-105,A2,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2026
-113,A2,7.21490000000,R2,14,2020,R2,residential,heatpump,retrofit,2026
-114,A2,0.57150000000,R2,15,2022,R2,residential,heatpump,retrofit,2026
-115,A2,1.76580000000,R2,16,2024,R2,residential,heatpump,retrofit,2026
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2026
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2026
-41,A1,4.17990000000,R1,51,2020,R1,power,solarPV,retrofit,2026
-48,A1,8.00000000000,R1,68,2020,R1,power,windturbine,retrofit,2026
-49,A1,1.10810000000,R1,69,2022,R1,power,windturbine,retrofit,2026
-64,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2026
-65,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2026
-105,A1,4.17990000000,R2,51,2020,R2,power,solarPV,retrofit,2026
-112,A1,8.00000000000,R2,68,2020,R2,power,windturbine,retrofit,2026
-113,A1,1.10810000000,R2,69,2022,R2,power,windturbine,retrofit,2026
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2026
-1,A1,3.12900000000,R1,1,2024,R1,gas,gassupply1,retrofit,2026
-20,A1,7.50000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2026
-21,A1,3.12900000000,R2,1,2024,R2,gas,gassupply1,retrofit,2026
-2,A1,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2028
-9,A1,7.21490000000,R1,14,2020,R1,residential,heatpump,retrofit,2028
-10,A1,0.57150000000,R1,15,2022,R1,residential,heatpump,retrofit,2028
-11,A1,1.76580000000,R1,16,2024,R1,residential,heatpump,retrofit,2028
-12,A1,0.57150000000,R1,17,2026,R1,residential,heatpump,retrofit,2028
-45,A1,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2028
-52,A1,7.21490000000,R2,14,2020,R2,residential,heatpump,retrofit,2028
-53,A1,0.57150000000,R2,15,2022,R2,residential,heatpump,retrofit,2028
-54,A1,1.76580000000,R2,16,2024,R2,residential,heatpump,retrofit,2028
-55,A1,0.57150000000,R2,17,2026,R2,residential,heatpump,retrofit,2028
-88,A2,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2028
-95,A2,7.21490000000,R1,14,2020,R1,residential,heatpump,retrofit,2028
-96,A2,0.57150000000,R1,15,2022,R1,residential,heatpump,retrofit,2028
-97,A2,1.76580000000,R1,16,2024,R1,residential,heatpump,retrofit,2028
-98,A2,0.57150000000,R1,17,2026,R1,residential,heatpump,retrofit,2028
-131,A2,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2028
-138,A2,7.21490000000,R2,14,2020,R2,residential,heatpump,retrofit,2028
-139,A2,0.57150000000,R2,15,2022,R2,residential,heatpump,retrofit,2028
-140,A2,1.76580000000,R2,16,2024,R2,residential,heatpump,retrofit,2028
-141,A2,0.57150000000,R2,17,2026,R2,residential,heatpump,retrofit,2028
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2028
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2028
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2028
-55,A1,4.17990000000,R1,72,2020,R1,power,solarPV,retrofit,2028
-61,A1,8.00000000000,R1,90,2020,R1,power,windturbine,retrofit,2028
-62,A1,1.10810000000,R1,91,2022,R1,power,windturbine,retrofit,2028
-75,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2028
-76,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2028
-77,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2028
-130,A1,4.17990000000,R2,72,2020,R2,power,solarPV,retrofit,2028
-136,A1,8.00000000000,R2,90,2020,R2,power,windturbine,retrofit,2028
-137,A1,1.10810000000,R2,91,2022,R2,power,windturbine,retrofit,2028
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2028
-1,A1,3.12900000000,R1,1,2024,R1,gas,gassupply1,retrofit,2028
-2,A1,1.81830000000,R1,2,2026,R1,gas,gassupply1,retrofit,2028
-28,A1,7.50000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2028
-29,A1,3.12900000000,R2,1,2024,R2,gas,gassupply1,retrofit,2028
-30,A1,1.81830000000,R2,2,2026,R2,gas,gassupply1,retrofit,2028
-2,A1,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2030
-8,A1,7.21490000000,R1,15,2020,R1,residential,heatpump,retrofit,2030
-9,A1,0.57150000000,R1,16,2022,R1,residential,heatpump,retrofit,2030
-10,A1,1.76580000000,R1,17,2024,R1,residential,heatpump,retrofit,2030
-11,A1,0.57150000000,R1,18,2026,R1,residential,heatpump,retrofit,2030
-12,A1,1.14290000000,R1,19,2028,R1,residential,heatpump,retrofit,2030
-50,A1,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2030
-56,A1,7.21490000000,R2,15,2020,R2,residential,heatpump,retrofit,2030
-57,A1,0.57150000000,R2,16,2022,R2,residential,heatpump,retrofit,2030
-58,A1,1.76580000000,R2,17,2024,R2,residential,heatpump,retrofit,2030
-59,A1,0.57150000000,R2,18,2026,R2,residential,heatpump,retrofit,2030
-60,A1,1.14290000000,R2,19,2028,R2,residential,heatpump,retrofit,2030
-98,A2,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2030
-104,A2,7.21490000000,R1,15,2020,R1,residential,heatpump,retrofit,2030
-105,A2,0.57150000000,R1,16,2022,R1,residential,heatpump,retrofit,2030
-106,A2,1.76580000000,R1,17,2024,R1,residential,heatpump,retrofit,2030
-107,A2,0.57150000000,R1,18,2026,R1,residential,heatpump,retrofit,2030
-108,A2,1.14290000000,R1,19,2028,R1,residential,heatpump,retrofit,2030
-146,A2,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2030
-152,A2,7.21490000000,R2,15,2020,R2,residential,heatpump,retrofit,2030
-153,A2,0.57150000000,R2,16,2022,R2,residential,heatpump,retrofit,2030
-154,A2,1.76580000000,R2,17,2024,R2,residential,heatpump,retrofit,2030
-155,A2,0.57150000000,R2,18,2026,R2,residential,heatpump,retrofit,2030
-156,A2,1.14290000000,R2,19,2028,R2,residential,heatpump,retrofit,2030
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2030
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2030
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2030
-3,A1,1.02420000000,R1,3,2028,R1,power,gasCCGT,retrofit,2030
-74,A1,4.17990000000,R1,100,2020,R1,power,solarPV,retrofit,2030
-80,A1,8.00000000000,R1,120,2020,R1,power,windturbine,retrofit,2030
-81,A1,1.10810000000,R1,121,2022,R1,power,windturbine,retrofit,2030
-94,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2030
-95,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2030
-96,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2030
-97,A1,1.02420000000,R2,3,2028,R2,power,gasCCGT,retrofit,2030
-168,A1,4.17990000000,R2,100,2020,R2,power,solarPV,retrofit,2030
-174,A1,8.00000000000,R2,120,2020,R2,power,windturbine,retrofit,2030
-175,A1,1.10810000000,R2,121,2022,R2,power,windturbine,retrofit,2030
-2,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-3,A1,3.12900000000,R1,1,2024,R1,gas,gassupply1,retrofit,2030
-4,A1,1.81830000000,R1,2,2026,R1,gas,gassupply1,retrofit,2030
-5,A1,1.68650000000,R1,3,2028,R1,gas,gassupply1,retrofit,2030
-44,A1,7.50000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2030
-45,A1,3.12900000000,R2,1,2024,R2,gas,gassupply1,retrofit,2030
-46,A1,1.81830000000,R2,2,2026,R2,gas,gassupply1,retrofit,2030
-47,A1,1.68650000000,R2,3,2028,R2,gas,gassupply1,retrofit,2030
-2,A1,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2032
-6,A1,0.57150000000,R1,15,2022,R1,residential,heatpump,retrofit,2032
-7,A1,1.76580000000,R1,16,2024,R1,residential,heatpump,retrofit,2032
-8,A1,0.57150000000,R1,17,2026,R1,residential,heatpump,retrofit,2032
-9,A1,1.14290000000,R1,18,2028,R1,residential,heatpump,retrofit,2032
-10,A1,8.92930000000,R1,19,2030,R1,residential,heatpump,retrofit,2032
-48,A1,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2032
-52,A1,0.57150000000,R2,15,2022,R2,residential,heatpump,retrofit,2032
-53,A1,1.76580000000,R2,16,2024,R2,residential,heatpump,retrofit,2032
-54,A1,0.57150000000,R2,17,2026,R2,residential,heatpump,retrofit,2032
-55,A1,1.14290000000,R2,18,2028,R2,residential,heatpump,retrofit,2032
-56,A1,8.92930000000,R2,19,2030,R2,residential,heatpump,retrofit,2032
-94,A2,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2032
-98,A2,0.57150000000,R1,15,2022,R1,residential,heatpump,retrofit,2032
-99,A2,1.76580000000,R1,16,2024,R1,residential,heatpump,retrofit,2032
-100,A2,0.57150000000,R1,17,2026,R1,residential,heatpump,retrofit,2032
-101,A2,1.14290000000,R1,18,2028,R1,residential,heatpump,retrofit,2032
-102,A2,8.92930000000,R1,19,2030,R1,residential,heatpump,retrofit,2032
-140,A2,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2032
-144,A2,0.57150000000,R2,15,2022,R2,residential,heatpump,retrofit,2032
-145,A2,1.76580000000,R2,16,2024,R2,residential,heatpump,retrofit,2032
-146,A2,0.57150000000,R2,17,2026,R2,residential,heatpump,retrofit,2032
-147,A2,1.14290000000,R2,18,2028,R2,residential,heatpump,retrofit,2032
-148,A2,8.92930000000,R2,19,2030,R2,residential,heatpump,retrofit,2032
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2032
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2032
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2032
-3,A1,1.02420000000,R1,3,2028,R1,power,gasCCGT,retrofit,2032
-4,A1,1.10660000000,R1,4,2030,R1,power,gasCCGT,retrofit,2032
-95,A1,4.17990000000,R1,132,2020,R1,power,solarPV,retrofit,2032
-111,A1,8.00000000000,R1,176,2020,R1,power,windturbine,retrofit,2032
-112,A1,1.10810000000,R1,177,2022,R1,power,windturbine,retrofit,2032
-125,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2032
-126,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2032
-127,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2032
-128,A1,1.02420000000,R2,3,2028,R2,power,gasCCGT,retrofit,2032
-129,A1,1.10660000000,R2,4,2030,R2,power,gasCCGT,retrofit,2032
-220,A1,4.17990000000,R2,132,2020,R2,power,solarPV,retrofit,2032
-236,A1,8.00000000000,R2,176,2020,R2,power,windturbine,retrofit,2032
-237,A1,1.10810000000,R2,177,2022,R2,power,windturbine,retrofit,2032
-0,A1,3.12900000000,R1,0,2024,R1,gas,gassupply1,retrofit,2032
-1,A1,1.81830000000,R1,1,2026,R1,gas,gassupply1,retrofit,2032
-2,A1,1.68650000000,R1,2,2028,R1,gas,gassupply1,retrofit,2032
-3,A1,9.08510000000,R1,3,2030,R1,gas,gassupply1,retrofit,2032
-54,A1,3.12900000000,R2,0,2024,R2,gas,gassupply1,retrofit,2032
-55,A1,1.81830000000,R2,1,2026,R2,gas,gassupply1,retrofit,2032
-56,A1,1.68650000000,R2,2,2028,R2,gas,gassupply1,retrofit,2032
-57,A1,9.08510000000,R2,3,2030,R2,gas,gassupply1,retrofit,2032
-2,A1,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2034
-14,A1,1.76580000000,R1,28,2024,R1,residential,heatpump,retrofit,2034
-15,A1,0.57150000000,R1,29,2026,R1,residential,heatpump,retrofit,2034
-16,A1,1.14290000000,R1,30,2028,R1,residential,heatpump,retrofit,2034
-17,A1,8.92930000000,R1,31,2030,R1,residential,heatpump,retrofit,2034
-18,A1,1.71440000000,R1,32,2032,R1,residential,heatpump,retrofit,2034
-56,A1,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2034
-68,A1,1.76580000000,R2,28,2024,R2,residential,heatpump,retrofit,2034
-69,A1,0.57150000000,R2,29,2026,R2,residential,heatpump,retrofit,2034
-70,A1,1.14290000000,R2,30,2028,R2,residential,heatpump,retrofit,2034
-71,A1,8.92930000000,R2,31,2030,R2,residential,heatpump,retrofit,2034
-72,A1,1.71440000000,R2,32,2032,R2,residential,heatpump,retrofit,2034
-110,A2,2.44860000000,R1,0,2024,R1,residential,gasboiler,retrofit,2034
-122,A2,1.76580000000,R1,28,2024,R1,residential,heatpump,retrofit,2034
-123,A2,0.57150000000,R1,29,2026,R1,residential,heatpump,retrofit,2034
-124,A2,1.14290000000,R1,30,2028,R1,residential,heatpump,retrofit,2034
-125,A2,8.92930000000,R1,31,2030,R1,residential,heatpump,retrofit,2034
-126,A2,1.71440000000,R1,32,2032,R1,residential,heatpump,retrofit,2034
-164,A2,2.44860000000,R2,0,2024,R2,residential,gasboiler,retrofit,2034
-176,A2,1.76580000000,R2,28,2024,R2,residential,heatpump,retrofit,2034
-177,A2,0.57150000000,R2,29,2026,R2,residential,heatpump,retrofit,2034
-178,A2,1.14290000000,R2,30,2028,R2,residential,heatpump,retrofit,2034
-179,A2,8.92930000000,R2,31,2030,R2,residential,heatpump,retrofit,2034
-180,A2,1.71440000000,R2,32,2032,R2,residential,heatpump,retrofit,2034
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2034
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2034
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2034
-3,A1,1.02420000000,R1,3,2028,R1,power,gasCCGT,retrofit,2034
-4,A1,1.10660000000,R1,4,2030,R1,power,gasCCGT,retrofit,2034
-5,A1,0.27290000000,R1,5,2032,R1,power,gasCCGT,retrofit,2034
-96,A1,4.17990000000,R1,132,2020,R1,power,solarPV,retrofit,2034
-97,A1,1.67190000000,R1,133,2032,R1,power,solarPV,retrofit,2034
-124,A1,8.00000000000,R1,198,2020,R1,power,windturbine,retrofit,2034
-125,A1,1.10810000000,R1,199,2022,R1,power,windturbine,retrofit,2034
-149,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2034
-150,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2034
-151,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2034
-152,A1,1.02420000000,R2,3,2028,R2,power,gasCCGT,retrofit,2034
-153,A1,1.10660000000,R2,4,2030,R2,power,gasCCGT,retrofit,2034
-154,A1,0.27290000000,R2,5,2032,R2,power,gasCCGT,retrofit,2034
-245,A1,4.17990000000,R2,132,2020,R2,power,solarPV,retrofit,2034
-246,A1,1.67190000000,R2,133,2032,R2,power,solarPV,retrofit,2034
-273,A1,8.00000000000,R2,198,2020,R2,power,windturbine,retrofit,2034
-274,A1,1.10810000000,R2,199,2022,R2,power,windturbine,retrofit,2034
-0,A1,3.12900000000,R1,0,2024,R1,gas,gassupply1,retrofit,2034
-1,A1,1.81830000000,R1,1,2026,R1,gas,gassupply1,retrofit,2034
-2,A1,1.68650000000,R1,2,2028,R1,gas,gassupply1,retrofit,2034
-3,A1,9.08510000000,R1,3,2030,R1,gas,gassupply1,retrofit,2034
-4,A1,0.45570000000,R1,4,2032,R1,gas,gassupply1,retrofit,2034
-55,A1,3.12900000000,R2,0,2024,R2,gas,gassupply1,retrofit,2034
-56,A1,1.81830000000,R2,1,2026,R2,gas,gassupply1,retrofit,2034
-57,A1,1.68650000000,R2,2,2028,R2,gas,gassupply1,retrofit,2034
-58,A1,9.08510000000,R2,3,2030,R2,gas,gassupply1,retrofit,2034
-59,A1,0.45570000000,R2,4,2032,R2,gas,gassupply1,retrofit,2034
-2,A1,1.31860000000,R1,0,2034,R1,residential,gasboiler,retrofit,2036
-12,A1,0.57150000000,R1,14,2026,R1,residential,heatpump,retrofit,2036
-13,A1,1.14290000000,R1,15,2028,R1,residential,heatpump,retrofit,2036
-14,A1,8.92930000000,R1,16,2030,R1,residential,heatpump,retrofit,2036
-15,A1,1.71440000000,R1,17,2032,R1,residential,heatpump,retrofit,2036
-16,A1,4.03870000000,R1,18,2034,R1,residential,heatpump,retrofit,2036
-54,A1,1.31860000000,R2,0,2034,R2,residential,gasboiler,retrofit,2036
-64,A1,0.57150000000,R2,14,2026,R2,residential,heatpump,retrofit,2036
-65,A1,1.14290000000,R2,15,2028,R2,residential,heatpump,retrofit,2036
-66,A1,8.92930000000,R2,16,2030,R2,residential,heatpump,retrofit,2036
-67,A1,1.71440000000,R2,17,2032,R2,residential,heatpump,retrofit,2036
-68,A1,4.03870000000,R2,18,2034,R2,residential,heatpump,retrofit,2036
-106,A2,1.31860000000,R1,0,2034,R1,residential,gasboiler,retrofit,2036
-116,A2,0.57150000000,R1,14,2026,R1,residential,heatpump,retrofit,2036
-117,A2,1.14290000000,R1,15,2028,R1,residential,heatpump,retrofit,2036
-118,A2,8.92930000000,R1,16,2030,R1,residential,heatpump,retrofit,2036
-119,A2,1.71440000000,R1,17,2032,R1,residential,heatpump,retrofit,2036
-120,A2,4.03870000000,R1,18,2034,R1,residential,heatpump,retrofit,2036
-158,A2,1.31860000000,R2,0,2034,R2,residential,gasboiler,retrofit,2036
-168,A2,0.57150000000,R2,14,2026,R2,residential,heatpump,retrofit,2036
-169,A2,1.14290000000,R2,15,2028,R2,residential,heatpump,retrofit,2036
-170,A2,8.92930000000,R2,16,2030,R2,residential,heatpump,retrofit,2036
-171,A2,1.71440000000,R2,17,2032,R2,residential,heatpump,retrofit,2036
-172,A2,4.03870000000,R2,18,2034,R2,residential,heatpump,retrofit,2036
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2036
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2036
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2036
-3,A1,1.02420000000,R1,3,2028,R1,power,gasCCGT,retrofit,2036
-4,A1,1.10660000000,R1,4,2030,R1,power,gasCCGT,retrofit,2036
-5,A1,0.27290000000,R1,5,2032,R1,power,gasCCGT,retrofit,2036
-90,A1,4.17990000000,R1,126,2020,R1,power,solarPV,retrofit,2036
-91,A1,1.67190000000,R1,127,2032,R1,power,solarPV,retrofit,2036
-92,A1,2.34070000000,R1,128,2034,R1,power,solarPV,retrofit,2036
-130,A1,8.00000000000,R1,210,2020,R1,power,windturbine,retrofit,2036
-131,A1,1.10810000000,R1,211,2022,R1,power,windturbine,retrofit,2036
-132,A1,2.20500000000,R1,212,2034,R1,power,windturbine,retrofit,2036
-154,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2036
-155,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2036
-156,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2036
-157,A1,1.02420000000,R2,3,2028,R2,power,gasCCGT,retrofit,2036
-158,A1,1.10660000000,R2,4,2030,R2,power,gasCCGT,retrofit,2036
-159,A1,0.27290000000,R2,5,2032,R2,power,gasCCGT,retrofit,2036
-244,A1,4.17990000000,R2,126,2020,R2,power,solarPV,retrofit,2036
-245,A1,1.67190000000,R2,127,2032,R2,power,solarPV,retrofit,2036
-246,A1,2.34070000000,R2,128,2034,R2,power,solarPV,retrofit,2036
-284,A1,8.00000000000,R2,210,2020,R2,power,windturbine,retrofit,2036
-285,A1,1.10810000000,R2,211,2022,R2,power,windturbine,retrofit,2036
-286,A1,2.20500000000,R2,212,2034,R2,power,windturbine,retrofit,2036
-0,A1,3.12900000000,R1,0,2024,R1,gas,gassupply1,retrofit,2036
-1,A1,1.81830000000,R1,1,2026,R1,gas,gassupply1,retrofit,2036
-2,A1,1.68650000000,R1,2,2028,R1,gas,gassupply1,retrofit,2036
-3,A1,9.08510000000,R1,3,2030,R1,gas,gassupply1,retrofit,2036
-4,A1,0.45570000000,R1,4,2032,R1,gas,gassupply1,retrofit,2036
-50,A1,3.12900000000,R2,0,2024,R2,gas,gassupply1,retrofit,2036
-51,A1,1.81830000000,R2,1,2026,R2,gas,gassupply1,retrofit,2036
-52,A1,1.68650000000,R2,2,2028,R2,gas,gassupply1,retrofit,2036
-53,A1,9.08510000000,R2,3,2030,R2,gas,gassupply1,retrofit,2036
-54,A1,0.45570000000,R2,4,2032,R2,gas,gassupply1,retrofit,2036
-2,A1,1.31860000000,R1,0,2034,R1,residential,gasboiler,retrofit,2038
-10,A1,1.14290000000,R1,13,2028,R1,residential,heatpump,retrofit,2038
-11,A1,8.92930000000,R1,14,2030,R1,residential,heatpump,retrofit,2038
-12,A1,1.71440000000,R1,15,2032,R1,residential,heatpump,retrofit,2038
-13,A1,4.03870000000,R1,16,2034,R1,residential,heatpump,retrofit,2038
-14,A1,1.71440000000,R1,17,2036,R1,residential,heatpump,retrofit,2038
-52,A1,1.31860000000,R2,0,2034,R2,residential,gasboiler,retrofit,2038
-60,A1,1.14290000000,R2,13,2028,R2,residential,heatpump,retrofit,2038
-61,A1,8.92930000000,R2,14,2030,R2,residential,heatpump,retrofit,2038
-62,A1,1.71440000000,R2,15,2032,R2,residential,heatpump,retrofit,2038
-63,A1,4.03870000000,R2,16,2034,R2,residential,heatpump,retrofit,2038
-64,A1,1.71440000000,R2,17,2036,R2,residential,heatpump,retrofit,2038
-102,A2,1.31860000000,R1,0,2034,R1,residential,gasboiler,retrofit,2038
-110,A2,1.14290000000,R1,13,2028,R1,residential,heatpump,retrofit,2038
-111,A2,8.92930000000,R1,14,2030,R1,residential,heatpump,retrofit,2038
-112,A2,1.71440000000,R1,15,2032,R1,residential,heatpump,retrofit,2038
-113,A2,4.03870000000,R1,16,2034,R1,residential,heatpump,retrofit,2038
-114,A2,1.71440000000,R1,17,2036,R1,residential,heatpump,retrofit,2038
-152,A2,1.31860000000,R2,0,2034,R2,residential,gasboiler,retrofit,2038
-160,A2,1.14290000000,R2,13,2028,R2,residential,heatpump,retrofit,2038
-161,A2,8.92930000000,R2,14,2030,R2,residential,heatpump,retrofit,2038
-162,A2,1.71440000000,R2,15,2032,R2,residential,heatpump,retrofit,2038
-163,A2,4.03870000000,R2,16,2034,R2,residential,heatpump,retrofit,2038
-164,A2,1.71440000000,R2,17,2036,R2,residential,heatpump,retrofit,2038
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2038
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2038
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2038
-3,A1,1.02420000000,R1,3,2028,R1,power,gasCCGT,retrofit,2038
-4,A1,1.10660000000,R1,4,2030,R1,power,gasCCGT,retrofit,2038
-5,A1,0.27290000000,R1,5,2032,R1,power,gasCCGT,retrofit,2038
-84,A1,4.17990000000,R1,120,2020,R1,power,solarPV,retrofit,2038
-85,A1,1.67190000000,R1,121,2032,R1,power,solarPV,retrofit,2038
-86,A1,2.34070000000,R1,122,2034,R1,power,solarPV,retrofit,2038
-87,A1,2.28590000000,R1,123,2036,R1,power,solarPV,retrofit,2038
-135,A1,8.00000000000,R1,220,2020,R1,power,windturbine,retrofit,2038
-136,A1,1.10810000000,R1,221,2022,R1,power,windturbine,retrofit,2038
-137,A1,2.20500000000,R1,222,2034,R1,power,windturbine,retrofit,2038
-156,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2038
-157,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2038
-158,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2038
-159,A1,1.02420000000,R2,3,2028,R2,power,gasCCGT,retrofit,2038
-160,A1,1.10660000000,R2,4,2030,R2,power,gasCCGT,retrofit,2038
-161,A1,0.27290000000,R2,5,2032,R2,power,gasCCGT,retrofit,2038
-240,A1,4.17990000000,R2,120,2020,R2,power,solarPV,retrofit,2038
-241,A1,1.67190000000,R2,121,2032,R2,power,solarPV,retrofit,2038
-242,A1,2.34070000000,R2,122,2034,R2,power,solarPV,retrofit,2038
-243,A1,2.28590000000,R2,123,2036,R2,power,solarPV,retrofit,2038
-291,A1,8.00000000000,R2,220,2020,R2,power,windturbine,retrofit,2038
-292,A1,1.10810000000,R2,221,2022,R2,power,windturbine,retrofit,2038
-293,A1,2.20500000000,R2,222,2034,R2,power,windturbine,retrofit,2038
-0,A1,3.12900000000,R1,0,2024,R1,gas,gassupply1,retrofit,2038
-1,A1,1.81830000000,R1,1,2026,R1,gas,gassupply1,retrofit,2038
-2,A1,1.68650000000,R1,2,2028,R1,gas,gassupply1,retrofit,2038
-3,A1,9.08510000000,R1,3,2030,R1,gas,gassupply1,retrofit,2038
-4,A1,0.45570000000,R1,4,2032,R1,gas,gassupply1,retrofit,2038
-45,A1,3.12900000000,R2,0,2024,R2,gas,gassupply1,retrofit,2038
-46,A1,1.81830000000,R2,1,2026,R2,gas,gassupply1,retrofit,2038
-47,A1,1.68650000000,R2,2,2028,R2,gas,gassupply1,retrofit,2038
-48,A1,9.08510000000,R2,3,2030,R2,gas,gassupply1,retrofit,2038
-49,A1,0.45570000000,R2,4,2032,R2,gas,gassupply1,retrofit,2038
-2,A1,1.31860000000,R1,0,2034,R1,residential,gasboiler,retrofit,2040
-8,A1,8.92930000000,R1,13,2030,R1,residential,heatpump,retrofit,2040
-9,A1,1.71440000000,R1,14,2032,R1,residential,heatpump,retrofit,2040
-10,A1,4.03870000000,R1,15,2034,R1,residential,heatpump,retrofit,2040
-11,A1,1.71440000000,R1,16,2036,R1,residential,heatpump,retrofit,2040
-12,A1,2.28590000000,R1,17,2038,R1,residential,heatpump,retrofit,2040
-50,A1,1.31860000000,R2,0,2034,R2,residential,gasboiler,retrofit,2040
-56,A1,8.92930000000,R2,13,2030,R2,residential,heatpump,retrofit,2040
-57,A1,1.71440000000,R2,14,2032,R2,residential,heatpump,retrofit,2040
-58,A1,4.03870000000,R2,15,2034,R2,residential,heatpump,retrofit,2040
-59,A1,1.71440000000,R2,16,2036,R2,residential,heatpump,retrofit,2040
-60,A1,2.28590000000,R2,17,2038,R2,residential,heatpump,retrofit,2040
-98,A2,1.31860000000,R1,0,2034,R1,residential,gasboiler,retrofit,2040
-104,A2,8.92930000000,R1,13,2030,R1,residential,heatpump,retrofit,2040
-105,A2,1.71440000000,R1,14,2032,R1,residential,heatpump,retrofit,2040
-106,A2,4.03870000000,R1,15,2034,R1,residential,heatpump,retrofit,2040
-107,A2,1.71440000000,R1,16,2036,R1,residential,heatpump,retrofit,2040
-108,A2,2.28590000000,R1,17,2038,R1,residential,heatpump,retrofit,2040
-146,A2,1.31860000000,R2,0,2034,R2,residential,gasboiler,retrofit,2040
-152,A2,8.92930000000,R2,13,2030,R2,residential,heatpump,retrofit,2040
-153,A2,1.71440000000,R2,14,2032,R2,residential,heatpump,retrofit,2040
-154,A2,4.03870000000,R2,15,2034,R2,residential,heatpump,retrofit,2040
-155,A2,1.71440000000,R2,16,2036,R2,residential,heatpump,retrofit,2040
-156,A2,2.28590000000,R2,17,2038,R2,residential,heatpump,retrofit,2040
-0,A1,0.40000000000,R1,0,2022,R1,power,gasCCGT,retrofit,2040
-1,A1,2.18510000000,R1,1,2024,R1,power,gasCCGT,retrofit,2040
-2,A1,0.91700000000,R1,2,2026,R1,power,gasCCGT,retrofit,2040
-3,A1,1.02420000000,R1,3,2028,R1,power,gasCCGT,retrofit,2040
-4,A1,1.10660000000,R1,4,2030,R1,power,gasCCGT,retrofit,2040
-5,A1,0.27290000000,R1,5,2032,R1,power,gasCCGT,retrofit,2040
-84,A1,4.17990000000,R1,120,2020,R1,power,solarPV,retrofit,2040
-85,A1,1.67190000000,R1,121,2032,R1,power,solarPV,retrofit,2040
-86,A1,2.34070000000,R1,122,2034,R1,power,solarPV,retrofit,2040
-87,A1,2.28590000000,R1,123,2036,R1,power,solarPV,retrofit,2040
-88,A1,2.28590000000,R1,124,2038,R1,power,solarPV,retrofit,2040
-152,A1,8.00000000000,R1,240,2020,R1,power,windturbine,retrofit,2040
-153,A1,1.10810000000,R1,241,2022,R1,power,windturbine,retrofit,2040
-154,A1,2.20500000000,R1,242,2034,R1,power,windturbine,retrofit,2040
-173,A1,0.40000000000,R2,0,2022,R2,power,gasCCGT,retrofit,2040
-174,A1,2.18510000000,R2,1,2024,R2,power,gasCCGT,retrofit,2040
-175,A1,0.91700000000,R2,2,2026,R2,power,gasCCGT,retrofit,2040
-176,A1,1.02420000000,R2,3,2028,R2,power,gasCCGT,retrofit,2040
-177,A1,1.10660000000,R2,4,2030,R2,power,gasCCGT,retrofit,2040
-178,A1,0.27290000000,R2,5,2032,R2,power,gasCCGT,retrofit,2040
-257,A1,4.17990000000,R2,120,2020,R2,power,solarPV,retrofit,2040
-258,A1,1.67190000000,R2,121,2032,R2,power,solarPV,retrofit,2040
-259,A1,2.34070000000,R2,122,2034,R2,power,solarPV,retrofit,2040
-260,A1,2.28590000000,R2,123,2036,R2,power,solarPV,retrofit,2040
-261,A1,2.28590000000,R2,124,2038,R2,power,solarPV,retrofit,2040
-325,A1,8.00000000000,R2,240,2020,R2,power,windturbine,retrofit,2040
-326,A1,1.10810000000,R2,241,2022,R2,power,windturbine,retrofit,2040
-327,A1,2.20500000000,R2,242,2034,R2,power,windturbine,retrofit,2040
-0,A1,3.12900000000,R1,0,2024,R1,gas,gassupply1,retrofit,2040
-1,A1,1.81830000000,R1,1,2026,R1,gas,gassupply1,retrofit,2040
-2,A1,1.68650000000,R1,2,2028,R1,gas,gassupply1,retrofit,2040
-3,A1,9.08510000000,R1,3,2030,R1,gas,gassupply1,retrofit,2040
-4,A1,0.45570000000,R1,4,2032,R1,gas,gassupply1,retrofit,2040
-45,A1,3.12900000000,R2,0,2024,R2,gas,gassupply1,retrofit,2040
-46,A1,1.81830000000,R2,1,2026,R2,gas,gassupply1,retrofit,2040
-47,A1,1.68650000000,R2,2,2028,R2,gas,gassupply1,retrofit,2040
-48,A1,9.08510000000,R2,3,2030,R2,gas,gassupply1,retrofit,2040
-49,A1,0.45570000000,R2,4,2032,R2,gas,gassupply1,retrofit,2040
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index 7442399f..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,2961 +0,0 @@
-,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,0.41412000000,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,0.62118000000,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,0.41412000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,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,1.24294000000,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,0.82882000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,57,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,9,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,57,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-16,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-17,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-18,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-19,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-20,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-21,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-22,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-23,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,57,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-24,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-25,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,9,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-26,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,17,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-27,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-28,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R2,33,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-29,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-30,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-31,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,57,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,13,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,37,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,73,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,76,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,85,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,88,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,13,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,16,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,28,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,37,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,40,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R2,52,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,61,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,73,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,76,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,85,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,88,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,13,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,37,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,73,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,76,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,85,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,88,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,13,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,16,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,25,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,28,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,37,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,40,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R2,49,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R2,52,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,61,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,73,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,76,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,85,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,88,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R1,26,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,59,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R1,76,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18787500000,R1,101,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,126,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,134,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,151,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,159,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,163,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,176,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R2,1,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,9,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,13,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R2,26,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R2,51,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,59,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,63,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R2,76,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,84,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,88,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18787500000,R2,101,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,126,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,134,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,138,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,151,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,159,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,163,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,176,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R1,8,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R1,21,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R1,24,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R1,28,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R1,44,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R1,48,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R1,68,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.38263888889,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38078814815,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03016074074,R1,88,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R1,101,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R1,104,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R1,108,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R1,121,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R1,124,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R1,128,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R1,141,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R1,144,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R1,148,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R2,8,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R2,21,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R2,24,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R2,28,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R2,44,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R2,48,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R2,61,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R2,68,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.38263888889,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38078814815,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03016074074,R2,88,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R2,101,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R2,104,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R2,108,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R2,121,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R2,124,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R2,128,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R2,141,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R2,144,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R2,148,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-50,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R1,8,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R1,21,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R1,24,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-53,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R1,28,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R1,44,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-56,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R1,48,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-59,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R1,68,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.38263888889,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38078814815,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-62,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03016074074,R1,88,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R1,101,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R1,104,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-65,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R1,108,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R1,121,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R1,124,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-68,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R1,128,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R1,141,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R1,144,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R1,148,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R2,4,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R2,8,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R2,21,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R2,24,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-77,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R2,28,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12748677866,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12687015295,R2,44,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-80,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01004888889,R2,48,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-81,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19123016799,R2,61,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-82,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19030522943,R2,64,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-83,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01507333333,R2,68,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.38263888889,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38078814815,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03016074074,R2,88,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R2,101,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R2,104,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-89,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R2,108,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R2,121,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R2,124,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-92,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R2,128,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-93,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25515211023,R2,141,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-94,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25391799520,R2,144,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-95,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02011185185,R2,148,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,16,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,23,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R1,31,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,46,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,53,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,69,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,73,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,76,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,83,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R1,91,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,99,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,106,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,113,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18787500000,R1,121,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,136,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,143,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,151,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,159,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,163,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,166,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,173,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,181,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,189,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,193,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,196,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,203,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R1,211,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,219,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,223,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,226,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,233,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R2,1,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,9,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,13,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,16,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,23,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R2,31,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,39,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,43,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,46,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,53,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259577695,R2,61,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,69,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,73,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,76,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,83,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389366542,R2,91,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,99,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,103,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,106,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,113,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18787500000,R2,121,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,129,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,133,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,136,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,143,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,151,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,159,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,163,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,166,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,173,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,181,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,189,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,193,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,196,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,203,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12527922305,R2,211,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,219,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,223,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,226,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,233,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,4,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,9,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,12,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,24,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,29,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,32,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,44,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,49,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,52,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,60,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,64,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,69,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,72,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,84,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R1,89,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R1,92,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,100,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,104,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,109,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,112,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,120,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,124,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,129,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,132,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,140,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,144,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,149,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,152,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,4,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,9,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,12,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,20,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,24,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,29,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,32,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,40,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,44,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,49,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,52,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,60,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,64,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,69,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,72,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R2,80,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,84,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R2,89,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R2,92,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,100,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,104,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,109,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,112,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,120,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,124,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,129,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,132,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,140,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,144,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,149,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,152,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,4,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,9,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-67,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,12,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,24,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,29,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-71,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,32,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,44,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,49,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-75,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,52,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R1,60,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,64,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,69,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-79,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,72,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,84,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R1,89,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R1,92,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,100,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,104,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,109,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-87,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,112,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,120,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,124,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,129,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-91,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,132,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R1,140,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,144,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,149,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-95,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,152,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,4,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,9,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,12,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,20,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,24,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,29,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,32,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12019277648,R2,40,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,44,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,49,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-107,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,52,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18028916472,R2,60,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,64,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,69,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,72,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36074666667,R2,80,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,84,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R2,89,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R2,92,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,100,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,104,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,109,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-119,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,112,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,120,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,124,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,129,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,132,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24055389019,R2,140,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,144,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,149,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-127,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,152,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,41,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,48,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,51,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,71,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,78,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,81,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,101,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,108,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,111,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,131,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,138,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,141,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,161,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,168,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,171,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,191,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,198,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,201,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,221,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,228,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,231,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,41,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,48,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,51,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,64,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,68,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,71,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,78,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,81,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,101,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,108,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,111,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,124,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,128,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,131,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,138,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,141,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,161,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,168,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,171,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,191,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,198,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,201,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,221,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,228,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,231,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,4,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R1,9,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R1,12,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,16,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R1,24,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,28,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R1,33,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R1,36,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,40,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,52,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R1,57,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R1,60,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,64,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R1,72,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,76,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R1,81,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R1,84,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,88,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37714424242,R1,96,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R1,100,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37117862788,R1,105,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09230555152,R1,108,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R1,112,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R1,120,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,124,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R1,129,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R1,132,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,136,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R1,144,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,148,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R1,153,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R1,156,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,160,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R1,168,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,172,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R1,177,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R1,180,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,184,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,4,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R2,9,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R2,12,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,16,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R2,24,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,28,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R2,33,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R2,36,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,40,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R2,48,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,52,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R2,57,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R2,60,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,64,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R2,72,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,76,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R2,81,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R2,84,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,88,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37714424242,R2,96,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R2,100,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37117862788,R2,105,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09230555152,R2,108,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R2,112,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R2,120,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,124,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R2,129,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R2,132,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,136,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R2,144,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,148,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R2,153,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R2,156,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,160,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R2,168,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,172,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R2,177,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R2,180,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,184,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,4,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R1,9,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R1,12,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-84,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,16,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-85,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R1,24,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-86,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,28,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-87,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R1,33,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-88,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R1,36,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-89,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,40,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,52,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-92,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R1,57,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-93,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R1,60,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-94,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R1,64,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R1,72,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-96,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,76,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-97,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R1,81,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-98,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R1,84,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-99,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R1,88,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37714424242,R1,96,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R1,100,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37117862788,R1,105,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09230555152,R1,108,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-104,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R1,112,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-105,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R1,120,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-106,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,124,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R1,129,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-108,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R1,132,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-109,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,136,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-110,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R1,144,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-111,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,148,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-112,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R1,153,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-113,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R1,156,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-114,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,160,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-115,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R1,168,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-116,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,172,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-117,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R1,177,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-118,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R1,180,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-119,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R1,184,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,4,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R2,9,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R2,12,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,16,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-125,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R2,24,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-126,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,28,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-127,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R2,33,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-128,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R2,36,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-129,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,40,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-130,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12565608450,R2,48,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-131,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,52,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-132,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12366847424,R2,57,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-133,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03075415949,R2,60,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-134,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00995272727,R2,64,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-135,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18848412676,R2,72,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-136,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,76,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-137,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18550271137,R2,81,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-138,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04613123923,R2,84,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-139,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01492909091,R2,88,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37714424242,R2,96,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R2,100,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37117862788,R2,105,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09230555152,R2,108,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02987212121,R2,112,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-145,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R2,120,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-146,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,124,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-147,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R2,129,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-148,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R2,132,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-149,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,136,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R2,144,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,148,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R2,153,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R2,156,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,160,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-155,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25148815792,R2,168,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-156,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,172,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-157,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24751015363,R2,177,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-158,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06155139203,R2,180,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-159,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01991939394,R2,184,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,46,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,53,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,56,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,61,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,81,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,88,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,91,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,96,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,116,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,123,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,126,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,131,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,151,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,158,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,161,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,166,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,186,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,193,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,196,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,201,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,221,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,228,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,231,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,236,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,249,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,253,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,256,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,263,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,266,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,271,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,39,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,43,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,46,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,53,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,56,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,61,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,74,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,78,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,81,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,88,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,91,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,96,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,116,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,123,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,126,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,131,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,144,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,148,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,151,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,158,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,161,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,166,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,179,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,183,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,186,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,193,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,196,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,201,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,221,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,228,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,231,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,236,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,249,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,253,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,256,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,263,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,266,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,271,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,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,electricity,0.00991666667,R1,4,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R1,9,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R1,12,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,16,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R1,20,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,32,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R1,37,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R1,40,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,44,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R1,48,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R1,56,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,60,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R1,65,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R1,68,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,72,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R1,76,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,88,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R1,93,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R1,96,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,100,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R1,104,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37577777778,R1,112,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R1,116,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36983377778,R1,121,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09197111111,R1,124,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R1,128,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05952777778,R1,132,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R1,140,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,144,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R1,149,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R1,152,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,156,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R1,160,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R1,168,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,172,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R1,177,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R1,180,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,184,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R1,188,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R1,196,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,200,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R1,205,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R1,208,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,212,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R1,216,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,4,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R2,9,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R2,12,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,16,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R2,20,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R2,28,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,32,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R2,37,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R2,40,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,44,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R2,48,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R2,56,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,60,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R2,65,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R2,68,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,72,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R2,76,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,88,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R2,93,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R2,96,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,100,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R2,104,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37577777778,R2,112,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R2,116,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36983377778,R2,121,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09197111111,R2,124,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R2,128,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05952777778,R2,132,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R2,140,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,144,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R2,149,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R2,152,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,156,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R2,160,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R2,168,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,172,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R2,177,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R2,180,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,184,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R2,188,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R2,196,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,200,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R2,205,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R2,208,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,212,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R2,216,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,4,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R1,9,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R1,12,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,16,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R1,20,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,32,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R1,37,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R1,40,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,44,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R1,48,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R1,56,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,60,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R1,65,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R1,68,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R1,72,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R1,76,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,88,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R1,93,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R1,96,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R1,100,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R1,104,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37577777778,R1,112,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R1,116,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36983377778,R1,121,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09197111111,R1,124,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R1,128,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05952777778,R1,132,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R1,140,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,144,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R1,149,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R1,152,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,156,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R1,160,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R1,168,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,172,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R1,177,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R1,180,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,184,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R1,188,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R1,196,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,200,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R1,205,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R1,208,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R1,212,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R1,216,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R2,0,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,4,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R2,9,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R2,12,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,16,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R2,20,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R2,28,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,32,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R2,37,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R2,40,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,44,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R2,48,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12520080883,R2,56,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,60,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12322040006,R2,65,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03064273137,R2,68,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00991666667,R2,72,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01983333333,R2,76,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18780121325,R2,84,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,88,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18483060009,R2,93,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04596409706,R2,96,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01487500000,R2,100,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02975000000,R2,104,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.37577777778,R2,112,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R2,116,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36983377778,R2,121,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09197111111,R2,124,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02976388889,R2,128,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05952777778,R2,132,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R2,140,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,144,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R2,149,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R2,152,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,156,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R2,160,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R2,168,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,172,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R2,177,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R2,180,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,184,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R2,188,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25057696894,R2,196,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,200,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24661337772,R2,205,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06132837974,R2,208,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01984722222,R2,212,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03969444444,R2,216,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,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.13327111526,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.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,31,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,44,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,51,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,58,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,61,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,66,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,71,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,91,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,98,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,101,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,106,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,111,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,131,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,138,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,141,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,146,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,151,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,164,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,168,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,171,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,178,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,181,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,186,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R1,191,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,204,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,208,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,211,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,218,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,221,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,226,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,231,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,244,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,248,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,251,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,258,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,261,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,266,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,271,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,284,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,288,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,291,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,298,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,301,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,306,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,311,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,31,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,44,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,48,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,51,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,58,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,61,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,66,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,71,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,84,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,88,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,91,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,98,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,101,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,106,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,111,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,124,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,128,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,131,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,138,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,141,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,146,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,151,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,164,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,168,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,171,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,178,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,181,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,186,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R2,191,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,204,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,208,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,211,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,218,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,221,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,226,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,231,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,244,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,248,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,251,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,258,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,261,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,266,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-104,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,271,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,284,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,288,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,291,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,298,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,301,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,306,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-111,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,311,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,0,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,5,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,8,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,12,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,16,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,20,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,28,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,33,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,36,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,40,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,44,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,56,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,61,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,64,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,68,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,72,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,76,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,84,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,89,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,92,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,96,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,100,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,104,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,112,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R1,117,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R1,120,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,124,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,128,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,140,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,145,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,148,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,152,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,156,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,160,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,168,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,173,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,176,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,180,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,184,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,188,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,196,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,201,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,204,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,208,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,212,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,216,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,0,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,5,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,8,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,12,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,16,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,20,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,28,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,33,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,36,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,40,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,44,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,56,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,61,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,64,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,68,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,72,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,76,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,84,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,89,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,92,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,96,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,100,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,104,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,112,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R2,117,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R2,120,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,124,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,128,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,132,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,140,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,145,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,148,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,152,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,156,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,160,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,168,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,173,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,176,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,180,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,184,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,188,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,196,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,201,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,204,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,208,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,212,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,216,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,0,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,5,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,8,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,12,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,16,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,20,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,28,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,33,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,36,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,40,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,44,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,56,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,61,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,64,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,68,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,72,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,76,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,84,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,89,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,92,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,96,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,100,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,104,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,112,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R1,117,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R1,120,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,124,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,128,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,140,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,145,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,148,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,152,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,156,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,160,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,168,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,173,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,176,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,180,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,184,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,188,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,196,2022.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,201,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,204,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,208,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,212,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,216,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,0,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,5,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,8,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,12,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,16,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,20,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,28,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,33,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,36,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,40,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,44,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,56,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,61,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,64,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,68,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,72,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,76,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,84,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,89,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,92,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,96,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,100,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,104,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,112,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R2,117,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R2,120,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,124,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,128,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,132,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,140,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,145,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,148,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,152,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,156,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,160,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,168,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,173,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,176,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,180,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,184,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,188,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,196,2022.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,201,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,204,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,208,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,212,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,216,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,31,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,36,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,61,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,68,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,71,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,76,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,81,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-15,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,86,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,104,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,108,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,111,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,118,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,121,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,126,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,131,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-23,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,136,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,161,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,168,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,171,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,176,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,181,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-31,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,186,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,204,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,208,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,211,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,218,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,221,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,226,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R1,231,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-39,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R1,236,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,254,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,258,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,261,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,268,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,271,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,276,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,281,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,286,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,304,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,308,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,311,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,318,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,321,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,326,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,331,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-55,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,336,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,354,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,358,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,361,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,368,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,371,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,376,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,381,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-63,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,386,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,31,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-71,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,36,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,54,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,58,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,61,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,68,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,71,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,76,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,81,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-79,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,86,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,104,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,108,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,111,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,118,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,121,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,126,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,131,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-87,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,136,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,161,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,168,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,171,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,176,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,181,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-95,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,186,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,204,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,208,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,211,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,218,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,221,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,226,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R2,231,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-103,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R2,236,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,254,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,258,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,261,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,268,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,271,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,276,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,281,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-111,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,286,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,304,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,308,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,311,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,318,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,321,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,326,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,331,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-119,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,336,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,354,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,358,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,361,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,368,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,371,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,376,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,381,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-127,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,386,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,1,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,4,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,8,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,12,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,20,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,33,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,36,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,40,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,44,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,52,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,65,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,68,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,72,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,76,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,84,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,97,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,100,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,104,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,108,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,116,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R1,129,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R1,132,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,136,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,140,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,144,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,148,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,161,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,164,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,168,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,172,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,176,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,180,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,193,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,196,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,200,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,204,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,208,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,212,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,225,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,228,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,232,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,236,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,240,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,244,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,1,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,4,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,8,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,12,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,16,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,20,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,33,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,36,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,40,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,44,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,52,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,65,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,68,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,72,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,76,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,80,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,84,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,97,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,100,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,104,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,108,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,112,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,116,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R2,129,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R2,132,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,136,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,140,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,144,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,148,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,161,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,164,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,168,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,172,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,176,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,180,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,193,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,196,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,200,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,204,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,208,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,212,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,225,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,228,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,232,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,236,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,240,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,244,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,1,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,4,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,8,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,12,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,20,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,33,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,36,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,40,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,44,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,52,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R1,65,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R1,68,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,72,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,76,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,84,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R1,97,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R1,100,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,104,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,108,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,116,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R1,129,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R1,132,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,136,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,140,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,144,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,148,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,161,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,164,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,168,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,172,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,176,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,180,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,193,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,196,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,200,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,204,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,208,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,212,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R1,225,2024.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R1,228,2024.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,232,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,236,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,240,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,244,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,1,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,4,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,8,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,12,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,16,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,20,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,33,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,36,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,40,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,44,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,48,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,52,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11829158406,R2,65,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02941702212,R2,68,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,72,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,76,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,80,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,84,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17743737609,R2,97,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04412553318,R2,100,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,104,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,108,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,112,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,116,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35504042667,R2,129,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08829226667,R2,132,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,136,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,140,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,144,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,148,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,161,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,164,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,168,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,172,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,176,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,180,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,193,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,196,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,200,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,204,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,208,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,212,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23674884261,R2,225,2024.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05887524455,R2,228,2024.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,232,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,236,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,240,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,244,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,31,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,36,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,41,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,49,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,71,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,78,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,81,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-15,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,86,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-16,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,91,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-17,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,96,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-18,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,101,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-19,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,109,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,131,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,138,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,141,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-25,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,146,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-26,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,151,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-27,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,156,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-28,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,161,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-29,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,169,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,191,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,198,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,201,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,206,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-36,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,211,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-37,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,216,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-38,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,221,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-39,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,229,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,244,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,248,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,251,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,258,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,261,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,266,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R1,271,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R1,276,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-48,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R1,281,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-49,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R1,289,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,304,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,308,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,311,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,318,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,321,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-55,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,326,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-56,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,331,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-57,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,336,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-58,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,341,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-59,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,349,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,364,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,368,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,371,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,378,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,381,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,386,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-66,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,391,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-67,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,396,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-68,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,401,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-69,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,409,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,424,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,428,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,431,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,438,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,441,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,446,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,451,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-77,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,456,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-78,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,461,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-79,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,469,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,31,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-87,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,36,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-88,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,41,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-89,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,49,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,64,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,68,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,71,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,78,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,81,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,86,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-96,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,91,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-97,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,96,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-98,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,101,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-99,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,109,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-100,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,124,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-101,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,128,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-102,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,131,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-103,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,138,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-104,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,141,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-105,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,146,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-106,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,151,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-107,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,156,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-108,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,161,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-109,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,169,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-110,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-111,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-112,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,191,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-113,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,198,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-114,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,201,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-115,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,206,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-116,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,211,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-117,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,216,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-118,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,221,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-119,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,229,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,244,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,248,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,251,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,258,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,261,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,266,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R2,271,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-127,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R2,276,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-128,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R2,281,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-129,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R2,289,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-130,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,304,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-131,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,308,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-132,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,311,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-133,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,318,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-134,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,321,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-135,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,326,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-136,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,331,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-137,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,336,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-138,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,341,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-139,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,349,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-140,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,364,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-141,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,368,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-142,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,371,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-143,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,378,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-144,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,381,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-145,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,386,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-146,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,391,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-147,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,396,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-148,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,401,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-149,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,409,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-150,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,424,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-151,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,428,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-152,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,431,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-153,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,438,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-154,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,441,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-155,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,446,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-156,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,451,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-157,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,456,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-158,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,461,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-159,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,469,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,0,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,4,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,12,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,17,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,20,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,28,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,32,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,40,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,45,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,48,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,56,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,60,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,68,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,73,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,76,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,84,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,88,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,96,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,101,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,104,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,112,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,116,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,120,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,124,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R1,129,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R1,132,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,140,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,144,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,148,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,152,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,157,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,160,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,168,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,172,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,176,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,180,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,185,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,188,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,196,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,200,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,204,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,208,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,213,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,216,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,0,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,4,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,8,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,12,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,17,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,20,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,28,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,32,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,36,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,40,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,45,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,48,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,56,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,60,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,64,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,68,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,73,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,76,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,84,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,88,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,92,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,96,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,101,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,104,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,112,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,116,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,120,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,124,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R2,129,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R2,132,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,140,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,144,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,148,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,152,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,157,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,160,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,168,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,172,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,176,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,180,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,185,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,188,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,196,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,200,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,204,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,208,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,213,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,216,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,0,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,4,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,12,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,17,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,20,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,28,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,32,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,40,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,45,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,48,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R1,56,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,60,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,68,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,73,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,76,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R1,84,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,88,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,96,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,101,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,104,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R1,112,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,116,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,120,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,124,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R1,129,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R1,132,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,140,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,144,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,148,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,152,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,157,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,160,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,168,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,172,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,176,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,180,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,185,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,188,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R1,196,2026.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,200,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,204,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,208,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,213,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,216,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,0,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,4,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,8,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,12,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,17,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,20,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,28,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,32,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,36,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,40,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,45,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,48,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.00952000000,R2,56,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,60,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,64,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,68,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,73,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,76,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01428000000,R2,84,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,88,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,92,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,96,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,101,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,104,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02857333333,R2,112,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,116,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,120,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,124,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R2,129,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R2,132,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,140,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,144,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,148,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,152,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,157,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,160,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,168,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,172,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,176,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,180,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,185,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,188,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01905333333,R2,196,2026.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,200,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,204,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,208,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,213,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,216,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,31,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,36,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,41,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,49,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-10,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R1,54,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-11,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R1,58,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,69,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,73,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,76,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,83,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,86,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,91,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-18,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,96,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-19,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,101,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-20,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,106,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-21,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,114,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-22,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R1,119,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-23,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R1,123,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,134,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,141,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,148,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,151,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,156,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,161,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-31,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,166,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-32,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,171,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-33,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,179,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-34,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R1,184,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-35,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R1,188,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,199,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,203,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,206,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,213,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,216,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,221,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-42,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,226,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-43,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,231,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-44,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,236,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-45,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,244,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-46,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R1,249,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-47,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R1,253,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,264,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,268,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,271,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,278,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,281,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,286,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R1,291,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-55,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R1,296,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-56,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R1,301,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-57,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R1,309,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-58,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11703626667,R1,314,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-59,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11024889600,R1,318,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,329,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,333,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,336,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,343,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,346,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,351,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-66,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,356,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-67,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,361,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-68,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,366,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-69,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,374,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-70,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,379,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-71,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,383,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,394,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,398,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,401,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,408,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,411,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,416,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,421,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-79,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,426,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-80,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,431,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-81,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,439,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-82,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,444,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-83,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,448,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,459,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,463,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,466,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,473,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,476,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,481,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,486,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-91,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,491,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-92,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,496,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-93,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,504,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-94,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,509,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-95,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,513,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,31,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-103,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,36,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-104,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,41,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-105,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,49,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-106,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R2,54,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-107,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R2,58,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-108,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,69,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-109,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,73,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-110,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,76,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-111,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,83,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-112,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,86,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-113,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,91,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-114,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,96,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-115,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,101,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-116,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,106,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-117,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,114,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-118,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R2,119,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-119,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R2,123,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,134,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,138,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,141,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,148,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,151,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,156,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,161,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-127,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,166,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-128,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,171,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-129,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,179,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-130,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R2,184,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-131,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R2,188,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-132,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,199,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-133,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,203,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-134,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,206,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-135,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,213,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-136,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,216,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-137,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,221,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-138,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,226,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-139,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,231,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-140,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,236,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-141,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,244,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-142,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R2,249,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-143,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R2,253,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-144,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,264,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-145,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,268,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-146,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,271,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-147,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,278,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-148,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,281,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-149,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,286,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-150,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R2,291,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-151,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R2,296,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-152,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R2,301,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-153,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R2,309,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-154,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11703626667,R2,314,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-155,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11024889600,R2,318,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-156,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,329,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-157,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,333,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-158,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,336,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-159,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,343,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-160,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,346,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-161,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,351,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-162,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,356,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-163,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,361,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-164,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,366,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-165,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,374,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-166,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,379,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-167,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,383,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-168,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,394,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-169,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,398,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-170,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,401,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-171,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,408,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-172,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,411,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-173,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,416,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-174,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,421,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-175,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,426,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-176,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,431,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-177,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,439,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-178,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,444,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-179,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,448,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-180,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,459,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-181,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,463,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-182,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,466,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-183,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,473,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-184,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,476,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-185,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,481,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-186,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,486,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-187,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,491,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-188,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,496,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-189,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,504,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-190,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,509,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-191,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,513,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,0,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,4,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,8,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,13,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,16,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,20,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,28,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,36,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,41,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,44,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,48,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,56,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,64,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,69,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,72,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,76,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,84,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,92,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,97,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,100,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,104,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,112,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,116,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,120,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R1,125,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R1,128,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,132,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,140,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,144,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,148,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,153,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,156,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,160,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,168,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,172,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,176,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,181,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,184,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,188,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,196,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,200,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,204,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,209,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,212,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,216,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,0,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,4,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,8,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,13,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,16,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,20,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,28,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,32,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,36,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,41,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,44,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,48,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,56,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,60,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,64,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,69,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,72,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,76,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,84,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,88,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,92,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,97,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,100,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,104,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,112,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,116,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,120,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R2,125,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R2,128,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,132,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,140,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,144,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,148,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,153,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,156,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,160,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,168,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,172,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,176,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,181,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,184,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,188,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,196,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,200,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,204,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,209,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,212,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,216,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,0,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,4,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,8,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,13,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,16,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,20,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,28,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,36,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,41,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,44,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,48,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R1,56,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,64,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,69,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,72,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,76,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,84,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,92,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,97,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,100,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,104,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R1,112,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,116,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,120,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R1,125,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R1,128,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,132,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,140,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,144,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,148,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,153,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,156,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,160,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,168,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,172,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,176,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,181,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,184,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,188,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R1,196,2028.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,200,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,204,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,209,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,212,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,216,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,0,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,4,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,8,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,13,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,16,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,20,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,28,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,32,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,36,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,41,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,44,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,48,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.01904000000,R2,56,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,60,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,64,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,69,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,72,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,76,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,84,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,88,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,92,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,97,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,100,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,104,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05714666667,R2,112,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,116,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,120,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R2,125,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R2,128,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,132,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,140,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,144,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,148,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,153,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,156,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,160,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,168,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,172,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,176,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,181,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,184,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,188,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03810666667,R2,196,2028.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,200,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,204,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,209,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,212,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,216,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,31,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,36,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,41,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,49,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-10,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R1,54,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-11,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R1,58,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-12,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R1,64,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-14,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,81,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-16,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,88,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-17,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,91,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-18,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,96,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-19,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,101,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-20,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,106,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-21,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,111,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-22,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,119,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-23,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R1,124,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-24,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R1,128,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-25,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R1,134,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-28,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,151,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-29,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,158,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-30,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,161,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-31,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,166,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-32,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,171,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-33,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,176,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-34,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,181,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-35,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,189,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-36,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R1,194,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-37,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R1,198,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-38,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R1,204,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,221,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-42,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,228,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-43,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,231,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-44,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,236,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-45,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,241,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-46,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,246,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-47,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,251,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-48,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,259,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-49,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R1,264,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-50,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R1,268,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-51,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R1,274,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,284,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,288,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,291,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,298,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-56,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,301,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-57,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,306,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-58,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R1,311,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-59,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R1,316,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-60,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R1,321,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-61,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R1,329,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-62,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11703626667,R1,334,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-63,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11024889600,R1,338,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-64,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11429333333,R1,344,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,354,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,358,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,361,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,368,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,371,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-70,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,376,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-71,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,381,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-72,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,386,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-73,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,391,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-74,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,399,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-75,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,404,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-76,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,408,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-77,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,414,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,424,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,428,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,431,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,438,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,441,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,446,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-84,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,451,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-85,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,456,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-86,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,461,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-87,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,469,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-88,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,474,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-89,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,478,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-90,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,484,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,494,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,498,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,501,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,508,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,511,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,516,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,521,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-98,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,526,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-99,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,531,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-100,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,539,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-101,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,544,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-102,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,548,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-103,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,554,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,31,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-111,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,36,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-112,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,41,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-113,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,49,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-114,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R2,54,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-115,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R2,58,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-116,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R2,64,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-117,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,74,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-118,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,78,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-119,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,81,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-120,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,88,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-121,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,91,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-122,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,96,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-123,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,101,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-124,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,106,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-125,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,111,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-126,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,119,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-127,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R2,124,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-128,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R2,128,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-129,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R2,134,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-130,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,144,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-131,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,148,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-132,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,151,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-133,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,158,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-134,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,161,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-135,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,166,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-136,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,171,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-137,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,176,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-138,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,181,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-139,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,189,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-140,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R2,194,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-141,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R2,198,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-142,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R2,204,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-143,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-144,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-145,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,221,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-146,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,228,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-147,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,231,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-148,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,236,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-149,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,241,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-150,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,246,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-151,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,251,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-152,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,259,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-153,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R2,264,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-154,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R2,268,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-155,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R2,274,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-156,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,284,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-157,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,288,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-158,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,291,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-159,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,298,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-160,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,301,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-161,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,306,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-162,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R2,311,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-163,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R2,316,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-164,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R2,321,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-165,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R2,329,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-166,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11703626667,R2,334,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-167,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11024889600,R2,338,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-168,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11429333333,R2,344,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-169,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,354,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-170,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,358,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-171,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,361,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-172,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,368,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-173,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,371,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-174,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,376,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-175,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,381,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-176,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,386,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-177,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,391,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-178,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,399,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-179,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,404,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-180,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,408,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-181,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,414,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-182,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,424,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-183,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,428,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-184,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,431,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-185,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,438,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-186,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,441,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-187,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,446,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-188,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,451,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-189,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,456,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-190,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,461,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-191,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,469,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-192,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,474,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-193,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,478,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-194,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,484,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-195,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,494,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-196,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,498,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-197,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,501,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-198,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,508,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-199,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,511,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-200,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,516,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-201,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,521,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-202,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,526,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-203,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,531,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-204,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,539,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-205,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,544,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-206,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,548,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-207,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,554,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,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,electricity,0.02856000000,R1,4,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,9,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,12,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,16,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R1,20,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,32,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,37,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,40,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,44,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R1,48,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,56,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,60,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,65,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,68,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,72,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R1,76,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,88,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,93,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,96,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,100,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R1,104,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,116,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R1,121,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R1,124,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,128,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.11429333333,R1,132,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,140,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,144,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,149,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,152,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,156,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R1,160,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,168,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,172,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,177,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,180,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,184,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R1,188,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,196,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,200,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,205,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,208,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,212,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R1,216,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,0,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,4,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,9,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,12,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,16,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R2,20,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,28,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,32,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,37,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,40,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,44,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R2,48,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,56,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,60,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,65,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,68,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,72,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R2,76,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,84,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,88,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,93,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,96,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,100,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R2,104,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,112,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,116,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R2,121,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R2,124,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,128,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.11429333333,R2,132,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,140,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,144,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,149,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,152,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,156,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R2,160,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,168,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,172,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,177,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,180,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,184,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R2,188,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,196,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,200,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,205,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,208,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,212,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R2,216,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,4,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,9,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,12,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,16,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R1,20,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,32,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,37,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,40,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,44,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R1,48,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,56,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,60,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R1,65,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R1,68,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R1,72,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R1,76,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,88,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R1,93,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R1,96,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R1,100,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R1,104,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,116,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R1,121,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R1,124,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R1,128,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.11429333333,R1,132,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,140,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,144,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,149,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,152,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,156,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R1,160,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,168,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,172,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,177,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,180,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,184,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R1,188,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,196,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,200,2032.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R1,205,2034.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R1,208,2034.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R1,212,2036.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R1,216,2038.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,0,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,4,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,9,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,12,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,16,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R2,20,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,28,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,32,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,37,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,40,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,44,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R2,48,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,56,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,60,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06370435078,R2,65,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.06728020601,R2,68,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.02856000000,R2,72,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.03808000000,R2,76,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,84,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,88,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09555652618,R2,93,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10092030901,R2,96,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04284000000,R2,100,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05712000000,R2,104,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,112,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,116,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19120227413,R2,121,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20193484800,R2,124,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08572000000,R2,128,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.11429333333,R2,132,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,140,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,144,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,149,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,152,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,156,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R2,160,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,168,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,172,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,177,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,180,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,184,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R2,188,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,196,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,200,2032.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12749792335,R2,205,2034.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13465464199,R2,208,2034.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05716000000,R2,212,2036.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07621333333,R2,216,2038.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,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.13327111526,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.02503831078,R1,11,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,18,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,21,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,26,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,31,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,36,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,41,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,49,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-10,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R1,54,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-11,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R1,58,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-12,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R1,64,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-13,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R1,69,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,79,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,86,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,93,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,96,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,101,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,106,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-21,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,111,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-22,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,116,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-23,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,124,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-24,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R1,129,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-25,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R1,133,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-26,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R1,139,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-27,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R1,144,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R1,161,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R1,168,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R1,171,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R1,176,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R1,181,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-35,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R1,186,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-36,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R1,191,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-37,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R1,199,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-38,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R1,204,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-39,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R1,208,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-40,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R1,214,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-41,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R1,219,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R1,236,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R1,243,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R1,246,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R1,251,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R1,256,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-49,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R1,261,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-50,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R1,266,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-51,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R1,274,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-52,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R1,279,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-53,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R1,283,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-54,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R1,289,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-55,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R1,294,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R1,304,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R1,308,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R1,311,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R1,318,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R1,321,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R1,326,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R1,331,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-63,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R1,336,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-64,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R1,341,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-65,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R1,349,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-66,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11703626667,R1,354,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-67,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11024889600,R1,358,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-68,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11429333333,R1,364,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-69,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11429333333,R1,369,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,379,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,383,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,386,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,393,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,396,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,401,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,406,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-77,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,411,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-78,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,416,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-79,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,424,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-80,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,429,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-81,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,433,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-82,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,439,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-83,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,444,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,454,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,458,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,461,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,468,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,471,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,476,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,481,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-91,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,486,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-92,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,491,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-93,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,499,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-94,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,504,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-95,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,508,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-96,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,514,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-97,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,519,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R1,529,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R1,533,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R1,536,2022.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R1,543,2022.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R1,546,2024.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R1,551,2026.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-104,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R1,556,2028.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-105,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R1,561,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-106,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R1,566,2032.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-107,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R1,574,2032.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-108,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R1,579,2034.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-109,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R1,583,2034.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-110,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,589,2036.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-111,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R1,594,2038.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,11,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,18,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,21,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,26,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,31,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-119,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,36,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-120,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,41,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-121,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,49,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-122,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R2,54,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-123,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R2,58,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-124,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R2,64,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-125,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R2,69,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-126,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,79,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-127,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,83,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-128,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,86,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-129,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,93,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-130,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,96,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-131,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,101,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-132,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,106,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-133,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,111,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-134,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,116,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-135,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,124,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-136,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R2,129,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-137,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R2,133,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-138,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R2,139,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-139,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R2,144,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-140,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06963193654,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-141,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13327111526,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-142,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02503831078,R2,161,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-143,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.01845953025,R2,168,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-144,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13677970452,R2,171,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-145,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05740090579,R2,176,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-146,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06410965785,R2,181,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-147,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06927023636,R2,186,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-148,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.01707946639,R2,191,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-149,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02785277462,R2,199,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-150,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03899388446,R2,204,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-151,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03673248331,R2,208,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-152,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R2,214,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-153,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03808000000,R2,219,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-154,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10444790481,R2,229,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-155,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19990667289,R2,233,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-156,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03755746617,R2,236,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-157,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.02768929538,R2,243,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-158,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20516955678,R2,246,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-159,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08610135868,R2,251,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-160,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09616448678,R2,256,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-161,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10390535454,R2,261,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-162,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.02561919959,R2,266,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-163,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04177916192,R2,274,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-164,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05849082669,R2,279,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-165,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05509872497,R2,283,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-166,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R2,289,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-167,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05712000000,R2,294,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-168,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20899333333,R2,304,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-169,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40000000000,R2,308,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-170,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07515000000,R2,311,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-171,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.05540444444,R2,318,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-172,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41053068178,R2,321,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-173,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17228311079,R2,326,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-174,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.19241876299,R2,331,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-175,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20790772622,R2,336,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-176,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05126232000,R2,341,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-177,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08359733333,R2,349,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-178,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11703626667,R2,354,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-179,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11024889600,R2,358,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-180,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11429333333,R2,364,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-181,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.11429333333,R2,369,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-182,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,379,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-183,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,383,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-184,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,386,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-185,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,393,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-186,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,396,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-187,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,401,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-188,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,406,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-189,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,411,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-190,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,416,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-191,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,424,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-192,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,429,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-193,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,433,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-194,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,439,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-195,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,444,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-196,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,454,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-197,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,458,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-198,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,461,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-199,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,468,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-200,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,471,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-201,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,476,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-202,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,481,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-203,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,486,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-204,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,491,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-205,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,499,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-206,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,504,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-207,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,508,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-208,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,514,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-209,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,519,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-210,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13936139680,R2,529,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-211,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26672888474,R2,533,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-212,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05011168922,R2,536,2022.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-213,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.03694491419,R2,543,2022.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-214,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27375097726,R2,546,2024.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-215,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11488220500,R2,551,2026.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-216,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12830910514,R2,556,2028.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-217,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13863748986,R2,561,2030.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-218,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03418285361,R2,566,2032.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-219,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05574455872,R2,574,2032.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-220,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07804238221,R2,579,2034.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-221,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07351641269,R2,583,2034.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-222,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,589,2036.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-223,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07621333333,R2,594,2038.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Supply.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Supply.csv
deleted file mode 100644
index c19f2f95..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,4545 +0,0 @@
-,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,0.35700000000,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,23.10147000000,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,0.53550000000,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,34.65220500000,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,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.53550000000,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,34.65220500000,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,1.07150000000,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,69.33676500000,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,0.71450000000,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,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,4,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,6,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2020.00000000000,R2,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,54,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,60,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-33,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-35,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-37,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-39,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-41,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-43,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-45,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-47,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,4,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-49,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,6,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-53,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-55,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2020.00000000000,R2,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-59,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-61,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,54,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,60,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.82824000000,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.24236000000,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,0.82824000000,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.24236000000,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,2.48588000000,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,1.65764000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2020.00000000000,R1,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.82824000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2020.00000000000,R2,gas,1.24236000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.82824000000,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,1.24236000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,2.48588000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2020.00000000000,R2,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2020.00000000000,R2,gas,1.65764000000,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,9,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2020.00000000000,R1,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2020.00000000000,R1,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,57,2020.00000000000,R1,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,69,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,81,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,9,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,21,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,33,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2020.00000000000,R2,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2020.00000000000,R2,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,57,2020.00000000000,R2,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-41,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,69,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,81,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,9,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-51,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-52,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-53,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-57,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-58,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-59,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2020.00000000000,R1,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2020.00000000000,R1,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,57,2020.00000000000,R1,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-63,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-65,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,69,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,81,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-71,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,6,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,7,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-74,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,9,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-77,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,21,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,33,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-81,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-82,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-83,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,54,2020.00000000000,R2,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,55,2020.00000000000,R2,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-86,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,57,2020.00000000000,R2,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,66,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,67,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-89,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,69,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,78,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,79,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,81,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-93,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-94,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,10,2020.00000000000,R1,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2020.00000000000,R1,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,77,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,85,2020.00000000000,R1,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2020.00000000000,R1,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,127,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,160,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,10,2020.00000000000,R2,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2022.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2020.00000000000,R2,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2022.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2022.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,85,2020.00000000000,R2,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2022.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-51,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2020.00000000000,R2,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2022.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2022.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-59,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,160,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2022.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2022.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.30414967336,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,0.45622451003,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.30414967336,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.45622451003,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.91287500000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2020.00000000000,R1,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.30414967336,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2022.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2020.00000000000,R2,gas,0.45622451003,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2022.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.30414967336,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2022.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,0.45622451003,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2022.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,0.91287500000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2022.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2020.00000000000,R2,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2022.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2022.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2020.00000000000,R2,gas,0.60872532664,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2022.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2020.00000000000,R1,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2020.00000000000,R1,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2022.00000000000,R1,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2020.00000000000,R1,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2020.00000000000,R1,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2022.00000000000,R1,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2020.00000000000,R1,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2020.00000000000,R1,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2020.00000000000,R1,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2022.00000000000,R1,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2020.00000000000,R1,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2020.00000000000,R1,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2020.00000000000,R1,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2022.00000000000,R1,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2020.00000000000,R1,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2020.00000000000,R1,residential,0.32986111111,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2020.00000000000,R1,residential,0.95197037037,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2022.00000000000,R1,residential,0.07540185185,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2020.00000000000,R1,residential,21.34531250000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2020.00000000000,R1,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2020.00000000000,R1,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2022.00000000000,R1,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,115,2020.00000000000,R1,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2020.00000000000,R1,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2020.00000000000,R1,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2022.00000000000,R1,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2020.00000000000,R1,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,150,2020.00000000000,R1,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,151,2020.00000000000,R1,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,152,2022.00000000000,R1,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,155,2020.00000000000,R1,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2020.00000000000,R2,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,11,2020.00000000000,R2,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2022.00000000000,R2,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,15,2020.00000000000,R2,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2020.00000000000,R2,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2020.00000000000,R2,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,32,2022.00000000000,R2,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2020.00000000000,R2,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,50,2020.00000000000,R2,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,51,2020.00000000000,R2,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2022.00000000000,R2,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,55,2020.00000000000,R2,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2020.00000000000,R2,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2020.00000000000,R2,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2022.00000000000,R2,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,75,2020.00000000000,R2,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2020.00000000000,R2,residential,0.32986111111,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2020.00000000000,R2,residential,0.95197037037,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,92,2022.00000000000,R2,residential,0.07540185185,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-51,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,95,2020.00000000000,R2,residential,21.34531250000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,110,2020.00000000000,R2,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,111,2020.00000000000,R2,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2022.00000000000,R2,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,115,2020.00000000000,R2,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2020.00000000000,R2,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2020.00000000000,R2,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,132,2022.00000000000,R2,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-59,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2020.00000000000,R2,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,150,2020.00000000000,R2,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,151,2020.00000000000,R2,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,152,2022.00000000000,R2,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,155,2020.00000000000,R2,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2020.00000000000,R1,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2020.00000000000,R1,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2022.00000000000,R1,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-67,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2020.00000000000,R1,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2020.00000000000,R1,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2022.00000000000,R1,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-71,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2020.00000000000,R1,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2020.00000000000,R1,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2020.00000000000,R1,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2022.00000000000,R1,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-75,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2020.00000000000,R1,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2020.00000000000,R1,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2020.00000000000,R1,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2022.00000000000,R1,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-79,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2020.00000000000,R1,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2020.00000000000,R1,residential,0.32986111111,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2020.00000000000,R1,residential,0.95197037037,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2022.00000000000,R1,residential,0.07540185185,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-83,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2020.00000000000,R1,residential,21.34531250000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2020.00000000000,R1,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2020.00000000000,R1,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2022.00000000000,R1,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-87,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,115,2020.00000000000,R1,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2020.00000000000,R1,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2020.00000000000,R1,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2022.00000000000,R1,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-91,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2020.00000000000,R1,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,150,2020.00000000000,R1,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,151,2020.00000000000,R1,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,152,2022.00000000000,R1,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,155,2020.00000000000,R1,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2020.00000000000,R2,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,11,2020.00000000000,R2,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2022.00000000000,R2,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-99,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,15,2020.00000000000,R2,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2020.00000000000,R2,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2020.00000000000,R2,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,32,2022.00000000000,R2,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-103,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2020.00000000000,R2,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,50,2020.00000000000,R2,residential,0.10990239540,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,51,2020.00000000000,R2,residential,0.31717538238,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2022.00000000000,R2,residential,0.02512222222,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-107,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,55,2020.00000000000,R2,residential,7.11178400607,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2020.00000000000,R2,residential,0.16485359309,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2020.00000000000,R2,residential,0.47576307357,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2022.00000000000,R2,residential,0.03768333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-111,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,75,2020.00000000000,R2,residential,10.66767600910,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2020.00000000000,R2,residential,0.32986111111,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2020.00000000000,R2,residential,0.95197037037,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,92,2022.00000000000,R2,residential,0.07540185185,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-115,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,95,2020.00000000000,R2,residential,21.34531250000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,110,2020.00000000000,R2,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,111,2020.00000000000,R2,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2022.00000000000,R2,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,115,2020.00000000000,R2,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2020.00000000000,R2,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2020.00000000000,R2,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,132,2022.00000000000,R2,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-123,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2020.00000000000,R2,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,150,2020.00000000000,R2,residential,0.21995871572,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,151,2020.00000000000,R2,residential,0.63479498799,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,152,2022.00000000000,R2,residential,0.05027962963,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-127,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,155,2020.00000000000,R2,residential,14.23352849393,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-6,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,30,2020.00000000000,R1,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,42,2020.00000000000,R1,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2020.00000000000,R1,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-20,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,102,2020.00000000000,R1,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,132,2020.00000000000,R1,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-34,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,165,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,192,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,195,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,222,2020.00000000000,R1,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-61,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-62,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,15,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2024.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,30,2020.00000000000,R2,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,31,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,32,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,33,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,34,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-68,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,42,2020.00000000000,R2,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,45,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2024.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,60,2020.00000000000,R2,power,0.03748250117,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,61,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,62,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,63,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,64,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,72,2020.00000000000,R2,power,3.43602088194,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-76,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,75,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2024.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.05622375175,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-82,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,102,2020.00000000000,R2,power,5.15403132291,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,105,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2024.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-89,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,132,2020.00000000000,R2,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-90,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2024.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,162,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-97,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,165,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2024.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-103,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,192,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-104,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,195,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2024.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.07501749883,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-110,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,222,2020.00000000000,R2,power,6.87685411806,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-111,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2024.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.34260764505,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.51391146757,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.34260764505,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.51391146757,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,1.02830277778,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.68569513273,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,0.68569513273,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2020.00000000000,R1,gas,0.68569513273,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.34260764505,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2024.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.51391146757,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2024.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,0.34260764505,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2024.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.51391146757,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2024.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2020.00000000000,R2,gas,1.02830277778,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2024.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2020.00000000000,R2,gas,0.68569513273,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2024.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,0.68569513273,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2024.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2020.00000000000,R2,gas,0.68569513273,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2024.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-4,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,17,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,33,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,37,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,53,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,57,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2020.00000000000,R1,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2022.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2024.00000000000,R1,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,93,2024.00000000000,R1,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,97,2024.00000000000,R1,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,113,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,117,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,137,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,150,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,151,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,152,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,153,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,157,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,11,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,17,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,32,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,33,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-49,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,37,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,50,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,51,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,53,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,57,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2020.00000000000,R2,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2022.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,92,2024.00000000000,R2,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,93,2024.00000000000,R2,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-64,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,97,2024.00000000000,R2,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,110,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,111,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,113,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,117,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,132,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,150,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,151,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,152,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,153,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,157,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-84,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,17,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-85,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-86,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-87,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-88,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,33,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-89,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,37,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2020.00000000000,R1,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-92,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-93,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,53,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,57,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-95,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2020.00000000000,R1,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-96,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-97,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-98,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-99,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2020.00000000000,R1,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2022.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2024.00000000000,R1,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,93,2024.00000000000,R1,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,97,2024.00000000000,R1,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-105,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-106,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-108,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,113,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-109,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,117,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-110,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-111,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-112,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-113,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,137,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-115,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,150,2020.00000000000,R1,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-116,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,151,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-117,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,152,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-118,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,153,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-119,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,157,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,10,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,11,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-124,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,17,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-125,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,30,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-126,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,31,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-127,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,32,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-128,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,33,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-129,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,37,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-130,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,50,2020.00000000000,R2,residential,0.30048194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-131,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,51,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-132,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-133,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,53,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,57,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-135,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2020.00000000000,R2,residential,0.45072291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-136,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-137,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-138,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-139,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,90,2020.00000000000,R2,residential,0.90186666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,91,2022.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,92,2024.00000000000,R2,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,93,2024.00000000000,R2,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-144,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,97,2024.00000000000,R2,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-145,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,110,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-146,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,111,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-147,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-148,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,113,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,117,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,132,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-154,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-155,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,150,2020.00000000000,R2,residential,0.60138472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-156,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,151,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-157,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,152,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-158,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,153,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-159,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,157,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-6,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,30,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,74,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-27,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,106,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-33,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,134,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,136,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-40,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-41,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,166,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,194,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-48,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,196,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-55,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-61,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-62,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2026.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,30,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,31,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,32,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,33,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,34,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,46,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2026.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,60,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,61,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,62,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,63,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,64,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-75,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,74,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2026.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-83,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,106,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2026.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-89,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,134,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-90,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,136,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2026.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-96,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-97,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,166,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2026.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-103,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,194,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-104,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,196,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2026.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-110,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,224,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-111,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2026.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2020.00000000000,R1,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2024.00000000000,R1,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2026.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2026.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2026.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2026.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2024.00000000000,R2,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2026.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2026.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2026.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2026.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2022.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2024.00000000000,R1,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2024.00000000000,R1,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2026.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2024.00000000000,R1,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,37,2022.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,38,2024.00000000000,R1,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,39,2024.00000000000,R1,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2026.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2024.00000000000,R1,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,61,2022.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,62,2024.00000000000,R1,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,63,2024.00000000000,R1,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,64,2026.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,68,2024.00000000000,R1,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,84,2020.00000000000,R1,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,85,2022.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,86,2024.00000000000,R1,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,87,2024.00000000000,R1,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2026.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2024.00000000000,R1,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,108,2020.00000000000,R1,residential,0.94286060606,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,109,2022.00000000000,R1,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2024.00000000000,R1,residential,0.31998157576,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2024.00000000000,R1,residential,0.23076387879,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2026.00000000000,R1,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,116,2024.00000000000,R1,residential,20.70600776727,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2020.00000000000,R1,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2022.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,134,2024.00000000000,R1,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2024.00000000000,R1,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,136,2026.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,140,2024.00000000000,R1,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2020.00000000000,R1,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2022.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2024.00000000000,R1,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2024.00000000000,R1,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,160,2026.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2024.00000000000,R1,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,180,2020.00000000000,R1,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2022.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2024.00000000000,R1,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2024.00000000000,R1,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2026.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,188,2024.00000000000,R1,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2022.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2024.00000000000,R2,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2024.00000000000,R2,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2026.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-53,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,20,2024.00000000000,R2,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,37,2022.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,38,2024.00000000000,R2,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,39,2024.00000000000,R2,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2026.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2024.00000000000,R2,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,60,2020.00000000000,R2,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,61,2022.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,62,2024.00000000000,R2,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,63,2024.00000000000,R2,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,64,2026.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,68,2024.00000000000,R2,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,84,2020.00000000000,R2,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,85,2022.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,86,2024.00000000000,R2,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,87,2024.00000000000,R2,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2026.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2024.00000000000,R2,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,108,2020.00000000000,R2,residential,0.94286060606,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,109,2022.00000000000,R2,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,110,2024.00000000000,R2,residential,0.31998157576,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,111,2024.00000000000,R2,residential,0.23076387879,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2026.00000000000,R2,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,116,2024.00000000000,R2,residential,20.70600776727,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,132,2020.00000000000,R2,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2022.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,134,2024.00000000000,R2,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2024.00000000000,R2,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,136,2026.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,140,2024.00000000000,R2,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2020.00000000000,R2,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2022.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2024.00000000000,R2,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2024.00000000000,R2,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,160,2026.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-89,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2024.00000000000,R2,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,180,2020.00000000000,R2,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2022.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2024.00000000000,R2,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2024.00000000000,R2,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2026.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,188,2024.00000000000,R2,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2022.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2024.00000000000,R1,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2024.00000000000,R1,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2026.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-101,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2024.00000000000,R1,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,37,2022.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,38,2024.00000000000,R1,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,39,2024.00000000000,R1,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2026.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2024.00000000000,R1,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,61,2022.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,62,2024.00000000000,R1,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,63,2024.00000000000,R1,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,64,2026.00000000000,R1,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-113,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,68,2024.00000000000,R1,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,84,2020.00000000000,R1,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,85,2022.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,86,2024.00000000000,R1,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,87,2024.00000000000,R1,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2026.00000000000,R1,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-119,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2024.00000000000,R1,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,108,2020.00000000000,R1,residential,0.94286060606,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,109,2022.00000000000,R1,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2024.00000000000,R1,residential,0.31998157576,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2024.00000000000,R1,residential,0.23076387879,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2026.00000000000,R1,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-125,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,116,2024.00000000000,R1,residential,20.70600776727,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2020.00000000000,R1,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2022.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,134,2024.00000000000,R1,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2024.00000000000,R1,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,136,2026.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-131,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,140,2024.00000000000,R1,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2020.00000000000,R1,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2022.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2024.00000000000,R1,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2024.00000000000,R1,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,160,2026.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-137,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2024.00000000000,R1,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,180,2020.00000000000,R1,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2022.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2024.00000000000,R1,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2024.00000000000,R1,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2026.00000000000,R1,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-143,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,188,2024.00000000000,R1,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,12,2020.00000000000,R2,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2022.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2024.00000000000,R2,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2024.00000000000,R2,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2026.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,20,2024.00000000000,R2,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,36,2020.00000000000,R2,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,37,2022.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,38,2024.00000000000,R2,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,39,2024.00000000000,R2,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,40,2026.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-155,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2024.00000000000,R2,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,60,2020.00000000000,R2,residential,0.31414021126,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,61,2022.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,62,2024.00000000000,R2,residential,0.10661075366,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,63,2024.00000000000,R2,residential,0.07688539872,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,64,2026.00000000000,R2,residential,0.02488181818,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-161,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,68,2024.00000000000,R2,residential,6.89878186926,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,84,2020.00000000000,R2,residential,0.47121031689,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,85,2022.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,86,2024.00000000000,R2,residential,0.15991613049,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,87,2024.00000000000,R2,residential,0.11532809808,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2026.00000000000,R2,residential,0.03732272727,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-167,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2024.00000000000,R2,residential,10.34817280390,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,108,2020.00000000000,R2,residential,0.94286060606,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,109,2022.00000000000,R2,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,110,2024.00000000000,R2,residential,0.31998157576,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,111,2024.00000000000,R2,residential,0.23076387879,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2026.00000000000,R2,residential,0.07468030303,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-173,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,116,2024.00000000000,R2,residential,20.70600776727,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,132,2020.00000000000,R2,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2022.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,134,2024.00000000000,R2,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2024.00000000000,R2,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,136,2026.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-179,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,140,2024.00000000000,R2,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2020.00000000000,R2,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2022.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2024.00000000000,R2,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2024.00000000000,R2,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,160,2026.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-185,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2024.00000000000,R2,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,180,2020.00000000000,R2,residential,0.62872039480,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2022.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2024.00000000000,R2,residential,0.21337082210,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2024.00000000000,R2,residential,0.15387848007,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2026.00000000000,R2,residential,0.04979848485,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,188,2024.00000000000,R2,residential,13.80722589801,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-7,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-8,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,19,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-12,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,39,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-14,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,86,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,88,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,89,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-30,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,109,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-32,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-33,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,121,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,123,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,156,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-43,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,158,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-44,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,159,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,179,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,193,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,194,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,215,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-60,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-61,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,228,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-62,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,229,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,247,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,248,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,249,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,261,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,263,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,264,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-78,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,18,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-80,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,19,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2028.00000000000
-81,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,35,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-82,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,36,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,37,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-84,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,38,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-85,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,39,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-86,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-87,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,53,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,54,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2028.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,70,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,71,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,72,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,73,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,74,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-96,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,86,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-97,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,88,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-98,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,89,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2028.00000000000
-99,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,105,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-100,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,106,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-101,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,107,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-102,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,108,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-103,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,109,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-104,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,110,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-105,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,121,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-106,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,123,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-107,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,124,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2028.00000000000
-108,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-109,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-110,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,142,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-111,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,143,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-112,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,144,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-113,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,145,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,156,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-115,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,158,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-116,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,159,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2028.00000000000
-117,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-118,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-119,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-120,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,178,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-121,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,179,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-122,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-123,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,193,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,194,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2028.00000000000
-126,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-127,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-128,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-129,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-130,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-131,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,215,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-132,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-133,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,228,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-134,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,229,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2028.00000000000
-135,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-136,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-137,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,247,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-138,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,248,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-139,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,249,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-140,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,250,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-141,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,261,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-142,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,263,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-143,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,264,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2028.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2020.00000000000,R1,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2024.00000000000,R1,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2026.00000000000,R1,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,24,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,29,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2028.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2028.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2028.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2028.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2020.00000000000,R2,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2024.00000000000,R2,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2026.00000000000,R2,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2028.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2028.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,24,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2028.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,29,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2028.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2020.00000000000,R1,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2022.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2024.00000000000,R1,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2024.00000000000,R1,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2026.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2028.00000000000,R1,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,23,2024.00000000000,R1,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2020.00000000000,R1,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2022.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2024.00000000000,R1,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2024.00000000000,R1,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2026.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2028.00000000000,R1,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2024.00000000000,R1,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2020.00000000000,R1,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2022.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2024.00000000000,R1,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2024.00000000000,R1,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2026.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2028.00000000000,R1,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,79,2024.00000000000,R1,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2020.00000000000,R1,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2022.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2024.00000000000,R1,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2024.00000000000,R1,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2026.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2028.00000000000,R1,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2024.00000000000,R1,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2020.00000000000,R1,residential,0.93944444444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2022.00000000000,R1,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2024.00000000000,R1,residential,0.31882222222,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2024.00000000000,R1,residential,0.22992777778,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2026.00000000000,R1,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2028.00000000000,R1,residential,0.14881944444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2024.00000000000,R1,residential,20.63098600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2020.00000000000,R1,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2022.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2024.00000000000,R1,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2024.00000000000,R1,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2026.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2028.00000000000,R1,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,163,2024.00000000000,R1,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2020.00000000000,R1,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2022.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2024.00000000000,R1,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2024.00000000000,R1,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2026.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2028.00000000000,R1,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2024.00000000000,R1,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2020.00000000000,R1,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2022.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2024.00000000000,R1,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2024.00000000000,R1,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2026.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2028.00000000000,R1,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,219,2024.00000000000,R1,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2020.00000000000,R2,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2022.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2024.00000000000,R2,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2024.00000000000,R2,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2026.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2028.00000000000,R2,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,23,2024.00000000000,R2,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2020.00000000000,R2,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2022.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2024.00000000000,R2,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2024.00000000000,R2,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2026.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2028.00000000000,R2,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2024.00000000000,R2,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2020.00000000000,R2,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2022.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2024.00000000000,R2,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2024.00000000000,R2,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2026.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2028.00000000000,R2,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-76,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,79,2024.00000000000,R2,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2020.00000000000,R2,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2022.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2024.00000000000,R2,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2024.00000000000,R2,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2026.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2028.00000000000,R2,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2024.00000000000,R2,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2020.00000000000,R2,residential,0.93944444444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2022.00000000000,R2,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2024.00000000000,R2,residential,0.31882222222,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2024.00000000000,R2,residential,0.22992777778,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2026.00000000000,R2,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2028.00000000000,R2,residential,0.14881944444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2024.00000000000,R2,residential,20.63098600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2020.00000000000,R2,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2022.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2024.00000000000,R2,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2024.00000000000,R2,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2026.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2028.00000000000,R2,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-97,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,163,2024.00000000000,R2,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2020.00000000000,R2,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2022.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2024.00000000000,R2,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2024.00000000000,R2,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2026.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2028.00000000000,R2,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-104,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2024.00000000000,R2,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2020.00000000000,R2,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2022.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2024.00000000000,R2,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2024.00000000000,R2,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2026.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2028.00000000000,R2,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-111,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,219,2024.00000000000,R2,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2020.00000000000,R1,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2022.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2024.00000000000,R1,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2024.00000000000,R1,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-116,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2026.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-117,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2028.00000000000,R1,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,23,2024.00000000000,R1,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2020.00000000000,R1,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2022.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-121,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2024.00000000000,R1,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-122,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2024.00000000000,R1,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-123,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2026.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-124,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2028.00000000000,R1,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-125,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2024.00000000000,R1,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2020.00000000000,R1,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2022.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2024.00000000000,R1,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2024.00000000000,R1,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2026.00000000000,R1,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2028.00000000000,R1,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-132,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,79,2024.00000000000,R1,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2020.00000000000,R1,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-134,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2022.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-135,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2024.00000000000,R1,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-136,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2024.00000000000,R1,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-137,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2026.00000000000,R1,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2028.00000000000,R1,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-139,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2024.00000000000,R1,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2020.00000000000,R1,residential,0.93944444444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2022.00000000000,R1,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2024.00000000000,R1,residential,0.31882222222,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2024.00000000000,R1,residential,0.22992777778,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2026.00000000000,R1,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-145,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2028.00000000000,R1,residential,0.14881944444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2024.00000000000,R1,residential,20.63098600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-147,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2020.00000000000,R1,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2022.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2024.00000000000,R1,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-150,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2024.00000000000,R1,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2026.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-152,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2028.00000000000,R1,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-153,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,163,2024.00000000000,R1,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-154,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2020.00000000000,R1,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2022.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2024.00000000000,R1,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2024.00000000000,R1,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-158,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2026.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-159,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2028.00000000000,R1,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-160,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2024.00000000000,R1,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-161,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2020.00000000000,R1,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-162,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2022.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-163,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2024.00000000000,R1,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-164,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2024.00000000000,R1,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-165,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2026.00000000000,R1,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-166,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2028.00000000000,R1,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-167,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,219,2024.00000000000,R1,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2020.00000000000,R2,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2022.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2024.00000000000,R2,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2024.00000000000,R2,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2026.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2028.00000000000,R2,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-174,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,23,2024.00000000000,R2,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-175,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2020.00000000000,R2,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2022.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-177,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2024.00000000000,R2,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-178,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2024.00000000000,R2,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-179,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2026.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-180,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2028.00000000000,R2,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-181,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2024.00000000000,R2,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2020.00000000000,R2,residential,0.31300202209,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2022.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-184,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2024.00000000000,R2,residential,0.10622448281,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2024.00000000000,R2,residential,0.07660682843,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-186,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2026.00000000000,R2,residential,0.02479166667,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-187,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2028.00000000000,R2,residential,0.04958333333,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,79,2024.00000000000,R2,residential,6.87378628278,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2020.00000000000,R2,residential,0.46950303313,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2022.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2024.00000000000,R2,residential,0.15933672422,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-192,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2024.00000000000,R2,residential,0.11491024265,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-193,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2026.00000000000,R2,residential,0.03718750000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2028.00000000000,R2,residential,0.07437500000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-195,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2024.00000000000,R2,residential,10.31067942417,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-196,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2020.00000000000,R2,residential,0.93944444444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-197,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2022.00000000000,R2,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2024.00000000000,R2,residential,0.31882222222,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-199,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2024.00000000000,R2,residential,0.22992777778,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-200,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2026.00000000000,R2,residential,0.07440972222,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-201,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2028.00000000000,R2,residential,0.14881944444,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-202,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2024.00000000000,R2,residential,20.63098600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-203,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2020.00000000000,R2,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-204,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2022.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-205,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2024.00000000000,R2,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-206,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2024.00000000000,R2,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2026.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-208,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2028.00000000000,R2,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-209,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,163,2024.00000000000,R2,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-210,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2020.00000000000,R2,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2022.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2024.00000000000,R2,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-213,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2024.00000000000,R2,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-214,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2026.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-215,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2028.00000000000,R2,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-216,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2024.00000000000,R2,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-217,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2020.00000000000,R2,residential,0.62644242236,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-218,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2022.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-219,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2024.00000000000,R2,residential,0.21259773941,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-220,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2024.00000000000,R2,residential,0.15332094934,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-221,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2026.00000000000,R2,residential,0.04961805556,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-222,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2028.00000000000,R2,residential,0.09923611111,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-223,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,219,2024.00000000000,R2,residential,13.75719971722,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,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.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-8,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-9,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-10,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-12,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-14,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-15,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-16,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-17,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,58,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-20,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-21,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-26,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-27,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-28,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,86,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,98,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-30,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,100,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-31,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,101,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-32,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,102,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-36,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-37,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-38,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-39,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-40,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,138,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-41,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,140,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-42,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,141,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-43,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,142,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,160,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-48,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-49,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-50,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,166,2028.00000000000,R1,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,178,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,180,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,181,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,182,2028.00000000000,R1,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-60,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-61,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,218,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-63,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,220,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-64,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,221,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-65,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,222,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,240,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,241,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,242,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,243,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,244,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-72,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-73,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,258,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,260,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,261,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,262,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,280,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,281,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,282,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,283,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,284,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,285,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,286,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-84,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,298,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-85,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,300,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-86,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,301,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-87,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,302,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,18,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-96,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,20,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-97,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,21,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-98,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-99,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-100,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,41,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-101,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,42,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-102,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,43,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-103,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,44,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-104,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-105,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,58,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-107,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-108,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,61,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-109,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-110,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,80,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-111,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,81,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-112,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,82,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-113,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,83,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-114,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,84,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-115,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,85,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-116,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,86,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-117,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,98,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-118,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,100,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-119,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,101,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-120,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,102,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-121,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-122,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-123,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-124,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-125,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-126,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-127,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-128,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,138,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-129,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,140,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-130,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,141,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-131,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,142,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-132,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,160,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-133,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,161,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-134,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,162,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-135,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,163,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-136,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,164,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-137,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,165,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-138,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,166,2028.00000000000,R2,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-139,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,178,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-140,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,180,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-141,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,181,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-142,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,182,2028.00000000000,R2,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-143,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,200,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-144,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,201,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-145,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,202,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-146,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,203,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-147,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,204,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-148,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,205,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-149,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,206,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-150,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,218,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-151,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,220,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-152,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,221,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-153,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,222,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-154,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,240,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-155,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,241,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-156,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,242,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-157,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,243,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-158,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,244,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-159,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-160,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-161,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,258,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-162,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,260,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-163,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,261,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-164,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,262,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-165,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,280,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-166,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,281,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-167,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,282,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-168,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,283,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-169,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,284,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-170,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,285,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-171,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,286,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-172,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,298,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-173,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,300,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-174,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,301,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-175,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,302,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2028.00000000000,R1,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2028.00000000000,R1,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2028.00000000000,R1,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2020.00000000000,R1,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2028.00000000000,R1,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2020.00000000000,R1,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2024.00000000000,R1,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2026.00000000000,R1,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,23,2028.00000000000,R1,gas,0.18972906279,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,27,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,31,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,32,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,33,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,35,2020.00000000000,R1,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,36,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,37,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,38,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2028.00000000000,R2,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2028.00000000000,R2,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2020.00000000000,R2,gas,0.28111875875,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2028.00000000000,R2,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2020.00000000000,R2,gas,0.42167813812,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2028.00000000000,R2,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2020.00000000000,R2,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2024.00000000000,R2,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2026.00000000000,R2,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,23,2028.00000000000,R2,gas,0.18972906279,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,27,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,31,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,32,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,33,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,35,2020.00000000000,R2,gas,0.56263124125,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,36,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,37,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,38,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-20,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,78,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,106,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2022.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2024.00000000000,R1,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2024.00000000000,R1,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2026.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,134,2024.00000000000,R1,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-48,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,190,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,218,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-62,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-69,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,50,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,78,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-83,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,106,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2022.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2024.00000000000,R2,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2024.00000000000,R2,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2026.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-90,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,134,2024.00000000000,R2,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,162,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-104,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,190,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-111,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,218,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-116,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-117,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-118,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-121,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-122,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-123,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-124,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2022.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-132,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,78,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2022.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-134,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-135,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-136,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-137,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,106,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2022.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2024.00000000000,R1,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2024.00000000000,R1,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2026.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-145,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-146,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,134,2024.00000000000,R1,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-147,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-150,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-152,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-153,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-154,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-158,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-159,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-160,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,190,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-161,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2022.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-162,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-163,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-164,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-165,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-166,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-167,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,218,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-174,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-175,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-177,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-178,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-179,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-180,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,50,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2022.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-184,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-186,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-187,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-188,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,78,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2022.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-192,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-193,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-195,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,106,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-196,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2022.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-197,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2024.00000000000,R2,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2024.00000000000,R2,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-199,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2026.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-200,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-201,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-202,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,134,2024.00000000000,R2,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-203,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-204,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-205,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-206,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-208,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-209,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,162,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-210,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-213,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-214,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-215,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-216,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,190,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-217,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2022.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-218,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-219,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-220,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-221,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-222,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-223,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,218,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-10,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-11,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-12,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-14,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-16,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-17,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,54,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-18,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,55,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-19,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,56,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-20,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,57,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-21,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,74,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-24,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-25,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-28,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-29,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-30,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,104,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-31,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-32,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-33,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,122,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-35,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-36,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,125,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-37,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,126,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-38,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,127,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-42,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-43,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-44,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,155,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-45,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,156,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-46,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,157,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,172,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-48,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,174,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-49,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,175,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-50,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,176,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-51,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,177,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-56,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-57,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-58,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2028.00000000000,R1,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-59,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,207,2030.00000000000,R1,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-60,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,222,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-61,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-62,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-63,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2028.00000000000,R1,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-64,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,227,2030.00000000000,R1,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,251,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,252,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,253,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,254,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-70,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,255,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-71,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,256,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-72,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,257,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-73,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,272,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,274,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,275,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,276,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-77,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,277,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,300,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,301,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,302,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,303,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,304,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,305,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-84,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,306,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-85,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,307,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,322,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-87,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,324,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-88,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,325,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-89,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,326,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-90,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,327,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,350,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,351,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,352,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,353,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,354,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,355,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,356,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-98,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,357,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-99,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,372,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,374,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,375,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,376,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-103,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,377,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-111,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,7,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-112,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,22,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-113,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-114,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-115,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,26,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-116,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,27,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2032.00000000000
-117,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-118,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-119,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-120,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,53,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-121,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,54,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-122,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,55,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-123,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,56,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-124,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,57,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-125,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,72,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-126,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,74,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-127,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,75,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-128,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,76,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-129,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,77,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2032.00000000000
-130,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-131,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-132,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-133,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,103,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-134,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,104,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-135,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,105,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-136,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,106,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-137,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,107,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-138,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,122,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-139,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,124,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-140,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,125,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-141,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,126,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-142,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,127,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2032.00000000000
-143,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-144,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-145,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-146,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-147,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-148,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,155,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-149,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,156,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-150,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,157,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-151,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,172,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-152,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,174,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-153,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,175,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-154,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,176,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-155,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,177,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2032.00000000000
-156,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,200,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-157,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,201,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-158,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,202,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-159,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,203,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-160,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,204,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-161,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,205,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-162,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,206,2028.00000000000,R2,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-163,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,207,2030.00000000000,R2,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-164,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,222,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-165,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,224,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-166,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-167,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2028.00000000000,R2,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-168,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,227,2030.00000000000,R2,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2032.00000000000
-169,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,250,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-170,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,251,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-171,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,252,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-172,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,253,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-173,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,254,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-174,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,255,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-175,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,256,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-176,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,257,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-177,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,272,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-178,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,274,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-179,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,275,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-180,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,276,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-181,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,277,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2032.00000000000
-182,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,300,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-183,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,301,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-184,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,302,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-185,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,303,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-186,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,304,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-187,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,305,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-188,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,306,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-189,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,307,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-190,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,322,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-191,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,324,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-192,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,325,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-193,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,326,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-194,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,327,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2032.00000000000
-195,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,350,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-196,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,351,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-197,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,352,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-198,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,353,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-199,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,354,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-200,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,355,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-201,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,356,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-202,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,357,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-203,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,372,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-204,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,374,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-205,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,375,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-206,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,376,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-207,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,377,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2032.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2028.00000000000,R1,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2028.00000000000,R1,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2028.00000000000,R1,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2028.00000000000,R1,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2030.00000000000,R1,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2024.00000000000,R1,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2026.00000000000,R1,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2028.00000000000,R1,gas,0.18972906279,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,23,2030.00000000000,R1,gas,1.02207102400,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,27,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2030.00000000000,R1,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,31,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,32,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,33,2030.00000000000,R1,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,35,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,36,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,37,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,38,2030.00000000000,R1,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2028.00000000000,R2,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2032.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2028.00000000000,R2,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2030.00000000000,R2,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2032.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2028.00000000000,R2,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2032.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2028.00000000000,R2,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2030.00000000000,R2,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2032.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2024.00000000000,R2,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2026.00000000000,R2,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2028.00000000000,R2,gas,0.18972906279,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,23,2030.00000000000,R2,gas,1.02207102400,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2032.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,27,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2030.00000000000,R2,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2032.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,31,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,32,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,33,2030.00000000000,R2,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2032.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,35,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,36,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,37,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,38,2030.00000000000,R2,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2032.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,48,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,49,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,53,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,56,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,80,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,81,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,82,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,83,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,84,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,85,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,88,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,113,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,114,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,115,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,116,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,117,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,120,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,144,2024.00000000000,R1,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,145,2024.00000000000,R1,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,146,2026.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,147,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,148,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,149,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-34,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,152,2024.00000000000,R1,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,176,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,177,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,178,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,180,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-41,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,184,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,208,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,209,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,216,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,240,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,241,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,242,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,243,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,244,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,245,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,248,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,21,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-62,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,48,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,49,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,50,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,51,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,53,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-69,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,56,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,80,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,81,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,82,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,83,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,84,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,85,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-76,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,88,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,113,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,114,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,115,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,116,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,117,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-83,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,120,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,144,2024.00000000000,R2,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,145,2024.00000000000,R2,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,146,2026.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,147,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,148,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,149,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,152,2024.00000000000,R2,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,176,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,177,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,178,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,180,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-97,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,184,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,208,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,209,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,216,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,240,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,241,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,242,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,243,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,244,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,245,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-111,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,248,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-116,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-117,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-118,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,48,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,49,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-121,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-122,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-123,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-124,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,53,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-125,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,56,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,80,2024.00000000000,R1,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,81,2024.00000000000,R1,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,82,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,83,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,84,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,85,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,88,2024.00000000000,R1,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2024.00000000000,R1,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-134,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,113,2024.00000000000,R1,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-135,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,114,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-136,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,115,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-137,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,116,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,117,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-139,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,120,2024.00000000000,R1,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,144,2024.00000000000,R1,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,145,2024.00000000000,R1,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,146,2026.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,147,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,148,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-145,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,149,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-146,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,152,2024.00000000000,R1,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-147,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,176,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,177,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,178,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-150,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,180,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-152,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-153,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,184,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-154,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,208,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,209,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-158,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-159,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-160,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,216,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-161,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,240,2024.00000000000,R1,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-162,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,241,2024.00000000000,R1,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-163,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,242,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-164,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,243,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-165,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,244,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-166,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,245,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-167,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,248,2024.00000000000,R1,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,20,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,21,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-175,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,48,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,49,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-177,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,50,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-178,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,51,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-179,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,52,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-180,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,53,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-181,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,56,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,80,2024.00000000000,R2,residential,0.10197550350,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,81,2024.00000000000,R2,residential,0.07354255530,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-184,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,82,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,83,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-186,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,84,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-187,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,85,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-188,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,88,2024.00000000000,R2,residential,6.59883483147,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,112,2024.00000000000,R2,residential,0.15296325525,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,113,2024.00000000000,R2,residential,0.11031383294,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,114,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-192,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,115,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-193,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,116,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,117,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-195,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,120,2024.00000000000,R2,residential,9.89825224720,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-196,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,144,2024.00000000000,R2,residential,0.30606933333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-197,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,145,2024.00000000000,R2,residential,0.22073066667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,146,2026.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-199,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,147,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-200,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,148,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-201,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,149,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-202,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,152,2024.00000000000,R2,residential,19.80574656000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-203,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,176,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-204,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,177,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-205,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,178,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-206,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,180,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-208,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-209,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,184,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-210,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,208,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,209,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-213,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-214,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-215,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-216,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,216,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-217,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,240,2024.00000000000,R2,residential,0.20409382983,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-218,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,241,2024.00000000000,R2,residential,0.14718811137,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-219,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,242,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-220,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,243,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-221,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,244,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-222,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,245,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-223,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,248,2024.00000000000,R2,residential,13.20691172853,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,8,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,9,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-14,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,31,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-15,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,65,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-23,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,67,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-24,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,68,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-25,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,69,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,86,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-27,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,88,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-28,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,89,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-29,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,90,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-30,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,91,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-31,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-39,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,127,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-40,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,128,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-41,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,129,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,146,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-43,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,148,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-44,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,149,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-45,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,150,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-46,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,151,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-47,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,152,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,186,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-55,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,187,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-56,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,188,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-57,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,189,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,206,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,208,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-60,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,209,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-61,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,210,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-62,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,211,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-63,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,212,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,240,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,241,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,242,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,243,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,244,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2028.00000000000,R1,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-71,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,247,2030.00000000000,R1,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-72,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,248,2032.00000000000,R1,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-73,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,249,2032.00000000000,R1,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,266,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-75,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,268,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-76,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,269,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-77,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,270,2028.00000000000,R1,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-78,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,271,2030.00000000000,R1,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-79,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,272,2032.00000000000,R1,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,300,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,301,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,302,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,303,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,304,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,305,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,306,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-87,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,307,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-88,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,308,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-89,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,309,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,326,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-91,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,328,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-92,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,329,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-93,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,330,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-94,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,331,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-95,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,332,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,360,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,361,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,362,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,363,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,364,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,365,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,366,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-103,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,367,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-104,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,368,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-105,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,369,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,386,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-107,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,388,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-108,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,389,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-109,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,390,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-110,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,391,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-111,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,392,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,420,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,421,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,422,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,423,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,424,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,425,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,426,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-119,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,427,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-120,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,428,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-121,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,429,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,446,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-123,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,448,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-124,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,449,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-125,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,450,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-126,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,451,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-127,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,452,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-128,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-129,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-130,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-131,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-132,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-133,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-134,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-135,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,7,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-136,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,8,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-137,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,9,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-138,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,26,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-139,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-140,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,29,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-141,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-142,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,31,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-143,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,32,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2034.00000000000
-144,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,60,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-145,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,61,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-146,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,62,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-147,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,63,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-148,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,64,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-149,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,65,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-150,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,66,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-151,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,67,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-152,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,68,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-153,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,69,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-154,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,86,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-155,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,88,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-156,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,89,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-157,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,90,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-158,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,91,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-159,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2034.00000000000
-160,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-161,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-162,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-163,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-164,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-165,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-166,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-167,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-168,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,128,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-169,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,129,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-170,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,146,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-171,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,148,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-172,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,149,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-173,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,150,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-174,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,151,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-175,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,152,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2034.00000000000
-176,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-177,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-178,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-179,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-180,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-181,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,185,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-182,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,186,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-183,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,187,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-184,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,188,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-185,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,189,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-186,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,206,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-187,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,208,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-188,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,209,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-189,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,210,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-190,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,211,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-191,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,212,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2034.00000000000
-192,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,240,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-193,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,241,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-194,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,242,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-195,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,243,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-196,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,244,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-197,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-198,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2028.00000000000,R2,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-199,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,247,2030.00000000000,R2,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-200,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,248,2032.00000000000,R2,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-201,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,249,2032.00000000000,R2,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-202,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,266,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-203,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,268,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-204,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,269,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-205,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,270,2028.00000000000,R2,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-206,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,271,2030.00000000000,R2,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-207,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,272,2032.00000000000,R2,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2034.00000000000
-208,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,300,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-209,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,301,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-210,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,302,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-211,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,303,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-212,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,304,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-213,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,305,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-214,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,306,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-215,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,307,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-216,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,308,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-217,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,309,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-218,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,326,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-219,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,328,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-220,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,329,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-221,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,330,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-222,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,331,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-223,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,332,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2034.00000000000
-224,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,360,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-225,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,361,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-226,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,362,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-227,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,363,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-228,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,364,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-229,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,365,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-230,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,366,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-231,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,367,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-232,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,368,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-233,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,369,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-234,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,386,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-235,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,388,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-236,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,389,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-237,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,390,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-238,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,391,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-239,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,392,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2034.00000000000
-240,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,420,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-241,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,421,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-242,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,422,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-243,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,423,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-244,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,424,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-245,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,425,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-246,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,426,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-247,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,427,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-248,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,428,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-249,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,429,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-250,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,446,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-251,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,448,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-252,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,449,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-253,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,450,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-254,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,451,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-255,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,452,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2034.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2028.00000000000,R1,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2032.00000000000,R1,gas,0.01707946639,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2028.00000000000,R1,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2032.00000000000,R1,gas,0.02561919959,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2024.00000000000,R1,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2026.00000000000,R1,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2028.00000000000,R1,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2032.00000000000,R1,gas,0.01707946639,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2024.00000000000,R1,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2026.00000000000,R1,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2028.00000000000,R1,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2030.00000000000,R1,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2032.00000000000,R1,gas,0.02561919959,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2024.00000000000,R1,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2026.00000000000,R1,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2028.00000000000,R1,gas,0.18972906279,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,23,2030.00000000000,R1,gas,1.02207102400,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,24,2032.00000000000,R1,gas,0.05126232000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,27,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2030.00000000000,R1,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,29,2032.00000000000,R1,gas,0.03418285361,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,31,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,32,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,33,2030.00000000000,R1,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,34,2032.00000000000,R1,gas,0.03418285361,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,35,2024.00000000000,R1,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,36,2026.00000000000,R1,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,37,2028.00000000000,R1,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,38,2030.00000000000,R1,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,39,2032.00000000000,R1,gas,0.03418285361,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2028.00000000000,R2,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2032.00000000000,R2,gas,0.01707946639,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2034.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2028.00000000000,R2,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2030.00000000000,R2,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2032.00000000000,R2,gas,0.02561919959,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2034.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2024.00000000000,R2,gas,0.11728242467,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2026.00000000000,R2,gas,0.06815468616,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2028.00000000000,R2,gas,0.06321350949,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.34053136311,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2032.00000000000,R2,gas,0.01707946639,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2034.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2024.00000000000,R2,gas,0.17592363701,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2026.00000000000,R2,gas,0.10223202923,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2028.00000000000,R2,gas,0.09482026423,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2030.00000000000,R2,gas,0.51079704466,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2032.00000000000,R2,gas,0.02561919959,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2034.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2024.00000000000,R2,gas,0.35201153511,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2026.00000000000,R2,gas,0.20455951321,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2028.00000000000,R2,gas,0.18972906279,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,23,2030.00000000000,R2,gas,1.02207102400,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,24,2032.00000000000,R2,gas,0.05126232000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2034.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,27,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2030.00000000000,R2,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,29,2032.00000000000,R2,gas,0.03418285361,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2034.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,31,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,32,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,33,2030.00000000000,R2,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,34,2032.00000000000,R2,gas,0.03418285361,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2034.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,35,2024.00000000000,R2,gas,0.23472911044,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,36,2026.00000000000,R2,gas,0.13640482706,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,37,2028.00000000000,R2,gas,0.12651555330,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,38,2030.00000000000,R2,gas,0.68153966089,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,39,2032.00000000000,R2,gas,0.03418285361,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2034.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-6,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,81,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-27,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2026.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2034.00000000000,R1,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2034.00000000000,R1,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,137,2034.00000000000,R1,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-41,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,165,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-48,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,193,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-55,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,221,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-62,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,53,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,81,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-83,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,109,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2026.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2034.00000000000,R2,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2034.00000000000,R2,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-90,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2034.00000000000,R2,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-97,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,165,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-104,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,193,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-111,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,221,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-116,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-117,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-121,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-122,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-123,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-124,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-125,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2026.00000000000,R1,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-132,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,81,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2026.00000000000,R1,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-134,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-135,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-136,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-137,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-139,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2026.00000000000,R1,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2034.00000000000,R1,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-145,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2034.00000000000,R1,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-146,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,137,2034.00000000000,R1,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-147,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-150,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-152,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-153,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,165,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-154,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-158,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-159,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,193,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-161,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2026.00000000000,R1,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-162,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-163,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-164,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-165,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-166,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-167,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,221,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-174,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-175,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-177,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-178,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-179,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-180,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-181,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,53,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2026.00000000000,R2,residential,0.02380000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-184,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-186,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-187,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-188,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,81,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2026.00000000000,R2,residential,0.03570000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-192,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-193,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-195,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,109,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-196,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2026.00000000000,R2,residential,0.07143333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-197,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-199,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-200,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2034.00000000000,R2,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-201,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2034.00000000000,R2,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-202,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2034.00000000000,R2,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-203,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-204,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-205,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-206,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-208,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-209,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,165,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-210,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-213,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-214,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-215,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-216,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,193,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-217,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2026.00000000000,R2,residential,0.04763333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-218,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-219,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-220,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-221,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-222,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-223,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,221,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,8,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,9,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-10,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,10,2034.00000000000,R1,power,0.03899388446,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-11,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,11,2034.00000000000,R1,power,0.03673248331,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-13,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-14,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,31,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-15,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-16,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-17,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,34,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,65,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,67,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,68,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,69,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-24,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-25,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-26,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-27,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-28,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2034.00000000000,R1,power,0.05849082669,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-29,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2034.00000000000,R1,power,0.05509872497,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-32,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,96,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-33,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,97,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-34,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,98,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-35,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,99,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,130,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,131,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,132,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,133,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,134,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-42,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-43,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,137,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-44,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-45,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,139,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-46,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2034.00000000000,R1,power,0.03899388446,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-47,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2034.00000000000,R1,power,0.03673248331,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,158,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,160,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,161,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-51,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-52,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,163,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-53,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,195,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,196,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,197,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,198,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,199,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-60,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-61,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-62,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-63,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-64,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2034.00000000000,R1,power,0.05849082669,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-65,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2034.00000000000,R1,power,0.05509872497,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,223,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,227,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-70,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,228,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-71,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,229,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,260,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,261,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,262,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,263,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,264,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,265,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,266,2028.00000000000,R1,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-79,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,267,2030.00000000000,R1,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-80,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,268,2032.00000000000,R1,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-81,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,269,2032.00000000000,R1,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-82,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,270,2034.00000000000,R1,power,0.11703626667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-83,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,271,2034.00000000000,R1,power,0.11024889600,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-84,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,288,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-85,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,290,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-86,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,291,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-87,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,292,2028.00000000000,R1,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-88,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,293,2030.00000000000,R1,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-89,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,294,2032.00000000000,R1,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,325,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,326,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,327,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,328,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,329,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,330,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-96,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,331,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-97,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,332,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-98,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,333,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-99,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,334,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-100,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,335,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-101,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,336,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-102,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,353,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-103,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,355,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-104,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,356,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-105,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,357,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-106,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,358,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-107,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,359,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-108,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,390,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-109,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,391,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-110,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,392,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-111,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,393,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-112,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,394,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-113,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,395,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-114,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,396,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-115,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,397,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-116,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,398,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-117,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,399,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-118,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,400,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-119,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,401,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-120,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,418,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-121,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,420,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-122,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,421,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-123,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,422,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-124,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,423,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-125,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,424,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-126,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,455,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-127,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,456,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-128,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,457,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-129,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,458,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-130,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,459,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-131,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,460,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-132,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,461,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-133,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,462,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-134,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,463,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-135,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,464,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-136,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,465,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-137,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,466,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-138,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,483,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-139,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,485,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-140,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,486,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-141,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,487,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-142,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,488,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-143,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,489,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-144,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-145,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-146,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-147,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-148,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-149,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-150,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-151,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,7,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-152,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,8,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-153,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,9,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-154,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,10,2034.00000000000,R2,power,0.03899388446,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-155,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,11,2034.00000000000,R2,power,0.03673248331,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-156,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-157,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-158,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,31,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-159,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,32,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-160,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,33,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-161,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,34,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2036.00000000000
-162,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,65,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-163,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,66,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-164,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,67,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-165,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,68,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-166,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,69,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-167,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,70,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-168,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,71,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-169,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,72,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-170,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,73,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-171,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,74,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-172,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2034.00000000000,R2,power,0.05849082669,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-173,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2034.00000000000,R2,power,0.05509872497,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-174,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-175,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,95,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-176,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,96,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-177,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,97,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-178,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,98,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-179,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,99,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2036.00000000000
-180,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,130,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-181,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,131,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-182,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,132,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-183,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,133,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-184,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,134,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-185,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,135,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-186,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,136,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-187,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,137,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-188,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,138,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-189,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,139,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-190,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2034.00000000000,R2,power,0.03899388446,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-191,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2034.00000000000,R2,power,0.03673248331,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-192,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,158,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-193,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,160,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-194,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,161,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-195,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,162,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-196,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,163,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-197,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2036.00000000000
-198,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,195,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-199,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,196,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-200,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,197,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-201,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,198,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-202,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,199,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-203,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,200,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-204,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,201,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-205,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,202,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-206,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,203,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-207,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,204,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-208,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,205,2034.00000000000,R2,power,0.05849082669,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-209,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,206,2034.00000000000,R2,power,0.05509872497,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-210,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,223,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-211,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-212,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-213,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,227,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-214,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,228,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-215,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,229,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2036.00000000000
-216,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,260,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-217,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,261,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-218,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,262,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-219,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,263,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-220,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,264,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-221,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,265,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-222,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,266,2028.00000000000,R2,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-223,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,267,2030.00000000000,R2,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-224,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,268,2032.00000000000,R2,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-225,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,269,2032.00000000000,R2,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-226,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,270,2034.00000000000,R2,power,0.11703626667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-227,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,271,2034.00000000000,R2,power,0.11024889600,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-228,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,288,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-229,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,290,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-230,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,291,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-231,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,292,2028.00000000000,R2,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-232,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,293,2030.00000000000,R2,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-233,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,294,2032.00000000000,R2,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2036.00000000000
-234,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,325,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-235,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,326,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-236,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,327,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-237,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,328,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-238,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,329,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-239,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,330,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-240,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,331,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-241,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,332,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-242,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,333,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-243,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,334,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-244,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,335,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-245,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,336,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-246,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,353,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-247,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,355,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-248,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,356,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-249,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,357,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-250,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,358,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-251,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,359,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2036.00000000000
-252,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,390,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-253,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,391,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-254,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,392,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-255,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,393,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-256,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,394,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-257,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,395,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-258,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,396,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-259,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,397,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-260,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,398,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-261,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,399,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-262,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,400,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-263,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,401,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-264,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,418,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-265,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,420,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-266,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,421,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-267,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,422,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-268,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,423,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-269,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,424,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2036.00000000000
-270,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,455,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-271,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,456,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-272,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,457,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-273,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,458,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-274,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,459,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-275,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,460,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-276,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,461,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-277,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,462,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-278,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,463,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-279,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,464,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-280,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,465,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-281,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,466,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-282,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,483,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-283,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,485,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-284,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,486,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-285,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,487,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-286,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,488,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-287,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,489,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2036.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2024.00000000000,R1,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2026.00000000000,R1,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2028.00000000000,R1,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2032.00000000000,R1,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2024.00000000000,R1,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2026.00000000000,R1,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2028.00000000000,R1,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2032.00000000000,R1,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2024.00000000000,R1,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2026.00000000000,R1,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2028.00000000000,R1,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2032.00000000000,R1,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2024.00000000000,R1,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2026.00000000000,R1,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2028.00000000000,R1,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2030.00000000000,R1,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2032.00000000000,R1,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2024.00000000000,R1,gas,0.28862193385,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2026.00000000000,R1,gas,0.16772280565,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2028.00000000000,R1,gas,0.15556299594,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,23,2030.00000000000,R1,gas,0.83801832057,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,24,2032.00000000000,R1,gas,0.04203109403,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,27,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,29,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,31,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,32,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,33,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,34,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,35,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,36,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,37,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,38,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,39,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2024.00000000000,R2,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2026.00000000000,R2,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2028.00000000000,R2,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2032.00000000000,R2,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2036.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2024.00000000000,R2,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2026.00000000000,R2,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2028.00000000000,R2,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2030.00000000000,R2,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2032.00000000000,R2,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2036.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2024.00000000000,R2,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2026.00000000000,R2,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2028.00000000000,R2,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2032.00000000000,R2,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2036.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2024.00000000000,R2,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2026.00000000000,R2,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2028.00000000000,R2,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2030.00000000000,R2,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2032.00000000000,R2,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2036.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2024.00000000000,R2,gas,0.28862193385,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2026.00000000000,R2,gas,0.16772280565,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2028.00000000000,R2,gas,0.15556299594,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,23,2030.00000000000,R2,gas,0.83801832057,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,24,2032.00000000000,R2,gas,0.04203109403,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2036.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,27,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,29,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2036.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,31,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,32,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,33,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,34,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2036.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,35,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,36,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,37,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,38,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,39,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2036.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-6,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-20,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,80,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2034.00000000000,R1,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2034.00000000000,R1,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2036.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-34,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,136,2034.00000000000,R1,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,192,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,220,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-62,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,52,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-76,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,80,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2034.00000000000,R2,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2034.00000000000,R2,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2036.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-90,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,136,2034.00000000000,R2,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-97,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-104,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,192,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-111,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,220,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-116,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-117,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-118,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-121,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-122,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-123,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-124,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-125,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2028.00000000000,R1,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-132,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,80,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2028.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-134,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-135,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-136,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-137,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-139,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2028.00000000000,R1,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2034.00000000000,R1,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2034.00000000000,R1,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-145,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2036.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-146,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,136,2034.00000000000,R1,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-147,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-150,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-152,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-154,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-158,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-159,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-160,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,192,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-161,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2028.00000000000,R1,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-162,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-163,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-164,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-165,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-166,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-167,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,220,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-174,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-175,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-177,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-178,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-179,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-180,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-181,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,52,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2028.00000000000,R2,residential,0.04760000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-184,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-186,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-187,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-188,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,80,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2028.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-192,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-193,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-195,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-196,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2028.00000000000,R2,residential,0.14286666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-197,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-199,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2034.00000000000,R2,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-200,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2034.00000000000,R2,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-201,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2036.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-202,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,136,2034.00000000000,R2,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-203,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-204,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-205,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-206,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-208,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-209,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-210,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-213,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-214,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-215,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-216,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,192,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-217,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2028.00000000000,R2,residential,0.09526666667,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-218,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-219,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-220,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-221,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-222,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-223,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,220,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,8,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,9,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-10,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,10,2034.00000000000,R1,power,0.03899388446,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-11,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,11,2034.00000000000,R1,power,0.03673248331,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-12,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2036.00000000000,R1,power,0.03808000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-15,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-16,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,34,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-17,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-18,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,36,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-20,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-21,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-22,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-23,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-24,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-25,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-26,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,77,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-27,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,78,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-28,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,79,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-29,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2034.00000000000,R1,power,0.05849082669,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-30,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2034.00000000000,R1,power,0.05509872497,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-31,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2036.00000000000,R1,power,0.05712000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,100,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-33,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,102,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-34,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,103,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-35,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-36,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-37,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,106,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-39,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-40,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-42,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-43,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-44,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,146,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-45,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,147,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-46,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,148,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-47,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,149,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-48,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2034.00000000000,R1,power,0.03899388446,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-49,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2034.00000000000,R1,power,0.03673248331,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-50,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2036.00000000000,R1,power,0.03808000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,170,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,172,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,173,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,174,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-55,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,175,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-56,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,176,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-57,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-58,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-60,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-61,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-62,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,215,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-63,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,216,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-64,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,217,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-65,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,218,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-66,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,219,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-67,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,220,2034.00000000000,R1,power,0.05849082669,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-68,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,221,2034.00000000000,R1,power,0.05509872497,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-69,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,222,2036.00000000000,R1,power,0.05712000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-70,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,240,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-71,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,242,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-72,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,243,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-73,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,244,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-74,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,245,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-75,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,246,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-76,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,280,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-77,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,281,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-78,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,282,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-79,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,283,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-80,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,284,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-81,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,285,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-82,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,286,2028.00000000000,R1,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-83,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,287,2030.00000000000,R1,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-84,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,288,2032.00000000000,R1,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-85,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,289,2032.00000000000,R1,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-86,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,290,2034.00000000000,R1,power,0.11703626667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-87,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,291,2034.00000000000,R1,power,0.11024889600,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-88,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,292,2036.00000000000,R1,power,0.11429333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-89,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,310,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-90,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,312,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-91,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,313,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-92,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,314,2028.00000000000,R1,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-93,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,315,2030.00000000000,R1,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-94,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,316,2032.00000000000,R1,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-95,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,350,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-96,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,351,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-97,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,352,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-98,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,353,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-99,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,354,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-100,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,355,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-101,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,356,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-102,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,357,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-103,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,358,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-104,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,359,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-105,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,360,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-106,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,361,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-107,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,362,2036.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-108,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,380,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,382,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,383,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-111,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,384,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-112,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,385,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-113,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,386,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-114,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,420,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-115,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,421,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-116,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,422,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-117,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,423,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-118,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,424,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-119,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,425,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-120,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,426,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-121,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,427,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-122,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,428,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-123,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,429,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-124,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,430,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-125,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,431,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-126,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,432,2036.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-127,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,450,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-128,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,452,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-129,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,453,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-130,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,454,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-131,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,455,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-132,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,456,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-133,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,490,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-134,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,491,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-135,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,492,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-136,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,493,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-137,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,494,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-138,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,495,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-139,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,496,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-140,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,497,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-141,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,498,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-142,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,499,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-143,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,500,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-144,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,501,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-145,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,502,2036.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-146,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,520,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-147,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,522,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-148,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,523,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-149,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,524,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-150,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,525,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-151,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,526,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-152,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-153,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-154,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-155,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-156,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-157,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-158,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-159,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,7,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-160,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,8,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-161,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,9,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-162,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,10,2034.00000000000,R2,power,0.03899388446,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-163,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,11,2034.00000000000,R2,power,0.03673248331,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-164,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,12,2036.00000000000,R2,power,0.03808000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-165,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,30,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-166,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,32,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-167,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,33,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-168,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,34,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-169,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-170,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,36,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2038.00000000000
-171,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,70,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-172,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,71,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-173,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,72,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-174,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,73,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-175,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,74,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-176,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-177,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-178,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-179,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,78,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-180,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,79,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-181,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,80,2034.00000000000,R2,power,0.05849082669,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-182,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,81,2034.00000000000,R2,power,0.05509872497,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-183,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,82,2036.00000000000,R2,power,0.05712000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-184,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,100,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-185,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,102,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-186,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,103,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-187,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-188,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,105,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-189,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,106,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2038.00000000000
-190,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-191,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-192,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,142,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-193,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,143,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-194,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,144,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-195,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,145,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-196,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,146,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-197,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,147,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-198,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,148,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-199,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,149,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-200,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2034.00000000000,R2,power,0.03899388446,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-201,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2034.00000000000,R2,power,0.03673248331,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-202,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2036.00000000000,R2,power,0.03808000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-203,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,170,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-204,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,172,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-205,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,173,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-206,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,174,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-207,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,175,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-208,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,176,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2038.00000000000
-209,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-210,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-211,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-212,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-213,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-214,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,215,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-215,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,216,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-216,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,217,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-217,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,218,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-218,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,219,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-219,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,220,2034.00000000000,R2,power,0.05849082669,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-220,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,221,2034.00000000000,R2,power,0.05509872497,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-221,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,222,2036.00000000000,R2,power,0.05712000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-222,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,240,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-223,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,242,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-224,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,243,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-225,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,244,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-226,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,245,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-227,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,246,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2038.00000000000
-228,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,280,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-229,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,281,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-230,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,282,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-231,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,283,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-232,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,284,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-233,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,285,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-234,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,286,2028.00000000000,R2,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-235,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,287,2030.00000000000,R2,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-236,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,288,2032.00000000000,R2,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-237,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,289,2032.00000000000,R2,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-238,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,290,2034.00000000000,R2,power,0.11703626667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-239,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,291,2034.00000000000,R2,power,0.11024889600,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-240,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,292,2036.00000000000,R2,power,0.11429333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-241,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,310,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-242,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,312,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-243,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,313,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-244,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,314,2028.00000000000,R2,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-245,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,315,2030.00000000000,R2,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-246,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,316,2032.00000000000,R2,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2038.00000000000
-247,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,350,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-248,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,351,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-249,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,352,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-250,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,353,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-251,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,354,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-252,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,355,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-253,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,356,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-254,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,357,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-255,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,358,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-256,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,359,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-257,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,360,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-258,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,361,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-259,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,362,2036.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-260,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,380,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-261,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,382,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-262,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,383,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-263,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,384,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-264,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,385,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-265,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,386,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2038.00000000000
-266,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,420,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-267,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,421,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-268,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,422,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-269,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,423,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-270,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,424,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-271,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,425,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-272,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,426,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-273,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,427,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-274,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,428,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-275,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,429,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-276,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,430,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-277,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,431,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-278,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,432,2036.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-279,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,450,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-280,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,452,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-281,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,453,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-282,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,454,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-283,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,455,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-284,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,456,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2038.00000000000
-285,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,490,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-286,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,491,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-287,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,492,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-288,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,493,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-289,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,494,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-290,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,495,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-291,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,496,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-292,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,497,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-293,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,498,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-294,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,499,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-295,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,500,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-296,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,501,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-297,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,502,2036.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-298,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,520,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-299,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,522,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-300,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,523,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-301,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,524,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-302,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,525,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-303,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,526,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2038.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2024.00000000000,R1,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2026.00000000000,R1,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2028.00000000000,R1,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2032.00000000000,R1,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2024.00000000000,R1,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2026.00000000000,R1,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2028.00000000000,R1,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2032.00000000000,R1,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2024.00000000000,R1,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2026.00000000000,R1,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2028.00000000000,R1,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2032.00000000000,R1,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2024.00000000000,R1,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2026.00000000000,R1,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2028.00000000000,R1,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2030.00000000000,R1,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2032.00000000000,R1,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2024.00000000000,R1,gas,0.28862193385,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2026.00000000000,R1,gas,0.16772280565,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2028.00000000000,R1,gas,0.15556299594,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,23,2030.00000000000,R1,gas,0.83801832057,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,24,2032.00000000000,R1,gas,0.04203109403,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,27,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,29,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,31,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,32,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,33,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,34,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,35,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,36,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,37,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,38,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,39,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2024.00000000000,R2,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2026.00000000000,R2,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2028.00000000000,R2,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2032.00000000000,R2,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2038.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2024.00000000000,R2,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2026.00000000000,R2,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2028.00000000000,R2,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2030.00000000000,R2,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2032.00000000000,R2,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2038.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2024.00000000000,R2,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2026.00000000000,R2,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2028.00000000000,R2,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2032.00000000000,R2,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2038.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2024.00000000000,R2,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2026.00000000000,R2,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2028.00000000000,R2,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2030.00000000000,R2,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2032.00000000000,R2,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2038.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2024.00000000000,R2,gas,0.28862193385,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2026.00000000000,R2,gas,0.16772280565,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2028.00000000000,R2,gas,0.15556299594,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,23,2030.00000000000,R2,gas,0.83801832057,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,24,2032.00000000000,R2,gas,0.04203109403,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2038.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,27,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,29,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2038.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,31,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,32,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,33,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,34,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2038.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,35,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,36,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,37,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,38,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,39,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2038.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2038.00000000000,R1,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,23,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2038.00000000000,R1,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2038.00000000000,R1,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,79,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2038.00000000000,R1,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2034.00000000000,R1,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2034.00000000000,R1,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2036.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2038.00000000000,R1,residential,0.28573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2034.00000000000,R1,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2038.00000000000,R1,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,163,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2038.00000000000,R1,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2038.00000000000,R1,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,219,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2038.00000000000,R2,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,23,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2038.00000000000,R2,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2038.00000000000,R2,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-76,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,79,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2038.00000000000,R2,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2034.00000000000,R2,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2034.00000000000,R2,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2036.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2038.00000000000,R2,residential,0.28573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2034.00000000000,R2,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2038.00000000000,R2,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-97,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,163,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2038.00000000000,R2,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-104,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2038.00000000000,R2,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-111,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,219,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,14,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-116,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-117,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2038.00000000000,R1,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,23,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-119,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-121,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-122,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-123,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,46,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-124,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,47,2038.00000000000,R1,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-125,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2030.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2032.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2034.00000000000,R1,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2034.00000000000,R1,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2036.00000000000,R1,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2038.00000000000,R1,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-132,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,79,2034.00000000000,R1,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,98,2030.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-134,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2032.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-135,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,100,2034.00000000000,R1,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-136,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2034.00000000000,R1,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-137,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,102,2036.00000000000,R1,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2038.00000000000,R1,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-139,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2034.00000000000,R1,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,126,2030.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,127,2032.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2034.00000000000,R1,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-143,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,129,2034.00000000000,R1,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-144,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2036.00000000000,R1,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-145,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2038.00000000000,R1,residential,0.28573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2034.00000000000,R1,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-147,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,154,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,155,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,156,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-150,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,157,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,158,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-152,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,159,2038.00000000000,R1,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-153,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,163,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-154,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,182,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,183,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,184,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,185,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-158,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,186,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-159,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,187,2038.00000000000,R1,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-160,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-161,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,210,2030.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-162,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,211,2032.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-163,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,212,2034.00000000000,R1,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-164,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,213,2034.00000000000,R1,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-165,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,214,2036.00000000000,R1,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-166,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,215,2038.00000000000,R1,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-167,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,219,2034.00000000000,R1,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,14,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,18,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2038.00000000000,R2,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-174,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,23,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-175,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,42,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-177,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,44,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-178,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-179,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,46,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-180,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,47,2038.00000000000,R2,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-181,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,70,2030.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,71,2032.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-184,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,72,2034.00000000000,R2,residential,0.05491754378,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2034.00000000000,R2,residential,0.16820051502,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-186,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,74,2036.00000000000,R2,residential,0.07140000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-187,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2038.00000000000,R2,residential,0.09520000000,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,79,2034.00000000000,R2,residential,3.55371425799,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,98,2030.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2032.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,100,2034.00000000000,R2,residential,0.08237631567,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-192,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2034.00000000000,R2,residential,0.25230077252,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-193,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,102,2036.00000000000,R2,residential,0.10710000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2038.00000000000,R2,residential,0.14280000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-195,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2034.00000000000,R2,residential,5.33057138698,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-196,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,126,2030.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-197,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,127,2032.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2034.00000000000,R2,residential,0.16482954667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-199,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,129,2034.00000000000,R2,residential,0.50483712000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-200,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,130,2036.00000000000,R2,residential,0.21430000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-201,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,131,2038.00000000000,R2,residential,0.28573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-202,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2034.00000000000,R2,residential,10.66611996480,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-203,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,154,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-204,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,155,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-205,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,156,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-206,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,157,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,158,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-208,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,159,2038.00000000000,R2,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-209,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,163,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-210,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,182,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,183,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,184,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-213,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,185,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-214,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,186,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-215,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,187,2038.00000000000,R2,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-216,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-217,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,210,2030.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-218,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,211,2032.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-219,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,212,2034.00000000000,R2,residential,0.10991200289,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-220,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,213,2034.00000000000,R2,residential,0.33663660498,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-221,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,214,2036.00000000000,R2,residential,0.14290000000,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-222,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,215,2038.00000000000,R2,residential,0.19053333333,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-223,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,219,2034.00000000000,R2,residential,7.11240570681,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.06963193654,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.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-8,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,8,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-9,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,9,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-10,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,10,2034.00000000000,R1,power,0.03899388446,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-11,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,11,2034.00000000000,R1,power,0.03673248331,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-12,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2036.00000000000,R1,power,0.03808000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-13,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2038.00000000000,R1,power,0.03808000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-15,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,34,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-16,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-17,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,36,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-18,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,37,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-19,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,77,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,78,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,79,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-25,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-26,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-27,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-28,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-29,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-30,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2034.00000000000,R1,power,0.05849082669,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-31,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,86,2034.00000000000,R1,power,0.05509872497,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-32,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,87,2036.00000000000,R1,power,0.05712000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-33,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,88,2038.00000000000,R1,power,0.05712000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-35,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-36,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-37,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,111,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-38,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,112,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-39,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,113,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2022.00000000000,R1,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2022.00000000000,R1,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2024.00000000000,R1,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,155,2026.00000000000,R1,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,156,2028.00000000000,R1,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,157,2030.00000000000,R1,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-48,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,158,2032.00000000000,R1,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-49,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,159,2032.00000000000,R1,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-50,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,160,2034.00000000000,R1,power,0.03899388446,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-51,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2034.00000000000,R1,power,0.03673248331,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-52,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2036.00000000000,R1,power,0.03808000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2038.00000000000,R1,power,0.03808000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,182,2022.00000000000,R1,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-55,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,184,2024.00000000000,R1,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-56,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2026.00000000000,R1,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-57,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,186,2028.00000000000,R1,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-58,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2030.00000000000,R1,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-59,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,188,2032.00000000000,R1,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2022.00000000000,R1,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2022.00000000000,R1,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,229,2024.00000000000,R1,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2026.00000000000,R1,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-66,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,231,2028.00000000000,R1,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-67,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,232,2030.00000000000,R1,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-68,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,233,2032.00000000000,R1,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-69,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,234,2032.00000000000,R1,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-70,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,235,2034.00000000000,R1,power,0.05849082669,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-71,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,236,2034.00000000000,R1,power,0.05509872497,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-72,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,237,2036.00000000000,R1,power,0.05712000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-73,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,238,2038.00000000000,R1,power,0.05712000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,257,2022.00000000000,R1,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-75,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,259,2024.00000000000,R1,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-76,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,260,2026.00000000000,R1,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-77,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,261,2028.00000000000,R1,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-78,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,262,2030.00000000000,R1,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-79,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,263,2032.00000000000,R1,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,300,2020.00000000000,R1,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,301,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,302,2022.00000000000,R1,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,303,2022.00000000000,R1,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,304,2024.00000000000,R1,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,305,2026.00000000000,R1,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,306,2028.00000000000,R1,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-87,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,307,2030.00000000000,R1,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-88,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,308,2032.00000000000,R1,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-89,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,309,2032.00000000000,R1,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-90,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,310,2034.00000000000,R1,power,0.11703626667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-91,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,311,2034.00000000000,R1,power,0.11024889600,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-92,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,312,2036.00000000000,R1,power,0.11429333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-93,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,313,2038.00000000000,R1,power,0.11429333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-94,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,332,2022.00000000000,R1,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,334,2024.00000000000,R1,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,335,2026.00000000000,R1,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,336,2028.00000000000,R1,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-98,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,337,2030.00000000000,R1,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-99,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,338,2032.00000000000,R1,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-100,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,375,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-101,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,376,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-102,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,377,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-103,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,378,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-104,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,379,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-105,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,380,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-106,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,381,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-107,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,382,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-108,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,383,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-109,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,384,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-110,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,385,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-111,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,386,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-112,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,387,2036.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-113,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,388,2038.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,407,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-115,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,409,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-116,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,410,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-117,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,411,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-118,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,412,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-119,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,413,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,450,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,451,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,452,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,453,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,454,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,455,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,456,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-127,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,457,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-128,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,458,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-129,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,459,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-130,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,460,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-131,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,461,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-132,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,462,2036.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-133,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,463,2038.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-134,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,482,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-135,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,484,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-136,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,485,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-137,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,486,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-138,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,487,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-139,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,488,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-140,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,525,2020.00000000000,R1,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-141,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,526,2020.00000000000,R1,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-142,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,527,2022.00000000000,R1,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-143,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,528,2022.00000000000,R1,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-144,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,529,2024.00000000000,R1,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-145,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,530,2026.00000000000,R1,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-146,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,531,2028.00000000000,R1,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-147,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,532,2030.00000000000,R1,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-148,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,533,2032.00000000000,R1,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-149,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,534,2032.00000000000,R1,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-150,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,535,2034.00000000000,R1,power,0.07804238221,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-151,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,536,2034.00000000000,R1,power,0.07351641269,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-152,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,537,2036.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-153,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,538,2038.00000000000,R1,power,0.07621333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-154,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,557,2022.00000000000,R1,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-155,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,559,2024.00000000000,R1,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-156,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,560,2026.00000000000,R1,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-157,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,561,2028.00000000000,R1,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-158,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,562,2030.00000000000,R1,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-159,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,563,2032.00000000000,R1,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-160,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-161,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-162,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-163,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-164,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-165,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-166,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-167,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,7,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-168,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,8,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-169,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,9,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-170,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,10,2034.00000000000,R2,power,0.03899388446,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-171,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,11,2034.00000000000,R2,power,0.03673248331,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-172,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,12,2036.00000000000,R2,power,0.03808000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-173,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,13,2038.00000000000,R2,power,0.03808000000,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-174,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,32,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-175,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,34,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-176,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-177,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,36,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-178,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,37,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-179,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,38,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-180,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-181,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-182,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-183,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,78,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-184,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,79,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-185,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,80,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-186,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,81,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-187,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,82,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-188,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,83,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-189,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,84,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-190,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,85,2034.00000000000,R2,power,0.05849082669,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-191,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,86,2034.00000000000,R2,power,0.05509872497,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-192,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,87,2036.00000000000,R2,power,0.05712000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-193,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,88,2038.00000000000,R2,power,0.05712000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-194,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-195,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,109,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-196,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-197,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,111,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-198,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,112,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-199,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,113,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-200,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.06963193654,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-201,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.13327111526,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-202,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2022.00000000000,R2,power,0.01499300047,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-203,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2022.00000000000,R2,power,0.01845953025,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-204,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2024.00000000000,R2,power,0.08190401468,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-205,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,155,2026.00000000000,R2,power,0.03437179987,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-206,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,156,2028.00000000000,R2,power,0.03838901668,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-207,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,157,2030.00000000000,R2,power,0.04147918345,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-208,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,158,2032.00000000000,R2,power,0.01022722538,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-209,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,159,2032.00000000000,R2,power,0.02785277462,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-210,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,160,2034.00000000000,R2,power,0.03899388446,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-211,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,161,2034.00000000000,R2,power,0.03673248331,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-212,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,162,2036.00000000000,R2,power,0.03808000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-213,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,163,2038.00000000000,R2,power,0.03808000000,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-214,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,182,2022.00000000000,R2,power,1.37440835278,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-215,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,184,2024.00000000000,R2,power,7.50814102603,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-216,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2026.00000000000,R2,power,3.15086289433,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-217,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,186,2028.00000000000,R2,power,3.51912115881,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-218,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,187,2030.00000000000,R2,power,3.80239674686,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-219,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,188,2032.00000000000,R2,power,0.93752975104,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-220,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,225,2020.00000000000,R2,power,0.10444790481,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-221,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,226,2020.00000000000,R2,power,0.19990667289,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-222,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,227,2022.00000000000,R2,power,0.02248950070,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-223,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,228,2022.00000000000,R2,power,0.02768929538,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-224,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,229,2024.00000000000,R2,power,0.12285602203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-225,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,230,2026.00000000000,R2,power,0.05155769981,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-226,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,231,2028.00000000000,R2,power,0.05758352502,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-227,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,232,2030.00000000000,R2,power,0.06221877517,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-228,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,233,2032.00000000000,R2,power,0.01534083808,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-229,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,234,2032.00000000000,R2,power,0.04177916192,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-230,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,235,2034.00000000000,R2,power,0.05849082669,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-231,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,236,2034.00000000000,R2,power,0.05509872497,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-232,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,237,2036.00000000000,R2,power,0.05712000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-233,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,238,2038.00000000000,R2,power,0.05712000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-234,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,257,2022.00000000000,R2,power,2.06161252916,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-235,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,259,2024.00000000000,R2,power,11.26221153905,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-236,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,260,2026.00000000000,R2,power,4.72629434150,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-237,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,261,2028.00000000000,R2,power,5.27868173821,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-238,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,262,2030.00000000000,R2,power,5.70359512029,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-239,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,263,2032.00000000000,R2,power,1.40629462656,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-240,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,300,2020.00000000000,R2,power,0.20899333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-241,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,301,2020.00000000000,R2,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-242,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,302,2022.00000000000,R2,power,0.04500000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-243,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,303,2022.00000000000,R2,power,0.05540444444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-244,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,304,2024.00000000000,R2,power,0.24582675556,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-245,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,305,2026.00000000000,R2,power,0.10316353939,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-246,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,306,2028.00000000000,R2,power,0.11522081616,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-247,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,307,2030.00000000000,R2,power,0.12449564444,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-248,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,308,2032.00000000000,R2,power,0.03069600000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-249,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,309,2032.00000000000,R2,power,0.08359733333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-250,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,310,2034.00000000000,R2,power,0.11703626667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-251,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,311,2034.00000000000,R2,power,0.11024889600,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-252,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,312,2036.00000000000,R2,power,0.11429333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-253,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,313,2038.00000000000,R2,power,0.11429333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-254,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,332,2022.00000000000,R2,power,4.12515000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-255,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,334,2024.00000000000,R2,power,22.53493868178,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-256,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,335,2026.00000000000,R2,power,9.45700165624,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-257,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,336,2028.00000000000,R2,power,10.56229221754,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-258,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,337,2030.00000000000,R2,power,11.41251572622,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-259,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,338,2032.00000000000,R2,power,2.81390232000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-260,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,375,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-261,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,376,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-262,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,377,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-263,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,378,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-264,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,379,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-265,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,380,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-266,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,381,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-267,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,382,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-268,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,383,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-269,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,384,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-270,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,385,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-271,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,386,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-272,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,387,2036.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-273,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,388,2038.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-274,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,407,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-275,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,409,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-276,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,410,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-277,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,411,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-278,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,412,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-279,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,413,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-280,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,450,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-281,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,451,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-282,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,452,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-283,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,453,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-284,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,454,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-285,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,455,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-286,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,456,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-287,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,457,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-288,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,458,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-289,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,459,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-290,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,460,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-291,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,461,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-292,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,462,2036.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-293,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,463,2038.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-294,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,482,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-295,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,484,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-296,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,485,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-297,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,486,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-298,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,487,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-299,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,488,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-300,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,525,2020.00000000000,R2,power,0.13936139680,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-301,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,526,2020.00000000000,R2,power,0.26672888474,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-302,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,527,2022.00000000000,R2,power,0.03000699953,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-303,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,528,2022.00000000000,R2,power,0.03694491419,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-304,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,529,2024.00000000000,R2,power,0.16392274087,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-305,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,530,2026.00000000000,R2,power,0.06879173952,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-306,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,531,2028.00000000000,R2,power,0.07683179948,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-307,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,532,2030.00000000000,R2,power,0.08301646099,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-308,A1,8.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,533,2032.00000000000,R2,power,0.02046877462,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-309,A1,9.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,534,2032.00000000000,R2,power,0.05574455872,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-310,A1,10.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,535,2034.00000000000,R2,power,0.07804238221,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-311,A1,11.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,536,2034.00000000000,R2,power,0.07351641269,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-312,A1,12.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,537,2036.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-313,A1,13.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,538,2038.00000000000,R2,power,0.07621333333,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-314,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,557,2022.00000000000,R2,power,2.75074164722,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-315,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,559,2024.00000000000,R2,power,15.02679765574,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-316,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,560,2026.00000000000,R2,power,6.30613876191,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-317,A1,6.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,561,2028.00000000000,R2,power,7.04317105873,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-318,A1,7.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,562,2030.00000000000,R2,power,7.61011897936,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-319,A1,8.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,563,2032.00000000000,R2,power,1.87637256896,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2024.00000000000,R1,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2026.00000000000,R1,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2028.00000000000,R1,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2032.00000000000,R1,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2024.00000000000,R1,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2026.00000000000,R1,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2028.00000000000,R1,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2030.00000000000,R1,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2032.00000000000,R1,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2024.00000000000,R1,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2026.00000000000,R1,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2028.00000000000,R1,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2032.00000000000,R1,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2024.00000000000,R1,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2026.00000000000,R1,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,17,2028.00000000000,R1,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2030.00000000000,R1,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2032.00000000000,R1,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,20,2024.00000000000,R1,gas,0.28862193385,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2026.00000000000,R1,gas,0.16772280565,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2028.00000000000,R1,gas,0.15556299594,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,23,2030.00000000000,R1,gas,0.83801832057,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,24,2032.00000000000,R1,gas,0.04203109403,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,25,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,26,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,27,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,28,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,29,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,30,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,31,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,32,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,33,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,34,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,35,2024.00000000000,R1,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,36,2026.00000000000,R1,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,37,2028.00000000000,R1,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,38,2030.00000000000,R1,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,39,2032.00000000000,R1,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2024.00000000000,R2,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2026.00000000000,R2,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2028.00000000000,R2,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2032.00000000000,R2,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2024.00000000000,R2,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2026.00000000000,R2,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2028.00000000000,R2,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2030.00000000000,R2,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2032.00000000000,R2,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2024.00000000000,R2,gas,0.09616241753,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2026.00000000000,R2,gas,0.05588151341,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2028.00000000000,R2,gas,0.05183013491,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.27920909048,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2032.00000000000,R2,gas,0.01400382694,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2024.00000000000,R2,gas,0.14424362630,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2026.00000000000,R2,gas,0.08382227011,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,17,2028.00000000000,R2,gas,0.07774520236,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2030.00000000000,R2,gas,0.41881363571,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2032.00000000000,R2,gas,0.02100574041,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,20,2024.00000000000,R2,gas,0.28862193385,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2026.00000000000,R2,gas,0.16772280565,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2028.00000000000,R2,gas,0.15556299594,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,23,2030.00000000000,R2,gas,0.83801832057,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,24,2032.00000000000,R2,gas,0.04203109403,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,25,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,26,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,27,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,28,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,29,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,30,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,31,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,32,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,33,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,34,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,35,2024.00000000000,R2,gas,0.19245951632,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,36,2026.00000000000,R2,gas,0.11184129224,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,37,2028.00000000000,R2,gas,0.10373286104,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,38,2030.00000000000,R2,gas,0.55880923010,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,39,2032.00000000000,R2,gas,0.02802726709,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 772a8cf7..e7e6ef07 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,3 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.32180000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,0.32180000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,0.72220000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,0.72220000000,2022
-"('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,0.48270000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,0.48270000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,1.08340000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,1.08340000000,2022
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32180000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32180000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.72220000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.72220000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48270000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48270000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.08340000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.08340000000,2022
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96580000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.96580000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.16780000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.16780000000,2022
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,0.64400000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,0.64400000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,1.44550000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,1.44550000000,2022
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.64400000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.64400000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.44550000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.44550000000,2022
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.64400000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.64400000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.44550000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.44550000000,2022
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.22110000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.22110000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,0.14510000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,0.14510000000,2024
-"('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.33200000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.33200000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,0.22320000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,0.22320000000,2024
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.22110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.22110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.14510000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.14510000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.33200000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.33200000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.22320000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.22320000000,2024
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66690000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.66690000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.48030000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.48030000000,2024
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,0.44360000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,0.44360000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,0.30530000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,0.30530000000,2024
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.44360000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.44360000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.30530000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.30530000000,2024
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.44360000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.44360000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.30530000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.30530000000,2024
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.32640000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.32640000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.13700000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.13700000000,2026
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,0.49030000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,0.49030000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.20960000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.20960000000,2026
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32640000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32640000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13700000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13700000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.49030000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.49030000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20960000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.20960000000,2026
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.98520000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.98520000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44410000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.44410000000,2026
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,0.65510000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,0.65510000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.28510000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.28510000000,2026
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.65510000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.65510000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.28510000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.28510000000,2026
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.65510000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.65510000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28510000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28510000000,2026
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.41460000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.41460000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.14730000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.14730000000,2028
-"('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,0.62270000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,0.62270000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.22700000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.22700000000,2028
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.41460000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41460000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.14730000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.14730000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62270000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.62270000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.22700000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.22700000000,2028
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.25110000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.25110000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.49020000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.49020000000,2028
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,0.83200000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,0.83200000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.31080000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.31080000000,2028
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.83200000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.83200000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.31080000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.31080000000,2028
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.83200000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.83200000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.31080000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.31080000000,2028
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.50990000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.50990000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.15120000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.15120000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.76590000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.76590000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.23440000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.23440000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.50990000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.50990000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15120000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.15120000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.76590000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.76590000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.23440000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.23440000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.53830000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.53830000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.51490000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.51490000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.02320000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.02320000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.32290000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.32290000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.02320000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.02320000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.32290000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.32290000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.02320000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.02320000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.32290000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.32290000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.63620000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.63620000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.15640000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.15640000000,2032
-"('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95540000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,0.95540000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.24400000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.24400000000,2032
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.63620000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.63620000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15640000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.15640000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95540000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.95540000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24400000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.24400000000,2032
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91830000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.91830000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.54550000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.54550000000,2032
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27620000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,1.27620000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.33830000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.33830000000,2032
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.27620000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.27620000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.33830000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.33830000000,2032
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.27620000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.27620000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.33830000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.33830000000,2032
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.68710000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.68710000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.16640000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.16640000000,2034
-"('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.03180000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.03180000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.26140000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.26140000000,2034
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.68710000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.68710000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.16640000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.16640000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.03180000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.03180000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.26140000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.26140000000,2034
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.07090000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.07090000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59490000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.59490000000,2034
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,1.37810000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,1.37810000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.36480000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.36480000000,2034
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.37810000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.37810000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.36480000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.36480000000,2034
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.37810000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.37810000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.36480000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.36480000000,2034
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.66510000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.66510000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.10850000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.10850000000,2036
-"('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,0.99860000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,0.99860000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.17660000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.17660000000,2036
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.66510000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66510000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.10850000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.10850000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99860000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.99860000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17660000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.17660000000,2036
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.00350000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.00350000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43650000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43650000000,2036
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,1.33360000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,1.33360000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.25410000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.25410000000,2036
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.33360000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.33360000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.25410000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.25410000000,2036
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.33360000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.33360000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.25410000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.25410000000,2036
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.68430000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.68430000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.11080000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.11080000000,2038
-"('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.02730000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.02730000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.17960000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.17960000000,2038
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.68430000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.68430000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.11080000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.11080000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.02730000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.02730000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17960000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.17960000000,2038
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.06070000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.06070000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44020000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.44020000000,2038
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,1.37180000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,1.37180000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.25760000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.25760000000,2038
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.37180000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.37180000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.25760000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.25760000000,2038
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.37180000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.37180000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.25760000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.25760000000,2038
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.70100000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.70100000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.11390000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.11390000000,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,1.05230000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.05230000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.18460000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.18460000000,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', 'mid-afternoon')",electricity,R1,0.70100000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.70100000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.11390000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.11390000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05230000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.05230000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18460000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.18460000000,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,2.11030000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.11030000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.45280000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.45280000000,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.40510000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.40510000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.26490000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.26490000000,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', 'early-morning')",electricity,R1,1.40510000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.40510000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.26490000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.26490000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.40510000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.40510000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.26490000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.26490000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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
new file mode 100644
index 00000000..78889a42
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
@@ -0,0 +1,21 @@
+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,windturbine,33.82470000000
+1,2025,R1,2020,windturbine,33.82470000000
+1,2030,R1,2020,windturbine,33.82470000000
+1,2035,R1,2020,windturbine,33.82470000000
+1,2040,R1,2020,windturbine,33.82470000000
+1,2045,R1,2020,windturbine,33.82470000000
+1,2046,R1,2020,windturbine,33.82470000000
+2,2020,R2,2020,gasCCGT,1.00000000000
+2,2022,R2,2020,gasCCGT,1.00000000000
+2,2025,R2,2020,gasCCGT,1.00000000000
+3,2022,R2,2020,windturbine,33.82470000000
+3,2025,R2,2020,windturbine,33.82470000000
+3,2030,R2,2020,windturbine,33.82470000000
+3,2035,R2,2020,windturbine,33.82470000000
+3,2040,R2,2020,windturbine,33.82470000000
+3,2045,R2,2020,windturbine,33.82470000000
+3,2046,R2,2020,windturbine,33.82470000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..0b9e6c57
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
@@ -0,0 +1,53 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,3.00000000000
+1,2035,gasCCGT,R1,2025,3.00000000000
+1,2040,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R1,2025,3.00000000000
+1,2049,gasCCGT,R1,2025,3.00000000000
+1,2050,gasCCGT,R1,2025,3.00000000000
+1,2054,gasCCGT,R1,2025,3.00000000000
+1,2055,gasCCGT,R1,2025,3.00000000000
+1,2064,gasCCGT,R1,2025,3.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,3.00000000000
+3,2035,gasCCGT,R2,2025,3.00000000000
+3,2040,gasCCGT,R2,2025,3.00000000000
+3,2045,gasCCGT,R2,2025,3.00000000000
+3,2049,gasCCGT,R2,2025,3.00000000000
+3,2050,gasCCGT,R2,2025,3.00000000000
+3,2054,gasCCGT,R2,2025,3.00000000000
+3,2055,gasCCGT,R2,2025,3.00000000000
+3,2064,gasCCGT,R2,2025,3.00000000000
+4,2025,solarPV,R1,2020,6.75000000000
+4,2030,solarPV,R1,2020,6.75000000000
+4,2035,solarPV,R1,2020,6.75000000000
+4,2040,solarPV,R1,2020,6.75000000000
+4,2045,solarPV,R1,2020,6.75000000000
+4,2049,solarPV,R1,2020,6.75000000000
+5,2030,solarPV,R1,2025,2.40000000000
+5,2035,solarPV,R1,2025,2.40000000000
+5,2040,solarPV,R1,2025,2.40000000000
+5,2045,solarPV,R1,2025,2.40000000000
+5,2049,solarPV,R1,2025,2.40000000000
+5,2050,solarPV,R1,2025,2.40000000000
+5,2054,solarPV,R1,2025,2.40000000000
+6,2030,solarPV,R2,2025,2.40000000000
+6,2035,solarPV,R2,2025,2.40000000000
+6,2040,solarPV,R2,2025,2.40000000000
+6,2045,solarPV,R2,2025,2.40000000000
+6,2049,solarPV,R2,2025,2.40000000000
+6,2050,solarPV,R2,2025,2.40000000000
+6,2054,solarPV,R2,2025,2.40000000000
+7,2025,windturbine,R1,2020,10.00000000000
+7,2030,windturbine,R1,2020,10.00000000000
+7,2035,windturbine,R1,2020,10.00000000000
+7,2040,windturbine,R1,2020,10.00000000000
+7,2045,windturbine,R1,2020,10.00000000000
+7,2049,windturbine,R1,2020,10.00000000000
+8,2025,windturbine,R2,2020,16.75000000000
+8,2030,windturbine,R2,2020,16.75000000000
+8,2035,windturbine,R2,2020,16.75000000000
+8,2040,windturbine,R2,2020,16.75000000000
+8,2045,windturbine,R2,2020,16.75000000000
+8,2049,windturbine,R2,2020,16.75000000000
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
new file mode 100644
index 00000000..ca265d0a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..bc71a6d4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
@@ -0,0 +1,105 @@
+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
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
new file mode 100644
index 00000000..bda10415
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
@@ -0,0 +1,105 @@
+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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..b04feb4a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
@@ -0,0 +1,131 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,3.00000000000
+0,2049,gasCCGT,R1,2025,3.00000000000
+0,2050,gasCCGT,R1,2025,3.00000000000
+0,2054,gasCCGT,R1,2025,3.00000000000
+0,2055,gasCCGT,R1,2025,3.00000000000
+0,2059,gasCCGT,R1,2025,3.00000000000
+0,2060,gasCCGT,R1,2025,3.00000000000
+0,2064,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R2,2025,3.00000000000
+1,2049,gasCCGT,R2,2025,3.00000000000
+1,2050,gasCCGT,R2,2025,3.00000000000
+1,2054,gasCCGT,R2,2025,3.00000000000
+1,2055,gasCCGT,R2,2025,3.00000000000
+1,2059,gasCCGT,R2,2025,3.00000000000
+1,2060,gasCCGT,R2,2025,3.00000000000
+1,2064,gasCCGT,R2,2025,3.00000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2045,solarPV,R1,2025,2.40000000000
+3,2049,solarPV,R1,2025,2.40000000000
+3,2050,solarPV,R1,2025,2.40000000000
+3,2054,solarPV,R1,2025,2.40000000000
+4,2045,solarPV,R1,2030,6.00000000000
+4,2049,solarPV,R1,2030,6.00000000000
+4,2050,solarPV,R1,2030,6.00000000000
+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
+15,2045,windturbine,R2,2020,16.75000000000
+15,2049,windturbine,R2,2020,16.75000000000
+16,2045,windturbine,R2,2030,3.60000000000
+16,2049,windturbine,R2,2030,3.60000000000
+16,2050,windturbine,R2,2030,3.60000000000
+16,2054,windturbine,R2,2030,3.60000000000
+16,2055,windturbine,R2,2030,3.60000000000
+16,2059,windturbine,R2,2030,3.60000000000
+17,2045,windturbine,R2,2035,4.39000000000
+17,2049,windturbine,R2,2035,4.39000000000
+17,2050,windturbine,R2,2035,4.39000000000
+17,2054,windturbine,R2,2035,4.39000000000
+17,2055,windturbine,R2,2035,4.39000000000
+17,2059,windturbine,R2,2035,4.39000000000
+17,2060,windturbine,R2,2035,4.39000000000
+17,2064,windturbine,R2,2035,4.39000000000
+18,2050,windturbine,R2,2045,6.75000000000
+18,2054,windturbine,R2,2045,6.75000000000
+18,2055,windturbine,R2,2045,6.75000000000
+18,2059,windturbine,R2,2045,6.75000000000
+18,2060,windturbine,R2,2045,6.75000000000
+18,2064,windturbine,R2,2045,6.75000000000
+18,2065,windturbine,R2,2045,6.75000000000
+18,2069,windturbine,R2,2045,6.75000000000
+18,2070,windturbine,R2,2045,6.75000000000
+18,2074,windturbine,R2,2045,6.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..37b2c93a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
@@ -0,0 +1,121 @@
+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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..8e165158
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,15 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2022,gasboiler,R1,2020,5.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2022,gasboiler,R2,2020,5.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2022,heatpump,R1,2020,14.42990000000
+2,2025,heatpump,R1,2020,14.42990000000
+2,2030,heatpump,R1,2020,14.42990000000
+2,2031,heatpump,R1,2020,14.42990000000
+3,2022,heatpump,R2,2020,14.42990000000
+3,2025,heatpump,R2,2020,14.42990000000
+3,2030,heatpump,R2,2020,14.42990000000
+3,2031,heatpump,R2,2020,14.42990000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..34d42206
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,4.10000000000
+1,2034,gasboiler,R1,2025,4.10000000000
+1,2035,gasboiler,R1,2025,4.10000000000
+1,2039,gasboiler,R1,2025,4.10000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,4.10000000000
+3,2034,gasboiler,R2,2025,4.10000000000
+3,2035,gasboiler,R2,2025,4.10000000000
+3,2039,gasboiler,R2,2025,4.10000000000
+4,2025,heatpump,R1,2020,19.00000000000
+4,2030,heatpump,R1,2020,19.00000000000
+4,2034,heatpump,R1,2020,19.00000000000
+5,2030,heatpump,R1,2025,6.90000000000
+5,2034,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2025,6.90000000000
+5,2039,heatpump,R1,2025,6.90000000000
+6,2025,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2020,19.00000000000
+6,2034,heatpump,R2,2020,19.00000000000
+7,2030,heatpump,R2,2025,6.90000000000
+7,2034,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..559a80d8
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,4.10000000000
+0,2034,gasboiler,R1,2025,4.10000000000
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2030,gasboiler,R2,2025,4.10000000000
+1,2034,gasboiler,R2,2025,4.10000000000
+1,2035,gasboiler,R2,2025,4.10000000000
+1,2039,gasboiler,R2,2025,4.10000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2030,heatpump,R1,2025,6.90000000000
+3,2034,heatpump,R1,2025,6.90000000000
+3,2035,heatpump,R1,2025,6.90000000000
+3,2039,heatpump,R1,2025,6.90000000000
+4,2035,heatpump,R1,2030,25.00000000000
+4,2039,heatpump,R1,2030,25.00000000000
+4,2040,heatpump,R1,2030,25.00000000000
+4,2044,heatpump,R1,2030,25.00000000000
+5,2030,heatpump,R2,2020,19.00000000000
+5,2034,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2025,6.90000000000
+6,2034,heatpump,R2,2025,6.90000000000
+6,2035,heatpump,R2,2025,6.90000000000
+6,2039,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2030,25.00000000000
+7,2039,heatpump,R2,2030,25.00000000000
+7,2040,heatpump,R2,2030,25.00000000000
+7,2044,heatpump,R2,2030,25.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..fa9e8bca
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2040,gasboiler,R1,2035,0.91000000000
+1,2044,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R1,2035,0.91000000000
+1,2049,gasboiler,R1,2035,0.91000000000
+2,2035,gasboiler,R2,2025,4.10000000000
+2,2039,gasboiler,R2,2025,4.10000000000
+3,2040,gasboiler,R2,2035,0.91000000000
+3,2044,gasboiler,R2,2035,0.91000000000
+3,2045,gasboiler,R2,2035,0.91000000000
+3,2049,gasboiler,R2,2035,0.91000000000
+4,2035,heatpump,R1,2025,6.90000000000
+4,2039,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2030,25.00000000000
+5,2039,heatpump,R1,2030,25.00000000000
+5,2040,heatpump,R1,2030,25.00000000000
+5,2044,heatpump,R1,2030,25.00000000000
+6,2040,heatpump,R1,2035,16.09000000000
+6,2044,heatpump,R1,2035,16.09000000000
+6,2045,heatpump,R1,2035,16.09000000000
+6,2049,heatpump,R1,2035,16.09000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
+8,2035,heatpump,R2,2030,25.00000000000
+8,2039,heatpump,R2,2030,25.00000000000
+8,2040,heatpump,R2,2030,25.00000000000
+8,2044,heatpump,R2,2030,25.00000000000
+9,2040,heatpump,R2,2035,16.09000000000
+9,2044,heatpump,R2,2035,16.09000000000
+9,2045,heatpump,R2,2035,16.09000000000
+9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..eb1a544b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2040,gasboiler,R1,2035,0.91000000000
+0,2044,gasboiler,R1,2035,0.91000000000
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2040,gasboiler,R2,2035,0.91000000000
+1,2044,gasboiler,R2,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2040,heatpump,R1,2030,25.00000000000
+2,2044,heatpump,R1,2030,25.00000000000
+3,2040,heatpump,R1,2035,16.09000000000
+3,2044,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2035,16.09000000000
+3,2049,heatpump,R1,2035,16.09000000000
+4,2045,heatpump,R1,2040,31.00000000000
+4,2049,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2040,31.00000000000
+4,2054,heatpump,R1,2040,31.00000000000
+5,2040,heatpump,R2,2030,25.00000000000
+5,2044,heatpump,R2,2030,25.00000000000
+6,2040,heatpump,R2,2035,16.09000000000
+6,2044,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2035,16.09000000000
+6,2049,heatpump,R2,2035,16.09000000000
+7,2045,heatpump,R2,2040,31.00000000000
+7,2049,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2040,31.00000000000
+7,2054,heatpump,R2,2040,31.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..0b5fe3de
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2045,heatpump,R1,2035,16.09000000000
+2,2049,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2040,31.00000000000
+3,2049,heatpump,R1,2040,31.00000000000
+3,2050,heatpump,R1,2040,31.00000000000
+3,2054,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2045,23.00000000000
+4,2054,heatpump,R1,2045,23.00000000000
+4,2055,heatpump,R1,2045,23.00000000000
+4,2059,heatpump,R1,2045,23.00000000000
+5,2045,heatpump,R2,2035,16.09000000000
+5,2049,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2040,31.00000000000
+6,2049,heatpump,R2,2040,31.00000000000
+6,2050,heatpump,R2,2040,31.00000000000
+6,2054,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2045,23.00000000000
+7,2054,heatpump,R2,2045,23.00000000000
+7,2055,heatpump,R2,2045,23.00000000000
+7,2059,heatpump,R2,2045,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..eb21c442
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..7a199736
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..eb9ddd9d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..af0c152b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..21119f08
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..503b4b8c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..98be95de
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..26d4aa26
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv
index d5d66ba2..578ab646 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearExport.csv
@@ -37,4 +37,4 @@ R2,Exports,2080,0,0,0,0,0,0
 R2,Exports,2085,0,0,0,0,0,0
 R2,Exports,2090,0,0,0,0,0,0
 R2,Exports,2095,0,0,0,0,0,0
-R2,Exports,2100,0,0,0,0,0,0
+R2,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv
index eb064aa9..1f9b8f3e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/BaseYearImport.csv
@@ -37,4 +37,4 @@ R2,Imports,2080,0,0,0,0,0,0
 R2,Imports,2085,0,0,0,0,0,0
 R2,Imports,2090,0,0,0,0,0,0
 R2,Imports,2095,0,0,0,0,0,0
-R2,Imports,2100,0,0,0,0,0,0
+R2,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv
index 253b75ef..9691db73 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/GlobalCommodities.csv
@@ -1,7 +1,7 @@
 Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
+Electricity,Energy,electricity,0.0,1,PJ
 Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv
index dd25bbad..eb6950dd 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/input/Projections.csv
@@ -37,4 +37,4 @@ R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
 R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
 R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
 R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 607482a9..35f39c13 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -16,26 +16,28 @@ 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"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{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"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
 
 # Carbon budget control
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
@@ -50,7 +52,7 @@ commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
 [sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/residential/Agents.csv'
+agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [
@@ -63,6 +65,21 @@ constraints = [
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 2  # Optional, defaults to 5
 
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -79,7 +96,13 @@ commodities_out = '{path}/technodata/power/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
-forecast = 2  # Optional, defaults to 5
+
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
@@ -97,7 +120,13 @@ commodities_out = '{path}/technodata/gas/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
-forecast = 2  # Optional, defaults to 5
+
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
 
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
@@ -106,16 +135,17 @@ interaction = 'transfer'
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-forecast = 2  # Optional, defaults to 5
 consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1095
-all-year.all-week.morning = 1095
-all-year.all-week.mid-afternoon = 1095
-all-year.all-week.early-peak = 1095
-all-year.all-week.late-peak = 1095
-all-year.all-week.evening = 1095
-all-year.all-week.early-morning = 1095
-all-year.all-week.late-afternoon = 1095
+
+[timeslices.all-year.all-week]
+night = 1095
+morning = 1095
+mid-afternoon = 1095
+early-peak = 1095
+late-peak = 1095
+evening = 1095
+early-morning = 1095
+late-afternoon = 1095
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
index 3050e067..9ab1349d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
@@ -1,5 +1,5 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv
index 913d062f..8e98856f 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,0,0,0,0
-gassupply1,R2,2020,fixed,0,0,0,0,0
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
index bb45c4b4..cdeddecf 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
 Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv
index 8142f5e5..2e95999a 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
-gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
index f7d15839..b368d952 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv
index b5ca96ca..7a8e8503 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommIn.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
 windturbine,R2,2020,fixed,0,0,0,0,1,0
 windturbine,R2,2040,fixed,0,0,0,0,1,0
 solarPV,R2,2020,fixed,0,0,0,0,0,1
-solarPV,R2,2040,fixed,0,0,0,0,0,1
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
index 7edb7454..8ab0fef9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
@@ -11,4 +11,4 @@ gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
 windturbine,R2,2020,fixed,1,0,0,0,0,0
 windturbine,R2,2040,fixed,1,0,0,0,0,0
 solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv
index 15edcaec..5c648dca 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/ExistingCapacity.csv
@@ -4,4 +4,4 @@ windturbine,R1,PJ/y,0,0,0,0,0,0,0
 solarPV,R1,PJ/y,0,0,0,0,0,0,0
 gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
 windturbine,R2,PJ/y,0,0,0,0,0,0,0
-solarPV,R2,PJ/y,0,0,0,0,0,0,0
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index 4958747b..6c73b86e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,100,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,100,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
index bce744a6..4bc0cede 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
 0,R1,gasboiler,1,0,0,0.714,0,0
 1,R1,gasboiler,2,0,0,1.071,0,0
 2,R1,gasboiler,3,0,0,0.714,0,0
 3,R1,gasboiler,4,0,0,1.071,0,0
 4,R1,gasboiler,5,0,0,2.143,0,0
 5,R1,gasboiler,6,0,0,1.429,0,0
-6,R1,gasboiler,7,0,0,1.429,0,0
-7,R1,gasboiler,8,0,0,1.429,0,0
+5,R1,gasboiler,7,0,0,1.429,0,0
+5,R1,gasboiler,8,0,0,1.429,0,0
 0,R2,gasboiler,1,0,0,0.714,0,0
 1,R2,gasboiler,2,0,0,1.071,0,0
 2,R2,gasboiler,3,0,0,0.714,0,0
 3,R2,gasboiler,4,0,0,1.071,0,0
 4,R2,gasboiler,5,0,0,2.143,0,0
 5,R2,gasboiler,6,0,0,1.429,0,0
-6,R2,gasboiler,7,0,0,1.429,0,0
-7,R2,gasboiler,8,0,0,1.429,0,0
+5,R2,gasboiler,7,0,0,1.429,0,0
+5,R2,gasboiler,8,0,0,1.429,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
index b79af2c9..5e1ea746 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
 0,R1,gasboiler,1,0,0,2.142,0,0
 1,R1,gasboiler,2,0,0,3.213,0,0
 2,R1,gasboiler,3,0,0,2.142,0,0
 3,R1,gasboiler,4,0,0,3.213,0,0
-4,R1,gasboiler,5,0,0,6.429,0,0
+4,R1,gasboiler,5,0,0,6.428999999999999,0,0
 5,R1,gasboiler,6,0,0,4.287,0,0
-6,R1,gasboiler,7,0,0,4.287,0,0
-7,R1,gasboiler,8,0,0,4.287,0,0
+5,R1,gasboiler,7,0,0,4.287,0,0
+5,R1,gasboiler,8,0,0,4.287,0,0
 0,R2,gasboiler,1,0,0,2.142,0,0
 1,R2,gasboiler,2,0,0,3.213,0,0
 2,R2,gasboiler,3,0,0,2.142,0,0
 3,R2,gasboiler,4,0,0,3.213,0,0
-4,R2,gasboiler,5,0,0,6.429,0,0
+4,R2,gasboiler,5,0,0,6.428999999999999,0,0
 5,R2,gasboiler,6,0,0,4.287,0,0
-6,R2,gasboiler,7,0,0,4.287,0,0
-7,R2,gasboiler,8,0,0,4.287,0,0
+5,R2,gasboiler,7,0,0,4.287,0,0
+5,R2,gasboiler,8,0,0,4.287,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv
deleted file mode 100644
index 1a179abe..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Agents.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv
index 50e0921c..3eedce97 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommIn.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,1.16,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0
 gasboiler,R2,2020,fixed,0,1.16,0,0,0
-heatpump,R2,2020,fixed,0.4,0,0,0,0
+heatpump,R2,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
index 4fac2bf4..bc310414 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
@@ -3,4 +3,4 @@ Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
 gasboiler,R1,2020,fixed,0,0,1,64.71,0
 heatpump,R1,2020,fixed,0,0,1,0,0
 gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
+heatpump,R2,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv
index 9c70c6f0..d57d56eb 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/ExistingCapacity.csv
@@ -2,4 +2,4 @@ ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasboiler,R1,PJ/y,10,5,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasboiler,R2,PJ/y,10,5,0,0,0,0,0
-heatpump,R2,PJ/y,0,0,0,0,0,0,0
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 23529b2d..94fe36a0 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
new file mode 100644
index 00000000..0f53e132
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -0,0 +1,116 @@
+import os
+import shutil
+import sys
+
+import pandas as pd
+from muse.wizard import add_timeslice, modify_toml
+from tomlkit import dumps, parse
+
+parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+
+"""
+Model 1 - Modify timeslices
+
+"""
+
+
+def generate_model_1():
+    model_name = "1-modify-timeslices"
+
+    # Starting point: copy model from tutorial 3
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+    shutil.copytree(
+        os.path.join(parent_path, "../3-add-region/1-new-region"), model_path
+    )
+
+    # Modify MaxCapacityGrowth (Undocumented)
+    technodata_file = os.path.join(model_path, "technodata/residential/Technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityGrowth"] = 0.04
+    df.to_csv(technodata_file, index=False)
+
+    # Add timeslices
+    add_timeslice(model_path, timeslice_name="early-morning", copy_from="evening")
+    add_timeslice(model_path, timeslice_name="late-afternoon", copy_from="evening")
+
+    # Modify timeslices
+    settings_file = os.path.join(model_path, "settings.toml")
+    with open(settings_file, "r") as file:
+        settings = parse(file.read())
+    timeslices = settings["timeslices"]["all-year"]["all-week"]
+    for key in timeslices:
+        timeslices[key] = 1095
+    settings["timeslices"]["all-year"]["all-week"] = {
+        key if key != "afternoon" else "mid-afternoon": value
+        for key, value in timeslices.items()
+    }
+    with open(settings_file, "w") as file:
+        file.write(dumps(settings))
+
+    # Change consumption profile (Undocumented)
+    consumption_values = [
+        0.714,
+        1.071,
+        0.714,
+        1.071,
+        2.143,
+        1.429,
+        1.429,
+        1.429,
+        0.714,
+        1.071,
+        0.714,
+        1.071,
+        2.143,
+        1.429,
+        1.429,
+        1.429,
+    ]
+    for year, multiplier in zip([2020, 2050], [1, 3]):
+        file = os.path.join(
+            model_path, f"technodata/preset/Residential{year}Consumption.csv"
+        )
+        df = pd.read_csv(file)
+        df["heat"] = [i * multiplier for i in consumption_values]
+        df.to_csv(file, index=False)
+
+
+def generate_model_2():
+    model_name = "2-modify-time-framework"
+
+    # Starting point: copy previous model
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+    shutil.copytree(os.path.join(parent_path, "1-modify-timeslices"), model_path)
+
+    # Modify time framework
+    settings_file = os.path.join(model_path, "settings.toml")
+    time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]
+    modify_toml(settings_file, lambda x: x.update({"time_framework": time_framework}))
+    modify_toml(settings_file, lambda x: x.update({"foresight": 2}))
+    modify_toml(
+        settings_file,
+        lambda x: x["sectors"]["residential"]["subsectors"]["retro_and_new"].update(
+            {"forecast": 2}
+        ),
+    )
+
+    # Double MaxCapacityAddition in power sector
+    technodata_file = os.path.join(model_path, "technodata/power/Technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
+    df.loc[1:, "MaxCapacityAddition"] *= 20
+    df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
+    df.loc[1:, "MaxCapacityGrowth"] *= 2
+    df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
+    df.loc[1:, "TotalCapacityLimit"] *= 2
+    df.to_csv(technodata_file, index=False)
+
+
+if __name__ == "__main__":
+    generate_model_1()
+    generate_model_2()
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb
similarity index 96%
rename from docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
rename to docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb
index a1ad4a1b..9c27622c 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/visualise-time-framework-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = (\n",
-    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    pd.read_csv(\"2-modify-time-framework/Results/MCACapacity.csv\")\n",
     "    .groupby([\"technology\", \"sector\", \"region\", \"year\"])\n",
     "    .sum()\n",
     "    .reset_index()\n",
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb
similarity index 95%
rename from docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
rename to docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb
index b2327dda..be79fea0 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/visualise-timing-result-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = (\n",
-    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    pd.read_csv(\"1-modify-timeslices/Results/MCACapacity.csv\")\n",
     "    .groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
     "    .sum()\n",
     "    .reset_index()\n",
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 0e5e1145..a1d71a62 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -138,9 +138,11 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1460
-all-year.all-week.morning = 1460
-all-year.all-week.afternoon = 1460
-all-year.all-week.early-peak = 1460
-all-year.all-week.late-peak = 1460
-all-year.all-week.evening = 1460
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 17ebd51f..f2b5d1ca 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -14,8 +14,7 @@ def modify_toml(path_to_toml, function):
 
     """
     with open(path_to_toml, "r") as file:
-        lines = file.readlines()
-        data = parse("".join(lines))
+        data = parse(file.read())
     function(data)
     with open(path_to_toml, "w") as file:
         file.write(dumps(data))
@@ -210,26 +209,24 @@ def add_region(model_path, region_name, copy_from) -> None:
         df.to_csv(file_path, index=False)
 
 
-def add_timeslice(model_path, timeslice_name, timeslice_number, copy_from):
-    ## WORK IN PROGRESS
-
-    # Append timeslice_name to timeslices in settings.toml
+def add_timeslice(model_path, timeslice_name, copy_from):
+    # Append timeslice to timeslices in settings.toml
     settings_file = os.path.join(model_path, "settings.toml")
-    modify_toml(
-        settings_file,
-        lambda x: x["timeslices"]["all-year"]["all-week"].append(timeslice_name),
-    )
-
-    # Get all preset file paths
-    preset_files = [
-        os.path.join(model_path, "technodata", "preset", file)
-        for file in os.listdir(os.path.join(model_path, "technodata", "preset"))
-    ]
+    with open(settings_file, "r") as file:
+        settings = parse(file.read())
+    timeslices = settings["timeslices"]["all-year"]["all-week"]
+    copy_from_number = list(timeslices).index(copy_from) + 1
+    timeslices[timeslice_name] = timeslices[copy_from]
+    with open(settings_file, "w") as file:
+        file.write(dumps(settings))
 
     # Loop through all preset files
-    for file_path in preset_files:
+    preset_dir = os.path.join(model_path, "technodata", "preset")
+    for file_name in os.listdir(preset_dir):
+        file_path = os.path.join(preset_dir, file_name)
         df = pd.read_csv(file_path)
-        new_rows = df[df["Timeslice"] == copy_from].copy()
-        new_rows["Timeslice"] = timeslice_number
+        new_rows = df[df["Timeslice"] == copy_from_number].copy()
+        new_rows["Timeslice"] = len(timeslices)
         df = pd.concat([df, new_rows])
+        df = df.sort_values(by=["RegionName", "Timeslice"]).reset_index(drop=True)
         df.to_csv(file_path, index=False)

From 5b1b41867050e8d046087f40ed18d6872c2c62f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 14 May 2024 16:00:11 +0100
Subject: [PATCH 105/419] Add explanation to LCOE function docstring

---
 src/muse/objectives.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 01ab84a5..722c46ae 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -554,7 +554,9 @@ def lifetime_levelized_cost_of_energy(
 ):
     """Levelized cost of energy (LCOE) of technologies over their lifetime.
 
-    It follows the `simpified LCOE` given by NREL.
+    It follows the `simpified LCOE` given by NREL. The LCOE is set to zero for those
+    timeslices where the production is zero, normally due to a zero utilisation
+    factor.
 
     Arguments:
         agent: The agent of interest

From f4cf92d6d846464ff1fcdaa2051e9105aaeaeb68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 14 May 2024 16:05:44 +0100
Subject: [PATCH 106/419] Fix typo

---
 src/muse/objectives.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 80e3ad57..35a62d08 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -554,7 +554,7 @@ def lifetime_levelized_cost_of_energy(
 ):
     """Levelized cost of energy (LCOE) of technologies over their lifetime.
 
-    It follows the `simpified LCOE` given by NREL. The LCOE is set to zero for those
+    It follows the `simplified LCOE` given by NREL. The LCOE is set to zero for those
     timeslices where the production is zero, normally due to a zero utilisation
     factor.
 

From b347eacb3629db28811e58326bca4aebb3682fb9 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 13 May 2024 10:35:35 +0100
Subject: [PATCH 107/419] Enable ruff's pydocstyle checks and fix errors

Fixes #292.
---
 pyproject.toml                    |  6 +++-
 src/muse/__init__.py              |  2 +-
 src/muse/agents/agent.py          | 21 +++++++----
 src/muse/carbon_budget.py         | 60 ++++++++++++++++---------------
 src/muse/commodities.py           |  7 ----
 src/muse/constraints.py           |  7 ++--
 src/muse/decisions.py             |  2 +-
 src/muse/demand_matching.py       |  1 +
 src/muse/demand_share.py          |  6 ++++
 src/muse/errors.py                |  4 +--
 src/muse/examples.py              |  5 ++-
 src/muse/interactions.py          |  1 -
 src/muse/investments.py           |  1 +
 src/muse/mca.py                   |  7 ++--
 src/muse/objectives.py            | 17 +++++++--
 src/muse/outputs/cache.py         | 10 +++---
 src/muse/outputs/mca.py           |  4 ---
 src/muse/outputs/sector.py        |  1 -
 src/muse/production.py            |  4 +--
 src/muse/quantities.py            | 14 +++++---
 src/muse/readers/csv.py           |  2 --
 src/muse/readers/toml.py          | 16 ++++-----
 src/muse/regressions.py           |  9 +++--
 src/muse/sectors/legacy_sector.py | 12 +++----
 src/muse/sectors/preset_sector.py |  1 -
 src/muse/sectors/register.py      |  1 -
 src/muse/sectors/sector.py        |  1 +
 src/muse/timeslices.py            | 12 +++----
 src/muse/utilities.py             |  7 ++--
 tests/conftest.py                 |  4 +--
 tests/test_aggregoutput.py        | 12 ++++---
 tests/test_constraints.py         |  4 +--
 tests/test_legacy_sector.py       |  1 -
 tests/test_readers.py             |  2 --
 34 files changed, 136 insertions(+), 128 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 16455c45..544cd028 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -102,8 +102,12 @@ ignore_errors = true
 
 [tool.ruff.lint]
 select = [
+    "D",  # pydocstyle
     "E",  # pycodestyle
     "F",  # Pyflakes
     "I"  # isort
 ]
-ignore = []
+ignore = [
+    "D1"  # missing docstring checks
+]
+pydocstyle.convention = "google"
diff --git a/src/muse/__init__.py b/src/muse/__init__.py
index 58d60839..a84270d4 100644
--- a/src/muse/__init__.py
+++ b/src/muse/__init__.py
@@ -1,4 +1,4 @@
-"""MUSE model"""
+"""MUSE model."""
 
 import os
 
diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 4a2a545f..cee92fda 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -34,6 +34,7 @@ def __init__(
                 the agent.
             category: optional attribute that could be used to classify
                 different agents together.
+            quantity: different agents' share of the population
         """
         from uuid import uuid4
 
@@ -51,7 +52,7 @@ def __init__(
         self.category = category
         """Attribute to classify different sets of agents."""
         self.quantity = quantity
-        """Attribute to classify different agents share of the population"""
+        """Attribute to classify different agents' share of the population."""
 
     def filter_input(
         self,
@@ -116,19 +117,23 @@ def __init__(
         category: Optional[Text] = None,
         asset_threshhold: float = 1e-4,
         quantity: Optional[float] = 1,
+        spend_limit: int = 0,
         **kwargs,
     ):
         """Creates a standard buildings agent.
 
         Arguments:
-            assets: Current stock of technologies.
             name: Name of the agent, used for cross-refencing external tables
             region: Region where the agent operates, used for cross-referencing
                 external tables.
+            assets: Current stock of technologies.
+            interpolation: interpolation method. see `xarray.interp`.
             search_rules: method used to filter the search space
+            objectives: One or more objectives by which to decide next investments.
+            decision: single decision objective from one or more objectives.
+            year: year the agent is created / current year
             maturity_threshhold: threshold when filtering replacement
                 technologies with respect to market share
-            year: year the agent is created / current year
             forecast: Number of years the agent will forecast
             housekeeping: transform applied to the assets at the start of
                 iteration. Defaults to doing nothing.
@@ -137,6 +142,10 @@ def __init__(
             demand_threshhold: criteria below which the demand is zero.
             category: optional attribute that could be used to classify
                 different agents together.
+            asset_threshhold: Threshold below which assets are not added.
+            quantity: different agents' share of the population
+            spend_limit: The cost above which agents will not invest
+            **kwargs: Extra arguments
         """
         from muse.decisions import factory as decision_factory
         from muse.filters import factory as filter_factory
@@ -175,8 +184,7 @@ def __init__(
         Threshold when and if filtering replacement technologies with respect
         to market share.
         """
-        if kwargs is not None:
-            self.spend_limit = kwargs.get("spend_limit", 0)
+        self.spend_limit = spend_limit
 
         if objectives is None:
             objectives = objectives_factory()
@@ -366,8 +374,9 @@ def __init__(
 
         Arguments:
             *args: See :py:class:`~muse.agents.agent.Agent`
-            *kwargs: See :py:class:`~muse.agents.agent.Agent`
+            constraints: Set of constraints limiting investment
             investment: A function to perform investments
+            **kwargs: See :py:class:`~muse.agents.agent.Agent`
         """
         from muse.constraints import factory as csfactory
         from muse.investments import factory as ifactory
diff --git a/src/muse/carbon_budget.py b/src/muse/carbon_budget.py
index 3f647af9..710a5eff 100644
--- a/src/muse/carbon_budget.py
+++ b/src/muse/carbon_budget.py
@@ -44,7 +44,9 @@ def update_carbon_budget(
     under: bool = True,
 ) -> float:
     """Adjust the carbon budget in the far future if emissions too high or low.
+
     This feature can allow to simulate overshoot shifting.
+
     Arguments:
         carbon_budget: budget for future year,
         emissions: emission for future year,
@@ -80,18 +82,17 @@ def fitting(
     price_too_high_threshold: float = 10,
     fitter: Text = "slinear",
 ) -> float:
-    """
-    Used to solve the carbon market: given the
-    emission of a period, adjusts carbon price to meet the budget.
-    A carbon market is meant as a pool of emissions for all
-    the modelled regions; therefore, the carbon price applies
-    to all modelled regions.
-    The method solves an equation applying
-    a fitting of the emission-carbon price relation
+    """Used to solve the carbon market.
+
+    Given the emission of a period, adjusts carbon price to meet the budget. A carbon
+    market is meant as a pool of emissions for all the modelled regions; therefore, the
+    carbon price applies to all modelled regions. The method solves an equation applying
+    a fitting of the emission-carbon price relation.
+
     Arguments:
         market: Market, with the prices, supply, and consumption,
         sectors: list of market sectors,
-        equilibrium: Method for searching maerket equilibrium,
+        equilibrium: Method for searching market equilibrium,
         carbon_budget: limit on emissions,
         carbon_price: current carbon price
         commodities: list of commodities to limit (ie. emissions),
@@ -103,7 +104,6 @@ def fitting(
     Returns:
         new_price: adjusted carbon price to meet budget
     """
-
     future = market.year[-1]
 
     threshold = carbon_budget.sel(year=future).values
@@ -160,8 +160,10 @@ def refine_new_price(
     commodities: list,
     price_too_high_threshold: float,
 ) -> float:
-    """Refine the value of the carbon price to ensure it is not too high or low
-    compared to heuristics values
+    """Refine the value of the carbon price.
+
+    Ensure it is not too high or low compared to heuristic values.
+
     Arguments:
         market: Market, with prices, supply, and consumption,
         historic_price: DataArray with the historic carbon prices,
@@ -172,7 +174,7 @@ def refine_new_price(
         price_too_high_threshold: Threshold to decide what is a price too high.
 
     Returns:
-        A refined carbon price.
+        The new carbon price
     """
     future = market.year[-1]
 
@@ -210,8 +212,7 @@ def exponential_fun(x, a, b, c):
 
 
 def create_sample(carbon_price, current_emissions, budget, size=4):
-    """Calculates a sample of carbon prices to estimate the adjusted carbon
-    price.
+    """Calculates a sample of carbon prices to estimate the adjusted carbon price.
 
     For each of these prices, the equilibrium loop will be run, obtaining a new value
     for the emissions. Out of those price-emissions pairs, the final carbon price will
@@ -262,8 +263,8 @@ def linear(prices: np.ndarray, emissions: np.ndarray, budget: int) -> float:
 def linear_guess_and_weights(
     prices: np.ndarray, emissions: np.ndarray, budget: int
 ) -> tuple:
-    """Estimates initial values for the linear fitting algorithm and the
-    weights.
+    """Estimates initial values for the linear fitting algorithm and the weights.
+
     The points closest to the budget are used to estimate the initial guess. They also
     have the highest weight.
 
@@ -323,8 +324,7 @@ def exponential(prices: np.ndarray, emissions: np.ndarray, budget: int) -> float
 def exp_guess_and_weights(
     prices: np.ndarray, emissions: np.ndarray, budget: int
 ) -> tuple:
-    """Estimates initial values for the exponential fitting algorithm and the
-    weights.
+    """Estimates initial values for the exponential fitting algorithm and the weights.
 
     The points closest to the budget are used to estimate the initial guess. They also
     have the highest weight.
@@ -374,9 +374,9 @@ def bisection(
     price_too_high_threshold: float = 10,
     fitter: Text = "slinear",
 ) -> float:
-    """
-    Applies bisection algorithm to escalate carbon price and
-    meet the budget. A carbon market is meant as a pool of emissions for all
+    """Applies bisection algorithm to escalate carbon price and meet the budget.
+
+    A carbon market is meant as a pool of emissions for all
     the modelled regions; therefore, the carbon price applies to all modelled regions.
     Bisection applies an iterative estimations of the emissions
     varying the carbon price until convergence or stop criteria
@@ -386,7 +386,7 @@ def bisection(
     Arguments:
         market: Market, with the prices, supply, consumption and demand,
         sectors: List of sectors,
-        equilibrium: Method for searching maerket equilibrium,
+        equilibrium: Method for searching market equilibrium,
         carbon_budget: DataArray with the carbon budget,
         carbon_price: DataArray with the carbon price,
         commodities: List of carbon-related commodities,
@@ -498,9 +498,10 @@ def min_max_bisect(
     threshold: float,
 ):
     """Refines bisection algorithm to escalate carbon price and meet the budget.
-    As emissions can be a discontinuous function of the carbon price,
-    this method is used to improve the solution search when discountinuities
-    are met, improving the bounds search.
+
+    As emissions can be a discontinuous function of the carbon price, this method is
+    used to improve the solution search when discontinuities are met, improving the
+    bounds search.
 
     Arguments:
         low: Value of carbon price at lower bound,
@@ -509,7 +510,7 @@ def min_max_bisect(
         ub: Value of emissions at upper bound,
         market: Market, with the prices, supply, consumption and demand,
         sectors: List of sectors,
-        equilibrium: Method for searching maerket equilibrium,
+        equilibrium: Method for searching market equilibrium,
         commodities: List of carbon-related commodities,
         sample_size: Number of iterations for bisection,
         refine_price: Boolean to decide on whether carbon price should be refined,
@@ -579,13 +580,14 @@ def bisect_loop(
     commodities: list,
     new_price: float,
 ) -> float:
-    """Calls market euilibrium iteration in bisection.
+    """Calls market equilibrium iteration in bisection.
+
     This updates emissions during iterations.
 
     Arguments:
         market: Market, with the prices, supply, consumption and demand,
         sectors: List of sectors,
-        equilibrium: Method for searching maerket equilibrium,
+        equilibrium: Method for searching market equilibrium,
         commodities: List of carbon-related commodities,
         new_price: New carbon price from bisection,
 
diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index c0fa8ecb..383b505c 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -125,7 +125,6 @@ def check_usage(
             - "exact", should match each flag and nothing else.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, check_usage
         >>> data = [
         ...     CommodityUsage.OTHER,
@@ -207,7 +206,6 @@ def is_pollutant(data: Sequence[CommodityUsage]) -> ndarray:
     """Environmental product.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, is_pollutant
         >>> data = [
         ...     CommodityUsage.CONSUMABLE,
@@ -228,7 +226,6 @@ def is_consumable(data: Sequence[CommodityUsage]) -> ndarray:
     """Any consumable.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, is_consumable
         >>> data = [
         ...     CommodityUsage.CONSUMABLE,
@@ -247,7 +244,6 @@ def is_fuel(data: Sequence[CommodityUsage]) -> ndarray:
     """Any consumable energy.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, is_fuel
         >>> data = [
         ...     CommodityUsage.CONSUMABLE,
@@ -270,7 +266,6 @@ def is_material(data: Sequence[CommodityUsage]) -> ndarray:
     """Any non-energy non-environmental consumable.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, is_material
         >>> data = [
         ...     CommodityUsage.CONSUMABLE,
@@ -299,7 +294,6 @@ def is_enduse(data: Sequence[CommodityUsage]) -> ndarray:
     """Non-environmental product.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, is_enduse
         >>> data = [
         ...     CommodityUsage.CONSUMABLE,
@@ -323,7 +317,6 @@ def is_other(data: Sequence[CommodityUsage]) -> ndarray:
     """No flags are set.
 
     Examples:
-
         >>> from muse.commodities import CommodityUsage, is_other
         >>> data = [
         ...     CommodityUsage.OTHER,
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 4f4ba2b8..6ac3c725 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -1,4 +1,4 @@
-"""Investment constraints.
+r"""Investment constraints.
 
 Constraints on investements ensure that investements match some given criteria. For
 instance, the constraints could ensure that only so much of a new asset can be built
@@ -557,7 +557,6 @@ def lp_costs(
     """Creates costs for solving with scipy's LP solver.
 
     Example:
-
         We can now construct example inputs to the function from the sample model. The
         costs will be a matrix where each assets has a candidate replacement technology.
 
@@ -734,8 +733,7 @@ def lp_constraint_matrix(
      The result is the constraint matrix, expanded, reduced and diagonalized for the
      conditions above.
 
-     Example:
-
+    Example:
          Lets first setup a constraint and a cost matrix:
 
          >>> from muse import examples
@@ -861,7 +859,6 @@ class ScipyAdapter:
     """Creates the input for the scipy solvers.
 
     Example:
-
         Lets give a fist simple example. The constraint
         :py:func:`~muse.constraints.max_capacity_expansion` limits how much each
         capacity can be expanded in a given year.
diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index 307974a5..4494e2b5 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -232,7 +232,7 @@ def retro_lexical_comparison(
 def _epsilon_constraints(
     objectives: Dataset, optimize: Text, mask: Optional[Any] = None, **epsilons
 ) -> DataArray:
-    """minimizes one objective subject to constraints on other objectives."""
+    """Minimizes one objective subject to constraints on other objectives."""
     constraints = True
     for name, epsilon in epsilons.items():
         reduced_dims = set(objectives[name].dims) - {"asset", "replacement"}
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index e4793655..c7fb4d1b 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -169,6 +169,7 @@ def demand_matching(
             as `max_production`.
         cost: Cost to minimize while fulfilling the demand.
         *constraints: each item is a separate constraint :math:`M_r`.
+        protected_dims: Dimensions that will not be modified
 
     Returns:
         An array with the joint dimensionality of `max_production`, `cost`, and
diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 0b99c977..ad06dea7 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -135,6 +135,9 @@ def new_and_retro(
             to the production method. The ``consumption`` reflects the demand for the
             commodities produced by the current sector.
         technologies: quantities describing the technologies.
+        production: Production method
+        current_year: Current year of simulation
+        forecast: How many years to forecast ahead
 
     Pseudo-code:
 
@@ -343,6 +346,9 @@ def standard_demand(
             to the production method. The ``consumption`` reflects the demand for the
             commodities produced by the current sector.
         technologies: quantities describing the technologies.
+        production: Production method
+        current_year: Current year of simulation
+        forecast: How many years to forecast ahead
 
     """
     from functools import partial
diff --git a/src/muse/errors.py b/src/muse/errors.py
index 2e9ce422..929e411c 100644
--- a/src/muse/errors.py
+++ b/src/muse/errors.py
@@ -36,7 +36,7 @@ def __str__(self):
 
 
 class TechnologyNotDefined(Exception):
-    """Indicates that the initialisation fails because a technology is not found"""
+    """Indicates that the initialisation fails because a technology is not found."""
 
     msg = """Error during the initialisation of a sector.
 The model tries to assign a share of the total capacity to an agent but it
@@ -48,7 +48,7 @@ def __str__(self):
 
 
 class FailedInterpolation(Exception):
-    """Indicates that the initialisation fails due to interpolation"""
+    """Indicates that the initialisation fails due to interpolation."""
 
     msg = """Error during the initialisation of a sector.
 The model tries to interpolate values in time of the technologies.
diff --git a/src/muse/examples.py b/src/muse/examples.py
index e52a7223..0253ed8a 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -39,14 +39,14 @@
 
 
 def example_data_dir() -> Path:
-    """Gets the examples folder"""
+    """Gets the examples folder."""
     import muse
 
     return Path(muse.__file__).parent / "data" / "example"
 
 
 def available_examples() -> List[str]:
-    """List examples available in the examples folder"""
+    """List examples available in the examples folder."""
     return [d.stem for d in example_data_dir().iterdir() if d.is_dir()]
 
 
@@ -134,7 +134,6 @@ def search_space(sector: Text, model: Text = "default") -> xr.DataArray:
 
     Used in constraints or during investment.
     """
-
     if model == "trade" and sector != "residential":
         return _trade_search_space(sector, model)
     return _nontrade_search_space(sector, model)
diff --git a/src/muse/interactions.py b/src/muse/interactions.py
index 998ed00d..f6302d6c 100644
--- a/src/muse/interactions.py
+++ b/src/muse/interactions.py
@@ -89,7 +89,6 @@ def factory(
     inputs: Optional[Sequence[Union[Mapping, Tuple[Text, Text]]]] = None,
 ) -> Callable[[Sequence[AbstractAgent]], None]:
     """Creates an interaction functor."""
-
     if inputs is None:
         inputs = tuple()
 
diff --git a/src/muse/investments.py b/src/muse/investments.py
index 5970d8a1..5ae9d242 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -204,6 +204,7 @@ def cliff_retirement_profile(
         current_year: current year
         protected: The technologies are assumed to be renewed between years
             `current_year` and `current_year + protected`
+        interpolation: Interpolation type
         **kwargs: arguments by which to filter technical_life, if any.
 
     Returns:
diff --git a/src/muse/mca.py b/src/muse/mca.py
index 0f6d862b..bd64649e 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -200,6 +200,8 @@ def find_equilibrium(
 
         Arguments:
             market: Commodities market, with the prices, supply, consumption and demand.
+            sectors: A list of the sectors participating in the simulation.
+            maxiter: Maximum number of iterations.
 
         Returns:
             A tuple with the updated market (prices, supply, consumption and demand) and
@@ -368,8 +370,9 @@ def run(self) -> None:
             )
 
     def calibrate_legacy_sectors(self):
-        """Run a calibration step in the legacy sectors
-        Run historical years
+        """Run a calibration step in the legacy sectors.
+
+        Run historical years.
         """
         from copy import deepcopy
         from logging import getLogger
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index cd9acee5..ccc58064 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -479,15 +479,18 @@ def annual_levelized_cost_of_energy(
     **kwargs,
 ):
     """Annual cost of energy (LCOE) of technologies - not dependent on production.
-    It needs to be used for trade agents where the actual service is unknown
 
-    It follows the `simplified LCOE` given by NREL.
+    It needs to be used for trade agents where the actual service is unknown. It follows
+    the `simplified LCOE` given by NREL.
 
     Arguments:
         agent: The agent of interest
+        demand: Demand for technology
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
+        *args: Extra arguments (unused)
+        **kwargs: Extra keyword arguments (unused)
 
     Return:
         xr.DataArray with the LCOE calculated for the relevant technologies
@@ -519,7 +522,6 @@ def capital_recovery_factor(
     Return:
         xr.DataArray with the CRF calculated for the relevant technologies
     """
-
     tech = agent.filter_input(
         technologies[["technical_life", "interest_rate"]],
         technology=search_space.replacement,
@@ -546,9 +548,12 @@ def lifetime_levelized_cost_of_energy(
 
     Arguments:
         agent: The agent of interest
+        demand: Demand for technology
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
+        *args: Extra arguments (unused)
+        **kwargs: Extra keyword arguments (unused)
 
     Return:
         xr.DataArray with the LCOE calculated for the relevant technologies
@@ -702,9 +707,12 @@ def net_present_value(
 
     Arguments:
         agent: The agent of interest
+        demand: Demand for technology
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
+        *args: Extra arguments (unused)
+        **kwargs: Extra keyword arguments (unused)
 
     Return:
         xr.DataArray with the NPV calculated for the relevant technologies
@@ -893,9 +901,12 @@ def equivalent_annual_cost(
 
     Arguments:
         agent: The agent of interest
+        demand: Demand for technology
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
+        *args: Extra arguments (unused)
+        **kwargs: Extra keyword arguments (unused)
 
     Return:
         xr.DataArray with the EAC calculated for the relevant technologies
diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index f657f09a..99e3bbe0 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -1,4 +1,4 @@
-"""Output cached quantities
+"""Output cached quantities.
 
 Functions that output the state of diverse quantities at intermediate steps of the
 calculation.
@@ -328,7 +328,7 @@ def consolidate_cache(self, year: int) -> None:
 def extract_agents(
     sectors: List[AbstractSector],
 ) -> MutableMapping[Text, MutableMapping[Text, Text]]:
-    """_summary_
+    """_summary_.
 
     Args:
         sectors (List[AbstractSector]): _description_
@@ -372,11 +372,11 @@ def _aggregate_cache(quantity: Text, data: List[xr.DataArray]) -> pd.DataFrame:
 
     The merging gives precedence to the last entries of the list over the first ones.
     I.e, the records of the arrays cached last will overwrite those of the ones cached
-    before in the case of having dientical index.
+    before in the case of having identical index.
 
     Args:
-        quantity (Text): The quantity to cache.
-        data List[xr.DataArray]: The list of DataArrays to combine.
+        quantity: The quantity to cache.
+        data: The list of DataArrays to combine.
 
     Returns:
         pd.DataFrame: A Dataframe with the data aggregated.
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 530ec660..8f75b06a 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -247,7 +247,6 @@ def _aggregate_sectors(
     sectors: List[AbstractSector], *args, op: Callable
 ) -> pd.DataFrame:
     """Aggregate outputs from all sectors."""
-
     alldata = [op(sector, *args) for sector in sectors]
 
     if len(alldata) == 0:
@@ -794,7 +793,6 @@ def sector_capital_costs(
     sector: AbstractSector, market: xr.Dataset, **kwargs
 ) -> pd.DataFrame:
     """Sector capital costs with agent annotations."""
-
     data_sector: List[xr.DataArray] = []
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
@@ -912,7 +910,6 @@ def metric_lcoe(
 
 def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame:
     """Levelized cost of energy () of technologies over their lifetime."""
-
     from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant
     from muse.objectives import discount_factor
     from muse.quantities import consumption
@@ -1115,7 +1112,6 @@ def metric_eac(
 
 def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame:
     """Net Present Value of technologies over their lifetime."""
-
     from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant
     from muse.objectives import discount_factor
     from muse.quantities import consumption
diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py
index 673fd016..d6a30848 100644
--- a/src/muse/outputs/sector.py
+++ b/src/muse/outputs/sector.py
@@ -202,7 +202,6 @@ def supply(
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
-
     moutput = market.copy(deep=True).reset_index("timeslice")
     result = (
         market_quantity(moutput.supply, sum_over=sum_over, drop=drop)
diff --git a/src/muse/production.py b/src/muse/production.py
index 109647cd..32f09959 100644
--- a/src/muse/production.py
+++ b/src/muse/production.py
@@ -71,7 +71,7 @@ def factory(
     actual functor usable within the model, i.e. it converts data into logic.
 
     Arguments:
-        name: Registered production method to create. The name is resolved when the
+        settings: Registered production method to create. The name is resolved when the
             function returned by the factory is called. Hence, it could refer to a
             function yet to be registered when this factory method is called.
         **kwargs: any keyword argument the production method accepts.
@@ -165,12 +165,12 @@ def costed_production(
     with_emission: bool = True,
 ) -> xr.DataArray:
     """Computes production from ranked assets.
+
     The assets are ranked according to their cost. The cost can be provided as an
     xarray, a callable creating an xarray, or as "alcoe". The asset with least cost are
     allowed to service the demand first, up to the maximum production. By default, the
     minimum service is applied first.
     """
-
     from muse.commodities import CommodityUsage, check_usage, is_pollutant
     from muse.quantities import (
         annual_levelized_cost_of_energy,
diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index dda878ea..604286d5 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -30,9 +30,11 @@ def supply(
     Arguments:
         capacity: number/quantity of assets that can service the demand
         demand: amount of each end-use required. The supply of each process will not
-            exceed it's share of the demand.
+            exceed its share of the demand.
         technologies: factors bindings the capacity of an asset with its production of
             commodities and environmental pollutants.
+        interpolation: Interpolation type
+        production_method: Production for a given capacity
 
     Return:
         A data array where the commodity dimension only contains actual outputs (i.e. no
@@ -133,7 +135,8 @@ def emission(production: xr.DataArray, fixed_outputs: xr.DataArray):
 def gross_margin(
     technologies: xr.Dataset, capacity: xr.DataArray, prices: xr.Dataset
 ) -> xr.DataArray:
-    """The percentage of revenue after direct expenses have been subtracted
+    """The percentage of revenue after direct expenses have been subtracted.
+
     .. _reference:
     https://www.investopedia.com/terms/g/grossmargin.asp
     We first calculate the revenues, which depend on prices
@@ -141,7 +144,7 @@ def gross_margin(
     - energy commodities INPUTS are related to fuel costs
     - environmental commodities OUTPUTS are related to environmental costs
     - variable costs is given as technodata inputs
-    - non-environmental commodities OUTPUTS are related to revenues
+    - non-environmental commodities OUTPUTS are related to revenues.
     """
     from muse.commodities import is_enduse, is_pollutant
     from muse.timeslices import QuantityType, convert_timeslice
@@ -441,6 +444,7 @@ def maximum_production(technologies: xr.Dataset, capacity: xr.DataArray, **filte
             technologies. Filters not relevant to the quantities of interest, i.e.
             filters that are not a dimension of `capacity` or `technologies`, are
             silently ignored.
+
     Return:
         `capacity * fixed_outputs * utilization_factor`, whittled down according to the
         filters and the set of technologies in `capacity`.
@@ -474,6 +478,7 @@ def demand_matched_production(
         demand: demand to match.
         prices: price from which to compute the annual levelized cost of energy.
         capacity: capacity from which to obtain the maximum production constraints.
+        technologies: technologies we are looking at
         **filters: keyword arguments with which to filter the input datasets and
             data arrays., e.g. region, or year.
     """
@@ -513,6 +518,7 @@ def capacity_in_use(
             technologies. Filters not relevant to the quantities of interest, i.e.
             filters that are not a dimension of `capacity` or `technologies`, are
             silently ignored.
+
     Return:
         Capacity-in-use for each technology, whittled down by the filters.
     """
@@ -582,11 +588,11 @@ def costed_production(
     with_minimum_service: bool = True,
 ) -> xr.DataArray:
     """Computes production from ranked assets.
+
     The assets are ranked according to their cost. The asset with least cost are allowed
     to service the demand first, up to the maximum production. By default, the minimum
     service is applied first.
     """
-
     from muse.quantities import maximum_production
     from muse.timeslices import QuantityType, convert_timeslice
     from muse.utilities import broadcast_techs
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index f30f899d..7b897a13 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -210,7 +210,6 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
 
 def read_initial_assets(filename: Union[Text, Path]) -> xr.DataArray:
     """Reads and formats data about initial capacity into a dataframe."""
-
     data = pd.read_csv(filename, float_precision="high", low_memory=False)
     if "Time" in data.columns:
         result = cast(
@@ -884,7 +883,6 @@ def read_trade(
 def read_finite_resources(path: Union[Text, Path]) -> xr.DataArray:
     """Reads finite resources from csv file.
 
-
     The CSV file is made up of columns "Region", "Year", as well
     as three timeslice columns ("Month", "Day", "Hour"). All three sets of columns are
     optional. The timeslice set should contain a full set of timeslices, if present.
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index f3273981..83285afa 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -127,7 +127,6 @@ def format_paths(
     nested dictionaries.
 
     Examples:
-
         Starting from a simple example, we see `data_path` has been modified to point to
         the current working directory:
 
@@ -356,12 +355,13 @@ def read_settings(
     """Loads the input settings for any MUSE simulation.
 
     Loads a MUSE settings file. This must be a TOML formatted file. Missing settings are
-    loaded from the DEFAULT_SETTINGS. Custom pythom modules, if present, are loaded
+    loaded from the DEFAULT_SETTINGS. Custom Python modules, if present, are loaded
     and checks are run to validate the settings and ensure that they are compatible with
     a MUSE simulation.
 
     Arguments:
-    settings_file: A string or a Path to the settings file
+        settings_file: A string or a Path to the settings file
+        path: A string or path to the settings folder
 
     Returns:
         A dictionary with the settings
@@ -406,10 +406,9 @@ def read_ts_multiindex(
     timeslice: Optional[xr.DataArray] = None,
     transforms: Optional[Dict[Tuple, np.ndarray]] = None,
 ) -> pd.MultiIndex:
-    """Read multiindex for a timeslice from TOML.
+    r"""Read multiindex for a timeslice from TOML.
 
     Example:
-
         The timeslices are read from ``timeslice_levels``. The levels (keyword) and
         slice (list of values) correspond to the level, slices and slice aggregates
         defined  in the the ``timeslices`` section.
@@ -499,7 +498,7 @@ def read_timeslices(
     timeslice: Optional[xr.DataArray] = None,
     transforms: Optional[Dict[Tuple, np.ndarray]] = None,
 ) -> xr.Dataset:
-    """Reads timeslice levels and create resulting timeslice coordinate.
+    r"""Reads timeslice levels and create resulting timeslice coordinate.
 
     Args:
         settings: TOML dictionary. It should contain a ``timeslice_levels`` section.
@@ -512,6 +511,7 @@ def read_timeslices(
             to the global in :py:mod:`~muse.timeslices`. If using the default,
             then this function should be called *after* the timeslice module has been
             setup with a call to :py:func:`~muse.timeslice.setup_module`.
+
     Returns:
         A xr.Dataset with the timeslice coordinates.
 
@@ -631,7 +631,6 @@ def add_unknown_parameters(dd, u):
 
 def validate_settings(settings: Dict) -> None:
     """Run the checks on the settings file."""
-
     msg = " Validating input settings..."
     getLogger(__name__).info(msg)
 
@@ -678,7 +677,6 @@ def check_plugins(settings: Dict) -> None:
 @register_settings_check(vary_name=False)
 def check_log_level(settings: Dict) -> None:
     """Check the log level required in the simulation."""
-
     valid_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
     msg = "ERROR - Valid log levels are {}.".format(", ".join(valid_levels))
     assert settings["log_level"].upper() in valid_levels, msg
@@ -789,7 +787,6 @@ def check_time_slices(settings: Dict) -> None:
 @register_settings_check(vary_name=False)
 def check_global_data_files(settings: Dict) -> None:
     """Checks that the global user files exist."""
-
     user_data = settings["global_input_files"]
 
     if Path(user_data["path"]).is_absolute():
@@ -822,7 +819,6 @@ def check_global_data_files(settings: Dict) -> None:
 @register_settings_check(vary_name=False)
 def check_sectors_files(settings: Dict) -> None:
     """Checks that the sector files exist."""
-
     sectors = settings["sectors"]
     priorities = {
         "preset": 0,
diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index ef7ff756..9f2c1aa2 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -34,7 +34,6 @@ class Regression(Callable):
     All regression functors are derived from this object.
 
     Examples:
-
     Creating a regression function can be done via it's constructor, or
     through a input csv file. This file is a
 
@@ -391,7 +390,7 @@ def ExponentialAdj(
 def Logistic(
     self, gdp: DataArray, population: DataArray, forecast: int = 5, n: int = 4, **kwargs
 ) -> DataArray:
-    """(1 + t * f^n) / (1 + f^n) * a * pop / (1 + b * e^(gpd * c / pop))
+    """(1 + t * f^n) / (1 + f^n) * a * pop / (1 + b * e^(gpd * c / pop)).
 
     With f the number of forecast years.
     """
@@ -406,7 +405,7 @@ def Logistic(
 @register_regression(name="log-log")
 @regression_functor({"a": "constant", "b": "GDPexp"})
 def Loglog(self, gdp: DataArray, population: DataArray, *args, **kwargs) -> DataArray:
-    """1e6 * e^a * population * (gpd/population)^b"""
+    """1e6 * e^a * population * (gpd/population)^b."""
     from numpy import exp, power
 
     factor = 1e6 * exp(self.coeffs.a) * population
@@ -425,7 +424,7 @@ def LogisticSigmoid(
     year: Optional[Union[int, Sequence[int]]] = None,
     **kwargs,
 ) -> DataArray:
-    """0.001 * (constant * pop + gdp * c / sqrt(1 + (gdp * scale / pop)^2)"""
+    """0.001 * (constant * pop + gdp * c / sqrt(1 + (gdp * scale / pop)^2)."""
     from numpy import power
 
     constant = self.coeffs.a
@@ -453,7 +452,7 @@ def LogisticSigmoid(
 
 @register_regression
 class Linear(Regression):
-    """a * population + b * (gdp - gdp[2010]/population[2010] * population)"""
+    """a * population + b * (gdp - gdp[2010]/population[2010] * population)."""
 
     __mappings__ = {"a": "constant", "b0": "GDPscaleLess", "b1": "GDPscaleGreater"}
 
diff --git a/src/muse/sectors/legacy_sector.py b/src/muse/sectors/legacy_sector.py
index 421dcc33..bb88bb70 100644
--- a/src/muse/sectors/legacy_sector.py
+++ b/src/muse/sectors/legacy_sector.py
@@ -1,7 +1,7 @@
-"""This module defines the LegacySector class, needed to interface the new MCA
-with the old MUSE sectors.
+"""This module defines the LegacySector class.
 
-It can be deleted once accessing those sectors is no longer needed.
+This is needed to interface the new MCA with the old MUSE sectors. It can be deleted
+once accessing those sectors is no longer needed.
 """
 
 from dataclasses import dataclass
@@ -320,7 +320,6 @@ def sector_timeslices(self):
 
     def _to(self, data: np.ndarray, data_ts, ts: pd.MultiIndex, qt: QuantityType):
         """From ndarray to dataarray."""
-
         return ndarray_to_xarray(
             years=self.time_framework,
             data=data,
@@ -335,7 +334,6 @@ def _to(self, data: np.ndarray, data_ts, ts: pd.MultiIndex, qt: QuantityType):
 
     def _from(self, xdata: DataArray, ts: pd.MultiIndex, qt: QuantityType):
         """From dataarray to ndarray."""
-
         return xarray_to_ndarray(
             years=self.time_framework,
             xdata=xdata,
@@ -427,8 +425,7 @@ def xarray_to_ndarray(
 
 
 def commodities_idx(sector, comm: Text) -> Sequence:
-    """Gets the indices of the commodities involved in the processes of the
-    sector.
+    """Gets the indices of the commodities involved in the processes of the sector.
 
     Arguments:
         sector: The old MUSE sector of interest
@@ -437,7 +434,6 @@ def commodities_idx(sector, comm: Text) -> Sequence:
     Returns:
         A list with the indexes
     """
-
     comm = {
         "OUT": "listIndexCommoditiesOUT",
         "IN": "listIndexCommoditiesIN",
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 5e0a7077..b1f1fddb 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -167,7 +167,6 @@ def next(self, mca_market: Dataset) -> Dataset:
 
     def _interpolate(self, data: DataArray, years: DataArray) -> DataArray:
         """Chooses interpolation depending on whether forecast is available."""
-
         if "forecast" in data.dims:
             baseyear = int(years.min())
             forecasted = (years - baseyear).values
diff --git a/src/muse/sectors/register.py b/src/muse/sectors/register.py
index 6839f4a8..690888d1 100644
--- a/src/muse/sectors/register.py
+++ b/src/muse/sectors/register.py
@@ -13,7 +13,6 @@ def register_sector(
     """Registers a sector so it is available MUSE-wide.
 
     Example:
-
         >>> from muse.sectors import AbstractSector, register_sector
         >>> @register_sector(name="MyResidence")
         ... class ResidentialSector(AbstractSector):
diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py
index cb544ed6..4d08878c 100644
--- a/src/muse/sectors/sector.py
+++ b/src/muse/sectors/sector.py
@@ -188,6 +188,7 @@ def next(
             time_period:
                 Length of the time period in the framework. Defaults to the range of
                 ``mca_market.year``.
+            current_year: Current year of the simulation
 
         Returns:
             A market containing the ``supply`` offered by the sector, it's attendant
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index bae01ea1..bbb6fde8 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -71,7 +71,7 @@ def reference_timeslice(
     level_names: Sequence[Text] = ("month", "day", "hour"),
     name: Text = "timeslice",
 ) -> DataArray:
-    """Reads reference timeslice from toml like input.
+    r"""Reads reference timeslice from toml like input.
 
     Arguments:
         settings: A dictionary of nested dictionaries or a string that toml will
@@ -89,7 +89,6 @@ def reference_timeslice(
         weight of each timeslice.
 
     Example:
-
         >>> from muse.timeslices import reference_timeslice
         >>> reference_timeslice(
         ...     \"\"\"
@@ -150,7 +149,7 @@ def aggregate_transforms(
     settings: Optional[Union[Mapping, Text]] = None,
     timeslice: Optional[DataArray] = None,
 ) -> Dict[Tuple, ndarray]:
-    """Creates dictionary of transforms for aggregate levels.
+    r"""Creates dictionary of transforms for aggregate levels.
 
     The transforms are used to create the projectors towards the finest timeslice.
 
@@ -165,7 +164,6 @@ def aggregate_transforms(
         timeslices.
 
     Example:
-
         >>> toml = \"\"\"
         ...     [timeslices]
         ...     spring.weekday = 5
@@ -251,14 +249,13 @@ def timeslice_projector(
     finest: Optional[DataArray] = None,
     transforms: Optional[Dict[Tuple, ndarray]] = None,
 ) -> DataArray:
-    """Project time-slice to standardized finest time-slices.
+    r"""Project time-slice to standardized finest time-slices.
 
     Returns a matrix from the input timeslice ``x`` to the ``finest`` timeslice, using
     the input ``transforms``. The latter are a set of transforms that map indices from
     one timeslice to indices in another.
 
     Example:
-
         Lets define the following timeslices and aggregates:
 
         >>> toml = \"\"\"
@@ -405,7 +402,7 @@ def convert_timeslice(
     finest: Optional[DataArray] = None,
     transforms: Optional[Dict[Tuple, ndarray]] = None,
 ) -> Union[DataArray, Dataset]:
-    """Adjusts the timeslice of x to match that of ts.
+    r"""Adjusts the timeslice of x to match that of ts.
 
     The conversion can be done in on of two ways, depending on whether the
     quantity is extensive or intensive. See `QuantityType`.
@@ -564,7 +561,6 @@ def new_to_old_timeslice(ts: DataArray, ag_level="Month") -> dict:
     This function is used in the LegacySector class to adapt the new MCA timeslices to
     the format required by the old sectors.
     """
-
     length = len(ts.month.values)
     converted_ts = {
         "Month": [kebab_to_camel(w) for w in ts.month.values],
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index f1f1278b..411f9fb5 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -317,7 +317,7 @@ def filter_with_template(
             format is that of an *asset* (see `broadcast_techs`)
         kwargs: passed on to `broadcast_techs` or `filter_input`
 
-    Returns
+    Returns:
         `data` transformed to match the form of `template`
     """
     if asset_dimension in template.dims:
@@ -433,7 +433,7 @@ def merge_assets(
 
 
 def avoid_repetitions(data: xr.DataArray, dim: Text = "year") -> xr.DataArray:
-    """list of years such that there is no repetition in the data.
+    """List of years such that there is no repetition in the data.
 
     It removes the central year of any three consecutive years where all data is
     the same. This means the original data can be reobtained via a linear
@@ -472,7 +472,6 @@ def future_propagation(
     """Propagates values into the future.
 
     Example:
-
         ``Data`` should be an array with at least one dimension, "year":
 
         >>> coords = dict(year=list(range(2020, 2040, 5)), fuel=["gas", "coal"])
@@ -550,7 +549,6 @@ def agent_concatenation(
     """Concatenates input map along given dimension.
 
     Example:
-
         Lets create sets of random assets to work with. We set the seed so that this
         test can be reproduced exactly.
 
@@ -629,7 +627,6 @@ def aggregate_technology_model(
     are grouped together and summed over.
 
     Example:
-
         We first create a random set of agent assets and aggregate them.
         Some of these agents own assets from the same technology but potentially with
         different installation year. This function will aggregate together all assets
diff --git a/tests/conftest.py b/tests/conftest.py
index 77a6c3ed..c6385ee7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -207,7 +207,7 @@ def coords() -> Mapping:
 
 @fixture
 def agent_args(coords) -> Mapping:
-    """some standard arguments defining an agent."""
+    """Some standard arguments defining an agent."""
     from numpy.random import choice, rand, randint
 
     return {
@@ -223,7 +223,7 @@ def agent_args(coords) -> Mapping:
 
 @fixture
 def technologies(coords) -> Dataset:
-    """randomly generated technology characteristics."""
+    """Randomly generated technology characteristics."""
     from muse.commodities import CommodityUsage
     from numpy import nonzero, sum
     from numpy.random import choice, rand, randint
diff --git a/tests/test_aggregoutput.py b/tests/test_aggregoutput.py
index b0e85b3d..d1f2f83f 100644
--- a/tests/test_aggregoutput.py
+++ b/tests/test_aggregoutput.py
@@ -3,8 +3,10 @@
 
 
 def test_aggregate_sector():
-    """Test for aggregate_sector function check column titles, number of
-    agents/region/technologies and assets capacities."""
+    """Test for aggregate_sector function.
+
+    Check column titles, number of agents/region/technologies and assets capacities.
+    """
     from pandas import DataFrame, concat
 
     mca = examples.model("multiple_agents")
@@ -72,8 +74,10 @@ def test_aggregate_sectors():
 
 
 def test_aggregate_sector_manyregions():
-    """Test for aggregate_sector function with two regions check column titles, number
-    of agents/region/technologies and assets capacities."""
+    """Test for aggregate_sector function with two regions.
+
+    Check column titles, number of agents/region/technologies and assets capacities.
+    """
     from muse.outputs.mca import _aggregate_sectors
     from pandas import DataFrame, concat
 
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index 9c0b957c..25adaff0 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -127,7 +127,7 @@ def constraints(request, market_demand, assets, search_space, market, technologi
 
 
 def test_lp_constraints_matrix_b_is_scalar(constraint, lpcosts):
-    """b is a scalar.
+    """B is a scalar.
 
     When ``b`` is a scalar, the output should be equivalent to a single row matrix, or a
     single vector with only decision variables.
@@ -148,7 +148,7 @@ def test_lp_constraints_matrix_b_is_scalar(constraint, lpcosts):
 
 
 def test_max_production_constraint_diagonal(constraint, lpcosts):
-    """production side of max capacity production is diagonal.
+    """Production side of max capacity production is diagonal.
 
     The production for each timeslice, region, asset, and replacement technology should
     not outstrip the assigned for the asset and replacement technology. Hence, the
diff --git a/tests/test_legacy_sector.py b/tests/test_legacy_sector.py
index 01e7d219..d0c6c882 100644
--- a/tests/test_legacy_sector.py
+++ b/tests/test_legacy_sector.py
@@ -59,7 +59,6 @@ def legacy_input_file(sector: Text) -> Optional[Path]:
 
 def update_settings(settings, sec_dir, out_dir):
     """Updates a settings namedtuple with temporal sectors and output directories."""
-
     sectors = settings.sectors
 
     for s in sectors.list:
diff --git a/tests/test_readers.py b/tests/test_readers.py
index a6715890..467e8263 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -8,7 +8,6 @@
 @fixture
 def user_data_files(settings: dict) -> None:
     """Creates the files related to the user data."""
-
     files = list(settings["global_input_files"].keys())
     files.remove("path")
     for m in files:
@@ -40,7 +39,6 @@ def sectors_files(settings: dict):
 @fixture
 def plugins(settings: dict, tmp_path) -> Path:
     """Creates the files related to the custom modules."""
-
     plugin = tmp_path / "plugins" / "cat.py"
     plugin.parent.mkdir(parents=True, exist_ok=True)
     plugin.write_text("my_cat_colour = 'tabby' ")

From f481fab7277246bce6b0b29c4b13a226f6a5059d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 15 May 2024 05:28:25 +0100
Subject: [PATCH 108/419] Add reviewrs comments.

---
 src/muse/investments.py | 11 +++++++----
 src/muse/objectives.py  |  4 +---
 src/muse/readers/csv.py | 14 +++++++-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/muse/investments.py b/src/muse/investments.py
index ae359c01..c5d7d0bb 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -345,12 +345,15 @@ def scipy_match_demand(
             },
         )
         if not res.success:
-            getLogger(__name__).critical(res.message)
-            print(f"in sector containing {df_technologies.technology.unique()}")
+            msg = (
+                res.message
+                + "\n"
+                + f"Error in sector containing {df_technologies.technology.unique()}"
+            )
+            getLogger(__name__).critical(msg)
             raise GrowthOfCapacityTooConstrained
 
-    solution = cast(Callable[[np.ndarray], xr.Dataset], adapter.to_muse)(res.x)
-    return solution
+    return cast(Callable[[np.ndarray], xr.Dataset], adapter.to_muse)(res.x)
 
 
 @register_investment(name=["cvxopt"])
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 35a62d08..05e980a2 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -259,7 +259,6 @@ def capacity_to_service_demand(
     **kwargs,
 ) -> xr.DataArray:
     """Minimum capacity required to fulfill the demand."""
-
     params = agent.filter_input(
         technologies[["utilization_factor", "fixed_outputs"]],
         year=agent.forecast_year,
@@ -678,8 +677,7 @@ def lifetime_levelized_cost_of_energy(
         + fixed_and_variable_costs
     ) / (denominator.sel(commodity=products).sum("commodity") * rates).sum("year")
 
-    results = results.where(np.isfinite(results)).fillna(0.0)
-    return results
+    return results.where(np.isfinite(results)).fillna(0.0)
 
 
 @register_objective(name="NPV")
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index a2828343..254bff7f 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -915,12 +915,12 @@ def check_utilization_not_all_zero(data, filename):
             """A technology needs to have a utilization factor defined for every
              timeslice. Please check file {}.""".format(filename)
         )
-    else:
-        utilization_sum = data.groupby(["technology", "region", "year"]).sum()
 
-        if (utilization_sum.utilization_factor == 0).any():
-            raise ValueError(
-                """A technology can not have a utilization factor of 0 for every
-                 timeslice. Please check file {}.""".format(filename)
-            )
+    utilization_sum = data.groupby(["technology", "region", "year"]).sum()
+
+    if (utilization_sum.utilization_factor == 0).any():
+        raise ValueError(
+            """A technology can not have a utilization factor of 0 for every
+                timeslice. Please check file {}.""".format(filename)
+        )
     return data

From 717f7225051b3d66b24a85a7b058dcc7e93c93f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 15 May 2024 05:46:00 +0100
Subject: [PATCH 109/419] Add updated result files for default_timeslice

---
 .../default_timeslice/Gas/Capacity/2020.csv   | 14 +--
 .../default_timeslice/Gas/Capacity/2025.csv   | 14 +--
 .../default_timeslice/Gas/Capacity/2030.csv   | 19 ++--
 .../default_timeslice/Gas/Capacity/2035.csv   | 17 ++--
 .../default_timeslice/Gas/Capacity/2040.csv   | 14 ++-
 .../default_timeslice/Gas/Capacity/2045.csv   | 11 ++-
 .../default_timeslice/Gas/Capacity/2050.csv   | 11 ++-
 .../default_timeslice/MCACapacity.csv         | 16 ++--
 .../default_timeslice/MCAMetric_Supply.csv    | 86 +++++++++++--------
 .../default_timeslice/MCAPrices.csv           | 36 ++++----
 .../default_timeslice/Power/Supply/2020.csv   | 40 ++++-----
 .../default_timeslice/Power/Supply/2025.csv   | 20 ++---
 12 files changed, 175 insertions(+), 123 deletions(-)

diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
index b2021661..371cd8ea 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,71.09630000000
-0,2030,R1,2020,gassupply1,63.59630000000
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
index 2f6ef446..2afc1e47 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,71.09630000000
-0,2030,R1,2020,gassupply1,63.59630000000
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
index 57b8cb7e..3ebe1998 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
@@ -1,7 +1,14 @@
 asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,63.59630000000
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
index bb4dacd3..882acc45 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
@@ -1,6 +1,13 @@
 asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
index aa3d4a78..9512c0de 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
@@ -1,5 +1,11 @@
 asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
index 278e1388..33eaf061 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
@@ -1,4 +1,9 @@
 asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
index ee9f1881..c9001996 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
@@ -1,4 +1,9 @@
 asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2055,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
+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
diff --git a/tests/example_outputs/default_timeslice/MCACapacity.csv b/tests/example_outputs/default_timeslice/MCACapacity.csv
index 0f73d68b..a048f4b8 100644
--- a/tests/example_outputs/default_timeslice/MCACapacity.csv
+++ b/tests/example_outputs/default_timeslice/MCACapacity.csv
@@ -6,20 +6,21 @@ 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,71.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
+A1,17.57780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2030
-A1,63.59630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
+A1,10.07780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
 A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2035
-A1,56.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
+A1,2.70670000000,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
@@ -27,7 +28,8 @@ A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2040
 A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
 A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
 A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2040
-A1,56.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
+A1,2.70670000000,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
@@ -36,7 +38,8 @@ A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
 A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
 A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
 A1,2.08150000000,R1,4,2040,R1,power,windturbine,retrofit,2045
-A1,56.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
+A1,2.70670000000,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.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
@@ -44,4 +47,5 @@ A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
 A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
 A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
 A1,2.37860000000,R1,4,2045,R1,power,windturbine,retrofit,2050
-A1,56.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
+A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
index 2ed432d5..b289c102 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
@@ -11,12 +11,12 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000
 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,0.81862009856,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.46946646668,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.78476537390,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.43561174202,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.42200557103,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.56953074780,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,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
@@ -54,11 +54,11 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.0
 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,3.82333333333,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,5.33222222222,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,7.16333333333,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,9.31666666667,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,10.66444444444,gassupply1,"('all-year', 'all-week', 'evening')",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
@@ -96,11 +96,11 @@ A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.0
 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,1,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,2,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,3,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,4,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,5,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",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
@@ -143,12 +143,18 @@ A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2030.0
 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.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('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
@@ -197,12 +203,18 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.
 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.05864444444,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,0.08796666667,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.05864444444,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.08796666667,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.17593333333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,0.11728888889,gassupply1,"('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
@@ -257,12 +269,18 @@ A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.
 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.05864444444,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,0.08796666667,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.05864444444,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.08796666667,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.17593333333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,0.11728888889,gassupply1,"('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
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 45e97e49..bc678ebb 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -23,53 +23,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.93080000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02460000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.83490000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.04710000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.73910000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.06580000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.64330000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.08830000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.54750000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.11490000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.45170000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.13150000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.19350000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.23250000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.33770000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.34900000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.25670000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.23250000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.43230000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34900000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.95960000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.69870000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.70270000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.46550000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
index 431f68c9..b346de20 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
@@ -4,28 +4,28 @@ timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
 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,2.00000000000
-1,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,2.00000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
+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,3.00000000000
-2,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,3.00000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
+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,4.00000000000
-3,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,366.68000000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,4.00000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,366.68000000000
+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,5.00000000000
-4,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,5.00000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
+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,6.00000000000
-5,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,6.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
+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
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
index 9f653027..cf76dc0a 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
@@ -4,28 +4,28 @@ timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
 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,2.00000000000
-1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,183.34000000000
+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,3.00000000000
-2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,275.01000000000
+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,4.00000000000
-3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,366.68000000000
+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,5.00000000000
-4,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,late-peak,458.35000000000
+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,6.00000000000
-5,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,evening,550.02000000000
+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

From 30a5a06f12cc5c87a299d47325bc3c26c9a20817 Mon Sep 17 00:00:00 2001
From: Alex Dewar <alexdewar@users.noreply.github.com>
Date: Wed, 15 May 2024 09:21:19 +0100
Subject: [PATCH 110/419] Demand is for commodities, not technologies per se
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Diego Alonso Álvarez <6095790+dalonsoa@users.noreply.github.com>
---
 src/muse/objectives.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index ccc58064..0da1c085 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -485,7 +485,7 @@ def annual_levelized_cost_of_energy(
 
     Arguments:
         agent: The agent of interest
-        demand: Demand for technology
+        demand: Demand for commodities
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
@@ -548,7 +548,7 @@ def lifetime_levelized_cost_of_energy(
 
     Arguments:
         agent: The agent of interest
-        demand: Demand for technology
+        demand: Demand for commodities
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
@@ -707,7 +707,7 @@ def net_present_value(
 
     Arguments:
         agent: The agent of interest
-        demand: Demand for technology
+        demand: Demand for commodities
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters
@@ -901,7 +901,7 @@ def equivalent_annual_cost(
 
     Arguments:
         agent: The agent of interest
-        demand: Demand for technology
+        demand: Demand for commodities
         search_space: The search space space for replacement technologies
         technologies: All the technologies
         market: The market parameters

From 23e8438a08d1ae1f9700f1618d11fdefb6f34afe Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 14 May 2024 16:58:23 +0100
Subject: [PATCH 111/419] Fix: Use single quotes for docstrings with """ in
 them

---
 src/muse/readers/toml.py | 16 ++++++++--------
 src/muse/timeslices.py   | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index 83285afa..093a2ada 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -406,14 +406,14 @@ def read_ts_multiindex(
     timeslice: Optional[xr.DataArray] = None,
     transforms: Optional[Dict[Tuple, np.ndarray]] = None,
 ) -> pd.MultiIndex:
-    r"""Read multiindex for a timeslice from TOML.
+    '''Read multiindex for a timeslice from TOML.
 
     Example:
         The timeslices are read from ``timeslice_levels``. The levels (keyword) and
         slice (list of values) correspond to the level, slices and slice aggregates
         defined  in the the ``timeslices`` section.
 
-        >>> toml = \"\"\"
+        >>> toml = """
         ...     ["timeslices"]
         ...     winter.weekday.day = 5
         ...     winter.weekday.night = 5
@@ -429,7 +429,7 @@ def read_ts_multiindex(
         ...     aggregates.allday = ["day", "night"]
         ...     [timeslice_levels]
         ...     day = ["dusk", "allday"]
-        ... \"\"\"
+        ... """
         >>> from muse.timeslices import (
         ...     reference_timeslice,  aggregate_transforms
         ... )
@@ -455,7 +455,7 @@ def read_ts_multiindex(
         Traceback (most recent call last):
         ...
         muse.readers.toml.IncorrectSettings: Unexpected slice(s): ...
-    """
+    '''
     from itertools import product
 
     from toml import loads
@@ -498,7 +498,7 @@ def read_timeslices(
     timeslice: Optional[xr.DataArray] = None,
     transforms: Optional[Dict[Tuple, np.ndarray]] = None,
 ) -> xr.Dataset:
-    r"""Reads timeslice levels and create resulting timeslice coordinate.
+    '''Reads timeslice levels and create resulting timeslice coordinate.
 
     Args:
         settings: TOML dictionary. It should contain a ``timeslice_levels`` section.
@@ -516,7 +516,7 @@ def read_timeslices(
         A xr.Dataset with the timeslice coordinates.
 
     Example:
-        >>> toml = \"\"\"
+        >>> toml = """
         ...     ["timeslices"]
         ...     winter.weekday.day = 5
         ...     winter.weekday.night = 5
@@ -532,7 +532,7 @@ def read_timeslices(
         ...     aggregates.allday = ["day", "night"]
         ...     [timeslice_levels]
         ...     day = ["dusk", "allday"]
-        ... \"\"\"
+        ... """
         >>> from muse.timeslices import (
         ...     reference_timeslice,  aggregate_transforms
         ... )
@@ -550,7 +550,7 @@ def read_timeslices(
             represent_hours  (timeslice) ... 10 1 4 10 1 4
         Data variables:
             *empty*
-    """
+    '''
     from muse.timeslices import TIMESLICE, timeslice_projector
 
     if timeslice is None:
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index bbb6fde8..74eba786 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -71,7 +71,7 @@ def reference_timeslice(
     level_names: Sequence[Text] = ("month", "day", "hour"),
     name: Text = "timeslice",
 ) -> DataArray:
-    r"""Reads reference timeslice from toml like input.
+    '''Reads reference timeslice from toml like input.
 
     Arguments:
         settings: A dictionary of nested dictionaries or a string that toml will
@@ -91,7 +91,7 @@ def reference_timeslice(
     Example:
         >>> from muse.timeslices import reference_timeslice
         >>> reference_timeslice(
-        ...     \"\"\"
+        ...     """
         ...     [timeslices]
         ...     spring.weekday = 5
         ...     spring.weekend = 2
@@ -102,7 +102,7 @@ def reference_timeslice(
         ...     summer.weekday = 5
         ...     summer.weekend = 2
         ...     level_names = ["season", "week"]
-        ...     \"\"\"
+        ...     """
         ... )
         <xarray.DataArray (timeslice: 8)>
         array([5, 2, 5, 2, 5, 2, 5, 2])
@@ -110,7 +110,7 @@ def reference_timeslice(
           * timeslice  (timeslice) MultiIndex
           - season     (timeslice) object 'spring' 'spring' ... 'summer' 'summer'
           - week       (timeslice) object 'weekday' 'weekend' ... 'weekday' 'weekend'
-    """
+    '''
     from functools import reduce
     from typing import List, Tuple
 
@@ -149,7 +149,7 @@ def aggregate_transforms(
     settings: Optional[Union[Mapping, Text]] = None,
     timeslice: Optional[DataArray] = None,
 ) -> Dict[Tuple, ndarray]:
-    r"""Creates dictionary of transforms for aggregate levels.
+    '''Creates dictionary of transforms for aggregate levels.
 
     The transforms are used to create the projectors towards the finest timeslice.
 
@@ -164,7 +164,7 @@ def aggregate_transforms(
         timeslices.
 
     Example:
-        >>> toml = \"\"\"
+        >>> toml = """
         ...     [timeslices]
         ...     spring.weekday = 5
         ...     spring.weekend = 2
@@ -178,7 +178,7 @@ def aggregate_transforms(
         ...     [timeslices.aggregates]
         ...     spautumn = ["spring", "autumn"]
         ...     week = ["weekday", "weekend"]
-        ... \"\"\"
+        ... """
         >>> from muse.timeslices import reference_timeslice, aggregate_transforms
         >>> ref = reference_timeslice(toml)
         >>> transforms = aggregate_transforms(toml, ref)
@@ -190,7 +190,7 @@ def aggregate_transforms(
         array([0, 0, 1, 1, 0, 0, 0, 0])
         >>> transforms[("spautumn", "week")].T
         array([1, 1, 1, 1, 0, 0, 0, 0])
-    """
+    '''
     from itertools import product
 
     from numpy import identity, sum
@@ -249,7 +249,7 @@ def timeslice_projector(
     finest: Optional[DataArray] = None,
     transforms: Optional[Dict[Tuple, ndarray]] = None,
 ) -> DataArray:
-    r"""Project time-slice to standardized finest time-slices.
+    '''Project time-slice to standardized finest time-slices.
 
     Returns a matrix from the input timeslice ``x`` to the ``finest`` timeslice, using
     the input ``transforms``. The latter are a set of transforms that map indices from
@@ -258,7 +258,7 @@ def timeslice_projector(
     Example:
         Lets define the following timeslices and aggregates:
 
-        >>> toml = \"\"\"
+        >>> toml = """
         ...     ["timeslices"]
         ...     winter.weekday.day = 5
         ...     winter.weekday.night = 5
@@ -272,7 +272,7 @@ def timeslice_projector(
         ...     summer.weekend.dusk = 1
         ...     level_names = ["semester", "week", "day"]
         ...     aggregates.allday = ["day", "night"]
-        ... \"\"\"
+        ... """
         >>> from muse.timeslices import (
         ...     reference_timeslice,  aggregate_transforms
         ... )
@@ -342,7 +342,7 @@ def timeslice_projector(
           - finest_week       (finest_timeslice) object 'weekday' ... 'weekend'
           - finest_day        (finest_timeslice) object 'day' 'night' ... 'night' 'dusk'
         Dimensions without coordinates: timeslice
-    """
+    '''
     from numpy import concatenate, ones_like
     from xarray import DataArray
 
@@ -402,7 +402,7 @@ def convert_timeslice(
     finest: Optional[DataArray] = None,
     transforms: Optional[Dict[Tuple, ndarray]] = None,
 ) -> Union[DataArray, Dataset]:
-    r"""Adjusts the timeslice of x to match that of ts.
+    '''Adjusts the timeslice of x to match that of ts.
 
     The conversion can be done in on of two ways, depending on whether the
     quantity is extensive or intensive. See `QuantityType`.
@@ -410,7 +410,7 @@ def convert_timeslice(
     Example:
         Lets define three timeslices from finest, to fine, to rough:
 
-        >>> toml = \"\"\"
+        >>> toml = """
         ...     ["timeslices"]
         ...     winter.weekday.day = 5
         ...     winter.weekday.night = 5
@@ -424,7 +424,7 @@ def convert_timeslice(
         ...     aggregates.allday = ["day", "night"]
         ...     aggregates.allweek = ["weekend", "weekday"]
         ...     aggregates.allyear = ["winter", "summer"]
-        ... \"\"\"
+        ... """
         >>> from muse.timeslices import setup_module
         >>> from muse.readers import read_timeslices
         >>> setup_module(toml)
@@ -526,7 +526,7 @@ def convert_timeslice(
         ... )
         >>> bool(all((weekend * 5).round(6) == (weekdays * 2).round(6)))
         True
-    """
+    '''
     if finest is None:
         global TIMESLICE
         finest = TIMESLICE

From 611648b484d430670d9eb20b7377cec7856b5845 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 15 May 2024 09:27:35 +0100
Subject: [PATCH 112/419] Use description from attribute for quantity

Suggested by @dalonsoa.

I also tidied some other docstrings while I was at it.
---
 src/muse/agents/agent.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index cee92fda..9ac6cb4b 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -32,17 +32,18 @@ def __init__(
                 instance. The information should not be anything describing the
                 technologies themselves, but rather the stock of assets held by
                 the agent.
-            category: optional attribute that could be used to classify
-                different agents together.
-            quantity: different agents' share of the population
+            category: optional value that could be used to classify different agents
+                together.
+            quantity: optional value to classify different agents' share of the
+                population.
         """
         from uuid import uuid4
 
         super().__init__()
         self.name = name
-        """ Name associated with the agent """
+        """Name associated with the agent."""
         self.region = region
-        """ Region the agent operates in """
+        """Region the agent operates in."""
         self.assets = assets if assets is not None else xr.Dataset()
         """Current stock of technologies."""
         self.uuid = uuid4()

From 7b8ab12e2dfe3b02d9f94febe7bdfc7b7d2bd623 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 09:50:50 +0100
Subject: [PATCH 113/419] Remove results files

---
 .../Results/Gas/Capacity/2020.csv             |   4 -
 .../Results/Gas/Capacity/2025.csv             |   9 -
 .../Results/Gas/Capacity/2030.csv             |  15 -
 .../Results/Gas/Capacity/2035.csv             |  13 -
 .../Results/Gas/Capacity/2040.csv             |  11 -
 .../Results/Gas/Capacity/2045.csv             |   9 -
 .../Results/Gas/Capacity/2050.csv             |   9 -
 .../1-introduction/Results/MCACapacity.csv    |  67 ---
 .../1-introduction/Results/MCAPrices.csv      | 169 -------
 .../Results/Power/Capacity/2020.csv           |  15 -
 .../Results/Power/Capacity/2025.csv           |  30 --
 .../Results/Power/Capacity/2030.csv           |  37 --
 .../Results/Power/Capacity/2035.csv           |  62 ---
 .../Results/Power/Capacity/2040.csv           |  57 ---
 .../Results/Power/Capacity/2045.csv           |  65 ---
 .../Results/Power/Capacity/2050.csv           |  57 ---
 .../Results/Residential/Capacity/2020.csv     |   6 -
 .../Results/Residential/Capacity/2025.csv     |  13 -
 .../Results/Residential/Capacity/2030.csv     |  15 -
 .../Results/Residential/Capacity/2035.csv     |  17 -
 .../Results/Residential/Capacity/2040.csv     |  15 -
 .../Results/Residential/Capacity/2045.csv     |  13 -
 .../Results/Residential/Capacity/2050.csv     |  11 -
 .../Results/Residential/Supply/2020.csv       |  31 --
 .../Results/Residential/Supply/2025.csv       |  43 --
 .../Results/Residential/Supply/2030.csv       |  49 --
 .../Results/Residential/Supply/2035.csv       |  49 --
 .../Results/Residential/Supply/2040.csv       |  49 --
 .../Results/Residential/Supply/2045.csv       |  37 --
 .../Results/Residential/Supply/2050.csv       |  25 -
 .../2-scenario/Results/Gas/Capacity/2020.csv  |   4 -
 .../2-scenario/Results/Gas/Capacity/2025.csv  |   9 -
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  15 -
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  13 -
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  11 -
 .../2-scenario/Results/Gas/Capacity/2045.csv  |   9 -
 .../2-scenario/Results/Gas/Capacity/2050.csv  |   9 -
 .../2-scenario/Results/MCACapacity.csv        |  64 ---
 .../2-scenario/Results/MCAPrices.csv          | 169 -------
 .../Results/Power/Capacity/2020.csv           |  15 -
 .../Results/Power/Capacity/2025.csv           |  30 --
 .../Results/Power/Capacity/2030.csv           |  37 --
 .../Results/Power/Capacity/2035.csv           |  51 --
 .../Results/Power/Capacity/2040.csv           |  46 --
 .../Results/Power/Capacity/2045.csv           |  55 ---
 .../Results/Power/Capacity/2050.csv           |  49 --
 .../Results/Residential/Capacity/2020.csv     |   6 -
 .../Results/Residential/Capacity/2025.csv     |  13 -
 .../Results/Residential/Capacity/2030.csv     |  15 -
 .../Results/Residential/Capacity/2035.csv     |  17 -
 .../Results/Residential/Capacity/2040.csv     |  15 -
 .../Results/Residential/Capacity/2045.csv     |  13 -
 .../Results/Residential/Capacity/2050.csv     |  11 -
 .../Results/Residential/Supply/2020.csv       |  31 --
 .../Results/Residential/Supply/2025.csv       |  43 --
 .../Results/Residential/Supply/2030.csv       |  49 --
 .../Results/Residential/Supply/2035.csv       |  49 --
 .../Results/Residential/Supply/2040.csv       |  49 --
 .../Results/Residential/Supply/2045.csv       |  37 --
 .../Results/Residential/Supply/2050.csv       |  25 -
 .../Results/Gas/Capacity/2020.csv             |   4 -
 .../Results/Gas/Capacity/2025.csv             |   3 -
 .../Results/Gas/Capacity/2030.csv             |   7 -
 .../Results/Gas/Capacity/2035.csv             |   6 -
 .../Results/Gas/Capacity/2040.csv             |   5 -
 .../Results/Gas/Capacity/2045.csv             |   4 -
 .../Results/Gas/Capacity/2050.csv             |   4 -
 .../Results/MCACapacity.csv                   | 101 ----
 .../Results/MCAPrices.csv                     | 169 -------
 .../Results/Power/Capacity/2020.csv           |  15 -
 .../Results/Power/Capacity/2025.csv           |  37 --
 .../Results/Power/Capacity/2030.csv           |  34 --
 .../Results/Power/Capacity/2035.csv           |  36 --
 .../Results/Power/Capacity/2040.csv           |  47 --
 .../Results/Power/Capacity/2045.csv           |  67 ---
 .../Results/Power/Capacity/2050.csv           |  51 --
 .../Results/Residential/Capacity/2020.csv     |   6 -
 .../Results/Residential/Capacity/2025.csv     |   5 -
 .../Results/Residential/Capacity/2030.csv     |   9 -
 .../Results/Residential/Capacity/2035.csv     |   7 -
 .../Results/Residential/Capacity/2040.csv     |  11 -
 .../Results/Residential/Capacity/2045.csv     |   7 -
 .../Results/Residential/Capacity/2050.csv     |   9 -
 .../Results/Residential/Supply/2020.csv       |  31 --
 .../Results/Residential/Supply/2025.csv       |  25 -
 .../Results/Residential/Supply/2030.csv       |  25 -
 .../Results/Residential/Supply/2035.csv       |  37 --
 .../Results/Residential/Supply/2040.csv       |  37 --
 .../Results/Residential/Supply/2045.csv       |  37 --
 .../Results/Residential/Supply/2050.csv       |  37 --
 .../Results/Gas/Capacity/2020.csv             |   4 -
 .../Results/Gas/Capacity/2025.csv             |   3 -
 .../Results/Gas/Capacity/2030.csv             |   7 -
 .../Results/Gas/Capacity/2035.csv             |   6 -
 .../Results/Gas/Capacity/2040.csv             |   5 -
 .../Results/Gas/Capacity/2045.csv             |   4 -
 .../Results/Gas/Capacity/2050.csv             |   4 -
 .../Results/MCACapacity.csv                   |  79 ---
 .../2-single-objective/Results/MCAPrices.csv  | 169 -------
 .../Results/Power/Capacity/2020.csv           |   9 -
 .../Results/Power/Capacity/2025.csv           |  24 -
 .../Results/Power/Capacity/2030.csv           |  22 -
 .../Results/Power/Capacity/2035.csv           |  19 -
 .../Results/Power/Capacity/2040.csv           |  16 -
 .../Results/Power/Capacity/2045.csv           |  33 --
 .../Results/Power/Capacity/2050.csv           |  27 --
 .../Results/Residential/Capacity/2020.csv     |   6 -
 .../Results/Residential/Capacity/2025.csv     |   5 -
 .../Results/Residential/Capacity/2030.csv     |   9 -
 .../Results/Residential/Capacity/2035.csv     |   7 -
 .../Results/Residential/Capacity/2040.csv     |  11 -
 .../Results/Residential/Capacity/2045.csv     |   7 -
 .../Results/Residential/Capacity/2050.csv     |   9 -
 .../Results/Residential/Supply/2020.csv       |  31 --
 .../Results/Residential/Supply/2025.csv       |  25 -
 .../Results/Residential/Supply/2030.csv       |  25 -
 .../Results/Residential/Supply/2035.csv       |  37 --
 .../Results/Residential/Supply/2040.csv       |  37 --
 .../Results/Residential/Supply/2045.csv       |  37 --
 .../Results/Residential/Supply/2050.csv       |  37 --
 .../Results/Gas/Capacity/2020.csv             |   7 -
 .../Results/Gas/Capacity/2025.csv             |  17 -
 .../Results/Gas/Capacity/2030.csv             |  29 --
 .../Results/Gas/Capacity/2035.csv             |  25 -
 .../Results/Gas/Capacity/2040.csv             |  21 -
 .../Results/Gas/Capacity/2045.csv             |  17 -
 .../Results/Gas/Capacity/2050.csv             |  17 -
 .../1-new-region/Results/MCACapacity.csv      | 128 -----
 .../1-new-region/Results/MCAPrices.csv        | 337 -------------
 .../Results/Power/Capacity/2020.csv           |  23 -
 .../Results/Power/Capacity/2025.csv           |  53 ---
 .../Results/Power/Capacity/2030.csv           |  76 ---
 .../Results/Power/Capacity/2035.csv           | 105 ----
 .../Results/Power/Capacity/2040.csv           | 105 ----
 .../Results/Power/Capacity/2045.csv           | 131 -----
 .../Results/Power/Capacity/2050.csv           | 121 -----
 .../Results/Residential/Capacity/2020.csv     |  11 -
 .../Results/Residential/Capacity/2025.csv     |  25 -
 .../Results/Residential/Capacity/2030.csv     |  29 --
 .../Results/Residential/Capacity/2035.csv     |  33 --
 .../Results/Residential/Capacity/2040.csv     |  29 --
 .../Results/Residential/Capacity/2045.csv     |  25 -
 .../Results/Residential/Capacity/2050.csv     |  21 -
 .../Results/Residential/Supply/2020.csv       | 121 -----
 .../Results/Residential/Supply/2025.csv       | 169 -------
 .../Results/Residential/Supply/2030.csv       | 193 --------
 .../Results/Residential/Supply/2035.csv       | 193 --------
 .../Results/Residential/Supply/2040.csv       | 193 --------
 .../Results/Residential/Supply/2045.csv       | 145 ------
 .../Results/Residential/Supply/2050.csv       |  97 ----
 .../Results/Gas/Capacity/2020.csv             |   7 -
 .../Results/Gas/Capacity/2025.csv             |  17 -
 .../Results/Gas/Capacity/2030.csv             |  29 --
 .../Results/Gas/Capacity/2035.csv             |  25 -
 .../Results/Gas/Capacity/2040.csv             |  21 -
 .../Results/Gas/Capacity/2045.csv             |  17 -
 .../Results/Gas/Capacity/2050.csv             |  17 -
 .../Results/MCACapacity.csv                   | 120 -----
 .../1-modify-timeslices/Results/MCAPrices.csv | 449 ------------------
 .../Results/Power/Capacity/2020.csv           |  23 -
 .../Results/Power/Capacity/2025.csv           |  53 ---
 .../Results/Power/Capacity/2030.csv           |  76 ---
 .../Results/Power/Capacity/2035.csv           |  87 ----
 .../Results/Power/Capacity/2040.csv           |  97 ----
 .../Results/Power/Capacity/2045.csv           | 125 -----
 .../Results/Power/Capacity/2050.csv           | 117 -----
 .../Results/Residential/Capacity/2020.csv     |  11 -
 .../Results/Residential/Capacity/2025.csv     |  25 -
 .../Results/Residential/Capacity/2030.csv     |  29 --
 .../Results/Residential/Capacity/2035.csv     |  25 -
 .../Results/Residential/Capacity/2040.csv     |  21 -
 .../Results/Residential/Capacity/2045.csv     |  21 -
 .../Results/Residential/Capacity/2050.csv     |  21 -
 .../Results/Residential/Supply/2020.csv       | 161 -------
 .../Results/Residential/Supply/2025.csv       | 225 ---------
 .../Results/Residential/Supply/2030.csv       | 257 ----------
 .../Results/Residential/Supply/2035.csv       | 193 --------
 .../Results/Residential/Supply/2040.csv       | 129 -----
 .../Results/Residential/Supply/2045.csv       | 129 -----
 .../Results/Residential/Supply/2050.csv       | 129 -----
 .../Results/Gas/Capacity/2020.csv             |   7 -
 .../Results/Gas/Capacity/2025.csv             |  17 -
 .../Results/Gas/Capacity/2030.csv             |  29 --
 .../Results/Gas/Capacity/2035.csv             |  25 -
 .../Results/Gas/Capacity/2040.csv             |  21 -
 .../Results/Gas/Capacity/2045.csv             |  17 -
 .../Results/Gas/Capacity/2050.csv             |  17 -
 .../Results/MCACapacity.csv                   |   7 -
 .../Results/MCAPrices.csv                     |  65 ---
 .../Results/Power/Capacity/2020.csv           |  21 -
 .../Results/Power/Capacity/2025.csv           |  53 ---
 .../Results/Power/Capacity/2030.csv           |  76 ---
 .../Results/Power/Capacity/2035.csv           | 105 ----
 .../Results/Power/Capacity/2040.csv           | 105 ----
 .../Results/Power/Capacity/2045.csv           | 131 -----
 .../Results/Power/Capacity/2050.csv           | 121 -----
 .../Results/Residential/Capacity/2020.csv     |  15 -
 .../Results/Residential/Capacity/2025.csv     |  25 -
 .../Results/Residential/Capacity/2030.csv     |  29 --
 .../Results/Residential/Capacity/2035.csv     |  33 --
 .../Results/Residential/Capacity/2040.csv     |  29 --
 .../Results/Residential/Capacity/2045.csv     |  25 -
 .../Results/Residential/Capacity/2050.csv     |  21 -
 .../Results/Residential/Supply/2020.csv       | 161 -------
 .../Results/Residential/Supply/2025.csv       | 169 -------
 .../Results/Residential/Supply/2030.csv       | 193 --------
 .../Results/Residential/Supply/2035.csv       | 193 --------
 .../Results/Residential/Supply/2040.csv       | 193 --------
 .../Results/Residential/Supply/2045.csv       | 145 ------
 .../Results/Residential/Supply/2050.csv       |  97 ----
 210 files changed, 10845 deletions(-)
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv

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
deleted file mode 100644
index fdbb2d27..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index d1fb99f5..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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/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
deleted file mode 100644
index 298f6c89..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
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
deleted file mode 100644
index e368dd50..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
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
deleted file mode 100644
index 4d55f6f7..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
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
deleted file mode 100644
index e5d560fc..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
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
deleted file mode 100644
index 4a7d05fa..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
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
deleted file mode 100644
index 9d868b1d..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
-windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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
-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
-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
-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,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
deleted file mode 100644
index f4d602c4..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
-"('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')",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')",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')",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')",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')",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')",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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,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')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,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')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,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')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,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')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,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
deleted file mode 100644
index beea1d34..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 35de2d84..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2064,R1,gasCCGT,2025,3.00000000000
-2,2025,R1,solarPV,2020,10.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,2025,R1,windturbine,2020,6.75000000000
-4,2030,R1,windturbine,2020,6.75000000000
-4,2035,R1,windturbine,2020,6.75000000000
-4,2040,R1,windturbine,2020,6.75000000000
-4,2045,R1,windturbine,2020,6.75000000000
-4,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
deleted file mode 100644
index 26ce8db8..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 3f21815e..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,62 +0,0 @@
-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
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
deleted file mode 100644
index 0ab7f9bf..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,57 +0,0 @@
-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
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
deleted file mode 100644
index 3d2ca0a4..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,65 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,3.00000000000
-0,2049,R1,gasCCGT,2025,3.00000000000
-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
-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
-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,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
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
deleted file mode 100644
index 43ea9b82..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,57 +0,0 @@
-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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 2eb0ec15..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 22334ba5..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 452c6c8a..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index e3ecc1d0..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 82b22d9b..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
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
deleted file mode 100644
index 305b627b..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
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
deleted file mode 100644
index a44059a3..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
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
deleted file mode 100644
index c9ed8c00..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-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
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
deleted file mode 100644
index 61ae1198..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 89e0bd4e..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 663e47a5..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 6e2884e6..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 61004cae..00000000
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index fdbb2d27..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index d1fb99f5..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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/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
deleted file mode 100644
index 298f6c89..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
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
deleted file mode 100644
index e368dd50..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-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
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
deleted file mode 100644
index 4d55f6f7..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
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
deleted file mode 100644
index e5d560fc..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
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
deleted file mode 100644
index 4a7d05fa..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
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
deleted file mode 100644
index 5f93911e..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
+++ /dev/null
@@ -1,64 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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
-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
-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
-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
-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
-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
-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,16.91000000000
-windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
-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/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
deleted file mode 100644
index d29309c0..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.51720000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17730000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77730000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27810000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51720000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17730000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77730000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27810000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56390000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62930000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38710000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56240000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19980000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84490000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31400000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56240000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19980000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84490000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31400000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69720000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.12810000000,2035
-"('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')",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')",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')",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')",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')",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')",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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08640000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14400000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08640000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14400000000,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')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37480000000,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')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.21120000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04750000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.08880000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04750000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08880000000,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')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28370000000,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')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14190000000,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
deleted file mode 100644
index f194e742..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 6611dc7e..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2064,R1,gasCCGT,2025,3.00000000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2025,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2020,10.00000000000
-4,2035,R1,windturbine,2020,10.00000000000
-4,2040,R1,windturbine,2020,10.00000000000
-4,2045,R1,windturbine,2020,10.00000000000
-4,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
deleted file mode 100644
index 3739f2ea..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 94a5d1ab..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-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
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
deleted file mode 100644
index 5e8f56bc..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,46 +0,0 @@
-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
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
deleted file mode 100644
index c64073d2..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,3.00000000000
-0,2049,R1,gasCCGT,2025,3.00000000000
-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
-1,2045,R1,solarPV,2020,6.75000000000
-1,2049,R1,solarPV,2020,6.75000000000
-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,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
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
deleted file mode 100644
index fbf5711d..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 2eb0ec15..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 22334ba5..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 452c6c8a..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index e3ecc1d0..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 82b22d9b..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
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
deleted file mode 100644
index 305b627b..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
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
deleted file mode 100644
index a44059a3..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
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
deleted file mode 100644
index c9ed8c00..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-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
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
deleted file mode 100644
index 61ae1198..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 89e0bd4e..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 663e47a5..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 6e2884e6..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 61004cae..00000000
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index fdbb2d27..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
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
deleted file mode 100644
index f2ad7b02..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 0e008ed8..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,7.50000000000
-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/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 39ffacce..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-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
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
deleted file mode 100644
index cc87d2bd..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-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
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
deleted file mode 100644
index c7248804..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
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
deleted file mode 100644
index 90a0f85e..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
deleted file mode 100644
index b926de76..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-solarPV,R1,R1,A1,power,retrofit,2025,0.39110000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-solarPV,R1,R1,A2,power,retrofit,2025,0.39110000000
-windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,4.32660000000
-solarPV,R1,R1,A2,power,retrofit,2030,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2030,2.64110000000
-windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2030,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,4.32660000000
-solarPV,R1,R1,A2,power,retrofit,2035,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2035,2.64110000000
-windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2035,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.36010000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,47.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.41900000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,4.32660000000
-solarPV,R1,R1,A2,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2040,2.64110000000
-solarPV,R1,R1,A2,power,retrofit,2040,3.03230000000
-windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2040,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.36010000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,47.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.41900000000
-solarPV,R1,R1,A1,power,retrofit,2045,1.20130000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,4.32660000000
-windturbine,R1,R1,A1,power,retrofit,2045,0.98720000000
-solarPV,R1,R1,A2,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2045,2.64110000000
-solarPV,R1,R1,A2,power,retrofit,2045,3.03230000000
-solarPV,R1,R1,A2,power,retrofit,2045,6.06450000000
-windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2045,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.36010000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,47.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,1.17930000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.41900000000
-solarPV,R1,R1,A1,power,retrofit,2050,1.20130000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.49210000000
-windturbine,R1,R1,A1,power,retrofit,2050,4.32660000000
-windturbine,R1,R1,A1,power,retrofit,2050,0.98720000000
-windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,2.64110000000
-solarPV,R1,R1,A2,power,retrofit,2050,3.03230000000
-solarPV,R1,R1,A2,power,retrofit,2050,6.06450000000
-solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2050,6.57660000000
-windturbine,R1,R1,A2,power,retrofit,2050,5.44720000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.36010000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,47.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
deleted file mode 100644
index 15e6634e..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.39520000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.93480000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.59280000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.40220000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.39520000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.93480000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.59280000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.40220000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18560000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.80430000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.79040000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.86950000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.31960000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03990000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.48010000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07160000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.31960000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03990000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48010000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07160000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96420000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21440000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.64100000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11130000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.38050000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.10930000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.57140000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.17330000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38050000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10930000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57140000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17330000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.14680000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40300000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.76270000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.24360000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.41770000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.13150000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.62720000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.20830000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41770000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.13150000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62720000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20830000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.25810000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.48320000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.83710000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.43870000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.15460000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.65850000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.24410000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43870000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15460000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65850000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24410000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.32020000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56140000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.87870000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.34170000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.51390000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.18180000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77140000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.28550000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51390000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18180000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77140000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.28550000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.54620000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.64770000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.02930000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.39770000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
deleted file mode 100644
index 48bcd2e6..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 32bf32ef..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,R1,solarPV,2020,0.78230000000
-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,2025,R1,windturbine,2020,20.00000000000
-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/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
deleted file mode 100644
index 68b049a3..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,34 +0,0 @@
-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
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
deleted file mode 100644
index a511e19c..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-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.45130000000
-6,2045,R1,2035,solarPV,3.45130000000
-6,2049,R1,2035,solarPV,3.45130000000
-6,2050,R1,2035,solarPV,3.45130000000
-6,2054,R1,2035,solarPV,3.45130000000
-6,2055,R1,2035,solarPV,3.45130000000
-6,2064,R1,2035,solarPV,3.45130000000
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
deleted file mode 100644
index 463af80c..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,47 +0,0 @@
-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.45130000000
-6,2045,R1,2035,solarPV,3.45130000000
-6,2049,R1,2035,solarPV,3.45130000000
-6,2050,R1,2035,solarPV,3.45130000000
-6,2054,R1,2035,solarPV,3.45130000000
-6,2055,R1,2035,solarPV,3.45130000000
-6,2064,R1,2035,solarPV,3.45130000000
-7,2045,R1,2040,solarPV,7.26580000000
-7,2049,R1,2040,solarPV,7.26580000000
-7,2050,R1,2040,solarPV,7.26580000000
-7,2054,R1,2040,solarPV,7.26580000000
-7,2055,R1,2040,solarPV,7.26580000000
-7,2064,R1,2040,solarPV,7.26580000000
-7,2065,R1,2040,solarPV,7.26580000000
-7,2069,R1,2040,solarPV,7.26580000000
-8,2045,R1,2040,windturbine,0.98720000000
-8,2049,R1,2040,windturbine,0.98720000000
-8,2050,R1,2040,windturbine,0.98720000000
-8,2054,R1,2040,windturbine,0.98720000000
-8,2055,R1,2040,windturbine,0.98720000000
-8,2064,R1,2040,windturbine,0.98720000000
-8,2065,R1,2040,windturbine,0.98720000000
-8,2069,R1,2040,windturbine,0.98720000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 9e366045..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,2.00000000000
-0,2049,R1,gasCCGT,2025,2.00000000000
-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.17930000000
-1,2054,R1,gasCCGT,2045,1.17930000000
-1,2055,R1,gasCCGT,2045,1.17930000000
-1,2064,R1,gasCCGT,2045,1.17930000000
-1,2065,R1,gasCCGT,2045,1.17930000000
-1,2069,R1,gasCCGT,2045,1.17930000000
-1,2070,R1,gasCCGT,2045,1.17930000000
-1,2074,R1,gasCCGT,2045,1.17930000000
-1,2075,R1,gasCCGT,2045,1.17930000000
-1,2084,R1,gasCCGT,2045,1.17930000000
-2,2045,R1,solarPV,2020,0.78230000000
-2,2049,R1,solarPV,2020,0.78230000000
-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,2045,R1,solarPV,2035,3.45130000000
-4,2049,R1,solarPV,2035,3.45130000000
-4,2050,R1,solarPV,2035,3.45130000000
-4,2054,R1,solarPV,2035,3.45130000000
-4,2055,R1,solarPV,2035,3.45130000000
-4,2064,R1,solarPV,2035,3.45130000000
-5,2045,R1,solarPV,2040,7.26580000000
-5,2049,R1,solarPV,2040,7.26580000000
-5,2050,R1,solarPV,2040,7.26580000000
-5,2054,R1,solarPV,2040,7.26580000000
-5,2055,R1,solarPV,2040,7.26580000000
-5,2064,R1,solarPV,2040,7.26580000000
-5,2065,R1,solarPV,2040,7.26580000000
-5,2069,R1,solarPV,2040,7.26580000000
-6,2050,R1,solarPV,2045,28.49210000000
-6,2054,R1,solarPV,2045,28.49210000000
-6,2055,R1,solarPV,2045,28.49210000000
-6,2064,R1,solarPV,2045,28.49210000000
-6,2065,R1,solarPV,2045,28.49210000000
-6,2069,R1,solarPV,2045,28.49210000000
-6,2070,R1,solarPV,2045,28.49210000000
-6,2074,R1,solarPV,2045,28.49210000000
-7,2045,R1,windturbine,2020,20.00000000000
-7,2049,R1,windturbine,2020,20.00000000000
-8,2045,R1,windturbine,2025,10.90320000000
-8,2049,R1,windturbine,2025,10.90320000000
-8,2050,R1,windturbine,2025,10.90320000000
-8,2054,R1,windturbine,2025,10.90320000000
-9,2045,R1,windturbine,2040,0.98720000000
-9,2049,R1,windturbine,2040,0.98720000000
-9,2050,R1,windturbine,2040,0.98720000000
-9,2054,R1,windturbine,2040,0.98720000000
-9,2055,R1,windturbine,2040,0.98720000000
-9,2064,R1,windturbine,2040,0.98720000000
-9,2065,R1,windturbine,2040,0.98720000000
-9,2069,R1,windturbine,2040,0.98720000000
-10,2050,R1,windturbine,2045,15.44720000000
-10,2054,R1,windturbine,2045,15.44720000000
-10,2055,R1,windturbine,2045,15.44720000000
-10,2064,R1,windturbine,2045,15.44720000000
-10,2065,R1,windturbine,2045,15.44720000000
-10,2069,R1,windturbine,2045,15.44720000000
-10,2070,R1,windturbine,2045,15.44720000000
-10,2074,R1,windturbine,2045,15.44720000000
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
deleted file mode 100644
index 137b6b00..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-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.45130000000
-5,2054,R1,2035,solarPV,3.45130000000
-5,2055,R1,2035,solarPV,3.45130000000
-5,2064,R1,2035,solarPV,3.45130000000
-6,2050,R1,2040,solarPV,7.26580000000
-6,2054,R1,2040,solarPV,7.26580000000
-6,2055,R1,2040,solarPV,7.26580000000
-6,2064,R1,2040,solarPV,7.26580000000
-6,2065,R1,2040,solarPV,7.26580000000
-6,2069,R1,2040,solarPV,7.26580000000
-7,2050,R1,2040,windturbine,0.98720000000
-7,2054,R1,2040,windturbine,0.98720000000
-7,2055,R1,2040,windturbine,0.98720000000
-7,2064,R1,2040,windturbine,0.98720000000
-7,2065,R1,2040,windturbine,0.98720000000
-7,2069,R1,2040,windturbine,0.98720000000
-8,2050,R1,2045,gasCCGT,1.17930000000
-8,2054,R1,2045,gasCCGT,1.17930000000
-8,2055,R1,2045,gasCCGT,1.17930000000
-8,2064,R1,2045,gasCCGT,1.17930000000
-8,2065,R1,2045,gasCCGT,1.17930000000
-8,2069,R1,2045,gasCCGT,1.17930000000
-8,2070,R1,2045,gasCCGT,1.17930000000
-8,2074,R1,2045,gasCCGT,1.17930000000
-8,2075,R1,2045,gasCCGT,1.17930000000
-8,2084,R1,2045,gasCCGT,1.17930000000
-9,2050,R1,2045,solarPV,28.49210000000
-9,2054,R1,2045,solarPV,28.49210000000
-9,2055,R1,2045,solarPV,28.49210000000
-9,2064,R1,2045,solarPV,28.49210000000
-9,2065,R1,2045,solarPV,28.49210000000
-9,2069,R1,2045,solarPV,28.49210000000
-9,2070,R1,2045,solarPV,28.49210000000
-9,2074,R1,2045,solarPV,28.49210000000
-10,2050,R1,2045,windturbine,15.44720000000
-10,2054,R1,2045,windturbine,15.44720000000
-10,2055,R1,2045,windturbine,15.44720000000
-10,2064,R1,2045,windturbine,15.44720000000
-10,2065,R1,2045,windturbine,15.44720000000
-10,2069,R1,2045,windturbine,15.44720000000
-10,2070,R1,2045,windturbine,15.44720000000
-10,2074,R1,2045,windturbine,15.44720000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 9458be5c..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-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/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index db6e6073..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 1434998a..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-1,2030,R1,heatpump,2020,119.00000000000
-1,2034,R1,heatpump,2020,119.00000000000
-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/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 6d888046..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 0e46259b..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,7.20000000000
-0,2044,R1,gasboiler,2030,7.20000000000
-1,2045,R1,gasboiler,2040,7.44000000000
-1,2050,R1,gasboiler,2040,7.44000000000
-1,2054,R1,gasboiler,2040,7.44000000000
-2,2040,R1,heatpump,2030,128.80000000000
-2,2044,R1,heatpump,2030,128.80000000000
-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/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 799a0664..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
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
deleted file mode 100644
index 85bfbefa..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
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
deleted file mode 100644
index 57fe2699..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
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
deleted file mode 100644
index 1339d7d2..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index 9c87f423..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index f8de2157..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 9a26b20d..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index cf942a49..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 9d4b068a..00000000
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index fdbb2d27..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
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
deleted file mode 100644
index f2ad7b02..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 15698c78..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,7.50000000000
-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/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index d5dee8bb..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-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
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
deleted file mode 100644
index 08966a42..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-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
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
deleted file mode 100644
index fe3133ab..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
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
deleted file mode 100644
index f3a800dd..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
deleted file mode 100644
index 8823691a..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
+++ /dev/null
@@ -1,79 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A1,power,retrofit,2025,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A2,power,retrofit,2025,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,6.54070000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2030,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2030,6.54070000000
-windturbine,R1,R1,A2,power,retrofit,2030,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
-gasboiler,R1,R1,A2,residential,retrofit,2035,7.20000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,28.80000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.54070000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2035,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2035,6.54070000000
-windturbine,R1,R1,A2,power,retrofit,2035,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,13.96760000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
-gasboiler,R1,R1,A2,residential,retrofit,2040,7.20000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,28.80000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,6.54070000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2040,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2040,6.54070000000
-windturbine,R1,R1,A2,power,retrofit,2040,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,13.96760000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
-gasboiler,R1,R1,A2,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,40.56000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.54070000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2045,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2045,6.54070000000
-windturbine,R1,R1,A2,power,retrofit,2045,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,13.96760000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
-gasboiler,R1,R1,A2,residential,retrofit,2050,7.44000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,40.56000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,0.86130000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.54070000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.61070000000
-windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
-gasCCGT,R1,R1,A2,power,retrofit,2050,2.00000000000
-gasCCGT,R1,R1,A2,power,retrofit,2050,0.86130000000
-solarPV,R1,R1,A2,power,retrofit,2050,6.54070000000
-solarPV,R1,R1,A2,power,retrofit,2050,11.61070000000
-windturbine,R1,R1,A2,power,retrofit,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,13.96760000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
deleted file mode 100644
index a198a4be..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.41420000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.99750000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.62130000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.49630000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41420000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.99750000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62130000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.49630000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.24260000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.99260000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.82840000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.99500000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.45920000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04060000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.69010000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07340000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.45920000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04060000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.69010000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07340000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.38800000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.22130000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.92190000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11440000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.57560000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.31520000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.86460000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.48470000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57560000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.31520000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86460000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.48470000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73710000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.04130000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.15460000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.66220000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.69190000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.39380000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.03920000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.60540000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69190000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.39380000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.03920000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.60540000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.08610000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.29950000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.38730000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.82690000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.85510000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.40120000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.28400000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.62000000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85510000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.40120000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28400000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.62000000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57580000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.35000000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.71370000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.85100000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.87940000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.48810000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.32010000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.75460000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.87940000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.48810000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.32010000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.75460000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.64690000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.64390000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.76170000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,1.03600000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
deleted file mode 100644
index e51bf8d5..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 9042b648..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,R1,windturbine,2020,18.95930000000
-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/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
deleted file mode 100644
index a3e0e3c7..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-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
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
deleted file mode 100644
index e66e2fa3..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-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
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
deleted file mode 100644
index c4711009..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 7507d45f..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,4.00000000000
-0,2049,R1,gasCCGT,2025,4.00000000000
-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,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,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
-4,2045,R1,windturbine,2020,18.95930000000
-4,2049,R1,windturbine,2020,18.95930000000
-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/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
deleted file mode 100644
index e4440602..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 4122d90b..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-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/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 08d92bf4..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 0ee56685..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-1,2030,R1,heatpump,2020,38.00000000000
-1,2034,R1,heatpump,2020,38.00000000000
-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/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 2363ffb8..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index cd28d615..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,14.40000000000
-0,2044,R1,gasboiler,2030,14.40000000000
-1,2045,R1,gasboiler,2040,14.88000000000
-1,2050,R1,gasboiler,2040,14.88000000000
-1,2054,R1,gasboiler,2040,14.88000000000
-2,2040,R1,heatpump,2030,57.60000000000
-2,2044,R1,heatpump,2030,57.60000000000
-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/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 939e3e56..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
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
deleted file mode 100644
index 6aff1325..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
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
deleted file mode 100644
index 62937431..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
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
deleted file mode 100644
index f9894bba..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index 514bc0ff..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index 80e72327..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 2c074d4d..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index aa751b65..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 79dedd79..00000000
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 192f9bf9..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 57ef9d5d..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,2.79440000000
-1,2035,gassupply1,R1,2025,2.79440000000
-1,2040,gassupply1,R1,2025,2.79440000000
-1,2045,gassupply1,R1,2025,2.79440000000
-1,2050,gassupply1,R1,2025,2.79440000000
-1,2064,gassupply1,R1,2025,2.79440000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,2.79440000000
-3,2035,gassupply1,R2,2025,2.79440000000
-3,2040,gassupply1,R2,2025,2.79440000000
-3,2045,gassupply1,R2,2025,2.79440000000
-3,2050,gassupply1,R2,2025,2.79440000000
-3,2064,gassupply1,R2,2025,2.79440000000
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
deleted file mode 100644
index 223a9793..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-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
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
deleted file mode 100644
index be63ee95..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index 301ed041..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
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
deleted file mode 100644
index 33d01ddd..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
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
deleted file mode 100644
index 59af6136..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
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
deleted file mode 100644
index c1b43bb2..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
+++ /dev/null
@@ -1,128 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,2.40000000000
-windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
-solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
-windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
-windturbine,R2,R2,A1,power,retrofit,2035,3.60000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
-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
-gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
-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
-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
-solarPV,R2,R2,A1,power,retrofit,2040,4.80000000000
-windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
-windturbine,R2,R2,A1,power,retrofit,2040,3.60000000000
-windturbine,R2,R2,A1,power,retrofit,2040,4.39000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.79440000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
-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
-gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
-heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
-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
-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
-solarPV,R2,R2,A1,power,retrofit,2045,4.80000000000
-solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
-windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
-windturbine,R2,R2,A1,power,retrofit,2045,3.60000000000
-windturbine,R2,R2,A1,power,retrofit,2045,4.39000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,2.79440000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
-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,16.91000000000
-windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
-windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
-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
-solarPV,R2,R2,A1,power,retrofit,2050,4.80000000000
-solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
-solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
-windturbine,R2,R2,A1,power,retrofit,2050,3.60000000000
-windturbine,R2,R2,A1,power,retrofit,2050,4.39000000000
-windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,2.79440000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
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
deleted file mode 100644
index ce14d096..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
+++ /dev/null
@@ -1,337 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.51500000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.51500000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17720000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.17720000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77400000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.77400000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.27790000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51500000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.51500000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.17720000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77400000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77400000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.27790000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.55730000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.55730000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62840000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.62840000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03410000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.03410000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38660000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.38660000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56090000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.56090000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19970000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.19970000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84270000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.84270000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31380000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.31380000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56090000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.56090000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19970000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.19970000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84270000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.84270000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31380000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.31380000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69290000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.69290000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71370000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.71370000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.12520000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.12520000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.43750000000,2035
-"('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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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
deleted file mode 100644
index b5425c1b..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 0b9e6c57..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,3.00000000000
-1,2035,gasCCGT,R1,2025,3.00000000000
-1,2040,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R1,2025,3.00000000000
-1,2049,gasCCGT,R1,2025,3.00000000000
-1,2050,gasCCGT,R1,2025,3.00000000000
-1,2054,gasCCGT,R1,2025,3.00000000000
-1,2055,gasCCGT,R1,2025,3.00000000000
-1,2064,gasCCGT,R1,2025,3.00000000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,3.00000000000
-3,2035,gasCCGT,R2,2025,3.00000000000
-3,2040,gasCCGT,R2,2025,3.00000000000
-3,2045,gasCCGT,R2,2025,3.00000000000
-3,2049,gasCCGT,R2,2025,3.00000000000
-3,2050,gasCCGT,R2,2025,3.00000000000
-3,2054,gasCCGT,R2,2025,3.00000000000
-3,2055,gasCCGT,R2,2025,3.00000000000
-3,2064,gasCCGT,R2,2025,3.00000000000
-4,2025,solarPV,R1,2020,6.75000000000
-4,2030,solarPV,R1,2020,6.75000000000
-4,2035,solarPV,R1,2020,6.75000000000
-4,2040,solarPV,R1,2020,6.75000000000
-4,2045,solarPV,R1,2020,6.75000000000
-4,2049,solarPV,R1,2020,6.75000000000
-5,2030,solarPV,R1,2025,2.40000000000
-5,2035,solarPV,R1,2025,2.40000000000
-5,2040,solarPV,R1,2025,2.40000000000
-5,2045,solarPV,R1,2025,2.40000000000
-5,2049,solarPV,R1,2025,2.40000000000
-5,2050,solarPV,R1,2025,2.40000000000
-5,2054,solarPV,R1,2025,2.40000000000
-6,2030,solarPV,R2,2025,2.40000000000
-6,2035,solarPV,R2,2025,2.40000000000
-6,2040,solarPV,R2,2025,2.40000000000
-6,2045,solarPV,R2,2025,2.40000000000
-6,2049,solarPV,R2,2025,2.40000000000
-6,2050,solarPV,R2,2025,2.40000000000
-6,2054,solarPV,R2,2025,2.40000000000
-7,2025,windturbine,R1,2020,10.00000000000
-7,2030,windturbine,R1,2020,10.00000000000
-7,2035,windturbine,R1,2020,10.00000000000
-7,2040,windturbine,R1,2020,10.00000000000
-7,2045,windturbine,R1,2020,10.00000000000
-7,2049,windturbine,R1,2020,10.00000000000
-8,2025,windturbine,R2,2020,16.75000000000
-8,2030,windturbine,R2,2020,16.75000000000
-8,2035,windturbine,R2,2020,16.75000000000
-8,2040,windturbine,R2,2020,16.75000000000
-8,2045,windturbine,R2,2020,16.75000000000
-8,2049,windturbine,R2,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
deleted file mode 100644
index ca265d0a..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,76 +0,0 @@
-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
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
deleted file mode 100644
index bc71a6d4..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,105 +0,0 @@
-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
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
deleted file mode 100644
index bda10415..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,105 +0,0 @@
-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
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
deleted file mode 100644
index b04feb4a..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,131 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,3.00000000000
-0,2049,gasCCGT,R1,2025,3.00000000000
-0,2050,gasCCGT,R1,2025,3.00000000000
-0,2054,gasCCGT,R1,2025,3.00000000000
-0,2055,gasCCGT,R1,2025,3.00000000000
-0,2059,gasCCGT,R1,2025,3.00000000000
-0,2060,gasCCGT,R1,2025,3.00000000000
-0,2064,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R2,2025,3.00000000000
-1,2049,gasCCGT,R2,2025,3.00000000000
-1,2050,gasCCGT,R2,2025,3.00000000000
-1,2054,gasCCGT,R2,2025,3.00000000000
-1,2055,gasCCGT,R2,2025,3.00000000000
-1,2059,gasCCGT,R2,2025,3.00000000000
-1,2060,gasCCGT,R2,2025,3.00000000000
-1,2064,gasCCGT,R2,2025,3.00000000000
-2,2045,solarPV,R1,2020,6.75000000000
-2,2049,solarPV,R1,2020,6.75000000000
-3,2045,solarPV,R1,2025,2.40000000000
-3,2049,solarPV,R1,2025,2.40000000000
-3,2050,solarPV,R1,2025,2.40000000000
-3,2054,solarPV,R1,2025,2.40000000000
-4,2045,solarPV,R1,2030,6.00000000000
-4,2049,solarPV,R1,2030,6.00000000000
-4,2050,solarPV,R1,2030,6.00000000000
-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
-15,2045,windturbine,R2,2020,16.75000000000
-15,2049,windturbine,R2,2020,16.75000000000
-16,2045,windturbine,R2,2030,3.60000000000
-16,2049,windturbine,R2,2030,3.60000000000
-16,2050,windturbine,R2,2030,3.60000000000
-16,2054,windturbine,R2,2030,3.60000000000
-16,2055,windturbine,R2,2030,3.60000000000
-16,2059,windturbine,R2,2030,3.60000000000
-17,2045,windturbine,R2,2035,4.39000000000
-17,2049,windturbine,R2,2035,4.39000000000
-17,2050,windturbine,R2,2035,4.39000000000
-17,2054,windturbine,R2,2035,4.39000000000
-17,2055,windturbine,R2,2035,4.39000000000
-17,2059,windturbine,R2,2035,4.39000000000
-17,2060,windturbine,R2,2035,4.39000000000
-17,2064,windturbine,R2,2035,4.39000000000
-18,2050,windturbine,R2,2045,6.75000000000
-18,2054,windturbine,R2,2045,6.75000000000
-18,2055,windturbine,R2,2045,6.75000000000
-18,2059,windturbine,R2,2045,6.75000000000
-18,2060,windturbine,R2,2045,6.75000000000
-18,2064,windturbine,R2,2045,6.75000000000
-18,2065,windturbine,R2,2045,6.75000000000
-18,2069,windturbine,R2,2045,6.75000000000
-18,2070,windturbine,R2,2045,6.75000000000
-18,2074,windturbine,R2,2045,6.75000000000
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
deleted file mode 100644
index 37b2c93a..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 06bad92b..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2020,gasboiler,R1,2020,10.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2020,gasboiler,R2,2020,10.00000000000
-1,2025,gasboiler,R2,2020,5.00000000000
-2,2025,heatpump,R1,2020,19.00000000000
-2,2030,heatpump,R1,2020,19.00000000000
-2,2034,heatpump,R1,2020,19.00000000000
-3,2025,heatpump,R2,2020,19.00000000000
-3,2030,heatpump,R2,2020,19.00000000000
-3,2034,heatpump,R2,2020,19.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 34d42206..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,4.10000000000
-1,2034,gasboiler,R1,2025,4.10000000000
-1,2035,gasboiler,R1,2025,4.10000000000
-1,2039,gasboiler,R1,2025,4.10000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,4.10000000000
-3,2034,gasboiler,R2,2025,4.10000000000
-3,2035,gasboiler,R2,2025,4.10000000000
-3,2039,gasboiler,R2,2025,4.10000000000
-4,2025,heatpump,R1,2020,19.00000000000
-4,2030,heatpump,R1,2020,19.00000000000
-4,2034,heatpump,R1,2020,19.00000000000
-5,2030,heatpump,R1,2025,6.90000000000
-5,2034,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2025,6.90000000000
-5,2039,heatpump,R1,2025,6.90000000000
-6,2025,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2020,19.00000000000
-6,2034,heatpump,R2,2020,19.00000000000
-7,2030,heatpump,R2,2025,6.90000000000
-7,2034,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 559a80d8..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,4.10000000000
-0,2034,gasboiler,R1,2025,4.10000000000
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2030,gasboiler,R2,2025,4.10000000000
-1,2034,gasboiler,R2,2025,4.10000000000
-1,2035,gasboiler,R2,2025,4.10000000000
-1,2039,gasboiler,R2,2025,4.10000000000
-2,2030,heatpump,R1,2020,19.00000000000
-2,2034,heatpump,R1,2020,19.00000000000
-3,2030,heatpump,R1,2025,6.90000000000
-3,2034,heatpump,R1,2025,6.90000000000
-3,2035,heatpump,R1,2025,6.90000000000
-3,2039,heatpump,R1,2025,6.90000000000
-4,2035,heatpump,R1,2030,25.00000000000
-4,2039,heatpump,R1,2030,25.00000000000
-4,2040,heatpump,R1,2030,25.00000000000
-4,2044,heatpump,R1,2030,25.00000000000
-5,2030,heatpump,R2,2020,19.00000000000
-5,2034,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2025,6.90000000000
-6,2034,heatpump,R2,2025,6.90000000000
-6,2035,heatpump,R2,2025,6.90000000000
-6,2039,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2030,25.00000000000
-7,2039,heatpump,R2,2030,25.00000000000
-7,2040,heatpump,R2,2030,25.00000000000
-7,2044,heatpump,R2,2030,25.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index fa9e8bca..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2040,gasboiler,R1,2035,0.91000000000
-1,2044,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R1,2035,0.91000000000
-1,2049,gasboiler,R1,2035,0.91000000000
-2,2035,gasboiler,R2,2025,4.10000000000
-2,2039,gasboiler,R2,2025,4.10000000000
-3,2040,gasboiler,R2,2035,0.91000000000
-3,2044,gasboiler,R2,2035,0.91000000000
-3,2045,gasboiler,R2,2035,0.91000000000
-3,2049,gasboiler,R2,2035,0.91000000000
-4,2035,heatpump,R1,2025,6.90000000000
-4,2039,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2030,25.00000000000
-5,2039,heatpump,R1,2030,25.00000000000
-5,2040,heatpump,R1,2030,25.00000000000
-5,2044,heatpump,R1,2030,25.00000000000
-6,2040,heatpump,R1,2035,16.09000000000
-6,2044,heatpump,R1,2035,16.09000000000
-6,2045,heatpump,R1,2035,16.09000000000
-6,2049,heatpump,R1,2035,16.09000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
-8,2035,heatpump,R2,2030,25.00000000000
-8,2039,heatpump,R2,2030,25.00000000000
-8,2040,heatpump,R2,2030,25.00000000000
-8,2044,heatpump,R2,2030,25.00000000000
-9,2040,heatpump,R2,2035,16.09000000000
-9,2044,heatpump,R2,2035,16.09000000000
-9,2045,heatpump,R2,2035,16.09000000000
-9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index eb1a544b..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2040,gasboiler,R1,2035,0.91000000000
-0,2044,gasboiler,R1,2035,0.91000000000
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2040,gasboiler,R2,2035,0.91000000000
-1,2044,gasboiler,R2,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2040,heatpump,R1,2030,25.00000000000
-2,2044,heatpump,R1,2030,25.00000000000
-3,2040,heatpump,R1,2035,16.09000000000
-3,2044,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2035,16.09000000000
-3,2049,heatpump,R1,2035,16.09000000000
-4,2045,heatpump,R1,2040,31.00000000000
-4,2049,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2040,31.00000000000
-4,2054,heatpump,R1,2040,31.00000000000
-5,2040,heatpump,R2,2030,25.00000000000
-5,2044,heatpump,R2,2030,25.00000000000
-6,2040,heatpump,R2,2035,16.09000000000
-6,2044,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2035,16.09000000000
-6,2049,heatpump,R2,2035,16.09000000000
-7,2045,heatpump,R2,2040,31.00000000000
-7,2049,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2040,31.00000000000
-7,2054,heatpump,R2,2040,31.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 0b5fe3de..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2045,heatpump,R1,2035,16.09000000000
-2,2049,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2040,31.00000000000
-3,2049,heatpump,R1,2040,31.00000000000
-3,2050,heatpump,R1,2040,31.00000000000
-3,2054,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2045,23.00000000000
-4,2054,heatpump,R1,2045,23.00000000000
-4,2055,heatpump,R1,2045,23.00000000000
-4,2059,heatpump,R1,2045,23.00000000000
-5,2045,heatpump,R2,2035,16.09000000000
-5,2049,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2040,31.00000000000
-6,2049,heatpump,R2,2040,31.00000000000
-6,2050,heatpump,R2,2040,31.00000000000
-6,2054,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2045,23.00000000000
-7,2054,heatpump,R2,2045,23.00000000000
-7,2055,heatpump,R2,2045,23.00000000000
-7,2059,heatpump,R2,2045,23.00000000000
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
deleted file mode 100644
index eb21c442..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
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
deleted file mode 100644
index 8e6f8adf..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-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
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
deleted file mode 100644
index eb9ddd9d..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-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
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
deleted file mode 100644
index af0c152b..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
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
deleted file mode 100644
index 21119f08..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
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
deleted file mode 100644
index 503b4b8c..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
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
deleted file mode 100644
index 98be95de..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,145 +0,0 @@
-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
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
deleted file mode 100644
index 26d4aa26..00000000
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-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
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
deleted file mode 100644
index 192f9bf9..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
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
deleted file mode 100644
index 3c032c34..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
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
deleted file mode 100644
index 8951d4a9..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-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
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
deleted file mode 100644
index a056e261..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index 0c2112af..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
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
deleted file mode 100644
index 20d6c8b3..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
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
deleted file mode 100644
index 857dfbd4..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
deleted file mode 100644
index 06b99912..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ /dev/null
@@ -1,120 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,5.60870000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
-heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
-heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
-heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
-heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2030,4.07170000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,4.07170000000
-windturbine,R2,R2,A1,power,retrofit,2030,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,0.27200000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,0.27200000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
-heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
-heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2035,4.07170000000
-solarPV,R1,R1,A1,power,retrofit,2035,5.71470000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
-windturbine,R2,R2,A1,power,retrofit,2035,15.60870000000
-windturbine,R2,R2,A1,power,retrofit,2035,1.64290000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,0.27200000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,0.27200000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
-heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2040,4.07170000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2040,7.85760000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2040,7.85760000000
-windturbine,R2,R2,A1,power,retrofit,2040,15.60870000000
-windturbine,R2,R2,A1,power,retrofit,2040,1.64290000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,0.27200000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,0.27200000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
-heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
-heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2045,4.07170000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2045,7.85760000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2045,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2045,7.85760000000
-solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
-windturbine,R2,R2,A1,power,retrofit,2045,15.60870000000
-windturbine,R2,R2,A1,power,retrofit,2045,1.64290000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,0.27200000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,0.27200000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
-heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
-heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
-heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,4.07170000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2050,7.85760000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.71470000000
-windturbine,R1,R1,A1,power,retrofit,2050,5.60870000000
-gasCCGT,R2,R2,A1,power,retrofit,2050,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2050,7.85760000000
-solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
-solarPV,R2,R2,A1,power,retrofit,2050,15.71470000000
-windturbine,R2,R2,A1,power,retrofit,2050,1.64290000000
-windturbine,R2,R2,A1,power,retrofit,2050,5.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,0.27200000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,0.27200000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
deleted file mode 100644
index 54105605..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ /dev/null
@@ -1,449 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.30330000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.30330000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.45500000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.45500000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.45500000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.45500000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.91030000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.91030000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.60700000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.60700000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.60700000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.60700000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.60700000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.60700000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.33730000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.33730000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.07490000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.50660000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.50660000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11850000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.11850000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.33730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.33730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07490000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.50660000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.50660000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11850000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11850000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.01710000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.01710000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27390000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27390000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.67670000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.67670000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.16630000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.16630000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.67670000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.67670000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16630000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16630000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.67670000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.67670000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.37230000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.37230000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08360000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08360000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.55890000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.55890000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.13230000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.13230000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37230000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37230000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08360000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08360000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.55890000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.55890000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13230000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13230000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.12120000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.12120000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30640000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30640000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.74630000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.74630000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.18580000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.18580000000,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', 'early-morning')",electricity,R1,0.74630000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.74630000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18580000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18580000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.74630000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.74630000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18580000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18580000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.37880000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.37880000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02350000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02350000000,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.56850000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56850000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04330000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.04330000000,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', 'mid-afternoon')",electricity,R1,0.37880000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37880000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02350000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02350000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56850000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56850000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04330000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04330000000,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.13990000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.13990000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13480000000,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,0.75910000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.75910000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.06840000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.06840000000,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', 'early-morning')",electricity,R1,0.75910000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.75910000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06840000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06840000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.75910000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.75910000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06840000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06840000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.41910000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.41910000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02370000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02370000000,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.62900000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.62900000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04370000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.04370000000,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', 'mid-afternoon')",electricity,R1,0.41910000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41910000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02370000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02370000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62900000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.62900000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04370000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04370000000,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.26060000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.26060000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13640000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13640000000,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,0.83970000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.83970000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.06920000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.06920000000,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', 'early-morning')",electricity,R1,0.83970000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.83970000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06920000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06920000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.83970000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.83970000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06920000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06920000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.44700000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.44700000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02480000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.02480000000,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.67070000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.67070000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04630000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.04630000000,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', 'mid-afternoon')",electricity,R1,0.44700000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44700000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02480000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02480000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67070000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.67070000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04630000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04630000000,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.34390000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34390000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.14670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.14670000000,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,0.89530000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89530000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07380000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.07380000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89530000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89530000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.07380000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.07380000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89530000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89530000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.07380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.07380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
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
deleted file mode 100644
index fa374881..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
deleted file mode 100644
index ea8602ea..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,3.00000000000
-1,2035,gasCCGT,R1,2025,3.00000000000
-1,2040,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R1,2025,3.00000000000
-1,2049,gasCCGT,R1,2025,3.00000000000
-1,2050,gasCCGT,R1,2025,3.00000000000
-1,2054,gasCCGT,R1,2025,3.00000000000
-1,2055,gasCCGT,R1,2025,3.00000000000
-1,2064,gasCCGT,R1,2025,3.00000000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,3.00000000000
-3,2035,gasCCGT,R2,2025,3.00000000000
-3,2040,gasCCGT,R2,2025,3.00000000000
-3,2045,gasCCGT,R2,2025,3.00000000000
-3,2049,gasCCGT,R2,2025,3.00000000000
-3,2050,gasCCGT,R2,2025,3.00000000000
-3,2054,gasCCGT,R2,2025,3.00000000000
-3,2055,gasCCGT,R2,2025,3.00000000000
-3,2064,gasCCGT,R2,2025,3.00000000000
-4,2025,solarPV,R1,2020,5.60870000000
-4,2030,solarPV,R1,2020,5.60870000000
-4,2035,solarPV,R1,2020,5.60870000000
-4,2040,solarPV,R1,2020,5.60870000000
-4,2045,solarPV,R1,2020,5.60870000000
-4,2049,solarPV,R1,2020,5.60870000000
-5,2030,solarPV,R1,2025,4.07170000000
-5,2035,solarPV,R1,2025,4.07170000000
-5,2040,solarPV,R1,2025,4.07170000000
-5,2045,solarPV,R1,2025,4.07170000000
-5,2049,solarPV,R1,2025,4.07170000000
-5,2050,solarPV,R1,2025,4.07170000000
-5,2054,solarPV,R1,2025,4.07170000000
-6,2030,solarPV,R2,2025,4.07170000000
-6,2035,solarPV,R2,2025,4.07170000000
-6,2040,solarPV,R2,2025,4.07170000000
-6,2045,solarPV,R2,2025,4.07170000000
-6,2049,solarPV,R2,2025,4.07170000000
-6,2050,solarPV,R2,2025,4.07170000000
-6,2054,solarPV,R2,2025,4.07170000000
-7,2025,windturbine,R1,2020,10.00000000000
-7,2030,windturbine,R1,2020,10.00000000000
-7,2035,windturbine,R1,2020,10.00000000000
-7,2040,windturbine,R1,2020,10.00000000000
-7,2045,windturbine,R1,2020,10.00000000000
-7,2049,windturbine,R1,2020,10.00000000000
-8,2025,windturbine,R2,2020,15.60870000000
-8,2030,windturbine,R2,2020,15.60870000000
-8,2035,windturbine,R2,2020,15.60870000000
-8,2040,windturbine,R2,2020,15.60870000000
-8,2045,windturbine,R2,2020,15.60870000000
-8,2049,windturbine,R2,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
deleted file mode 100644
index 91268246..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,76 +0,0 @@
-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
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
deleted file mode 100644
index 9eb83457..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,87 +0,0 @@
-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
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
deleted file mode 100644
index f78b605a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 797266c4..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,125 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,3.00000000000
-0,2049,gasCCGT,R1,2025,3.00000000000
-0,2050,gasCCGT,R1,2025,3.00000000000
-0,2054,gasCCGT,R1,2025,3.00000000000
-0,2055,gasCCGT,R1,2025,3.00000000000
-0,2059,gasCCGT,R1,2025,3.00000000000
-0,2060,gasCCGT,R1,2025,3.00000000000
-0,2064,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R2,2025,3.00000000000
-1,2049,gasCCGT,R2,2025,3.00000000000
-1,2050,gasCCGT,R2,2025,3.00000000000
-1,2054,gasCCGT,R2,2025,3.00000000000
-1,2055,gasCCGT,R2,2025,3.00000000000
-1,2059,gasCCGT,R2,2025,3.00000000000
-1,2060,gasCCGT,R2,2025,3.00000000000
-1,2064,gasCCGT,R2,2025,3.00000000000
-2,2045,solarPV,R1,2020,5.60870000000
-2,2049,solarPV,R1,2020,5.60870000000
-3,2045,solarPV,R1,2025,4.07170000000
-3,2049,solarPV,R1,2025,4.07170000000
-3,2050,solarPV,R1,2025,4.07170000000
-3,2054,solarPV,R1,2025,4.07170000000
-4,2045,solarPV,R1,2030,5.71470000000
-4,2049,solarPV,R1,2030,5.71470000000
-4,2050,solarPV,R1,2030,5.71470000000
-4,2054,solarPV,R1,2030,5.71470000000
-4,2055,solarPV,R1,2030,5.71470000000
-4,2059,solarPV,R1,2030,5.71470000000
-5,2045,solarPV,R1,2035,7.85760000000
-5,2049,solarPV,R1,2035,7.85760000000
-5,2050,solarPV,R1,2035,7.85760000000
-5,2054,solarPV,R1,2035,7.85760000000
-5,2055,solarPV,R1,2035,7.85760000000
-5,2059,solarPV,R1,2035,7.85760000000
-5,2060,solarPV,R1,2035,7.85760000000
-5,2064,solarPV,R1,2035,7.85760000000
-6,2045,solarPV,R1,2040,5.71470000000
-6,2049,solarPV,R1,2040,5.71470000000
-6,2050,solarPV,R1,2040,5.71470000000
-6,2054,solarPV,R1,2040,5.71470000000
-6,2055,solarPV,R1,2040,5.71470000000
-6,2059,solarPV,R1,2040,5.71470000000
-6,2060,solarPV,R1,2040,5.71470000000
-6,2064,solarPV,R1,2040,5.71470000000
-6,2065,solarPV,R1,2040,5.71470000000
-6,2069,solarPV,R1,2040,5.71470000000
-7,2050,solarPV,R1,2045,15.71470000000
-7,2054,solarPV,R1,2045,15.71470000000
-7,2055,solarPV,R1,2045,15.71470000000
-7,2059,solarPV,R1,2045,15.71470000000
-7,2060,solarPV,R1,2045,15.71470000000
-7,2064,solarPV,R1,2045,15.71470000000
-7,2065,solarPV,R1,2045,15.71470000000
-7,2069,solarPV,R1,2045,15.71470000000
-7,2070,solarPV,R1,2045,15.71470000000
-7,2074,solarPV,R1,2045,15.71470000000
-8,2045,solarPV,R2,2025,4.07170000000
-8,2049,solarPV,R2,2025,4.07170000000
-8,2050,solarPV,R2,2025,4.07170000000
-8,2054,solarPV,R2,2025,4.07170000000
-9,2045,solarPV,R2,2030,4.07170000000
-9,2049,solarPV,R2,2030,4.07170000000
-9,2050,solarPV,R2,2030,4.07170000000
-9,2054,solarPV,R2,2030,4.07170000000
-9,2055,solarPV,R2,2030,4.07170000000
-9,2059,solarPV,R2,2030,4.07170000000
-10,2045,solarPV,R2,2035,7.85760000000
-10,2049,solarPV,R2,2035,7.85760000000
-10,2050,solarPV,R2,2035,7.85760000000
-10,2054,solarPV,R2,2035,7.85760000000
-10,2055,solarPV,R2,2035,7.85760000000
-10,2059,solarPV,R2,2035,7.85760000000
-10,2060,solarPV,R2,2035,7.85760000000
-10,2064,solarPV,R2,2035,7.85760000000
-11,2045,solarPV,R2,2040,5.71470000000
-11,2049,solarPV,R2,2040,5.71470000000
-11,2050,solarPV,R2,2040,5.71470000000
-11,2054,solarPV,R2,2040,5.71470000000
-11,2055,solarPV,R2,2040,5.71470000000
-11,2059,solarPV,R2,2040,5.71470000000
-11,2060,solarPV,R2,2040,5.71470000000
-11,2064,solarPV,R2,2040,5.71470000000
-11,2065,solarPV,R2,2040,5.71470000000
-11,2069,solarPV,R2,2040,5.71470000000
-12,2050,solarPV,R2,2045,15.71470000000
-12,2054,solarPV,R2,2045,15.71470000000
-12,2055,solarPV,R2,2045,15.71470000000
-12,2059,solarPV,R2,2045,15.71470000000
-12,2060,solarPV,R2,2045,15.71470000000
-12,2064,solarPV,R2,2045,15.71470000000
-12,2065,solarPV,R2,2045,15.71470000000
-12,2069,solarPV,R2,2045,15.71470000000
-12,2070,solarPV,R2,2045,15.71470000000
-12,2074,solarPV,R2,2045,15.71470000000
-13,2045,windturbine,R1,2020,10.00000000000
-13,2049,windturbine,R1,2020,10.00000000000
-14,2050,windturbine,R1,2045,5.60870000000
-14,2054,windturbine,R1,2045,5.60870000000
-14,2055,windturbine,R1,2045,5.60870000000
-14,2059,windturbine,R1,2045,5.60870000000
-14,2060,windturbine,R1,2045,5.60870000000
-14,2064,windturbine,R1,2045,5.60870000000
-14,2065,windturbine,R1,2045,5.60870000000
-14,2069,windturbine,R1,2045,5.60870000000
-14,2070,windturbine,R1,2045,5.60870000000
-14,2074,windturbine,R1,2045,5.60870000000
-15,2045,windturbine,R2,2020,15.60870000000
-15,2049,windturbine,R2,2020,15.60870000000
-16,2045,windturbine,R2,2030,1.64290000000
-16,2049,windturbine,R2,2030,1.64290000000
-16,2050,windturbine,R2,2030,1.64290000000
-16,2054,windturbine,R2,2030,1.64290000000
-16,2055,windturbine,R2,2030,1.64290000000
-16,2059,windturbine,R2,2030,1.64290000000
-17,2050,windturbine,R2,2045,5.60870000000
-17,2054,windturbine,R2,2045,5.60870000000
-17,2055,windturbine,R2,2045,5.60870000000
-17,2059,windturbine,R2,2045,5.60870000000
-17,2060,windturbine,R2,2045,5.60870000000
-17,2064,windturbine,R2,2045,5.60870000000
-17,2065,windturbine,R2,2045,5.60870000000
-17,2069,windturbine,R2,2045,5.60870000000
-17,2070,windturbine,R2,2045,5.60870000000
-17,2074,windturbine,R2,2045,5.60870000000
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
deleted file mode 100644
index db2da871..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,117 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index bba2293b..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2020,gasboiler,R1,2020,10.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2020,gasboiler,R2,2020,10.00000000000
-1,2025,gasboiler,R2,2020,5.00000000000
-2,2025,heatpump,R1,2020,17.85870000000
-2,2030,heatpump,R1,2020,17.85870000000
-2,2034,heatpump,R1,2020,17.85870000000
-3,2025,heatpump,R2,2020,17.85870000000
-3,2030,heatpump,R2,2020,17.85870000000
-3,2034,heatpump,R2,2020,17.85870000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index b5155356..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,2.14290000000
-1,2034,gasboiler,R1,2025,2.14290000000
-1,2035,gasboiler,R1,2025,2.14290000000
-1,2039,gasboiler,R1,2025,2.14290000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,2.14290000000
-3,2034,gasboiler,R2,2025,2.14290000000
-3,2035,gasboiler,R2,2025,2.14290000000
-3,2039,gasboiler,R2,2025,2.14290000000
-4,2025,heatpump,R1,2020,17.85870000000
-4,2030,heatpump,R1,2020,17.85870000000
-4,2034,heatpump,R1,2020,17.85870000000
-5,2030,heatpump,R1,2025,8.57170000000
-5,2034,heatpump,R1,2025,8.57170000000
-5,2035,heatpump,R1,2025,8.57170000000
-5,2039,heatpump,R1,2025,8.57170000000
-6,2025,heatpump,R2,2020,17.85870000000
-6,2030,heatpump,R2,2020,17.85870000000
-6,2034,heatpump,R2,2020,17.85870000000
-7,2030,heatpump,R2,2025,8.57170000000
-7,2034,heatpump,R2,2025,8.57170000000
-7,2035,heatpump,R2,2025,8.57170000000
-7,2039,heatpump,R2,2025,8.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 8a37b512..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,2.14290000000
-0,2034,gasboiler,R1,2025,2.14290000000
-0,2035,gasboiler,R1,2025,2.14290000000
-0,2039,gasboiler,R1,2025,2.14290000000
-1,2030,gasboiler,R2,2025,2.14290000000
-1,2034,gasboiler,R2,2025,2.14290000000
-1,2035,gasboiler,R2,2025,2.14290000000
-1,2039,gasboiler,R2,2025,2.14290000000
-2,2030,heatpump,R1,2020,17.85870000000
-2,2034,heatpump,R1,2020,17.85870000000
-3,2030,heatpump,R1,2025,8.57170000000
-3,2034,heatpump,R1,2025,8.57170000000
-3,2035,heatpump,R1,2025,8.57170000000
-3,2039,heatpump,R1,2025,8.57170000000
-4,2035,heatpump,R1,2030,23.57330000000
-4,2039,heatpump,R1,2030,23.57330000000
-4,2040,heatpump,R1,2030,23.57330000000
-4,2044,heatpump,R1,2030,23.57330000000
-5,2030,heatpump,R2,2020,17.85870000000
-5,2034,heatpump,R2,2020,17.85870000000
-6,2030,heatpump,R2,2025,8.57170000000
-6,2034,heatpump,R2,2025,8.57170000000
-6,2035,heatpump,R2,2025,8.57170000000
-6,2039,heatpump,R2,2025,8.57170000000
-7,2035,heatpump,R2,2030,23.57330000000
-7,2039,heatpump,R2,2030,23.57330000000
-7,2040,heatpump,R2,2030,23.57330000000
-7,2044,heatpump,R2,2030,23.57330000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index d34aa52e..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,2.14290000000
-0,2039,gasboiler,R1,2025,2.14290000000
-1,2035,gasboiler,R2,2025,2.14290000000
-1,2039,gasboiler,R2,2025,2.14290000000
-2,2035,heatpump,R1,2025,8.57170000000
-2,2039,heatpump,R1,2025,8.57170000000
-3,2035,heatpump,R1,2030,23.57330000000
-3,2039,heatpump,R1,2030,23.57330000000
-3,2040,heatpump,R1,2030,23.57330000000
-3,2044,heatpump,R1,2030,23.57330000000
-4,2040,heatpump,R1,2035,16.42930000000
-4,2044,heatpump,R1,2035,16.42930000000
-4,2045,heatpump,R1,2035,16.42930000000
-4,2049,heatpump,R1,2035,16.42930000000
-5,2035,heatpump,R2,2025,8.57170000000
-5,2039,heatpump,R2,2025,8.57170000000
-6,2035,heatpump,R2,2030,23.57330000000
-6,2039,heatpump,R2,2030,23.57330000000
-6,2040,heatpump,R2,2030,23.57330000000
-6,2044,heatpump,R2,2030,23.57330000000
-7,2040,heatpump,R2,2035,16.42930000000
-7,2044,heatpump,R2,2035,16.42930000000
-7,2045,heatpump,R2,2035,16.42930000000
-7,2049,heatpump,R2,2035,16.42930000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index ca3f6cfa..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2040,heatpump,R1,2030,23.57330000000
-0,2044,heatpump,R1,2030,23.57330000000
-1,2040,heatpump,R1,2035,16.42930000000
-1,2044,heatpump,R1,2035,16.42930000000
-1,2045,heatpump,R1,2035,16.42930000000
-1,2049,heatpump,R1,2035,16.42930000000
-2,2045,heatpump,R1,2040,29.28800000000
-2,2049,heatpump,R1,2040,29.28800000000
-2,2050,heatpump,R1,2040,29.28800000000
-2,2054,heatpump,R1,2040,29.28800000000
-3,2040,heatpump,R2,2030,23.57330000000
-3,2044,heatpump,R2,2030,23.57330000000
-4,2040,heatpump,R2,2035,16.42930000000
-4,2044,heatpump,R2,2035,16.42930000000
-4,2045,heatpump,R2,2035,16.42930000000
-4,2049,heatpump,R2,2035,16.42930000000
-5,2045,heatpump,R2,2040,29.28800000000
-5,2049,heatpump,R2,2040,29.28800000000
-5,2050,heatpump,R2,2040,29.28800000000
-5,2054,heatpump,R2,2040,29.28800000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 7f9d122a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,heatpump,R1,2035,16.42930000000
-0,2049,heatpump,R1,2035,16.42930000000
-1,2045,heatpump,R1,2040,29.28800000000
-1,2049,heatpump,R1,2040,29.28800000000
-1,2050,heatpump,R1,2040,29.28800000000
-1,2054,heatpump,R1,2040,29.28800000000
-2,2050,heatpump,R1,2045,22.14400000000
-2,2054,heatpump,R1,2045,22.14400000000
-2,2055,heatpump,R1,2045,22.14400000000
-2,2059,heatpump,R1,2045,22.14400000000
-3,2045,heatpump,R2,2035,16.42930000000
-3,2049,heatpump,R2,2035,16.42930000000
-4,2045,heatpump,R2,2040,29.28800000000
-4,2049,heatpump,R2,2040,29.28800000000
-4,2050,heatpump,R2,2040,29.28800000000
-4,2054,heatpump,R2,2040,29.28800000000
-5,2050,heatpump,R2,2045,22.14400000000
-5,2054,heatpump,R2,2045,22.14400000000
-5,2055,heatpump,R2,2045,22.14400000000
-5,2059,heatpump,R2,2045,22.14400000000
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
deleted file mode 100644
index 02533b47..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
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
deleted file mode 100644
index 2cf8d713..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,161 +0,0 @@
-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
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
deleted file mode 100644
index e03b6acf..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,225 +0,0 @@
-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
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
deleted file mode 100644
index ed5f57f1..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-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
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
deleted file mode 100644
index f705f5ab..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
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
deleted file mode 100644
index e83a6d96..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-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
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
deleted file mode 100644
index 79c2096b..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-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
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
deleted file mode 100644
index bff478f6..00000000
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-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
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
deleted file mode 100644
index 192f9bf9..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 57ef9d5d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,2.79440000000
-1,2035,gassupply1,R1,2025,2.79440000000
-1,2040,gassupply1,R1,2025,2.79440000000
-1,2045,gassupply1,R1,2025,2.79440000000
-1,2050,gassupply1,R1,2025,2.79440000000
-1,2064,gassupply1,R1,2025,2.79440000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,2.79440000000
-3,2035,gassupply1,R2,2025,2.79440000000
-3,2040,gassupply1,R2,2025,2.79440000000
-3,2045,gassupply1,R2,2025,2.79440000000
-3,2050,gassupply1,R2,2025,2.79440000000
-3,2064,gassupply1,R2,2025,2.79440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
deleted file mode 100644
index 223a9793..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index be63ee95..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index 301ed041..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 33d01ddd..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 59af6136..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
deleted file mode 100644
index 377c773d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
deleted file mode 100644
index e7e6ef07..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ /dev/null
@@ -1,65 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
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
deleted file mode 100644
index 78889a42..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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,windturbine,33.82470000000
-1,2025,R1,2020,windturbine,33.82470000000
-1,2030,R1,2020,windturbine,33.82470000000
-1,2035,R1,2020,windturbine,33.82470000000
-1,2040,R1,2020,windturbine,33.82470000000
-1,2045,R1,2020,windturbine,33.82470000000
-1,2046,R1,2020,windturbine,33.82470000000
-2,2020,R2,2020,gasCCGT,1.00000000000
-2,2022,R2,2020,gasCCGT,1.00000000000
-2,2025,R2,2020,gasCCGT,1.00000000000
-3,2022,R2,2020,windturbine,33.82470000000
-3,2025,R2,2020,windturbine,33.82470000000
-3,2030,R2,2020,windturbine,33.82470000000
-3,2035,R2,2020,windturbine,33.82470000000
-3,2040,R2,2020,windturbine,33.82470000000
-3,2045,R2,2020,windturbine,33.82470000000
-3,2046,R2,2020,windturbine,33.82470000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 0b9e6c57..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,3.00000000000
-1,2035,gasCCGT,R1,2025,3.00000000000
-1,2040,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R1,2025,3.00000000000
-1,2049,gasCCGT,R1,2025,3.00000000000
-1,2050,gasCCGT,R1,2025,3.00000000000
-1,2054,gasCCGT,R1,2025,3.00000000000
-1,2055,gasCCGT,R1,2025,3.00000000000
-1,2064,gasCCGT,R1,2025,3.00000000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,3.00000000000
-3,2035,gasCCGT,R2,2025,3.00000000000
-3,2040,gasCCGT,R2,2025,3.00000000000
-3,2045,gasCCGT,R2,2025,3.00000000000
-3,2049,gasCCGT,R2,2025,3.00000000000
-3,2050,gasCCGT,R2,2025,3.00000000000
-3,2054,gasCCGT,R2,2025,3.00000000000
-3,2055,gasCCGT,R2,2025,3.00000000000
-3,2064,gasCCGT,R2,2025,3.00000000000
-4,2025,solarPV,R1,2020,6.75000000000
-4,2030,solarPV,R1,2020,6.75000000000
-4,2035,solarPV,R1,2020,6.75000000000
-4,2040,solarPV,R1,2020,6.75000000000
-4,2045,solarPV,R1,2020,6.75000000000
-4,2049,solarPV,R1,2020,6.75000000000
-5,2030,solarPV,R1,2025,2.40000000000
-5,2035,solarPV,R1,2025,2.40000000000
-5,2040,solarPV,R1,2025,2.40000000000
-5,2045,solarPV,R1,2025,2.40000000000
-5,2049,solarPV,R1,2025,2.40000000000
-5,2050,solarPV,R1,2025,2.40000000000
-5,2054,solarPV,R1,2025,2.40000000000
-6,2030,solarPV,R2,2025,2.40000000000
-6,2035,solarPV,R2,2025,2.40000000000
-6,2040,solarPV,R2,2025,2.40000000000
-6,2045,solarPV,R2,2025,2.40000000000
-6,2049,solarPV,R2,2025,2.40000000000
-6,2050,solarPV,R2,2025,2.40000000000
-6,2054,solarPV,R2,2025,2.40000000000
-7,2025,windturbine,R1,2020,10.00000000000
-7,2030,windturbine,R1,2020,10.00000000000
-7,2035,windturbine,R1,2020,10.00000000000
-7,2040,windturbine,R1,2020,10.00000000000
-7,2045,windturbine,R1,2020,10.00000000000
-7,2049,windturbine,R1,2020,10.00000000000
-8,2025,windturbine,R2,2020,16.75000000000
-8,2030,windturbine,R2,2020,16.75000000000
-8,2035,windturbine,R2,2020,16.75000000000
-8,2040,windturbine,R2,2020,16.75000000000
-8,2045,windturbine,R2,2020,16.75000000000
-8,2049,windturbine,R2,2020,16.75000000000
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
deleted file mode 100644
index ca265d0a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,76 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
deleted file mode 100644
index bc71a6d4..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,105 +0,0 @@
-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
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
deleted file mode 100644
index bda10415..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,105 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
deleted file mode 100644
index b04feb4a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,131 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,3.00000000000
-0,2049,gasCCGT,R1,2025,3.00000000000
-0,2050,gasCCGT,R1,2025,3.00000000000
-0,2054,gasCCGT,R1,2025,3.00000000000
-0,2055,gasCCGT,R1,2025,3.00000000000
-0,2059,gasCCGT,R1,2025,3.00000000000
-0,2060,gasCCGT,R1,2025,3.00000000000
-0,2064,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R2,2025,3.00000000000
-1,2049,gasCCGT,R2,2025,3.00000000000
-1,2050,gasCCGT,R2,2025,3.00000000000
-1,2054,gasCCGT,R2,2025,3.00000000000
-1,2055,gasCCGT,R2,2025,3.00000000000
-1,2059,gasCCGT,R2,2025,3.00000000000
-1,2060,gasCCGT,R2,2025,3.00000000000
-1,2064,gasCCGT,R2,2025,3.00000000000
-2,2045,solarPV,R1,2020,6.75000000000
-2,2049,solarPV,R1,2020,6.75000000000
-3,2045,solarPV,R1,2025,2.40000000000
-3,2049,solarPV,R1,2025,2.40000000000
-3,2050,solarPV,R1,2025,2.40000000000
-3,2054,solarPV,R1,2025,2.40000000000
-4,2045,solarPV,R1,2030,6.00000000000
-4,2049,solarPV,R1,2030,6.00000000000
-4,2050,solarPV,R1,2030,6.00000000000
-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
-15,2045,windturbine,R2,2020,16.75000000000
-15,2049,windturbine,R2,2020,16.75000000000
-16,2045,windturbine,R2,2030,3.60000000000
-16,2049,windturbine,R2,2030,3.60000000000
-16,2050,windturbine,R2,2030,3.60000000000
-16,2054,windturbine,R2,2030,3.60000000000
-16,2055,windturbine,R2,2030,3.60000000000
-16,2059,windturbine,R2,2030,3.60000000000
-17,2045,windturbine,R2,2035,4.39000000000
-17,2049,windturbine,R2,2035,4.39000000000
-17,2050,windturbine,R2,2035,4.39000000000
-17,2054,windturbine,R2,2035,4.39000000000
-17,2055,windturbine,R2,2035,4.39000000000
-17,2059,windturbine,R2,2035,4.39000000000
-17,2060,windturbine,R2,2035,4.39000000000
-17,2064,windturbine,R2,2035,4.39000000000
-18,2050,windturbine,R2,2045,6.75000000000
-18,2054,windturbine,R2,2045,6.75000000000
-18,2055,windturbine,R2,2045,6.75000000000
-18,2059,windturbine,R2,2045,6.75000000000
-18,2060,windturbine,R2,2045,6.75000000000
-18,2064,windturbine,R2,2045,6.75000000000
-18,2065,windturbine,R2,2045,6.75000000000
-18,2069,windturbine,R2,2045,6.75000000000
-18,2070,windturbine,R2,2045,6.75000000000
-18,2074,windturbine,R2,2045,6.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 37b2c93a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 8e165158..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2020,gasboiler,R1,2020,10.00000000000
-0,2022,gasboiler,R1,2020,5.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2020,gasboiler,R2,2020,10.00000000000
-1,2022,gasboiler,R2,2020,5.00000000000
-1,2025,gasboiler,R2,2020,5.00000000000
-2,2022,heatpump,R1,2020,14.42990000000
-2,2025,heatpump,R1,2020,14.42990000000
-2,2030,heatpump,R1,2020,14.42990000000
-2,2031,heatpump,R1,2020,14.42990000000
-3,2022,heatpump,R2,2020,14.42990000000
-3,2025,heatpump,R2,2020,14.42990000000
-3,2030,heatpump,R2,2020,14.42990000000
-3,2031,heatpump,R2,2020,14.42990000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 34d42206..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,4.10000000000
-1,2034,gasboiler,R1,2025,4.10000000000
-1,2035,gasboiler,R1,2025,4.10000000000
-1,2039,gasboiler,R1,2025,4.10000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,4.10000000000
-3,2034,gasboiler,R2,2025,4.10000000000
-3,2035,gasboiler,R2,2025,4.10000000000
-3,2039,gasboiler,R2,2025,4.10000000000
-4,2025,heatpump,R1,2020,19.00000000000
-4,2030,heatpump,R1,2020,19.00000000000
-4,2034,heatpump,R1,2020,19.00000000000
-5,2030,heatpump,R1,2025,6.90000000000
-5,2034,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2025,6.90000000000
-5,2039,heatpump,R1,2025,6.90000000000
-6,2025,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2020,19.00000000000
-6,2034,heatpump,R2,2020,19.00000000000
-7,2030,heatpump,R2,2025,6.90000000000
-7,2034,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 559a80d8..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,4.10000000000
-0,2034,gasboiler,R1,2025,4.10000000000
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2030,gasboiler,R2,2025,4.10000000000
-1,2034,gasboiler,R2,2025,4.10000000000
-1,2035,gasboiler,R2,2025,4.10000000000
-1,2039,gasboiler,R2,2025,4.10000000000
-2,2030,heatpump,R1,2020,19.00000000000
-2,2034,heatpump,R1,2020,19.00000000000
-3,2030,heatpump,R1,2025,6.90000000000
-3,2034,heatpump,R1,2025,6.90000000000
-3,2035,heatpump,R1,2025,6.90000000000
-3,2039,heatpump,R1,2025,6.90000000000
-4,2035,heatpump,R1,2030,25.00000000000
-4,2039,heatpump,R1,2030,25.00000000000
-4,2040,heatpump,R1,2030,25.00000000000
-4,2044,heatpump,R1,2030,25.00000000000
-5,2030,heatpump,R2,2020,19.00000000000
-5,2034,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2025,6.90000000000
-6,2034,heatpump,R2,2025,6.90000000000
-6,2035,heatpump,R2,2025,6.90000000000
-6,2039,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2030,25.00000000000
-7,2039,heatpump,R2,2030,25.00000000000
-7,2040,heatpump,R2,2030,25.00000000000
-7,2044,heatpump,R2,2030,25.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index fa9e8bca..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2040,gasboiler,R1,2035,0.91000000000
-1,2044,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R1,2035,0.91000000000
-1,2049,gasboiler,R1,2035,0.91000000000
-2,2035,gasboiler,R2,2025,4.10000000000
-2,2039,gasboiler,R2,2025,4.10000000000
-3,2040,gasboiler,R2,2035,0.91000000000
-3,2044,gasboiler,R2,2035,0.91000000000
-3,2045,gasboiler,R2,2035,0.91000000000
-3,2049,gasboiler,R2,2035,0.91000000000
-4,2035,heatpump,R1,2025,6.90000000000
-4,2039,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2030,25.00000000000
-5,2039,heatpump,R1,2030,25.00000000000
-5,2040,heatpump,R1,2030,25.00000000000
-5,2044,heatpump,R1,2030,25.00000000000
-6,2040,heatpump,R1,2035,16.09000000000
-6,2044,heatpump,R1,2035,16.09000000000
-6,2045,heatpump,R1,2035,16.09000000000
-6,2049,heatpump,R1,2035,16.09000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
-8,2035,heatpump,R2,2030,25.00000000000
-8,2039,heatpump,R2,2030,25.00000000000
-8,2040,heatpump,R2,2030,25.00000000000
-8,2044,heatpump,R2,2030,25.00000000000
-9,2040,heatpump,R2,2035,16.09000000000
-9,2044,heatpump,R2,2035,16.09000000000
-9,2045,heatpump,R2,2035,16.09000000000
-9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index eb1a544b..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2040,gasboiler,R1,2035,0.91000000000
-0,2044,gasboiler,R1,2035,0.91000000000
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2040,gasboiler,R2,2035,0.91000000000
-1,2044,gasboiler,R2,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2040,heatpump,R1,2030,25.00000000000
-2,2044,heatpump,R1,2030,25.00000000000
-3,2040,heatpump,R1,2035,16.09000000000
-3,2044,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2035,16.09000000000
-3,2049,heatpump,R1,2035,16.09000000000
-4,2045,heatpump,R1,2040,31.00000000000
-4,2049,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2040,31.00000000000
-4,2054,heatpump,R1,2040,31.00000000000
-5,2040,heatpump,R2,2030,25.00000000000
-5,2044,heatpump,R2,2030,25.00000000000
-6,2040,heatpump,R2,2035,16.09000000000
-6,2044,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2035,16.09000000000
-6,2049,heatpump,R2,2035,16.09000000000
-7,2045,heatpump,R2,2040,31.00000000000
-7,2049,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2040,31.00000000000
-7,2054,heatpump,R2,2040,31.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 0b5fe3de..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2045,heatpump,R1,2035,16.09000000000
-2,2049,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2040,31.00000000000
-3,2049,heatpump,R1,2040,31.00000000000
-3,2050,heatpump,R1,2040,31.00000000000
-3,2054,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2045,23.00000000000
-4,2054,heatpump,R1,2045,23.00000000000
-4,2055,heatpump,R1,2045,23.00000000000
-4,2059,heatpump,R1,2045,23.00000000000
-5,2045,heatpump,R2,2035,16.09000000000
-5,2049,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2040,31.00000000000
-6,2049,heatpump,R2,2040,31.00000000000
-6,2050,heatpump,R2,2040,31.00000000000
-6,2054,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2045,23.00000000000
-7,2054,heatpump,R2,2045,23.00000000000
-7,2055,heatpump,R2,2045,23.00000000000
-7,2059,heatpump,R2,2045,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index eb21c442..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
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
deleted file mode 100644
index 7a199736..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,161 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
deleted file mode 100644
index eb9ddd9d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-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
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
deleted file mode 100644
index af0c152b..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 21119f08..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
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
deleted file mode 100644
index 503b4b8c..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 98be95de..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,145 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 26d4aa26..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-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

From 3d0a03b340db8af5f25c883aabfd8999a277a129 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 11:01:07 +0100
Subject: [PATCH 114/419] Tutorial 5

---
 .../preset/Residential2020Consumption.csv     |   14 +-
 .../preset/Residential2050Consumption.csv     |   14 +-
 .../preset/Residential2020Consumption.csv     |   14 +-
 .../preset/Residential2050Consumption.csv     |   14 +-
 .../preset/Residential2020Consumption.csv     |   14 +-
 .../preset/Residential2050Consumption.csv     |   14 +-
 .../preset/Residential2020Consumption.csv     |   14 +-
 .../preset/Residential2050Consumption.csv     |   14 +-
 .../preset/Residential2020Consumption.csv     |   26 +-
 .../preset/Residential2050Consumption.csv     |   26 +-
 .../preset/Residential2020Consumption.csv     |   34 +-
 .../preset/Residential2050Consumption.csv     |   34 +-
 .../preset/Residential2020Consumption.csv     |   34 +-
 .../preset/Residential2050Consumption.csv     |   34 +-
 .../input/BaseYearExport.csv                  |   78 +-
 .../input/BaseYearImport.csv                  |   78 +-
 .../input/GlobalCommodities.csv               |    8 +
 .../input/Projections.csv                     |   78 +-
 .../{ => 1-new-service-demand}/settings.toml  |   75 +-
 .../technodata/Agents.csv                     |    5 +
 .../technodata/gas/CommIn.csv                 |    6 +-
 .../technodata/gas/CommOut.csv                |    6 +-
 .../technodata/gas/ExistingCapacity.csv       |    4 +-
 .../technodata/gas/Technodata.csv             |    8 +-
 .../technodata/power/CommIn.csv               |   26 +-
 .../technodata/power/CommOut.csv              |   26 +-
 .../technodata/power/ExistingCapacity.csv     |   12 +-
 .../technodata/power/Technodata.csv           |   28 +-
 .../preset/Residential2020Consumption.csv     |   17 +
 .../preset/Residential2050Consumption.csv     |   17 +
 .../technodata/residential/CommIn.csv         |   20 +-
 .../technodata/residential/CommOut.csv        |   20 +-
 .../residential/ExistingCapacity.csv          |   16 +-
 .../technodata/residential/Technodata.csv     |   10 +
 .../Results/MCACapacity.csv                   |  211 --
 .../Results/MCAMetric_Consumption.csv         | 1473 ------------
 .../Results/MCAMetric_Supply.csv              | 2017 -----------------
 .../Results/MCAPrices.csv                     |  561 -----
 .../5-add-service-demand/generate_model.py    |    1 -
 .../5-add-service-demand/generate_models.py   |   85 +
 .../input/GlobalCommodities.csv               |    8 -
 .../technodata/Agents.csv                     |    5 -
 .../preset/Residential2020Consumption.csv     |   17 -
 .../preset/Residential2050Consumption.csv     |   17 -
 .../technodata/residential/Agents.csv         |    9 -
 .../technodata/residential/Technodata.csv     |   10 -
 .../visualise-service-demand-addition.ipynb   |    2 +-
 src/muse/wizard.py                            |    7 +
 48 files changed, 557 insertions(+), 4704 deletions(-)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/input/BaseYearExport.csv (96%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/input/BaseYearImport.csv (96%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/GlobalCommodities.csv
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/input/Projections.csv (98%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/settings.toml (68%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/gas/CommIn.csv (98%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/gas/CommOut.csv (98%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/gas/ExistingCapacity.csv (98%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/gas/Technodata.csv (73%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/power/CommIn.csv (97%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/power/CommOut.csv (97%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/power/ExistingCapacity.csv (97%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/power/Technodata.csv (59%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/residential/CommIn.csv (64%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/residential/CommOut.csv (80%)
 rename docs/tutorial-code/5-add-service-demand/{ => 1-new-service-demand}/technodata/residential/ExistingCapacity.csv (77%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Supply.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/generate_model.py
 create mode 100644 docs/tutorial-code/5-add-service-demand/generate_models.py
 delete mode 100644 docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/technodata/Agents.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..5a1dcdd2 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,1.0,0,0,0
+1,R1,gasboiler,2,0,0,1.5,0,0,0
+2,R1,gasboiler,3,0,0,1.0,0,0,0
+3,R1,gasboiler,4,0,0,1.5,0,0,0
+4,R1,gasboiler,5,0,0,3.0,0,0,0
+5,R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv
index ddcb0405..282377d9 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,3.0,0,0,0
+1,R1,gasboiler,2,0,0,4.5,0,0,0
+2,R1,gasboiler,3,0,0,3.0,0,0,0
+3,R1,gasboiler,4,0,0,4.5,0,0,0
+4,R1,gasboiler,5,0,0,9.0,0,0,0
+5,R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..5a1dcdd2 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,1.0,0,0,0
+1,R1,gasboiler,2,0,0,1.5,0,0,0
+2,R1,gasboiler,3,0,0,1.0,0,0,0
+3,R1,gasboiler,4,0,0,1.5,0,0,0
+4,R1,gasboiler,5,0,0,3.0,0,0,0
+5,R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv
index ddcb0405..282377d9 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,3.0,0,0,0
+1,R1,gasboiler,2,0,0,4.5,0,0,0
+2,R1,gasboiler,3,0,0,3.0,0,0,0
+3,R1,gasboiler,4,0,0,4.5,0,0,0
+4,R1,gasboiler,5,0,0,9.0,0,0,0
+5,R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..5a1dcdd2 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,1.0,0,0,0
+1,R1,gasboiler,2,0,0,1.5,0,0,0
+2,R1,gasboiler,3,0,0,1.0,0,0,0
+3,R1,gasboiler,4,0,0,1.5,0,0,0
+4,R1,gasboiler,5,0,0,3.0,0,0,0
+5,R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
index ddcb0405..282377d9 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,3.0,0,0,0
+1,R1,gasboiler,2,0,0,4.5,0,0,0
+2,R1,gasboiler,3,0,0,3.0,0,0,0
+3,R1,gasboiler,4,0,0,4.5,0,0,0
+4,R1,gasboiler,5,0,0,9.0,0,0,0
+5,R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..5a1dcdd2 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,1.0,0,0,0
+1,R1,gasboiler,2,0,0,1.5,0,0,0
+2,R1,gasboiler,3,0,0,1.0,0,0,0
+3,R1,gasboiler,4,0,0,1.5,0,0,0
+4,R1,gasboiler,5,0,0,3.0,0,0,0
+5,R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
index ddcb0405..282377d9 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,3.0,0,0,0
+1,R1,gasboiler,2,0,0,4.5,0,0,0
+2,R1,gasboiler,3,0,0,3.0,0,0,0
+3,R1,gasboiler,4,0,0,4.5,0,0,0
+4,R1,gasboiler,5,0,0,9.0,0,0,0
+5,R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
index 7e461e3f..1b3690ff 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
@@ -1,13 +1,13 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1.0,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1.0,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3.0,0,0
-5,R1,gasboiler,6,0,0,2.0,0,0
-0,R2,gasboiler,1,0,0,1.0,0,0
-1,R2,gasboiler,2,0,0,1.5,0,0
-2,R2,gasboiler,3,0,0,1.0,0,0
-3,R2,gasboiler,4,0,0,1.5,0,0
-4,R2,gasboiler,5,0,0,3.0,0,0
-5,R2,gasboiler,6,0,0,2.0,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,1.0,0,0,0
+1,R1,gasboiler,2,0,0,1.5,0,0,0
+2,R1,gasboiler,3,0,0,1.0,0,0,0
+3,R1,gasboiler,4,0,0,1.5,0,0,0
+4,R1,gasboiler,5,0,0,3.0,0,0,0
+5,R1,gasboiler,6,0,0,2.0,0,0,0
+0,R2,gasboiler,1,0,0,1.0,0,0,0
+1,R2,gasboiler,2,0,0,1.5,0,0,0
+2,R2,gasboiler,3,0,0,1.0,0,0,0
+3,R2,gasboiler,4,0,0,1.5,0,0,0
+4,R2,gasboiler,5,0,0,3.0,0,0,0
+5,R2,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
index ada625fa..80448207 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
@@ -1,13 +1,13 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3.0,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3.0,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9.0,0,0
-5,R1,gasboiler,6,0,0,6.0,0,0
-0,R2,gasboiler,1,0,0,3.0,0,0
-1,R2,gasboiler,2,0,0,4.5,0,0
-2,R2,gasboiler,3,0,0,3.0,0,0
-3,R2,gasboiler,4,0,0,4.5,0,0
-4,R2,gasboiler,5,0,0,9.0,0,0
-5,R2,gasboiler,6,0,0,6.0,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,3.0,0,0,0
+1,R1,gasboiler,2,0,0,4.5,0,0,0
+2,R1,gasboiler,3,0,0,3.0,0,0,0
+3,R1,gasboiler,4,0,0,4.5,0,0,0
+4,R1,gasboiler,5,0,0,9.0,0,0,0
+5,R1,gasboiler,6,0,0,6.0,0,0,0
+0,R2,gasboiler,1,0,0,3.0,0,0,0
+1,R2,gasboiler,2,0,0,4.5,0,0,0
+2,R2,gasboiler,3,0,0,3.0,0,0,0
+3,R2,gasboiler,4,0,0,4.5,0,0,0
+4,R2,gasboiler,5,0,0,9.0,0,0,0
+5,R2,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
index 4bc0cede..54ab24c5 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,0.714,0,0
-1,R1,gasboiler,2,0,0,1.071,0,0
-2,R1,gasboiler,3,0,0,0.714,0,0
-3,R1,gasboiler,4,0,0,1.071,0,0
-4,R1,gasboiler,5,0,0,2.143,0,0
-5,R1,gasboiler,6,0,0,1.429,0,0
-5,R1,gasboiler,7,0,0,1.429,0,0
-5,R1,gasboiler,8,0,0,1.429,0,0
-0,R2,gasboiler,1,0,0,0.714,0,0
-1,R2,gasboiler,2,0,0,1.071,0,0
-2,R2,gasboiler,3,0,0,0.714,0,0
-3,R2,gasboiler,4,0,0,1.071,0,0
-4,R2,gasboiler,5,0,0,2.143,0,0
-5,R2,gasboiler,6,0,0,1.429,0,0
-5,R2,gasboiler,7,0,0,1.429,0,0
-5,R2,gasboiler,8,0,0,1.429,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,0.714,0,0,0
+1,R1,gasboiler,2,0,0,1.071,0,0,0
+2,R1,gasboiler,3,0,0,0.714,0,0,0
+3,R1,gasboiler,4,0,0,1.071,0,0,0
+4,R1,gasboiler,5,0,0,2.143,0,0,0
+5,R1,gasboiler,6,0,0,1.429,0,0,0
+5,R1,gasboiler,7,0,0,1.429,0,0,0
+5,R1,gasboiler,8,0,0,1.429,0,0,0
+0,R2,gasboiler,1,0,0,0.714,0,0,0
+1,R2,gasboiler,2,0,0,1.071,0,0,0
+2,R2,gasboiler,3,0,0,0.714,0,0,0
+3,R2,gasboiler,4,0,0,1.071,0,0,0
+4,R2,gasboiler,5,0,0,2.143,0,0,0
+5,R2,gasboiler,6,0,0,1.429,0,0,0
+5,R2,gasboiler,7,0,0,1.429,0,0,0
+5,R2,gasboiler,8,0,0,1.429,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
index 5e1ea746..c2501c58 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,2.142,0,0
-1,R1,gasboiler,2,0,0,3.213,0,0
-2,R1,gasboiler,3,0,0,2.142,0,0
-3,R1,gasboiler,4,0,0,3.213,0,0
-4,R1,gasboiler,5,0,0,6.428999999999999,0,0
-5,R1,gasboiler,6,0,0,4.287,0,0
-5,R1,gasboiler,7,0,0,4.287,0,0
-5,R1,gasboiler,8,0,0,4.287,0,0
-0,R2,gasboiler,1,0,0,2.142,0,0
-1,R2,gasboiler,2,0,0,3.213,0,0
-2,R2,gasboiler,3,0,0,2.142,0,0
-3,R2,gasboiler,4,0,0,3.213,0,0
-4,R2,gasboiler,5,0,0,6.428999999999999,0,0
-5,R2,gasboiler,6,0,0,4.287,0,0
-5,R2,gasboiler,7,0,0,4.287,0,0
-5,R2,gasboiler,8,0,0,4.287,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,2.142,0,0,0
+1,R1,gasboiler,2,0,0,3.213,0,0,0
+2,R1,gasboiler,3,0,0,2.142,0,0,0
+3,R1,gasboiler,4,0,0,3.213,0,0,0
+4,R1,gasboiler,5,0,0,6.428999999999999,0,0,0
+5,R1,gasboiler,6,0,0,4.287,0,0,0
+5,R1,gasboiler,7,0,0,4.287,0,0,0
+5,R1,gasboiler,8,0,0,4.287,0,0,0
+0,R2,gasboiler,1,0,0,2.142,0,0,0
+1,R2,gasboiler,2,0,0,3.213,0,0,0
+2,R2,gasboiler,3,0,0,2.142,0,0,0
+3,R2,gasboiler,4,0,0,3.213,0,0,0
+4,R2,gasboiler,5,0,0,6.428999999999999,0,0,0
+5,R2,gasboiler,6,0,0,4.287,0,0,0
+5,R2,gasboiler,7,0,0,4.287,0,0,0
+5,R2,gasboiler,8,0,0,4.287,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
index 4bc0cede..54ab24c5 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,0.714,0,0
-1,R1,gasboiler,2,0,0,1.071,0,0
-2,R1,gasboiler,3,0,0,0.714,0,0
-3,R1,gasboiler,4,0,0,1.071,0,0
-4,R1,gasboiler,5,0,0,2.143,0,0
-5,R1,gasboiler,6,0,0,1.429,0,0
-5,R1,gasboiler,7,0,0,1.429,0,0
-5,R1,gasboiler,8,0,0,1.429,0,0
-0,R2,gasboiler,1,0,0,0.714,0,0
-1,R2,gasboiler,2,0,0,1.071,0,0
-2,R2,gasboiler,3,0,0,0.714,0,0
-3,R2,gasboiler,4,0,0,1.071,0,0
-4,R2,gasboiler,5,0,0,2.143,0,0
-5,R2,gasboiler,6,0,0,1.429,0,0
-5,R2,gasboiler,7,0,0,1.429,0,0
-5,R2,gasboiler,8,0,0,1.429,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,0.714,0,0,0
+1,R1,gasboiler,2,0,0,1.071,0,0,0
+2,R1,gasboiler,3,0,0,0.714,0,0,0
+3,R1,gasboiler,4,0,0,1.071,0,0,0
+4,R1,gasboiler,5,0,0,2.143,0,0,0
+5,R1,gasboiler,6,0,0,1.429,0,0,0
+5,R1,gasboiler,7,0,0,1.429,0,0,0
+5,R1,gasboiler,8,0,0,1.429,0,0,0
+0,R2,gasboiler,1,0,0,0.714,0,0,0
+1,R2,gasboiler,2,0,0,1.071,0,0,0
+2,R2,gasboiler,3,0,0,0.714,0,0,0
+3,R2,gasboiler,4,0,0,1.071,0,0,0
+4,R2,gasboiler,5,0,0,2.143,0,0,0
+5,R2,gasboiler,6,0,0,1.429,0,0,0
+5,R2,gasboiler,7,0,0,1.429,0,0,0
+5,R2,gasboiler,8,0,0,1.429,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
index 5e1ea746..c2501c58 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,2.142,0,0
-1,R1,gasboiler,2,0,0,3.213,0,0
-2,R1,gasboiler,3,0,0,2.142,0,0
-3,R1,gasboiler,4,0,0,3.213,0,0
-4,R1,gasboiler,5,0,0,6.428999999999999,0,0
-5,R1,gasboiler,6,0,0,4.287,0,0
-5,R1,gasboiler,7,0,0,4.287,0,0
-5,R1,gasboiler,8,0,0,4.287,0,0
-0,R2,gasboiler,1,0,0,2.142,0,0
-1,R2,gasboiler,2,0,0,3.213,0,0
-2,R2,gasboiler,3,0,0,2.142,0,0
-3,R2,gasboiler,4,0,0,3.213,0,0
-4,R2,gasboiler,5,0,0,6.428999999999999,0,0
-5,R2,gasboiler,6,0,0,4.287,0,0
-5,R2,gasboiler,7,0,0,4.287,0,0
-5,R2,gasboiler,8,0,0,4.287,0,0
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+0,R1,gasboiler,1,0,0,2.142,0,0,0
+1,R1,gasboiler,2,0,0,3.213,0,0,0
+2,R1,gasboiler,3,0,0,2.142,0,0,0
+3,R1,gasboiler,4,0,0,3.213,0,0,0
+4,R1,gasboiler,5,0,0,6.428999999999999,0,0,0
+5,R1,gasboiler,6,0,0,4.287,0,0,0
+5,R1,gasboiler,7,0,0,4.287,0,0,0
+5,R1,gasboiler,8,0,0,4.287,0,0,0
+0,R2,gasboiler,1,0,0,2.142,0,0,0
+1,R2,gasboiler,2,0,0,3.213,0,0,0
+2,R2,gasboiler,3,0,0,2.142,0,0,0
+3,R2,gasboiler,4,0,0,3.213,0,0,0
+4,R2,gasboiler,5,0,0,6.428999999999999,0,0,0
+5,R2,gasboiler,6,0,0,4.287,0,0,0
+5,R2,gasboiler,7,0,0,4.287,0,0,0
+5,R2,gasboiler,8,0,0,4.287,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearExport.csv
similarity index 96%
rename from docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearExport.csv
index 35070fbe..5524e835 100644
--- a/docs/tutorial-code/5-add-service-demand/input/BaseYearExport.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearExport.csv
@@ -1,40 +1,40 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
-Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ
-R1,Exports,2010,0,0,0,0,0,0,0
-R1,Exports,2015,0,0,0,0,0,0,0
-R1,Exports,2020,0,0,0,0,0,0,0
-R1,Exports,2025,0,0,0,0,0,0,0
-R1,Exports,2030,0,0,0,0,0,0,0
-R1,Exports,2035,0,0,0,0,0,0,0
-R1,Exports,2040,0,0,0,0,0,0,0
-R1,Exports,2045,0,0,0,0,0,0,0
-R1,Exports,2050,0,0,0,0,0,0,0
-R1,Exports,2055,0,0,0,0,0,0,0
-R1,Exports,2060,0,0,0,0,0,0,0
-R1,Exports,2065,0,0,0,0,0,0,0
-R1,Exports,2070,0,0,0,0,0,0,0
-R1,Exports,2075,0,0,0,0,0,0,0
-R1,Exports,2080,0,0,0,0,0,0,0
-R1,Exports,2085,0,0,0,0,0,0,0
-R1,Exports,2090,0,0,0,0,0,0,0
-R1,Exports,2095,0,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0,0
-R2,Exports,2010,0,0,0,0,0,0,0
-R2,Exports,2015,0,0,0,0,0,0,0
-R2,Exports,2020,0,0,0,0,0,0,0
-R2,Exports,2025,0,0,0,0,0,0,0
-R2,Exports,2030,0,0,0,0,0,0,0
-R2,Exports,2035,0,0,0,0,0,0,0
-R2,Exports,2040,0,0,0,0,0,0,0
-R2,Exports,2045,0,0,0,0,0,0,0
-R2,Exports,2050,0,0,0,0,0,0,0
-R2,Exports,2055,0,0,0,0,0,0,0
-R2,Exports,2060,0,0,0,0,0,0,0
-R2,Exports,2065,0,0,0,0,0,0,0
-R2,Exports,2070,0,0,0,0,0,0,0
-R2,Exports,2075,0,0,0,0,0,0,0
-R2,Exports,2080,0,0,0,0,0,0,0
-R2,Exports,2085,0,0,0,0,0,0,0
-R2,Exports,2090,0,0,0,0,0,0,0
-R2,Exports,2095,0,0,0,0,0,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ
+R1,Exports,2010,0,0,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0,0,0
+R2,Exports,2010,0,0,0,0,0,0,0
+R2,Exports,2015,0,0,0,0,0,0,0
+R2,Exports,2020,0,0,0,0,0,0,0
+R2,Exports,2025,0,0,0,0,0,0,0
+R2,Exports,2030,0,0,0,0,0,0,0
+R2,Exports,2035,0,0,0,0,0,0,0
+R2,Exports,2040,0,0,0,0,0,0,0
+R2,Exports,2045,0,0,0,0,0,0,0
+R2,Exports,2050,0,0,0,0,0,0,0
+R2,Exports,2055,0,0,0,0,0,0,0
+R2,Exports,2060,0,0,0,0,0,0,0
+R2,Exports,2065,0,0,0,0,0,0,0
+R2,Exports,2070,0,0,0,0,0,0,0
+R2,Exports,2075,0,0,0,0,0,0,0
+R2,Exports,2080,0,0,0,0,0,0,0
+R2,Exports,2085,0,0,0,0,0,0,0
+R2,Exports,2090,0,0,0,0,0,0,0
+R2,Exports,2095,0,0,0,0,0,0,0
 R2,Exports,2100,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearImport.csv
similarity index 96%
rename from docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearImport.csv
index d7a9581b..a6d02500 100644
--- a/docs/tutorial-code/5-add-service-demand/input/BaseYearImport.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearImport.csv
@@ -1,40 +1,40 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
-Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ
-R1,Imports,2010,0,0,0,0,0,0,0
-R1,Imports,2015,0,0,0,0,0,0,0
-R1,Imports,2020,0,0,0,0,0,0,0
-R1,Imports,2025,0,0,0,0,0,0,0
-R1,Imports,2030,0,0,0,0,0,0,0
-R1,Imports,2035,0,0,0,0,0,0,0
-R1,Imports,2040,0,0,0,0,0,0,0
-R1,Imports,2045,0,0,0,0,0,0,0
-R1,Imports,2050,0,0,0,0,0,0,0
-R1,Imports,2055,0,0,0,0,0,0,0
-R1,Imports,2060,0,0,0,0,0,0,0
-R1,Imports,2065,0,0,0,0,0,0,0
-R1,Imports,2070,0,0,0,0,0,0,0
-R1,Imports,2075,0,0,0,0,0,0,0
-R1,Imports,2080,0,0,0,0,0,0,0
-R1,Imports,2085,0,0,0,0,0,0,0
-R1,Imports,2090,0,0,0,0,0,0,0
-R1,Imports,2095,0,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0,0
-R2,Imports,2010,0,0,0,0,0,0,0
-R2,Imports,2015,0,0,0,0,0,0,0
-R2,Imports,2020,0,0,0,0,0,0,0
-R2,Imports,2025,0,0,0,0,0,0,0
-R2,Imports,2030,0,0,0,0,0,0,0
-R2,Imports,2035,0,0,0,0,0,0,0
-R2,Imports,2040,0,0,0,0,0,0,0
-R2,Imports,2045,0,0,0,0,0,0,0
-R2,Imports,2050,0,0,0,0,0,0,0
-R2,Imports,2055,0,0,0,0,0,0,0
-R2,Imports,2060,0,0,0,0,0,0,0
-R2,Imports,2065,0,0,0,0,0,0,0
-R2,Imports,2070,0,0,0,0,0,0,0
-R2,Imports,2075,0,0,0,0,0,0,0
-R2,Imports,2080,0,0,0,0,0,0,0
-R2,Imports,2085,0,0,0,0,0,0,0
-R2,Imports,2090,0,0,0,0,0,0,0
-R2,Imports,2095,0,0,0,0,0,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ
+R1,Imports,2010,0,0,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0,0,0
+R2,Imports,2010,0,0,0,0,0,0,0
+R2,Imports,2015,0,0,0,0,0,0,0
+R2,Imports,2020,0,0,0,0,0,0,0
+R2,Imports,2025,0,0,0,0,0,0,0
+R2,Imports,2030,0,0,0,0,0,0,0
+R2,Imports,2035,0,0,0,0,0,0,0
+R2,Imports,2040,0,0,0,0,0,0,0
+R2,Imports,2045,0,0,0,0,0,0,0
+R2,Imports,2050,0,0,0,0,0,0,0
+R2,Imports,2055,0,0,0,0,0,0,0
+R2,Imports,2060,0,0,0,0,0,0,0
+R2,Imports,2065,0,0,0,0,0,0,0
+R2,Imports,2070,0,0,0,0,0,0,0
+R2,Imports,2075,0,0,0,0,0,0,0
+R2,Imports,2080,0,0,0,0,0,0,0
+R2,Imports,2085,0,0,0,0,0,0,0
+R2,Imports,2090,0,0,0,0,0,0,0
+R2,Imports,2095,0,0,0,0,0,0,0
 R2,Imports,2100,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/GlobalCommodities.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/GlobalCommodities.csv
new file mode 100644
index 00000000..aea518c6
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/GlobalCommodities.csv
@@ -0,0 +1,8 @@
+Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
+Electricity,Energy,electricity,0.0,1,PJ
+Gas,Energy,gas,56.1,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
+Cook,Energy,cook,0.0,1,PJ
diff --git a/docs/tutorial-code/5-add-service-demand/input/Projections.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/Projections.csv
similarity index 98%
rename from docs/tutorial-code/5-add-service-demand/input/Projections.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/Projections.csv
index cfa76100..6a1f9a17 100644
--- a/docs/tutorial-code/5-add-service-demand/input/Projections.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/Projections.csv
@@ -1,40 +1,40 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
-Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt,MUS$2010/PJ
-R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100
-R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100
-R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100
-R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100
-R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100
-R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100
-R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100
-R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100
-R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100
-R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100
-R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100
-R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100
-R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100
-R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100
-R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
-R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
-R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
-R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
-R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100
-R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100
-R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100
-R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100
-R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100
-R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100
-R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100
-R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100
-R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100
-R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100
-R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100
-R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100
-R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100
-R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100
-R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
-R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
-R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
-R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt,MUS$2010/PJ
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
+R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100
+R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100
+R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100
+R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100
+R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100
+R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100
+R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100
+R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100
+R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100
+R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100
+R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100
+R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100
+R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100
+R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100
+R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
+R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
+R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
+R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
 R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
diff --git a/docs/tutorial-code/5-add-service-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
similarity index 68%
rename from docs/tutorial-code/5-add-service-demand/settings.toml
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
index 06144269..1ffcec63 100644
--- a/docs/tutorial-code/5-add-service-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
@@ -16,26 +16,28 @@ 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"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{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"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
 
 # Carbon budget control
 [carbon_budget_control]
 budget = []
+method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
@@ -50,7 +52,7 @@ commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
 [sectors.residential.subsectors.retro_and_new]
-agents = '{path}/technodata/residential/Agents.csv'
+agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
 constraints = [
@@ -63,6 +65,21 @@ constraints = [
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -80,6 +97,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -97,6 +121,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -108,11 +139,13 @@ consumption_path = "{path}/technodata/preset/*Consumption.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1095
-all-year.all-week.morning = 1095
-all-year.all-week.mid-afternoon = 1095
-all-year.all-week.early-peak = 1095
-all-year.all-week.late-peak = 1095
-all-year.all-week.evening = 1095
-all-year.all-week.early-morning = 1095
-all-year.all-week.late-afternoon = 1095
+
+[timeslices.all-year.all-week]
+night = 1095
+morning = 1095
+mid-afternoon = 1095
+early-peak = 1095
+late-peak = 1095
+evening = 1095
+early-morning = 1095
+late-afternoon = 1095
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
new file mode 100644
index 00000000..5074779a
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
@@ -0,0 +1,5 @@
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommIn.csv
similarity index 98%
rename from docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommIn.csv
index 913d062f..0e85ade1 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommIn.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,0,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,0,0,0,0
 gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommOut.csv
similarity index 98%
rename from docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommOut.csv
index bb45c4b4..cc721c76 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,1,0,0,0
 gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/ExistingCapacity.csv
similarity index 98%
rename from docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/ExistingCapacity.csv
index 8142f5e5..3cd9976f 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/ExistingCapacity.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
-gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
 gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/Technodata.csv
similarity index 73%
rename from docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/Technodata.csv
index f7d15839..a10e7473 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommIn.csv
similarity index 97%
rename from docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommIn.csv
index b5ca96ca..7e636149 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommIn.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
-gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
-windturbine,R1,2020,fixed,0,0,0,0,1,0
-windturbine,R1,2040,fixed,0,0,0,0,1,0
-solarPV,R1,2020,fixed,0,0,0,0,0,1
-solarPV,R1,2040,fixed,0,0,0,0,0,1
-gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0
-gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
-windturbine,R2,2020,fixed,0,0,0,0,1,0
-windturbine,R2,2040,fixed,0,0,0,0,1,0
-solarPV,R2,2020,fixed,0,0,0,0,0,1
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1,0
+windturbine,R1,2040,fixed,0,0,0,0,1,0
+solarPV,R1,2020,fixed,0,0,0,0,0,1
+solarPV,R1,2040,fixed,0,0,0,0,0,1
+gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
+windturbine,R2,2020,fixed,0,0,0,0,1,0
+windturbine,R2,2040,fixed,0,0,0,0,1,0
+solarPV,R2,2020,fixed,0,0,0,0,0,1
 solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommOut.csv
similarity index 97%
rename from docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommOut.csv
index 7edb7454..b0b03543 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommOut.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
-gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
-windturbine,R2,2020,fixed,1,0,0,0,0,0
-windturbine,R2,2040,fixed,1,0,0,0,0,0
-solarPV,R2,2020,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
+windturbine,R1,2020,fixed,1,0,0,0,0,0
+windturbine,R1,2040,fixed,1,0,0,0,0,0
+solarPV,R1,2020,fixed,1,0,0,0,0,0
+solarPV,R1,2040,fixed,1,0,0,0,0,0
+gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
+windturbine,R2,2020,fixed,1,0,0,0,0,0
+windturbine,R2,2040,fixed,1,0,0,0,0,0
+solarPV,R2,2020,fixed,1,0,0,0,0,0
 solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/ExistingCapacity.csv
similarity index 97%
rename from docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/ExistingCapacity.csv
index 15edcaec..073ccdd5 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/ExistingCapacity.csv
@@ -1,7 +1,7 @@
-ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
-gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
-windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
-gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
-windturbine,R2,PJ/y,0,0,0,0,0,0,0
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
+windturbine,R1,PJ/y,0,0,0,0,0,0,0
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
+gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
+windturbine,R2,PJ/y,0,0,0,0,0,0,0
 solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv
similarity index 59%
rename from docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv
index e47e0d75..449bfa1c 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
new file mode 100644
index 00000000..0e13d8ff
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
@@ -0,0 +1,17 @@
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
+0,R1,gasboiler,1,0,0,0.714,0,0,0,0.714
+1,R1,gasboiler,2,0,0,1.071,0,0,0,1.071
+2,R1,gasboiler,3,0,0,0.714,0,0,0,0.714
+3,R1,gasboiler,4,0,0,1.071,0,0,0,1.071
+4,R1,gasboiler,5,0,0,2.143,0,0,0,2.143
+5,R1,gasboiler,6,0,0,1.429,0,0,0,1.429
+5,R1,gasboiler,7,0,0,1.429,0,0,0,1.429
+5,R1,gasboiler,8,0,0,1.429,0,0,0,1.429
+0,R2,gasboiler,1,0,0,0.714,0,0,0,0.714
+1,R2,gasboiler,2,0,0,1.071,0,0,0,1.071
+2,R2,gasboiler,3,0,0,0.714,0,0,0,0.714
+3,R2,gasboiler,4,0,0,1.071,0,0,0,1.071
+4,R2,gasboiler,5,0,0,2.143,0,0,0,2.143
+5,R2,gasboiler,6,0,0,1.429,0,0,0,1.429
+5,R2,gasboiler,7,0,0,1.429,0,0,0,1.429
+5,R2,gasboiler,8,0,0,1.429,0,0,0,1.429
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
new file mode 100644
index 00000000..c5cf2ca6
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
@@ -0,0 +1,17 @@
+Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
+0,R1,gasboiler,1,0,0,2.142,0,0,0,2.142
+1,R1,gasboiler,2,0,0,3.213,0,0,0,3.213
+2,R1,gasboiler,3,0,0,2.142,0,0,0,2.142
+3,R1,gasboiler,4,0,0,3.213,0,0,0,3.213
+4,R1,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
+5,R1,gasboiler,6,0,0,4.287,0,0,0,4.287
+5,R1,gasboiler,7,0,0,4.287,0,0,0,4.287
+5,R1,gasboiler,8,0,0,4.287,0,0,0,4.287
+0,R2,gasboiler,1,0,0,2.142,0,0,0,2.142
+1,R2,gasboiler,2,0,0,3.213,0,0,0,3.213
+2,R2,gasboiler,3,0,0,2.142,0,0,0,2.142
+3,R2,gasboiler,4,0,0,3.213,0,0,0,3.213
+4,R2,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
+5,R2,gasboiler,6,0,0,4.287,0,0,0,4.287
+5,R2,gasboiler,7,0,0,4.287,0,0,0,4.287
+5,R2,gasboiler,8,0,0,4.287,0,0,0,4.287
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommIn.csv
similarity index 64%
rename from docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommIn.csv
index 91ff0a40..3313c80c 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommIn.csv
@@ -1,10 +1,10 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,1.16,0,0,0,0
-heatpump,R1,2020,fixed,0.4,0,0,0,0,0
-gasboiler,R2,2020,fixed,0,1.16,0,0,0,0
-heatpump,R2,2020,fixed,0.4,0,0,0,0,0
-estove,R1,2020,fixed,0.36,0,0,0,0,0
-gasstove,R1,2020,fixed,0,1,0,0,0,0
-estove,R2,2020,fixed,0.36,0,0,0,0,0
-gasstove,R2,2020,fixed,0,1,0,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,1.16,0,0,0,0
+heatpump,R1,2020,fixed,0.4,0,0,0,0,0
+gasboiler,R2,2020,fixed,0,1.16,0,0,0,0
+heatpump,R2,2020,fixed,0.4,0,0,0,0,0
+estove,R1,2020,fixed,0.4,0,0,0,0,0
+estove,R2,2020,fixed,0.4,0,0,0,0,0
+gas_stove,R1,2020,fixed,0,1.16,0,0,0,0
+gas_stove,R2,2020,fixed,0,1.16,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommOut.csv
similarity index 80%
rename from docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommOut.csv
index 80c7e904..276db9e2 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommOut.csv
@@ -1,10 +1,10 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0,0
-heatpump,R1,2020,fixed,0,0,1,0,0,0
-gasboiler,R2,2020,fixed,0,0,1,64.71,0,0
-heatpump,R2,2020,fixed,0,0,1,0,0,0
-estove,R1,2020,fixed,0,0,0,0,0,1
-gasstove,R1,2020,fixed,0,0,0,50,0,1
-estove,R2,2020,fixed,0,0,0,0,0,1
-gasstove,R2,2020,fixed,0,0,0,50,0,1
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,0,1,64.71,0,0
+heatpump,R1,2020,fixed,0,0,1,0,0,0
+gasboiler,R2,2020,fixed,0,0,1,64.71,0,0
+heatpump,R2,2020,fixed,0,0,1,0,0,0
+estove,R1,2020,fixed,0,0,0,0,0,1
+estove,R2,2020,fixed,0,0,0,0,0,1
+gas_stove,R1,2020,fixed,0,0,0,50,0,1
+gas_stove,R2,2020,fixed,0,0,0,50,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/ExistingCapacity.csv
similarity index 77%
rename from docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/ExistingCapacity.csv
index 7d9bc45e..6da9ddd1 100644
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/ExistingCapacity.csv
@@ -1,9 +1,9 @@
-ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
-gasboiler,R1,PJ/y,10,5,0,0,0,0,0
-heatpump,R1,PJ/y,0,0,0,0,0,0,0
-gasboiler,R2,PJ/y,10,5,0,0,0,0,0
-heatpump,R2,PJ/y,0,0,0,0,0,0,0
-gasstove,R1,PJ/y,10,5,0,0,0,0,0
-estove,R1,PJ/y,0,0,0,0,0,0,0
-gasstove,R2,PJ/y,10,5,0,0,0,0,0
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasboiler,R1,PJ/y,10,5,0,0,0,0,0
+heatpump,R1,PJ/y,0,0,0,0,0,0,0
+gasboiler,R2,PJ/y,10,5,0,0,0,0,0
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
+estove,R1,PJ/y,0,0,0,0,0,0,0
 estove,R2,PJ/y,0,0,0,0,0,0,0
+gas_stove,R1,PJ/y,10,5,0,0,0,0,0
+gas_stove,R2,PJ/y,10,5,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv
new file mode 100644
index 00000000..3e5a40c5
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv
@@ -0,0 +1,10 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+estove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+estove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gas_stove,R1,2020,fixed,8.8667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gas_stove,R2,2020,fixed,8.8667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
diff --git a/docs/tutorial-code/5-add-service-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/Results/MCACapacity.csv
deleted file mode 100644
index 59e65767..00000000
--- a/docs/tutorial-code/5-add-service-demand/Results/MCACapacity.csv
+++ /dev/null
@@ -1,211 +0,0 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-7,A1,5.00000000000,R1,8,2020,R1,residential,gasboiler,retrofit,2020
-9,A1,5.00000000000,R1,16,2020,R1,residential,gasstove,retrofit,2020
-21,A1,5.00000000000,R2,8,2020,R2,residential,gasboiler,retrofit,2020
-23,A1,5.00000000000,R2,16,2020,R2,residential,gasstove,retrofit,2020
-35,A2,5.00000000000,R1,8,2020,R1,residential,gasboiler,retrofit,2020
-37,A2,5.00000000000,R1,16,2020,R1,residential,gasstove,retrofit,2020
-49,A2,5.00000000000,R2,8,2020,R2,residential,gasboiler,retrofit,2020
-51,A2,5.00000000000,R2,16,2020,R2,residential,gasstove,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-14,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-3,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2020
-4,A1,8.07200000000,R1,0,2020,R1,residential,estove,retrofit,2025
-11,A1,2.50000000000,R1,16,2020,R1,residential,gasboiler,retrofit,2025
-16,A1,2.50000000000,R1,32,2020,R1,residential,gasstove,retrofit,2025
-21,A1,8.92930000000,R1,48,2020,R1,residential,heatpump,retrofit,2025
-32,A1,8.07200000000,R2,0,2020,R2,residential,estove,retrofit,2025
-39,A1,2.50000000000,R2,16,2020,R2,residential,gasboiler,retrofit,2025
-44,A1,2.50000000000,R2,32,2020,R2,residential,gasstove,retrofit,2025
-49,A1,8.92930000000,R2,48,2020,R2,residential,heatpump,retrofit,2025
-60,A2,8.07200000000,R1,0,2020,R1,residential,estove,retrofit,2025
-67,A2,2.50000000000,R1,16,2020,R1,residential,gasboiler,retrofit,2025
-72,A2,2.50000000000,R1,32,2020,R1,residential,gasstove,retrofit,2025
-77,A2,8.92930000000,R1,48,2020,R1,residential,heatpump,retrofit,2025
-88,A2,8.07200000000,R2,0,2020,R2,residential,estove,retrofit,2025
-95,A2,2.50000000000,R2,16,2020,R2,residential,gasboiler,retrofit,2025
-100,A2,2.50000000000,R2,32,2020,R2,residential,gasstove,retrofit,2025
-105,A2,8.92930000000,R2,48,2020,R2,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,10.13830000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,20.00000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-33,A1,1.00000000000,R2,0,2020,R2,power,gasCCGT,retrofit,2025
-43,A1,10.13830000000,R2,22,2020,R2,power,solarPV,retrofit,2025
-56,A1,20.00000000000,R2,44,2020,R2,power,windturbine,retrofit,2025
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-8,A1,15.00000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2025
-4,A1,8.07200000000,R1,0,2020,R1,residential,estove,retrofit,2030
-5,A1,3.61440000000,R1,1,2025,R1,residential,estove,retrofit,2030
-14,A1,1.07150000000,R1,24,2025,R1,residential,gasboiler,retrofit,2030
-18,A1,0.88560000000,R1,32,2025,R1,residential,gasstove,retrofit,2030
-22,A1,8.92930000000,R1,40,2020,R1,residential,heatpump,retrofit,2030
-23,A1,4.28590000000,R1,41,2025,R1,residential,heatpump,retrofit,2030
-36,A1,8.07200000000,R2,0,2020,R2,residential,estove,retrofit,2030
-37,A1,3.61440000000,R2,1,2025,R2,residential,estove,retrofit,2030
-46,A1,1.07150000000,R2,24,2025,R2,residential,gasboiler,retrofit,2030
-50,A1,0.88560000000,R2,32,2025,R2,residential,gasstove,retrofit,2030
-54,A1,8.92930000000,R2,40,2020,R2,residential,heatpump,retrofit,2030
-55,A1,4.28590000000,R2,41,2025,R2,residential,heatpump,retrofit,2030
-68,A2,8.07200000000,R1,0,2020,R1,residential,estove,retrofit,2030
-69,A2,3.61440000000,R1,1,2025,R1,residential,estove,retrofit,2030
-78,A2,1.07150000000,R1,24,2025,R1,residential,gasboiler,retrofit,2030
-82,A2,0.88560000000,R1,32,2025,R1,residential,gasstove,retrofit,2030
-86,A2,8.92930000000,R1,40,2020,R1,residential,heatpump,retrofit,2030
-87,A2,4.28590000000,R1,41,2025,R1,residential,heatpump,retrofit,2030
-100,A2,8.07200000000,R2,0,2020,R2,residential,estove,retrofit,2030
-101,A2,3.61440000000,R2,1,2025,R2,residential,estove,retrofit,2030
-110,A2,1.07150000000,R2,24,2025,R2,residential,gasboiler,retrofit,2030
-114,A2,0.88560000000,R2,32,2025,R2,residential,gasstove,retrofit,2030
-118,A2,8.92930000000,R2,40,2020,R2,residential,heatpump,retrofit,2030
-119,A2,4.28590000000,R2,41,2025,R2,residential,heatpump,retrofit,2030
-0,A1,4.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,10.13830000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,8.32770000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,20.00000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-36,A1,4.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2030
-47,A1,10.13830000000,R2,12,2020,R2,power,solarPV,retrofit,2030
-48,A1,8.32770000000,R2,13,2025,R2,power,solarPV,retrofit,2030
-67,A1,20.00000000000,R2,48,2020,R2,power,windturbine,retrofit,2030
-2,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-3,A1,3.91000000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-18,A1,7.50000000000,R2,0,2020,R2,gas,gassupply1,retrofit,2030
-19,A1,3.91000000000,R2,1,2025,R2,gas,gassupply1,retrofit,2030
-4,A1,3.61440000000,R1,0,2025,R1,residential,estove,retrofit,2035
-5,A1,10.07200000000,R1,1,2030,R1,residential,estove,retrofit,2035
-14,A1,1.07150000000,R1,21,2025,R1,residential,gasboiler,retrofit,2035
-16,A1,0.88560000000,R1,28,2025,R1,residential,gasstove,retrofit,2035
-18,A1,4.28590000000,R1,35,2025,R1,residential,heatpump,retrofit,2035
-19,A1,11.78670000000,R1,36,2030,R1,residential,heatpump,retrofit,2035
-32,A1,3.61440000000,R2,0,2025,R2,residential,estove,retrofit,2035
-33,A1,10.07200000000,R2,1,2030,R2,residential,estove,retrofit,2035
-42,A1,1.07150000000,R2,21,2025,R2,residential,gasboiler,retrofit,2035
-44,A1,0.88560000000,R2,28,2025,R2,residential,gasstove,retrofit,2035
-46,A1,4.28590000000,R2,35,2025,R2,residential,heatpump,retrofit,2035
-47,A1,11.78670000000,R2,36,2030,R2,residential,heatpump,retrofit,2035
-60,A2,3.61440000000,R1,0,2025,R1,residential,estove,retrofit,2035
-61,A2,10.07200000000,R1,1,2030,R1,residential,estove,retrofit,2035
-70,A2,1.07150000000,R1,21,2025,R1,residential,gasboiler,retrofit,2035
-72,A2,0.88560000000,R1,28,2025,R1,residential,gasstove,retrofit,2035
-74,A2,4.28590000000,R1,35,2025,R1,residential,heatpump,retrofit,2035
-75,A2,11.78670000000,R1,36,2030,R1,residential,heatpump,retrofit,2035
-88,A2,3.61440000000,R2,0,2025,R2,residential,estove,retrofit,2035
-89,A2,10.07200000000,R2,1,2030,R2,residential,estove,retrofit,2035
-98,A2,1.07150000000,R2,21,2025,R2,residential,gasboiler,retrofit,2035
-100,A2,0.88560000000,R2,28,2025,R2,residential,gasstove,retrofit,2035
-102,A2,4.28590000000,R2,35,2025,R2,residential,heatpump,retrofit,2035
-103,A2,11.78670000000,R2,36,2030,R2,residential,heatpump,retrofit,2035
-0,A1,4.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-10,A1,10.13830000000,R1,11,2020,R1,power,solarPV,retrofit,2035
-11,A1,8.32770000000,R1,12,2025,R1,power,solarPV,retrofit,2035
-12,A1,9.31470000000,R1,13,2030,R1,power,solarPV,retrofit,2035
-37,A1,20.00000000000,R1,55,2020,R1,power,windturbine,retrofit,2035
-41,A1,4.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2035
-51,A1,10.13830000000,R2,11,2020,R2,power,solarPV,retrofit,2035
-52,A1,8.32770000000,R2,12,2025,R2,power,solarPV,retrofit,2035
-53,A1,9.31470000000,R2,13,2030,R2,power,solarPV,retrofit,2035
-78,A1,20.00000000000,R2,55,2020,R2,power,windturbine,retrofit,2035
-0,A1,3.91000000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
-1,A1,7.50010000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
-12,A1,3.91000000000,R2,0,2025,R2,gas,gassupply1,retrofit,2035
-13,A1,7.50010000000,R2,1,2030,R2,gas,gassupply1,retrofit,2035
-4,A1,10.07200000000,R1,0,2030,R1,residential,estove,retrofit,2040
-5,A1,6.50000000000,R1,1,2035,R1,residential,estove,retrofit,2040
-14,A1,11.78670000000,R1,21,2030,R1,residential,heatpump,retrofit,2040
-15,A1,8.21470000000,R1,22,2035,R1,residential,heatpump,retrofit,2040
-28,A1,10.07200000000,R2,0,2030,R2,residential,estove,retrofit,2040
-29,A1,6.50000000000,R2,1,2035,R2,residential,estove,retrofit,2040
-38,A1,11.78670000000,R2,21,2030,R2,residential,heatpump,retrofit,2040
-39,A1,8.21470000000,R2,22,2035,R2,residential,heatpump,retrofit,2040
-52,A2,10.07200000000,R1,0,2030,R1,residential,estove,retrofit,2040
-53,A2,6.50000000000,R1,1,2035,R1,residential,estove,retrofit,2040
-62,A2,11.78670000000,R1,21,2030,R1,residential,heatpump,retrofit,2040
-63,A2,8.21470000000,R1,22,2035,R1,residential,heatpump,retrofit,2040
-76,A2,10.07200000000,R2,0,2030,R2,residential,estove,retrofit,2040
-77,A2,6.50000000000,R2,1,2035,R2,residential,estove,retrofit,2040
-86,A2,11.78670000000,R2,21,2030,R2,residential,heatpump,retrofit,2040
-87,A2,8.21470000000,R2,22,2035,R2,residential,heatpump,retrofit,2040
-0,A1,4.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-9,A1,10.13830000000,R1,12,2020,R1,power,solarPV,retrofit,2040
-10,A1,8.32770000000,R1,13,2025,R1,power,solarPV,retrofit,2040
-11,A1,9.31470000000,R1,14,2030,R1,power,solarPV,retrofit,2040
-12,A1,13.05170000000,R1,15,2035,R1,power,solarPV,retrofit,2040
-43,A1,20.00000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
-46,A1,4.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2040
-55,A1,10.13830000000,R2,12,2020,R2,power,solarPV,retrofit,2040
-56,A1,8.32770000000,R2,13,2025,R2,power,solarPV,retrofit,2040
-57,A1,9.31470000000,R2,14,2030,R2,power,solarPV,retrofit,2040
-58,A1,13.05170000000,R2,15,2035,R2,power,solarPV,retrofit,2040
-89,A1,20.00000000000,R2,72,2020,R2,power,windturbine,retrofit,2040
-0,A1,3.91000000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
-1,A1,7.50010000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
-10,A1,3.91000000000,R2,0,2025,R2,gas,gassupply1,retrofit,2040
-11,A1,7.50010000000,R2,1,2030,R2,gas,gassupply1,retrofit,2040
-4,A1,6.50000000000,R1,0,2035,R1,residential,estove,retrofit,2045
-5,A1,12.07200000000,R1,1,2040,R1,residential,estove,retrofit,2045
-14,A1,8.21470000000,R1,21,2035,R1,residential,heatpump,retrofit,2045
-15,A1,14.64400000000,R1,22,2040,R1,residential,heatpump,retrofit,2045
-28,A1,6.50000000000,R2,0,2035,R2,residential,estove,retrofit,2045
-29,A1,12.07200000000,R2,1,2040,R2,residential,estove,retrofit,2045
-38,A1,8.21470000000,R2,21,2035,R2,residential,heatpump,retrofit,2045
-39,A1,14.64400000000,R2,22,2040,R2,residential,heatpump,retrofit,2045
-52,A2,6.50000000000,R1,0,2035,R1,residential,estove,retrofit,2045
-53,A2,12.07200000000,R1,1,2040,R1,residential,estove,retrofit,2045
-62,A2,8.21470000000,R1,21,2035,R1,residential,heatpump,retrofit,2045
-63,A2,14.64400000000,R1,22,2040,R1,residential,heatpump,retrofit,2045
-76,A2,6.50000000000,R2,0,2035,R2,residential,estove,retrofit,2045
-77,A2,12.07200000000,R2,1,2040,R2,residential,estove,retrofit,2045
-86,A2,8.21470000000,R2,21,2035,R2,residential,heatpump,retrofit,2045
-87,A2,14.64400000000,R2,22,2040,R2,residential,heatpump,retrofit,2045
-2,A1,4.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-10,A1,10.13830000000,R1,13,2020,R1,power,solarPV,retrofit,2045
-11,A1,8.32770000000,R1,14,2025,R1,power,solarPV,retrofit,2045
-12,A1,9.31470000000,R1,15,2030,R1,power,solarPV,retrofit,2045
-13,A1,13.05170000000,R1,16,2035,R1,power,solarPV,retrofit,2045
-14,A1,9.31470000000,R1,17,2040,R1,power,solarPV,retrofit,2045
-50,A1,20.00000000000,R1,91,2020,R1,power,windturbine,retrofit,2045
-64,A1,4.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2045
-72,A1,10.13830000000,R2,13,2020,R2,power,solarPV,retrofit,2045
-73,A1,8.32770000000,R2,14,2025,R2,power,solarPV,retrofit,2045
-74,A1,9.31470000000,R2,15,2030,R2,power,solarPV,retrofit,2045
-75,A1,13.05170000000,R2,16,2035,R2,power,solarPV,retrofit,2045
-76,A1,9.31470000000,R2,17,2040,R2,power,solarPV,retrofit,2045
-112,A1,20.00000000000,R2,91,2020,R2,power,windturbine,retrofit,2045
-0,A1,3.91000000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
-1,A1,7.50010000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
-8,A1,3.91000000000,R2,0,2025,R2,gas,gassupply1,retrofit,2045
-9,A1,7.50010000000,R2,1,2030,R2,gas,gassupply1,retrofit,2045
-0,A1,12.07200000000,R1,0,2040,R1,residential,estove,retrofit,2050
-1,A1,8.50000000000,R1,1,2045,R1,residential,estove,retrofit,2050
-10,A1,14.64400000000,R1,21,2040,R1,residential,heatpump,retrofit,2050
-11,A1,11.07200000000,R1,22,2045,R1,residential,heatpump,retrofit,2050
-20,A1,12.07200000000,R2,0,2040,R2,residential,estove,retrofit,2050
-21,A1,8.50000000000,R2,1,2045,R2,residential,estove,retrofit,2050
-30,A1,14.64400000000,R2,21,2040,R2,residential,heatpump,retrofit,2050
-31,A1,11.07200000000,R2,22,2045,R2,residential,heatpump,retrofit,2050
-40,A2,12.07200000000,R1,0,2040,R1,residential,estove,retrofit,2050
-41,A2,8.50000000000,R1,1,2045,R1,residential,estove,retrofit,2050
-50,A2,14.64400000000,R1,21,2040,R1,residential,heatpump,retrofit,2050
-51,A2,11.07200000000,R1,22,2045,R1,residential,heatpump,retrofit,2050
-60,A2,12.07200000000,R2,0,2040,R2,residential,estove,retrofit,2050
-61,A2,8.50000000000,R2,1,2045,R2,residential,estove,retrofit,2050
-70,A2,14.64400000000,R2,21,2040,R2,residential,heatpump,retrofit,2050
-71,A2,11.07200000000,R2,22,2045,R2,residential,heatpump,retrofit,2050
-0,A1,4.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-6,A1,8.32770000000,R1,13,2025,R1,power,solarPV,retrofit,2050
-7,A1,9.31470000000,R1,14,2030,R1,power,solarPV,retrofit,2050
-8,A1,13.05170000000,R1,15,2035,R1,power,solarPV,retrofit,2050
-9,A1,9.31470000000,R1,16,2040,R1,power,solarPV,retrofit,2050
-10,A1,29.30600000000,R1,17,2045,R1,power,solarPV,retrofit,2050
-36,A1,10.14690000000,R1,78,2045,R1,power,windturbine,retrofit,2050
-56,A1,4.00000000000,R2,0,2025,R2,power,gasCCGT,retrofit,2050
-62,A1,8.32770000000,R2,13,2025,R2,power,solarPV,retrofit,2050
-63,A1,9.31470000000,R2,14,2030,R2,power,solarPV,retrofit,2050
-64,A1,13.05170000000,R2,15,2035,R2,power,solarPV,retrofit,2050
-65,A1,9.31470000000,R2,16,2040,R2,power,solarPV,retrofit,2050
-66,A1,29.30600000000,R2,17,2045,R2,power,solarPV,retrofit,2050
-92,A1,10.14690000000,R2,78,2045,R2,power,windturbine,retrofit,2050
-0,A1,3.91000000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
-1,A1,7.50010000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
-8,A1,3.91000000000,R2,0,2025,R2,gas,gassupply1,retrofit,2050
-9,A1,7.50010000000,R2,1,2030,R2,gas,gassupply1,retrofit,2050
diff --git a/docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index f62a6e1c..00000000
--- a/docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,1473 +0,0 @@
-,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,0.41412000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R1,6,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,21,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R1,26,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R1,46,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R1,66,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.07150000000,R1,86,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,101,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R1,106,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,121,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R1,126,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,141,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R1,146,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R2,6,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,21,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R2,26,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R2,46,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,61,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R2,66,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.07150000000,R2,86,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,101,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R2,106,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,121,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R2,126,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,141,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R2,146,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-32,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-33,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R1,6,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-34,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,21,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-35,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R1,26,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-36,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-37,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R1,46,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-38,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-39,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R1,66,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-40,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-41,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.07150000000,R1,86,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-42,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,101,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-43,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R1,106,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-44,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,121,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-45,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R1,126,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-46,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R1,141,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-47,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R1,146,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-48,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-49,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R2,6,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-50,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,21,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-51,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R2,26,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-52,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.41412000000,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-53,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35700000000,R2,46,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-54,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.62118000000,R2,61,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-55,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.53550000000,R2,66,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-56,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24294000000,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-57,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.07150000000,R2,86,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-58,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,101,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-59,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R2,106,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-60,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,121,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-61,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R2,126,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-62,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.82882000000,R2,141,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-63,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.71450000000,R2,146,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,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,gas,0.10412725438,R1,6,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R1,10,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,15,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R1,46,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R1,50,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,55,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R1,86,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R1,90,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,95,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,121,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R1,126,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R1,130,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,135,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R1,161,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31250000000,R1,166,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R1,170,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,175,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,201,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R1,206,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R1,210,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,215,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,241,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R1,246,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R1,250,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,255,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,281,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R1,286,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R1,290,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,295,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R2,6,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R2,10,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,15,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R2,46,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R2,50,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,55,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R2,86,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R2,90,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,95,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,121,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R2,126,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R2,130,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,135,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R2,161,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31250000000,R2,166,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R2,170,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,175,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,201,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R2,206,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R2,210,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,215,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,241,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R2,246,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R2,250,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,255,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,281,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R2,286,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R2,290,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,295,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R1,6,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R1,10,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-67,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,15,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R1,46,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R1,50,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-71,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,55,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R1,86,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R1,90,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-75,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,95,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R1,121,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R1,126,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R1,130,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-79,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,135,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R1,161,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31250000000,R1,166,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R1,170,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,175,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,201,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R1,206,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R1,210,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-87,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,215,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,241,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R1,246,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R1,250,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-91,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,255,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R1,281,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R1,286,2020.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R1,290,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-95,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,295,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,1,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R2,6,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R2,10,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,15,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,41,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R2,46,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R2,50,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,55,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12077694820,R2,81,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10412725438,R2,86,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12103418842,R2,90,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-107,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,95,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18116542231,R2,121,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15617117543,R2,126,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152837684,R2,130,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,135,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,R2,161,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31250000000,R2,166,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R2,170,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,175,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,201,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R2,206,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R2,210,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-119,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,215,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,241,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R2,246,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R2,250,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,255,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24172305180,R2,281,2020.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20839245176,R2,286,2020.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24222871737,R2,290,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-127,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,295,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259825702,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.16889895477,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.33319098880,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.09389207074,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.25333409208,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.49975819420,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.06259825702,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16889895477,R1,59,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33319098880,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389207074,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.25333409208,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.49975819420,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.18787500000,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.50691333333,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,1.00000000000,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.12528205777,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.33802871863,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.66683730020,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12528205777,R1,151,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33802871863,R1,159,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66683730020,R1,163,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12528205777,R1,176,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33802871863,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66683730020,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259825702,R2,1,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16889895477,R2,9,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33319098880,R2,13,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389207074,R2,26,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25333409208,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49975819420,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06259825702,R2,51,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16889895477,R2,59,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33319098880,R2,63,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09389207074,R2,76,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25333409208,R2,84,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49975819420,R2,88,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18787500000,R2,101,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12528205777,R2,126,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33802871863,R2,134,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66683730020,R2,138,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12528205777,R2,151,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33802871863,R2,159,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66683730020,R2,163,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12528205777,R2,176,2020.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33802871863,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66683730020,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R1,0,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,5,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R1,10,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,16,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R1,21,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,25,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R1,40,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,45,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R1,50,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,56,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R1,61,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,65,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R1,80,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,85,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R1,90,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,96,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R1,101,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,105,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R1,120,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,125,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R1,130,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,136,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R1,141,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,145,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R1,160,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,165,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R1,170,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R1,176,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R1,181,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R1,185,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R1,200,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,205,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R1,210,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,216,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R1,221,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,225,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R1,240,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,245,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R1,250,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,256,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R1,261,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,265,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R1,280,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,285,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R1,290,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,296,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R1,301,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,305,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R2,0,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,5,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R2,10,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,16,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R2,21,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,25,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R2,40,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,45,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R2,50,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,56,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R2,61,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,65,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R2,80,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,85,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R2,90,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,96,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R2,101,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,105,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R2,120,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,125,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R2,130,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,136,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R2,141,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,145,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R2,160,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,165,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R2,170,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,176,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R2,181,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,185,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R2,200,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,205,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R2,210,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,216,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R2,221,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,225,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R2,240,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,245,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R2,250,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,256,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R2,261,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,265,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R2,280,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,285,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R2,290,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,296,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R2,301,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,305,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R1,0,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,5,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R1,10,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,16,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R1,21,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,25,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R1,40,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,45,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R1,50,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,56,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R1,61,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,65,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R1,80,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R1,85,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R1,90,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,96,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R1,101,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,105,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R1,120,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R1,125,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R1,130,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,136,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R1,141,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,145,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R1,160,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R1,165,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R1,170,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R1,176,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R1,181,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R1,185,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R1,200,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,205,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R1,210,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,216,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R1,221,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,225,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R1,240,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,245,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R1,250,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,256,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R1,261,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,265,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R1,280,2020.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R1,285,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R1,290,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,296,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R1,301,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,305,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R2,0,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,5,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R2,10,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,16,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R2,21,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,25,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R2,40,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,45,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R2,50,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,56,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R2,61,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,65,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12104147630,R2,80,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14875277648,R2,85,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05419875024,R2,90,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,96,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688825962,R2,101,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,105,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18152369074,R2,120,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22312916472,R2,125,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08128087560,R2,130,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,136,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05532064906,R2,141,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,145,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36324000000,R2,160,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.44646666667,R2,165,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R2,170,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,176,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R2,181,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,185,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R2,200,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,205,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R2,210,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,216,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R2,221,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,225,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R2,240,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,245,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R2,250,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,256,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R2,261,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,265,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24223704741,R2,280,2020.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29771389019,R2,285,2020.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846649952,R2,290,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,296,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382348075,R2,301,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,305,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890338094,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.33319972042,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.25039958989,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.13873858812,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.25333124605,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.49975257977,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.37556406370,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.20808831184,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.16890338094,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33319972042,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25039958989,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13873858812,R1,69,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25333124605,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.49975257977,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.37556406370,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.20808831184,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.50691333333,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,1.00000000000,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.41638266667,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.33803377775,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.66684728043,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.50113573125,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.27766364889,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803377775,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66684728043,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50113573125,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766364889,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803377775,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66684728043,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50113573125,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766364889,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890338094,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33319972042,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25039958989,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13873858812,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25333124605,R2,29,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49975257977,R2,33,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37556406370,R2,36,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808831184,R2,44,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890338094,R2,54,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33319972042,R2,58,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25039958989,R2,61,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13873858812,R2,69,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25333124605,R2,79,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49975257977,R2,83,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37556406370,R2,86,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808831184,R2,94,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R2,104,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R2,108,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,111,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R2,119,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803377775,R2,129,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66684728043,R2,133,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50113573125,R2,136,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766364889,R2,144,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803377775,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66684728043,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50113573125,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766364889,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803377775,R2,179,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66684728043,R2,183,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50113573125,R2,186,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766364889,R2,194,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R1,0,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,6,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R1,11,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,15,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R1,20,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,25,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R1,40,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,46,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R1,51,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,55,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R1,60,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,65,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R1,80,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,86,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R1,91,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,95,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R1,100,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,105,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R1,120,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,126,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R1,131,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,135,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R1,140,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,145,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R1,160,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R1,166,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R1,171,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R1,175,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R1,180,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,185,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R1,200,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,206,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R1,211,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,215,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R1,220,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,225,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R1,240,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,246,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R1,251,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,255,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R1,260,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,265,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R1,280,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,286,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R1,291,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,295,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R1,300,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,305,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R2,0,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,6,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R2,11,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,15,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R2,20,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,25,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R2,40,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,46,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R2,51,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,55,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R2,60,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,65,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R2,80,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,86,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R2,91,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,95,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R2,100,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,105,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R2,120,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,126,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R2,131,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,135,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R2,140,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,145,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R2,160,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,166,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R2,171,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,175,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R2,180,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,185,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R2,200,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,206,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R2,211,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,215,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R2,220,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,225,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R2,240,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,246,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R2,251,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,255,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R2,260,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,265,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R2,280,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,286,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R2,291,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,295,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R2,300,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,305,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R1,0,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,6,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R1,11,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,15,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-100,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R1,20,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-101,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,25,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R1,40,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,46,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-104,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R1,51,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,55,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-106,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R1,60,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-107,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,65,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R1,80,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R1,86,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R1,91,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R1,95,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-112,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R1,100,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-113,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,105,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R1,120,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R1,126,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-116,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R1,131,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R1,135,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-118,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R1,140,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-119,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,145,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R1,160,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R1,166,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R1,171,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R1,175,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-124,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R1,180,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-125,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,185,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R1,200,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,206,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-128,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R1,211,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,215,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-130,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R1,220,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-131,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,225,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R1,240,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-133,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,246,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R1,251,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-135,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,255,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-136,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R1,260,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-137,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,265,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R1,280,2025.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R1,286,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R1,291,2025.00000000000,R1,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-141,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R1,295,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-142,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R1,300,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-143,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,305,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R2,0,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-145,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,6,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-146,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R2,11,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,15,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R2,20,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-149,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,25,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R2,40,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-151,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,46,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-152,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R2,51,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,55,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-154,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R2,60,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-155,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,65,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.05420111776,R2,80,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-157,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05176338964,R2,86,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.03688987099,R2,91,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-159,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.07139777881,R2,95,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-160,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15103852869,R2,100,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-161,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,105,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08127935328,R2,120,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07764508446,R2,126,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05531961296,R2,131,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-165,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10709666822,R2,135,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-166,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649558606,R2,140,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-167,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,145,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.16264800000,R2,160,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-169,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15536266667,R2,166,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-170,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11070000000,R2,171,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.21429333333,R2,175,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R2,180,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-173,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,185,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R2,200,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-175,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,206,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-176,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R2,211,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,215,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-178,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R2,220,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-179,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,225,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R2,240,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-181,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,246,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R2,251,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-183,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,255,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-184,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R2,260,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-185,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,265,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.10846920560,R2,280,2025.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.10359927703,R2,286,2025.00000000000,R2,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07382532254,R2,291,2025.00000000000,R2,residential,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-189,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14289555452,R2,295,2025.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-190,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226367829,R2,300,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-191,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,305,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890634907,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.33320557571,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.25040399015,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.13874102616,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.15518494346,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.25332933755,R1,34,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.49974881482,R1,38,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.37556123433,R1,41,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.20808674418,R1,49,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.23274968135,R1,54,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.16890634907,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33320557571,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040399015,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874102616,R1,79,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518494346,R1,84,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332933755,R1,94,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.49974881482,R1,98,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.37556123433,R1,101,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.20808674418,R1,109,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.23274968135,R1,114,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.50691333333,R1,124,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,1.00000000000,R1,128,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,131,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.41638266667,R1,139,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.46573333333,R1,144,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.33803717032,R1,154,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.66685397304,R1,158,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.50114076074,R1,161,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.27766643557,R1,169,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.31057612371,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803717032,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685397304,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114076074,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766643557,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057612371,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803717032,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685397304,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114076074,R1,221,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766643557,R1,229,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057612371,R1,234,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890634907,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33320557571,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040399015,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874102616,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518494346,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332933755,R2,34,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974881482,R2,38,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37556123433,R2,41,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808674418,R2,49,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-49,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274968135,R2,54,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890634907,R2,64,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33320557571,R2,68,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040399015,R2,71,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874102616,R2,79,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518494346,R2,84,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332933755,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974881482,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37556123433,R2,101,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808674418,R2,109,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-59,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274968135,R2,114,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R2,124,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R2,128,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,131,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R2,139,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R2,144,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803717032,R2,154,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685397304,R2,158,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114076074,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766643557,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-69,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057612371,R2,174,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803717032,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685397304,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114076074,R2,191,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766643557,R2,199,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057612371,R2,204,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803717032,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685397304,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114076074,R2,221,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766643557,R2,229,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057612371,R2,234,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R1,0,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,5,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R1,10,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,15,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R1,30,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,35,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R1,40,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,45,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R1,60,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,65,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R1,70,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,75,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R1,90,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,95,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R1,100,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,105,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R1,120,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,125,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R1,130,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,135,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R1,150,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,155,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R1,160,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,165,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R1,180,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,185,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R1,190,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,195,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R1,210,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,215,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R1,220,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,225,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R2,0,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,5,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R2,10,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,15,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R2,30,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,35,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R2,40,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,45,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R2,60,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,65,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R2,70,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,75,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R2,90,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,95,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R2,100,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,105,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R2,120,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,125,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R2,130,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,135,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R2,150,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,155,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R2,160,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,165,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R2,180,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,185,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R2,190,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,195,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R2,210,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,215,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R2,220,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,225,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R1,0,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,5,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R1,10,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-67,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,15,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R1,30,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,35,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R1,40,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-71,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,45,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R1,60,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R1,65,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R1,70,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-75,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,75,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R1,90,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R1,95,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R1,100,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-79,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,105,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R1,120,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R1,125,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R1,130,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,135,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R1,150,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,155,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R1,160,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-87,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,165,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R1,180,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,185,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R1,190,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-91,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,195,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R1,210,2030.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R1,215,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R1,220,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-95,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,225,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R2,0,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,5,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R2,10,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,15,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R2,30,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,35,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R2,40,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,45,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15104353367,R2,60,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19635277648,R2,65,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747646633,R2,70,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-107,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,75,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.22649236785,R2,90,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29452916472,R2,95,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616763215,R2,100,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,105,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45324000000,R2,120,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58933333333,R2,125,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R2,130,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,135,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R2,150,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,155,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R2,160,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-119,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,165,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R2,180,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,185,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R2,190,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,195,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30226939899,R2,210,2030.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.39298055685,R2,215,2030.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507060101,R2,220,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-127,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,225,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890852229,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.33320986287,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.25040721195,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.13874281126,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.15518694013,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,solar,0.21744742515,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332794017,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974605817,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555916272,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808559636,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274839749,R1,59,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612628163,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890852229,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33320986287,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040721195,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874281126,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518694013,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21744742515,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332794017,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974605817,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555916272,R1,116,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808559636,R1,124,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274839749,R1,129,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612628163,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R1,164,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.65258400000,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803965431,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685887326,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114444326,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766847594,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057840591,R1,199,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518143095,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803965431,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685887326,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114444326,R1,221,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766847594,R1,229,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057840591,R1,234,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518143095,R1,239,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803965431,R1,249,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685887326,R1,253,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114444326,R1,256,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766847594,R1,264,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057840591,R1,269,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518143095,R1,274,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890852229,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33320986287,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040721195,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874281126,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518694013,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21744742515,R2,29,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332794017,R2,39,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974605817,R2,43,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555916272,R2,46,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808559636,R2,54,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274839749,R2,59,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612628163,R2,64,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16890852229,R2,74,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33320986287,R2,78,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040721195,R2,81,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874281126,R2,89,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518694013,R2,94,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-65,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21744742515,R2,99,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332794017,R2,109,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974605817,R2,113,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555916272,R2,116,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808559636,R2,124,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274839749,R2,129,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-71,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612628163,R2,134,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R2,144,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R2,148,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,151,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R2,159,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R2,164,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.65258400000,R2,169,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803965431,R2,179,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685887326,R2,183,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114444326,R2,186,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766847594,R2,194,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057840591,R2,199,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-83,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518143095,R2,204,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803965431,R2,214,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685887326,R2,218,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114444326,R2,221,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766847594,R2,229,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057840591,R2,234,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518143095,R2,239,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33803965431,R2,249,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66685887326,R2,253,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114444326,R2,256,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27766847594,R2,264,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31057840591,R2,269,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-95,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518143095,R2,274,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R1,0,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,5,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.18104099935,R1,10,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,15,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R1,30,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,35,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R1,40,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,45,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R1,60,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,65,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R1,70,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,75,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R1,90,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,95,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R1,100,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,105,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R1,120,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,125,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R1,130,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,135,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R1,150,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,155,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R1,160,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,165,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R1,180,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,185,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R1,190,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,195,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R1,210,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,215,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R1,220,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,225,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R2,0,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,5,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R2,10,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,15,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R2,30,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,35,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R2,40,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,45,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R2,60,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,65,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R2,70,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,75,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R2,90,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,95,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R2,100,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,105,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R2,120,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,125,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R2,130,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,135,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R2,150,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,155,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R2,160,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,165,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R2,180,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,185,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R2,190,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,195,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R2,210,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,215,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R2,220,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,225,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R1,0,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,5,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R1,10,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-67,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,15,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R1,30,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,35,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R1,40,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-71,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,45,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R1,60,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R1,65,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R1,70,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-75,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,75,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R1,90,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R1,95,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R1,100,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-79,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,105,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R1,120,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R1,125,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R1,130,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,135,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R1,150,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,155,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R1,160,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-87,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,165,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R1,180,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,185,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R1,190,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-91,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,195,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R1,210,2035.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R1,215,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R1,220,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-95,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,225,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R2,0,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,5,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R2,10,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,15,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R2,30,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,35,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R2,40,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,45,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.09747900065,R2,60,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.13684722352,R2,65,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104099935,R2,70,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-107,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,75,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.14616600258,R2,90,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.20527083528,R2,95,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146399742,R2,100,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,105,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29250000000,R2,120,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.41073333333,R2,125,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R2,130,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,135,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R2,150,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,155,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R2,160,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-119,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,165,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R2,180,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,185,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R2,190,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,195,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19507349774,R2,210,2035.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27388610981,R2,215,2035.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36229650226,R2,220,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-127,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,225,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16891019518,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.33321316303,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.25040969202,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.13874418539,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.15518847713,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,solar,0.21744957878,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R1,34,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332686450,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974393617,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555756803,R1,56,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808471279,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612489684,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R1,79,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16891019518,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33321316303,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040969202,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874418539,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R1,114,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21744957878,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R1,124,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332686450,R1,139,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974393617,R1,143,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555756803,R1,146,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808471279,R1,154,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R1,159,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612489684,R1,164,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R1,169,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.65258400000,R1,209,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R1,214,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33804156643,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66686264534,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114727797,R1,236,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767004657,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R1,249,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518389255,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R1,259,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33804156643,R1,274,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66686264534,R1,278,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114727797,R1,281,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767004657,R1,289,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R1,294,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518389255,R1,299,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R1,304,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33804156643,R1,319,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66686264534,R1,323,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114727797,R1,326,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767004657,R1,334,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R1,339,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518389255,R1,344,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R1,349,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16891019518,R2,4,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33321316303,R2,8,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040969202,R2,11,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874418539,R2,19,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R2,24,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21744957878,R2,29,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R2,34,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332686450,R2,49,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974393617,R2,53,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555756803,R2,56,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808471279,R2,64,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R2,69,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612489684,R2,74,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R2,79,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16891019518,R2,94,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33321316303,R2,98,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25040969202,R2,101,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874418539,R2,109,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R2,114,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21744957878,R2,119,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518847713,R2,124,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25332686450,R2,139,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49974393617,R2,143,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555756803,R2,146,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808471279,R2,154,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R2,159,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612489684,R2,164,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274740921,R2,169,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50691333333,R2,184,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00000000000,R2,188,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,191,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R2,199,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R2,204,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.65258400000,R2,209,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R2,214,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33804156643,R2,229,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66686264534,R2,233,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114727797,R2,236,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767004657,R2,244,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R2,249,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518389255,R2,254,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R2,259,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33804156643,R2,274,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66686264534,R2,278,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114727797,R2,281,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767004657,R2,289,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R2,294,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518389255,R2,299,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-104,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R2,304,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33804156643,R2,319,2020.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66686264534,R2,323,2020.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114727797,R2,326,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767004657,R2,334,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R2,339,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518389255,R2,344,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-111,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058016269,R2,349,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R1,0,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,5,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R1,10,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,15,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R1,30,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,35,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R1,40,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R1,45,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R1,60,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,65,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R1,70,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,75,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R1,90,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,95,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R1,100,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R1,105,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R1,120,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,125,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38250000000,R1,130,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R1,135,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R1,150,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,155,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R1,160,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,165,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R1,180,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,185,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R1,190,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,195,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R1,210,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,215,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R1,220,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,225,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R2,0,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,5,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R2,10,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,15,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R2,30,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,35,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R2,40,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,45,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R2,60,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,65,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R2,70,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,75,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R2,90,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,95,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R2,100,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-47,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,105,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R2,120,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,125,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38250000000,R2,130,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R2,135,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R2,150,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,155,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R2,160,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,165,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R2,180,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,185,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R2,190,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,195,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R2,210,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,215,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R2,220,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,225,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R1,0,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-65,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,5,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-66,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R1,10,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-67,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,15,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R1,30,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-69,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,35,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-70,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R1,40,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-71,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R1,45,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R1,60,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-73,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R1,65,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-74,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R1,70,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-75,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R1,75,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R1,90,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-77,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R1,95,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-78,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R1,100,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-79,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R1,105,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R1,120,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-81,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R1,125,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-82,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38250000000,R1,130,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-83,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R1,135,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R1,150,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-85,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,155,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-86,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R1,160,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-87,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,165,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R1,180,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-89,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,185,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-90,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R1,190,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-91,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,195,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R1,210,2040.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-93,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R1,215,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-94,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R1,220,2045.00000000000,R1,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-95,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R1,225,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R2,0,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-97,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,5,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-98,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R2,10,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-99,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,15,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R2,30,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-101,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,35,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-102,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R2,40,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,45,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18104479098,R2,60,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.24395277648,R2,65,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-106,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.12747520902,R2,70,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-107,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.18444722352,R2,75,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27146155940,R2,90,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-109,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36592916472,R2,95,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-110,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.19113844060,R2,100,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-111,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.27667083528,R2,105,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.54324000000,R2,120,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-113,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.73220000000,R2,125,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-114,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.38250000000,R2,130,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55360000000,R2,135,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R2,150,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,155,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-118,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R2,160,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-119,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,165,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R2,180,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-121,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,185,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-122,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R2,190,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-123,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,195,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36230083609,R2,210,2040.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-125,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.48824722352,R2,215,2040.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-126,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.25509916391,R2,220,2045.00000000000,R2,residential,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-127,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.36915277648,R2,225,2045.00000000000,R2,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25041164980,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.13874527014,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.15518969044,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,solar,0.21745127887,R1,19,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R1,24,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.48826106514,R1,29,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16905590928,R1,33,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555630918,R1,41,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808401530,R1,49,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R1,54,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612380368,R1,59,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R1,64,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.73227233511,R1,69,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-13,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25354257034,R1,73,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25041164980,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874527014,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21745127887,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R1,104,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.48826106514,R1,109,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-20,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16905590928,R1,113,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555630918,R1,121,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808401530,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R1,134,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612380368,R1,139,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R1,144,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.73227233511,R1,149,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-27,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25354257034,R1,153,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,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,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.65258400000,R1,179,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R1,184,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,1.46530000000,R1,189,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-34,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50734666667,R1,193,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114951572,R1,201,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767128643,R1,209,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R1,214,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518583575,R1,219,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R1,224,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.97715819746,R1,229,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-41,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33833205097,R1,233,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114951572,R1,241,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767128643,R1,249,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R1,254,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518583575,R1,259,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R1,264,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.97715819746,R1,269,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-48,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33833205097,R1,273,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114951572,R1,281,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767128643,R1,289,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R1,294,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518583575,R1,299,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R1,304,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.97715819746,R1,309,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-55,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33833205097,R1,313,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25041164980,R2,1,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874527014,R2,9,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R2,14,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21745127887,R2,19,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R2,24,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.48826106514,R2,29,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16905590928,R2,33,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555630918,R2,41,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808401530,R2,49,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R2,54,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612380368,R2,59,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R2,64,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.73227233511,R2,69,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-69,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25354257034,R2,73,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25041164980,R2,81,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13874527014,R2,89,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R2,94,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21745127887,R2,99,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.15518969044,R2,104,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.48826106514,R2,109,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-76,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.16905590928,R2,113,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37555630918,R2,121,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20808401530,R2,129,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R2,134,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32612380368,R2,139,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.23274662905,R2,144,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.73227233511,R2,149,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-83,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25354257034,R2,153,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R2,161,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41638266667,R2,169,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R2,174,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.65258400000,R2,179,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.46573333333,R2,184,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,1.46530000000,R2,189,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-90,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50734666667,R2,193,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114951572,R2,201,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767128643,R2,209,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R2,214,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518583575,R2,219,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R2,224,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.97715819746,R2,229,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-97,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33833205097,R2,233,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114951572,R2,241,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767128643,R2,249,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R2,254,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518583575,R2,259,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R2,264,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.97715819746,R2,269,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-104,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33833205097,R2,273,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50114951572,R2,281,2025.00000000000,R2,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27767128643,R2,289,2025.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R2,294,2030.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.43518583575,R2,299,2035.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31058154951,R2,304,2040.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.97715819746,R2,309,2045.00000000000,R2,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-111,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33833205097,R2,313,2045.00000000000,R2,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Supply.csv b/docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Supply.csv
deleted file mode 100644
index a5228b26..00000000
--- a/docs/tutorial-code/5-add-service-demand/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,2017 +0,0 @@
-,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,8,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-2,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2020.00000000000,R1,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,17,2020.00000000000,R1,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2020.00000000000,R1,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,37,2020.00000000000,R1,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,48,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2020.00000000000,R1,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,57,2020.00000000000,R1,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,68,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-14,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,73,2020.00000000000,R1,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,77,2020.00000000000,R1,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-18,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2020.00000000000,R1,residential,53.57500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,97,2020.00000000000,R1,residential,1.07150000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,108,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,112,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,113,2020.00000000000,R1,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,117,2020.00000000000,R1,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,132,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,133,2020.00000000000,R1,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,137,2020.00000000000,R1,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,148,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,152,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-30,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,153,2020.00000000000,R1,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,157,2020.00000000000,R1,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-33,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,13,2020.00000000000,R2,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-35,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,17,2020.00000000000,R2,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-37,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,32,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-38,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,33,2020.00000000000,R2,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-39,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,37,2020.00000000000,R2,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,48,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-41,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,52,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-42,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,53,2020.00000000000,R2,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,57,2020.00000000000,R2,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,68,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,72,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,73,2020.00000000000,R2,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-47,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,77,2020.00000000000,R2,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2020.00000000000,R2,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2020.00000000000,R2,residential,53.57500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,97,2020.00000000000,R2,residential,1.07150000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,108,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-53,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,112,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-54,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,113,2020.00000000000,R2,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,117,2020.00000000000,R2,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-57,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,132,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-58,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,133,2020.00000000000,R2,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-59,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,137,2020.00000000000,R2,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,148,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-61,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,152,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-62,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,153,2020.00000000000,R2,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-63,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,157,2020.00000000000,R2,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-64,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-65,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-66,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2020.00000000000,R1,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-67,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,17,2020.00000000000,R1,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-68,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-69,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-70,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2020.00000000000,R1,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-71,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,37,2020.00000000000,R1,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-72,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,48,2020.00000000000,R1,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-73,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2020.00000000000,R1,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-74,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2020.00000000000,R1,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-75,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,57,2020.00000000000,R1,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-76,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,68,2020.00000000000,R1,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-77,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2020.00000000000,R1,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-78,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,73,2020.00000000000,R1,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-79,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,77,2020.00000000000,R1,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-80,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-81,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-82,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2020.00000000000,R1,residential,53.57500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-83,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,97,2020.00000000000,R1,residential,1.07150000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-84,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,108,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-85,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,112,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-86,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,113,2020.00000000000,R1,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-87,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,117,2020.00000000000,R1,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-88,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,128,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-89,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,132,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-90,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,133,2020.00000000000,R1,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-91,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,137,2020.00000000000,R1,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-92,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,148,2020.00000000000,R1,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-93,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,152,2020.00000000000,R1,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-94,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,153,2020.00000000000,R1,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-95,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,157,2020.00000000000,R1,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,8,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-97,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-98,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,13,2020.00000000000,R2,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-99,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,17,2020.00000000000,R2,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-100,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,28,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-101,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,32,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-102,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,33,2020.00000000000,R2,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-103,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,37,2020.00000000000,R2,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,48,2020.00000000000,R2,residential,0.35700000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-105,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,52,2020.00000000000,R2,residential,23.10147000000,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-106,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,53,2020.00000000000,R2,residential,17.85000000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-107,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,57,2020.00000000000,R2,residential,0.35700000000,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,68,2020.00000000000,R2,residential,0.53550000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-109,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,72,2020.00000000000,R2,residential,34.65220500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-110,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,73,2020.00000000000,R2,residential,26.77500000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-111,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,77,2020.00000000000,R2,residential,0.53550000000,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-112,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,88,2020.00000000000,R2,residential,1.07150000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-113,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,92,2020.00000000000,R2,residential,69.33676500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-114,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,93,2020.00000000000,R2,residential,53.57500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-115,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,97,2020.00000000000,R2,residential,1.07150000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,108,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-117,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,112,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-118,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,113,2020.00000000000,R2,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-119,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,117,2020.00000000000,R2,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,128,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-121,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,132,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-122,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,133,2020.00000000000,R2,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-123,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,137,2020.00000000000,R2,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-124,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,148,2020.00000000000,R2,residential,0.71450000000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-125,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,152,2020.00000000000,R2,residential,46.23529500000,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-126,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,153,2020.00000000000,R2,residential,35.72500000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-127,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,157,2020.00000000000,R2,residential,0.71450000000,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.96390000000,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.44585000000,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,0.96390000000,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.44585000000,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,2.89305000000,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,1.92915000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,1.92915000000,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2020.00000000000,R1,gas,1.92915000000,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.96390000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2020.00000000000,R2,gas,1.44585000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.96390000000,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,1.44585000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,2.89305000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2020.00000000000,R2,gas,1.92915000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,1.92915000000,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2020.00000000000,R2,gas,1.92915000000,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2020.00000000000,R1,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,33,2020.00000000000,R1,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,34,2020.00000000000,R1,residential,0.33620607895,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,59,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,64,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2020.00000000000,R1,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,73,2020.00000000000,R1,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,74,2020.00000000000,R1,residential,0.50424549123,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,96,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2020.00000000000,R1,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,113,2020.00000000000,R1,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2020.00000000000,R1,residential,0.33620607895,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,136,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,139,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,144,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,145,2020.00000000000,R1,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,153,2020.00000000000,R1,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,154,2020.00000000000,R1,residential,0.50424549123,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,176,2020.00000000000,R1,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2020.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,184,2020.00000000000,R1,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2020.00000000000,R1,residential,15.62500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,193,2020.00000000000,R1,residential,0.31250000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,194,2020.00000000000,R1,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,216,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,219,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2020.00000000000,R1,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-34,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,233,2020.00000000000,R1,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2020.00000000000,R1,residential,0.67285754824,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,256,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-37,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,259,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,264,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-39,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,265,2020.00000000000,R1,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,273,2020.00000000000,R1,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,274,2020.00000000000,R1,residential,0.67285754824,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,296,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,299,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,304,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,305,2020.00000000000,R1,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,313,2020.00000000000,R1,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,314,2020.00000000000,R1,residential,0.67285754824,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2020.00000000000,R2,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-52,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,33,2020.00000000000,R2,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-53,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,34,2020.00000000000,R2,residential,0.33620607895,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-55,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,59,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,64,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2020.00000000000,R2,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-58,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,73,2020.00000000000,R2,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,74,2020.00000000000,R2,residential,0.50424549123,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,96,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-61,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-62,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-63,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,105,2020.00000000000,R2,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,113,2020.00000000000,R2,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2020.00000000000,R2,residential,0.33620607895,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,136,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,139,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-68,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,144,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-69,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,145,2020.00000000000,R2,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-70,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,153,2020.00000000000,R2,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,154,2020.00000000000,R2,residential,0.50424549123,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,176,2020.00000000000,R2,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-74,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,184,2020.00000000000,R2,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-75,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2020.00000000000,R2,residential,15.62500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,193,2020.00000000000,R2,residential,0.31250000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,194,2020.00000000000,R2,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,216,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-79,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,219,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,224,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2020.00000000000,R2,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-82,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,233,2020.00000000000,R2,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2020.00000000000,R2,residential,0.67285754824,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,256,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-85,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,259,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-86,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,264,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-87,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,265,2020.00000000000,R2,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-88,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,273,2020.00000000000,R2,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-89,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,274,2020.00000000000,R2,residential,0.67285754824,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,296,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,299,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-92,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,304,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-93,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,305,2020.00000000000,R2,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-94,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,313,2020.00000000000,R2,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,314,2020.00000000000,R2,residential,0.67285754824,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-96,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,16,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-97,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-98,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,24,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-99,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2020.00000000000,R1,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-100,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,33,2020.00000000000,R1,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-101,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,34,2020.00000000000,R1,residential,0.33620607895,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-103,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,59,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-104,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,64,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-105,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2020.00000000000,R1,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-106,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,73,2020.00000000000,R1,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,74,2020.00000000000,R1,residential,0.50424549123,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-108,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,96,2020.00000000000,R1,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-109,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-110,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2020.00000000000,R1,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-111,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2020.00000000000,R1,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-112,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,113,2020.00000000000,R1,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-113,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2020.00000000000,R1,residential,0.33620607895,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,136,2020.00000000000,R1,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-115,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,139,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-116,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,144,2020.00000000000,R1,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-117,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,145,2020.00000000000,R1,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-118,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,153,2020.00000000000,R1,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-119,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,154,2020.00000000000,R1,residential,0.50424549123,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-120,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,176,2020.00000000000,R1,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-121,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2020.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-122,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,184,2020.00000000000,R1,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-123,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2020.00000000000,R1,residential,15.62500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-124,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,193,2020.00000000000,R1,residential,0.31250000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-125,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,194,2020.00000000000,R1,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,216,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-127,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,219,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-128,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-129,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2020.00000000000,R1,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-130,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,233,2020.00000000000,R1,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-131,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2020.00000000000,R1,residential,0.67285754824,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-132,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,256,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-133,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,259,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-134,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,264,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-135,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,265,2020.00000000000,R1,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-136,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,273,2020.00000000000,R1,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-137,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,274,2020.00000000000,R1,residential,0.67285754824,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-138,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,296,2020.00000000000,R1,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-139,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,299,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-140,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,304,2020.00000000000,R1,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-141,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,305,2020.00000000000,R1,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-142,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,313,2020.00000000000,R1,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-143,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,314,2020.00000000000,R1,residential,0.67285754824,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-144,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,16,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-145,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-146,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,24,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-147,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2020.00000000000,R2,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-148,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,33,2020.00000000000,R2,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-149,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,34,2020.00000000000,R2,residential,0.33620607895,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-150,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,56,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-151,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,59,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-152,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,64,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-153,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2020.00000000000,R2,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-154,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,73,2020.00000000000,R2,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-155,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,74,2020.00000000000,R2,residential,0.50424549123,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-156,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,96,2020.00000000000,R2,residential,0.10411805880,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-157,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-158,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2020.00000000000,R2,residential,6.73747958469,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-159,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,105,2020.00000000000,R2,residential,5.20636271913,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-160,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,113,2020.00000000000,R2,residential,0.10412725438,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-161,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2020.00000000000,R2,residential,0.33620607895,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-162,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,136,2020.00000000000,R2,residential,0.15617708819,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-163,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,139,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-164,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,144,2020.00000000000,R2,residential,10.10621937704,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-165,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,145,2020.00000000000,R2,residential,7.80855877160,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-166,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,153,2020.00000000000,R2,residential,0.15617117543,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-167,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,154,2020.00000000000,R2,residential,0.50424549123,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-168,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,176,2020.00000000000,R2,residential,0.31250000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-169,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-170,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,184,2020.00000000000,R2,residential,20.22187500000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-171,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2020.00000000000,R2,residential,15.62500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-172,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,193,2020.00000000000,R2,residential,0.31250000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-173,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,194,2020.00000000000,R2,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-174,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,216,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-175,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,219,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-176,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,224,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-177,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2020.00000000000,R2,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-178,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,233,2020.00000000000,R2,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-179,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2020.00000000000,R2,residential,0.67285754824,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-180,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,256,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-181,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,259,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-182,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,264,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-183,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,265,2020.00000000000,R2,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-184,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,273,2020.00000000000,R2,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-185,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,274,2020.00000000000,R2,residential,0.67285754824,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-186,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,296,2020.00000000000,R2,residential,0.20838194120,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-187,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,299,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-188,A2,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,304,2020.00000000000,R2,residential,13.48439541531,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-189,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,305,2020.00000000000,R2,residential,10.41962258797,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-190,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,313,2020.00000000000,R2,residential,0.20839245176,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-191,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,314,2020.00000000000,R2,residential,0.67285754824,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.03748398624,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.16889895477,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.33319098880,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,3.43615701861,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.05622279685,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.25333409208,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.49975819420,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,5.15394378703,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.03748398624,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.16889895477,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2020.00000000000,R1,power,0.33319098880,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,power,3.43615701861,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.05622279685,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.25333409208,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.49975819420,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,5.15394378703,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.11250000000,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.50691333333,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,1.00000000000,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,10.31287500000,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.07501919627,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.33802871863,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.66683730020,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,6.87700972227,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.07501919627,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.33802871863,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2020.00000000000,R1,power,0.66683730020,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,160,2020.00000000000,R1,power,6.87700972227,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.07501919627,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.33802871863,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2020.00000000000,R1,power,0.66683730020,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2020.00000000000,R1,power,6.87700972227,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.03748398624,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.16889895477,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2020.00000000000,R2,power,0.33319098880,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,10,2020.00000000000,R2,power,3.43615701861,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.05622279685,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.25333409208,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2020.00000000000,R2,power,0.49975819420,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,35,2020.00000000000,R2,power,5.15394378703,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.03748398624,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.16889895477,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2020.00000000000,R2,power,0.33319098880,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-43,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,60,2020.00000000000,R2,power,3.43615701861,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-44,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.05622279685,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-45,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.25333409208,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2020.00000000000,R2,power,0.49975819420,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,85,2020.00000000000,R2,power,5.15394378703,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2020.00000000000,R2,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-51,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2020.00000000000,R2,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-52,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.07501919627,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-53,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.33802871863,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2020.00000000000,R2,power,0.66683730020,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,135,2020.00000000000,R2,power,6.87700972227,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.07501919627,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.33802871863,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2020.00000000000,R2,power,0.66683730020,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-59,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,160,2020.00000000000,R2,power,6.87700972227,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.07501919627,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.33802871863,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2020.00000000000,R2,power,0.66683730020,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2020.00000000000,R2,power,6.87700972227,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.51240666219,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.76856526621,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.51240666219,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.76856526621,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.53787500000,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,1.02551306489,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,1.02551306489,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2020.00000000000,R1,gas,1.02551306489,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.51240666219,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2020.00000000000,R2,gas,0.76856526621,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2020.00000000000,R2,gas,0.51240666219,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.76856526621,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2020.00000000000,R2,gas,1.53787500000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2020.00000000000,R2,gas,1.02551306489,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,1.02551306489,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2020.00000000000,R2,gas,1.02551306489,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,32,2020.00000000000,R1,residential,0.33622632305,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,34,2025.00000000000,R1,residential,0.15055208400,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-7,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,36,2025.00000000000,R1,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,59,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-10,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,61,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,67,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,68,2025.00000000000,R1,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,72,2020.00000000000,R1,residential,0.50423247428,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,74,2025.00000000000,R1,residential,0.22578020999,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-15,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,76,2025.00000000000,R1,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,97,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-18,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2025.00000000000,R1,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,112,2020.00000000000,R1,residential,0.33622632305,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2025.00000000000,R1,residential,0.15055208400,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-23,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2025.00000000000,R1,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-24,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,137,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,139,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,141,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,147,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,148,2025.00000000000,R1,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,152,2020.00000000000,R1,residential,0.50423247428,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,154,2025.00000000000,R1,residential,0.22578020999,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,156,2025.00000000000,R1,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-32,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,177,2020.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-34,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,188,2025.00000000000,R1,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-37,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,192,2020.00000000000,R1,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,194,2025.00000000000,R1,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,196,2025.00000000000,R1,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,217,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,219,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-42,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,221,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,227,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,228,2025.00000000000,R1,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,232,2020.00000000000,R1,residential,0.67288068724,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2025.00000000000,R1,residential,0.30129583201,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-47,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2025.00000000000,R1,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-48,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,257,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,259,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,261,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,267,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,268,2025.00000000000,R1,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-53,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,272,2020.00000000000,R1,residential,0.67288068724,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,274,2025.00000000000,R1,residential,0.30129583201,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-55,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,276,2025.00000000000,R1,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,297,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,299,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-58,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,301,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,307,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,308,2025.00000000000,R1,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-61,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,312,2020.00000000000,R1,residential,0.67288068724,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,314,2025.00000000000,R1,residential,0.30129583201,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-63,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,316,2025.00000000000,R1,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-65,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-66,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,21,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,27,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2025.00000000000,R2,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-69,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,32,2020.00000000000,R2,residential,0.33622632305,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-70,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,34,2025.00000000000,R2,residential,0.15055208400,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-71,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,36,2025.00000000000,R2,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-72,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,59,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-74,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,61,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,67,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,68,2025.00000000000,R2,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,72,2020.00000000000,R2,residential,0.50423247428,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-78,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,74,2025.00000000000,R2,residential,0.22578020999,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,76,2025.00000000000,R2,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-80,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,97,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2025.00000000000,R2,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-85,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,112,2020.00000000000,R2,residential,0.33622632305,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2025.00000000000,R2,residential,0.15055208400,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-87,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2025.00000000000,R2,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-88,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,137,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-89,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,139,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-90,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,141,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,147,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,148,2025.00000000000,R2,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-93,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,152,2020.00000000000,R2,residential,0.50423247428,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-94,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,154,2025.00000000000,R2,residential,0.22578020999,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,156,2025.00000000000,R2,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-96,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,177,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-97,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-98,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,187,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,188,2025.00000000000,R2,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-101,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,192,2020.00000000000,R2,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-102,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,194,2025.00000000000,R2,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-103,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,196,2025.00000000000,R2,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-104,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,217,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-105,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,219,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-106,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,221,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,227,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,228,2025.00000000000,R2,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-109,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,232,2020.00000000000,R2,residential,0.67288068724,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-110,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2025.00000000000,R2,residential,0.30129583201,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-111,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2025.00000000000,R2,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-112,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,257,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-113,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,259,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-114,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,261,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,267,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,268,2025.00000000000,R2,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-117,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,272,2020.00000000000,R2,residential,0.67288068724,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-118,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,274,2025.00000000000,R2,residential,0.30129583201,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-119,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,276,2025.00000000000,R2,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-120,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,297,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-121,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,299,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-122,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,301,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,307,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,308,2025.00000000000,R2,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-125,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,312,2020.00000000000,R2,residential,0.67288068724,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-126,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,314,2025.00000000000,R2,residential,0.30129583201,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-127,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,316,2025.00000000000,R2,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-128,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-130,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-131,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-132,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2025.00000000000,R1,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,32,2020.00000000000,R1,residential,0.33622632305,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,34,2025.00000000000,R1,residential,0.15055208400,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-135,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,36,2025.00000000000,R1,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-136,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-137,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,59,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,61,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-139,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,67,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-140,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,68,2025.00000000000,R1,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-141,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,72,2020.00000000000,R1,residential,0.50423247428,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,74,2025.00000000000,R1,residential,0.22578020999,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-143,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,76,2025.00000000000,R1,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-144,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,97,2020.00000000000,R1,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-145,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-146,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-147,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,107,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-148,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2025.00000000000,R1,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-149,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,112,2020.00000000000,R1,residential,0.33622632305,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-150,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2025.00000000000,R1,residential,0.15055208400,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2025.00000000000,R1,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-152,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,137,2020.00000000000,R1,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,139,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-154,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,141,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-155,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,147,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-156,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,148,2025.00000000000,R1,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-157,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,152,2020.00000000000,R1,residential,0.50423247428,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,154,2025.00000000000,R1,residential,0.22578020999,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-159,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,156,2025.00000000000,R1,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-160,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,177,2020.00000000000,R1,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-161,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-162,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-163,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-164,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,188,2025.00000000000,R1,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-165,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,192,2020.00000000000,R1,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-166,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,194,2025.00000000000,R1,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-167,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,196,2025.00000000000,R1,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-168,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,217,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-169,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,219,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-170,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,221,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-171,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,227,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-172,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,228,2025.00000000000,R1,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-173,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,232,2020.00000000000,R1,residential,0.67288068724,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-174,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2025.00000000000,R1,residential,0.30129583201,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-175,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2025.00000000000,R1,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,257,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,259,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-178,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,261,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-179,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,267,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-180,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,268,2025.00000000000,R1,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-181,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,272,2020.00000000000,R1,residential,0.67288068724,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,274,2025.00000000000,R1,residential,0.30129583201,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-183,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,276,2025.00000000000,R1,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-184,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,297,2020.00000000000,R1,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,299,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-186,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,301,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-187,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,307,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-188,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,308,2025.00000000000,R1,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,312,2020.00000000000,R1,residential,0.67288068724,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-190,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,314,2025.00000000000,R1,residential,0.30129583201,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-191,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,316,2025.00000000000,R1,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-192,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-193,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,21,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-195,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,27,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-196,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,28,2025.00000000000,R2,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-197,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,32,2020.00000000000,R2,residential,0.33622632305,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,34,2025.00000000000,R2,residential,0.15055208400,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-199,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,36,2025.00000000000,R2,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-200,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-201,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,59,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-202,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,61,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-203,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,67,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-204,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,68,2025.00000000000,R2,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-205,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,72,2020.00000000000,R2,residential,0.50423247428,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-206,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,74,2025.00000000000,R2,residential,0.22578020999,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,76,2025.00000000000,R2,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-208,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,97,2020.00000000000,R2,residential,0.37188194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-209,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-210,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-211,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,107,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-212,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,108,2025.00000000000,R2,residential,1.84441298123,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-213,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,112,2020.00000000000,R2,residential,0.33622632305,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-214,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2025.00000000000,R2,residential,0.15055208400,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-215,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2025.00000000000,R2,residential,0.03688825962,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-216,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,137,2020.00000000000,R2,residential,0.55782291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-217,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,139,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-218,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,141,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-219,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,147,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-220,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,148,2025.00000000000,R2,residential,2.76603245307,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-221,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,152,2020.00000000000,R2,residential,0.50423247428,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-222,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,154,2025.00000000000,R2,residential,0.22578020999,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-223,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,156,2025.00000000000,R2,residential,0.05532064906,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-224,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,177,2020.00000000000,R2,residential,1.11616666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-225,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-226,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-227,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,187,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-228,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,188,2025.00000000000,R2,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-229,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,192,2020.00000000000,R2,residential,1.00900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-230,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,194,2025.00000000000,R2,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-231,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,196,2025.00000000000,R2,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-232,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,217,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-233,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,219,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-234,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,221,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-235,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,227,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-236,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,228,2025.00000000000,R2,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-237,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,232,2020.00000000000,R2,residential,0.67288068724,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-238,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2025.00000000000,R2,residential,0.30129583201,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-239,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2025.00000000000,R2,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-240,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,257,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-241,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,259,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-242,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,261,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-243,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,267,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-244,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,268,2025.00000000000,R2,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-245,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,272,2020.00000000000,R2,residential,0.67288068724,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-246,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,274,2025.00000000000,R2,residential,0.30129583201,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-247,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,276,2025.00000000000,R2,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-248,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,297,2020.00000000000,R2,residential,0.74428472546,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-249,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,299,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-250,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,301,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-251,A2,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,307,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-252,A2,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,308,2025.00000000000,R2,residential,3.69117403754,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-253,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,312,2020.00000000000,R2,residential,0.67288068724,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-254,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,314,2025.00000000000,R2,residential,0.30129583201,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-255,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,316,2025.00000000000,R2,residential,0.07382348075,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16890338094,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.33319972042,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.14993987419,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.13873858812,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.74498826672,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.25333124605,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.49975257977,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.22488866090,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.20808831184,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.61554354450,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.16890338094,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.33319972042,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2025.00000000000,R1,power,0.14993987419,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2025.00000000000,R1,power,0.13873858812,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2025.00000000000,R1,power,13.74498826672,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.25333124605,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.49975257977,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.22488866090,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.20808831184,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.61554354450,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.50691333333,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,1.00000000000,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.41638266667,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.33803377775,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.66684728043,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.30008127620,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.27766364889,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.50845058886,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.33803377775,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.66684728043,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.30008127620,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.27766364889,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2025.00000000000,R1,power,27.50845058886,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.33803377775,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.66684728043,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2025.00000000000,R1,power,0.30008127620,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.27766364889,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2025.00000000000,R1,power,27.50845058886,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.16890338094,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.33319972042,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.14993987419,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.13873858812,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,12,2025.00000000000,R2,power,13.74498826672,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,25,2020.00000000000,R2,power,0.25333124605,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-46,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,26,2020.00000000000,R2,power,0.49975257977,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,27,2025.00000000000,R2,power,0.22488866090,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-48,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,28,2025.00000000000,R2,power,0.20808831184,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-49,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,37,2025.00000000000,R2,power,20.61554354450,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2020.00000000000,R2,power,0.16890338094,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2020.00000000000,R2,power,0.33319972042,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,52,2025.00000000000,R2,power,0.14993987419,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,53,2025.00000000000,R2,power,0.13873858812,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,62,2025.00000000000,R2,power,13.74498826672,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2020.00000000000,R2,power,0.25333124605,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,76,2020.00000000000,R2,power,0.49975257977,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-57,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,77,2025.00000000000,R2,power,0.22488866090,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-58,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,78,2025.00000000000,R2,power,0.20808831184,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,87,2025.00000000000,R2,power,20.61554354450,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,100,2020.00000000000,R2,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,101,2020.00000000000,R2,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,102,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,103,2025.00000000000,R2,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-64,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,112,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-65,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2020.00000000000,R2,power,0.33803377775,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-66,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2020.00000000000,R2,power,0.66684728043,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-67,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,127,2025.00000000000,R2,power,0.30008127620,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-68,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,128,2025.00000000000,R2,power,0.27766364889,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,137,2025.00000000000,R2,power,27.50845058886,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.33803377775,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.66684728043,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2025.00000000000,R2,power,0.30008127620,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2025.00000000000,R2,power,0.27766364889,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,162,2025.00000000000,R2,power,27.50845058886,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-75,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.33803377775,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-76,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.66684728043,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2025.00000000000,R2,power,0.30008127620,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-78,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,178,2025.00000000000,R2,power,0.27766364889,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,187,2025.00000000000,R2,power,27.50845058886,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.28113679493,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.14656609349,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.42166654086,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.21982898989,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.28113679493,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2025.00000000000,R1,gas,0.14656609349,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2020.00000000000,R1,gas,0.42166654086,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.21982898989,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,0.84375000000,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.43987533333,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.56265185661,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.29332939019,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2020.00000000000,R1,gas,0.56265185661,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2025.00000000000,R1,gas,0.29332939019,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2020.00000000000,R1,gas,0.56265185661,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2025.00000000000,R1,gas,0.29332939019,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2020.00000000000,R2,gas,0.28113679493,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2025.00000000000,R2,gas,0.14656609349,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2020.00000000000,R2,gas,0.42166654086,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.21982898989,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2020.00000000000,R2,gas,0.28113679493,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2025.00000000000,R2,gas,0.14656609349,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2020.00000000000,R2,gas,0.42166654086,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.21982898989,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2020.00000000000,R2,gas,0.84375000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2025.00000000000,R2,gas,0.43987533333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2020.00000000000,R2,gas,0.56265185661,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,16,2025.00000000000,R2,gas,0.29332939019,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,18,2020.00000000000,R2,gas,0.56265185661,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,19,2025.00000000000,R2,gas,0.29332939019,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,21,2020.00000000000,R2,gas,0.56265185661,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,22,2025.00000000000,R2,gas,0.29332939019,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2025.00000000000,R1,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,32,2025.00000000000,R1,residential,0.15055866044,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,34,2025.00000000000,R1,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-7,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,36,2030.00000000000,R1,residential,0.41955146857,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,59,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,61,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2025.00000000000,R1,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,72,2025.00000000000,R1,residential,0.22577598133,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,74,2025.00000000000,R1,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-15,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,76,2030.00000000000,R1,residential,0.62915440571,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,97,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-18,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,106,2025.00000000000,R1,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,112,2025.00000000000,R1,residential,0.15055866044,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2025.00000000000,R1,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-23,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2030.00000000000,R1,residential,0.41955146857,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-24,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,137,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,139,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,141,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,145,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-28,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,146,2025.00000000000,R1,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-29,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,152,2025.00000000000,R1,residential,0.22577598133,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,154,2025.00000000000,R1,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-31,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,156,2030.00000000000,R1,residential,0.62915440571,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-32,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,177,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-34,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-35,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-36,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,186,2025.00000000000,R1,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-37,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,192,2025.00000000000,R1,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,194,2025.00000000000,R1,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,196,2030.00000000000,R1,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,217,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,219,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-42,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,221,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2025.00000000000,R1,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-45,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,232,2025.00000000000,R1,residential,0.30130334889,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-46,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2025.00000000000,R1,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-47,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2030.00000000000,R1,residential,0.83962132858,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-48,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,257,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,259,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-50,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,261,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,265,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,266,2025.00000000000,R1,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-53,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,272,2025.00000000000,R1,residential,0.30130334889,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-54,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,274,2025.00000000000,R1,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-55,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,276,2030.00000000000,R1,residential,0.83962132858,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,297,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,299,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-58,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,301,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-59,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,305,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-60,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,306,2025.00000000000,R1,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-61,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,312,2025.00000000000,R1,residential,0.30130334889,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,314,2025.00000000000,R1,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-63,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,316,2030.00000000000,R1,residential,0.83962132858,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-65,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-66,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,21,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,26,2025.00000000000,R2,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-69,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,32,2025.00000000000,R2,residential,0.15055866044,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-70,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,34,2025.00000000000,R2,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-71,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,36,2030.00000000000,R2,residential,0.41955146857,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-72,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,59,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-74,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,61,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-75,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-76,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,66,2025.00000000000,R2,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,72,2025.00000000000,R2,residential,0.22577598133,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-78,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,74,2025.00000000000,R2,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-79,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,76,2030.00000000000,R2,residential,0.62915440571,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-80,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,97,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-83,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,105,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-84,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,106,2025.00000000000,R2,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-85,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,112,2025.00000000000,R2,residential,0.15055866044,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2025.00000000000,R2,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-87,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2030.00000000000,R2,residential,0.41955146857,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-88,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,137,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-89,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,139,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-90,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,141,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,145,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,146,2025.00000000000,R2,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-93,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,152,2025.00000000000,R2,residential,0.22577598133,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-94,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,154,2025.00000000000,R2,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,156,2030.00000000000,R2,residential,0.62915440571,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-96,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,177,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-97,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-98,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,186,2025.00000000000,R2,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-101,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,192,2025.00000000000,R2,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-102,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,194,2025.00000000000,R2,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-103,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,196,2030.00000000000,R2,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-104,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,217,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-105,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,219,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-106,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,221,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-107,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-108,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2025.00000000000,R2,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-109,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,232,2025.00000000000,R2,residential,0.30130334889,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-110,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2025.00000000000,R2,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-111,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2030.00000000000,R2,residential,0.83962132858,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-112,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,257,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-113,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,259,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-114,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,261,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-115,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,265,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-116,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,266,2025.00000000000,R2,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-117,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,272,2025.00000000000,R2,residential,0.30130334889,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-118,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,274,2025.00000000000,R2,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-119,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,276,2030.00000000000,R2,residential,0.83962132858,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-120,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,297,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-121,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,299,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-122,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,301,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-123,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,305,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-124,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,306,2025.00000000000,R2,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-125,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,312,2025.00000000000,R2,residential,0.30130334889,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-126,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,314,2025.00000000000,R2,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-127,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,316,2030.00000000000,R2,residential,0.83962132858,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-128,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,17,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-129,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-130,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,21,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-131,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-132,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2025.00000000000,R1,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-133,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,32,2025.00000000000,R1,residential,0.15055866044,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-134,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,34,2025.00000000000,R1,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-135,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,36,2030.00000000000,R1,residential,0.41955146857,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-136,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-137,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,59,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-138,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,61,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-139,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-140,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2025.00000000000,R1,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-141,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,72,2025.00000000000,R1,residential,0.22577598133,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-142,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,74,2025.00000000000,R1,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-143,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,76,2030.00000000000,R1,residential,0.62915440571,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-144,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,97,2025.00000000000,R1,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-145,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,99,2025.00000000000,R1,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-146,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,101,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-147,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,105,2025.00000000000,R1,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-148,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,106,2025.00000000000,R1,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-149,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,112,2025.00000000000,R1,residential,0.15055866044,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-150,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2025.00000000000,R1,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-151,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2030.00000000000,R1,residential,0.41955146857,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-152,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,137,2025.00000000000,R1,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-153,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,139,2025.00000000000,R1,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-154,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,141,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-155,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,145,2025.00000000000,R1,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-156,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,146,2025.00000000000,R1,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-157,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,152,2025.00000000000,R1,residential,0.22577598133,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-158,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,154,2025.00000000000,R1,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-159,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,156,2030.00000000000,R1,residential,0.62915440571,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-160,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,177,2025.00000000000,R1,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-161,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,179,2025.00000000000,R1,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-162,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,181,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-163,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,185,2025.00000000000,R1,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-164,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,186,2025.00000000000,R1,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-165,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,192,2025.00000000000,R1,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-166,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,194,2025.00000000000,R1,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-167,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,196,2030.00000000000,R1,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-168,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,217,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-169,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,219,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-170,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,221,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-171,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-172,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2025.00000000000,R1,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-173,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,232,2025.00000000000,R1,residential,0.30130334889,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-174,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2025.00000000000,R1,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-175,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2030.00000000000,R1,residential,0.83962132858,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-176,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,257,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-177,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,259,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-178,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,261,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-179,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,265,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-180,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,266,2025.00000000000,R1,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-181,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,272,2025.00000000000,R1,residential,0.30130334889,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-182,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,274,2025.00000000000,R1,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-183,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,276,2030.00000000000,R1,residential,0.83962132858,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-184,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,297,2025.00000000000,R1,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-185,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,299,2025.00000000000,R1,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-186,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,301,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-187,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,305,2025.00000000000,R1,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-188,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,306,2025.00000000000,R1,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-189,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,312,2025.00000000000,R1,residential,0.30130334889,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-190,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,314,2025.00000000000,R1,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-191,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,316,2030.00000000000,R1,residential,0.83962132858,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-192,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,17,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-193,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,19,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-194,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,21,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-195,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,25,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-196,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,26,2025.00000000000,R2,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-197,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,32,2025.00000000000,R2,residential,0.15055866044,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-198,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,34,2025.00000000000,R2,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-199,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,36,2030.00000000000,R2,residential,0.41955146857,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-200,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,57,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-201,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,59,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-202,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,61,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-203,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-204,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,66,2025.00000000000,R2,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-205,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,72,2025.00000000000,R2,residential,0.22577598133,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-206,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,74,2025.00000000000,R2,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-207,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,76,2030.00000000000,R2,residential,0.62915440571,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-208,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,97,2025.00000000000,R2,residential,0.04462361176,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-209,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,99,2025.00000000000,R2,residential,0.17849444704,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-210,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,101,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-211,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,105,2025.00000000000,R2,residential,2.88759391694,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-212,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,106,2025.00000000000,R2,residential,1.84449354927,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-213,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,112,2025.00000000000,R2,residential,0.15055866044,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-214,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2025.00000000000,R2,residential,0.03688987099,gasstove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-215,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2030.00000000000,R2,residential,0.41955146857,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-216,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,137,2025.00000000000,R2,residential,0.06693541764,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-217,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,139,2025.00000000000,R2,residential,0.26774167056,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-218,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,141,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-219,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,145,2025.00000000000,R2,residential,4.33139087541,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-220,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,146,2025.00000000000,R2,residential,2.76598064782,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-221,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,152,2025.00000000000,R2,residential,0.22577598133,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-222,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,154,2025.00000000000,R2,residential,0.05531961296,gasstove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-223,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,156,2030.00000000000,R2,residential,0.62915440571,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-224,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,177,2025.00000000000,R2,residential,0.13393333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-225,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,179,2025.00000000000,R2,residential,0.53573333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-226,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,181,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-227,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,185,2025.00000000000,R2,residential,8.66682600000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-228,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,186,2025.00000000000,R2,residential,5.53500000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-229,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,192,2025.00000000000,R2,residential,0.45180000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-230,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,194,2025.00000000000,R2,residential,0.11070000000,gasstove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-231,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,196,2030.00000000000,R2,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-232,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,217,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-233,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,219,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-234,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,221,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-235,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,225,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-236,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2025.00000000000,R2,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-237,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,232,2025.00000000000,R2,residential,0.30130334889,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-238,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2025.00000000000,R2,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-239,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2030.00000000000,R2,residential,0.83962132858,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-240,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,257,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-241,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,259,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-242,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,261,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-243,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,265,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-244,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,266,2025.00000000000,R2,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-245,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,272,2025.00000000000,R2,residential,0.30130334889,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-246,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,274,2025.00000000000,R2,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-247,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,276,2030.00000000000,R2,residential,0.83962132858,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-248,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,297,2025.00000000000,R2,residential,0.08930972157,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-249,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,299,2025.00000000000,R2,residential,0.35723888630,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-250,A2,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,301,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-251,A2,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,305,2025.00000000000,R2,residential,5.77923208306,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-252,A2,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,306,2025.00000000000,R2,residential,3.69126612682,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-253,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,312,2025.00000000000,R2,residential,0.30130334889,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-254,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,314,2025.00000000000,R2,residential,0.07382532254,gasstove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-255,A2,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,316,2030.00000000000,R2,residential,0.83962132858,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16890634907,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.33320557571,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.14994250907,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.13874102616,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.15518494346,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2025.00000000000,R1,power,13.74522980658,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,30,2020.00000000000,R1,power,0.25332933755,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.49974881482,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2025.00000000000,R1,power,0.22488696667,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.20808674418,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2030.00000000000,R1,power,0.23274968135,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,power,20.61538823437,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.16890634907,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.33320557571,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2025.00000000000,R1,power,0.14994250907,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2025.00000000000,R1,power,0.13874102616,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2030.00000000000,R1,power,0.15518494346,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,74,2025.00000000000,R1,power,13.74522980658,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.25332933755,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.49974881482,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2025.00000000000,R1,power,0.22488696667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.20808674418,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2030.00000000000,R1,power,0.23274968135,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2025.00000000000,R1,power,20.61538823437,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2030.00000000000,R1,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.33803717032,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.66685397304,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.30008428787,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.27766643557,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2030.00000000000,R1,power,0.31057612371,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2025.00000000000,R1,power,27.50872666892,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.33803717032,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.66685397304,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2025.00000000000,R1,power,0.30008428787,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.27766643557,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2030.00000000000,R1,power,0.31057612371,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,194,2025.00000000000,R1,power,27.50872666892,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.33803717032,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.66685397304,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2025.00000000000,R1,power,0.30008428787,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2025.00000000000,R1,power,0.27766643557,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2030.00000000000,R1,power,0.31057612371,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2025.00000000000,R1,power,27.50872666892,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.16890634907,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.33320557571,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.14994250907,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.13874102616,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.15518494346,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-53,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,14,2025.00000000000,R2,power,13.74522980658,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,30,2020.00000000000,R2,power,0.25332933755,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-55,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,31,2020.00000000000,R2,power,0.49974881482,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-56,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,32,2025.00000000000,R2,power,0.22488696667,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,33,2025.00000000000,R2,power,0.20808674418,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-58,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,34,2030.00000000000,R2,power,0.23274968135,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,44,2025.00000000000,R2,power,20.61538823437,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-60,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,60,2020.00000000000,R2,power,0.16890634907,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-61,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,61,2020.00000000000,R2,power,0.33320557571,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,62,2025.00000000000,R2,power,0.14994250907,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-63,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,63,2025.00000000000,R2,power,0.13874102616,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-64,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,64,2030.00000000000,R2,power,0.15518494346,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,74,2025.00000000000,R2,power,13.74522980658,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-66,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.25332933755,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-67,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.49974881482,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-68,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2025.00000000000,R2,power,0.22488696667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-69,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2025.00000000000,R2,power,0.20808674418,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-70,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2030.00000000000,R2,power,0.23274968135,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,104,2025.00000000000,R2,power,20.61538823437,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2020.00000000000,R2,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2020.00000000000,R2,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2025.00000000000,R2,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2030.00000000000,R2,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-77,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,134,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-78,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,150,2020.00000000000,R2,power,0.33803717032,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-79,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,151,2020.00000000000,R2,power,0.66685397304,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-80,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,152,2025.00000000000,R2,power,0.30008428787,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-81,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,153,2025.00000000000,R2,power,0.27766643557,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-82,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,154,2030.00000000000,R2,power,0.31057612371,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,164,2025.00000000000,R2,power,27.50872666892,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.33803717032,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,0.66685397304,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2025.00000000000,R2,power,0.30008428787,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2025.00000000000,R2,power,0.27766643557,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2030.00000000000,R2,power,0.31057612371,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-89,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,194,2025.00000000000,R2,power,27.50872666892,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-90,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.33803717032,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-91,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.66685397304,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-92,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2025.00000000000,R2,power,0.30008428787,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-93,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2025.00000000000,R2,power,0.27766643557,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-94,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2030.00000000000,R2,power,0.31057612371,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,224,2025.00000000000,R2,power,27.50872666892,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.14656771087,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.28114280053,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.21982581806,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.42166481111,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.14656771087,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.28114280053,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.21982581806,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.42166481111,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.43987234754,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,0.84375298579,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.29333038492,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.56265957495,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.29333038492,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.56265957495,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.29333038492,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.56265957495,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.14656771087,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.28114280053,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.21982581806,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.42166481111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.14656771087,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.28114280053,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.21982581806,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.42166481111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.43987234754,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.84375298579,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.29333038492,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.56265957495,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.29333038492,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.56265957495,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.29333038492,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.56265957495,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,24,2030.00000000000,R1,residential,0.41956537131,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,26,2035.00000000000,R1,residential,0.27076796202,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-5,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,54,2030.00000000000,R1,residential,0.62914546625,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,56,2035.00000000000,R1,residential,0.40602120042,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,84,2030.00000000000,R1,residential,0.41956537131,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,86,2035.00000000000,R1,residential,0.27076796202,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-12,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2030.00000000000,R1,residential,0.62914546625,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2035.00000000000,R1,residential,0.40602120042,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,144,2030.00000000000,R1,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,146,2035.00000000000,R1,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,163,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,165,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,174,2030.00000000000,R1,residential,0.83963721941,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,176,2035.00000000000,R1,residential,0.54186278059,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-24,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,193,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,195,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,204,2030.00000000000,R1,residential,0.83963721941,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,206,2035.00000000000,R1,residential,0.54186278059,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,223,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-29,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,225,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2030.00000000000,R1,residential,0.83963721941,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2035.00000000000,R1,residential,0.54186278059,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-32,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-34,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,24,2030.00000000000,R2,residential,0.41956537131,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,26,2035.00000000000,R2,residential,0.27076796202,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-37,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,54,2030.00000000000,R2,residential,0.62914546625,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,56,2035.00000000000,R2,residential,0.40602120042,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,84,2030.00000000000,R2,residential,0.41956537131,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-43,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,86,2035.00000000000,R2,residential,0.27076796202,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-44,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-46,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2030.00000000000,R2,residential,0.62914546625,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2035.00000000000,R2,residential,0.40602120042,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-48,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,144,2030.00000000000,R2,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,146,2035.00000000000,R2,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-52,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,163,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,165,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,174,2030.00000000000,R2,residential,0.83963721941,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,176,2035.00000000000,R2,residential,0.54186278059,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,193,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,195,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-58,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,204,2030.00000000000,R2,residential,0.83963721941,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,206,2035.00000000000,R2,residential,0.54186278059,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-60,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,223,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-61,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,225,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-62,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2030.00000000000,R2,residential,0.83963721941,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-63,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2035.00000000000,R2,residential,0.54186278059,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-65,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,24,2030.00000000000,R1,residential,0.41956537131,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-67,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,26,2035.00000000000,R1,residential,0.27076796202,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-68,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-69,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-70,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,54,2030.00000000000,R1,residential,0.62914546625,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,56,2035.00000000000,R1,residential,0.40602120042,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-72,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2030.00000000000,R1,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-73,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-74,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,84,2030.00000000000,R1,residential,0.41956537131,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-75,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,86,2035.00000000000,R1,residential,0.27076796202,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2030.00000000000,R1,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-77,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2030.00000000000,R1,residential,0.62914546625,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-79,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2035.00000000000,R1,residential,0.40602120042,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-80,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2030.00000000000,R1,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-81,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-82,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,144,2030.00000000000,R1,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-83,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,146,2035.00000000000,R1,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-84,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,163,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-85,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,165,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-86,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,174,2030.00000000000,R1,residential,0.83963721941,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-87,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,176,2035.00000000000,R1,residential,0.54186278059,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,193,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-89,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,195,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,204,2030.00000000000,R1,residential,0.83963721941,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-91,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,206,2035.00000000000,R1,residential,0.54186278059,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-92,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,223,2030.00000000000,R1,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-93,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,225,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-94,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2030.00000000000,R1,residential,0.83963721941,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-95,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2035.00000000000,R1,residential,0.54186278059,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-96,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-97,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-98,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,24,2030.00000000000,R2,residential,0.41956537131,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-99,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,26,2035.00000000000,R2,residential,0.27076796202,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-100,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-101,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,54,2030.00000000000,R2,residential,0.62914546625,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-103,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,56,2035.00000000000,R2,residential,0.40602120042,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-104,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2030.00000000000,R2,residential,0.49088194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-106,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,84,2030.00000000000,R2,residential,0.41956537131,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,86,2035.00000000000,R2,residential,0.27076796202,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-108,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2030.00000000000,R2,residential,0.73632291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-109,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-110,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2030.00000000000,R2,residential,0.62914546625,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-111,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2035.00000000000,R2,residential,0.40602120042,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-112,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2030.00000000000,R2,residential,1.47333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-113,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,144,2030.00000000000,R2,residential,1.25900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-115,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,146,2035.00000000000,R2,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-116,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,163,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,165,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-118,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,174,2030.00000000000,R2,residential,0.83963721941,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-119,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,176,2035.00000000000,R2,residential,0.54186278059,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,193,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-121,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,195,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-122,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,204,2030.00000000000,R2,residential,0.83963721941,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-123,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,206,2035.00000000000,R2,residential,0.54186278059,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-124,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,223,2030.00000000000,R2,residential,0.98245139213,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-125,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,225,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2030.00000000000,R2,residential,0.83963721941,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-127,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2035.00000000000,R2,residential,0.54186278059,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16890852229,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.33320986287,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.14994443829,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.13874281126,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.15518694013,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.21744742515,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2025.00000000000,R1,power,13.74540665824,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2020.00000000000,R1,power,0.25332794017,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.49974605817,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2025.00000000000,R1,power,0.22488572618,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2025.00000000000,R1,power,0.20808559636,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,39,2030.00000000000,R1,power,0.23274839749,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2035.00000000000,R1,power,0.32612628163,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2025.00000000000,R1,power,20.61527451875,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2020.00000000000,R1,power,0.16890852229,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2020.00000000000,R1,power,0.33320986287,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2025.00000000000,R1,power,0.14994443829,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.13874281126,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2030.00000000000,R1,power,0.15518694013,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.21744742515,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,86,2025.00000000000,R1,power,13.74540665824,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2020.00000000000,R1,power,0.25332794017,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2020.00000000000,R1,power,0.49974605817,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2025.00000000000,R1,power,0.22488572618,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2025.00000000000,R1,power,0.20808559636,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,109,2030.00000000000,R1,power,0.23274839749,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2035.00000000000,R1,power,0.32612628163,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,121,2025.00000000000,R1,power,20.61527451875,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2025.00000000000,R1,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2030.00000000000,R1,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2035.00000000000,R1,power,0.65258400000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.33803965431,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.66685887326,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2025.00000000000,R1,power,0.30008649297,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2025.00000000000,R1,power,0.27766847594,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,179,2030.00000000000,R1,power,0.31057840591,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2035.00000000000,R1,power,0.43518143095,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,191,2025.00000000000,R1,power,27.50892881037,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.33803965431,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.66685887326,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2025.00000000000,R1,power,0.30008649297,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2025.00000000000,R1,power,0.27766847594,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2030.00000000000,R1,power,0.31057840591,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,215,2035.00000000000,R1,power,0.43518143095,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,226,2025.00000000000,R1,power,27.50892881037,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2020.00000000000,R1,power,0.33803965431,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2020.00000000000,R1,power,0.66685887326,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,247,2025.00000000000,R1,power,0.30008649297,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,248,2025.00000000000,R1,power,0.27766847594,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,249,2030.00000000000,R1,power,0.31057840591,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2035.00000000000,R1,power,0.43518143095,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,261,2025.00000000000,R1,power,27.50892881037,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.16890852229,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.33320986287,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.14994443829,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.13874281126,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.15518694013,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2035.00000000000,R2,power,0.21744742515,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-62,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2025.00000000000,R2,power,13.74540665824,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,35,2020.00000000000,R2,power,0.25332794017,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-64,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,36,2020.00000000000,R2,power,0.49974605817,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-65,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,37,2025.00000000000,R2,power,0.22488572618,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-66,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,38,2025.00000000000,R2,power,0.20808559636,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-67,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,39,2030.00000000000,R2,power,0.23274839749,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-68,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2035.00000000000,R2,power,0.32612628163,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-69,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,51,2025.00000000000,R2,power,20.61527451875,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-70,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,70,2020.00000000000,R2,power,0.16890852229,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-71,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,71,2020.00000000000,R2,power,0.33320986287,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-72,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,72,2025.00000000000,R2,power,0.14994443829,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-73,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,73,2025.00000000000,R2,power,0.13874281126,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-74,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,74,2030.00000000000,R2,power,0.15518694013,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-75,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,75,2035.00000000000,R2,power,0.21744742515,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-76,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,86,2025.00000000000,R2,power,13.74540665824,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-77,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,105,2020.00000000000,R2,power,0.25332794017,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-78,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,106,2020.00000000000,R2,power,0.49974605817,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,107,2025.00000000000,R2,power,0.22488572618,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-80,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,108,2025.00000000000,R2,power,0.20808559636,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-81,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,109,2030.00000000000,R2,power,0.23274839749,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-82,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,110,2035.00000000000,R2,power,0.32612628163,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-83,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,121,2025.00000000000,R2,power,20.61527451875,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-84,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2020.00000000000,R2,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-85,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2020.00000000000,R2,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-86,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,142,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-87,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,143,2025.00000000000,R2,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-88,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,144,2030.00000000000,R2,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-89,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,145,2035.00000000000,R2,power,0.65258400000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,156,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-91,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,175,2020.00000000000,R2,power,0.33803965431,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-92,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,176,2020.00000000000,R2,power,0.66685887326,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-93,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,177,2025.00000000000,R2,power,0.30008649297,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-94,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,178,2025.00000000000,R2,power,0.27766847594,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-95,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,179,2030.00000000000,R2,power,0.31057840591,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-96,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2035.00000000000,R2,power,0.43518143095,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-97,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,191,2025.00000000000,R2,power,27.50892881037,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-98,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,210,2020.00000000000,R2,power,0.33803965431,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-99,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,211,2020.00000000000,R2,power,0.66685887326,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-100,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,212,2025.00000000000,R2,power,0.30008649297,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-101,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,213,2025.00000000000,R2,power,0.27766847594,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-102,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,214,2030.00000000000,R2,power,0.31057840591,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-103,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,215,2035.00000000000,R2,power,0.43518143095,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-104,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,226,2025.00000000000,R2,power,27.50892881037,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-105,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2020.00000000000,R2,power,0.33803965431,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-106,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2020.00000000000,R2,power,0.66685887326,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-107,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,247,2025.00000000000,R2,power,0.30008649297,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-108,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,248,2025.00000000000,R2,power,0.27766847594,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-109,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,249,2030.00000000000,R2,power,0.31057840591,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-110,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,250,2035.00000000000,R2,power,0.43518143095,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-111,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,261,2025.00000000000,R2,power,27.50892881037,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.08580946893,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.16459774302,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.12869650221,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.24686266051,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.08580946893,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.16459774302,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.12869650221,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.24686266051,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.25752379654,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.49397620346,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.17173202880,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.32941241446,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.17173202880,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.32941241446,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.17173202880,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.32941241446,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.08580946893,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.16459774302,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.12869650221,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.24686266051,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.08580946893,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.16459774302,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.12869650221,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.24686266051,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.25752379654,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.49397620346,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.17173202880,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.32941241446,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.17173202880,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.32941241446,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.17173202880,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.32941241446,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,24,2035.00000000000,R1,residential,0.27077500179,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,26,2040.00000000000,R1,residential,0.50289166487,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-5,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,54,2035.00000000000,R1,residential,0.40601667385,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,56,2040.00000000000,R1,residential,0.75406665949,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,84,2035.00000000000,R1,residential,0.27077500179,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,86,2040.00000000000,R1,residential,0.50289166487,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-12,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2035.00000000000,R1,residential,0.40601667385,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2040.00000000000,R1,residential,0.75406665949,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,144,2035.00000000000,R1,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,146,2040.00000000000,R1,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-20,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,163,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,165,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,174,2035.00000000000,R1,residential,0.54187082705,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,176,2040.00000000000,R1,residential,1.00637917295,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-24,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,193,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,195,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,204,2035.00000000000,R1,residential,0.54187082705,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,206,2040.00000000000,R1,residential,1.00637917295,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,223,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-29,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,225,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2035.00000000000,R1,residential,0.54187082705,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2040.00000000000,R1,residential,1.00637917295,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-32,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-34,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,24,2035.00000000000,R2,residential,0.27077500179,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,26,2040.00000000000,R2,residential,0.50289166487,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-37,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,54,2035.00000000000,R2,residential,0.40601667385,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,56,2040.00000000000,R2,residential,0.75406665949,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,84,2035.00000000000,R2,residential,0.27077500179,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-43,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,86,2040.00000000000,R2,residential,0.50289166487,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-44,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-46,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2035.00000000000,R2,residential,0.40601667385,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2040.00000000000,R2,residential,0.75406665949,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-48,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,144,2035.00000000000,R2,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,146,2040.00000000000,R2,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-52,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,163,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,165,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,174,2035.00000000000,R2,residential,0.54187082705,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,176,2040.00000000000,R2,residential,1.00637917295,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,193,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,195,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-58,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,204,2035.00000000000,R2,residential,0.54187082705,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,206,2040.00000000000,R2,residential,1.00637917295,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-60,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,223,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-61,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,225,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-62,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2035.00000000000,R2,residential,0.54187082705,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-63,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2040.00000000000,R2,residential,1.00637917295,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-65,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,24,2035.00000000000,R1,residential,0.27077500179,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-67,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,26,2040.00000000000,R1,residential,0.50289166487,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-68,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-69,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-70,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,54,2035.00000000000,R1,residential,0.40601667385,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,56,2040.00000000000,R1,residential,0.75406665949,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-72,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-73,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-74,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,84,2035.00000000000,R1,residential,0.27077500179,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-75,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,86,2040.00000000000,R1,residential,0.50289166487,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2035.00000000000,R1,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-77,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2035.00000000000,R1,residential,0.40601667385,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-79,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2040.00000000000,R1,residential,0.75406665949,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-80,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2035.00000000000,R1,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-81,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-82,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,144,2035.00000000000,R1,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-83,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,146,2040.00000000000,R1,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-84,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,163,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-85,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,165,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-86,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,174,2035.00000000000,R1,residential,0.54187082705,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-87,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,176,2040.00000000000,R1,residential,1.00637917295,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,193,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-89,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,195,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,204,2035.00000000000,R1,residential,0.54187082705,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-91,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,206,2040.00000000000,R1,residential,1.00637917295,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-92,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,223,2035.00000000000,R1,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-93,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,225,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-94,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2035.00000000000,R1,residential,0.54187082705,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-95,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2040.00000000000,R1,residential,1.00637917295,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-96,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-97,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-98,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,24,2035.00000000000,R2,residential,0.27077500179,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-99,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,26,2040.00000000000,R2,residential,0.50289166487,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-100,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-101,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,54,2035.00000000000,R2,residential,0.40601667385,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-103,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,56,2040.00000000000,R2,residential,0.75406665949,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-104,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2035.00000000000,R2,residential,0.34211805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-106,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,84,2035.00000000000,R2,residential,0.27077500179,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,86,2040.00000000000,R2,residential,0.50289166487,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-108,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2035.00000000000,R2,residential,0.51317708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-109,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-110,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2035.00000000000,R2,residential,0.40601667385,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-111,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2040.00000000000,R2,residential,0.75406665949,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-112,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2035.00000000000,R2,residential,1.02683333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-113,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,144,2035.00000000000,R2,residential,0.81250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-115,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,146,2040.00000000000,R2,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-116,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,163,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,165,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-118,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,174,2035.00000000000,R2,residential,0.54187082705,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-119,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,176,2040.00000000000,R2,residential,1.00637917295,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,193,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-121,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,195,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-122,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,204,2035.00000000000,R2,residential,0.54187082705,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-123,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,206,2040.00000000000,R2,residential,1.00637917295,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-124,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,223,2035.00000000000,R2,residential,0.68471527454,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-125,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,225,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2035.00000000000,R2,residential,0.54187082705,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-127,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2040.00000000000,R2,residential,1.00637917295,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16891019518,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.33321316303,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.14994592336,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.13874418539,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.15518847713,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.21744957878,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2040.00000000000,R1,power,0.15518847713,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2025.00000000000,R1,power,13.74554279467,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2020.00000000000,R1,power,0.25332686450,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2020.00000000000,R1,power,0.49974393617,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,47,2025.00000000000,R1,power,0.22488477128,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.20808471279,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2030.00000000000,R1,power,0.23274740921,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.32612489684,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2040.00000000000,R1,power,0.23274740921,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,65,2025.00000000000,R1,power,20.61518698303,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.16891019518,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.33321316303,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2025.00000000000,R1,power,0.14994592336,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2025.00000000000,R1,power,0.13874418539,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2030.00000000000,R1,power,0.15518847713,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2035.00000000000,R1,power,0.21744957878,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2040.00000000000,R1,power,0.15518847713,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2025.00000000000,R1,power,13.74554279467,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2020.00000000000,R1,power,0.25332686450,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2020.00000000000,R1,power,0.49974393617,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,137,2025.00000000000,R1,power,0.22488477128,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2025.00000000000,R1,power,0.20808471279,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,139,2030.00000000000,R1,power,0.23274740921,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2035.00000000000,R1,power,0.32612489684,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2040.00000000000,R1,power,0.23274740921,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,155,2025.00000000000,R1,power,20.61518698303,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2025.00000000000,R1,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2030.00000000000,R1,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2035.00000000000,R1,power,0.65258400000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,186,2040.00000000000,R1,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2020.00000000000,R1,power,0.33804156643,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2020.00000000000,R1,power,0.66686264534,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2025.00000000000,R1,power,0.30008819040,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2025.00000000000,R1,power,0.27767004657,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,229,2030.00000000000,R1,power,0.31058016269,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2035.00000000000,R1,power,0.43518389255,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,231,2040.00000000000,R1,power,0.31058016269,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,245,2025.00000000000,R1,power,27.50908441430,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,270,2020.00000000000,R1,power,0.33804156643,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,271,2020.00000000000,R1,power,0.66686264534,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,272,2025.00000000000,R1,power,0.30008819040,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,273,2025.00000000000,R1,power,0.27767004657,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,274,2030.00000000000,R1,power,0.31058016269,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,275,2035.00000000000,R1,power,0.43518389255,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,276,2040.00000000000,R1,power,0.31058016269,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,290,2025.00000000000,R1,power,27.50908441430,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,315,2020.00000000000,R1,power,0.33804156643,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,316,2020.00000000000,R1,power,0.66686264534,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,317,2025.00000000000,R1,power,0.30008819040,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,318,2025.00000000000,R1,power,0.27767004657,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,319,2030.00000000000,R1,power,0.31058016269,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,320,2035.00000000000,R1,power,0.43518389255,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,321,2040.00000000000,R1,power,0.31058016269,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-63,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,335,2025.00000000000,R1,power,27.50908441430,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2020.00000000000,R2,power,0.16891019518,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2020.00000000000,R2,power,0.33321316303,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2025.00000000000,R2,power,0.14994592336,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2025.00000000000,R2,power,0.13874418539,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2030.00000000000,R2,power,0.15518847713,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2035.00000000000,R2,power,0.21744957878,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2040.00000000000,R2,power,0.15518847713,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-71,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,20,2025.00000000000,R2,power,13.74554279467,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2020.00000000000,R2,power,0.25332686450,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2020.00000000000,R2,power,0.49974393617,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,47,2025.00000000000,R2,power,0.22488477128,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,48,2025.00000000000,R2,power,0.20808471279,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,49,2030.00000000000,R2,power,0.23274740921,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,50,2035.00000000000,R2,power,0.32612489684,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,51,2040.00000000000,R2,power,0.23274740921,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-79,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,65,2025.00000000000,R2,power,20.61518698303,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,90,2020.00000000000,R2,power,0.16891019518,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,91,2020.00000000000,R2,power,0.33321316303,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,92,2025.00000000000,R2,power,0.14994592336,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,93,2025.00000000000,R2,power,0.13874418539,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,94,2030.00000000000,R2,power,0.15518847713,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,95,2035.00000000000,R2,power,0.21744957878,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,96,2040.00000000000,R2,power,0.15518847713,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-87,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,110,2025.00000000000,R2,power,13.74554279467,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,135,2020.00000000000,R2,power,0.25332686450,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,136,2020.00000000000,R2,power,0.49974393617,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,137,2025.00000000000,R2,power,0.22488477128,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,138,2025.00000000000,R2,power,0.20808471279,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,139,2030.00000000000,R2,power,0.23274740921,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,140,2035.00000000000,R2,power,0.32612489684,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,141,2040.00000000000,R2,power,0.23274740921,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-95,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,155,2025.00000000000,R2,power,20.61518698303,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,180,2020.00000000000,R2,power,0.50691333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,181,2020.00000000000,R2,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,182,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,183,2025.00000000000,R2,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,184,2030.00000000000,R2,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,185,2035.00000000000,R2,power,0.65258400000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,186,2040.00000000000,R2,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-103,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,200,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,225,2020.00000000000,R2,power,0.33804156643,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,226,2020.00000000000,R2,power,0.66686264534,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,227,2025.00000000000,R2,power,0.30008819040,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,228,2025.00000000000,R2,power,0.27767004657,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,229,2030.00000000000,R2,power,0.31058016269,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,230,2035.00000000000,R2,power,0.43518389255,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,231,2040.00000000000,R2,power,0.31058016269,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-111,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,245,2025.00000000000,R2,power,27.50908441430,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,270,2020.00000000000,R2,power,0.33804156643,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,271,2020.00000000000,R2,power,0.66686264534,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,272,2025.00000000000,R2,power,0.30008819040,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,273,2025.00000000000,R2,power,0.27767004657,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,274,2030.00000000000,R2,power,0.31058016269,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,275,2035.00000000000,R2,power,0.43518389255,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,276,2040.00000000000,R2,power,0.31058016269,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-119,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,290,2025.00000000000,R2,power,27.50908441430,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,315,2020.00000000000,R2,power,0.33804156643,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,316,2020.00000000000,R2,power,0.66686264534,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,317,2025.00000000000,R2,power,0.30008819040,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,318,2025.00000000000,R2,power,0.27767004657,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,319,2030.00000000000,R2,power,0.31058016269,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,320,2035.00000000000,R2,power,0.43518389255,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,321,2040.00000000000,R2,power,0.31058016269,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-127,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,335,2025.00000000000,R2,power,27.50908441430,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.08581031880,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.16459937321,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.12869595574,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.24686161229,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.08581031880,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.16459937321,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.12869595574,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.24686161229,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.25752379654,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.49397620346,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.17173300020,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.32941427777,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.17173300020,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.32941427777,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.17173300020,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.32941427777,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.08581031880,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.16459937321,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.12869595574,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.24686161229,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.08581031880,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.16459937321,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.12869595574,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.24686161229,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.25752379654,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.49397620346,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.17173300020,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.32941427777,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.17173300020,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.32941427777,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.17173300020,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.32941427777,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,24,2040.00000000000,R1,residential,0.50290219716,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-3,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,26,2045.00000000000,R1,residential,0.35409780284,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-5,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2045.00000000000,R1,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,54,2040.00000000000,R1,residential,0.75405988723,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,56,2045.00000000000,R1,residential,0.53094011277,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,84,2040.00000000000,R1,residential,0.50290219716,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,86,2045.00000000000,R1,residential,0.35409780284,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-12,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2045.00000000000,R1,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2040.00000000000,R1,residential,0.75405988723,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2045.00000000000,R1,residential,0.53094011277,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2045.00000000000,R1,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,144,2040.00000000000,R1,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,146,2045.00000000000,R1,residential,1.06250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-20,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,163,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,165,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,174,2040.00000000000,R1,residential,1.00639121136,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,176,2045.00000000000,R1,residential,0.70860878864,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-24,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,193,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-25,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,195,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,204,2040.00000000000,R1,residential,1.00639121136,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,206,2045.00000000000,R1,residential,0.70860878864,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-28,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,223,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-29,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,225,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2040.00000000000,R1,residential,1.00639121136,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2045.00000000000,R1,residential,0.70860878864,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-32,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-34,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,24,2040.00000000000,R2,residential,0.50290219716,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,26,2045.00000000000,R2,residential,0.35409780284,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-37,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,54,2040.00000000000,R2,residential,0.75405988723,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,56,2045.00000000000,R2,residential,0.53094011277,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-40,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-41,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,84,2040.00000000000,R2,residential,0.50290219716,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-43,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,86,2045.00000000000,R2,residential,0.35409780284,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-44,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-46,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2040.00000000000,R2,residential,0.75405988723,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2045.00000000000,R2,residential,0.53094011277,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-48,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2045.00000000000,R2,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,144,2040.00000000000,R2,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,146,2045.00000000000,R2,residential,1.06250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-52,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,163,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,165,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-54,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,174,2040.00000000000,R2,residential,1.00639121136,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,176,2045.00000000000,R2,residential,0.70860878864,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-56,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,193,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-57,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,195,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-58,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,204,2040.00000000000,R2,residential,1.00639121136,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-59,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,206,2045.00000000000,R2,residential,0.70860878864,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-60,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,223,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-61,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,225,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-62,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2040.00000000000,R2,residential,1.00639121136,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-63,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2045.00000000000,R2,residential,0.70860878864,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-64,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,13,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-65,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,15,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-66,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,24,2040.00000000000,R1,residential,0.50290219716,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-67,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,26,2045.00000000000,R1,residential,0.35409780284,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-68,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-69,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,45,2045.00000000000,R1,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-70,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,54,2040.00000000000,R1,residential,0.75405988723,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-71,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,56,2045.00000000000,R1,residential,0.53094011277,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-72,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2040.00000000000,R1,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-73,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,75,2045.00000000000,R1,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-74,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,84,2040.00000000000,R1,residential,0.50290219716,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-75,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,86,2045.00000000000,R1,residential,0.35409780284,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-76,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,103,2040.00000000000,R1,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-77,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2045.00000000000,R1,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-78,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,114,2040.00000000000,R1,residential,0.75405988723,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-79,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,116,2045.00000000000,R1,residential,0.53094011277,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-80,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,133,2040.00000000000,R1,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-81,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,135,2045.00000000000,R1,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-82,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,144,2040.00000000000,R1,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-83,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,146,2045.00000000000,R1,residential,1.06250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-84,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,163,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-85,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,165,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-86,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,174,2040.00000000000,R1,residential,1.00639121136,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-87,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,176,2045.00000000000,R1,residential,0.70860878864,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-88,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,193,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-89,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,195,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-90,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,204,2040.00000000000,R1,residential,1.00639121136,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-91,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,206,2045.00000000000,R1,residential,0.70860878864,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-92,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,223,2040.00000000000,R1,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-93,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,225,2045.00000000000,R1,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-94,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,234,2040.00000000000,R1,residential,1.00639121136,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-95,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R1,236,2045.00000000000,R1,residential,0.70860878864,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-96,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,13,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-97,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,15,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-98,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,24,2040.00000000000,R2,residential,0.50290219716,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-99,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,26,2045.00000000000,R2,residential,0.35409780284,estove,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-100,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,43,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-101,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,45,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-102,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,54,2040.00000000000,R2,residential,0.75405988723,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-103,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,56,2045.00000000000,R2,residential,0.53094011277,estove,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-104,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,73,2040.00000000000,R2,residential,0.60988194120,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-105,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,75,2045.00000000000,R2,residential,0.46111805880,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-106,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,84,2040.00000000000,R2,residential,0.50290219716,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-107,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,86,2045.00000000000,R2,residential,0.35409780284,estove,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-108,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,103,2040.00000000000,R2,residential,0.91482291181,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-109,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,105,2045.00000000000,R2,residential,0.69167708819,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-110,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,114,2040.00000000000,R2,residential,0.75405988723,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-111,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,116,2045.00000000000,R2,residential,0.53094011277,estove,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-112,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,133,2040.00000000000,R2,residential,1.83050000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-113,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,135,2045.00000000000,R2,residential,1.38400000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-114,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,144,2040.00000000000,R2,residential,1.50900000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-115,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,146,2045.00000000000,R2,residential,1.06250000000,estove,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-116,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,163,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-117,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,165,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-118,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,174,2040.00000000000,R2,residential,1.00639121136,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-119,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,176,2045.00000000000,R2,residential,0.70860878864,estove,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-120,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,193,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-121,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,195,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-122,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,204,2040.00000000000,R2,residential,1.00639121136,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-123,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,206,2045.00000000000,R2,residential,0.70860878864,estove,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-124,A2,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,223,2040.00000000000,R2,residential,1.22061805880,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-125,A2,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R2,225,2045.00000000000,R2,residential,0.92288194120,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-126,A2,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,234,2040.00000000000,R2,residential,1.00639121136,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-127,A2,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,cook,R2,236,2045.00000000000,R2,residential,0.70860878864,estove,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.14994709569,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.13874527014,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.15518969044,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.21745127887,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2040.00000000000,R1,power,0.15518969044,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2045.00000000000,R1,power,0.48826106514,solarPV,"('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.16905590928,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2025.00000000000,R1,power,13.74565026181,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2025.00000000000,R1,power,0.22488401747,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.20808401530,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2030.00000000000,R1,power,0.23274662905,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.32612380368,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2040.00000000000,R1,power,0.23274662905,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2045.00000000000,R1,power,0.73227233511,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2045.00000000000,R1,power,0.25354257034,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,56,2025.00000000000,R1,power,20.61511788166,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2025.00000000000,R1,power,0.14994709569,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.13874527014,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.15518969044,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.21745127887,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2040.00000000000,R1,power,0.15518969044,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2045.00000000000,R1,power,0.48826106514,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,86,2045.00000000000,R1,power,0.16905590928,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,96,2025.00000000000,R1,power,13.74565026181,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2025.00000000000,R1,power,0.22488401747,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.20808401530,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2030.00000000000,R1,power,0.23274662905,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.32612380368,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2040.00000000000,R1,power,0.23274662905,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2045.00000000000,R1,power,0.73227233511,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2045.00000000000,R1,power,0.25354257034,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,136,2025.00000000000,R1,power,20.61511788166,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2025.00000000000,R1,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2030.00000000000,R1,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2035.00000000000,R1,power,0.65258400000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2040.00000000000,R1,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2045.00000000000,R1,power,1.46530000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,166,2045.00000000000,R1,power,0.50734666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-39,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,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,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2025.00000000000,R1,power,0.30008953037,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2025.00000000000,R1,power,0.27767128643,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2030.00000000000,R1,power,0.31058154951,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2035.00000000000,R1,power,0.43518583575,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2040.00000000000,R1,power,0.31058154951,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2045.00000000000,R1,power,0.97715819746,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2045.00000000000,R1,power,0.33833205097,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-47,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,216,2025.00000000000,R1,power,27.50920724925,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,240,2025.00000000000,R1,power,0.30008953037,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-49,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,241,2025.00000000000,R1,power,0.27767128643,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-50,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,242,2030.00000000000,R1,power,0.31058154951,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-51,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,243,2035.00000000000,R1,power,0.43518583575,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-52,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,244,2040.00000000000,R1,power,0.31058154951,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-53,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2045.00000000000,R1,power,0.97715819746,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-54,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2045.00000000000,R1,power,0.33833205097,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,256,2025.00000000000,R1,power,27.50920724925,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-56,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,280,2025.00000000000,R1,power,0.30008953037,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-57,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,281,2025.00000000000,R1,power,0.27767128643,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,282,2030.00000000000,R1,power,0.31058154951,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,283,2035.00000000000,R1,power,0.43518583575,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-60,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,284,2040.00000000000,R1,power,0.31058154951,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-61,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,285,2045.00000000000,R1,power,0.97715819746,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-62,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,286,2045.00000000000,R1,power,0.33833205097,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-63,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,296,2025.00000000000,R1,power,27.50920724925,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-64,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,0,2025.00000000000,R2,power,0.14994709569,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-65,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,1,2025.00000000000,R2,power,0.13874527014,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-66,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,2,2030.00000000000,R2,power,0.15518969044,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-67,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,3,2035.00000000000,R2,power,0.21745127887,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-68,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,4,2040.00000000000,R2,power,0.15518969044,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-69,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,5,2045.00000000000,R2,power,0.48826106514,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-70,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,6,2045.00000000000,R2,power,0.16905590928,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-71,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,16,2025.00000000000,R2,power,13.74565026181,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-72,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,40,2025.00000000000,R2,power,0.22488401747,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-73,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,41,2025.00000000000,R2,power,0.20808401530,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-74,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,42,2030.00000000000,R2,power,0.23274662905,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-75,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,43,2035.00000000000,R2,power,0.32612380368,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-76,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,44,2040.00000000000,R2,power,0.23274662905,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-77,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,45,2045.00000000000,R2,power,0.73227233511,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-78,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,46,2045.00000000000,R2,power,0.25354257034,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-79,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,56,2025.00000000000,R2,power,20.61511788166,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-80,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,80,2025.00000000000,R2,power,0.14994709569,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-81,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,81,2025.00000000000,R2,power,0.13874527014,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-82,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,82,2030.00000000000,R2,power,0.15518969044,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-83,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,83,2035.00000000000,R2,power,0.21745127887,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-84,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,84,2040.00000000000,R2,power,0.15518969044,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-85,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,85,2045.00000000000,R2,power,0.48826106514,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-86,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,86,2045.00000000000,R2,power,0.16905590928,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-87,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,96,2025.00000000000,R2,power,13.74565026181,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-88,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,120,2025.00000000000,R2,power,0.22488401747,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-89,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,121,2025.00000000000,R2,power,0.20808401530,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-90,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,122,2030.00000000000,R2,power,0.23274662905,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-91,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,123,2035.00000000000,R2,power,0.32612380368,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-92,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,124,2040.00000000000,R2,power,0.23274662905,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-93,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,125,2045.00000000000,R2,power,0.73227233511,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-94,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,126,2045.00000000000,R2,power,0.25354257034,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-95,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,136,2025.00000000000,R2,power,20.61511788166,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-96,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,160,2025.00000000000,R2,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-97,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,161,2025.00000000000,R2,power,0.41638266667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-98,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,162,2030.00000000000,R2,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-99,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,163,2035.00000000000,R2,power,0.65258400000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-100,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,164,2040.00000000000,R2,power,0.46573333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-101,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,165,2045.00000000000,R2,power,1.46530000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-102,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,166,2045.00000000000,R2,power,0.50734666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-103,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,176,2025.00000000000,R2,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-104,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,200,2025.00000000000,R2,power,0.30008953037,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-105,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,201,2025.00000000000,R2,power,0.27767128643,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-106,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,202,2030.00000000000,R2,power,0.31058154951,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-107,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,203,2035.00000000000,R2,power,0.43518583575,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-108,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,204,2040.00000000000,R2,power,0.31058154951,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-109,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,205,2045.00000000000,R2,power,0.97715819746,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-110,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,206,2045.00000000000,R2,power,0.33833205097,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-111,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,216,2025.00000000000,R2,power,27.50920724925,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-112,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,240,2025.00000000000,R2,power,0.30008953037,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-113,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,241,2025.00000000000,R2,power,0.27767128643,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-114,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,242,2030.00000000000,R2,power,0.31058154951,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-115,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,243,2035.00000000000,R2,power,0.43518583575,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-116,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,244,2040.00000000000,R2,power,0.31058154951,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-117,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,245,2045.00000000000,R2,power,0.97715819746,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-118,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,246,2045.00000000000,R2,power,0.33833205097,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-119,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,256,2025.00000000000,R2,power,27.50920724925,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-120,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,280,2025.00000000000,R2,power,0.30008953037,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-121,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,281,2025.00000000000,R2,power,0.27767128643,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-122,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,282,2030.00000000000,R2,power,0.31058154951,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-123,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,283,2035.00000000000,R2,power,0.43518583575,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-124,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,284,2040.00000000000,R2,power,0.31058154951,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-125,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,285,2045.00000000000,R2,power,0.97715819746,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-126,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R2,286,2045.00000000000,R2,power,0.33833205097,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-127,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R2,296,2025.00000000000,R2,power,27.50920724925,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.08581098969,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.16460066011,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.12869552436,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.24686078482,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.08581098969,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.16460066011,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.12869552436,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.24686078482,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.25752379654,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.49397620346,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.17173376703,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.32941574869,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.17173376703,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.32941574869,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.17173376703,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.32941574869,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,0,2025.00000000000,R2,gas,0.08581098969,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,1,2030.00000000000,R2,gas,0.16460066011,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,2,2025.00000000000,R2,gas,0.12869552436,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,3,2030.00000000000,R2,gas,0.24686078482,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,4,2025.00000000000,R2,gas,0.08581098969,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,5,2030.00000000000,R2,gas,0.16460066011,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,6,2025.00000000000,R2,gas,0.12869552436,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,7,2030.00000000000,R2,gas,0.24686078482,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,8,2025.00000000000,R2,gas,0.25752379654,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,9,2030.00000000000,R2,gas,0.49397620346,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,10,2025.00000000000,R2,gas,0.17173376703,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,11,2030.00000000000,R2,gas,0.32941574869,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,12,2025.00000000000,R2,gas,0.17173376703,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,13,2030.00000000000,R2,gas,0.32941574869,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,14,2025.00000000000,R2,gas,0.17173376703,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R2,15,2030.00000000000,R2,gas,0.32941574869,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/Results/MCAPrices.csv
deleted file mode 100644
index 15187c0c..00000000
--- a/docs/tutorial-code/5-add-service-demand/Results/MCAPrices.csv
+++ /dev/null
@@ -1,561 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.20930000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.20930000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.67600000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,0.67600000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.31400000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.31400000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.01390000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,1.01390000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.20930000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.20930000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.67600000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.67600000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.31400000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.31400000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.01390000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,1.01390000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.62830000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.62830000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.02890000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,2.02890000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.41900000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.41900000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.35300000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,1.35300000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.41900000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.41900000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,1.35300000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,1.35300000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.41900000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.41900000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.35300000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.35300000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.27480000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.27480000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07240000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.07240000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.05070000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.05070000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.41270000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.41270000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11290000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.11290000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.07980000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.07980000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27480000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27480000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07240000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07240000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05070000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05070000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41270000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41270000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11290000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11290000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.07980000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.07980000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.82830000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.82830000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.25150000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.25150000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.18280000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.18280000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.55120000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.55120000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15630000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.15630000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.11170000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,0.11170000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.55120000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.55120000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.15630000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.15630000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.11170000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.11170000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.55120000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.55120000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.11170000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.11170000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.30390000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.30390000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08200000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08200000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.05930000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.05930000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.45620000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.45620000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12860000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.12860000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.09410000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.09410000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30390000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30390000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08200000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08200000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05930000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05930000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.45620000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.45620000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12860000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12860000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.09410000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.09410000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.91500000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.91500000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.29120000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.29120000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.21880000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.21880000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.60920000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.60920000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17910000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.17910000000,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', 'evening')",cook,R1,0.13230000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.13230000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.60920000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.60920000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.17910000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.17910000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.13230000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.13230000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.60920000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.60920000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.13230000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.13230000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.31090000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.31090000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02160000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02160000000,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', 'night')",cook,R1,0.01330000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.01330000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.46650000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.46650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.03890000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.03890000000,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', 'morning')",cook,R1,0.02590000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.02590000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.31090000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.31090000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02160000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02160000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01330000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01330000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.46650000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.46650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03890000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03890000000,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', 'early-peak')",cook,R1,0.02590000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02590000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.93530000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.93530000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11710000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11710000000,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', 'late-peak')",cook,R1,0.08710000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.08710000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.62300000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.62300000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.06060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.06060000000,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', 'evening')",cook,R1,0.04240000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.04240000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.62300000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.62300000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06060000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.04240000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.04240000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.62300000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.62300000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.04240000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.04240000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.34340000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.34340000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02180000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02180000000,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', 'night')",cook,R1,0.01350000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.01350000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.51530000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.51530000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.03930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.03930000000,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', 'morning')",cook,R1,0.02630000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.02630000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.34340000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.34340000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02180000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02180000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01350000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01350000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.51530000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.51530000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03930000000,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', 'early-peak')",cook,R1,0.02630000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02630000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.03270000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.03270000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11880000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11880000000,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', 'late-peak')",cook,R1,0.08870000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.08870000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.68800000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.68800000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.06140000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.06140000000,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', 'evening')",cook,R1,0.04310000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.04310000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.68800000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.68800000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06140000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06140000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.04310000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.04310000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.68800000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.68800000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06140000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06140000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.04310000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.04310000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.36450000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.36450000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02270000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.02270000000,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', 'night')",cook,R1,0.01430000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.01430000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.54700000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.54700000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04140000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.04140000000,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', 'morning')",cook,R1,0.02810000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.02810000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.36450000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.36450000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02270000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02270000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01430000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01430000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.54700000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.54700000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04140000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04140000000,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', 'early-peak')",cook,R1,0.02810000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02810000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.09590000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.09590000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12720000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.12720000000,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', 'late-peak')",cook,R1,0.09620000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.09620000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.73020000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.73020000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.06510000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.06510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.04640000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.04640000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.73020000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.73020000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06510000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.04640000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.04640000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.73020000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.73020000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.04640000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.04640000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/generate_model.py b/docs/tutorial-code/5-add-service-demand/generate_model.py
deleted file mode 100644
index ae8395c1..00000000
--- a/docs/tutorial-code/5-add-service-demand/generate_model.py
+++ /dev/null
@@ -1 +0,0 @@
-# Follows similar process as 1-add-new-technology
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
new file mode 100644
index 00000000..92e466ab
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -0,0 +1,85 @@
+# Follows similar process as 1-add-new-technology
+
+
+import os
+import shutil
+import sys
+
+import pandas as pd
+from muse.wizard import add_new_commodity, add_new_process
+
+parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+
+"""
+Model 1 - New service demand
+
+"""
+
+
+def generate_model_1():
+    model_name = "1-new-service-demand"
+
+    # Starting point: copy model from tutorial 4
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+    shutil.copytree(
+        os.path.join(parent_path, "../4-modify-timing-data/1-modify-timeslices"),
+        model_path,
+    )
+
+    # Copy gas commodity in power sector -> cook
+    add_new_commodity(model_path, "cook", "residential", "heat")
+
+    # Modify cook projections
+    projections_file = os.path.join(model_path, "input/Projections.csv")
+    df = pd.read_csv(projections_file)
+    df.loc[1:, "cook"] = 100
+    df.to_csv(projections_file, index=False)
+
+    # Copy windturbine process in power sector -> cook
+    add_new_process(model_path, "estove", "residential", "heatpump")
+    add_new_process(model_path, "gas_stove", "residential", "gasboiler")
+
+    # Modify output commodities
+    commout_file = os.path.join(model_path, "technodata/residential/CommOut.csv")
+    df = pd.read_csv(commout_file)
+    df.loc[1:, "cook"] = 0
+    df.loc[df["ProcessName"] == "gas_stove", df.columns[-6:]] = [0, 0, 0, 50, 0, 1]
+    df.loc[df["ProcessName"] == "estove", df.columns[-6:]] = [0, 0, 0, 0, 0, 1]
+    df.to_csv(commout_file, index=False)
+
+    # Modify input commodities
+    commin_file = os.path.join(model_path, "technodata/residential/CommIn.csv")
+    df = pd.read_csv(commin_file)
+    df.loc[1:, "cook"] = 0
+    df.to_csv(commin_file, index=False)
+
+    # Change cap_par, Fuel and EndUse
+    technodata_file = os.path.join(model_path, "technodata/residential/technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[df["ProcessName"] == "gas_stove", "cap_par"] = 8.8667
+    df.loc[df["ProcessName"] == "gas_stove", "Fuel"] = "gas"
+    df.loc[df["ProcessName"] == "electric_stove", "Fuel"] = "electricity"
+    df.loc[df["ProcessName"] == "gas_stove", "EndUse"] = "cook"
+    df.loc[df["ProcessName"] == "electric_stove", "EndUse"] = "cook"
+    df.to_csv(technodata_file, index=False)
+
+    # Change power sector limits
+    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityAddition"] = 4
+    df.loc[1:, "MaxCapacityGrowth"] = 0.4
+    df.loc[1:, "TotalCapacityLimit"] = 60
+    df.to_csv(technodata_file, index=False)
+
+    # # Change gas supply limits
+    # technodata_file = os.path.join(model_path, "technodata/gas/technodata.csv")
+    # df = pd.read_csv(technodata_file)
+    # df.loc[df["ProcessName"] == "gassupply1", "MaxCapacityAddition"] = 100
+    # df.loc[df["ProcessName"] == "gassupply1", "MaxCapacityGrowth"] = 5
+
+
+if __name__ == "__main__":
+    generate_model_1()
diff --git a/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv b/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv
deleted file mode 100644
index 9cd98111..00000000
--- a/docs/tutorial-code/5-add-service-demand/input/GlobalCommodities.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
-Electricity,Energy,electricity,0,1,PJ
-Gas,Energy,gas,56.1,1,PJ
-Heat,Energy,heat,0,1,PJ
-Wind,Energy,wind,0,1,PJ
-CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
-Cook,Energy,cook,0,1,PJ
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv
deleted file mode 100644
index 3050e067..00000000
--- a/docs/tutorial-code/5-add-service-demand/technodata/Agents.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv
deleted file mode 100644
index 2d6ab112..00000000
--- a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2020Consumption.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,cook
-0,R1,gasboiler,1,0,0,0.714,0,0,0.714
-1,R1,gasboiler,2,0,0,1.071,0,0,1.071
-2,R1,gasboiler,3,0,0,0.714,0,0,0.714
-3,R1,gasboiler,4,0,0,1.071,0,0,1.071
-4,R1,gasboiler,5,0,0,2.143,0,0,2.143
-5,R1,gasboiler,6,0,0,1.429,0,0,1.429
-6,R1,gasboiler,7,0,0,1.429,0,0,1.429
-7,R1,gasboiler,8,0,0,1.429,0,0,1.429
-0,R2,gasboiler,1,0,0,0.714,0,0,0.714
-1,R2,gasboiler,2,0,0,1.071,0,0,1.071
-2,R2,gasboiler,3,0,0,0.714,0,0,0.714
-3,R2,gasboiler,4,0,0,1.071,0,0,1.071
-4,R2,gasboiler,5,0,0,2.143,0,0,2.143
-5,R2,gasboiler,6,0,0,1.429,0,0,1.429
-6,R2,gasboiler,7,0,0,1.429,0,0,1.429
-7,R2,gasboiler,8,0,0,1.429,0,0,1.429
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv
deleted file mode 100644
index a4f178dd..00000000
--- a/docs/tutorial-code/5-add-service-demand/technodata/preset/Residential2050Consumption.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,cook
-0,R1,gasboiler,1,0,0,2.142,0,0,1.714
-1,R1,gasboiler,2,0,0,3.213,0,0,2.57
-2,R1,gasboiler,3,0,0,2.142,0,0,1.714
-3,R1,gasboiler,4,0,0,3.213,0,0,2.57
-4,R1,gasboiler,5,0,0,6.429,0,0,5.143
-5,R1,gasboiler,6,0,0,4.287,0,0,3.43
-6,R1,gasboiler,7,0,0,4.287,0,0,3.43
-7,R1,gasboiler,8,0,0,4.287,0,0,3.43
-0,R2,gasboiler,1,0,0,2.142,0,0,1.714
-1,R2,gasboiler,2,0,0,3.213,0,0,2.57
-2,R2,gasboiler,3,0,0,2.142,0,0,1.714
-3,R2,gasboiler,4,0,0,3.213,0,0,2.57
-4,R2,gasboiler,5,0,0,6.429,0,0,5.143
-5,R2,gasboiler,6,0,0,4.287,0,0,3.43
-6,R2,gasboiler,7,0,0,4.287,0,0,3.43
-7,R2,gasboiler,8,0,0,4.287,0,0,3.43
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv
deleted file mode 100644
index 1a179abe..00000000
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/Agents.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent1,A1,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,1,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,2,R2,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv
deleted file mode 100644
index b0aeaa39..00000000
--- a/docs/tutorial-code/5-add-service-demand/technodata/residential/Technodata.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
-estove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,0.5,0.5
-gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,0.5,0.5
-estove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,0.5,0.5
-gasstove,R2,2020,fixed,8.866666667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,0.5,0.5
diff --git a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
index 930f6d8e..fc73ec22 100644
--- a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
+++ b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = (\n",
-    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    pd.read_csv(\"1-new-service-demand/Results/MCACapacity.csv\")\n",
     "    .groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
     "    .sum()\n",
     "    .reset_index()\n",
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index f2b5d1ca..57037532 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -71,6 +71,13 @@ def add_new_commodity(
     df = pd.concat([df, new_rows])
     df.to_csv(global_commodities_file, index=False)
 
+    # Add to projections
+    projections_files = os.listdir(os.path.join(model_path, "technodata/preset"))
+    for file in projections_files:
+        df = pd.read_csv(os.path.join(model_path, "technodata/preset", file))
+        df[commodity_name] = df[copy_from]
+        df.to_csv(os.path.join(model_path, "technodata/preset", file), index=False)
+
 
 def add_new_process(
     model_path: str, process_name: str, sector: str, copy_from: str

From 3bbcd02c596591e7b8499a340bdea61b6f067dfe Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 11:17:18 +0100
Subject: [PATCH 115/419] Delete more results, restructure

---
 .../input/BaseYearExport.csv                  |   0
 .../input/BaseYearImport.csv                  |   0
 .../input/GlobalCommodities.csv               |   0
 .../{ => 1-correlation}/input/Projections.csv |   0
 .../{ => 1-correlation}/settings.toml         |   0
 .../{ => 1-correlation}/technodata/Agents.csv |   0
 .../technodata/gas/CommIn.csv                 |   0
 .../technodata/gas/CommOut.csv                |   0
 .../technodata/gas/ExistingCapacity.csv       |   0
 .../technodata/gas/Technodata.csv             |   0
 .../technodata/power/CommIn.csv               |   0
 .../technodata/power/CommOut.csv              |   0
 .../technodata/power/ExistingCapacity.csv     |   0
 .../technodata/power/Technodata.csv           |   8 +-
 .../technodata/preset/Macrodrivers.csv        |   6 +-
 .../preset/TimesliceSharepreset.csv           |  16 +-
 .../preset/regressionparameters.csv           |   8 +-
 .../technodata/residential/CommIn.csv         |   0
 .../technodata/residential/CommOut.csv        |   0
 .../residential/ExistingCapacity.csv          |   0
 .../technodata/residential/Technodata.csv     |   6 +-
 .../Results/MCACapacity.csv                   |  58 --
 .../Results/MCAMetric_Consumption.csv         | 353 ------------
 .../Results/MCAMetric_Supply.csv              | 545 ------------------
 .../Results/MCAPrices.csv                     | 225 --------
 .../visualise-correlation-demand.ipynb        |   2 +-
 .../Results/Gas/Capacity/2020.csv             |   9 -
 .../Results/Gas/Capacity/2025.csv             |   8 -
 .../Results/Gas/Capacity/2030.csv             |   7 -
 .../Results/Gas/Capacity/2035.csv             |   6 -
 .../Results/Gas/Capacity/2040.csv             |   5 -
 .../Results/Gas/Capacity/2045.csv             |   4 -
 .../Results/Gas/Capacity/2050.csv             |   4 -
 .../1-min-constraint/Results/MCACapacity.csv  |  47 --
 .../1-min-constraint/Results/MCAPrices.csv    | 169 ------
 .../Results/Power/Capacity/2020.csv           |   9 -
 .../Results/Power/Capacity/2025.csv           |  15 -
 .../Results/Power/Capacity/2030.csv           |  21 -
 .../Results/Power/Capacity/2035.csv           |  28 -
 .../Results/Power/Capacity/2040.csv           |  35 --
 .../Results/Power/Capacity/2045.csv           |  41 --
 .../Results/Power/Capacity/2050.csv           |  41 --
 .../Power/Consumption_Timeslice/2020.csv      |  19 -
 .../Power/Consumption_Timeslice/2025.csv      |  25 -
 .../Power/Consumption_Timeslice/2030.csv      |  31 -
 .../Power/Consumption_Timeslice/2035.csv      |  43 --
 .../Power/Consumption_Timeslice/2040.csv      |  55 --
 .../Power/Consumption_Timeslice/2045.csv      |  61 --
 .../Power/Consumption_Timeslice/2050.csv      |  61 --
 .../Results/Power/Supply_Timeslice/2020.csv   |  31 -
 .../Results/Power/Supply_Timeslice/2025.csv   |  31 -
 .../Results/Power/Supply_Timeslice/2030.csv   |  31 -
 .../Results/Power/Supply_Timeslice/2035.csv   |  43 --
 .../Results/Power/Supply_Timeslice/2040.csv   |  55 --
 .../Results/Power/Supply_Timeslice/2045.csv   |  61 --
 .../Results/Power/Supply_Timeslice/2050.csv   |  61 --
 .../Results/Residential/Capacity/2020.csv     |   6 -
 .../Results/Residential/Capacity/2025.csv     |  13 -
 .../Results/Residential/Capacity/2030.csv     |  15 -
 .../Results/Residential/Capacity/2035.csv     |  17 -
 .../Results/Residential/Capacity/2040.csv     |  15 -
 .../Results/Residential/Capacity/2045.csv     |  13 -
 .../Results/Residential/Capacity/2050.csv     |  11 -
 .../Results/Residential/Supply/2020.csv       |  31 -
 .../Results/Residential/Supply/2025.csv       |  43 --
 .../Results/Residential/Supply/2030.csv       |  49 --
 .../Results/Residential/Supply/2035.csv       |  49 --
 .../Results/Residential/Supply/2040.csv       |  49 --
 .../Results/Residential/Supply/2045.csv       |  37 --
 .../Results/Residential/Supply/2050.csv       |  25 -
 .../Results/Gas/Capacity/2020.csv             |   9 -
 .../Results/Gas/Capacity/2025.csv             |   8 -
 .../Results/Gas/Capacity/2030.csv             |   7 -
 .../Results/Gas/Capacity/2035.csv             |   6 -
 .../Results/Gas/Capacity/2040.csv             |   5 -
 .../Results/Gas/Capacity/2045.csv             |   4 -
 .../Results/Gas/Capacity/2050.csv             |   4 -
 .../2-max-constraint/Results/MCACapacity.csv  |  29 -
 .../2-max-constraint/Results/MCAPrices.csv    | 169 ------
 .../Results/Power/Capacity/2020.csv           |   9 -
 .../Results/Power/Capacity/2025.csv           |   8 -
 .../Results/Power/Capacity/2030.csv           |   6 -
 .../Results/Power/Capacity/2035.csv           |   5 -
 .../Results/Power/Capacity/2040.csv           |   4 -
 .../Results/Power/Capacity/2045.csv           |   5 -
 .../Results/Power/Capacity/2050.csv           |   4 -
 .../Power/Consumption_Timeslice/2020.csv      |  13 -
 .../Power/Consumption_Timeslice/2025.csv      |  13 -
 .../Power/Consumption_Timeslice/2030.csv      |  13 -
 .../Power/Consumption_Timeslice/2035.csv      |  13 -
 .../Power/Consumption_Timeslice/2040.csv      |  13 -
 .../Power/Consumption_Timeslice/2045.csv      |  13 -
 .../Power/Consumption_Timeslice/2050.csv      |  13 -
 .../Results/Power/Supply_Timeslice/2020.csv   |  25 -
 .../Results/Power/Supply_Timeslice/2025.csv   |  19 -
 .../Results/Power/Supply_Timeslice/2030.csv   |  13 -
 .../Results/Power/Supply_Timeslice/2035.csv   |  13 -
 .../Results/Power/Supply_Timeslice/2040.csv   |  13 -
 .../Results/Power/Supply_Timeslice/2045.csv   |  13 -
 .../Results/Power/Supply_Timeslice/2050.csv   |  13 -
 .../Results/Residential/Capacity/2020.csv     |   8 -
 .../Results/Residential/Capacity/2025.csv     |   7 -
 .../Results/Residential/Capacity/2030.csv     |  11 -
 .../Results/Residential/Capacity/2035.csv     |   7 -
 .../Results/Residential/Capacity/2040.csv     |  11 -
 .../Results/Residential/Capacity/2045.csv     |   7 -
 .../Results/Residential/Capacity/2050.csv     |   9 -
 .../Results/Residential/Supply/2020.csv       |  31 -
 .../Results/Residential/Supply/2025.csv       |  37 --
 .../Results/Residential/Supply/2030.csv       |  37 --
 .../Results/Residential/Supply/2035.csv       |  37 --
 .../Results/Residential/Supply/2040.csv       |  37 --
 .../Results/Residential/Supply/2045.csv       |  37 --
 .../Results/Residential/Supply/2050.csv       |  37 --
 .../visualise-max-service.ipynb               |   4 +-
 .../visualise-min-service.ipynb               |   8 +-
 docs/user-guide/addition-service-demand.ipynb | 318 ----------
 117 files changed, 30 insertions(+), 3752 deletions(-)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/input/BaseYearExport.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/input/BaseYearImport.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/input/GlobalCommodities.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/input/Projections.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/settings.toml (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/Agents.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/gas/CommIn.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/gas/CommOut.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/gas/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/gas/Technodata.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/power/CommIn.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/power/CommOut.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/power/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/power/Technodata.csv (99%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/preset/Macrodrivers.csv (99%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/preset/TimesliceSharepreset.csv (96%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/preset/regressionparameters.csv (98%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/residential/CommIn.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/residential/CommOut.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/residential/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/6-add-correlation-demand/{ => 1-correlation}/technodata/residential/Technodata.csv (99%)
 delete mode 100644 docs/tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Supply.csv
 delete mode 100644 docs/tutorial-code/6-add-correlation-demand/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
 rename docs/tutorial-code/7-min-max-timeslice-constraints/{2-max-constraint => }/visualise-max-service.ipynb (90%)
 rename docs/tutorial-code/7-min-max-timeslice-constraints/{1-min-constraint => }/visualise-min-service.ipynb (90%)
 delete mode 100644 docs/user-guide/addition-service-demand.ipynb

diff --git a/docs/tutorial-code/6-add-correlation-demand/input/BaseYearExport.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/input/BaseYearExport.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/input/BaseYearImport.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/input/BaseYearImport.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/input/GlobalCommodities.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/input/GlobalCommodities.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/input/Projections.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/input/Projections.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/settings.toml
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/Agents.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/Agents.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/gas/CommIn.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/gas/CommIn.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommIn.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/gas/CommOut.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/gas/ExistingCapacity.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/ExistingCapacity.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/gas/Technodata.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/CommIn.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/power/CommIn.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/power/CommOut.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/power/ExistingCapacity.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
similarity index 99%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
index de511a38..a88ebe95 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
 solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/Macrodrivers.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv
similarity index 99%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/preset/Macrodrivers.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv
index f50f2e7f..97c00691 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/Macrodrivers.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv
@@ -1,3 +1,3 @@
-Variable,RegionName,Unit,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110
-GDP|PPP,R1,millionUS$2005,1206919,1220599,1234278,1247958,1261637,1275317,1288997,1302676,1316356,1330035,1343715,1384465,1425215,1465965,1506715,1547465,1588215,1628965,1669715,1710465,1751215,1796887,1842558,1888230,1933901,1979573,2025244,2070916,2116587,2162259,2207930,2257386,2306842,2356297,2405753,2455209,2504665,2554120,2603576,2653032,2702488,2758342,2814196,2870050,2925904,2981758,3037612,3093466,3149320,3205175,3261029,3330014,3398999,3467984,3536969,3605954,3674939,3743925,3812910,3881895,3950880,4017445,4084009,4150574,4217139,4283704,4350268,4416833,4483398,4549962,4616527,4681288,4746048,4810808,4875569,4940329,5005090,5069850,5134610,5199371,5264131,5326189,5388246,5450304,5512362,5574419,5636477,5698534,5760592,5822650,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707
-Population,R1,inhab,80004200,80915100,81825990,82736890,83647790,84558680,85469580,86380480,87291370,88202270,89113170,89830650,90548130,91265610,91983090,92700570,93418050,94135530,94853010,95570490,96287970,96822050,97356120,97890190,98424270,98958340,99492420,100026500,100560600,101094600,101628700,101971000,102313300,102655600,102997900,103340200,103682500,104024700,104367000,104709300,105051600,105187600,105323600,105459600,105595600,105731600,105867600,106003600,106139600,106275600,106411600,106385400,106359100,106332800,106306500,106280200,106253900,106227600,106201400,106175100,106148800,105981900,105815000,105648200,105481300,105314400,105147600,104980700,104813800,104646900,104480100,104216900,103953800,103690600,103427500,103164300,102901200,102638000,102374900,102111700,101848600,101535800,101223000,100910200,100597400,100284600,99971790,99658990,99346190,99033390,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590
+Variable,RegionName,Unit,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110
+GDP|PPP,R1,millionUS$2005,1206919,1220599,1234278,1247958,1261637,1275317,1288997,1302676,1316356,1330035,1343715,1384465,1425215,1465965,1506715,1547465,1588215,1628965,1669715,1710465,1751215,1796887,1842558,1888230,1933901,1979573,2025244,2070916,2116587,2162259,2207930,2257386,2306842,2356297,2405753,2455209,2504665,2554120,2603576,2653032,2702488,2758342,2814196,2870050,2925904,2981758,3037612,3093466,3149320,3205175,3261029,3330014,3398999,3467984,3536969,3605954,3674939,3743925,3812910,3881895,3950880,4017445,4084009,4150574,4217139,4283704,4350268,4416833,4483398,4549962,4616527,4681288,4746048,4810808,4875569,4940329,5005090,5069850,5134610,5199371,5264131,5326189,5388246,5450304,5512362,5574419,5636477,5698534,5760592,5822650,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707
+Population,R1,inhab,80004200,80915100,81825990,82736890,83647790,84558680,85469580,86380480,87291370,88202270,89113170,89830650,90548130,91265610,91983090,92700570,93418050,94135530,94853010,95570490,96287970,96822050,97356120,97890190,98424270,98958340,99492420,100026500,100560600,101094600,101628700,101971000,102313300,102655600,102997900,103340200,103682500,104024700,104367000,104709300,105051600,105187600,105323600,105459600,105595600,105731600,105867600,106003600,106139600,106275600,106411600,106385400,106359100,106332800,106306500,106280200,106253900,106227600,106201400,106175100,106148800,105981900,105815000,105648200,105481300,105314400,105147600,104980700,104813800,104646900,104480100,104216900,103953800,103690600,103427500,103164300,102901200,102638000,102374900,102111700,101848600,101535800,101223000,100910200,100597400,100284600,99971790,99658990,99346190,99033390,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv
similarity index 96%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv
index 23687fb0..351edf35 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv
@@ -1,9 +1,9 @@
-SN,RegionName,electricity,gas,heat,CO2f,wind
-1,R1,0,0,0.071,0,0
-2,R1,0,0,0.107,0,0
-3,R1,0,0,0.071,0,0
-4,R1,0,0,0.107,0,0
-5,R1,0,0,0.214,0,0
-6,R1,0,0,0.143,0,0
-7,R1,0,0,0.143,0,0
+SN,RegionName,electricity,gas,heat,CO2f,wind
+1,R1,0,0,0.071,0,0
+2,R1,0,0,0.107,0,0
+3,R1,0,0,0.071,0,0
+4,R1,0,0,0.107,0,0
+5,R1,0,0,0.214,0,0
+6,R1,0,0,0.143,0,0
+7,R1,0,0,0.143,0,0
 8,R1,0,0,0.143,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv
similarity index 98%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv
index d67265e4..6b0e4b54 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv
@@ -1,5 +1,5 @@
-SectorName,FunctionType,Coeff,RegionName,electricity,gas,heat,CO2f
-Residential,logistic-sigmoid,GDPexp,R1,0,0,9.94E-02,0
-Residential,logistic-sigmoid,constant,R1,0,0,1.01039E-05,0
-Residential,logistic-sigmoid,GDPscaleLess,R1,0,0,753.1068725,0
+SectorName,FunctionType,Coeff,RegionName,electricity,gas,heat,CO2f
+Residential,logistic-sigmoid,GDPexp,R1,0,0,9.94E-02,0
+Residential,logistic-sigmoid,constant,R1,0,0,1.01039E-05,0
+Residential,logistic-sigmoid,GDPscaleLess,R1,0,0,753.1068725,0
 Residential,logistic-sigmoid,GDPscaleGreater,R1,0,0,672.9316672,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/CommIn.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/residential/CommIn.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommIn.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/residential/CommOut.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/residential/ExistingCapacity.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/ExistingCapacity.csv
diff --git a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
similarity index 99%
rename from docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv
rename to docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
index 6d2c3cb3..a69ce96b 100644
--- a/docs/tutorial-code/6-add-correlation-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
 heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv
deleted file mode 100644
index f403cc0d..00000000
--- a/docs/tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv
+++ /dev/null
@@ -1,58 +0,0 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,17.48430000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-10,A1,10.00000000000,R1,18,2020,R1,power,solarPV,retrofit,2025
-16,A1,5.23430000000,R1,27,2020,R1,power,windturbine,retrofit,2025
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,3.25160000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,17.48430000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,2.62930000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-0,A1,2.16860000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-9,A1,10.00000000000,R1,10,2020,R1,power,solarPV,retrofit,2030
-20,A1,5.23430000000,R1,30,2020,R1,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,0.31240000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-2,A1,3.25160000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-8,A1,2.62930000000,R1,14,2025,R1,residential,heatpump,retrofit,2035
-9,A1,18.14250000000,R1,15,2030,R1,residential,heatpump,retrofit,2035
-0,A1,2.16860000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-8,A1,10.00000000000,R1,9,2020,R1,power,solarPV,retrofit,2035
-9,A1,0.65820000000,R1,10,2030,R1,power,solarPV,retrofit,2035
-25,A1,5.23430000000,R1,36,2020,R1,power,windturbine,retrofit,2035
-0,A1,0.31240000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
-2,A1,1.17440000000,R1,0,2035,R1,residential,gasboiler,retrofit,2040
-6,A1,18.14250000000,R1,7,2030,R1,residential,heatpump,retrofit,2040
-7,A1,5.36240000000,R1,8,2035,R1,residential,heatpump,retrofit,2040
-0,A1,2.16860000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-7,A1,10.00000000000,R1,10,2020,R1,power,solarPV,retrofit,2040
-8,A1,0.65820000000,R1,11,2030,R1,power,solarPV,retrofit,2040
-9,A1,2.73310000000,R1,12,2035,R1,power,solarPV,retrofit,2040
-30,A1,5.23430000000,R1,50,2020,R1,power,windturbine,retrofit,2040
-0,A1,0.31240000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
-2,A1,1.17440000000,R1,0,2035,R1,residential,gasboiler,retrofit,2045
-4,A1,5.36240000000,R1,7,2035,R1,residential,heatpump,retrofit,2045
-5,A1,18.56530000000,R1,8,2040,R1,residential,heatpump,retrofit,2045
-2,A1,2.16860000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-8,A1,10.00000000000,R1,11,2020,R1,power,solarPV,retrofit,2045
-9,A1,0.65820000000,R1,12,2030,R1,power,solarPV,retrofit,2045
-10,A1,2.73310000000,R1,13,2035,R1,power,solarPV,retrofit,2045
-11,A1,0.42270000000,R1,14,2040,R1,power,solarPV,retrofit,2045
-36,A1,5.23430000000,R1,66,2020,R1,power,windturbine,retrofit,2045
-0,A1,0.31240000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
-1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
-2,A1,18.56530000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
-3,A1,6.95790000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-0,A1,2.16860000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-5,A1,0.65820000000,R1,12,2030,R1,power,solarPV,retrofit,2050
-6,A1,2.73310000000,R1,13,2035,R1,power,solarPV,retrofit,2050
-7,A1,0.42270000000,R1,14,2040,R1,power,solarPV,retrofit,2050
-8,A1,11.59550000000,R1,15,2045,R1,power,solarPV,retrofit,2050
-39,A1,5.23430000000,R1,72,2045,R1,power,windturbine,retrofit,2050
-0,A1,0.31240000000,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/6-add-correlation-demand/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index 847ab122..00000000
--- a/docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,353 +0,0 @@
-,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,0.82442442442,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.24244244244,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,0.82442442442,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.24244244244,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,2.48488488488,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,1.66046046046,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.66046046046,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.66046046046,R1,57,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.24053738318,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.29004304198,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.36250000000,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.43710711960,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.24053738318,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29004304198,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.36250000000,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.43710711960,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.72500000000,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,0.87421423920,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.48446261682,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.58417119722,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48446261682,R1,97,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58417119722,R1,100,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48446261682,R1,113,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58417119722,R1,116,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06233235981,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.16588785047,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.08683042515,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.09393750000,R1,21,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.25000000000,R1,29,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.13085711960,R1,33,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.06233235981,R1,41,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09393750000,R1,61,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.25000000000,R1,69,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.13085711960,R1,73,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.18787500000,R1,81,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.50000000000,R1,89,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.26171423920,R1,93,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.12554264019,R1,101,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.33411214953,R1,109,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.17488381404,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12554264019,R1,121,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12554264019,R1,141,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,149,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,153,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.29004304198,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.15642490100,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.04361678698,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.43710711960,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.23573893532,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.06573234095,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.29004304198,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15642490100,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04361678698,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.43710711960,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.23573893532,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.06573234095,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,0.87421423920,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.47147787063,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.13146468190,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.58417119722,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.31505296963,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.08784789491,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58417119722,R1,96,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31505296963,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08784789491,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.58417119722,R1,112,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31505296963,R1,117,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08784789491,R1,120,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,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.08683042515,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.13517239408,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,24,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,28,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,31,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,R1,44,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13517239408,R1,51,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50000000000,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26171423920,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40742101877,R1,91,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,104,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,108,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,111,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,131,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,151,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.15642490100,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.04361678698,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.30096257830,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.23573893532,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.06573234095,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.45356332223,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.15642490100,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.04361678698,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30096257830,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23573893532,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.06573234095,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.45356332223,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.47147787063,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.13146468190,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,0.90712664446,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.31505296963,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.08784789491,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,0.60616406616,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31505296963,R1,121,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08784789491,R1,124,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60616406616,R1,128,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.31505296963,R1,141,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08784789491,R1,144,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60616406616,R1,148,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,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.08683042515,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.13517239408,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.01091953632,R1,19,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,29,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,33,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,36,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,44,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13517239408,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01091953632,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,79,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,86,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50000000000,R1,104,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26171423920,R1,108,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40742101877,R1,111,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03291240526,R1,119,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,144,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,169,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,194,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30096257830,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.05649688507,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.08895557837,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.45356332223,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.08514319300,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.13405981529,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.30096257830,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05649688507,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08895557837,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.45356332223,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.08514319300,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.13405981529,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,0.90712664446,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.17028638599,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,0.26811963058,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,0.60616406616,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.11378950092,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.17916405221,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60616406616,R1,96,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11378950092,R1,101,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.17916405221,R1,104,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.60616406616,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11378950092,R1,117,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.17916405221,R1,120,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,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.08683042515,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.13517239408,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.01091953632,R1,19,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04533879139,R1,24,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,41,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,49,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06832747434,R1,54,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13517239408,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01091953632,R1,79,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04533879139,R1,84,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,109,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06832747434,R1,114,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50000000000,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26171423920,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40742101877,R1,131,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03291240526,R1,139,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13665494868,R1,144,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,169,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,174,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,199,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,214,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,218,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,221,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,229,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,234,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05649688507,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.08895557837,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.30797508087,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.08514319300,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.13405981529,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,0.46413145991,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.05649688507,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.08895557837,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30797508087,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08514319300,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.13405981529,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,0.46413145991,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.17028638599,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,0.26811963058,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,0.92826291982,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.11378950092,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.17916405221,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,0.62028783894,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11378950092,R1,97,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.17916405221,R1,100,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.62028783894,R1,104,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11378950092,R1,113,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.17916405221,R1,116,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.62028783894,R1,120,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,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.08683042515,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.13517239408,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.01091953632,R1,19,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04533879139,R1,24,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.00701250257,R1,29,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,44,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,51,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,59,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06832747434,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01056813768,R1,69,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16588785047,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13517239408,R1,91,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01091953632,R1,99,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04533879139,R1,104,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.00701250257,R1,109,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.25000000000,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,131,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,139,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06832747434,R1,144,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01056813768,R1,149,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.50000000000,R1,164,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26171423920,R1,168,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40742101877,R1,171,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03291240526,R1,179,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13665494868,R1,184,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02113627536,R1,189,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,204,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,208,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,211,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,219,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,224,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01412377279,R1,229,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,244,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,248,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,251,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,259,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,264,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01412377279,R1,269,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33411214953,R1,284,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,288,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,291,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,299,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,304,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01412377279,R1,309,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30797508087,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.11542345132,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,0.46413145991,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.17394801819,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.30797508087,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.11542345132,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46413145991,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.17394801819,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,0.92826291982,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,0.34789603638,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,0.62028783894,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,0.23247258505,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.62028783894,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23247258505,R1,76,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.62028783894,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23247258505,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13517239408,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.01091953632,R1,9,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04533879139,R1,14,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.00701250257,R1,19,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19235572342,R1,24,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,28,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,36,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,44,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06832747434,R1,49,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01056813768,R1,54,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28988820290,R1,59,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,63,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.13517239408,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01091953632,R1,79,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04533879139,R1,84,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.00701250257,R1,89,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.19235572342,R1,94,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.08683042515,R1,98,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20371050938,R1,106,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01645620263,R1,114,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06832747434,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01056813768,R1,124,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.28988820290,R1,129,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13085711960,R1,133,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40742101877,R1,141,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.03291240526,R1,149,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13665494868,R1,154,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02113627536,R1,159,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.57977640580,R1,164,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26171423920,R1,168,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,176,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,184,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,189,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01412377279,R1,194,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.38742068238,R1,199,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,203,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,211,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,219,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,224,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01412377279,R1,229,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.38742068238,R1,234,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-41,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,238,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.27224862469,R1,246,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.02199286894,R1,254,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09131615730,R1,259,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.01412377279,R1,264,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.38742068238,R1,269,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17488381404,R1,273,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Supply.csv b/docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Supply.csv
deleted file mode 100644
index 49b6bf28..00000000
--- a/docs/tutorial-code/6-add-correlation-demand/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,545 +0,0 @@
-,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,0.71071071071,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,45.99009009009,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.07107107107,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,69.30900900901,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,0.71071071071,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,45.99009009009,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,1.07107107107,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,69.30900900901,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,2.14214214214,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,138.61801801802,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,1.43143143143,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,92.62792792793,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2020.00000000000,R1,residential,1.43143143143,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,residential,92.62792792793,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2020.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,60,2020.00000000000,R1,residential,1.43143143143,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2020.00000000000,R1,residential,92.62792792793,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.82442442442,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.24244244244,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,0.82442442442,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.24244244244,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,2.48488488488,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,1.66046046046,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,1.66046046046,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2020.00000000000,R1,gas,1.66046046046,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.20735981308,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,0.72510760494,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,13.41825350467,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.31250000000,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.09276779900,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,20.22187500000,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.20735981308,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,0.72510760494,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,13.41825350467,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.31250000000,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.09276779900,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,20.22187500000,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.62500000000,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,2.18553559799,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,40.44375000000,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.41764018692,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,1.46042799305,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,27.02549649533,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2020.00000000000,R1,residential,0.41764018692,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2020.00000000000,R1,residential,1.46042799305,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2020.00000000000,R1,residential,27.02549649533,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2020.00000000000,R1,residential,0.41764018692,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2020.00000000000,R1,residential,1.46042799305,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2020.00000000000,R1,residential,27.02549649533,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.03732476636,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.16588785047,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.08683042515,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,8,2020.00000000000,R1,power,3.42156133178,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,20,2020.00000000000,R1,power,0.05625000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,21,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,22,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,power,5.15643750000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.03732476636,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2020.00000000000,R1,power,0.16588785047,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2020.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,48,2020.00000000000,R1,power,3.42156133178,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.05625000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,68,2020.00000000000,R1,power,5.15643750000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.11250000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2020.00000000000,R1,power,0.50000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2020.00000000000,R1,power,0.26171423920,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,88,2020.00000000000,R1,power,10.31287500000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.07517523364,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2020.00000000000,R1,power,6.89131366822,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.07517523364,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,128,2020.00000000000,R1,power,6.89131366822,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2025.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.07517523364,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,148,2020.00000000000,R1,power,6.89131366822,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.30286974299,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.45643750000,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.30286974299,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.45643750000,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,0.91287500000,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.61000525701,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,0.61000525701,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2025.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2020.00000000000,R1,gas,0.61000525701,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.72510760494,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.13484905259,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.10904196746,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,8.72608219310,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.09276779900,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.20322322010,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.16433085237,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,13.15057457270,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,0.72510760494,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.13484905259,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.10904196746,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,8.72608219310,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,1.09276779900,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.20322322010,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.16433085237,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,13.15057457270,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,2.18553559799,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.40644644020,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,0.32866170474,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,26.30114914539,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,1.46042799305,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.27159738761,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.21961973728,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,17.57506695230,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2020.00000000000,R1,residential,1.46042799305,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2025.00000000000,R1,residential,0.27159738761,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2025.00000000000,R1,residential,0.21961973728,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2025.00000000000,R1,residential,17.57506695230,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2020.00000000000,R1,residential,1.46042799305,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2025.00000000000,R1,residential,0.27159738761,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2025.00000000000,R1,residential,0.21961973728,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,125,2025.00000000000,R1,residential,17.57506695230,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16588785047,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.08683042515,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.08094155334,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,10,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,20,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,21,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,22,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.16588785047,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2020.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2025.00000000000,R1,power,0.08094155334,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-15,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,70,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.50000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2020.00000000000,R1,power,0.26171423920,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2025.00000000000,R1,power,0.24396468190,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,90,2025.00000000000,R1,power,22.36424238941,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,130,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2030.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-31,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,150,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.27993574766,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.01166154742,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.42187500000,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.01757444470,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.27993574766,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2025.00000000000,R1,gas,0.01166154742,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2020.00000000000,R1,gas,0.42187500000,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.01757444470,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,0.84375000000,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.03514888940,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.56381425234,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.02348734198,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,18,2020.00000000000,R1,gas,0.56381425234,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,19,2025.00000000000,R1,gas,0.02348734198,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2030.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,21,2020.00000000000,R1,gas,0.56381425234,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,22,2025.00000000000,R1,gas,0.02348734198,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.13484905259,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.10904196746,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,0.75240644575,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,8.72608219310,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.20322322010,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.16433085237,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,1.13390830557,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,13.15057457270,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.13484905259,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2025.00000000000,R1,residential,0.10904196746,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,0.75240644575,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2025.00000000000,R1,residential,8.72608219310,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2025.00000000000,R1,residential,0.20322322010,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.16433085237,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,1.13390830557,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,13.15057457270,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.40644644020,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,0.32866170474,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,2.26781661114,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,26.30114914539,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.27159738761,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.21961973728,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,1.51541016539,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,17.57506695230,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,130,2025.00000000000,R1,residential,0.27159738761,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,131,2025.00000000000,R1,residential,0.21961973728,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,132,2030.00000000000,R1,residential,1.51541016539,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2025.00000000000,R1,residential,17.57506695230,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,150,2025.00000000000,R1,residential,0.27159738761,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,151,2025.00000000000,R1,residential,0.21961973728,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,152,2030.00000000000,R1,residential,1.51541016539,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,155,2025.00000000000,R1,residential,17.57506695230,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16588785047,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.08683042515,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.08094155334,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-4,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,37,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.16588785047,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2025.00000000000,R1,power,0.08094155334,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,77,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,78,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,87,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.50000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.26171423920,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2025.00000000000,R1,power,0.24396468190,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2030.00000000000,R1,power,0.03291240526,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,112,2025.00000000000,R1,power,22.36424238941,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,127,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,128,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,137,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,162,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2035.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-39,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,187,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.01166154742,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.27993574766,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.01757444470,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.42187500000,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.01166154742,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.27993574766,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.01757444470,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.42187500000,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.03514888940,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,0.84375000000,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.02348734198,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.56381425234,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.02348734198,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.56381425234,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2035.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.02348734198,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.56381425234,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2030.00000000000,R1,residential,0.75240644575,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.04870421127,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.22238894592,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.15164951119,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,1.13390830557,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.07339930431,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,0.33514953822,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.74966898165,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,0.75240644575,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.04870421127,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.22238894592,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2035.00000000000,R1,residential,3.15164951119,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2030.00000000000,R1,residential,1.13390830557,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.07339930431,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,0.33514953822,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.74966898165,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,2.26781661114,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.14679860861,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,0.67029907645,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.49933796331,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,1.51541016539,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.09809439734,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,0.44791013052,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.34768845212,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2030.00000000000,R1,residential,1.51541016539,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2035.00000000000,R1,residential,0.09809439734,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2035.00000000000,R1,residential,0.44791013052,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-27,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,109,2035.00000000000,R1,residential,6.34768845212,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2030.00000000000,R1,residential,1.51541016539,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2035.00000000000,R1,residential,0.09809439734,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2035.00000000000,R1,residential,0.44791013052,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,125,2035.00000000000,R1,residential,6.34768845212,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16588785047,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.08683042515,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.08094155334,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2035.00000000000,R1,power,0.04533879139,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,30,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,31,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2035.00000000000,R1,power,0.06832747434,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.16588785047,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2025.00000000000,R1,power,0.08094155334,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2035.00000000000,R1,power,0.04533879139,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,74,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2035.00000000000,R1,power,0.06832747434,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,104,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.50000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.26171423920,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2025.00000000000,R1,power,0.24396468190,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2030.00000000000,R1,power,0.03291240526,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2035.00000000000,R1,power,0.13665494868,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,134,2025.00000000000,R1,power,22.36424238941,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,164,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-36,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-37,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-40,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,194,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2040.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-47,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.00766523018,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.18400404897,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.01155182577,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.27730187661,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.00766523018,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.18400404897,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.01155182577,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.27730187661,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.02310365153,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.55460375322,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.01543842135,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.37059970426,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.01543842135,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.37059970426,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2040.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.01543842135,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.37059970426,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2035.00000000000,R1,residential,0.04870421127,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.22238894592,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,0.76993770218,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.15164951119,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.07339930431,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,0.33514953822,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,1.16032864977,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.74966898165,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.04870421127,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.22238894592,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,0.76993770218,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2035.00000000000,R1,residential,3.15164951119,gasboiler,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2035.00000000000,R1,residential,0.07339930431,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,0.33514953822,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,1.16032864977,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.74966898165,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.14679860861,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,0.67029907645,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,2.32065729954,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.49933796331,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.09809439734,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,0.44791013052,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,1.55071959736,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.34768845212,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,104,2035.00000000000,R1,residential,0.09809439734,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,105,2035.00000000000,R1,residential,0.44791013052,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,106,2040.00000000000,R1,residential,1.55071959736,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2035.00000000000,R1,residential,6.34768845212,gasboiler,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,120,2035.00000000000,R1,residential,0.09809439734,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,121,2035.00000000000,R1,residential,0.44791013052,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,122,2040.00000000000,R1,residential,1.55071959736,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-31,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,124,2035.00000000000,R1,residential,6.34768845212,gasboiler,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.16588785047,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.08683042515,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.08094155334,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2035.00000000000,R1,power,0.04533879139,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2040.00000000000,R1,power,0.00701250257,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2035.00000000000,R1,power,0.06832747434,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2040.00000000000,R1,power,0.01056813768,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,58,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.16588785047,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2020.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2025.00000000000,R1,power,0.08094155334,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2035.00000000000,R1,power,0.04533879139,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2040.00000000000,R1,power,0.00701250257,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,98,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2045.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.25000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2035.00000000000,R1,power,0.06832747434,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2040.00000000000,R1,power,0.01056813768,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,138,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,160,2020.00000000000,R1,power,0.50000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2020.00000000000,R1,power,0.26171423920,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2025.00000000000,R1,power,0.24396468190,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2030.00000000000,R1,power,0.03291240526,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2035.00000000000,R1,power,0.13665494868,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2040.00000000000,R1,power,0.02113627536,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,178,2025.00000000000,R1,power,22.36424238941,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2040.00000000000,R1,power,0.01412377279,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-41,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,218,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,240,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,241,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,242,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,243,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,244,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2040.00000000000,R1,power,0.01412377279,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,258,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2045.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,280,2020.00000000000,R1,power,0.33411214953,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,281,2020.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,282,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,283,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,284,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,285,2040.00000000000,R1,power,0.01412377279,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-55,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,298,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.00766523018,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.18400404897,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.01155182577,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.27730187661,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.00766523018,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.18400404897,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.01155182577,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.27730187661,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.02310365153,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.55460375322,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.01543842135,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.37059970426,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.01543842135,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.37059970426,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2045.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.01543842135,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.37059970426,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,0.76993770218,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,0.28855862830,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,1.16032864977,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,0.43487004547,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,0.76993770218,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,0.28855862830,heatpump,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.16032864977,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,0.43487004547,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,2.32065729954,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,0.86974009094,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,1.55071959736,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,0.58118146264,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,78,2040.00000000000,R1,residential,1.55071959736,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,79,2045.00000000000,R1,residential,0.58118146264,heatpump,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,1.55071959736,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2045.00000000000,R1,residential,0.58118146264,heatpump,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.08094155334,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2035.00000000000,R1,power,0.04533879139,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2040.00000000000,R1,power,0.00701250257,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2045.00000000000,R1,power,0.19235572342,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2045.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,35,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-8,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2035.00000000000,R1,power,0.06832747434,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-10,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,38,2040.00000000000,R1,power,0.01056813768,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-11,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,39,2045.00000000000,R1,power,0.28988820290,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2045.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-13,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,49,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,70,2025.00000000000,R1,power,0.08094155334,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,71,2030.00000000000,R1,power,0.01091953632,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-16,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2035.00000000000,R1,power,0.04533879139,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2040.00000000000,R1,power,0.00701250257,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-18,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2045.00000000000,R1,power,0.19235572342,solarPV,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2045.00000000000,R1,power,0.08683042515,windturbine,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,84,2025.00000000000,R1,power,7.41991219462,gasCCGT,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/kt,2050.00000000000
-21,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2025.00000000000,R1,power,0.12198234095,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-22,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2030.00000000000,R1,power,0.01645620263,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2035.00000000000,R1,power,0.06832747434,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-24,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,108,2040.00000000000,R1,power,0.01056813768,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,109,2045.00000000000,R1,power,0.28988820290,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-26,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,110,2045.00000000000,R1,power,0.13085711960,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-27,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,119,2025.00000000000,R1,power,11.18212119471,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2025.00000000000,R1,power,0.24396468190,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-29,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2030.00000000000,R1,power,0.03291240526,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-30,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2035.00000000000,R1,power,0.13665494868,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-31,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,143,2040.00000000000,R1,power,0.02113627536,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-32,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,144,2045.00000000000,R1,power,0.57977640580,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-33,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,145,2045.00000000000,R1,power,0.26171423920,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,154,2025.00000000000,R1,power,22.36424238941,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-35,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,175,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-36,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,176,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-37,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,177,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-38,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,178,2040.00000000000,R1,power,0.01412377279,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-39,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,179,2045.00000000000,R1,power,0.38742068238,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-40,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2045.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-41,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,189,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-42,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,210,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-43,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,211,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-44,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,212,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-45,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,213,2040.00000000000,R1,power,0.01412377279,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-46,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,214,2045.00000000000,R1,power,0.38742068238,solarPV,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-47,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,215,2045.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,224,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'early-morning')",MUS$2010/kt,2050.00000000000
-49,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,245,2025.00000000000,R1,power,0.16302312856,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-50,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,246,2030.00000000000,R1,power,0.02199286894,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-51,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,247,2035.00000000000,R1,power,0.09131615730,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-52,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,248,2040.00000000000,R1,power,0.01412377279,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-53,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,249,2045.00000000000,R1,power,0.38742068238,solarPV,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-54,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2045.00000000000,R1,power,0.17488381404,windturbine,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-55,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,259,2025.00000000000,R1,power,14.94433019480,gasCCGT,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/kt,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.00540580900,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.12976658507,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.00814678258,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.19556372680,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.00540580900,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.12976658507,gassupply1,"('all-year', 'all-week', 'mid-afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.00814678258,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.19556372680,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.01629356516,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.39112745360,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.01088775616,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.26136086853,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2025.00000000000,R1,gas,0.01088775616,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2030.00000000000,R1,gas,0.26136086853,gassupply1,"('all-year', 'all-week', 'early-morning')",MUS$2010/PJ,2050.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,14,2025.00000000000,R1,gas,0.01088775616,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2030.00000000000,R1,gas,0.26136086853,gassupply1,"('all-year', 'all-week', 'late-afternoon')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/Results/MCAPrices.csv
deleted file mode 100644
index 90b0a31f..00000000
--- a/docs/tutorial-code/6-add-correlation-demand/Results/MCAPrices.csv
+++ /dev/null
@@ -1,225 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.29620000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02520000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.76750000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.44640000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.15670000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.29620000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02520000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76750000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.44640000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15670000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.89280000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.31340000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.59660000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05070000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.54580000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.59660000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05070000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.54580000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.59660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05070000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.54580000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.31440000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02520000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.11980000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.47430000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.18630000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.31440000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02520000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.11980000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.47430000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18630000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.95200000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40690000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.63470000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05070000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25670000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.63470000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05070000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.25670000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.63470000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05070000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.25670000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.39530000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02520000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.15360000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.59630000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.23760000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.39530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02520000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15360000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.59630000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.23760000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.19580000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.51190000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.79760000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05070000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.32580000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.79760000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05070000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.32580000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.79760000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05070000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.32580000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.43620000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02520000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08300000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.65780000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.13330000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.43620000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02520000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08300000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65780000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13330000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31840000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31600000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.87970000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05070000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18920000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.87970000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05070000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18920000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.87970000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05070000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18920000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.53760000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02520000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.10050000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81070000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.16070000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.53760000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02520000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.10050000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81070000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16070000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.62410000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37570000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08410000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05070000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22690000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.08410000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05070000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.22690000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.08410000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05070000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.22690000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.60970000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02520000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02810000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.91930000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05410000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.60970000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02520000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02810000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.91930000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05410000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84120000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.17780000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.22920000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05070000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.08790000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.22920000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05070000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08790000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.22920000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05070000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08790000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
index 54fd05de..9d71ae1a 100644
--- a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
+++ b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = (\n",
-    "    pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "    pd.read_csv(\"1-correlation/Results/MCACapacity.csv\")\n",
     "    .groupby([\"technology\", \"region\", \"year\", \"sector\"])\n",
     "    .sum()\n",
     "    .reset_index()\n",
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
deleted file mode 100644
index b2021661..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,71.09630000000
-0,2030,R1,2020,gassupply1,63.59630000000
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
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
deleted file mode 100644
index 2f6ef446..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,71.09630000000
-0,2030,R1,2020,gassupply1,63.59630000000
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
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
deleted file mode 100644
index 57b8cb7e..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,63.59630000000
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
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
deleted file mode 100644
index bb4dacd3..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,56.09630000000
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
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
deleted file mode 100644
index aa3d4a78..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,56.09630000000
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
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
deleted file mode 100644
index 278e1388..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,56.09630000000
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
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
deleted file mode 100644
index ee9f1881..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,56.09630000000
-0,2055,R1,2020,gassupply1,56.09630000000
-0,2059,R1,2020,gassupply1,56.09630000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
deleted file mode 100644
index 3405f75e..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
+++ /dev/null
@@ -1,47 +0,0 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-3,A1,1.10000000000,R1,9,2020,R1,power,windturbine,retrofit,2025
-0,A1,71.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-2,A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2030
-3,A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2030
-0,A1,63.59630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-8,A1,6.90000000000,R1,14,2025,R1,residential,heatpump,retrofit,2035
-9,A1,25.00000000000,R1,15,2030,R1,residential,heatpump,retrofit,2035
-2,A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2035
-3,A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
-4,A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2035
-0,A1,56.09630000000,R1,0,2020,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
-2,A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2040
-3,A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
-4,A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
-5,A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2040
-0,A1,56.09630000000,R1,0,2020,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,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2045
-3,A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
-4,A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
-5,A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
-6,A1,2.08150000000,R1,4,2040,R1,power,windturbine,retrofit,2045
-0,A1,56.09630000000,R1,0,2020,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,1.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
-1,A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
-2,A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
-3,A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
-4,A1,2.37860000000,R1,4,2045,R1,power,windturbine,retrofit,2050
-0,A1,56.09630000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
deleted file mode 100644
index 6be57537..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.00350000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02690000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.97830000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.05170000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.95310000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07200000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.97830000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.05170000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.90280000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12590000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.87760000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.14410000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.19610000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.34520000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.26410000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34520000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.99700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.73250000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.18540000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.27860000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18540000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27860000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56000000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.37210000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06650000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.09980000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06650000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09980000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.20010000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13320000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07170000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.10760000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07170000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10760000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21570000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14360000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
deleted file mode 100644
index 0745318f..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
deleted file mode 100644
index c6bfdc80..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-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.54330000000
-2,2035,R1,windturbine,2025,1.54330000000
-2,2040,R1,windturbine,2025,1.54330000000
-2,2045,R1,windturbine,2025,1.54330000000
-2,2049,R1,windturbine,2025,1.54330000000
-2,2050,R1,windturbine,2025,1.54330000000
-2,2054,R1,windturbine,2025,1.54330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
deleted file mode 100644
index fe65e893..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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.54330000000
-1,2035,R1,windturbine,2025,1.54330000000
-1,2040,R1,windturbine,2025,1.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2035,R1,windturbine,2030,1.68610000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 8280e4a7..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-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.54330000000
-1,2040,R1,windturbine,2025,1.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2035,R1,windturbine,2030,1.68610000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2040,R1,windturbine,2035,2.01780000000
-3,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
deleted file mode 100644
index 74962932..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-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.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2040,R1,windturbine,2035,2.01780000000
-3,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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,2045,R1,windturbine,2040,2.08150000000
-4,2049,R1,windturbine,2040,2.08150000000
-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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
deleted file mode 100644
index bcd2871b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-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.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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,2045,R1,windturbine,2040,2.08150000000
-4,2049,R1,windturbine,2040,2.08150000000
-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
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
deleted file mode 100644
index e61276d3..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2020.csv
deleted file mode 100644
index 51b73870..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2020.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,night,1.67000000000
-0,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,night,1.67000000000
-0,1,2025,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-1,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,morning,3.34000000000
-1,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,morning,3.34000000000
-1,1,2025,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-2,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,afternoon,5.01000000000
-2,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,afternoon,5.01000000000
-2,1,2025,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-3,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,early-peak,3.34000000000
-3,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,early-peak,3.34000000000
-3,1,2025,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-4,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,late-peak,8.35000000000
-4,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,late-peak,8.35000000000
-4,1,2025,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-5,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,evening,10.02000000000
-5,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,evening,10.02000000000
-5,1,2025,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2025.csv
deleted file mode 100644
index 247b0379..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,night,1.67000000000
-0,1,2025,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2030,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,2,2030,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-1,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,morning,3.34000000000
-1,1,2025,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2030,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,2,2030,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-2,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,afternoon,5.01000000000
-2,1,2025,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2030,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,2,2030,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-3,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,early-peak,3.34000000000
-3,1,2025,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2030,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,2,2030,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-4,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,late-peak,8.35000000000
-4,1,2025,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2030,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,2,2030,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-5,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,evening,10.02000000000
-5,1,2025,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2030,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,2,2030,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2030.csv
deleted file mode 100644
index 08ed520b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2030,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,0,2035,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2030,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2035,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2035,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-1,0,2030,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,0,2035,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2030,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2035,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2035,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-2,0,2030,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,0,2035,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2030,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2035,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2035,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-3,0,2030,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,0,2035,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2030,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2035,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2035,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-4,0,2030,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,0,2035,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2030,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2035,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2035,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-5,0,2030,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,0,2035,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2030,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2035,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2035,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2035.csv
deleted file mode 100644
index 901ccbce..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2035.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2035,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,0,2040,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2035,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2040,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2035,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2040,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2040,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-1,0,2035,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,0,2040,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2035,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2040,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2035,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2040,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2040,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-2,0,2035,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,0,2040,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2035,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2040,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2035,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2040,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2040,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-3,0,2035,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,0,2040,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2035,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2040,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2035,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2040,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2040,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-4,0,2035,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,0,2040,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2035,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2040,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2035,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2040,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2040,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-5,0,2035,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,0,2040,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2035,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2040,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2035,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2040,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2040,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2040.csv
deleted file mode 100644
index 0b252daf..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2040.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2040,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,0,2045,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2040,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2045,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2040,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2045,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2040,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2045,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2045,wind,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-1,0,2040,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,0,2045,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2040,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2045,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2040,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2045,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2040,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2045,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2045,wind,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-2,0,2040,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,0,2045,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2040,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2045,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2040,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2045,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2040,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2045,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2045,wind,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-3,0,2040,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,0,2045,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2040,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2045,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2040,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2045,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2040,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2045,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2045,wind,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-4,0,2040,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,0,2045,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2040,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2045,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2040,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2045,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2040,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2045,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2045,wind,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-5,0,2040,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,0,2045,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2040,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2045,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2040,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2045,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2040,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2045,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2045,wind,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2045.csv
deleted file mode 100644
index 1dfc2759..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2045.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2045,wind,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2045,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2050,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2045,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2050,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2045,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2050,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2045,wind,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,4,2050,wind,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,5,2050,wind,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-1,0,2045,wind,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2045,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2050,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2045,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2050,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2045,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2050,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2045,wind,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,4,2050,wind,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,5,2050,wind,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-2,0,2045,wind,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2045,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2050,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2045,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2050,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2045,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2050,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2045,wind,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,4,2050,wind,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,5,2050,wind,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-3,0,2045,wind,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2045,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2050,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2045,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2050,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2045,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2050,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2045,wind,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,4,2050,wind,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,5,2050,wind,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-4,0,2045,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2045,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2050,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2045,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2050,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2045,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2050,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2045,wind,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,4,2050,wind,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,5,2050,wind,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-5,0,2045,wind,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2045,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2050,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2045,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2050,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2045,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2050,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2045,wind,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,4,2050,wind,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,5,2050,wind,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2050.csv
deleted file mode 100644
index 404f9aaa..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Consumption_Timeslice/2050.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,1,2050,wind,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2050,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2055,wind,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2050,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2055,wind,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2050,wind,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,4,2055,wind,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,5,2050,wind,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-0,5,2055,wind,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-0,6,2055,wind,R1,2050,windturbine,all-year,all-week,night,2.23940000000
-1,1,2050,wind,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2050,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2055,wind,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2050,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2055,wind,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2050,wind,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,4,2055,wind,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,5,2050,wind,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-1,5,2055,wind,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-1,6,2055,wind,R1,2050,windturbine,all-year,all-week,morning,2.23940000000
-2,1,2050,wind,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2050,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2055,wind,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2050,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2055,wind,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2050,wind,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,4,2055,wind,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,5,2050,wind,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-2,5,2055,wind,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-2,6,2055,wind,R1,2050,windturbine,all-year,all-week,afternoon,2.23940000000
-3,1,2050,wind,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2050,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2055,wind,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2050,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2055,wind,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2050,wind,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,4,2055,wind,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,5,2050,wind,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-3,5,2055,wind,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-3,6,2055,wind,R1,2050,windturbine,all-year,all-week,early-peak,2.23940000000
-4,1,2050,wind,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2050,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2055,wind,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2050,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2055,wind,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2050,wind,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,4,2055,wind,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,5,2050,wind,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-4,5,2055,wind,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-4,6,2055,wind,R1,2050,windturbine,all-year,all-week,late-peak,2.23940000000
-5,1,2050,wind,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2050,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2055,wind,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2050,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2055,wind,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2050,wind,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,4,2055,wind,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,5,2050,wind,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
-5,5,2055,wind,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
-5,6,2055,wind,R1,2050,windturbine,all-year,all-week,evening,2.23940000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv
deleted file mode 100644
index dac19b31..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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,2.00000000000
-1,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,2.00000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-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,3.00000000000
-2,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,3.00000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-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,2.00000000000
-3,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,183.34000000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,2.00000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,183.34000000000
-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,5.00000000000
-4,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,5.00000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-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,6.00000000000
-5,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,6.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
-5,1,2025,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2025.csv
deleted file mode 100644
index e7a18e37..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2025.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-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
-0,1,2030,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,2,2030,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,2.00000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-1,1,2025,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2030,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,2,2030,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,3.00000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-2,1,2025,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2030,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,2,2030,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,2.00000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,183.34000000000
-3,1,2025,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2030,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,2,2030,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,5.00000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-4,1,2025,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2030,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,2,2030,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,6.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
-5,1,2025,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2030,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,2,2030,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2030.csv
deleted file mode 100644
index 7fa6400e..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2030.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2030,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,0,2035,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2030,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2035,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2035,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-1,0,2030,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,0,2035,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2030,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2035,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2035,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-2,0,2030,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,0,2035,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2030,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2035,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2035,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-3,0,2030,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,0,2035,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2030,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2035,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2035,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-4,0,2030,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,0,2035,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2030,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2035,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2035,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-5,0,2030,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,0,2035,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2030,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2035,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2035,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2035.csv
deleted file mode 100644
index 1daab23b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2035.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2035,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,0,2040,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2035,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2040,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2035,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2040,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2040,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-1,0,2035,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,0,2040,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2035,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2040,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2035,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2040,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2040,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-2,0,2035,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,0,2040,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2035,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2040,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2035,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2040,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2040,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-3,0,2035,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,0,2040,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2035,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2040,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2035,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2040,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2040,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-4,0,2035,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,0,2040,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2035,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2040,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2035,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2040,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2040,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-5,0,2035,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,0,2040,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2035,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2040,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2035,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2040,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2040,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2040.csv
deleted file mode 100644
index 9ad621cb..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2040.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2040,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,0,2045,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2040,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2045,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2040,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2045,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2040,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2045,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2045,electricity,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-1,0,2040,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,0,2045,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2040,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2045,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2040,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2045,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2040,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2045,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2045,electricity,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-2,0,2040,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,0,2045,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2040,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2045,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2040,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2045,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2040,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2045,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2045,electricity,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-3,0,2040,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,0,2045,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2040,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2045,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2040,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2045,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2040,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2045,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2045,electricity,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-4,0,2040,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,0,2045,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2040,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2045,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2040,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2045,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2040,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2045,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2045,electricity,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-5,0,2040,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,0,2045,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2040,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2045,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2040,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2045,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2040,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2045,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2045,electricity,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2045.csv
deleted file mode 100644
index 440264a0..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2045.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2045,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-0,1,2045,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,1,2050,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2045,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2050,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2045,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2050,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2045,electricity,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,4,2050,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
-1,0,2045,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-1,1,2045,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,1,2050,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2045,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2050,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2045,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2050,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2045,electricity,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,4,2050,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
-2,0,2045,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-2,1,2045,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,1,2050,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2045,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2050,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2045,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2050,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2045,electricity,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,4,2050,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
-3,0,2045,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-3,1,2045,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,1,2050,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2045,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2050,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2045,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2050,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2045,electricity,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,4,2050,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
-4,0,2045,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-4,1,2045,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,1,2050,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2045,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2050,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2045,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2050,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2045,electricity,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,4,2050,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
-5,0,2045,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
-5,1,2045,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,1,2050,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2045,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2050,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2045,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2050,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2045,electricity,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,4,2050,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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2050.csv
deleted file mode 100644
index 06be5a1f..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2050.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index bcdf148c..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 2eb0ec15..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 22334ba5..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 452c6c8a..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index e3ecc1d0..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 82b22d9b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
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
deleted file mode 100644
index 305b627b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-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
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
deleted file mode 100644
index a44059a3..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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
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
deleted file mode 100644
index c9ed8c00..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-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
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
deleted file mode 100644
index 61ae1198..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 89e0bd4e..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 663e47a5..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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
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
deleted file mode 100644
index 6e2884e6..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-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
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
deleted file mode 100644
index 61004cae..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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
deleted file mode 100644
index e1c3a0bc..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,265.00000000000
-0,2030,R1,2020,gassupply1,257.50000000000
-0,2035,R1,2020,gassupply1,250.00000000000
-0,2040,R1,2020,gassupply1,250.00000000000
-0,2045,R1,2020,gassupply1,250.00000000000
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index 98db1e32..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,265.00000000000
-0,2030,R1,2020,gassupply1,257.50000000000
-0,2035,R1,2020,gassupply1,250.00000000000
-0,2040,R1,2020,gassupply1,250.00000000000
-0,2045,R1,2020,gassupply1,250.00000000000
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index cc1ca104..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,257.50000000000
-0,2035,R1,2020,gassupply1,250.00000000000
-0,2040,R1,2020,gassupply1,250.00000000000
-0,2045,R1,2020,gassupply1,250.00000000000
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index da4a897b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,250.00000000000
-0,2040,R1,2020,gassupply1,250.00000000000
-0,2045,R1,2020,gassupply1,250.00000000000
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index aa2ab75f..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,250.00000000000
-0,2045,R1,2020,gassupply1,250.00000000000
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index a515aa7c..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,250.00000000000
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index db203878..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,250.00000000000
-0,2055,R1,2020,gassupply1,250.00000000000
-0,2059,R1,2020,gassupply1,250.00000000000
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
deleted file mode 100644
index 2a2ea049..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-A1,61.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-A1,100.00000000000,R1,7,2020,R1,residential,heatpump,retrofit,2025
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-A1,60.00000000000,R1,7,2020,R1,power,windturbine,retrofit,2025
-A1,265.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-A1,56.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2030
-A1,100.00000000000,R1,14,2020,R1,residential,heatpump,retrofit,2030
-A1,60.00000000000,R1,0,2020,R1,power,windturbine,retrofit,2030
-A1,257.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-A1,100.00000000000,R1,0,2030,R1,residential,gasboiler,retrofit,2035
-A1,100.00000000000,R1,5,2030,R1,residential,heatpump,retrofit,2035
-A1,60.00000000000,R1,0,2020,R1,power,windturbine,retrofit,2035
-A1,250.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
-A1,100.00000000000,R1,0,2030,R1,residential,gasboiler,retrofit,2040
-A1,100.00000000000,R1,12,2030,R1,residential,heatpump,retrofit,2040
-A1,60.00000000000,R1,0,2020,R1,power,windturbine,retrofit,2040
-A1,250.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
-A1,100.00000000000,R1,0,2040,R1,residential,gasboiler,retrofit,2045
-A1,100.00000000000,R1,4,2040,R1,residential,heatpump,retrofit,2045
-A1,60.00000000000,R1,0,2020,R1,power,windturbine,retrofit,2045
-A1,250.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
-A1,100.00000000000,R1,0,2040,R1,residential,gasboiler,retrofit,2050
-A1,100.00000000000,R1,10,2040,R1,residential,heatpump,retrofit,2050
-A1,120.00000000000,R1,0,2045,R1,power,windturbine,retrofit,2050
-A1,250.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
deleted file mode 100644
index e67bcb24..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.31350000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02830000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.21450000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.62690000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.05300000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.82170000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.94040000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.21450000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.62690000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.05300000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.82170000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.56730000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12700000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.64340000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,7.88070000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.14060000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.42900000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.41870000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.68010000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.48780000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.68010000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.67250000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.18350000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.71650000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,1.08080000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.71780000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.07780000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.17390000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.44110000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.90380000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,1.36170000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.90510000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.35870000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.73570000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,1.81570000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,1.16640000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,1.75570000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.16780000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.75270000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.52380000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,2.34100000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,1.42910000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,2.14980000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.43050000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.14680000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.31190000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,2.86640000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
deleted file mode 100644
index 3123db0a..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-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,60.00000000000
-1,2030,R1,2020,windturbine,60.00000000000
-1,2035,R1,2020,windturbine,60.00000000000
-1,2040,R1,2020,windturbine,60.00000000000
-1,2045,R1,2020,windturbine,60.00000000000
-1,2049,R1,2020,windturbine,60.00000000000
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
deleted file mode 100644
index dfd62ed2..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,60.00000000000
-1,2030,R1,2020,windturbine,60.00000000000
-1,2035,R1,2020,windturbine,60.00000000000
-1,2040,R1,2020,windturbine,60.00000000000
-1,2045,R1,2020,windturbine,60.00000000000
-1,2049,R1,2020,windturbine,60.00000000000
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
deleted file mode 100644
index bd78fc9a..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,windturbine,60.00000000000
-1,2035,R1,2020,windturbine,60.00000000000
-1,2040,R1,2020,windturbine,60.00000000000
-1,2045,R1,2020,windturbine,60.00000000000
-1,2049,R1,2020,windturbine,60.00000000000
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
deleted file mode 100644
index 83af03b9..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,windturbine,60.00000000000
-1,2040,R1,2020,windturbine,60.00000000000
-1,2045,R1,2020,windturbine,60.00000000000
-1,2049,R1,2020,windturbine,60.00000000000
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
deleted file mode 100644
index 58524693..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,windturbine,60.00000000000
-1,2045,R1,2020,windturbine,60.00000000000
-1,2049,R1,2020,windturbine,60.00000000000
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
deleted file mode 100644
index ff032b73..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2045,R1,windturbine,2020,60.00000000000
-0,2049,R1,windturbine,2020,60.00000000000
-1,2050,R1,windturbine,2045,120.00000000000
-1,2074,R1,windturbine,2045,120.00000000000
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
deleted file mode 100644
index 894b75c9..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2045,windturbine,120.00000000000
-1,2055,R1,2045,windturbine,120.00000000000
-1,2074,R1,2045,windturbine,120.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2020.csv
deleted file mode 100644
index 8da9230e..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2020.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,night,1.67000000000
-0,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,night,1.67000000000
-1,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,morning,3.34000000000
-1,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,morning,3.34000000000
-2,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,afternoon,5.01000000000
-2,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,afternoon,5.01000000000
-3,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,early-peak,3.34000000000
-3,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,early-peak,3.34000000000
-4,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,late-peak,8.35000000000
-4,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,late-peak,8.35000000000
-5,0,2020,gas,R1,2020,gasCCGT,all-year,all-week,evening,10.02000000000
-5,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,evening,10.02000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2025.csv
deleted file mode 100644
index c09e7fbb..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2025.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,night,1.67000000000
-0,1,2030,wind,R1,2020,windturbine,all-year,all-week,night,0.42740000000
-1,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,morning,3.34000000000
-1,1,2030,wind,R1,2020,windturbine,all-year,all-week,morning,0.64100000000
-2,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,afternoon,5.01000000000
-2,1,2030,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.42740000000
-3,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,early-peak,3.34000000000
-3,1,2030,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.64100000000
-4,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,late-peak,8.35000000000
-4,1,2030,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.28210000000
-5,0,2025,gas,R1,2020,gasCCGT,all-year,all-week,evening,10.02000000000
-5,1,2030,wind,R1,2020,windturbine,all-year,all-week,evening,0.85470000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2030.csv
deleted file mode 100644
index 29d556c7..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2030.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,1,2030,wind,R1,2020,windturbine,all-year,all-week,night,0.42740000000
-0,1,2035,wind,R1,2020,windturbine,all-year,all-week,night,0.40000000000
-1,1,2030,wind,R1,2020,windturbine,all-year,all-week,morning,0.64100000000
-1,1,2035,wind,R1,2020,windturbine,all-year,all-week,morning,0.60000000000
-2,1,2030,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.42740000000
-2,1,2035,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.40000000000
-3,1,2030,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.64100000000
-3,1,2035,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.60000000000
-4,1,2030,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.28210000000
-4,1,2035,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.20000000000
-5,1,2030,wind,R1,2020,windturbine,all-year,all-week,evening,0.85470000000
-5,1,2035,wind,R1,2020,windturbine,all-year,all-week,evening,0.80000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2035.csv
deleted file mode 100644
index ffac1ddd..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2035.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,1,2035,wind,R1,2020,windturbine,all-year,all-week,night,0.40000000000
-0,1,2040,wind,R1,2020,windturbine,all-year,all-week,night,0.46670000000
-1,1,2035,wind,R1,2020,windturbine,all-year,all-week,morning,0.60000000000
-1,1,2040,wind,R1,2020,windturbine,all-year,all-week,morning,0.70000000000
-2,1,2035,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.40000000000
-2,1,2040,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.46670000000
-3,1,2035,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.60000000000
-3,1,2040,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.70000000000
-4,1,2035,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.20000000000
-4,1,2040,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.40000000000
-5,1,2035,wind,R1,2020,windturbine,all-year,all-week,evening,0.80000000000
-5,1,2040,wind,R1,2020,windturbine,all-year,all-week,evening,0.93330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2040.csv
deleted file mode 100644
index 4fc9b54c..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2040.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,1,2040,wind,R1,2020,windturbine,all-year,all-week,night,0.46670000000
-0,1,2045,wind,R1,2020,windturbine,all-year,all-week,night,0.53330000000
-1,1,2040,wind,R1,2020,windturbine,all-year,all-week,morning,0.70000000000
-1,1,2045,wind,R1,2020,windturbine,all-year,all-week,morning,0.80000000000
-2,1,2040,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.46670000000
-2,1,2045,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.53330000000
-3,1,2040,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.70000000000
-3,1,2045,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.80000000000
-4,1,2040,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.40000000000
-4,1,2045,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.60000000000
-5,1,2040,wind,R1,2020,windturbine,all-year,all-week,evening,0.93330000000
-5,1,2045,wind,R1,2020,windturbine,all-year,all-week,evening,1.06670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2045.csv
deleted file mode 100644
index 985b400b..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,0,2045,wind,R1,2020,windturbine,all-year,all-week,night,0.53330000000
-0,1,2050,wind,R1,2045,windturbine,all-year,all-week,night,0.60000000000
-1,0,2045,wind,R1,2020,windturbine,all-year,all-week,morning,0.80000000000
-1,1,2050,wind,R1,2045,windturbine,all-year,all-week,morning,0.90000000000
-2,0,2045,wind,R1,2020,windturbine,all-year,all-week,afternoon,0.53330000000
-2,1,2050,wind,R1,2045,windturbine,all-year,all-week,afternoon,0.60000000000
-3,0,2045,wind,R1,2020,windturbine,all-year,all-week,early-peak,0.80000000000
-3,1,2050,wind,R1,2045,windturbine,all-year,all-week,early-peak,0.90000000000
-4,0,2045,wind,R1,2020,windturbine,all-year,all-week,late-peak,1.60000000000
-4,1,2050,wind,R1,2045,windturbine,all-year,all-week,late-peak,1.80000000000
-5,0,2045,wind,R1,2020,windturbine,all-year,all-week,evening,1.06670000000
-5,1,2050,wind,R1,2045,windturbine,all-year,all-week,evening,1.20000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2050.csv
deleted file mode 100644
index 6c9cf9f3..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Consumption_Timeslice/2050.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,consumption
-0,1,2050,wind,R1,2045,windturbine,all-year,all-week,night,0.60000000000
-0,1,2055,wind,R1,2045,windturbine,all-year,all-week,night,0.60000000000
-1,1,2050,wind,R1,2045,windturbine,all-year,all-week,morning,0.90000000000
-1,1,2055,wind,R1,2045,windturbine,all-year,all-week,morning,0.90000000000
-2,1,2050,wind,R1,2045,windturbine,all-year,all-week,afternoon,0.60000000000
-2,1,2055,wind,R1,2045,windturbine,all-year,all-week,afternoon,0.60000000000
-3,1,2050,wind,R1,2045,windturbine,all-year,all-week,early-peak,0.90000000000
-3,1,2055,wind,R1,2045,windturbine,all-year,all-week,early-peak,0.90000000000
-4,1,2050,wind,R1,2045,windturbine,all-year,all-week,late-peak,1.80000000000
-4,1,2055,wind,R1,2045,windturbine,all-year,all-week,late-peak,1.80000000000
-5,1,2050,wind,R1,2045,windturbine,all-year,all-week,evening,1.20000000000
-5,1,2055,wind,R1,2045,windturbine,all-year,all-week,evening,1.20000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2020.csv
deleted file mode 100644
index 52d4f012..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2020.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-1,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,morning,2.00000000000
-1,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,2.00000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-2,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,3.00000000000
-2,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,3.00000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-3,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,2.00000000000
-3,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,183.34000000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,2.00000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,183.34000000000
-4,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,5.00000000000
-4,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,5.00000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-5,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,evening,6.00000000000
-5,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,6.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv
deleted file mode 100644
index 5cfb068c..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-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,2030,electricity,R1,2020,windturbine,all-year,all-week,night,0.42740000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,2.00000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,183.34000000000
-1,1,2030,electricity,R1,2020,windturbine,all-year,all-week,morning,0.64100000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,3.00000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,275.01000000000
-2,1,2030,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.42740000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,2.00000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,183.34000000000
-3,1,2030,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.64100000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,5.00000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,458.35000000000
-4,1,2030,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.28210000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,6.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,550.02000000000
-5,1,2030,electricity,R1,2020,windturbine,all-year,all-week,evening,0.85470000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2030.csv
deleted file mode 100644
index 0eb6ff49..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2030.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2030,electricity,R1,2020,windturbine,all-year,all-week,night,0.42740000000
-0,1,2035,electricity,R1,2020,windturbine,all-year,all-week,night,0.40000000000
-1,1,2030,electricity,R1,2020,windturbine,all-year,all-week,morning,0.64100000000
-1,1,2035,electricity,R1,2020,windturbine,all-year,all-week,morning,0.60000000000
-2,1,2030,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.42740000000
-2,1,2035,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.40000000000
-3,1,2030,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.64100000000
-3,1,2035,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.60000000000
-4,1,2030,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.28210000000
-4,1,2035,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.20000000000
-5,1,2030,electricity,R1,2020,windturbine,all-year,all-week,evening,0.85470000000
-5,1,2035,electricity,R1,2020,windturbine,all-year,all-week,evening,0.80000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2035.csv
deleted file mode 100644
index 5b598cfd..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2035.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2035,electricity,R1,2020,windturbine,all-year,all-week,night,0.40000000000
-0,1,2040,electricity,R1,2020,windturbine,all-year,all-week,night,0.46670000000
-1,1,2035,electricity,R1,2020,windturbine,all-year,all-week,morning,0.60000000000
-1,1,2040,electricity,R1,2020,windturbine,all-year,all-week,morning,0.70000000000
-2,1,2035,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.40000000000
-2,1,2040,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.46670000000
-3,1,2035,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.60000000000
-3,1,2040,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.70000000000
-4,1,2035,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.20000000000
-4,1,2040,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.40000000000
-5,1,2035,electricity,R1,2020,windturbine,all-year,all-week,evening,0.80000000000
-5,1,2040,electricity,R1,2020,windturbine,all-year,all-week,evening,0.93330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2040.csv
deleted file mode 100644
index 2b7c2319..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2040.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2040,electricity,R1,2020,windturbine,all-year,all-week,night,0.46670000000
-0,1,2045,electricity,R1,2020,windturbine,all-year,all-week,night,0.53330000000
-1,1,2040,electricity,R1,2020,windturbine,all-year,all-week,morning,0.70000000000
-1,1,2045,electricity,R1,2020,windturbine,all-year,all-week,morning,0.80000000000
-2,1,2040,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.46670000000
-2,1,2045,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.53330000000
-3,1,2040,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.70000000000
-3,1,2045,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.80000000000
-4,1,2040,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.40000000000
-4,1,2045,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.60000000000
-5,1,2040,electricity,R1,2020,windturbine,all-year,all-week,evening,0.93330000000
-5,1,2045,electricity,R1,2020,windturbine,all-year,all-week,evening,1.06670000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2045.csv
deleted file mode 100644
index 16097c79..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2045.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2045,electricity,R1,2020,windturbine,all-year,all-week,night,0.53330000000
-0,1,2050,electricity,R1,2045,windturbine,all-year,all-week,night,0.60000000000
-1,0,2045,electricity,R1,2020,windturbine,all-year,all-week,morning,0.80000000000
-1,1,2050,electricity,R1,2045,windturbine,all-year,all-week,morning,0.90000000000
-2,0,2045,electricity,R1,2020,windturbine,all-year,all-week,afternoon,0.53330000000
-2,1,2050,electricity,R1,2045,windturbine,all-year,all-week,afternoon,0.60000000000
-3,0,2045,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.80000000000
-3,1,2050,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.90000000000
-4,0,2045,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.60000000000
-4,1,2050,electricity,R1,2045,windturbine,all-year,all-week,late-peak,1.80000000000
-5,0,2045,electricity,R1,2020,windturbine,all-year,all-week,evening,1.06670000000
-5,1,2050,electricity,R1,2045,windturbine,all-year,all-week,evening,1.20000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2050.csv
deleted file mode 100644
index 512b0c7d..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2050.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2050,electricity,R1,2045,windturbine,all-year,all-week,night,0.60000000000
-0,1,2055,electricity,R1,2045,windturbine,all-year,all-week,night,0.60000000000
-1,1,2050,electricity,R1,2045,windturbine,all-year,all-week,morning,0.90000000000
-1,1,2055,electricity,R1,2045,windturbine,all-year,all-week,morning,0.90000000000
-2,1,2050,electricity,R1,2045,windturbine,all-year,all-week,afternoon,0.60000000000
-2,1,2055,electricity,R1,2045,windturbine,all-year,all-week,afternoon,0.60000000000
-3,1,2050,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.90000000000
-3,1,2055,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.90000000000
-4,1,2050,electricity,R1,2045,windturbine,all-year,all-week,late-peak,1.80000000000
-4,1,2055,electricity,R1,2045,windturbine,all-year,all-week,late-peak,1.80000000000
-5,1,2050,electricity,R1,2045,windturbine,all-year,all-week,evening,1.20000000000
-5,1,2055,electricity,R1,2045,windturbine,all-year,all-week,evening,1.20000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
deleted file mode 100644
index 77d60cfa..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,61.00000000000
-0,2030,R1,gasboiler,2020,56.00000000000
-0,2034,R1,gasboiler,2020,56.00000000000
-1,2025,R1,heatpump,2020,100.00000000000
-1,2030,R1,heatpump,2020,100.00000000000
-1,2034,R1,heatpump,2020,100.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 14794bb6..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gasboiler,61.00000000000
-0,2030,R1,2020,gasboiler,56.00000000000
-0,2034,R1,2020,gasboiler,56.00000000000
-1,2025,R1,2020,heatpump,100.00000000000
-1,2030,R1,2020,heatpump,100.00000000000
-1,2034,R1,2020,heatpump,100.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
deleted file mode 100644
index 0acaeeaa..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2020,56.00000000000
-0,2034,R1,gasboiler,2020,56.00000000000
-1,2035,R1,gasboiler,2030,100.00000000000
-1,2040,R1,gasboiler,2030,100.00000000000
-1,2044,R1,gasboiler,2030,100.00000000000
-2,2030,R1,heatpump,2020,100.00000000000
-2,2034,R1,heatpump,2020,100.00000000000
-3,2035,R1,heatpump,2030,100.00000000000
-3,2040,R1,heatpump,2030,100.00000000000
-3,2044,R1,heatpump,2030,100.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index c4e9879f..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-2,2035,R1,2030,gasboiler,100.00000000000
-2,2040,R1,2030,gasboiler,100.00000000000
-2,2044,R1,2030,gasboiler,100.00000000000
-3,2035,R1,2030,heatpump,100.00000000000
-3,2040,R1,2030,heatpump,100.00000000000
-3,2044,R1,2030,heatpump,100.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index 10139040..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,100.00000000000
-0,2044,R1,gasboiler,2030,100.00000000000
-1,2045,R1,gasboiler,2040,100.00000000000
-1,2050,R1,gasboiler,2040,100.00000000000
-1,2054,R1,gasboiler,2040,100.00000000000
-2,2040,R1,heatpump,2030,100.00000000000
-2,2044,R1,heatpump,2030,100.00000000000
-3,2045,R1,heatpump,2040,100.00000000000
-3,2050,R1,heatpump,2040,100.00000000000
-3,2054,R1,heatpump,2040,100.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index b76615cf..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-2,2045,R1,2040,gasboiler,100.00000000000
-2,2050,R1,2040,gasboiler,100.00000000000
-2,2054,R1,2040,gasboiler,100.00000000000
-3,2045,R1,2040,heatpump,100.00000000000
-3,2050,R1,2040,heatpump,100.00000000000
-3,2054,R1,2040,heatpump,100.00000000000
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
deleted file mode 100644
index 63c0a716..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,gasboiler,100.00000000000
-2,2054,R1,2040,gasboiler,100.00000000000
-3,2050,R1,2040,heatpump,100.00000000000
-3,2054,R1,2040,heatpump,100.00000000000
-4,2055,R1,2050,gasboiler,50.00000000000
-4,2064,R1,2050,gasboiler,50.00000000000
-5,2055,R1,2050,heatpump,50.00000000000
-5,2064,R1,2050,heatpump,50.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
deleted file mode 100644
index f7205d50..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-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.50520000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,0.82820000000
-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,32.68990000000
-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.75780000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.24220000000
-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,49.03490000000
-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.50520000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,0.82820000000
-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,32.68990000000
-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.75780000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.24220000000
-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,49.03490000000
-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,1.51550000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,2.48450000000
-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,98.06980000000
-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,1.01040000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,1.65630000000
-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,65.37990000000
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
deleted file mode 100644
index a9a9df1c..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2025,0,R1,2020,gasboiler,all-year,all-week,night,0.50520000000
-0,heat,2025,1,R1,2020,heatpump,all-year,all-week,night,0.82820000000
-0,heat,2030,0,R1,2020,gasboiler,all-year,all-week,night,0.59830000000
-0,heat,2030,1,R1,2020,heatpump,all-year,all-week,night,1.06840000000
-0,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,night,32.68990000000
-0,CO2f,2030,0,R1,2020,gasboiler,all-year,all-week,night,38.71540000000
-1,heat,2025,0,R1,2020,gasboiler,all-year,all-week,morning,0.75780000000
-1,heat,2025,1,R1,2020,heatpump,all-year,all-week,morning,1.24220000000
-1,heat,2030,0,R1,2020,gasboiler,all-year,all-week,morning,0.89740000000
-1,heat,2030,1,R1,2020,heatpump,all-year,all-week,morning,1.60260000000
-1,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,morning,49.03490000000
-1,CO2f,2030,0,R1,2020,gasboiler,all-year,all-week,morning,58.07310000000
-2,heat,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,0.50520000000
-2,heat,2025,1,R1,2020,heatpump,all-year,all-week,afternoon,0.82820000000
-2,heat,2030,0,R1,2020,gasboiler,all-year,all-week,afternoon,0.59830000000
-2,heat,2030,1,R1,2020,heatpump,all-year,all-week,afternoon,1.06840000000
-2,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,32.68990000000
-2,CO2f,2030,0,R1,2020,gasboiler,all-year,all-week,afternoon,38.71540000000
-3,heat,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,0.75780000000
-3,heat,2025,1,R1,2020,heatpump,all-year,all-week,early-peak,1.24220000000
-3,heat,2030,0,R1,2020,gasboiler,all-year,all-week,early-peak,0.89740000000
-3,heat,2030,1,R1,2020,heatpump,all-year,all-week,early-peak,1.60260000000
-3,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,49.03490000000
-3,CO2f,2030,0,R1,2020,gasboiler,all-year,all-week,early-peak,58.07310000000
-4,heat,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,1.51550000000
-4,heat,2025,1,R1,2020,heatpump,all-year,all-week,late-peak,2.48450000000
-4,heat,2030,0,R1,2020,gasboiler,all-year,all-week,late-peak,1.79490000000
-4,heat,2030,1,R1,2020,heatpump,all-year,all-week,late-peak,3.20510000000
-4,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,98.06980000000
-4,CO2f,2030,0,R1,2020,gasboiler,all-year,all-week,late-peak,116.14620000000
-5,heat,2025,0,R1,2020,gasboiler,all-year,all-week,evening,1.01040000000
-5,heat,2025,1,R1,2020,heatpump,all-year,all-week,evening,1.65630000000
-5,heat,2030,0,R1,2020,gasboiler,all-year,all-week,evening,1.19660000000
-5,heat,2030,1,R1,2020,heatpump,all-year,all-week,evening,2.13680000000
-5,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,evening,65.37990000000
-5,CO2f,2030,0,R1,2020,gasboiler,all-year,all-week,evening,77.43080000000
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
deleted file mode 100644
index d49460b1..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2020,all-year,all-week,night,0.59830000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.06840000000
-0,heat,2035,1,R1,gasboiler,2030,all-year,all-week,night,1.00000000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.00000000000
-0,CO2f,2030,0,R1,gasboiler,2020,all-year,all-week,night,38.71540000000
-0,CO2f,2035,1,R1,gasboiler,2030,all-year,all-week,night,64.71000000000
-1,heat,2030,0,R1,gasboiler,2020,all-year,all-week,morning,0.89740000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.60260000000
-1,heat,2035,1,R1,gasboiler,2030,all-year,all-week,morning,1.50000000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,1.50000000000
-1,CO2f,2030,0,R1,gasboiler,2020,all-year,all-week,morning,58.07310000000
-1,CO2f,2035,1,R1,gasboiler,2030,all-year,all-week,morning,97.06500000000
-2,heat,2030,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.59830000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.06840000000
-2,heat,2035,1,R1,gasboiler,2030,all-year,all-week,afternoon,1.00000000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.00000000000
-2,CO2f,2030,0,R1,gasboiler,2020,all-year,all-week,afternoon,38.71540000000
-2,CO2f,2035,1,R1,gasboiler,2030,all-year,all-week,afternoon,64.71000000000
-3,heat,2030,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.89740000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.60260000000
-3,heat,2035,1,R1,gasboiler,2030,all-year,all-week,early-peak,1.50000000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,1.50000000000
-3,CO2f,2030,0,R1,gasboiler,2020,all-year,all-week,early-peak,58.07310000000
-3,CO2f,2035,1,R1,gasboiler,2030,all-year,all-week,early-peak,97.06500000000
-4,heat,2030,0,R1,gasboiler,2020,all-year,all-week,late-peak,1.79490000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.20510000000
-4,heat,2035,1,R1,gasboiler,2030,all-year,all-week,late-peak,3.00000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,3.00000000000
-4,CO2f,2030,0,R1,gasboiler,2020,all-year,all-week,late-peak,116.14620000000
-4,CO2f,2035,1,R1,gasboiler,2030,all-year,all-week,late-peak,194.13000000000
-5,heat,2030,0,R1,gasboiler,2020,all-year,all-week,evening,1.19660000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.13680000000
-5,heat,2035,1,R1,gasboiler,2030,all-year,all-week,evening,2.00000000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.00000000000
-5,CO2f,2030,0,R1,gasboiler,2020,all-year,all-week,evening,77.43080000000
-5,CO2f,2035,1,R1,gasboiler,2030,all-year,all-week,evening,129.42000000000
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
deleted file mode 100644
index d43cfe3a..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2035,2,R1,2030,gasboiler,all-year,all-week,night,1.00000000000
-0,heat,2035,3,R1,2030,heatpump,all-year,all-week,night,1.00000000000
-0,heat,2040,2,R1,2030,gasboiler,all-year,all-week,night,1.16670000000
-0,heat,2040,3,R1,2030,heatpump,all-year,all-week,night,1.16670000000
-0,CO2f,2035,2,R1,2030,gasboiler,all-year,all-week,night,64.71000000000
-0,CO2f,2040,2,R1,2030,gasboiler,all-year,all-week,night,75.49500000000
-1,heat,2035,2,R1,2030,gasboiler,all-year,all-week,morning,1.50000000000
-1,heat,2035,3,R1,2030,heatpump,all-year,all-week,morning,1.50000000000
-1,heat,2040,2,R1,2030,gasboiler,all-year,all-week,morning,1.75000000000
-1,heat,2040,3,R1,2030,heatpump,all-year,all-week,morning,1.75000000000
-1,CO2f,2035,2,R1,2030,gasboiler,all-year,all-week,morning,97.06500000000
-1,CO2f,2040,2,R1,2030,gasboiler,all-year,all-week,morning,113.24250000000
-2,heat,2035,2,R1,2030,gasboiler,all-year,all-week,afternoon,1.00000000000
-2,heat,2035,3,R1,2030,heatpump,all-year,all-week,afternoon,1.00000000000
-2,heat,2040,2,R1,2030,gasboiler,all-year,all-week,afternoon,1.16670000000
-2,heat,2040,3,R1,2030,heatpump,all-year,all-week,afternoon,1.16670000000
-2,CO2f,2035,2,R1,2030,gasboiler,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2040,2,R1,2030,gasboiler,all-year,all-week,afternoon,75.49500000000
-3,heat,2035,2,R1,2030,gasboiler,all-year,all-week,early-peak,1.50000000000
-3,heat,2035,3,R1,2030,heatpump,all-year,all-week,early-peak,1.50000000000
-3,heat,2040,2,R1,2030,gasboiler,all-year,all-week,early-peak,1.75000000000
-3,heat,2040,3,R1,2030,heatpump,all-year,all-week,early-peak,1.75000000000
-3,CO2f,2035,2,R1,2030,gasboiler,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2040,2,R1,2030,gasboiler,all-year,all-week,early-peak,113.24250000000
-4,heat,2035,2,R1,2030,gasboiler,all-year,all-week,late-peak,3.00000000000
-4,heat,2035,3,R1,2030,heatpump,all-year,all-week,late-peak,3.00000000000
-4,heat,2040,2,R1,2030,gasboiler,all-year,all-week,late-peak,3.50000000000
-4,heat,2040,3,R1,2030,heatpump,all-year,all-week,late-peak,3.50000000000
-4,CO2f,2035,2,R1,2030,gasboiler,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2040,2,R1,2030,gasboiler,all-year,all-week,late-peak,226.48500000000
-5,heat,2035,2,R1,2030,gasboiler,all-year,all-week,evening,2.00000000000
-5,heat,2035,3,R1,2030,heatpump,all-year,all-week,evening,2.00000000000
-5,heat,2040,2,R1,2030,gasboiler,all-year,all-week,evening,2.33330000000
-5,heat,2040,3,R1,2030,heatpump,all-year,all-week,evening,2.33330000000
-5,CO2f,2035,2,R1,2030,gasboiler,all-year,all-week,evening,129.42000000000
-5,CO2f,2040,2,R1,2030,gasboiler,all-year,all-week,evening,150.99000000000
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
deleted file mode 100644
index ade3c9a7..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2030,all-year,all-week,night,1.16670000000
-0,heat,2040,2,R1,heatpump,2030,all-year,all-week,night,1.16670000000
-0,heat,2045,1,R1,gasboiler,2040,all-year,all-week,night,1.33330000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.33330000000
-0,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,night,75.49500000000
-0,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,night,86.28000000000
-1,heat,2040,0,R1,gasboiler,2030,all-year,all-week,morning,1.75000000000
-1,heat,2040,2,R1,heatpump,2030,all-year,all-week,morning,1.75000000000
-1,heat,2045,1,R1,gasboiler,2040,all-year,all-week,morning,2.00000000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.00000000000
-1,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,morning,113.24250000000
-1,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,morning,129.42000000000
-2,heat,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,1.16670000000
-2,heat,2040,2,R1,heatpump,2030,all-year,all-week,afternoon,1.16670000000
-2,heat,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,1.33330000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.33330000000
-2,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,75.49500000000
-2,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,86.28000000000
-3,heat,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,1.75000000000
-3,heat,2040,2,R1,heatpump,2030,all-year,all-week,early-peak,1.75000000000
-3,heat,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,2.00000000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.00000000000
-3,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,113.24250000000
-3,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,129.42000000000
-4,heat,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,3.50000000000
-4,heat,2040,2,R1,heatpump,2030,all-year,all-week,late-peak,3.50000000000
-4,heat,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,4.00000000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,4.00000000000
-4,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,226.48500000000
-4,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,258.84000000000
-5,heat,2040,0,R1,gasboiler,2030,all-year,all-week,evening,2.33330000000
-5,heat,2040,2,R1,heatpump,2030,all-year,all-week,evening,2.33330000000
-5,heat,2045,1,R1,gasboiler,2040,all-year,all-week,evening,2.66670000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,2.66670000000
-5,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,evening,150.99000000000
-5,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,evening,172.56000000000
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
deleted file mode 100644
index a8125dfc..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2045,2,R1,2040,gasboiler,all-year,all-week,night,1.33330000000
-0,heat,2045,3,R1,2040,heatpump,all-year,all-week,night,1.33330000000
-0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,1.50000000000
-0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,1.50000000000
-0,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,night,86.28000000000
-0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,97.06500000000
-1,heat,2045,2,R1,2040,gasboiler,all-year,all-week,morning,2.00000000000
-1,heat,2045,3,R1,2040,heatpump,all-year,all-week,morning,2.00000000000
-1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,2.25000000000
-1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,2.25000000000
-1,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,morning,129.42000000000
-1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,145.59750000000
-2,heat,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,1.33330000000
-2,heat,2045,3,R1,2040,heatpump,all-year,all-week,afternoon,1.33330000000
-2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,1.50000000000
-2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,1.50000000000
-2,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,86.28000000000
-2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,97.06500000000
-3,heat,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,2.00000000000
-3,heat,2045,3,R1,2040,heatpump,all-year,all-week,early-peak,2.00000000000
-3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,2.25000000000
-3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,2.25000000000
-3,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,129.42000000000
-3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,145.59750000000
-4,heat,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,4.00000000000
-4,heat,2045,3,R1,2040,heatpump,all-year,all-week,late-peak,4.00000000000
-4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,4.50000000000
-4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,4.50000000000
-4,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,258.84000000000
-4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,291.19500000000
-5,heat,2045,2,R1,2040,gasboiler,all-year,all-week,evening,2.66670000000
-5,heat,2045,3,R1,2040,heatpump,all-year,all-week,evening,2.66670000000
-5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,3.00000000000
-5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,3.00000000000
-5,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,evening,172.56000000000
-5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,194.13000000000
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
deleted file mode 100644
index 3e613685..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,1.50000000000
-0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,1.50000000000
-0,heat,2055,4,R1,2050,gasboiler,all-year,all-week,night,1.50000000000
-0,heat,2055,5,R1,2050,heatpump,all-year,all-week,night,1.50000000000
-0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,97.06500000000
-0,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,night,97.06500000000
-1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,2.25000000000
-1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,2.25000000000
-1,heat,2055,4,R1,2050,gasboiler,all-year,all-week,morning,2.25000000000
-1,heat,2055,5,R1,2050,heatpump,all-year,all-week,morning,2.25000000000
-1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,145.59750000000
-1,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,morning,145.59750000000
-2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,1.50000000000
-2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,1.50000000000
-2,heat,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,1.50000000000
-2,heat,2055,5,R1,2050,heatpump,all-year,all-week,afternoon,1.50000000000
-2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,97.06500000000
-2,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,97.06500000000
-3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,2.25000000000
-3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,2.25000000000
-3,heat,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,2.25000000000
-3,heat,2055,5,R1,2050,heatpump,all-year,all-week,early-peak,2.25000000000
-3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,145.59750000000
-3,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,145.59750000000
-4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,4.50000000000
-4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,4.50000000000
-4,heat,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,4.50000000000
-4,heat,2055,5,R1,2050,heatpump,all-year,all-week,late-peak,4.50000000000
-4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,291.19500000000
-4,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,291.19500000000
-5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,3.00000000000
-5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,3.00000000000
-5,heat,2055,4,R1,2050,gasboiler,all-year,all-week,evening,3.00000000000
-5,heat,2055,5,R1,2050,heatpump,all-year,all-week,evening,3.00000000000
-5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,194.13000000000
-5,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,evening,194.13000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
similarity index 90%
rename from docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
rename to docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
index b8aa4153..36de79ac 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/visualise-max-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "# share with minimum service\n",
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"2-max-constraint/Results/MCACapacity.csv\")\n",
     "print(mca_capacity.head())\n",
     "\n",
     "capacity = (\n",
@@ -36,7 +36,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply = pd.read_csv(\"Results/Power/Supply_Timeslice/2025.csv\")\n",
+    "power_supply = pd.read_csv(\"2-max-constraint/Results/Power/Supply_Timeslice/2025.csv\")\n",
     "\n",
     "sns.lineplot(\n",
     "    data=power_supply[\n",
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
similarity index 90%
rename from docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
rename to docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
index 0f9c430e..a0d5c4f8 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "# share with minimum service\n",
-    "mca_capacity = pd.read_csv(\"Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"1-min-constraint/Results/MCACapacity.csv\")\n",
     "print(mca_capacity.head())\n",
     "\n",
     "capacity = (\n",
@@ -36,7 +36,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2020 = pd.read_csv(\"Results/Power/Supply_Timeslice/2020.csv\")\n",
+    "power_supply_2020 = pd.read_csv(\n",
+    "    \"1-min-constraint/Results/Power/Supply_Timeslice/2020.csv\"\n",
+    ")\n",
     "\n",
     "sns.lineplot(\n",
     "    data=power_supply_2020[\n",
@@ -60,7 +62,7 @@
    "source": [
     "from pathlib import Path\n",
     "\n",
-    "path = \"Results/Residential/Capacity/\"\n",
+    "path = \"1-min-constraint-Results/Residential/Capacity/\"\n",
     "\n",
     "all_files = Path(path).glob(\"*.csv\")\n",
     "\n",
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
deleted file mode 100644
index c1f9aad1..00000000
--- a/docs/user-guide/addition-service-demand.ipynb
+++ /dev/null
@@ -1,318 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Adding a service demand"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "In this section, we detail how to add a service demand to MUSE. \n",
-    "\n",
-    "In the residential sector, a service demand could be cooking. Houses require energy to cook food and a technology to service this demand, such as an electric stove. \n",
-    "\n",
-    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socio-economic development of a region or country. In addition, a technology must be added to service this new demand."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Addition of cooking demand"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Firstly, we must add the demand section. In this example, we will add a cooking preset demand. To achieve this, we will now edit the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files, found within the `technodata/preset/` directory.\n",
-    "\n",
-    "The `Residential2020Consumption.csv` file allows us to specify the demand in 2020 for each region and technology per timeslice. The `Residential2050Consumption.csv` file does the same but for the year 2050. The datapoints between these are interpolated.\n",
-    "\n",
-    "Firstly, we must add the new service demand: `cook` as a column in these two files. Next, we add the demand. Again, the modified entries are in bold:"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
-    "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|0|R1|gasboiler|1|0|0|1|0|0|**1**|\n",
-    "|1|R1|gasboiler|2|0|0|1.5|0|0|**2**|\n",
-    "|2|R1|gasboiler|3|0|0|1|0|0|**1**|\n",
-    "|3|R1|gasboiler|4|0|0|1.5|0|0|**1.5**|\n",
-    "|4|R1|gasboiler|5|0|0|3|0|0|**2**|\n",
-    "|5|R1|gasboiler|6|0|0|2|0|0|**3**|\n",
-    "|6|R1|gasboiler|7|0|0|2|0|0|**2**|\n",
-    "|7|R1|gasboiler|8|0|0|2|0|0|**3**|\n",
-    "|8|R2|gasboiler|1|0|0|1|0|0|**1**|\n",
-    "|9|R2|gasboiler|2|0|0|1.5|0|0|**1**|\n",
-    "|10|R2|gasboiler|3|0|0|1|0|0|**1**|\n",
-    "|11|R2|gasboiler|4|0|0|1.5|0|0|**1.5**|\n",
-    "|12|R2|gasboiler|5|0|0|3|0|0|**2**|\n",
-    "|13|R2|gasboiler|6|0|0|2|0|0|**2**|\n",
-    "|14|R2|gasboiler|7|0|0|2|0|0|**2.5**|\n",
-    "|15|R2|gasboiler|8|0|0|2|0|0|**2**|\n",
-    "\n",
-    "\n",
-    "<!-- ||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
-    "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|0|R1|gasboiler|1|0|0|1|0|0|**0**|\n",
-    "|...|...|...|...|...|...|...|...|...|**...**|\n",
-    "|15|R2|gasboiler|8|0|0|2|0|0|**0**|\n",
-    "|**16**|**R1**|**electric_stove**|**1**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**17**|**R1**|**electric_stove**|**2**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**18**|**R1**|**electric_stove**|**3**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**19**|**R1**|**electric_stove**|**4**|**0**|**0**|**0**|**0**|**0**|**1.5**|\n",
-    "|**20**|**R1**|**electric_stove**|**5**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**21**|**R1**|**electric_stove**|**6**|**0**|**0**|**0**|**0**|**0**|**3**|\n",
-    "|**22**|**R1**|**electric_stove**|**7**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**23**|**R1**|**electric_stove**|**8**|**0**|**0**|**0**|**0**|**0**|**3**|\n",
-    "|**24**|**R2**|**electric_stove**|**1**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**25**|**R2**|**electric_stove**|**2**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**26**|**R2**|**electric_stove**|**3**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**27**|**R2**|**electric_stove**|**4**|**0**|**0**|**0**|**0**|**0**|**1.5**|\n",
-    "|**28**|**R2**|**electric_stove**|**5**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**29**|**R2**|**electric_stove**|**6**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**30**|**R2**|**electric_stove**|**7**|**0**|**0**|**0**|**0**|**0**|**2.5**|\n",
-    "|**31**|**R2**|**electric_stove**|**8**|**0**|**0**|**0**|**0**|**0**|**2**| -->\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "As can be seen, we only need to add a `cook` column in the file, as well as the demand level for each timeslice and each region. This can be seen through the addition of a positive number in the `cook` column.\n",
-    "\n",
-    "The process is very similar for the `Residential2050Consumption.csv` file, however, for this example, we often placed larger numbers to indicate higher demand in 2050. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Next, we must edit the files within the `input` folder. For this, we must  add the `cook` service demand to each of these files.\n",
-    "\n",
-    "First, we will amend the `BaseYearExport.csv` and `BaseYearImport.csv` files. For this, we say that there is no import or export of the `cook` service demand. A brief example is outlined below for `BaseYearExport.csv`:\n",
-    "\n",
-    "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|solar|**cook**|\n",
-    "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|PJ|**PJ**|\n",
-    "|R1|Exports|2010|0|0|0|0|0|0|**0**|\n",
-    "|...|...|...|...|...|...|...|...|...|**...**|\n",
-    "|R2|Exports|2100|0|0|0|0|0|0|**0**|\n",
-    "\n",
-    "The same is true for the `BaseYearImport.csv` file:\n",
-    "\n",
-    "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|solar|**cook**|\n",
-    "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|PJ|**PJ**|\n",
-    "|R1|Imports|2010|0|0|0|0|0|0|**0**|\n",
-    "|...|...|...|...|...|...|...|...|...|**...**|\n",
-    "|R2|Imports|2100|0|0|0|0|0|0|**0**|\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Next, we must edit the `GlobalCommodities.csv` file. This is where we define the new commodity `cook`. It tells MUSE the commodity type, name, emissions factor of CO2 and heat rate, amongst other things. \n",
-    "\n",
-    "The example used for this tutorial is below: \n",
-    "\n",
-    "|Commodity|CommodityType|CommodityName|CommodityEmissionFactor_CO2|HeatRate|Unit|\n",
-    "|-|-|-|-|-|-|\n",
-    "|Electricity|Energy|electricity|0|1|PJ|\n",
-    "|Gas|Energy|gas|56.1|1|PJ|\n",
-    "|Heat|Energy|heat|0|1|PJ|\n",
-    "|Wind|Energy|wind|0|1|PJ|\n",
-    "|CO2fuelcomsbustion|Environmental|CO2f|0|1|kt|\n",
-    "|Solar|Energy|solar|0|1|PJ|\n",
-    "|**Cook**|**Energy**|**cook**|**0**|**1**|**PJ**|"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Finally, the `Projections.csv` file must be changed. This is a large file which details the expected cost of the technology in the first benchmark year of the simulation. Due to its size, we will only show two rows of the new column `cook`.\n",
-    "\n",
-    "|RegionName|Attribute|Time|…|**cook**|\n",
-    "|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|**MUS\\$2010/PJ**|\n",
-    "|R1|CommodityPrice|2010|…|**100**|\n",
-    "|…|…|…|…|**…**|\n",
-    "|R2|CommodityPrice|2100|…|**100**|\n",
-    "\n",
-    "We set every price of cook to be `100MUS$2010/PJ`"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Addition of cooking technology"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Next, we must add a technology to service this new demand. This is achieved through a similar process as the section in the [\"1. adding a new technology\"](add-solar.ipynb) section. However, we must be careful to specify the end-use of the technology as `cook`.\n",
-    "\n",
-    "For this example, we will add two competing technologies to service the cooking demand: `electric_stove` and `gas_stove` to the `Technodata.csv` file in `/technodata/residential/Technodata.csv`.\n",
-    "\n",
-    "Again for the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `gasboiler` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `heatpump` from region `R1` for both `R1` and `R2`. \n",
-    "\n",
-    "An important modification, however, is specifying the end-use for these new technologies to be `cook` and not `heat`.\n",
-    "\n",
-    "|ProcessName|RegionName|Time|Level|cap_par|…|Fuel|EndUse|Agent2|\n",
-    "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|-|MUS$2010/PJ_a|…|-|-|Retrofit|\n",
-    "|gasboiler|R1|2020|fixed|3.8|…|gas|heat|1|\n",
-    "|...|...|...|...|...|...|...|...|...|\n",
-    "|**electric_stove**|**R1**|**2020**|**fixed**|**3.8**|**…**|**electricity**|**cook**|**1**|\n",
-    "|**electric_stove**|**R2**|**2020**|**fixed**|**3.8**|**…**|**electricity**|**cook**|**1**|\n",
-    "|**gas_stove**|**R1**|**2020**|**fixed**|**8.8667**|**…**|**gas**|**cook**|**1**|\n",
-    "|**gas_stove**|**R2**|**2020**|**fixed**|**8.8667**|**…**|**gas**|**cook**|**1**|\n",
-    "\n",
-    "\n",
-    "As can be seen we have added two technologies, in the two regions with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "We must also add the data for these new technologies to the following files:\n",
-    "\n",
-    "- `CommIn.csv`\n",
-    "\n",
-    "- `CommOut.csv`\n",
-    "\n",
-    "- `ExistingCapacity.csv`\n",
-    "\n",
-    "This is largely a similar process to the tutorial shown in [\"adding a new technology\"](add-solar.ipynb). We must add the input to each of the technologies (gas and electricity for `gas_stove` and `electric_stove` respectively), outputs of `cook` for both and the existing capacity for each technology in each region.\n",
-    "\n",
-    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/technodata.csv` file. For this example, we set this file as follows:\n",
-    "\n",
-    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
-    "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gassupply1|R1|2020|…|**100**|**5**|**500**|…|1|\n",
-    "|gassupply1|R2|2020|…|**100**|**5**|**120**|…|1|\n",
-    "\n",
-    "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Again, we run the simulation with our modified input files using the following command, in the relevant directory:\n",
-    "    \n",
-    "    python -m muse settings.toml\n",
-    "    \n",
-    "Once this has run we are ready to visualise our results."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import matplotlib.pyplot as plt\n",
-    "import pandas as pd\n",
-    "import seaborn as sns"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "mca_capacity = pd.read_csv(\n",
-    "    \"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\"\n",
-    ")\n",
-    "mca_capacity.head()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
-    "    sector_capacity = (\n",
-    "        sector_data.groupby([\"technology\", \"region\", \"year\"]).sum().reset_index()\n",
-    "    )\n",
-    "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
-    "    g.map_dataframe(\n",
-    "        lambda data, **kwargs: data.pivot(\n",
-    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
-    "    )\n",
-    "    g.add_legend()\n",
-    "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
-    "    g.figure.subplots_adjust(top=0.8)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "We can see our new technology, the `gas_stove` is used and the `electric_stove` is not used at all. Therefore, there is an increase in `gassupply1` to accommodate for this growth in demand. However, this is not enough to displace `windturbine` by `gasCCGT` in the power sector."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Next steps"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "In the next section we will use a regression function to estimate electricity demand from GDP and population data."
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3.9.0 ('muse39')",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.18"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "22ff8bbda430c28f07def99f448c0c69dabbaf0c7d993cae69f87b3c458d04b2"
-   }
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}

From 0a7fa9aa7f34ef9e8c63e75db90777502e3541cb Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 13:39:29 +0100
Subject: [PATCH 116/419] Tutorial 6

---
 .gitignore                                    |  1 +
 .../1-correlation/input/BaseYearExport.csv    | 42 ++++-----
 .../1-correlation/input/BaseYearImport.csv    | 42 ++++-----
 .../1-correlation/input/GlobalCommodities.csv |  1 -
 .../1-correlation/input/Projections.csv       | 42 ++++-----
 .../1-correlation/settings.toml               | 86 ++++++++++++-------
 .../1-correlation/technodata/Agents.csv       |  6 +-
 .../technodata/gas/Technodata.csv             |  6 +-
 .../1-correlation/technodata/power/CommIn.csv |  9 +-
 .../technodata/power/CommOut.csv              |  9 +-
 .../technodata/power/ExistingCapacity.csv     |  1 -
 .../technodata/power/Technodata.csv           |  9 +-
 .../preset/TimesliceSharepreset.csv           |  2 -
 .../technodata/residential/Technodata.csv     |  8 +-
 .../6-add-correlation-demand/Macrodrivers.csv |  3 +
 .../TimesliceSharepreset.csv                  |  9 ++
 .../generate_models.py                        | 65 ++++++++++++++
 .../regressionparameters.csv                  |  5 ++
 .../add-gdp-correlation-demand.ipynb          |  2 +-
 19 files changed, 225 insertions(+), 123 deletions(-)
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/Macrodrivers.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/generate_models.py
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/regressionparameters.csv

diff --git a/.gitignore b/.gitignore
index 90eea441..50008857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@ dmypy.json
 .pyre/
 
 /Results/
+docs/tutorial-code/**/Results
 /FileLog.txt
 /Power/Data/MusePower/Data/
 /MUSEGlobalSettings.csv/
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv
index 38c886d3..7218c1fc 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearExport.csv
@@ -1,21 +1,21 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
-R1,Exports,2010,0,0,0,0,0,0
-R1,Exports,2015,0,0,0,0,0,0
-R1,Exports,2020,0,0,0,0,0,0
-R1,Exports,2025,0,0,0,0,0,0
-R1,Exports,2030,0,0,0,0,0,0
-R1,Exports,2035,0,0,0,0,0,0
-R1,Exports,2040,0,0,0,0,0,0
-R1,Exports,2045,0,0,0,0,0,0
-R1,Exports,2050,0,0,0,0,0,0
-R1,Exports,2055,0,0,0,0,0,0
-R1,Exports,2060,0,0,0,0,0,0
-R1,Exports,2065,0,0,0,0,0,0
-R1,Exports,2070,0,0,0,0,0,0
-R1,Exports,2075,0,0,0,0,0,0
-R1,Exports,2080,0,0,0,0,0,0
-R1,Exports,2085,0,0,0,0,0,0
-R1,Exports,2090,0,0,0,0,0,0
-R1,Exports,2095,0,0,0,0,0,0
-R1,Exports,2100,0,0,0,0,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ,PJ,PJ,kt,PJ
+R1,Exports,2010,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv
index 9c9cc695..75b32276 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/BaseYearImport.csv
@@ -1,21 +1,21 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
-R1,Imports,2010,0,0,0,0,0,0
-R1,Imports,2015,0,0,0,0,0,0
-R1,Imports,2020,0,0,0,0,0,0
-R1,Imports,2025,0,0,0,0,0,0
-R1,Imports,2030,0,0,0,0,0,0
-R1,Imports,2035,0,0,0,0,0,0
-R1,Imports,2040,0,0,0,0,0,0
-R1,Imports,2045,0,0,0,0,0,0
-R1,Imports,2050,0,0,0,0,0,0
-R1,Imports,2055,0,0,0,0,0,0
-R1,Imports,2060,0,0,0,0,0,0
-R1,Imports,2065,0,0,0,0,0,0
-R1,Imports,2070,0,0,0,0,0,0
-R1,Imports,2075,0,0,0,0,0,0
-R1,Imports,2080,0,0,0,0,0,0
-R1,Imports,2085,0,0,0,0,0,0
-R1,Imports,2090,0,0,0,0,0,0
-R1,Imports,2095,0,0,0,0,0,0
-R1,Imports,2100,0,0,0,0,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ,PJ,PJ,kt,PJ
+R1,Imports,2010,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv
index 253b75ef..0d4c58da 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/GlobalCommodities.csv
@@ -4,4 +4,3 @@ Gas,Energy,gas,56.1,1,PJ
 Heat,Energy,heat,0,1,PJ
 Wind,Energy,wind,0,1,PJ
 CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
-Solar,Energy,solar,0,1,PJ
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv
index 6a013889..5b5e4326 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/input/Projections.csv
@@ -1,21 +1,21 @@
-RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt
-R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
-R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
-R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
-R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
-R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
-R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
-R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
-R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
-R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
-R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
-R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
-R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
-R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
-R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
-R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
-R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
-R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
-R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
-R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 86cae5e3..91dc51e1 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -6,37 +6,37 @@ regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities = ["wind", "solar"]
+excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 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"
-
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{path}/{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"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
 
 # Carbon budget control
 [carbon_budget_control]
-# budget = []
-method = "fitting"
+budget = []
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
@@ -64,6 +64,21 @@ constraints = [
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -81,6 +96,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.power.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -98,6 +120,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
 interaction = 'transfer'
@@ -105,20 +134,17 @@ interaction = 'transfer'
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
-path = '{path}/technodata/preset'
-timeslice_shares_path = '{path}/TimesliceSharepreset.csv'
-macrodrivers_path = '{path}/Macrodrivers.csv'
-regression_path = '{path}/regressionparameters.csv'
-forecast = 0
-filters = {sector = "residential", region = ["R1"]}
+timeslice_shares_path = "{path}/technodata/preset/TimesliceSharepreset.csv"
+macrodrivers_path = "{path}/technodata/preset/Macrodrivers.csv"
+regression_path = "{path}/technodata/preset/regressionparameters.csv"
 
 [timeslices]
 level_names = ["month", "day", "hour"]
-all-year.all-week.night = 1095
-all-year.all-week.morning = 1095
-all-year.all-week.mid-afternoon = 1095
-all-year.all-week.early-peak = 1095
-all-year.all-week.late-peak = 1095
-all-year.all-week.evening = 1095
-all-year.all-week.early-morning = 1095
-all-year.all-week.late-afternoon = 1095
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
index f6ab761e..26315bf8 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
+Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
index 57f66da8..25614cf7 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv
index d5fa3d21..c78f9c6e 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommIn.csv
@@ -1,5 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
-windturbine,R1,2020,fixed,0,0,0,0,1,0
-solarPV,R1,2020,fixed,0,0,0,0,0,1
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
index b1a8d48f..03a2f4dd 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
@@ -1,5 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0
+windturbine,R1,2020,fixed,1,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv
index 56b7b1fc..2171d259 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/ExistingCapacity.csv
@@ -1,4 +1,3 @@
 ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
 gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
 windturbine,R1,PJ/y,0,0,0,0,0,0,0
-solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
index a88ebe95..9d767cfa 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
@@ -1,5 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv
index 351edf35..5037b854 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv
@@ -5,5 +5,3 @@ SN,RegionName,electricity,gas,heat,CO2f,wind
 4,R1,0,0,0.107,0,0
 5,R1,0,0,0.214,0,0
 6,R1,0,0,0.143,0,0
-7,R1,0,0,0.143,0,0
-8,R1,0,0,0.143,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
index a69ce96b..aa4eb867 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/Macrodrivers.csv b/docs/tutorial-code/6-add-correlation-demand/Macrodrivers.csv
new file mode 100644
index 00000000..97c00691
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/Macrodrivers.csv
@@ -0,0 +1,3 @@
+Variable,RegionName,Unit,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110
+GDP|PPP,R1,millionUS$2005,1206919,1220599,1234278,1247958,1261637,1275317,1288997,1302676,1316356,1330035,1343715,1384465,1425215,1465965,1506715,1547465,1588215,1628965,1669715,1710465,1751215,1796887,1842558,1888230,1933901,1979573,2025244,2070916,2116587,2162259,2207930,2257386,2306842,2356297,2405753,2455209,2504665,2554120,2603576,2653032,2702488,2758342,2814196,2870050,2925904,2981758,3037612,3093466,3149320,3205175,3261029,3330014,3398999,3467984,3536969,3605954,3674939,3743925,3812910,3881895,3950880,4017445,4084009,4150574,4217139,4283704,4350268,4416833,4483398,4549962,4616527,4681288,4746048,4810808,4875569,4940329,5005090,5069850,5134610,5199371,5264131,5326189,5388246,5450304,5512362,5574419,5636477,5698534,5760592,5822650,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707,5884707
+Population,R1,inhab,80004200,80915100,81825990,82736890,83647790,84558680,85469580,86380480,87291370,88202270,89113170,89830650,90548130,91265610,91983090,92700570,93418050,94135530,94853010,95570490,96287970,96822050,97356120,97890190,98424270,98958340,99492420,100026500,100560600,101094600,101628700,101971000,102313300,102655600,102997900,103340200,103682500,104024700,104367000,104709300,105051600,105187600,105323600,105459600,105595600,105731600,105867600,106003600,106139600,106275600,106411600,106385400,106359100,106332800,106306500,106280200,106253900,106227600,106201400,106175100,106148800,105981900,105815000,105648200,105481300,105314400,105147600,104980700,104813800,104646900,104480100,104216900,103953800,103690600,103427500,103164300,102901200,102638000,102374900,102111700,101848600,101535800,101223000,100910200,100597400,100284600,99971790,99658990,99346190,99033390,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590,98720590
diff --git a/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv b/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv
new file mode 100644
index 00000000..351edf35
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv
@@ -0,0 +1,9 @@
+SN,RegionName,electricity,gas,heat,CO2f,wind
+1,R1,0,0,0.071,0,0
+2,R1,0,0,0.107,0,0
+3,R1,0,0,0.071,0,0
+4,R1,0,0,0.107,0,0
+5,R1,0,0,0.214,0,0
+6,R1,0,0,0.143,0,0
+7,R1,0,0,0.143,0,0
+8,R1,0,0,0.143,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/generate_models.py b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
new file mode 100644
index 00000000..1dfa705e
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
@@ -0,0 +1,65 @@
+import os
+import shutil
+import sys
+
+from muse import examples
+from muse.wizard import (
+    modify_toml,
+)
+
+"""
+Model 1 - Introduction
+
+"""
+
+
+def generate_model_1() -> None:
+    """
+    Code to generate model 1-introduction.
+
+    """
+    model_name = "1-correlation"
+    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+
+    # Starting point: copy default model
+    examples.copy_model(name="default", path=parent_path, overwrite=True)
+    os.rename(os.path.join(parent_path, "model"), model_path)
+
+    # Delete presets
+    shutil.rmtree(os.path.join(model_path, "technodata/preset"))
+
+    # Copy regression files
+    os.mkdir(os.path.join(model_path, "technodata/preset"))
+    for file in [
+        "Macrodrivers.csv",
+        "regressionparameters.csv",
+        "TimesliceSharepreset.csv",
+    ]:
+        shutil.copy(
+            os.path.join(parent_path, file),
+            os.path.join(model_path, "technodata/preset", file),
+        )
+
+    # Modify toml file to point to new presets
+    settings_file = os.path.join(model_path, "settings.toml")
+    path_prefix = "{path}/technodata/preset/"
+    modify_toml(
+        settings_file,
+        lambda settings: (
+            settings["sectors"]["residential_presets"].update(
+                {
+                    "timeslice_shares_path": path_prefix + "TimesliceSharepreset.csv",
+                    "macrodrivers_path": path_prefix + "Macrodrivers.csv",
+                    "regression_path": path_prefix + "regressionparameters.csv",
+                }
+            ),
+            settings["sectors"]["residential_presets"].pop("consumption_path"),
+        ),
+    )
+
+
+if __name__ == "__main__":
+    generate_model_1()
diff --git a/docs/tutorial-code/6-add-correlation-demand/regressionparameters.csv b/docs/tutorial-code/6-add-correlation-demand/regressionparameters.csv
new file mode 100644
index 00000000..6b0e4b54
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/regressionparameters.csv
@@ -0,0 +1,5 @@
+SectorName,FunctionType,Coeff,RegionName,electricity,gas,heat,CO2f
+Residential,logistic-sigmoid,GDPexp,R1,0,0,9.94E-02,0
+Residential,logistic-sigmoid,constant,R1,0,0,1.01039E-05,0
+Residential,logistic-sigmoid,GDPscaleLess,R1,0,0,753.1068725,0
+Residential,logistic-sigmoid,GDPscaleGreater,R1,0,0,672.9316672,0
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index c9a69a5b..b38f4956 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -150,7 +150,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\n",
-    "    \"../tutorial-code/6-add-correlation-demand/Results/MCACapacity.csv\"\n",
+    "    \"../tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv\"\n",
     ")\n",
     "mca_capacity.head()"
    ]

From c70ff869287161c7a301dfd8a338df04f580fccf Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 14:17:55 +0100
Subject: [PATCH 117/419] Tutorial 7

---
 .../1-min-constraint/output.py                |  5 +-
 .../1-min-constraint/settings.toml            | 70 +++++++------------
 .../1-min-constraint/technodata/Agents.csv    |  2 +-
 .../technodata/power/TechnodataTimeslices.csv | 28 ++++----
 .../residential/TechnodataTimeslices.csv      | 14 ++++
 .../2-max-constraint/output.py                |  5 +-
 .../2-max-constraint/settings.toml            | 69 +++++++-----------
 .../2-max-constraint/technodata/Agents.csv    |  6 +-
 .../technodata/power/TechnodataTimeslices.csv | 28 ++++----
 .../generate_models.py                        | 60 ++++++++++++++++
 .../min-max-timeslice-constraints.ipynb       | 11 +--
 11 files changed, 166 insertions(+), 132 deletions(-)
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py

diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
index e6e04bb5..1b5785cb 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
@@ -1,6 +1,5 @@
 from typing import List, Optional, Text
 
-import pandas as pd
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
 
@@ -22,7 +21,7 @@ def supply_timeslice(
         .to_dataframe()
         .round(rounding)
     )
-    return pd.DataFrame(result[result.supply != 0]).reset_index()
+    return result[result.supply != 0]
 
 
 @register_output_quantity
@@ -42,4 +41,4 @@ def consumption_timeslice(
         .to_dataframe()
         .round(rounding)
     )
-    return pd.DataFrame(result[result.consumption != 0]).reset_index()
+    return result[result.consumption != 0]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 89618ec5..585d142d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -1,12 +1,12 @@
-plugins = "{path}/output.py"
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
 foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities = ["solar", "wind"]
+excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -16,12 +16,25 @@ 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"
+index = false
+
+[[outputs]]
+quantity = "timeslice_supply"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+
+[[outputs]]
+quantity = "timeslice_consumption"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -54,14 +67,14 @@ demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 sink = 'csv'
 overwrite = true
 quantity.name = "supply"
@@ -87,51 +100,18 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-quantity = "supply_timeslice"
-sink = "csv"
-overwrite = true
-index = false
-keep_columns = [
-    "timeslice",
-    "asset",
-    "year",
-    "commodity",
-    "region",
-    "installed",
-    "technology",
-    "month",
-    "day",
-    "hour",
-    "supply"
-]
-
-[[sectors.power.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-quantity = "consumption_timeslice"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-index = false
-keep_columns = [
-    "timeslice",
-    "asset",
-    "year",
-    "commodity",
-    "region",
-    "installed",
-    "technology",
-    "month",
-    "day",
-    "hour",
-    "consumption"
-]
+quantity.name = "supply"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
@@ -151,7 +131,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv
index f2a72ba7..26315bf8 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
index 7381e299..0b0629b4 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,month,day,hour,UtilizationFactor,MinimumServiceFactor
-Unit,-,Year,-,-,-,-,-
-gasCCGT,R1,2020,all-year,all-week,night,1,1
-gasCCGT,R1,2020,all-year,all-week,morning,1,2
-gasCCGT,R1,2020,all-year,all-week,afternoon,1,3
-gasCCGT,R1,2020,all-year,all-week,early-peak,1,2
-gasCCGT,R1,2020,all-year,all-week,late-peak,1,5
-gasCCGT,R1,2020,all-year,all-week,evening,1,6
-windturbine,R1,2020,all-year,all-week,night,1,1
-windturbine,R1,2020,all-year,all-week,morning,1,1
-windturbine,R1,2020,all-year,all-week,afternoon,1,1
-windturbine,R1,2020,all-year,all-week,early-peak,1,1
-windturbine,R1,2020,all-year,all-week,late-peak,1,1
-windturbine,R1,2020,all-year,all-week,evening,1,1
+ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
+Unit,-,Year,-,-,-,-,-,-
+gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,2
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,3
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,4
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,5
+gasCCGT,R1,2020,upper,all-year,all-week,evening,1,6
+windturbine,R1,2020,upper,all-year,all-week,night,1,1
+windturbine,R1,2020,upper,all-year,all-week,morning,1,1
+windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1
+windturbine,R1,2020,upper,all-year,all-week,early-peak,1,1
+windturbine,R1,2020,upper,all-year,all-week,late-peak,1,1
+windturbine,R1,2020,upper,all-year,all-week,evening,1,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv
new file mode 100644
index 00000000..847fd495
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv
@@ -0,0 +1,14 @@
+ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor
+Unit,-,Year,-,-,-,-,-
+heatpump,R1,2020,upper,all-year,all-week,night,0.9
+heatpump,R1,2020,upper,all-year,all-week,morning,0.9
+heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9
+heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9
+heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9
+heatpump,R1,2020,upper,all-year,all-week,evening,0.9
+gasboiler,R1,2020,upper,all-year,all-week,night,0.9
+gasboiler,R1,2020,upper,all-year,all-week,morning,0.9
+gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9
+gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9
+gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9
+gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
index e6e04bb5..1b5785cb 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
@@ -1,6 +1,5 @@
 from typing import List, Optional, Text
 
-import pandas as pd
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
 
@@ -22,7 +21,7 @@ def supply_timeslice(
         .to_dataframe()
         .round(rounding)
     )
-    return pd.DataFrame(result[result.supply != 0]).reset_index()
+    return result[result.supply != 0]
 
 
 @register_output_quantity
@@ -42,4 +41,4 @@ def consumption_timeslice(
         .to_dataframe()
         .round(rounding)
     )
-    return pd.DataFrame(result[result.consumption != 0]).reset_index()
+    return result[result.consumption != 0]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 18c1eabe..585d142d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -1,12 +1,12 @@
-plugins = "{path}/output.py"
 # Global settings - most REQUIRED
+
 time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
 foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
 regions = ["R1"]
 interest_rate = 0.1
 interpolation_mode = 'Active'
 log_level = 'info'
-excluded_commodities = ["solar", "wind"]
+excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
 maximum_iterations = 100
@@ -16,12 +16,24 @@ 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"
+index = false
+
+[[outputs]]
+quantity = "timeslice_supply"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+
+[[outputs]]
+quantity = "timeslice_consumption"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
 
 # Carbon budget control
@@ -55,14 +67,14 @@ demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.residential.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 sink = 'csv'
 overwrite = true
 quantity.name = "supply"
@@ -88,51 +100,18 @@ existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 [[sectors.power.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
 index = false
 
 [[sectors.power.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-quantity = "supply_timeslice"
-sink = "csv"
-overwrite = true
-index = false
-keep_columns = [
-    "timeslice",
-    "asset",
-    "year",
-    "commodity",
-    "region",
-    "installed",
-    "technology",
-    "month",
-    "day",
-    "hour",
-    "supply"
-]
-
-[[sectors.power.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
-quantity = "consumption_timeslice"
-sink = "csv"
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
 overwrite = true
-index = false
-keep_columns = [
-    "timeslice",
-    "asset",
-    "year",
-    "commodity",
-    "region",
-    "installed",
-    "technology",
-    "month",
-    "day",
-    "hour",
-    "consumption"
-]
+quantity.name = "supply"
+quantity.drop = ["comm_usage", "units_prices"]
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
@@ -152,7 +131,7 @@ existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
 [[sectors.gas.outputs]]
-filename = '{path}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv
index 739bee82..26315bf8 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
-Agent1,A1,R1,LCOE,,,1,,,FALSE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,FALSE,,,all,singleObj,1,-1,inf,Retrofit
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
+Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
index 2005515e..d556a983 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,month,day,hour,UtilizationFactor,MinimumServiceFactor
-Unit,-,Year,-,-,-,-,-
-gasCCGT,R1,2020,all-year,all-week,night,1,1
-gasCCGT,R1,2020,all-year,all-week,morning,1,2
-gasCCGT,R1,2020,all-year,all-week,afternoon,1,3
-gasCCGT,R1,2020,all-year,all-week,early-peak,1,2
-gasCCGT,R1,2020,all-year,all-week,late-peak,1,5
-gasCCGT,R1,2020,all-year,all-week,evening,1,6
-windturbine,R1,2020,all-year,all-week,night,1,0
-windturbine,R1,2020,all-year,all-week,morning,0.5,0
-windturbine,R1,2020,all-year,all-week,afternoon,0.5,0
-windturbine,R1,2020,all-year,all-week,early-peak,1,0
-windturbine,R1,2020,all-year,all-week,late-peak,1,0
-windturbine,R1,2020,all-year,all-week,evening,1,0
+ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
+Unit,-,Year,-,-,-,-,-,-
+gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,2
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,3
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,4
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,5
+gasCCGT,R1,2020,upper,all-year,all-week,evening,1,6
+windturbine,R1,2020,upper,all-year,all-week,night,1,0
+windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0
+windturbine,R1,2020,upper,all-year,all-week,afternoon,0.5,0
+windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
+windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
+windturbine,R1,2020,upper,all-year,all-week,evening,1,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
new file mode 100644
index 00000000..0655dd03
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -0,0 +1,60 @@
+import os
+import shutil
+import sys
+
+import pandas as pd
+from muse import examples
+
+"""
+Model 1 - Min constraint
+
+"""
+
+
+def generate_model_1() -> None:
+    """
+    Code to generate model 1-min-constraint.
+
+    """
+    model_name = "1-min-constraint"
+    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+
+    # Starting point: copy default model
+    examples.copy_model(name="default_timeslice", path=parent_path, overwrite=True)
+    os.rename(os.path.join(parent_path, "model"), model_path)
+
+
+def generate_model_2() -> None:
+    """
+    Code to generate model 2-max-constraint.
+
+    """
+    model_name = "2-max-constraint"
+    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    model_path = os.path.join(parent_path, model_name)
+    if os.path.exists(model_path):
+        shutil.rmtree(model_path)
+
+    # Starting point: copy model from 1-introduction
+    shutil.copytree(os.path.join(parent_path, "1-min-constraint"), model_path)
+
+    # Modify UtilizationFactor and MinimumServiceFactor for windturbine
+    timeslices_file = os.path.join(
+        model_path, "technodata/power/TechnodataTimeslices.csv"
+    )
+    df = pd.read_csv(timeslices_file)
+    df.loc[df["ProcessName"] == "windturbine", "MinimumServiceFactor"] = 0
+    df.loc[
+        (df["ProcessName"] == "windturbine")
+        & (df["hour"].isin(["morning", "afternoon"])),
+        "UtilizationFactor",
+    ] = 0.5
+    df.to_csv(timeslices_file, index=False)
+
+
+if __name__ == "__main__":
+    generate_model_1()
+    generate_model_2()
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 975c309d..150ef139 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -154,7 +154,7 @@
    "outputs": [],
    "source": [
     "power_supply_2020 = pd.read_csv(\n",
-    "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply_Timeslice/2020.csv\"\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv\"\n",
     ")\n",
     "\n",
     "ax = sns.barplot(\n",
@@ -220,14 +220,17 @@
    "outputs": [],
    "source": [
     "power_supply_2025 = pd.read_csv(\n",
-    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply_Timeslice/2025.csv\"\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv\"\n",
     ")\n",
     "\n",
     "ax = sns.barplot(\n",
     "    data=power_supply_2025[\n",
-    "        (power_supply_2025.commodity == \"electricity\")\n",
+    "        (power_supply_2025.technology == \"windturbine\")\n",
     "        & (power_supply_2025.year == 2030)\n",
-    "    ],\n",
+    "    ]\n",
+    "    .groupby([\"timeslice\", \"year\", \"technology\"])\n",
+    "    .sum()\n",
+    "    .reset_index(),\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
     "    hue=\"technology\",\n",

From 7b75caf086b0f1f48d2170a2c59c89bfa8ae6f14 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 14:49:17 +0100
Subject: [PATCH 118/419] Use pathlib

---
 .../1-add-new-technology/generate_models.py   | 27 ++++-----
 .../2-add-agent/generate_models.py            | 22 +++-----
 .../3-add-region/generate_models.py           | 12 ++--
 .../4-modify-timing-data/generate_models.py   | 26 ++++-----
 .../5-add-service-demand/generate_models.py   | 23 ++++----
 .../generate_models.py                        | 19 ++++---
 .../generate_models.py                        | 19 +++----
 src/muse/wizard.py                            | 56 +++++++++----------
 8 files changed, 96 insertions(+), 108 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index e702b3be..75f12835 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -1,6 +1,6 @@
 import os
 import shutil
-import sys
+from pathlib import Path
 
 import pandas as pd
 from muse import examples
@@ -11,6 +11,9 @@
     modify_toml,
 )
 
+parent_path = Path(__file__).parent
+
+
 """
 Model 1 - Introduction
 
@@ -23,23 +26,22 @@ def generate_model_1() -> None:
 
     """
     model_name = "1-introduction"
-    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
 
     # Starting point: copy default model
     examples.copy_model(name="default", path=parent_path, overwrite=True)
-    os.rename(os.path.join(parent_path, "model"), model_path)
+    os.rename(parent_path / "model", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    technodata_file = model_path / "technodata/power/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.2
     df.to_csv(technodata_file, index=False)
 
     # Change maximum_iterations to 100 (Undocumented)
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     modify_toml(
         settings_file, lambda settings: settings.update({"maximum_iterations": 100})
     )
@@ -61,7 +63,7 @@ def generate_model_1() -> None:
     add_new_process(model_path, "solarPV", "power", "windturbine")
 
     # Special handling for CommIn.csv
-    commin_file = os.path.join(model_path, "technodata/power/CommIn.csv")
+    commin_file = model_path / "technodata/power/CommIn.csv"
     df = pd.read_csv(commin_file)
     df.loc[(df["ProcessName"] == "solarPV"), "solar"] = 1
     df.loc[(df["ProcessName"] == "solarPV"), "wind"] = 0
@@ -69,14 +71,14 @@ def generate_model_1() -> None:
     df.to_csv(commin_file, index=False)
 
     # Special handling for technodata.csv
-    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    technodata_file = model_path / "technodata/power/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "solarPV", "cap_par"] = 30
     df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
     df.to_csv(technodata_file, index=False)
 
     # Add solar to excluded commodities (Undocumented)
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     modify_toml(
         settings_file, lambda settings: settings["excluded_commodities"].append("solar")
     )
@@ -88,19 +90,18 @@ def generate_model_2() -> None:
 
     """
     model_name = "2-scenario"
-    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
 
     # Starting point: copy model from 1-introduction
-    shutil.copytree(os.path.join(parent_path, "1-introduction"), model_path)
+    shutil.copytree(parent_path / "1-introduction", model_path)
 
     # Copy price data for 2020 -> 2040
     add_price_data_for_new_year(model_path, "2040", "power", "2020")
 
     # Special handling for technodata.csv
-    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    technodata_file = model_path / "technodata/power/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2020"), "cap_par"] = 40
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2040"), "cap_par"] = 30
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index ebc025d7..4f1e44c3 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -1,11 +1,11 @@
 import os
 import shutil
-import sys
+from pathlib import Path
 
 import pandas as pd
 from muse.wizard import add_agent, get_sectors
 
-parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+parent_path = Path(__file__).parent
 
 
 """
@@ -21,15 +21,13 @@ def generate_model_2():
     model_name = "2-single-objective"
 
     # Starting point: copy model from previous tutorial
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
-    shutil.copytree(
-        os.path.join(parent_path, "../1-add-new-technology/2-scenario"), model_path
-    )
+    shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = os.path.join(model_path, "technodata/residential/technodata.csv")
+    technodata_file = model_path / "technodata/residential/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.04
     df.to_csv(technodata_file, index=False)
@@ -45,9 +43,7 @@ def generate_model_2():
 
     # Split capacity equally between the two agents
     for sector in get_sectors(model_path):
-        technodata_file = os.path.join(
-            model_path, f"technodata/{sector}/Technodata.csv"
-        )
+        technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
         df = pd.read_csv(technodata_file)
         df.loc[1:, "Agent2"] = 0.5
         df.loc[1:, "Agent4"] = 0.5
@@ -64,13 +60,13 @@ def generate_model_1():
     model_name = "1-multiple-objective"
 
     # Starting point: copy model from previous tutorial
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
-    shutil.copytree(os.path.join(parent_path, "2-single-objective"), model_path)
+    shutil.copytree(parent_path / "2-single-objective", model_path)
 
     # Special handling for Agents.csv
-    agents_file = os.path.join(model_path, "technodata/Agents.csv")
+    agents_file = model_path / "technodata/Agents.csv"
     df = pd.read_csv(agents_file)
     df.loc[df["Name"] == "A2", "Objective2"] = "EAC"
     df.loc[df["Name"] == "A2", "DecisionMethod"] = "weighted_sum"
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index 74290c62..b741be82 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -1,11 +1,11 @@
 import os
 import shutil
-import sys
+from pathlib import Path
 
 import pandas as pd
 from muse.wizard import add_region
 
-parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+parent_path = Path(__file__).parent
 
 
 """
@@ -18,18 +18,16 @@ def generate_model_1():
     model_name = "1-new-region"
 
     # Starting point: copy model from tutorial 1
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
-    shutil.copytree(
-        os.path.join(parent_path, "../1-add-new-technology/2-scenario"), model_path
-    )
+    shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
     # Add region R2
     add_region(model_path, region_name="R2", copy_from="R1")
 
     # Special handling for power/Technodata.csv
-    technodata_file = os.path.join(model_path, "technodata/power/Technodata.csv")
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "windturbine")
     df.loc[mask, "MaxCapacityAddition"] = 5
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 0f53e132..b8eeab10 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -1,12 +1,12 @@
 import os
 import shutil
-import sys
+from pathlib import Path
 
 import pandas as pd
 from muse.wizard import add_timeslice, modify_toml
 from tomlkit import dumps, parse
 
-parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+parent_path = Path(__file__).parent
 
 
 """
@@ -19,15 +19,13 @@ def generate_model_1():
     model_name = "1-modify-timeslices"
 
     # Starting point: copy model from tutorial 3
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
-    shutil.copytree(
-        os.path.join(parent_path, "../3-add-region/1-new-region"), model_path
-    )
+    shutil.copytree(parent_path / "../3-add-region/1-new-region", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = os.path.join(model_path, "technodata/residential/Technodata.csv")
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.04
     df.to_csv(technodata_file, index=False)
@@ -37,7 +35,7 @@ def generate_model_1():
     add_timeslice(model_path, timeslice_name="late-afternoon", copy_from="evening")
 
     # Modify timeslices
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     with open(settings_file, "r") as file:
         settings = parse(file.read())
     timeslices = settings["timeslices"]["all-year"]["all-week"]
@@ -70,9 +68,7 @@ def generate_model_1():
         1.429,
     ]
     for year, multiplier in zip([2020, 2050], [1, 3]):
-        file = os.path.join(
-            model_path, f"technodata/preset/Residential{year}Consumption.csv"
-        )
+        file = model_path / f"technodata/preset/Residential{year}Consumption.csv"
         df = pd.read_csv(file)
         df["heat"] = [i * multiplier for i in consumption_values]
         df.to_csv(file, index=False)
@@ -82,13 +78,13 @@ def generate_model_2():
     model_name = "2-modify-time-framework"
 
     # Starting point: copy previous model
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
-    shutil.copytree(os.path.join(parent_path, "1-modify-timeslices"), model_path)
+    shutil.copytree(parent_path / "1-modify-timeslices", model_path)
 
     # Modify time framework
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]
     modify_toml(settings_file, lambda x: x.update({"time_framework": time_framework}))
     modify_toml(settings_file, lambda x: x.update({"foresight": 2}))
@@ -100,7 +96,7 @@ def generate_model_2():
     )
 
     # Double MaxCapacityAddition in power sector
-    technodata_file = os.path.join(model_path, "technodata/power/Technodata.csv")
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
     df.loc[1:, "MaxCapacityAddition"] *= 20
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index 92e466ab..31417d13 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -1,14 +1,11 @@
-# Follows similar process as 1-add-new-technology
-
-
 import os
 import shutil
-import sys
+from pathlib import Path
 
 import pandas as pd
 from muse.wizard import add_new_commodity, add_new_process
 
-parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+parent_path = Path(__file__).parent
 
 
 """
@@ -21,11 +18,11 @@ def generate_model_1():
     model_name = "1-new-service-demand"
 
     # Starting point: copy model from tutorial 4
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
     shutil.copytree(
-        os.path.join(parent_path, "../4-modify-timing-data/1-modify-timeslices"),
+        parent_path / "../4-modify-timing-data/1-modify-timeslices",
         model_path,
     )
 
@@ -33,7 +30,7 @@ def generate_model_1():
     add_new_commodity(model_path, "cook", "residential", "heat")
 
     # Modify cook projections
-    projections_file = os.path.join(model_path, "input/Projections.csv")
+    projections_file = model_path / "input/Projections.csv"
     df = pd.read_csv(projections_file)
     df.loc[1:, "cook"] = 100
     df.to_csv(projections_file, index=False)
@@ -43,7 +40,7 @@ def generate_model_1():
     add_new_process(model_path, "gas_stove", "residential", "gasboiler")
 
     # Modify output commodities
-    commout_file = os.path.join(model_path, "technodata/residential/CommOut.csv")
+    commout_file = model_path / "technodata/residential/CommOut.csv"
     df = pd.read_csv(commout_file)
     df.loc[1:, "cook"] = 0
     df.loc[df["ProcessName"] == "gas_stove", df.columns[-6:]] = [0, 0, 0, 50, 0, 1]
@@ -51,13 +48,13 @@ def generate_model_1():
     df.to_csv(commout_file, index=False)
 
     # Modify input commodities
-    commin_file = os.path.join(model_path, "technodata/residential/CommIn.csv")
+    commin_file = model_path / "technodata/residential/CommIn.csv"
     df = pd.read_csv(commin_file)
     df.loc[1:, "cook"] = 0
     df.to_csv(commin_file, index=False)
 
     # Change cap_par, Fuel and EndUse
-    technodata_file = os.path.join(model_path, "technodata/residential/technodata.csv")
+    technodata_file = model_path / "technodata/residential/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "gas_stove", "cap_par"] = 8.8667
     df.loc[df["ProcessName"] == "gas_stove", "Fuel"] = "gas"
@@ -67,7 +64,7 @@ def generate_model_1():
     df.to_csv(technodata_file, index=False)
 
     # Change power sector limits
-    technodata_file = os.path.join(model_path, "technodata/power/technodata.csv")
+    technodata_file = model_path / "technodata/power/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = 4
     df.loc[1:, "MaxCapacityGrowth"] = 0.4
@@ -75,7 +72,7 @@ def generate_model_1():
     df.to_csv(technodata_file, index=False)
 
     # # Change gas supply limits
-    # technodata_file = os.path.join(model_path, "technodata/gas/technodata.csv")
+    # technodata_file = model_path/ "technodata/gas/technodata.csv"
     # df = pd.read_csv(technodata_file)
     # df.loc[df["ProcessName"] == "gassupply1", "MaxCapacityAddition"] = 100
     # df.loc[df["ProcessName"] == "gassupply1", "MaxCapacityGrowth"] = 5
diff --git a/docs/tutorial-code/6-add-correlation-demand/generate_models.py b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
index 1dfa705e..fad62393 100644
--- a/docs/tutorial-code/6-add-correlation-demand/generate_models.py
+++ b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
@@ -1,12 +1,14 @@
 import os
 import shutil
-import sys
+from pathlib import Path
 
 from muse import examples
 from muse.wizard import (
     modify_toml,
 )
 
+parent_path = Path(__file__).parent
+
 """
 Model 1 - Introduction
 
@@ -19,32 +21,31 @@ def generate_model_1() -> None:
 
     """
     model_name = "1-correlation"
-    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
 
     # Starting point: copy default model
     examples.copy_model(name="default", path=parent_path, overwrite=True)
-    os.rename(os.path.join(parent_path, "model"), model_path)
+    os.rename(parent_path / "model", model_path)
 
     # Delete presets
-    shutil.rmtree(os.path.join(model_path, "technodata/preset"))
+    shutil.rmtree(model_path / "technodata/preset")
 
     # Copy regression files
-    os.mkdir(os.path.join(model_path, "technodata/preset"))
+    os.mkdir(model_path / "technodata/preset")
     for file in [
         "Macrodrivers.csv",
         "regressionparameters.csv",
         "TimesliceSharepreset.csv",
     ]:
         shutil.copy(
-            os.path.join(parent_path, file),
-            os.path.join(model_path, "technodata/preset", file),
+            parent_path / file,
+            model_path / "technodata/preset" / file,
         )
 
     # Modify toml file to point to new presets
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     path_prefix = "{path}/technodata/preset/"
     modify_toml(
         settings_file,
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index 0655dd03..adaccf7e 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -1,10 +1,13 @@
 import os
 import shutil
-import sys
+from pathlib import Path
 
 import pandas as pd
 from muse import examples
 
+parent_path = Path(__file__).parent
+
+
 """
 Model 1 - Min constraint
 
@@ -17,14 +20,13 @@ def generate_model_1() -> None:
 
     """
     model_name = "1-min-constraint"
-    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
 
     # Starting point: copy default model
     examples.copy_model(name="default_timeslice", path=parent_path, overwrite=True)
-    os.rename(os.path.join(parent_path, "model"), model_path)
+    os.rename(parent_path / "model", model_path)
 
 
 def generate_model_2() -> None:
@@ -33,18 +35,15 @@ def generate_model_2() -> None:
 
     """
     model_name = "2-max-constraint"
-    parent_path = os.path.dirname(os.path.abspath(sys.argv[0]))
-    model_path = os.path.join(parent_path, model_name)
+    model_path = parent_path / model_name
     if os.path.exists(model_path):
         shutil.rmtree(model_path)
 
     # Starting point: copy model from 1-introduction
-    shutil.copytree(os.path.join(parent_path, "1-min-constraint"), model_path)
+    shutil.copytree(parent_path / "1-min-constraint", model_path)
 
     # Modify UtilizationFactor and MinimumServiceFactor for windturbine
-    timeslices_file = os.path.join(
-        model_path, "technodata/power/TechnodataTimeslices.csv"
-    )
+    timeslices_file = model_path / "technodata/power/TechnodataTimeslices.csv"
     df = pd.read_csv(timeslices_file)
     df.loc[df["ProcessName"] == "windturbine", "MinimumServiceFactor"] = 0
     df.loc[
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 57037532..4c63c515 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,10 +1,12 @@
 import os
+from pathlib import Path
+from typing import Callable
 
 import pandas as pd
 from tomlkit import dumps, parse
 
 
-def modify_toml(path_to_toml, function):
+def modify_toml(path_to_toml: Path, function: Callable):
     """Apply the specified function to modify a toml file
 
     Args:
@@ -20,7 +22,7 @@ def modify_toml(path_to_toml, function):
         file.write(dumps(data))
 
 
-def get_sectors(model_path: str) -> list[str]:
+def get_sectors(model_path: Path) -> list[str]:
     """Get a list of sector names for a model.
 
     Args:
@@ -31,13 +33,13 @@ def get_sectors(model_path: str) -> list[str]:
     """
     return [
         s
-        for s in os.listdir(os.path.join(model_path, "technodata"))
-        if os.path.isfile(os.path.join(model_path, "technodata", s, "technodata.csv"))
+        for s in os.listdir(model_path / "technodata")
+        if os.path.isfile(model_path / "technodata" / s / "technodata.csv")
     ]
 
 
 def add_new_commodity(
-    model_path: str, commodity_name: str, sector: str, copy_from: str
+    model_path: Path, commodity_name: str, sector: str, copy_from: str
 ) -> None:
     """Add a new commodity to a sector by copying an existing one.
 
@@ -48,7 +50,7 @@ def add_new_commodity(
         copy_from: Name of the commodity to copy from.
     """
     files_to_update = [
-        os.path.join(model_path, file)
+        model_path / file
         for file in [
             f"technodata/{sector}/CommIn.csv",
             f"technodata/{sector}/CommOut.csv",
@@ -63,7 +65,7 @@ def add_new_commodity(
         df[commodity_name] = df[copy_from]
         df.to_csv(file, index=False)
 
-    global_commodities_file = os.path.join(model_path, "input/GlobalCommodities.csv")
+    global_commodities_file = model_path / "input/GlobalCommodities.csv"
     df = pd.read_csv(global_commodities_file)
     new_rows = df[df["Commodity"] == copy_from.capitalize()].copy()
     new_rows["Commodity"] = commodity_name.capitalize()
@@ -72,15 +74,15 @@ def add_new_commodity(
     df.to_csv(global_commodities_file, index=False)
 
     # Add to projections
-    projections_files = os.listdir(os.path.join(model_path, "technodata/preset"))
+    projections_files = os.listdir(model_path / "technodata/preset")
     for file in projections_files:
-        df = pd.read_csv(os.path.join(model_path, "technodata/preset", file))
+        df = pd.read_csv(model_path / "technodata/preset" / file)
         df[commodity_name] = df[copy_from]
-        df.to_csv(os.path.join(model_path, "technodata/preset", file), index=False)
+        df.to_csv(model_path / "technodata/preset" / file, index=False)
 
 
 def add_new_process(
-    model_path: str, process_name: str, sector: str, copy_from: str
+    model_path: Path, process_name: str, sector: str, copy_from: str
 ) -> None:
     """Add a new process to a sector by copying an existing one.
 
@@ -91,7 +93,7 @@ def add_new_process(
         copy_from: Name of the process to copy from.
     """
     files_to_update = [
-        os.path.join(model_path, file)
+        model_path / file
         for file in [
             f"technodata/{sector}/CommIn.csv",
             f"technodata/{sector}/CommOut.csv",
@@ -109,7 +111,7 @@ def add_new_process(
 
 
 def add_price_data_for_new_year(
-    model_path: str, year: str, sector: str, copy_from: str
+    model_path: Path, year: str, sector: str, copy_from: str
 ) -> None:
     """Add price data for a new year by copying from an existing year.
 
@@ -120,7 +122,7 @@ def add_price_data_for_new_year(
         copy_from: Year to copy the price data from.
     """
     files_to_update = [
-        os.path.join(model_path, f"technodata/{sector}/{file}")
+        model_path / f"technodata/{sector}/{file}"
         for file in ["technodata.csv", "CommIn.csv", "CommOut.csv"]
     ]
 
@@ -136,7 +138,7 @@ def add_price_data_for_new_year(
 
 
 def add_agent(
-    model_path: str,
+    model_path: Path,
     agent_name: str,
     copy_from: str,
     agentshare_new: str,
@@ -151,7 +153,7 @@ def add_agent(
         agentshare_new: Name of the new agent share for new agent.
         agentshare_retrofit: Name of the retrofit agent share for new agent.
     """
-    agents_file = os.path.join(model_path, "technodata/Agents.csv")
+    agents_file = model_path / "technodata/Agents.csv"
     df = pd.read_csv(agents_file)
     new_rows = df[df["Name"] == copy_from].copy()
     new_rows["Name"] = agent_name
@@ -168,9 +170,7 @@ def add_agent(
     ].values[0]
 
     for sector in get_sectors(model_path):
-        technodata_file = os.path.join(
-            model_path, f"technodata/{sector}/technodata.csv"
-        )
+        technodata_file = model_path / f"technodata/{sector}/technodata.csv"
         df = pd.read_csv(technodata_file)
         if copy_from_retrofit in df.columns:
             df[agentshare_retrofit] = df[copy_from_retrofit]
@@ -179,14 +179,14 @@ def add_agent(
         df.to_csv(technodata_file, index=False)
 
 
-def add_region(model_path, region_name, copy_from) -> None:
+def add_region(model_path: Path, region_name, copy_from) -> None:
     # Append region to settings.toml
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     modify_toml(settings_file, lambda x: x["regions"].append(region_name))
 
     # Modify csv files
     sector_files = [
-        os.path.join(model_path, "technodata", sector, file)
+        model_path / "technodata" / sector / file
         for sector in get_sectors(model_path)
         for file in [
             "technodata.csv",
@@ -196,11 +196,11 @@ def add_region(model_path, region_name, copy_from) -> None:
         ]
     ]
     preset_files = [
-        os.path.join(model_path, "technodata", "preset", file)
-        for file in os.listdir(os.path.join(model_path, "technodata", "preset"))
+        model_path / "technodata" / "preset" / file
+        for file in os.listdir(model_path / "technodata" / "preset")
     ]
     global_files = [
-        os.path.join(model_path, file)
+        model_path / file
         for file in [
             "technodata/Agents.csv",
             "input/BaseYearImport.csv",
@@ -218,7 +218,7 @@ def add_region(model_path, region_name, copy_from) -> None:
 
 def add_timeslice(model_path, timeslice_name, copy_from):
     # Append timeslice to timeslices in settings.toml
-    settings_file = os.path.join(model_path, "settings.toml")
+    settings_file = model_path / "settings.toml"
     with open(settings_file, "r") as file:
         settings = parse(file.read())
     timeslices = settings["timeslices"]["all-year"]["all-week"]
@@ -228,9 +228,9 @@ def add_timeslice(model_path, timeslice_name, copy_from):
         file.write(dumps(settings))
 
     # Loop through all preset files
-    preset_dir = os.path.join(model_path, "technodata", "preset")
+    preset_dir = model_path / "technodata" / "preset"
     for file_name in os.listdir(preset_dir):
-        file_path = os.path.join(preset_dir, file_name)
+        file_path = preset_dir / file_name
         df = pd.read_csv(file_path)
         new_rows = df[df["Timeslice"] == copy_from_number].copy()
         new_rows["Timeslice"] = len(timeslices)

From e044d0c6c9677b1d84db7b23f065c61afcab312f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 15:11:48 +0100
Subject: [PATCH 119/419] More pathlib, regenerating models

---
 .../1-introduction/technodata/Agents.csv                  | 2 +-
 .../1-add-new-technology/2-scenario/technodata/Agents.csv | 2 +-
 .../tutorial-code/1-add-new-technology/generate_models.py | 4 ++--
 .../1-multiple-objective/technodata/Agents.csv            | 2 +-
 .../2-add-agent/2-single-objective/technodata/Agents.csv  | 2 +-
 docs/tutorial-code/2-add-agent/generate_models.py         | 5 ++---
 .../3-add-region/1-new-region/technodata/Agents.csv       | 2 +-
 docs/tutorial-code/3-add-region/generate_models.py        | 3 +--
 .../1-modify-timeslices/technodata/Agents.csv             | 2 +-
 .../2-modify-time-framework/technodata/Agents.csv         | 2 +-
 .../tutorial-code/4-modify-timing-data/generate_models.py | 5 ++---
 .../1-new-service-demand/technodata/Agents.csv            | 2 +-
 .../tutorial-code/5-add-service-demand/generate_models.py | 3 +--
 .../6-add-correlation-demand/TimesliceSharepreset.csv     | 2 --
 .../6-add-correlation-demand/generate_models.py           | 2 +-
 .../7-min-max-timeslice-constraints/generate_models.py    | 4 ++--
 docs/tutorial-code/generate_models.py                     | 8 ++++++++
 src/muse/wizard.py                                        | 6 +++---
 18 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 docs/tutorial-code/generate_models.py

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
index f2a72ba7..26315bf8 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
index f2a72ba7..26315bf8 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
@@ -1,3 +1,3 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 75f12835..3a0bd499 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -27,7 +27,7 @@ def generate_model_1() -> None:
     """
     model_name = "1-introduction"
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
 
     # Starting point: copy default model
@@ -91,7 +91,7 @@ def generate_model_2() -> None:
     """
     model_name = "2-scenario"
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
 
     # Starting point: copy model from 1-introduction
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
index 7f266b04..47c77448 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent3,A2,R1,LCOE,EAC,,0.5,0.5,,True,,,all,weighted_sum,1,-1,inf,New
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
index 57a6732d..a73ed075 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent3,A2,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 4f1e44c3..1f075e69 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -1,4 +1,3 @@
-import os
 import shutil
 from pathlib import Path
 
@@ -22,7 +21,7 @@ def generate_model_2():
 
     # Starting point: copy model from previous tutorial
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
@@ -61,7 +60,7 @@ def generate_model_1():
 
     # Starting point: copy model from previous tutorial
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "2-single-objective", model_path)
 
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
index 5074779a..9acb05de 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index b741be82..bd6d7155 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -1,4 +1,3 @@
-import os
 import shutil
 from pathlib import Path
 
@@ -19,7 +18,7 @@ def generate_model_1():
 
     # Starting point: copy model from tutorial 1
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
index 9ab1349d..29f26c2e 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
index 9ab1349d..29f26c2e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index b8eeab10..12ba8023 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -1,4 +1,3 @@
-import os
 import shutil
 from pathlib import Path
 
@@ -20,7 +19,7 @@ def generate_model_1():
 
     # Starting point: copy model from tutorial 3
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "../3-add-region/1-new-region", model_path)
 
@@ -79,7 +78,7 @@ def generate_model_2():
 
     # Starting point: copy previous model
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "1-modify-timeslices", model_path)
 
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
index 5074779a..9acb05de 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
@@ -1,4 +1,4 @@
-AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
 Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index 31417d13..8eb841a7 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -1,4 +1,3 @@
-import os
 import shutil
 from pathlib import Path
 
@@ -19,7 +18,7 @@ def generate_model_1():
 
     # Starting point: copy model from tutorial 4
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
     shutil.copytree(
         parent_path / "../4-modify-timing-data/1-modify-timeslices",
diff --git a/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv b/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv
index 351edf35..5037b854 100644
--- a/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/TimesliceSharepreset.csv
@@ -5,5 +5,3 @@ SN,RegionName,electricity,gas,heat,CO2f,wind
 4,R1,0,0,0.107,0,0
 5,R1,0,0,0.214,0,0
 6,R1,0,0,0.143,0,0
-7,R1,0,0,0.143,0,0
-8,R1,0,0,0.143,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/generate_models.py b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
index fad62393..ee84de83 100644
--- a/docs/tutorial-code/6-add-correlation-demand/generate_models.py
+++ b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
@@ -22,7 +22,7 @@ def generate_model_1() -> None:
     """
     model_name = "1-correlation"
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
 
     # Starting point: copy default model
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index adaccf7e..101cacd3 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -21,7 +21,7 @@ def generate_model_1() -> None:
     """
     model_name = "1-min-constraint"
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
 
     # Starting point: copy default model
@@ -36,7 +36,7 @@ def generate_model_2() -> None:
     """
     model_name = "2-max-constraint"
     model_path = parent_path / model_name
-    if os.path.exists(model_path):
+    if model_path.exists():
         shutil.rmtree(model_path)
 
     # Starting point: copy model from 1-introduction
diff --git a/docs/tutorial-code/generate_models.py b/docs/tutorial-code/generate_models.py
new file mode 100644
index 00000000..58bce5dc
--- /dev/null
+++ b/docs/tutorial-code/generate_models.py
@@ -0,0 +1,8 @@
+import subprocess
+import sys
+from pathlib import Path
+
+parent_path = Path(__file__).parent
+for tutorial in parent_path.iterdir():
+    if (tutorial / "generate_models.py").exists():
+        subprocess.call([sys.executable, str(tutorial / "generate_models.py")])
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 4c63c515..3fe25bf5 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -32,9 +32,9 @@ def get_sectors(model_path: Path) -> list[str]:
         List of sector names
     """
     return [
-        s
-        for s in os.listdir(model_path / "technodata")
-        if os.path.isfile(model_path / "technodata" / s / "technodata.csv")
+        s.name
+        for s in (model_path / "technodata").iterdir()
+        if (s / "technodata.csv").is_file()
     ]
 
 

From 7374f9c0cd2ba0b49dbab752650d32f81fcadaff Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 15:44:08 +0100
Subject: [PATCH 120/419] Small improvements to wizard module

---
 src/muse/wizard.py | 65 +++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 3fe25bf5..87f1371f 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import Callable
+from typing import Callable, List
 
 import pandas as pd
 from tomlkit import dumps, parse
@@ -12,17 +12,15 @@ def modify_toml(path_to_toml: Path, function: Callable):
     Args:
         path_to_toml: Path to the toml file
         function: Function to apply to the toml data. Must take a dictionary as a single
-            input.
+            input and modify it in place.
 
     """
-    with open(path_to_toml, "r") as file:
-        data = parse(file.read())
+    data = parse(path_to_toml.read_text())
     function(data)
-    with open(path_to_toml, "w") as file:
-        file.write(dumps(data))
+    path_to_toml.write_text(dumps(data))
 
 
-def get_sectors(model_path: Path) -> list[str]:
+def get_sectors(model_path: Path) -> List[str]:
     """Get a list of sector names for a model.
 
     Args:
@@ -67,18 +65,17 @@ def add_new_commodity(
 
     global_commodities_file = model_path / "input/GlobalCommodities.csv"
     df = pd.read_csv(global_commodities_file)
-    new_rows = df[df["Commodity"] == copy_from.capitalize()].copy()
-    new_rows["Commodity"] = commodity_name.capitalize()
-    new_rows["CommodityName"] = commodity_name
+    new_rows = df[df["Commodity"] == copy_from.capitalize()].assign(
+        Commodity=commodity_name.capitalize(), CommodityName=commodity_name
+    )
     df = pd.concat([df, new_rows])
     df.to_csv(global_commodities_file, index=False)
 
     # Add to projections
-    projections_files = os.listdir(model_path / "technodata/preset")
-    for file in projections_files:
-        df = pd.read_csv(model_path / "technodata/preset" / file)
+    for file in (model_path / "technodata/preset").glob("*"):
+        df = pd.read_csv(file)
         df[commodity_name] = df[copy_from]
-        df.to_csv(model_path / "technodata/preset" / file, index=False)
+        df.to_csv(file, index=False)
 
 
 def add_new_process(
@@ -155,13 +152,6 @@ def add_agent(
     """
     agents_file = model_path / "technodata/Agents.csv"
     df = pd.read_csv(agents_file)
-    new_rows = df[df["Name"] == copy_from].copy()
-    new_rows["Name"] = agent_name
-    new_rows.loc[new_rows["Type"] == "New", "AgentShare"] = agentshare_new
-    new_rows.loc[new_rows["Type"] == "Retrofit", "AgentShare"] = agentshare_retrofit
-    df = pd.concat([df, new_rows])
-    df.to_csv(agents_file, index=False)
-
     copy_from_new = df.loc[
         (df["Name"] == copy_from) & (df["Type"] == "New"), "AgentShare"
     ].values[0]
@@ -169,6 +159,13 @@ def add_agent(
         (df["Name"] == copy_from) & (df["Type"] == "Retrofit"), "AgentShare"
     ].values[0]
 
+    new_rows = df[df["Name"] == copy_from].copy()
+    new_rows["Name"] = agent_name
+    new_rows.loc[new_rows["Type"] == "New", "AgentShare"] = agentshare_new
+    new_rows.loc[new_rows["Type"] == "Retrofit", "AgentShare"] = agentshare_retrofit
+    df = pd.concat([df, new_rows])
+    df.to_csv(agents_file, index=False)
+
     for sector in get_sectors(model_path):
         technodata_file = model_path / f"technodata/{sector}/technodata.csv"
         df = pd.read_csv(technodata_file)
@@ -179,7 +176,15 @@ def add_agent(
         df.to_csv(technodata_file, index=False)
 
 
-def add_region(model_path: Path, region_name, copy_from) -> None:
+def add_region(model_path: Path, region_name: str, copy_from: str) -> None:
+    """
+    Add a new region to the MUSE model.
+
+    Args:
+        model_path: The path to the MUSE model directory.
+        region_name: The name of the new region to be added.
+        copy_from: The name of the region to copy data from.
+    """
     # Append region to settings.toml
     settings_file = model_path / "settings.toml"
     modify_toml(settings_file, lambda x: x["regions"].append(region_name))
@@ -216,16 +221,22 @@ def add_region(model_path: Path, region_name, copy_from) -> None:
         df.to_csv(file_path, index=False)
 
 
-def add_timeslice(model_path, timeslice_name, copy_from):
+def add_timeslice(model_path: Path, timeslice_name: str, copy_from: str) -> None:
+    """
+    Add a new timeslice to the model.
+
+    Args:
+        model_path: The path to the model directory.
+        timeslice_name: The name of the new timeslice.
+        copy_from: The name of the timeslice to copy from.
+    """
     # Append timeslice to timeslices in settings.toml
     settings_file = model_path / "settings.toml"
-    with open(settings_file, "r") as file:
-        settings = parse(file.read())
+    settings = parse(settings_file.read_text())
     timeslices = settings["timeslices"]["all-year"]["all-week"]
     copy_from_number = list(timeslices).index(copy_from) + 1
     timeslices[timeslice_name] = timeslices[copy_from]
-    with open(settings_file, "w") as file:
-        file.write(dumps(settings))
+    settings_file.write_text(dumps(settings))
 
     # Loop through all preset files
     preset_dir = model_path / "technodata" / "preset"

From 0f93c160792d19030fb75413a64d6585868fe54f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 16:28:19 +0100
Subject: [PATCH 121/419] Delete more results

---
 .../Results/MCACapacity.csv                   |  67 ---
 .../Results/MCAMetric_Consumption.csv         | 319 ------------
 .../Results/MCAMetric_Supply.csv              | 481 ------------------
 .../Results/MCAPrices.csv                     | 169 ------
 4 files changed, 1036 deletions(-)
 delete mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
 delete mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
 delete mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv

diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
deleted file mode 100644
index 1def068e..00000000
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,6.75000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,6.75000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-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
-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
-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
-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
-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
deleted file mode 100644
index c6cacd79..00000000
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,319 +0,0 @@
-,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
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
deleted file mode 100644
index 93ccbd1e..00000000
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,481 +0,0 @@
-,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
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
deleted file mode 100644
index f4d602c4..00000000
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
-"('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')",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')",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')",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')",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')",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')",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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,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')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,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')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,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')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,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')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,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')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,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')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050

From 159a0a64e163863984399c5e0afbe40284bc95fc Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 16:57:20 +0100
Subject: [PATCH 122/419] Script for running models in parallel

---
 docs/advanced-guide/extending-muse.ipynb      |  2 +-
 .../1-add-new-technology/generate_models.py   |  2 --
 docs/tutorial-code/run_models.py              | 31 +++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 docs/tutorial-code/run_models.py

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 67b92467..237e7898 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -669,7 +669,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.2"
+   "version": "3.9.18"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 3a0bd499..30dd47ee 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -54,8 +54,6 @@ def generate_model_1() -> None:
         ),
     )
 
-    ### Tutorial
-
     # Copy wind commodity in power sector -> solar
     add_new_commodity(model_path, "solar", "power", "wind")
 
diff --git a/docs/tutorial-code/run_models.py b/docs/tutorial-code/run_models.py
new file mode 100644
index 00000000..72b3608a
--- /dev/null
+++ b/docs/tutorial-code/run_models.py
@@ -0,0 +1,31 @@
+import os
+from concurrent.futures import ProcessPoolExecutor
+from pathlib import Path
+
+from muse.mca import MCA
+from muse.readers.toml import read_settings
+
+parent_path = Path(__file__).parent
+
+
+def run_model(settings_file):
+    try:
+        os.chdir(settings_file.parent)
+        settings = read_settings(settings_file)
+        model = MCA.factory(settings)
+        model.run()
+    except Exception as e:
+        return f"Failed to run model with settings file {settings_file}. Error: {e}"
+
+
+if __name__ == "__main__":
+    settings_files = parent_path.rglob("*/*settings.toml")
+    with ProcessPoolExecutor() as executor:
+        futures = {
+            executor.submit(run_model, settings_file)
+            for settings_file in parent_path.rglob("*/*settings.toml")
+        }
+    for future in futures:
+        error_message = future.result()
+        if error_message:
+            print(error_message)

From 247fafbd696a680e28306b741bc9f98eb0372f1c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 17:05:22 +0100
Subject: [PATCH 123/419] Restore accidentally deleted file

---
 docs/user-guide/addition-service-demand.ipynb | 318 ++++++++++++++++++
 1 file changed, 318 insertions(+)
 create mode 100644 docs/user-guide/addition-service-demand.ipynb

diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
new file mode 100644
index 00000000..c1f9aad1
--- /dev/null
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -0,0 +1,318 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Adding a service demand"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "In this section, we detail how to add a service demand to MUSE. \n",
+    "\n",
+    "In the residential sector, a service demand could be cooking. Houses require energy to cook food and a technology to service this demand, such as an electric stove. \n",
+    "\n",
+    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socio-economic development of a region or country. In addition, a technology must be added to service this new demand."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Addition of cooking demand"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Firstly, we must add the demand section. In this example, we will add a cooking preset demand. To achieve this, we will now edit the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files, found within the `technodata/preset/` directory.\n",
+    "\n",
+    "The `Residential2020Consumption.csv` file allows us to specify the demand in 2020 for each region and technology per timeslice. The `Residential2050Consumption.csv` file does the same but for the year 2050. The datapoints between these are interpolated.\n",
+    "\n",
+    "Firstly, we must add the new service demand: `cook` as a column in these two files. Next, we add the demand. Again, the modified entries are in bold:"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
+    "|-|-|-|-|-|-|-|-|-|-|\n",
+    "|0|R1|gasboiler|1|0|0|1|0|0|**1**|\n",
+    "|1|R1|gasboiler|2|0|0|1.5|0|0|**2**|\n",
+    "|2|R1|gasboiler|3|0|0|1|0|0|**1**|\n",
+    "|3|R1|gasboiler|4|0|0|1.5|0|0|**1.5**|\n",
+    "|4|R1|gasboiler|5|0|0|3|0|0|**2**|\n",
+    "|5|R1|gasboiler|6|0|0|2|0|0|**3**|\n",
+    "|6|R1|gasboiler|7|0|0|2|0|0|**2**|\n",
+    "|7|R1|gasboiler|8|0|0|2|0|0|**3**|\n",
+    "|8|R2|gasboiler|1|0|0|1|0|0|**1**|\n",
+    "|9|R2|gasboiler|2|0|0|1.5|0|0|**1**|\n",
+    "|10|R2|gasboiler|3|0|0|1|0|0|**1**|\n",
+    "|11|R2|gasboiler|4|0|0|1.5|0|0|**1.5**|\n",
+    "|12|R2|gasboiler|5|0|0|3|0|0|**2**|\n",
+    "|13|R2|gasboiler|6|0|0|2|0|0|**2**|\n",
+    "|14|R2|gasboiler|7|0|0|2|0|0|**2.5**|\n",
+    "|15|R2|gasboiler|8|0|0|2|0|0|**2**|\n",
+    "\n",
+    "\n",
+    "<!-- ||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
+    "|-|-|-|-|-|-|-|-|-|-|\n",
+    "|0|R1|gasboiler|1|0|0|1|0|0|**0**|\n",
+    "|...|...|...|...|...|...|...|...|...|**...**|\n",
+    "|15|R2|gasboiler|8|0|0|2|0|0|**0**|\n",
+    "|**16**|**R1**|**electric_stove**|**1**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
+    "|**17**|**R1**|**electric_stove**|**2**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
+    "|**18**|**R1**|**electric_stove**|**3**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
+    "|**19**|**R1**|**electric_stove**|**4**|**0**|**0**|**0**|**0**|**0**|**1.5**|\n",
+    "|**20**|**R1**|**electric_stove**|**5**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
+    "|**21**|**R1**|**electric_stove**|**6**|**0**|**0**|**0**|**0**|**0**|**3**|\n",
+    "|**22**|**R1**|**electric_stove**|**7**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
+    "|**23**|**R1**|**electric_stove**|**8**|**0**|**0**|**0**|**0**|**0**|**3**|\n",
+    "|**24**|**R2**|**electric_stove**|**1**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
+    "|**25**|**R2**|**electric_stove**|**2**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
+    "|**26**|**R2**|**electric_stove**|**3**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
+    "|**27**|**R2**|**electric_stove**|**4**|**0**|**0**|**0**|**0**|**0**|**1.5**|\n",
+    "|**28**|**R2**|**electric_stove**|**5**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
+    "|**29**|**R2**|**electric_stove**|**6**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
+    "|**30**|**R2**|**electric_stove**|**7**|**0**|**0**|**0**|**0**|**0**|**2.5**|\n",
+    "|**31**|**R2**|**electric_stove**|**8**|**0**|**0**|**0**|**0**|**0**|**2**| -->\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "As can be seen, we only need to add a `cook` column in the file, as well as the demand level for each timeslice and each region. This can be seen through the addition of a positive number in the `cook` column.\n",
+    "\n",
+    "The process is very similar for the `Residential2050Consumption.csv` file, however, for this example, we often placed larger numbers to indicate higher demand in 2050. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Next, we must edit the files within the `input` folder. For this, we must  add the `cook` service demand to each of these files.\n",
+    "\n",
+    "First, we will amend the `BaseYearExport.csv` and `BaseYearImport.csv` files. For this, we say that there is no import or export of the `cook` service demand. A brief example is outlined below for `BaseYearExport.csv`:\n",
+    "\n",
+    "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|solar|**cook**|\n",
+    "|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|PJ|**PJ**|\n",
+    "|R1|Exports|2010|0|0|0|0|0|0|**0**|\n",
+    "|...|...|...|...|...|...|...|...|...|**...**|\n",
+    "|R2|Exports|2100|0|0|0|0|0|0|**0**|\n",
+    "\n",
+    "The same is true for the `BaseYearImport.csv` file:\n",
+    "\n",
+    "|RegionName|Attribute|Time|electricity|gas|heat|CO2f|wind|solar|**cook**|\n",
+    "|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|Year|PJ|PJ|PJ|kt|PJ|PJ|**PJ**|\n",
+    "|R1|Imports|2010|0|0|0|0|0|0|**0**|\n",
+    "|...|...|...|...|...|...|...|...|...|**...**|\n",
+    "|R2|Imports|2100|0|0|0|0|0|0|**0**|\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Next, we must edit the `GlobalCommodities.csv` file. This is where we define the new commodity `cook`. It tells MUSE the commodity type, name, emissions factor of CO2 and heat rate, amongst other things. \n",
+    "\n",
+    "The example used for this tutorial is below: \n",
+    "\n",
+    "|Commodity|CommodityType|CommodityName|CommodityEmissionFactor_CO2|HeatRate|Unit|\n",
+    "|-|-|-|-|-|-|\n",
+    "|Electricity|Energy|electricity|0|1|PJ|\n",
+    "|Gas|Energy|gas|56.1|1|PJ|\n",
+    "|Heat|Energy|heat|0|1|PJ|\n",
+    "|Wind|Energy|wind|0|1|PJ|\n",
+    "|CO2fuelcomsbustion|Environmental|CO2f|0|1|kt|\n",
+    "|Solar|Energy|solar|0|1|PJ|\n",
+    "|**Cook**|**Energy**|**cook**|**0**|**1**|**PJ**|"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Finally, the `Projections.csv` file must be changed. This is a large file which details the expected cost of the technology in the first benchmark year of the simulation. Due to its size, we will only show two rows of the new column `cook`.\n",
+    "\n",
+    "|RegionName|Attribute|Time|…|**cook**|\n",
+    "|-|-|-|-|-|\n",
+    "|Unit|-|Year|…|**MUS\\$2010/PJ**|\n",
+    "|R1|CommodityPrice|2010|…|**100**|\n",
+    "|…|…|…|…|**…**|\n",
+    "|R2|CommodityPrice|2100|…|**100**|\n",
+    "\n",
+    "We set every price of cook to be `100MUS$2010/PJ`"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Addition of cooking technology"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Next, we must add a technology to service this new demand. This is achieved through a similar process as the section in the [\"1. adding a new technology\"](add-solar.ipynb) section. However, we must be careful to specify the end-use of the technology as `cook`.\n",
+    "\n",
+    "For this example, we will add two competing technologies to service the cooking demand: `electric_stove` and `gas_stove` to the `Technodata.csv` file in `/technodata/residential/Technodata.csv`.\n",
+    "\n",
+    "Again for the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `gasboiler` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `heatpump` from region `R1` for both `R1` and `R2`. \n",
+    "\n",
+    "An important modification, however, is specifying the end-use for these new technologies to be `cook` and not `heat`.\n",
+    "\n",
+    "|ProcessName|RegionName|Time|Level|cap_par|…|Fuel|EndUse|Agent2|\n",
+    "|-|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|Year|-|MUS$2010/PJ_a|…|-|-|Retrofit|\n",
+    "|gasboiler|R1|2020|fixed|3.8|…|gas|heat|1|\n",
+    "|...|...|...|...|...|...|...|...|...|\n",
+    "|**electric_stove**|**R1**|**2020**|**fixed**|**3.8**|**…**|**electricity**|**cook**|**1**|\n",
+    "|**electric_stove**|**R2**|**2020**|**fixed**|**3.8**|**…**|**electricity**|**cook**|**1**|\n",
+    "|**gas_stove**|**R1**|**2020**|**fixed**|**8.8667**|**…**|**gas**|**cook**|**1**|\n",
+    "|**gas_stove**|**R2**|**2020**|**fixed**|**8.8667**|**…**|**gas**|**cook**|**1**|\n",
+    "\n",
+    "\n",
+    "As can be seen we have added two technologies, in the two regions with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "We must also add the data for these new technologies to the following files:\n",
+    "\n",
+    "- `CommIn.csv`\n",
+    "\n",
+    "- `CommOut.csv`\n",
+    "\n",
+    "- `ExistingCapacity.csv`\n",
+    "\n",
+    "This is largely a similar process to the tutorial shown in [\"adding a new technology\"](add-solar.ipynb). We must add the input to each of the technologies (gas and electricity for `gas_stove` and `electric_stove` respectively), outputs of `cook` for both and the existing capacity for each technology in each region.\n",
+    "\n",
+    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/technodata.csv` file. For this example, we set this file as follows:\n",
+    "\n",
+    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
+    "|-|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
+    "|gassupply1|R1|2020|…|**100**|**5**|**500**|…|1|\n",
+    "|gassupply1|R2|2020|…|**100**|**5**|**120**|…|1|\n",
+    "\n",
+    "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). "
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Again, we run the simulation with our modified input files using the following command, in the relevant directory:\n",
+    "    \n",
+    "    python -m muse settings.toml\n",
+    "    \n",
+    "Once this has run we are ready to visualise our results."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import matplotlib.pyplot as plt\n",
+    "import pandas as pd\n",
+    "import seaborn as sns"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\"\n",
+    ")\n",
+    "mca_capacity.head()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"technology\", \"region\", \"year\"]).sum().reset_index()\n",
+    "    )\n",
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"region\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
+    "    g.add_legend()\n",
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "We can see our new technology, the `gas_stove` is used and the `electric_stove` is not used at all. Therefore, there is an increase in `gassupply1` to accommodate for this growth in demand. However, this is not enough to displace `windturbine` by `gasCCGT` in the power sector."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Next steps"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "In the next section we will use a regression function to estimate electricity demand from GDP and population data."
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3.9.0 ('muse39')",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.18"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "22ff8bbda430c28f07def99f448c0c69dabbaf0c7d993cae69f87b3c458d04b2"
+   }
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

From 539aa84bf14ebac558fed8c6963ecaf0cbdfecd8 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 15 May 2024 17:09:37 +0100
Subject: [PATCH 124/419] Fix path

---
 docs/user-guide/addition-service-demand.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index c1f9aad1..6fb82d3b 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -240,7 +240,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\n",
-    "    \"../tutorial-code/5-add-service-demand/Results/MCACapacity.csv\"\n",
+    "    \"../tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv\"\n",
     ")\n",
     "mca_capacity.head()"
    ]

From 2ad6eb7440a56c0ee860b24e6cc1237ac7c67c26 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 16 May 2024 08:21:05 +0100
Subject: [PATCH 125/419] Enable Ruff's own checks

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 544cd028..4e32ed4d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -105,7 +105,8 @@ select = [
     "D",  # pydocstyle
     "E",  # pycodestyle
     "F",  # Pyflakes
-    "I"  # isort
+    "I",  # isort
+    "RUF"  # Ruff's own checks
 ]
 ignore = [
     "D1"  # missing docstring checks

From 9537e5b4cff77704c0bf8c03067da9efc2197c41 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 16 May 2024 08:29:36 +0100
Subject: [PATCH 126/419] Fix warnings from Ruff checks

---
 src/muse/readers/__init__.py |  2 +-
 src/muse/readers/csv.py      |  4 ++--
 src/muse/readers/toml.py     |  4 ++--
 src/muse/registration.py     | 10 +++++-----
 src/muse/regressions.py      | 10 +++++++---
 tests/test_agents.py         |  2 +-
 tests/test_outputs.py        |  7 +++----
 tests/test_regressions.py    |  6 +++---
 tests/test_utilities.py      |  2 +-
 9 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/muse/readers/__init__.py b/src/muse/readers/__init__.py
index 7273450b..f9b7827b 100644
--- a/src/muse/readers/__init__.py
+++ b/src/muse/readers/__init__.py
@@ -3,7 +3,7 @@
 from typing import Text
 
 from muse.defaults import DATA_DIRECTORY
-from muse.readers.csv import *  # noqa: F401, F403
+from muse.readers.csv import *  # noqa: F403
 from muse.readers.toml import read_settings, read_timeslices  # noqa: F401
 
 DEFAULT_SETTINGS_PATH = DATA_DIRECTORY / "default_settings.toml"
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 7b897a13..dedea180 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -868,12 +868,12 @@ def read_trade(
     )
     if parameters is None:
         result: Union[xr.DataArray, xr.Dataset] = xr.DataArray.from_series(
-            data.set_index(indices + [col_region])["value"]
+            data.set_index([*indices, col_region])["value"]
         ).rename(name)
     else:
         result = xr.Dataset.from_dataframe(
             data.pivot_table(
-                values="value", columns=parameters, index=indices + [col_region]
+                values="value", columns=parameters, index=[*indices, col_region]
             ).rename(columns=camel_to_snake)
         )
 
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index 093a2ada..0ea713f3 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -934,14 +934,14 @@ def read_technodata(
     if technologies.year.max() < maxyear:
         msg = "Forward-filling technodata to fit simulation timeframe"
         getLogger(__name__).info(msg)
-        years = technologies.year.data.tolist() + [maxyear]
+        years = [*technologies.year.data.tolist(), maxyear]
         technologies = technologies.sel(year=years, method="ffill")
         technologies["year"] = "year", years
     minyear = min(time_framework)
     if technologies.year.min() > minyear:
         msg = "Back-filling technodata to fit simulation timeframe"
         getLogger(__name__).info(msg)
-        years = [minyear] + technologies.year.data.tolist()
+        years = [minyear, *technologies.year.data.tolist()]
         technologies = technologies.sel(year=years, method="bfill")
         technologies["year"] = "year", years
 
diff --git a/src/muse/registration.py b/src/muse/registration.py
index 540626b2..d44910cf 100644
--- a/src/muse/registration.py
+++ b/src/muse/registration.py
@@ -12,7 +12,7 @@ def camelCase(name):
         comps = name.split("_")
         return comps[0] + "".join(x.title() for x in comps[1:])
 
-    def CamelCase(name):  # noqa
+    def CamelCase(name):
         return "".join(x.title() for x in name.split("_"))
 
     def kebab_case(name):
@@ -37,8 +37,8 @@ def nospacecase(name):
 
 
 def registrator(
-    decorator: Callable = None,
-    registry: MutableMapping = None,
+    decorator: Optional[Callable] = None,
+    registry: Optional[MutableMapping] = None,
     logname: Optional[Text] = None,
     loglevel: Optional[Text] = "Debug",
 ) -> Callable:
@@ -140,7 +140,7 @@ def register(
         from itertools import chain
         from logging import getLogger
 
-        # allows specifyng the registered name as a keyword argument
+        # allows specifying the registered name as a keyword argument
         if function is None:
             return lambda x: register(
                 x, name=name, vary_name=vary_name, overwrite=overwrite
@@ -151,7 +151,7 @@ def register(
         elif isinstance(name, Text):
             names = [name, function.__name__]
         else:
-            names = list(name) + [function.__name__]
+            names = [*name, function.__name__]
 
         # all registered filters will use the same logger, at least for the
         # default logging done in the decorated function
diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index 9f2c1aa2..7fe43c14 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -4,7 +4,7 @@
 
 from abc import abstractmethod
 from pathlib import Path
-from typing import Callable, Mapping, Optional, Sequence, Text, Tuple, Union
+from typing import Callable, ClassVar, Mapping, Optional, Sequence, Text, Tuple, Union
 
 from xarray import DataArray, Dataset
 
@@ -55,7 +55,7 @@ class Regression(Callable):
         ...     demand = expo(macrodrivers, year=2010, forecast=5)
     """
 
-    __mappings__ = {}
+    __mappings__: ClassVar = {}
     """ Maps from input names to coefficient names
 
     Maps the coefficients names in the class to their names in the input data
@@ -454,7 +454,11 @@ def LogisticSigmoid(
 class Linear(Regression):
     """a * population + b * (gdp - gdp[2010]/population[2010] * population)."""
 
-    __mappings__ = {"a": "constant", "b0": "GDPscaleLess", "b1": "GDPscaleGreater"}
+    __mappings__: ClassVar[dict[str, str]] = {
+        "a": "constant",
+        "b0": "GDPscaleLess",
+        "b1": "GDPscaleGreater",
+    }
 
     __regression__ = "linear"
     __scaleyear__ = 2015
diff --git a/tests/test_agents.py b/tests/test_agents.py
index 9c71eb10..3b35598a 100644
--- a/tests/test_agents.py
+++ b/tests/test_agents.py
@@ -9,7 +9,7 @@ def assets():
     from muse.utilities import avoid_repetitions
     from numpy import ones
     from numpy.random import choice, randint
-    from xarray import Dataset  # noqa
+    from xarray import Dataset
 
     result = Dataset()
     result["year"] = "year", range(2010, 2031)
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index 4c743a99..3e01123d 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -629,17 +629,16 @@ def test_consolidate_quantity(newcapa_agent, retro_agent):
     actual = consolidate_quantity(quantity, [a, b], agents)
 
     cols = set(
-        list(agents[retro_agent.uuid].keys())
-        + ["installed", "year", "technology", quantity]
+        (*agents[retro_agent.uuid].keys(), "installed", "year", "technology", quantity)
     )
     assert set(actual.columns) == cols
     assert all(actual.year == newcapa_agent.forecast_year)
     assert all(actual.installed == newcapa_agent.year)
     assert all(
-        [
+        (
             name in (newcapa_agent.name, retro_agent.name)
             for name in actual.agent.unique()
-        ]
+        )
     )
 
 
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index cafe2b12..2a8c0ceb 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -89,8 +89,8 @@ def test_linear(regression_params, drivers):
     from pytest import approx  # noqa
 
     from muse import DEFAULT_SECTORS_DIRECTORY
-    from tests.agents import test_regressions  # noqa
+    from tests.agents import test_regressions
 
     sectors_dir = DEFAULT_SECTORS_DIRECTORY
-    regression_params = test_regressions.regression_params()  # noqa
-    drivers = test_regressions.drivers()  # noqa
+    regression_params = test_regressions.regression_params()
+    drivers = test_regressions.drivers()
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index 60219802..1cb8caa3 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -229,7 +229,7 @@ def fake(year, order=("installed", "technology")):
             ("year", "asset"),
             np.random.rand(len(result.year), len(result.asset)),
         )
-        result = result[["capacity"] + list(order)].set_coords(order)
+        result = result[["capacity", *order]].set_coords(order)
         return result.capacity
 
     # checks order of coords does not interfere with merging

From b305ff9b9a8b7062c4f0f03c251109b8246eed59 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 16 May 2024 08:29:53 +0100
Subject: [PATCH 127/419] Remove unneeded annotations

---
 src/muse/regressions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index 7fe43c14..a9e63e0c 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -486,13 +486,11 @@ def __call__(
             condition = year + forecast < self.__scaleyear__
             scale = coeffs.b0 if condition else coeffs.b1
         elif year is not None and "year" in data.dims:
-            # fmt: disable
             years = (
                 year
                 if isinstance(year, DataArray)
                 else DataArray(year, coords={"year": year}, dims="year")
             )
-            # fmt: enable
             condition = years + forecast < self.__scaleyear__
             scale = coeffs.b0.where(condition, coeffs.b1)
         else:

From 98984154507f085bfb6b7b9bb86a04043c8a4ceb Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 16 May 2024 08:34:49 +0100
Subject: [PATCH 128/419] Use different name for variable to appease type
 checkers

---
 src/muse/regressions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index a9e63e0c..dbd5f007 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -491,8 +491,8 @@ def __call__(
                 if isinstance(year, DataArray)
                 else DataArray(year, coords={"year": year}, dims="year")
             )
-            condition = years + forecast < self.__scaleyear__
-            scale = coeffs.b0.where(condition, coeffs.b1)
+            sel = years + forecast < self.__scaleyear__
+            scale = coeffs.b0.where(sel, coeffs.b1)
         else:
             scale = coeffs.b0
         data_baseyear = data.sel(year=self.base_year)

From 84521e5025cfca982ae46e50f174abbc3de1d43d Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 15 May 2024 16:54:26 +0100
Subject: [PATCH 129/419] VS Code: --no-cov argument no longer needed for
 pytest

---
 .vscode/settings.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9329ef54..8eb0feeb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,8 +17,6 @@
     "editor.formatOnSave": true,
     "editor.rulers": [88],
 
-    // --no-cov needed so that breakpoints work: https://github.com/microsoft/vscode-python/issues/693
-    "python.testing.pytestArgs": ["--no-cov"],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true
 }

From b0d45bde3dfc6e42f7aca81923f567a57957cb3b Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 16 May 2024 11:43:20 +0100
Subject: [PATCH 130/419] CI: Remove pre-commit workflow

I recently enabled the pre-commit app for this repo, which checks the pre-commit hooks pass anyway (and also commits autofixes), so this workflow is no longer needed.
---
 .github/workflows/ci.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc7443cb..37810196 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: QA and tests
+name: Tests
 
 on:
   pull_request:
@@ -8,16 +8,7 @@ on:
   workflow_call:
 
 jobs:
-  # Checks the style using the pre-commit hooks
-  qa:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pre-commit/action@v3.0.1
-
-  # Only then, normal testing proceeds
   unit-tests:
-    needs: qa
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -58,7 +49,6 @@ jobs:
         run: pytest -m "not regression and not notebook"
 
   regression-tests:
-    needs: qa
     runs-on: ${{ matrix.os }}
 
     strategy:

From ceb46d219baad33f9fe95a2a024b7d20ddc30589 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 12:19:13 +0000
Subject: [PATCH 131/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/muse/readers/csv.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 9f9fcefd..7e6d10ee 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -175,7 +175,6 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
 
     There are four axes: (technology, region, year, commodity)
     """
-
     from muse.readers import camel_to_snake
 
     csv = pd.read_csv(filename, float_precision="high", low_memory=False)
@@ -843,7 +842,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 muse.readers import camel_to_snake
 
     if not isinstance(data, pd.DataFrame):

From 44206bdd4bfd228474fb21e0c10d2791c9d831d4 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 16 May 2024 21:03:21 +0100
Subject: [PATCH 132/419] Add back results files

---
 .gitignore                                    |   1 -
 .../Results/MCACapacity.csv                   |  67 +++
 .../Results/MCAMetric_Consumption.csv         | 319 ++++++++++
 .../Results/MCAMetric_Supply.csv              | 481 +++++++++++++++
 .../Results/MCAPrices.csv                     | 169 ++++++
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   9 +
 .../Results/Gas/Capacity/2030.csv             |  15 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/Gas/Capacity/2045.csv             |   9 +
 .../Results/Gas/Capacity/2050.csv             |   9 +
 .../1-introduction/Results/MCACapacity.csv    |  67 +++
 .../1-introduction/Results/MCAPrices.csv      | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  30 +
 .../Results/Power/Capacity/2030.csv           |  37 ++
 .../Results/Power/Capacity/2035.csv           |  62 ++
 .../Results/Power/Capacity/2040.csv           |  57 ++
 .../Results/Power/Capacity/2045.csv           |  65 ++
 .../Results/Power/Capacity/2050.csv           |  57 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../2-scenario/Results/Gas/Capacity/2020.csv  |   4 +
 .../2-scenario/Results/Gas/Capacity/2025.csv  |   9 +
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  15 +
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  13 +
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  11 +
 .../2-scenario/Results/Gas/Capacity/2045.csv  |   9 +
 .../2-scenario/Results/Gas/Capacity/2050.csv  |   9 +
 .../2-scenario/Results/MCACapacity.csv        |  64 ++
 .../2-scenario/Results/MCAPrices.csv          | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  30 +
 .../Results/Power/Capacity/2030.csv           |  37 ++
 .../Results/Power/Capacity/2035.csv           |  51 ++
 .../Results/Power/Capacity/2040.csv           |  46 ++
 .../Results/Power/Capacity/2045.csv           |  55 ++
 .../Results/Power/Capacity/2050.csv           |  49 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../1-add-new-technology/generate_models.py   |  14 +-
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../Results/MCACapacity.csv                   | 101 ++++
 .../Results/MCAPrices.csv                     | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  37 ++
 .../Results/Power/Capacity/2030.csv           |  34 ++
 .../Results/Power/Capacity/2035.csv           |  36 ++
 .../Results/Power/Capacity/2040.csv           |  47 ++
 .../Results/Power/Capacity/2045.csv           |  67 +++
 .../Results/Power/Capacity/2050.csv           |  51 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |   5 +
 .../Results/Residential/Capacity/2030.csv     |   9 +
 .../Results/Residential/Capacity/2035.csv     |   7 +
 .../Results/Residential/Capacity/2040.csv     |  11 +
 .../Results/Residential/Capacity/2045.csv     |   7 +
 .../Results/Residential/Capacity/2050.csv     |   9 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  25 +
 .../Results/Residential/Supply/2030.csv       |  25 +
 .../Results/Residential/Supply/2035.csv       |  37 ++
 .../Results/Residential/Supply/2040.csv       |  37 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  37 ++
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../Results/MCACapacity.csv                   |  79 +++
 .../2-single-objective/Results/MCAPrices.csv  | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  24 +
 .../Results/Power/Capacity/2030.csv           |  22 +
 .../Results/Power/Capacity/2035.csv           |  19 +
 .../Results/Power/Capacity/2040.csv           |  16 +
 .../Results/Power/Capacity/2045.csv           |  33 ++
 .../Results/Power/Capacity/2050.csv           |  27 +
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |   5 +
 .../Results/Residential/Capacity/2030.csv     |   9 +
 .../Results/Residential/Capacity/2035.csv     |   7 +
 .../Results/Residential/Capacity/2040.csv     |  11 +
 .../Results/Residential/Capacity/2045.csv     |   7 +
 .../Results/Residential/Capacity/2050.csv     |   9 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  25 +
 .../Results/Residential/Supply/2030.csv       |  25 +
 .../Results/Residential/Supply/2035.csv       |  37 ++
 .../Results/Residential/Supply/2040.csv       |  37 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  37 ++
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/Gas/Capacity/2025.csv             |  17 +
 .../Results/Gas/Capacity/2030.csv             |  29 +
 .../Results/Gas/Capacity/2035.csv             |  25 +
 .../Results/Gas/Capacity/2040.csv             |  21 +
 .../Results/Gas/Capacity/2045.csv             |  17 +
 .../Results/Gas/Capacity/2050.csv             |  17 +
 .../1-new-region/Results/MCACapacity.csv      | 128 ++++
 .../1-new-region/Results/MCAPrices.csv        | 337 +++++++++++
 .../Results/Power/Capacity/2020.csv           |  23 +
 .../Results/Power/Capacity/2025.csv           |  53 ++
 .../Results/Power/Capacity/2030.csv           |  76 +++
 .../Results/Power/Capacity/2035.csv           | 105 ++++
 .../Results/Power/Capacity/2040.csv           | 105 ++++
 .../Results/Power/Capacity/2045.csv           | 131 ++++
 .../Results/Power/Capacity/2050.csv           | 121 ++++
 .../Results/Residential/Capacity/2020.csv     |  11 +
 .../Results/Residential/Capacity/2025.csv     |  25 +
 .../Results/Residential/Capacity/2030.csv     |  29 +
 .../Results/Residential/Capacity/2035.csv     |  33 ++
 .../Results/Residential/Capacity/2040.csv     |  29 +
 .../Results/Residential/Capacity/2045.csv     |  25 +
 .../Results/Residential/Capacity/2050.csv     |  21 +
 .../Results/Residential/Supply/2020.csv       | 121 ++++
 .../Results/Residential/Supply/2025.csv       | 169 ++++++
 .../Results/Residential/Supply/2030.csv       | 193 ++++++
 .../Results/Residential/Supply/2035.csv       | 193 ++++++
 .../Results/Residential/Supply/2040.csv       | 193 ++++++
 .../Results/Residential/Supply/2045.csv       | 145 +++++
 .../Results/Residential/Supply/2050.csv       |  97 +++
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/Gas/Capacity/2025.csv             |  17 +
 .../Results/Gas/Capacity/2030.csv             |  29 +
 .../Results/Gas/Capacity/2035.csv             |  25 +
 .../Results/Gas/Capacity/2040.csv             |  21 +
 .../Results/Gas/Capacity/2045.csv             |  17 +
 .../Results/Gas/Capacity/2050.csv             |  17 +
 .../Results/MCACapacity.csv                   | 120 ++++
 .../1-modify-timeslices/Results/MCAPrices.csv | 449 ++++++++++++++
 .../Results/Power/Capacity/2020.csv           |  23 +
 .../Results/Power/Capacity/2025.csv           |  53 ++
 .../Results/Power/Capacity/2030.csv           |  76 +++
 .../Results/Power/Capacity/2035.csv           |  87 +++
 .../Results/Power/Capacity/2040.csv           |  97 +++
 .../Results/Power/Capacity/2045.csv           | 125 ++++
 .../Results/Power/Capacity/2050.csv           | 117 ++++
 .../Results/Residential/Capacity/2020.csv     |  11 +
 .../Results/Residential/Capacity/2025.csv     |  25 +
 .../Results/Residential/Capacity/2030.csv     |  29 +
 .../Results/Residential/Capacity/2035.csv     |  25 +
 .../Results/Residential/Capacity/2040.csv     |  21 +
 .../Results/Residential/Capacity/2045.csv     |  21 +
 .../Results/Residential/Capacity/2050.csv     |  21 +
 .../Results/Residential/Supply/2020.csv       | 161 +++++
 .../Results/Residential/Supply/2025.csv       | 225 +++++++
 .../Results/Residential/Supply/2030.csv       | 257 ++++++++
 .../Results/Residential/Supply/2035.csv       | 193 ++++++
 .../Results/Residential/Supply/2040.csv       | 129 ++++
 .../Results/Residential/Supply/2045.csv       | 129 ++++
 .../Results/Residential/Supply/2050.csv       | 129 ++++
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/MCACapacity.csv                   |   7 +
 .../Results/MCAPrices.csv                     |  65 ++
 .../Results/Power/Capacity/2020.csv           |  21 +
 .../Results/Residential/Capacity/2020.csv     |  15 +
 .../Results/Residential/Supply/2020.csv       | 161 +++++
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/Gas/Capacity/2025.csv             |  17 +
 .../Results/Gas/Capacity/2030.csv             |  29 +
 .../Results/Gas/Capacity/2035.csv             |  25 +
 .../Results/Gas/Capacity/2040.csv             |  21 +
 .../Results/Gas/Capacity/2045.csv             |  17 +
 .../Results/Gas/Capacity/2050.csv             |  17 +
 .../Results/MCACapacity.csv                   | 155 +++++
 .../Results/MCAPrices.csv                     | 561 ++++++++++++++++++
 .../Results/Power/Capacity/2020.csv           |  29 +
 .../Results/Power/Capacity/2025.csv           |  59 ++
 .../Results/Power/Capacity/2030.csv           |  73 +++
 .../Results/Power/Capacity/2035.csv           |  83 +++
 .../Results/Power/Capacity/2040.csv           | 113 ++++
 .../Results/Power/Capacity/2045.csv           | 141 +++++
 .../Results/Power/Capacity/2050.csv           | 129 ++++
 .../Results/Residential/Capacity/2020.csv     |  21 +
 .../Results/Residential/Capacity/2025.csv     |  49 ++
 .../Results/Residential/Capacity/2030.csv     |  57 ++
 .../Results/Residential/Capacity/2035.csv     |  49 ++
 .../Results/Residential/Capacity/2040.csv     |  41 ++
 .../Results/Residential/Capacity/2045.csv     |  41 ++
 .../Results/Residential/Capacity/2050.csv     |  41 ++
 .../Results/Residential/Supply/2020.csv       | 321 ++++++++++
 .../Results/Residential/Supply/2025.csv       | 449 ++++++++++++++
 .../Results/Residential/Supply/2030.csv       | 513 ++++++++++++++++
 .../Results/Residential/Supply/2035.csv       | 385 ++++++++++++
 .../Results/Residential/Supply/2040.csv       | 257 ++++++++
 .../Results/Residential/Supply/2045.csv       | 257 ++++++++
 .../Results/Residential/Supply/2050.csv       | 257 ++++++++
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../1-correlation/Results/MCACapacity.csv     |  48 ++
 .../1-correlation/Results/MCAPrices.csv       | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 ++
 .../Results/Power/Capacity/2045.csv           |  41 ++
 .../Results/Power/Capacity/2050.csv           |  41 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  17 +
 .../Results/Residential/Capacity/2050.csv     |  15 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  49 ++
 .../Results/Residential/Supply/2050.csv       |  49 ++
 .../generate_models.py                        |   4 -
 .../Results/Gas/Capacity/2020.csv             |   9 +
 .../Results/Gas/Capacity/2025.csv             |   8 +
 .../Results/Gas/Capacity/2030.csv             |  14 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/Gas/Capacity/2045.csv             |   9 +
 .../Results/Gas/Capacity/2050.csv             |   9 +
 .../1-min-constraint/Results/MCACapacity.csv  |  51 ++
 .../Results/MCAMetric_Consumption.csv         | 229 +++++++
 .../Results/MCAMetric_Supply.csv              | 325 ++++++++++
 .../1-min-constraint/Results/MCAPrices.csv    | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 ++
 .../Results/Power/Capacity/2045.csv           |  41 ++
 .../Results/Power/Capacity/2050.csv           |  41 ++
 .../Results/Power/Supply/2020.csv             |  31 +
 .../Results/Power/Supply/2025.csv             |  31 +
 .../Results/Power/Supply/2030.csv             |  31 +
 .../Results/Power/Supply/2035.csv             |  43 ++
 .../Results/Power/Supply/2040.csv             |  55 ++
 .../Results/Power/Supply/2045.csv             |  61 ++
 .../Results/Power/Supply/2050.csv             |  61 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../technodata/power/TechnodataTimeslices.csv |  10 +-
 .../Results/Gas/Capacity/2020.csv             |   9 +
 .../Results/Gas/Capacity/2025.csv             |   8 +
 .../Results/Gas/Capacity/2030.csv             |  14 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/Gas/Capacity/2045.csv             |   9 +
 .../Results/Gas/Capacity/2050.csv             |   9 +
 .../2-max-constraint/Results/MCACapacity.csv  |  51 ++
 .../Results/MCAMetric_Consumption.csv         | 229 +++++++
 .../Results/MCAMetric_Supply.csv              | 325 ++++++++++
 .../2-max-constraint/Results/MCAPrices.csv    | 169 ++++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 ++
 .../Results/Power/Capacity/2045.csv           |  41 ++
 .../Results/Power/Capacity/2050.csv           |  41 ++
 .../Results/Power/Supply/2020.csv             |  26 +
 .../Results/Power/Supply/2025.csv             |  26 +
 .../Results/Power/Supply/2030.csv             |  31 +
 .../Results/Power/Supply/2035.csv             |  43 ++
 .../Results/Power/Supply/2040.csv             |  55 ++
 .../Results/Power/Supply/2045.csv             |  61 ++
 .../Results/Power/Supply/2050.csv             |  61 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 ++
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../technodata/power/TechnodataTimeslices.csv |  10 +-
 .../generate_models.py                        |   8 -
 docs/tutorial-code/generate_models.py         |   8 +-
 src/muse/wizard.py                            |   8 +-
 336 files changed, 18539 insertions(+), 43 deletions(-)
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv

diff --git a/.gitignore b/.gitignore
index 50008857..90eea441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,7 +127,6 @@ dmypy.json
 .pyre/
 
 /Results/
-docs/tutorial-code/**/Results
 /FileLog.txt
 /Power/Data/MusePower/Data/
 /MUSEGlobalSettings.csv/
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
new file mode 100644
index 00000000..1def068e
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -0,0 +1,67 @@
+,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
+0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
+0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
+2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
+7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
+2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
+12,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
+25,A1,6.75000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
+2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
+2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
+6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
+7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
+0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
+11,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
+12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
+31,A1,6.75000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
+0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
+1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
+2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
+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
+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
+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
+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
+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
new file mode 100644
index 00000000..c6cacd79
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
@@ -0,0 +1,319 @@
+,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
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
new file mode 100644
index 00000000..93ccbd1e
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
@@ -0,0 +1,481 @@
+,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
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
new file mode 100644
index 00000000..f4d602c4
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
+"('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')",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')",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')",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')",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')",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')",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')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,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')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,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')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,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')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,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')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,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')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,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')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,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')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d1fb99f5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,9 @@
+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/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
new file mode 100644
index 00000000..298f6c89
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e368dd50
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..4d55f6f7
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e5d560fc
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..4a7d05fa
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9d868b1d
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
@@ -0,0 +1,67 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
+windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+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
+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
+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
+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,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
new file mode 100644
index 00000000..f4d602c4
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
+"('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')",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')",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')",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')",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')",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')",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')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,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')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,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')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,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')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,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')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,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')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,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')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,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')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,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')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,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')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,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
new file mode 100644
index 00000000..beea1d34
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..35de2d84
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -0,0 +1,30 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+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,2064,R1,gasCCGT,2025,3.00000000000
+2,2025,R1,solarPV,2020,10.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,2025,R1,windturbine,2020,6.75000000000
+4,2030,R1,windturbine,2020,6.75000000000
+4,2035,R1,windturbine,2020,6.75000000000
+4,2040,R1,windturbine,2020,6.75000000000
+4,2045,R1,windturbine,2020,6.75000000000
+4,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
new file mode 100644
index 00000000..26ce8db8
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3f21815e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
@@ -0,0 +1,62 @@
+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
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
new file mode 100644
index 00000000..0ab7f9bf
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
@@ -0,0 +1,57 @@
+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
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
new file mode 100644
index 00000000..3d2ca0a4
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
@@ -0,0 +1,65 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasCCGT,2025,3.00000000000
+0,2049,R1,gasCCGT,2025,3.00000000000
+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
+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
+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,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
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
new file mode 100644
index 00000000..43ea9b82
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..305b627b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a44059a3
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9ed8c00
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61ae1198
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89e0bd4e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..663e47a5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6e2884e6
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61004cae
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d1fb99f5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,9 @@
+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/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
new file mode 100644
index 00000000..298f6c89
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e368dd50
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..4d55f6f7
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e5d560fc
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..4a7d05fa
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..5f93911e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
@@ -0,0 +1,64 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+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
+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
+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
+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
+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
+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
+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,16.91000000000
+windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
+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/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
new file mode 100644
index 00000000..d29309c0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.51720000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17730000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77730000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27810000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51720000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17730000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77730000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27810000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56390000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62930000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38710000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.56240000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.84490000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31400000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56240000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84490000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31400000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69720000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.12810000000,2035
+"('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')",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')",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')",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')",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')",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')",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')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08640000000,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')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14400000000,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')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08640000000,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')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14400000000,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')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.37480000000,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')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.21120000000,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')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04750000000,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')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.08880000000,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')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04750000000,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')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08880000000,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')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28370000000,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')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14190000000,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
new file mode 100644
index 00000000..f194e742
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..6611dc7e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -0,0 +1,30 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+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,2064,R1,gasCCGT,2025,3.00000000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2025,R1,windturbine,2020,10.00000000000
+4,2030,R1,windturbine,2020,10.00000000000
+4,2035,R1,windturbine,2020,10.00000000000
+4,2040,R1,windturbine,2020,10.00000000000
+4,2045,R1,windturbine,2020,10.00000000000
+4,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
new file mode 100644
index 00000000..3739f2ea
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..94a5d1ab
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
@@ -0,0 +1,51 @@
+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
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
new file mode 100644
index 00000000..5e8f56bc
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
@@ -0,0 +1,46 @@
+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
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
new file mode 100644
index 00000000..c64073d2
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
@@ -0,0 +1,55 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasCCGT,2025,3.00000000000
+0,2049,R1,gasCCGT,2025,3.00000000000
+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
+1,2045,R1,solarPV,2020,6.75000000000
+1,2049,R1,solarPV,2020,6.75000000000
+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,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
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
new file mode 100644
index 00000000..fbf5711d
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
@@ -0,0 +1,49 @@
+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
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..305b627b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a44059a3
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9ed8c00
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61ae1198
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89e0bd4e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..663e47a5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6e2884e6
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61004cae
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 30dd47ee..accb9cbf 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -21,10 +21,6 @@
 
 
 def generate_model_1() -> None:
-    """
-    Code to generate model 1-introduction.
-
-    """
     model_name = "1-introduction"
     model_path = parent_path / model_name
     if model_path.exists():
@@ -60,7 +56,7 @@ def generate_model_1() -> None:
     # Copy windturbine process in power sector -> solarPV
     add_new_process(model_path, "solarPV", "power", "windturbine")
 
-    # Special handling for CommIn.csv
+    # Modify input commodities
     commin_file = model_path / "technodata/power/CommIn.csv"
     df = pd.read_csv(commin_file)
     df.loc[(df["ProcessName"] == "solarPV"), "solar"] = 1
@@ -68,7 +64,7 @@ def generate_model_1() -> None:
     df.loc[(df["ProcessName"] == "windturbine"), "solar"] = 0
     df.to_csv(commin_file, index=False)
 
-    # Special handling for technodata.csv
+    # Modify technodata for solarPV
     technodata_file = model_path / "technodata/power/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "solarPV", "cap_par"] = 30
@@ -83,10 +79,6 @@ def generate_model_1() -> None:
 
 
 def generate_model_2() -> None:
-    """
-    Code to generate model 2-scenario.
-
-    """
     model_name = "2-scenario"
     model_path = parent_path / model_name
     if model_path.exists():
@@ -98,7 +90,7 @@ def generate_model_2() -> None:
     # Copy price data for 2020 -> 2040
     add_price_data_for_new_year(model_path, "2040", "power", "2020")
 
-    # Special handling for technodata.csv
+    # Modify cap_par for solarPV
     technodata_file = model_path / "technodata/power/technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2020"), "cap_par"] = 40
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..0e008ed8
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..39ffacce
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..cc87d2bd
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c7248804
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..90a0f85e
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
new file mode 100644
index 00000000..d750edcf
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
@@ -0,0 +1,101 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
+solarPV,R1,R1,A1,power,retrofit,2025,0.39110000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
+solarPV,R1,R1,A2,power,retrofit,2025,0.39110000000
+windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.32660000000
+solarPV,R1,R1,A2,power,retrofit,2030,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2030,2.64110000000
+windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2030,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.32660000000
+solarPV,R1,R1,A2,power,retrofit,2035,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2035,2.64110000000
+windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2035,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,47.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.27940000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.32660000000
+solarPV,R1,R1,A2,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2040,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2040,3.03230000000
+windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2040,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,47.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.27940000000
+solarPV,R1,R1,A1,power,retrofit,2045,1.06160000000
+windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.32660000000
+windturbine,R1,R1,A1,power,retrofit,2045,0.46720000000
+solarPV,R1,R1,A2,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A2,power,retrofit,2045,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.03230000000
+solarPV,R1,R1,A2,power,retrofit,2045,6.06450000000
+windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2045,6.57660000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,47.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,1.65880000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.27940000000
+solarPV,R1,R1,A1,power,retrofit,2050,1.06160000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.21280000000
+windturbine,R1,R1,A1,power,retrofit,2050,4.32660000000
+windturbine,R1,R1,A1,power,retrofit,2050,0.46720000000
+windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A2,power,retrofit,2050,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.03230000000
+solarPV,R1,R1,A2,power,retrofit,2050,6.06450000000
+solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
+windturbine,R1,R1,A2,power,retrofit,2050,6.57660000000
+windturbine,R1,R1,A2,power,retrofit,2050,6.24660000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.36010000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,47.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
new file mode 100644
index 00000000..a2b8932d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.39520000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.93480000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.59280000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.40220000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.39520000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.93480000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.59280000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.40220000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18560000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.80430000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.79040000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.86950000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.31960000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.03990000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.48010000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07160000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.31960000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03990000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48010000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07160000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96420000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21440000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.64100000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11130000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.38050000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.10930000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.57140000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.17330000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38050000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10930000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57140000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17330000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.14680000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40300000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.76270000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.24360000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.41860000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.13150000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.62850000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.20830000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41860000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.13150000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62850000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20830000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.26080000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.48320000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.83890000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.44310000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.15470000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66520000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.24420000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44310000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.15470000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66520000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.24420000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33370000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56170000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.88770000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.34180000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.56450000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.18200000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.84730000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.28590000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56450000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18200000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84730000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.28590000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69840000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.64920000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.13060000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.39840000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..48bcd2e6
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..32bf32ef
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
@@ -0,0 +1,37 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+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,2025,R1,solarPV,2020,0.78230000000
+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,2025,R1,windturbine,2020,20.00000000000
+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/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..68b049a3
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..ca175287
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3969a49d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..92bea04b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
@@ -0,0 +1,67 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasCCGT,2025,2.00000000000
+0,2049,R1,gasCCGT,2025,2.00000000000
+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
+2,2045,R1,solarPV,2020,0.78230000000
+2,2049,R1,solarPV,2020,0.78230000000
+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,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,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
+7,2045,R1,windturbine,2020,20.00000000000
+7,2049,R1,windturbine,2020,20.00000000000
+8,2045,R1,windturbine,2025,10.90320000000
+8,2049,R1,windturbine,2025,10.90320000000
+8,2050,R1,windturbine,2025,10.90320000000
+8,2054,R1,windturbine,2025,10.90320000000
+9,2045,R1,windturbine,2040,0.46720000000
+9,2049,R1,windturbine,2040,0.46720000000
+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/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..e3a24169
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..9458be5c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+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/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..db6e6073
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..1434998a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,9 @@
+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
+1,2030,R1,heatpump,2020,119.00000000000
+1,2034,R1,heatpump,2020,119.00000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..6d888046
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..0e46259b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2030,7.20000000000
+0,2044,R1,gasboiler,2030,7.20000000000
+1,2045,R1,gasboiler,2040,7.44000000000
+1,2050,R1,gasboiler,2040,7.44000000000
+1,2054,R1,gasboiler,2040,7.44000000000
+2,2040,R1,heatpump,2030,128.80000000000
+2,2044,R1,heatpump,2030,128.80000000000
+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/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..799a0664
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..85bfbefa
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..57fe2699
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..1339d7d2
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9c87f423
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f8de2157
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9a26b20d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..cf942a49
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9d4b068a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..15698c78
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..d5dee8bb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..08966a42
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fe3133ab
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f3a800dd
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
new file mode 100644
index 00000000..8823691a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
@@ -0,0 +1,79 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A1,power,retrofit,2025,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A2,power,retrofit,2025,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2030,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2030,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2030,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2030,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
+gasboiler,R1,R1,A2,residential,retrofit,2035,7.20000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,28.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2035,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2035,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2035,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2035,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,13.96760000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
+gasboiler,R1,R1,A2,residential,retrofit,2040,7.20000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,28.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2040,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2040,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2040,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2040,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,13.96760000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
+gasboiler,R1,R1,A2,residential,retrofit,2045,7.44000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,40.56000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.54070000000
+windturbine,R1,R1,A1,power,retrofit,2045,9.47970000000
+gasCCGT,R1,R1,A2,power,retrofit,2045,2.00000000000
+solarPV,R1,R1,A2,power,retrofit,2045,6.54070000000
+windturbine,R1,R1,A2,power,retrofit,2045,9.47970000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,13.96760000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
+gasboiler,R1,R1,A2,residential,retrofit,2050,7.44000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,40.56000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,0.86130000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.54070000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.61070000000
+windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
+gasCCGT,R1,R1,A2,power,retrofit,2050,2.00000000000
+gasCCGT,R1,R1,A2,power,retrofit,2050,0.86130000000
+solarPV,R1,R1,A2,power,retrofit,2050,6.54070000000
+solarPV,R1,R1,A2,power,retrofit,2050,11.61070000000
+windturbine,R1,R1,A2,power,retrofit,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,13.96760000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,13.96760000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
new file mode 100644
index 00000000..a198a4be
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.41420000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.99750000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.62130000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.49630000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41420000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.99750000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62130000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.49630000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.24260000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.99260000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.82840000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.99500000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.45920000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04060000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.69010000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07340000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.45920000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04060000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.69010000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07340000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.38800000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22130000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.92190000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11440000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.57560000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.31520000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.86460000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.48470000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57560000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31520000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86460000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.48470000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73710000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.04130000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.15460000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.66220000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.69190000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.39380000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.03920000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.60540000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69190000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.39380000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.03920000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.60540000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.08610000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.29950000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.38730000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.82690000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.85510000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.40120000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.28400000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.62000000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85510000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.40120000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28400000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.62000000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57580000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.35000000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.71370000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.85100000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.87940000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.48810000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.32010000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.75460000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.87940000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.48810000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.32010000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.75460000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.64690000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.64390000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.76170000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,1.03600000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..e51bf8d5
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..9042b648
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
@@ -0,0 +1,24 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+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,2025,R1,windturbine,2020,18.95930000000
+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/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..a3e0e3c7
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e66e2fa3
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c4711009
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..7507d45f
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
@@ -0,0 +1,33 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasCCGT,2025,4.00000000000
+0,2049,R1,gasCCGT,2025,4.00000000000
+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,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,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
+4,2045,R1,windturbine,2020,18.95930000000
+4,2049,R1,windturbine,2020,18.95930000000
+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/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..e4440602
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..4122d90b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+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/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..08d92bf4
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..0ee56685
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,9 @@
+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
+1,2030,R1,heatpump,2020,38.00000000000
+1,2034,R1,heatpump,2020,38.00000000000
+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/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..2363ffb8
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..cd28d615
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2030,14.40000000000
+0,2044,R1,gasboiler,2030,14.40000000000
+1,2045,R1,gasboiler,2040,14.88000000000
+1,2050,R1,gasboiler,2040,14.88000000000
+1,2054,R1,gasboiler,2040,14.88000000000
+2,2040,R1,heatpump,2030,57.60000000000
+2,2044,R1,heatpump,2030,57.60000000000
+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/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..939e3e56
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6aff1325
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..62937431
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f9894bba
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..514bc0ff
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..80e72327
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..2c074d4d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..aa751b65
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..79dedd79
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..57ef9d5d
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,17 @@
+asset,year,technology,region,installed,capacity
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2025,2.79440000000
+1,2035,gassupply1,R1,2025,2.79440000000
+1,2040,gassupply1,R1,2025,2.79440000000
+1,2045,gassupply1,R1,2025,2.79440000000
+1,2050,gassupply1,R1,2025,2.79440000000
+1,2064,gassupply1,R1,2025,2.79440000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2030,gassupply1,R2,2025,2.79440000000
+3,2035,gassupply1,R2,2025,2.79440000000
+3,2040,gassupply1,R2,2025,2.79440000000
+3,2045,gassupply1,R2,2025,2.79440000000
+3,2050,gassupply1,R2,2025,2.79440000000
+3,2064,gassupply1,R2,2025,2.79440000000
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
new file mode 100644
index 00000000..223a9793
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..be63ee95
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..301ed041
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..33d01ddd
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..59af6136
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c1b43bb2
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
@@ -0,0 +1,128 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.40000000000
+windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,2.79440000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
+windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
+windturbine,R2,R2,A1,power,retrofit,2035,3.60000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+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
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
+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
+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
+solarPV,R2,R2,A1,power,retrofit,2040,4.80000000000
+windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
+windturbine,R2,R2,A1,power,retrofit,2040,3.60000000000
+windturbine,R2,R2,A1,power,retrofit,2040,4.39000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+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
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
+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
+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
+solarPV,R2,R2,A1,power,retrofit,2045,4.80000000000
+solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
+windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
+windturbine,R2,R2,A1,power,retrofit,2045,3.60000000000
+windturbine,R2,R2,A1,power,retrofit,2045,4.39000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
+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,16.91000000000
+windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
+windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
+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
+solarPV,R2,R2,A1,power,retrofit,2050,4.80000000000
+solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
+windturbine,R2,R2,A1,power,retrofit,2050,3.60000000000
+windturbine,R2,R2,A1,power,retrofit,2050,4.39000000000
+windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
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
new file mode 100644
index 00000000..ce14d096
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
@@ -0,0 +1,337 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.51500000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.51500000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17720000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.17720000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77400000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.77400000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27790000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.27790000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51500000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.51500000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.17720000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77400000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77400000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27790000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.27790000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.55730000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.55730000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62840000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.62840000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.03410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.03410000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38660000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.38660000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.56090000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.56090000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19970000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.19970000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.84270000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.84270000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31380000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.31380000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56090000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.56090000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19970000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.19970000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84270000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.84270000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31380000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.31380000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69290000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.69290000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71370000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.71370000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.12520000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.12520000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.43750000000,2035
+"('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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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')",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
new file mode 100644
index 00000000..b5425c1b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..0b9e6c57
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -0,0 +1,53 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,3.00000000000
+1,2035,gasCCGT,R1,2025,3.00000000000
+1,2040,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R1,2025,3.00000000000
+1,2049,gasCCGT,R1,2025,3.00000000000
+1,2050,gasCCGT,R1,2025,3.00000000000
+1,2054,gasCCGT,R1,2025,3.00000000000
+1,2055,gasCCGT,R1,2025,3.00000000000
+1,2064,gasCCGT,R1,2025,3.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,3.00000000000
+3,2035,gasCCGT,R2,2025,3.00000000000
+3,2040,gasCCGT,R2,2025,3.00000000000
+3,2045,gasCCGT,R2,2025,3.00000000000
+3,2049,gasCCGT,R2,2025,3.00000000000
+3,2050,gasCCGT,R2,2025,3.00000000000
+3,2054,gasCCGT,R2,2025,3.00000000000
+3,2055,gasCCGT,R2,2025,3.00000000000
+3,2064,gasCCGT,R2,2025,3.00000000000
+4,2025,solarPV,R1,2020,6.75000000000
+4,2030,solarPV,R1,2020,6.75000000000
+4,2035,solarPV,R1,2020,6.75000000000
+4,2040,solarPV,R1,2020,6.75000000000
+4,2045,solarPV,R1,2020,6.75000000000
+4,2049,solarPV,R1,2020,6.75000000000
+5,2030,solarPV,R1,2025,2.40000000000
+5,2035,solarPV,R1,2025,2.40000000000
+5,2040,solarPV,R1,2025,2.40000000000
+5,2045,solarPV,R1,2025,2.40000000000
+5,2049,solarPV,R1,2025,2.40000000000
+5,2050,solarPV,R1,2025,2.40000000000
+5,2054,solarPV,R1,2025,2.40000000000
+6,2030,solarPV,R2,2025,2.40000000000
+6,2035,solarPV,R2,2025,2.40000000000
+6,2040,solarPV,R2,2025,2.40000000000
+6,2045,solarPV,R2,2025,2.40000000000
+6,2049,solarPV,R2,2025,2.40000000000
+6,2050,solarPV,R2,2025,2.40000000000
+6,2054,solarPV,R2,2025,2.40000000000
+7,2025,windturbine,R1,2020,10.00000000000
+7,2030,windturbine,R1,2020,10.00000000000
+7,2035,windturbine,R1,2020,10.00000000000
+7,2040,windturbine,R1,2020,10.00000000000
+7,2045,windturbine,R1,2020,10.00000000000
+7,2049,windturbine,R1,2020,10.00000000000
+8,2025,windturbine,R2,2020,16.75000000000
+8,2030,windturbine,R2,2020,16.75000000000
+8,2035,windturbine,R2,2020,16.75000000000
+8,2040,windturbine,R2,2020,16.75000000000
+8,2045,windturbine,R2,2020,16.75000000000
+8,2049,windturbine,R2,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
new file mode 100644
index 00000000..ca265d0a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..bc71a6d4
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
@@ -0,0 +1,105 @@
+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
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
new file mode 100644
index 00000000..bda10415
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
@@ -0,0 +1,105 @@
+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
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
new file mode 100644
index 00000000..b04feb4a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
@@ -0,0 +1,131 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,3.00000000000
+0,2049,gasCCGT,R1,2025,3.00000000000
+0,2050,gasCCGT,R1,2025,3.00000000000
+0,2054,gasCCGT,R1,2025,3.00000000000
+0,2055,gasCCGT,R1,2025,3.00000000000
+0,2059,gasCCGT,R1,2025,3.00000000000
+0,2060,gasCCGT,R1,2025,3.00000000000
+0,2064,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R2,2025,3.00000000000
+1,2049,gasCCGT,R2,2025,3.00000000000
+1,2050,gasCCGT,R2,2025,3.00000000000
+1,2054,gasCCGT,R2,2025,3.00000000000
+1,2055,gasCCGT,R2,2025,3.00000000000
+1,2059,gasCCGT,R2,2025,3.00000000000
+1,2060,gasCCGT,R2,2025,3.00000000000
+1,2064,gasCCGT,R2,2025,3.00000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2045,solarPV,R1,2025,2.40000000000
+3,2049,solarPV,R1,2025,2.40000000000
+3,2050,solarPV,R1,2025,2.40000000000
+3,2054,solarPV,R1,2025,2.40000000000
+4,2045,solarPV,R1,2030,6.00000000000
+4,2049,solarPV,R1,2030,6.00000000000
+4,2050,solarPV,R1,2030,6.00000000000
+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
+15,2045,windturbine,R2,2020,16.75000000000
+15,2049,windturbine,R2,2020,16.75000000000
+16,2045,windturbine,R2,2030,3.60000000000
+16,2049,windturbine,R2,2030,3.60000000000
+16,2050,windturbine,R2,2030,3.60000000000
+16,2054,windturbine,R2,2030,3.60000000000
+16,2055,windturbine,R2,2030,3.60000000000
+16,2059,windturbine,R2,2030,3.60000000000
+17,2045,windturbine,R2,2035,4.39000000000
+17,2049,windturbine,R2,2035,4.39000000000
+17,2050,windturbine,R2,2035,4.39000000000
+17,2054,windturbine,R2,2035,4.39000000000
+17,2055,windturbine,R2,2035,4.39000000000
+17,2059,windturbine,R2,2035,4.39000000000
+17,2060,windturbine,R2,2035,4.39000000000
+17,2064,windturbine,R2,2035,4.39000000000
+18,2050,windturbine,R2,2045,6.75000000000
+18,2054,windturbine,R2,2045,6.75000000000
+18,2055,windturbine,R2,2045,6.75000000000
+18,2059,windturbine,R2,2045,6.75000000000
+18,2060,windturbine,R2,2045,6.75000000000
+18,2064,windturbine,R2,2045,6.75000000000
+18,2065,windturbine,R2,2045,6.75000000000
+18,2069,windturbine,R2,2045,6.75000000000
+18,2070,windturbine,R2,2045,6.75000000000
+18,2074,windturbine,R2,2045,6.75000000000
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
new file mode 100644
index 00000000..37b2c93a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
@@ -0,0 +1,121 @@
+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
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..06bad92b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,11 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2025,heatpump,R1,2020,19.00000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2025,heatpump,R2,2020,19.00000000000
+3,2030,heatpump,R2,2020,19.00000000000
+3,2034,heatpump,R2,2020,19.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..34d42206
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,4.10000000000
+1,2034,gasboiler,R1,2025,4.10000000000
+1,2035,gasboiler,R1,2025,4.10000000000
+1,2039,gasboiler,R1,2025,4.10000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,4.10000000000
+3,2034,gasboiler,R2,2025,4.10000000000
+3,2035,gasboiler,R2,2025,4.10000000000
+3,2039,gasboiler,R2,2025,4.10000000000
+4,2025,heatpump,R1,2020,19.00000000000
+4,2030,heatpump,R1,2020,19.00000000000
+4,2034,heatpump,R1,2020,19.00000000000
+5,2030,heatpump,R1,2025,6.90000000000
+5,2034,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2025,6.90000000000
+5,2039,heatpump,R1,2025,6.90000000000
+6,2025,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2020,19.00000000000
+6,2034,heatpump,R2,2020,19.00000000000
+7,2030,heatpump,R2,2025,6.90000000000
+7,2034,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..559a80d8
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,4.10000000000
+0,2034,gasboiler,R1,2025,4.10000000000
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2030,gasboiler,R2,2025,4.10000000000
+1,2034,gasboiler,R2,2025,4.10000000000
+1,2035,gasboiler,R2,2025,4.10000000000
+1,2039,gasboiler,R2,2025,4.10000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2030,heatpump,R1,2025,6.90000000000
+3,2034,heatpump,R1,2025,6.90000000000
+3,2035,heatpump,R1,2025,6.90000000000
+3,2039,heatpump,R1,2025,6.90000000000
+4,2035,heatpump,R1,2030,25.00000000000
+4,2039,heatpump,R1,2030,25.00000000000
+4,2040,heatpump,R1,2030,25.00000000000
+4,2044,heatpump,R1,2030,25.00000000000
+5,2030,heatpump,R2,2020,19.00000000000
+5,2034,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2025,6.90000000000
+6,2034,heatpump,R2,2025,6.90000000000
+6,2035,heatpump,R2,2025,6.90000000000
+6,2039,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2030,25.00000000000
+7,2039,heatpump,R2,2030,25.00000000000
+7,2040,heatpump,R2,2030,25.00000000000
+7,2044,heatpump,R2,2030,25.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..fa9e8bca
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2040,gasboiler,R1,2035,0.91000000000
+1,2044,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R1,2035,0.91000000000
+1,2049,gasboiler,R1,2035,0.91000000000
+2,2035,gasboiler,R2,2025,4.10000000000
+2,2039,gasboiler,R2,2025,4.10000000000
+3,2040,gasboiler,R2,2035,0.91000000000
+3,2044,gasboiler,R2,2035,0.91000000000
+3,2045,gasboiler,R2,2035,0.91000000000
+3,2049,gasboiler,R2,2035,0.91000000000
+4,2035,heatpump,R1,2025,6.90000000000
+4,2039,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2030,25.00000000000
+5,2039,heatpump,R1,2030,25.00000000000
+5,2040,heatpump,R1,2030,25.00000000000
+5,2044,heatpump,R1,2030,25.00000000000
+6,2040,heatpump,R1,2035,16.09000000000
+6,2044,heatpump,R1,2035,16.09000000000
+6,2045,heatpump,R1,2035,16.09000000000
+6,2049,heatpump,R1,2035,16.09000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
+8,2035,heatpump,R2,2030,25.00000000000
+8,2039,heatpump,R2,2030,25.00000000000
+8,2040,heatpump,R2,2030,25.00000000000
+8,2044,heatpump,R2,2030,25.00000000000
+9,2040,heatpump,R2,2035,16.09000000000
+9,2044,heatpump,R2,2035,16.09000000000
+9,2045,heatpump,R2,2035,16.09000000000
+9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..eb1a544b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2040,gasboiler,R1,2035,0.91000000000
+0,2044,gasboiler,R1,2035,0.91000000000
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2040,gasboiler,R2,2035,0.91000000000
+1,2044,gasboiler,R2,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2040,heatpump,R1,2030,25.00000000000
+2,2044,heatpump,R1,2030,25.00000000000
+3,2040,heatpump,R1,2035,16.09000000000
+3,2044,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2035,16.09000000000
+3,2049,heatpump,R1,2035,16.09000000000
+4,2045,heatpump,R1,2040,31.00000000000
+4,2049,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2040,31.00000000000
+4,2054,heatpump,R1,2040,31.00000000000
+5,2040,heatpump,R2,2030,25.00000000000
+5,2044,heatpump,R2,2030,25.00000000000
+6,2040,heatpump,R2,2035,16.09000000000
+6,2044,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2035,16.09000000000
+6,2049,heatpump,R2,2035,16.09000000000
+7,2045,heatpump,R2,2040,31.00000000000
+7,2049,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2040,31.00000000000
+7,2054,heatpump,R2,2040,31.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..0b5fe3de
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2045,heatpump,R1,2035,16.09000000000
+2,2049,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2040,31.00000000000
+3,2049,heatpump,R1,2040,31.00000000000
+3,2050,heatpump,R1,2040,31.00000000000
+3,2054,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2045,23.00000000000
+4,2054,heatpump,R1,2045,23.00000000000
+4,2055,heatpump,R1,2045,23.00000000000
+4,2059,heatpump,R1,2045,23.00000000000
+5,2045,heatpump,R2,2035,16.09000000000
+5,2049,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2040,31.00000000000
+6,2049,heatpump,R2,2040,31.00000000000
+6,2050,heatpump,R2,2040,31.00000000000
+6,2054,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2045,23.00000000000
+7,2054,heatpump,R2,2045,23.00000000000
+7,2055,heatpump,R2,2045,23.00000000000
+7,2059,heatpump,R2,2045,23.00000000000
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
new file mode 100644
index 00000000..eb21c442
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..8e6f8adf
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..eb9ddd9d
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..af0c152b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..21119f08
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..503b4b8c
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..98be95de
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..26d4aa26
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3c032c34
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..8951d4a9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a056e261
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..0c2112af
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..20d6c8b3
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..857dfbd4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
new file mode 100644
index 00000000..06b99912
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -0,0 +1,120 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,5.60870000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,15.60870000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
+heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
+heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2030,4.07170000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,4.07170000000
+windturbine,R2,R2,A1,power,retrofit,2030,15.60870000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,0.27200000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
+heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
+heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2035,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.71470000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
+windturbine,R2,R2,A1,power,retrofit,2035,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2035,1.64290000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2040,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2040,7.85760000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2040,7.85760000000
+windturbine,R2,R2,A1,power,retrofit,2040,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2040,1.64290000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
+heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
+heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2045,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2045,7.85760000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
+windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2045,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2045,7.85760000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
+windturbine,R2,R2,A1,power,retrofit,2045,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2045,1.64290000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
+heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
+heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
+heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,4.07170000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2050,7.85760000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.71470000000
+windturbine,R1,R1,A1,power,retrofit,2050,5.60870000000
+gasCCGT,R2,R2,A1,power,retrofit,2050,3.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
+solarPV,R2,R2,A1,power,retrofit,2050,7.85760000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.71470000000
+windturbine,R2,R2,A1,power,retrofit,2050,1.64290000000
+windturbine,R2,R2,A1,power,retrofit,2050,5.60870000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
new file mode 100644
index 00000000..54105605
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -0,0 +1,449 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.30330000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.30330000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.45500000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.45500000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.45500000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.45500000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.91030000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.91030000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.60700000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.60700000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.60700000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.60700000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.60700000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.60700000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.33730000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.33730000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.07490000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.50660000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.50660000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.11850000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.11850000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.33730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.33730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07490000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07490000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.50660000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.50660000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11850000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11850000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.01710000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.01710000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27390000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27390000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.67670000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.67670000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.16630000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.16630000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.67670000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.67670000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16630000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16630000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.67670000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.67670000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.37230000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.37230000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08360000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08360000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.55890000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.55890000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.13230000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.13230000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37230000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37230000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08360000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08360000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.55890000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.55890000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13230000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13230000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.12120000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.12120000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30640000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.30640000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.74630000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.74630000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.18580000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.18580000000,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', 'early-morning')",electricity,R1,0.74630000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.74630000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18580000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18580000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.74630000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.74630000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18580000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18580000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.37880000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.37880000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02350000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.02350000000,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.56850000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.56850000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04330000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.04330000000,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', 'mid-afternoon')",electricity,R1,0.37880000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37880000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02350000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02350000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56850000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56850000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04330000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.04330000000,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.13990000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.13990000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13480000000,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,0.75910000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.75910000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.06840000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.06840000000,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', 'early-morning')",electricity,R1,0.75910000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.75910000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.06840000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.06840000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.75910000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.75910000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06840000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06840000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.41910000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.41910000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02370000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.02370000000,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.62900000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.62900000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.04370000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.04370000000,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', 'mid-afternoon')",electricity,R1,0.41910000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41910000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02370000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02370000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62900000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.62900000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04370000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.04370000000,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.26060000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.26060000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13640000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13640000000,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,0.83970000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.83970000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.06920000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.06920000000,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', 'early-morning')",electricity,R1,0.83970000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.83970000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.06920000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.06920000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.83970000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.83970000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06920000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06920000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.44700000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.44700000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02480000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.02480000000,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.67070000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.67070000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04630000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.04630000000,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', 'mid-afternoon')",electricity,R1,0.44700000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44700000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67070000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.67070000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04630000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.04630000000,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.34390000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34390000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.14670000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.14670000000,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,0.89530000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89530000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07380000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.07380000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89530000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89530000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.07380000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.07380000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89530000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89530000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.07380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.07380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
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
new file mode 100644
index 00000000..fa374881
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..ea8602ea
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -0,0 +1,53 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,3.00000000000
+1,2035,gasCCGT,R1,2025,3.00000000000
+1,2040,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R1,2025,3.00000000000
+1,2049,gasCCGT,R1,2025,3.00000000000
+1,2050,gasCCGT,R1,2025,3.00000000000
+1,2054,gasCCGT,R1,2025,3.00000000000
+1,2055,gasCCGT,R1,2025,3.00000000000
+1,2064,gasCCGT,R1,2025,3.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,3.00000000000
+3,2035,gasCCGT,R2,2025,3.00000000000
+3,2040,gasCCGT,R2,2025,3.00000000000
+3,2045,gasCCGT,R2,2025,3.00000000000
+3,2049,gasCCGT,R2,2025,3.00000000000
+3,2050,gasCCGT,R2,2025,3.00000000000
+3,2054,gasCCGT,R2,2025,3.00000000000
+3,2055,gasCCGT,R2,2025,3.00000000000
+3,2064,gasCCGT,R2,2025,3.00000000000
+4,2025,solarPV,R1,2020,5.60870000000
+4,2030,solarPV,R1,2020,5.60870000000
+4,2035,solarPV,R1,2020,5.60870000000
+4,2040,solarPV,R1,2020,5.60870000000
+4,2045,solarPV,R1,2020,5.60870000000
+4,2049,solarPV,R1,2020,5.60870000000
+5,2030,solarPV,R1,2025,4.07170000000
+5,2035,solarPV,R1,2025,4.07170000000
+5,2040,solarPV,R1,2025,4.07170000000
+5,2045,solarPV,R1,2025,4.07170000000
+5,2049,solarPV,R1,2025,4.07170000000
+5,2050,solarPV,R1,2025,4.07170000000
+5,2054,solarPV,R1,2025,4.07170000000
+6,2030,solarPV,R2,2025,4.07170000000
+6,2035,solarPV,R2,2025,4.07170000000
+6,2040,solarPV,R2,2025,4.07170000000
+6,2045,solarPV,R2,2025,4.07170000000
+6,2049,solarPV,R2,2025,4.07170000000
+6,2050,solarPV,R2,2025,4.07170000000
+6,2054,solarPV,R2,2025,4.07170000000
+7,2025,windturbine,R1,2020,10.00000000000
+7,2030,windturbine,R1,2020,10.00000000000
+7,2035,windturbine,R1,2020,10.00000000000
+7,2040,windturbine,R1,2020,10.00000000000
+7,2045,windturbine,R1,2020,10.00000000000
+7,2049,windturbine,R1,2020,10.00000000000
+8,2025,windturbine,R2,2020,15.60870000000
+8,2030,windturbine,R2,2020,15.60870000000
+8,2035,windturbine,R2,2020,15.60870000000
+8,2040,windturbine,R2,2020,15.60870000000
+8,2045,windturbine,R2,2020,15.60870000000
+8,2049,windturbine,R2,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
new file mode 100644
index 00000000..91268246
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9eb83457
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f78b605a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..797266c4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -0,0 +1,125 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,3.00000000000
+0,2049,gasCCGT,R1,2025,3.00000000000
+0,2050,gasCCGT,R1,2025,3.00000000000
+0,2054,gasCCGT,R1,2025,3.00000000000
+0,2055,gasCCGT,R1,2025,3.00000000000
+0,2059,gasCCGT,R1,2025,3.00000000000
+0,2060,gasCCGT,R1,2025,3.00000000000
+0,2064,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R2,2025,3.00000000000
+1,2049,gasCCGT,R2,2025,3.00000000000
+1,2050,gasCCGT,R2,2025,3.00000000000
+1,2054,gasCCGT,R2,2025,3.00000000000
+1,2055,gasCCGT,R2,2025,3.00000000000
+1,2059,gasCCGT,R2,2025,3.00000000000
+1,2060,gasCCGT,R2,2025,3.00000000000
+1,2064,gasCCGT,R2,2025,3.00000000000
+2,2045,solarPV,R1,2020,5.60870000000
+2,2049,solarPV,R1,2020,5.60870000000
+3,2045,solarPV,R1,2025,4.07170000000
+3,2049,solarPV,R1,2025,4.07170000000
+3,2050,solarPV,R1,2025,4.07170000000
+3,2054,solarPV,R1,2025,4.07170000000
+4,2045,solarPV,R1,2030,5.71470000000
+4,2049,solarPV,R1,2030,5.71470000000
+4,2050,solarPV,R1,2030,5.71470000000
+4,2054,solarPV,R1,2030,5.71470000000
+4,2055,solarPV,R1,2030,5.71470000000
+4,2059,solarPV,R1,2030,5.71470000000
+5,2045,solarPV,R1,2035,7.85760000000
+5,2049,solarPV,R1,2035,7.85760000000
+5,2050,solarPV,R1,2035,7.85760000000
+5,2054,solarPV,R1,2035,7.85760000000
+5,2055,solarPV,R1,2035,7.85760000000
+5,2059,solarPV,R1,2035,7.85760000000
+5,2060,solarPV,R1,2035,7.85760000000
+5,2064,solarPV,R1,2035,7.85760000000
+6,2045,solarPV,R1,2040,5.71470000000
+6,2049,solarPV,R1,2040,5.71470000000
+6,2050,solarPV,R1,2040,5.71470000000
+6,2054,solarPV,R1,2040,5.71470000000
+6,2055,solarPV,R1,2040,5.71470000000
+6,2059,solarPV,R1,2040,5.71470000000
+6,2060,solarPV,R1,2040,5.71470000000
+6,2064,solarPV,R1,2040,5.71470000000
+6,2065,solarPV,R1,2040,5.71470000000
+6,2069,solarPV,R1,2040,5.71470000000
+7,2050,solarPV,R1,2045,15.71470000000
+7,2054,solarPV,R1,2045,15.71470000000
+7,2055,solarPV,R1,2045,15.71470000000
+7,2059,solarPV,R1,2045,15.71470000000
+7,2060,solarPV,R1,2045,15.71470000000
+7,2064,solarPV,R1,2045,15.71470000000
+7,2065,solarPV,R1,2045,15.71470000000
+7,2069,solarPV,R1,2045,15.71470000000
+7,2070,solarPV,R1,2045,15.71470000000
+7,2074,solarPV,R1,2045,15.71470000000
+8,2045,solarPV,R2,2025,4.07170000000
+8,2049,solarPV,R2,2025,4.07170000000
+8,2050,solarPV,R2,2025,4.07170000000
+8,2054,solarPV,R2,2025,4.07170000000
+9,2045,solarPV,R2,2030,4.07170000000
+9,2049,solarPV,R2,2030,4.07170000000
+9,2050,solarPV,R2,2030,4.07170000000
+9,2054,solarPV,R2,2030,4.07170000000
+9,2055,solarPV,R2,2030,4.07170000000
+9,2059,solarPV,R2,2030,4.07170000000
+10,2045,solarPV,R2,2035,7.85760000000
+10,2049,solarPV,R2,2035,7.85760000000
+10,2050,solarPV,R2,2035,7.85760000000
+10,2054,solarPV,R2,2035,7.85760000000
+10,2055,solarPV,R2,2035,7.85760000000
+10,2059,solarPV,R2,2035,7.85760000000
+10,2060,solarPV,R2,2035,7.85760000000
+10,2064,solarPV,R2,2035,7.85760000000
+11,2045,solarPV,R2,2040,5.71470000000
+11,2049,solarPV,R2,2040,5.71470000000
+11,2050,solarPV,R2,2040,5.71470000000
+11,2054,solarPV,R2,2040,5.71470000000
+11,2055,solarPV,R2,2040,5.71470000000
+11,2059,solarPV,R2,2040,5.71470000000
+11,2060,solarPV,R2,2040,5.71470000000
+11,2064,solarPV,R2,2040,5.71470000000
+11,2065,solarPV,R2,2040,5.71470000000
+11,2069,solarPV,R2,2040,5.71470000000
+12,2050,solarPV,R2,2045,15.71470000000
+12,2054,solarPV,R2,2045,15.71470000000
+12,2055,solarPV,R2,2045,15.71470000000
+12,2059,solarPV,R2,2045,15.71470000000
+12,2060,solarPV,R2,2045,15.71470000000
+12,2064,solarPV,R2,2045,15.71470000000
+12,2065,solarPV,R2,2045,15.71470000000
+12,2069,solarPV,R2,2045,15.71470000000
+12,2070,solarPV,R2,2045,15.71470000000
+12,2074,solarPV,R2,2045,15.71470000000
+13,2045,windturbine,R1,2020,10.00000000000
+13,2049,windturbine,R1,2020,10.00000000000
+14,2050,windturbine,R1,2045,5.60870000000
+14,2054,windturbine,R1,2045,5.60870000000
+14,2055,windturbine,R1,2045,5.60870000000
+14,2059,windturbine,R1,2045,5.60870000000
+14,2060,windturbine,R1,2045,5.60870000000
+14,2064,windturbine,R1,2045,5.60870000000
+14,2065,windturbine,R1,2045,5.60870000000
+14,2069,windturbine,R1,2045,5.60870000000
+14,2070,windturbine,R1,2045,5.60870000000
+14,2074,windturbine,R1,2045,5.60870000000
+15,2045,windturbine,R2,2020,15.60870000000
+15,2049,windturbine,R2,2020,15.60870000000
+16,2045,windturbine,R2,2030,1.64290000000
+16,2049,windturbine,R2,2030,1.64290000000
+16,2050,windturbine,R2,2030,1.64290000000
+16,2054,windturbine,R2,2030,1.64290000000
+16,2055,windturbine,R2,2030,1.64290000000
+16,2059,windturbine,R2,2030,1.64290000000
+17,2050,windturbine,R2,2045,5.60870000000
+17,2054,windturbine,R2,2045,5.60870000000
+17,2055,windturbine,R2,2045,5.60870000000
+17,2059,windturbine,R2,2045,5.60870000000
+17,2060,windturbine,R2,2045,5.60870000000
+17,2064,windturbine,R2,2045,5.60870000000
+17,2065,windturbine,R2,2045,5.60870000000
+17,2069,windturbine,R2,2045,5.60870000000
+17,2070,windturbine,R2,2045,5.60870000000
+17,2074,windturbine,R2,2045,5.60870000000
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
new file mode 100644
index 00000000..db2da871
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bba2293b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,11 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2025,heatpump,R1,2020,17.85870000000
+2,2030,heatpump,R1,2020,17.85870000000
+2,2034,heatpump,R1,2020,17.85870000000
+3,2025,heatpump,R2,2020,17.85870000000
+3,2030,heatpump,R2,2020,17.85870000000
+3,2034,heatpump,R2,2020,17.85870000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..b5155356
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,2.14290000000
+1,2034,gasboiler,R1,2025,2.14290000000
+1,2035,gasboiler,R1,2025,2.14290000000
+1,2039,gasboiler,R1,2025,2.14290000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,2.14290000000
+3,2034,gasboiler,R2,2025,2.14290000000
+3,2035,gasboiler,R2,2025,2.14290000000
+3,2039,gasboiler,R2,2025,2.14290000000
+4,2025,heatpump,R1,2020,17.85870000000
+4,2030,heatpump,R1,2020,17.85870000000
+4,2034,heatpump,R1,2020,17.85870000000
+5,2030,heatpump,R1,2025,8.57170000000
+5,2034,heatpump,R1,2025,8.57170000000
+5,2035,heatpump,R1,2025,8.57170000000
+5,2039,heatpump,R1,2025,8.57170000000
+6,2025,heatpump,R2,2020,17.85870000000
+6,2030,heatpump,R2,2020,17.85870000000
+6,2034,heatpump,R2,2020,17.85870000000
+7,2030,heatpump,R2,2025,8.57170000000
+7,2034,heatpump,R2,2025,8.57170000000
+7,2035,heatpump,R2,2025,8.57170000000
+7,2039,heatpump,R2,2025,8.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..8a37b512
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,2.14290000000
+0,2034,gasboiler,R1,2025,2.14290000000
+0,2035,gasboiler,R1,2025,2.14290000000
+0,2039,gasboiler,R1,2025,2.14290000000
+1,2030,gasboiler,R2,2025,2.14290000000
+1,2034,gasboiler,R2,2025,2.14290000000
+1,2035,gasboiler,R2,2025,2.14290000000
+1,2039,gasboiler,R2,2025,2.14290000000
+2,2030,heatpump,R1,2020,17.85870000000
+2,2034,heatpump,R1,2020,17.85870000000
+3,2030,heatpump,R1,2025,8.57170000000
+3,2034,heatpump,R1,2025,8.57170000000
+3,2035,heatpump,R1,2025,8.57170000000
+3,2039,heatpump,R1,2025,8.57170000000
+4,2035,heatpump,R1,2030,23.57330000000
+4,2039,heatpump,R1,2030,23.57330000000
+4,2040,heatpump,R1,2030,23.57330000000
+4,2044,heatpump,R1,2030,23.57330000000
+5,2030,heatpump,R2,2020,17.85870000000
+5,2034,heatpump,R2,2020,17.85870000000
+6,2030,heatpump,R2,2025,8.57170000000
+6,2034,heatpump,R2,2025,8.57170000000
+6,2035,heatpump,R2,2025,8.57170000000
+6,2039,heatpump,R2,2025,8.57170000000
+7,2035,heatpump,R2,2030,23.57330000000
+7,2039,heatpump,R2,2030,23.57330000000
+7,2040,heatpump,R2,2030,23.57330000000
+7,2044,heatpump,R2,2030,23.57330000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..d34aa52e
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,2.14290000000
+0,2039,gasboiler,R1,2025,2.14290000000
+1,2035,gasboiler,R2,2025,2.14290000000
+1,2039,gasboiler,R2,2025,2.14290000000
+2,2035,heatpump,R1,2025,8.57170000000
+2,2039,heatpump,R1,2025,8.57170000000
+3,2035,heatpump,R1,2030,23.57330000000
+3,2039,heatpump,R1,2030,23.57330000000
+3,2040,heatpump,R1,2030,23.57330000000
+3,2044,heatpump,R1,2030,23.57330000000
+4,2040,heatpump,R1,2035,16.42930000000
+4,2044,heatpump,R1,2035,16.42930000000
+4,2045,heatpump,R1,2035,16.42930000000
+4,2049,heatpump,R1,2035,16.42930000000
+5,2035,heatpump,R2,2025,8.57170000000
+5,2039,heatpump,R2,2025,8.57170000000
+6,2035,heatpump,R2,2030,23.57330000000
+6,2039,heatpump,R2,2030,23.57330000000
+6,2040,heatpump,R2,2030,23.57330000000
+6,2044,heatpump,R2,2030,23.57330000000
+7,2040,heatpump,R2,2035,16.42930000000
+7,2044,heatpump,R2,2035,16.42930000000
+7,2045,heatpump,R2,2035,16.42930000000
+7,2049,heatpump,R2,2035,16.42930000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..ca3f6cfa
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,21 @@
+asset,year,technology,region,installed,capacity
+0,2040,heatpump,R1,2030,23.57330000000
+0,2044,heatpump,R1,2030,23.57330000000
+1,2040,heatpump,R1,2035,16.42930000000
+1,2044,heatpump,R1,2035,16.42930000000
+1,2045,heatpump,R1,2035,16.42930000000
+1,2049,heatpump,R1,2035,16.42930000000
+2,2045,heatpump,R1,2040,29.28800000000
+2,2049,heatpump,R1,2040,29.28800000000
+2,2050,heatpump,R1,2040,29.28800000000
+2,2054,heatpump,R1,2040,29.28800000000
+3,2040,heatpump,R2,2030,23.57330000000
+3,2044,heatpump,R2,2030,23.57330000000
+4,2040,heatpump,R2,2035,16.42930000000
+4,2044,heatpump,R2,2035,16.42930000000
+4,2045,heatpump,R2,2035,16.42930000000
+4,2049,heatpump,R2,2035,16.42930000000
+5,2045,heatpump,R2,2040,29.28800000000
+5,2049,heatpump,R2,2040,29.28800000000
+5,2050,heatpump,R2,2040,29.28800000000
+5,2054,heatpump,R2,2040,29.28800000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..7f9d122a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,21 @@
+asset,year,technology,region,installed,capacity
+0,2045,heatpump,R1,2035,16.42930000000
+0,2049,heatpump,R1,2035,16.42930000000
+1,2045,heatpump,R1,2040,29.28800000000
+1,2049,heatpump,R1,2040,29.28800000000
+1,2050,heatpump,R1,2040,29.28800000000
+1,2054,heatpump,R1,2040,29.28800000000
+2,2050,heatpump,R1,2045,22.14400000000
+2,2054,heatpump,R1,2045,22.14400000000
+2,2055,heatpump,R1,2045,22.14400000000
+2,2059,heatpump,R1,2045,22.14400000000
+3,2045,heatpump,R2,2035,16.42930000000
+3,2049,heatpump,R2,2035,16.42930000000
+4,2045,heatpump,R2,2040,29.28800000000
+4,2049,heatpump,R2,2040,29.28800000000
+4,2050,heatpump,R2,2040,29.28800000000
+4,2054,heatpump,R2,2040,29.28800000000
+5,2050,heatpump,R2,2045,22.14400000000
+5,2054,heatpump,R2,2045,22.14400000000
+5,2055,heatpump,R2,2045,22.14400000000
+5,2059,heatpump,R2,2045,22.14400000000
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
new file mode 100644
index 00000000..02533b47
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..2cf8d713
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e03b6acf
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..ed5f57f1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f705f5ab
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e83a6d96
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..79c2096b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..bff478f6
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
new file mode 100644
index 00000000..377c773d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -0,0 +1,7 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
new file mode 100644
index 00000000..e7e6ef07
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -0,0 +1,65 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
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
new file mode 100644
index 00000000..78889a42
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
@@ -0,0 +1,21 @@
+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,windturbine,33.82470000000
+1,2025,R1,2020,windturbine,33.82470000000
+1,2030,R1,2020,windturbine,33.82470000000
+1,2035,R1,2020,windturbine,33.82470000000
+1,2040,R1,2020,windturbine,33.82470000000
+1,2045,R1,2020,windturbine,33.82470000000
+1,2046,R1,2020,windturbine,33.82470000000
+2,2020,R2,2020,gasCCGT,1.00000000000
+2,2022,R2,2020,gasCCGT,1.00000000000
+2,2025,R2,2020,gasCCGT,1.00000000000
+3,2022,R2,2020,windturbine,33.82470000000
+3,2025,R2,2020,windturbine,33.82470000000
+3,2030,R2,2020,windturbine,33.82470000000
+3,2035,R2,2020,windturbine,33.82470000000
+3,2040,R2,2020,windturbine,33.82470000000
+3,2045,R2,2020,windturbine,33.82470000000
+3,2046,R2,2020,windturbine,33.82470000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..8e165158
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,15 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2022,gasboiler,R1,2020,5.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2022,gasboiler,R2,2020,5.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2022,heatpump,R1,2020,14.42990000000
+2,2025,heatpump,R1,2020,14.42990000000
+2,2030,heatpump,R1,2020,14.42990000000
+2,2031,heatpump,R1,2020,14.42990000000
+3,2022,heatpump,R2,2020,14.42990000000
+3,2025,heatpump,R2,2020,14.42990000000
+3,2030,heatpump,R2,2020,14.42990000000
+3,2031,heatpump,R2,2020,14.42990000000
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
new file mode 100644
index 00000000..7a199736
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..192f9bf9
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9836bff0
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9dd42497
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..48ffe4c5
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..ff57f6c8
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..865dc571
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..50f6271d
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv
new file mode 100644
index 00000000..0b335432
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv
@@ -0,0 +1,155 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gas_stove,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gas_stove,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+estove,R1,R1,A1,residential,retrofit,2025,17.85870000000
+gas_stove,R1,R1,A1,residential,retrofit,2025,5.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
+estove,R2,R2,A1,residential,retrofit,2025,17.85870000000
+gas_stove,R2,R2,A1,residential,retrofit,2025,5.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,13.46730000000
+windturbine,R1,R1,A1,power,retrofit,2025,20.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+solarPV,R2,R2,A1,power,retrofit,2025,13.46730000000
+windturbine,R2,R2,A1,power,retrofit,2025,20.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+estove,R1,R1,A1,residential,retrofit,2030,17.85870000000
+estove,R1,R1,A1,residential,retrofit,2030,8.57170000000
+gas_stove,R1,R1,A1,residential,retrofit,2030,2.14290000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
+heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
+estove,R2,R2,A1,residential,retrofit,2030,17.85870000000
+estove,R2,R2,A1,residential,retrofit,2030,8.57170000000
+gas_stove,R2,R2,A1,residential,retrofit,2030,2.14290000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
+heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.39350000000
+windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,4.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,13.46730000000
+solarPV,R2,R2,A1,power,retrofit,2030,10.39350000000
+windturbine,R2,R2,A1,power,retrofit,2030,20.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,4.70400000000
+estove,R1,R1,A1,residential,retrofit,2035,8.57170000000
+estove,R1,R1,A1,residential,retrofit,2035,23.57330000000
+gas_stove,R1,R1,A1,residential,retrofit,2035,2.14290000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
+heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
+estove,R2,R2,A1,residential,retrofit,2035,8.57170000000
+estove,R2,R2,A1,residential,retrofit,2035,23.57330000000
+gas_stove,R2,R2,A1,residential,retrofit,2035,2.14290000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
+heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.39350000000
+solarPV,R1,R1,A1,power,retrofit,2035,11.42930000000
+windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,4.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,13.46730000000
+solarPV,R2,R2,A1,power,retrofit,2035,10.39350000000
+solarPV,R2,R2,A1,power,retrofit,2035,11.42930000000
+windturbine,R2,R2,A1,power,retrofit,2035,20.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+estove,R1,R1,A1,residential,retrofit,2040,23.57330000000
+estove,R1,R1,A1,residential,retrofit,2040,16.42930000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
+estove,R2,R2,A1,residential,retrofit,2040,23.57330000000
+estove,R2,R2,A1,residential,retrofit,2040,16.42930000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2040,10.39350000000
+solarPV,R1,R1,A1,power,retrofit,2040,11.42930000000
+solarPV,R1,R1,A1,power,retrofit,2040,15.71520000000
+windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,4.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,13.46730000000
+solarPV,R2,R2,A1,power,retrofit,2040,10.39350000000
+solarPV,R2,R2,A1,power,retrofit,2040,11.42930000000
+solarPV,R2,R2,A1,power,retrofit,2040,15.71520000000
+windturbine,R2,R2,A1,power,retrofit,2040,20.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+estove,R1,R1,A1,residential,retrofit,2045,16.42930000000
+estove,R1,R1,A1,residential,retrofit,2045,29.28800000000
+heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
+heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
+estove,R2,R2,A1,residential,retrofit,2045,16.42930000000
+estove,R2,R2,A1,residential,retrofit,2045,29.28800000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
+heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2045,10.39350000000
+solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
+solarPV,R1,R1,A1,power,retrofit,2045,15.71520000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.99470000000
+windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,2.43470000000
+gasCCGT,R2,R2,A1,power,retrofit,2045,4.00000000000
+solarPV,R2,R2,A1,power,retrofit,2045,13.46730000000
+solarPV,R2,R2,A1,power,retrofit,2045,10.39350000000
+solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
+solarPV,R2,R2,A1,power,retrofit,2045,15.71520000000
+solarPV,R2,R2,A1,power,retrofit,2045,8.99470000000
+windturbine,R2,R2,A1,power,retrofit,2045,20.00000000000
+windturbine,R2,R2,A1,power,retrofit,2045,2.43470000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+estove,R1,R1,A1,residential,retrofit,2050,29.28800000000
+estove,R1,R1,A1,residential,retrofit,2050,22.14400000000
+heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
+heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
+estove,R2,R2,A1,residential,retrofit,2050,29.28800000000
+estove,R2,R2,A1,residential,retrofit,2050,22.14400000000
+heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
+heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,10.39350000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.71520000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.99470000000
+solarPV,R1,R1,A1,power,retrofit,2050,24.89670000000
+windturbine,R1,R1,A1,power,retrofit,2050,2.43470000000
+windturbine,R1,R1,A1,power,retrofit,2050,20.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2050,4.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,10.39350000000
+solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.71520000000
+solarPV,R2,R2,A1,power,retrofit,2050,8.99470000000
+solarPV,R2,R2,A1,power,retrofit,2050,24.89670000000
+windturbine,R2,R2,A1,power,retrofit,2050,2.43470000000
+windturbine,R2,R2,A1,power,retrofit,2050,20.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv
new file mode 100644
index 00000000..35c903fd
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv
@@ -0,0 +1,561 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.19900000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.19900000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.74290000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,0.74290000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.29850000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.29850000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,1.11440000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,1.11440000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.19900000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.19900000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.74290000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.74290000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.29850000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.29850000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,1.11440000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,1.11440000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.59720000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.59720000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,2.22990000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,2.22990000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.39830000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.39830000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,1.48690000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,1.48690000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.39830000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.39830000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,1.48690000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,1.48690000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.39830000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.39830000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.48690000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.48690000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.25660000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.25660000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07210000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.07210000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.06030000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,0.06030000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.38520000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.38520000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.11230000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.11230000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.09460000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,0.09460000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.25660000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.25660000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07210000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07210000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.06030000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.06030000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.38520000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.38520000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11230000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11230000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.09460000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.09460000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.77320000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.77320000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.24910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.24910000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.21360000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.21360000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.51450000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.51450000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.15520000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.15520000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,0.13160000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,0.13160000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.51450000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.51450000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.15520000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.15520000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.13160000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.13160000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.51450000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.51450000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15520000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15520000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.13160000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.13160000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.27930000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.27930000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08150000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08150000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.06780000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,0.06780000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.41930000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.41930000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.12750000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.12750000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.10700000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,0.10700000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27930000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27930000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08150000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08150000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.06780000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.06780000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41930000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41930000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12750000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.12750000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.10700000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.10700000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.84080000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.84080000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28680000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.28680000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.24590000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.24590000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.55980000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.55980000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.17710000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.17710000000,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', 'evening')",cook,R1,0.14980000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,0.14980000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.55980000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.55980000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.17710000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.17710000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.14980000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.14980000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.55980000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.55980000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17710000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17710000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.14980000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.14980000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.28270000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.28270000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02090000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.02090000000,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', 'night')",cook,R1,0.02090000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.02090000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.42440000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.42440000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.03730000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.03730000000,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', 'morning')",cook,R1,0.03730000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.03730000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.28270000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.28270000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02090000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02090000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02090000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02090000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.42440000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.42440000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03730000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03730000000,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', 'early-peak')",cook,R1,0.03730000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03730000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.85060000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.85060000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.11070000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.11070000000,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', 'late-peak')",cook,R1,0.11070000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.11070000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.56660000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.56660000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05780000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.05780000000,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', 'evening')",cook,R1,0.05780000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.05780000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.56660000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.56660000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.05780000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.05780000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.05780000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.05780000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.56660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.56660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05780000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05780000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05780000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05780000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.30930000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.30930000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02100000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.02100000000,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', 'night')",cook,R1,0.02100000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.02100000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.46420000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.46420000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.03750000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.03750000000,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', 'morning')",cook,R1,0.03750000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.03750000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30930000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30930000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02100000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02100000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02100000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02100000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.46420000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.46420000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03750000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03750000000,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', 'early-peak')",cook,R1,0.03750000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03750000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.93020000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.93020000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.11160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.11160000000,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', 'late-peak')",cook,R1,0.11160000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.11160000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.61970000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.61970000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.05820000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.05820000000,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', 'evening')",cook,R1,0.05820000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.05820000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.61970000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.61970000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.05820000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.05820000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.05820000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.05820000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.61970000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.61970000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05820000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05820000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05820000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05820000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.32640000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.32640000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02170000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.02170000000,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', 'night')",cook,R1,0.02170000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.02170000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.48990000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.48990000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.03920000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.03920000000,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', 'morning')",cook,R1,0.03920000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.03920000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32640000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32640000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02170000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02170000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02170000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02170000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48990000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48990000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03920000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03920000000,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', 'early-peak')",cook,R1,0.03920000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03920000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.98130000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.98130000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.11840000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.11840000000,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', 'late-peak')",cook,R1,0.11840000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.11840000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.65390000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.65390000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.06120000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.06120000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.06120000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.06120000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.65390000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.65390000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.06120000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.06120000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.06120000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.06120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.65390000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.65390000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.06120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.06120000000,2050
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
new file mode 100644
index 00000000..c4dfc406
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..9f272ab7
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv
@@ -0,0 +1,59 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,4.00000000000
+1,2035,gasCCGT,R1,2025,4.00000000000
+1,2040,gasCCGT,R1,2025,4.00000000000
+1,2045,gasCCGT,R1,2025,4.00000000000
+1,2049,gasCCGT,R1,2025,4.00000000000
+1,2050,gasCCGT,R1,2025,4.00000000000
+1,2054,gasCCGT,R1,2025,4.00000000000
+1,2055,gasCCGT,R1,2025,4.00000000000
+1,2064,gasCCGT,R1,2025,4.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,4.00000000000
+3,2035,gasCCGT,R2,2025,4.00000000000
+3,2040,gasCCGT,R2,2025,4.00000000000
+3,2045,gasCCGT,R2,2025,4.00000000000
+3,2049,gasCCGT,R2,2025,4.00000000000
+3,2050,gasCCGT,R2,2025,4.00000000000
+3,2054,gasCCGT,R2,2025,4.00000000000
+3,2055,gasCCGT,R2,2025,4.00000000000
+3,2064,gasCCGT,R2,2025,4.00000000000
+4,2025,solarPV,R1,2020,13.46730000000
+4,2030,solarPV,R1,2020,13.46730000000
+4,2035,solarPV,R1,2020,13.46730000000
+4,2040,solarPV,R1,2020,13.46730000000
+4,2045,solarPV,R1,2020,13.46730000000
+4,2049,solarPV,R1,2020,13.46730000000
+5,2030,solarPV,R1,2025,10.39350000000
+5,2035,solarPV,R1,2025,10.39350000000
+5,2040,solarPV,R1,2025,10.39350000000
+5,2045,solarPV,R1,2025,10.39350000000
+5,2049,solarPV,R1,2025,10.39350000000
+5,2050,solarPV,R1,2025,10.39350000000
+5,2054,solarPV,R1,2025,10.39350000000
+6,2025,solarPV,R2,2020,13.46730000000
+6,2030,solarPV,R2,2020,13.46730000000
+6,2035,solarPV,R2,2020,13.46730000000
+6,2040,solarPV,R2,2020,13.46730000000
+6,2045,solarPV,R2,2020,13.46730000000
+6,2049,solarPV,R2,2020,13.46730000000
+7,2030,solarPV,R2,2025,10.39350000000
+7,2035,solarPV,R2,2025,10.39350000000
+7,2040,solarPV,R2,2025,10.39350000000
+7,2045,solarPV,R2,2025,10.39350000000
+7,2049,solarPV,R2,2025,10.39350000000
+7,2050,solarPV,R2,2025,10.39350000000
+7,2054,solarPV,R2,2025,10.39350000000
+8,2025,windturbine,R1,2020,20.00000000000
+8,2030,windturbine,R1,2020,20.00000000000
+8,2035,windturbine,R1,2020,20.00000000000
+8,2040,windturbine,R1,2020,20.00000000000
+8,2045,windturbine,R1,2020,20.00000000000
+8,2049,windturbine,R1,2020,20.00000000000
+9,2025,windturbine,R2,2020,20.00000000000
+9,2030,windturbine,R2,2020,20.00000000000
+9,2035,windturbine,R2,2020,20.00000000000
+9,2040,windturbine,R2,2020,20.00000000000
+9,2045,windturbine,R2,2020,20.00000000000
+9,2049,windturbine,R2,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
new file mode 100644
index 00000000..5920f22e
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..73f39dde
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..5aecf3d9
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..5cb9a711
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv
@@ -0,0 +1,141 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,4.00000000000
+0,2049,gasCCGT,R1,2025,4.00000000000
+0,2050,gasCCGT,R1,2025,4.00000000000
+0,2054,gasCCGT,R1,2025,4.00000000000
+0,2055,gasCCGT,R1,2025,4.00000000000
+0,2059,gasCCGT,R1,2025,4.00000000000
+0,2060,gasCCGT,R1,2025,4.00000000000
+0,2064,gasCCGT,R1,2025,4.00000000000
+1,2045,gasCCGT,R2,2025,4.00000000000
+1,2049,gasCCGT,R2,2025,4.00000000000
+1,2050,gasCCGT,R2,2025,4.00000000000
+1,2054,gasCCGT,R2,2025,4.00000000000
+1,2055,gasCCGT,R2,2025,4.00000000000
+1,2059,gasCCGT,R2,2025,4.00000000000
+1,2060,gasCCGT,R2,2025,4.00000000000
+1,2064,gasCCGT,R2,2025,4.00000000000
+2,2045,solarPV,R1,2020,13.46730000000
+2,2049,solarPV,R1,2020,13.46730000000
+3,2045,solarPV,R1,2025,10.39350000000
+3,2049,solarPV,R1,2025,10.39350000000
+3,2050,solarPV,R1,2025,10.39350000000
+3,2054,solarPV,R1,2025,10.39350000000
+4,2045,solarPV,R1,2030,11.42930000000
+4,2049,solarPV,R1,2030,11.42930000000
+4,2050,solarPV,R1,2030,11.42930000000
+4,2054,solarPV,R1,2030,11.42930000000
+4,2055,solarPV,R1,2030,11.42930000000
+4,2059,solarPV,R1,2030,11.42930000000
+5,2045,solarPV,R1,2035,15.71520000000
+5,2049,solarPV,R1,2035,15.71520000000
+5,2050,solarPV,R1,2035,15.71520000000
+5,2054,solarPV,R1,2035,15.71520000000
+5,2055,solarPV,R1,2035,15.71520000000
+5,2059,solarPV,R1,2035,15.71520000000
+5,2060,solarPV,R1,2035,15.71520000000
+5,2064,solarPV,R1,2035,15.71520000000
+6,2045,solarPV,R1,2040,8.99470000000
+6,2049,solarPV,R1,2040,8.99470000000
+6,2050,solarPV,R1,2040,8.99470000000
+6,2054,solarPV,R1,2040,8.99470000000
+6,2055,solarPV,R1,2040,8.99470000000
+6,2059,solarPV,R1,2040,8.99470000000
+6,2060,solarPV,R1,2040,8.99470000000
+6,2064,solarPV,R1,2040,8.99470000000
+6,2065,solarPV,R1,2040,8.99470000000
+6,2069,solarPV,R1,2040,8.99470000000
+7,2050,solarPV,R1,2045,24.89670000000
+7,2054,solarPV,R1,2045,24.89670000000
+7,2055,solarPV,R1,2045,24.89670000000
+7,2059,solarPV,R1,2045,24.89670000000
+7,2060,solarPV,R1,2045,24.89670000000
+7,2064,solarPV,R1,2045,24.89670000000
+7,2065,solarPV,R1,2045,24.89670000000
+7,2069,solarPV,R1,2045,24.89670000000
+7,2070,solarPV,R1,2045,24.89670000000
+7,2074,solarPV,R1,2045,24.89670000000
+8,2045,solarPV,R2,2020,13.46730000000
+8,2049,solarPV,R2,2020,13.46730000000
+9,2045,solarPV,R2,2025,10.39350000000
+9,2049,solarPV,R2,2025,10.39350000000
+9,2050,solarPV,R2,2025,10.39350000000
+9,2054,solarPV,R2,2025,10.39350000000
+10,2045,solarPV,R2,2030,11.42930000000
+10,2049,solarPV,R2,2030,11.42930000000
+10,2050,solarPV,R2,2030,11.42930000000
+10,2054,solarPV,R2,2030,11.42930000000
+10,2055,solarPV,R2,2030,11.42930000000
+10,2059,solarPV,R2,2030,11.42930000000
+11,2045,solarPV,R2,2035,15.71520000000
+11,2049,solarPV,R2,2035,15.71520000000
+11,2050,solarPV,R2,2035,15.71520000000
+11,2054,solarPV,R2,2035,15.71520000000
+11,2055,solarPV,R2,2035,15.71520000000
+11,2059,solarPV,R2,2035,15.71520000000
+11,2060,solarPV,R2,2035,15.71520000000
+11,2064,solarPV,R2,2035,15.71520000000
+12,2045,solarPV,R2,2040,8.99470000000
+12,2049,solarPV,R2,2040,8.99470000000
+12,2050,solarPV,R2,2040,8.99470000000
+12,2054,solarPV,R2,2040,8.99470000000
+12,2055,solarPV,R2,2040,8.99470000000
+12,2059,solarPV,R2,2040,8.99470000000
+12,2060,solarPV,R2,2040,8.99470000000
+12,2064,solarPV,R2,2040,8.99470000000
+12,2065,solarPV,R2,2040,8.99470000000
+12,2069,solarPV,R2,2040,8.99470000000
+13,2050,solarPV,R2,2045,24.89670000000
+13,2054,solarPV,R2,2045,24.89670000000
+13,2055,solarPV,R2,2045,24.89670000000
+13,2059,solarPV,R2,2045,24.89670000000
+13,2060,solarPV,R2,2045,24.89670000000
+13,2064,solarPV,R2,2045,24.89670000000
+13,2065,solarPV,R2,2045,24.89670000000
+13,2069,solarPV,R2,2045,24.89670000000
+13,2070,solarPV,R2,2045,24.89670000000
+13,2074,solarPV,R2,2045,24.89670000000
+14,2045,windturbine,R1,2020,20.00000000000
+14,2049,windturbine,R1,2020,20.00000000000
+15,2045,windturbine,R1,2040,2.43470000000
+15,2049,windturbine,R1,2040,2.43470000000
+15,2050,windturbine,R1,2040,2.43470000000
+15,2054,windturbine,R1,2040,2.43470000000
+15,2055,windturbine,R1,2040,2.43470000000
+15,2059,windturbine,R1,2040,2.43470000000
+15,2060,windturbine,R1,2040,2.43470000000
+15,2064,windturbine,R1,2040,2.43470000000
+15,2065,windturbine,R1,2040,2.43470000000
+15,2069,windturbine,R1,2040,2.43470000000
+16,2050,windturbine,R1,2045,20.00000000000
+16,2054,windturbine,R1,2045,20.00000000000
+16,2055,windturbine,R1,2045,20.00000000000
+16,2059,windturbine,R1,2045,20.00000000000
+16,2060,windturbine,R1,2045,20.00000000000
+16,2064,windturbine,R1,2045,20.00000000000
+16,2065,windturbine,R1,2045,20.00000000000
+16,2069,windturbine,R1,2045,20.00000000000
+16,2070,windturbine,R1,2045,20.00000000000
+16,2074,windturbine,R1,2045,20.00000000000
+17,2045,windturbine,R2,2020,20.00000000000
+17,2049,windturbine,R2,2020,20.00000000000
+18,2045,windturbine,R2,2040,2.43470000000
+18,2049,windturbine,R2,2040,2.43470000000
+18,2050,windturbine,R2,2040,2.43470000000
+18,2054,windturbine,R2,2040,2.43470000000
+18,2055,windturbine,R2,2040,2.43470000000
+18,2059,windturbine,R2,2040,2.43470000000
+18,2060,windturbine,R2,2040,2.43470000000
+18,2064,windturbine,R2,2040,2.43470000000
+18,2065,windturbine,R2,2040,2.43470000000
+18,2069,windturbine,R2,2040,2.43470000000
+19,2050,windturbine,R2,2045,20.00000000000
+19,2054,windturbine,R2,2045,20.00000000000
+19,2055,windturbine,R2,2045,20.00000000000
+19,2059,windturbine,R2,2045,20.00000000000
+19,2060,windturbine,R2,2045,20.00000000000
+19,2064,windturbine,R2,2045,20.00000000000
+19,2065,windturbine,R2,2045,20.00000000000
+19,2069,windturbine,R2,2045,20.00000000000
+19,2070,windturbine,R2,2045,20.00000000000
+19,2074,windturbine,R2,2045,20.00000000000
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
new file mode 100644
index 00000000..6092e062
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..4d909d23
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,21 @@
+asset,year,technology,region,installed,capacity
+0,2025,estove,R1,2020,17.85870000000
+0,2030,estove,R1,2020,17.85870000000
+0,2034,estove,R1,2020,17.85870000000
+1,2025,estove,R2,2020,17.85870000000
+1,2030,estove,R2,2020,17.85870000000
+1,2034,estove,R2,2020,17.85870000000
+2,2020,gas_stove,R1,2020,10.00000000000
+2,2025,gas_stove,R1,2020,5.00000000000
+3,2020,gas_stove,R2,2020,10.00000000000
+3,2025,gas_stove,R2,2020,5.00000000000
+4,2020,gasboiler,R1,2020,10.00000000000
+4,2025,gasboiler,R1,2020,5.00000000000
+5,2020,gasboiler,R2,2020,10.00000000000
+5,2025,gasboiler,R2,2020,5.00000000000
+6,2025,heatpump,R1,2020,17.85870000000
+6,2030,heatpump,R1,2020,17.85870000000
+6,2034,heatpump,R1,2020,17.85870000000
+7,2025,heatpump,R2,2020,17.85870000000
+7,2030,heatpump,R2,2020,17.85870000000
+7,2034,heatpump,R2,2020,17.85870000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..a0d0e820
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,49 @@
+asset,year,technology,region,installed,capacity
+0,2025,estove,R1,2020,17.85870000000
+0,2030,estove,R1,2020,17.85870000000
+0,2034,estove,R1,2020,17.85870000000
+1,2030,estove,R1,2025,8.57170000000
+1,2034,estove,R1,2025,8.57170000000
+1,2035,estove,R1,2025,8.57170000000
+1,2039,estove,R1,2025,8.57170000000
+2,2025,estove,R2,2020,17.85870000000
+2,2030,estove,R2,2020,17.85870000000
+2,2034,estove,R2,2020,17.85870000000
+3,2030,estove,R2,2025,8.57170000000
+3,2034,estove,R2,2025,8.57170000000
+3,2035,estove,R2,2025,8.57170000000
+3,2039,estove,R2,2025,8.57170000000
+4,2025,gas_stove,R1,2020,5.00000000000
+5,2030,gas_stove,R1,2025,2.14290000000
+5,2034,gas_stove,R1,2025,2.14290000000
+5,2035,gas_stove,R1,2025,2.14290000000
+5,2039,gas_stove,R1,2025,2.14290000000
+6,2025,gas_stove,R2,2020,5.00000000000
+7,2030,gas_stove,R2,2025,2.14290000000
+7,2034,gas_stove,R2,2025,2.14290000000
+7,2035,gas_stove,R2,2025,2.14290000000
+7,2039,gas_stove,R2,2025,2.14290000000
+8,2025,gasboiler,R1,2020,5.00000000000
+9,2030,gasboiler,R1,2025,2.14290000000
+9,2034,gasboiler,R1,2025,2.14290000000
+9,2035,gasboiler,R1,2025,2.14290000000
+9,2039,gasboiler,R1,2025,2.14290000000
+10,2025,gasboiler,R2,2020,5.00000000000
+11,2030,gasboiler,R2,2025,2.14290000000
+11,2034,gasboiler,R2,2025,2.14290000000
+11,2035,gasboiler,R2,2025,2.14290000000
+11,2039,gasboiler,R2,2025,2.14290000000
+12,2025,heatpump,R1,2020,17.85870000000
+12,2030,heatpump,R1,2020,17.85870000000
+12,2034,heatpump,R1,2020,17.85870000000
+13,2030,heatpump,R1,2025,8.57170000000
+13,2034,heatpump,R1,2025,8.57170000000
+13,2035,heatpump,R1,2025,8.57170000000
+13,2039,heatpump,R1,2025,8.57170000000
+14,2025,heatpump,R2,2020,17.85870000000
+14,2030,heatpump,R2,2020,17.85870000000
+14,2034,heatpump,R2,2020,17.85870000000
+15,2030,heatpump,R2,2025,8.57170000000
+15,2034,heatpump,R2,2025,8.57170000000
+15,2035,heatpump,R2,2025,8.57170000000
+15,2039,heatpump,R2,2025,8.57170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..396b9551
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,57 @@
+asset,year,technology,region,installed,capacity
+0,2030,estove,R1,2020,17.85870000000
+0,2034,estove,R1,2020,17.85870000000
+1,2030,estove,R1,2025,8.57170000000
+1,2034,estove,R1,2025,8.57170000000
+1,2035,estove,R1,2025,8.57170000000
+1,2039,estove,R1,2025,8.57170000000
+2,2035,estove,R1,2030,23.57330000000
+2,2039,estove,R1,2030,23.57330000000
+2,2040,estove,R1,2030,23.57330000000
+2,2044,estove,R1,2030,23.57330000000
+3,2030,estove,R2,2020,17.85870000000
+3,2034,estove,R2,2020,17.85870000000
+4,2030,estove,R2,2025,8.57170000000
+4,2034,estove,R2,2025,8.57170000000
+4,2035,estove,R2,2025,8.57170000000
+4,2039,estove,R2,2025,8.57170000000
+5,2035,estove,R2,2030,23.57330000000
+5,2039,estove,R2,2030,23.57330000000
+5,2040,estove,R2,2030,23.57330000000
+5,2044,estove,R2,2030,23.57330000000
+6,2030,gas_stove,R1,2025,2.14290000000
+6,2034,gas_stove,R1,2025,2.14290000000
+6,2035,gas_stove,R1,2025,2.14290000000
+6,2039,gas_stove,R1,2025,2.14290000000
+7,2030,gas_stove,R2,2025,2.14290000000
+7,2034,gas_stove,R2,2025,2.14290000000
+7,2035,gas_stove,R2,2025,2.14290000000
+7,2039,gas_stove,R2,2025,2.14290000000
+8,2030,gasboiler,R1,2025,2.14290000000
+8,2034,gasboiler,R1,2025,2.14290000000
+8,2035,gasboiler,R1,2025,2.14290000000
+8,2039,gasboiler,R1,2025,2.14290000000
+9,2030,gasboiler,R2,2025,2.14290000000
+9,2034,gasboiler,R2,2025,2.14290000000
+9,2035,gasboiler,R2,2025,2.14290000000
+9,2039,gasboiler,R2,2025,2.14290000000
+10,2030,heatpump,R1,2020,17.85870000000
+10,2034,heatpump,R1,2020,17.85870000000
+11,2030,heatpump,R1,2025,8.57170000000
+11,2034,heatpump,R1,2025,8.57170000000
+11,2035,heatpump,R1,2025,8.57170000000
+11,2039,heatpump,R1,2025,8.57170000000
+12,2035,heatpump,R1,2030,23.57330000000
+12,2039,heatpump,R1,2030,23.57330000000
+12,2040,heatpump,R1,2030,23.57330000000
+12,2044,heatpump,R1,2030,23.57330000000
+13,2030,heatpump,R2,2020,17.85870000000
+13,2034,heatpump,R2,2020,17.85870000000
+14,2030,heatpump,R2,2025,8.57170000000
+14,2034,heatpump,R2,2025,8.57170000000
+14,2035,heatpump,R2,2025,8.57170000000
+14,2039,heatpump,R2,2025,8.57170000000
+15,2035,heatpump,R2,2030,23.57330000000
+15,2039,heatpump,R2,2030,23.57330000000
+15,2040,heatpump,R2,2030,23.57330000000
+15,2044,heatpump,R2,2030,23.57330000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..14db553f
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,49 @@
+asset,year,technology,region,installed,capacity
+0,2035,estove,R1,2025,8.57170000000
+0,2039,estove,R1,2025,8.57170000000
+1,2035,estove,R1,2030,23.57330000000
+1,2039,estove,R1,2030,23.57330000000
+1,2040,estove,R1,2030,23.57330000000
+1,2044,estove,R1,2030,23.57330000000
+2,2040,estove,R1,2035,16.42930000000
+2,2044,estove,R1,2035,16.42930000000
+2,2045,estove,R1,2035,16.42930000000
+2,2049,estove,R1,2035,16.42930000000
+3,2035,estove,R2,2025,8.57170000000
+3,2039,estove,R2,2025,8.57170000000
+4,2035,estove,R2,2030,23.57330000000
+4,2039,estove,R2,2030,23.57330000000
+4,2040,estove,R2,2030,23.57330000000
+4,2044,estove,R2,2030,23.57330000000
+5,2040,estove,R2,2035,16.42930000000
+5,2044,estove,R2,2035,16.42930000000
+5,2045,estove,R2,2035,16.42930000000
+5,2049,estove,R2,2035,16.42930000000
+6,2035,gas_stove,R1,2025,2.14290000000
+6,2039,gas_stove,R1,2025,2.14290000000
+7,2035,gas_stove,R2,2025,2.14290000000
+7,2039,gas_stove,R2,2025,2.14290000000
+8,2035,gasboiler,R1,2025,2.14290000000
+8,2039,gasboiler,R1,2025,2.14290000000
+9,2035,gasboiler,R2,2025,2.14290000000
+9,2039,gasboiler,R2,2025,2.14290000000
+10,2035,heatpump,R1,2025,8.57170000000
+10,2039,heatpump,R1,2025,8.57170000000
+11,2035,heatpump,R1,2030,23.57330000000
+11,2039,heatpump,R1,2030,23.57330000000
+11,2040,heatpump,R1,2030,23.57330000000
+11,2044,heatpump,R1,2030,23.57330000000
+12,2040,heatpump,R1,2035,16.42930000000
+12,2044,heatpump,R1,2035,16.42930000000
+12,2045,heatpump,R1,2035,16.42930000000
+12,2049,heatpump,R1,2035,16.42930000000
+13,2035,heatpump,R2,2025,8.57170000000
+13,2039,heatpump,R2,2025,8.57170000000
+14,2035,heatpump,R2,2030,23.57330000000
+14,2039,heatpump,R2,2030,23.57330000000
+14,2040,heatpump,R2,2030,23.57330000000
+14,2044,heatpump,R2,2030,23.57330000000
+15,2040,heatpump,R2,2035,16.42930000000
+15,2044,heatpump,R2,2035,16.42930000000
+15,2045,heatpump,R2,2035,16.42930000000
+15,2049,heatpump,R2,2035,16.42930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..b0a238a8
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,41 @@
+asset,year,technology,region,installed,capacity
+0,2040,estove,R1,2030,23.57330000000
+0,2044,estove,R1,2030,23.57330000000
+1,2040,estove,R1,2035,16.42930000000
+1,2044,estove,R1,2035,16.42930000000
+1,2045,estove,R1,2035,16.42930000000
+1,2049,estove,R1,2035,16.42930000000
+2,2045,estove,R1,2040,29.28800000000
+2,2049,estove,R1,2040,29.28800000000
+2,2050,estove,R1,2040,29.28800000000
+2,2054,estove,R1,2040,29.28800000000
+3,2040,estove,R2,2030,23.57330000000
+3,2044,estove,R2,2030,23.57330000000
+4,2040,estove,R2,2035,16.42930000000
+4,2044,estove,R2,2035,16.42930000000
+4,2045,estove,R2,2035,16.42930000000
+4,2049,estove,R2,2035,16.42930000000
+5,2045,estove,R2,2040,29.28800000000
+5,2049,estove,R2,2040,29.28800000000
+5,2050,estove,R2,2040,29.28800000000
+5,2054,estove,R2,2040,29.28800000000
+6,2040,heatpump,R1,2030,23.57330000000
+6,2044,heatpump,R1,2030,23.57330000000
+7,2040,heatpump,R1,2035,16.42930000000
+7,2044,heatpump,R1,2035,16.42930000000
+7,2045,heatpump,R1,2035,16.42930000000
+7,2049,heatpump,R1,2035,16.42930000000
+8,2045,heatpump,R1,2040,29.28800000000
+8,2049,heatpump,R1,2040,29.28800000000
+8,2050,heatpump,R1,2040,29.28800000000
+8,2054,heatpump,R1,2040,29.28800000000
+9,2040,heatpump,R2,2030,23.57330000000
+9,2044,heatpump,R2,2030,23.57330000000
+10,2040,heatpump,R2,2035,16.42930000000
+10,2044,heatpump,R2,2035,16.42930000000
+10,2045,heatpump,R2,2035,16.42930000000
+10,2049,heatpump,R2,2035,16.42930000000
+11,2045,heatpump,R2,2040,29.28800000000
+11,2049,heatpump,R2,2040,29.28800000000
+11,2050,heatpump,R2,2040,29.28800000000
+11,2054,heatpump,R2,2040,29.28800000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..23f5fa59
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,41 @@
+asset,year,technology,region,installed,capacity
+0,2045,estove,R1,2035,16.42930000000
+0,2049,estove,R1,2035,16.42930000000
+1,2045,estove,R1,2040,29.28800000000
+1,2049,estove,R1,2040,29.28800000000
+1,2050,estove,R1,2040,29.28800000000
+1,2054,estove,R1,2040,29.28800000000
+2,2050,estove,R1,2045,22.14400000000
+2,2054,estove,R1,2045,22.14400000000
+2,2055,estove,R1,2045,22.14400000000
+2,2059,estove,R1,2045,22.14400000000
+3,2045,estove,R2,2035,16.42930000000
+3,2049,estove,R2,2035,16.42930000000
+4,2045,estove,R2,2040,29.28800000000
+4,2049,estove,R2,2040,29.28800000000
+4,2050,estove,R2,2040,29.28800000000
+4,2054,estove,R2,2040,29.28800000000
+5,2050,estove,R2,2045,22.14400000000
+5,2054,estove,R2,2045,22.14400000000
+5,2055,estove,R2,2045,22.14400000000
+5,2059,estove,R2,2045,22.14400000000
+6,2045,heatpump,R1,2035,16.42930000000
+6,2049,heatpump,R1,2035,16.42930000000
+7,2045,heatpump,R1,2040,29.28800000000
+7,2049,heatpump,R1,2040,29.28800000000
+7,2050,heatpump,R1,2040,29.28800000000
+7,2054,heatpump,R1,2040,29.28800000000
+8,2050,heatpump,R1,2045,22.14400000000
+8,2054,heatpump,R1,2045,22.14400000000
+8,2055,heatpump,R1,2045,22.14400000000
+8,2059,heatpump,R1,2045,22.14400000000
+9,2045,heatpump,R2,2035,16.42930000000
+9,2049,heatpump,R2,2035,16.42930000000
+10,2045,heatpump,R2,2040,29.28800000000
+10,2049,heatpump,R2,2040,29.28800000000
+10,2050,heatpump,R2,2040,29.28800000000
+10,2054,heatpump,R2,2040,29.28800000000
+11,2050,heatpump,R2,2045,22.14400000000
+11,2054,heatpump,R2,2045,22.14400000000
+11,2055,heatpump,R2,2045,22.14400000000
+11,2059,heatpump,R2,2045,22.14400000000
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
new file mode 100644
index 00000000..81136126
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..0155957b
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a0be87ad
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..683124bd
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b2e9f555
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a46c9d61
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6d7f6711
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f046e7e7
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fdbb2d27
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f2ad7b02
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,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
new file mode 100644
index 00000000..c7297452
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f3e4bf75
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..23ed9376
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..821a7afa
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..0032cb9b
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
new file mode 100644
index 00000000..3848a821
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -0,0 +1,48 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,11.86320000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,9.61320000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.81370000000
+heatpump,R1,R1,A1,residential,retrofit,2030,11.86320000000
+heatpump,R1,R1,A1,residential,retrofit,2030,1.84700000000
+windturbine,R1,R1,A1,power,retrofit,2030,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.09700000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.81370000000
+heatpump,R1,R1,A1,residential,retrofit,2035,1.84700000000
+heatpump,R1,R1,A1,residential,retrofit,2035,12.35690000000
+windturbine,R1,R1,A1,power,retrofit,2035,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2035,0.49370000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.91540000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,2.39330000000
+heatpump,R1,R1,A1,residential,retrofit,2040,12.35690000000
+heatpump,R1,R1,A1,residential,retrofit,2040,3.75930000000
+windturbine,R1,R1,A1,power,retrofit,2040,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2040,0.49370000000
+windturbine,R1,R1,A1,power,retrofit,2040,1.91230000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.91540000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,2.39330000000
+heatpump,R1,R1,A1,residential,retrofit,2045,3.75930000000
+heatpump,R1,R1,A1,residential,retrofit,2045,12.67390000000
+windturbine,R1,R1,A1,power,retrofit,2045,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2045,0.49370000000
+windturbine,R1,R1,A1,power,retrofit,2045,1.91230000000
+windturbine,R1,R1,A1,power,retrofit,2045,0.31700000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,4.91540000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,0.75000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,12.67390000000
+heatpump,R1,R1,A1,residential,retrofit,2050,5.71850000000
+windturbine,R1,R1,A1,power,retrofit,2050,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2050,0.49370000000
+windturbine,R1,R1,A1,power,retrofit,2050,1.91230000000
+windturbine,R1,R1,A1,power,retrofit,2050,0.31700000000
+windturbine,R1,R1,A1,power,retrofit,2050,11.57240000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
new file mode 100644
index 00000000..71735d05
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.66950000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.22830000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.73100000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.34410000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.66950000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.22830000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.73100000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.34410000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.91390000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.68820000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.79250000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.45990000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.16880000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.37370000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.23480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.56370000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.16880000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.37370000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.23480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.56370000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.43110000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23920000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.13110000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.30090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.75420000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.36820000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17340000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.67620000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.43790000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.91880000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.36820000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17340000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.67620000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.43790000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.91880000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.64500000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21970000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.64460000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.50760000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19670000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.16220000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.12780000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34820000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.48220000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.20030000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.74860000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.12780000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34820000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.48220000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.20030000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.74860000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.41600000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40410000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.54750000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.27290000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37630000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,42.01630000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.33540000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68790000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.32150000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.41030000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70400000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.60430000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.33540000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68790000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.32150000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.41030000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70400000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.60430000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.63290000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.45370000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.48520000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.72000000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.88860000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,5.90150000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.15980000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.74240000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,5.97830000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,27.01280000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,5.90150000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.15980000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.74240000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.97830000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,27.01280000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.20630000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.82690000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,6.05500000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.19490000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.28490000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..bbb50094
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..6fa5726c
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+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
+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
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
new file mode 100644
index 00000000..76ad67dd
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..ac33bd58
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..cb1a0914
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..a373151f
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,windturbine,2020,9.61320000000
+0,2049,R1,windturbine,2020,9.61320000000
+1,2045,R1,windturbine,2025,4.09700000000
+1,2049,R1,windturbine,2025,4.09700000000
+1,2050,R1,windturbine,2025,4.09700000000
+1,2054,R1,windturbine,2025,4.09700000000
+2,2045,R1,windturbine,2030,0.49370000000
+2,2049,R1,windturbine,2030,0.49370000000
+2,2050,R1,windturbine,2030,0.49370000000
+2,2054,R1,windturbine,2030,0.49370000000
+2,2055,R1,windturbine,2030,0.49370000000
+2,2059,R1,windturbine,2030,0.49370000000
+3,2045,R1,windturbine,2035,1.91230000000
+3,2049,R1,windturbine,2035,1.91230000000
+3,2050,R1,windturbine,2035,1.91230000000
+3,2054,R1,windturbine,2035,1.91230000000
+3,2055,R1,windturbine,2035,1.91230000000
+3,2059,R1,windturbine,2035,1.91230000000
+3,2060,R1,windturbine,2035,1.91230000000
+3,2064,R1,windturbine,2035,1.91230000000
+4,2045,R1,windturbine,2040,0.31700000000
+4,2049,R1,windturbine,2040,0.31700000000
+4,2050,R1,windturbine,2040,0.31700000000
+4,2054,R1,windturbine,2040,0.31700000000
+4,2055,R1,windturbine,2040,0.31700000000
+4,2059,R1,windturbine,2040,0.31700000000
+4,2060,R1,windturbine,2040,0.31700000000
+4,2064,R1,windturbine,2040,0.31700000000
+4,2065,R1,windturbine,2040,0.31700000000
+4,2069,R1,windturbine,2040,0.31700000000
+5,2050,R1,windturbine,2045,11.57240000000
+5,2054,R1,windturbine,2045,11.57240000000
+5,2055,R1,windturbine,2045,11.57240000000
+5,2059,R1,windturbine,2045,11.57240000000
+5,2060,R1,windturbine,2045,11.57240000000
+5,2064,R1,windturbine,2045,11.57240000000
+5,2065,R1,windturbine,2045,11.57240000000
+5,2069,R1,windturbine,2045,11.57240000000
+5,2070,R1,windturbine,2045,11.57240000000
+5,2074,R1,windturbine,2045,11.57240000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..0386e8f1
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+0,2050,R1,windturbine,2025,4.09700000000
+0,2054,R1,windturbine,2025,4.09700000000
+1,2050,R1,windturbine,2030,0.49370000000
+1,2054,R1,windturbine,2030,0.49370000000
+1,2055,R1,windturbine,2030,0.49370000000
+1,2059,R1,windturbine,2030,0.49370000000
+2,2050,R1,windturbine,2035,1.91230000000
+2,2054,R1,windturbine,2035,1.91230000000
+2,2055,R1,windturbine,2035,1.91230000000
+2,2059,R1,windturbine,2035,1.91230000000
+2,2060,R1,windturbine,2035,1.91230000000
+2,2064,R1,windturbine,2035,1.91230000000
+3,2050,R1,windturbine,2040,0.31700000000
+3,2054,R1,windturbine,2040,0.31700000000
+3,2055,R1,windturbine,2040,0.31700000000
+3,2059,R1,windturbine,2040,0.31700000000
+3,2060,R1,windturbine,2040,0.31700000000
+3,2064,R1,windturbine,2040,0.31700000000
+3,2065,R1,windturbine,2040,0.31700000000
+3,2069,R1,windturbine,2040,0.31700000000
+4,2050,R1,windturbine,2045,11.57240000000
+4,2054,R1,windturbine,2045,11.57240000000
+4,2055,R1,windturbine,2045,11.57240000000
+4,2059,R1,windturbine,2045,11.57240000000
+4,2060,R1,windturbine,2045,11.57240000000
+4,2064,R1,windturbine,2045,11.57240000000
+4,2065,R1,windturbine,2045,11.57240000000
+4,2069,R1,windturbine,2045,11.57240000000
+4,2070,R1,windturbine,2045,11.57240000000
+4,2074,R1,windturbine,2045,11.57240000000
+5,2055,R1,windturbine,2050,4.22490000000
+5,2059,R1,windturbine,2050,4.22490000000
+5,2060,R1,windturbine,2050,4.22490000000
+5,2064,R1,windturbine,2050,4.22490000000
+5,2065,R1,windturbine,2050,4.22490000000
+5,2069,R1,windturbine,2050,4.22490000000
+5,2070,R1,windturbine,2050,4.22490000000
+5,2074,R1,windturbine,2050,4.22490000000
+5,2075,R1,windturbine,2050,4.22490000000
+5,2079,R1,windturbine,2050,4.22490000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..3c4e421e
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,11.86320000000
+1,2030,R1,heatpump,2020,11.86320000000
+1,2034,R1,heatpump,2020,11.86320000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..c10983de
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,3.81370000000
+1,2034,R1,gasboiler,2025,3.81370000000
+1,2035,R1,gasboiler,2025,3.81370000000
+1,2039,R1,gasboiler,2025,3.81370000000
+2,2025,R1,heatpump,2020,11.86320000000
+2,2030,R1,heatpump,2020,11.86320000000
+2,2034,R1,heatpump,2020,11.86320000000
+3,2030,R1,heatpump,2025,1.84700000000
+3,2034,R1,heatpump,2025,1.84700000000
+3,2035,R1,heatpump,2025,1.84700000000
+3,2039,R1,heatpump,2025,1.84700000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..fc1265ec
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,3.81370000000
+0,2034,R1,gasboiler,2025,3.81370000000
+0,2035,R1,gasboiler,2025,3.81370000000
+0,2039,R1,gasboiler,2025,3.81370000000
+1,2030,R1,heatpump,2020,11.86320000000
+1,2034,R1,heatpump,2020,11.86320000000
+2,2030,R1,heatpump,2025,1.84700000000
+2,2034,R1,heatpump,2025,1.84700000000
+2,2035,R1,heatpump,2025,1.84700000000
+2,2039,R1,heatpump,2025,1.84700000000
+3,2035,R1,heatpump,2030,12.35690000000
+3,2039,R1,heatpump,2030,12.35690000000
+3,2040,R1,heatpump,2030,12.35690000000
+3,2044,R1,heatpump,2030,12.35690000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..5a7273fe
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,3.81370000000
+0,2039,R1,gasboiler,2025,3.81370000000
+1,2040,R1,gasboiler,2035,2.39330000000
+1,2044,R1,gasboiler,2035,2.39330000000
+1,2045,R1,gasboiler,2035,2.39330000000
+1,2049,R1,gasboiler,2035,2.39330000000
+2,2035,R1,heatpump,2025,1.84700000000
+2,2039,R1,heatpump,2025,1.84700000000
+3,2035,R1,heatpump,2030,12.35690000000
+3,2039,R1,heatpump,2030,12.35690000000
+3,2040,R1,heatpump,2030,12.35690000000
+3,2044,R1,heatpump,2030,12.35690000000
+4,2040,R1,heatpump,2035,3.75930000000
+4,2044,R1,heatpump,2035,3.75930000000
+4,2045,R1,heatpump,2035,3.75930000000
+4,2049,R1,heatpump,2035,3.75930000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..31c274c8
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,2.39330000000
+0,2044,R1,gasboiler,2035,2.39330000000
+0,2045,R1,gasboiler,2035,2.39330000000
+0,2049,R1,gasboiler,2035,2.39330000000
+1,2040,R1,heatpump,2030,12.35690000000
+1,2044,R1,heatpump,2030,12.35690000000
+2,2040,R1,heatpump,2035,3.75930000000
+2,2044,R1,heatpump,2035,3.75930000000
+2,2045,R1,heatpump,2035,3.75930000000
+2,2049,R1,heatpump,2035,3.75930000000
+3,2045,R1,heatpump,2040,12.67390000000
+3,2049,R1,heatpump,2040,12.67390000000
+3,2050,R1,heatpump,2040,12.67390000000
+3,2054,R1,heatpump,2040,12.67390000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..388c7811
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,2.39330000000
+0,2049,R1,gasboiler,2035,2.39330000000
+1,2050,R1,gasboiler,2045,0.75000000000
+1,2054,R1,gasboiler,2045,0.75000000000
+1,2055,R1,gasboiler,2045,0.75000000000
+1,2059,R1,gasboiler,2045,0.75000000000
+2,2045,R1,heatpump,2035,3.75930000000
+2,2049,R1,heatpump,2035,3.75930000000
+3,2045,R1,heatpump,2040,12.67390000000
+3,2049,R1,heatpump,2040,12.67390000000
+3,2050,R1,heatpump,2040,12.67390000000
+3,2054,R1,heatpump,2040,12.67390000000
+4,2050,R1,heatpump,2045,5.71850000000
+4,2054,R1,heatpump,2045,5.71850000000
+4,2055,R1,heatpump,2045,5.71850000000
+4,2059,R1,heatpump,2045,5.71850000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..58b208c9
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasboiler,2045,0.75000000000
+0,2054,R1,gasboiler,2045,0.75000000000
+0,2055,R1,gasboiler,2045,0.75000000000
+0,2059,R1,gasboiler,2045,0.75000000000
+1,2050,R1,heatpump,2040,12.67390000000
+1,2054,R1,heatpump,2040,12.67390000000
+2,2050,R1,heatpump,2045,5.71850000000
+2,2054,R1,heatpump,2045,5.71850000000
+2,2055,R1,heatpump,2045,5.71850000000
+2,2059,R1,heatpump,2045,5.71850000000
+3,2055,R1,heatpump,2050,12.80180000000
+3,2059,R1,heatpump,2050,12.80180000000
+3,2060,R1,heatpump,2050,12.80180000000
+3,2064,R1,heatpump,2050,12.80180000000
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
new file mode 100644
index 00000000..23ffa638
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fa269fb1
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3351505d
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..8c9ac46b
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..5e3fa1f0
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3e65d64a
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..59bd881e
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/6-add-correlation-demand/generate_models.py b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
index ee84de83..5ee38b53 100644
--- a/docs/tutorial-code/6-add-correlation-demand/generate_models.py
+++ b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
@@ -16,10 +16,6 @@
 
 
 def generate_model_1() -> None:
-    """
-    Code to generate model 1-introduction.
-
-    """
     model_name = "1-correlation"
     model_path = parent_path / model_name
     if model_path.exists():
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
new file mode 100644
index 00000000..371cd8ea
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..2afc1e47
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3ebe1998
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..882acc45
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9512c0de
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..33eaf061
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9001996
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
new file mode 100644
index 00000000..a048f4b8
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
@@ -0,0 +1,51 @@
+agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
+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,17.57780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2030
+A1,10.07780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
+A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2035
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
+A1,2.70670000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
+A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
+A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2040
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
+A1,2.70670000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
+A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
+A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
+A1,2.08150000000,R1,4,2040,R1,power,windturbine,retrofit,2045
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
+A1,2.70670000000,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.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
+A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
+A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
+A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
+A1,2.37860000000,R1,4,2045,R1,power,windturbine,retrofit,2050
+A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
+A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
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
new file mode 100644
index 00000000..3013fe14
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b289c102
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
new file mode 100644
index 00000000..bc678ebb
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.23250000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.34900000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.23250000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34900000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.69870000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.46550000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.18540000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.27860000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18540000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27860000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56000000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.37210000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06650000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.09980000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06650000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09980000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.20010000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13320000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.07170000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.10760000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07170000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10760000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21570000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14360000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..0745318f
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..c6bfdc80
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
@@ -0,0 +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.54330000000
+2,2035,R1,windturbine,2025,1.54330000000
+2,2040,R1,windturbine,2025,1.54330000000
+2,2045,R1,windturbine,2025,1.54330000000
+2,2049,R1,windturbine,2025,1.54330000000
+2,2050,R1,windturbine,2025,1.54330000000
+2,2054,R1,windturbine,2025,1.54330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..fe65e893
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
@@ -0,0 +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.54330000000
+1,2035,R1,windturbine,2025,1.54330000000
+1,2040,R1,windturbine,2025,1.54330000000
+1,2045,R1,windturbine,2025,1.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2035,R1,windturbine,2030,1.68610000000
+2,2040,R1,windturbine,2030,1.68610000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..8280e4a7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
@@ -0,0 +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.54330000000
+1,2040,R1,windturbine,2025,1.54330000000
+1,2045,R1,windturbine,2025,1.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2035,R1,windturbine,2030,1.68610000000
+2,2040,R1,windturbine,2030,1.68610000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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,2040,R1,windturbine,2035,2.01780000000
+3,2045,R1,windturbine,2035,2.01780000000
+3,2049,R1,windturbine,2035,2.01780000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..74962932
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
@@ -0,0 +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.54330000000
+1,2045,R1,windturbine,2025,1.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2040,R1,windturbine,2030,1.68610000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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,2040,R1,windturbine,2035,2.01780000000
+3,2045,R1,windturbine,2035,2.01780000000
+3,2049,R1,windturbine,2035,2.01780000000
+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,2045,R1,windturbine,2040,2.08150000000
+4,2049,R1,windturbine,2040,2.08150000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..bcd2871b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
@@ -0,0 +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.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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,2045,R1,windturbine,2035,2.01780000000
+3,2049,R1,windturbine,2035,2.01780000000
+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,2045,R1,windturbine,2040,2.08150000000
+4,2049,R1,windturbine,2040,2.08150000000
+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
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
new file mode 100644
index 00000000..e61276d3
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b346de20
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..cf76dc0a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..d39ab64c
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..70cf1860
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..469339f6
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b4e174f3
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..06be5a1f
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..305b627b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a44059a3
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9ed8c00
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61ae1198
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89e0bd4e
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..663e47a5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6e2884e6
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61004cae
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
index 0b0629b4..824ff170 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
@@ -1,11 +1,11 @@
 ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
 Unit,-,Year,-,-,-,-,-,-
 gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,2
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,3
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,4
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,5
-gasCCGT,R1,2020,upper,all-year,all-week,evening,1,6
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
 windturbine,R1,2020,upper,all-year,all-week,night,1,1
 windturbine,R1,2020,upper,all-year,all-week,morning,1,1
 windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1
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
new file mode 100644
index 00000000..371cd8ea
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..2afc1e47
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3ebe1998
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..882acc45
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9512c0de
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..33eaf061
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9001996
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..654985f4
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
@@ -0,0 +1,51 @@
+agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
+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,17.57780000000,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,10.07780000000,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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
+A1,2.70670000000,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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
+A1,2.70670000000,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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
+A1,2.70670000000,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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
+A1,2.70670000000,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
new file mode 100644
index 00000000..f024353b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e3122114
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
@@ -0,0 +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.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,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.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.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.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.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.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.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.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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
new file mode 100644
index 00000000..cfbd6d55
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,3.98230000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,3.98230000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.98230000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,3.98230000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.01060000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,3.98230000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.29970000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.44960000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.29970000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.44960000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.90300000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.59970000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.28330000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18620000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06730000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.11280000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07250000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..0745318f
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..7d9d9278
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..7b5158ef
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a09a20c7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..146d05f9
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b1c0a3b7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b69d9788
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e65a6d4a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
@@ -0,0 +1,26 @@
+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
+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
+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
+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
+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,0.26670000000
+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
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
new file mode 100644
index 00000000..a746e9d8
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
@@ -0,0 +1,26 @@
+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,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,1.00000000000
+1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,91.67000000000
+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,1.00000000000
+2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,91.67000000000
+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,1.00000000000
+3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,91.67000000000
+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,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,0.26670000000
+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
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
new file mode 100644
index 00000000..3c07d73d
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..5324d255
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f300181b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c42cbd4c
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..bd71ce59
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..305b627b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..a44059a3
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..c9ed8c00
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61ae1198
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89e0bd4e
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..663e47a5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..6e2884e6
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..61004cae
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
index d556a983..586bce65 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
@@ -1,11 +1,11 @@
 ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
 Unit,-,Year,-,-,-,-,-,-
 gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,2
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,3
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,4
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,5
-gasCCGT,R1,2020,upper,all-year,all-week,evening,1,6
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
 windturbine,R1,2020,upper,all-year,all-week,night,1,0
 windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0
 windturbine,R1,2020,upper,all-year,all-week,afternoon,0.5,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index 101cacd3..42045862 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -15,10 +15,6 @@
 
 
 def generate_model_1() -> None:
-    """
-    Code to generate model 1-min-constraint.
-
-    """
     model_name = "1-min-constraint"
     model_path = parent_path / model_name
     if model_path.exists():
@@ -30,10 +26,6 @@ def generate_model_1() -> None:
 
 
 def generate_model_2() -> None:
-    """
-    Code to generate model 2-max-constraint.
-
-    """
     model_name = "2-max-constraint"
     model_path = parent_path / model_name
     if model_path.exists():
diff --git a/docs/tutorial-code/generate_models.py b/docs/tutorial-code/generate_models.py
index 58bce5dc..f045ed45 100644
--- a/docs/tutorial-code/generate_models.py
+++ b/docs/tutorial-code/generate_models.py
@@ -2,7 +2,7 @@
 import sys
 from pathlib import Path
 
-parent_path = Path(__file__).parent
-for tutorial in parent_path.iterdir():
-    if (tutorial / "generate_models.py").exists():
-        subprocess.call([sys.executable, str(tutorial / "generate_models.py")])
+if __name__ == "__main__":
+    for tutorial in Path(__file__).parent.iterdir():
+        if (tutorial / "generate_models.py").exists():
+            subprocess.call([sys.executable, str(tutorial / "generate_models.py")])
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 87f1371f..7271c103 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -7,7 +7,7 @@
 
 
 def modify_toml(path_to_toml: Path, function: Callable):
-    """Apply the specified function to modify a toml file
+    """Apply the specified function to modify a toml file.
 
     Args:
         path_to_toml: Path to the toml file
@@ -177,8 +177,7 @@ def add_agent(
 
 
 def add_region(model_path: Path, region_name: str, copy_from: str) -> None:
-    """
-    Add a new region to the MUSE model.
+    """Add a new region to the MUSE model.
 
     Args:
         model_path: The path to the MUSE model directory.
@@ -222,8 +221,7 @@ def add_region(model_path: Path, region_name: str, copy_from: str) -> None:
 
 
 def add_timeslice(model_path: Path, timeslice_name: str, copy_from: str) -> None:
-    """
-    Add a new timeslice to the model.
+    """Add a new timeslice to the model.
 
     Args:
         model_path: The path to the model directory.

From d3d30cf68beedf3bd38497721c7044490904a850 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 16 May 2024 21:24:15 +0100
Subject: [PATCH 133/419] Nicer comments, removing some unnecessary changes

---
 .../1-introduction/settings.toml              |  1 -
 .../2-scenario/settings.toml                  |  1 -
 .../1-add-new-technology/generate_models.py   |  8 ---
 .../1-multiple-objective/settings.toml        |  1 -
 .../2-single-objective/settings.toml          |  1 -
 .../2-add-agent/generate_models.py            |  2 +-
 .../3-add-region/1-new-region/settings.toml   |  1 -
 .../3-add-region/generate_models.py           |  2 +-
 .../1-modify-timeslices/settings.toml         |  1 -
 .../Results/Gas/Capacity/2020.csv             |  7 --
 .../Results/MCACapacity.csv                   |  7 --
 .../Results/MCAPrices.csv                     | 65 -------------------
 .../Results/Power/Capacity/2020.csv           | 21 ------
 .../2-modify-time-framework/settings.toml     |  1 -
 .../technodata/power/Technodata.csv           | 24 +++----
 .../4-modify-timing-data/generate_models.py   | 10 ++-
 .../1-new-service-demand/settings.toml        |  1 -
 .../5-add-service-demand/generate_models.py   |  6 --
 .../generate_models.py                        |  2 +-
 19 files changed, 19 insertions(+), 143 deletions(-)
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index e41a4bf7..7c78dd4d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index e41a4bf7..7c78dd4d 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index accb9cbf..77b47f6b 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -42,14 +42,6 @@ def generate_model_1() -> None:
         settings_file, lambda settings: settings.update({"maximum_iterations": 100})
     )
 
-    # Change carbon budget method (Undocumented)
-    modify_toml(
-        settings_file,
-        lambda settings: settings["carbon_budget_control"].update(
-            {"method": "fitting"}
-        ),
-    )
-
     # Copy wind commodity in power sector -> solar
     add_new_commodity(model_path, "solar", "power", "wind")
 
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index e41a4bf7..7c78dd4d 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index e41a4bf7..7c78dd4d 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 1f075e69..05e2c31c 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -64,7 +64,7 @@ def generate_model_1():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "2-single-objective", model_path)
 
-    # Special handling for Agents.csv
+    # Add second objective for agent A2
     agents_file = model_path / "technodata/Agents.csv"
     df = pd.read_csv(agents_file)
     df.loc[df["Name"] == "A2", "Objective2"] = "EAC"
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 02de7018..bb490bea 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index bd6d7155..a5f1c9e2 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -25,7 +25,7 @@ def generate_model_1():
     # Add region R2
     add_region(model_path, region_name="R2", copy_from="R1")
 
-    # Special handling for power/Technodata.csv
+    # Change growth/capacity limits for windturbine in R2
     technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "windturbine")
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 1ffcec63..1de51053 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
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
deleted file mode 100644
index 192f9bf9..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
deleted file mode 100644
index 377c773d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
deleted file mode 100644
index e7e6ef07..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ /dev/null
@@ -1,65 +0,0 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
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
deleted file mode 100644
index 78889a42..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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,windturbine,33.82470000000
-1,2025,R1,2020,windturbine,33.82470000000
-1,2030,R1,2020,windturbine,33.82470000000
-1,2035,R1,2020,windturbine,33.82470000000
-1,2040,R1,2020,windturbine,33.82470000000
-1,2045,R1,2020,windturbine,33.82470000000
-1,2046,R1,2020,windturbine,33.82470000000
-2,2020,R2,2020,gasCCGT,1.00000000000
-2,2022,R2,2020,gasCCGT,1.00000000000
-2,2025,R2,2020,gasCCGT,1.00000000000
-3,2022,R2,2020,windturbine,33.82470000000
-3,2025,R2,2020,windturbine,33.82470000000
-3,2030,R2,2020,windturbine,33.82470000000
-3,2035,R2,2020,windturbine,33.82470000000
-3,2040,R2,2020,windturbine,33.82470000000
-3,2045,R2,2020,windturbine,33.82470000000
-3,2046,R2,2020,windturbine,33.82470000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 35f39c13..620fc1e0 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index 6c73b86e..88bd8e67 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,40,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,100,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,100,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,40,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 12ba8023..24e81496 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -35,17 +35,15 @@ def generate_model_1():
 
     # Modify timeslices
     settings_file = model_path / "settings.toml"
-    with open(settings_file, "r") as file:
-        settings = parse(file.read())
+    settings = parse(settings_file.read_text())
     timeslices = settings["timeslices"]["all-year"]["all-week"]
     for key in timeslices:
         timeslices[key] = 1095
     settings["timeslices"]["all-year"]["all-week"] = {
         key if key != "afternoon" else "mid-afternoon": value
         for key, value in timeslices.items()
-    }
-    with open(settings_file, "w") as file:
-        file.write(dumps(settings))
+    }  # hacky way to preserve the order
+    settings_file.write_text(dumps(settings))
 
     # Change consumption profile (Undocumented)
     consumption_values = [
@@ -98,7 +96,7 @@ def generate_model_2():
     technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
-    df.loc[1:, "MaxCapacityAddition"] *= 20
+    df.loc[1:, "MaxCapacityAddition"] *= 2
     df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
     df.loc[1:, "MaxCapacityGrowth"] *= 2
     df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
index 1ffcec63..1de51053 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
@@ -37,7 +37,6 @@ keep_columns = [
 # Carbon budget control
 [carbon_budget_control]
 budget = []
-method = "fitting"
 
 [global_input_files]
 projections = '{path}/input/Projections.csv'
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index 8eb841a7..d716083e 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -70,12 +70,6 @@ def generate_model_1():
     df.loc[1:, "TotalCapacityLimit"] = 60
     df.to_csv(technodata_file, index=False)
 
-    # # Change gas supply limits
-    # technodata_file = model_path/ "technodata/gas/technodata.csv"
-    # df = pd.read_csv(technodata_file)
-    # df.loc[df["ProcessName"] == "gassupply1", "MaxCapacityAddition"] = 100
-    # df.loc[df["ProcessName"] == "gassupply1", "MaxCapacityGrowth"] = 5
-
 
 if __name__ == "__main__":
     generate_model_1()
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index 42045862..e60812bd 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -20,7 +20,7 @@ def generate_model_1() -> None:
     if model_path.exists():
         shutil.rmtree(model_path)
 
-    # Starting point: copy default model
+    # Starting point: copy default_timeslice model
     examples.copy_model(name="default_timeslice", path=parent_path, overwrite=True)
     os.rename(parent_path / "model", model_path)
 

From 3b47054c6ca5510d40e724a3d714f509e35bff21 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 16 May 2024 22:42:07 +0100
Subject: [PATCH 134/419] Fix tutorial 4.2

---
 .../Results/Gas/Capacity/2020.csv             |   9 +
 .../Results/Gas/Capacity/2022.csv             |   9 +
 .../Results/Gas/Capacity/2024.csv             |  23 +
 .../Results/Gas/Capacity/2026.csv             |  41 +
 .../Results/Gas/Capacity/2028.csv             |  57 ++
 .../Results/Gas/Capacity/2030.csv             |  81 ++
 .../Results/Gas/Capacity/2032.csv             |  81 ++
 .../Results/Gas/Capacity/2034.csv             |  81 ++
 .../Results/Gas/Capacity/2036.csv             |  73 ++
 .../Results/Gas/Capacity/2038.csv             |  65 ++
 .../Results/Gas/Capacity/2040.csv             |  65 ++
 .../Results/MCACapacity.csv                   | 308 ++++++++
 .../Results/MCAPrices.csv                     | 705 ++++++++++++++++++
 .../Results/Power/Capacity/2020.csv           |  28 +
 .../Results/Power/Capacity/2022.csv           |  73 ++
 .../Results/Power/Capacity/2024.csv           | 101 +++
 .../Results/Power/Capacity/2026.csv           | 122 +++
 .../Results/Power/Capacity/2028.csv           | 145 ++++
 .../Results/Power/Capacity/2030.csv           | 183 +++++
 .../Results/Power/Capacity/2032.csv           | 205 +++++
 .../Results/Power/Capacity/2034.csv           | 240 ++++++
 .../Results/Power/Capacity/2036.csv           | 252 +++++++
 .../Results/Power/Capacity/2038.csv           | 260 +++++++
 .../Results/Power/Capacity/2040.csv           | 294 ++++++++
 .../Results/Residential/Capacity/2022.csv     |  29 +
 .../Results/Residential/Capacity/2024.csv     |  57 ++
 .../Results/Residential/Capacity/2026.csv     |  71 ++
 .../Results/Residential/Capacity/2028.csv     |  83 +++
 .../Results/Residential/Capacity/2030.csv     |  93 +++
 .../Results/Residential/Capacity/2032.csv     |  89 +++
 .../Results/Residential/Capacity/2034.csv     |  85 +++
 .../Results/Residential/Capacity/2036.csv     |  81 ++
 .../Results/Residential/Capacity/2038.csv     |  81 ++
 .../Results/Residential/Capacity/2040.csv     |  81 ++
 .../Results/Residential/Supply/2022.csv       | 225 ++++++
 .../Results/Residential/Supply/2024.csv       | 289 +++++++
 .../Results/Residential/Supply/2026.csv       | 353 +++++++++
 .../Results/Residential/Supply/2028.csv       | 417 +++++++++++
 .../Results/Residential/Supply/2030.csv       | 449 +++++++++++
 .../Results/Residential/Supply/2032.csv       | 449 +++++++++++
 .../Results/Residential/Supply/2034.csv       | 385 ++++++++++
 .../Results/Residential/Supply/2036.csv       | 321 ++++++++
 .../Results/Residential/Supply/2038.csv       | 321 ++++++++
 .../Results/Residential/Supply/2040.csv       | 321 ++++++++
 .../2-modify-time-framework/settings.toml     |   2 +
 .../technodata/residential/Technodata.csv     |   8 +-
 .../4-modify-timing-data/generate_models.py   |  30 +-
 47 files changed, 7808 insertions(+), 13 deletions(-)
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv

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
new file mode 100644
index 00000000..29ae58ec
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..0eb22015
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
new file mode 100644
index 00000000..86f35c56
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
@@ -0,0 +1,23 @@
+asset,year,technology,region,installed,capacity
+0,2024,gassupply1,R1,2020,15.00000000000
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2026,gassupply1,R1,2020,7.50000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2026,gassupply1,R1,2024,2.18500000000
+1,2030,gassupply1,R1,2024,2.18500000000
+1,2035,gassupply1,R1,2024,2.18500000000
+1,2040,gassupply1,R1,2024,2.18500000000
+1,2045,gassupply1,R1,2024,2.18500000000
+1,2050,gassupply1,R1,2024,2.18500000000
+1,2060,gassupply1,R1,2024,2.18500000000
+2,2024,gassupply1,R2,2020,15.00000000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2026,gassupply1,R2,2020,7.50000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2026,gassupply1,R2,2024,2.18500000000
+3,2030,gassupply1,R2,2024,2.18500000000
+3,2035,gassupply1,R2,2024,2.18500000000
+3,2040,gassupply1,R2,2024,2.18500000000
+3,2045,gassupply1,R2,2024,2.18500000000
+3,2050,gassupply1,R2,2024,2.18500000000
+3,2060,gassupply1,R2,2024,2.18500000000
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
new file mode 100644
index 00000000..4f172556
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..67c69d2c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..620db1f4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2024,2.18500000000
+1,2032,gassupply1,R1,2024,2.18500000000
+1,2035,gassupply1,R1,2024,2.18500000000
+1,2040,gassupply1,R1,2024,2.18500000000
+1,2045,gassupply1,R1,2024,2.18500000000
+1,2050,gassupply1,R1,2024,2.18500000000
+1,2060,gassupply1,R1,2024,2.18500000000
+2,2030,gassupply1,R1,2026,1.69660000000
+2,2032,gassupply1,R1,2026,1.69660000000
+2,2035,gassupply1,R1,2026,1.69660000000
+2,2040,gassupply1,R1,2026,1.69660000000
+2,2045,gassupply1,R1,2026,1.69660000000
+2,2050,gassupply1,R1,2026,1.69660000000
+2,2060,gassupply1,R1,2026,1.69660000000
+2,2061,gassupply1,R1,2026,1.69660000000
+2,2062,gassupply1,R1,2026,1.69660000000
+3,2030,gassupply1,R1,2028,1.69660000000
+3,2032,gassupply1,R1,2028,1.69660000000
+3,2035,gassupply1,R1,2028,1.69660000000
+3,2040,gassupply1,R1,2028,1.69660000000
+3,2045,gassupply1,R1,2028,1.69660000000
+3,2050,gassupply1,R1,2028,1.69660000000
+3,2060,gassupply1,R1,2028,1.69660000000
+3,2061,gassupply1,R1,2028,1.69660000000
+3,2062,gassupply1,R1,2028,1.69660000000
+3,2063,gassupply1,R1,2028,1.69660000000
+3,2064,gassupply1,R1,2028,1.69660000000
+4,2032,gassupply1,R1,2030,9.19660000000
+4,2035,gassupply1,R1,2030,9.19660000000
+4,2040,gassupply1,R1,2030,9.19660000000
+4,2045,gassupply1,R1,2030,9.19660000000
+4,2050,gassupply1,R1,2030,9.19660000000
+4,2060,gassupply1,R1,2030,9.19660000000
+4,2061,gassupply1,R1,2030,9.19660000000
+4,2062,gassupply1,R1,2030,9.19660000000
+4,2063,gassupply1,R1,2030,9.19660000000
+4,2064,gassupply1,R1,2030,9.19660000000
+4,2065,gassupply1,R1,2030,9.19660000000
+4,2066,gassupply1,R1,2030,9.19660000000
+5,2030,gassupply1,R2,2020,7.50000000000
+6,2030,gassupply1,R2,2024,2.18500000000
+6,2032,gassupply1,R2,2024,2.18500000000
+6,2035,gassupply1,R2,2024,2.18500000000
+6,2040,gassupply1,R2,2024,2.18500000000
+6,2045,gassupply1,R2,2024,2.18500000000
+6,2050,gassupply1,R2,2024,2.18500000000
+6,2060,gassupply1,R2,2024,2.18500000000
+7,2030,gassupply1,R2,2026,1.69660000000
+7,2032,gassupply1,R2,2026,1.69660000000
+7,2035,gassupply1,R2,2026,1.69660000000
+7,2040,gassupply1,R2,2026,1.69660000000
+7,2045,gassupply1,R2,2026,1.69660000000
+7,2050,gassupply1,R2,2026,1.69660000000
+7,2060,gassupply1,R2,2026,1.69660000000
+7,2061,gassupply1,R2,2026,1.69660000000
+7,2062,gassupply1,R2,2026,1.69660000000
+8,2030,gassupply1,R2,2028,1.69660000000
+8,2032,gassupply1,R2,2028,1.69660000000
+8,2035,gassupply1,R2,2028,1.69660000000
+8,2040,gassupply1,R2,2028,1.69660000000
+8,2045,gassupply1,R2,2028,1.69660000000
+8,2050,gassupply1,R2,2028,1.69660000000
+8,2060,gassupply1,R2,2028,1.69660000000
+8,2061,gassupply1,R2,2028,1.69660000000
+8,2062,gassupply1,R2,2028,1.69660000000
+8,2063,gassupply1,R2,2028,1.69660000000
+8,2064,gassupply1,R2,2028,1.69660000000
+9,2032,gassupply1,R2,2030,9.19660000000
+9,2035,gassupply1,R2,2030,9.19660000000
+9,2040,gassupply1,R2,2030,9.19660000000
+9,2045,gassupply1,R2,2030,9.19660000000
+9,2050,gassupply1,R2,2030,9.19660000000
+9,2060,gassupply1,R2,2030,9.19660000000
+9,2061,gassupply1,R2,2030,9.19660000000
+9,2062,gassupply1,R2,2030,9.19660000000
+9,2063,gassupply1,R2,2030,9.19660000000
+9,2064,gassupply1,R2,2030,9.19660000000
+9,2065,gassupply1,R2,2030,9.19660000000
+9,2066,gassupply1,R2,2030,9.19660000000
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
new file mode 100644
index 00000000..b40fbda2
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..04997302
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..72aa33a6
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..de3b2958
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..e36b5e9e
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
new file mode 100644
index 00000000..4fcacf85
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -0,0 +1,308 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2022,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2022,14.42990000000
+gasboiler,R2,R2,A1,residential,retrofit,2022,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2022,14.42990000000
+gasCCGT,R1,R1,A1,power,retrofit,2022,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2022,4.17990000000
+windturbine,R1,R1,A1,power,retrofit,2022,8.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2022,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2022,12.17990000000
+gassupply1,R1,R1,A1,gas,retrofit,2022,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2022,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2024,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2024,14.42990000000
+heatpump,R1,R1,A1,residential,retrofit,2024,2.28590000000
+gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2024,14.42990000000
+heatpump,R2,R2,A1,residential,retrofit,2024,2.28590000000
+gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2024,0.80000000000
+solarPV,R1,R1,A1,power,retrofit,2024,4.17990000000
+windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2024,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2024,0.80000000000
+windturbine,R2,R2,A1,power,retrofit,2024,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2024,0.48590000000
+gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2026,2.32550000000
+heatpump,R1,R1,A1,residential,retrofit,2026,14.42990000000
+heatpump,R1,R1,A1,residential,retrofit,2026,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2026,4.96040000000
+gasboiler,R2,R2,A1,residential,retrofit,2026,2.32550000000
+heatpump,R2,R2,A1,residential,retrofit,2026,14.42990000000
+heatpump,R2,R2,A1,residential,retrofit,2026,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2026,4.96040000000
+gasCCGT,R1,R1,A1,power,retrofit,2026,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2026,3.20460000000
+solarPV,R1,R1,A1,power,retrofit,2026,4.17990000000
+windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2026,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2026,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2026,3.20460000000
+windturbine,R2,R2,A1,power,retrofit,2026,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2026,0.48590000000
+gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2026,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2026,2.18500000000
+gasboiler,R1,R1,A1,residential,retrofit,2028,2.32550000000
+heatpump,R1,R1,A1,residential,retrofit,2028,14.42990000000
+heatpump,R1,R1,A1,residential,retrofit,2028,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2028,4.96040000000
+heatpump,R1,R1,A1,residential,retrofit,2028,2.28590000000
+gasboiler,R2,R2,A1,residential,retrofit,2028,2.32550000000
+heatpump,R2,R2,A1,residential,retrofit,2028,14.42990000000
+heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2028,4.96040000000
+heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
+gasCCGT,R1,R1,A1,power,retrofit,2028,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2028,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2028,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2028,4.17990000000
+windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2028,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2028,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2028,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2028,1.01590000000
+windturbine,R2,R2,A1,power,retrofit,2028,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2028,0.48590000000
+gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2028,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2028,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2028,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2028,1.69660000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.32550000000
+heatpump,R1,R1,A1,residential,retrofit,2030,14.42990000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2030,4.96040000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.32550000000
+heatpump,R2,R2,A1,residential,retrofit,2030,14.42990000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2030,4.96040000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2030,4.17990000000
+windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
+windturbine,R2,R2,A1,power,retrofit,2030,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2030,0.48590000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,1.69660000000
+gasboiler,R1,R1,A1,residential,retrofit,2032,2.32550000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2032,4.96040000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2032,16.71570000000
+gasboiler,R2,R2,A1,residential,retrofit,2032,2.32550000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2032,4.96040000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2032,16.71570000000
+gasCCGT,R1,R1,A1,power,retrofit,2032,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2032,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2032,4.17990000000
+windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2032,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2032,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2032,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
+windturbine,R2,R2,A1,power,retrofit,2032,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2032,0.48590000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,9.19660000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,9.19660000000
+gasboiler,R1,R1,A1,residential,retrofit,2034,2.32550000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.96040000000
+heatpump,R1,R1,A1,residential,retrofit,2034,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2034,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2034,16.71570000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.57170000000
+gasboiler,R2,R2,A1,residential,retrofit,2034,2.32550000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.96040000000
+heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2034,16.71570000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2034,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2034,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2034,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2034,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2034,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2034,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2034,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2034,0.48590000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,9.19660000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,9.19660000000
+heatpump,R1,R1,A1,residential,retrofit,2036,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2036,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2036,16.71570000000
+heatpump,R1,R1,A1,residential,retrofit,2036,4.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2036,9.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2036,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2036,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2036,16.71570000000
+heatpump,R2,R2,A1,residential,retrofit,2036,4.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2036,9.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2036,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2036,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2036,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2036,4.61130000000
+windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2036,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2036,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2036,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2036,1.82870000000
+windturbine,R2,R2,A1,power,retrofit,2036,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2036,0.48590000000
+windturbine,R2,R2,A1,power,retrofit,2036,2.78270000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,9.19660000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,9.19660000000
+heatpump,R1,R1,A1,residential,retrofit,2038,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2038,16.71570000000
+heatpump,R1,R1,A1,residential,retrofit,2038,4.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2038,9.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2038,4.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2038,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2038,16.71570000000
+heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2038,9.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2038,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2038,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2038,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2038,4.61130000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2038,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2038,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2038,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2038,1.82870000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2038,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2038,0.48590000000
+windturbine,R2,R2,A1,power,retrofit,2038,2.78270000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,9.19660000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,9.19660000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.71570000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2040,9.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.71570000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2040,9.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,3.20460000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
+solarPV,R1,R1,A1,power,retrofit,2040,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2040,4.61130000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,0.48590000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,3.20460000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2040,1.82870000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2040,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2040,0.48590000000
+windturbine,R2,R2,A1,power,retrofit,2040,2.78270000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,1.69660000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,9.19660000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,1.69660000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
new file mode 100644
index 00000000..3fb568f9
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -0,0 +1,705 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.32050000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,0.32050000000,2022
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2022
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,0.72220000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,0.72220000000,2022
+"('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,0.48070000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,0.48070000000,2022
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2022
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,1.08340000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,1.08340000000,2022
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32050000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32050000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.72220000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.72220000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48070000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48070000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.08340000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.08340000000,2022
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96180000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.96180000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.16780000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.16780000000,2022
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,0.64140000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,0.64140000000,2022
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2022
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,1.44550000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,1.44550000000,2022
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.64140000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.64140000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.44550000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.44550000000,2022
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.64140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.64140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.44550000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.44550000000,2022
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,0.25410000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,0.25410000000,2024
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2024
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,0.13860000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,0.13860000000,2024
+"('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,0.38170000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,0.38170000000,2024
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2024
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,0.21350000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,0.21350000000,2024
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.25410000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.25410000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13860000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13860000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.38170000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.38170000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.21350000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.21350000000,2024
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.76710000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.76710000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.46120000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.46120000000,2024
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,0.51000000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,0.51000000000,2024
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2024
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,0.29250000000,2024
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.51000000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.51000000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.29250000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.29250000000,2024
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.51000000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.51000000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.29250000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.29250000000,2024
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,0.41120000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,0.41120000000,2026
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2026
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,0.07600000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,0.07600000000,2026
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,0.61780000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,0.61780000000,2026
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2026
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,0.11910000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,0.11910000000,2026
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.41120000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41120000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07600000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07600000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.61780000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.61780000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11910000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11910000000,2026
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.24180000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.24180000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.26900000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.26900000000,2026
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,0.82550000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,0.82550000000,2026
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2026
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,0.16570000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,0.16570000000,2026
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.82550000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.82550000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16570000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16570000000,2026
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.82550000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.82550000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16570000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16570000000,2026
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,0.49980000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,0.49980000000,2028
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2028
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,0.08130000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,0.08130000000,2028
+"('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,0.75070000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,0.75070000000,2028
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2028
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,0.13010000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,0.13010000000,2028
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.49980000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.49980000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08130000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08130000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.75070000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.75070000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13010000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13010000000,2028
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50850000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.50850000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30990000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.30990000000,2028
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,1.00310000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,1.00310000000,2028
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2028
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,0.18460000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,0.18460000000,2028
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.00310000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.00310000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18460000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18460000000,2028
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.00310000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.00310000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18460000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18460000000,2028
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,0.58970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.58970000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.08460000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.08460000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.88580000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.88580000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.13690000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.13690000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.58970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.58970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08460000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08460000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.88580000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.88580000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13690000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13690000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.77940000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.77940000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.33440000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.33440000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.18340000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.18340000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.19610000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.19610000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.18340000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.18340000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.19610000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.19610000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.18340000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.18340000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19610000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19610000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.71130000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,0.71130000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,0.09080000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,0.09080000000,2032
+"('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,1.06820000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,1.06820000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,0.14800000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,0.14800000000,2032
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.71130000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.71130000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09080000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09080000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.06820000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.06820000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14800000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.14800000000,2032
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.14490000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.14490000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.36770000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.36770000000,2032
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,1.42690000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,1.42690000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,0.21340000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,0.21340000000,2032
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.42690000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.42690000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.21340000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.21340000000,2032
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.42690000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.42690000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.21340000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.21340000000,2032
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,0.74270000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,0.74270000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,0.09730000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,0.09730000000,2034
+"('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,1.11530000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,1.11530000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,0.16030000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,0.16030000000,2034
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74270000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74270000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09730000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09730000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.11530000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.11530000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16030000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.16030000000,2034
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.23860000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.23860000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40720000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.40720000000,2034
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,1.48960000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,1.48960000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,0.23310000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,0.23310000000,2034
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.48960000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.48960000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.23310000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.23310000000,2034
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.48960000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.48960000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.23310000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.23310000000,2034
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,0.72480000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.72480000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.03410000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.03410000000,2036
+"('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,1.08820000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,1.08820000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.06710000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.06710000000,2036
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.72480000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.72480000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03410000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03410000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.08820000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.08820000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06710000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06710000000,2036
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.18360000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.18360000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23050000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23050000000,2036
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,1.45340000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,1.45340000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.11090000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.11090000000,2036
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.45340000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.45340000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11090000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11090000000,2036
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.45340000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.45340000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11090000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11090000000,2036
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.74940000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.74940000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.03360000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.03360000000,2038
+"('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,1.12510000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,1.12510000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.06590000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.06590000000,2038
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74940000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74940000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03360000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03360000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12510000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.12510000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06590000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06590000000,2038
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.25690000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.25690000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22580000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.22580000000,2038
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,1.50240000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,1.50240000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.10880000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.10880000000,2038
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.50240000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.50240000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.10880000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.10880000000,2038
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.50240000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.50240000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10880000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10880000000,2038
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.77110000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.77110000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03430000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.03430000000,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,1.15750000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.15750000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.06750000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.06750000000,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', 'mid-afternoon')",electricity,R1,0.77110000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.77110000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15750000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15750000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06750000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06750000000,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,2.32140000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.32140000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23210000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23210000000,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.54560000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.54560000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.11170000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.11170000000,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', 'early-morning')",electricity,R1,1.54560000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.54560000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11170000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11170000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.54560000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.54560000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11170000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11170000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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
new file mode 100644
index 00000000..f6737d1d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..350eac06
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
new file mode 100644
index 00000000..78e5bc43
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -0,0 +1,101 @@
+asset,year,technology,region,installed,capacity
+0,2024,gasCCGT,R1,2020,1.00000000000
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2024,gasCCGT,R1,2022,0.80000000000
+1,2025,gasCCGT,R1,2022,0.80000000000
+1,2026,gasCCGT,R1,2022,0.80000000000
+1,2030,gasCCGT,R1,2022,0.80000000000
+1,2035,gasCCGT,R1,2022,0.80000000000
+1,2040,gasCCGT,R1,2022,0.80000000000
+1,2045,gasCCGT,R1,2022,0.80000000000
+1,2046,gasCCGT,R1,2022,0.80000000000
+1,2047,gasCCGT,R1,2022,0.80000000000
+1,2048,gasCCGT,R1,2022,0.80000000000
+1,2049,gasCCGT,R1,2022,0.80000000000
+1,2050,gasCCGT,R1,2022,0.80000000000
+1,2058,gasCCGT,R1,2022,0.80000000000
+2,2026,gasCCGT,R1,2024,3.20460000000
+2,2030,gasCCGT,R1,2024,3.20460000000
+2,2035,gasCCGT,R1,2024,3.20460000000
+2,2040,gasCCGT,R1,2024,3.20460000000
+2,2045,gasCCGT,R1,2024,3.20460000000
+2,2046,gasCCGT,R1,2024,3.20460000000
+2,2047,gasCCGT,R1,2024,3.20460000000
+2,2048,gasCCGT,R1,2024,3.20460000000
+2,2049,gasCCGT,R1,2024,3.20460000000
+2,2050,gasCCGT,R1,2024,3.20460000000
+2,2058,gasCCGT,R1,2024,3.20460000000
+2,2059,gasCCGT,R1,2024,3.20460000000
+2,2060,gasCCGT,R1,2024,3.20460000000
+3,2024,gasCCGT,R2,2020,1.00000000000
+3,2025,gasCCGT,R2,2020,1.00000000000
+4,2024,gasCCGT,R2,2022,0.80000000000
+4,2025,gasCCGT,R2,2022,0.80000000000
+4,2026,gasCCGT,R2,2022,0.80000000000
+4,2030,gasCCGT,R2,2022,0.80000000000
+4,2035,gasCCGT,R2,2022,0.80000000000
+4,2040,gasCCGT,R2,2022,0.80000000000
+4,2045,gasCCGT,R2,2022,0.80000000000
+4,2046,gasCCGT,R2,2022,0.80000000000
+4,2047,gasCCGT,R2,2022,0.80000000000
+4,2048,gasCCGT,R2,2022,0.80000000000
+4,2049,gasCCGT,R2,2022,0.80000000000
+4,2050,gasCCGT,R2,2022,0.80000000000
+4,2058,gasCCGT,R2,2022,0.80000000000
+5,2026,gasCCGT,R2,2024,3.20460000000
+5,2030,gasCCGT,R2,2024,3.20460000000
+5,2035,gasCCGT,R2,2024,3.20460000000
+5,2040,gasCCGT,R2,2024,3.20460000000
+5,2045,gasCCGT,R2,2024,3.20460000000
+5,2046,gasCCGT,R2,2024,3.20460000000
+5,2047,gasCCGT,R2,2024,3.20460000000
+5,2048,gasCCGT,R2,2024,3.20460000000
+5,2049,gasCCGT,R2,2024,3.20460000000
+5,2050,gasCCGT,R2,2024,3.20460000000
+5,2058,gasCCGT,R2,2024,3.20460000000
+5,2059,gasCCGT,R2,2024,3.20460000000
+5,2060,gasCCGT,R2,2024,3.20460000000
+6,2024,solarPV,R1,2020,4.17990000000
+6,2025,solarPV,R1,2020,4.17990000000
+6,2026,solarPV,R1,2020,4.17990000000
+6,2030,solarPV,R1,2020,4.17990000000
+6,2035,solarPV,R1,2020,4.17990000000
+6,2040,solarPV,R1,2020,4.17990000000
+6,2045,solarPV,R1,2020,4.17990000000
+6,2046,solarPV,R1,2020,4.17990000000
+7,2024,windturbine,R1,2020,8.00000000000
+7,2025,windturbine,R1,2020,8.00000000000
+7,2026,windturbine,R1,2020,8.00000000000
+7,2030,windturbine,R1,2020,8.00000000000
+7,2035,windturbine,R1,2020,8.00000000000
+7,2040,windturbine,R1,2020,8.00000000000
+7,2045,windturbine,R1,2020,8.00000000000
+7,2046,windturbine,R1,2020,8.00000000000
+8,2024,windturbine,R1,2022,0.48590000000
+8,2025,windturbine,R1,2022,0.48590000000
+8,2026,windturbine,R1,2022,0.48590000000
+8,2030,windturbine,R1,2022,0.48590000000
+8,2035,windturbine,R1,2022,0.48590000000
+8,2040,windturbine,R1,2022,0.48590000000
+8,2045,windturbine,R1,2022,0.48590000000
+8,2046,windturbine,R1,2022,0.48590000000
+8,2047,windturbine,R1,2022,0.48590000000
+8,2048,windturbine,R1,2022,0.48590000000
+9,2024,windturbine,R2,2020,12.17990000000
+9,2025,windturbine,R2,2020,12.17990000000
+9,2026,windturbine,R2,2020,12.17990000000
+9,2030,windturbine,R2,2020,12.17990000000
+9,2035,windturbine,R2,2020,12.17990000000
+9,2040,windturbine,R2,2020,12.17990000000
+9,2045,windturbine,R2,2020,12.17990000000
+9,2046,windturbine,R2,2020,12.17990000000
+10,2024,windturbine,R2,2022,0.48590000000
+10,2025,windturbine,R2,2022,0.48590000000
+10,2026,windturbine,R2,2022,0.48590000000
+10,2030,windturbine,R2,2022,0.48590000000
+10,2035,windturbine,R2,2022,0.48590000000
+10,2040,windturbine,R2,2022,0.48590000000
+10,2045,windturbine,R2,2022,0.48590000000
+10,2046,windturbine,R2,2022,0.48590000000
+10,2047,windturbine,R2,2022,0.48590000000
+10,2048,windturbine,R2,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
new file mode 100644
index 00000000..76da3da0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..9bcf9d75
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..90db9e92
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..8700e017
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..f5d513a8
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..911983cc
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..06e4c47c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..0ee948ae
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..aa3089b3
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
new file mode 100644
index 00000000..a749693b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
@@ -0,0 +1,57 @@
+asset,year,technology,region,installed,capacity
+0,2024,gasboiler,R1,2020,5.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2026,gasboiler,R1,2024,2.32550000000
+1,2030,gasboiler,R1,2024,2.32550000000
+1,2031,gasboiler,R1,2024,2.32550000000
+1,2032,gasboiler,R1,2024,2.32550000000
+1,2033,gasboiler,R1,2024,2.32550000000
+1,2034,gasboiler,R1,2024,2.32550000000
+1,2035,gasboiler,R1,2024,2.32550000000
+2,2024,gasboiler,R2,2020,5.00000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2026,gasboiler,R2,2024,2.32550000000
+3,2030,gasboiler,R2,2024,2.32550000000
+3,2031,gasboiler,R2,2024,2.32550000000
+3,2032,gasboiler,R2,2024,2.32550000000
+3,2033,gasboiler,R2,2024,2.32550000000
+3,2034,gasboiler,R2,2024,2.32550000000
+3,2035,gasboiler,R2,2024,2.32550000000
+4,2024,heatpump,R1,2020,14.42990000000
+4,2025,heatpump,R1,2020,14.42990000000
+4,2026,heatpump,R1,2020,14.42990000000
+4,2030,heatpump,R1,2020,14.42990000000
+4,2031,heatpump,R1,2020,14.42990000000
+5,2024,heatpump,R1,2022,2.28590000000
+5,2025,heatpump,R1,2022,2.28590000000
+5,2026,heatpump,R1,2022,2.28590000000
+5,2030,heatpump,R1,2022,2.28590000000
+5,2031,heatpump,R1,2022,2.28590000000
+5,2032,heatpump,R1,2022,2.28590000000
+5,2033,heatpump,R1,2022,2.28590000000
+6,2026,heatpump,R1,2024,4.96040000000
+6,2030,heatpump,R1,2024,4.96040000000
+6,2031,heatpump,R1,2024,4.96040000000
+6,2032,heatpump,R1,2024,4.96040000000
+6,2033,heatpump,R1,2024,4.96040000000
+6,2034,heatpump,R1,2024,4.96040000000
+6,2035,heatpump,R1,2024,4.96040000000
+7,2024,heatpump,R2,2020,14.42990000000
+7,2025,heatpump,R2,2020,14.42990000000
+7,2026,heatpump,R2,2020,14.42990000000
+7,2030,heatpump,R2,2020,14.42990000000
+7,2031,heatpump,R2,2020,14.42990000000
+8,2024,heatpump,R2,2022,2.28590000000
+8,2025,heatpump,R2,2022,2.28590000000
+8,2026,heatpump,R2,2022,2.28590000000
+8,2030,heatpump,R2,2022,2.28590000000
+8,2031,heatpump,R2,2022,2.28590000000
+8,2032,heatpump,R2,2022,2.28590000000
+8,2033,heatpump,R2,2022,2.28590000000
+9,2026,heatpump,R2,2024,4.96040000000
+9,2030,heatpump,R2,2024,4.96040000000
+9,2031,heatpump,R2,2024,4.96040000000
+9,2032,heatpump,R2,2024,4.96040000000
+9,2033,heatpump,R2,2024,4.96040000000
+9,2034,heatpump,R2,2024,4.96040000000
+9,2035,heatpump,R2,2024,4.96040000000
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
new file mode 100644
index 00000000..b3b9d8fd
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..d49c6f24
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..34abbefd
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,93 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2024,2.32550000000
+0,2031,gasboiler,R1,2024,2.32550000000
+0,2032,gasboiler,R1,2024,2.32550000000
+0,2033,gasboiler,R1,2024,2.32550000000
+0,2034,gasboiler,R1,2024,2.32550000000
+0,2035,gasboiler,R1,2024,2.32550000000
+1,2030,gasboiler,R2,2024,2.32550000000
+1,2031,gasboiler,R2,2024,2.32550000000
+1,2032,gasboiler,R2,2024,2.32550000000
+1,2033,gasboiler,R2,2024,2.32550000000
+1,2034,gasboiler,R2,2024,2.32550000000
+1,2035,gasboiler,R2,2024,2.32550000000
+2,2030,heatpump,R1,2020,14.42990000000
+2,2031,heatpump,R1,2020,14.42990000000
+3,2030,heatpump,R1,2022,2.28590000000
+3,2031,heatpump,R1,2022,2.28590000000
+3,2032,heatpump,R1,2022,2.28590000000
+3,2033,heatpump,R1,2022,2.28590000000
+4,2030,heatpump,R1,2024,4.96040000000
+4,2031,heatpump,R1,2024,4.96040000000
+4,2032,heatpump,R1,2024,4.96040000000
+4,2033,heatpump,R1,2024,4.96040000000
+4,2034,heatpump,R1,2024,4.96040000000
+4,2035,heatpump,R1,2024,4.96040000000
+5,2030,heatpump,R1,2026,2.28590000000
+5,2031,heatpump,R1,2026,2.28590000000
+5,2032,heatpump,R1,2026,2.28590000000
+5,2033,heatpump,R1,2026,2.28590000000
+5,2034,heatpump,R1,2026,2.28590000000
+5,2035,heatpump,R1,2026,2.28590000000
+5,2036,heatpump,R1,2026,2.28590000000
+5,2037,heatpump,R1,2026,2.28590000000
+6,2030,heatpump,R1,2028,2.28590000000
+6,2031,heatpump,R1,2028,2.28590000000
+6,2032,heatpump,R1,2028,2.28590000000
+6,2033,heatpump,R1,2028,2.28590000000
+6,2034,heatpump,R1,2028,2.28590000000
+6,2035,heatpump,R1,2028,2.28590000000
+6,2036,heatpump,R1,2028,2.28590000000
+6,2037,heatpump,R1,2028,2.28590000000
+6,2038,heatpump,R1,2028,2.28590000000
+6,2039,heatpump,R1,2028,2.28590000000
+7,2032,heatpump,R1,2030,16.71570000000
+7,2033,heatpump,R1,2030,16.71570000000
+7,2034,heatpump,R1,2030,16.71570000000
+7,2035,heatpump,R1,2030,16.71570000000
+7,2036,heatpump,R1,2030,16.71570000000
+7,2037,heatpump,R1,2030,16.71570000000
+7,2038,heatpump,R1,2030,16.71570000000
+7,2039,heatpump,R1,2030,16.71570000000
+7,2040,heatpump,R1,2030,16.71570000000
+7,2041,heatpump,R1,2030,16.71570000000
+8,2030,heatpump,R2,2020,14.42990000000
+8,2031,heatpump,R2,2020,14.42990000000
+9,2030,heatpump,R2,2022,2.28590000000
+9,2031,heatpump,R2,2022,2.28590000000
+9,2032,heatpump,R2,2022,2.28590000000
+9,2033,heatpump,R2,2022,2.28590000000
+10,2030,heatpump,R2,2024,4.96040000000
+10,2031,heatpump,R2,2024,4.96040000000
+10,2032,heatpump,R2,2024,4.96040000000
+10,2033,heatpump,R2,2024,4.96040000000
+10,2034,heatpump,R2,2024,4.96040000000
+10,2035,heatpump,R2,2024,4.96040000000
+11,2030,heatpump,R2,2026,2.28590000000
+11,2031,heatpump,R2,2026,2.28590000000
+11,2032,heatpump,R2,2026,2.28590000000
+11,2033,heatpump,R2,2026,2.28590000000
+11,2034,heatpump,R2,2026,2.28590000000
+11,2035,heatpump,R2,2026,2.28590000000
+11,2036,heatpump,R2,2026,2.28590000000
+11,2037,heatpump,R2,2026,2.28590000000
+12,2030,heatpump,R2,2028,2.28590000000
+12,2031,heatpump,R2,2028,2.28590000000
+12,2032,heatpump,R2,2028,2.28590000000
+12,2033,heatpump,R2,2028,2.28590000000
+12,2034,heatpump,R2,2028,2.28590000000
+12,2035,heatpump,R2,2028,2.28590000000
+12,2036,heatpump,R2,2028,2.28590000000
+12,2037,heatpump,R2,2028,2.28590000000
+12,2038,heatpump,R2,2028,2.28590000000
+12,2039,heatpump,R2,2028,2.28590000000
+13,2032,heatpump,R2,2030,16.71570000000
+13,2033,heatpump,R2,2030,16.71570000000
+13,2034,heatpump,R2,2030,16.71570000000
+13,2035,heatpump,R2,2030,16.71570000000
+13,2036,heatpump,R2,2030,16.71570000000
+13,2037,heatpump,R2,2030,16.71570000000
+13,2038,heatpump,R2,2030,16.71570000000
+13,2039,heatpump,R2,2030,16.71570000000
+13,2040,heatpump,R2,2030,16.71570000000
+13,2041,heatpump,R2,2030,16.71570000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
new file mode 100644
index 00000000..cf84841d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
@@ -0,0 +1,89 @@
+asset,year,technology,region,installed,capacity
+0,2032,gasboiler,R1,2024,2.32550000000
+0,2033,gasboiler,R1,2024,2.32550000000
+0,2034,gasboiler,R1,2024,2.32550000000
+0,2035,gasboiler,R1,2024,2.32550000000
+1,2032,gasboiler,R2,2024,2.32550000000
+1,2033,gasboiler,R2,2024,2.32550000000
+1,2034,gasboiler,R2,2024,2.32550000000
+1,2035,gasboiler,R2,2024,2.32550000000
+2,2032,heatpump,R1,2022,2.28590000000
+2,2033,heatpump,R1,2022,2.28590000000
+3,2032,heatpump,R1,2024,4.96040000000
+3,2033,heatpump,R1,2024,4.96040000000
+3,2034,heatpump,R1,2024,4.96040000000
+3,2035,heatpump,R1,2024,4.96040000000
+4,2032,heatpump,R1,2026,2.28590000000
+4,2033,heatpump,R1,2026,2.28590000000
+4,2034,heatpump,R1,2026,2.28590000000
+4,2035,heatpump,R1,2026,2.28590000000
+4,2036,heatpump,R1,2026,2.28590000000
+4,2037,heatpump,R1,2026,2.28590000000
+5,2032,heatpump,R1,2028,2.28590000000
+5,2033,heatpump,R1,2028,2.28590000000
+5,2034,heatpump,R1,2028,2.28590000000
+5,2035,heatpump,R1,2028,2.28590000000
+5,2036,heatpump,R1,2028,2.28590000000
+5,2037,heatpump,R1,2028,2.28590000000
+5,2038,heatpump,R1,2028,2.28590000000
+5,2039,heatpump,R1,2028,2.28590000000
+6,2032,heatpump,R1,2030,16.71570000000
+6,2033,heatpump,R1,2030,16.71570000000
+6,2034,heatpump,R1,2030,16.71570000000
+6,2035,heatpump,R1,2030,16.71570000000
+6,2036,heatpump,R1,2030,16.71570000000
+6,2037,heatpump,R1,2030,16.71570000000
+6,2038,heatpump,R1,2030,16.71570000000
+6,2039,heatpump,R1,2030,16.71570000000
+6,2040,heatpump,R1,2030,16.71570000000
+6,2041,heatpump,R1,2030,16.71570000000
+7,2034,heatpump,R1,2032,4.57170000000
+7,2035,heatpump,R1,2032,4.57170000000
+7,2036,heatpump,R1,2032,4.57170000000
+7,2037,heatpump,R1,2032,4.57170000000
+7,2038,heatpump,R1,2032,4.57170000000
+7,2039,heatpump,R1,2032,4.57170000000
+7,2040,heatpump,R1,2032,4.57170000000
+7,2041,heatpump,R1,2032,4.57170000000
+7,2042,heatpump,R1,2032,4.57170000000
+7,2043,heatpump,R1,2032,4.57170000000
+8,2032,heatpump,R2,2022,2.28590000000
+8,2033,heatpump,R2,2022,2.28590000000
+9,2032,heatpump,R2,2024,4.96040000000
+9,2033,heatpump,R2,2024,4.96040000000
+9,2034,heatpump,R2,2024,4.96040000000
+9,2035,heatpump,R2,2024,4.96040000000
+10,2032,heatpump,R2,2026,2.28590000000
+10,2033,heatpump,R2,2026,2.28590000000
+10,2034,heatpump,R2,2026,2.28590000000
+10,2035,heatpump,R2,2026,2.28590000000
+10,2036,heatpump,R2,2026,2.28590000000
+10,2037,heatpump,R2,2026,2.28590000000
+11,2032,heatpump,R2,2028,2.28590000000
+11,2033,heatpump,R2,2028,2.28590000000
+11,2034,heatpump,R2,2028,2.28590000000
+11,2035,heatpump,R2,2028,2.28590000000
+11,2036,heatpump,R2,2028,2.28590000000
+11,2037,heatpump,R2,2028,2.28590000000
+11,2038,heatpump,R2,2028,2.28590000000
+11,2039,heatpump,R2,2028,2.28590000000
+12,2032,heatpump,R2,2030,16.71570000000
+12,2033,heatpump,R2,2030,16.71570000000
+12,2034,heatpump,R2,2030,16.71570000000
+12,2035,heatpump,R2,2030,16.71570000000
+12,2036,heatpump,R2,2030,16.71570000000
+12,2037,heatpump,R2,2030,16.71570000000
+12,2038,heatpump,R2,2030,16.71570000000
+12,2039,heatpump,R2,2030,16.71570000000
+12,2040,heatpump,R2,2030,16.71570000000
+12,2041,heatpump,R2,2030,16.71570000000
+13,2034,heatpump,R2,2032,4.57170000000
+13,2035,heatpump,R2,2032,4.57170000000
+13,2036,heatpump,R2,2032,4.57170000000
+13,2037,heatpump,R2,2032,4.57170000000
+13,2038,heatpump,R2,2032,4.57170000000
+13,2039,heatpump,R2,2032,4.57170000000
+13,2040,heatpump,R2,2032,4.57170000000
+13,2041,heatpump,R2,2032,4.57170000000
+13,2042,heatpump,R2,2032,4.57170000000
+13,2043,heatpump,R2,2032,4.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
new file mode 100644
index 00000000..0d4fdd2a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
@@ -0,0 +1,85 @@
+asset,year,technology,region,installed,capacity
+0,2034,gasboiler,R1,2024,2.32550000000
+0,2035,gasboiler,R1,2024,2.32550000000
+1,2034,gasboiler,R2,2024,2.32550000000
+1,2035,gasboiler,R2,2024,2.32550000000
+2,2034,heatpump,R1,2024,4.96040000000
+2,2035,heatpump,R1,2024,4.96040000000
+3,2034,heatpump,R1,2026,2.28590000000
+3,2035,heatpump,R1,2026,2.28590000000
+3,2036,heatpump,R1,2026,2.28590000000
+3,2037,heatpump,R1,2026,2.28590000000
+4,2034,heatpump,R1,2028,2.28590000000
+4,2035,heatpump,R1,2028,2.28590000000
+4,2036,heatpump,R1,2028,2.28590000000
+4,2037,heatpump,R1,2028,2.28590000000
+4,2038,heatpump,R1,2028,2.28590000000
+4,2039,heatpump,R1,2028,2.28590000000
+5,2034,heatpump,R1,2030,16.71570000000
+5,2035,heatpump,R1,2030,16.71570000000
+5,2036,heatpump,R1,2030,16.71570000000
+5,2037,heatpump,R1,2030,16.71570000000
+5,2038,heatpump,R1,2030,16.71570000000
+5,2039,heatpump,R1,2030,16.71570000000
+5,2040,heatpump,R1,2030,16.71570000000
+5,2041,heatpump,R1,2030,16.71570000000
+6,2034,heatpump,R1,2032,4.57170000000
+6,2035,heatpump,R1,2032,4.57170000000
+6,2036,heatpump,R1,2032,4.57170000000
+6,2037,heatpump,R1,2032,4.57170000000
+6,2038,heatpump,R1,2032,4.57170000000
+6,2039,heatpump,R1,2032,4.57170000000
+6,2040,heatpump,R1,2032,4.57170000000
+6,2041,heatpump,R1,2032,4.57170000000
+6,2042,heatpump,R1,2032,4.57170000000
+6,2043,heatpump,R1,2032,4.57170000000
+7,2036,heatpump,R1,2034,9.57170000000
+7,2037,heatpump,R1,2034,9.57170000000
+7,2038,heatpump,R1,2034,9.57170000000
+7,2039,heatpump,R1,2034,9.57170000000
+7,2040,heatpump,R1,2034,9.57170000000
+7,2041,heatpump,R1,2034,9.57170000000
+7,2042,heatpump,R1,2034,9.57170000000
+7,2043,heatpump,R1,2034,9.57170000000
+7,2044,heatpump,R1,2034,9.57170000000
+7,2045,heatpump,R1,2034,9.57170000000
+8,2034,heatpump,R2,2024,4.96040000000
+8,2035,heatpump,R2,2024,4.96040000000
+9,2034,heatpump,R2,2026,2.28590000000
+9,2035,heatpump,R2,2026,2.28590000000
+9,2036,heatpump,R2,2026,2.28590000000
+9,2037,heatpump,R2,2026,2.28590000000
+10,2034,heatpump,R2,2028,2.28590000000
+10,2035,heatpump,R2,2028,2.28590000000
+10,2036,heatpump,R2,2028,2.28590000000
+10,2037,heatpump,R2,2028,2.28590000000
+10,2038,heatpump,R2,2028,2.28590000000
+10,2039,heatpump,R2,2028,2.28590000000
+11,2034,heatpump,R2,2030,16.71570000000
+11,2035,heatpump,R2,2030,16.71570000000
+11,2036,heatpump,R2,2030,16.71570000000
+11,2037,heatpump,R2,2030,16.71570000000
+11,2038,heatpump,R2,2030,16.71570000000
+11,2039,heatpump,R2,2030,16.71570000000
+11,2040,heatpump,R2,2030,16.71570000000
+11,2041,heatpump,R2,2030,16.71570000000
+12,2034,heatpump,R2,2032,4.57170000000
+12,2035,heatpump,R2,2032,4.57170000000
+12,2036,heatpump,R2,2032,4.57170000000
+12,2037,heatpump,R2,2032,4.57170000000
+12,2038,heatpump,R2,2032,4.57170000000
+12,2039,heatpump,R2,2032,4.57170000000
+12,2040,heatpump,R2,2032,4.57170000000
+12,2041,heatpump,R2,2032,4.57170000000
+12,2042,heatpump,R2,2032,4.57170000000
+12,2043,heatpump,R2,2032,4.57170000000
+13,2036,heatpump,R2,2034,9.57170000000
+13,2037,heatpump,R2,2034,9.57170000000
+13,2038,heatpump,R2,2034,9.57170000000
+13,2039,heatpump,R2,2034,9.57170000000
+13,2040,heatpump,R2,2034,9.57170000000
+13,2041,heatpump,R2,2034,9.57170000000
+13,2042,heatpump,R2,2034,9.57170000000
+13,2043,heatpump,R2,2034,9.57170000000
+13,2044,heatpump,R2,2034,9.57170000000
+13,2045,heatpump,R2,2034,9.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
new file mode 100644
index 00000000..a5d05756
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2036,heatpump,R1,2026,2.28590000000
+0,2037,heatpump,R1,2026,2.28590000000
+1,2036,heatpump,R1,2028,2.28590000000
+1,2037,heatpump,R1,2028,2.28590000000
+1,2038,heatpump,R1,2028,2.28590000000
+1,2039,heatpump,R1,2028,2.28590000000
+2,2036,heatpump,R1,2030,16.71570000000
+2,2037,heatpump,R1,2030,16.71570000000
+2,2038,heatpump,R1,2030,16.71570000000
+2,2039,heatpump,R1,2030,16.71570000000
+2,2040,heatpump,R1,2030,16.71570000000
+2,2041,heatpump,R1,2030,16.71570000000
+3,2036,heatpump,R1,2032,4.57170000000
+3,2037,heatpump,R1,2032,4.57170000000
+3,2038,heatpump,R1,2032,4.57170000000
+3,2039,heatpump,R1,2032,4.57170000000
+3,2040,heatpump,R1,2032,4.57170000000
+3,2041,heatpump,R1,2032,4.57170000000
+3,2042,heatpump,R1,2032,4.57170000000
+3,2043,heatpump,R1,2032,4.57170000000
+4,2036,heatpump,R1,2034,9.57170000000
+4,2037,heatpump,R1,2034,9.57170000000
+4,2038,heatpump,R1,2034,9.57170000000
+4,2039,heatpump,R1,2034,9.57170000000
+4,2040,heatpump,R1,2034,9.57170000000
+4,2041,heatpump,R1,2034,9.57170000000
+4,2042,heatpump,R1,2034,9.57170000000
+4,2043,heatpump,R1,2034,9.57170000000
+4,2044,heatpump,R1,2034,9.57170000000
+4,2045,heatpump,R1,2034,9.57170000000
+5,2038,heatpump,R1,2036,4.57170000000
+5,2039,heatpump,R1,2036,4.57170000000
+5,2040,heatpump,R1,2036,4.57170000000
+5,2041,heatpump,R1,2036,4.57170000000
+5,2042,heatpump,R1,2036,4.57170000000
+5,2043,heatpump,R1,2036,4.57170000000
+5,2044,heatpump,R1,2036,4.57170000000
+5,2045,heatpump,R1,2036,4.57170000000
+5,2046,heatpump,R1,2036,4.57170000000
+5,2047,heatpump,R1,2036,4.57170000000
+6,2036,heatpump,R2,2026,2.28590000000
+6,2037,heatpump,R2,2026,2.28590000000
+7,2036,heatpump,R2,2028,2.28590000000
+7,2037,heatpump,R2,2028,2.28590000000
+7,2038,heatpump,R2,2028,2.28590000000
+7,2039,heatpump,R2,2028,2.28590000000
+8,2036,heatpump,R2,2030,16.71570000000
+8,2037,heatpump,R2,2030,16.71570000000
+8,2038,heatpump,R2,2030,16.71570000000
+8,2039,heatpump,R2,2030,16.71570000000
+8,2040,heatpump,R2,2030,16.71570000000
+8,2041,heatpump,R2,2030,16.71570000000
+9,2036,heatpump,R2,2032,4.57170000000
+9,2037,heatpump,R2,2032,4.57170000000
+9,2038,heatpump,R2,2032,4.57170000000
+9,2039,heatpump,R2,2032,4.57170000000
+9,2040,heatpump,R2,2032,4.57170000000
+9,2041,heatpump,R2,2032,4.57170000000
+9,2042,heatpump,R2,2032,4.57170000000
+9,2043,heatpump,R2,2032,4.57170000000
+10,2036,heatpump,R2,2034,9.57170000000
+10,2037,heatpump,R2,2034,9.57170000000
+10,2038,heatpump,R2,2034,9.57170000000
+10,2039,heatpump,R2,2034,9.57170000000
+10,2040,heatpump,R2,2034,9.57170000000
+10,2041,heatpump,R2,2034,9.57170000000
+10,2042,heatpump,R2,2034,9.57170000000
+10,2043,heatpump,R2,2034,9.57170000000
+10,2044,heatpump,R2,2034,9.57170000000
+10,2045,heatpump,R2,2034,9.57170000000
+11,2038,heatpump,R2,2036,4.57170000000
+11,2039,heatpump,R2,2036,4.57170000000
+11,2040,heatpump,R2,2036,4.57170000000
+11,2041,heatpump,R2,2036,4.57170000000
+11,2042,heatpump,R2,2036,4.57170000000
+11,2043,heatpump,R2,2036,4.57170000000
+11,2044,heatpump,R2,2036,4.57170000000
+11,2045,heatpump,R2,2036,4.57170000000
+11,2046,heatpump,R2,2036,4.57170000000
+11,2047,heatpump,R2,2036,4.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
new file mode 100644
index 00000000..430766a0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2038,heatpump,R1,2028,2.28590000000
+0,2039,heatpump,R1,2028,2.28590000000
+1,2038,heatpump,R1,2030,16.71570000000
+1,2039,heatpump,R1,2030,16.71570000000
+1,2040,heatpump,R1,2030,16.71570000000
+1,2041,heatpump,R1,2030,16.71570000000
+2,2038,heatpump,R1,2032,4.57170000000
+2,2039,heatpump,R1,2032,4.57170000000
+2,2040,heatpump,R1,2032,4.57170000000
+2,2041,heatpump,R1,2032,4.57170000000
+2,2042,heatpump,R1,2032,4.57170000000
+2,2043,heatpump,R1,2032,4.57170000000
+3,2038,heatpump,R1,2034,9.57170000000
+3,2039,heatpump,R1,2034,9.57170000000
+3,2040,heatpump,R1,2034,9.57170000000
+3,2041,heatpump,R1,2034,9.57170000000
+3,2042,heatpump,R1,2034,9.57170000000
+3,2043,heatpump,R1,2034,9.57170000000
+3,2044,heatpump,R1,2034,9.57170000000
+3,2045,heatpump,R1,2034,9.57170000000
+4,2038,heatpump,R1,2036,4.57170000000
+4,2039,heatpump,R1,2036,4.57170000000
+4,2040,heatpump,R1,2036,4.57170000000
+4,2041,heatpump,R1,2036,4.57170000000
+4,2042,heatpump,R1,2036,4.57170000000
+4,2043,heatpump,R1,2036,4.57170000000
+4,2044,heatpump,R1,2036,4.57170000000
+4,2045,heatpump,R1,2036,4.57170000000
+4,2046,heatpump,R1,2036,4.57170000000
+4,2047,heatpump,R1,2036,4.57170000000
+5,2040,heatpump,R1,2038,4.57170000000
+5,2041,heatpump,R1,2038,4.57170000000
+5,2042,heatpump,R1,2038,4.57170000000
+5,2043,heatpump,R1,2038,4.57170000000
+5,2044,heatpump,R1,2038,4.57170000000
+5,2045,heatpump,R1,2038,4.57170000000
+5,2046,heatpump,R1,2038,4.57170000000
+5,2047,heatpump,R1,2038,4.57170000000
+5,2048,heatpump,R1,2038,4.57170000000
+5,2049,heatpump,R1,2038,4.57170000000
+6,2038,heatpump,R2,2028,2.28590000000
+6,2039,heatpump,R2,2028,2.28590000000
+7,2038,heatpump,R2,2030,16.71570000000
+7,2039,heatpump,R2,2030,16.71570000000
+7,2040,heatpump,R2,2030,16.71570000000
+7,2041,heatpump,R2,2030,16.71570000000
+8,2038,heatpump,R2,2032,4.57170000000
+8,2039,heatpump,R2,2032,4.57170000000
+8,2040,heatpump,R2,2032,4.57170000000
+8,2041,heatpump,R2,2032,4.57170000000
+8,2042,heatpump,R2,2032,4.57170000000
+8,2043,heatpump,R2,2032,4.57170000000
+9,2038,heatpump,R2,2034,9.57170000000
+9,2039,heatpump,R2,2034,9.57170000000
+9,2040,heatpump,R2,2034,9.57170000000
+9,2041,heatpump,R2,2034,9.57170000000
+9,2042,heatpump,R2,2034,9.57170000000
+9,2043,heatpump,R2,2034,9.57170000000
+9,2044,heatpump,R2,2034,9.57170000000
+9,2045,heatpump,R2,2034,9.57170000000
+10,2038,heatpump,R2,2036,4.57170000000
+10,2039,heatpump,R2,2036,4.57170000000
+10,2040,heatpump,R2,2036,4.57170000000
+10,2041,heatpump,R2,2036,4.57170000000
+10,2042,heatpump,R2,2036,4.57170000000
+10,2043,heatpump,R2,2036,4.57170000000
+10,2044,heatpump,R2,2036,4.57170000000
+10,2045,heatpump,R2,2036,4.57170000000
+10,2046,heatpump,R2,2036,4.57170000000
+10,2047,heatpump,R2,2036,4.57170000000
+11,2040,heatpump,R2,2038,4.57170000000
+11,2041,heatpump,R2,2038,4.57170000000
+11,2042,heatpump,R2,2038,4.57170000000
+11,2043,heatpump,R2,2038,4.57170000000
+11,2044,heatpump,R2,2038,4.57170000000
+11,2045,heatpump,R2,2038,4.57170000000
+11,2046,heatpump,R2,2038,4.57170000000
+11,2047,heatpump,R2,2038,4.57170000000
+11,2048,heatpump,R2,2038,4.57170000000
+11,2049,heatpump,R2,2038,4.57170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..71bf41cf
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2040,heatpump,R1,2030,16.71570000000
+0,2041,heatpump,R1,2030,16.71570000000
+1,2040,heatpump,R1,2032,4.57170000000
+1,2041,heatpump,R1,2032,4.57170000000
+1,2042,heatpump,R1,2032,4.57170000000
+1,2043,heatpump,R1,2032,4.57170000000
+2,2040,heatpump,R1,2034,9.57170000000
+2,2041,heatpump,R1,2034,9.57170000000
+2,2042,heatpump,R1,2034,9.57170000000
+2,2043,heatpump,R1,2034,9.57170000000
+2,2044,heatpump,R1,2034,9.57170000000
+2,2045,heatpump,R1,2034,9.57170000000
+3,2040,heatpump,R1,2036,4.57170000000
+3,2041,heatpump,R1,2036,4.57170000000
+3,2042,heatpump,R1,2036,4.57170000000
+3,2043,heatpump,R1,2036,4.57170000000
+3,2044,heatpump,R1,2036,4.57170000000
+3,2045,heatpump,R1,2036,4.57170000000
+3,2046,heatpump,R1,2036,4.57170000000
+3,2047,heatpump,R1,2036,4.57170000000
+4,2040,heatpump,R1,2038,4.57170000000
+4,2041,heatpump,R1,2038,4.57170000000
+4,2042,heatpump,R1,2038,4.57170000000
+4,2043,heatpump,R1,2038,4.57170000000
+4,2044,heatpump,R1,2038,4.57170000000
+4,2045,heatpump,R1,2038,4.57170000000
+4,2046,heatpump,R1,2038,4.57170000000
+4,2047,heatpump,R1,2038,4.57170000000
+4,2048,heatpump,R1,2038,4.57170000000
+4,2049,heatpump,R1,2038,4.57170000000
+5,2042,heatpump,R1,2040,19.00160000000
+5,2043,heatpump,R1,2040,19.00160000000
+5,2044,heatpump,R1,2040,19.00160000000
+5,2045,heatpump,R1,2040,19.00160000000
+5,2046,heatpump,R1,2040,19.00160000000
+5,2047,heatpump,R1,2040,19.00160000000
+5,2048,heatpump,R1,2040,19.00160000000
+5,2049,heatpump,R1,2040,19.00160000000
+5,2050,heatpump,R1,2040,19.00160000000
+5,2051,heatpump,R1,2040,19.00160000000
+6,2040,heatpump,R2,2030,16.71570000000
+6,2041,heatpump,R2,2030,16.71570000000
+7,2040,heatpump,R2,2032,4.57170000000
+7,2041,heatpump,R2,2032,4.57170000000
+7,2042,heatpump,R2,2032,4.57170000000
+7,2043,heatpump,R2,2032,4.57170000000
+8,2040,heatpump,R2,2034,9.57170000000
+8,2041,heatpump,R2,2034,9.57170000000
+8,2042,heatpump,R2,2034,9.57170000000
+8,2043,heatpump,R2,2034,9.57170000000
+8,2044,heatpump,R2,2034,9.57170000000
+8,2045,heatpump,R2,2034,9.57170000000
+9,2040,heatpump,R2,2036,4.57170000000
+9,2041,heatpump,R2,2036,4.57170000000
+9,2042,heatpump,R2,2036,4.57170000000
+9,2043,heatpump,R2,2036,4.57170000000
+9,2044,heatpump,R2,2036,4.57170000000
+9,2045,heatpump,R2,2036,4.57170000000
+9,2046,heatpump,R2,2036,4.57170000000
+9,2047,heatpump,R2,2036,4.57170000000
+10,2040,heatpump,R2,2038,4.57170000000
+10,2041,heatpump,R2,2038,4.57170000000
+10,2042,heatpump,R2,2038,4.57170000000
+10,2043,heatpump,R2,2038,4.57170000000
+10,2044,heatpump,R2,2038,4.57170000000
+10,2045,heatpump,R2,2038,4.57170000000
+10,2046,heatpump,R2,2038,4.57170000000
+10,2047,heatpump,R2,2038,4.57170000000
+10,2048,heatpump,R2,2038,4.57170000000
+10,2049,heatpump,R2,2038,4.57170000000
+11,2042,heatpump,R2,2040,19.00160000000
+11,2043,heatpump,R2,2040,19.00160000000
+11,2044,heatpump,R2,2040,19.00160000000
+11,2045,heatpump,R2,2040,19.00160000000
+11,2046,heatpump,R2,2040,19.00160000000
+11,2047,heatpump,R2,2040,19.00160000000
+11,2048,heatpump,R2,2040,19.00160000000
+11,2049,heatpump,R2,2040,19.00160000000
+11,2050,heatpump,R2,2040,19.00160000000
+11,2051,heatpump,R2,2040,19.00160000000
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
new file mode 100644
index 00000000..6f689597
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..5b8d3bd3
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..ee0bdf3d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..5e12685c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..eef20226
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..3aa4b2d0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..fe8d5955
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..121eb083
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..89992632
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
@@ -0,0 +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
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
new file mode 100644
index 00000000..b0cd3e1d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 620fc1e0..271f3f39 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -95,6 +95,7 @@ commodities_out = '{path}/technodata/power/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+forecast = 2
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -119,6 +120,7 @@ commodities_out = '{path}/technodata/gas/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+forecast = 2
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 94fe36a0..959cd528 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 24e81496..4d539f73 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 
 import pandas as pd
-from muse.wizard import add_timeslice, modify_toml
+from muse.wizard import add_timeslice, get_sectors, modify_toml
 from tomlkit import dumps, parse
 
 parent_path = Path(__file__).parent
@@ -85,14 +85,15 @@ def generate_model_2():
     time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]
     modify_toml(settings_file, lambda x: x.update({"time_framework": time_framework}))
     modify_toml(settings_file, lambda x: x.update({"foresight": 2}))
-    modify_toml(
-        settings_file,
-        lambda x: x["sectors"]["residential"]["subsectors"]["retro_and_new"].update(
-            {"forecast": 2}
-        ),
-    )
-
-    # Double MaxCapacityAddition in power sector
+    for sector in get_sectors(model_path):
+        modify_toml(
+            settings_file,
+            lambda x: x["sectors"][sector]["subsectors"]["retro_and_new"].update(
+                {"forecast": 2}
+            ),
+        )
+
+    # Double capacity limits in power sector
     technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
@@ -103,6 +104,17 @@ def generate_model_2():
     df.loc[1:, "TotalCapacityLimit"] *= 2
     df.to_csv(technodata_file, index=False)
 
+    # Double capacity limits in residential sector
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
+    df.loc[1:, "MaxCapacityAddition"] *= 2
+    df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
+    df.loc[1:, "MaxCapacityGrowth"] *= 2
+    df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
+    df.loc[1:, "TotalCapacityLimit"] *= 2
+    df.to_csv(technodata_file, index=False)
+
 
 if __name__ == "__main__":
     generate_model_1()

From bcef20e071f296a9a1d349c4f4afbd125ee29fe9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 16 May 2024 22:47:07 +0100
Subject: [PATCH 135/419] Add tomlkit to dependencies

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4e32ed4d..53d9c3d1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,7 +28,8 @@ dependencies = [
     "toml",
     "xlrd==1.2.0",
     "mypy-extensions",
-    "pypubsub"
+    "pypubsub",
+    "tomlkit"
 ]
 dynamic = ["version"]
 

From 5d90b1acd7c35425a8e83e6b3892420e2521c25f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 16 May 2024 22:52:27 +0100
Subject: [PATCH 136/419] Fix faulty paths

---
 .../visualise-max-service.ipynb               |  2 +-
 .../visualise-min-service.ipynb               | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
index 36de79ac..5662e13e 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
@@ -36,7 +36,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply = pd.read_csv(\"2-max-constraint/Results/Power/Supply_Timeslice/2025.csv\")\n",
+    "power_supply = pd.read_csv(\"2-max-constraint/Results/Power/Supply/2025.csv\")\n",
     "\n",
     "sns.lineplot(\n",
     "    data=power_supply[\n",
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
index a0d5c4f8..69d35dba 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
@@ -36,9 +36,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2020 = pd.read_csv(\n",
-    "    \"1-min-constraint/Results/Power/Supply_Timeslice/2020.csv\"\n",
-    ")\n",
+    "power_supply_2020 = pd.read_csv(\"1-min-constraint/Results/Power/Supply/2020.csv\")\n",
     "\n",
     "sns.lineplot(\n",
     "    data=power_supply_2020[\n",
@@ -62,7 +60,7 @@
    "source": [
     "from pathlib import Path\n",
     "\n",
-    "path = \"1-min-constraint-Results/Residential/Capacity/\"\n",
+    "path = \"1-min-constraint/Results/Residential/Capacity/\"\n",
     "\n",
     "all_files = Path(path).glob(\"*.csv\")\n",
     "\n",
@@ -91,6 +89,20 @@
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

From 87781f49b060f033c44c3f1b9ef4b71fa744fb40 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 16 May 2024 23:05:41 +0100
Subject: [PATCH 137/419] Remove index from consumption files

---
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 26 +++++++-------
 .../preset/Residential2050Consumption.csv     | 26 +++++++-------
 .../preset/Residential2020Consumption.csv     | 34 +++++++++----------
 .../preset/Residential2050Consumption.csv     | 34 +++++++++----------
 .../preset/Residential2020Consumption.csv     | 34 +++++++++----------
 .../preset/Residential2050Consumption.csv     | 34 +++++++++----------
 .../preset/Residential2020Consumption.csv     | 34 +++++++++----------
 .../preset/Residential2050Consumption.csv     | 34 +++++++++----------
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Residential2020Consumption.csv     | 14 ++++----
 .../preset/Residential2050Consumption.csv     | 14 ++++----
 .../preset/Industry2010Consumption.csv        |  8 ++---
 .../preset/Industry2020Consumption.csv        |  8 ++---
 .../preset/Industry2030Consumption.csv        |  8 ++---
 .../preset/Industry2040Consumption.csv        |  8 ++---
 .../preset/Industry2050Consumption.csv        |  8 ++---
 .../preset/Residential2020Consumption.csv     | 26 +++++++-------
 .../preset/Residential2030Consumption.csv     | 26 +++++++-------
 .../preset/Residential2050Consumption.csv     | 26 +++++++-------
 34 files changed, 313 insertions(+), 313 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv
index 5a1dcdd2..82245400 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,1.0,0,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0,0
-2,R1,gasboiler,3,0,0,1.0,0,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0,0
-4,R1,gasboiler,5,0,0,3.0,0,0,0
-5,R1,gasboiler,6,0,0,2.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv
index 282377d9..16a138cf 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,3.0,0,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0,0
-2,R1,gasboiler,3,0,0,3.0,0,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0,0
-4,R1,gasboiler,5,0,0,9.0,0,0,0
-5,R1,gasboiler,6,0,0,6.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv
index 5a1dcdd2..82245400 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,1.0,0,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0,0
-2,R1,gasboiler,3,0,0,1.0,0,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0,0
-4,R1,gasboiler,5,0,0,3.0,0,0,0
-5,R1,gasboiler,6,0,0,2.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv
index 282377d9..16a138cf 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,3.0,0,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0,0
-2,R1,gasboiler,3,0,0,3.0,0,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0,0
-4,R1,gasboiler,5,0,0,9.0,0,0,0
-5,R1,gasboiler,6,0,0,6.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
index 5a1dcdd2..82245400 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,1.0,0,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0,0
-2,R1,gasboiler,3,0,0,1.0,0,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0,0
-4,R1,gasboiler,5,0,0,3.0,0,0,0
-5,R1,gasboiler,6,0,0,2.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
index 282377d9..16a138cf 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,3.0,0,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0,0
-2,R1,gasboiler,3,0,0,3.0,0,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0,0
-4,R1,gasboiler,5,0,0,9.0,0,0,0
-5,R1,gasboiler,6,0,0,6.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
index 5a1dcdd2..82245400 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,1.0,0,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0,0
-2,R1,gasboiler,3,0,0,1.0,0,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0,0
-4,R1,gasboiler,5,0,0,3.0,0,0,0
-5,R1,gasboiler,6,0,0,2.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
index 282377d9..16a138cf 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,3.0,0,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0,0
-2,R1,gasboiler,3,0,0,3.0,0,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0,0
-4,R1,gasboiler,5,0,0,9.0,0,0,0
-5,R1,gasboiler,6,0,0,6.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
index 1b3690ff..8854f2ef 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2020Consumption.csv
@@ -1,13 +1,13 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,1.0,0,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0,0
-2,R1,gasboiler,3,0,0,1.0,0,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0,0
-4,R1,gasboiler,5,0,0,3.0,0,0,0
-5,R1,gasboiler,6,0,0,2.0,0,0,0
-0,R2,gasboiler,1,0,0,1.0,0,0,0
-1,R2,gasboiler,2,0,0,1.5,0,0,0
-2,R2,gasboiler,3,0,0,1.0,0,0,0
-3,R2,gasboiler,4,0,0,1.5,0,0,0
-4,R2,gasboiler,5,0,0,3.0,0,0,0
-5,R2,gasboiler,6,0,0,2.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
+R2,gasboiler,1,0,0,1.0,0,0,0
+R2,gasboiler,2,0,0,1.5,0,0,0
+R2,gasboiler,3,0,0,1.0,0,0,0
+R2,gasboiler,4,0,0,1.5,0,0,0
+R2,gasboiler,5,0,0,3.0,0,0,0
+R2,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
index 80448207..91aa17c5 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/preset/Residential2050Consumption.csv
@@ -1,13 +1,13 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,3.0,0,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0,0
-2,R1,gasboiler,3,0,0,3.0,0,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0,0
-4,R1,gasboiler,5,0,0,9.0,0,0,0
-5,R1,gasboiler,6,0,0,6.0,0,0,0
-0,R2,gasboiler,1,0,0,3.0,0,0,0
-1,R2,gasboiler,2,0,0,4.5,0,0,0
-2,R2,gasboiler,3,0,0,3.0,0,0,0
-3,R2,gasboiler,4,0,0,4.5,0,0,0
-4,R2,gasboiler,5,0,0,9.0,0,0,0
-5,R2,gasboiler,6,0,0,6.0,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
+R2,gasboiler,1,0,0,3.0,0,0,0
+R2,gasboiler,2,0,0,4.5,0,0,0
+R2,gasboiler,3,0,0,3.0,0,0,0
+R2,gasboiler,4,0,0,4.5,0,0,0
+R2,gasboiler,5,0,0,9.0,0,0,0
+R2,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
index 54ab24c5..97378524 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,0.714,0,0,0
-1,R1,gasboiler,2,0,0,1.071,0,0,0
-2,R1,gasboiler,3,0,0,0.714,0,0,0
-3,R1,gasboiler,4,0,0,1.071,0,0,0
-4,R1,gasboiler,5,0,0,2.143,0,0,0
-5,R1,gasboiler,6,0,0,1.429,0,0,0
-5,R1,gasboiler,7,0,0,1.429,0,0,0
-5,R1,gasboiler,8,0,0,1.429,0,0,0
-0,R2,gasboiler,1,0,0,0.714,0,0,0
-1,R2,gasboiler,2,0,0,1.071,0,0,0
-2,R2,gasboiler,3,0,0,0.714,0,0,0
-3,R2,gasboiler,4,0,0,1.071,0,0,0
-4,R2,gasboiler,5,0,0,2.143,0,0,0
-5,R2,gasboiler,6,0,0,1.429,0,0,0
-5,R2,gasboiler,7,0,0,1.429,0,0,0
-5,R2,gasboiler,8,0,0,1.429,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,0.714,0,0,0
+R1,gasboiler,2,0,0,1.071,0,0,0
+R1,gasboiler,3,0,0,0.714,0,0,0
+R1,gasboiler,4,0,0,1.071,0,0,0
+R1,gasboiler,5,0,0,2.143,0,0,0
+R1,gasboiler,6,0,0,1.429,0,0,0
+R1,gasboiler,7,0,0,1.429,0,0,0
+R1,gasboiler,8,0,0,1.429,0,0,0
+R2,gasboiler,1,0,0,0.714,0,0,0
+R2,gasboiler,2,0,0,1.071,0,0,0
+R2,gasboiler,3,0,0,0.714,0,0,0
+R2,gasboiler,4,0,0,1.071,0,0,0
+R2,gasboiler,5,0,0,2.143,0,0,0
+R2,gasboiler,6,0,0,1.429,0,0,0
+R2,gasboiler,7,0,0,1.429,0,0,0
+R2,gasboiler,8,0,0,1.429,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
index c2501c58..5e20cf90 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,2.142,0,0,0
-1,R1,gasboiler,2,0,0,3.213,0,0,0
-2,R1,gasboiler,3,0,0,2.142,0,0,0
-3,R1,gasboiler,4,0,0,3.213,0,0,0
-4,R1,gasboiler,5,0,0,6.428999999999999,0,0,0
-5,R1,gasboiler,6,0,0,4.287,0,0,0
-5,R1,gasboiler,7,0,0,4.287,0,0,0
-5,R1,gasboiler,8,0,0,4.287,0,0,0
-0,R2,gasboiler,1,0,0,2.142,0,0,0
-1,R2,gasboiler,2,0,0,3.213,0,0,0
-2,R2,gasboiler,3,0,0,2.142,0,0,0
-3,R2,gasboiler,4,0,0,3.213,0,0,0
-4,R2,gasboiler,5,0,0,6.428999999999999,0,0,0
-5,R2,gasboiler,6,0,0,4.287,0,0,0
-5,R2,gasboiler,7,0,0,4.287,0,0,0
-5,R2,gasboiler,8,0,0,4.287,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,2.142,0,0,0
+R1,gasboiler,2,0,0,3.213,0,0,0
+R1,gasboiler,3,0,0,2.142,0,0,0
+R1,gasboiler,4,0,0,3.213,0,0,0
+R1,gasboiler,5,0,0,6.428999999999999,0,0,0
+R1,gasboiler,6,0,0,4.287,0,0,0
+R1,gasboiler,7,0,0,4.287,0,0,0
+R1,gasboiler,8,0,0,4.287,0,0,0
+R2,gasboiler,1,0,0,2.142,0,0,0
+R2,gasboiler,2,0,0,3.213,0,0,0
+R2,gasboiler,3,0,0,2.142,0,0,0
+R2,gasboiler,4,0,0,3.213,0,0,0
+R2,gasboiler,5,0,0,6.428999999999999,0,0,0
+R2,gasboiler,6,0,0,4.287,0,0,0
+R2,gasboiler,7,0,0,4.287,0,0,0
+R2,gasboiler,8,0,0,4.287,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
index 54ab24c5..97378524 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,0.714,0,0,0
-1,R1,gasboiler,2,0,0,1.071,0,0,0
-2,R1,gasboiler,3,0,0,0.714,0,0,0
-3,R1,gasboiler,4,0,0,1.071,0,0,0
-4,R1,gasboiler,5,0,0,2.143,0,0,0
-5,R1,gasboiler,6,0,0,1.429,0,0,0
-5,R1,gasboiler,7,0,0,1.429,0,0,0
-5,R1,gasboiler,8,0,0,1.429,0,0,0
-0,R2,gasboiler,1,0,0,0.714,0,0,0
-1,R2,gasboiler,2,0,0,1.071,0,0,0
-2,R2,gasboiler,3,0,0,0.714,0,0,0
-3,R2,gasboiler,4,0,0,1.071,0,0,0
-4,R2,gasboiler,5,0,0,2.143,0,0,0
-5,R2,gasboiler,6,0,0,1.429,0,0,0
-5,R2,gasboiler,7,0,0,1.429,0,0,0
-5,R2,gasboiler,8,0,0,1.429,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,0.714,0,0,0
+R1,gasboiler,2,0,0,1.071,0,0,0
+R1,gasboiler,3,0,0,0.714,0,0,0
+R1,gasboiler,4,0,0,1.071,0,0,0
+R1,gasboiler,5,0,0,2.143,0,0,0
+R1,gasboiler,6,0,0,1.429,0,0,0
+R1,gasboiler,7,0,0,1.429,0,0,0
+R1,gasboiler,8,0,0,1.429,0,0,0
+R2,gasboiler,1,0,0,0.714,0,0,0
+R2,gasboiler,2,0,0,1.071,0,0,0
+R2,gasboiler,3,0,0,0.714,0,0,0
+R2,gasboiler,4,0,0,1.071,0,0,0
+R2,gasboiler,5,0,0,2.143,0,0,0
+R2,gasboiler,6,0,0,1.429,0,0,0
+R2,gasboiler,7,0,0,1.429,0,0,0
+R2,gasboiler,8,0,0,1.429,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
index c2501c58..5e20cf90 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-0,R1,gasboiler,1,0,0,2.142,0,0,0
-1,R1,gasboiler,2,0,0,3.213,0,0,0
-2,R1,gasboiler,3,0,0,2.142,0,0,0
-3,R1,gasboiler,4,0,0,3.213,0,0,0
-4,R1,gasboiler,5,0,0,6.428999999999999,0,0,0
-5,R1,gasboiler,6,0,0,4.287,0,0,0
-5,R1,gasboiler,7,0,0,4.287,0,0,0
-5,R1,gasboiler,8,0,0,4.287,0,0,0
-0,R2,gasboiler,1,0,0,2.142,0,0,0
-1,R2,gasboiler,2,0,0,3.213,0,0,0
-2,R2,gasboiler,3,0,0,2.142,0,0,0
-3,R2,gasboiler,4,0,0,3.213,0,0,0
-4,R2,gasboiler,5,0,0,6.428999999999999,0,0,0
-5,R2,gasboiler,6,0,0,4.287,0,0,0
-5,R2,gasboiler,7,0,0,4.287,0,0,0
-5,R2,gasboiler,8,0,0,4.287,0,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,2.142,0,0,0
+R1,gasboiler,2,0,0,3.213,0,0,0
+R1,gasboiler,3,0,0,2.142,0,0,0
+R1,gasboiler,4,0,0,3.213,0,0,0
+R1,gasboiler,5,0,0,6.428999999999999,0,0,0
+R1,gasboiler,6,0,0,4.287,0,0,0
+R1,gasboiler,7,0,0,4.287,0,0,0
+R1,gasboiler,8,0,0,4.287,0,0,0
+R2,gasboiler,1,0,0,2.142,0,0,0
+R2,gasboiler,2,0,0,3.213,0,0,0
+R2,gasboiler,3,0,0,2.142,0,0,0
+R2,gasboiler,4,0,0,3.213,0,0,0
+R2,gasboiler,5,0,0,6.428999999999999,0,0,0
+R2,gasboiler,6,0,0,4.287,0,0,0
+R2,gasboiler,7,0,0,4.287,0,0,0
+R2,gasboiler,8,0,0,4.287,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
index 0e13d8ff..60cdda57 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
-0,R1,gasboiler,1,0,0,0.714,0,0,0,0.714
-1,R1,gasboiler,2,0,0,1.071,0,0,0,1.071
-2,R1,gasboiler,3,0,0,0.714,0,0,0,0.714
-3,R1,gasboiler,4,0,0,1.071,0,0,0,1.071
-4,R1,gasboiler,5,0,0,2.143,0,0,0,2.143
-5,R1,gasboiler,6,0,0,1.429,0,0,0,1.429
-5,R1,gasboiler,7,0,0,1.429,0,0,0,1.429
-5,R1,gasboiler,8,0,0,1.429,0,0,0,1.429
-0,R2,gasboiler,1,0,0,0.714,0,0,0,0.714
-1,R2,gasboiler,2,0,0,1.071,0,0,0,1.071
-2,R2,gasboiler,3,0,0,0.714,0,0,0,0.714
-3,R2,gasboiler,4,0,0,1.071,0,0,0,1.071
-4,R2,gasboiler,5,0,0,2.143,0,0,0,2.143
-5,R2,gasboiler,6,0,0,1.429,0,0,0,1.429
-5,R2,gasboiler,7,0,0,1.429,0,0,0,1.429
-5,R2,gasboiler,8,0,0,1.429,0,0,0,1.429
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
+R1,gasboiler,1,0,0,0.714,0,0,0,0.714
+R1,gasboiler,2,0,0,1.071,0,0,0,1.071
+R1,gasboiler,3,0,0,0.714,0,0,0,0.714
+R1,gasboiler,4,0,0,1.071,0,0,0,1.071
+R1,gasboiler,5,0,0,2.143,0,0,0,2.143
+R1,gasboiler,6,0,0,1.429,0,0,0,1.429
+R1,gasboiler,7,0,0,1.429,0,0,0,1.429
+R1,gasboiler,8,0,0,1.429,0,0,0,1.429
+R2,gasboiler,1,0,0,0.714,0,0,0,0.714
+R2,gasboiler,2,0,0,1.071,0,0,0,1.071
+R2,gasboiler,3,0,0,0.714,0,0,0,0.714
+R2,gasboiler,4,0,0,1.071,0,0,0,1.071
+R2,gasboiler,5,0,0,2.143,0,0,0,2.143
+R2,gasboiler,6,0,0,1.429,0,0,0,1.429
+R2,gasboiler,7,0,0,1.429,0,0,0,1.429
+R2,gasboiler,8,0,0,1.429,0,0,0,1.429
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
index c5cf2ca6..35043ae3 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
-Unnamed: 0,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
-0,R1,gasboiler,1,0,0,2.142,0,0,0,2.142
-1,R1,gasboiler,2,0,0,3.213,0,0,0,3.213
-2,R1,gasboiler,3,0,0,2.142,0,0,0,2.142
-3,R1,gasboiler,4,0,0,3.213,0,0,0,3.213
-4,R1,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
-5,R1,gasboiler,6,0,0,4.287,0,0,0,4.287
-5,R1,gasboiler,7,0,0,4.287,0,0,0,4.287
-5,R1,gasboiler,8,0,0,4.287,0,0,0,4.287
-0,R2,gasboiler,1,0,0,2.142,0,0,0,2.142
-1,R2,gasboiler,2,0,0,3.213,0,0,0,3.213
-2,R2,gasboiler,3,0,0,2.142,0,0,0,2.142
-3,R2,gasboiler,4,0,0,3.213,0,0,0,3.213
-4,R2,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
-5,R2,gasboiler,6,0,0,4.287,0,0,0,4.287
-5,R2,gasboiler,7,0,0,4.287,0,0,0,4.287
-5,R2,gasboiler,8,0,0,4.287,0,0,0,4.287
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
+R1,gasboiler,1,0,0,2.142,0,0,0,2.142
+R1,gasboiler,2,0,0,3.213,0,0,0,3.213
+R1,gasboiler,3,0,0,2.142,0,0,0,2.142
+R1,gasboiler,4,0,0,3.213,0,0,0,3.213
+R1,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
+R1,gasboiler,6,0,0,4.287,0,0,0,4.287
+R1,gasboiler,7,0,0,4.287,0,0,0,4.287
+R1,gasboiler,8,0,0,4.287,0,0,0,4.287
+R2,gasboiler,1,0,0,2.142,0,0,0,2.142
+R2,gasboiler,2,0,0,3.213,0,0,0,3.213
+R2,gasboiler,3,0,0,2.142,0,0,0,2.142
+R2,gasboiler,4,0,0,3.213,0,0,0,3.213
+R2,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
+R2,gasboiler,6,0,0,4.287,0,0,0,4.287
+R2,gasboiler,7,0,0,4.287,0,0,0,4.287
+R2,gasboiler,8,0,0,4.287,0,0,0,4.287
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..39eac92a 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,1,0,0
+R1,gasboiler,2,0,0,1.5,0,0
+R1,gasboiler,3,0,0,1,0,0
+R1,gasboiler,4,0,0,1.5,0,0
+R1,gasboiler,5,0,0,3,0,0
+R1,gasboiler,6,0,0,2,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv
index ddcb0405..06ab89ab 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,3,0,0
+R1,gasboiler,2,0,0,4.5,0,0
+R1,gasboiler,3,0,0,3,0,0
+R1,gasboiler,4,0,0,4.5,0,0
+R1,gasboiler,5,0,0,9,0,0
+R1,gasboiler,6,0,0,6,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..39eac92a 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,1,0,0
+R1,gasboiler,2,0,0,1.5,0,0
+R1,gasboiler,3,0,0,1,0,0
+R1,gasboiler,4,0,0,1.5,0,0
+R1,gasboiler,5,0,0,3,0,0
+R1,gasboiler,6,0,0,2,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv
index ddcb0405..06ab89ab 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,3,0,0
+R1,gasboiler,2,0,0,4.5,0,0
+R1,gasboiler,3,0,0,3,0,0
+R1,gasboiler,4,0,0,4.5,0,0
+R1,gasboiler,5,0,0,9,0,0
+R1,gasboiler,6,0,0,6,0,0
diff --git a/src/muse/data/example/default/technodata/preset/Residential2020Consumption.csv b/src/muse/data/example/default/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..39eac92a 100644
--- a/src/muse/data/example/default/technodata/preset/Residential2020Consumption.csv
+++ b/src/muse/data/example/default/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,1,0,0
+R1,gasboiler,2,0,0,1.5,0,0
+R1,gasboiler,3,0,0,1,0,0
+R1,gasboiler,4,0,0,1.5,0,0
+R1,gasboiler,5,0,0,3,0,0
+R1,gasboiler,6,0,0,2,0,0
diff --git a/src/muse/data/example/default/technodata/preset/Residential2050Consumption.csv b/src/muse/data/example/default/technodata/preset/Residential2050Consumption.csv
index ddcb0405..06ab89ab 100644
--- a/src/muse/data/example/default/technodata/preset/Residential2050Consumption.csv
+++ b/src/muse/data/example/default/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,3,0,0
+R1,gasboiler,2,0,0,4.5,0,0
+R1,gasboiler,3,0,0,3,0,0
+R1,gasboiler,4,0,0,4.5,0,0
+R1,gasboiler,5,0,0,9,0,0
+R1,gasboiler,6,0,0,6,0,0
diff --git a/src/muse/data/example/default_timeslice/technodata/preset/Residential2020Consumption.csv b/src/muse/data/example/default_timeslice/technodata/preset/Residential2020Consumption.csv
index 1f2cc293..39eac92a 100644
--- a/src/muse/data/example/default_timeslice/technodata/preset/Residential2020Consumption.csv
+++ b/src/muse/data/example/default_timeslice/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,1,0,0
-1,R1,gasboiler,2,0,0,1.5,0,0
-2,R1,gasboiler,3,0,0,1,0,0
-3,R1,gasboiler,4,0,0,1.5,0,0
-4,R1,gasboiler,5,0,0,3,0,0
-5,R1,gasboiler,6,0,0,2,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,1,0,0
+R1,gasboiler,2,0,0,1.5,0,0
+R1,gasboiler,3,0,0,1,0,0
+R1,gasboiler,4,0,0,1.5,0,0
+R1,gasboiler,5,0,0,3,0,0
+R1,gasboiler,6,0,0,2,0,0
diff --git a/src/muse/data/example/default_timeslice/technodata/preset/Residential2050Consumption.csv b/src/muse/data/example/default_timeslice/technodata/preset/Residential2050Consumption.csv
index ddcb0405..06ab89ab 100644
--- a/src/muse/data/example/default_timeslice/technodata/preset/Residential2050Consumption.csv
+++ b/src/muse/data/example/default_timeslice/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,3,0,0
-1,R1,gasboiler,2,0,0,4.5,0,0
-2,R1,gasboiler,3,0,0,3,0,0
-3,R1,gasboiler,4,0,0,4.5,0,0
-4,R1,gasboiler,5,0,0,9,0,0
-5,R1,gasboiler,6,0,0,6,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,3,0,0
+R1,gasboiler,2,0,0,4.5,0,0
+R1,gasboiler,3,0,0,3,0,0
+R1,gasboiler,4,0,0,4.5,0,0
+R1,gasboiler,5,0,0,9,0,0
+R1,gasboiler,6,0,0,6,0,0
diff --git a/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv b/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv
index 9454e2d1..a0c9076d 100644
--- a/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv
+++ b/src/muse/data/example/medium/technodata/preset/Residential2020Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,cook,heat,CO2f,wind
-0,R1,gasboiler,1,0,0,0.5,0.5,0,0
-1,R1,gasboiler,2,0,0,0.75,0.75,0,0
-2,R1,gasboiler,3,0,0,0.5,0.5,0,0
-3,R1,gasboiler,4,0,0,0.75,0.75,0,0
-4,R1,gasboiler,5,0,0,1.5,1.5,0,0
-5,R1,gasboiler,6,0,0,1,1,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,cook,heat,CO2f,wind
+R1,gasboiler,1,0,0,0.5,0.5,0,0
+R1,gasboiler,2,0,0,0.75,0.75,0,0
+R1,gasboiler,3,0,0,0.5,0.5,0,0
+R1,gasboiler,4,0,0,0.75,0.75,0,0
+R1,gasboiler,5,0,0,1.5,1.5,0,0
+R1,gasboiler,6,0,0,1,1,0,0
diff --git a/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv b/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv
index beb805a7..76ebdacf 100644
--- a/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv
+++ b/src/muse/data/example/medium/technodata/preset/Residential2050Consumption.csv
@@ -1,7 +1,7 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,heat,cook,CO2f,wind
-0,R1,gasboiler,1,0,0,1.5,1.5,0,0
-1,R1,gasboiler,2,0,0,2.25,2.25,0,0
-2,R1,gasboiler,3,0,0,1.5,1.5,0,0
-3,R1,gasboiler,4,0,0,2.25,2.25,0,0
-4,R1,gasboiler,5,0,0,4.5,4.5,0,0
-5,R1,gasboiler,6,0,0,3,3,0,0
+RegionName,ProcessName,Timeslice,electricity,gas,heat,cook,CO2f,wind
+R1,gasboiler,1,0,0,1.5,1.5,0,0
+R1,gasboiler,2,0,0,2.25,2.25,0,0
+R1,gasboiler,3,0,0,1.5,1.5,0,0
+R1,gasboiler,4,0,0,2.25,2.25,0,0
+R1,gasboiler,5,0,0,4.5,4.5,0,0
+R1,gasboiler,6,0,0,3,3,0,0
diff --git a/src/muse/data/example/minimum_service/technodata/preset/Industry2010Consumption.csv b/src/muse/data/example/minimum_service/technodata/preset/Industry2010Consumption.csv
index d279477c..a7476b3e 100644
--- a/src/muse/data/example/minimum_service/technodata/preset/Industry2010Consumption.csv
+++ b/src/muse/data/example/minimum_service/technodata/preset/Industry2010Consumption.csv
@@ -1,4 +1,4 @@
-,RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
-0,R1,procammonia_1,1,0,0,0,14.92004,0,0,0,0,0
-1,R1,procammonia_1,2,0,0,0,15.37216242,0,0,0,0,0
-2,R1,procammonia_1,3,0,0,0,14.92004,0,0,0,0,0
+RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
+R1,procammonia_1,1,0,0,0,14.92004,0,0,0,0,0
+R1,procammonia_1,2,0,0,0,15.37216242,0,0,0,0,0
+R1,procammonia_1,3,0,0,0,14.92004,0,0,0,0,0
diff --git a/src/muse/data/example/minimum_service/technodata/preset/Industry2020Consumption.csv b/src/muse/data/example/minimum_service/technodata/preset/Industry2020Consumption.csv
index d279477c..a7476b3e 100644
--- a/src/muse/data/example/minimum_service/technodata/preset/Industry2020Consumption.csv
+++ b/src/muse/data/example/minimum_service/technodata/preset/Industry2020Consumption.csv
@@ -1,4 +1,4 @@
-,RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
-0,R1,procammonia_1,1,0,0,0,14.92004,0,0,0,0,0
-1,R1,procammonia_1,2,0,0,0,15.37216242,0,0,0,0,0
-2,R1,procammonia_1,3,0,0,0,14.92004,0,0,0,0,0
+RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
+R1,procammonia_1,1,0,0,0,14.92004,0,0,0,0,0
+R1,procammonia_1,2,0,0,0,15.37216242,0,0,0,0,0
+R1,procammonia_1,3,0,0,0,14.92004,0,0,0,0,0
diff --git a/src/muse/data/example/minimum_service/technodata/preset/Industry2030Consumption.csv b/src/muse/data/example/minimum_service/technodata/preset/Industry2030Consumption.csv
index 11615caa..d2ab6342 100644
--- a/src/muse/data/example/minimum_service/technodata/preset/Industry2030Consumption.csv
+++ b/src/muse/data/example/minimum_service/technodata/preset/Industry2030Consumption.csv
@@ -1,4 +1,4 @@
-,RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
-0,R1,procammonia_1,1,0,0,0,14.94182491,0,0,0,0,0
-1,R1,procammonia_1,2,0,0,0,15.39460748,0,0,0,0,0
-2,R1,procammonia_1,3,0,0,0,14.94182491,0,0,0,0,0
+RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
+R1,procammonia_1,1,0,0,0,14.94182491,0,0,0,0,0
+R1,procammonia_1,2,0,0,0,15.39460748,0,0,0,0,0
+R1,procammonia_1,3,0,0,0,14.94182491,0,0,0,0,0
diff --git a/src/muse/data/example/minimum_service/technodata/preset/Industry2040Consumption.csv b/src/muse/data/example/minimum_service/technodata/preset/Industry2040Consumption.csv
index d71b315d..9df85f7b 100644
--- a/src/muse/data/example/minimum_service/technodata/preset/Industry2040Consumption.csv
+++ b/src/muse/data/example/minimum_service/technodata/preset/Industry2040Consumption.csv
@@ -1,4 +1,4 @@
-,RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
-0,R1,procammonia_1,1,0,0,0,14.50612647,0,0,0,0,0
-1,R1,procammonia_1,2,0,0,0,14.94570606,0,0,0,0,0
-2,R1,procammonia_1,3,0,0,0,14.50612647,0,0,0,0,0
+RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
+R1,procammonia_1,1,0,0,0,14.50612647,0,0,0,0,0
+R1,procammonia_1,2,0,0,0,14.94570606,0,0,0,0,0
+R1,procammonia_1,3,0,0,0,14.50612647,0,0,0,0,0
diff --git a/src/muse/data/example/minimum_service/technodata/preset/Industry2050Consumption.csv b/src/muse/data/example/minimum_service/technodata/preset/Industry2050Consumption.csv
index b1672409..d47eabb3 100644
--- a/src/muse/data/example/minimum_service/technodata/preset/Industry2050Consumption.csv
+++ b/src/muse/data/example/minimum_service/technodata/preset/Industry2050Consumption.csv
@@ -1,4 +1,4 @@
-,RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
-0,R1,procammonia_1,1,0,0,0,13.68853037,0,0,0,0,0
-1,R1,procammonia_1,2,0,0,0,14.10333432,0,0,0,0,0
-2,R1,procammonia_1,3,0,0,0,13.68853037,0,0,0,0,0
+RegionName,ProcessName,Timeslice,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
+R1,procammonia_1,1,0,0,0,13.68853037,0,0,0,0,0
+R1,procammonia_1,2,0,0,0,14.10333432,0,0,0,0,0
+R1,procammonia_1,3,0,0,0,13.68853037,0,0,0,0,0
diff --git a/src/muse/data/example/trade/technodata/preset/Residential2020Consumption.csv b/src/muse/data/example/trade/technodata/preset/Residential2020Consumption.csv
index 1b4c4c63..265d4aba 100644
--- a/src/muse/data/example/trade/technodata/preset/Residential2020Consumption.csv
+++ b/src/muse/data/example/trade/technodata/preset/Residential2020Consumption.csv
@@ -1,13 +1,13 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,CO2f,wind,heat
-0,R1,gasboiler,1,0,0,0,0,73
-1,R1,gasboiler,2,0,0,0,0,103.2
-2,R1,gasboiler,3,0,0,0,0,77.4
-3,R1,gasboiler,4,0,0,0,0,77.4
-4,R1,gasboiler,5,0,0,0,0,111.8
-5,R1,gasboiler,6,0,0,0,0,77.2
-6,R2,gasboiler,1,0,0,0,0,2
-7,R2,gasboiler,2,0,0,0,0,2.2
-8,R2,gasboiler,3,0,0,0,0,1.8
-9,R2,gasboiler,4,0,0,0,0,1.8
-10,R2,gasboiler,5,0,0,0,0,2.3
-11,R2,gasboiler,6,0,0,0,0,1.8
+RegionName,ProcessName,Timeslice,electricity,gas,CO2f,wind,heat
+R1,gasboiler,1,0,0,0,0,73
+R1,gasboiler,2,0,0,0,0,103.2
+R1,gasboiler,3,0,0,0,0,77.4
+R1,gasboiler,4,0,0,0,0,77.4
+R1,gasboiler,5,0,0,0,0,111.8
+R1,gasboiler,6,0,0,0,0,77.2
+R2,gasboiler,1,0,0,0,0,2
+R2,gasboiler,2,0,0,0,0,2.2
+R2,gasboiler,3,0,0,0,0,1.8
+R2,gasboiler,4,0,0,0,0,1.8
+R2,gasboiler,5,0,0,0,0,2.3
+R2,gasboiler,6,0,0,0,0,1.8
diff --git a/src/muse/data/example/trade/technodata/preset/Residential2030Consumption.csv b/src/muse/data/example/trade/technodata/preset/Residential2030Consumption.csv
index ef2c8416..62799cf8 100644
--- a/src/muse/data/example/trade/technodata/preset/Residential2030Consumption.csv
+++ b/src/muse/data/example/trade/technodata/preset/Residential2030Consumption.csv
@@ -1,13 +1,13 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,CO2f,wind,heat
-0,R1,gasboiler,1,0,0,0,0,87.6
-1,R1,gasboiler,2,0,0,0,0,123.84
-2,R1,gasboiler,3,0,0,0,0,92.88
-3,R1,gasboiler,4,0,0,0,0,92.88
-4,R1,gasboiler,5,0,0,0,0,134.16
-5,R1,gasboiler,6,0,0,0,0,92.64
-6,R2,gasboiler,1,0,0,0,0,2.4
-7,R2,gasboiler,2,0,0,0,0,2.64
-8,R2,gasboiler,3,0,0,0,0,2.16
-9,R2,gasboiler,4,0,0,0,0,2.16
-10,R2,gasboiler,5,0,0,0,0,2.76
-11,R2,gasboiler,6,0,0,0,0,2.16
+RegionName,ProcessName,Timeslice,electricity,gas,CO2f,wind,heat
+R1,gasboiler,1,0,0,0,0,87.6
+R1,gasboiler,2,0,0,0,0,123.84
+R1,gasboiler,3,0,0,0,0,92.88
+R1,gasboiler,4,0,0,0,0,92.88
+R1,gasboiler,5,0,0,0,0,134.16
+R1,gasboiler,6,0,0,0,0,92.64
+R2,gasboiler,1,0,0,0,0,2.4
+R2,gasboiler,2,0,0,0,0,2.64
+R2,gasboiler,3,0,0,0,0,2.16
+R2,gasboiler,4,0,0,0,0,2.16
+R2,gasboiler,5,0,0,0,0,2.76
+R2,gasboiler,6,0,0,0,0,2.16
diff --git a/src/muse/data/example/trade/technodata/preset/Residential2050Consumption.csv b/src/muse/data/example/trade/technodata/preset/Residential2050Consumption.csv
index d5124037..47c784a0 100644
--- a/src/muse/data/example/trade/technodata/preset/Residential2050Consumption.csv
+++ b/src/muse/data/example/trade/technodata/preset/Residential2050Consumption.csv
@@ -1,13 +1,13 @@
-,RegionName,ProcessName,Timeslice,electricity,gas,CO2f,wind,heat
-0,R1,gasboiler,1,0,0,0,0,94.9
-1,R1,gasboiler,2,0,0,0,0,134.16
-2,R1,gasboiler,3,0,0,0,0,100.62
-3,R1,gasboiler,4,0,0,0,0,100.62
-4,R1,gasboiler,5,0,0,0,0,145.34
-5,R1,gasboiler,6,0,0,0,0,100.36
-6,R2,gasboiler,1,0,0,0,0,2.6
-7,R2,gasboiler,2,0,0,0,0,2.86
-8,R2,gasboiler,3,0,0,0,0,2.34
-9,R2,gasboiler,4,0,0,0,0,2.34
-10,R2,gasboiler,5,0,0,0,0,2.99
-11,R2,gasboiler,6,0,0,0,0,2.34
+RegionName,ProcessName,Timeslice,electricity,gas,CO2f,wind,heat
+R1,gasboiler,1,0,0,0,0,94.9
+R1,gasboiler,2,0,0,0,0,134.16
+R1,gasboiler,3,0,0,0,0,100.62
+R1,gasboiler,4,0,0,0,0,100.62
+R1,gasboiler,5,0,0,0,0,145.34
+R1,gasboiler,6,0,0,0,0,100.36
+R2,gasboiler,1,0,0,0,0,2.6
+R2,gasboiler,2,0,0,0,0,2.86
+R2,gasboiler,3,0,0,0,0,2.34
+R2,gasboiler,4,0,0,0,0,2.34
+R2,gasboiler,5,0,0,0,0,2.99
+R2,gasboiler,6,0,0,0,0,2.34

From 09b23d7cf4d2bc932c90e0d39b38ae3425f83f87 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 17 May 2024 00:11:02 +0100
Subject: [PATCH 138/419] Limit MinimumServiceFactor to <1

---
 .../Results/Gas/Capacity/2020.csv             | 14 +--
 .../Results/Gas/Capacity/2025.csv             | 14 +--
 .../Results/Gas/Capacity/2030.csv             | 26 ++---
 .../Results/Gas/Capacity/2035.csv             | 24 ++---
 .../Results/Gas/Capacity/2040.csv             | 20 ++--
 .../Results/Gas/Capacity/2045.csv             | 16 ++--
 .../Results/Gas/Capacity/2050.csv             | 16 ++--
 .../1-min-constraint/Results/MCACapacity.csv  | 20 ++--
 .../Results/MCAMetric_Supply.csv              | 94 +++++++++----------
 .../1-min-constraint/Results/MCAPrices.csv    | 36 +++----
 .../Results/Power/Supply/2020.csv             | 40 ++++----
 .../Results/Power/Supply/2025.csv             | 20 ++--
 .../technodata/power/TechnodataTimeslices.csv | 10 +-
 .../Results/Gas/Capacity/2020.csv             | 14 +--
 .../Results/Gas/Capacity/2025.csv             | 14 +--
 .../Results/Gas/Capacity/2030.csv             | 26 ++---
 .../Results/Gas/Capacity/2035.csv             | 24 ++---
 .../Results/Gas/Capacity/2040.csv             | 20 ++--
 .../Results/Gas/Capacity/2045.csv             | 16 ++--
 .../Results/Gas/Capacity/2050.csv             | 16 ++--
 .../2-max-constraint/Results/MCACapacity.csv  | 20 ++--
 .../Results/MCAMetric_Supply.csv              | 94 +++++++++----------
 .../2-max-constraint/Results/MCAPrices.csv    | 36 +++----
 .../Results/Power/Supply/2020.csv             | 45 ++++-----
 .../Results/Power/Supply/2025.csv             | 25 ++---
 .../technodata/power/TechnodataTimeslices.csv | 10 +-
 .../generate_models.py                        | 13 +++
 27 files changed, 371 insertions(+), 352 deletions(-)

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 371cd8ea..5c04a79f 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,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
+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
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 2afc1e47..83f68b79 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,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
+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
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 3ebe1998..ec7a9590 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,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
+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
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 882acc45..5c5b3b30 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,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
+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
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 9512c0de..b2702c26 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,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
+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
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 33eaf061..e8be0bbd 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,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
+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
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 c9001996..cd8cdf35 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,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
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
index a048f4b8..354aa418 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
@@ -6,21 +6,21 @@ 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,17.57780000000,R1,0,2020,R1,gas,gassupply1,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2030
-A1,10.07780000000,R1,0,2020,R1,gas,gassupply1,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
 A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2035
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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
@@ -28,8 +28,8 @@ A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2040
 A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
 A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
 A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2040
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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
@@ -38,8 +38,8 @@ A1,1.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
 A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
 A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
 A1,2.08150000000,R1,4,2040,R1,power,windturbine,retrofit,2045
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
@@ -47,5 +47,5 @@ A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
 A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
 A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
 A1,2.37860000000,R1,4,2045,R1,power,windturbine,retrofit,2050
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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/1-min-constraint/Results/MCAMetric_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
index b289c102..37d1c853 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
@@ -11,12 +11,12 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000
 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,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
@@ -53,11 +53,11 @@ A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.0
 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,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
@@ -143,18 +143,18 @@ A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2030.0
 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,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
@@ -203,18 +203,18 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.
 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,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
@@ -269,18 +269,18 @@ A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.
 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,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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index bc678ebb..0e22feda 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,2.03880000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.57240000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.03880000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.07160000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.03880000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.57070000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03880000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.07160000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.03880000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.06980000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.03880000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.56890000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.23250000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.18130000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.34900000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.29850000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.23250000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21640000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34900000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.29850000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.69870000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70330000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.46550000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.50340000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
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 b346de20..ce41a4a7 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,28 +1,28 @@
 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,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,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,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,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,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,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,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,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,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
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 cf76dc0a..959636f2 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,26 +1,26 @@
 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,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,1.00000000000
-1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,91.67000000000
+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,1.00000000000
-2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,91.67000000000
+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,1.00000000000
-3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,91.67000000000
+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,1.00000000000
-4,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,late-peak,91.67000000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
index 824ff170..e761b4c5 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
@@ -1,10 +1,10 @@
 ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
 Unit,-,Year,-,-,-,-,-,-
-gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8
 gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
 windturbine,R1,2020,upper,all-year,all-week,night,1,1
 windturbine,R1,2020,upper,all-year,all-week,morning,1,1
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 371cd8ea..5c04a79f 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,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
+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
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 2afc1e47..83f68b79 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,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
+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
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 3ebe1998..ec7a9590 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,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
+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
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 882acc45..5c5b3b30 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,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
+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
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 9512c0de..b2702c26 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,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
+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
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 33eaf061..e8be0bbd 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,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
+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
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 c9001996..cd8cdf35 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,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
+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
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 654985f4..55d57422 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
@@ -6,21 +6,21 @@ 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,17.57780000000,R1,0,2020,R1,gas,gassupply1,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,10.07780000000,R1,0,2020,R1,gas,gassupply1,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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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
@@ -28,8 +28,8 @@ 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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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
@@ -38,8 +38,8 @@ 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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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
@@ -47,5 +47,5 @@ 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,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,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_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
index e3122114..a6d6edc5 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
@@ -11,12 +11,12 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000
 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,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
@@ -53,11 +53,11 @@ A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.0
 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,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
@@ -143,18 +143,18 @@ A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2030.0
 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.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,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
@@ -203,18 +203,18 @@ A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.
 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.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,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
@@ -269,18 +269,18 @@ A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.
 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.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,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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index cfbd6d55..ed4a4096 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,3.98230000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,3.98230000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.25950000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.98230000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.98230000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.01060000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,3.98230000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.29970000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.44960000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.36000000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.29970000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.44960000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.90300000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.59970000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
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 e65a6d4a..cb7d1aae 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,25 +1,28 @@
 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
-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
-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
-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
-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,0.26670000000
+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
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 a746e9d8..8f130d01 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,23 +1,26 @@
 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,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,1.00000000000
-1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,91.67000000000
+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,1.00000000000
-2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,91.67000000000
+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,1.00000000000
-3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,91.67000000000
+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,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,0.26670000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
index 586bce65..a75c7beb 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv
@@ -1,10 +1,10 @@
 ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
 Unit,-,Year,-,-,-,-,-,-
-gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8
 gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
 windturbine,R1,2020,upper,all-year,all-week,night,1,0
 windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index e60812bd..01d75ccf 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -24,6 +24,19 @@ def generate_model_1() -> None:
     examples.copy_model(name="default_timeslice", path=parent_path, overwrite=True)
     os.rename(parent_path / "model", model_path)
 
+    # Modify MinimumServiceFactor for gasCCGT
+    timeslices_file = model_path / "technodata/power/TechnodataTimeslices.csv"
+    df = pd.read_csv(timeslices_file)
+    df.loc[df["ProcessName"] == "gasCCGT", "MinimumServiceFactor"] = [
+        0.2,
+        0.4,
+        0.6,
+        0.4,
+        0.8,
+        1,
+    ]
+    df.to_csv(timeslices_file, index=False)
+
 
 def generate_model_2() -> None:
     model_name = "2-max-constraint"

From 9246cbd3ce89da119d9b24e845d6a34a81d7950b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 17 May 2024 14:42:10 +0100
Subject: [PATCH 139/419] Add modifications needed for dep upgrade

---
 src/muse/agents/agent.py  |  2 +-
 src/muse/investments.py   |  6 +++++-
 src/muse/outputs/cache.py |  5 +++--
 src/muse/outputs/mca.py   | 32 ++++++++++++++++++++++++--------
 src/muse/utilities.py     |  1 -
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 9ac6cb4b..fb41b0e1 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -414,7 +414,7 @@ def next(
         if search is None:
             return None
 
-        search["demand"] = demand
+        search["demand"] = demand.drop_vars(["timeslice", "month", "day", "hour"])
         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/investments.py b/src/muse/investments.py
index f5f4bed2..41a85385 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/outputs/cache.py b/src/muse/outputs/cache.py
index 0f185029..78f125f6 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])
         )
@@ -398,7 +398,7 @@ def check_col(colname: str) -> str:
         .T.groupby(check_col)
         .last(),
         data,
-    )
+    ).T
 
 
 def consolidate_quantity(
@@ -432,6 +432,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 8f75b06a..810b28ef 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -358,7 +358,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
@@ -392,7 +394,9 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
 
             a = data_agent.to_dataframe("supply")
             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 +404,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"])
@@ -592,7 +600,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
@@ -628,7 +638,9 @@ def sector_consumption(
             data_agent["sector"] = getattr(sector, "name", "unnamed")
             a = data_agent.to_dataframe("consumption")
             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 +648,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"])
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index 8555a463..a453e4db 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -427,7 +427,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
 

From bc4a6708f0393b5e47dad1669e6ba2d2bc0b6036 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 17 May 2024 15:28:35 +0100
Subject: [PATCH 140/419] technodata.csv > Technodata.csv

---
 .../1-add-new-technology/generate_models.py            |  6 +++---
 docs/tutorial-code/2-add-agent/generate_models.py      |  2 +-
 .../5-add-service-demand/generate_models.py            |  4 ++--
 docs/user-guide/add-region.ipynb                       |  2 +-
 docs/user-guide/addition-service-demand.ipynb          |  2 +-
 docs/user-guide/modify-timing-data.ipynb               | 10 +++++-----
 src/muse/wizard.py                                     | 10 +++++-----
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 77b47f6b..acea3928 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -31,7 +31,7 @@ def generate_model_1() -> None:
     os.rename(parent_path / "model", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.2
     df.to_csv(technodata_file, index=False)
@@ -57,7 +57,7 @@ def generate_model_1() -> None:
     df.to_csv(commin_file, index=False)
 
     # Modify technodata for solarPV
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "solarPV", "cap_par"] = 30
     df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
@@ -83,7 +83,7 @@ def generate_model_2() -> None:
     add_price_data_for_new_year(model_path, "2040", "power", "2020")
 
     # Modify cap_par for solarPV
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2020"), "cap_par"] = 40
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2040"), "cap_par"] = 30
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 05e2c31c..016c9e47 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -26,7 +26,7 @@ def generate_model_2():
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/residential/technodata.csv"
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.04
     df.to_csv(technodata_file, index=False)
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index d716083e..d0c27a1d 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -53,7 +53,7 @@ def generate_model_1():
     df.to_csv(commin_file, index=False)
 
     # Change cap_par, Fuel and EndUse
-    technodata_file = model_path / "technodata/residential/technodata.csv"
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "gas_stove", "cap_par"] = 8.8667
     df.loc[df["ProcessName"] == "gas_stove", "Fuel"] = "gas"
@@ -63,7 +63,7 @@ def generate_model_1():
     df.to_csv(technodata_file, index=False)
 
     # Change power sector limits
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = 4
     df.loc[1:, "MaxCapacityGrowth"] = 0.4
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 5224bdf0..564d6049 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -54,7 +54,7 @@
     "|**gasboiler**|**R2**|**PJ/y**|**10**|**5**|**0**|**0**|**0**|**0**|**0**|\n",
     "|**heatpump**|**R2**|**PJ/y**|**0**|**0**|**0**|**0**|**0**|**0**|**0**|\n",
     "\n",
-    "Below is the reduced ```/technodata/power/technodata.csv``` file, showing the increased capacity for ```windturbine``` in `R2`. For this, we highlight only the elements we changed from the rows in `R1`. The rest of the elements are the same for `R1` as they are for `R2`.\n",
+    "Below is the reduced ```/technodata/power/Technodata.csv``` file, showing the increased capacity for ```windturbine``` in `R2`. For this, we highlight only the elements we changed from the rows in `R1`. The rest of the elements are the same for `R1` as they are for `R2`.\n",
     "\n",
     "Again, we don't show the entries for 2040, apart from the edited windturbine row, for the sake of brevity.\n",
     "\n",
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 6fb82d3b..61053943 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -200,7 +200,7 @@
     "\n",
     "This is largely a similar process to the tutorial shown in [\"adding a new technology\"](add-solar.ipynb). We must add the input to each of the technologies (gas and electricity for `gas_stove` and `electric_stove` respectively), outputs of `cook` for both and the existing capacity for each technology in each region.\n",
     "\n",
-    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/technodata.csv` file. For this example, we set this file as follows:\n",
+    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/Technodata.csv` file. For this example, we set this file as follows:\n",
     "\n",
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 7e1a5097..1526e27b 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -73,7 +73,7 @@
     "\n",
     "We do the same for the ```Residential2050Consumption.csv```, however this time we make the demand for heat in 2050 to both be 5 for the new timeslices. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file.\n",
     " \n",
-    "<!-- As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service the demand for heat. Therefore, we relax the constraints for growth in ```windturbine``` in region `R2` in the ```technodata/power/technodata.csv``` file, as well as the constraints for ```heatpump```, again in region `R2`. For the full power sector ```technodata.csv``` file click [here INSERT LINK HERE](github-power-technodata), and for the full residential sector ```technodata.csv``` file click [here INSERT LINK HERE](github-residential-technodata). -->"
+    "<!-- As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service the demand for heat. Therefore, we relax the constraints for growth in ```windturbine``` in region `R2` in the ```technodata/power/Technodata.csv``` file, as well as the constraints for ```heatpump```, again in region `R2`. For the full power sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-power-technodata), and for the full residential sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-residential-technodata). -->"
    ]
   },
   {
@@ -169,7 +169,7 @@
    "source": [
     "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n",
     "\n",
-    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/technodata.csv```, as shown below:\n",
+    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv```, as shown below:\n",
     "\n",
     "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|\n",
@@ -182,7 +182,7 @@
     "|solarPV|R2|…|**40**|**0.2**|**120**|…|0|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "We also modify the constraints defined in the `technodata.csv` file for the residential sector, as shown below.\n",
+    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector, as shown below.\n",
     "\n",
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
@@ -194,9 +194,9 @@
     "\n",
     "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",
-    "For the full power sector ```technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n",
+    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n",
     "\n",
-    "<!-- Again, we run the simulation and ensure that the constraints allow for the demand to be met by modifying the `technodata.csv` files. See [here (INSERT LINK HERE)](github-horizon-periods) for the modified full example, including the `technodata.csv` files.\n",
+    "<!-- Again, we run the simulation and ensure that the constraints allow for the demand to be met by modifying the `Technodata.csv` files. See [here (INSERT LINK HERE)](github-horizon-periods) for the modified full example, including the `Technodata.csv` files.\n",
     " -->\n"
    ]
   },
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 7271c103..60a43331 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -32,7 +32,7 @@ def get_sectors(model_path: Path) -> List[str]:
     return [
         s.name
         for s in (model_path / "technodata").iterdir()
-        if (s / "technodata.csv").is_file()
+        if (s / "Technodata.csv").is_file()
     ]
 
 
@@ -95,7 +95,7 @@ def add_new_process(
             f"technodata/{sector}/CommIn.csv",
             f"technodata/{sector}/CommOut.csv",
             f"technodata/{sector}/ExistingCapacity.csv",
-            f"technodata/{sector}/technodata.csv",
+            f"technodata/{sector}/Technodata.csv",
         ]
     ]
 
@@ -120,7 +120,7 @@ def add_price_data_for_new_year(
     """
     files_to_update = [
         model_path / f"technodata/{sector}/{file}"
-        for file in ["technodata.csv", "CommIn.csv", "CommOut.csv"]
+        for file in ["Technodata.csv", "CommIn.csv", "CommOut.csv"]
     ]
 
     for file in files_to_update:
@@ -167,7 +167,7 @@ def add_agent(
     df.to_csv(agents_file, index=False)
 
     for sector in get_sectors(model_path):
-        technodata_file = model_path / f"technodata/{sector}/technodata.csv"
+        technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
         df = pd.read_csv(technodata_file)
         if copy_from_retrofit in df.columns:
             df[agentshare_retrofit] = df[copy_from_retrofit]
@@ -193,7 +193,7 @@ def add_region(model_path: Path, region_name: str, copy_from: str) -> None:
         model_path / "technodata" / sector / file
         for sector in get_sectors(model_path)
         for file in [
-            "technodata.csv",
+            "Technodata.csv",
             "CommIn.csv",
             "CommOut.csv",
             "ExistingCapacity.csv",

From 69f5c2de29a2bcf27638371f82f2863f4e9834f2 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 17 May 2024 15:48:51 +0100
Subject: [PATCH 141/419] Minor text changes for tutorial 1

---
 docs/user-guide/add-solar.ipynb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 2ff2cce6..5901b8b3 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -146,7 +146,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Finally, the ```technodata.csv``` contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version."
+    "Finally, the ```Technodata.csv``` contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version."
    ]
   },
   {
@@ -155,7 +155,7 @@
    "source": [
     "Here, we will only define the parameters: ```processName```, ```RegionName```, ```Time```, ```Level```,```cap_par```, ```Fuel```,```EndUse```,```Agent2``` and ```Agent1```\n",
     "\n",
-    "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```technodata.csv``` file for brevity. You can see the full file [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
+    "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```Technodata.csv``` file for brevity. You can see the full file [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
     "\n",
     "Again, flat forward extension is used here. Therefore, as in this example we only provide data for the benchmark year 2020, 2025 and the following benchmark years will keep the same characteristics, e.g. costs, for each benchmark year of the simulation."
    ]
@@ -244,7 +244,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The ```projections.csv``` file details the initial market prices for the commodities. The market clearing algorithm will update these throughout the simulation, however, an initial estimate is required to start the simulation. As solar energy is free, we will indicate this by adding a final column.\n",
+    "The ```Projections.csv``` file details the initial market prices for the commodities. The market clearing algorithm will update these throughout the simulation, however, an initial estimate is required to start the simulation. As solar energy is free, we will indicate this by adding a final column.\n",
     "\n",
     "Please note that the unit row is not read by MUSE, but used as a reference for the user. The units should be consistent across all input files for MUSE; MUSE does not carry out any unit conversion.\n",
     "\n",
@@ -365,7 +365,7 @@
    "source": [
     "Now, we will observe what happens if we increase the price of solar to be more expensive than wind in the year 2020, but then reduce the price of solar in 2040. By doing this, we should observe an increase in wind in the first few benchmark years of the simulation, followed by a transition to solar as we approach the year 2040.\n",
     "\n",
-    "To achieve this we have to modify the `Technodata.csv`, `CommIn.csv` and `CommOut.csv` files.\n",
+    "To achieve this we have to modify the `Technodata.csv`, `CommIn.csv` and `CommOut.csv` files in the `power` sector.\n",
     "\n",
     "First, we will amend the `Technodata.csv` file as follows:\n",
     "\n",
@@ -442,7 +442,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "From the results, we can see that `windturbine` increases rapidly between 2025 and 2040. However, between the years 2030 and 2050 `solarPV` increases. This is because of the changing cost of `solarPV` during these years. \n",
+    "From the results, we can see that `windturbine` increases rapidly between 2020 and 2040. However, between the years 2030 and 2050 `solarPV` increases. This is because of the changing cost of `solarPV` during these years. \n",
     "\n",
     "For the full example with the completed input files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)"
    ]

From 398a84dfe0859c76cc35295209cb2a1edd3b1cde Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 17 May 2024 16:12:04 +0100
Subject: [PATCH 142/419] Minor text changes for tutorial 2

---
 docs/user-guide/add-agent.ipynb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 2c90398b..ce110e18 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this section, we will add a new agent called `A2`. This agent will be slightly different to the other agents in the ```default``` example, in that it will make investments based upon a mixture of [levelised cost of electricity (LCOE)](https://en.wikipedia.org/wiki/Levelized_cost_of_energy) and [equivalent annual cost (EAC)](https://en.wikipedia.org/wiki/Equivalent_annual_cost). These two objectives will be combined by calculating a weighted sum of the two when comparing potential investment options. We will give the LCOE a relative weight value of 1 and the EAC a relative weight value  of 0.25.\n",
+    "In this section, we will add a new agent called `A2`. This agent will be slightly different to the other agents in the ```default``` example, in that it will make investments based upon a mixture of [levelised cost of electricity (LCOE)](https://en.wikipedia.org/wiki/Levelized_cost_of_energy) and [equivalent annual cost (EAC)](https://en.wikipedia.org/wiki/Equivalent_annual_cost). These two objectives will be combined by calculating a weighted sum of the two when comparing potential investment options. We will give both LCOE and EAC a relative weight value of 0.5.\n",
     "\n",
     "We will continue to use the files from the previous tutorial where we added `solarPV` and created a new scenario. The full, finished case study can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/2-add-agent/1-multiple-objective)\n",
     "\n",
@@ -43,7 +43,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We then edit all of the `technodata` files to split the existing capacity between the two agents by the proportions we like. As we now have two agents which take up 50% of the population each, we will split the existing capacity by 50% for each of the agents. Notice that we only require the columns `Agent2` and `Agent4` to define the retrofit agents.\n",
+    "We then edit all of the `Technodata` files to split the existing capacity between the two agents by the proportions we like. As we now have two agents which take up 50% of the population each, we will split the existing capacity by 50% for each of the agents. Notice that we only require the columns `Agent2` and `Agent4` to define the retrofit agents.\n",
     "\n",
     "The new technodata file for the power sector will look like the following:\n",
     "\n",
@@ -51,8 +51,11 @@
     "|-|-|-|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|Retrofit|**Retrofit**|\n",
     "|gasCCGT|R1|2020|fixed|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
+    "|gasCCGT|R1|2040|fixed|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
     "|windturbine|R1|2020|fixed|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
-    "|solarPV|R1|2020|fixed|30|1|...|solar|electricity|**0.5**|**0.5**|\n",
+    "|windturbine|R1|2040|fixed|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
+    "|solarPV|R1|2020|fixed|40|1|...|solar|electricity|**0.5**|**0.5**|\n",
+    "|solarPV|R1|2040|fixed|30|1|...|solar|electricity|**0.5**|**0.5**|\n",
     "\n",
     "However, remember you will have to make the same changes for the residential and gas sectors!"
    ]
@@ -125,7 +128,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this scenario we can see two divergent strategies. Agent `A2` invests heavily in `windturbine`, `gasCCGT` and `solarPV` early on. Whereas Agent `A1`  invests a small amount in `windturbine` and `gasCCGT`. \n",
+    "In this scenario we can see two divergent strategies. Both agents invests heavily in `windturbine` early on, and relatively little in `gasCCGT`. The share of `solarPV` increases in later years as the price falls (as set in the previous tutorial), but this increase is more dramatic for agent `A2`.\n",
     "\n",
     "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation based models."
    ]
@@ -181,7 +184,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this new scenario, with both agents running the same objective, very similar results between agents can be seen. There is a lower uptake in `gasCCGT`, and a large uptake in `windturbine`, whilst `solarPV` is invested in especially in the year 2040 where a change in the price of `solarPV` was set in the previous tutorial. \n",
+    "In this new scenario, with both agents running the same objective, identical results between agents can be seen. There is large uptake in `windturbine`, whilst `solarPV` is invested in especially in later years where a change in the price of `solarPV` was set in the previous tutorial. \n",
     "\n",
     "As the two agents make the same decisions, we see the same scenario develop for both agents, unlike in the previous scenario.\n",
     "\n",

From 36c5cb211ed4cee29093260c8461c456c51802cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Mon, 20 May 2024 06:43:23 +0100
Subject: [PATCH 143/419] Add more modifications

---
 src/muse/agents/agent.py   |  5 ++++-
 src/muse/outputs/mca.py    |  2 +-
 src/muse/outputs/sector.py |  4 +++-
 src/muse/timeslices.py     | 25 +++++++++++--------------
 tests/test_constraints.py  |  4 +++-
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index fb41b0e1..c5b27d8e 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.drop_vars(["timeslice", "month", "day", "hour"])
+        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/outputs/mca.py b/src/muse/outputs/mca.py
index 810b28ef..01d2c298 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -332,7 +332,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"])
diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py
index d6a30848..bf69de16 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/timeslices.py b/src/muse/timeslices.py
index f0f02cfd..a9553f8d 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -548,24 +548,21 @@ def convert_timeslice(
         index = finest.get_index("finest_timeslice")
         index = index.set_names((f"finest_{u}" for u in index.names))
         mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "finest_timeslice")
-        finest = finest.drop_vars(
-            ["finest_timeslice", "month", "day", "hour"]
-        ).assign_coords(mindex_coords)
+        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", month="month_ts", day="day_ts", hour="hour_ts"
-        )
-        * proj0
-    ).sum("finest_timeslice")
-    return (
-        (P * x)
-        .sum("timeslice")
-        .rename(final_ts="timeslice", month_ts="month", day_ts="day", hour_ts="hour")
-    )
+
+    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/tests/test_constraints.py b/tests/test_constraints.py
index 9556017d..e88149ed 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -170,7 +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]))

From 5ee4126273406f99a0a1646a17f2b04f91cb301f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Mon, 20 May 2024 07:08:57 +0100
Subject: [PATCH 144/419] All unit and doctest fixed!

---
 src/muse/constraints.py  |  3 ++
 src/muse/readers/toml.py | 12 +++----
 src/muse/timeslices.py   | 78 ++++++++++++++++++++--------------------
 src/muse/utilities.py    | 50 +++++++++++++-------------
 4 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index bc482feb..67701269 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -803,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]))
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index 0ea713f3..faa8416a 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -540,14 +540,14 @@ def read_timeslices(
         >>> ref = reference_timeslice(toml)
         >>> transforms = aggregate_transforms(toml, ref)
         >>> read_timeslices(toml, ref, transforms)
-        <xarray.Dataset>
+        <xarray.Dataset> Size: 216B
         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
+          * timeslice        (timeslice) object 48B MultiIndex
+          * semester         (timeslice) object 48B 'summer' 'summer' ... 'winter'
+          * week             (timeslice) object 48B 'weekday' 'weekend' ... 'weekend'
+          * day              (timeslice) object 48B 'allday' 'dusk' ... 'dusk' 'allday'
+            represent_hours  (timeslice) int32 24B 10 1 4 10 1 4
         Data variables:
             *empty*
     '''
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index a9553f8d..97f20450 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -105,12 +105,12 @@ def reference_timeslice(
         ...     level_names = ["season", "week"]
         ...     """
         ... )
-        <xarray.DataArray (timeslice: 8)>
+        <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
@@ -295,13 +295,13 @@ def timeslice_projector(
         ...     dims="timeslice"
         ... )
         >>> input_ts
-        <xarray.DataArray (timeslice: 3)>
+        <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
@@ -309,7 +309,7 @@ def timeslice_projector(
 
         >>> from muse.timeslices import timeslice_projector
         >>> timeslice_projector(input_ts, ref, transforms)
-        <xarray.DataArray 'projector' (finest_timeslice: 10, timeslice: 3)>
+        <xarray.DataArray 'projector' (finest_timeslice: 10, timeslice: 3)> Size: 120B
         array([[1, 0, 0],
                [1, 0, 0],
                [0, 0, 0],
@@ -321,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)>
+        <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
@@ -451,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],
@@ -461,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.
 
@@ -486,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]],
@@ -495,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:
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index a453e4db..2c6c285c 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -116,15 +116,15 @@ def reduce_assets(
         same process:
 
         >>> reduce_assets(data.capacity)
-        <xarray.DataArray 'capacity' (year: 3, asset: 3)>
+        <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'
@@ -135,14 +135,14 @@ def reduce_assets(
         ...     coords=('technology', 'installed'),
         ...     operation = lambda x: x.mean(dim='asset')
         ... )
-        <xarray.DataArray 'capacity' (year: 3, asset: 3)>
+        <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
@@ -493,12 +493,12 @@ def future_propagation(
 
         >>> from muse.utilities import future_propagation
         >>> future_propagation(data, future, threshold=0.1)
-        <xarray.DataArray (fuel: 2, year: 4)>
+        <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,19 +507,19 @@ def future_propagation(
         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)>
+        <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'
+          * 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)
-        <xarray.DataArray (fuel: 2, year: 4)>
+        <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,17 +562,17 @@ def agent_concatenation(
         >>> from muse.utilities import agent_concatenation
         >>> aggregate = agent_concatenation(assets)
         >>> aggregate
-        <xarray.Dataset>
+        <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.

From ff33f7d81b45af27578c8945b3f3552175377be6 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 20 May 2024 11:36:07 +0100
Subject: [PATCH 145/419] Fix failing tests

---
 tests/test_agents.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/test_agents.py b/tests/test_agents.py
index 3b35598a..abfb30dd 100644
--- a/tests/test_agents.py
+++ b/tests/test_agents.py
@@ -41,8 +41,8 @@ def test_create_retrofit(agent_args, technologies, stock):
         **agent_args,
     )
     assert isinstance(agent, Agent)
-    assert len(agent.assets.capacity) == 0
-    assert "asset" in agent.assets.dims and len(agent.assets.asset) == 0
+    assert (agent.assets.capacity == 0).all()
+    assert "asset" in agent.assets.dims and len(agent.assets.asset) != 0
     assert "year" in agent.assets.dims or len(agent.assets.year) > 1
     assert "region" not in agent.assets.dims
     assert "commodity" not in agent.assets.dims
@@ -76,8 +76,8 @@ def test_create_newcapa(agent_args, technologies, stock):
         **agent_args,
     )
     assert isinstance(agent, Agent)
-    assert len(agent.assets.capacity) == 0
-    assert "asset" in agent.assets.dims and len(agent.assets.asset) == 0
+    assert (agent.assets.capacity == 0).all()
+    assert "asset" in agent.assets.dims and len(agent.assets.asset) != 0
     assert "year" in agent.assets.dims or len(agent.assets.year) > 1
     assert "region" not in agent.assets.dims
     assert "commodity" not in agent.assets.dims
@@ -129,8 +129,8 @@ def test_issue_835_and_842(agent_args, technologies, stock):
         **agent_args,
     )
     assert isinstance(agent, Agent)
-    assert len(agent.assets.capacity) == 0
-    assert "asset" in agent.assets.dims and len(agent.assets.asset) == 0
+    assert (agent.assets.capacity == 0).all()
+    assert "asset" in agent.assets.dims and len(agent.assets.asset) != 0
     assert "year" in agent.assets.dims or len(agent.assets.year) > 1
     assert "region" not in agent.assets.dims
     assert "commodity" not in agent.assets.dims

From 661c5bacfd1e5fd80317754911a10a4db4e5d2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Tue, 21 May 2024 06:55:48 +0100
Subject: [PATCH 146/419] Add codecov secret

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37810196..15cb2530 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,10 @@ jobs:
       - name: Upload coverage to Codecov
         if: success() && (runner.os == 'Linux' && matrix.python-version == 3.9)
         uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
 
       - name: Unit tests (not linux)
         if: (runner.os != 'Linux')

From 01fa6bfd011491af6961804927eb00c4a2409410 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 11:18:20 +0100
Subject: [PATCH 147/419] Improvements to tutorials 4 and 5

---
 .../Results/Gas/Capacity/2025.csv             |  17 +
 .../Results/Gas/Capacity/2035.csv             |  25 +
 .../Results/Gas/Capacity/2045.csv             |  17 +
 .../Results/Gas/Capacity/2050.csv             |  17 +
 .../Results/Power/Capacity/2025.csv           |  53 ++
 .../Results/Power/Capacity/2035.csv           | 105 ++++
 .../Results/Power/Capacity/2045.csv           | 131 +++++
 .../Results/Power/Capacity/2050.csv           | 121 ++++
 .../Results/Residential/Capacity/2025.csv     |  25 +
 .../Results/Residential/Capacity/2035.csv     |  33 ++
 .../Results/Residential/Capacity/2045.csv     |  25 +
 .../Results/Residential/Capacity/2050.csv     |  21 +
 .../Results/Residential/Supply/2025.csv       | 169 ++++++
 .../Results/Residential/Supply/2035.csv       | 193 +++++++
 .../Results/Residential/Supply/2045.csv       | 145 +++++
 .../Results/Residential/Supply/2050.csv       |  97 ++++
 .../4-modify-timing-data/generate_models.py   |   4 +-
 .../Results/Gas/Capacity/2020.csv             |   0
 .../Results/Gas/Capacity/2025.csv             |   0
 .../Results/Gas/Capacity/2030.csv             |   0
 .../Results/Gas/Capacity/2035.csv             |   0
 .../Results/Gas/Capacity/2040.csv             |   0
 .../Results/Gas/Capacity/2045.csv             |   0
 .../Results/Gas/Capacity/2050.csv             |   0
 .../Results/MCACapacity.csv                   |  79 ++-
 .../Results/MCAPrices.csv                     | 520 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  18 +-
 .../Results/Power/Capacity/2025.csv           |  44 +-
 .../Results/Power/Capacity/2030.csv           |  68 +++
 .../Results/Power/Capacity/2035.csv}          |  38 +-
 .../Results/Power/Capacity/2040.csv}          |  39 +-
 .../Results/Power/Capacity/2045.csv           | 119 ++++
 .../Results/Power/Capacity/2050.csv           | 113 ++++
 .../Results/Residential/Capacity/2020.csv     |  12 +-
 .../Results/Residential/Capacity/2025.csv     |  28 +-
 .../Results/Residential/Capacity/2030.csv     |  40 +-
 .../Results/Residential/Capacity/2035.csv     |  40 +-
 .../Results/Residential/Capacity/2040.csv     |  41 ++
 .../Results/Residential/Capacity/2045.csv     |  41 ++
 .../Results/Residential/Capacity/2050.csv     |  41 ++
 .../Results/Residential/Supply/2020.csv       |  64 +--
 .../Results/Residential/Supply/2025.csv       | 192 +++----
 .../Results/Residential/Supply/2030.csv       | 256 ++++-----
 .../Results/Residential/Supply/2035.csv       | 256 ++++-----
 .../Results/Residential/Supply/2040.csv       | 257 +++++++++
 .../Results/Residential/Supply/2045.csv       | 257 +++++++++
 .../Results/Residential/Supply/2050.csv       | 257 +++++++++
 .../input/BaseYearExport.csv                  |   0
 .../input/BaseYearImport.csv                  |   0
 .../input/GlobalCommodities.csv               |   0
 .../input/Projections.csv                     |   0
 .../settings.toml                             |   0
 .../technodata/Agents.csv                     |   0
 .../technodata/gas/CommIn.csv                 |   0
 .../technodata/gas/CommOut.csv                |   0
 .../technodata/gas/ExistingCapacity.csv       |   0
 .../technodata/gas/Technodata.csv             |   0
 .../technodata/power/CommIn.csv               |   0
 .../technodata/power/CommOut.csv              |   0
 .../technodata/power/ExistingCapacity.csv     |   0
 .../technodata/power/Technodata.csv           |  14 +
 .../preset/Residential2020Consumption.csv     |   0
 .../preset/Residential2050Consumption.csv     |   0
 .../technodata/residential/CommIn.csv         |   4 +-
 .../technodata/residential/CommOut.csv        |   4 +-
 .../residential/ExistingCapacity.csv          |   4 +-
 .../technodata/residential/Technodata.csv     |   8 +-
 .../Results/Power/Capacity/2040.csv           | 113 ----
 .../Results/Power/Capacity/2045.csv           | 141 -----
 .../Results/Power/Capacity/2050.csv           | 129 -----
 .../Results/Residential/Capacity/2040.csv     |  41 --
 .../Results/Residential/Capacity/2045.csv     |  41 --
 .../Results/Residential/Capacity/2050.csv     |  41 --
 .../Results/Residential/Supply/2040.csv       | 257 ---------
 .../Results/Residential/Supply/2045.csv       | 257 ---------
 .../Results/Residential/Supply/2050.csv       | 257 ---------
 .../technodata/power/Technodata.csv           |  14 -
 .../5-add-service-demand/generate_models.py   |  20 +-
 docs/user-guide/add-region.ipynb              |  22 +-
 docs/user-guide/addition-service-demand.ipynb |  69 +--
 docs/user-guide/modify-timing-data.ipynb      |  73 ++-
 81 files changed, 3318 insertions(+), 2209 deletions(-)
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2020.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2025.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2030.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2035.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2040.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2045.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Gas/Capacity/2050.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/MCACapacity.csv (71%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/MCAPrices.csv (59%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Power/Capacity/2020.csv (58%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Power/Capacity/2025.csv (56%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand/Results/Power/Capacity/2030.csv => 1-exogenous-demand/Results/Power/Capacity/2035.csv} (71%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand/Results/Power/Capacity/2035.csv => 1-exogenous-demand/Results/Power/Capacity/2040.csv} (74%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Capacity/2020.csv (68%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Capacity/2025.csv (69%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Capacity/2030.csv (62%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Capacity/2035.csv (56%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Supply/2020.csv (89%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Supply/2025.csv (78%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Supply/2030.csv (74%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/Results/Residential/Supply/2035.csv (65%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/input/BaseYearExport.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/input/BaseYearImport.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/input/GlobalCommodities.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/input/Projections.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/settings.toml (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/Agents.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/gas/CommIn.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/gas/CommOut.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/gas/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/gas/Technodata.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/power/CommIn.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/power/CommOut.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/power/ExistingCapacity.csv (100%)
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/preset/Residential2020Consumption.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/preset/Residential2050Consumption.csv (100%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/residential/CommIn.csv (80%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/residential/CommOut.csv (80%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/residential/ExistingCapacity.csv (77%)
 rename docs/tutorial-code/5-add-service-demand/{1-new-service-demand => 1-exogenous-demand}/technodata/residential/Technodata.csv (64%)
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
 delete mode 100644 docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv

diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..57ef9d5d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,17 @@
+asset,year,technology,region,installed,capacity
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2025,2.79440000000
+1,2035,gassupply1,R1,2025,2.79440000000
+1,2040,gassupply1,R1,2025,2.79440000000
+1,2045,gassupply1,R1,2025,2.79440000000
+1,2050,gassupply1,R1,2025,2.79440000000
+1,2064,gassupply1,R1,2025,2.79440000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2030,gassupply1,R2,2025,2.79440000000
+3,2035,gassupply1,R2,2025,2.79440000000
+3,2040,gassupply1,R2,2025,2.79440000000
+3,2045,gassupply1,R2,2025,2.79440000000
+3,2050,gassupply1,R2,2025,2.79440000000
+3,2064,gassupply1,R2,2025,2.79440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..be63ee95
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..33d01ddd
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..59af6136
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..0b9e6c57
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
@@ -0,0 +1,53 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2030,gasCCGT,R1,2025,3.00000000000
+1,2035,gasCCGT,R1,2025,3.00000000000
+1,2040,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R1,2025,3.00000000000
+1,2049,gasCCGT,R1,2025,3.00000000000
+1,2050,gasCCGT,R1,2025,3.00000000000
+1,2054,gasCCGT,R1,2025,3.00000000000
+1,2055,gasCCGT,R1,2025,3.00000000000
+1,2064,gasCCGT,R1,2025,3.00000000000
+2,2025,gasCCGT,R2,2020,1.00000000000
+3,2030,gasCCGT,R2,2025,3.00000000000
+3,2035,gasCCGT,R2,2025,3.00000000000
+3,2040,gasCCGT,R2,2025,3.00000000000
+3,2045,gasCCGT,R2,2025,3.00000000000
+3,2049,gasCCGT,R2,2025,3.00000000000
+3,2050,gasCCGT,R2,2025,3.00000000000
+3,2054,gasCCGT,R2,2025,3.00000000000
+3,2055,gasCCGT,R2,2025,3.00000000000
+3,2064,gasCCGT,R2,2025,3.00000000000
+4,2025,solarPV,R1,2020,6.75000000000
+4,2030,solarPV,R1,2020,6.75000000000
+4,2035,solarPV,R1,2020,6.75000000000
+4,2040,solarPV,R1,2020,6.75000000000
+4,2045,solarPV,R1,2020,6.75000000000
+4,2049,solarPV,R1,2020,6.75000000000
+5,2030,solarPV,R1,2025,2.40000000000
+5,2035,solarPV,R1,2025,2.40000000000
+5,2040,solarPV,R1,2025,2.40000000000
+5,2045,solarPV,R1,2025,2.40000000000
+5,2049,solarPV,R1,2025,2.40000000000
+5,2050,solarPV,R1,2025,2.40000000000
+5,2054,solarPV,R1,2025,2.40000000000
+6,2030,solarPV,R2,2025,2.40000000000
+6,2035,solarPV,R2,2025,2.40000000000
+6,2040,solarPV,R2,2025,2.40000000000
+6,2045,solarPV,R2,2025,2.40000000000
+6,2049,solarPV,R2,2025,2.40000000000
+6,2050,solarPV,R2,2025,2.40000000000
+6,2054,solarPV,R2,2025,2.40000000000
+7,2025,windturbine,R1,2020,10.00000000000
+7,2030,windturbine,R1,2020,10.00000000000
+7,2035,windturbine,R1,2020,10.00000000000
+7,2040,windturbine,R1,2020,10.00000000000
+7,2045,windturbine,R1,2020,10.00000000000
+7,2049,windturbine,R1,2020,10.00000000000
+8,2025,windturbine,R2,2020,16.75000000000
+8,2030,windturbine,R2,2020,16.75000000000
+8,2035,windturbine,R2,2020,16.75000000000
+8,2040,windturbine,R2,2020,16.75000000000
+8,2045,windturbine,R2,2020,16.75000000000
+8,2049,windturbine,R2,2020,16.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..bc71a6d4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
@@ -0,0 +1,105 @@
+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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..b04feb4a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
@@ -0,0 +1,131 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,3.00000000000
+0,2049,gasCCGT,R1,2025,3.00000000000
+0,2050,gasCCGT,R1,2025,3.00000000000
+0,2054,gasCCGT,R1,2025,3.00000000000
+0,2055,gasCCGT,R1,2025,3.00000000000
+0,2059,gasCCGT,R1,2025,3.00000000000
+0,2060,gasCCGT,R1,2025,3.00000000000
+0,2064,gasCCGT,R1,2025,3.00000000000
+1,2045,gasCCGT,R2,2025,3.00000000000
+1,2049,gasCCGT,R2,2025,3.00000000000
+1,2050,gasCCGT,R2,2025,3.00000000000
+1,2054,gasCCGT,R2,2025,3.00000000000
+1,2055,gasCCGT,R2,2025,3.00000000000
+1,2059,gasCCGT,R2,2025,3.00000000000
+1,2060,gasCCGT,R2,2025,3.00000000000
+1,2064,gasCCGT,R2,2025,3.00000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2045,solarPV,R1,2025,2.40000000000
+3,2049,solarPV,R1,2025,2.40000000000
+3,2050,solarPV,R1,2025,2.40000000000
+3,2054,solarPV,R1,2025,2.40000000000
+4,2045,solarPV,R1,2030,6.00000000000
+4,2049,solarPV,R1,2030,6.00000000000
+4,2050,solarPV,R1,2030,6.00000000000
+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
+15,2045,windturbine,R2,2020,16.75000000000
+15,2049,windturbine,R2,2020,16.75000000000
+16,2045,windturbine,R2,2030,3.60000000000
+16,2049,windturbine,R2,2030,3.60000000000
+16,2050,windturbine,R2,2030,3.60000000000
+16,2054,windturbine,R2,2030,3.60000000000
+16,2055,windturbine,R2,2030,3.60000000000
+16,2059,windturbine,R2,2030,3.60000000000
+17,2045,windturbine,R2,2035,4.39000000000
+17,2049,windturbine,R2,2035,4.39000000000
+17,2050,windturbine,R2,2035,4.39000000000
+17,2054,windturbine,R2,2035,4.39000000000
+17,2055,windturbine,R2,2035,4.39000000000
+17,2059,windturbine,R2,2035,4.39000000000
+17,2060,windturbine,R2,2035,4.39000000000
+17,2064,windturbine,R2,2035,4.39000000000
+18,2050,windturbine,R2,2045,6.75000000000
+18,2054,windturbine,R2,2045,6.75000000000
+18,2055,windturbine,R2,2045,6.75000000000
+18,2059,windturbine,R2,2045,6.75000000000
+18,2060,windturbine,R2,2045,6.75000000000
+18,2064,windturbine,R2,2045,6.75000000000
+18,2065,windturbine,R2,2045,6.75000000000
+18,2069,windturbine,R2,2045,6.75000000000
+18,2070,windturbine,R2,2045,6.75000000000
+18,2074,windturbine,R2,2045,6.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..37b2c93a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
@@ -0,0 +1,121 @@
+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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..34d42206
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,4.10000000000
+1,2034,gasboiler,R1,2025,4.10000000000
+1,2035,gasboiler,R1,2025,4.10000000000
+1,2039,gasboiler,R1,2025,4.10000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,4.10000000000
+3,2034,gasboiler,R2,2025,4.10000000000
+3,2035,gasboiler,R2,2025,4.10000000000
+3,2039,gasboiler,R2,2025,4.10000000000
+4,2025,heatpump,R1,2020,19.00000000000
+4,2030,heatpump,R1,2020,19.00000000000
+4,2034,heatpump,R1,2020,19.00000000000
+5,2030,heatpump,R1,2025,6.90000000000
+5,2034,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2025,6.90000000000
+5,2039,heatpump,R1,2025,6.90000000000
+6,2025,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2020,19.00000000000
+6,2034,heatpump,R2,2020,19.00000000000
+7,2030,heatpump,R2,2025,6.90000000000
+7,2034,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..fa9e8bca
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2040,gasboiler,R1,2035,0.91000000000
+1,2044,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R1,2035,0.91000000000
+1,2049,gasboiler,R1,2035,0.91000000000
+2,2035,gasboiler,R2,2025,4.10000000000
+2,2039,gasboiler,R2,2025,4.10000000000
+3,2040,gasboiler,R2,2035,0.91000000000
+3,2044,gasboiler,R2,2035,0.91000000000
+3,2045,gasboiler,R2,2035,0.91000000000
+3,2049,gasboiler,R2,2035,0.91000000000
+4,2035,heatpump,R1,2025,6.90000000000
+4,2039,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2030,25.00000000000
+5,2039,heatpump,R1,2030,25.00000000000
+5,2040,heatpump,R1,2030,25.00000000000
+5,2044,heatpump,R1,2030,25.00000000000
+6,2040,heatpump,R1,2035,16.09000000000
+6,2044,heatpump,R1,2035,16.09000000000
+6,2045,heatpump,R1,2035,16.09000000000
+6,2049,heatpump,R1,2035,16.09000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
+8,2035,heatpump,R2,2030,25.00000000000
+8,2039,heatpump,R2,2030,25.00000000000
+8,2040,heatpump,R2,2030,25.00000000000
+8,2044,heatpump,R2,2030,25.00000000000
+9,2040,heatpump,R2,2035,16.09000000000
+9,2044,heatpump,R2,2035,16.09000000000
+9,2045,heatpump,R2,2035,16.09000000000
+9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..0b5fe3de
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2045,heatpump,R1,2035,16.09000000000
+2,2049,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2040,31.00000000000
+3,2049,heatpump,R1,2040,31.00000000000
+3,2050,heatpump,R1,2040,31.00000000000
+3,2054,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2045,23.00000000000
+4,2054,heatpump,R1,2045,23.00000000000
+4,2055,heatpump,R1,2045,23.00000000000
+4,2059,heatpump,R1,2045,23.00000000000
+5,2045,heatpump,R2,2035,16.09000000000
+5,2049,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2040,31.00000000000
+6,2049,heatpump,R2,2040,31.00000000000
+6,2050,heatpump,R2,2040,31.00000000000
+6,2054,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2045,23.00000000000
+7,2054,heatpump,R2,2045,23.00000000000
+7,2055,heatpump,R2,2045,23.00000000000
+7,2059,heatpump,R2,2045,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..eb21c442
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..eb9ddd9d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..21119f08
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..98be95de
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..26d4aa26
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 4d539f73..bfb16176 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -93,7 +93,7 @@ def generate_model_2():
             ),
         )
 
-    # Double capacity limits in power sector
+    # Increase capacity limits in power sector
     technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
@@ -104,7 +104,7 @@ def generate_model_2():
     df.loc[1:, "TotalCapacityLimit"] *= 2
     df.to_csv(technodata_file, index=False)
 
-    # Double capacity limits in residential sector
+    # Increase capacity limits in residential sector
     technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
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-exogenous-demand/Results/Gas/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
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-exogenous-demand/Results/Gas/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
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-exogenous-demand/Results/Gas/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
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-exogenous-demand/Results/Gas/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
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-exogenous-demand/Results/Gas/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
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-exogenous-demand/Results/Gas/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
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-exogenous-demand/Results/Gas/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
similarity index 71%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 0b335432..0c6ffd81 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -7,11 +7,11 @@ gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-estove,R1,R1,A1,residential,retrofit,2025,17.85870000000
+electric_stove,R1,R1,A1,residential,retrofit,2025,17.85870000000
 gas_stove,R1,R1,A1,residential,retrofit,2025,5.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
-estove,R2,R2,A1,residential,retrofit,2025,17.85870000000
+electric_stove,R2,R2,A1,residential,retrofit,2025,17.85870000000
 gas_stove,R2,R2,A1,residential,retrofit,2025,5.00000000000
 gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
@@ -19,18 +19,17 @@ gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
 solarPV,R1,R1,A1,power,retrofit,2025,13.46730000000
 windturbine,R1,R1,A1,power,retrofit,2025,20.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-solarPV,R2,R2,A1,power,retrofit,2025,13.46730000000
-windturbine,R2,R2,A1,power,retrofit,2025,20.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-estove,R1,R1,A1,residential,retrofit,2030,17.85870000000
-estove,R1,R1,A1,residential,retrofit,2030,8.57170000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,17.85870000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,8.57170000000
 gas_stove,R1,R1,A1,residential,retrofit,2030,2.14290000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
 heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
 heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
-estove,R2,R2,A1,residential,retrofit,2030,17.85870000000
-estove,R2,R2,A1,residential,retrofit,2030,8.57170000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,17.85870000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,8.57170000000
 gas_stove,R2,R2,A1,residential,retrofit,2030,2.14290000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
@@ -40,21 +39,20 @@ solarPV,R1,R1,A1,power,retrofit,2030,13.46730000000
 solarPV,R1,R1,A1,power,retrofit,2030,10.39350000000
 windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2030,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,13.46730000000
 solarPV,R2,R2,A1,power,retrofit,2030,10.39350000000
-windturbine,R2,R2,A1,power,retrofit,2030,20.00000000000
+windturbine,R2,R2,A1,power,retrofit,2030,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,4.70400000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,4.70400000000
-estove,R1,R1,A1,residential,retrofit,2035,8.57170000000
-estove,R1,R1,A1,residential,retrofit,2035,23.57330000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,8.57170000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,23.57330000000
 gas_stove,R1,R1,A1,residential,retrofit,2035,2.14290000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
 heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
 heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
-estove,R2,R2,A1,residential,retrofit,2035,8.57170000000
-estove,R2,R2,A1,residential,retrofit,2035,23.57330000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,8.57170000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,23.57330000000
 gas_stove,R2,R2,A1,residential,retrofit,2035,2.14290000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
@@ -65,20 +63,19 @@ solarPV,R1,R1,A1,power,retrofit,2035,10.39350000000
 solarPV,R1,R1,A1,power,retrofit,2035,11.42930000000
 windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2035,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,13.46730000000
 solarPV,R2,R2,A1,power,retrofit,2035,10.39350000000
 solarPV,R2,R2,A1,power,retrofit,2035,11.42930000000
-windturbine,R2,R2,A1,power,retrofit,2035,20.00000000000
+windturbine,R2,R2,A1,power,retrofit,2035,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,4.70400000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2035,4.70400000000
 gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
-estove,R1,R1,A1,residential,retrofit,2040,23.57330000000
-estove,R1,R1,A1,residential,retrofit,2040,16.42930000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,23.57330000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,16.42930000000
 heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
 heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
-estove,R2,R2,A1,residential,retrofit,2040,23.57330000000
-estove,R2,R2,A1,residential,retrofit,2040,16.42930000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,23.57330000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
 gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
@@ -88,21 +85,20 @@ solarPV,R1,R1,A1,power,retrofit,2040,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2040,15.71520000000
 windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2040,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,13.46730000000
 solarPV,R2,R2,A1,power,retrofit,2040,10.39350000000
 solarPV,R2,R2,A1,power,retrofit,2040,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2040,15.71520000000
-windturbine,R2,R2,A1,power,retrofit,2040,20.00000000000
+windturbine,R2,R2,A1,power,retrofit,2040,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,4.70400000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,4.70400000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
-estove,R1,R1,A1,residential,retrofit,2045,16.42930000000
-estove,R1,R1,A1,residential,retrofit,2045,29.28800000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,16.42930000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,29.28800000000
 heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
 heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
-estove,R2,R2,A1,residential,retrofit,2045,16.42930000000
-estove,R2,R2,A1,residential,retrofit,2045,29.28800000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,16.42930000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
 gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
@@ -110,45 +106,40 @@ solarPV,R1,R1,A1,power,retrofit,2045,13.46730000000
 solarPV,R1,R1,A1,power,retrofit,2045,10.39350000000
 solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2045,15.71520000000
-solarPV,R1,R1,A1,power,retrofit,2045,8.99470000000
+solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
 windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,2.43470000000
 gasCCGT,R2,R2,A1,power,retrofit,2045,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,13.46730000000
 solarPV,R2,R2,A1,power,retrofit,2045,10.39350000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2045,15.71520000000
-solarPV,R2,R2,A1,power,retrofit,2045,8.99470000000
-windturbine,R2,R2,A1,power,retrofit,2045,20.00000000000
-windturbine,R2,R2,A1,power,retrofit,2045,2.43470000000
+solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
+windturbine,R2,R2,A1,power,retrofit,2045,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,4.70400000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2045,4.70400000000
 gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
-estove,R1,R1,A1,residential,retrofit,2050,29.28800000000
-estove,R1,R1,A1,residential,retrofit,2050,22.14400000000
+electric_stove,R1,R1,A1,residential,retrofit,2050,29.28800000000
+electric_stove,R1,R1,A1,residential,retrofit,2050,22.14400000000
 heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
 heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
-estove,R2,R2,A1,residential,retrofit,2050,29.28800000000
-estove,R2,R2,A1,residential,retrofit,2050,22.14400000000
+electric_stove,R2,R2,A1,residential,retrofit,2050,29.28800000000
+electric_stove,R2,R2,A1,residential,retrofit,2050,22.14400000000
 heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
 gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2050,10.39350000000
 solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2050,15.71520000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.99470000000
-solarPV,R1,R1,A1,power,retrofit,2050,24.89670000000
-windturbine,R1,R1,A1,power,retrofit,2050,2.43470000000
-windturbine,R1,R1,A1,power,retrofit,2050,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
+solarPV,R1,R1,A1,power,retrofit,2050,31.42930000000
+windturbine,R1,R1,A1,power,retrofit,2050,13.46730000000
 gasCCGT,R2,R2,A1,power,retrofit,2050,4.00000000000
 solarPV,R2,R2,A1,power,retrofit,2050,10.39350000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2050,15.71520000000
-solarPV,R2,R2,A1,power,retrofit,2050,8.99470000000
-solarPV,R2,R2,A1,power,retrofit,2050,24.89670000000
-windturbine,R2,R2,A1,power,retrofit,2050,2.43470000000
-windturbine,R2,R2,A1,power,retrofit,2050,20.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
+solarPV,R2,R2,A1,power,retrofit,2050,31.42930000000
+windturbine,R2,R2,A1,power,retrofit,2050,13.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,4.70400000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2050,4.70400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
similarity index 59%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index 35c903fd..c2ac1894 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,408 +79,408 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.19900000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.19900000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.19730000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.19730000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
 "('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.74290000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,0.74290000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.29850000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.29850000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.74130000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,0.74130000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.29590000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.29590000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
 "('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.11440000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,1.11440000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.19900000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.19900000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,1.11200000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,1.11200000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.19730000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.19730000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.74290000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.74290000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.29850000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.29850000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.74130000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.74130000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.29590000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.29590000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.11440000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,1.11440000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.59720000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.59720000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,1.11200000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,1.11200000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.59210000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.59210000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.22990000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,2.22990000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.39830000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.39830000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,2.22500000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,2.22500000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.39480000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.39480000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
 "('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.48690000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,1.48690000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.39830000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.39830000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,1.48370000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,1.48370000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.39480000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.39480000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
 "('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
 "('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,1.48690000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,1.48690000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.39830000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.39830000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,1.48370000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,1.48370000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.39480000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.39480000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.48690000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.48690000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.25660000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.25660000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.48370000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.48370000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.25540000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.25540000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.07210000000,2030
 "('all-year', 'all-week', 'night')",heat,R2,0.07210000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.06030000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.06030000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.38520000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.38520000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.05970000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,0.05970000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.38350000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.38350000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11230000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.11230000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.11220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.11220000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.09460000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.09460000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.25660000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.25660000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.09360000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,0.09360000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.25540000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.25540000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07210000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07210000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.06030000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.06030000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.38520000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.38520000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05970000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.38350000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.38350000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11230000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11230000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11220000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.09460000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.09460000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.77320000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.77320000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.09360000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.09360000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.76970000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.76970000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.24910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.24860000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.24860000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.21360000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.21360000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.51450000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.51450000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.21150000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.21150000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.51220000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.51220000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15520000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.15520000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.15510000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.15510000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.13160000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,0.13160000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.51450000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.51450000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,0.13030000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,0.13030000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.51220000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.51220000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.15520000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.15520000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.15510000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.15510000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.13160000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.13160000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.51450000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.51450000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.13030000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.13030000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.51220000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.51220000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15520000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15520000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15510000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15510000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.13160000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.13160000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.27930000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.27930000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.13030000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.13030000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.27830000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.27830000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08150000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08150000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08140000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08140000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.06780000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.06780000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.41930000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.41930000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.06730000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,0.06730000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.41780000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.41780000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12750000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.12750000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.12740000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.12740000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.10700000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.10700000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27930000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27930000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.10620000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,0.10620000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27830000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27830000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08150000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08150000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08140000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08140000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.06780000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.06780000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41930000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41930000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.06730000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.06730000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41780000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41780000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12750000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12750000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12740000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.12740000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.10700000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.10700000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.84080000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.84080000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.10620000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.10620000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.83790000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.83790000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28680000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28680000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28650000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.28650000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.24590000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.24590000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.55980000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.55980000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.24420000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.24420000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.55790000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.55790000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17710000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.17710000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.17700000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.17700000000,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', 'evening')",cook,R1,0.14980000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.14980000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.55980000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.55980000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.14880000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,0.14880000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.55790000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.55790000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.17710000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.17710000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.17700000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.17700000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.14980000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.14980000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.55980000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.55980000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.14880000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.14880000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.55790000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.55790000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17710000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17710000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17700000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17700000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.14980000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.14980000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.28270000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.28270000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.14880000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.14880000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.28200000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.28200000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02090000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02090000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02080000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.02080000000,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', 'night')",cook,R1,0.02090000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.02090000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.42440000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.42440000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.02080000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.02080000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.42320000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.42320000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.03730000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.03730000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.03720000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.03720000000,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', 'morning')",cook,R1,0.03730000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.03730000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.28270000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.28270000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.03720000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.03720000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.28200000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.28200000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02090000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02090000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02080000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02090000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02090000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.42440000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.42440000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02080000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.42320000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.42320000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03730000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03730000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03720000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03720000000,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', 'early-peak')",cook,R1,0.03730000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03730000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.85060000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.85060000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.03720000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03720000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.84840000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.84840000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11070000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11070000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.11050000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.11050000000,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', 'late-peak')",cook,R1,0.11070000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.11070000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.56660000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.56660000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11050000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.11050000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.56500000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.56500000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05780000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.05780000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05770000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.05770000000,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', 'evening')",cook,R1,0.05780000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.05780000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.56660000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.56660000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.05770000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.05770000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.56500000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.56500000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.05780000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.05780000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.05770000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.05770000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.05780000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.05780000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.56660000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.56660000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.05770000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.05770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.56500000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.56500000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05780000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05780000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05770000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05780000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05780000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.30930000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.30930000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05770000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.30830000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.30830000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02100000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02100000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02090000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.02090000000,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', 'night')",cook,R1,0.02100000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.02100000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.46420000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.46420000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.02090000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.02090000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.46260000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.46260000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.03750000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.03750000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.03740000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.03740000000,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', 'morning')",cook,R1,0.03750000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.03750000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30930000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30930000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.03740000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.03740000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30830000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30830000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02100000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02100000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02090000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02090000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02100000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02100000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.46420000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.46420000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02090000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02090000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.46260000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.46260000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03750000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03750000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03740000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03740000000,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', 'early-peak')",cook,R1,0.03750000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03750000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.93020000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.93020000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.03740000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03740000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.92700000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.92700000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.11140000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.11140000000,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', 'late-peak')",cook,R1,0.11160000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.11160000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.61970000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.61970000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11140000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.11140000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.61750000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.61750000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05820000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.05820000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.05810000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.05810000000,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', 'evening')",cook,R1,0.05820000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.05820000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.61970000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.61970000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.05810000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.05810000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.61750000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.61750000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.05820000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.05820000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.05810000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.05810000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.05820000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.05820000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.61970000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.61970000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.05810000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.05810000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.61750000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.61750000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05820000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05820000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05810000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05810000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05820000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05820000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.32640000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.32640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05810000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05810000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.32510000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.32510000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
 "('all-year', 'all-week', 'night')",heat,R1,0.02170000000,2050
@@ -489,18 +489,18 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'night')",CO2f,R2,0.43510000000,2050
 "('all-year', 'all-week', 'night')",cook,R1,0.02170000000,2050
 "('all-year', 'all-week', 'night')",cook,R2,0.02170000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.48990000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.48990000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.48780000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.48780000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.03920000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.03920000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.03910000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.03910000000,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', 'morning')",cook,R1,0.03920000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.03920000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32640000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32640000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.03910000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.03910000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02170000000,2050
@@ -509,53 +509,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02170000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02170000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48990000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48990000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48780000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48780000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03920000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03920000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03910000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03910000000,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', 'early-peak')",cook,R1,0.03920000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03920000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.98130000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.98130000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.03910000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03910000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.97730000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.97730000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11840000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11840000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.11810000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.11810000000,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', 'late-peak')",cook,R1,0.11840000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.11840000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.65390000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.65390000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11810000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.11810000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.65120000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.65120000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.06120000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.06120000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.06110000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.06110000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.06120000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.06120000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.65390000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.65390000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.06110000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.06110000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.65120000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.65120000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06120000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06120000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.06110000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.06110000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.06120000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.06120000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.65390000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.65390000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.06110000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.06110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.65120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.65120000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06120000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06110000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.06120000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.06120000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.06110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.06110000000,2050
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-exogenous-demand/Results/Power/Capacity/2020.csv
similarity index 58%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
index c4dfc406..39fc1925 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-exogenous-demand/Results/Power/Capacity/2020.csv
@@ -15,15 +15,9 @@ asset,year,region,installed,technology,capacity
 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
+4,2025,R2,2020,windturbine,33.46730000000
+4,2030,R2,2020,windturbine,33.46730000000
+4,2035,R2,2020,windturbine,33.46730000000
+4,2040,R2,2020,windturbine,33.46730000000
+4,2045,R2,2020,windturbine,33.46730000000
+4,2049,R2,2020,windturbine,33.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
similarity index 56%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 9f272ab7..5e5e4461 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -32,28 +32,22 @@ asset,year,technology,region,installed,capacity
 5,2049,solarPV,R1,2025,10.39350000000
 5,2050,solarPV,R1,2025,10.39350000000
 5,2054,solarPV,R1,2025,10.39350000000
-6,2025,solarPV,R2,2020,13.46730000000
-6,2030,solarPV,R2,2020,13.46730000000
-6,2035,solarPV,R2,2020,13.46730000000
-6,2040,solarPV,R2,2020,13.46730000000
-6,2045,solarPV,R2,2020,13.46730000000
-6,2049,solarPV,R2,2020,13.46730000000
-7,2030,solarPV,R2,2025,10.39350000000
-7,2035,solarPV,R2,2025,10.39350000000
-7,2040,solarPV,R2,2025,10.39350000000
-7,2045,solarPV,R2,2025,10.39350000000
-7,2049,solarPV,R2,2025,10.39350000000
-7,2050,solarPV,R2,2025,10.39350000000
-7,2054,solarPV,R2,2025,10.39350000000
-8,2025,windturbine,R1,2020,20.00000000000
-8,2030,windturbine,R1,2020,20.00000000000
-8,2035,windturbine,R1,2020,20.00000000000
-8,2040,windturbine,R1,2020,20.00000000000
-8,2045,windturbine,R1,2020,20.00000000000
-8,2049,windturbine,R1,2020,20.00000000000
-9,2025,windturbine,R2,2020,20.00000000000
-9,2030,windturbine,R2,2020,20.00000000000
-9,2035,windturbine,R2,2020,20.00000000000
-9,2040,windturbine,R2,2020,20.00000000000
-9,2045,windturbine,R2,2020,20.00000000000
-9,2049,windturbine,R2,2020,20.00000000000
+6,2030,solarPV,R2,2025,10.39350000000
+6,2035,solarPV,R2,2025,10.39350000000
+6,2040,solarPV,R2,2025,10.39350000000
+6,2045,solarPV,R2,2025,10.39350000000
+6,2049,solarPV,R2,2025,10.39350000000
+6,2050,solarPV,R2,2025,10.39350000000
+6,2054,solarPV,R2,2025,10.39350000000
+7,2025,windturbine,R1,2020,20.00000000000
+7,2030,windturbine,R1,2020,20.00000000000
+7,2035,windturbine,R1,2020,20.00000000000
+7,2040,windturbine,R1,2020,20.00000000000
+7,2045,windturbine,R1,2020,20.00000000000
+7,2049,windturbine,R1,2020,20.00000000000
+8,2025,windturbine,R2,2020,33.46730000000
+8,2030,windturbine,R2,2020,33.46730000000
+8,2035,windturbine,R2,2020,33.46730000000
+8,2040,windturbine,R2,2020,33.46730000000
+8,2045,windturbine,R2,2020,33.46730000000
+8,2049,windturbine,R2,2020,33.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..ff513932
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -0,0 +1,68 @@
+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,windturbine,33.46730000000
+7,2035,R2,2020,windturbine,33.46730000000
+7,2040,R2,2020,windturbine,33.46730000000
+7,2045,R2,2020,windturbine,33.46730000000
+7,2049,R2,2020,windturbine,33.46730000000
+8,2030,R2,2025,gasCCGT,4.00000000000
+8,2035,R2,2025,gasCCGT,4.00000000000
+8,2040,R2,2025,gasCCGT,4.00000000000
+8,2045,R2,2025,gasCCGT,4.00000000000
+8,2049,R2,2025,gasCCGT,4.00000000000
+8,2050,R2,2025,gasCCGT,4.00000000000
+8,2054,R2,2025,gasCCGT,4.00000000000
+8,2055,R2,2025,gasCCGT,4.00000000000
+8,2059,R2,2025,gasCCGT,4.00000000000
+8,2060,R2,2025,gasCCGT,4.00000000000
+8,2064,R2,2025,gasCCGT,4.00000000000
+9,2030,R2,2025,solarPV,10.39350000000
+9,2035,R2,2025,solarPV,10.39350000000
+9,2040,R2,2025,solarPV,10.39350000000
+9,2045,R2,2025,solarPV,10.39350000000
+9,2049,R2,2025,solarPV,10.39350000000
+9,2050,R2,2025,solarPV,10.39350000000
+9,2054,R2,2025,solarPV,10.39350000000
+10,2035,R2,2030,solarPV,11.42930000000
+10,2040,R2,2030,solarPV,11.42930000000
+10,2045,R2,2030,solarPV,11.42930000000
+10,2049,R2,2030,solarPV,11.42930000000
+10,2050,R2,2030,solarPV,11.42930000000
+10,2054,R2,2030,solarPV,11.42930000000
+10,2055,R2,2030,solarPV,11.42930000000
+10,2059,R2,2030,solarPV,11.42930000000
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-exogenous-demand/Results/Power/Capacity/2035.csv
similarity index 71%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index 5920f22e..8da4c34e 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-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -1,15 +1,12 @@
 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
@@ -20,7 +17,6 @@ asset,year,region,installed,technology,capacity
 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
@@ -35,17 +31,19 @@ asset,year,region,installed,technology,capacity
 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
+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,windturbine,33.46730000000
+8,2040,R2,2020,windturbine,33.46730000000
+8,2045,R2,2020,windturbine,33.46730000000
+8,2049,R2,2020,windturbine,33.46730000000
 9,2035,R2,2025,gasCCGT,4.00000000000
 9,2040,R2,2025,gasCCGT,4.00000000000
 9,2045,R2,2025,gasCCGT,4.00000000000
@@ -56,7 +54,6 @@ asset,year,region,installed,technology,capacity
 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
@@ -71,3 +68,12 @@ asset,year,region,installed,technology,capacity
 11,2054,R2,2030,solarPV,11.42930000000
 11,2055,R2,2030,solarPV,11.42930000000
 11,2059,R2,2030,solarPV,11.42930000000
+12,2040,R2,2035,solarPV,15.71520000000
+12,2045,R2,2035,solarPV,15.71520000000
+12,2049,R2,2035,solarPV,15.71520000000
+12,2050,R2,2035,solarPV,15.71520000000
+12,2054,R2,2035,solarPV,15.71520000000
+12,2055,R2,2035,solarPV,15.71520000000
+12,2059,R2,2035,solarPV,15.71520000000
+12,2060,R2,2035,solarPV,15.71520000000
+12,2064,R2,2035,solarPV,15.71520000000
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-exogenous-demand/Results/Power/Capacity/2040.csv
similarity index 74%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index 73f39dde..305a3986 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-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -1,13 +1,10 @@
 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
@@ -17,13 +14,11 @@ asset,year,region,installed,technology,capacity
 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
@@ -40,15 +35,19 @@ asset,year,region,installed,technology,capacity
 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
+7,2045,R1,2040,solarPV,11.42930000000
+7,2049,R1,2040,solarPV,11.42930000000
+7,2050,R1,2040,solarPV,11.42930000000
+7,2054,R1,2040,solarPV,11.42930000000
+7,2055,R1,2040,solarPV,11.42930000000
+7,2059,R1,2040,solarPV,11.42930000000
+7,2060,R1,2040,solarPV,11.42930000000
+7,2064,R1,2040,solarPV,11.42930000000
+7,2065,R1,2040,solarPV,11.42930000000
+7,2069,R1,2040,solarPV,11.42930000000
+9,2040,R2,2020,windturbine,33.46730000000
+9,2045,R2,2020,windturbine,33.46730000000
+9,2049,R2,2020,windturbine,33.46730000000
 10,2040,R2,2025,gasCCGT,4.00000000000
 10,2045,R2,2025,gasCCGT,4.00000000000
 10,2049,R2,2025,gasCCGT,4.00000000000
@@ -58,13 +57,11 @@ asset,year,region,installed,technology,capacity
 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
@@ -81,3 +78,13 @@ asset,year,region,installed,technology,capacity
 13,2059,R2,2035,solarPV,15.71520000000
 13,2060,R2,2035,solarPV,15.71520000000
 13,2064,R2,2035,solarPV,15.71520000000
+14,2045,R2,2040,solarPV,11.42930000000
+14,2049,R2,2040,solarPV,11.42930000000
+14,2050,R2,2040,solarPV,11.42930000000
+14,2054,R2,2040,solarPV,11.42930000000
+14,2055,R2,2040,solarPV,11.42930000000
+14,2059,R2,2040,solarPV,11.42930000000
+14,2060,R2,2040,solarPV,11.42930000000
+14,2064,R2,2040,solarPV,11.42930000000
+14,2065,R2,2040,solarPV,11.42930000000
+14,2069,R2,2040,solarPV,11.42930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..a92b3086
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -0,0 +1,119 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasCCGT,R1,2025,4.00000000000
+0,2049,gasCCGT,R1,2025,4.00000000000
+0,2050,gasCCGT,R1,2025,4.00000000000
+0,2054,gasCCGT,R1,2025,4.00000000000
+0,2055,gasCCGT,R1,2025,4.00000000000
+0,2059,gasCCGT,R1,2025,4.00000000000
+0,2060,gasCCGT,R1,2025,4.00000000000
+0,2064,gasCCGT,R1,2025,4.00000000000
+1,2045,gasCCGT,R2,2025,4.00000000000
+1,2049,gasCCGT,R2,2025,4.00000000000
+1,2050,gasCCGT,R2,2025,4.00000000000
+1,2054,gasCCGT,R2,2025,4.00000000000
+1,2055,gasCCGT,R2,2025,4.00000000000
+1,2059,gasCCGT,R2,2025,4.00000000000
+1,2060,gasCCGT,R2,2025,4.00000000000
+1,2064,gasCCGT,R2,2025,4.00000000000
+2,2045,solarPV,R1,2020,13.46730000000
+2,2049,solarPV,R1,2020,13.46730000000
+3,2045,solarPV,R1,2025,10.39350000000
+3,2049,solarPV,R1,2025,10.39350000000
+3,2050,solarPV,R1,2025,10.39350000000
+3,2054,solarPV,R1,2025,10.39350000000
+4,2045,solarPV,R1,2030,11.42930000000
+4,2049,solarPV,R1,2030,11.42930000000
+4,2050,solarPV,R1,2030,11.42930000000
+4,2054,solarPV,R1,2030,11.42930000000
+4,2055,solarPV,R1,2030,11.42930000000
+4,2059,solarPV,R1,2030,11.42930000000
+5,2045,solarPV,R1,2035,15.71520000000
+5,2049,solarPV,R1,2035,15.71520000000
+5,2050,solarPV,R1,2035,15.71520000000
+5,2054,solarPV,R1,2035,15.71520000000
+5,2055,solarPV,R1,2035,15.71520000000
+5,2059,solarPV,R1,2035,15.71520000000
+5,2060,solarPV,R1,2035,15.71520000000
+5,2064,solarPV,R1,2035,15.71520000000
+6,2045,solarPV,R1,2040,11.42930000000
+6,2049,solarPV,R1,2040,11.42930000000
+6,2050,solarPV,R1,2040,11.42930000000
+6,2054,solarPV,R1,2040,11.42930000000
+6,2055,solarPV,R1,2040,11.42930000000
+6,2059,solarPV,R1,2040,11.42930000000
+6,2060,solarPV,R1,2040,11.42930000000
+6,2064,solarPV,R1,2040,11.42930000000
+6,2065,solarPV,R1,2040,11.42930000000
+6,2069,solarPV,R1,2040,11.42930000000
+7,2050,solarPV,R1,2045,31.42930000000
+7,2054,solarPV,R1,2045,31.42930000000
+7,2055,solarPV,R1,2045,31.42930000000
+7,2059,solarPV,R1,2045,31.42930000000
+7,2060,solarPV,R1,2045,31.42930000000
+7,2064,solarPV,R1,2045,31.42930000000
+7,2065,solarPV,R1,2045,31.42930000000
+7,2069,solarPV,R1,2045,31.42930000000
+7,2070,solarPV,R1,2045,31.42930000000
+7,2074,solarPV,R1,2045,31.42930000000
+8,2045,solarPV,R2,2025,10.39350000000
+8,2049,solarPV,R2,2025,10.39350000000
+8,2050,solarPV,R2,2025,10.39350000000
+8,2054,solarPV,R2,2025,10.39350000000
+9,2045,solarPV,R2,2030,11.42930000000
+9,2049,solarPV,R2,2030,11.42930000000
+9,2050,solarPV,R2,2030,11.42930000000
+9,2054,solarPV,R2,2030,11.42930000000
+9,2055,solarPV,R2,2030,11.42930000000
+9,2059,solarPV,R2,2030,11.42930000000
+10,2045,solarPV,R2,2035,15.71520000000
+10,2049,solarPV,R2,2035,15.71520000000
+10,2050,solarPV,R2,2035,15.71520000000
+10,2054,solarPV,R2,2035,15.71520000000
+10,2055,solarPV,R2,2035,15.71520000000
+10,2059,solarPV,R2,2035,15.71520000000
+10,2060,solarPV,R2,2035,15.71520000000
+10,2064,solarPV,R2,2035,15.71520000000
+11,2045,solarPV,R2,2040,11.42930000000
+11,2049,solarPV,R2,2040,11.42930000000
+11,2050,solarPV,R2,2040,11.42930000000
+11,2054,solarPV,R2,2040,11.42930000000
+11,2055,solarPV,R2,2040,11.42930000000
+11,2059,solarPV,R2,2040,11.42930000000
+11,2060,solarPV,R2,2040,11.42930000000
+11,2064,solarPV,R2,2040,11.42930000000
+11,2065,solarPV,R2,2040,11.42930000000
+11,2069,solarPV,R2,2040,11.42930000000
+12,2050,solarPV,R2,2045,31.42930000000
+12,2054,solarPV,R2,2045,31.42930000000
+12,2055,solarPV,R2,2045,31.42930000000
+12,2059,solarPV,R2,2045,31.42930000000
+12,2060,solarPV,R2,2045,31.42930000000
+12,2064,solarPV,R2,2045,31.42930000000
+12,2065,solarPV,R2,2045,31.42930000000
+12,2069,solarPV,R2,2045,31.42930000000
+12,2070,solarPV,R2,2045,31.42930000000
+12,2074,solarPV,R2,2045,31.42930000000
+13,2045,windturbine,R1,2020,20.00000000000
+13,2049,windturbine,R1,2020,20.00000000000
+14,2050,windturbine,R1,2045,13.46730000000
+14,2054,windturbine,R1,2045,13.46730000000
+14,2055,windturbine,R1,2045,13.46730000000
+14,2059,windturbine,R1,2045,13.46730000000
+14,2060,windturbine,R1,2045,13.46730000000
+14,2064,windturbine,R1,2045,13.46730000000
+14,2065,windturbine,R1,2045,13.46730000000
+14,2069,windturbine,R1,2045,13.46730000000
+14,2070,windturbine,R1,2045,13.46730000000
+14,2074,windturbine,R1,2045,13.46730000000
+15,2045,windturbine,R2,2020,33.46730000000
+15,2049,windturbine,R2,2020,33.46730000000
+16,2050,windturbine,R2,2045,13.46730000000
+16,2054,windturbine,R2,2045,13.46730000000
+16,2055,windturbine,R2,2045,13.46730000000
+16,2059,windturbine,R2,2045,13.46730000000
+16,2060,windturbine,R2,2045,13.46730000000
+16,2064,windturbine,R2,2045,13.46730000000
+16,2065,windturbine,R2,2045,13.46730000000
+16,2069,windturbine,R2,2045,13.46730000000
+16,2070,windturbine,R2,2045,13.46730000000
+16,2074,windturbine,R2,2045,13.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..90a0fecb
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -0,0 +1,113 @@
+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,11.42930000000
+6,2054,R1,2040,solarPV,11.42930000000
+6,2055,R1,2040,solarPV,11.42930000000
+6,2059,R1,2040,solarPV,11.42930000000
+6,2060,R1,2040,solarPV,11.42930000000
+6,2064,R1,2040,solarPV,11.42930000000
+6,2065,R1,2040,solarPV,11.42930000000
+6,2069,R1,2040,solarPV,11.42930000000
+7,2050,R1,2045,solarPV,31.42930000000
+7,2054,R1,2045,solarPV,31.42930000000
+7,2055,R1,2045,solarPV,31.42930000000
+7,2059,R1,2045,solarPV,31.42930000000
+7,2060,R1,2045,solarPV,31.42930000000
+7,2064,R1,2045,solarPV,31.42930000000
+7,2065,R1,2045,solarPV,31.42930000000
+7,2069,R1,2045,solarPV,31.42930000000
+7,2070,R1,2045,solarPV,31.42930000000
+7,2074,R1,2045,solarPV,31.42930000000
+8,2050,R1,2045,windturbine,13.46730000000
+8,2054,R1,2045,windturbine,13.46730000000
+8,2055,R1,2045,windturbine,13.46730000000
+8,2059,R1,2045,windturbine,13.46730000000
+8,2060,R1,2045,windturbine,13.46730000000
+8,2064,R1,2045,windturbine,13.46730000000
+8,2065,R1,2045,windturbine,13.46730000000
+8,2069,R1,2045,windturbine,13.46730000000
+8,2070,R1,2045,windturbine,13.46730000000
+8,2074,R1,2045,windturbine,13.46730000000
+9,2055,R1,2050,solarPV,10.39350000000
+9,2059,R1,2050,solarPV,10.39350000000
+9,2060,R1,2050,solarPV,10.39350000000
+9,2064,R1,2050,solarPV,10.39350000000
+9,2065,R1,2050,solarPV,10.39350000000
+9,2069,R1,2050,solarPV,10.39350000000
+9,2070,R1,2050,solarPV,10.39350000000
+9,2074,R1,2050,solarPV,10.39350000000
+9,2075,R1,2050,solarPV,10.39350000000
+9,2079,R1,2050,solarPV,10.39350000000
+11,2050,R2,2025,gasCCGT,4.00000000000
+11,2054,R2,2025,gasCCGT,4.00000000000
+11,2055,R2,2025,gasCCGT,4.00000000000
+11,2059,R2,2025,gasCCGT,4.00000000000
+11,2060,R2,2025,gasCCGT,4.00000000000
+11,2064,R2,2025,gasCCGT,4.00000000000
+12,2050,R2,2025,solarPV,10.39350000000
+12,2054,R2,2025,solarPV,10.39350000000
+13,2050,R2,2030,solarPV,11.42930000000
+13,2054,R2,2030,solarPV,11.42930000000
+13,2055,R2,2030,solarPV,11.42930000000
+13,2059,R2,2030,solarPV,11.42930000000
+14,2050,R2,2035,solarPV,15.71520000000
+14,2054,R2,2035,solarPV,15.71520000000
+14,2055,R2,2035,solarPV,15.71520000000
+14,2059,R2,2035,solarPV,15.71520000000
+14,2060,R2,2035,solarPV,15.71520000000
+14,2064,R2,2035,solarPV,15.71520000000
+15,2050,R2,2040,solarPV,11.42930000000
+15,2054,R2,2040,solarPV,11.42930000000
+15,2055,R2,2040,solarPV,11.42930000000
+15,2059,R2,2040,solarPV,11.42930000000
+15,2060,R2,2040,solarPV,11.42930000000
+15,2064,R2,2040,solarPV,11.42930000000
+15,2065,R2,2040,solarPV,11.42930000000
+15,2069,R2,2040,solarPV,11.42930000000
+16,2050,R2,2045,solarPV,31.42930000000
+16,2054,R2,2045,solarPV,31.42930000000
+16,2055,R2,2045,solarPV,31.42930000000
+16,2059,R2,2045,solarPV,31.42930000000
+16,2060,R2,2045,solarPV,31.42930000000
+16,2064,R2,2045,solarPV,31.42930000000
+16,2065,R2,2045,solarPV,31.42930000000
+16,2069,R2,2045,solarPV,31.42930000000
+16,2070,R2,2045,solarPV,31.42930000000
+16,2074,R2,2045,solarPV,31.42930000000
+17,2050,R2,2045,windturbine,13.46730000000
+17,2054,R2,2045,windturbine,13.46730000000
+17,2055,R2,2045,windturbine,13.46730000000
+17,2059,R2,2045,windturbine,13.46730000000
+17,2060,R2,2045,windturbine,13.46730000000
+17,2064,R2,2045,windturbine,13.46730000000
+17,2065,R2,2045,windturbine,13.46730000000
+17,2069,R2,2045,windturbine,13.46730000000
+17,2070,R2,2045,windturbine,13.46730000000
+17,2074,R2,2045,windturbine,13.46730000000
+18,2055,R2,2050,solarPV,10.39350000000
+18,2059,R2,2050,solarPV,10.39350000000
+18,2060,R2,2050,solarPV,10.39350000000
+18,2064,R2,2050,solarPV,10.39350000000
+18,2065,R2,2050,solarPV,10.39350000000
+18,2069,R2,2050,solarPV,10.39350000000
+18,2070,R2,2050,solarPV,10.39350000000
+18,2074,R2,2050,solarPV,10.39350000000
+18,2075,R2,2050,solarPV,10.39350000000
+18,2079,R2,2050,solarPV,10.39350000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
similarity index 68%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
index 4d909d23..5db0ff89 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
@@ -1,10 +1,10 @@
 asset,year,technology,region,installed,capacity
-0,2025,estove,R1,2020,17.85870000000
-0,2030,estove,R1,2020,17.85870000000
-0,2034,estove,R1,2020,17.85870000000
-1,2025,estove,R2,2020,17.85870000000
-1,2030,estove,R2,2020,17.85870000000
-1,2034,estove,R2,2020,17.85870000000
+0,2025,electric_stove,R1,2020,17.85870000000
+0,2030,electric_stove,R1,2020,17.85870000000
+0,2034,electric_stove,R1,2020,17.85870000000
+1,2025,electric_stove,R2,2020,17.85870000000
+1,2030,electric_stove,R2,2020,17.85870000000
+1,2034,electric_stove,R2,2020,17.85870000000
 2,2020,gas_stove,R1,2020,10.00000000000
 2,2025,gas_stove,R1,2020,5.00000000000
 3,2020,gas_stove,R2,2020,10.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
similarity index 69%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
index a0d0e820..26dcc6c8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
@@ -1,18 +1,18 @@
 asset,year,technology,region,installed,capacity
-0,2025,estove,R1,2020,17.85870000000
-0,2030,estove,R1,2020,17.85870000000
-0,2034,estove,R1,2020,17.85870000000
-1,2030,estove,R1,2025,8.57170000000
-1,2034,estove,R1,2025,8.57170000000
-1,2035,estove,R1,2025,8.57170000000
-1,2039,estove,R1,2025,8.57170000000
-2,2025,estove,R2,2020,17.85870000000
-2,2030,estove,R2,2020,17.85870000000
-2,2034,estove,R2,2020,17.85870000000
-3,2030,estove,R2,2025,8.57170000000
-3,2034,estove,R2,2025,8.57170000000
-3,2035,estove,R2,2025,8.57170000000
-3,2039,estove,R2,2025,8.57170000000
+0,2025,electric_stove,R1,2020,17.85870000000
+0,2030,electric_stove,R1,2020,17.85870000000
+0,2034,electric_stove,R1,2020,17.85870000000
+1,2030,electric_stove,R1,2025,8.57170000000
+1,2034,electric_stove,R1,2025,8.57170000000
+1,2035,electric_stove,R1,2025,8.57170000000
+1,2039,electric_stove,R1,2025,8.57170000000
+2,2025,electric_stove,R2,2020,17.85870000000
+2,2030,electric_stove,R2,2020,17.85870000000
+2,2034,electric_stove,R2,2020,17.85870000000
+3,2030,electric_stove,R2,2025,8.57170000000
+3,2034,electric_stove,R2,2025,8.57170000000
+3,2035,electric_stove,R2,2025,8.57170000000
+3,2039,electric_stove,R2,2025,8.57170000000
 4,2025,gas_stove,R1,2020,5.00000000000
 5,2030,gas_stove,R1,2025,2.14290000000
 5,2034,gas_stove,R1,2025,2.14290000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
similarity index 62%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
index 396b9551..0db0f069 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
@@ -1,24 +1,24 @@
 asset,year,technology,region,installed,capacity
-0,2030,estove,R1,2020,17.85870000000
-0,2034,estove,R1,2020,17.85870000000
-1,2030,estove,R1,2025,8.57170000000
-1,2034,estove,R1,2025,8.57170000000
-1,2035,estove,R1,2025,8.57170000000
-1,2039,estove,R1,2025,8.57170000000
-2,2035,estove,R1,2030,23.57330000000
-2,2039,estove,R1,2030,23.57330000000
-2,2040,estove,R1,2030,23.57330000000
-2,2044,estove,R1,2030,23.57330000000
-3,2030,estove,R2,2020,17.85870000000
-3,2034,estove,R2,2020,17.85870000000
-4,2030,estove,R2,2025,8.57170000000
-4,2034,estove,R2,2025,8.57170000000
-4,2035,estove,R2,2025,8.57170000000
-4,2039,estove,R2,2025,8.57170000000
-5,2035,estove,R2,2030,23.57330000000
-5,2039,estove,R2,2030,23.57330000000
-5,2040,estove,R2,2030,23.57330000000
-5,2044,estove,R2,2030,23.57330000000
+0,2030,electric_stove,R1,2020,17.85870000000
+0,2034,electric_stove,R1,2020,17.85870000000
+1,2030,electric_stove,R1,2025,8.57170000000
+1,2034,electric_stove,R1,2025,8.57170000000
+1,2035,electric_stove,R1,2025,8.57170000000
+1,2039,electric_stove,R1,2025,8.57170000000
+2,2035,electric_stove,R1,2030,23.57330000000
+2,2039,electric_stove,R1,2030,23.57330000000
+2,2040,electric_stove,R1,2030,23.57330000000
+2,2044,electric_stove,R1,2030,23.57330000000
+3,2030,electric_stove,R2,2020,17.85870000000
+3,2034,electric_stove,R2,2020,17.85870000000
+4,2030,electric_stove,R2,2025,8.57170000000
+4,2034,electric_stove,R2,2025,8.57170000000
+4,2035,electric_stove,R2,2025,8.57170000000
+4,2039,electric_stove,R2,2025,8.57170000000
+5,2035,electric_stove,R2,2030,23.57330000000
+5,2039,electric_stove,R2,2030,23.57330000000
+5,2040,electric_stove,R2,2030,23.57330000000
+5,2044,electric_stove,R2,2030,23.57330000000
 6,2030,gas_stove,R1,2025,2.14290000000
 6,2034,gas_stove,R1,2025,2.14290000000
 6,2035,gas_stove,R1,2025,2.14290000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
similarity index 56%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
index 14db553f..f64aac9e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
@@ -1,24 +1,24 @@
 asset,year,technology,region,installed,capacity
-0,2035,estove,R1,2025,8.57170000000
-0,2039,estove,R1,2025,8.57170000000
-1,2035,estove,R1,2030,23.57330000000
-1,2039,estove,R1,2030,23.57330000000
-1,2040,estove,R1,2030,23.57330000000
-1,2044,estove,R1,2030,23.57330000000
-2,2040,estove,R1,2035,16.42930000000
-2,2044,estove,R1,2035,16.42930000000
-2,2045,estove,R1,2035,16.42930000000
-2,2049,estove,R1,2035,16.42930000000
-3,2035,estove,R2,2025,8.57170000000
-3,2039,estove,R2,2025,8.57170000000
-4,2035,estove,R2,2030,23.57330000000
-4,2039,estove,R2,2030,23.57330000000
-4,2040,estove,R2,2030,23.57330000000
-4,2044,estove,R2,2030,23.57330000000
-5,2040,estove,R2,2035,16.42930000000
-5,2044,estove,R2,2035,16.42930000000
-5,2045,estove,R2,2035,16.42930000000
-5,2049,estove,R2,2035,16.42930000000
+0,2035,electric_stove,R1,2025,8.57170000000
+0,2039,electric_stove,R1,2025,8.57170000000
+1,2035,electric_stove,R1,2030,23.57330000000
+1,2039,electric_stove,R1,2030,23.57330000000
+1,2040,electric_stove,R1,2030,23.57330000000
+1,2044,electric_stove,R1,2030,23.57330000000
+2,2040,electric_stove,R1,2035,16.42930000000
+2,2044,electric_stove,R1,2035,16.42930000000
+2,2045,electric_stove,R1,2035,16.42930000000
+2,2049,electric_stove,R1,2035,16.42930000000
+3,2035,electric_stove,R2,2025,8.57170000000
+3,2039,electric_stove,R2,2025,8.57170000000
+4,2035,electric_stove,R2,2030,23.57330000000
+4,2039,electric_stove,R2,2030,23.57330000000
+4,2040,electric_stove,R2,2030,23.57330000000
+4,2044,electric_stove,R2,2030,23.57330000000
+5,2040,electric_stove,R2,2035,16.42930000000
+5,2044,electric_stove,R2,2035,16.42930000000
+5,2045,electric_stove,R2,2035,16.42930000000
+5,2049,electric_stove,R2,2035,16.42930000000
 6,2035,gas_stove,R1,2025,2.14290000000
 6,2039,gas_stove,R1,2025,2.14290000000
 7,2035,gas_stove,R2,2025,2.14290000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..f81f7695
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,41 @@
+asset,year,technology,region,installed,capacity
+0,2040,electric_stove,R1,2030,23.57330000000
+0,2044,electric_stove,R1,2030,23.57330000000
+1,2040,electric_stove,R1,2035,16.42930000000
+1,2044,electric_stove,R1,2035,16.42930000000
+1,2045,electric_stove,R1,2035,16.42930000000
+1,2049,electric_stove,R1,2035,16.42930000000
+2,2045,electric_stove,R1,2040,29.28800000000
+2,2049,electric_stove,R1,2040,29.28800000000
+2,2050,electric_stove,R1,2040,29.28800000000
+2,2054,electric_stove,R1,2040,29.28800000000
+3,2040,electric_stove,R2,2030,23.57330000000
+3,2044,electric_stove,R2,2030,23.57330000000
+4,2040,electric_stove,R2,2035,16.42930000000
+4,2044,electric_stove,R2,2035,16.42930000000
+4,2045,electric_stove,R2,2035,16.42930000000
+4,2049,electric_stove,R2,2035,16.42930000000
+5,2045,electric_stove,R2,2040,29.28800000000
+5,2049,electric_stove,R2,2040,29.28800000000
+5,2050,electric_stove,R2,2040,29.28800000000
+5,2054,electric_stove,R2,2040,29.28800000000
+6,2040,heatpump,R1,2030,23.57330000000
+6,2044,heatpump,R1,2030,23.57330000000
+7,2040,heatpump,R1,2035,16.42930000000
+7,2044,heatpump,R1,2035,16.42930000000
+7,2045,heatpump,R1,2035,16.42930000000
+7,2049,heatpump,R1,2035,16.42930000000
+8,2045,heatpump,R1,2040,29.28800000000
+8,2049,heatpump,R1,2040,29.28800000000
+8,2050,heatpump,R1,2040,29.28800000000
+8,2054,heatpump,R1,2040,29.28800000000
+9,2040,heatpump,R2,2030,23.57330000000
+9,2044,heatpump,R2,2030,23.57330000000
+10,2040,heatpump,R2,2035,16.42930000000
+10,2044,heatpump,R2,2035,16.42930000000
+10,2045,heatpump,R2,2035,16.42930000000
+10,2049,heatpump,R2,2035,16.42930000000
+11,2045,heatpump,R2,2040,29.28800000000
+11,2049,heatpump,R2,2040,29.28800000000
+11,2050,heatpump,R2,2040,29.28800000000
+11,2054,heatpump,R2,2040,29.28800000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..ccde9c72
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,41 @@
+asset,year,technology,region,installed,capacity
+0,2045,electric_stove,R1,2035,16.42930000000
+0,2049,electric_stove,R1,2035,16.42930000000
+1,2045,electric_stove,R1,2040,29.28800000000
+1,2049,electric_stove,R1,2040,29.28800000000
+1,2050,electric_stove,R1,2040,29.28800000000
+1,2054,electric_stove,R1,2040,29.28800000000
+2,2050,electric_stove,R1,2045,22.14400000000
+2,2054,electric_stove,R1,2045,22.14400000000
+2,2055,electric_stove,R1,2045,22.14400000000
+2,2059,electric_stove,R1,2045,22.14400000000
+3,2045,electric_stove,R2,2035,16.42930000000
+3,2049,electric_stove,R2,2035,16.42930000000
+4,2045,electric_stove,R2,2040,29.28800000000
+4,2049,electric_stove,R2,2040,29.28800000000
+4,2050,electric_stove,R2,2040,29.28800000000
+4,2054,electric_stove,R2,2040,29.28800000000
+5,2050,electric_stove,R2,2045,22.14400000000
+5,2054,electric_stove,R2,2045,22.14400000000
+5,2055,electric_stove,R2,2045,22.14400000000
+5,2059,electric_stove,R2,2045,22.14400000000
+6,2045,heatpump,R1,2035,16.42930000000
+6,2049,heatpump,R1,2035,16.42930000000
+7,2045,heatpump,R1,2040,29.28800000000
+7,2049,heatpump,R1,2040,29.28800000000
+7,2050,heatpump,R1,2040,29.28800000000
+7,2054,heatpump,R1,2040,29.28800000000
+8,2050,heatpump,R1,2045,22.14400000000
+8,2054,heatpump,R1,2045,22.14400000000
+8,2055,heatpump,R1,2045,22.14400000000
+8,2059,heatpump,R1,2045,22.14400000000
+9,2045,heatpump,R2,2035,16.42930000000
+9,2049,heatpump,R2,2035,16.42930000000
+10,2045,heatpump,R2,2040,29.28800000000
+10,2049,heatpump,R2,2040,29.28800000000
+10,2050,heatpump,R2,2040,29.28800000000
+10,2054,heatpump,R2,2040,29.28800000000
+11,2050,heatpump,R2,2045,22.14400000000
+11,2054,heatpump,R2,2045,22.14400000000
+11,2055,heatpump,R2,2045,22.14400000000
+11,2059,heatpump,R2,2045,22.14400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..7892705e
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,41 @@
+asset,year,region,installed,technology,capacity
+2,2050,R1,2040,electric_stove,29.28800000000
+2,2054,R1,2040,electric_stove,29.28800000000
+3,2050,R1,2040,heatpump,29.28800000000
+3,2054,R1,2040,heatpump,29.28800000000
+4,2050,R1,2045,electric_stove,22.14400000000
+4,2054,R1,2045,electric_stove,22.14400000000
+4,2055,R1,2045,electric_stove,22.14400000000
+4,2059,R1,2045,electric_stove,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,electric_stove,29.28800000000
+6,2059,R1,2050,electric_stove,29.28800000000
+6,2060,R1,2050,electric_stove,29.28800000000
+6,2064,R1,2050,electric_stove,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,electric_stove,29.28800000000
+10,2054,R2,2040,electric_stove,29.28800000000
+11,2050,R2,2040,heatpump,29.28800000000
+11,2054,R2,2040,heatpump,29.28800000000
+12,2050,R2,2045,electric_stove,22.14400000000
+12,2054,R2,2045,electric_stove,22.14400000000
+12,2055,R2,2045,electric_stove,22.14400000000
+12,2059,R2,2045,electric_stove,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,electric_stove,29.28800000000
+14,2059,R2,2050,electric_stove,29.28800000000
+14,2060,R2,2050,electric_stove,29.28800000000
+14,2064,R2,2050,electric_stove,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
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-exogenous-demand/Results/Residential/Supply/2020.csv
similarity index 89%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
index 0155957b..79dfdaff 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-exogenous-demand/Results/Residential/Supply/2020.csv
@@ -29,14 +29,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R2,2025,1,electric_stove,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
@@ -69,14 +69,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R2,2025,1,electric_stove,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
@@ -109,14 +109,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R2,2025,1,electric_stove,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
@@ -149,14 +149,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R2,2025,1,electric_stove,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
@@ -189,14 +189,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2025,1,electric_stove,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
@@ -229,14 +229,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R2,2025,1,electric_stove,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
@@ -269,14 +269,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R2,2025,1,electric_stove,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
@@ -309,13 +309,13 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R1,2025,1,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R2,2025,1,electric_stove,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
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-exogenous-demand/Results/Residential/Supply/2025.csv
similarity index 78%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
index a0be87ad..4cff2b0a 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-exogenous-demand/Results/Residential/Supply/2025.csv
@@ -35,24 +35,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R1,2030,2,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R2,2030,2,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R2,2030,3,electric_stove,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
@@ -91,24 +91,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R1,2030,2,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R2,2030,2,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R2,2030,3,electric_stove,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
@@ -147,24 +147,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R1,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R2,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R2,2030,3,electric_stove,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
@@ -203,24 +203,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R2,2030,3,electric_stove,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
@@ -259,24 +259,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2030,3,electric_stove,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
@@ -315,24 +315,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R1,2030,2,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R2,2030,2,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R2,2030,3,electric_stove,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
@@ -371,24 +371,24 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R2,2030,3,electric_stove,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
@@ -427,23 +427,23 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R1,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R1,2030,3,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R2,2025,2,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R2,2030,3,electric_stove,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
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-exogenous-demand/Results/Residential/Supply/2030.csv
similarity index 74%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
index 683124bd..86e7a961 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-exogenous-demand/Results/Residential/Supply/2030.csv
@@ -39,28 +39,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R1,2030,3,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R1,2035,2,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R1,2035,4,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R2,2030,3,electric_stove,2020,all-year,all-week,night,0.37190000000
+0,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R2,2035,2,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R2,2035,4,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R2,2035,5,electric_stove,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
@@ -103,28 +103,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R1,2030,3,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R1,2035,2,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R1,2035,4,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R2,2030,3,electric_stove,2020,all-year,all-week,morning,0.55780000000
+1,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R2,2035,2,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R2,2035,4,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R2,2035,5,electric_stove,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
@@ -167,28 +167,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R1,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R1,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R1,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R2,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
+2,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R2,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R2,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R2,2035,5,electric_stove,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
@@ -231,28 +231,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
+3,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R2,2035,5,electric_stove,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
@@ -295,28 +295,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R2,2035,5,electric_stove,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
@@ -359,28 +359,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R1,2030,3,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R1,2035,2,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R1,2035,4,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R2,2030,3,electric_stove,2020,all-year,all-week,evening,0.74430000000
+5,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R2,2035,2,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R2,2035,4,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R2,2035,5,electric_stove,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
@@ -423,28 +423,28 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
+6,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R2,2035,5,electric_stove,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
@@ -487,27 +487,27 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R1,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R1,2035,5,electric_stove,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,0,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
+7,cook,R2,2030,4,electric_stove,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,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R2,2035,5,electric_stove,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
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-exogenous-demand/Results/Residential/Supply/2035.csv
similarity index 65%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
index b2e9f555..9919735a 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-exogenous-demand/Results/Residential/Supply/2035.csv
@@ -27,26 +27,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R1,2035,1,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R1,2035,3,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R1,2040,2,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2040,4,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R1,2040,5,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2035,0,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R2,2035,1,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R2,2035,3,electric_stove,2025,all-year,all-week,night,0.17850000000
+0,cook,R2,2035,4,electric_stove,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
+0,cook,R2,2040,1,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R2,2040,2,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2040,4,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R2,2040,5,electric_stove,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
@@ -75,26 +75,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R1,2035,1,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R1,2035,3,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R1,2040,2,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2040,4,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R1,2040,5,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2035,0,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R2,2035,1,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R2,2035,3,electric_stove,2025,all-year,all-week,morning,0.26770000000
+1,cook,R2,2035,4,electric_stove,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
+1,cook,R2,2040,1,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R2,2040,2,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2040,4,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R2,2040,5,electric_stove,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
@@ -123,26 +123,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R1,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R1,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R1,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R1,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R2,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R2,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
+2,cook,R2,2035,4,electric_stove,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
+2,cook,R2,2040,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R2,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R2,2040,5,electric_stove,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
@@ -171,26 +171,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
+3,cook,R2,2035,4,electric_stove,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
+3,cook,R2,2040,1,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R2,2040,5,electric_stove,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
@@ -219,26 +219,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
+4,cook,R2,2035,4,electric_stove,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
+4,cook,R2,2040,1,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R2,2040,5,electric_stove,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
@@ -267,26 +267,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R1,2035,1,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R1,2035,3,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R1,2040,2,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2040,4,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R1,2040,5,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2035,0,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R2,2035,1,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R2,2035,3,electric_stove,2025,all-year,all-week,evening,0.35720000000
+5,cook,R2,2035,4,electric_stove,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
+5,cook,R2,2040,1,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R2,2040,2,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2040,4,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R2,2040,5,electric_stove,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
@@ -315,26 +315,26 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
+6,cook,R2,2035,4,electric_stove,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
+6,cook,R2,2040,1,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R2,2040,5,electric_stove,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
@@ -363,23 +363,23 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 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,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R1,2035,4,electric_stove,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,R1,2040,1,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
+7,cook,R2,2035,4,electric_stove,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
+7,cook,R2,2040,1,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
new file mode 100644
index 00000000..959ed730
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
@@ -0,0 +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,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R1,2040,1,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2040,3,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R1,2040,4,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2045,1,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2045,2,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R1,2045,4,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2045,5,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R2,2040,0,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R2,2040,1,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2040,3,electric_stove,2030,all-year,all-week,night,0.49090000000
+0,cook,R2,2040,4,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2045,1,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2045,2,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R2,2045,4,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R1,2040,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2040,3,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R1,2040,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2045,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2045,2,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R1,2045,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2045,5,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R2,2040,0,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R2,2040,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2040,3,electric_stove,2030,all-year,all-week,morning,0.73630000000
+1,cook,R2,2040,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2045,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2045,2,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R2,2045,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R1,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R1,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2045,5,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2040,0,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R2,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
+2,cook,R2,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
+3,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
+4,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R1,2040,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2040,3,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R1,2040,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2045,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2045,2,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R1,2045,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2045,5,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R2,2040,0,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R2,2040,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2040,3,electric_stove,2030,all-year,all-week,evening,0.98250000000
+5,cook,R2,2040,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2045,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2045,2,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R2,2045,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
+6,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
+7,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..93dda046
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
@@ -0,0 +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,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2045,1,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R1,2045,3,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R1,2045,4,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R1,2050,1,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R1,2050,2,electric_stove,2045,all-year,all-week,night,0.46110000000
+0,cook,R1,2050,4,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R1,2050,5,electric_stove,2045,all-year,all-week,night,0.46110000000
+0,cook,R2,2045,0,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2045,1,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R2,2045,3,electric_stove,2035,all-year,all-week,night,0.34210000000
+0,cook,R2,2045,4,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R2,2050,1,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R2,2050,2,electric_stove,2045,all-year,all-week,night,0.46110000000
+0,cook,R2,2050,4,electric_stove,2040,all-year,all-week,night,0.60990000000
+0,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2045,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R1,2045,3,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R1,2045,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R1,2050,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R1,2050,2,electric_stove,2045,all-year,all-week,morning,0.69170000000
+1,cook,R1,2050,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R1,2050,5,electric_stove,2045,all-year,all-week,morning,0.69170000000
+1,cook,R2,2045,0,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2045,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R2,2045,3,electric_stove,2035,all-year,all-week,morning,0.51320000000
+1,cook,R2,2045,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R2,2050,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R2,2050,2,electric_stove,2045,all-year,all-week,morning,0.69170000000
+1,cook,R2,2050,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
+1,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R1,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R1,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2050,5,electric_stove,2045,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R2,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
+2,cook,R2,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R2,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.69170000000
+3,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-peak,0.69170000000
+3,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
+3,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.69170000000
+3,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.38400000000
+4,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-peak,1.38400000000
+4,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
+4,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.38400000000
+4,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2045,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R1,2045,3,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R1,2045,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R1,2050,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R1,2050,2,electric_stove,2045,all-year,all-week,evening,0.92290000000
+5,cook,R1,2050,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R1,2050,5,electric_stove,2045,all-year,all-week,evening,0.92290000000
+5,cook,R2,2045,0,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2045,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R2,2045,3,electric_stove,2035,all-year,all-week,evening,0.68470000000
+5,cook,R2,2045,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R2,2050,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R2,2050,2,electric_stove,2045,all-year,all-week,evening,0.92290000000
+5,cook,R2,2050,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
+5,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.92290000000
+6,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-morning,0.92290000000
+6,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
+6,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.92290000000
+6,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+7,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..3302b285
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
@@ -0,0 +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,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R1,2050,4,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R1,2050,10,2040,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R1,2050,12,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R1,2055,4,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R1,2055,6,2050,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R1,2055,12,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R1,2055,14,2050,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R2,2050,2,2040,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R2,2050,4,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R2,2050,10,2040,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R2,2050,12,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R2,2055,4,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R2,2055,6,2050,electric_stove,all-year,all-week,night,0.60990000000
+0,cook,R2,2055,12,2045,electric_stove,all-year,all-week,night,0.46110000000
+0,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R1,2050,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R1,2050,10,2040,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R1,2050,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R1,2055,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R1,2055,6,2050,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R1,2055,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R1,2055,14,2050,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R2,2050,2,2040,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R2,2050,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R2,2050,10,2040,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R2,2050,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R2,2055,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R2,2055,6,2050,electric_stove,all-year,all-week,morning,0.91480000000
+1,cook,R2,2055,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
+1,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R1,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R1,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R1,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R1,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R1,2055,14,2050,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2050,2,2040,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R2,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R2,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R2,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
+2,cook,R2,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
+2,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.91480000000
+3,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
+3,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.83050000000
+4,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
+4,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R1,2050,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R1,2050,10,2040,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R1,2050,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R1,2055,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R1,2055,6,2050,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R1,2055,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R1,2055,14,2050,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R2,2050,2,2040,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R2,2050,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R2,2050,10,2040,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R2,2050,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R2,2055,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R2,2055,6,2050,electric_stove,all-year,all-week,evening,1.22060000000
+5,cook,R2,2055,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
+5,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.22060000000
+6,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
+6,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+7,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
+7,cook,R2,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearExport.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearExport.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearImport.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/BaseYearImport.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/GlobalCommodities.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/GlobalCommodities.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/Projections.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/input/Projections.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/settings.toml
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/Agents.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommIn.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/CommOut.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/ExistingCapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/gas/Technodata.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommIn.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/CommOut.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/ExistingCapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
new file mode 100644
index 00000000..465ac9d1
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
@@ -0,0 +1,14 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2020Consumption.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
similarity index 100%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/preset/Residential2050Consumption.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv
similarity index 80%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommIn.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv
index 3313c80c..5653886c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommIn.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv
@@ -4,7 +4,7 @@ gasboiler,R1,2020,fixed,0,1.16,0,0,0,0
 heatpump,R1,2020,fixed,0.4,0,0,0,0,0
 gasboiler,R2,2020,fixed,0,1.16,0,0,0,0
 heatpump,R2,2020,fixed,0.4,0,0,0,0,0
-estove,R1,2020,fixed,0.4,0,0,0,0,0
-estove,R2,2020,fixed,0.4,0,0,0,0,0
+electric_stove,R1,2020,fixed,0.4,0,0,0,0,0
+electric_stove,R2,2020,fixed,0.4,0,0,0,0,0
 gas_stove,R1,2020,fixed,0,1.16,0,0,0,0
 gas_stove,R2,2020,fixed,0,1.16,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
similarity index 80%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommOut.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
index 276db9e2..e90d9dc1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
@@ -4,7 +4,7 @@ gasboiler,R1,2020,fixed,0,0,1,64.71,0,0
 heatpump,R1,2020,fixed,0,0,1,0,0,0
 gasboiler,R2,2020,fixed,0,0,1,64.71,0,0
 heatpump,R2,2020,fixed,0,0,1,0,0,0
-estove,R1,2020,fixed,0,0,0,0,0,1
-estove,R2,2020,fixed,0,0,0,0,0,1
+electric_stove,R1,2020,fixed,0,0,0,0,0,1
+electric_stove,R2,2020,fixed,0,0,0,0,0,1
 gas_stove,R1,2020,fixed,0,0,0,50,0,1
 gas_stove,R2,2020,fixed,0,0,0,50,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv
similarity index 77%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/ExistingCapacity.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv
index 6da9ddd1..5ade79dc 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/ExistingCapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv
@@ -3,7 +3,7 @@ gasboiler,R1,PJ/y,10,5,0,0,0,0,0
 heatpump,R1,PJ/y,0,0,0,0,0,0,0
 gasboiler,R2,PJ/y,10,5,0,0,0,0,0
 heatpump,R2,PJ/y,0,0,0,0,0,0,0
-estove,R1,PJ/y,0,0,0,0,0,0,0
-estove,R2,PJ/y,0,0,0,0,0,0,0
+electric_stove,R1,PJ/y,0,0,0,0,0,0,0
+electric_stove,R2,PJ/y,0,0,0,0,0,0,0
 gas_stove,R1,PJ/y,10,5,0,0,0,0,0
 gas_stove,R2,PJ/y,10,5,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
similarity index 64%
rename from docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv
rename to docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
index 3e5a40c5..8339479f 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
@@ -4,7 +4,7 @@ gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,g
 heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
 gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
 heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-estove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-estove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gas_stove,R1,2020,fixed,8.8667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gas_stove,R2,2020,fixed,8.8667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
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
deleted file mode 100644
index 5aecf3d9..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
+++ /dev/null
@@ -1,113 +0,0 @@
-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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 5cb9a711..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,141 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,4.00000000000
-0,2049,gasCCGT,R1,2025,4.00000000000
-0,2050,gasCCGT,R1,2025,4.00000000000
-0,2054,gasCCGT,R1,2025,4.00000000000
-0,2055,gasCCGT,R1,2025,4.00000000000
-0,2059,gasCCGT,R1,2025,4.00000000000
-0,2060,gasCCGT,R1,2025,4.00000000000
-0,2064,gasCCGT,R1,2025,4.00000000000
-1,2045,gasCCGT,R2,2025,4.00000000000
-1,2049,gasCCGT,R2,2025,4.00000000000
-1,2050,gasCCGT,R2,2025,4.00000000000
-1,2054,gasCCGT,R2,2025,4.00000000000
-1,2055,gasCCGT,R2,2025,4.00000000000
-1,2059,gasCCGT,R2,2025,4.00000000000
-1,2060,gasCCGT,R2,2025,4.00000000000
-1,2064,gasCCGT,R2,2025,4.00000000000
-2,2045,solarPV,R1,2020,13.46730000000
-2,2049,solarPV,R1,2020,13.46730000000
-3,2045,solarPV,R1,2025,10.39350000000
-3,2049,solarPV,R1,2025,10.39350000000
-3,2050,solarPV,R1,2025,10.39350000000
-3,2054,solarPV,R1,2025,10.39350000000
-4,2045,solarPV,R1,2030,11.42930000000
-4,2049,solarPV,R1,2030,11.42930000000
-4,2050,solarPV,R1,2030,11.42930000000
-4,2054,solarPV,R1,2030,11.42930000000
-4,2055,solarPV,R1,2030,11.42930000000
-4,2059,solarPV,R1,2030,11.42930000000
-5,2045,solarPV,R1,2035,15.71520000000
-5,2049,solarPV,R1,2035,15.71520000000
-5,2050,solarPV,R1,2035,15.71520000000
-5,2054,solarPV,R1,2035,15.71520000000
-5,2055,solarPV,R1,2035,15.71520000000
-5,2059,solarPV,R1,2035,15.71520000000
-5,2060,solarPV,R1,2035,15.71520000000
-5,2064,solarPV,R1,2035,15.71520000000
-6,2045,solarPV,R1,2040,8.99470000000
-6,2049,solarPV,R1,2040,8.99470000000
-6,2050,solarPV,R1,2040,8.99470000000
-6,2054,solarPV,R1,2040,8.99470000000
-6,2055,solarPV,R1,2040,8.99470000000
-6,2059,solarPV,R1,2040,8.99470000000
-6,2060,solarPV,R1,2040,8.99470000000
-6,2064,solarPV,R1,2040,8.99470000000
-6,2065,solarPV,R1,2040,8.99470000000
-6,2069,solarPV,R1,2040,8.99470000000
-7,2050,solarPV,R1,2045,24.89670000000
-7,2054,solarPV,R1,2045,24.89670000000
-7,2055,solarPV,R1,2045,24.89670000000
-7,2059,solarPV,R1,2045,24.89670000000
-7,2060,solarPV,R1,2045,24.89670000000
-7,2064,solarPV,R1,2045,24.89670000000
-7,2065,solarPV,R1,2045,24.89670000000
-7,2069,solarPV,R1,2045,24.89670000000
-7,2070,solarPV,R1,2045,24.89670000000
-7,2074,solarPV,R1,2045,24.89670000000
-8,2045,solarPV,R2,2020,13.46730000000
-8,2049,solarPV,R2,2020,13.46730000000
-9,2045,solarPV,R2,2025,10.39350000000
-9,2049,solarPV,R2,2025,10.39350000000
-9,2050,solarPV,R2,2025,10.39350000000
-9,2054,solarPV,R2,2025,10.39350000000
-10,2045,solarPV,R2,2030,11.42930000000
-10,2049,solarPV,R2,2030,11.42930000000
-10,2050,solarPV,R2,2030,11.42930000000
-10,2054,solarPV,R2,2030,11.42930000000
-10,2055,solarPV,R2,2030,11.42930000000
-10,2059,solarPV,R2,2030,11.42930000000
-11,2045,solarPV,R2,2035,15.71520000000
-11,2049,solarPV,R2,2035,15.71520000000
-11,2050,solarPV,R2,2035,15.71520000000
-11,2054,solarPV,R2,2035,15.71520000000
-11,2055,solarPV,R2,2035,15.71520000000
-11,2059,solarPV,R2,2035,15.71520000000
-11,2060,solarPV,R2,2035,15.71520000000
-11,2064,solarPV,R2,2035,15.71520000000
-12,2045,solarPV,R2,2040,8.99470000000
-12,2049,solarPV,R2,2040,8.99470000000
-12,2050,solarPV,R2,2040,8.99470000000
-12,2054,solarPV,R2,2040,8.99470000000
-12,2055,solarPV,R2,2040,8.99470000000
-12,2059,solarPV,R2,2040,8.99470000000
-12,2060,solarPV,R2,2040,8.99470000000
-12,2064,solarPV,R2,2040,8.99470000000
-12,2065,solarPV,R2,2040,8.99470000000
-12,2069,solarPV,R2,2040,8.99470000000
-13,2050,solarPV,R2,2045,24.89670000000
-13,2054,solarPV,R2,2045,24.89670000000
-13,2055,solarPV,R2,2045,24.89670000000
-13,2059,solarPV,R2,2045,24.89670000000
-13,2060,solarPV,R2,2045,24.89670000000
-13,2064,solarPV,R2,2045,24.89670000000
-13,2065,solarPV,R2,2045,24.89670000000
-13,2069,solarPV,R2,2045,24.89670000000
-13,2070,solarPV,R2,2045,24.89670000000
-13,2074,solarPV,R2,2045,24.89670000000
-14,2045,windturbine,R1,2020,20.00000000000
-14,2049,windturbine,R1,2020,20.00000000000
-15,2045,windturbine,R1,2040,2.43470000000
-15,2049,windturbine,R1,2040,2.43470000000
-15,2050,windturbine,R1,2040,2.43470000000
-15,2054,windturbine,R1,2040,2.43470000000
-15,2055,windturbine,R1,2040,2.43470000000
-15,2059,windturbine,R1,2040,2.43470000000
-15,2060,windturbine,R1,2040,2.43470000000
-15,2064,windturbine,R1,2040,2.43470000000
-15,2065,windturbine,R1,2040,2.43470000000
-15,2069,windturbine,R1,2040,2.43470000000
-16,2050,windturbine,R1,2045,20.00000000000
-16,2054,windturbine,R1,2045,20.00000000000
-16,2055,windturbine,R1,2045,20.00000000000
-16,2059,windturbine,R1,2045,20.00000000000
-16,2060,windturbine,R1,2045,20.00000000000
-16,2064,windturbine,R1,2045,20.00000000000
-16,2065,windturbine,R1,2045,20.00000000000
-16,2069,windturbine,R1,2045,20.00000000000
-16,2070,windturbine,R1,2045,20.00000000000
-16,2074,windturbine,R1,2045,20.00000000000
-17,2045,windturbine,R2,2020,20.00000000000
-17,2049,windturbine,R2,2020,20.00000000000
-18,2045,windturbine,R2,2040,2.43470000000
-18,2049,windturbine,R2,2040,2.43470000000
-18,2050,windturbine,R2,2040,2.43470000000
-18,2054,windturbine,R2,2040,2.43470000000
-18,2055,windturbine,R2,2040,2.43470000000
-18,2059,windturbine,R2,2040,2.43470000000
-18,2060,windturbine,R2,2040,2.43470000000
-18,2064,windturbine,R2,2040,2.43470000000
-18,2065,windturbine,R2,2040,2.43470000000
-18,2069,windturbine,R2,2040,2.43470000000
-19,2050,windturbine,R2,2045,20.00000000000
-19,2054,windturbine,R2,2045,20.00000000000
-19,2055,windturbine,R2,2045,20.00000000000
-19,2059,windturbine,R2,2045,20.00000000000
-19,2060,windturbine,R2,2045,20.00000000000
-19,2064,windturbine,R2,2045,20.00000000000
-19,2065,windturbine,R2,2045,20.00000000000
-19,2069,windturbine,R2,2045,20.00000000000
-19,2070,windturbine,R2,2045,20.00000000000
-19,2074,windturbine,R2,2045,20.00000000000
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
deleted file mode 100644
index 6092e062..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv
deleted file mode 100644
index b0a238a8..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2040.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2040,estove,R1,2030,23.57330000000
-0,2044,estove,R1,2030,23.57330000000
-1,2040,estove,R1,2035,16.42930000000
-1,2044,estove,R1,2035,16.42930000000
-1,2045,estove,R1,2035,16.42930000000
-1,2049,estove,R1,2035,16.42930000000
-2,2045,estove,R1,2040,29.28800000000
-2,2049,estove,R1,2040,29.28800000000
-2,2050,estove,R1,2040,29.28800000000
-2,2054,estove,R1,2040,29.28800000000
-3,2040,estove,R2,2030,23.57330000000
-3,2044,estove,R2,2030,23.57330000000
-4,2040,estove,R2,2035,16.42930000000
-4,2044,estove,R2,2035,16.42930000000
-4,2045,estove,R2,2035,16.42930000000
-4,2049,estove,R2,2035,16.42930000000
-5,2045,estove,R2,2040,29.28800000000
-5,2049,estove,R2,2040,29.28800000000
-5,2050,estove,R2,2040,29.28800000000
-5,2054,estove,R2,2040,29.28800000000
-6,2040,heatpump,R1,2030,23.57330000000
-6,2044,heatpump,R1,2030,23.57330000000
-7,2040,heatpump,R1,2035,16.42930000000
-7,2044,heatpump,R1,2035,16.42930000000
-7,2045,heatpump,R1,2035,16.42930000000
-7,2049,heatpump,R1,2035,16.42930000000
-8,2045,heatpump,R1,2040,29.28800000000
-8,2049,heatpump,R1,2040,29.28800000000
-8,2050,heatpump,R1,2040,29.28800000000
-8,2054,heatpump,R1,2040,29.28800000000
-9,2040,heatpump,R2,2030,23.57330000000
-9,2044,heatpump,R2,2030,23.57330000000
-10,2040,heatpump,R2,2035,16.42930000000
-10,2044,heatpump,R2,2035,16.42930000000
-10,2045,heatpump,R2,2035,16.42930000000
-10,2049,heatpump,R2,2035,16.42930000000
-11,2045,heatpump,R2,2040,29.28800000000
-11,2049,heatpump,R2,2040,29.28800000000
-11,2050,heatpump,R2,2040,29.28800000000
-11,2054,heatpump,R2,2040,29.28800000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 23f5fa59..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,estove,R1,2035,16.42930000000
-0,2049,estove,R1,2035,16.42930000000
-1,2045,estove,R1,2040,29.28800000000
-1,2049,estove,R1,2040,29.28800000000
-1,2050,estove,R1,2040,29.28800000000
-1,2054,estove,R1,2040,29.28800000000
-2,2050,estove,R1,2045,22.14400000000
-2,2054,estove,R1,2045,22.14400000000
-2,2055,estove,R1,2045,22.14400000000
-2,2059,estove,R1,2045,22.14400000000
-3,2045,estove,R2,2035,16.42930000000
-3,2049,estove,R2,2035,16.42930000000
-4,2045,estove,R2,2040,29.28800000000
-4,2049,estove,R2,2040,29.28800000000
-4,2050,estove,R2,2040,29.28800000000
-4,2054,estove,R2,2040,29.28800000000
-5,2050,estove,R2,2045,22.14400000000
-5,2054,estove,R2,2045,22.14400000000
-5,2055,estove,R2,2045,22.14400000000
-5,2059,estove,R2,2045,22.14400000000
-6,2045,heatpump,R1,2035,16.42930000000
-6,2049,heatpump,R1,2035,16.42930000000
-7,2045,heatpump,R1,2040,29.28800000000
-7,2049,heatpump,R1,2040,29.28800000000
-7,2050,heatpump,R1,2040,29.28800000000
-7,2054,heatpump,R1,2040,29.28800000000
-8,2050,heatpump,R1,2045,22.14400000000
-8,2054,heatpump,R1,2045,22.14400000000
-8,2055,heatpump,R1,2045,22.14400000000
-8,2059,heatpump,R1,2045,22.14400000000
-9,2045,heatpump,R2,2035,16.42930000000
-9,2049,heatpump,R2,2035,16.42930000000
-10,2045,heatpump,R2,2040,29.28800000000
-10,2049,heatpump,R2,2040,29.28800000000
-10,2050,heatpump,R2,2040,29.28800000000
-10,2054,heatpump,R2,2040,29.28800000000
-11,2050,heatpump,R2,2045,22.14400000000
-11,2054,heatpump,R2,2045,22.14400000000
-11,2055,heatpump,R2,2045,22.14400000000
-11,2059,heatpump,R2,2045,22.14400000000
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
deleted file mode 100644
index 81136126..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-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
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
deleted file mode 100644
index a46c9d61..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-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
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
deleted file mode 100644
index 6d7f6711..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-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
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
deleted file mode 100644
index f046e7e7..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,257 +0,0 @@
-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
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv
deleted file mode 100644
index 449bfa1c..00000000
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/technodata/power/Technodata.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index d0c27a1d..14083524 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -14,7 +14,7 @@
 
 
 def generate_model_1():
-    model_name = "1-new-service-demand"
+    model_name = "1-exogenous-demand"
 
     # Starting point: copy model from tutorial 4
     model_path = parent_path / model_name
@@ -34,8 +34,8 @@ def generate_model_1():
     df.loc[1:, "cook"] = 100
     df.to_csv(projections_file, index=False)
 
-    # Copy windturbine process in power sector -> cook
-    add_new_process(model_path, "estove", "residential", "heatpump")
+    # Copy processes in power sector -> cook
+    add_new_process(model_path, "electric_stove", "residential", "heatpump")
     add_new_process(model_path, "gas_stove", "residential", "gasboiler")
 
     # Modify output commodities
@@ -43,7 +43,7 @@ def generate_model_1():
     df = pd.read_csv(commout_file)
     df.loc[1:, "cook"] = 0
     df.loc[df["ProcessName"] == "gas_stove", df.columns[-6:]] = [0, 0, 0, 50, 0, 1]
-    df.loc[df["ProcessName"] == "estove", df.columns[-6:]] = [0, 0, 0, 0, 0, 1]
+    df.loc[df["ProcessName"] == "electric_stove", df.columns[-6:]] = [0, 0, 0, 0, 0, 1]
     df.to_csv(commout_file, index=False)
 
     # Modify input commodities
@@ -55,19 +55,21 @@ def generate_model_1():
     # Change cap_par, Fuel and EndUse
     technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
-    df.loc[df["ProcessName"] == "gas_stove", "cap_par"] = 8.8667
     df.loc[df["ProcessName"] == "gas_stove", "Fuel"] = "gas"
     df.loc[df["ProcessName"] == "electric_stove", "Fuel"] = "electricity"
     df.loc[df["ProcessName"] == "gas_stove", "EndUse"] = "cook"
     df.loc[df["ProcessName"] == "electric_stove", "EndUse"] = "cook"
     df.to_csv(technodata_file, index=False)
 
-    # Change power sector limits
+    # Increase capacity limits in power sector
     technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityAddition"] = 4
-    df.loc[1:, "MaxCapacityGrowth"] = 0.4
-    df.loc[1:, "TotalCapacityLimit"] = 60
+    df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
+    df.loc[1:, "MaxCapacityAddition"] *= 2
+    df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
+    df.loc[1:, "MaxCapacityGrowth"] *= 2
+    df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
+    df.loc[1:, "TotalCapacityLimit"] *= 2
     df.to_csv(technodata_file, index=False)
 
 
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 564d6049..7c32ab8b 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -19,7 +19,7 @@
     "\n",
     "The process to change the input files, however, takes a bit more time. To achieve this, there must be data for each of the sectors for the new region. This, therefore, requires the modification of every [input file](../inputs/index.rst).\n",
     "\n",
-    "Due to space constraints, we will not show you how to edit all of the files. However, you can access the modified files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region)."
+    "Due to space constraints, we will not show you how to edit all of the files. However, you can access the modified files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
    ]
   },
   {
@@ -32,7 +32,7 @@
     "\n",
     "We have placed two examples as to how to edit the residential sector below. Again, the edited data are highlighted in **bold**, with the original data in normal text. \n",
     "\n",
-    "For the sake of brevity, we have omitted the entries for 2040 for the `CommIn.csv` file, however, just make sure to copy and paste the values for 2020 to 2040 here. The full file can be seen [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/3-add-region/technodata/residential/CommIn.csv). \n",
+    "For the sake of brevity, we have omitted the entries for 2040 for the `CommIn.csv` file, however, just make sure to copy and paste the values for 2020 to 2040 here. The full file can be seen [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv). \n",
     "\n",
     "The following file is the modified ```/technodata/residential/CommIn.csv``` file:\n",
     "\n",
@@ -61,16 +61,16 @@
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gasCCGT|R1|2020|…|2|0.02|60|…|1|\n",
-    "|windturbine|R1|2020|…|2|0.02|60|…|1|\n",
-    "|solarPV|R1|2020|…|2|0.02|60|…|1|\n",
-    "|gasCCGT|R2|2020|…|2|0.02|60|…|1|\n",
-    "|windturbine|R2|2020|…|**5**|**0.05**|**100**|…|1|\n",
-    "|windturbine|R2|2040|…|**5**|**0.05**|**100**|…|1|\n",
-    "|solarPV|R2|2020|…|2|0.02|60|…|1|\n",
+    "|gasCCGT|R1|2020|…|2|0.2|60|…|1|\n",
+    "|windturbine|R1|2020|…|2|0.2|60|…|1|\n",
+    "|solarPV|R1|2020|…|2|0.2|60|…|1|\n",
+    "|gasCCGT|R2|2020|…|2|0.2|60|…|1|\n",
+    "|windturbine|R2|2020|…|**5**|**0.5**|**100**|…|1|\n",
+    "|windturbine|R2|2040|…|**5**|**0.5**|**100**|…|1|\n",
+    "|solarPV|R2|2020|…|2|0.2|60|…|1|\n",
     "|...|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. All of the edited input files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region)."
+    "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. All of the edited input files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
    ]
   },
   {
@@ -121,7 +121,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Due to the similar natures of the two regions, with the parameters effectively copied and pasted between them, the results are very similar in both `R1` and `R2`. `gassupply1` drops significantly within the gas sector due to the carbon price profile. Which leads to the increasing demand of `heatpump` and falling demand of `gasboiler` in both region `R1` and `R2`. `windturbine` and `solarPV` increase significantly to match this demand of `heatpump`.\n",
+    "Due to the similar natures of the two regions, with the parameters effectively copied and pasted between them, the results are very similar in both `R1` and `R2`. `gassupply1` drops significantly within the gas sector due to the carbon price profile. Which leads to the increasing demand of `heatpump` and falling demand of `gasboiler` in both region `R1` and `R2`. `windturbine` and `solarPV` increase significantly to match this demand of `heatpump`. Region `R2` has a slightly higher share of `windturbine` resulting from the increase in capacity that we introduced.\n",
     "\n",
     "Have a play around with the various costs data in the technodata files for each of the sectors and technologies to see if different scenarios emerge. Although be careful. In some cases, the constraints on certain technologies will make it impossible for the demand to be met and it will give you an error such as the following:\n",
     "\n",
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 61053943..c694e944 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -33,31 +33,31 @@
     "\n",
     "The `Residential2020Consumption.csv` file allows us to specify the demand in 2020 for each region and technology per timeslice. The `Residential2050Consumption.csv` file does the same but for the year 2050. The datapoints between these are interpolated.\n",
     "\n",
-    "Firstly, we must add the new service demand: `cook` as a column in these two files. Next, we add the demand. Again, the modified entries are in bold:"
+    "Firstly, we must add the new service demand: `cook` as a column in these two files. Next, we add the demand. For simplicity we will copy over the values from the `heat` column:"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
+    "|RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|solar|**cook**|\n",
     "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|0|R1|gasboiler|1|0|0|1|0|0|**1**|\n",
-    "|1|R1|gasboiler|2|0|0|1.5|0|0|**2**|\n",
-    "|2|R1|gasboiler|3|0|0|1|0|0|**1**|\n",
-    "|3|R1|gasboiler|4|0|0|1.5|0|0|**1.5**|\n",
-    "|4|R1|gasboiler|5|0|0|3|0|0|**2**|\n",
-    "|5|R1|gasboiler|6|0|0|2|0|0|**3**|\n",
-    "|6|R1|gasboiler|7|0|0|2|0|0|**2**|\n",
-    "|7|R1|gasboiler|8|0|0|2|0|0|**3**|\n",
-    "|8|R2|gasboiler|1|0|0|1|0|0|**1**|\n",
-    "|9|R2|gasboiler|2|0|0|1.5|0|0|**1**|\n",
-    "|10|R2|gasboiler|3|0|0|1|0|0|**1**|\n",
-    "|11|R2|gasboiler|4|0|0|1.5|0|0|**1.5**|\n",
-    "|12|R2|gasboiler|5|0|0|3|0|0|**2**|\n",
-    "|13|R2|gasboiler|6|0|0|2|0|0|**2**|\n",
-    "|14|R2|gasboiler|7|0|0|2|0|0|**2.5**|\n",
-    "|15|R2|gasboiler|8|0|0|2|0|0|**2**|\n",
+    "|R1|gasboiler|1|0|0|0.714|0|0|0|**0.714**|\n",
+    "|R1|gasboiler|2|0|0|1.071|0|0|0|**1.071**|\n",
+    "|R1|gasboiler|3|0|0|0.714|0|0|0|**0.714**|\n",
+    "|R1|gasboiler|4|0|0|1.071|0|0|0|**1.071**|\n",
+    "|R1|gasboiler|5|0|0|2.143|0|0|0|**2.143**|\n",
+    "|R1|gasboiler|6|0|0|1.429|0|0|0|**1.429**|\n",
+    "|R1|gasboiler|7|0|0|1.429|0|0|0|**1.429**|\n",
+    "|R1|gasboiler|8|0|0|1.429|0|0|0|**1.429**|\n",
+    "|R2|gasboiler|1|0|0|0.714|0|0|0|**0.714**|\n",
+    "|R2|gasboiler|2|0|0|1.071|0|0|0|**1.071**|\n",
+    "|R2|gasboiler|3|0|0|0.714|0|0|0|**0.714**|\n",
+    "|R2|gasboiler|4|0|0|1.071|0|0|0|**1.071**|\n",
+    "|R2|gasboiler|5|0|0|2.143|0|0|0|**2.143**|\n",
+    "|R2|gasboiler|6|0|0|1.429|0|0|0|**1.429**|\n",
+    "|R2|gasboiler|7|0|0|1.429|0|0|0|**1.429**|\n",
+    "|R2|gasboiler|8|0|0|1.429|0|0|0|**1.429**|\n",
     "\n",
     "\n",
     "<!-- ||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
@@ -89,7 +89,7 @@
    "source": [
     "As can be seen, we only need to add a `cook` column in the file, as well as the demand level for each timeslice and each region. This can be seen through the addition of a positive number in the `cook` column.\n",
     "\n",
-    "The process is very similar for the `Residential2050Consumption.csv` file, however, for this example, we often placed larger numbers to indicate higher demand in 2050. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
+    "The process is very similar for the `Residential2050Consumption.csv` file, again copying the values over from the `heat` column. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
    ]
   },
   {
@@ -168,7 +168,7 @@
     "\n",
     "For this example, we will add two competing technologies to service the cooking demand: `electric_stove` and `gas_stove` to the `Technodata.csv` file in `/technodata/residential/Technodata.csv`.\n",
     "\n",
-    "Again for the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `gasboiler` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `heatpump` from region `R1` for both `R1` and `R2`. \n",
+    "Again for the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `heatpump` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `gasboiler` from region `R1` for both `R1` and `R2`. \n",
     "\n",
     "An important modification, however, is specifying the end-use for these new technologies to be `cook` and not `heat`.\n",
     "\n",
@@ -177,10 +177,10 @@
     "|Unit|-|Year|-|MUS$2010/PJ_a|…|-|-|Retrofit|\n",
     "|gasboiler|R1|2020|fixed|3.8|…|gas|heat|1|\n",
     "|...|...|...|...|...|...|...|...|...|\n",
-    "|**electric_stove**|**R1**|**2020**|**fixed**|**3.8**|**…**|**electricity**|**cook**|**1**|\n",
-    "|**electric_stove**|**R2**|**2020**|**fixed**|**3.8**|**…**|**electricity**|**cook**|**1**|\n",
-    "|**gas_stove**|**R1**|**2020**|**fixed**|**8.8667**|**…**|**gas**|**cook**|**1**|\n",
-    "|**gas_stove**|**R2**|**2020**|**fixed**|**8.8667**|**…**|**gas**|**cook**|**1**|\n",
+    "|**electric_stove**|**R1**|**2020**|**fixed**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n",
+    "|**electric_stove**|**R2**|**2020**|**fixed**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n",
+    "|**gas_stove**|**R1**|**2020**|**fixed**|**3.8**|**…**|**gas**|**cook**|**1**|\n",
+    "|**gas_stove**|**R2**|**2020**|**fixed**|**3.8**|**…**|**gas**|**cook**|**1**|\n",
     "\n",
     "\n",
     "As can be seen we have added two technologies, in the two regions with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)."
@@ -200,13 +200,18 @@
     "\n",
     "This is largely a similar process to the tutorial shown in [\"adding a new technology\"](add-solar.ipynb). We must add the input to each of the technologies (gas and electricity for `gas_stove` and `electric_stove` respectively), outputs of `cook` for both and the existing capacity for each technology in each region.\n",
     "\n",
-    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/Technodata.csv` file. For this example, we set this file as follows:\n",
+    "Due to the additional demand for electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints in the `technodata/power/Technodata.csv` file. For this example, we will double all the values for `MaxCapaciyAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`, as follows:\n",
     "\n",
-    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
-    "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gassupply1|R1|2020|…|**100**|**5**|**500**|…|1|\n",
-    "|gassupply1|R2|2020|…|**100**|**5**|**120**|…|1|\n",
+    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
+    "|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|…|PJ|%|PJ|…|Retrofit|\n",
+    "|gasCCGT|R1|…|**4**|**0.4**|**120**|…|1|\n",
+    "|windturbine|R1|…|**4**|**0.4**|**120**|…|1|\n",
+    "|solarPV|R1|…|**4**|**0.4**|**120**|…|1|\n",
+    "|gasCCGT|R2|…|**4**|**0.4**|**120**|…|1|\n",
+    "|windturbine|R2|…|**10**|**0.4**|**200**|…|1|\n",
+    "|solarPV|R2|…|**4**|**0.4**|**120**|…|1|\n",
+    "|...|...|...|...|...|...|...|...|\n",
     "\n",
     "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). "
    ]
@@ -240,7 +245,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\n",
-    "    \"../tutorial-code/5-add-service-demand/1-new-service-demand/Results/MCACapacity.csv\"\n",
+    "    \"../tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv\"\n",
     ")\n",
     "mca_capacity.head()"
    ]
@@ -271,7 +276,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We can see our new technology, the `gas_stove` is used and the `electric_stove` is not used at all. Therefore, there is an increase in `gassupply1` to accommodate for this growth in demand. However, this is not enough to displace `windturbine` by `gasCCGT` in the power sector."
+    "We can see that `electric_stove` is used and `gas_stove` is barely used at all. Therefore, compared to the previous tutorial, there is a larger increase in capacity in the `power` sector to accommodate this increase in demand for electricity, which is largely driven by `windturbine` and `solarPV`."
    ]
   },
   {
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 1526e27b..4587ec11 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -33,7 +33,7 @@
     "\n",
     "An example of the changes is shown below:\n",
     "\n",
-    "    [timeslices]\n",
+    "    [timeslices.all-year.all-week]\n",
     "    all-year.all-week.night = 1095\n",
     "    all-year.all-week.morning = 1095\n",
     "    all-year.all-week.mid-afternoon = 1095\n",
@@ -42,36 +42,35 @@
     "    all-year.all-week.evening = 1095\n",
     "    all-year.all-week.early-morning = 1095\n",
     "    all-year.all-week.late-afternoon = 1095\n",
-    "    level_names = [\"month\", \"day\", \"hour\"]\n",
     "    \n",
     "The number of timeslices within this should add up to 8760; the number of hours in a benchmark year. Whilst this is required, MUSE does not check and enforce this.\n",
     "    \n",
-    "Next, we modify both Residential Consumption files. Again, we put the text in bold for the modified entries. We must add the demand for the two additional timelsices, which we call timeslice 7 and 8. We make the demand for heat to be 2 for both of the new timeslices.\n",
+    "Next, we modify both Residential Consumption files. Again, we put the text in bold for the modified entries. We must add the demand for the two additional timelsices, which we call timeslice 7 and 8. We will also change the demand for `heat` in the existing timeslices.\n",
     "\n",
     "Below is the modified ```Residential2020Consumption.csv``` file:\n",
     " \n",
-    "||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|\n",
+    "|RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|solar|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|0|R1|gasboiler|1|0|0|1|0|0|\n",
-    "|1|R1|gasboiler|2|0|0|1.5|0|0|\n",
-    "|2|R1|gasboiler|3|0|0|1|0|0|\n",
-    "|3|R1|gasboiler|4|0|0|1.5|0|0|\n",
-    "|4|R1|gasboiler|5|0|0|3|0|0|\n",
-    "|5|R1|gasboiler|6|0|0|2|0|0|\n",
-    "|**6**|**R1**|**gasboiler**|**7**|**0**|**0**|**2**|**0**|**0**|\n",
-    "|**7**|**R1**|**gasboiler**|**8**|**0**|**0**|**2**|**0**|**0**|\n",
-    "|0|R2|gasboiler|1|0|0|1|0|0|\n",
-    "|1|R2|gasboiler|2|0|0|1.5|0|0|\n",
-    "|2|R2|gasboiler|3|0|0|1|0|0|\n",
-    "|3|R2|gasboiler|4|0|0|1.5|0|0|\n",
-    "|4|R2|gasboiler|5|0|0|3|0|0|\n",
-    "|5|R2|gasboiler|6|0|0|2|0|0|\n",
-    "|**6**|**R2**|**gasboiler**|**7**|**0**|**0**|**2**|**0**|**0**|\n",
-    "|**7**|**R2**|**gasboiler**|**8**|**0**|**0**|**2**|**0**|**0**|\n",
+    "|R1|gasboiler|1|0|0|**0.714**|0|0|0|\n",
+    "|R1|gasboiler|2|0|0|**1.071**|0|0|0|\n",
+    "|R1|gasboiler|3|0|0|**0.714**|0|0|0|\n",
+    "|R1|gasboiler|4|0|0|**1.071**|0|0|0|\n",
+    "|R1|gasboiler|5|0|0|**2.143**|0|0|0|\n",
+    "|R1|gasboiler|6|0|0|**1.429**|0|0|0|\n",
+    "|**R1**|**gasboiler**|**7**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
+    "|**R1**|**gasboiler**|**8**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
+    "|R2|gasboiler|1|0|0|**0.714**|0|0|0|\n",
+    "|R2|gasboiler|2|0|0|**1.071**|0|0|0|\n",
+    "|R2|gasboiler|3|0|0|**0.714**|0|0|0|\n",
+    "|R2|gasboiler|4|0|0|**1.071**|0|0|0|\n",
+    "|R2|gasboiler|5|0|0|**2.143**|0|0|0|\n",
+    "|R2|gasboiler|6|0|0|**1.429**|0|0|0|\n",
+    "|**R2**|**gasboiler**|**7**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
+    "|**R2**|**gasboiler**|**8**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
     "\n",
     "The `ProcessName` must be reported, but it is not binding on the results. It is just the way that the model reads the input data.\n",
     "\n",
-    "We do the same for the ```Residential2050Consumption.csv```, however this time we make the demand for heat in 2050 to both be 5 for the new timeslices. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file.\n",
+    "We do the same for the ```Residential2050Consumption.csv```, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file.\n",
     " \n",
     "<!-- As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service the demand for heat. Therefore, we relax the constraints for growth in ```windturbine``` in region `R2` in the ```technodata/power/Technodata.csv``` file, as well as the constraints for ```heatpump```, again in region `R2`. For the full power sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-power-technodata), and for the full residential sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-residential-technodata). -->"
    ]
@@ -169,28 +168,28 @@
    "source": [
     "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n",
     "\n",
-    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv```, as shown below:\n",
+    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv``` (we will double `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
     "\n",
-    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
+    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|…|PJ|%|PJ|…|New|\n",
-    "|gasCCGT|R1|…|**40**|**0.2**|**120**|…|0|\n",
-    "|windturbine|R1|…|**40**|**0.2**|**120**|…|0|\n",
-    "|solarPV|R1|…|**40**|**0.2**|**120**|…|0|\n",
-    "|gasCCGT|R2|…|**40**|**0.2**|**120**|…|0|\n",
-    "|windturbine|R2|…|**40**|**0.2**|**120**|…|0|\n",
-    "|solarPV|R2|…|**40**|**0.2**|**120**|…|0|\n",
+    "|Unit|-|…|PJ|%|PJ|…|Retrofit|\n",
+    "|gasCCGT|R1|…|**4**|**0.4**|**120**|…|1|\n",
+    "|windturbine|R1|…|**4**|**0.4**|**120**|…|1|\n",
+    "|solarPV|R1|…|**4**|**0.4**|**120**|…|1|\n",
+    "|gasCCGT|R2|…|**4**|**0.4**|**120**|…|1|\n",
+    "|windturbine|R2|…|**10**|**0.4**|**200**|…|1|\n",
+    "|solarPV|R2|…|**4**|**0.4**|**120**|…|1|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector, as shown below.\n",
+    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector (also doubling `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
     "\n",
-    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
+    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|PJ|%|PJ|…|New|\n",
-    "|gasboiler|R1|2020|…|**60**|**0.5**|**120**|…|0|\n",
-    "|heatpump|R1|2020|…|**60**|**0.5**|**120**|…|0|\n",
-    "|gasboiler|R2|2020|…|**60**|**0.5**|**120**|…|0|\n",
-    "|heatpump|R2|2020|…|**60**|**0.5**|**120**|…|0|\n",
+    "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
+    "|gasboiler|R1|2020|…|**20**|**0.08**|**120**|…|1|\n",
+    "|heatpump|R1|2020|…|**20**|**0.08**|**120**|…|1|\n",
+    "|gasboiler|R2|2020|…|**20**|**0.08**|**120**|…|1|\n",
+    "|heatpump|R2|2020|…|**20**|**0.08**|**120**|…|1|\n",
     "\n",
     "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",

From 935940ad80a82430cb9bf2491aa095862c3a061b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 11:42:24 +0100
Subject: [PATCH 148/419] Sorting paths for generating models

---
 docs/tutorial-code/generate_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial-code/generate_models.py b/docs/tutorial-code/generate_models.py
index f045ed45..ee09a907 100644
--- a/docs/tutorial-code/generate_models.py
+++ b/docs/tutorial-code/generate_models.py
@@ -3,6 +3,6 @@
 from pathlib import Path
 
 if __name__ == "__main__":
-    for tutorial in Path(__file__).parent.iterdir():
+    for tutorial in sorted(Path(__file__).parent.iterdir()):
         if (tutorial / "generate_models.py").exists():
             subprocess.call([sys.executable, str(tutorial / "generate_models.py")])

From 24fede3424fb45278ca53a8bea402871a880e0e1 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 11:42:54 +0100
Subject: [PATCH 149/419] Docstrings

---
 .../1-add-new-technology/generate_models.py      | 14 +++++++++-----
 .../tutorial-code/2-add-agent/generate_models.py | 16 +++++++++-------
 .../3-add-region/generate_models.py              |  9 ++++-----
 .../4-modify-timing-data/generate_models.py      | 14 +++++++++-----
 .../5-add-service-demand/generate_models.py      |  9 ++++-----
 .../6-add-correlation-demand/generate_models.py  |  8 ++++----
 .../generate_models.py                           | 14 +++++++++-----
 docs/tutorial-code/run_models.py                 | 13 +++++++++++--
 8 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 77b47f6b..9a88b5be 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -14,13 +14,12 @@
 parent_path = Path(__file__).parent
 
 
-"""
-Model 1 - Introduction
-
-"""
+def generate_model_1() -> None:
+    """Generates the first model for tutorial 1.
 
+    Adds solarPV to the default model.
 
-def generate_model_1() -> None:
+    """
     model_name = "1-introduction"
     model_path = parent_path / model_name
     if model_path.exists():
@@ -71,6 +70,11 @@ def generate_model_1() -> None:
 
 
 def generate_model_2() -> None:
+    """Generates the second model for tutorial 1.
+
+    Changes the price of solar between 2020 and 2040.
+
+    """
     model_name = "2-scenario"
     model_path = parent_path / model_name
     if model_path.exists():
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 05e2c31c..56bb77ae 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -8,8 +8,6 @@
 
 
 """
-Model 2 - Single objective
-
 Note: Generating the models in reverse order as this makes more sense programmatically.
 Consider changing the tutorial
 
@@ -17,6 +15,11 @@
 
 
 def generate_model_2():
+    """Generates the second model for tutorial 2.
+
+    Adds a new agent to the model with a single objective.
+
+    """
     model_name = "2-single-objective"
 
     # Starting point: copy model from previous tutorial
@@ -49,13 +52,12 @@ def generate_model_2():
         df.to_csv(technodata_file, index=False)
 
 
-"""
-Model 1 - Multiple objective
-
-"""
+def generate_model_1():
+    """Generates the first model for tutorial 2.
 
+    Adds a second objective for agent A2.
 
-def generate_model_1():
+    """
     model_name = "1-multiple-objective"
 
     # Starting point: copy model from previous tutorial
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index a5f1c9e2..e79b069c 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -7,13 +7,12 @@
 parent_path = Path(__file__).parent
 
 
-"""
-Model 1 - New region
-
-"""
+def generate_model_1():
+    """Generates the first model for tutorial 3.
 
+    Adds a new region to the model.
 
-def generate_model_1():
+    """
     model_name = "1-new-region"
 
     # Starting point: copy model from tutorial 1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 4d539f73..f88abdfa 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -8,13 +8,12 @@
 parent_path = Path(__file__).parent
 
 
-"""
-Model 1 - Modify timeslices
-
-"""
+def generate_model_1():
+    """Generates first model for tutorial 4.
 
+    Adds two new timeslices to the model.
 
-def generate_model_1():
+    """
     model_name = "1-modify-timeslices"
 
     # Starting point: copy model from tutorial 3
@@ -72,6 +71,11 @@ def generate_model_1():
 
 
 def generate_model_2():
+    """Generates the second model for tutorial 4.
+
+    Modifies the time framework of the model to every two years.
+
+    """
     model_name = "2-modify-time-framework"
 
     # Starting point: copy previous model
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index d716083e..a258c494 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -7,13 +7,12 @@
 parent_path = Path(__file__).parent
 
 
-"""
-Model 1 - New service demand
-
-"""
+def generate_model_1():
+    """Generates the first model for tutorial 5.
 
+    Adds a new service demand for cooking.
 
-def generate_model_1():
+    """
     model_name = "1-new-service-demand"
 
     # Starting point: copy model from tutorial 4
diff --git a/docs/tutorial-code/6-add-correlation-demand/generate_models.py b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
index 5ee38b53..7744f3bc 100644
--- a/docs/tutorial-code/6-add-correlation-demand/generate_models.py
+++ b/docs/tutorial-code/6-add-correlation-demand/generate_models.py
@@ -9,13 +9,13 @@
 
 parent_path = Path(__file__).parent
 
-"""
-Model 1 - Introduction
 
-"""
+def generate_model_1() -> None:
+    """Generates the first model for tutorial 6.
 
+    Adds correlation demand for residential sector.
 
-def generate_model_1() -> None:
+    """
     model_name = "1-correlation"
     model_path = parent_path / model_name
     if model_path.exists():
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index 01d75ccf..22b7b9d8 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -8,13 +8,12 @@
 parent_path = Path(__file__).parent
 
 
-"""
-Model 1 - Min constraint
-
-"""
+def generate_model_1() -> None:
+    """Generates the first model for tutorial 7.
 
+    Adds a minimum service factor constraint for gasCCGT.
 
-def generate_model_1() -> None:
+    """
     model_name = "1-min-constraint"
     model_path = parent_path / model_name
     if model_path.exists():
@@ -39,6 +38,11 @@ def generate_model_1() -> None:
 
 
 def generate_model_2() -> None:
+    """Generates the second model for tutorial 7.
+
+    Adds a maximum service factor constraint for windturbine.
+
+    """
     model_name = "2-max-constraint"
     model_path = parent_path / model_name
     if model_path.exists():
diff --git a/docs/tutorial-code/run_models.py b/docs/tutorial-code/run_models.py
index 72b3608a..c9935f4a 100644
--- a/docs/tutorial-code/run_models.py
+++ b/docs/tutorial-code/run_models.py
@@ -1,6 +1,7 @@
 import os
 from concurrent.futures import ProcessPoolExecutor
 from pathlib import Path
+from typing import Union
 
 from muse.mca import MCA
 from muse.readers.toml import read_settings
@@ -8,18 +9,26 @@
 parent_path = Path(__file__).parent
 
 
-def run_model(settings_file):
+def run_model(settings_file: Path) -> Union[str, None]:
+    """Run a model with the specified settings file.
+
+    Args:
+        settings_file: Path to the settings file to run the model with.
+
+    Returns:
+        Error message for failed runs, otherwise None.
+    """
     try:
         os.chdir(settings_file.parent)
         settings = read_settings(settings_file)
         model = MCA.factory(settings)
         model.run()
+        return None
     except Exception as e:
         return f"Failed to run model with settings file {settings_file}. Error: {e}"
 
 
 if __name__ == "__main__":
-    settings_files = parent_path.rglob("*/*settings.toml")
     with ProcessPoolExecutor() as executor:
         futures = {
             executor.submit(run_model, settings_file)

From 579651f70f6289fd318ef10dff1bcec31f5e1b3c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 11:50:47 +0100
Subject: [PATCH 150/419] technodata > Technodata

---
 .../1-add-new-technology/generate_models.py            |  6 +++---
 docs/tutorial-code/2-add-agent/generate_models.py      |  2 +-
 .../5-add-service-demand/generate_models.py            |  4 ++--
 docs/user-guide/add-region.ipynb                       |  2 +-
 docs/user-guide/add-solar.ipynb                        |  4 ++--
 docs/user-guide/addition-service-demand.ipynb          |  2 +-
 docs/user-guide/modify-timing-data.ipynb               | 10 +++++-----
 src/muse/wizard.py                                     | 10 +++++-----
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 9a88b5be..d62b4565 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -30,7 +30,7 @@ def generate_model_1() -> None:
     os.rename(parent_path / "model", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.2
     df.to_csv(technodata_file, index=False)
@@ -56,7 +56,7 @@ def generate_model_1() -> None:
     df.to_csv(commin_file, index=False)
 
     # Modify technodata for solarPV
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "solarPV", "cap_par"] = 30
     df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
@@ -87,7 +87,7 @@ def generate_model_2() -> None:
     add_price_data_for_new_year(model_path, "2040", "power", "2020")
 
     # Modify cap_par for solarPV
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2020"), "cap_par"] = 40
     df.loc[(df["ProcessName"] == "solarPV") & (df["Time"] == "2040"), "cap_par"] = 30
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 56bb77ae..3e1b3592 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -29,7 +29,7 @@ def generate_model_2():
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
     # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/residential/technodata.csv"
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.04
     df.to_csv(technodata_file, index=False)
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index a258c494..f865e876 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -52,7 +52,7 @@ def generate_model_1():
     df.to_csv(commin_file, index=False)
 
     # Change cap_par, Fuel and EndUse
-    technodata_file = model_path / "technodata/residential/technodata.csv"
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[df["ProcessName"] == "gas_stove", "cap_par"] = 8.8667
     df.loc[df["ProcessName"] == "gas_stove", "Fuel"] = "gas"
@@ -62,7 +62,7 @@ def generate_model_1():
     df.to_csv(technodata_file, index=False)
 
     # Change power sector limits
-    technodata_file = model_path / "technodata/power/technodata.csv"
+    technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = 4
     df.loc[1:, "MaxCapacityGrowth"] = 0.4
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 5224bdf0..564d6049 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -54,7 +54,7 @@
     "|**gasboiler**|**R2**|**PJ/y**|**10**|**5**|**0**|**0**|**0**|**0**|**0**|\n",
     "|**heatpump**|**R2**|**PJ/y**|**0**|**0**|**0**|**0**|**0**|**0**|**0**|\n",
     "\n",
-    "Below is the reduced ```/technodata/power/technodata.csv``` file, showing the increased capacity for ```windturbine``` in `R2`. For this, we highlight only the elements we changed from the rows in `R1`. The rest of the elements are the same for `R1` as they are for `R2`.\n",
+    "Below is the reduced ```/technodata/power/Technodata.csv``` file, showing the increased capacity for ```windturbine``` in `R2`. For this, we highlight only the elements we changed from the rows in `R1`. The rest of the elements are the same for `R1` as they are for `R2`.\n",
     "\n",
     "Again, we don't show the entries for 2040, apart from the edited windturbine row, for the sake of brevity.\n",
     "\n",
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 2ff2cce6..1b67e2a1 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -146,7 +146,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Finally, the ```technodata.csv``` contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version."
+    "Finally, the ```Technodata.csv``` contains parametrisation data for the technology, such as the cost, growth constraints, lifetime of the power plant and fuel used. The technodata file is too long for it all to be displayed here, so we will truncate the full version."
    ]
   },
   {
@@ -155,7 +155,7 @@
    "source": [
     "Here, we will only define the parameters: ```processName```, ```RegionName```, ```Time```, ```Level```,```cap_par```, ```Fuel```,```EndUse```,```Agent2``` and ```Agent1```\n",
     "\n",
-    "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```technodata.csv``` file for brevity. You can see the full file [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
+    "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```Technodata.csv``` file for brevity. You can see the full file [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
     "\n",
     "Again, flat forward extension is used here. Therefore, as in this example we only provide data for the benchmark year 2020, 2025 and the following benchmark years will keep the same characteristics, e.g. costs, for each benchmark year of the simulation."
    ]
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 6fb82d3b..61053943 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -200,7 +200,7 @@
     "\n",
     "This is largely a similar process to the tutorial shown in [\"adding a new technology\"](add-solar.ipynb). We must add the input to each of the technologies (gas and electricity for `gas_stove` and `electric_stove` respectively), outputs of `cook` for both and the existing capacity for each technology in each region.\n",
     "\n",
-    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/technodata.csv` file. For this example, we set this file as follows:\n",
+    "Due to the additional demand for gas and electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints for `gassupply1` in the `technodata/gas/Technodata.csv` file. For this example, we set this file as follows:\n",
     "\n",
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 7e1a5097..1526e27b 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -73,7 +73,7 @@
     "\n",
     "We do the same for the ```Residential2050Consumption.csv```, however this time we make the demand for heat in 2050 to both be 5 for the new timeslices. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file.\n",
     " \n",
-    "<!-- As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service the demand for heat. Therefore, we relax the constraints for growth in ```windturbine``` in region `R2` in the ```technodata/power/technodata.csv``` file, as well as the constraints for ```heatpump```, again in region `R2`. For the full power sector ```technodata.csv``` file click [here INSERT LINK HERE](github-power-technodata), and for the full residential sector ```technodata.csv``` file click [here INSERT LINK HERE](github-residential-technodata). -->"
+    "<!-- As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service the demand for heat. Therefore, we relax the constraints for growth in ```windturbine``` in region `R2` in the ```technodata/power/Technodata.csv``` file, as well as the constraints for ```heatpump```, again in region `R2`. For the full power sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-power-technodata), and for the full residential sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-residential-technodata). -->"
    ]
   },
   {
@@ -169,7 +169,7 @@
    "source": [
     "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n",
     "\n",
-    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/technodata.csv```, as shown below:\n",
+    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv```, as shown below:\n",
     "\n",
     "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|\n",
@@ -182,7 +182,7 @@
     "|solarPV|R2|…|**40**|**0.2**|**120**|…|0|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "We also modify the constraints defined in the `technodata.csv` file for the residential sector, as shown below.\n",
+    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector, as shown below.\n",
     "\n",
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
@@ -194,9 +194,9 @@
     "\n",
     "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",
-    "For the full power sector ```technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n",
+    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n",
     "\n",
-    "<!-- Again, we run the simulation and ensure that the constraints allow for the demand to be met by modifying the `technodata.csv` files. See [here (INSERT LINK HERE)](github-horizon-periods) for the modified full example, including the `technodata.csv` files.\n",
+    "<!-- Again, we run the simulation and ensure that the constraints allow for the demand to be met by modifying the `Technodata.csv` files. See [here (INSERT LINK HERE)](github-horizon-periods) for the modified full example, including the `Technodata.csv` files.\n",
     " -->\n"
    ]
   },
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 7271c103..60a43331 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -32,7 +32,7 @@ def get_sectors(model_path: Path) -> List[str]:
     return [
         s.name
         for s in (model_path / "technodata").iterdir()
-        if (s / "technodata.csv").is_file()
+        if (s / "Technodata.csv").is_file()
     ]
 
 
@@ -95,7 +95,7 @@ def add_new_process(
             f"technodata/{sector}/CommIn.csv",
             f"technodata/{sector}/CommOut.csv",
             f"technodata/{sector}/ExistingCapacity.csv",
-            f"technodata/{sector}/technodata.csv",
+            f"technodata/{sector}/Technodata.csv",
         ]
     ]
 
@@ -120,7 +120,7 @@ def add_price_data_for_new_year(
     """
     files_to_update = [
         model_path / f"technodata/{sector}/{file}"
-        for file in ["technodata.csv", "CommIn.csv", "CommOut.csv"]
+        for file in ["Technodata.csv", "CommIn.csv", "CommOut.csv"]
     ]
 
     for file in files_to_update:
@@ -167,7 +167,7 @@ def add_agent(
     df.to_csv(agents_file, index=False)
 
     for sector in get_sectors(model_path):
-        technodata_file = model_path / f"technodata/{sector}/technodata.csv"
+        technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
         df = pd.read_csv(technodata_file)
         if copy_from_retrofit in df.columns:
             df[agentshare_retrofit] = df[copy_from_retrofit]
@@ -193,7 +193,7 @@ def add_region(model_path: Path, region_name: str, copy_from: str) -> None:
         model_path / "technodata" / sector / file
         for sector in get_sectors(model_path)
         for file in [
-            "technodata.csv",
+            "Technodata.csv",
             "CommIn.csv",
             "CommOut.csv",
             "ExistingCapacity.csv",

From f23806d6858ad2ad43906a1f6193681d7c5e34ef Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 13:58:47 +0100
Subject: [PATCH 151/419] Add tests for wizard module

---
 src/muse/wizard.py   |  26 +++---
 tests/test_wizard.py | 194 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+), 15 deletions(-)
 create mode 100644 tests/test_wizard.py

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 60a43331..b450f6d1 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -47,6 +47,16 @@ def add_new_commodity(
         sector: Sector to add the commodity to.
         copy_from: Name of the commodity to copy from.
     """
+    # Add commodity to global commodities file
+    global_commodities_file = model_path / "input/GlobalCommodities.csv"
+    df = pd.read_csv(global_commodities_file)
+    new_rows = df[df["Commodity"] == copy_from.capitalize()].assign(
+        Commodity=commodity_name.capitalize(), CommodityName=commodity_name
+    )
+    df = pd.concat([df, new_rows])
+    df.to_csv(global_commodities_file, index=False)
+
+    # Add columns to additional files
     files_to_update = [
         model_path / file
         for file in [
@@ -56,27 +66,13 @@ def add_new_commodity(
             "input/BaseYearExport.csv",
             "input/Projections.csv",
         ]
-    ]
+    ] + list((model_path / "technodata/preset").glob("*"))
 
     for file in files_to_update:
         df = pd.read_csv(file)
         df[commodity_name] = df[copy_from]
         df.to_csv(file, index=False)
 
-    global_commodities_file = model_path / "input/GlobalCommodities.csv"
-    df = pd.read_csv(global_commodities_file)
-    new_rows = df[df["Commodity"] == copy_from.capitalize()].assign(
-        Commodity=commodity_name.capitalize(), CommodityName=commodity_name
-    )
-    df = pd.concat([df, new_rows])
-    df.to_csv(global_commodities_file, index=False)
-
-    # Add to projections
-    for file in (model_path / "technodata/preset").glob("*"):
-        df = pd.read_csv(file)
-        df[commodity_name] = df[copy_from]
-        df.to_csv(file, index=False)
-
 
 def add_new_process(
     model_path: Path, process_name: str, sector: str, copy_from: str
diff --git a/tests/test_wizard.py b/tests/test_wizard.py
new file mode 100644
index 00000000..b7a046bc
--- /dev/null
+++ b/tests/test_wizard.py
@@ -0,0 +1,194 @@
+import pandas as pd
+import pytest
+from muse import examples
+from muse.wizard import (
+    add_agent,
+    add_new_commodity,
+    add_new_process,
+    add_price_data_for_new_year,
+    add_region,
+    add_timeslice,
+    get_sectors,
+    modify_toml,
+)
+from tomlkit import dumps, parse
+
+
+@pytest.fixture
+def model_path(tmp_path):
+    """Creates temporary folder containing the default model."""
+    examples.copy_model(name="default", path=tmp_path)
+    return tmp_path / "model"
+
+
+def test_modify_toml(tmp_path):
+    """Test the modify_toml function."""
+    # Create a temporary toml file
+    toml_path = tmp_path / "temp.toml"
+
+    # Create initial toml data
+    initial_data = {"name": "Tomm", "age": 299}
+
+    # Write initial toml data to the temporary file
+    toml_path.write_text(dumps(initial_data))
+
+    # Define the function to modify the toml data
+    def modify_function(data):
+        data["name"] = "Tom"
+        data["age"] = 29
+
+    # Call the modify_toml function
+    modify_toml(toml_path, modify_function)
+
+    # Read the modified toml data
+    modified_data = parse(toml_path.read_text())
+
+    # Assert that the modifications were applied correctly
+    assert modified_data["name"] == "Tom"
+    assert modified_data["age"] == 29
+
+
+def test_get_sectors(tmp_path):
+    """Test the get_sectors function."""
+    # Create a temporary model folder
+    model_path = tmp_path / "model"
+    model_path.mkdir()
+
+    # Create some sector folders with Technodata.csv files
+    sector1 = model_path / "technodata" / "sector1"
+    sector1.mkdir(parents=True)
+    (sector1 / "Technodata.csv").touch()
+
+    sector2 = model_path / "technodata" / "sector2"
+    sector2.mkdir(parents=True)
+    (sector2 / "Technodata.csv").touch()
+
+    sector3 = model_path / "technodata" / "sector3"
+    sector3.mkdir(parents=True)
+
+    # Call the get_sectors function
+    sectors = get_sectors(model_path)
+
+    # Check the returned sectors
+    assert sectors == ["sector1", "sector2"]
+
+
+def test_add_new_commodity(model_path):
+    """Test the add_new_commodity function on the default model."""
+    add_new_commodity(model_path, "new_commodity", "power", "wind")
+
+    # Check if the new commodity is added to the global commodities file
+    global_commodities_file = model_path / "input/GlobalCommodities.csv"
+    df = pd.read_csv(global_commodities_file)
+    assert "new_commodity" in df["CommodityName"].values
+
+    # Check if the new column is added to additional files
+    files_to_check = [
+        model_path / file
+        for file in [
+            "technodata/power/CommIn.csv",
+            "technodata/power/CommOut.csv",
+            "input/BaseYearImport.csv",
+            "input/BaseYearExport.csv",
+            "input/Projections.csv",
+        ]
+    ] + list((model_path / "technodata/preset").glob("*"))
+    for file in files_to_check:
+        df = pd.read_csv(model_path / file)
+        assert "new_commodity" in df.columns
+
+
+def test_add_new_process(model_path):
+    """Test the add_new_process function on the default model."""
+    add_new_process(model_path, "new_process", "power", "windturbine")
+
+    # Check if the new process is added to the files
+    files_to_check = [
+        "technodata/power/CommIn.csv",
+        "technodata/power/CommOut.csv",
+        "technodata/power/ExistingCapacity.csv",
+        "technodata/power/Technodata.csv",
+    ]
+    for file in files_to_check:
+        df = pd.read_csv(model_path / file)
+        assert "new_process" in df["ProcessName"].values
+
+
+def test_add_price_data_for_new_year(model_path):
+    """Test the add_price_data_for_new_year function on the default model."""
+    add_price_data_for_new_year(model_path, "2030", "power", "2020")
+
+    # Check if the new price data is added to the files
+    files_to_check = [
+        "technodata/power/Technodata.csv",
+        "technodata/power/CommIn.csv",
+        "technodata/power/CommOut.csv",
+    ]
+    for file in files_to_check:
+        df = pd.read_csv(model_path / file)
+        assert "2030" in df["Time"].values
+
+
+def test_add_agent(model_path):
+    """Test the add_agent function on the default model."""
+    add_agent(model_path, "A2", "A1", "Agent3", "Agent4")
+
+    # Check if the new agent is added to the Agents.csv file
+    df = pd.read_csv(model_path / "technodata/Agents.csv")
+    assert "A2" in df["Name"].values
+    assert "Agent3" in df["AgentShare"].values
+    assert "Agent4" in df["AgentShare"].values
+
+    # Check if the retrofit agent is added to the Technodata.csv files
+    sector1_file = model_path / "technodata/power/Technodata.csv"
+    sector2_file = model_path / "technodata/gas/Technodata.csv"
+    df_sector1 = pd.read_csv(sector1_file)
+    df_sector2 = pd.read_csv(sector2_file)
+    assert "Agent4" in df_sector1.columns
+    assert "Agent4" in df_sector2.columns
+
+
+def test_add_region(model_path):
+    """Test the add_region function on the default model."""
+    add_region(model_path, "R2", "R1")
+
+    # Check if the new region is added to the settings.toml file
+    with open(model_path / "settings.toml", "r") as f:
+        modified_settings_data = parse(f.read())
+    assert "R2" in modified_settings_data["regions"]
+
+    # Check if the new region is added to the technodata files
+    sector_files = [
+        model_path / "technodata" / sector / file
+        for sector in get_sectors(model_path)
+        for file in [
+            "Technodata.csv",
+            "CommIn.csv",
+            "CommOut.csv",
+            "ExistingCapacity.csv",
+        ]
+    ]
+    for file in sector_files:
+        df = pd.read_csv(file)
+        assert "R2" in df["RegionName"].values
+
+
+def test_add_timeslice(model_path):
+    """Test the add_timeslice function on the default model."""
+    add_timeslice(model_path, "midnight", "evening")
+
+    # Check if the new timeslice is added to the settings.toml file
+    with open(model_path / "settings.toml", "r") as f:
+        modified_settings_data = parse(f.read())
+    assert "midnight" in modified_settings_data["timeslices"]["all-year"]["all-week"]
+    n_timeslices = len(modified_settings_data["timeslices"]["all-year"]["all-week"])
+
+    # Check if the new timeslice is added to the preset files
+    df_preset1 = pd.read_csv(
+        model_path / "technodata/preset/Residential2020Consumption.csv"
+    )
+    df_preset2 = pd.read_csv(
+        model_path / "technodata/preset/Residential2050Consumption.csv"
+    )
+    assert len(df_preset1["Timeslice"].unique()) == n_timeslices
+    assert len(df_preset2["Timeslice"].unique()) == n_timeslices

From b2157c771902f335b9c688da8133ecfc63b07532 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 14:12:22 +0100
Subject: [PATCH 152/419] Fix path

---
 .../visualise-service-demand-addition.ipynb                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
index fc73ec22..8c7514b7 100644
--- a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
+++ b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = (\n",
-    "    pd.read_csv(\"1-new-service-demand/Results/MCACapacity.csv\")\n",
+    "    pd.read_csv(\"1-exogenous-demand/Results/MCACapacity.csv\")\n",
     "    .groupby([\"technology\", \"sector\", \"region\", \"year\", \"agent\"])\n",
     "    .sum()\n",
     "    .reset_index()\n",

From a7bd522db7b8affc960dc12af523ec6c123877bd Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 14:42:13 +0100
Subject: [PATCH 153/419] Fix more paths

---
 .../5-add-service-demand/generate_models.py              | 2 +-
 docs/user-guide/add-gdp-correlation-demand.ipynb         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index c9ee375b..a766b002 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -12,7 +12,7 @@ def generate_model_1():
 
     Adds a new service demand for cooking.
 
-def generate_model_1():
+    """
     model_name = "1-exogenous-demand"
 
     # Starting point: copy model from tutorial 4
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index b38f4956..34540b99 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -47,11 +47,11 @@
     "\n",
     "The example files for each of those just mentioned can be found below, respectively:\n",
     "\n",
-    "- [Macrodrivers.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/technodata/preset/Macrodrivers.csv)\n",
+    "- [Macrodrivers.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv)\n",
     "\n",
-    "- [regressionparameters.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/technodata/preset/regressionparameters.csv)\n",
+    "- [regressionparameters.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv)\n",
     "\n",
-    "- [TimesliceSharepreset.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/technodata/preset/TimesliceSharepreset.csv)\n",
+    "- [TimesliceSharepreset.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv)\n",
     "\n",
     "For a full introduction to these files, see the link [here](../inputs/correlation_files.rst).\n",
     "\n",
@@ -88,7 +88,6 @@
     "[sectors.residential_presets]\n",
     "type = 'presets'\n",
     "priority = 0\n",
-    "\n",
     "timeslice_shares_path = '{path}/technodata/preset/TimesliceSharepreset.csv'\n",
     "macrodrivers_path = '{path}/technodata/preset/Macrodrivers.csv'\n",
     "regression_path = '{path}/technodata/preset/regressionparameters.csv'\n",
@@ -107,7 +106,7 @@
     "\n",
     "To ensure that we don't encounter any problems, we will relax our capacity constraints considerably.\n",
     "\n",
-    "For the full files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/6-add-correlation-demand). Make sure to take note of the columns:\n",
+    "For the full files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/6-add-correlation-demand/1-correlation). Make sure to take note of the columns:\n",
     "\n",
     "- MaxCapacityAddition\n",
     "\n",

From 68e0a98e503defe0de7f79e3421c6922408e614b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 14:45:01 +0100
Subject: [PATCH 154/419] Fix test_get_sectors function

---
 tests/test_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_wizard.py b/tests/test_wizard.py
index b7a046bc..978973f6 100644
--- a/tests/test_wizard.py
+++ b/tests/test_wizard.py
@@ -70,7 +70,7 @@ def test_get_sectors(tmp_path):
     sectors = get_sectors(model_path)
 
     # Check the returned sectors
-    assert sectors == ["sector1", "sector2"]
+    assert set(sectors) == {"sector1", "sector2"}
 
 
 def test_add_new_commodity(model_path):

From ca47508f4291b56a4b9cdcbd3291ea5f19f50a11 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 15:07:20 +0100
Subject: [PATCH 155/419] Minor text changes for tutorial 7

---
 .../min-max-timeslice-constraints.ipynb       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 150ef139..cea9dc83 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -31,12 +31,12 @@
     "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
     "|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|-|-|-|-|-|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|night|1|1|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|morning|1|2|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|3|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|2|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|5|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|evening|1|6|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|night|1|0.2|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|morning|1|0.4|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|0.6|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|0.4|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|0.8|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|evening|1|1|\n",
     "|windturbine|R1|2020|all-year|all-week|night|1|1|\n",
     "|windturbine|R1|2020|all-year|all-week|morning|1|1|\n",
     "|windturbine|R1|2020|all-year|all-week|afternoon|1|1|\n",
@@ -61,7 +61,6 @@
     "    type = 'default'\n",
     "    priority = 2\n",
     "    dispatch_production = 'costed'\n",
-    "\n",
     "    technodata = '{path}/technodata/power/Technodata.csv'\n",
     "    commodities_in = '{path}/technodata/power/CommIn.csv'\n",
     "    commodities_out = '{path}/technodata/power/CommOut.csv'\n",
@@ -110,7 +109,7 @@
     "        .to_dataframe()\n",
     "        .round(rounding)\n",
     "    )\n",
-    "    return result[result.supply != 0].reset_index()"
+    "    return result[result.supply != 0]"
    ]
   },
   {
@@ -173,7 +172,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "As expected, for the year 2020, the gasCCGT supplies the electricity mix by the minimum per timeslice. This is as specified in the `TechnodataTimeslices.csv` file. Starting from a supply of 1 in the first timeslice and ending with a supply of 6 in the last timeslice. The supply increases linearly apart from during the 3rd timeslice, where it reduces to 2."
+    "As expected, for the year 2020, the gasCCGT supplies the electricity mix by the minimum per timeslice. This is as specified in the `TechnodataTimeslices.csv` file. Starting from a supply of 0.2 in the first timeslice and ending with a supply of 1 in the last timeslice. The supply increases linearly apart from during the 3rd timeslice, where it reduces to 0.4."
    ]
   },
   {
@@ -192,12 +191,12 @@
     "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
     "|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|-|-|-|-|-|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|night|1|1|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|morning|1|2|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|3|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|2|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|5|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|evening|1|6|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|night|1|0.2|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|morning|1|0.4|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|0.6|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|0.4|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|0.8|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|evening|1|1|\n",
     "|windturbine|R1|2020|all-year|all-week|night|1|0|\n",
     "|windturbine|R1|2020|all-year|all-week|morning|0.5|0|\n",
     "|windturbine|R1|2020|all-year|all-week|afternoon|0.5|0|\n",

From f0b60d6c8431950c89e7101907a266998a12dfcf Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 17:06:41 +0100
Subject: [PATCH 156/419] Global change to MaxCapacityGrowth

---
 .../Results/Gas/Capacity/2025.csv             |  12 +-
 .../Results/Gas/Capacity/2030.csv             |  12 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |   8 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../1-introduction/Results/MCACapacity.csv    |  39 +-
 .../1-introduction/Results/MCAPrices.csv      | 108 ++--
 .../Results/Power/Capacity/2025.csv           |  35 +-
 .../Results/Power/Capacity/2030.csv           |  41 +-
 .../Results/Power/Capacity/2035.csv           |  74 +--
 .../Results/Power/Capacity/2040.csv           |  77 +--
 .../Results/Power/Capacity/2045.csv           | 108 ++--
 .../Results/Power/Capacity/2050.csv           |  94 ++-
 .../technodata/power/Technodata.csv           |   6 +-
 .../2-scenario/Results/Gas/Capacity/2025.csv  |  12 +-
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  12 +-
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  10 +-
 .../2-scenario/Results/Gas/Capacity/2040.csv  |   8 +-
 .../2-scenario/Results/Gas/Capacity/2045.csv  |   6 +-
 .../2-scenario/Results/Gas/Capacity/2050.csv  |   6 +-
 .../2-scenario/Results/MCACapacity.csv        |  38 +-
 .../2-scenario/Results/MCAPrices.csv          | 108 ++--
 .../Results/Power/Capacity/2025.csv           |  35 +-
 .../Results/Power/Capacity/2030.csv           |  41 +-
 .../Results/Power/Capacity/2035.csv           |  63 +-
 .../Results/Power/Capacity/2040.csv           |  66 +--
 .../Results/Power/Capacity/2045.csv           |  78 ++-
 .../Results/Power/Capacity/2050.csv           |  86 ++-
 .../technodata/power/Technodata.csv           |  12 +-
 .../1-add-new-technology/generate_models.py   |   6 -
 .../Results/Gas/Capacity/2030.csv             |  10 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |   8 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   |  71 +--
 .../Results/MCAPrices.csv                     | 108 ++--
 .../Results/Power/Capacity/2025.csv           |  46 +-
 .../Results/Power/Capacity/2030.csv           |  46 +-
 .../Results/Power/Capacity/2035.csv           |  54 +-
 .../Results/Power/Capacity/2040.csv           |  64 +--
 .../Results/Power/Capacity/2045.csv           | 106 ++--
 .../Results/Power/Capacity/2050.csv           |  82 ++-
 .../technodata/power/Technodata.csv           |  12 +-
 .../Results/Gas/Capacity/2025.csv             |   6 +
 .../Results/Gas/Capacity/2030.csv             |  18 +-
 .../Results/Gas/Capacity/2035.csv             |  17 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  11 +-
 .../Results/Gas/Capacity/2050.csv             |  11 +-
 .../Results/MCACapacity.csv                   |  76 +--
 .../2-single-objective/Results/MCAPrices.csv  | 108 ++--
 .../Results/Power/Capacity/2025.csv           |  32 +-
 .../Results/Power/Capacity/2030.csv           |  32 +-
 .../Results/Power/Capacity/2035.csv           |  28 +-
 .../Results/Power/Capacity/2040.csv           |  24 +-
 .../Results/Power/Capacity/2045.csv           |  56 +-
 .../Results/Power/Capacity/2050.csv           |  44 +-
 .../technodata/power/Technodata.csv           |  12 +-
 .../Results/Gas/Capacity/2025.csv             |  24 +-
 .../Results/Gas/Capacity/2030.csv             |  24 +-
 .../Results/Gas/Capacity/2035.csv             |  20 +-
 .../Results/Gas/Capacity/2040.csv             |  16 +-
 .../Results/Gas/Capacity/2045.csv             |  12 +-
 .../Results/Gas/Capacity/2050.csv             |  12 +-
 .../1-new-region/Results/MCACapacity.csv      |  84 ++-
 .../1-new-region/Results/MCAPrices.csv        | 216 +++----
 .../Results/Power/Capacity/2025.csv           |  70 +--
 .../Results/Power/Capacity/2030.csv           | 100 ++--
 .../Results/Power/Capacity/2035.csv           | 142 ++---
 .../Results/Power/Capacity/2040.csv           | 155 ++---
 .../Results/Power/Capacity/2045.csv           | 196 +++----
 .../Results/Power/Capacity/2050.csv           | 196 +++----
 .../technodata/power/Technodata.csv           |  20 +-
 .../Results/Gas/Capacity/2025.csv             |  34 +-
 .../Results/Gas/Capacity/2030.csv             |  24 +-
 .../Results/Gas/Capacity/2035.csv             |  20 +-
 .../Results/Gas/Capacity/2040.csv             |  16 +-
 .../Results/Gas/Capacity/2045.csv             |  12 +-
 .../Results/Gas/Capacity/2050.csv             |  12 +-
 .../Results/MCACapacity.csv                   |  62 +-
 .../1-modify-timeslices/Results/MCAPrices.csv | 288 +++++-----
 .../Results/Power/Capacity/2025.csv           |  70 +--
 .../Results/Power/Capacity/2030.csv           | 100 ++--
 .../Results/Power/Capacity/2035.csv           | 124 ++--
 .../Results/Power/Capacity/2040.csv           | 147 ++---
 .../Results/Power/Capacity/2045.csv           | 206 +++----
 .../Results/Power/Capacity/2050.csv           | 192 +++----
 .../technodata/power/Technodata.csv           |  20 +-
 .../Results/Gas/Capacity/2024.csv             |  28 +-
 .../Results/Gas/Capacity/2025.csv             |  17 -
 .../Results/Gas/Capacity/2026.csv             |  32 +-
 .../Results/Gas/Capacity/2028.csv             |  28 +-
 .../Results/Gas/Capacity/2030.csv             |  28 +-
 .../Results/Gas/Capacity/2032.csv             |  28 +-
 .../Results/Gas/Capacity/2034.csv             |  28 +-
 .../Results/Gas/Capacity/2035.csv             |  25 -
 .../Results/Gas/Capacity/2036.csv             |  24 +-
 .../Results/Gas/Capacity/2038.csv             |  20 +-
 .../Results/Gas/Capacity/2040.csv             |  20 +-
 .../Results/Gas/Capacity/2045.csv             |  17 -
 .../Results/Gas/Capacity/2050.csv             |  17 -
 .../Results/MCACapacity.csv                   |  95 ++-
 .../Results/MCAPrices.csv                     | 544 +++++++++---------
 .../Results/Power/Capacity/2022.csv           |  84 +--
 .../Results/Power/Capacity/2024.csv           |  88 +--
 .../Results/Power/Capacity/2025.csv           |  53 --
 .../Results/Power/Capacity/2026.csv           | 184 +++---
 .../Results/Power/Capacity/2028.csv           | 232 ++++----
 .../Results/Power/Capacity/2030.csv           | 304 +++++-----
 .../Results/Power/Capacity/2032.csv           | 344 +++++------
 .../Results/Power/Capacity/2034.csv           | 399 ++++++-------
 .../Results/Power/Capacity/2035.csv           | 105 ----
 .../Results/Power/Capacity/2036.csv           | 424 ++++++--------
 .../Results/Power/Capacity/2038.csv           | 443 +++++++-------
 .../Results/Power/Capacity/2040.csv           | 507 +++++++---------
 .../Results/Power/Capacity/2045.csv           | 131 -----
 .../Results/Power/Capacity/2050.csv           | 121 ----
 .../Results/Residential/Capacity/2025.csv     |  25 -
 .../Results/Residential/Capacity/2035.csv     |  33 --
 .../Results/Residential/Capacity/2045.csv     |  25 -
 .../Results/Residential/Capacity/2050.csv     |  21 -
 .../Results/Residential/Supply/2025.csv       | 169 ------
 .../Results/Residential/Supply/2035.csv       | 193 -------
 .../Results/Residential/Supply/2045.csv       | 145 -----
 .../Results/Residential/Supply/2050.csv       |  97 ----
 .../technodata/power/Technodata.csv           |  20 +-
 .../Results/Gas/Capacity/2025.csv             |  34 +-
 .../Results/Gas/Capacity/2030.csv             |  24 +-
 .../Results/Gas/Capacity/2035.csv             |  20 +-
 .../Results/Gas/Capacity/2040.csv             |  16 +-
 .../Results/Gas/Capacity/2045.csv             |  12 +-
 .../Results/Gas/Capacity/2050.csv             |  12 +-
 .../Results/MCACapacity.csv                   |  50 +-
 .../1-exogenous-demand/Results/MCAPrices.csv  | 416 +++++++-------
 .../Results/Power/Capacity/2025.csv           |  70 +--
 .../Results/Power/Capacity/2030.csv           |  92 ++-
 .../Results/Power/Capacity/2035.csv           | 116 ++--
 .../Results/Power/Capacity/2040.csv           | 140 ++---
 .../Results/Power/Capacity/2045.csv           | 200 +++----
 .../Results/Power/Capacity/2050.csv           | 188 +++---
 .../technodata/power/Technodata.csv           |  20 +-
 docs/user-guide/add-solar.ipynb               |   8 +-
 144 files changed, 4483 insertions(+), 6988 deletions(-)
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
index d1fb99f5..839b2c82 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
 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
+1,2030,R1,gassupply1,2025,4.57580000000
+1,2035,R1,gassupply1,2025,4.57580000000
+1,2040,R1,gassupply1,2025,4.57580000000
+1,2045,R1,gassupply1,2025,4.57580000000
+1,2050,R1,gassupply1,2025,4.57580000000
+1,2064,R1,gassupply1,2025,4.57580000000
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 298f6c89..21999e26 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,11 +1,11 @@
 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
+1,2030,R1,2025,gassupply1,4.57580000000
+1,2035,R1,2025,gassupply1,4.57580000000
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,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 e368dd50..c644313c 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,9 +1,9 @@
 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
+1,2035,R1,2025,gassupply1,4.57580000000
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,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 4d55f6f7..c9dcc224 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,8 +1,8 @@
 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
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
 2,2050,R1,2030,gassupply1,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 e5d560fc..20e50e13 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,7 +1,7 @@
 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
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2045,R1,2030,gassupply1,7.50000000000
 2,2050,R1,2030,gassupply1,7.50000000000
 2,2064,R1,2030,gassupply1,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 4a7d05fa..f53a8f8c 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,7 +1,7 @@
 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
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2055,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2050,R1,2030,gassupply1,7.50000000000
 2,2055,R1,2030,gassupply1,7.50000000000
 2,2064,R1,2030,gassupply1,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 9d868b1d..e09c0cb2 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
@@ -11,57 +11,48 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
 windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,4.57580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 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
+gasCCGT,R1,R1,A1,power,retrofit,2040,4.06670000000
 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,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
 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
+gasCCGT,R1,R1,A1,power,retrofit,2045,4.06670000000
 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,4.57580000000
 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
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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,10.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,4.57580000000
 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 f4d602c4..d9ed93a1 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
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.62400000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.93800000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.62400000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.93800000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.88860000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.25350000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.68470000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.20360000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.02870000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.32250000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.68470000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.20360000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.02870000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.32250000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.06770000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.74900000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.37390000000,2035
 "('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')",heat,R1,0.45300000000,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.68050000000,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')",heat,R1,0.08890000000,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,1.02210000000,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')",heat,R1,0.15360000000,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.68050000000,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')",heat,R1,0.08890000000,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,1.02210000000,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')",heat,R1,0.15360000000,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,2.05210000000,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')",heat,R1,0.42980000000,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.36450000000,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')",heat,R1,0.23200000000,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.75600000000,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.09400000000,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,1.13510000000,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.16120000000,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.75600000000,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.09400000000,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,1.13510000000,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.16120000000,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,2.27710000000,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.44410000000,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.51500000000,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.24190000000,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.80300000000,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.05430000000,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,1.20550000000,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.10420000000,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.80300000000,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.05430000000,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,1.20550000000,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.10420000000,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,2.41690000000,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.34540000000,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.60860000000,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.16930000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
index 35de2d84..3ef1ff53 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -1,30 +1,21 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-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,2064,R1,gasCCGT,2025,3.00000000000
+1,2030,R1,gasCCGT,2025,4.06670000000
+1,2035,R1,gasCCGT,2025,4.06670000000
+1,2040,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
 2,2025,R1,solarPV,2020,10.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,2025,R1,windturbine,2020,6.75000000000
-4,2030,R1,windturbine,2020,6.75000000000
-4,2035,R1,windturbine,2020,6.75000000000
-4,2040,R1,windturbine,2020,6.75000000000
-4,2045,R1,windturbine,2020,6.75000000000
-4,2049,R1,windturbine,2020,6.75000000000
+3,2025,R1,windturbine,2020,6.75000000000
+3,2030,R1,windturbine,2020,6.75000000000
+3,2035,R1,windturbine,2020,6.75000000000
+3,2040,R1,windturbine,2020,6.75000000000
+3,2045,R1,windturbine,2020,6.75000000000
+3,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 26ce8db8..1b51d2ca 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
@@ -9,29 +9,18 @@ asset,year,region,installed,technology,capacity
 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
+3,2030,R1,2025,gasCCGT,4.06670000000
+3,2035,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
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 3f21815e..245f914c 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
@@ -7,56 +7,24 @@ asset,year,region,installed,technology,capacity
 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
+3,2035,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+5,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
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 0ab7f9bf..2271c1d9 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
@@ -5,53 +5,30 @@ asset,year,region,installed,technology,capacity
 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
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+5,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+6,2045,R1,2040,solarPV,6.00000000000
+6,2049,R1,2040,solarPV,6.00000000000
+6,2050,R1,2040,solarPV,6.00000000000
+6,2059,R1,2040,solarPV,6.00000000000
+6,2060,R1,2040,solarPV,6.00000000000
+6,2064,R1,2040,solarPV,6.00000000000
+6,2065,R1,2040,solarPV,6.00000000000
+6,2069,R1,2040,solarPV,6.00000000000
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 3d2ca0a4..d68102bd 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
@@ -1,65 +1,45 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,3.00000000000
-0,2049,R1,gasCCGT,2025,3.00000000000
-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
-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
-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,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
+0,2045,R1,gasCCGT,2025,4.06670000000
+0,2049,R1,gasCCGT,2025,4.06670000000
+0,2050,R1,gasCCGT,2025,4.06670000000
+0,2059,R1,gasCCGT,2025,4.06670000000
+0,2060,R1,gasCCGT,2025,4.06670000000
+0,2064,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,solarPV,2020,10.00000000000
+1,2049,R1,solarPV,2020,10.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2035,9.19000000000
+3,2049,R1,solarPV,2035,9.19000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2045,R1,windturbine,2020,6.75000000000
+6,2049,R1,windturbine,2020,6.75000000000
+7,2050,R1,windturbine,2045,6.75000000000
+7,2059,R1,windturbine,2045,6.75000000000
+7,2060,R1,windturbine,2045,6.75000000000
+7,2064,R1,windturbine,2045,6.75000000000
+7,2065,R1,windturbine,2045,6.75000000000
+7,2069,R1,windturbine,2045,6.75000000000
+7,2070,R1,windturbine,2045,6.75000000000
+7,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 43ea9b82..e43fa2d5 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,39 @@
 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
+2,2050,R1,2025,gasCCGT,4.06670000000
+2,2055,R1,2025,gasCCGT,4.06670000000
+2,2059,R1,2025,gasCCGT,4.06670000000
+2,2060,R1,2025,gasCCGT,4.06670000000
+2,2064,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2030,solarPV,6.00000000000
+3,2055,R1,2030,solarPV,6.00000000000
+3,2059,R1,2030,solarPV,6.00000000000
+4,2050,R1,2035,solarPV,9.19000000000
+4,2055,R1,2035,solarPV,9.19000000000
+4,2059,R1,2035,solarPV,9.19000000000
+4,2060,R1,2035,solarPV,9.19000000000
+4,2064,R1,2035,solarPV,9.19000000000
+5,2050,R1,2040,solarPV,6.00000000000
+5,2055,R1,2040,solarPV,6.00000000000
+5,2059,R1,2040,solarPV,6.00000000000
+5,2060,R1,2040,solarPV,6.00000000000
+5,2064,R1,2040,solarPV,6.00000000000
+5,2065,R1,2040,solarPV,6.00000000000
+5,2069,R1,2040,solarPV,6.00000000000
+6,2050,R1,2045,solarPV,16.91000000000
+6,2055,R1,2045,solarPV,16.91000000000
+6,2059,R1,2045,solarPV,16.91000000000
+6,2060,R1,2045,solarPV,16.91000000000
+6,2064,R1,2045,solarPV,16.91000000000
+6,2065,R1,2045,solarPV,16.91000000000
+6,2069,R1,2045,solarPV,16.91000000000
+6,2070,R1,2045,solarPV,16.91000000000
+6,2074,R1,2045,solarPV,16.91000000000
+7,2050,R1,2045,windturbine,6.75000000000
+7,2055,R1,2045,windturbine,6.75000000000
+7,2059,R1,2045,windturbine,6.75000000000
+7,2060,R1,2045,windturbine,6.75000000000
+7,2064,R1,2045,windturbine,6.75000000000
+7,2065,R1,2045,windturbine,6.75000000000
+7,2069,R1,2045,windturbine,6.75000000000
+7,2070,R1,2045,windturbine,6.75000000000
+7,2074,R1,2045,windturbine,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
index 52699888..b1e77966 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
index d1fb99f5..839b2c82 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
 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
+1,2030,R1,gassupply1,2025,4.57580000000
+1,2035,R1,gassupply1,2025,4.57580000000
+1,2040,R1,gassupply1,2025,4.57580000000
+1,2045,R1,gassupply1,2025,4.57580000000
+1,2050,R1,gassupply1,2025,4.57580000000
+1,2064,R1,gassupply1,2025,4.57580000000
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 298f6c89..21999e26 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,11 +1,11 @@
 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
+1,2030,R1,2025,gassupply1,4.57580000000
+1,2035,R1,2025,gassupply1,4.57580000000
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,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 e368dd50..c644313c 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,9 +1,9 @@
 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
+1,2035,R1,2025,gassupply1,4.57580000000
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,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 4d55f6f7..c9dcc224 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,8 +1,8 @@
 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
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
 2,2050,R1,2030,gassupply1,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 e5d560fc..20e50e13 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,7 +1,7 @@
 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
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2045,R1,2030,gassupply1,7.50000000000
 2,2050,R1,2030,gassupply1,7.50000000000
 2,2064,R1,2030,gassupply1,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 4a7d05fa..f53a8f8c 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,7 +1,7 @@
 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
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2055,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2050,R1,2030,gassupply1,7.50000000000
 2,2055,R1,2030,gassupply1,7.50000000000
 2,2064,R1,2030,gassupply1,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 5f93911e..a2fbcf00 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
@@ -11,54 +11,48 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,4.57580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 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,4.06670000000
 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,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
 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,4.06670000000
 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,4.57580000000
 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
-solarPV,R1,R1,A1,power,retrofit,2050,2.40000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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,10.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
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.57580000000
 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 d29309c0..474d2d12 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
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.51720000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.63960000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.17730000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77730000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.96140000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.27810000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51720000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63960000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.17730000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77730000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.96140000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.27810000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56390000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.93540000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.62930000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.28470000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.38710000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56240000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.70170000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.20410000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.05420000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31400000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.32380000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56240000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.70170000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.20410000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05420000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31400000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.32380000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69720000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.11860000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.75390000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.12810000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.40790000000,2035
 "('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')",heat,R1,0.45530000000,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.69630000000,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')",heat,R1,0.08960000000,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,1.04570000000,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')",heat,R1,0.15510000000,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.69630000000,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')",heat,R1,0.08960000000,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,1.04570000000,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')",heat,R1,0.15510000000,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,2.09930000000,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')",heat,R1,0.43580000000,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.39600000000,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')",heat,R1,0.23470000000,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.76970000000,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.09460000000,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,1.15570000000,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.16260000000,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.76970000000,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.09460000000,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,1.15570000000,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.16260000000,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,2.31830000000,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.44970000000,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.54250000000,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.24440000000,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.80750000000,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.05480000000,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,1.21220000000,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.10540000000,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.80750000000,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.05480000000,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,1.21220000000,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.10540000000,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,2.43040000000,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.35040000000,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.61760000000,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.17150000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
index 6611dc7e..04fb2747 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -1,30 +1,21 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-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,2064,R1,gasCCGT,2025,3.00000000000
+1,2030,R1,gasCCGT,2025,4.06670000000
+1,2035,R1,gasCCGT,2025,4.06670000000
+1,2040,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
 2,2025,R1,solarPV,2020,6.75000000000
 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,2025,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2020,10.00000000000
-4,2035,R1,windturbine,2020,10.00000000000
-4,2040,R1,windturbine,2020,10.00000000000
-4,2045,R1,windturbine,2020,10.00000000000
-4,2049,R1,windturbine,2020,10.00000000000
+3,2025,R1,windturbine,2020,10.00000000000
+3,2030,R1,windturbine,2020,10.00000000000
+3,2035,R1,windturbine,2020,10.00000000000
+3,2040,R1,windturbine,2020,10.00000000000
+3,2045,R1,windturbine,2020,10.00000000000
+3,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 3739f2ea..5957189b 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
@@ -9,29 +9,18 @@ asset,year,region,installed,technology,capacity
 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
+3,2030,R1,2025,gasCCGT,4.06670000000
+3,2035,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.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 94a5d1ab..34ff7af2 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
@@ -7,45 +7,24 @@ asset,year,region,installed,technology,capacity
 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
+3,2035,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+5,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
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 5e8f56bc..4d81c5df 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
@@ -5,42 +5,30 @@ asset,year,region,installed,technology,capacity
 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
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+5,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+6,2045,R1,2040,solarPV,6.00000000000
+6,2049,R1,2040,solarPV,6.00000000000
+6,2050,R1,2040,solarPV,6.00000000000
+6,2059,R1,2040,solarPV,6.00000000000
+6,2060,R1,2040,solarPV,6.00000000000
+6,2064,R1,2040,solarPV,6.00000000000
+6,2065,R1,2040,solarPV,6.00000000000
+6,2069,R1,2040,solarPV,6.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 c64073d2..52f051b5 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
@@ -1,55 +1,45 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,3.00000000000
-0,2049,R1,gasCCGT,2025,3.00000000000
-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
+0,2045,R1,gasCCGT,2025,4.06670000000
+0,2049,R1,gasCCGT,2025,4.06670000000
+0,2050,R1,gasCCGT,2025,4.06670000000
+0,2059,R1,gasCCGT,2025,4.06670000000
+0,2060,R1,gasCCGT,2025,4.06670000000
+0,2064,R1,gasCCGT,2025,4.06670000000
 1,2045,R1,solarPV,2020,6.75000000000
 1,2049,R1,solarPV,2020,6.75000000000
-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,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
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2035,9.19000000000
+3,2049,R1,solarPV,2035,9.19000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,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
+7,2050,R1,windturbine,2045,6.75000000000
+7,2059,R1,windturbine,2045,6.75000000000
+7,2060,R1,windturbine,2045,6.75000000000
+7,2064,R1,windturbine,2045,6.75000000000
+7,2065,R1,windturbine,2045,6.75000000000
+7,2069,R1,windturbine,2045,6.75000000000
+7,2070,R1,windturbine,2045,6.75000000000
+7,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 fbf5711d..e43fa2d5 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,39 @@
 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
+2,2050,R1,2025,gasCCGT,4.06670000000
+2,2055,R1,2025,gasCCGT,4.06670000000
+2,2059,R1,2025,gasCCGT,4.06670000000
+2,2060,R1,2025,gasCCGT,4.06670000000
+2,2064,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2030,solarPV,6.00000000000
+3,2055,R1,2030,solarPV,6.00000000000
+3,2059,R1,2030,solarPV,6.00000000000
+4,2050,R1,2035,solarPV,9.19000000000
+4,2055,R1,2035,solarPV,9.19000000000
+4,2059,R1,2035,solarPV,9.19000000000
+4,2060,R1,2035,solarPV,9.19000000000
+4,2064,R1,2035,solarPV,9.19000000000
+5,2050,R1,2040,solarPV,6.00000000000
+5,2055,R1,2040,solarPV,6.00000000000
+5,2059,R1,2040,solarPV,6.00000000000
+5,2060,R1,2040,solarPV,6.00000000000
+5,2064,R1,2040,solarPV,6.00000000000
+5,2065,R1,2040,solarPV,6.00000000000
+5,2069,R1,2040,solarPV,6.00000000000
+6,2050,R1,2045,solarPV,16.91000000000
+6,2055,R1,2045,solarPV,16.91000000000
+6,2059,R1,2045,solarPV,16.91000000000
+6,2060,R1,2045,solarPV,16.91000000000
+6,2064,R1,2045,solarPV,16.91000000000
+6,2065,R1,2045,solarPV,16.91000000000
+6,2069,R1,2045,solarPV,16.91000000000
+6,2070,R1,2045,solarPV,16.91000000000
+6,2074,R1,2045,solarPV,16.91000000000
+7,2050,R1,2045,windturbine,6.75000000000
+7,2055,R1,2045,windturbine,6.75000000000
+7,2059,R1,2045,windturbine,6.75000000000
+7,2060,R1,2045,windturbine,6.75000000000
+7,2064,R1,2045,windturbine,6.75000000000
+7,2065,R1,2045,windturbine,6.75000000000
+7,2069,R1,2045,windturbine,6.75000000000
+7,2070,R1,2045,windturbine,6.75000000000
+7,2074,R1,2045,windturbine,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
index f165e7e2..ae7066eb 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index d62b4565..398163be 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -29,12 +29,6 @@ def generate_model_1() -> None:
     examples.copy_model(name="default", path=parent_path, overwrite=True)
     os.rename(parent_path / "model", model_path)
 
-    # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/power/Technodata.csv"
-    df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityGrowth"] = 0.2
-    df.to_csv(technodata_file, index=False)
-
     # Change maximum_iterations to 100 (Undocumented)
     settings_file = model_path / "settings.toml"
     modify_toml(
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
index 0e008ed8..79ba0a01 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,7 @@
 asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
-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
+1,2035,R1,gassupply1,2030,55.76380000000
+1,2040,R1,gassupply1,2030,55.76380000000
+1,2045,R1,gassupply1,2030,55.76380000000
+1,2050,R1,gassupply1,2030,55.76380000000
+1,2069,R1,gassupply1,2030,55.76380000000
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 39ffacce..90e6de90 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
+1,2035,R1,2030,gassupply1,55.76380000000
+1,2040,R1,2030,gassupply1,55.76380000000
+1,2045,R1,2030,gassupply1,55.76380000000
+1,2050,R1,2030,gassupply1,55.76380000000
+1,2069,R1,2030,gassupply1,55.76380000000
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 cc87d2bd..7bb76395 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
+1,2040,R1,2030,gassupply1,55.76380000000
+1,2045,R1,2030,gassupply1,55.76380000000
+1,2050,R1,2030,gassupply1,55.76380000000
+1,2069,R1,2030,gassupply1,55.76380000000
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 c7248804..376cd655 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
+1,2045,R1,2030,gassupply1,55.76380000000
+1,2050,R1,2030,gassupply1,55.76380000000
+1,2069,R1,2030,gassupply1,55.76380000000
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 90a0f85e..62ecbe98 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
+1,2050,R1,2030,gassupply1,55.76380000000
+1,2055,R1,2030,gassupply1,55.76380000000
+1,2069,R1,2030,gassupply1,55.76380000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
index d750edcf..b0c8d233 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
@@ -19,83 +19,72 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2030,0.21770000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,4.32660000000
 solarPV,R1,R1,A2,power,retrofit,2030,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2030,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2030,4.20560000000
 windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2030,6.57660000000
+windturbine,R1,R1,A2,power,retrofit,2030,5.01210000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
 heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2035,0.21770000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,4.32660000000
 solarPV,R1,R1,A2,power,retrofit,2035,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2035,2.64110000000
+solarPV,R1,R1,A2,power,retrofit,2035,4.20560000000
 windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2035,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.36010000000
+windturbine,R1,R1,A2,power,retrofit,2035,5.01210000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,8.26380000000
 gassupply1,R1,R1,A2,gas,retrofit,2035,47.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
 heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2040,0.21770000000
 solarPV,R1,R1,A1,power,retrofit,2040,0.27940000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,4.32660000000
 solarPV,R1,R1,A2,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2040,2.64110000000
-solarPV,R1,R1,A2,power,retrofit,2040,3.03230000000
+solarPV,R1,R1,A2,power,retrofit,2040,4.20560000000
+solarPV,R1,R1,A2,power,retrofit,2040,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2040,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.36010000000
+windturbine,R1,R1,A2,power,retrofit,2040,5.01210000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,8.26380000000
 gassupply1,R1,R1,A2,gas,retrofit,2040,47.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
 heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.21770000000
 solarPV,R1,R1,A1,power,retrofit,2045,0.27940000000
-solarPV,R1,R1,A1,power,retrofit,2045,1.06160000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,4.32660000000
-windturbine,R1,R1,A1,power,retrofit,2045,0.46720000000
 solarPV,R1,R1,A2,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2045,2.64110000000
-solarPV,R1,R1,A2,power,retrofit,2045,3.03230000000
-solarPV,R1,R1,A2,power,retrofit,2045,6.06450000000
+solarPV,R1,R1,A2,power,retrofit,2045,4.20560000000
+solarPV,R1,R1,A2,power,retrofit,2045,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2045,6.57660000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.36010000000
+windturbine,R1,R1,A2,power,retrofit,2045,5.01210000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,8.26380000000
 gassupply1,R1,R1,A2,gas,retrofit,2045,47.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
 heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,1.65880000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.39110000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,0.90660000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.21770000000
 solarPV,R1,R1,A1,power,retrofit,2050,0.27940000000
-solarPV,R1,R1,A1,power,retrofit,2050,1.06160000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.21280000000
-windturbine,R1,R1,A1,power,retrofit,2050,4.32660000000
-windturbine,R1,R1,A1,power,retrofit,2050,0.46720000000
+solarPV,R1,R1,A1,power,retrofit,2050,10.53070000000
 windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,2.64110000000
-solarPV,R1,R1,A2,power,retrofit,2050,3.03230000000
-solarPV,R1,R1,A2,power,retrofit,2050,6.06450000000
+solarPV,R1,R1,A2,power,retrofit,2050,4.20560000000
+solarPV,R1,R1,A2,power,retrofit,2050,10.00000000000
 solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2050,6.57660000000
-windturbine,R1,R1,A2,power,retrofit,2050,6.24660000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.36010000000
+windturbine,R1,R1,A2,power,retrofit,2050,5.01210000000
+windturbine,R1,R1,A2,power,retrofit,2050,6.87220000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,8.26380000000
 gassupply1,R1,R1,A2,gas,retrofit,2050,47.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
index a2b8932d..f7047e34 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,1.86950000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.31960000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.47190000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.03990000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.48010000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.70930000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.07160000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.31960000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.47190000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.03990000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48010000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70930000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.07160000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96420000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.42670000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.21440000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.64100000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.94750000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.11130000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.38050000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.59370000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.10930000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.11510000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.57140000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.89190000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.17330000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.18640000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38050000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59370000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10930000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.11510000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57140000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89190000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17330000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.18640000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.14680000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.79200000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40300000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.45560000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.76270000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.19100000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.24360000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.26680000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.41860000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.59790000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.13150000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.13950000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.62850000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.89790000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.20830000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.22650000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41860000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59790000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.13150000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.13950000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62850000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89790000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20830000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.22650000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.26080000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.80220000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.48320000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.55660000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.83890000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.19860000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.32490000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.44310000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.73320000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.15470000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.16150000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66520000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.10090000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.24420000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.25950000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44310000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73320000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15470000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.16150000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66520000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10090000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24420000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.25950000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33370000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.20820000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62340000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.88770000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.46930000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.34180000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.36920000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.56450000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.70080000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.18200000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.19300000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84730000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.05210000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.28590000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.31070000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56450000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.70080000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18200000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19300000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84730000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05210000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.28590000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31070000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69840000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.10920000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.64920000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.74890000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.13060000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.40390000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.39840000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.44260000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
index 32bf32ef..f44e45fd 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,37 +1,37 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-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
+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,2025,R1,solarPV,2020,0.78230000000
 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
+3,2030,R1,solarPV,2025,4.42340000000
+3,2035,R1,solarPV,2025,4.42340000000
+3,2040,R1,solarPV,2025,4.42340000000
+3,2045,R1,solarPV,2025,4.42340000000
+3,2049,R1,solarPV,2025,4.42340000000
+3,2050,R1,solarPV,2025,4.42340000000
+3,2054,R1,solarPV,2025,4.42340000000
 4,2025,R1,windturbine,2020,20.00000000000
 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
+5,2030,R1,windturbine,2025,5.01210000000
+5,2035,R1,windturbine,2025,5.01210000000
+5,2040,R1,windturbine,2025,5.01210000000
+5,2045,R1,windturbine,2025,5.01210000000
+5,2049,R1,windturbine,2025,5.01210000000
+5,2050,R1,windturbine,2025,5.01210000000
+5,2054,R1,windturbine,2025,5.01210000000
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 68b049a3..58c35ebe 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
@@ -9,26 +9,26 @@ asset,year,region,installed,technology,capacity
 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
+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,2064,R1,2025,gasCCGT,4.00000000000
+4,2030,R1,2025,solarPV,4.42340000000
+4,2035,R1,2025,solarPV,4.42340000000
+4,2040,R1,2025,solarPV,4.42340000000
+4,2045,R1,2025,solarPV,4.42340000000
+4,2049,R1,2025,solarPV,4.42340000000
+4,2050,R1,2025,solarPV,4.42340000000
+4,2054,R1,2025,solarPV,4.42340000000
+5,2030,R1,2025,windturbine,5.01210000000
+5,2035,R1,2025,windturbine,5.01210000000
+5,2040,R1,2025,windturbine,5.01210000000
+5,2045,R1,2025,windturbine,5.01210000000
+5,2049,R1,2025,windturbine,5.01210000000
+5,2050,R1,2025,windturbine,5.01210000000
+5,2054,R1,2025,windturbine,5.01210000000
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 ca175287..d0e5732e 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
@@ -7,30 +7,30 @@ asset,year,region,installed,technology,capacity
 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
+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,2064,R1,2025,gasCCGT,4.00000000000
+4,2035,R1,2025,solarPV,4.42340000000
+4,2040,R1,2025,solarPV,4.42340000000
+4,2045,R1,2025,solarPV,4.42340000000
+4,2049,R1,2025,solarPV,4.42340000000
+4,2050,R1,2025,solarPV,4.42340000000
+4,2054,R1,2025,solarPV,4.42340000000
+5,2035,R1,2025,windturbine,5.01210000000
+5,2040,R1,2025,windturbine,5.01210000000
+5,2045,R1,2025,windturbine,5.01210000000
+5,2049,R1,2025,windturbine,5.01210000000
+5,2050,R1,2025,windturbine,5.01210000000
+5,2054,R1,2025,windturbine,5.01210000000
+6,2040,R1,2035,solarPV,10.27940000000
+6,2045,R1,2035,solarPV,10.27940000000
+6,2049,R1,2035,solarPV,10.27940000000
+6,2050,R1,2035,solarPV,10.27940000000
+6,2054,R1,2035,solarPV,10.27940000000
+6,2055,R1,2035,solarPV,10.27940000000
+6,2064,R1,2035,solarPV,10.27940000000
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 3969a49d..8224b2c2 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
@@ -5,43 +5,27 @@ asset,year,region,installed,technology,capacity
 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
+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,2064,R1,2025,gasCCGT,4.00000000000
+4,2040,R1,2025,solarPV,4.42340000000
+4,2045,R1,2025,solarPV,4.42340000000
+4,2049,R1,2025,solarPV,4.42340000000
+4,2050,R1,2025,solarPV,4.42340000000
+4,2054,R1,2025,solarPV,4.42340000000
+5,2040,R1,2025,windturbine,5.01210000000
+5,2045,R1,2025,windturbine,5.01210000000
+5,2049,R1,2025,windturbine,5.01210000000
+5,2050,R1,2025,windturbine,5.01210000000
+5,2054,R1,2025,windturbine,5.01210000000
+6,2040,R1,2035,solarPV,10.27940000000
+6,2045,R1,2035,solarPV,10.27940000000
+6,2049,R1,2035,solarPV,10.27940000000
+6,2050,R1,2035,solarPV,10.27940000000
+6,2054,R1,2035,solarPV,10.27940000000
+6,2055,R1,2035,solarPV,10.27940000000
+6,2064,R1,2035,solarPV,10.27940000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
index 92bea04b..6cb5e5f9 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,67 +1,45 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,2.00000000000
-0,2049,R1,gasCCGT,2025,2.00000000000
-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
+0,2045,R1,gasCCGT,2025,4.00000000000
+0,2049,R1,gasCCGT,2025,4.00000000000
+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,0.90660000000
+1,2054,R1,gasCCGT,2045,0.90660000000
+1,2055,R1,gasCCGT,2045,0.90660000000
+1,2064,R1,gasCCGT,2045,0.90660000000
+1,2065,R1,gasCCGT,2045,0.90660000000
+1,2074,R1,gasCCGT,2045,0.90660000000
+1,2075,R1,gasCCGT,2045,0.90660000000
+1,2084,R1,gasCCGT,2045,0.90660000000
 2,2045,R1,solarPV,2020,0.78230000000
 2,2049,R1,solarPV,2020,0.78230000000
-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,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,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
-7,2045,R1,windturbine,2020,20.00000000000
-7,2049,R1,windturbine,2020,20.00000000000
-8,2045,R1,windturbine,2025,10.90320000000
-8,2049,R1,windturbine,2025,10.90320000000
-8,2050,R1,windturbine,2025,10.90320000000
-8,2054,R1,windturbine,2025,10.90320000000
-9,2045,R1,windturbine,2040,0.46720000000
-9,2049,R1,windturbine,2040,0.46720000000
-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
+3,2045,R1,solarPV,2025,4.42340000000
+3,2049,R1,solarPV,2025,4.42340000000
+3,2050,R1,solarPV,2025,4.42340000000
+3,2054,R1,solarPV,2025,4.42340000000
+4,2045,R1,solarPV,2035,10.27940000000
+4,2049,R1,solarPV,2035,10.27940000000
+4,2050,R1,solarPV,2035,10.27940000000
+4,2054,R1,solarPV,2035,10.27940000000
+4,2055,R1,solarPV,2035,10.27940000000
+4,2064,R1,solarPV,2035,10.27940000000
+5,2050,R1,solarPV,2045,30.53070000000
+5,2054,R1,solarPV,2045,30.53070000000
+5,2055,R1,solarPV,2045,30.53070000000
+5,2064,R1,solarPV,2045,30.53070000000
+5,2065,R1,solarPV,2045,30.53070000000
+5,2074,R1,solarPV,2045,30.53070000000
+6,2045,R1,windturbine,2020,20.00000000000
+6,2049,R1,windturbine,2020,20.00000000000
+7,2045,R1,windturbine,2025,5.01210000000
+7,2049,R1,windturbine,2025,5.01210000000
+7,2050,R1,windturbine,2025,5.01210000000
+7,2054,R1,windturbine,2025,5.01210000000
+8,2050,R1,windturbine,2045,16.87220000000
+8,2054,R1,windturbine,2045,16.87220000000
+8,2055,R1,windturbine,2045,16.87220000000
+8,2064,R1,windturbine,2045,16.87220000000
+8,2065,R1,windturbine,2045,16.87220000000
+8,2074,R1,windturbine,2045,16.87220000000
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 e3a24169..d22e8ed7 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,33 @@
 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
+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,2050,R1,2025,solarPV,4.42340000000
+3,2054,R1,2025,solarPV,4.42340000000
+4,2050,R1,2025,windturbine,5.01210000000
+4,2054,R1,2025,windturbine,5.01210000000
+5,2050,R1,2035,solarPV,10.27940000000
+5,2054,R1,2035,solarPV,10.27940000000
+5,2055,R1,2035,solarPV,10.27940000000
+5,2064,R1,2035,solarPV,10.27940000000
+6,2050,R1,2045,gasCCGT,0.90660000000
+6,2054,R1,2045,gasCCGT,0.90660000000
+6,2055,R1,2045,gasCCGT,0.90660000000
+6,2064,R1,2045,gasCCGT,0.90660000000
+6,2065,R1,2045,gasCCGT,0.90660000000
+6,2074,R1,2045,gasCCGT,0.90660000000
+6,2075,R1,2045,gasCCGT,0.90660000000
+6,2084,R1,2045,gasCCGT,0.90660000000
+7,2050,R1,2045,solarPV,30.53070000000
+7,2054,R1,2045,solarPV,30.53070000000
+7,2055,R1,2045,solarPV,30.53070000000
+7,2064,R1,2045,solarPV,30.53070000000
+7,2065,R1,2045,solarPV,30.53070000000
+7,2074,R1,2045,solarPV,30.53070000000
+8,2050,R1,2045,windturbine,16.87220000000
+8,2054,R1,2045,windturbine,16.87220000000
+8,2055,R1,2045,windturbine,16.87220000000
+8,2064,R1,2045,windturbine,16.87220000000
+8,2065,R1,2045,windturbine,16.87220000000
+8,2074,R1,2045,windturbine,16.87220000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
index c80af575..e69aabc4 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
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 f2ad7b02..7bdf75ce 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,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,4.53180000000
+1,2035,R1,2025,gassupply1,4.53180000000
+1,2040,R1,2025,gassupply1,4.53180000000
+1,2045,R1,2025,gassupply1,4.53180000000
+1,2050,R1,2025,gassupply1,4.53180000000
+1,2064,R1,2025,gassupply1,4.53180000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
index 15698c78..f1b98d40 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,15 @@
 asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
-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
+1,2030,R1,gassupply1,2025,4.53180000000
+1,2035,R1,gassupply1,2025,4.53180000000
+1,2040,R1,gassupply1,2025,4.53180000000
+1,2045,R1,gassupply1,2025,4.53180000000
+1,2050,R1,gassupply1,2025,4.53180000000
+1,2064,R1,gassupply1,2025,4.53180000000
+2,2035,R1,gassupply1,2030,28.24690000000
+2,2040,R1,gassupply1,2030,28.24690000000
+2,2045,R1,gassupply1,2030,28.24690000000
+2,2050,R1,gassupply1,2030,28.24690000000
+2,2064,R1,gassupply1,2030,28.24690000000
+2,2065,R1,gassupply1,2030,28.24690000000
+2,2069,R1,gassupply1,2030,28.24690000000
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 d5dee8bb..469b0272 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,13 @@
 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
+1,2035,R1,2025,gassupply1,4.53180000000
+1,2040,R1,2025,gassupply1,4.53180000000
+1,2045,R1,2025,gassupply1,4.53180000000
+1,2050,R1,2025,gassupply1,4.53180000000
+1,2064,R1,2025,gassupply1,4.53180000000
+2,2035,R1,2030,gassupply1,28.24690000000
+2,2040,R1,2030,gassupply1,28.24690000000
+2,2045,R1,2030,gassupply1,28.24690000000
+2,2050,R1,2030,gassupply1,28.24690000000
+2,2064,R1,2030,gassupply1,28.24690000000
+2,2065,R1,2030,gassupply1,28.24690000000
+2,2069,R1,2030,gassupply1,28.24690000000
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 08966a42..e5e3f682 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,11 @@
 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
+1,2040,R1,2025,gassupply1,4.53180000000
+1,2045,R1,2025,gassupply1,4.53180000000
+1,2050,R1,2025,gassupply1,4.53180000000
+1,2064,R1,2025,gassupply1,4.53180000000
+2,2040,R1,2030,gassupply1,28.24690000000
+2,2045,R1,2030,gassupply1,28.24690000000
+2,2050,R1,2030,gassupply1,28.24690000000
+2,2064,R1,2030,gassupply1,28.24690000000
+2,2065,R1,2030,gassupply1,28.24690000000
+2,2069,R1,2030,gassupply1,28.24690000000
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 fe3133ab..0dcaa05b 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,9 @@
 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
+1,2045,R1,2025,gassupply1,4.53180000000
+1,2050,R1,2025,gassupply1,4.53180000000
+1,2064,R1,2025,gassupply1,4.53180000000
+2,2045,R1,2030,gassupply1,28.24690000000
+2,2050,R1,2030,gassupply1,28.24690000000
+2,2064,R1,2030,gassupply1,28.24690000000
+2,2065,R1,2030,gassupply1,28.24690000000
+2,2069,R1,2030,gassupply1,28.24690000000
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 f3a800dd..39988ada 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,9 @@
 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
+1,2050,R1,2025,gassupply1,4.53180000000
+1,2055,R1,2025,gassupply1,4.53180000000
+1,2064,R1,2025,gassupply1,4.53180000000
+2,2050,R1,2030,gassupply1,28.24690000000
+2,2055,R1,2030,gassupply1,28.24690000000
+2,2064,R1,2030,gassupply1,28.24690000000
+2,2065,R1,2030,gassupply1,28.24690000000
+2,2069,R1,2030,gassupply1,28.24690000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
index 8823691a..e8ab59d7 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
@@ -17,63 +17,71 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A2,residential,retrofit,2030,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,6.54070000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.04070000000
 windturbine,R1,R1,A1,power,retrofit,2030,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2030,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2030,6.54070000000
+gasCCGT,R1,R1,A2,power,retrofit,2030,4.00000000000
+solarPV,R1,R1,A2,power,retrofit,2030,2.04070000000
 windturbine,R1,R1,A2,power,retrofit,2030,9.47970000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.26590000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,2.26590000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
 gasboiler,R1,R1,A2,residential,retrofit,2035,7.20000000000
 heatpump,R1,R1,A2,residential,retrofit,2035,28.80000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.54070000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,2.04070000000
 windturbine,R1,R1,A1,power,retrofit,2035,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2035,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2035,6.54070000000
+gasCCGT,R1,R1,A2,power,retrofit,2035,4.00000000000
+solarPV,R1,R1,A2,power,retrofit,2035,2.04070000000
 windturbine,R1,R1,A2,power,retrofit,2035,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,13.96760000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.26590000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,14.12340000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,2.26590000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,14.12340000000
 gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
 gasboiler,R1,R1,A2,residential,retrofit,2040,7.20000000000
 heatpump,R1,R1,A2,residential,retrofit,2040,28.80000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,6.54070000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.04070000000
 windturbine,R1,R1,A1,power,retrofit,2040,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2040,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2040,6.54070000000
+gasCCGT,R1,R1,A2,power,retrofit,2040,4.00000000000
+solarPV,R1,R1,A2,power,retrofit,2040,2.04070000000
 windturbine,R1,R1,A2,power,retrofit,2040,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,13.96760000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.26590000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,14.12340000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,2.26590000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,14.12340000000
 gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
 gasboiler,R1,R1,A2,residential,retrofit,2045,7.44000000000
 heatpump,R1,R1,A2,residential,retrofit,2045,40.56000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,2.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.54070000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,2.04070000000
 windturbine,R1,R1,A1,power,retrofit,2045,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2045,2.00000000000
-solarPV,R1,R1,A2,power,retrofit,2045,6.54070000000
+gasCCGT,R1,R1,A2,power,retrofit,2045,4.00000000000
+solarPV,R1,R1,A2,power,retrofit,2045,2.04070000000
 windturbine,R1,R1,A2,power,retrofit,2045,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,13.96760000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.26590000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,14.12340000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,2.26590000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,14.12340000000
 gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
 gasboiler,R1,R1,A2,residential,retrofit,2050,7.44000000000
 heatpump,R1,R1,A2,residential,retrofit,2050,40.56000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,2.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,0.86130000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.54070000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.61070000000
-windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
-gasCCGT,R1,R1,A2,power,retrofit,2050,2.00000000000
-gasCCGT,R1,R1,A2,power,retrofit,2050,0.86130000000
-solarPV,R1,R1,A2,power,retrofit,2050,6.54070000000
-solarPV,R1,R1,A2,power,retrofit,2050,11.61070000000
-windturbine,R1,R1,A2,power,retrofit,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,13.96760000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,13.96760000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,2.04070000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.07000000000
+windturbine,R1,R1,A1,power,retrofit,2050,8.47860000000
+gasCCGT,R1,R1,A2,power,retrofit,2050,4.00000000000
+solarPV,R1,R1,A2,power,retrofit,2050,2.04070000000
+solarPV,R1,R1,A2,power,retrofit,2050,15.07000000000
+windturbine,R1,R1,A2,power,retrofit,2050,8.47860000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.26590000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,14.12340000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,2.26590000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,14.12340000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
index a198a4be..335e260d 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,1.99500000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.45920000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.74880000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.04060000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.69010000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.12580000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.07340000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.45920000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.74880000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.04060000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.69010000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12580000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.07340000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.38800000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.26720000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.22130000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.92190000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.50460000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.11440000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.57560000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.98150000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.31520000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.32450000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.86460000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.47490000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.48470000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.50560000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57560000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.98150000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.31520000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.32450000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86460000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47490000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.48470000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50560000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73710000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.96530000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.04130000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.12570000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.15460000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.97000000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.66220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.69950000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.69190000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.21420000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.39380000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.40680000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.03920000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.82390000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.60540000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.63470000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69190000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21420000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.39380000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.40680000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.03920000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82390000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.60540000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.63470000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.08610000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.66340000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.29950000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.41740000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.38730000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.43540000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.82690000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.87910000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.85510000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.54070000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.40120000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.41880000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.28400000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.31360000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.62000000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.65980000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85510000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.54070000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.40120000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.41880000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28400000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.31360000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.62000000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.65980000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57580000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.64270000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.35000000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.50990000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.71370000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.08820000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.85100000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.92190000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.87940000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.16280000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.48810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.51130000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.32010000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.74580000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.75460000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.80680000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.87940000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.16280000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.48810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.51130000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.32010000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.74580000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.75460000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.80680000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.64690000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.50080000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.64390000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.85350000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.76170000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.32980000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,1.03600000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,1.12890000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
index 9042b648..dfebe441 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
@@ -1,21 +1,21 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-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
+1,2030,R1,gasCCGT,2025,8.00000000000
+1,2035,R1,gasCCGT,2025,8.00000000000
+1,2040,R1,gasCCGT,2025,8.00000000000
+1,2045,R1,gasCCGT,2025,8.00000000000
+1,2049,R1,gasCCGT,2025,8.00000000000
+1,2050,R1,gasCCGT,2025,8.00000000000
+1,2054,R1,gasCCGT,2025,8.00000000000
+1,2055,R1,gasCCGT,2025,8.00000000000
+1,2064,R1,gasCCGT,2025,8.00000000000
+2,2030,R1,solarPV,2025,4.08140000000
+2,2035,R1,solarPV,2025,4.08140000000
+2,2040,R1,solarPV,2025,4.08140000000
+2,2045,R1,solarPV,2025,4.08140000000
+2,2049,R1,solarPV,2025,4.08140000000
+2,2050,R1,solarPV,2025,4.08140000000
+2,2054,R1,solarPV,2025,4.08140000000
 3,2025,R1,windturbine,2020,18.95930000000
 3,2030,R1,windturbine,2020,18.95930000000
 3,2035,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 a3e0e3c7..a04a9a9a 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
@@ -4,19 +4,19 @@ 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,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
+2,2030,R1,2025,gasCCGT,8.00000000000
+2,2035,R1,2025,gasCCGT,8.00000000000
+2,2040,R1,2025,gasCCGT,8.00000000000
+2,2045,R1,2025,gasCCGT,8.00000000000
+2,2049,R1,2025,gasCCGT,8.00000000000
+2,2050,R1,2025,gasCCGT,8.00000000000
+2,2054,R1,2025,gasCCGT,8.00000000000
+2,2055,R1,2025,gasCCGT,8.00000000000
+2,2064,R1,2025,gasCCGT,8.00000000000
+3,2030,R1,2025,solarPV,4.08140000000
+3,2035,R1,2025,solarPV,4.08140000000
+3,2040,R1,2025,solarPV,4.08140000000
+3,2045,R1,2025,solarPV,4.08140000000
+3,2049,R1,2025,solarPV,4.08140000000
+3,2050,R1,2025,solarPV,4.08140000000
+3,2054,R1,2025,solarPV,4.08140000000
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 e66e2fa3..fbe6b430 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
@@ -3,17 +3,17 @@ 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,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
+2,2035,R1,2025,gasCCGT,8.00000000000
+2,2040,R1,2025,gasCCGT,8.00000000000
+2,2045,R1,2025,gasCCGT,8.00000000000
+2,2049,R1,2025,gasCCGT,8.00000000000
+2,2050,R1,2025,gasCCGT,8.00000000000
+2,2054,R1,2025,gasCCGT,8.00000000000
+2,2055,R1,2025,gasCCGT,8.00000000000
+2,2064,R1,2025,gasCCGT,8.00000000000
+3,2035,R1,2025,solarPV,4.08140000000
+3,2040,R1,2025,solarPV,4.08140000000
+3,2045,R1,2025,solarPV,4.08140000000
+3,2049,R1,2025,solarPV,4.08140000000
+3,2050,R1,2025,solarPV,4.08140000000
+3,2054,R1,2025,solarPV,4.08140000000
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 c4711009..af738706 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
@@ -2,15 +2,15 @@ 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
+2,2040,R1,2025,gasCCGT,8.00000000000
+2,2045,R1,2025,gasCCGT,8.00000000000
+2,2049,R1,2025,gasCCGT,8.00000000000
+2,2050,R1,2025,gasCCGT,8.00000000000
+2,2054,R1,2025,gasCCGT,8.00000000000
+2,2055,R1,2025,gasCCGT,8.00000000000
+2,2064,R1,2025,gasCCGT,8.00000000000
+3,2040,R1,2025,solarPV,4.08140000000
+3,2045,R1,2025,solarPV,4.08140000000
+3,2049,R1,2025,solarPV,4.08140000000
+3,2050,R1,2025,solarPV,4.08140000000
+3,2054,R1,2025,solarPV,4.08140000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
index 7507d45f..750d513b 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
@@ -1,33 +1,25 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,4.00000000000
-0,2049,R1,gasCCGT,2025,4.00000000000
-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,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,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
-4,2045,R1,windturbine,2020,18.95930000000
-4,2049,R1,windturbine,2020,18.95930000000
-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
+0,2045,R1,gasCCGT,2025,8.00000000000
+0,2049,R1,gasCCGT,2025,8.00000000000
+0,2050,R1,gasCCGT,2025,8.00000000000
+0,2054,R1,gasCCGT,2025,8.00000000000
+0,2055,R1,gasCCGT,2025,8.00000000000
+0,2064,R1,gasCCGT,2025,8.00000000000
+1,2045,R1,solarPV,2025,4.08140000000
+1,2049,R1,solarPV,2025,4.08140000000
+1,2050,R1,solarPV,2025,4.08140000000
+1,2054,R1,solarPV,2025,4.08140000000
+2,2050,R1,solarPV,2045,30.14000000000
+2,2054,R1,solarPV,2045,30.14000000000
+2,2055,R1,solarPV,2045,30.14000000000
+2,2064,R1,solarPV,2045,30.14000000000
+2,2065,R1,solarPV,2045,30.14000000000
+2,2074,R1,solarPV,2045,30.14000000000
+3,2045,R1,windturbine,2020,18.95930000000
+3,2049,R1,windturbine,2020,18.95930000000
+4,2050,R1,windturbine,2045,16.95720000000
+4,2054,R1,windturbine,2045,16.95720000000
+4,2055,R1,windturbine,2045,16.95720000000
+4,2064,R1,windturbine,2045,16.95720000000
+4,2065,R1,windturbine,2045,16.95720000000
+4,2074,R1,windturbine,2045,16.95720000000
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 e4440602..7b6a31fa 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,19 @@
 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
+1,2050,R1,2025,gasCCGT,8.00000000000
+1,2054,R1,2025,gasCCGT,8.00000000000
+1,2055,R1,2025,gasCCGT,8.00000000000
+1,2064,R1,2025,gasCCGT,8.00000000000
+2,2050,R1,2025,solarPV,4.08140000000
+2,2054,R1,2025,solarPV,4.08140000000
+3,2050,R1,2045,solarPV,30.14000000000
+3,2054,R1,2045,solarPV,30.14000000000
+3,2055,R1,2045,solarPV,30.14000000000
+3,2064,R1,2045,solarPV,30.14000000000
+3,2065,R1,2045,solarPV,30.14000000000
+3,2074,R1,2045,solarPV,30.14000000000
+4,2050,R1,2045,windturbine,16.95720000000
+4,2054,R1,2045,windturbine,16.95720000000
+4,2055,R1,2045,windturbine,16.95720000000
+4,2064,R1,2045,windturbine,16.95720000000
+4,2065,R1,2045,windturbine,16.95720000000
+4,2074,R1,2045,windturbine,16.95720000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
index c80af575..e69aabc4 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
index 57ef9d5d..383b4523 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -1,17 +1,17 @@
 asset,year,technology,region,installed,capacity
 0,2025,gassupply1,R1,2020,15.00000000000
 0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,2.79440000000
-1,2035,gassupply1,R1,2025,2.79440000000
-1,2040,gassupply1,R1,2025,2.79440000000
-1,2045,gassupply1,R1,2025,2.79440000000
-1,2050,gassupply1,R1,2025,2.79440000000
-1,2064,gassupply1,R1,2025,2.79440000000
+1,2030,gassupply1,R1,2025,4.57580000000
+1,2035,gassupply1,R1,2025,4.57580000000
+1,2040,gassupply1,R1,2025,4.57580000000
+1,2045,gassupply1,R1,2025,4.57580000000
+1,2050,gassupply1,R1,2025,4.57580000000
+1,2064,gassupply1,R1,2025,4.57580000000
 2,2025,gassupply1,R2,2020,15.00000000000
 2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,2.79440000000
-3,2035,gassupply1,R2,2025,2.79440000000
-3,2040,gassupply1,R2,2025,2.79440000000
-3,2045,gassupply1,R2,2025,2.79440000000
-3,2050,gassupply1,R2,2025,2.79440000000
-3,2064,gassupply1,R2,2025,2.79440000000
+3,2030,gassupply1,R2,2025,4.57580000000
+3,2035,gassupply1,R2,2025,4.57580000000
+3,2040,gassupply1,R2,2025,4.57580000000
+3,2045,gassupply1,R2,2025,4.57580000000
+3,2050,gassupply1,R2,2025,4.57580000000
+3,2064,gassupply1,R2,2025,4.57580000000
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 223a9793..04e52a76 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,11 +1,11 @@
 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
+1,2030,R1,2025,gassupply1,4.57580000000
+1,2035,R1,2025,gassupply1,4.57580000000
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
@@ -14,12 +14,12 @@ asset,year,region,installed,technology,capacity
 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
+4,2030,R2,2025,gassupply1,4.57580000000
+4,2035,R2,2025,gassupply1,4.57580000000
+4,2040,R2,2025,gassupply1,4.57580000000
+4,2045,R2,2025,gassupply1,4.57580000000
+4,2050,R2,2025,gassupply1,4.57580000000
+4,2064,R2,2025,gassupply1,4.57580000000
 5,2035,R2,2030,gassupply1,7.50000000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,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 be63ee95..f93dfc37 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,9 +1,9 @@
 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
+1,2035,R1,2025,gassupply1,4.57580000000
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
@@ -11,11 +11,11 @@ asset,year,region,installed,technology,capacity
 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
+4,2035,R2,2025,gassupply1,4.57580000000
+4,2040,R2,2025,gassupply1,4.57580000000
+4,2045,R2,2025,gassupply1,4.57580000000
+4,2050,R2,2025,gassupply1,4.57580000000
+4,2064,R2,2025,gassupply1,4.57580000000
 5,2035,R2,2030,gassupply1,7.50000000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,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 301ed041..b0d943a6 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,18 +1,18 @@
 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
+1,2040,R1,2025,gassupply1,4.57580000000
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 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
+4,2040,R2,2025,gassupply1,4.57580000000
+4,2045,R2,2025,gassupply1,4.57580000000
+4,2050,R2,2025,gassupply1,4.57580000000
+4,2064,R2,2025,gassupply1,4.57580000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,7.50000000000
 5,2050,R2,2030,gassupply1,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 33d01ddd..1afe2898 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,15 +1,15 @@
 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
+1,2045,R1,2025,gassupply1,4.57580000000
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 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
+4,2045,R2,2025,gassupply1,4.57580000000
+4,2050,R2,2025,gassupply1,4.57580000000
+4,2064,R2,2025,gassupply1,4.57580000000
 5,2045,R2,2030,gassupply1,7.50000000000
 5,2050,R2,2030,gassupply1,7.50000000000
 5,2064,R2,2030,gassupply1,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 59af6136..f7ed5304 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,15 +1,15 @@
 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
+1,2050,R1,2025,gassupply1,4.57580000000
+1,2055,R1,2025,gassupply1,4.57580000000
+1,2064,R1,2025,gassupply1,4.57580000000
 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
+4,2050,R2,2025,gassupply1,4.57580000000
+4,2055,R2,2025,gassupply1,4.57580000000
+4,2064,R2,2025,gassupply1,4.57580000000
 5,2050,R2,2030,gassupply1,7.50000000000
 5,2055,R2,2030,gassupply1,7.50000000000
 5,2064,R2,2030,gassupply1,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 c1b43bb2..6cc73c39 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
@@ -22,36 +22,31 @@ heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,2.40000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,4.06670000000
 windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,4.57580000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,4.57580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
 heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
 heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
-solarPV,R2,R2,A1,power,retrofit,2035,2.40000000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2035,6.00000000000
 windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
-windturbine,R2,R2,A1,power,retrofit,2035,3.60000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,4.57580000000
 gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2040,0.91000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,25.00000000000
@@ -59,23 +54,18 @@ heatpump,R1,R1,A1,residential,retrofit,2040,16.09000000000
 gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
 heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,4.06670000000
 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
-solarPV,R2,R2,A1,power,retrofit,2040,4.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2040,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,9.19000000000
 windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
-windturbine,R2,R2,A1,power,retrofit,2040,3.60000000000
-windturbine,R2,R2,A1,power,retrofit,2040,4.39000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,4.57580000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2045,0.91000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,16.09000000000
@@ -83,46 +73,38 @@ heatpump,R1,R1,A1,residential,retrofit,2045,31.00000000000
 gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
 heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,4.06670000000
 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
-solarPV,R2,R2,A1,power,retrofit,2045,4.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2045,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2045,9.19000000000
 solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
 windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
-windturbine,R2,R2,A1,power,retrofit,2045,3.60000000000
-windturbine,R2,R2,A1,power,retrofit,2045,4.39000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,4.57580000000
 gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
 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
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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,10.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
-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
-solarPV,R2,R2,A1,power,retrofit,2050,4.80000000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
+gasCCGT,R2,R2,A1,power,retrofit,2050,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,9.19000000000
 solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
 solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
-windturbine,R2,R2,A1,power,retrofit,2050,3.60000000000
-windturbine,R2,R2,A1,power,retrofit,2050,4.39000000000
 windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.57580000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,4.57580000000
 gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
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 ce14d096..a44a8ef9 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
@@ -95,243 +95,243 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.51500000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.51500000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.63740000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.63740000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.17720000000,2030
 "('all-year', 'all-week', 'night')",heat,R2,0.17720000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77400000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.77400000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95810000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.95810000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.27790000000,2030
 "('all-year', 'all-week', 'morning')",heat,R2,0.27790000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51500000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.51500000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63740000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.63740000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.17720000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R2,0.17720000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77400000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77400000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95810000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.95810000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.27790000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.27790000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.55730000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.55730000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.92880000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.92880000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.62840000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R2,0.62840000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03410000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.03410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.28030000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.28030000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.38660000000,2030
 "('all-year', 'all-week', 'evening')",heat,R2,0.38660000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56090000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.56090000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.69990000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.69990000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19970000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.19970000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.20410000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.20410000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84270000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.84270000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.05150000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,1.05150000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31380000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.31380000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.32360000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.32360000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.56090000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.56090000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69990000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.69990000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19970000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.19970000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.20410000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.20410000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84270000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.84270000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05150000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.05150000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31380000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.31380000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.32360000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.32360000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69290000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.69290000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.11320000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.11320000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71370000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.71370000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.75320000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.75320000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.12520000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.12520000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.40430000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.40430000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.43750000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.43750000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.45490000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.45490000000,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.69490000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.69490000000,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')",heat,R1,0.08950000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.08950000000,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,1.04360000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.04360000000,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')",heat,R1,0.15500000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.15500000000,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.69490000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.69490000000,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')",heat,R1,0.08950000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.08950000000,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,1.04360000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.04360000000,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')",heat,R1,0.15500000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.15500000000,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,2.09510000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.09510000000,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')",heat,R1,0.43510000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43510000000,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.39320000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.39320000000,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')",heat,R1,0.23440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.23440000000,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.76850000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.76850000000,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.09460000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.09460000000,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,1.15390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,1.15390000000,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.16250000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.16250000000,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.76850000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.76850000000,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.09460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.09460000000,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,1.15390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15390000000,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.16250000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.16250000000,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,2.31470000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.31470000000,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.44920000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.44920000000,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.54010000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,1.54010000000,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.24420000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.24420000000,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.80750000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.80750000000,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.05480000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.05480000000,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,1.21220000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,1.21220000000,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.10530000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.10530000000,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.80750000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.80750000000,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.05480000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.05480000000,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,1.21220000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.21220000000,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.10530000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.10530000000,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,2.43040000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.43040000000,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.34990000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.34990000000,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.61760000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,1.61760000000,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.17130000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.17130000000,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/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
index 0b9e6c57..da6b6511 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -1,53 +1,35 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,3.00000000000
-1,2035,gasCCGT,R1,2025,3.00000000000
-1,2040,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R1,2025,3.00000000000
-1,2049,gasCCGT,R1,2025,3.00000000000
-1,2050,gasCCGT,R1,2025,3.00000000000
-1,2054,gasCCGT,R1,2025,3.00000000000
-1,2055,gasCCGT,R1,2025,3.00000000000
-1,2064,gasCCGT,R1,2025,3.00000000000
+1,2030,gasCCGT,R1,2025,4.06670000000
+1,2035,gasCCGT,R1,2025,4.06670000000
+1,2040,gasCCGT,R1,2025,4.06670000000
+1,2045,gasCCGT,R1,2025,4.06670000000
+1,2049,gasCCGT,R1,2025,4.06670000000
+1,2050,gasCCGT,R1,2025,4.06670000000
+1,2064,gasCCGT,R1,2025,4.06670000000
 2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,3.00000000000
-3,2035,gasCCGT,R2,2025,3.00000000000
-3,2040,gasCCGT,R2,2025,3.00000000000
-3,2045,gasCCGT,R2,2025,3.00000000000
-3,2049,gasCCGT,R2,2025,3.00000000000
-3,2050,gasCCGT,R2,2025,3.00000000000
-3,2054,gasCCGT,R2,2025,3.00000000000
-3,2055,gasCCGT,R2,2025,3.00000000000
-3,2064,gasCCGT,R2,2025,3.00000000000
+3,2030,gasCCGT,R2,2025,4.06670000000
+3,2035,gasCCGT,R2,2025,4.06670000000
+3,2040,gasCCGT,R2,2025,4.06670000000
+3,2045,gasCCGT,R2,2025,4.06670000000
+3,2049,gasCCGT,R2,2025,4.06670000000
+3,2050,gasCCGT,R2,2025,4.06670000000
+3,2064,gasCCGT,R2,2025,4.06670000000
 4,2025,solarPV,R1,2020,6.75000000000
 4,2030,solarPV,R1,2020,6.75000000000
 4,2035,solarPV,R1,2020,6.75000000000
 4,2040,solarPV,R1,2020,6.75000000000
 4,2045,solarPV,R1,2020,6.75000000000
 4,2049,solarPV,R1,2020,6.75000000000
-5,2030,solarPV,R1,2025,2.40000000000
-5,2035,solarPV,R1,2025,2.40000000000
-5,2040,solarPV,R1,2025,2.40000000000
-5,2045,solarPV,R1,2025,2.40000000000
-5,2049,solarPV,R1,2025,2.40000000000
-5,2050,solarPV,R1,2025,2.40000000000
-5,2054,solarPV,R1,2025,2.40000000000
-6,2030,solarPV,R2,2025,2.40000000000
-6,2035,solarPV,R2,2025,2.40000000000
-6,2040,solarPV,R2,2025,2.40000000000
-6,2045,solarPV,R2,2025,2.40000000000
-6,2049,solarPV,R2,2025,2.40000000000
-6,2050,solarPV,R2,2025,2.40000000000
-6,2054,solarPV,R2,2025,2.40000000000
-7,2025,windturbine,R1,2020,10.00000000000
-7,2030,windturbine,R1,2020,10.00000000000
-7,2035,windturbine,R1,2020,10.00000000000
-7,2040,windturbine,R1,2020,10.00000000000
-7,2045,windturbine,R1,2020,10.00000000000
-7,2049,windturbine,R1,2020,10.00000000000
-8,2025,windturbine,R2,2020,16.75000000000
-8,2030,windturbine,R2,2020,16.75000000000
-8,2035,windturbine,R2,2020,16.75000000000
-8,2040,windturbine,R2,2020,16.75000000000
-8,2045,windturbine,R2,2020,16.75000000000
-8,2049,windturbine,R2,2020,16.75000000000
+5,2025,windturbine,R1,2020,10.00000000000
+5,2030,windturbine,R1,2020,10.00000000000
+5,2035,windturbine,R1,2020,10.00000000000
+5,2040,windturbine,R1,2020,10.00000000000
+5,2045,windturbine,R1,2020,10.00000000000
+5,2049,windturbine,R1,2020,10.00000000000
+6,2025,windturbine,R2,2020,16.75000000000
+6,2030,windturbine,R2,2020,16.75000000000
+6,2035,windturbine,R2,2020,16.75000000000
+6,2040,windturbine,R2,2020,16.75000000000
+6,2045,windturbine,R2,2020,16.75000000000
+6,2049,windturbine,R2,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 ca265d0a..45f7f199 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
@@ -9,68 +9,38 @@ asset,year,region,installed,technology,capacity
 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
+3,2030,R1,2025,gasCCGT,4.06670000000
+3,2035,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+6,2030,R2,2020,windturbine,16.75000000000
+6,2035,R2,2020,windturbine,16.75000000000
+6,2040,R2,2020,windturbine,16.75000000000
+6,2045,R2,2020,windturbine,16.75000000000
+6,2049,R2,2020,windturbine,16.75000000000
+7,2030,R2,2025,gasCCGT,4.06670000000
+7,2035,R2,2025,gasCCGT,4.06670000000
+7,2040,R2,2025,gasCCGT,4.06670000000
+7,2045,R2,2025,gasCCGT,4.06670000000
+7,2049,R2,2025,gasCCGT,4.06670000000
+7,2050,R2,2025,gasCCGT,4.06670000000
+7,2059,R2,2025,gasCCGT,4.06670000000
+7,2060,R2,2025,gasCCGT,4.06670000000
+7,2064,R2,2025,gasCCGT,4.06670000000
+8,2035,R2,2030,solarPV,6.00000000000
+8,2040,R2,2030,solarPV,6.00000000000
+8,2045,R2,2030,solarPV,6.00000000000
+8,2049,R2,2030,solarPV,6.00000000000
+8,2050,R2,2030,solarPV,6.00000000000
+8,2059,R2,2030,solarPV,6.00000000000
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 bc71a6d4..d46564bb 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
@@ -7,99 +7,49 @@ asset,year,region,installed,technology,capacity
 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
+3,2035,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+5,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+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,2035,R2,2025,gasCCGT,4.06670000000
+8,2040,R2,2025,gasCCGT,4.06670000000
+8,2045,R2,2025,gasCCGT,4.06670000000
+8,2049,R2,2025,gasCCGT,4.06670000000
+8,2050,R2,2025,gasCCGT,4.06670000000
+8,2059,R2,2025,gasCCGT,4.06670000000
+8,2060,R2,2025,gasCCGT,4.06670000000
+8,2064,R2,2025,gasCCGT,4.06670000000
+9,2035,R2,2030,solarPV,6.00000000000
+9,2040,R2,2030,solarPV,6.00000000000
+9,2045,R2,2030,solarPV,6.00000000000
+9,2049,R2,2030,solarPV,6.00000000000
+9,2050,R2,2030,solarPV,6.00000000000
+9,2059,R2,2030,solarPV,6.00000000000
+10,2040,R2,2035,solarPV,9.19000000000
+10,2045,R2,2035,solarPV,9.19000000000
+10,2049,R2,2035,solarPV,9.19000000000
+10,2050,R2,2035,solarPV,9.19000000000
+10,2059,R2,2035,solarPV,9.19000000000
+10,2060,R2,2035,solarPV,9.19000000000
+10,2064,R2,2035,solarPV,9.19000000000
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 bda10415..cf421cb0 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
@@ -5,101 +5,60 @@ asset,year,region,installed,technology,capacity
 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
+3,2040,R1,2025,gasCCGT,4.06670000000
+3,2045,R1,2025,gasCCGT,4.06670000000
+3,2049,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2025,gasCCGT,4.06670000000
+3,2059,R1,2025,gasCCGT,4.06670000000
+3,2060,R1,2025,gasCCGT,4.06670000000
+3,2064,R1,2025,gasCCGT,4.06670000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+4,2050,R1,2030,solarPV,6.00000000000
+4,2059,R1,2030,solarPV,6.00000000000
+5,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+6,2045,R1,2040,solarPV,6.00000000000
+6,2049,R1,2040,solarPV,6.00000000000
+6,2050,R1,2040,solarPV,6.00000000000
+6,2059,R1,2040,solarPV,6.00000000000
+6,2060,R1,2040,solarPV,6.00000000000
+6,2064,R1,2040,solarPV,6.00000000000
+6,2065,R1,2040,solarPV,6.00000000000
+6,2069,R1,2040,solarPV,6.00000000000
+8,2040,R2,2020,windturbine,16.75000000000
+8,2045,R2,2020,windturbine,16.75000000000
+8,2049,R2,2020,windturbine,16.75000000000
+9,2040,R2,2025,gasCCGT,4.06670000000
+9,2045,R2,2025,gasCCGT,4.06670000000
+9,2049,R2,2025,gasCCGT,4.06670000000
+9,2050,R2,2025,gasCCGT,4.06670000000
+9,2059,R2,2025,gasCCGT,4.06670000000
+9,2060,R2,2025,gasCCGT,4.06670000000
+9,2064,R2,2025,gasCCGT,4.06670000000
+10,2040,R2,2030,solarPV,6.00000000000
+10,2045,R2,2030,solarPV,6.00000000000
+10,2049,R2,2030,solarPV,6.00000000000
+10,2050,R2,2030,solarPV,6.00000000000
+10,2059,R2,2030,solarPV,6.00000000000
+11,2040,R2,2035,solarPV,9.19000000000
+11,2045,R2,2035,solarPV,9.19000000000
+11,2049,R2,2035,solarPV,9.19000000000
+11,2050,R2,2035,solarPV,9.19000000000
+11,2059,R2,2035,solarPV,9.19000000000
+11,2060,R2,2035,solarPV,9.19000000000
+11,2064,R2,2035,solarPV,9.19000000000
+12,2045,R2,2040,solarPV,6.00000000000
+12,2049,R2,2040,solarPV,6.00000000000
+12,2050,R2,2040,solarPV,6.00000000000
+12,2059,R2,2040,solarPV,6.00000000000
+12,2060,R2,2040,solarPV,6.00000000000
+12,2064,R2,2040,solarPV,6.00000000000
+12,2065,R2,2040,solarPV,6.00000000000
+12,2069,R2,2040,solarPV,6.00000000000
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 b04feb4a..1903b624 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
@@ -1,43 +1,37 @@
 asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,3.00000000000
-0,2049,gasCCGT,R1,2025,3.00000000000
-0,2050,gasCCGT,R1,2025,3.00000000000
-0,2054,gasCCGT,R1,2025,3.00000000000
-0,2055,gasCCGT,R1,2025,3.00000000000
-0,2059,gasCCGT,R1,2025,3.00000000000
-0,2060,gasCCGT,R1,2025,3.00000000000
-0,2064,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R2,2025,3.00000000000
-1,2049,gasCCGT,R2,2025,3.00000000000
-1,2050,gasCCGT,R2,2025,3.00000000000
-1,2054,gasCCGT,R2,2025,3.00000000000
-1,2055,gasCCGT,R2,2025,3.00000000000
-1,2059,gasCCGT,R2,2025,3.00000000000
-1,2060,gasCCGT,R2,2025,3.00000000000
-1,2064,gasCCGT,R2,2025,3.00000000000
+0,2045,gasCCGT,R1,2025,4.06670000000
+0,2049,gasCCGT,R1,2025,4.06670000000
+0,2050,gasCCGT,R1,2025,4.06670000000
+0,2059,gasCCGT,R1,2025,4.06670000000
+0,2060,gasCCGT,R1,2025,4.06670000000
+0,2064,gasCCGT,R1,2025,4.06670000000
+1,2045,gasCCGT,R2,2025,4.06670000000
+1,2049,gasCCGT,R2,2025,4.06670000000
+1,2050,gasCCGT,R2,2025,4.06670000000
+1,2059,gasCCGT,R2,2025,4.06670000000
+1,2060,gasCCGT,R2,2025,4.06670000000
+1,2064,gasCCGT,R2,2025,4.06670000000
 2,2045,solarPV,R1,2020,6.75000000000
 2,2049,solarPV,R1,2020,6.75000000000
-3,2045,solarPV,R1,2025,2.40000000000
-3,2049,solarPV,R1,2025,2.40000000000
-3,2050,solarPV,R1,2025,2.40000000000
-3,2054,solarPV,R1,2025,2.40000000000
-4,2045,solarPV,R1,2030,6.00000000000
-4,2049,solarPV,R1,2030,6.00000000000
-4,2050,solarPV,R1,2030,6.00000000000
-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
+3,2045,solarPV,R1,2030,6.00000000000
+3,2049,solarPV,R1,2030,6.00000000000
+3,2050,solarPV,R1,2030,6.00000000000
+3,2059,solarPV,R1,2030,6.00000000000
+4,2045,solarPV,R1,2035,9.19000000000
+4,2049,solarPV,R1,2035,9.19000000000
+4,2050,solarPV,R1,2035,9.19000000000
+4,2059,solarPV,R1,2035,9.19000000000
+4,2060,solarPV,R1,2035,9.19000000000
+4,2064,solarPV,R1,2035,9.19000000000
+5,2045,solarPV,R1,2040,6.00000000000
+5,2049,solarPV,R1,2040,6.00000000000
+5,2050,solarPV,R1,2040,6.00000000000
+5,2059,solarPV,R1,2040,6.00000000000
+5,2060,solarPV,R1,2040,6.00000000000
+5,2064,solarPV,R1,2040,6.00000000000
+5,2065,solarPV,R1,2040,6.00000000000
+5,2069,solarPV,R1,2040,6.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
@@ -45,87 +39,49 @@ asset,year,technology,region,installed,capacity
 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
-15,2045,windturbine,R2,2020,16.75000000000
-15,2049,windturbine,R2,2020,16.75000000000
-16,2045,windturbine,R2,2030,3.60000000000
-16,2049,windturbine,R2,2030,3.60000000000
-16,2050,windturbine,R2,2030,3.60000000000
-16,2054,windturbine,R2,2030,3.60000000000
-16,2055,windturbine,R2,2030,3.60000000000
-16,2059,windturbine,R2,2030,3.60000000000
-17,2045,windturbine,R2,2035,4.39000000000
-17,2049,windturbine,R2,2035,4.39000000000
-17,2050,windturbine,R2,2035,4.39000000000
-17,2054,windturbine,R2,2035,4.39000000000
-17,2055,windturbine,R2,2035,4.39000000000
-17,2059,windturbine,R2,2035,4.39000000000
-17,2060,windturbine,R2,2035,4.39000000000
-17,2064,windturbine,R2,2035,4.39000000000
-18,2050,windturbine,R2,2045,6.75000000000
-18,2054,windturbine,R2,2045,6.75000000000
-18,2055,windturbine,R2,2045,6.75000000000
-18,2059,windturbine,R2,2045,6.75000000000
-18,2060,windturbine,R2,2045,6.75000000000
-18,2064,windturbine,R2,2045,6.75000000000
-18,2065,windturbine,R2,2045,6.75000000000
-18,2069,windturbine,R2,2045,6.75000000000
-18,2070,windturbine,R2,2045,6.75000000000
-18,2074,windturbine,R2,2045,6.75000000000
+7,2045,solarPV,R2,2030,6.00000000000
+7,2049,solarPV,R2,2030,6.00000000000
+7,2050,solarPV,R2,2030,6.00000000000
+7,2059,solarPV,R2,2030,6.00000000000
+8,2045,solarPV,R2,2035,9.19000000000
+8,2049,solarPV,R2,2035,9.19000000000
+8,2050,solarPV,R2,2035,9.19000000000
+8,2059,solarPV,R2,2035,9.19000000000
+8,2060,solarPV,R2,2035,9.19000000000
+8,2064,solarPV,R2,2035,9.19000000000
+9,2045,solarPV,R2,2040,6.00000000000
+9,2049,solarPV,R2,2040,6.00000000000
+9,2050,solarPV,R2,2040,6.00000000000
+9,2059,solarPV,R2,2040,6.00000000000
+9,2060,solarPV,R2,2040,6.00000000000
+9,2064,solarPV,R2,2040,6.00000000000
+9,2065,solarPV,R2,2040,6.00000000000
+9,2069,solarPV,R2,2040,6.00000000000
+10,2050,solarPV,R2,2045,16.91000000000
+10,2059,solarPV,R2,2045,16.91000000000
+10,2060,solarPV,R2,2045,16.91000000000
+10,2064,solarPV,R2,2045,16.91000000000
+10,2065,solarPV,R2,2045,16.91000000000
+10,2069,solarPV,R2,2045,16.91000000000
+10,2070,solarPV,R2,2045,16.91000000000
+10,2074,solarPV,R2,2045,16.91000000000
+11,2045,windturbine,R1,2020,10.00000000000
+11,2049,windturbine,R1,2020,10.00000000000
+12,2050,windturbine,R1,2045,6.75000000000
+12,2059,windturbine,R1,2045,6.75000000000
+12,2060,windturbine,R1,2045,6.75000000000
+12,2064,windturbine,R1,2045,6.75000000000
+12,2065,windturbine,R1,2045,6.75000000000
+12,2069,windturbine,R1,2045,6.75000000000
+12,2070,windturbine,R1,2045,6.75000000000
+12,2074,windturbine,R1,2045,6.75000000000
+13,2045,windturbine,R2,2020,16.75000000000
+13,2049,windturbine,R2,2020,16.75000000000
+14,2050,windturbine,R2,2045,6.75000000000
+14,2059,windturbine,R2,2045,6.75000000000
+14,2060,windturbine,R2,2045,6.75000000000
+14,2064,windturbine,R2,2045,6.75000000000
+14,2065,windturbine,R2,2045,6.75000000000
+14,2069,windturbine,R2,2045,6.75000000000
+14,2070,windturbine,R2,2045,6.75000000000
+14,2074,windturbine,R2,2045,6.75000000000
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 37b2c93a..2ee60e9b 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,77 @@
 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
+2,2050,R1,2025,gasCCGT,4.06670000000
+2,2055,R1,2025,gasCCGT,4.06670000000
+2,2059,R1,2025,gasCCGT,4.06670000000
+2,2060,R1,2025,gasCCGT,4.06670000000
+2,2064,R1,2025,gasCCGT,4.06670000000
+3,2050,R1,2030,solarPV,6.00000000000
+3,2055,R1,2030,solarPV,6.00000000000
+3,2059,R1,2030,solarPV,6.00000000000
+4,2050,R1,2035,solarPV,9.19000000000
+4,2055,R1,2035,solarPV,9.19000000000
+4,2059,R1,2035,solarPV,9.19000000000
+4,2060,R1,2035,solarPV,9.19000000000
+4,2064,R1,2035,solarPV,9.19000000000
+5,2050,R1,2040,solarPV,6.00000000000
+5,2055,R1,2040,solarPV,6.00000000000
+5,2059,R1,2040,solarPV,6.00000000000
+5,2060,R1,2040,solarPV,6.00000000000
+5,2064,R1,2040,solarPV,6.00000000000
+5,2065,R1,2040,solarPV,6.00000000000
+5,2069,R1,2040,solarPV,6.00000000000
+6,2050,R1,2045,solarPV,16.91000000000
+6,2055,R1,2045,solarPV,16.91000000000
+6,2059,R1,2045,solarPV,16.91000000000
+6,2060,R1,2045,solarPV,16.91000000000
+6,2064,R1,2045,solarPV,16.91000000000
+6,2065,R1,2045,solarPV,16.91000000000
+6,2069,R1,2045,solarPV,16.91000000000
+6,2070,R1,2045,solarPV,16.91000000000
+6,2074,R1,2045,solarPV,16.91000000000
+7,2050,R1,2045,windturbine,6.75000000000
+7,2055,R1,2045,windturbine,6.75000000000
+7,2059,R1,2045,windturbine,6.75000000000
+7,2060,R1,2045,windturbine,6.75000000000
+7,2064,R1,2045,windturbine,6.75000000000
+7,2065,R1,2045,windturbine,6.75000000000
+7,2069,R1,2045,windturbine,6.75000000000
+7,2070,R1,2045,windturbine,6.75000000000
+7,2074,R1,2045,windturbine,6.75000000000
+9,2050,R2,2025,gasCCGT,4.06670000000
+9,2055,R2,2025,gasCCGT,4.06670000000
+9,2059,R2,2025,gasCCGT,4.06670000000
+9,2060,R2,2025,gasCCGT,4.06670000000
+9,2064,R2,2025,gasCCGT,4.06670000000
+10,2050,R2,2030,solarPV,6.00000000000
+10,2055,R2,2030,solarPV,6.00000000000
+10,2059,R2,2030,solarPV,6.00000000000
+11,2050,R2,2035,solarPV,9.19000000000
+11,2055,R2,2035,solarPV,9.19000000000
+11,2059,R2,2035,solarPV,9.19000000000
+11,2060,R2,2035,solarPV,9.19000000000
+11,2064,R2,2035,solarPV,9.19000000000
+12,2050,R2,2040,solarPV,6.00000000000
+12,2055,R2,2040,solarPV,6.00000000000
+12,2059,R2,2040,solarPV,6.00000000000
+12,2060,R2,2040,solarPV,6.00000000000
+12,2064,R2,2040,solarPV,6.00000000000
+12,2065,R2,2040,solarPV,6.00000000000
+12,2069,R2,2040,solarPV,6.00000000000
+13,2050,R2,2045,solarPV,16.91000000000
+13,2055,R2,2045,solarPV,16.91000000000
+13,2059,R2,2045,solarPV,16.91000000000
+13,2060,R2,2045,solarPV,16.91000000000
+13,2064,R2,2045,solarPV,16.91000000000
+13,2065,R2,2045,solarPV,16.91000000000
+13,2069,R2,2045,solarPV,16.91000000000
+13,2070,R2,2045,solarPV,16.91000000000
+13,2074,R2,2045,solarPV,16.91000000000
+14,2050,R2,2045,windturbine,6.75000000000
+14,2055,R2,2045,windturbine,6.75000000000
+14,2059,R2,2045,windturbine,6.75000000000
+14,2060,R2,2045,windturbine,6.75000000000
+14,2064,R2,2045,windturbine,6.75000000000
+14,2065,R2,2045,windturbine,6.75000000000
+14,2069,R2,2045,windturbine,6.75000000000
+14,2070,R2,2045,windturbine,6.75000000000
+14,2074,R2,2045,windturbine,6.75000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
index df1bc687..3393c128 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
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 3c032c34..99e10143 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,technology,region,installed,capacity
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2025,3.29410000000
+1,2035,gassupply1,R1,2025,3.29410000000
+1,2040,gassupply1,R1,2025,3.29410000000
+1,2045,gassupply1,R1,2025,3.29410000000
+1,2050,gassupply1,R1,2025,3.29410000000
+1,2064,gassupply1,R1,2025,3.29410000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2030,gassupply1,R2,2025,3.29410000000
+3,2035,gassupply1,R2,2025,3.29410000000
+3,2040,gassupply1,R2,2025,3.29410000000
+3,2045,gassupply1,R2,2025,3.29410000000
+3,2050,gassupply1,R2,2025,3.29410000000
+3,2064,gassupply1,R2,2025,3.29410000000
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 8951d4a9..f72e4692 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,11 +1,11 @@
 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
+1,2030,R1,2025,gassupply1,3.29410000000
+1,2035,R1,2025,gassupply1,3.29410000000
+1,2040,R1,2025,gassupply1,3.29410000000
+1,2045,R1,2025,gassupply1,3.29410000000
+1,2050,R1,2025,gassupply1,3.29410000000
+1,2064,R1,2025,gassupply1,3.29410000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
@@ -14,12 +14,12 @@ asset,year,region,installed,technology,capacity
 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
+4,2030,R2,2025,gassupply1,3.29410000000
+4,2035,R2,2025,gassupply1,3.29410000000
+4,2040,R2,2025,gassupply1,3.29410000000
+4,2045,R2,2025,gassupply1,3.29410000000
+4,2050,R2,2025,gassupply1,3.29410000000
+4,2064,R2,2025,gassupply1,3.29410000000
 5,2035,R2,2030,gassupply1,7.50000000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,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 a056e261..3cf095fb 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,9 +1,9 @@
 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
+1,2035,R1,2025,gassupply1,3.29410000000
+1,2040,R1,2025,gassupply1,3.29410000000
+1,2045,R1,2025,gassupply1,3.29410000000
+1,2050,R1,2025,gassupply1,3.29410000000
+1,2064,R1,2025,gassupply1,3.29410000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
@@ -11,11 +11,11 @@ asset,year,region,installed,technology,capacity
 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
+4,2035,R2,2025,gassupply1,3.29410000000
+4,2040,R2,2025,gassupply1,3.29410000000
+4,2045,R2,2025,gassupply1,3.29410000000
+4,2050,R2,2025,gassupply1,3.29410000000
+4,2064,R2,2025,gassupply1,3.29410000000
 5,2035,R2,2030,gassupply1,7.50000000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,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 0c2112af..a73a3436 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,18 +1,18 @@
 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
+1,2040,R1,2025,gassupply1,3.29410000000
+1,2045,R1,2025,gassupply1,3.29410000000
+1,2050,R1,2025,gassupply1,3.29410000000
+1,2064,R1,2025,gassupply1,3.29410000000
 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
+4,2040,R2,2025,gassupply1,3.29410000000
+4,2045,R2,2025,gassupply1,3.29410000000
+4,2050,R2,2025,gassupply1,3.29410000000
+4,2064,R2,2025,gassupply1,3.29410000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,7.50000000000
 5,2050,R2,2030,gassupply1,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 20d6c8b3..bf58e223 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,15 +1,15 @@
 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
+1,2045,R1,2025,gassupply1,3.29410000000
+1,2050,R1,2025,gassupply1,3.29410000000
+1,2064,R1,2025,gassupply1,3.29410000000
 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
+4,2045,R2,2025,gassupply1,3.29410000000
+4,2050,R2,2025,gassupply1,3.29410000000
+4,2064,R2,2025,gassupply1,3.29410000000
 5,2045,R2,2030,gassupply1,7.50000000000
 5,2050,R2,2030,gassupply1,7.50000000000
 5,2064,R2,2030,gassupply1,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 857dfbd4..0eb40c74 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,15 +1,15 @@
 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
+1,2050,R1,2025,gassupply1,3.29410000000
+1,2055,R1,2025,gassupply1,3.29410000000
+1,2064,R1,2025,gassupply1,3.29410000000
 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
+4,2050,R2,2025,gassupply1,3.29410000000
+4,2055,R2,2025,gassupply1,3.29410000000
+4,2064,R2,2025,gassupply1,3.29410000000
 5,2050,R2,2030,gassupply1,7.50000000000
 5,2055,R2,2030,gassupply1,7.50000000000
 5,2064,R2,2030,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 06b99912..42355dee 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -22,99 +22,85 @@ heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
 heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2030,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2030,4.07170000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,4.07170000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,4.80970000000
 windturbine,R2,R2,A1,power,retrofit,2030,15.60870000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.29410000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,3.29410000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
 heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
 heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2035,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2035,4.07170000000
 solarPV,R1,R1,A1,power,retrofit,2035,5.71470000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2035,4.07170000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2035,5.71470000000
 windturbine,R2,R2,A1,power,retrofit,2035,15.60870000000
-windturbine,R2,R2,A1,power,retrofit,2035,1.64290000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,3.29410000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,3.29410000000
 gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
 heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2040,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2040,4.07170000000
 solarPV,R1,R1,A1,power,retrofit,2040,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2040,7.85760000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2040,4.07170000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2040,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2040,7.85760000000
 windturbine,R2,R2,A1,power,retrofit,2040,15.60870000000
-windturbine,R2,R2,A1,power,retrofit,2040,1.64290000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,3.29410000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,3.29410000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
 heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2045,4.07170000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2045,7.85760000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2045,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2045,4.07170000000
+gasCCGT,R2,R2,A1,power,retrofit,2045,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2045,7.85760000000
 solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
 windturbine,R2,R2,A1,power,retrofit,2045,15.60870000000
-windturbine,R2,R2,A1,power,retrofit,2045,1.64290000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,3.29410000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,3.29410000000
 gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
 heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
 heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,4.07170000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2050,7.85760000000
 solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2050,15.71470000000
 windturbine,R1,R1,A1,power,retrofit,2050,5.60870000000
-gasCCGT,R2,R2,A1,power,retrofit,2050,3.00000000000
-solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
-solarPV,R2,R2,A1,power,retrofit,2050,4.07170000000
+gasCCGT,R2,R2,A1,power,retrofit,2050,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2050,7.85760000000
 solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2050,15.71470000000
-windturbine,R2,R2,A1,power,retrofit,2050,1.64290000000
 windturbine,R2,R2,A1,power,retrofit,2050,5.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,0.27200000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,3.29410000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,0.27200000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,3.29410000000
 gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 54105605..627647a6 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -127,323 +127,323 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.33730000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.33730000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.48570000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.48570000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'night')",heat,R2,0.07490000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.50660000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.50660000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.72940000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.72940000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.11850000000,2030
 "('all-year', 'all-week', 'morning')",heat,R2,0.11850000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.33730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.33730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.48570000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.48570000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07490000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.50660000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.50660000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.72940000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.72940000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.11850000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.11850000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.01710000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.01710000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.46510000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.46510000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.27390000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R2,0.27390000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.67670000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.67670000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.97450000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.97450000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.16630000000,2030
 "('all-year', 'all-week', 'evening')",heat,R2,0.16630000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.67670000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.67670000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.97450000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.97450000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.16630000000,2030
 "('all-year', 'all-week', 'early-morning')",heat,R2,0.16630000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.67670000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.67670000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.97450000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.97450000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16630000000,2030
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16630000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.37230000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.37230000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.54210000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.54210000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08360000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08360000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08760000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08760000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.55890000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.55890000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81400000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.81400000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.13230000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.13230000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.14130000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.14130000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37230000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37230000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.54210000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.54210000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08360000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08360000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08760000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.55890000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.55890000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81400000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.81400000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13230000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13230000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14130000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.14130000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.12120000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.12120000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63330000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.63330000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30640000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30640000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.34240000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.34240000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.74630000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.74630000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08710000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.08710000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.18580000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.18580000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.20180000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.20180000000,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', 'early-morning')",electricity,R1,0.74630000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.74630000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.08710000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.08710000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18580000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18580000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.20180000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.20180000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.74630000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.74630000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.08710000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.08710000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18580000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18580000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.20180000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.20180000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.37880000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.37880000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.55380000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.55380000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02350000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02350000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02840000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.02840000000,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.56850000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56850000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.83140000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.83140000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04330000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.04330000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05420000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.05420000000,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', 'mid-afternoon')",electricity,R1,0.37880000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37880000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.55380000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.55380000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02350000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02350000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02840000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02840000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56850000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56850000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.83140000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.83140000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04330000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04330000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05420000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05420000000,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.13990000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.13990000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.66720000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.66720000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13480000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.17870000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.17870000000,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,0.75910000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.75910000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.11010000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.11010000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.06840000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.06840000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.08790000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.08790000000,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', 'early-morning')",electricity,R1,0.75910000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.75910000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.11010000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.11010000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06840000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06840000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.08790000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.08790000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.75910000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.75910000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.11010000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.11010000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06840000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06840000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08790000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08790000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.41910000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.41910000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.61960000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.61960000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02370000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02370000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02870000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.02870000000,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.62900000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.62900000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.93000000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.93000000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04370000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.04370000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05490000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.05490000000,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', 'mid-afternoon')",electricity,R1,0.41910000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41910000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61960000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61960000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02370000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02370000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02870000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02870000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62900000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.62900000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.93000000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.93000000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04370000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04370000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05490000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05490000000,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.26060000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.26060000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.86400000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.86400000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13640000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13640000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.18160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.18160000000,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,0.83970000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.83970000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.24150000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,1.24150000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.06920000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.06920000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.08920000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.08920000000,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', 'early-morning')",electricity,R1,0.83970000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.83970000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.24150000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.24150000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06920000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06920000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.08920000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.08920000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.83970000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.83970000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.24150000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.24150000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06920000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06920000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08920000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08920000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.44700000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.44700000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.66730000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.66730000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02480000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.02480000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.03060000000,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.67070000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.67070000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.00140000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,1.00140000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04630000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.04630000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05920000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.05920000000,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', 'mid-afternoon')",electricity,R1,0.44700000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44700000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.66730000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66730000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02480000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03060000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67070000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.67070000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00140000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.00140000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04630000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04630000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05920000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05920000000,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.34390000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34390000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.00650000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.00650000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.14670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.14670000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.19840000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.19840000000,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,0.89530000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89530000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.33670000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,1.33670000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07380000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.07380000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.09670000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.09670000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89530000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89530000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.33670000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.33670000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.07380000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.07380000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.09670000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.09670000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89530000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89530000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.33670000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.33670000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.07380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.07380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09670000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09670000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index ea8602ea..97ed5793 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -1,53 +1,35 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,3.00000000000
-1,2035,gasCCGT,R1,2025,3.00000000000
-1,2040,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R1,2025,3.00000000000
-1,2049,gasCCGT,R1,2025,3.00000000000
-1,2050,gasCCGT,R1,2025,3.00000000000
-1,2054,gasCCGT,R1,2025,3.00000000000
-1,2055,gasCCGT,R1,2025,3.00000000000
-1,2064,gasCCGT,R1,2025,3.00000000000
+1,2030,gasCCGT,R1,2025,4.80970000000
+1,2035,gasCCGT,R1,2025,4.80970000000
+1,2040,gasCCGT,R1,2025,4.80970000000
+1,2045,gasCCGT,R1,2025,4.80970000000
+1,2049,gasCCGT,R1,2025,4.80970000000
+1,2050,gasCCGT,R1,2025,4.80970000000
+1,2064,gasCCGT,R1,2025,4.80970000000
 2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,3.00000000000
-3,2035,gasCCGT,R2,2025,3.00000000000
-3,2040,gasCCGT,R2,2025,3.00000000000
-3,2045,gasCCGT,R2,2025,3.00000000000
-3,2049,gasCCGT,R2,2025,3.00000000000
-3,2050,gasCCGT,R2,2025,3.00000000000
-3,2054,gasCCGT,R2,2025,3.00000000000
-3,2055,gasCCGT,R2,2025,3.00000000000
-3,2064,gasCCGT,R2,2025,3.00000000000
+3,2030,gasCCGT,R2,2025,4.80970000000
+3,2035,gasCCGT,R2,2025,4.80970000000
+3,2040,gasCCGT,R2,2025,4.80970000000
+3,2045,gasCCGT,R2,2025,4.80970000000
+3,2049,gasCCGT,R2,2025,4.80970000000
+3,2050,gasCCGT,R2,2025,4.80970000000
+3,2064,gasCCGT,R2,2025,4.80970000000
 4,2025,solarPV,R1,2020,5.60870000000
 4,2030,solarPV,R1,2020,5.60870000000
 4,2035,solarPV,R1,2020,5.60870000000
 4,2040,solarPV,R1,2020,5.60870000000
 4,2045,solarPV,R1,2020,5.60870000000
 4,2049,solarPV,R1,2020,5.60870000000
-5,2030,solarPV,R1,2025,4.07170000000
-5,2035,solarPV,R1,2025,4.07170000000
-5,2040,solarPV,R1,2025,4.07170000000
-5,2045,solarPV,R1,2025,4.07170000000
-5,2049,solarPV,R1,2025,4.07170000000
-5,2050,solarPV,R1,2025,4.07170000000
-5,2054,solarPV,R1,2025,4.07170000000
-6,2030,solarPV,R2,2025,4.07170000000
-6,2035,solarPV,R2,2025,4.07170000000
-6,2040,solarPV,R2,2025,4.07170000000
-6,2045,solarPV,R2,2025,4.07170000000
-6,2049,solarPV,R2,2025,4.07170000000
-6,2050,solarPV,R2,2025,4.07170000000
-6,2054,solarPV,R2,2025,4.07170000000
-7,2025,windturbine,R1,2020,10.00000000000
-7,2030,windturbine,R1,2020,10.00000000000
-7,2035,windturbine,R1,2020,10.00000000000
-7,2040,windturbine,R1,2020,10.00000000000
-7,2045,windturbine,R1,2020,10.00000000000
-7,2049,windturbine,R1,2020,10.00000000000
-8,2025,windturbine,R2,2020,15.60870000000
-8,2030,windturbine,R2,2020,15.60870000000
-8,2035,windturbine,R2,2020,15.60870000000
-8,2040,windturbine,R2,2020,15.60870000000
-8,2045,windturbine,R2,2020,15.60870000000
-8,2049,windturbine,R2,2020,15.60870000000
+5,2025,windturbine,R1,2020,10.00000000000
+5,2030,windturbine,R1,2020,10.00000000000
+5,2035,windturbine,R1,2020,10.00000000000
+5,2040,windturbine,R1,2020,10.00000000000
+5,2045,windturbine,R1,2020,10.00000000000
+5,2049,windturbine,R1,2020,10.00000000000
+6,2025,windturbine,R2,2020,15.60870000000
+6,2030,windturbine,R2,2020,15.60870000000
+6,2035,windturbine,R2,2020,15.60870000000
+6,2040,windturbine,R2,2020,15.60870000000
+6,2045,windturbine,R2,2020,15.60870000000
+6,2049,windturbine,R2,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 91268246..aad3d309 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
@@ -9,68 +9,38 @@ asset,year,region,installed,technology,capacity
 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
+3,2030,R1,2025,gasCCGT,4.80970000000
+3,2035,R1,2025,gasCCGT,4.80970000000
+3,2040,R1,2025,gasCCGT,4.80970000000
+3,2045,R1,2025,gasCCGT,4.80970000000
+3,2049,R1,2025,gasCCGT,4.80970000000
+3,2050,R1,2025,gasCCGT,4.80970000000
+3,2059,R1,2025,gasCCGT,4.80970000000
+3,2060,R1,2025,gasCCGT,4.80970000000
+3,2064,R1,2025,gasCCGT,4.80970000000
+4,2035,R1,2030,solarPV,5.71470000000
+4,2040,R1,2030,solarPV,5.71470000000
+4,2045,R1,2030,solarPV,5.71470000000
+4,2049,R1,2030,solarPV,5.71470000000
+4,2050,R1,2030,solarPV,5.71470000000
+4,2059,R1,2030,solarPV,5.71470000000
+6,2030,R2,2020,windturbine,15.60870000000
+6,2035,R2,2020,windturbine,15.60870000000
+6,2040,R2,2020,windturbine,15.60870000000
+6,2045,R2,2020,windturbine,15.60870000000
+6,2049,R2,2020,windturbine,15.60870000000
+7,2030,R2,2025,gasCCGT,4.80970000000
+7,2035,R2,2025,gasCCGT,4.80970000000
+7,2040,R2,2025,gasCCGT,4.80970000000
+7,2045,R2,2025,gasCCGT,4.80970000000
+7,2049,R2,2025,gasCCGT,4.80970000000
+7,2050,R2,2025,gasCCGT,4.80970000000
+7,2059,R2,2025,gasCCGT,4.80970000000
+7,2060,R2,2025,gasCCGT,4.80970000000
+7,2064,R2,2025,gasCCGT,4.80970000000
+8,2035,R2,2030,solarPV,5.71470000000
+8,2040,R2,2030,solarPV,5.71470000000
+8,2045,R2,2030,solarPV,5.71470000000
+8,2049,R2,2030,solarPV,5.71470000000
+8,2050,R2,2030,solarPV,5.71470000000
+8,2059,R2,2030,solarPV,5.71470000000
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 9eb83457..b2807f5a 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
@@ -7,81 +7,49 @@ asset,year,region,installed,technology,capacity
 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
+3,2035,R1,2025,gasCCGT,4.80970000000
+3,2040,R1,2025,gasCCGT,4.80970000000
+3,2045,R1,2025,gasCCGT,4.80970000000
+3,2049,R1,2025,gasCCGT,4.80970000000
+3,2050,R1,2025,gasCCGT,4.80970000000
+3,2059,R1,2025,gasCCGT,4.80970000000
+3,2060,R1,2025,gasCCGT,4.80970000000
+3,2064,R1,2025,gasCCGT,4.80970000000
+4,2035,R1,2030,solarPV,5.71470000000
+4,2040,R1,2030,solarPV,5.71470000000
+4,2045,R1,2030,solarPV,5.71470000000
+4,2049,R1,2030,solarPV,5.71470000000
+4,2050,R1,2030,solarPV,5.71470000000
+4,2059,R1,2030,solarPV,5.71470000000
+5,2040,R1,2035,solarPV,7.85760000000
+5,2045,R1,2035,solarPV,7.85760000000
+5,2049,R1,2035,solarPV,7.85760000000
+5,2050,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
+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,2035,R2,2025,gasCCGT,4.80970000000
+8,2040,R2,2025,gasCCGT,4.80970000000
+8,2045,R2,2025,gasCCGT,4.80970000000
+8,2049,R2,2025,gasCCGT,4.80970000000
+8,2050,R2,2025,gasCCGT,4.80970000000
+8,2059,R2,2025,gasCCGT,4.80970000000
+8,2060,R2,2025,gasCCGT,4.80970000000
+8,2064,R2,2025,gasCCGT,4.80970000000
+9,2035,R2,2030,solarPV,5.71470000000
+9,2040,R2,2030,solarPV,5.71470000000
+9,2045,R2,2030,solarPV,5.71470000000
+9,2049,R2,2030,solarPV,5.71470000000
+9,2050,R2,2030,solarPV,5.71470000000
+9,2059,R2,2030,solarPV,5.71470000000
+10,2040,R2,2035,solarPV,7.85760000000
+10,2045,R2,2035,solarPV,7.85760000000
+10,2049,R2,2035,solarPV,7.85760000000
+10,2050,R2,2035,solarPV,7.85760000000
+10,2059,R2,2035,solarPV,7.85760000000
+10,2060,R2,2035,solarPV,7.85760000000
+10,2064,R2,2035,solarPV,7.85760000000
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 f78b605a..faf4165c 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
@@ -5,93 +5,60 @@ asset,year,region,installed,technology,capacity
 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
+3,2040,R1,2025,gasCCGT,4.80970000000
+3,2045,R1,2025,gasCCGT,4.80970000000
+3,2049,R1,2025,gasCCGT,4.80970000000
+3,2050,R1,2025,gasCCGT,4.80970000000
+3,2059,R1,2025,gasCCGT,4.80970000000
+3,2060,R1,2025,gasCCGT,4.80970000000
+3,2064,R1,2025,gasCCGT,4.80970000000
+4,2040,R1,2030,solarPV,5.71470000000
+4,2045,R1,2030,solarPV,5.71470000000
+4,2049,R1,2030,solarPV,5.71470000000
+4,2050,R1,2030,solarPV,5.71470000000
+4,2059,R1,2030,solarPV,5.71470000000
+5,2040,R1,2035,solarPV,7.85760000000
+5,2045,R1,2035,solarPV,7.85760000000
+5,2049,R1,2035,solarPV,7.85760000000
+5,2050,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,2045,R1,2040,solarPV,5.71470000000
+6,2049,R1,2040,solarPV,5.71470000000
+6,2050,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
+8,2040,R2,2020,windturbine,15.60870000000
+8,2045,R2,2020,windturbine,15.60870000000
+8,2049,R2,2020,windturbine,15.60870000000
+9,2040,R2,2025,gasCCGT,4.80970000000
+9,2045,R2,2025,gasCCGT,4.80970000000
+9,2049,R2,2025,gasCCGT,4.80970000000
+9,2050,R2,2025,gasCCGT,4.80970000000
+9,2059,R2,2025,gasCCGT,4.80970000000
+9,2060,R2,2025,gasCCGT,4.80970000000
+9,2064,R2,2025,gasCCGT,4.80970000000
+10,2040,R2,2030,solarPV,5.71470000000
+10,2045,R2,2030,solarPV,5.71470000000
+10,2049,R2,2030,solarPV,5.71470000000
+10,2050,R2,2030,solarPV,5.71470000000
+10,2059,R2,2030,solarPV,5.71470000000
+11,2040,R2,2035,solarPV,7.85760000000
+11,2045,R2,2035,solarPV,7.85760000000
+11,2049,R2,2035,solarPV,7.85760000000
+11,2050,R2,2035,solarPV,7.85760000000
+11,2059,R2,2035,solarPV,7.85760000000
+11,2060,R2,2035,solarPV,7.85760000000
+11,2064,R2,2035,solarPV,7.85760000000
+12,2045,R2,2040,solarPV,5.71470000000
+12,2049,R2,2040,solarPV,5.71470000000
+12,2050,R2,2040,solarPV,5.71470000000
+12,2059,R2,2040,solarPV,5.71470000000
+12,2060,R2,2040,solarPV,5.71470000000
+12,2064,R2,2040,solarPV,5.71470000000
+12,2065,R2,2040,solarPV,5.71470000000
+12,2069,R2,2040,solarPV,5.71470000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index 797266c4..99829cd9 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,125 +1,87 @@
 asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,3.00000000000
-0,2049,gasCCGT,R1,2025,3.00000000000
-0,2050,gasCCGT,R1,2025,3.00000000000
-0,2054,gasCCGT,R1,2025,3.00000000000
-0,2055,gasCCGT,R1,2025,3.00000000000
-0,2059,gasCCGT,R1,2025,3.00000000000
-0,2060,gasCCGT,R1,2025,3.00000000000
-0,2064,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R2,2025,3.00000000000
-1,2049,gasCCGT,R2,2025,3.00000000000
-1,2050,gasCCGT,R2,2025,3.00000000000
-1,2054,gasCCGT,R2,2025,3.00000000000
-1,2055,gasCCGT,R2,2025,3.00000000000
-1,2059,gasCCGT,R2,2025,3.00000000000
-1,2060,gasCCGT,R2,2025,3.00000000000
-1,2064,gasCCGT,R2,2025,3.00000000000
+0,2045,gasCCGT,R1,2025,4.80970000000
+0,2049,gasCCGT,R1,2025,4.80970000000
+0,2050,gasCCGT,R1,2025,4.80970000000
+0,2059,gasCCGT,R1,2025,4.80970000000
+0,2060,gasCCGT,R1,2025,4.80970000000
+0,2064,gasCCGT,R1,2025,4.80970000000
+1,2045,gasCCGT,R2,2025,4.80970000000
+1,2049,gasCCGT,R2,2025,4.80970000000
+1,2050,gasCCGT,R2,2025,4.80970000000
+1,2059,gasCCGT,R2,2025,4.80970000000
+1,2060,gasCCGT,R2,2025,4.80970000000
+1,2064,gasCCGT,R2,2025,4.80970000000
 2,2045,solarPV,R1,2020,5.60870000000
 2,2049,solarPV,R1,2020,5.60870000000
-3,2045,solarPV,R1,2025,4.07170000000
-3,2049,solarPV,R1,2025,4.07170000000
-3,2050,solarPV,R1,2025,4.07170000000
-3,2054,solarPV,R1,2025,4.07170000000
-4,2045,solarPV,R1,2030,5.71470000000
-4,2049,solarPV,R1,2030,5.71470000000
-4,2050,solarPV,R1,2030,5.71470000000
-4,2054,solarPV,R1,2030,5.71470000000
-4,2055,solarPV,R1,2030,5.71470000000
-4,2059,solarPV,R1,2030,5.71470000000
-5,2045,solarPV,R1,2035,7.85760000000
-5,2049,solarPV,R1,2035,7.85760000000
-5,2050,solarPV,R1,2035,7.85760000000
-5,2054,solarPV,R1,2035,7.85760000000
-5,2055,solarPV,R1,2035,7.85760000000
-5,2059,solarPV,R1,2035,7.85760000000
-5,2060,solarPV,R1,2035,7.85760000000
-5,2064,solarPV,R1,2035,7.85760000000
-6,2045,solarPV,R1,2040,5.71470000000
-6,2049,solarPV,R1,2040,5.71470000000
-6,2050,solarPV,R1,2040,5.71470000000
-6,2054,solarPV,R1,2040,5.71470000000
-6,2055,solarPV,R1,2040,5.71470000000
-6,2059,solarPV,R1,2040,5.71470000000
-6,2060,solarPV,R1,2040,5.71470000000
-6,2064,solarPV,R1,2040,5.71470000000
-6,2065,solarPV,R1,2040,5.71470000000
-6,2069,solarPV,R1,2040,5.71470000000
-7,2050,solarPV,R1,2045,15.71470000000
-7,2054,solarPV,R1,2045,15.71470000000
-7,2055,solarPV,R1,2045,15.71470000000
-7,2059,solarPV,R1,2045,15.71470000000
-7,2060,solarPV,R1,2045,15.71470000000
-7,2064,solarPV,R1,2045,15.71470000000
-7,2065,solarPV,R1,2045,15.71470000000
-7,2069,solarPV,R1,2045,15.71470000000
-7,2070,solarPV,R1,2045,15.71470000000
-7,2074,solarPV,R1,2045,15.71470000000
-8,2045,solarPV,R2,2025,4.07170000000
-8,2049,solarPV,R2,2025,4.07170000000
-8,2050,solarPV,R2,2025,4.07170000000
-8,2054,solarPV,R2,2025,4.07170000000
-9,2045,solarPV,R2,2030,4.07170000000
-9,2049,solarPV,R2,2030,4.07170000000
-9,2050,solarPV,R2,2030,4.07170000000
-9,2054,solarPV,R2,2030,4.07170000000
-9,2055,solarPV,R2,2030,4.07170000000
-9,2059,solarPV,R2,2030,4.07170000000
-10,2045,solarPV,R2,2035,7.85760000000
-10,2049,solarPV,R2,2035,7.85760000000
-10,2050,solarPV,R2,2035,7.85760000000
-10,2054,solarPV,R2,2035,7.85760000000
-10,2055,solarPV,R2,2035,7.85760000000
-10,2059,solarPV,R2,2035,7.85760000000
-10,2060,solarPV,R2,2035,7.85760000000
-10,2064,solarPV,R2,2035,7.85760000000
-11,2045,solarPV,R2,2040,5.71470000000
-11,2049,solarPV,R2,2040,5.71470000000
-11,2050,solarPV,R2,2040,5.71470000000
-11,2054,solarPV,R2,2040,5.71470000000
-11,2055,solarPV,R2,2040,5.71470000000
-11,2059,solarPV,R2,2040,5.71470000000
-11,2060,solarPV,R2,2040,5.71470000000
-11,2064,solarPV,R2,2040,5.71470000000
-11,2065,solarPV,R2,2040,5.71470000000
-11,2069,solarPV,R2,2040,5.71470000000
-12,2050,solarPV,R2,2045,15.71470000000
-12,2054,solarPV,R2,2045,15.71470000000
-12,2055,solarPV,R2,2045,15.71470000000
-12,2059,solarPV,R2,2045,15.71470000000
-12,2060,solarPV,R2,2045,15.71470000000
-12,2064,solarPV,R2,2045,15.71470000000
-12,2065,solarPV,R2,2045,15.71470000000
-12,2069,solarPV,R2,2045,15.71470000000
-12,2070,solarPV,R2,2045,15.71470000000
-12,2074,solarPV,R2,2045,15.71470000000
-13,2045,windturbine,R1,2020,10.00000000000
-13,2049,windturbine,R1,2020,10.00000000000
-14,2050,windturbine,R1,2045,5.60870000000
-14,2054,windturbine,R1,2045,5.60870000000
-14,2055,windturbine,R1,2045,5.60870000000
-14,2059,windturbine,R1,2045,5.60870000000
-14,2060,windturbine,R1,2045,5.60870000000
-14,2064,windturbine,R1,2045,5.60870000000
-14,2065,windturbine,R1,2045,5.60870000000
-14,2069,windturbine,R1,2045,5.60870000000
-14,2070,windturbine,R1,2045,5.60870000000
-14,2074,windturbine,R1,2045,5.60870000000
-15,2045,windturbine,R2,2020,15.60870000000
-15,2049,windturbine,R2,2020,15.60870000000
-16,2045,windturbine,R2,2030,1.64290000000
-16,2049,windturbine,R2,2030,1.64290000000
-16,2050,windturbine,R2,2030,1.64290000000
-16,2054,windturbine,R2,2030,1.64290000000
-16,2055,windturbine,R2,2030,1.64290000000
-16,2059,windturbine,R2,2030,1.64290000000
-17,2050,windturbine,R2,2045,5.60870000000
-17,2054,windturbine,R2,2045,5.60870000000
-17,2055,windturbine,R2,2045,5.60870000000
-17,2059,windturbine,R2,2045,5.60870000000
-17,2060,windturbine,R2,2045,5.60870000000
-17,2064,windturbine,R2,2045,5.60870000000
-17,2065,windturbine,R2,2045,5.60870000000
-17,2069,windturbine,R2,2045,5.60870000000
-17,2070,windturbine,R2,2045,5.60870000000
-17,2074,windturbine,R2,2045,5.60870000000
+3,2045,solarPV,R1,2030,5.71470000000
+3,2049,solarPV,R1,2030,5.71470000000
+3,2050,solarPV,R1,2030,5.71470000000
+3,2059,solarPV,R1,2030,5.71470000000
+4,2045,solarPV,R1,2035,7.85760000000
+4,2049,solarPV,R1,2035,7.85760000000
+4,2050,solarPV,R1,2035,7.85760000000
+4,2059,solarPV,R1,2035,7.85760000000
+4,2060,solarPV,R1,2035,7.85760000000
+4,2064,solarPV,R1,2035,7.85760000000
+5,2045,solarPV,R1,2040,5.71470000000
+5,2049,solarPV,R1,2040,5.71470000000
+5,2050,solarPV,R1,2040,5.71470000000
+5,2059,solarPV,R1,2040,5.71470000000
+5,2060,solarPV,R1,2040,5.71470000000
+5,2064,solarPV,R1,2040,5.71470000000
+5,2065,solarPV,R1,2040,5.71470000000
+5,2069,solarPV,R1,2040,5.71470000000
+6,2050,solarPV,R1,2045,15.71470000000
+6,2059,solarPV,R1,2045,15.71470000000
+6,2060,solarPV,R1,2045,15.71470000000
+6,2064,solarPV,R1,2045,15.71470000000
+6,2065,solarPV,R1,2045,15.71470000000
+6,2069,solarPV,R1,2045,15.71470000000
+6,2070,solarPV,R1,2045,15.71470000000
+6,2074,solarPV,R1,2045,15.71470000000
+7,2045,solarPV,R2,2030,5.71470000000
+7,2049,solarPV,R2,2030,5.71470000000
+7,2050,solarPV,R2,2030,5.71470000000
+7,2059,solarPV,R2,2030,5.71470000000
+8,2045,solarPV,R2,2035,7.85760000000
+8,2049,solarPV,R2,2035,7.85760000000
+8,2050,solarPV,R2,2035,7.85760000000
+8,2059,solarPV,R2,2035,7.85760000000
+8,2060,solarPV,R2,2035,7.85760000000
+8,2064,solarPV,R2,2035,7.85760000000
+9,2045,solarPV,R2,2040,5.71470000000
+9,2049,solarPV,R2,2040,5.71470000000
+9,2050,solarPV,R2,2040,5.71470000000
+9,2059,solarPV,R2,2040,5.71470000000
+9,2060,solarPV,R2,2040,5.71470000000
+9,2064,solarPV,R2,2040,5.71470000000
+9,2065,solarPV,R2,2040,5.71470000000
+9,2069,solarPV,R2,2040,5.71470000000
+10,2050,solarPV,R2,2045,15.71470000000
+10,2059,solarPV,R2,2045,15.71470000000
+10,2060,solarPV,R2,2045,15.71470000000
+10,2064,solarPV,R2,2045,15.71470000000
+10,2065,solarPV,R2,2045,15.71470000000
+10,2069,solarPV,R2,2045,15.71470000000
+10,2070,solarPV,R2,2045,15.71470000000
+10,2074,solarPV,R2,2045,15.71470000000
+11,2045,windturbine,R1,2020,10.00000000000
+11,2049,windturbine,R1,2020,10.00000000000
+12,2050,windturbine,R1,2045,5.60870000000
+12,2059,windturbine,R1,2045,5.60870000000
+12,2060,windturbine,R1,2045,5.60870000000
+12,2064,windturbine,R1,2045,5.60870000000
+12,2065,windturbine,R1,2045,5.60870000000
+12,2069,windturbine,R1,2045,5.60870000000
+12,2070,windturbine,R1,2045,5.60870000000
+12,2074,windturbine,R1,2045,5.60870000000
+13,2045,windturbine,R2,2020,15.60870000000
+13,2049,windturbine,R2,2020,15.60870000000
+14,2050,windturbine,R2,2045,5.60870000000
+14,2059,windturbine,R2,2045,5.60870000000
+14,2060,windturbine,R2,2045,5.60870000000
+14,2064,windturbine,R2,2045,5.60870000000
+14,2065,windturbine,R2,2045,5.60870000000
+14,2069,windturbine,R2,2045,5.60870000000
+14,2070,windturbine,R2,2045,5.60870000000
+14,2074,windturbine,R2,2045,5.60870000000
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 db2da871..495c8a0d 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,77 @@
 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
+2,2050,R1,2025,gasCCGT,4.80970000000
+2,2055,R1,2025,gasCCGT,4.80970000000
+2,2059,R1,2025,gasCCGT,4.80970000000
+2,2060,R1,2025,gasCCGT,4.80970000000
+2,2064,R1,2025,gasCCGT,4.80970000000
+3,2050,R1,2030,solarPV,5.71470000000
+3,2055,R1,2030,solarPV,5.71470000000
+3,2059,R1,2030,solarPV,5.71470000000
+4,2050,R1,2035,solarPV,7.85760000000
+4,2055,R1,2035,solarPV,7.85760000000
+4,2059,R1,2035,solarPV,7.85760000000
+4,2060,R1,2035,solarPV,7.85760000000
+4,2064,R1,2035,solarPV,7.85760000000
+5,2050,R1,2040,solarPV,5.71470000000
+5,2055,R1,2040,solarPV,5.71470000000
+5,2059,R1,2040,solarPV,5.71470000000
+5,2060,R1,2040,solarPV,5.71470000000
+5,2064,R1,2040,solarPV,5.71470000000
+5,2065,R1,2040,solarPV,5.71470000000
+5,2069,R1,2040,solarPV,5.71470000000
+6,2050,R1,2045,solarPV,15.71470000000
+6,2055,R1,2045,solarPV,15.71470000000
+6,2059,R1,2045,solarPV,15.71470000000
+6,2060,R1,2045,solarPV,15.71470000000
+6,2064,R1,2045,solarPV,15.71470000000
+6,2065,R1,2045,solarPV,15.71470000000
+6,2069,R1,2045,solarPV,15.71470000000
+6,2070,R1,2045,solarPV,15.71470000000
+6,2074,R1,2045,solarPV,15.71470000000
+7,2050,R1,2045,windturbine,5.60870000000
+7,2055,R1,2045,windturbine,5.60870000000
+7,2059,R1,2045,windturbine,5.60870000000
+7,2060,R1,2045,windturbine,5.60870000000
+7,2064,R1,2045,windturbine,5.60870000000
+7,2065,R1,2045,windturbine,5.60870000000
+7,2069,R1,2045,windturbine,5.60870000000
+7,2070,R1,2045,windturbine,5.60870000000
+7,2074,R1,2045,windturbine,5.60870000000
+9,2050,R2,2025,gasCCGT,4.80970000000
+9,2055,R2,2025,gasCCGT,4.80970000000
+9,2059,R2,2025,gasCCGT,4.80970000000
+9,2060,R2,2025,gasCCGT,4.80970000000
+9,2064,R2,2025,gasCCGT,4.80970000000
+10,2050,R2,2030,solarPV,5.71470000000
+10,2055,R2,2030,solarPV,5.71470000000
+10,2059,R2,2030,solarPV,5.71470000000
+11,2050,R2,2035,solarPV,7.85760000000
+11,2055,R2,2035,solarPV,7.85760000000
+11,2059,R2,2035,solarPV,7.85760000000
+11,2060,R2,2035,solarPV,7.85760000000
+11,2064,R2,2035,solarPV,7.85760000000
+12,2050,R2,2040,solarPV,5.71470000000
+12,2055,R2,2040,solarPV,5.71470000000
+12,2059,R2,2040,solarPV,5.71470000000
+12,2060,R2,2040,solarPV,5.71470000000
+12,2064,R2,2040,solarPV,5.71470000000
+12,2065,R2,2040,solarPV,5.71470000000
+12,2069,R2,2040,solarPV,5.71470000000
+13,2050,R2,2045,solarPV,15.71470000000
+13,2055,R2,2045,solarPV,15.71470000000
+13,2059,R2,2045,solarPV,15.71470000000
+13,2060,R2,2045,solarPV,15.71470000000
+13,2064,R2,2045,solarPV,15.71470000000
+13,2065,R2,2045,solarPV,15.71470000000
+13,2069,R2,2045,solarPV,15.71470000000
+13,2070,R2,2045,solarPV,15.71470000000
+13,2074,R2,2045,solarPV,15.71470000000
+14,2050,R2,2045,windturbine,5.60870000000
+14,2055,R2,2045,windturbine,5.60870000000
+14,2059,R2,2045,windturbine,5.60870000000
+14,2060,R2,2045,windturbine,5.60870000000
+14,2064,R2,2045,windturbine,5.60870000000
+14,2065,R2,2045,windturbine,5.60870000000
+14,2069,R2,2045,windturbine,5.60870000000
+14,2070,R2,2045,windturbine,5.60870000000
+14,2074,R2,2045,windturbine,5.60870000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
index 70d10b89..1a532f16 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
index 86f35c56..ef01c5df 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
@@ -3,21 +3,21 @@ asset,year,technology,region,installed,capacity
 0,2025,gassupply1,R1,2020,15.00000000000
 0,2026,gassupply1,R1,2020,7.50000000000
 0,2030,gassupply1,R1,2020,7.50000000000
-1,2026,gassupply1,R1,2024,2.18500000000
-1,2030,gassupply1,R1,2024,2.18500000000
-1,2035,gassupply1,R1,2024,2.18500000000
-1,2040,gassupply1,R1,2024,2.18500000000
-1,2045,gassupply1,R1,2024,2.18500000000
-1,2050,gassupply1,R1,2024,2.18500000000
-1,2060,gassupply1,R1,2024,2.18500000000
+1,2026,gassupply1,R1,2024,2.54560000000
+1,2030,gassupply1,R1,2024,2.54560000000
+1,2035,gassupply1,R1,2024,2.54560000000
+1,2040,gassupply1,R1,2024,2.54560000000
+1,2045,gassupply1,R1,2024,2.54560000000
+1,2050,gassupply1,R1,2024,2.54560000000
+1,2060,gassupply1,R1,2024,2.54560000000
 2,2024,gassupply1,R2,2020,15.00000000000
 2,2025,gassupply1,R2,2020,15.00000000000
 2,2026,gassupply1,R2,2020,7.50000000000
 2,2030,gassupply1,R2,2020,7.50000000000
-3,2026,gassupply1,R2,2024,2.18500000000
-3,2030,gassupply1,R2,2024,2.18500000000
-3,2035,gassupply1,R2,2024,2.18500000000
-3,2040,gassupply1,R2,2024,2.18500000000
-3,2045,gassupply1,R2,2024,2.18500000000
-3,2050,gassupply1,R2,2024,2.18500000000
-3,2060,gassupply1,R2,2024,2.18500000000
+3,2026,gassupply1,R2,2024,2.54560000000
+3,2030,gassupply1,R2,2024,2.54560000000
+3,2035,gassupply1,R2,2024,2.54560000000
+3,2040,gassupply1,R2,2024,2.54560000000
+3,2045,gassupply1,R2,2024,2.54560000000
+3,2050,gassupply1,R2,2024,2.54560000000
+3,2060,gassupply1,R2,2024,2.54560000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 57ef9d5d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,2.79440000000
-1,2035,gassupply1,R1,2025,2.79440000000
-1,2040,gassupply1,R1,2025,2.79440000000
-1,2045,gassupply1,R1,2025,2.79440000000
-1,2050,gassupply1,R1,2025,2.79440000000
-1,2064,gassupply1,R1,2025,2.79440000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,2.79440000000
-3,2035,gassupply1,R2,2025,2.79440000000
-3,2040,gassupply1,R2,2025,2.79440000000
-3,2045,gassupply1,R2,2025,2.79440000000
-3,2050,gassupply1,R2,2025,2.79440000000
-3,2064,gassupply1,R2,2025,2.79440000000
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 4f172556..1ac8ff7b 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
@@ -2,14 +2,14 @@ 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
+1,2026,R1,2024,gassupply1,2.54560000000
+1,2028,R1,2024,gassupply1,2.54560000000
+1,2030,R1,2024,gassupply1,2.54560000000
+1,2035,R1,2024,gassupply1,2.54560000000
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2028,R1,2026,gassupply1,1.69660000000
 2,2030,R1,2026,gassupply1,1.69660000000
 2,2035,R1,2026,gassupply1,1.69660000000
@@ -22,14 +22,14 @@ asset,year,region,installed,technology,capacity
 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
+4,2026,R2,2024,gassupply1,2.54560000000
+4,2028,R2,2024,gassupply1,2.54560000000
+4,2030,R2,2024,gassupply1,2.54560000000
+4,2035,R2,2024,gassupply1,2.54560000000
+4,2040,R2,2024,gassupply1,2.54560000000
+4,2045,R2,2024,gassupply1,2.54560000000
+4,2050,R2,2024,gassupply1,2.54560000000
+4,2060,R2,2024,gassupply1,2.54560000000
 5,2028,R2,2026,gassupply1,1.69660000000
 5,2030,R2,2026,gassupply1,1.69660000000
 5,2035,R2,2026,gassupply1,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 67c69d2c..d6baaa17 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,13 +1,13 @@
 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
+1,2028,R1,2024,gassupply1,2.54560000000
+1,2030,R1,2024,gassupply1,2.54560000000
+1,2035,R1,2024,gassupply1,2.54560000000
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2028,R1,2026,gassupply1,1.69660000000
 2,2030,R1,2026,gassupply1,1.69660000000
 2,2035,R1,2026,gassupply1,1.69660000000
@@ -29,13 +29,13 @@ asset,year,region,installed,technology,capacity
 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
+5,2028,R2,2024,gassupply1,2.54560000000
+5,2030,R2,2024,gassupply1,2.54560000000
+5,2035,R2,2024,gassupply1,2.54560000000
+5,2040,R2,2024,gassupply1,2.54560000000
+5,2045,R2,2024,gassupply1,2.54560000000
+5,2050,R2,2024,gassupply1,2.54560000000
+5,2060,R2,2024,gassupply1,2.54560000000
 6,2028,R2,2026,gassupply1,1.69660000000
 6,2030,R2,2026,gassupply1,1.69660000000
 6,2035,R2,2026,gassupply1,1.69660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index 620db1f4..ec46c1a1 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,12 +1,12 @@
 asset,year,technology,region,installed,capacity
 0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2024,2.18500000000
-1,2032,gassupply1,R1,2024,2.18500000000
-1,2035,gassupply1,R1,2024,2.18500000000
-1,2040,gassupply1,R1,2024,2.18500000000
-1,2045,gassupply1,R1,2024,2.18500000000
-1,2050,gassupply1,R1,2024,2.18500000000
-1,2060,gassupply1,R1,2024,2.18500000000
+1,2030,gassupply1,R1,2024,2.54560000000
+1,2032,gassupply1,R1,2024,2.54560000000
+1,2035,gassupply1,R1,2024,2.54560000000
+1,2040,gassupply1,R1,2024,2.54560000000
+1,2045,gassupply1,R1,2024,2.54560000000
+1,2050,gassupply1,R1,2024,2.54560000000
+1,2060,gassupply1,R1,2024,2.54560000000
 2,2030,gassupply1,R1,2026,1.69660000000
 2,2032,gassupply1,R1,2026,1.69660000000
 2,2035,gassupply1,R1,2026,1.69660000000
@@ -40,13 +40,13 @@ asset,year,technology,region,installed,capacity
 4,2065,gassupply1,R1,2030,9.19660000000
 4,2066,gassupply1,R1,2030,9.19660000000
 5,2030,gassupply1,R2,2020,7.50000000000
-6,2030,gassupply1,R2,2024,2.18500000000
-6,2032,gassupply1,R2,2024,2.18500000000
-6,2035,gassupply1,R2,2024,2.18500000000
-6,2040,gassupply1,R2,2024,2.18500000000
-6,2045,gassupply1,R2,2024,2.18500000000
-6,2050,gassupply1,R2,2024,2.18500000000
-6,2060,gassupply1,R2,2024,2.18500000000
+6,2030,gassupply1,R2,2024,2.54560000000
+6,2032,gassupply1,R2,2024,2.54560000000
+6,2035,gassupply1,R2,2024,2.54560000000
+6,2040,gassupply1,R2,2024,2.54560000000
+6,2045,gassupply1,R2,2024,2.54560000000
+6,2050,gassupply1,R2,2024,2.54560000000
+6,2060,gassupply1,R2,2024,2.54560000000
 7,2030,gassupply1,R2,2026,1.69660000000
 7,2032,gassupply1,R2,2026,1.69660000000
 7,2035,gassupply1,R2,2026,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 b40fbda2..e604abaa 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,11 +1,11 @@
 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
+1,2032,R1,2024,gassupply1,2.54560000000
+1,2034,R1,2024,gassupply1,2.54560000000
+1,2035,R1,2024,gassupply1,2.54560000000
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2032,R1,2026,gassupply1,1.69660000000
 2,2034,R1,2026,gassupply1,1.69660000000
 2,2035,R1,2026,gassupply1,1.69660000000
@@ -39,13 +39,13 @@ asset,year,region,installed,technology,capacity
 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
+6,2032,R2,2024,gassupply1,2.54560000000
+6,2034,R2,2024,gassupply1,2.54560000000
+6,2035,R2,2024,gassupply1,2.54560000000
+6,2040,R2,2024,gassupply1,2.54560000000
+6,2045,R2,2024,gassupply1,2.54560000000
+6,2050,R2,2024,gassupply1,2.54560000000
+6,2060,R2,2024,gassupply1,2.54560000000
 7,2032,R2,2026,gassupply1,1.69660000000
 7,2034,R2,2026,gassupply1,1.69660000000
 7,2035,R2,2026,gassupply1,1.69660000000
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 04997302..5d31f52d 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,11 +1,11 @@
 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
+1,2034,R1,2024,gassupply1,2.54560000000
+1,2035,R1,2024,gassupply1,2.54560000000
+1,2036,R1,2024,gassupply1,2.54560000000
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2034,R1,2026,gassupply1,1.69660000000
 2,2035,R1,2026,gassupply1,1.69660000000
 2,2036,R1,2026,gassupply1,1.69660000000
@@ -39,13 +39,13 @@ asset,year,region,installed,technology,capacity
 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
+6,2034,R2,2024,gassupply1,2.54560000000
+6,2035,R2,2024,gassupply1,2.54560000000
+6,2036,R2,2024,gassupply1,2.54560000000
+6,2040,R2,2024,gassupply1,2.54560000000
+6,2045,R2,2024,gassupply1,2.54560000000
+6,2050,R2,2024,gassupply1,2.54560000000
+6,2060,R2,2024,gassupply1,2.54560000000
 7,2034,R2,2026,gassupply1,1.69660000000
 7,2035,R2,2026,gassupply1,1.69660000000
 7,2036,R2,2026,gassupply1,1.69660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index be63ee95..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-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
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 72aa33a6..0be66489 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,10 +1,10 @@
 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
+1,2036,R1,2024,gassupply1,2.54560000000
+1,2038,R1,2024,gassupply1,2.54560000000
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2036,R1,2026,gassupply1,1.69660000000
 2,2038,R1,2026,gassupply1,1.69660000000
 2,2040,R1,2026,gassupply1,1.69660000000
@@ -35,12 +35,12 @@ asset,year,region,installed,technology,capacity
 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
+6,2036,R2,2024,gassupply1,2.54560000000
+6,2038,R2,2024,gassupply1,2.54560000000
+6,2040,R2,2024,gassupply1,2.54560000000
+6,2045,R2,2024,gassupply1,2.54560000000
+6,2050,R2,2024,gassupply1,2.54560000000
+6,2060,R2,2024,gassupply1,2.54560000000
 7,2036,R2,2026,gassupply1,1.69660000000
 7,2038,R2,2026,gassupply1,1.69660000000
 7,2040,R2,2026,gassupply1,1.69660000000
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 de3b2958..e5e2c159 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,9 +1,9 @@
 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
+1,2038,R1,2024,gassupply1,2.54560000000
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2038,R1,2026,gassupply1,1.69660000000
 2,2040,R1,2026,gassupply1,1.69660000000
 2,2045,R1,2026,gassupply1,1.69660000000
@@ -31,11 +31,11 @@ asset,year,region,installed,technology,capacity
 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
+6,2038,R2,2024,gassupply1,2.54560000000
+6,2040,R2,2024,gassupply1,2.54560000000
+6,2045,R2,2024,gassupply1,2.54560000000
+6,2050,R2,2024,gassupply1,2.54560000000
+6,2060,R2,2024,gassupply1,2.54560000000
 7,2038,R2,2026,gassupply1,1.69660000000
 7,2040,R2,2026,gassupply1,1.69660000000
 7,2045,R2,2026,gassupply1,1.69660000000
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 e36b5e9e..66cbc89b 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,9 +1,9 @@
 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
+1,2040,R1,2024,gassupply1,2.54560000000
+1,2042,R1,2024,gassupply1,2.54560000000
+1,2045,R1,2024,gassupply1,2.54560000000
+1,2050,R1,2024,gassupply1,2.54560000000
+1,2060,R1,2024,gassupply1,2.54560000000
 2,2040,R1,2026,gassupply1,1.69660000000
 2,2042,R1,2026,gassupply1,1.69660000000
 2,2045,R1,2026,gassupply1,1.69660000000
@@ -31,11 +31,11 @@ asset,year,region,installed,technology,capacity
 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
+6,2040,R2,2024,gassupply1,2.54560000000
+6,2042,R2,2024,gassupply1,2.54560000000
+6,2045,R2,2024,gassupply1,2.54560000000
+6,2050,R2,2024,gassupply1,2.54560000000
+6,2060,R2,2024,gassupply1,2.54560000000
 7,2040,R2,2026,gassupply1,1.69660000000
 7,2042,R2,2026,gassupply1,1.69660000000
 7,2045,R2,2026,gassupply1,1.69660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 33d01ddd..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 59af6136..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 4fcacf85..0e8f4d28 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -23,14 +23,12 @@ gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2024,14.42990000000
 heatpump,R2,R2,A1,residential,retrofit,2024,2.28590000000
 gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2024,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2024,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2024,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2024,0.48590000000
 gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2024,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2024,1.01590000000
 windturbine,R2,R2,A1,power,retrofit,2024,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2024,0.48590000000
 gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2026,2.32550000000
@@ -41,19 +39,17 @@ gasboiler,R2,R2,A1,residential,retrofit,2026,2.32550000000
 heatpump,R2,R2,A1,residential,retrofit,2026,14.42990000000
 heatpump,R2,R2,A1,residential,retrofit,2026,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2026,4.96040000000
-gasCCGT,R1,R1,A1,power,retrofit,2026,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2026,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2026,3.20460000000
 solarPV,R1,R1,A1,power,retrofit,2026,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2026,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2026,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2026,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2026,3.20460000000
 windturbine,R2,R2,A1,power,retrofit,2026,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2026,0.48590000000
 gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2026,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2026,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2026,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2026,2.54560000000
 gasboiler,R1,R1,A1,residential,retrofit,2028,2.32550000000
 heatpump,R1,R1,A1,residential,retrofit,2028,14.42990000000
 heatpump,R1,R1,A1,residential,retrofit,2028,2.28590000000
@@ -64,22 +60,20 @@ heatpump,R2,R2,A1,residential,retrofit,2028,14.42990000000
 heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2028,4.96040000000
 heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
-gasCCGT,R1,R1,A1,power,retrofit,2028,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2028,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2028,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2028,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2028,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2028,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2028,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2028,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2028,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2028,1.01590000000
 windturbine,R2,R2,A1,power,retrofit,2028,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2028,0.48590000000
 gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2028,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2028,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2028,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2028,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2028,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2028,1.69660000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,2.32550000000
 heatpump,R1,R1,A1,residential,retrofit,2030,14.42990000000
@@ -93,25 +87,23 @@ heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2030,4.96040000000
 heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2030,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2030,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2030,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
 windturbine,R2,R2,A1,power,retrofit,2030,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2030,0.48590000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,1.69660000000
 gasboiler,R1,R1,A1,residential,retrofit,2032,2.32550000000
@@ -126,26 +118,24 @@ heatpump,R2,R2,A1,residential,retrofit,2032,4.96040000000
 heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2032,16.71570000000
-gasCCGT,R1,R1,A1,power,retrofit,2032,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2032,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2032,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2032,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2032,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2032,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
 windturbine,R2,R2,A1,power,retrofit,2032,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2032,0.48590000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2032,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2032,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2032,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2032,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2032,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2032,9.19660000000
@@ -161,7 +151,7 @@ heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2034,16.71570000000
 heatpump,R2,R2,A1,residential,retrofit,2034,4.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2034,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2034,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
@@ -169,20 +159,18 @@ gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2034,4.17990000000
 solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2034,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2034,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2034,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
 solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2034,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2034,0.48590000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2034,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2034,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2034,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2034,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2034,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2034,9.19660000000
@@ -196,7 +184,7 @@ heatpump,R2,R2,A1,residential,retrofit,2036,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2036,16.71570000000
 heatpump,R2,R2,A1,residential,retrofit,2036,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2036,9.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2036,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2036,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
@@ -205,22 +193,19 @@ solarPV,R1,R1,A1,power,retrofit,2036,4.17990000000
 solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2036,4.61130000000
 windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2036,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2036,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2036,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
 solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2036,1.82870000000
+solarPV,R2,R2,A1,power,retrofit,2036,4.61130000000
 windturbine,R2,R2,A1,power,retrofit,2036,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2036,0.48590000000
-windturbine,R2,R2,A1,power,retrofit,2036,2.78270000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2036,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2036,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2036,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2036,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2036,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2036,9.19660000000
@@ -234,7 +219,7 @@ heatpump,R2,R2,A1,residential,retrofit,2038,16.71570000000
 heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2038,9.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2038,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2038,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
@@ -244,23 +229,20 @@ solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2038,4.61130000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2038,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2038,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2038,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2038,1.82870000000
+solarPV,R2,R2,A1,power,retrofit,2038,4.61130000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2038,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2038,0.48590000000
-windturbine,R2,R2,A1,power,retrofit,2038,2.78270000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2038,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2038,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2038,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2038,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2038,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2038,9.19660000000
@@ -274,7 +256,7 @@ heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2040,9.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,0.80000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2040,3.20460000000
 gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
 gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
@@ -285,24 +267,21 @@ solarPV,R1,R1,A1,power,retrofit,2040,4.61130000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,0.48590000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,0.80000000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2040,3.20460000000
 gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
 gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2040,1.82870000000
+solarPV,R2,R2,A1,power,retrofit,2040,4.61130000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2040,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2040,0.48590000000
-windturbine,R2,R2,A1,power,retrofit,2040,2.78270000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.18500000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.54560000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,1.69660000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.18500000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 3fb568f9..90e1c51a 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -127,579 +127,579 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,1.44550000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.25410000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.25410000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,0.27380000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,0.27380000000,2024
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2024
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2024
 "('all-year', 'all-week', 'night')",heat,R1,0.13860000000,2024
 "('all-year', 'all-week', 'night')",heat,R2,0.13860000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.38170000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.38170000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,0.41120000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,0.41120000000,2024
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2024
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2024
 "('all-year', 'all-week', 'morning')",heat,R1,0.21350000000,2024
 "('all-year', 'all-week', 'morning')",heat,R2,0.21350000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.25410000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.25410000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27380000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27380000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13860000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13860000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.38170000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.38170000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41120000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41120000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2024
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.21350000000,2024
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.21350000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.76710000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.76710000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.82660000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.82660000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2024
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.46120000000,2024
 "('all-year', 'all-week', 'late-peak')",heat,R2,0.46120000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,0.51000000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,0.51000000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,0.54950000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,0.54950000000,2024
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2024
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2024
 "('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2024
 "('all-year', 'all-week', 'evening')",heat,R2,0.29250000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.51000000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.51000000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.54950000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.54950000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2024
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.29250000000,2024
 "('all-year', 'all-week', 'early-morning')",heat,R2,0.29250000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.51000000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.51000000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.54950000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.54950000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2024
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.29250000000,2024
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,0.29250000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.41120000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.41120000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,0.42850000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,0.42850000000,2026
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2026
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.07600000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.07600000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,0.07650000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,0.07650000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,0.61780000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,0.61780000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64380000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,0.64380000000,2026
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2026
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.11910000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.11910000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,0.12020000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,0.12020000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.41120000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.41120000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.42850000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.42850000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07600000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07600000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07650000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07650000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.61780000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.61780000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64380000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64380000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11910000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11910000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12020000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.12020000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.24180000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.24180000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.29410000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.29410000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.26900000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.26900000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27360000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27360000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,0.82550000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,0.82550000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,0.86030000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,0.86030000000,2026
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2026
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.16570000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.16570000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,0.16770000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,0.16770000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.82550000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.82550000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.86030000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.86030000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16570000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16570000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16770000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16770000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.82550000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.82550000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.86030000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.86030000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16570000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16570000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16770000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16770000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.49980000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.49980000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,0.51740000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,0.51740000000,2028
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2028
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.08130000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.08130000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,0.08170000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,0.08170000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,0.75070000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,0.75070000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77720000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,0.77720000000,2028
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2028
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.13010000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.13010000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,0.13110000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,0.13110000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.49980000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.49980000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.51740000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.51740000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08130000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08130000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08170000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08170000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.75070000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.75070000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77720000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77720000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13010000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13010000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13110000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13110000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50850000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.50850000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56180000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.56180000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30990000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30990000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31400000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.31400000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00310000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,1.00310000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,1.03850000000,2028
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2028
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.18460000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.18460000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,0.18640000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,0.18640000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.00310000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.00310000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.03850000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.03850000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18460000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18460000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18640000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18640000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.00310000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.00310000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.03850000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.03850000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18460000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18460000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18640000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18640000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.58970000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.58970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.60760000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.60760000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.08460000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.08460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.08510000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.08510000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.88580000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.88580000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.91260000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.91260000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.13690000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.13690000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.13790000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.13790000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.58970000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.58970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.60760000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.60760000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08460000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08460000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08510000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08510000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.88580000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.88580000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.91260000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.91260000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13690000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13690000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13790000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13790000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.77940000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.77940000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.83340000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.83340000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33440000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.33440000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.33860000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.33860000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.18340000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.18340000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.21930000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.21930000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.19610000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.19610000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.19790000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.19790000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.18340000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.18340000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.21930000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.21930000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.19610000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.19610000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.19790000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.19790000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.18340000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.18340000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.21930000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.21930000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19610000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19610000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19790000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19790000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.71130000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.71130000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,0.73030000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,0.73030000000,2032
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2032
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.09080000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.09080000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,0.09130000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,0.09130000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,1.06820000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,1.06820000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,1.09680000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,1.09680000000,2032
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2032
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.14800000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.14800000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,0.14910000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,0.14910000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.71130000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.71130000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.73030000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.73030000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09080000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09080000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09130000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09130000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.06820000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.06820000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.09680000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.09680000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14800000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.14800000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14910000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.14910000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.14490000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.14490000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.20230000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.20230000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.36770000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.36770000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.37200000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.37200000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,1.42690000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,1.42690000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,1.46510000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,1.46510000000,2032
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2032
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.21340000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.21340000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,0.21530000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,0.21530000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.42690000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.42690000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.46510000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.46510000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.21340000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.21340000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.21530000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.21530000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.42690000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.42690000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.46510000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.46510000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.21340000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.21340000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.21530000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.21530000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.74270000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.74270000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,0.76280000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,0.76280000000,2034
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2034
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.09730000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.09730000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,0.09780000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,0.09780000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.11530000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.11530000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,1.14530000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,1.14530000000,2034
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2034
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.16030000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.16030000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,0.16140000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,0.16140000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74270000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74270000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.76280000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.76280000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09730000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09730000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09780000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09780000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.11530000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.11530000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.14530000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.14530000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16030000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.16030000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16140000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.16140000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.23860000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.23860000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.29890000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.29890000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40720000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.40720000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.41180000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.41180000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,1.48960000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,1.48960000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,1.52980000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,1.52980000000,2034
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2034
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.23310000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.23310000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,0.23510000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,0.23510000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.48960000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.48960000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.52980000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.52980000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.23310000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.23310000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.23510000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.23510000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.48960000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.48960000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.52980000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.52980000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.23310000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.23310000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.23510000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.23510000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.72480000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.72480000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.74400000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.74400000000,2036
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2036
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.03410000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.03410000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.03470000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.03470000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,1.08820000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,1.08820000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,1.11700000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,1.11700000000,2036
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2036
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.06710000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.06710000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.06840000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.06840000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.72480000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.72480000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74400000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74400000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03410000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03410000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03470000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03470000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.08820000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.08820000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.11700000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.11700000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06710000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06710000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06840000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06840000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.18360000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.18360000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.24130000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.24130000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23050000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23050000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23570000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23570000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,1.45340000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,1.45340000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,1.49180000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,1.49180000000,2036
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2036
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.11090000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.11090000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.11320000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.11320000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.45340000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.45340000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.49180000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.49180000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11090000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11090000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11320000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11320000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.45340000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.45340000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.49180000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.49180000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11090000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11090000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11320000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11320000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.74940000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.74940000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.76940000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.76940000000,2038
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2038
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.03360000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.03360000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.03410000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.03410000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.12510000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.12510000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,1.15500000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,1.15500000000,2038
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2038
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.06590000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.06590000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.06720000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.06720000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74940000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74940000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.76940000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.76940000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03360000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03360000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03410000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03410000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12510000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.12510000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15500000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15500000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06590000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06590000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06720000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06720000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.25690000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.25690000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31700000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.31700000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.22580000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.22580000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23080000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23080000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,1.50240000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,1.50240000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,1.54240000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,1.54240000000,2038
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2038
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.10880000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.10880000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.11100000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.11100000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.50240000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.50240000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.54240000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.54240000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10880000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10880000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11100000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11100000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.50240000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.50240000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.54240000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.54240000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10880000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10880000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11100000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11100000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.77110000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.77110000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.79170000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.79170000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03430000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.03430000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03490000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.03490000000,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,1.15750000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.15750000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.18850000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.18850000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.06750000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.06750000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.06880000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.06880000000,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', 'mid-afternoon')",electricity,R1,0.77110000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.77110000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.79170000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.79170000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03430000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03490000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03490000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15750000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15750000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.18850000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.18850000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06750000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06750000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06880000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06880000000,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,2.32140000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.32140000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.38360000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.38360000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23210000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23210000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23730000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23730000000,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.54560000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.54560000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.58700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.58700000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.11170000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.11170000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.11390000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.11390000000,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', 'early-morning')",electricity,R1,1.54560000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.54560000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.58700000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.58700000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11170000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11170000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11390000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11390000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.54560000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.54560000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.58700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.58700000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11170000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11170000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11390000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11390000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 350eac06..cdc4a2ff 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
@@ -18,56 +18,34 @@ asset,year,region,installed,technology,capacity
 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
+3,2024,R1,2022,gasCCGT,1.01590000000
+3,2025,R1,2022,gasCCGT,1.01590000000
+3,2030,R1,2022,gasCCGT,1.01590000000
+3,2035,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2022,R2,2020,gasCCGT,1.00000000000
+4,2024,R2,2020,gasCCGT,1.00000000000
+4,2025,R2,2020,gasCCGT,1.00000000000
+5,2022,R2,2020,windturbine,12.17990000000
+5,2024,R2,2020,windturbine,12.17990000000
+5,2025,R2,2020,windturbine,12.17990000000
+5,2030,R2,2020,windturbine,12.17990000000
+5,2035,R2,2020,windturbine,12.17990000000
+5,2040,R2,2020,windturbine,12.17990000000
+5,2045,R2,2020,windturbine,12.17990000000
+5,2046,R2,2020,windturbine,12.17990000000
+6,2024,R2,2022,gasCCGT,1.01590000000
+6,2025,R2,2022,gasCCGT,1.01590000000
+6,2030,R2,2022,gasCCGT,1.01590000000
+6,2035,R2,2022,gasCCGT,1.01590000000
+6,2040,R2,2022,gasCCGT,1.01590000000
+6,2045,R2,2022,gasCCGT,1.01590000000
+6,2046,R2,2022,gasCCGT,1.01590000000
+6,2047,R2,2022,gasCCGT,1.01590000000
+6,2050,R2,2022,gasCCGT,1.01590000000
+6,2058,R2,2022,gasCCGT,1.01590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index 78e5bc43..330b0b0d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -1,19 +1,17 @@
 asset,year,technology,region,installed,capacity
 0,2024,gasCCGT,R1,2020,1.00000000000
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2024,gasCCGT,R1,2022,0.80000000000
-1,2025,gasCCGT,R1,2022,0.80000000000
-1,2026,gasCCGT,R1,2022,0.80000000000
-1,2030,gasCCGT,R1,2022,0.80000000000
-1,2035,gasCCGT,R1,2022,0.80000000000
-1,2040,gasCCGT,R1,2022,0.80000000000
-1,2045,gasCCGT,R1,2022,0.80000000000
-1,2046,gasCCGT,R1,2022,0.80000000000
-1,2047,gasCCGT,R1,2022,0.80000000000
-1,2048,gasCCGT,R1,2022,0.80000000000
-1,2049,gasCCGT,R1,2022,0.80000000000
-1,2050,gasCCGT,R1,2022,0.80000000000
-1,2058,gasCCGT,R1,2022,0.80000000000
+1,2024,gasCCGT,R1,2022,1.01590000000
+1,2025,gasCCGT,R1,2022,1.01590000000
+1,2026,gasCCGT,R1,2022,1.01590000000
+1,2030,gasCCGT,R1,2022,1.01590000000
+1,2035,gasCCGT,R1,2022,1.01590000000
+1,2040,gasCCGT,R1,2022,1.01590000000
+1,2045,gasCCGT,R1,2022,1.01590000000
+1,2046,gasCCGT,R1,2022,1.01590000000
+1,2047,gasCCGT,R1,2022,1.01590000000
+1,2050,gasCCGT,R1,2022,1.01590000000
+1,2058,gasCCGT,R1,2022,1.01590000000
 2,2026,gasCCGT,R1,2024,3.20460000000
 2,2030,gasCCGT,R1,2024,3.20460000000
 2,2035,gasCCGT,R1,2024,3.20460000000
@@ -21,27 +19,23 @@ asset,year,technology,region,installed,capacity
 2,2045,gasCCGT,R1,2024,3.20460000000
 2,2046,gasCCGT,R1,2024,3.20460000000
 2,2047,gasCCGT,R1,2024,3.20460000000
-2,2048,gasCCGT,R1,2024,3.20460000000
-2,2049,gasCCGT,R1,2024,3.20460000000
 2,2050,gasCCGT,R1,2024,3.20460000000
 2,2058,gasCCGT,R1,2024,3.20460000000
 2,2059,gasCCGT,R1,2024,3.20460000000
 2,2060,gasCCGT,R1,2024,3.20460000000
 3,2024,gasCCGT,R2,2020,1.00000000000
 3,2025,gasCCGT,R2,2020,1.00000000000
-4,2024,gasCCGT,R2,2022,0.80000000000
-4,2025,gasCCGT,R2,2022,0.80000000000
-4,2026,gasCCGT,R2,2022,0.80000000000
-4,2030,gasCCGT,R2,2022,0.80000000000
-4,2035,gasCCGT,R2,2022,0.80000000000
-4,2040,gasCCGT,R2,2022,0.80000000000
-4,2045,gasCCGT,R2,2022,0.80000000000
-4,2046,gasCCGT,R2,2022,0.80000000000
-4,2047,gasCCGT,R2,2022,0.80000000000
-4,2048,gasCCGT,R2,2022,0.80000000000
-4,2049,gasCCGT,R2,2022,0.80000000000
-4,2050,gasCCGT,R2,2022,0.80000000000
-4,2058,gasCCGT,R2,2022,0.80000000000
+4,2024,gasCCGT,R2,2022,1.01590000000
+4,2025,gasCCGT,R2,2022,1.01590000000
+4,2026,gasCCGT,R2,2022,1.01590000000
+4,2030,gasCCGT,R2,2022,1.01590000000
+4,2035,gasCCGT,R2,2022,1.01590000000
+4,2040,gasCCGT,R2,2022,1.01590000000
+4,2045,gasCCGT,R2,2022,1.01590000000
+4,2046,gasCCGT,R2,2022,1.01590000000
+4,2047,gasCCGT,R2,2022,1.01590000000
+4,2050,gasCCGT,R2,2022,1.01590000000
+4,2058,gasCCGT,R2,2022,1.01590000000
 5,2026,gasCCGT,R2,2024,3.20460000000
 5,2030,gasCCGT,R2,2024,3.20460000000
 5,2035,gasCCGT,R2,2024,3.20460000000
@@ -49,8 +43,6 @@ asset,year,technology,region,installed,capacity
 5,2045,gasCCGT,R2,2024,3.20460000000
 5,2046,gasCCGT,R2,2024,3.20460000000
 5,2047,gasCCGT,R2,2024,3.20460000000
-5,2048,gasCCGT,R2,2024,3.20460000000
-5,2049,gasCCGT,R2,2024,3.20460000000
 5,2050,gasCCGT,R2,2024,3.20460000000
 5,2058,gasCCGT,R2,2024,3.20460000000
 5,2059,gasCCGT,R2,2024,3.20460000000
@@ -71,31 +63,11 @@ asset,year,technology,region,installed,capacity
 7,2040,windturbine,R1,2020,8.00000000000
 7,2045,windturbine,R1,2020,8.00000000000
 7,2046,windturbine,R1,2020,8.00000000000
-8,2024,windturbine,R1,2022,0.48590000000
-8,2025,windturbine,R1,2022,0.48590000000
-8,2026,windturbine,R1,2022,0.48590000000
-8,2030,windturbine,R1,2022,0.48590000000
-8,2035,windturbine,R1,2022,0.48590000000
-8,2040,windturbine,R1,2022,0.48590000000
-8,2045,windturbine,R1,2022,0.48590000000
-8,2046,windturbine,R1,2022,0.48590000000
-8,2047,windturbine,R1,2022,0.48590000000
-8,2048,windturbine,R1,2022,0.48590000000
-9,2024,windturbine,R2,2020,12.17990000000
-9,2025,windturbine,R2,2020,12.17990000000
-9,2026,windturbine,R2,2020,12.17990000000
-9,2030,windturbine,R2,2020,12.17990000000
-9,2035,windturbine,R2,2020,12.17990000000
-9,2040,windturbine,R2,2020,12.17990000000
-9,2045,windturbine,R2,2020,12.17990000000
-9,2046,windturbine,R2,2020,12.17990000000
-10,2024,windturbine,R2,2022,0.48590000000
-10,2025,windturbine,R2,2022,0.48590000000
-10,2026,windturbine,R2,2022,0.48590000000
-10,2030,windturbine,R2,2022,0.48590000000
-10,2035,windturbine,R2,2022,0.48590000000
-10,2040,windturbine,R2,2022,0.48590000000
-10,2045,windturbine,R2,2022,0.48590000000
-10,2046,windturbine,R2,2022,0.48590000000
-10,2047,windturbine,R2,2022,0.48590000000
-10,2048,windturbine,R2,2022,0.48590000000
+8,2024,windturbine,R2,2020,12.17990000000
+8,2025,windturbine,R2,2020,12.17990000000
+8,2026,windturbine,R2,2020,12.17990000000
+8,2030,windturbine,R2,2020,12.17990000000
+8,2035,windturbine,R2,2020,12.17990000000
+8,2040,windturbine,R2,2020,12.17990000000
+8,2045,windturbine,R2,2020,12.17990000000
+8,2046,windturbine,R2,2020,12.17990000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 0b9e6c57..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,53 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,3.00000000000
-1,2035,gasCCGT,R1,2025,3.00000000000
-1,2040,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R1,2025,3.00000000000
-1,2049,gasCCGT,R1,2025,3.00000000000
-1,2050,gasCCGT,R1,2025,3.00000000000
-1,2054,gasCCGT,R1,2025,3.00000000000
-1,2055,gasCCGT,R1,2025,3.00000000000
-1,2064,gasCCGT,R1,2025,3.00000000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,3.00000000000
-3,2035,gasCCGT,R2,2025,3.00000000000
-3,2040,gasCCGT,R2,2025,3.00000000000
-3,2045,gasCCGT,R2,2025,3.00000000000
-3,2049,gasCCGT,R2,2025,3.00000000000
-3,2050,gasCCGT,R2,2025,3.00000000000
-3,2054,gasCCGT,R2,2025,3.00000000000
-3,2055,gasCCGT,R2,2025,3.00000000000
-3,2064,gasCCGT,R2,2025,3.00000000000
-4,2025,solarPV,R1,2020,6.75000000000
-4,2030,solarPV,R1,2020,6.75000000000
-4,2035,solarPV,R1,2020,6.75000000000
-4,2040,solarPV,R1,2020,6.75000000000
-4,2045,solarPV,R1,2020,6.75000000000
-4,2049,solarPV,R1,2020,6.75000000000
-5,2030,solarPV,R1,2025,2.40000000000
-5,2035,solarPV,R1,2025,2.40000000000
-5,2040,solarPV,R1,2025,2.40000000000
-5,2045,solarPV,R1,2025,2.40000000000
-5,2049,solarPV,R1,2025,2.40000000000
-5,2050,solarPV,R1,2025,2.40000000000
-5,2054,solarPV,R1,2025,2.40000000000
-6,2030,solarPV,R2,2025,2.40000000000
-6,2035,solarPV,R2,2025,2.40000000000
-6,2040,solarPV,R2,2025,2.40000000000
-6,2045,solarPV,R2,2025,2.40000000000
-6,2049,solarPV,R2,2025,2.40000000000
-6,2050,solarPV,R2,2025,2.40000000000
-6,2054,solarPV,R2,2025,2.40000000000
-7,2025,windturbine,R1,2020,10.00000000000
-7,2030,windturbine,R1,2020,10.00000000000
-7,2035,windturbine,R1,2020,10.00000000000
-7,2040,windturbine,R1,2020,10.00000000000
-7,2045,windturbine,R1,2020,10.00000000000
-7,2049,windturbine,R1,2020,10.00000000000
-8,2025,windturbine,R2,2020,16.75000000000
-8,2030,windturbine,R2,2020,16.75000000000
-8,2035,windturbine,R2,2020,16.75000000000
-8,2040,windturbine,R2,2020,16.75000000000
-8,2045,windturbine,R2,2020,16.75000000000
-8,2049,windturbine,R2,2020,16.75000000000
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 76da3da0..8bd66eba 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
@@ -13,110 +13,80 @@ asset,year,region,installed,technology,capacity
 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
+3,2026,R1,2022,gasCCGT,1.01590000000
+3,2028,R1,2022,gasCCGT,1.01590000000
+3,2030,R1,2022,gasCCGT,1.01590000000
+3,2035,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2026,R1,2024,gasCCGT,3.20460000000
+4,2028,R1,2024,gasCCGT,3.20460000000
+4,2030,R1,2024,gasCCGT,3.20460000000
+4,2035,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2028,R1,2026,gasCCGT,1.01590000000
+5,2030,R1,2026,gasCCGT,1.01590000000
+5,2035,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+7,2026,R2,2020,windturbine,12.17990000000
+7,2028,R2,2020,windturbine,12.17990000000
+7,2030,R2,2020,windturbine,12.17990000000
+7,2035,R2,2020,windturbine,12.17990000000
+7,2040,R2,2020,windturbine,12.17990000000
+7,2045,R2,2020,windturbine,12.17990000000
+7,2046,R2,2020,windturbine,12.17990000000
+8,2026,R2,2022,gasCCGT,1.01590000000
+8,2028,R2,2022,gasCCGT,1.01590000000
+8,2030,R2,2022,gasCCGT,1.01590000000
+8,2035,R2,2022,gasCCGT,1.01590000000
+8,2040,R2,2022,gasCCGT,1.01590000000
+8,2045,R2,2022,gasCCGT,1.01590000000
+8,2046,R2,2022,gasCCGT,1.01590000000
+8,2047,R2,2022,gasCCGT,1.01590000000
+8,2050,R2,2022,gasCCGT,1.01590000000
+8,2058,R2,2022,gasCCGT,1.01590000000
+9,2026,R2,2024,gasCCGT,3.20460000000
+9,2028,R2,2024,gasCCGT,3.20460000000
+9,2030,R2,2024,gasCCGT,3.20460000000
+9,2035,R2,2024,gasCCGT,3.20460000000
+9,2040,R2,2024,gasCCGT,3.20460000000
+9,2045,R2,2024,gasCCGT,3.20460000000
+9,2046,R2,2024,gasCCGT,3.20460000000
+9,2047,R2,2024,gasCCGT,3.20460000000
+9,2050,R2,2024,gasCCGT,3.20460000000
+9,2058,R2,2024,gasCCGT,3.20460000000
+9,2059,R2,2024,gasCCGT,3.20460000000
+9,2060,R2,2024,gasCCGT,3.20460000000
+10,2028,R2,2026,gasCCGT,1.01590000000
+10,2030,R2,2026,gasCCGT,1.01590000000
+10,2035,R2,2026,gasCCGT,1.01590000000
+10,2040,R2,2026,gasCCGT,1.01590000000
+10,2045,R2,2026,gasCCGT,1.01590000000
+10,2046,R2,2026,gasCCGT,1.01590000000
+10,2047,R2,2026,gasCCGT,1.01590000000
+10,2050,R2,2026,gasCCGT,1.01590000000
+10,2058,R2,2026,gasCCGT,1.01590000000
+10,2059,R2,2026,gasCCGT,1.01590000000
+10,2060,R2,2026,gasCCGT,1.01590000000
+10,2061,R2,2026,gasCCGT,1.01590000000
+10,2062,R2,2026,gasCCGT,1.01590000000
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 9bcf9d75..40fac75b 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
@@ -11,135 +11,103 @@ asset,year,region,installed,technology,capacity
 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
+3,2028,R1,2022,gasCCGT,1.01590000000
+3,2030,R1,2022,gasCCGT,1.01590000000
+3,2035,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2028,R1,2024,gasCCGT,3.20460000000
+4,2030,R1,2024,gasCCGT,3.20460000000
+4,2035,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2028,R1,2026,gasCCGT,1.01590000000
+5,2030,R1,2026,gasCCGT,1.01590000000
+5,2035,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2030,R1,2028,gasCCGT,1.01590000000
+6,2035,R1,2028,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+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,2028,R2,2022,gasCCGT,1.01590000000
+9,2030,R2,2022,gasCCGT,1.01590000000
+9,2035,R2,2022,gasCCGT,1.01590000000
+9,2040,R2,2022,gasCCGT,1.01590000000
+9,2045,R2,2022,gasCCGT,1.01590000000
+9,2046,R2,2022,gasCCGT,1.01590000000
+9,2047,R2,2022,gasCCGT,1.01590000000
+9,2050,R2,2022,gasCCGT,1.01590000000
+9,2058,R2,2022,gasCCGT,1.01590000000
+10,2028,R2,2024,gasCCGT,3.20460000000
+10,2030,R2,2024,gasCCGT,3.20460000000
+10,2035,R2,2024,gasCCGT,3.20460000000
+10,2040,R2,2024,gasCCGT,3.20460000000
+10,2045,R2,2024,gasCCGT,3.20460000000
+10,2046,R2,2024,gasCCGT,3.20460000000
+10,2047,R2,2024,gasCCGT,3.20460000000
+10,2050,R2,2024,gasCCGT,3.20460000000
+10,2058,R2,2024,gasCCGT,3.20460000000
+10,2059,R2,2024,gasCCGT,3.20460000000
+10,2060,R2,2024,gasCCGT,3.20460000000
+11,2028,R2,2026,gasCCGT,1.01590000000
+11,2030,R2,2026,gasCCGT,1.01590000000
+11,2035,R2,2026,gasCCGT,1.01590000000
+11,2040,R2,2026,gasCCGT,1.01590000000
+11,2045,R2,2026,gasCCGT,1.01590000000
+11,2046,R2,2026,gasCCGT,1.01590000000
+11,2047,R2,2026,gasCCGT,1.01590000000
+11,2050,R2,2026,gasCCGT,1.01590000000
+11,2058,R2,2026,gasCCGT,1.01590000000
+11,2059,R2,2026,gasCCGT,1.01590000000
+11,2060,R2,2026,gasCCGT,1.01590000000
+11,2061,R2,2026,gasCCGT,1.01590000000
+11,2062,R2,2026,gasCCGT,1.01590000000
+12,2030,R2,2028,gasCCGT,1.01590000000
+12,2035,R2,2028,gasCCGT,1.01590000000
+12,2040,R2,2028,gasCCGT,1.01590000000
+12,2045,R2,2028,gasCCGT,1.01590000000
+12,2046,R2,2028,gasCCGT,1.01590000000
+12,2047,R2,2028,gasCCGT,1.01590000000
+12,2050,R2,2028,gasCCGT,1.01590000000
+12,2058,R2,2028,gasCCGT,1.01590000000
+12,2059,R2,2028,gasCCGT,1.01590000000
+12,2060,R2,2028,gasCCGT,1.01590000000
+12,2061,R2,2028,gasCCGT,1.01590000000
+12,2062,R2,2028,gasCCGT,1.01590000000
+12,2063,R2,2028,gasCCGT,1.01590000000
+12,2064,R2,2028,gasCCGT,1.01590000000
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 90db9e92..b511c748 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
@@ -11,173 +11,137 @@ asset,year,region,installed,technology,capacity
 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
+3,2030,R1,2022,gasCCGT,1.01590000000
+3,2032,R1,2022,gasCCGT,1.01590000000
+3,2035,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2030,R1,2024,gasCCGT,3.20460000000
+4,2032,R1,2024,gasCCGT,3.20460000000
+4,2035,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2030,R1,2026,gasCCGT,1.01590000000
+5,2032,R1,2026,gasCCGT,1.01590000000
+5,2035,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2030,R1,2028,gasCCGT,1.01590000000
+6,2032,R1,2028,gasCCGT,1.01590000000
+6,2035,R1,2028,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+7,2032,R1,2030,gasCCGT,1.01590000000
+7,2035,R1,2030,gasCCGT,1.01590000000
+7,2040,R1,2030,gasCCGT,1.01590000000
+7,2045,R1,2030,gasCCGT,1.01590000000
+7,2046,R1,2030,gasCCGT,1.01590000000
+7,2047,R1,2030,gasCCGT,1.01590000000
+7,2050,R1,2030,gasCCGT,1.01590000000
+7,2058,R1,2030,gasCCGT,1.01590000000
+7,2059,R1,2030,gasCCGT,1.01590000000
+7,2060,R1,2030,gasCCGT,1.01590000000
+7,2061,R1,2030,gasCCGT,1.01590000000
+7,2062,R1,2030,gasCCGT,1.01590000000
+7,2063,R1,2030,gasCCGT,1.01590000000
+7,2064,R1,2030,gasCCGT,1.01590000000
+7,2065,R1,2030,gasCCGT,1.01590000000
+7,2066,R1,2030,gasCCGT,1.01590000000
+9,2030,R2,2020,windturbine,12.17990000000
+9,2032,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,2030,R2,2022,gasCCGT,1.01590000000
+10,2032,R2,2022,gasCCGT,1.01590000000
+10,2035,R2,2022,gasCCGT,1.01590000000
+10,2040,R2,2022,gasCCGT,1.01590000000
+10,2045,R2,2022,gasCCGT,1.01590000000
+10,2046,R2,2022,gasCCGT,1.01590000000
+10,2047,R2,2022,gasCCGT,1.01590000000
+10,2050,R2,2022,gasCCGT,1.01590000000
+10,2058,R2,2022,gasCCGT,1.01590000000
+11,2030,R2,2024,gasCCGT,3.20460000000
+11,2032,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,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,2030,R2,2026,gasCCGT,1.01590000000
+12,2032,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,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
+13,2030,R2,2028,gasCCGT,1.01590000000
+13,2032,R2,2028,gasCCGT,1.01590000000
+13,2035,R2,2028,gasCCGT,1.01590000000
+13,2040,R2,2028,gasCCGT,1.01590000000
+13,2045,R2,2028,gasCCGT,1.01590000000
+13,2046,R2,2028,gasCCGT,1.01590000000
+13,2047,R2,2028,gasCCGT,1.01590000000
+13,2050,R2,2028,gasCCGT,1.01590000000
+13,2058,R2,2028,gasCCGT,1.01590000000
+13,2059,R2,2028,gasCCGT,1.01590000000
+13,2060,R2,2028,gasCCGT,1.01590000000
+13,2061,R2,2028,gasCCGT,1.01590000000
+13,2062,R2,2028,gasCCGT,1.01590000000
+13,2063,R2,2028,gasCCGT,1.01590000000
+13,2064,R2,2028,gasCCGT,1.01590000000
+14,2032,R2,2030,gasCCGT,1.01590000000
+14,2035,R2,2030,gasCCGT,1.01590000000
+14,2040,R2,2030,gasCCGT,1.01590000000
+14,2045,R2,2030,gasCCGT,1.01590000000
+14,2046,R2,2030,gasCCGT,1.01590000000
+14,2047,R2,2030,gasCCGT,1.01590000000
+14,2050,R2,2030,gasCCGT,1.01590000000
+14,2058,R2,2030,gasCCGT,1.01590000000
+14,2059,R2,2030,gasCCGT,1.01590000000
+14,2060,R2,2030,gasCCGT,1.01590000000
+14,2061,R2,2030,gasCCGT,1.01590000000
+14,2062,R2,2030,gasCCGT,1.01590000000
+14,2063,R2,2030,gasCCGT,1.01590000000
+14,2064,R2,2030,gasCCGT,1.01590000000
+14,2065,R2,2030,gasCCGT,1.01590000000
+14,2066,R2,2030,gasCCGT,1.01590000000
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 8700e017..dd28bb6c 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
@@ -11,195 +11,155 @@ asset,year,region,installed,technology,capacity
 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
+3,2032,R1,2022,gasCCGT,1.01590000000
+3,2034,R1,2022,gasCCGT,1.01590000000
+3,2035,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2032,R1,2024,gasCCGT,3.20460000000
+4,2034,R1,2024,gasCCGT,3.20460000000
+4,2035,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2032,R1,2026,gasCCGT,1.01590000000
+5,2034,R1,2026,gasCCGT,1.01590000000
+5,2035,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2032,R1,2028,gasCCGT,1.01590000000
+6,2034,R1,2028,gasCCGT,1.01590000000
+6,2035,R1,2028,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+7,2032,R1,2030,gasCCGT,1.01590000000
+7,2034,R1,2030,gasCCGT,1.01590000000
+7,2035,R1,2030,gasCCGT,1.01590000000
+7,2040,R1,2030,gasCCGT,1.01590000000
+7,2045,R1,2030,gasCCGT,1.01590000000
+7,2046,R1,2030,gasCCGT,1.01590000000
+7,2047,R1,2030,gasCCGT,1.01590000000
+7,2050,R1,2030,gasCCGT,1.01590000000
+7,2058,R1,2030,gasCCGT,1.01590000000
+7,2059,R1,2030,gasCCGT,1.01590000000
+7,2060,R1,2030,gasCCGT,1.01590000000
+7,2061,R1,2030,gasCCGT,1.01590000000
+7,2062,R1,2030,gasCCGT,1.01590000000
+7,2063,R1,2030,gasCCGT,1.01590000000
+7,2064,R1,2030,gasCCGT,1.01590000000
+7,2065,R1,2030,gasCCGT,1.01590000000
+7,2066,R1,2030,gasCCGT,1.01590000000
+8,2034,R1,2032,solarPV,2.28590000000
+8,2035,R1,2032,solarPV,2.28590000000
+8,2040,R1,2032,solarPV,2.28590000000
+8,2045,R1,2032,solarPV,2.28590000000
+8,2046,R1,2032,solarPV,2.28590000000
+8,2047,R1,2032,solarPV,2.28590000000
+8,2050,R1,2032,solarPV,2.28590000000
+8,2058,R1,2032,solarPV,2.28590000000
+10,2032,R2,2020,windturbine,12.17990000000
+10,2034,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,2032,R2,2022,gasCCGT,1.01590000000
+11,2034,R2,2022,gasCCGT,1.01590000000
+11,2035,R2,2022,gasCCGT,1.01590000000
+11,2040,R2,2022,gasCCGT,1.01590000000
+11,2045,R2,2022,gasCCGT,1.01590000000
+11,2046,R2,2022,gasCCGT,1.01590000000
+11,2047,R2,2022,gasCCGT,1.01590000000
+11,2050,R2,2022,gasCCGT,1.01590000000
+11,2058,R2,2022,gasCCGT,1.01590000000
+12,2032,R2,2024,gasCCGT,3.20460000000
+12,2034,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,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,2032,R2,2026,gasCCGT,1.01590000000
+13,2034,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,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,2032,R2,2028,gasCCGT,1.01590000000
+14,2034,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,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
+15,2032,R2,2030,gasCCGT,1.01590000000
+15,2034,R2,2030,gasCCGT,1.01590000000
+15,2035,R2,2030,gasCCGT,1.01590000000
+15,2040,R2,2030,gasCCGT,1.01590000000
+15,2045,R2,2030,gasCCGT,1.01590000000
+15,2046,R2,2030,gasCCGT,1.01590000000
+15,2047,R2,2030,gasCCGT,1.01590000000
+15,2050,R2,2030,gasCCGT,1.01590000000
+15,2058,R2,2030,gasCCGT,1.01590000000
+15,2059,R2,2030,gasCCGT,1.01590000000
+15,2060,R2,2030,gasCCGT,1.01590000000
+15,2061,R2,2030,gasCCGT,1.01590000000
+15,2062,R2,2030,gasCCGT,1.01590000000
+15,2063,R2,2030,gasCCGT,1.01590000000
+15,2064,R2,2030,gasCCGT,1.01590000000
+15,2065,R2,2030,gasCCGT,1.01590000000
+15,2066,R2,2030,gasCCGT,1.01590000000
+16,2034,R2,2032,solarPV,2.28590000000
+16,2035,R2,2032,solarPV,2.28590000000
+16,2040,R2,2032,solarPV,2.28590000000
+16,2045,R2,2032,solarPV,2.28590000000
+16,2046,R2,2032,solarPV,2.28590000000
+16,2047,R2,2032,solarPV,2.28590000000
+16,2050,R2,2032,solarPV,2.28590000000
+16,2058,R2,2032,solarPV,2.28590000000
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 f5d513a8..ffb72e8c 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
@@ -11,230 +11,175 @@ asset,year,region,installed,technology,capacity
 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
+3,2034,R1,2022,gasCCGT,1.01590000000
+3,2035,R1,2022,gasCCGT,1.01590000000
+3,2036,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2034,R1,2024,gasCCGT,3.20460000000
+4,2035,R1,2024,gasCCGT,3.20460000000
+4,2036,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2034,R1,2026,gasCCGT,1.01590000000
+5,2035,R1,2026,gasCCGT,1.01590000000
+5,2036,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2034,R1,2028,gasCCGT,1.01590000000
+6,2035,R1,2028,gasCCGT,1.01590000000
+6,2036,R1,2028,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+7,2034,R1,2030,gasCCGT,1.01590000000
+7,2035,R1,2030,gasCCGT,1.01590000000
+7,2036,R1,2030,gasCCGT,1.01590000000
+7,2040,R1,2030,gasCCGT,1.01590000000
+7,2045,R1,2030,gasCCGT,1.01590000000
+7,2046,R1,2030,gasCCGT,1.01590000000
+7,2047,R1,2030,gasCCGT,1.01590000000
+7,2050,R1,2030,gasCCGT,1.01590000000
+7,2058,R1,2030,gasCCGT,1.01590000000
+7,2059,R1,2030,gasCCGT,1.01590000000
+7,2060,R1,2030,gasCCGT,1.01590000000
+7,2061,R1,2030,gasCCGT,1.01590000000
+7,2062,R1,2030,gasCCGT,1.01590000000
+7,2063,R1,2030,gasCCGT,1.01590000000
+7,2064,R1,2030,gasCCGT,1.01590000000
+7,2065,R1,2030,gasCCGT,1.01590000000
+7,2066,R1,2030,gasCCGT,1.01590000000
+8,2034,R1,2032,solarPV,2.28590000000
+8,2035,R1,2032,solarPV,2.28590000000
+8,2036,R1,2032,solarPV,2.28590000000
+8,2040,R1,2032,solarPV,2.28590000000
+8,2045,R1,2032,solarPV,2.28590000000
+8,2046,R1,2032,solarPV,2.28590000000
+8,2047,R1,2032,solarPV,2.28590000000
+8,2050,R1,2032,solarPV,2.28590000000
+8,2058,R1,2032,solarPV,2.28590000000
+9,2036,R1,2034,solarPV,4.61130000000
+9,2040,R1,2034,solarPV,4.61130000000
+9,2045,R1,2034,solarPV,4.61130000000
+9,2046,R1,2034,solarPV,4.61130000000
+9,2047,R1,2034,solarPV,4.61130000000
+9,2050,R1,2034,solarPV,4.61130000000
+9,2058,R1,2034,solarPV,4.61130000000
+9,2059,R1,2034,solarPV,4.61130000000
+9,2060,R1,2034,solarPV,4.61130000000
+11,2034,R2,2020,windturbine,12.17990000000
+11,2035,R2,2020,windturbine,12.17990000000
+11,2036,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,2034,R2,2022,gasCCGT,1.01590000000
+12,2035,R2,2022,gasCCGT,1.01590000000
+12,2036,R2,2022,gasCCGT,1.01590000000
+12,2040,R2,2022,gasCCGT,1.01590000000
+12,2045,R2,2022,gasCCGT,1.01590000000
+12,2046,R2,2022,gasCCGT,1.01590000000
+12,2047,R2,2022,gasCCGT,1.01590000000
+12,2050,R2,2022,gasCCGT,1.01590000000
+12,2058,R2,2022,gasCCGT,1.01590000000
+13,2034,R2,2024,gasCCGT,3.20460000000
+13,2035,R2,2024,gasCCGT,3.20460000000
+13,2036,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,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,2034,R2,2026,gasCCGT,1.01590000000
+14,2035,R2,2026,gasCCGT,1.01590000000
+14,2036,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,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,2034,R2,2028,gasCCGT,1.01590000000
+15,2035,R2,2028,gasCCGT,1.01590000000
+15,2036,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,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,2034,R2,2030,gasCCGT,1.01590000000
+16,2035,R2,2030,gasCCGT,1.01590000000
+16,2036,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,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
+17,2034,R2,2032,solarPV,2.28590000000
+17,2035,R2,2032,solarPV,2.28590000000
+17,2036,R2,2032,solarPV,2.28590000000
+17,2040,R2,2032,solarPV,2.28590000000
+17,2045,R2,2032,solarPV,2.28590000000
+17,2046,R2,2032,solarPV,2.28590000000
+17,2047,R2,2032,solarPV,2.28590000000
+17,2050,R2,2032,solarPV,2.28590000000
+17,2058,R2,2032,solarPV,2.28590000000
+18,2036,R2,2034,solarPV,4.61130000000
+18,2040,R2,2034,solarPV,4.61130000000
+18,2045,R2,2034,solarPV,4.61130000000
+18,2046,R2,2034,solarPV,4.61130000000
+18,2047,R2,2034,solarPV,4.61130000000
+18,2050,R2,2034,solarPV,4.61130000000
+18,2058,R2,2034,solarPV,4.61130000000
+18,2059,R2,2034,solarPV,4.61130000000
+18,2060,R2,2034,solarPV,4.61130000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
deleted file mode 100644
index bc71a6d4..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,105 +0,0 @@
-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
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 911983cc..98a0880c 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
@@ -9,244 +9,186 @@ asset,year,region,installed,technology,capacity
 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
+3,2036,R1,2022,gasCCGT,1.01590000000
+3,2038,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2036,R1,2024,gasCCGT,3.20460000000
+4,2038,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2036,R1,2026,gasCCGT,1.01590000000
+5,2038,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2036,R1,2028,gasCCGT,1.01590000000
+6,2038,R1,2028,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+7,2036,R1,2030,gasCCGT,1.01590000000
+7,2038,R1,2030,gasCCGT,1.01590000000
+7,2040,R1,2030,gasCCGT,1.01590000000
+7,2045,R1,2030,gasCCGT,1.01590000000
+7,2046,R1,2030,gasCCGT,1.01590000000
+7,2047,R1,2030,gasCCGT,1.01590000000
+7,2050,R1,2030,gasCCGT,1.01590000000
+7,2058,R1,2030,gasCCGT,1.01590000000
+7,2059,R1,2030,gasCCGT,1.01590000000
+7,2060,R1,2030,gasCCGT,1.01590000000
+7,2061,R1,2030,gasCCGT,1.01590000000
+7,2062,R1,2030,gasCCGT,1.01590000000
+7,2063,R1,2030,gasCCGT,1.01590000000
+7,2064,R1,2030,gasCCGT,1.01590000000
+7,2065,R1,2030,gasCCGT,1.01590000000
+7,2066,R1,2030,gasCCGT,1.01590000000
+8,2036,R1,2032,solarPV,2.28590000000
+8,2038,R1,2032,solarPV,2.28590000000
+8,2040,R1,2032,solarPV,2.28590000000
+8,2045,R1,2032,solarPV,2.28590000000
+8,2046,R1,2032,solarPV,2.28590000000
+8,2047,R1,2032,solarPV,2.28590000000
+8,2050,R1,2032,solarPV,2.28590000000
+8,2058,R1,2032,solarPV,2.28590000000
+9,2036,R1,2034,solarPV,4.61130000000
+9,2038,R1,2034,solarPV,4.61130000000
+9,2040,R1,2034,solarPV,4.61130000000
+9,2045,R1,2034,solarPV,4.61130000000
+9,2046,R1,2034,solarPV,4.61130000000
+9,2047,R1,2034,solarPV,4.61130000000
+9,2050,R1,2034,solarPV,4.61130000000
+9,2058,R1,2034,solarPV,4.61130000000
+9,2059,R1,2034,solarPV,4.61130000000
+9,2060,R1,2034,solarPV,4.61130000000
+10,2038,R1,2036,solarPV,2.28590000000
+10,2040,R1,2036,solarPV,2.28590000000
+10,2045,R1,2036,solarPV,2.28590000000
+10,2046,R1,2036,solarPV,2.28590000000
+10,2047,R1,2036,solarPV,2.28590000000
+10,2050,R1,2036,solarPV,2.28590000000
+10,2058,R1,2036,solarPV,2.28590000000
+10,2059,R1,2036,solarPV,2.28590000000
+10,2060,R1,2036,solarPV,2.28590000000
+10,2061,R1,2036,solarPV,2.28590000000
+10,2062,R1,2036,solarPV,2.28590000000
+12,2036,R2,2020,windturbine,12.17990000000
+12,2038,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,2036,R2,2022,gasCCGT,1.01590000000
+13,2038,R2,2022,gasCCGT,1.01590000000
+13,2040,R2,2022,gasCCGT,1.01590000000
+13,2045,R2,2022,gasCCGT,1.01590000000
+13,2046,R2,2022,gasCCGT,1.01590000000
+13,2047,R2,2022,gasCCGT,1.01590000000
+13,2050,R2,2022,gasCCGT,1.01590000000
+13,2058,R2,2022,gasCCGT,1.01590000000
+14,2036,R2,2024,gasCCGT,3.20460000000
+14,2038,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,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,2036,R2,2026,gasCCGT,1.01590000000
+15,2038,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,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,2036,R2,2028,gasCCGT,1.01590000000
+16,2038,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,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,2036,R2,2030,gasCCGT,1.01590000000
+17,2038,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,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,2036,R2,2032,solarPV,2.28590000000
+18,2038,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,2050,R2,2032,solarPV,2.28590000000
+18,2058,R2,2032,solarPV,2.28590000000
+19,2036,R2,2034,solarPV,4.61130000000
+19,2038,R2,2034,solarPV,4.61130000000
+19,2040,R2,2034,solarPV,4.61130000000
+19,2045,R2,2034,solarPV,4.61130000000
+19,2046,R2,2034,solarPV,4.61130000000
+19,2047,R2,2034,solarPV,4.61130000000
+19,2050,R2,2034,solarPV,4.61130000000
+19,2058,R2,2034,solarPV,4.61130000000
+19,2059,R2,2034,solarPV,4.61130000000
+19,2060,R2,2034,solarPV,4.61130000000
+20,2038,R2,2036,solarPV,2.28590000000
+20,2040,R2,2036,solarPV,2.28590000000
+20,2045,R2,2036,solarPV,2.28590000000
+20,2046,R2,2036,solarPV,2.28590000000
+20,2047,R2,2036,solarPV,2.28590000000
+20,2050,R2,2036,solarPV,2.28590000000
+20,2058,R2,2036,solarPV,2.28590000000
+20,2059,R2,2036,solarPV,2.28590000000
+20,2060,R2,2036,solarPV,2.28590000000
+20,2061,R2,2036,solarPV,2.28590000000
+20,2062,R2,2036,solarPV,2.28590000000
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 06e4c47c..93fcb37f 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
@@ -7,254 +7,195 @@ asset,year,region,installed,technology,capacity
 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
+3,2038,R1,2022,gasCCGT,1.01590000000
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2038,R1,2024,gasCCGT,3.20460000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2038,R1,2026,gasCCGT,1.01590000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2038,R1,2028,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+7,2038,R1,2030,gasCCGT,1.01590000000
+7,2040,R1,2030,gasCCGT,1.01590000000
+7,2045,R1,2030,gasCCGT,1.01590000000
+7,2046,R1,2030,gasCCGT,1.01590000000
+7,2047,R1,2030,gasCCGT,1.01590000000
+7,2050,R1,2030,gasCCGT,1.01590000000
+7,2058,R1,2030,gasCCGT,1.01590000000
+7,2059,R1,2030,gasCCGT,1.01590000000
+7,2060,R1,2030,gasCCGT,1.01590000000
+7,2061,R1,2030,gasCCGT,1.01590000000
+7,2062,R1,2030,gasCCGT,1.01590000000
+7,2063,R1,2030,gasCCGT,1.01590000000
+7,2064,R1,2030,gasCCGT,1.01590000000
+7,2065,R1,2030,gasCCGT,1.01590000000
+7,2066,R1,2030,gasCCGT,1.01590000000
+8,2038,R1,2032,solarPV,2.28590000000
+8,2040,R1,2032,solarPV,2.28590000000
+8,2045,R1,2032,solarPV,2.28590000000
+8,2046,R1,2032,solarPV,2.28590000000
+8,2047,R1,2032,solarPV,2.28590000000
+8,2050,R1,2032,solarPV,2.28590000000
+8,2058,R1,2032,solarPV,2.28590000000
+9,2038,R1,2034,solarPV,4.61130000000
+9,2040,R1,2034,solarPV,4.61130000000
+9,2045,R1,2034,solarPV,4.61130000000
+9,2046,R1,2034,solarPV,4.61130000000
+9,2047,R1,2034,solarPV,4.61130000000
+9,2050,R1,2034,solarPV,4.61130000000
+9,2058,R1,2034,solarPV,4.61130000000
+9,2059,R1,2034,solarPV,4.61130000000
+9,2060,R1,2034,solarPV,4.61130000000
+10,2038,R1,2036,solarPV,2.28590000000
+10,2040,R1,2036,solarPV,2.28590000000
+10,2045,R1,2036,solarPV,2.28590000000
+10,2046,R1,2036,solarPV,2.28590000000
+10,2047,R1,2036,solarPV,2.28590000000
+10,2050,R1,2036,solarPV,2.28590000000
+10,2058,R1,2036,solarPV,2.28590000000
+10,2059,R1,2036,solarPV,2.28590000000
+10,2060,R1,2036,solarPV,2.28590000000
+10,2061,R1,2036,solarPV,2.28590000000
+10,2062,R1,2036,solarPV,2.28590000000
+11,2040,R1,2038,solarPV,2.28590000000
+11,2045,R1,2038,solarPV,2.28590000000
+11,2046,R1,2038,solarPV,2.28590000000
+11,2047,R1,2038,solarPV,2.28590000000
+11,2050,R1,2038,solarPV,2.28590000000
+11,2058,R1,2038,solarPV,2.28590000000
+11,2059,R1,2038,solarPV,2.28590000000
+11,2060,R1,2038,solarPV,2.28590000000
+11,2061,R1,2038,solarPV,2.28590000000
+11,2062,R1,2038,solarPV,2.28590000000
+11,2063,R1,2038,solarPV,2.28590000000
+11,2064,R1,2038,solarPV,2.28590000000
+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,2038,R2,2022,gasCCGT,1.01590000000
+14,2040,R2,2022,gasCCGT,1.01590000000
+14,2045,R2,2022,gasCCGT,1.01590000000
+14,2046,R2,2022,gasCCGT,1.01590000000
+14,2047,R2,2022,gasCCGT,1.01590000000
+14,2050,R2,2022,gasCCGT,1.01590000000
+14,2058,R2,2022,gasCCGT,1.01590000000
+15,2038,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,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,2038,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,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,2038,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,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,2038,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,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,2038,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,2050,R2,2032,solarPV,2.28590000000
+19,2058,R2,2032,solarPV,2.28590000000
+20,2038,R2,2034,solarPV,4.61130000000
+20,2040,R2,2034,solarPV,4.61130000000
+20,2045,R2,2034,solarPV,4.61130000000
+20,2046,R2,2034,solarPV,4.61130000000
+20,2047,R2,2034,solarPV,4.61130000000
+20,2050,R2,2034,solarPV,4.61130000000
+20,2058,R2,2034,solarPV,4.61130000000
+20,2059,R2,2034,solarPV,4.61130000000
+20,2060,R2,2034,solarPV,4.61130000000
+21,2038,R2,2036,solarPV,2.28590000000
+21,2040,R2,2036,solarPV,2.28590000000
+21,2045,R2,2036,solarPV,2.28590000000
+21,2046,R2,2036,solarPV,2.28590000000
+21,2047,R2,2036,solarPV,2.28590000000
+21,2050,R2,2036,solarPV,2.28590000000
+21,2058,R2,2036,solarPV,2.28590000000
+21,2059,R2,2036,solarPV,2.28590000000
+21,2060,R2,2036,solarPV,2.28590000000
+21,2061,R2,2036,solarPV,2.28590000000
+21,2062,R2,2036,solarPV,2.28590000000
+22,2040,R2,2038,solarPV,2.28590000000
+22,2045,R2,2038,solarPV,2.28590000000
+22,2046,R2,2038,solarPV,2.28590000000
+22,2047,R2,2038,solarPV,2.28590000000
+22,2050,R2,2038,solarPV,2.28590000000
+22,2058,R2,2038,solarPV,2.28590000000
+22,2059,R2,2038,solarPV,2.28590000000
+22,2060,R2,2038,solarPV,2.28590000000
+22,2061,R2,2038,solarPV,2.28590000000
+22,2062,R2,2038,solarPV,2.28590000000
+22,2063,R2,2038,solarPV,2.28590000000
+22,2064,R2,2038,solarPV,2.28590000000
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 0ee948ae..b2767af2 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
@@ -7,288 +7,225 @@ asset,year,region,installed,technology,capacity
 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
+3,2040,R1,2022,gasCCGT,1.01590000000
+3,2042,R1,2022,gasCCGT,1.01590000000
+3,2045,R1,2022,gasCCGT,1.01590000000
+3,2046,R1,2022,gasCCGT,1.01590000000
+3,2047,R1,2022,gasCCGT,1.01590000000
+3,2050,R1,2022,gasCCGT,1.01590000000
+3,2058,R1,2022,gasCCGT,1.01590000000
+4,2040,R1,2024,gasCCGT,3.20460000000
+4,2042,R1,2024,gasCCGT,3.20460000000
+4,2045,R1,2024,gasCCGT,3.20460000000
+4,2046,R1,2024,gasCCGT,3.20460000000
+4,2047,R1,2024,gasCCGT,3.20460000000
+4,2050,R1,2024,gasCCGT,3.20460000000
+4,2058,R1,2024,gasCCGT,3.20460000000
+4,2059,R1,2024,gasCCGT,3.20460000000
+4,2060,R1,2024,gasCCGT,3.20460000000
+5,2040,R1,2026,gasCCGT,1.01590000000
+5,2042,R1,2026,gasCCGT,1.01590000000
+5,2045,R1,2026,gasCCGT,1.01590000000
+5,2046,R1,2026,gasCCGT,1.01590000000
+5,2047,R1,2026,gasCCGT,1.01590000000
+5,2050,R1,2026,gasCCGT,1.01590000000
+5,2058,R1,2026,gasCCGT,1.01590000000
+5,2059,R1,2026,gasCCGT,1.01590000000
+5,2060,R1,2026,gasCCGT,1.01590000000
+5,2061,R1,2026,gasCCGT,1.01590000000
+5,2062,R1,2026,gasCCGT,1.01590000000
+6,2040,R1,2028,gasCCGT,1.01590000000
+6,2042,R1,2028,gasCCGT,1.01590000000
+6,2045,R1,2028,gasCCGT,1.01590000000
+6,2046,R1,2028,gasCCGT,1.01590000000
+6,2047,R1,2028,gasCCGT,1.01590000000
+6,2050,R1,2028,gasCCGT,1.01590000000
+6,2058,R1,2028,gasCCGT,1.01590000000
+6,2059,R1,2028,gasCCGT,1.01590000000
+6,2060,R1,2028,gasCCGT,1.01590000000
+6,2061,R1,2028,gasCCGT,1.01590000000
+6,2062,R1,2028,gasCCGT,1.01590000000
+6,2063,R1,2028,gasCCGT,1.01590000000
+6,2064,R1,2028,gasCCGT,1.01590000000
+7,2040,R1,2030,gasCCGT,1.01590000000
+7,2042,R1,2030,gasCCGT,1.01590000000
+7,2045,R1,2030,gasCCGT,1.01590000000
+7,2046,R1,2030,gasCCGT,1.01590000000
+7,2047,R1,2030,gasCCGT,1.01590000000
+7,2050,R1,2030,gasCCGT,1.01590000000
+7,2058,R1,2030,gasCCGT,1.01590000000
+7,2059,R1,2030,gasCCGT,1.01590000000
+7,2060,R1,2030,gasCCGT,1.01590000000
+7,2061,R1,2030,gasCCGT,1.01590000000
+7,2062,R1,2030,gasCCGT,1.01590000000
+7,2063,R1,2030,gasCCGT,1.01590000000
+7,2064,R1,2030,gasCCGT,1.01590000000
+7,2065,R1,2030,gasCCGT,1.01590000000
+7,2066,R1,2030,gasCCGT,1.01590000000
+8,2040,R1,2032,solarPV,2.28590000000
+8,2042,R1,2032,solarPV,2.28590000000
+8,2045,R1,2032,solarPV,2.28590000000
+8,2046,R1,2032,solarPV,2.28590000000
+8,2047,R1,2032,solarPV,2.28590000000
+8,2050,R1,2032,solarPV,2.28590000000
+8,2058,R1,2032,solarPV,2.28590000000
+9,2040,R1,2034,solarPV,4.61130000000
+9,2042,R1,2034,solarPV,4.61130000000
+9,2045,R1,2034,solarPV,4.61130000000
+9,2046,R1,2034,solarPV,4.61130000000
+9,2047,R1,2034,solarPV,4.61130000000
+9,2050,R1,2034,solarPV,4.61130000000
+9,2058,R1,2034,solarPV,4.61130000000
+9,2059,R1,2034,solarPV,4.61130000000
+9,2060,R1,2034,solarPV,4.61130000000
+10,2040,R1,2036,solarPV,2.28590000000
+10,2042,R1,2036,solarPV,2.28590000000
+10,2045,R1,2036,solarPV,2.28590000000
+10,2046,R1,2036,solarPV,2.28590000000
+10,2047,R1,2036,solarPV,2.28590000000
+10,2050,R1,2036,solarPV,2.28590000000
+10,2058,R1,2036,solarPV,2.28590000000
+10,2059,R1,2036,solarPV,2.28590000000
+10,2060,R1,2036,solarPV,2.28590000000
+10,2061,R1,2036,solarPV,2.28590000000
+10,2062,R1,2036,solarPV,2.28590000000
+11,2040,R1,2038,solarPV,2.28590000000
+11,2042,R1,2038,solarPV,2.28590000000
+11,2045,R1,2038,solarPV,2.28590000000
+11,2046,R1,2038,solarPV,2.28590000000
+11,2047,R1,2038,solarPV,2.28590000000
+11,2050,R1,2038,solarPV,2.28590000000
+11,2058,R1,2038,solarPV,2.28590000000
+11,2059,R1,2038,solarPV,2.28590000000
+11,2060,R1,2038,solarPV,2.28590000000
+11,2061,R1,2038,solarPV,2.28590000000
+11,2062,R1,2038,solarPV,2.28590000000
+11,2063,R1,2038,solarPV,2.28590000000
+11,2064,R1,2038,solarPV,2.28590000000
+12,2042,R1,2040,solarPV,2.28590000000
+12,2045,R1,2040,solarPV,2.28590000000
+12,2046,R1,2040,solarPV,2.28590000000
+12,2047,R1,2040,solarPV,2.28590000000
+12,2050,R1,2040,solarPV,2.28590000000
+12,2058,R1,2040,solarPV,2.28590000000
+12,2059,R1,2040,solarPV,2.28590000000
+12,2060,R1,2040,solarPV,2.28590000000
+12,2061,R1,2040,solarPV,2.28590000000
+12,2062,R1,2040,solarPV,2.28590000000
+12,2063,R1,2040,solarPV,2.28590000000
+12,2064,R1,2040,solarPV,2.28590000000
+12,2065,R1,2040,solarPV,2.28590000000
+12,2066,R1,2040,solarPV,2.28590000000
+14,2040,R2,2020,windturbine,12.17990000000
+14,2042,R2,2020,windturbine,12.17990000000
+14,2045,R2,2020,windturbine,12.17990000000
+14,2046,R2,2020,windturbine,12.17990000000
+15,2040,R2,2022,gasCCGT,1.01590000000
+15,2042,R2,2022,gasCCGT,1.01590000000
+15,2045,R2,2022,gasCCGT,1.01590000000
+15,2046,R2,2022,gasCCGT,1.01590000000
+15,2047,R2,2022,gasCCGT,1.01590000000
+15,2050,R2,2022,gasCCGT,1.01590000000
+15,2058,R2,2022,gasCCGT,1.01590000000
+16,2040,R2,2024,gasCCGT,3.20460000000
+16,2042,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,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,2040,R2,2026,gasCCGT,1.01590000000
+17,2042,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,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,2040,R2,2028,gasCCGT,1.01590000000
+18,2042,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,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,2040,R2,2030,gasCCGT,1.01590000000
+19,2042,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,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,2040,R2,2032,solarPV,2.28590000000
+20,2042,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,2050,R2,2032,solarPV,2.28590000000
+20,2058,R2,2032,solarPV,2.28590000000
+21,2040,R2,2034,solarPV,4.61130000000
+21,2042,R2,2034,solarPV,4.61130000000
+21,2045,R2,2034,solarPV,4.61130000000
+21,2046,R2,2034,solarPV,4.61130000000
+21,2047,R2,2034,solarPV,4.61130000000
+21,2050,R2,2034,solarPV,4.61130000000
+21,2058,R2,2034,solarPV,4.61130000000
+21,2059,R2,2034,solarPV,4.61130000000
+21,2060,R2,2034,solarPV,4.61130000000
+22,2040,R2,2036,solarPV,2.28590000000
+22,2042,R2,2036,solarPV,2.28590000000
+22,2045,R2,2036,solarPV,2.28590000000
+22,2046,R2,2036,solarPV,2.28590000000
+22,2047,R2,2036,solarPV,2.28590000000
+22,2050,R2,2036,solarPV,2.28590000000
+22,2058,R2,2036,solarPV,2.28590000000
+22,2059,R2,2036,solarPV,2.28590000000
+22,2060,R2,2036,solarPV,2.28590000000
+22,2061,R2,2036,solarPV,2.28590000000
+22,2062,R2,2036,solarPV,2.28590000000
+23,2040,R2,2038,solarPV,2.28590000000
+23,2042,R2,2038,solarPV,2.28590000000
+23,2045,R2,2038,solarPV,2.28590000000
+23,2046,R2,2038,solarPV,2.28590000000
+23,2047,R2,2038,solarPV,2.28590000000
+23,2050,R2,2038,solarPV,2.28590000000
+23,2058,R2,2038,solarPV,2.28590000000
+23,2059,R2,2038,solarPV,2.28590000000
+23,2060,R2,2038,solarPV,2.28590000000
+23,2061,R2,2038,solarPV,2.28590000000
+23,2062,R2,2038,solarPV,2.28590000000
+23,2063,R2,2038,solarPV,2.28590000000
+23,2064,R2,2038,solarPV,2.28590000000
+24,2042,R2,2040,solarPV,2.28590000000
+24,2045,R2,2040,solarPV,2.28590000000
+24,2046,R2,2040,solarPV,2.28590000000
+24,2047,R2,2040,solarPV,2.28590000000
+24,2050,R2,2040,solarPV,2.28590000000
+24,2058,R2,2040,solarPV,2.28590000000
+24,2059,R2,2040,solarPV,2.28590000000
+24,2060,R2,2040,solarPV,2.28590000000
+24,2061,R2,2040,solarPV,2.28590000000
+24,2062,R2,2040,solarPV,2.28590000000
+24,2063,R2,2040,solarPV,2.28590000000
+24,2064,R2,2040,solarPV,2.28590000000
+24,2065,R2,2040,solarPV,2.28590000000
+24,2066,R2,2040,solarPV,2.28590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
deleted file mode 100644
index b04feb4a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,131 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,3.00000000000
-0,2049,gasCCGT,R1,2025,3.00000000000
-0,2050,gasCCGT,R1,2025,3.00000000000
-0,2054,gasCCGT,R1,2025,3.00000000000
-0,2055,gasCCGT,R1,2025,3.00000000000
-0,2059,gasCCGT,R1,2025,3.00000000000
-0,2060,gasCCGT,R1,2025,3.00000000000
-0,2064,gasCCGT,R1,2025,3.00000000000
-1,2045,gasCCGT,R2,2025,3.00000000000
-1,2049,gasCCGT,R2,2025,3.00000000000
-1,2050,gasCCGT,R2,2025,3.00000000000
-1,2054,gasCCGT,R2,2025,3.00000000000
-1,2055,gasCCGT,R2,2025,3.00000000000
-1,2059,gasCCGT,R2,2025,3.00000000000
-1,2060,gasCCGT,R2,2025,3.00000000000
-1,2064,gasCCGT,R2,2025,3.00000000000
-2,2045,solarPV,R1,2020,6.75000000000
-2,2049,solarPV,R1,2020,6.75000000000
-3,2045,solarPV,R1,2025,2.40000000000
-3,2049,solarPV,R1,2025,2.40000000000
-3,2050,solarPV,R1,2025,2.40000000000
-3,2054,solarPV,R1,2025,2.40000000000
-4,2045,solarPV,R1,2030,6.00000000000
-4,2049,solarPV,R1,2030,6.00000000000
-4,2050,solarPV,R1,2030,6.00000000000
-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
-15,2045,windturbine,R2,2020,16.75000000000
-15,2049,windturbine,R2,2020,16.75000000000
-16,2045,windturbine,R2,2030,3.60000000000
-16,2049,windturbine,R2,2030,3.60000000000
-16,2050,windturbine,R2,2030,3.60000000000
-16,2054,windturbine,R2,2030,3.60000000000
-16,2055,windturbine,R2,2030,3.60000000000
-16,2059,windturbine,R2,2030,3.60000000000
-17,2045,windturbine,R2,2035,4.39000000000
-17,2049,windturbine,R2,2035,4.39000000000
-17,2050,windturbine,R2,2035,4.39000000000
-17,2054,windturbine,R2,2035,4.39000000000
-17,2055,windturbine,R2,2035,4.39000000000
-17,2059,windturbine,R2,2035,4.39000000000
-17,2060,windturbine,R2,2035,4.39000000000
-17,2064,windturbine,R2,2035,4.39000000000
-18,2050,windturbine,R2,2045,6.75000000000
-18,2054,windturbine,R2,2045,6.75000000000
-18,2055,windturbine,R2,2045,6.75000000000
-18,2059,windturbine,R2,2045,6.75000000000
-18,2060,windturbine,R2,2045,6.75000000000
-18,2064,windturbine,R2,2045,6.75000000000
-18,2065,windturbine,R2,2045,6.75000000000
-18,2069,windturbine,R2,2045,6.75000000000
-18,2070,windturbine,R2,2045,6.75000000000
-18,2074,windturbine,R2,2045,6.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 37b2c93a..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 34d42206..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,4.10000000000
-1,2034,gasboiler,R1,2025,4.10000000000
-1,2035,gasboiler,R1,2025,4.10000000000
-1,2039,gasboiler,R1,2025,4.10000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,4.10000000000
-3,2034,gasboiler,R2,2025,4.10000000000
-3,2035,gasboiler,R2,2025,4.10000000000
-3,2039,gasboiler,R2,2025,4.10000000000
-4,2025,heatpump,R1,2020,19.00000000000
-4,2030,heatpump,R1,2020,19.00000000000
-4,2034,heatpump,R1,2020,19.00000000000
-5,2030,heatpump,R1,2025,6.90000000000
-5,2034,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2025,6.90000000000
-5,2039,heatpump,R1,2025,6.90000000000
-6,2025,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2020,19.00000000000
-6,2034,heatpump,R2,2020,19.00000000000
-7,2030,heatpump,R2,2025,6.90000000000
-7,2034,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index fa9e8bca..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2040,gasboiler,R1,2035,0.91000000000
-1,2044,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R1,2035,0.91000000000
-1,2049,gasboiler,R1,2035,0.91000000000
-2,2035,gasboiler,R2,2025,4.10000000000
-2,2039,gasboiler,R2,2025,4.10000000000
-3,2040,gasboiler,R2,2035,0.91000000000
-3,2044,gasboiler,R2,2035,0.91000000000
-3,2045,gasboiler,R2,2035,0.91000000000
-3,2049,gasboiler,R2,2035,0.91000000000
-4,2035,heatpump,R1,2025,6.90000000000
-4,2039,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2030,25.00000000000
-5,2039,heatpump,R1,2030,25.00000000000
-5,2040,heatpump,R1,2030,25.00000000000
-5,2044,heatpump,R1,2030,25.00000000000
-6,2040,heatpump,R1,2035,16.09000000000
-6,2044,heatpump,R1,2035,16.09000000000
-6,2045,heatpump,R1,2035,16.09000000000
-6,2049,heatpump,R1,2035,16.09000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
-8,2035,heatpump,R2,2030,25.00000000000
-8,2039,heatpump,R2,2030,25.00000000000
-8,2040,heatpump,R2,2030,25.00000000000
-8,2044,heatpump,R2,2030,25.00000000000
-9,2040,heatpump,R2,2035,16.09000000000
-9,2044,heatpump,R2,2035,16.09000000000
-9,2045,heatpump,R2,2035,16.09000000000
-9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 0b5fe3de..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2045,heatpump,R1,2035,16.09000000000
-2,2049,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2040,31.00000000000
-3,2049,heatpump,R1,2040,31.00000000000
-3,2050,heatpump,R1,2040,31.00000000000
-3,2054,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2045,23.00000000000
-4,2054,heatpump,R1,2045,23.00000000000
-4,2055,heatpump,R1,2045,23.00000000000
-4,2059,heatpump,R1,2045,23.00000000000
-5,2045,heatpump,R2,2035,16.09000000000
-5,2049,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2040,31.00000000000
-6,2049,heatpump,R2,2040,31.00000000000
-6,2050,heatpump,R2,2040,31.00000000000
-6,2054,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2045,23.00000000000
-7,2054,heatpump,R2,2045,23.00000000000
-7,2055,heatpump,R2,2045,23.00000000000
-7,2059,heatpump,R2,2045,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index eb21c442..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
deleted file mode 100644
index eb9ddd9d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 21119f08..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 98be95de..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,145 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 26d4aa26..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index 88bd8e67..5d8504bc 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
index 9836bff0..fe314ea8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,technology,region,installed,capacity
+0,2025,gassupply1,R1,2020,15.00000000000
+0,2030,gassupply1,R1,2020,7.50000000000
+1,2030,gassupply1,R1,2025,12.41830000000
+1,2035,gassupply1,R1,2025,12.41830000000
+1,2040,gassupply1,R1,2025,12.41830000000
+1,2045,gassupply1,R1,2025,12.41830000000
+1,2050,gassupply1,R1,2025,12.41830000000
+1,2064,gassupply1,R1,2025,12.41830000000
+2,2025,gassupply1,R2,2020,15.00000000000
+2,2030,gassupply1,R2,2020,7.50000000000
+3,2030,gassupply1,R2,2025,12.41830000000
+3,2035,gassupply1,R2,2025,12.41830000000
+3,2040,gassupply1,R2,2025,12.41830000000
+3,2045,gassupply1,R2,2025,12.41830000000
+3,2050,gassupply1,R2,2025,12.41830000000
+3,2064,gassupply1,R2,2025,12.41830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index 9dd42497..8bf69df1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -1,11 +1,11 @@
 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
+1,2030,R1,2025,gassupply1,12.41830000000
+1,2035,R1,2025,gassupply1,12.41830000000
+1,2040,R1,2025,gassupply1,12.41830000000
+1,2045,R1,2025,gassupply1,12.41830000000
+1,2050,R1,2025,gassupply1,12.41830000000
+1,2064,R1,2025,gassupply1,12.41830000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
@@ -14,12 +14,12 @@ asset,year,region,installed,technology,capacity
 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
+4,2030,R2,2025,gassupply1,12.41830000000
+4,2035,R2,2025,gassupply1,12.41830000000
+4,2040,R2,2025,gassupply1,12.41830000000
+4,2045,R2,2025,gassupply1,12.41830000000
+4,2050,R2,2025,gassupply1,12.41830000000
+4,2064,R2,2025,gassupply1,12.41830000000
 5,2035,R2,2030,gassupply1,7.50000000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index 48ffe4c5..06622cbc 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -1,9 +1,9 @@
 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
+1,2035,R1,2025,gassupply1,12.41830000000
+1,2040,R1,2025,gassupply1,12.41830000000
+1,2045,R1,2025,gassupply1,12.41830000000
+1,2050,R1,2025,gassupply1,12.41830000000
+1,2064,R1,2025,gassupply1,12.41830000000
 2,2035,R1,2030,gassupply1,7.50000000000
 2,2040,R1,2030,gassupply1,7.50000000000
 2,2045,R1,2030,gassupply1,7.50000000000
@@ -11,11 +11,11 @@ asset,year,region,installed,technology,capacity
 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
+4,2035,R2,2025,gassupply1,12.41830000000
+4,2040,R2,2025,gassupply1,12.41830000000
+4,2045,R2,2025,gassupply1,12.41830000000
+4,2050,R2,2025,gassupply1,12.41830000000
+4,2064,R2,2025,gassupply1,12.41830000000
 5,2035,R2,2030,gassupply1,7.50000000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index ff57f6c8..c7ffc2ba 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -1,18 +1,18 @@
 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
+1,2040,R1,2025,gassupply1,12.41830000000
+1,2045,R1,2025,gassupply1,12.41830000000
+1,2050,R1,2025,gassupply1,12.41830000000
+1,2064,R1,2025,gassupply1,12.41830000000
 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
+4,2040,R2,2025,gassupply1,12.41830000000
+4,2045,R2,2025,gassupply1,12.41830000000
+4,2050,R2,2025,gassupply1,12.41830000000
+4,2064,R2,2025,gassupply1,12.41830000000
 5,2040,R2,2030,gassupply1,7.50000000000
 5,2045,R2,2030,gassupply1,7.50000000000
 5,2050,R2,2030,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index 865dc571..18543ff4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -1,15 +1,15 @@
 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
+1,2045,R1,2025,gassupply1,12.41830000000
+1,2050,R1,2025,gassupply1,12.41830000000
+1,2064,R1,2025,gassupply1,12.41830000000
 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
+4,2045,R2,2025,gassupply1,12.41830000000
+4,2050,R2,2025,gassupply1,12.41830000000
+4,2064,R2,2025,gassupply1,12.41830000000
 5,2045,R2,2030,gassupply1,7.50000000000
 5,2050,R2,2030,gassupply1,7.50000000000
 5,2064,R2,2030,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 50f6271d..885c23a8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -1,15 +1,15 @@
 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
+1,2050,R1,2025,gassupply1,12.41830000000
+1,2055,R1,2025,gassupply1,12.41830000000
+1,2064,R1,2025,gassupply1,12.41830000000
 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
+4,2050,R2,2025,gassupply1,12.41830000000
+4,2055,R2,2025,gassupply1,12.41830000000
+4,2064,R2,2025,gassupply1,12.41830000000
 5,2050,R2,2030,gassupply1,7.50000000000
 5,2055,R2,2030,gassupply1,7.50000000000
 5,2064,R2,2030,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 0c6ffd81..001705c4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -34,17 +34,15 @@ gas_stove,R2,R2,A1,residential,retrofit,2030,2.14290000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
 heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2030,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2030,10.39350000000
 windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,10.39350000000
+gasCCGT,R2,R2,A1,power,retrofit,2030,8.61930000000
 windturbine,R2,R2,A1,power,retrofit,2030,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,12.41830000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,12.41830000000
 electric_stove,R1,R1,A1,residential,retrofit,2035,8.57170000000
 electric_stove,R1,R1,A1,residential,retrofit,2035,23.57330000000
 gas_stove,R1,R1,A1,residential,retrofit,2035,2.14290000000
@@ -57,18 +55,16 @@ gas_stove,R2,R2,A1,residential,retrofit,2035,2.14290000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2035,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2035,10.39350000000
 solarPV,R1,R1,A1,power,retrofit,2035,11.42930000000
 windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,10.39350000000
+gasCCGT,R2,R2,A1,power,retrofit,2035,8.61930000000
 solarPV,R2,R2,A1,power,retrofit,2035,11.42930000000
 windturbine,R2,R2,A1,power,retrofit,2035,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,12.41830000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,12.41830000000
 gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
 electric_stove,R1,R1,A1,residential,retrofit,2040,23.57330000000
 electric_stove,R1,R1,A1,residential,retrofit,2040,16.42930000000
@@ -78,20 +74,18 @@ electric_stove,R2,R2,A1,residential,retrofit,2040,23.57330000000
 electric_stove,R2,R2,A1,residential,retrofit,2040,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2040,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2040,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2040,10.39350000000
 solarPV,R1,R1,A1,power,retrofit,2040,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2040,15.71520000000
 windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,10.39350000000
+gasCCGT,R2,R2,A1,power,retrofit,2040,8.61930000000
 solarPV,R2,R2,A1,power,retrofit,2040,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2040,15.71520000000
 windturbine,R2,R2,A1,power,retrofit,2040,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,12.41830000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,12.41830000000
 gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
 electric_stove,R1,R1,A1,residential,retrofit,2045,16.42930000000
 electric_stove,R1,R1,A1,residential,retrofit,2045,29.28800000000
@@ -101,22 +95,20 @@ electric_stove,R2,R2,A1,residential,retrofit,2045,16.42930000000
 electric_stove,R2,R2,A1,residential,retrofit,2045,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2045,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2045,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.39350000000
 solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2045,15.71520000000
 solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
 windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2045,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,10.39350000000
+gasCCGT,R2,R2,A1,power,retrofit,2045,8.61930000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2045,15.71520000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
 windturbine,R2,R2,A1,power,retrofit,2045,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,12.41830000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,12.41830000000
 gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
 electric_stove,R1,R1,A1,residential,retrofit,2050,29.28800000000
 electric_stove,R1,R1,A1,residential,retrofit,2050,22.14400000000
@@ -126,21 +118,19 @@ electric_stove,R2,R2,A1,residential,retrofit,2050,29.28800000000
 electric_stove,R2,R2,A1,residential,retrofit,2050,22.14400000000
 heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.39350000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2050,15.71520000000
 solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2050,31.42930000000
 windturbine,R1,R1,A1,power,retrofit,2050,13.46730000000
-gasCCGT,R2,R2,A1,power,retrofit,2050,4.00000000000
-solarPV,R2,R2,A1,power,retrofit,2050,10.39350000000
+gasCCGT,R2,R2,A1,power,retrofit,2050,8.61930000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2050,15.71520000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2050,31.42930000000
 windturbine,R2,R2,A1,power,retrofit,2050,13.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,4.70400000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,12.41830000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,4.70400000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,12.41830000000
 gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index c2ac1894..f70a1c29 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -159,8 +159,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,1.48370000000,2025
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,1.48370000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.25540000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.25540000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.44470000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.44470000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.07210000000,2030
@@ -169,8 +169,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'night')",cook,R1,0.05970000000,2030
 "('all-year', 'all-week', 'night')",cook,R2,0.05970000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.38350000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.38350000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66790000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.66790000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
 "('all-year', 'all-week', 'morning')",heat,R1,0.11220000000,2030
@@ -179,8 +179,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",cook,R1,0.09360000000,2030
 "('all-year', 'all-week', 'morning')",cook,R2,0.09360000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.25540000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.25540000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44470000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44470000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07210000000,2030
@@ -189,8 +189,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05970000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05970000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.38350000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.38350000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66790000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66790000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.11220000000,2030
@@ -199,8 +199,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.09360000000,2030
 "('all-year', 'all-week', 'early-peak')",cook,R2,0.09360000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.76970000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.76970000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34150000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34150000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.24860000000,2030
@@ -209,8 +209,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.21150000000,2030
 "('all-year', 'all-week', 'late-peak')",cook,R2,0.21150000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.51220000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.51220000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89230000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89230000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.15510000000,2030
@@ -219,8 +219,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",cook,R1,0.13030000000,2030
 "('all-year', 'all-week', 'evening')",cook,R2,0.13030000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.51220000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.51220000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89230000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89230000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.15510000000,2030
@@ -229,8 +229,8 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",cook,R1,0.13030000000,2030
 "('all-year', 'all-week', 'early-morning')",cook,R2,0.13030000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.51220000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.51220000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89230000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89230000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15510000000,2030
@@ -239,323 +239,323 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,0.13030000000,2030
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,0.13030000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.27830000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.27830000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.49520000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.49520000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08140000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08140000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08650000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08650000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.06730000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.06730000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.41780000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.41780000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.07240000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,0.07240000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.74360000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.74360000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12740000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.12740000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.13880000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.13880000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.10620000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.10620000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27830000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27830000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.11770000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,0.11770000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.49520000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.49520000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08140000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08140000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08650000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08650000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.06730000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.06730000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41780000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41780000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.07240000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.07240000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74360000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.74360000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12740000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12740000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13880000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13880000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.10620000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.10620000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.83790000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.83790000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.11770000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.11770000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.49190000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.49190000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28650000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28650000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.33250000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.33250000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.24420000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.24420000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.55790000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.55790000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.29020000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.29020000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.99300000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.99300000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17700000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.17700000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.19740000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.19740000000,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', 'evening')",cook,R1,0.14880000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.14880000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.55790000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.55790000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.16920000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,0.16920000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.99300000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.99300000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.17700000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.17700000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.19740000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.19740000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.14880000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.14880000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.55790000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.55790000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.16920000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.16920000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.99300000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.99300000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17700000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17700000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19740000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19740000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.14880000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.14880000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.28200000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.28200000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.16920000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.16920000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.50550000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.50550000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02080000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02080000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02700000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.02700000000,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', 'night')",cook,R1,0.02080000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.02080000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.42320000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.42320000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.02700000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.02700000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.75880000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.75880000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.03720000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.03720000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05120000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.05120000000,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', 'morning')",cook,R1,0.03720000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.03720000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.28200000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.28200000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.05120000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.05120000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.50550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.50550000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02080000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02700000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02700000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02080000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02080000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.42320000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.42320000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02700000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02700000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.75880000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.75880000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03720000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03720000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05120000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05120000000,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', 'early-peak')",cook,R1,0.03720000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03720000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.84840000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.84840000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.05120000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.05120000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.52160000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.52160000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11050000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11050000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.16650000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.16650000000,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', 'late-peak')",cook,R1,0.11050000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.11050000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.56500000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.56500000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.16650000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.16650000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.01320000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.01320000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05770000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.05770000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.08250000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.08250000000,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', 'evening')",cook,R1,0.05770000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.05770000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.56500000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.56500000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.08250000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.08250000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.01320000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.01320000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.05770000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.05770000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.08250000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.08250000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.05770000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.05770000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.56500000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.56500000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.08250000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.08250000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.01320000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.01320000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05770000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08250000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08250000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05770000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05770000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.30830000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.30830000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08250000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08250000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.56420000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.56420000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02090000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02090000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02730000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.02730000000,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', 'night')",cook,R1,0.02090000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.02090000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.46260000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.46260000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.02730000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.02730000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.84680000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.84680000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.03740000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.03740000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05180000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.05180000000,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', 'morning')",cook,R1,0.03740000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.03740000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30830000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30830000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.05180000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.05180000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.56420000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.56420000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02090000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02090000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02730000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02730000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02090000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02090000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.46260000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.46260000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02730000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02730000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84680000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.84680000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03740000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03740000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05180000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05180000000,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', 'early-peak')",cook,R1,0.03740000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03740000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.92700000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.92700000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.05180000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.05180000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69730000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.69730000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11140000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11140000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.16910000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.16910000000,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', 'late-peak')",cook,R1,0.11140000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.11140000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.61750000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.61750000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.16910000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.16910000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.13050000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,1.13050000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05810000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.05810000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.08370000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.08370000000,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', 'evening')",cook,R1,0.05810000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.05810000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.61750000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.61750000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.08370000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.08370000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.13050000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.13050000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.05810000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.05810000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.08370000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.08370000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.05810000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.05810000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.61750000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.61750000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.08370000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.08370000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.13050000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.13050000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.05810000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.05810000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08370000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08370000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.05810000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.05810000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.32510000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.32510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08370000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08370000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.60630000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.60630000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02170000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.02170000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02900000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.02900000000,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', 'night')",cook,R1,0.02170000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.02170000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.48780000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.48780000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.02900000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.02900000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.90990000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.90990000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.03910000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.03910000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05560000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.05560000000,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', 'morning')",cook,R1,0.03910000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.03910000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32510000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.05560000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.05560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.60630000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.60630000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02170000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02170000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02900000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02900000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02170000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02170000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48780000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48780000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02900000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02900000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.90990000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.90990000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03910000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03910000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05560000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05560000000,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', 'early-peak')",cook,R1,0.03910000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03910000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.97730000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.97730000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.05560000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.05560000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.82320000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.82320000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.11810000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.11810000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.18420000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.18420000000,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', 'late-peak')",cook,R1,0.11810000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.11810000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.65120000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.65120000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.18420000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.18420000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.21460000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,1.21460000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.06110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.06110000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.09040000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.09040000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.06110000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.06110000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.65120000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.65120000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.09040000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.09040000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.21460000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.21460000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06110000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.09040000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.09040000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.06110000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.06110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.65120000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.65120000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.09040000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.09040000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.21460000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.21460000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09040000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09040000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.06110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.06110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09040000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09040000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 5e5e4461..3dad784d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -1,53 +1,35 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,4.00000000000
-1,2035,gasCCGT,R1,2025,4.00000000000
-1,2040,gasCCGT,R1,2025,4.00000000000
-1,2045,gasCCGT,R1,2025,4.00000000000
-1,2049,gasCCGT,R1,2025,4.00000000000
-1,2050,gasCCGT,R1,2025,4.00000000000
-1,2054,gasCCGT,R1,2025,4.00000000000
-1,2055,gasCCGT,R1,2025,4.00000000000
-1,2064,gasCCGT,R1,2025,4.00000000000
+1,2030,gasCCGT,R1,2025,8.61930000000
+1,2035,gasCCGT,R1,2025,8.61930000000
+1,2040,gasCCGT,R1,2025,8.61930000000
+1,2045,gasCCGT,R1,2025,8.61930000000
+1,2049,gasCCGT,R1,2025,8.61930000000
+1,2050,gasCCGT,R1,2025,8.61930000000
+1,2064,gasCCGT,R1,2025,8.61930000000
 2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,4.00000000000
-3,2035,gasCCGT,R2,2025,4.00000000000
-3,2040,gasCCGT,R2,2025,4.00000000000
-3,2045,gasCCGT,R2,2025,4.00000000000
-3,2049,gasCCGT,R2,2025,4.00000000000
-3,2050,gasCCGT,R2,2025,4.00000000000
-3,2054,gasCCGT,R2,2025,4.00000000000
-3,2055,gasCCGT,R2,2025,4.00000000000
-3,2064,gasCCGT,R2,2025,4.00000000000
+3,2030,gasCCGT,R2,2025,8.61930000000
+3,2035,gasCCGT,R2,2025,8.61930000000
+3,2040,gasCCGT,R2,2025,8.61930000000
+3,2045,gasCCGT,R2,2025,8.61930000000
+3,2049,gasCCGT,R2,2025,8.61930000000
+3,2050,gasCCGT,R2,2025,8.61930000000
+3,2064,gasCCGT,R2,2025,8.61930000000
 4,2025,solarPV,R1,2020,13.46730000000
 4,2030,solarPV,R1,2020,13.46730000000
 4,2035,solarPV,R1,2020,13.46730000000
 4,2040,solarPV,R1,2020,13.46730000000
 4,2045,solarPV,R1,2020,13.46730000000
 4,2049,solarPV,R1,2020,13.46730000000
-5,2030,solarPV,R1,2025,10.39350000000
-5,2035,solarPV,R1,2025,10.39350000000
-5,2040,solarPV,R1,2025,10.39350000000
-5,2045,solarPV,R1,2025,10.39350000000
-5,2049,solarPV,R1,2025,10.39350000000
-5,2050,solarPV,R1,2025,10.39350000000
-5,2054,solarPV,R1,2025,10.39350000000
-6,2030,solarPV,R2,2025,10.39350000000
-6,2035,solarPV,R2,2025,10.39350000000
-6,2040,solarPV,R2,2025,10.39350000000
-6,2045,solarPV,R2,2025,10.39350000000
-6,2049,solarPV,R2,2025,10.39350000000
-6,2050,solarPV,R2,2025,10.39350000000
-6,2054,solarPV,R2,2025,10.39350000000
-7,2025,windturbine,R1,2020,20.00000000000
-7,2030,windturbine,R1,2020,20.00000000000
-7,2035,windturbine,R1,2020,20.00000000000
-7,2040,windturbine,R1,2020,20.00000000000
-7,2045,windturbine,R1,2020,20.00000000000
-7,2049,windturbine,R1,2020,20.00000000000
-8,2025,windturbine,R2,2020,33.46730000000
-8,2030,windturbine,R2,2020,33.46730000000
-8,2035,windturbine,R2,2020,33.46730000000
-8,2040,windturbine,R2,2020,33.46730000000
-8,2045,windturbine,R2,2020,33.46730000000
-8,2049,windturbine,R2,2020,33.46730000000
+5,2025,windturbine,R1,2020,20.00000000000
+5,2030,windturbine,R1,2020,20.00000000000
+5,2035,windturbine,R1,2020,20.00000000000
+5,2040,windturbine,R1,2020,20.00000000000
+5,2045,windturbine,R1,2020,20.00000000000
+5,2049,windturbine,R1,2020,20.00000000000
+6,2025,windturbine,R2,2020,33.46730000000
+6,2030,windturbine,R2,2020,33.46730000000
+6,2035,windturbine,R2,2020,33.46730000000
+6,2040,windturbine,R2,2020,33.46730000000
+6,2045,windturbine,R2,2020,33.46730000000
+6,2049,windturbine,R2,2020,33.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index ff513932..9155016d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -9,60 +9,38 @@ asset,year,region,installed,technology,capacity
 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,windturbine,33.46730000000
-7,2035,R2,2020,windturbine,33.46730000000
-7,2040,R2,2020,windturbine,33.46730000000
-7,2045,R2,2020,windturbine,33.46730000000
-7,2049,R2,2020,windturbine,33.46730000000
-8,2030,R2,2025,gasCCGT,4.00000000000
-8,2035,R2,2025,gasCCGT,4.00000000000
-8,2040,R2,2025,gasCCGT,4.00000000000
-8,2045,R2,2025,gasCCGT,4.00000000000
-8,2049,R2,2025,gasCCGT,4.00000000000
-8,2050,R2,2025,gasCCGT,4.00000000000
-8,2054,R2,2025,gasCCGT,4.00000000000
-8,2055,R2,2025,gasCCGT,4.00000000000
-8,2059,R2,2025,gasCCGT,4.00000000000
-8,2060,R2,2025,gasCCGT,4.00000000000
-8,2064,R2,2025,gasCCGT,4.00000000000
-9,2030,R2,2025,solarPV,10.39350000000
-9,2035,R2,2025,solarPV,10.39350000000
-9,2040,R2,2025,solarPV,10.39350000000
-9,2045,R2,2025,solarPV,10.39350000000
-9,2049,R2,2025,solarPV,10.39350000000
-9,2050,R2,2025,solarPV,10.39350000000
-9,2054,R2,2025,solarPV,10.39350000000
-10,2035,R2,2030,solarPV,11.42930000000
-10,2040,R2,2030,solarPV,11.42930000000
-10,2045,R2,2030,solarPV,11.42930000000
-10,2049,R2,2030,solarPV,11.42930000000
-10,2050,R2,2030,solarPV,11.42930000000
-10,2054,R2,2030,solarPV,11.42930000000
-10,2055,R2,2030,solarPV,11.42930000000
-10,2059,R2,2030,solarPV,11.42930000000
+3,2030,R1,2025,gasCCGT,8.61930000000
+3,2035,R1,2025,gasCCGT,8.61930000000
+3,2040,R1,2025,gasCCGT,8.61930000000
+3,2045,R1,2025,gasCCGT,8.61930000000
+3,2049,R1,2025,gasCCGT,8.61930000000
+3,2050,R1,2025,gasCCGT,8.61930000000
+3,2059,R1,2025,gasCCGT,8.61930000000
+3,2060,R1,2025,gasCCGT,8.61930000000
+3,2064,R1,2025,gasCCGT,8.61930000000
+4,2035,R1,2030,solarPV,11.42930000000
+4,2040,R1,2030,solarPV,11.42930000000
+4,2045,R1,2030,solarPV,11.42930000000
+4,2049,R1,2030,solarPV,11.42930000000
+4,2050,R1,2030,solarPV,11.42930000000
+4,2059,R1,2030,solarPV,11.42930000000
+6,2030,R2,2020,windturbine,33.46730000000
+6,2035,R2,2020,windturbine,33.46730000000
+6,2040,R2,2020,windturbine,33.46730000000
+6,2045,R2,2020,windturbine,33.46730000000
+6,2049,R2,2020,windturbine,33.46730000000
+7,2030,R2,2025,gasCCGT,8.61930000000
+7,2035,R2,2025,gasCCGT,8.61930000000
+7,2040,R2,2025,gasCCGT,8.61930000000
+7,2045,R2,2025,gasCCGT,8.61930000000
+7,2049,R2,2025,gasCCGT,8.61930000000
+7,2050,R2,2025,gasCCGT,8.61930000000
+7,2059,R2,2025,gasCCGT,8.61930000000
+7,2060,R2,2025,gasCCGT,8.61930000000
+7,2064,R2,2025,gasCCGT,8.61930000000
+8,2035,R2,2030,solarPV,11.42930000000
+8,2040,R2,2030,solarPV,11.42930000000
+8,2045,R2,2030,solarPV,11.42930000000
+8,2049,R2,2030,solarPV,11.42930000000
+8,2050,R2,2030,solarPV,11.42930000000
+8,2059,R2,2030,solarPV,11.42930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index 8da4c34e..ba65d611 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -7,73 +7,49 @@ asset,year,region,installed,technology,capacity
 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,windturbine,33.46730000000
-8,2040,R2,2020,windturbine,33.46730000000
-8,2045,R2,2020,windturbine,33.46730000000
-8,2049,R2,2020,windturbine,33.46730000000
-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,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
-12,2040,R2,2035,solarPV,15.71520000000
-12,2045,R2,2035,solarPV,15.71520000000
-12,2049,R2,2035,solarPV,15.71520000000
-12,2050,R2,2035,solarPV,15.71520000000
-12,2054,R2,2035,solarPV,15.71520000000
-12,2055,R2,2035,solarPV,15.71520000000
-12,2059,R2,2035,solarPV,15.71520000000
-12,2060,R2,2035,solarPV,15.71520000000
-12,2064,R2,2035,solarPV,15.71520000000
+3,2035,R1,2025,gasCCGT,8.61930000000
+3,2040,R1,2025,gasCCGT,8.61930000000
+3,2045,R1,2025,gasCCGT,8.61930000000
+3,2049,R1,2025,gasCCGT,8.61930000000
+3,2050,R1,2025,gasCCGT,8.61930000000
+3,2059,R1,2025,gasCCGT,8.61930000000
+3,2060,R1,2025,gasCCGT,8.61930000000
+3,2064,R1,2025,gasCCGT,8.61930000000
+4,2035,R1,2030,solarPV,11.42930000000
+4,2040,R1,2030,solarPV,11.42930000000
+4,2045,R1,2030,solarPV,11.42930000000
+4,2049,R1,2030,solarPV,11.42930000000
+4,2050,R1,2030,solarPV,11.42930000000
+4,2059,R1,2030,solarPV,11.42930000000
+5,2040,R1,2035,solarPV,15.71520000000
+5,2045,R1,2035,solarPV,15.71520000000
+5,2049,R1,2035,solarPV,15.71520000000
+5,2050,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
+7,2035,R2,2020,windturbine,33.46730000000
+7,2040,R2,2020,windturbine,33.46730000000
+7,2045,R2,2020,windturbine,33.46730000000
+7,2049,R2,2020,windturbine,33.46730000000
+8,2035,R2,2025,gasCCGT,8.61930000000
+8,2040,R2,2025,gasCCGT,8.61930000000
+8,2045,R2,2025,gasCCGT,8.61930000000
+8,2049,R2,2025,gasCCGT,8.61930000000
+8,2050,R2,2025,gasCCGT,8.61930000000
+8,2059,R2,2025,gasCCGT,8.61930000000
+8,2060,R2,2025,gasCCGT,8.61930000000
+8,2064,R2,2025,gasCCGT,8.61930000000
+9,2035,R2,2030,solarPV,11.42930000000
+9,2040,R2,2030,solarPV,11.42930000000
+9,2045,R2,2030,solarPV,11.42930000000
+9,2049,R2,2030,solarPV,11.42930000000
+9,2050,R2,2030,solarPV,11.42930000000
+9,2059,R2,2030,solarPV,11.42930000000
+10,2040,R2,2035,solarPV,15.71520000000
+10,2045,R2,2035,solarPV,15.71520000000
+10,2049,R2,2035,solarPV,15.71520000000
+10,2050,R2,2035,solarPV,15.71520000000
+10,2059,R2,2035,solarPV,15.71520000000
+10,2060,R2,2035,solarPV,15.71520000000
+10,2064,R2,2035,solarPV,15.71520000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index 305a3986..a2466d2e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -5,86 +5,60 @@ asset,year,region,installed,technology,capacity
 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,11.42930000000
-7,2049,R1,2040,solarPV,11.42930000000
-7,2050,R1,2040,solarPV,11.42930000000
-7,2054,R1,2040,solarPV,11.42930000000
-7,2055,R1,2040,solarPV,11.42930000000
-7,2059,R1,2040,solarPV,11.42930000000
-7,2060,R1,2040,solarPV,11.42930000000
-7,2064,R1,2040,solarPV,11.42930000000
-7,2065,R1,2040,solarPV,11.42930000000
-7,2069,R1,2040,solarPV,11.42930000000
-9,2040,R2,2020,windturbine,33.46730000000
-9,2045,R2,2020,windturbine,33.46730000000
-9,2049,R2,2020,windturbine,33.46730000000
-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,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,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
-14,2045,R2,2040,solarPV,11.42930000000
-14,2049,R2,2040,solarPV,11.42930000000
-14,2050,R2,2040,solarPV,11.42930000000
-14,2054,R2,2040,solarPV,11.42930000000
-14,2055,R2,2040,solarPV,11.42930000000
-14,2059,R2,2040,solarPV,11.42930000000
-14,2060,R2,2040,solarPV,11.42930000000
-14,2064,R2,2040,solarPV,11.42930000000
-14,2065,R2,2040,solarPV,11.42930000000
-14,2069,R2,2040,solarPV,11.42930000000
+3,2040,R1,2025,gasCCGT,8.61930000000
+3,2045,R1,2025,gasCCGT,8.61930000000
+3,2049,R1,2025,gasCCGT,8.61930000000
+3,2050,R1,2025,gasCCGT,8.61930000000
+3,2059,R1,2025,gasCCGT,8.61930000000
+3,2060,R1,2025,gasCCGT,8.61930000000
+3,2064,R1,2025,gasCCGT,8.61930000000
+4,2040,R1,2030,solarPV,11.42930000000
+4,2045,R1,2030,solarPV,11.42930000000
+4,2049,R1,2030,solarPV,11.42930000000
+4,2050,R1,2030,solarPV,11.42930000000
+4,2059,R1,2030,solarPV,11.42930000000
+5,2040,R1,2035,solarPV,15.71520000000
+5,2045,R1,2035,solarPV,15.71520000000
+5,2049,R1,2035,solarPV,15.71520000000
+5,2050,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,2045,R1,2040,solarPV,11.42930000000
+6,2049,R1,2040,solarPV,11.42930000000
+6,2050,R1,2040,solarPV,11.42930000000
+6,2059,R1,2040,solarPV,11.42930000000
+6,2060,R1,2040,solarPV,11.42930000000
+6,2064,R1,2040,solarPV,11.42930000000
+6,2065,R1,2040,solarPV,11.42930000000
+6,2069,R1,2040,solarPV,11.42930000000
+8,2040,R2,2020,windturbine,33.46730000000
+8,2045,R2,2020,windturbine,33.46730000000
+8,2049,R2,2020,windturbine,33.46730000000
+9,2040,R2,2025,gasCCGT,8.61930000000
+9,2045,R2,2025,gasCCGT,8.61930000000
+9,2049,R2,2025,gasCCGT,8.61930000000
+9,2050,R2,2025,gasCCGT,8.61930000000
+9,2059,R2,2025,gasCCGT,8.61930000000
+9,2060,R2,2025,gasCCGT,8.61930000000
+9,2064,R2,2025,gasCCGT,8.61930000000
+10,2040,R2,2030,solarPV,11.42930000000
+10,2045,R2,2030,solarPV,11.42930000000
+10,2049,R2,2030,solarPV,11.42930000000
+10,2050,R2,2030,solarPV,11.42930000000
+10,2059,R2,2030,solarPV,11.42930000000
+11,2040,R2,2035,solarPV,15.71520000000
+11,2045,R2,2035,solarPV,15.71520000000
+11,2049,R2,2035,solarPV,15.71520000000
+11,2050,R2,2035,solarPV,15.71520000000
+11,2059,R2,2035,solarPV,15.71520000000
+11,2060,R2,2035,solarPV,15.71520000000
+11,2064,R2,2035,solarPV,15.71520000000
+12,2045,R2,2040,solarPV,11.42930000000
+12,2049,R2,2040,solarPV,11.42930000000
+12,2050,R2,2040,solarPV,11.42930000000
+12,2059,R2,2040,solarPV,11.42930000000
+12,2060,R2,2040,solarPV,11.42930000000
+12,2064,R2,2040,solarPV,11.42930000000
+12,2065,R2,2040,solarPV,11.42930000000
+12,2069,R2,2040,solarPV,11.42930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index a92b3086..998e9d77 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,119 +1,87 @@
 asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,4.00000000000
-0,2049,gasCCGT,R1,2025,4.00000000000
-0,2050,gasCCGT,R1,2025,4.00000000000
-0,2054,gasCCGT,R1,2025,4.00000000000
-0,2055,gasCCGT,R1,2025,4.00000000000
-0,2059,gasCCGT,R1,2025,4.00000000000
-0,2060,gasCCGT,R1,2025,4.00000000000
-0,2064,gasCCGT,R1,2025,4.00000000000
-1,2045,gasCCGT,R2,2025,4.00000000000
-1,2049,gasCCGT,R2,2025,4.00000000000
-1,2050,gasCCGT,R2,2025,4.00000000000
-1,2054,gasCCGT,R2,2025,4.00000000000
-1,2055,gasCCGT,R2,2025,4.00000000000
-1,2059,gasCCGT,R2,2025,4.00000000000
-1,2060,gasCCGT,R2,2025,4.00000000000
-1,2064,gasCCGT,R2,2025,4.00000000000
+0,2045,gasCCGT,R1,2025,8.61930000000
+0,2049,gasCCGT,R1,2025,8.61930000000
+0,2050,gasCCGT,R1,2025,8.61930000000
+0,2059,gasCCGT,R1,2025,8.61930000000
+0,2060,gasCCGT,R1,2025,8.61930000000
+0,2064,gasCCGT,R1,2025,8.61930000000
+1,2045,gasCCGT,R2,2025,8.61930000000
+1,2049,gasCCGT,R2,2025,8.61930000000
+1,2050,gasCCGT,R2,2025,8.61930000000
+1,2059,gasCCGT,R2,2025,8.61930000000
+1,2060,gasCCGT,R2,2025,8.61930000000
+1,2064,gasCCGT,R2,2025,8.61930000000
 2,2045,solarPV,R1,2020,13.46730000000
 2,2049,solarPV,R1,2020,13.46730000000
-3,2045,solarPV,R1,2025,10.39350000000
-3,2049,solarPV,R1,2025,10.39350000000
-3,2050,solarPV,R1,2025,10.39350000000
-3,2054,solarPV,R1,2025,10.39350000000
-4,2045,solarPV,R1,2030,11.42930000000
-4,2049,solarPV,R1,2030,11.42930000000
-4,2050,solarPV,R1,2030,11.42930000000
-4,2054,solarPV,R1,2030,11.42930000000
-4,2055,solarPV,R1,2030,11.42930000000
-4,2059,solarPV,R1,2030,11.42930000000
-5,2045,solarPV,R1,2035,15.71520000000
-5,2049,solarPV,R1,2035,15.71520000000
-5,2050,solarPV,R1,2035,15.71520000000
-5,2054,solarPV,R1,2035,15.71520000000
-5,2055,solarPV,R1,2035,15.71520000000
-5,2059,solarPV,R1,2035,15.71520000000
-5,2060,solarPV,R1,2035,15.71520000000
-5,2064,solarPV,R1,2035,15.71520000000
-6,2045,solarPV,R1,2040,11.42930000000
-6,2049,solarPV,R1,2040,11.42930000000
-6,2050,solarPV,R1,2040,11.42930000000
-6,2054,solarPV,R1,2040,11.42930000000
-6,2055,solarPV,R1,2040,11.42930000000
-6,2059,solarPV,R1,2040,11.42930000000
-6,2060,solarPV,R1,2040,11.42930000000
-6,2064,solarPV,R1,2040,11.42930000000
-6,2065,solarPV,R1,2040,11.42930000000
-6,2069,solarPV,R1,2040,11.42930000000
-7,2050,solarPV,R1,2045,31.42930000000
-7,2054,solarPV,R1,2045,31.42930000000
-7,2055,solarPV,R1,2045,31.42930000000
-7,2059,solarPV,R1,2045,31.42930000000
-7,2060,solarPV,R1,2045,31.42930000000
-7,2064,solarPV,R1,2045,31.42930000000
-7,2065,solarPV,R1,2045,31.42930000000
-7,2069,solarPV,R1,2045,31.42930000000
-7,2070,solarPV,R1,2045,31.42930000000
-7,2074,solarPV,R1,2045,31.42930000000
-8,2045,solarPV,R2,2025,10.39350000000
-8,2049,solarPV,R2,2025,10.39350000000
-8,2050,solarPV,R2,2025,10.39350000000
-8,2054,solarPV,R2,2025,10.39350000000
-9,2045,solarPV,R2,2030,11.42930000000
-9,2049,solarPV,R2,2030,11.42930000000
-9,2050,solarPV,R2,2030,11.42930000000
-9,2054,solarPV,R2,2030,11.42930000000
-9,2055,solarPV,R2,2030,11.42930000000
-9,2059,solarPV,R2,2030,11.42930000000
-10,2045,solarPV,R2,2035,15.71520000000
-10,2049,solarPV,R2,2035,15.71520000000
-10,2050,solarPV,R2,2035,15.71520000000
-10,2054,solarPV,R2,2035,15.71520000000
-10,2055,solarPV,R2,2035,15.71520000000
-10,2059,solarPV,R2,2035,15.71520000000
-10,2060,solarPV,R2,2035,15.71520000000
-10,2064,solarPV,R2,2035,15.71520000000
-11,2045,solarPV,R2,2040,11.42930000000
-11,2049,solarPV,R2,2040,11.42930000000
-11,2050,solarPV,R2,2040,11.42930000000
-11,2054,solarPV,R2,2040,11.42930000000
-11,2055,solarPV,R2,2040,11.42930000000
-11,2059,solarPV,R2,2040,11.42930000000
-11,2060,solarPV,R2,2040,11.42930000000
-11,2064,solarPV,R2,2040,11.42930000000
-11,2065,solarPV,R2,2040,11.42930000000
-11,2069,solarPV,R2,2040,11.42930000000
-12,2050,solarPV,R2,2045,31.42930000000
-12,2054,solarPV,R2,2045,31.42930000000
-12,2055,solarPV,R2,2045,31.42930000000
-12,2059,solarPV,R2,2045,31.42930000000
-12,2060,solarPV,R2,2045,31.42930000000
-12,2064,solarPV,R2,2045,31.42930000000
-12,2065,solarPV,R2,2045,31.42930000000
-12,2069,solarPV,R2,2045,31.42930000000
-12,2070,solarPV,R2,2045,31.42930000000
-12,2074,solarPV,R2,2045,31.42930000000
-13,2045,windturbine,R1,2020,20.00000000000
-13,2049,windturbine,R1,2020,20.00000000000
-14,2050,windturbine,R1,2045,13.46730000000
-14,2054,windturbine,R1,2045,13.46730000000
-14,2055,windturbine,R1,2045,13.46730000000
-14,2059,windturbine,R1,2045,13.46730000000
-14,2060,windturbine,R1,2045,13.46730000000
-14,2064,windturbine,R1,2045,13.46730000000
-14,2065,windturbine,R1,2045,13.46730000000
-14,2069,windturbine,R1,2045,13.46730000000
-14,2070,windturbine,R1,2045,13.46730000000
-14,2074,windturbine,R1,2045,13.46730000000
-15,2045,windturbine,R2,2020,33.46730000000
-15,2049,windturbine,R2,2020,33.46730000000
-16,2050,windturbine,R2,2045,13.46730000000
-16,2054,windturbine,R2,2045,13.46730000000
-16,2055,windturbine,R2,2045,13.46730000000
-16,2059,windturbine,R2,2045,13.46730000000
-16,2060,windturbine,R2,2045,13.46730000000
-16,2064,windturbine,R2,2045,13.46730000000
-16,2065,windturbine,R2,2045,13.46730000000
-16,2069,windturbine,R2,2045,13.46730000000
-16,2070,windturbine,R2,2045,13.46730000000
-16,2074,windturbine,R2,2045,13.46730000000
+3,2045,solarPV,R1,2030,11.42930000000
+3,2049,solarPV,R1,2030,11.42930000000
+3,2050,solarPV,R1,2030,11.42930000000
+3,2059,solarPV,R1,2030,11.42930000000
+4,2045,solarPV,R1,2035,15.71520000000
+4,2049,solarPV,R1,2035,15.71520000000
+4,2050,solarPV,R1,2035,15.71520000000
+4,2059,solarPV,R1,2035,15.71520000000
+4,2060,solarPV,R1,2035,15.71520000000
+4,2064,solarPV,R1,2035,15.71520000000
+5,2045,solarPV,R1,2040,11.42930000000
+5,2049,solarPV,R1,2040,11.42930000000
+5,2050,solarPV,R1,2040,11.42930000000
+5,2059,solarPV,R1,2040,11.42930000000
+5,2060,solarPV,R1,2040,11.42930000000
+5,2064,solarPV,R1,2040,11.42930000000
+5,2065,solarPV,R1,2040,11.42930000000
+5,2069,solarPV,R1,2040,11.42930000000
+6,2050,solarPV,R1,2045,31.42930000000
+6,2059,solarPV,R1,2045,31.42930000000
+6,2060,solarPV,R1,2045,31.42930000000
+6,2064,solarPV,R1,2045,31.42930000000
+6,2065,solarPV,R1,2045,31.42930000000
+6,2069,solarPV,R1,2045,31.42930000000
+6,2070,solarPV,R1,2045,31.42930000000
+6,2074,solarPV,R1,2045,31.42930000000
+7,2045,solarPV,R2,2030,11.42930000000
+7,2049,solarPV,R2,2030,11.42930000000
+7,2050,solarPV,R2,2030,11.42930000000
+7,2059,solarPV,R2,2030,11.42930000000
+8,2045,solarPV,R2,2035,15.71520000000
+8,2049,solarPV,R2,2035,15.71520000000
+8,2050,solarPV,R2,2035,15.71520000000
+8,2059,solarPV,R2,2035,15.71520000000
+8,2060,solarPV,R2,2035,15.71520000000
+8,2064,solarPV,R2,2035,15.71520000000
+9,2045,solarPV,R2,2040,11.42930000000
+9,2049,solarPV,R2,2040,11.42930000000
+9,2050,solarPV,R2,2040,11.42930000000
+9,2059,solarPV,R2,2040,11.42930000000
+9,2060,solarPV,R2,2040,11.42930000000
+9,2064,solarPV,R2,2040,11.42930000000
+9,2065,solarPV,R2,2040,11.42930000000
+9,2069,solarPV,R2,2040,11.42930000000
+10,2050,solarPV,R2,2045,31.42930000000
+10,2059,solarPV,R2,2045,31.42930000000
+10,2060,solarPV,R2,2045,31.42930000000
+10,2064,solarPV,R2,2045,31.42930000000
+10,2065,solarPV,R2,2045,31.42930000000
+10,2069,solarPV,R2,2045,31.42930000000
+10,2070,solarPV,R2,2045,31.42930000000
+10,2074,solarPV,R2,2045,31.42930000000
+11,2045,windturbine,R1,2020,20.00000000000
+11,2049,windturbine,R1,2020,20.00000000000
+12,2050,windturbine,R1,2045,13.46730000000
+12,2059,windturbine,R1,2045,13.46730000000
+12,2060,windturbine,R1,2045,13.46730000000
+12,2064,windturbine,R1,2045,13.46730000000
+12,2065,windturbine,R1,2045,13.46730000000
+12,2069,windturbine,R1,2045,13.46730000000
+12,2070,windturbine,R1,2045,13.46730000000
+12,2074,windturbine,R1,2045,13.46730000000
+13,2045,windturbine,R2,2020,33.46730000000
+13,2049,windturbine,R2,2020,33.46730000000
+14,2050,windturbine,R2,2045,13.46730000000
+14,2059,windturbine,R2,2045,13.46730000000
+14,2060,windturbine,R2,2045,13.46730000000
+14,2064,windturbine,R2,2045,13.46730000000
+14,2065,windturbine,R2,2045,13.46730000000
+14,2069,windturbine,R2,2045,13.46730000000
+14,2070,windturbine,R2,2045,13.46730000000
+14,2074,windturbine,R2,2045,13.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index 90a0fecb..98023c25 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,113 +1,77 @@
 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,11.42930000000
-6,2054,R1,2040,solarPV,11.42930000000
-6,2055,R1,2040,solarPV,11.42930000000
-6,2059,R1,2040,solarPV,11.42930000000
-6,2060,R1,2040,solarPV,11.42930000000
-6,2064,R1,2040,solarPV,11.42930000000
-6,2065,R1,2040,solarPV,11.42930000000
-6,2069,R1,2040,solarPV,11.42930000000
-7,2050,R1,2045,solarPV,31.42930000000
-7,2054,R1,2045,solarPV,31.42930000000
-7,2055,R1,2045,solarPV,31.42930000000
-7,2059,R1,2045,solarPV,31.42930000000
-7,2060,R1,2045,solarPV,31.42930000000
-7,2064,R1,2045,solarPV,31.42930000000
-7,2065,R1,2045,solarPV,31.42930000000
-7,2069,R1,2045,solarPV,31.42930000000
-7,2070,R1,2045,solarPV,31.42930000000
-7,2074,R1,2045,solarPV,31.42930000000
-8,2050,R1,2045,windturbine,13.46730000000
-8,2054,R1,2045,windturbine,13.46730000000
-8,2055,R1,2045,windturbine,13.46730000000
-8,2059,R1,2045,windturbine,13.46730000000
-8,2060,R1,2045,windturbine,13.46730000000
-8,2064,R1,2045,windturbine,13.46730000000
-8,2065,R1,2045,windturbine,13.46730000000
-8,2069,R1,2045,windturbine,13.46730000000
-8,2070,R1,2045,windturbine,13.46730000000
-8,2074,R1,2045,windturbine,13.46730000000
-9,2055,R1,2050,solarPV,10.39350000000
-9,2059,R1,2050,solarPV,10.39350000000
-9,2060,R1,2050,solarPV,10.39350000000
-9,2064,R1,2050,solarPV,10.39350000000
-9,2065,R1,2050,solarPV,10.39350000000
-9,2069,R1,2050,solarPV,10.39350000000
-9,2070,R1,2050,solarPV,10.39350000000
-9,2074,R1,2050,solarPV,10.39350000000
-9,2075,R1,2050,solarPV,10.39350000000
-9,2079,R1,2050,solarPV,10.39350000000
-11,2050,R2,2025,gasCCGT,4.00000000000
-11,2054,R2,2025,gasCCGT,4.00000000000
-11,2055,R2,2025,gasCCGT,4.00000000000
-11,2059,R2,2025,gasCCGT,4.00000000000
-11,2060,R2,2025,gasCCGT,4.00000000000
-11,2064,R2,2025,gasCCGT,4.00000000000
-12,2050,R2,2025,solarPV,10.39350000000
-12,2054,R2,2025,solarPV,10.39350000000
-13,2050,R2,2030,solarPV,11.42930000000
-13,2054,R2,2030,solarPV,11.42930000000
-13,2055,R2,2030,solarPV,11.42930000000
-13,2059,R2,2030,solarPV,11.42930000000
-14,2050,R2,2035,solarPV,15.71520000000
-14,2054,R2,2035,solarPV,15.71520000000
-14,2055,R2,2035,solarPV,15.71520000000
-14,2059,R2,2035,solarPV,15.71520000000
-14,2060,R2,2035,solarPV,15.71520000000
-14,2064,R2,2035,solarPV,15.71520000000
-15,2050,R2,2040,solarPV,11.42930000000
-15,2054,R2,2040,solarPV,11.42930000000
-15,2055,R2,2040,solarPV,11.42930000000
-15,2059,R2,2040,solarPV,11.42930000000
-15,2060,R2,2040,solarPV,11.42930000000
-15,2064,R2,2040,solarPV,11.42930000000
-15,2065,R2,2040,solarPV,11.42930000000
-15,2069,R2,2040,solarPV,11.42930000000
-16,2050,R2,2045,solarPV,31.42930000000
-16,2054,R2,2045,solarPV,31.42930000000
-16,2055,R2,2045,solarPV,31.42930000000
-16,2059,R2,2045,solarPV,31.42930000000
-16,2060,R2,2045,solarPV,31.42930000000
-16,2064,R2,2045,solarPV,31.42930000000
-16,2065,R2,2045,solarPV,31.42930000000
-16,2069,R2,2045,solarPV,31.42930000000
-16,2070,R2,2045,solarPV,31.42930000000
-16,2074,R2,2045,solarPV,31.42930000000
-17,2050,R2,2045,windturbine,13.46730000000
-17,2054,R2,2045,windturbine,13.46730000000
-17,2055,R2,2045,windturbine,13.46730000000
-17,2059,R2,2045,windturbine,13.46730000000
-17,2060,R2,2045,windturbine,13.46730000000
-17,2064,R2,2045,windturbine,13.46730000000
-17,2065,R2,2045,windturbine,13.46730000000
-17,2069,R2,2045,windturbine,13.46730000000
-17,2070,R2,2045,windturbine,13.46730000000
-17,2074,R2,2045,windturbine,13.46730000000
-18,2055,R2,2050,solarPV,10.39350000000
-18,2059,R2,2050,solarPV,10.39350000000
-18,2060,R2,2050,solarPV,10.39350000000
-18,2064,R2,2050,solarPV,10.39350000000
-18,2065,R2,2050,solarPV,10.39350000000
-18,2069,R2,2050,solarPV,10.39350000000
-18,2070,R2,2050,solarPV,10.39350000000
-18,2074,R2,2050,solarPV,10.39350000000
-18,2075,R2,2050,solarPV,10.39350000000
-18,2079,R2,2050,solarPV,10.39350000000
+2,2050,R1,2025,gasCCGT,8.61930000000
+2,2055,R1,2025,gasCCGT,8.61930000000
+2,2059,R1,2025,gasCCGT,8.61930000000
+2,2060,R1,2025,gasCCGT,8.61930000000
+2,2064,R1,2025,gasCCGT,8.61930000000
+3,2050,R1,2030,solarPV,11.42930000000
+3,2055,R1,2030,solarPV,11.42930000000
+3,2059,R1,2030,solarPV,11.42930000000
+4,2050,R1,2035,solarPV,15.71520000000
+4,2055,R1,2035,solarPV,15.71520000000
+4,2059,R1,2035,solarPV,15.71520000000
+4,2060,R1,2035,solarPV,15.71520000000
+4,2064,R1,2035,solarPV,15.71520000000
+5,2050,R1,2040,solarPV,11.42930000000
+5,2055,R1,2040,solarPV,11.42930000000
+5,2059,R1,2040,solarPV,11.42930000000
+5,2060,R1,2040,solarPV,11.42930000000
+5,2064,R1,2040,solarPV,11.42930000000
+5,2065,R1,2040,solarPV,11.42930000000
+5,2069,R1,2040,solarPV,11.42930000000
+6,2050,R1,2045,solarPV,31.42930000000
+6,2055,R1,2045,solarPV,31.42930000000
+6,2059,R1,2045,solarPV,31.42930000000
+6,2060,R1,2045,solarPV,31.42930000000
+6,2064,R1,2045,solarPV,31.42930000000
+6,2065,R1,2045,solarPV,31.42930000000
+6,2069,R1,2045,solarPV,31.42930000000
+6,2070,R1,2045,solarPV,31.42930000000
+6,2074,R1,2045,solarPV,31.42930000000
+7,2050,R1,2045,windturbine,13.46730000000
+7,2055,R1,2045,windturbine,13.46730000000
+7,2059,R1,2045,windturbine,13.46730000000
+7,2060,R1,2045,windturbine,13.46730000000
+7,2064,R1,2045,windturbine,13.46730000000
+7,2065,R1,2045,windturbine,13.46730000000
+7,2069,R1,2045,windturbine,13.46730000000
+7,2070,R1,2045,windturbine,13.46730000000
+7,2074,R1,2045,windturbine,13.46730000000
+9,2050,R2,2025,gasCCGT,8.61930000000
+9,2055,R2,2025,gasCCGT,8.61930000000
+9,2059,R2,2025,gasCCGT,8.61930000000
+9,2060,R2,2025,gasCCGT,8.61930000000
+9,2064,R2,2025,gasCCGT,8.61930000000
+10,2050,R2,2030,solarPV,11.42930000000
+10,2055,R2,2030,solarPV,11.42930000000
+10,2059,R2,2030,solarPV,11.42930000000
+11,2050,R2,2035,solarPV,15.71520000000
+11,2055,R2,2035,solarPV,15.71520000000
+11,2059,R2,2035,solarPV,15.71520000000
+11,2060,R2,2035,solarPV,15.71520000000
+11,2064,R2,2035,solarPV,15.71520000000
+12,2050,R2,2040,solarPV,11.42930000000
+12,2055,R2,2040,solarPV,11.42930000000
+12,2059,R2,2040,solarPV,11.42930000000
+12,2060,R2,2040,solarPV,11.42930000000
+12,2064,R2,2040,solarPV,11.42930000000
+12,2065,R2,2040,solarPV,11.42930000000
+12,2069,R2,2040,solarPV,11.42930000000
+13,2050,R2,2045,solarPV,31.42930000000
+13,2055,R2,2045,solarPV,31.42930000000
+13,2059,R2,2045,solarPV,31.42930000000
+13,2060,R2,2045,solarPV,31.42930000000
+13,2064,R2,2045,solarPV,31.42930000000
+13,2065,R2,2045,solarPV,31.42930000000
+13,2069,R2,2045,solarPV,31.42930000000
+13,2070,R2,2045,solarPV,31.42930000000
+13,2074,R2,2045,solarPV,31.42930000000
+14,2050,R2,2045,windturbine,13.46730000000
+14,2055,R2,2045,windturbine,13.46730000000
+14,2059,R2,2045,windturbine,13.46730000000
+14,2060,R2,2045,windturbine,13.46730000000
+14,2064,R2,2045,windturbine,13.46730000000
+14,2065,R2,2045,windturbine,13.46730000000
+14,2069,R2,2045,windturbine,13.46730000000
+14,2070,R2,2045,windturbine,13.46730000000
+14,2074,R2,2045,windturbine,13.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
index 465ac9d1..ea61a7fd 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,0.4,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,0.4,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 5901b8b3..55bfc68f 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -183,13 +183,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Next, navigate to the ```input``` folder, found at \n",
+    "Next, navigate to the ```input``` folder.\n",
     "\n",
-    "```bash\n",
-    "{muse_installation_location}src/muse/data/example/default/input\n",
-    "```\n",
-    "\n",
-    "We must now edit each of the files found here to add the new solar commodity. Due to space constraints we will not display all of the entries contained in the input files. The edited files can be viewed [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology) however."
+    "We must now edit each of the files found here to add the new solar commodity. Due to space constraints we will not display all of the entries contained in the input files. The edited files can be viewed [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/1-introduction) however."
    ]
   },
   {

From 28d9c25838eb8cf7f1824701be48183424c2617c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 21 May 2024 17:16:28 +0100
Subject: [PATCH 157/419] Global change to maximum_iterations

---
 .../Results/Gas/Capacity/2025.csv             |  12 +-
 .../Results/Gas/Capacity/2030.csv             |  18 +-
 .../Results/Gas/Capacity/2035.csv             |  17 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  11 +-
 .../Results/Gas/Capacity/2050.csv             |  11 +-
 .../1-introduction/Results/MCACapacity.csv    |  23 +-
 .../1-introduction/Results/MCAPrices.csv      | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  26 +-
 .../Results/Power/Capacity/2030.csv           |  18 +-
 .../Results/Power/Capacity/2035.csv           |  18 +-
 .../Results/Power/Capacity/2040.csv           |  18 +-
 .../Results/Power/Capacity/2045.csv           |  24 +-
 .../Results/Power/Capacity/2050.csv           |  22 +-
 .../1-introduction/settings.toml              |   2 +-
 .../2-scenario/Results/Gas/Capacity/2025.csv  |  12 +-
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  18 +-
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  17 +-
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  14 +-
 .../2-scenario/Results/Gas/Capacity/2045.csv  |  11 +-
 .../2-scenario/Results/Gas/Capacity/2050.csv  |  11 +-
 .../2-scenario/Results/MCACapacity.csv        |  23 +-
 .../2-scenario/Results/MCAPrices.csv          | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  26 +-
 .../Results/Power/Capacity/2030.csv           |  18 +-
 .../Results/Power/Capacity/2035.csv           |  18 +-
 .../Results/Power/Capacity/2040.csv           |  18 +-
 .../Results/Power/Capacity/2045.csv           |  24 +-
 .../Results/Power/Capacity/2050.csv           |  22 +-
 .../2-scenario/settings.toml                  |   2 +-
 .../1-add-new-technology/generate_models.py   |   6 -
 .../Results/Gas/Capacity/2030.csv             |  14 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |   8 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   |  41 +-
 .../Results/MCAPrices.csv                     | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  61 +-
 .../Results/Power/Capacity/2030.csv           |  37 +-
 .../Results/Power/Capacity/2035.csv           |  46 +-
 .../Results/Power/Capacity/2040.csv           |  41 +-
 .../Results/Power/Capacity/2045.csv           |  74 +-
 .../Results/Power/Capacity/2050.csv           |  52 +-
 .../1-multiple-objective/settings.toml        |   2 +-
 .../Results/Gas/Capacity/2025.csv             |   6 -
 .../Results/Gas/Capacity/2030.csv             |  22 +-
 .../Results/Gas/Capacity/2035.csv             |  17 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  11 +-
 .../Results/Gas/Capacity/2050.csv             |  11 +-
 .../Results/MCACapacity.csv                   |  56 +-
 .../2-single-objective/Results/MCAPrices.csv  | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  35 +-
 .../Results/Power/Capacity/2030.csv           |  23 +-
 .../Results/Power/Capacity/2035.csv           |  20 +-
 .../Results/Power/Capacity/2040.csv           |  17 +-
 .../Results/Power/Capacity/2045.csv           |  38 +-
 .../Results/Power/Capacity/2050.csv           |  32 +-
 .../2-single-objective/settings.toml          |   2 +-
 .../Results/Gas/Capacity/2025.csv             |  22 +-
 .../Results/Gas/Capacity/2030.csv             |  38 +-
 .../Results/Gas/Capacity/2035.csv             |  34 +-
 .../Results/Gas/Capacity/2040.csv             |  28 +-
 .../Results/Gas/Capacity/2045.csv             |  22 +-
 .../Results/Gas/Capacity/2050.csv             |  22 +-
 .../1-new-region/Results/MCACapacity.csv      |  46 +-
 .../1-new-region/Results/MCAPrices.csv        | 432 ++++----
 .../Results/Power/Capacity/2025.csv           |  42 +-
 .../Results/Power/Capacity/2030.csv           |  36 +-
 .../Results/Power/Capacity/2035.csv           |  36 +-
 .../Results/Power/Capacity/2040.csv           |  36 +-
 .../Results/Power/Capacity/2045.csv           |  96 +-
 .../Results/Power/Capacity/2050.csv           | 110 +-
 .../3-add-region/1-new-region/settings.toml   |   2 +-
 .../Results/Gas/Capacity/2025.csv             |  22 +-
 .../Results/Gas/Capacity/2030.csv             |  38 +-
 .../Results/Gas/Capacity/2035.csv             |  34 +-
 .../Results/Gas/Capacity/2040.csv             |  28 +-
 .../Results/Gas/Capacity/2045.csv             |  22 +-
 .../Results/Gas/Capacity/2050.csv             |  22 +-
 .../Results/MCACapacity.csv                   |  46 +-
 .../1-modify-timeslices/Results/MCAPrices.csv | 576 +++++------
 .../Results/Power/Capacity/2025.csv           |  42 +-
 .../Results/Power/Capacity/2030.csv           |  36 +-
 .../Results/Power/Capacity/2035.csv           |  36 +-
 .../Results/Power/Capacity/2040.csv           |  36 +-
 .../Results/Power/Capacity/2045.csv           |  96 +-
 .../Results/Power/Capacity/2050.csv           | 130 ++-
 .../1-modify-timeslices/settings.toml         |   2 +-
 .../Results/Gas/Capacity/2024.csv             |  32 +-
 .../Results/Gas/Capacity/2026.csv             |  40 +-
 .../Results/Gas/Capacity/2028.csv             |  56 +-
 .../Results/Gas/Capacity/2030.csv             |  96 +-
 .../Results/Gas/Capacity/2032.csv             |  94 +-
 .../Results/Gas/Capacity/2034.csv             |  94 +-
 .../Results/Gas/Capacity/2036.csv             |  84 +-
 .../Results/Gas/Capacity/2038.csv             |  74 +-
 .../Results/Gas/Capacity/2040.csv             |  74 +-
 .../Results/MCACapacity.csv                   | 202 ++--
 .../Results/MCAPrices.csv                     | 960 +++++++++---------
 .../Results/Power/Capacity/2022.csv           |  38 +-
 .../Results/Power/Capacity/2024.csv           | 136 ++-
 .../Results/Power/Capacity/2026.csv           | 134 ++-
 .../Results/Power/Capacity/2028.csv           | 180 ++--
 .../Results/Power/Capacity/2030.csv           | 246 +++--
 .../Results/Power/Capacity/2032.csv           | 268 ++---
 .../Results/Power/Capacity/2034.csv           | 286 +++---
 .../Results/Power/Capacity/2036.csv           | 284 +++---
 .../Results/Power/Capacity/2038.csv           | 282 +++--
 .../Results/Power/Capacity/2040.csv           | 300 ++++--
 .../2-modify-time-framework/settings.toml     |   2 +-
 .../Results/Gas/Capacity/2025.csv             |  22 +-
 .../Results/Gas/Capacity/2030.csv             |  38 +-
 .../Results/Gas/Capacity/2035.csv             |  34 +-
 .../Results/Gas/Capacity/2040.csv             |  28 +-
 .../Results/Gas/Capacity/2045.csv             |  22 +-
 .../Results/Gas/Capacity/2050.csv             |  22 +-
 .../Results/MCACapacity.csv                   |  46 +-
 .../1-exogenous-demand/Results/MCAPrices.csv  | 768 +++++++-------
 .../Results/Power/Capacity/2025.csv           |  42 +-
 .../Results/Power/Capacity/2030.csv           |  36 +-
 .../Results/Power/Capacity/2035.csv           |  36 +-
 .../Results/Power/Capacity/2040.csv           |  36 +-
 .../Results/Power/Capacity/2045.csv           |  96 +-
 .../Results/Power/Capacity/2050.csv           | 110 +-
 .../1-exogenous-demand/settings.toml          |   2 +-
 127 files changed, 4456 insertions(+), 5052 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
index 839b2c82..f2ad7b02 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -1,9 +1,3 @@
-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.57580000000
-1,2035,R1,gassupply1,2025,4.57580000000
-1,2040,R1,gassupply1,2025,4.57580000000
-1,2045,R1,gassupply1,2025,4.57580000000
-1,2050,R1,gassupply1,2025,4.57580000000
-1,2064,R1,gassupply1,2025,4.57580000000
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,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 21999e26..46ed388e 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,7 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,4.57580000000
-1,2035,R1,2025,gassupply1,4.57580000000
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 c644313c..4a49ec7f 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,6 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,4.57580000000
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 c9dcc224..54d8f5f5 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,5 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 20e50e13..18de09c4 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,4 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 f53a8f8c..efec1bce 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,4 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2055,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 e09c0cb2..fa454d8e 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
@@ -11,48 +11,43 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
 windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,4.57580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
 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,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
 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,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
 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,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.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,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
 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,4.06670000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2050,6.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
-gassupply1,R1,R1,A1,gas,retrofit,2050,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
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 d9ed93a1..176ae31f 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.62400000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.93800000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.62400000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.93800000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.88860000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.25350000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.68470000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.20360000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.02870000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.32250000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.68470000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20360000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.02870000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.32250000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.06770000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.74900000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.37390000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.45300000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.44430000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.68050000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08890000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.02210000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.15360000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.68050000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08890000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.02210000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15360000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.05210000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.42980000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.32640000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.36450000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.23200000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.21250000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.75600000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.09400000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13510000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.16120000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75600000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09400000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13510000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16120000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.27710000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44410000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.51500000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.24190000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.80300000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05430000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.14130000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31630000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.20550000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.10420000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.21200000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.47810000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.80300000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05430000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14130000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31630000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.20550000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10420000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21200000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.47810000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.41690000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34540000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.42400000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.97770000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.60860000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.16930000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.28270000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64220000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
index 3ef1ff53..849d1bde 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -1,18 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,4.06670000000
-1,2035,R1,gasCCGT,2025,4.06670000000
-1,2040,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2025,R1,solarPV,2020,10.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
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
 3,2025,R1,windturbine,2020,6.75000000000
 3,2030,R1,windturbine,2020,6.75000000000
 3,2035,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 1b51d2ca..b8d11565 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
@@ -9,18 +9,18 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2035,R1,2025,gasCCGT,4.06670000000
-3,2040,R1,2025,gasCCGT,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2030,R1,2025,solarPV,9.15000000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2035,R1,2030,solarPV,6.00000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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
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 245f914c..bb2bda0b 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
@@ -7,24 +7,26 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2040,R1,2025,gasCCGT,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2035,R1,2030,solarPV,6.00000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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,2040,R1,2035,solarPV,9.19000000000
 5,2045,R1,2035,solarPV,9.19000000000
 5,2049,R1,2035,solarPV,9.19000000000
 5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
 5,2059,R1,2035,solarPV,9.19000000000
 5,2060,R1,2035,solarPV,9.19000000000
 5,2064,R1,2035,solarPV,9.19000000000
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 2271c1d9..2f4caa4e 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
@@ -5,28 +5,32 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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,2040,R1,2035,solarPV,9.19000000000
 5,2045,R1,2035,solarPV,9.19000000000
 5,2049,R1,2035,solarPV,9.19000000000
 5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
 5,2059,R1,2035,solarPV,9.19000000000
 5,2060,R1,2035,solarPV,9.19000000000
 5,2064,R1,2035,solarPV,9.19000000000
 6,2045,R1,2040,solarPV,6.00000000000
 6,2049,R1,2040,solarPV,6.00000000000
 6,2050,R1,2040,solarPV,6.00000000000
+6,2054,R1,2040,solarPV,6.00000000000
+6,2055,R1,2040,solarPV,6.00000000000
 6,2059,R1,2040,solarPV,6.00000000000
 6,2060,R1,2040,solarPV,6.00000000000
 6,2064,R1,2040,solarPV,6.00000000000
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 d68102bd..324548ca 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
@@ -1,31 +1,37 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,4.06670000000
-0,2049,R1,gasCCGT,2025,4.06670000000
-0,2050,R1,gasCCGT,2025,4.06670000000
-0,2059,R1,gasCCGT,2025,4.06670000000
-0,2060,R1,gasCCGT,2025,4.06670000000
-0,2064,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,solarPV,2020,10.00000000000
-1,2049,R1,solarPV,2020,10.00000000000
+0,2045,R1,solarPV,2020,10.00000000000
+0,2049,R1,solarPV,2020,10.00000000000
+1,2045,R1,solarPV,2025,9.15000000000
+1,2049,R1,solarPV,2025,9.15000000000
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
 2,2045,R1,solarPV,2030,6.00000000000
 2,2049,R1,solarPV,2030,6.00000000000
 2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
 2,2059,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2035,9.19000000000
 3,2049,R1,solarPV,2035,9.19000000000
 3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
 3,2059,R1,solarPV,2035,9.19000000000
 3,2060,R1,solarPV,2035,9.19000000000
 3,2064,R1,solarPV,2035,9.19000000000
 4,2045,R1,solarPV,2040,6.00000000000
 4,2049,R1,solarPV,2040,6.00000000000
 4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
 4,2059,R1,solarPV,2040,6.00000000000
 4,2060,R1,solarPV,2040,6.00000000000
 4,2064,R1,solarPV,2040,6.00000000000
 4,2065,R1,solarPV,2040,6.00000000000
 4,2069,R1,solarPV,2040,6.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
@@ -36,6 +42,8 @@ asset,year,region,technology,installed,capacity
 6,2045,R1,windturbine,2020,6.75000000000
 6,2049,R1,windturbine,2020,6.75000000000
 7,2050,R1,windturbine,2045,6.75000000000
+7,2054,R1,windturbine,2045,6.75000000000
+7,2055,R1,windturbine,2045,6.75000000000
 7,2059,R1,windturbine,2045,6.75000000000
 7,2060,R1,windturbine,2045,6.75000000000
 7,2064,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 e43fa2d5..470b2a93 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,18 +1,18 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,4.06670000000
-2,2055,R1,2025,gasCCGT,4.06670000000
-2,2059,R1,2025,gasCCGT,4.06670000000
-2,2060,R1,2025,gasCCGT,4.06670000000
-2,2064,R1,2025,gasCCGT,4.06670000000
+2,2050,R1,2025,solarPV,9.15000000000
+2,2054,R1,2025,solarPV,9.15000000000
 3,2050,R1,2030,solarPV,6.00000000000
+3,2054,R1,2030,solarPV,6.00000000000
 3,2055,R1,2030,solarPV,6.00000000000
 3,2059,R1,2030,solarPV,6.00000000000
 4,2050,R1,2035,solarPV,9.19000000000
+4,2054,R1,2035,solarPV,9.19000000000
 4,2055,R1,2035,solarPV,9.19000000000
 4,2059,R1,2035,solarPV,9.19000000000
 4,2060,R1,2035,solarPV,9.19000000000
 4,2064,R1,2035,solarPV,9.19000000000
 5,2050,R1,2040,solarPV,6.00000000000
+5,2054,R1,2040,solarPV,6.00000000000
 5,2055,R1,2040,solarPV,6.00000000000
 5,2059,R1,2040,solarPV,6.00000000000
 5,2060,R1,2040,solarPV,6.00000000000
@@ -20,6 +20,7 @@ asset,year,region,installed,technology,capacity
 5,2065,R1,2040,solarPV,6.00000000000
 5,2069,R1,2040,solarPV,6.00000000000
 6,2050,R1,2045,solarPV,16.91000000000
+6,2054,R1,2045,solarPV,16.91000000000
 6,2055,R1,2045,solarPV,16.91000000000
 6,2059,R1,2045,solarPV,16.91000000000
 6,2060,R1,2045,solarPV,16.91000000000
@@ -29,6 +30,7 @@ asset,year,region,installed,technology,capacity
 6,2070,R1,2045,solarPV,16.91000000000
 6,2074,R1,2045,solarPV,16.91000000000
 7,2050,R1,2045,windturbine,6.75000000000
+7,2054,R1,2045,windturbine,6.75000000000
 7,2055,R1,2045,windturbine,6.75000000000
 7,2059,R1,2045,windturbine,6.75000000000
 7,2060,R1,2045,windturbine,6.75000000000
@@ -37,3 +39,13 @@ asset,year,region,installed,technology,capacity
 7,2069,R1,2045,windturbine,6.75000000000
 7,2070,R1,2045,windturbine,6.75000000000
 7,2074,R1,2045,windturbine,6.75000000000
+8,2055,R1,2050,solarPV,9.15000000000
+8,2059,R1,2050,solarPV,9.15000000000
+8,2060,R1,2050,solarPV,9.15000000000
+8,2064,R1,2050,solarPV,9.15000000000
+8,2065,R1,2050,solarPV,9.15000000000
+8,2069,R1,2050,solarPV,9.15000000000
+8,2070,R1,2050,solarPV,9.15000000000
+8,2074,R1,2050,solarPV,9.15000000000
+8,2075,R1,2050,solarPV,9.15000000000
+8,2079,R1,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 7c78dd4d..704d93ac 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
index 839b2c82..f2ad7b02 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -1,9 +1,3 @@
-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.57580000000
-1,2035,R1,gassupply1,2025,4.57580000000
-1,2040,R1,gassupply1,2025,4.57580000000
-1,2045,R1,gassupply1,2025,4.57580000000
-1,2050,R1,gassupply1,2025,4.57580000000
-1,2064,R1,gassupply1,2025,4.57580000000
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,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 21999e26..46ed388e 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,7 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,4.57580000000
-1,2035,R1,2025,gassupply1,4.57580000000
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 c644313c..4a49ec7f 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,6 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,4.57580000000
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 c9dcc224..54d8f5f5 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,5 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 20e50e13..18de09c4 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,4 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 f53a8f8c..efec1bce 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,4 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2055,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
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 a2fbcf00..0599eab8 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
@@ -11,48 +11,43 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,4.57580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
 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,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
 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,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.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
-gassupply1,R1,R1,A1,gas,retrofit,2045,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
 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,4.06670000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2050,6.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
-gassupply1,R1,R1,A1,gas,retrofit,2050,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
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 474d2d12..e7cafa95 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63800000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68290000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63800000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68290000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81760000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.72780000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.63960000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17730000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.14500000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.96140000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27810000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.19820000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52010000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63960000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17730000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.14500000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.96140000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27810000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.19820000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52010000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.93540000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62930000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.35790000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04310000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.28470000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38710000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.25140000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69410000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.70170000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.20410000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.35010000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62730000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.05420000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.32380000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.40980000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84190000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.70170000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20410000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.35010000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62730000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05420000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.32380000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.40980000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84190000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.11860000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.75390000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.58870000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48980000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.40790000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.45530000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.46940000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05720000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.69630000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08960000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.11330000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40520000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.04570000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.15510000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.17760000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62930000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69630000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08960000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.11330000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40520000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.04570000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15510000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.17760000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62930000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.09930000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43580000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.37050000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30750000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.39600000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.23470000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.24190000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85430000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.76970000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.09460000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.32310000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21060000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.15570000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.16260000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.39070000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43380000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76970000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09460000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.32310000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21060000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15570000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16260000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.39070000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43380000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31830000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44970000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.59380000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.11150000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.54250000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.24440000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.45840000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65840000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.80750000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05480000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.15170000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31700000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.21220000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.10540000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22750000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.47950000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.80750000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05480000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15170000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31700000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.21220000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10540000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22750000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.47950000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.43040000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.35040000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45500000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98340000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.61760000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.17150000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64480000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
index 04fb2747..80fe0b8b 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -1,18 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,4.06670000000
-1,2035,R1,gasCCGT,2025,4.06670000000
-1,2040,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,gasCCGT,2025,4.06670000000
-1,2049,R1,gasCCGT,2025,4.06670000000
-1,2050,R1,gasCCGT,2025,4.06670000000
-1,2064,R1,gasCCGT,2025,4.06670000000
-2,2025,R1,solarPV,2020,6.75000000000
-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
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
 3,2025,R1,windturbine,2020,10.00000000000
 3,2030,R1,windturbine,2020,10.00000000000
 3,2035,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 5957189b..59b0ffa5 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
@@ -9,18 +9,18 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2035,R1,2025,gasCCGT,4.06670000000
-3,2040,R1,2025,gasCCGT,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2030,R1,2025,solarPV,9.15000000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2035,R1,2030,solarPV,6.00000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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
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 34ff7af2..a77d5fb7 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
@@ -7,24 +7,26 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2040,R1,2025,gasCCGT,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2035,R1,2030,solarPV,6.00000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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,2040,R1,2035,solarPV,9.19000000000
 5,2045,R1,2035,solarPV,9.19000000000
 5,2049,R1,2035,solarPV,9.19000000000
 5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
 5,2059,R1,2035,solarPV,9.19000000000
 5,2060,R1,2035,solarPV,9.19000000000
 5,2064,R1,2035,solarPV,9.19000000000
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 4d81c5df..0dc3d06d 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
@@ -5,28 +5,32 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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,2040,R1,2035,solarPV,9.19000000000
 5,2045,R1,2035,solarPV,9.19000000000
 5,2049,R1,2035,solarPV,9.19000000000
 5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
 5,2059,R1,2035,solarPV,9.19000000000
 5,2060,R1,2035,solarPV,9.19000000000
 5,2064,R1,2035,solarPV,9.19000000000
 6,2045,R1,2040,solarPV,6.00000000000
 6,2049,R1,2040,solarPV,6.00000000000
 6,2050,R1,2040,solarPV,6.00000000000
+6,2054,R1,2040,solarPV,6.00000000000
+6,2055,R1,2040,solarPV,6.00000000000
 6,2059,R1,2040,solarPV,6.00000000000
 6,2060,R1,2040,solarPV,6.00000000000
 6,2064,R1,2040,solarPV,6.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 52f051b5..a6d9e492 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
@@ -1,31 +1,37 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,4.06670000000
-0,2049,R1,gasCCGT,2025,4.06670000000
-0,2050,R1,gasCCGT,2025,4.06670000000
-0,2059,R1,gasCCGT,2025,4.06670000000
-0,2060,R1,gasCCGT,2025,4.06670000000
-0,2064,R1,gasCCGT,2025,4.06670000000
-1,2045,R1,solarPV,2020,6.75000000000
-1,2049,R1,solarPV,2020,6.75000000000
+0,2045,R1,solarPV,2020,6.75000000000
+0,2049,R1,solarPV,2020,6.75000000000
+1,2045,R1,solarPV,2025,9.15000000000
+1,2049,R1,solarPV,2025,9.15000000000
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
 2,2045,R1,solarPV,2030,6.00000000000
 2,2049,R1,solarPV,2030,6.00000000000
 2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
 2,2059,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2035,9.19000000000
 3,2049,R1,solarPV,2035,9.19000000000
 3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
 3,2059,R1,solarPV,2035,9.19000000000
 3,2060,R1,solarPV,2035,9.19000000000
 3,2064,R1,solarPV,2035,9.19000000000
 4,2045,R1,solarPV,2040,6.00000000000
 4,2049,R1,solarPV,2040,6.00000000000
 4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
 4,2059,R1,solarPV,2040,6.00000000000
 4,2060,R1,solarPV,2040,6.00000000000
 4,2064,R1,solarPV,2040,6.00000000000
 4,2065,R1,solarPV,2040,6.00000000000
 4,2069,R1,solarPV,2040,6.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
@@ -36,6 +42,8 @@ asset,year,region,technology,installed,capacity
 6,2045,R1,windturbine,2020,10.00000000000
 6,2049,R1,windturbine,2020,10.00000000000
 7,2050,R1,windturbine,2045,6.75000000000
+7,2054,R1,windturbine,2045,6.75000000000
+7,2055,R1,windturbine,2045,6.75000000000
 7,2059,R1,windturbine,2045,6.75000000000
 7,2060,R1,windturbine,2045,6.75000000000
 7,2064,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 e43fa2d5..470b2a93 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,18 +1,18 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,4.06670000000
-2,2055,R1,2025,gasCCGT,4.06670000000
-2,2059,R1,2025,gasCCGT,4.06670000000
-2,2060,R1,2025,gasCCGT,4.06670000000
-2,2064,R1,2025,gasCCGT,4.06670000000
+2,2050,R1,2025,solarPV,9.15000000000
+2,2054,R1,2025,solarPV,9.15000000000
 3,2050,R1,2030,solarPV,6.00000000000
+3,2054,R1,2030,solarPV,6.00000000000
 3,2055,R1,2030,solarPV,6.00000000000
 3,2059,R1,2030,solarPV,6.00000000000
 4,2050,R1,2035,solarPV,9.19000000000
+4,2054,R1,2035,solarPV,9.19000000000
 4,2055,R1,2035,solarPV,9.19000000000
 4,2059,R1,2035,solarPV,9.19000000000
 4,2060,R1,2035,solarPV,9.19000000000
 4,2064,R1,2035,solarPV,9.19000000000
 5,2050,R1,2040,solarPV,6.00000000000
+5,2054,R1,2040,solarPV,6.00000000000
 5,2055,R1,2040,solarPV,6.00000000000
 5,2059,R1,2040,solarPV,6.00000000000
 5,2060,R1,2040,solarPV,6.00000000000
@@ -20,6 +20,7 @@ asset,year,region,installed,technology,capacity
 5,2065,R1,2040,solarPV,6.00000000000
 5,2069,R1,2040,solarPV,6.00000000000
 6,2050,R1,2045,solarPV,16.91000000000
+6,2054,R1,2045,solarPV,16.91000000000
 6,2055,R1,2045,solarPV,16.91000000000
 6,2059,R1,2045,solarPV,16.91000000000
 6,2060,R1,2045,solarPV,16.91000000000
@@ -29,6 +30,7 @@ asset,year,region,installed,technology,capacity
 6,2070,R1,2045,solarPV,16.91000000000
 6,2074,R1,2045,solarPV,16.91000000000
 7,2050,R1,2045,windturbine,6.75000000000
+7,2054,R1,2045,windturbine,6.75000000000
 7,2055,R1,2045,windturbine,6.75000000000
 7,2059,R1,2045,windturbine,6.75000000000
 7,2060,R1,2045,windturbine,6.75000000000
@@ -37,3 +39,13 @@ asset,year,region,installed,technology,capacity
 7,2069,R1,2045,windturbine,6.75000000000
 7,2070,R1,2045,windturbine,6.75000000000
 7,2074,R1,2045,windturbine,6.75000000000
+8,2055,R1,2050,solarPV,9.15000000000
+8,2059,R1,2050,solarPV,9.15000000000
+8,2060,R1,2050,solarPV,9.15000000000
+8,2064,R1,2050,solarPV,9.15000000000
+8,2065,R1,2050,solarPV,9.15000000000
+8,2069,R1,2050,solarPV,9.15000000000
+8,2070,R1,2050,solarPV,9.15000000000
+8,2074,R1,2050,solarPV,9.15000000000
+8,2075,R1,2050,solarPV,9.15000000000
+8,2079,R1,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 7c78dd4d..704d93ac 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 398163be..9a2e226c 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -29,12 +29,6 @@ def generate_model_1() -> None:
     examples.copy_model(name="default", path=parent_path, overwrite=True)
     os.rename(parent_path / "model", model_path)
 
-    # Change maximum_iterations to 100 (Undocumented)
-    settings_file = model_path / "settings.toml"
-    modify_toml(
-        settings_file, lambda settings: settings.update({"maximum_iterations": 100})
-    )
-
     # Copy wind commodity in power sector -> solar
     add_new_commodity(model_path, "solar", "power", "wind")
 
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
index 79ba0a01..2c637fd8 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,7 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,7.50000000000
-1,2035,R1,gassupply1,2030,55.76380000000
-1,2040,R1,gassupply1,2030,55.76380000000
-1,2045,R1,gassupply1,2030,55.76380000000
-1,2050,R1,gassupply1,2030,55.76380000000
-1,2069,R1,gassupply1,2030,55.76380000000
+asset,year,region,installed,technology,capacity
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2035,R1,2030,gassupply1,24.95650000000
+1,2040,R1,2030,gassupply1,24.95650000000
+1,2045,R1,2030,gassupply1,24.95650000000
+1,2050,R1,2030,gassupply1,24.95650000000
+1,2069,R1,2030,gassupply1,24.95650000000
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 90e6de90..720f4883 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,55.76380000000
-1,2040,R1,2030,gassupply1,55.76380000000
-1,2045,R1,2030,gassupply1,55.76380000000
-1,2050,R1,2030,gassupply1,55.76380000000
-1,2069,R1,2030,gassupply1,55.76380000000
+1,2035,R1,2030,gassupply1,24.95650000000
+1,2040,R1,2030,gassupply1,24.95650000000
+1,2045,R1,2030,gassupply1,24.95650000000
+1,2050,R1,2030,gassupply1,24.95650000000
+1,2069,R1,2030,gassupply1,24.95650000000
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 7bb76395..5186f9e0 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,55.76380000000
-1,2045,R1,2030,gassupply1,55.76380000000
-1,2050,R1,2030,gassupply1,55.76380000000
-1,2069,R1,2030,gassupply1,55.76380000000
+1,2040,R1,2030,gassupply1,24.95650000000
+1,2045,R1,2030,gassupply1,24.95650000000
+1,2050,R1,2030,gassupply1,24.95650000000
+1,2069,R1,2030,gassupply1,24.95650000000
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 376cd655..968b462b 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,55.76380000000
-1,2050,R1,2030,gassupply1,55.76380000000
-1,2069,R1,2030,gassupply1,55.76380000000
+1,2045,R1,2030,gassupply1,24.95650000000
+1,2050,R1,2030,gassupply1,24.95650000000
+1,2069,R1,2030,gassupply1,24.95650000000
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 62ecbe98..f7e7b55e 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,55.76380000000
-1,2055,R1,2030,gassupply1,55.76380000000
-1,2069,R1,2030,gassupply1,55.76380000000
+1,2050,R1,2030,gassupply1,24.95650000000
+1,2055,R1,2030,gassupply1,24.95650000000
+1,2069,R1,2030,gassupply1,24.95650000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
index b0c8d233..22e82dbb 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
@@ -19,10 +19,10 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2030,0.21770000000
+solarPV,R1,R1,A1,power,retrofit,2030,4.20560000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,5.01210000000
 solarPV,R1,R1,A2,power,retrofit,2030,0.39110000000
 solarPV,R1,R1,A2,power,retrofit,2030,4.20560000000
 windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
@@ -32,59 +32,58 @@ gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
 heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2035,0.21770000000
+solarPV,R1,R1,A1,power,retrofit,2035,4.20560000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,5.01210000000
 solarPV,R1,R1,A2,power,retrofit,2035,0.39110000000
 solarPV,R1,R1,A2,power,retrofit,2035,4.20560000000
 windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2035,5.01210000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,8.26380000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,47.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.45650000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,22.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
 heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.21770000000
+solarPV,R1,R1,A1,power,retrofit,2040,4.20560000000
 solarPV,R1,R1,A1,power,retrofit,2040,0.27940000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,5.01210000000
 solarPV,R1,R1,A2,power,retrofit,2040,0.39110000000
 solarPV,R1,R1,A2,power,retrofit,2040,4.20560000000
 solarPV,R1,R1,A2,power,retrofit,2040,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2040,5.01210000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,8.26380000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,47.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.45650000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,22.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
 heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
 solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.21770000000
+solarPV,R1,R1,A1,power,retrofit,2045,4.20560000000
 solarPV,R1,R1,A1,power,retrofit,2045,0.27940000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,5.01210000000
 solarPV,R1,R1,A2,power,retrofit,2045,0.39110000000
 solarPV,R1,R1,A2,power,retrofit,2045,4.20560000000
 solarPV,R1,R1,A2,power,retrofit,2045,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2045,5.01210000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,8.26380000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,47.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.45650000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,22.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
 heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,0.90660000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.21770000000
+solarPV,R1,R1,A1,power,retrofit,2050,4.20560000000
 solarPV,R1,R1,A1,power,retrofit,2050,0.27940000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.53070000000
-windturbine,R1,R1,A1,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.69840000000
+windturbine,R1,R1,A1,power,retrofit,2050,5.01210000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.87220000000
 solarPV,R1,R1,A2,power,retrofit,2050,4.20560000000
 solarPV,R1,R1,A2,power,retrofit,2050,10.00000000000
 solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
 windturbine,R1,R1,A2,power,retrofit,2050,5.01210000000
 windturbine,R1,R1,A2,power,retrofit,2050,6.87220000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,8.26380000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,47.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.45650000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,22.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
index f7047e34..25f0e059 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.39520000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.93480000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.62720000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.18700000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.59280000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.40220000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.66670000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.28040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.39520000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.93480000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.62720000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.18700000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.59280000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.40220000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.66670000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.28040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18560000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.80430000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.78530000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.56090000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.79040000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.86950000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.70620000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.37390000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.47190000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03990000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.16820000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72910000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.70930000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07160000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25230000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09610000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.47190000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03990000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16820000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72910000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70930000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07160000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25230000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09610000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.42670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21440000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50450000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.20640000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.94750000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11130000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33640000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46460000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.59370000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.11510000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.16820000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.61190000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.89190000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.18640000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25230000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.92080000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59370000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11510000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16820000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.61190000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89190000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18640000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25230000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.92080000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.79200000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.45560000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50450000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.85870000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.19100000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.26680000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33640000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.23150000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.59790000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.13950000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16740000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.52060000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.89790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.22650000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25110000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.78410000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59790000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.13950000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16740000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.52060000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.22650000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25110000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.78410000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.80220000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55660000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50220000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.58780000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.19860000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.32490000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33480000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,1.04990000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.73320000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.16150000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16680000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.45030000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.10090000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.25950000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.67900000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73320000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.16150000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16680000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.45030000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10090000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.25950000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.67900000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.20820000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62340000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50030000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.37960000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.46930000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.36920000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33350000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.91020000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.70080000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.19300000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.39840000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.05210000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.31070000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24560000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.60140000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.70080000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19300000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.39840000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05210000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31070000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24560000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.60140000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.10920000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.74890000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49130000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.22590000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.40390000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.44260000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.32750000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.80700000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
index f44e45fd..826d2c60 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,37 +1,28 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,R1,solarPV,2020,0.78230000000
-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,4.42340000000
-3,2035,R1,solarPV,2025,4.42340000000
-3,2040,R1,solarPV,2025,4.42340000000
-3,2045,R1,solarPV,2025,4.42340000000
-3,2049,R1,solarPV,2025,4.42340000000
-3,2050,R1,solarPV,2025,4.42340000000
-3,2054,R1,solarPV,2025,4.42340000000
-4,2025,R1,windturbine,2020,20.00000000000
-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,5.01210000000
-5,2035,R1,windturbine,2025,5.01210000000
-5,2040,R1,windturbine,2025,5.01210000000
-5,2045,R1,windturbine,2025,5.01210000000
-5,2049,R1,windturbine,2025,5.01210000000
-5,2050,R1,windturbine,2025,5.01210000000
-5,2054,R1,windturbine,2025,5.01210000000
+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,2030,R1,solarPV,2025,8.41130000000
+2,2035,R1,solarPV,2025,8.41130000000
+2,2040,R1,solarPV,2025,8.41130000000
+2,2045,R1,solarPV,2025,8.41130000000
+2,2049,R1,solarPV,2025,8.41130000000
+2,2050,R1,solarPV,2025,8.41130000000
+2,2054,R1,solarPV,2025,8.41130000000
+3,2025,R1,windturbine,2020,20.00000000000
+3,2030,R1,windturbine,2020,20.00000000000
+3,2035,R1,windturbine,2020,20.00000000000
+3,2040,R1,windturbine,2020,20.00000000000
+3,2045,R1,windturbine,2020,20.00000000000
+3,2049,R1,windturbine,2020,20.00000000000
+4,2030,R1,windturbine,2025,10.02420000000
+4,2035,R1,windturbine,2025,10.02420000000
+4,2040,R1,windturbine,2025,10.02420000000
+4,2045,R1,windturbine,2025,10.02420000000
+4,2049,R1,windturbine,2025,10.02420000000
+4,2050,R1,windturbine,2025,10.02420000000
+4,2054,R1,windturbine,2025,10.02420000000
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 58c35ebe..5c1bbb7f 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
@@ -9,26 +9,17 @@ asset,year,region,installed,technology,capacity
 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,2064,R1,2025,gasCCGT,4.00000000000
-4,2030,R1,2025,solarPV,4.42340000000
-4,2035,R1,2025,solarPV,4.42340000000
-4,2040,R1,2025,solarPV,4.42340000000
-4,2045,R1,2025,solarPV,4.42340000000
-4,2049,R1,2025,solarPV,4.42340000000
-4,2050,R1,2025,solarPV,4.42340000000
-4,2054,R1,2025,solarPV,4.42340000000
-5,2030,R1,2025,windturbine,5.01210000000
-5,2035,R1,2025,windturbine,5.01210000000
-5,2040,R1,2025,windturbine,5.01210000000
-5,2045,R1,2025,windturbine,5.01210000000
-5,2049,R1,2025,windturbine,5.01210000000
-5,2050,R1,2025,windturbine,5.01210000000
-5,2054,R1,2025,windturbine,5.01210000000
+3,2030,R1,2025,solarPV,8.41130000000
+3,2035,R1,2025,solarPV,8.41130000000
+3,2040,R1,2025,solarPV,8.41130000000
+3,2045,R1,2025,solarPV,8.41130000000
+3,2049,R1,2025,solarPV,8.41130000000
+3,2050,R1,2025,solarPV,8.41130000000
+3,2054,R1,2025,solarPV,8.41130000000
+4,2030,R1,2025,windturbine,10.02420000000
+4,2035,R1,2025,windturbine,10.02420000000
+4,2040,R1,2025,windturbine,10.02420000000
+4,2045,R1,2025,windturbine,10.02420000000
+4,2049,R1,2025,windturbine,10.02420000000
+4,2050,R1,2025,windturbine,10.02420000000
+4,2054,R1,2025,windturbine,10.02420000000
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 d0e5732e..218c07ff 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
@@ -7,30 +7,22 @@ asset,year,region,installed,technology,capacity
 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,2064,R1,2025,gasCCGT,4.00000000000
-4,2035,R1,2025,solarPV,4.42340000000
-4,2040,R1,2025,solarPV,4.42340000000
-4,2045,R1,2025,solarPV,4.42340000000
-4,2049,R1,2025,solarPV,4.42340000000
-4,2050,R1,2025,solarPV,4.42340000000
-4,2054,R1,2025,solarPV,4.42340000000
-5,2035,R1,2025,windturbine,5.01210000000
-5,2040,R1,2025,windturbine,5.01210000000
-5,2045,R1,2025,windturbine,5.01210000000
-5,2049,R1,2025,windturbine,5.01210000000
-5,2050,R1,2025,windturbine,5.01210000000
-5,2054,R1,2025,windturbine,5.01210000000
-6,2040,R1,2035,solarPV,10.27940000000
-6,2045,R1,2035,solarPV,10.27940000000
-6,2049,R1,2035,solarPV,10.27940000000
-6,2050,R1,2035,solarPV,10.27940000000
-6,2054,R1,2035,solarPV,10.27940000000
-6,2055,R1,2035,solarPV,10.27940000000
-6,2064,R1,2035,solarPV,10.27940000000
+3,2035,R1,2025,solarPV,8.41130000000
+3,2040,R1,2025,solarPV,8.41130000000
+3,2045,R1,2025,solarPV,8.41130000000
+3,2049,R1,2025,solarPV,8.41130000000
+3,2050,R1,2025,solarPV,8.41130000000
+3,2054,R1,2025,solarPV,8.41130000000
+4,2035,R1,2025,windturbine,10.02420000000
+4,2040,R1,2025,windturbine,10.02420000000
+4,2045,R1,2025,windturbine,10.02420000000
+4,2049,R1,2025,windturbine,10.02420000000
+4,2050,R1,2025,windturbine,10.02420000000
+4,2054,R1,2025,windturbine,10.02420000000
+5,2040,R1,2035,solarPV,10.27940000000
+5,2045,R1,2035,solarPV,10.27940000000
+5,2049,R1,2035,solarPV,10.27940000000
+5,2050,R1,2035,solarPV,10.27940000000
+5,2054,R1,2035,solarPV,10.27940000000
+5,2055,R1,2035,solarPV,10.27940000000
+5,2064,R1,2035,solarPV,10.27940000000
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 8224b2c2..30bdc897 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
@@ -5,27 +5,20 @@ asset,year,region,installed,technology,capacity
 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,2064,R1,2025,gasCCGT,4.00000000000
-4,2040,R1,2025,solarPV,4.42340000000
-4,2045,R1,2025,solarPV,4.42340000000
-4,2049,R1,2025,solarPV,4.42340000000
-4,2050,R1,2025,solarPV,4.42340000000
-4,2054,R1,2025,solarPV,4.42340000000
-5,2040,R1,2025,windturbine,5.01210000000
-5,2045,R1,2025,windturbine,5.01210000000
-5,2049,R1,2025,windturbine,5.01210000000
-5,2050,R1,2025,windturbine,5.01210000000
-5,2054,R1,2025,windturbine,5.01210000000
-6,2040,R1,2035,solarPV,10.27940000000
-6,2045,R1,2035,solarPV,10.27940000000
-6,2049,R1,2035,solarPV,10.27940000000
-6,2050,R1,2035,solarPV,10.27940000000
-6,2054,R1,2035,solarPV,10.27940000000
-6,2055,R1,2035,solarPV,10.27940000000
-6,2064,R1,2035,solarPV,10.27940000000
+3,2040,R1,2025,solarPV,8.41130000000
+3,2045,R1,2025,solarPV,8.41130000000
+3,2049,R1,2025,solarPV,8.41130000000
+3,2050,R1,2025,solarPV,8.41130000000
+3,2054,R1,2025,solarPV,8.41130000000
+4,2040,R1,2025,windturbine,10.02420000000
+4,2045,R1,2025,windturbine,10.02420000000
+4,2049,R1,2025,windturbine,10.02420000000
+4,2050,R1,2025,windturbine,10.02420000000
+4,2054,R1,2025,windturbine,10.02420000000
+5,2040,R1,2035,solarPV,10.27940000000
+5,2045,R1,2035,solarPV,10.27940000000
+5,2049,R1,2035,solarPV,10.27940000000
+5,2050,R1,2035,solarPV,10.27940000000
+5,2054,R1,2035,solarPV,10.27940000000
+5,2055,R1,2035,solarPV,10.27940000000
+5,2064,R1,2035,solarPV,10.27940000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
index 6cb5e5f9..40e25f85 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,45 +1,31 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,4.00000000000
-0,2049,R1,gasCCGT,2025,4.00000000000
-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,0.90660000000
-1,2054,R1,gasCCGT,2045,0.90660000000
-1,2055,R1,gasCCGT,2045,0.90660000000
-1,2064,R1,gasCCGT,2045,0.90660000000
-1,2065,R1,gasCCGT,2045,0.90660000000
-1,2074,R1,gasCCGT,2045,0.90660000000
-1,2075,R1,gasCCGT,2045,0.90660000000
-1,2084,R1,gasCCGT,2045,0.90660000000
-2,2045,R1,solarPV,2020,0.78230000000
-2,2049,R1,solarPV,2020,0.78230000000
-3,2045,R1,solarPV,2025,4.42340000000
-3,2049,R1,solarPV,2025,4.42340000000
-3,2050,R1,solarPV,2025,4.42340000000
-3,2054,R1,solarPV,2025,4.42340000000
-4,2045,R1,solarPV,2035,10.27940000000
-4,2049,R1,solarPV,2035,10.27940000000
-4,2050,R1,solarPV,2035,10.27940000000
-4,2054,R1,solarPV,2035,10.27940000000
-4,2055,R1,solarPV,2035,10.27940000000
-4,2064,R1,solarPV,2035,10.27940000000
-5,2050,R1,solarPV,2045,30.53070000000
-5,2054,R1,solarPV,2045,30.53070000000
-5,2055,R1,solarPV,2045,30.53070000000
-5,2064,R1,solarPV,2045,30.53070000000
-5,2065,R1,solarPV,2045,30.53070000000
-5,2074,R1,solarPV,2045,30.53070000000
-6,2045,R1,windturbine,2020,20.00000000000
-6,2049,R1,windturbine,2020,20.00000000000
-7,2045,R1,windturbine,2025,5.01210000000
-7,2049,R1,windturbine,2025,5.01210000000
-7,2050,R1,windturbine,2025,5.01210000000
-7,2054,R1,windturbine,2025,5.01210000000
-8,2050,R1,windturbine,2045,16.87220000000
-8,2054,R1,windturbine,2045,16.87220000000
-8,2055,R1,windturbine,2045,16.87220000000
-8,2064,R1,windturbine,2045,16.87220000000
-8,2065,R1,windturbine,2045,16.87220000000
-8,2074,R1,windturbine,2045,16.87220000000
+0,2045,R1,solarPV,2020,0.78230000000
+0,2049,R1,solarPV,2020,0.78230000000
+1,2045,R1,solarPV,2025,8.41130000000
+1,2049,R1,solarPV,2025,8.41130000000
+1,2050,R1,solarPV,2025,8.41130000000
+1,2054,R1,solarPV,2025,8.41130000000
+2,2045,R1,solarPV,2035,10.27940000000
+2,2049,R1,solarPV,2035,10.27940000000
+2,2050,R1,solarPV,2035,10.27940000000
+2,2054,R1,solarPV,2035,10.27940000000
+2,2055,R1,solarPV,2035,10.27940000000
+2,2064,R1,solarPV,2035,10.27940000000
+3,2050,R1,solarPV,2045,35.69840000000
+3,2054,R1,solarPV,2045,35.69840000000
+3,2055,R1,solarPV,2045,35.69840000000
+3,2064,R1,solarPV,2045,35.69840000000
+3,2065,R1,solarPV,2045,35.69840000000
+3,2074,R1,solarPV,2045,35.69840000000
+4,2045,R1,windturbine,2020,20.00000000000
+4,2049,R1,windturbine,2020,20.00000000000
+5,2045,R1,windturbine,2025,10.02420000000
+5,2049,R1,windturbine,2025,10.02420000000
+5,2050,R1,windturbine,2025,10.02420000000
+5,2054,R1,windturbine,2025,10.02420000000
+6,2050,R1,windturbine,2045,13.74440000000
+6,2054,R1,windturbine,2045,13.74440000000
+6,2055,R1,windturbine,2045,13.74440000000
+6,2064,R1,windturbine,2045,13.74440000000
+6,2065,R1,windturbine,2045,13.74440000000
+6,2074,R1,windturbine,2045,13.74440000000
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 d22e8ed7..7ecfe57c 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,33 +1,21 @@
 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,2064,R1,2025,gasCCGT,4.00000000000
-3,2050,R1,2025,solarPV,4.42340000000
-3,2054,R1,2025,solarPV,4.42340000000
-4,2050,R1,2025,windturbine,5.01210000000
-4,2054,R1,2025,windturbine,5.01210000000
-5,2050,R1,2035,solarPV,10.27940000000
-5,2054,R1,2035,solarPV,10.27940000000
-5,2055,R1,2035,solarPV,10.27940000000
-5,2064,R1,2035,solarPV,10.27940000000
-6,2050,R1,2045,gasCCGT,0.90660000000
-6,2054,R1,2045,gasCCGT,0.90660000000
-6,2055,R1,2045,gasCCGT,0.90660000000
-6,2064,R1,2045,gasCCGT,0.90660000000
-6,2065,R1,2045,gasCCGT,0.90660000000
-6,2074,R1,2045,gasCCGT,0.90660000000
-6,2075,R1,2045,gasCCGT,0.90660000000
-6,2084,R1,2045,gasCCGT,0.90660000000
-7,2050,R1,2045,solarPV,30.53070000000
-7,2054,R1,2045,solarPV,30.53070000000
-7,2055,R1,2045,solarPV,30.53070000000
-7,2064,R1,2045,solarPV,30.53070000000
-7,2065,R1,2045,solarPV,30.53070000000
-7,2074,R1,2045,solarPV,30.53070000000
-8,2050,R1,2045,windturbine,16.87220000000
-8,2054,R1,2045,windturbine,16.87220000000
-8,2055,R1,2045,windturbine,16.87220000000
-8,2064,R1,2045,windturbine,16.87220000000
-8,2065,R1,2045,windturbine,16.87220000000
-8,2074,R1,2045,windturbine,16.87220000000
+2,2050,R1,2025,solarPV,8.41130000000
+2,2054,R1,2025,solarPV,8.41130000000
+3,2050,R1,2025,windturbine,10.02420000000
+3,2054,R1,2025,windturbine,10.02420000000
+4,2050,R1,2035,solarPV,10.27940000000
+4,2054,R1,2035,solarPV,10.27940000000
+4,2055,R1,2035,solarPV,10.27940000000
+4,2064,R1,2035,solarPV,10.27940000000
+5,2050,R1,2045,solarPV,35.69840000000
+5,2054,R1,2045,solarPV,35.69840000000
+5,2055,R1,2045,solarPV,35.69840000000
+5,2064,R1,2045,solarPV,35.69840000000
+5,2065,R1,2045,solarPV,35.69840000000
+5,2074,R1,2045,solarPV,35.69840000000
+6,2050,R1,2045,windturbine,13.74440000000
+6,2054,R1,2045,windturbine,13.74440000000
+6,2055,R1,2045,windturbine,13.74440000000
+6,2064,R1,2045,windturbine,13.74440000000
+6,2065,R1,2045,windturbine,13.74440000000
+6,2074,R1,2045,windturbine,13.74440000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
index 7c78dd4d..704d93ac 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
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 7bdf75ce..f2ad7b02 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,9 +1,3 @@
 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.53180000000
-1,2035,R1,2025,gassupply1,4.53180000000
-1,2040,R1,2025,gassupply1,4.53180000000
-1,2045,R1,2025,gassupply1,4.53180000000
-1,2050,R1,2025,gassupply1,4.53180000000
-1,2064,R1,2025,gassupply1,4.53180000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
index f1b98d40..d48e7ac8 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
@@ -1,15 +1,7 @@
-asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,7.50000000000
-1,2030,R1,gassupply1,2025,4.53180000000
-1,2035,R1,gassupply1,2025,4.53180000000
-1,2040,R1,gassupply1,2025,4.53180000000
-1,2045,R1,gassupply1,2025,4.53180000000
-1,2050,R1,gassupply1,2025,4.53180000000
-1,2064,R1,gassupply1,2025,4.53180000000
-2,2035,R1,gassupply1,2030,28.24690000000
-2,2040,R1,gassupply1,2030,28.24690000000
-2,2045,R1,gassupply1,2030,28.24690000000
-2,2050,R1,gassupply1,2030,28.24690000000
-2,2064,R1,gassupply1,2030,28.24690000000
-2,2065,R1,gassupply1,2030,28.24690000000
-2,2069,R1,gassupply1,2030,28.24690000000
+asset,year,region,installed,technology,capacity
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2035,R1,2030,gassupply1,18.56000000000
+1,2040,R1,2030,gassupply1,18.56000000000
+1,2045,R1,2030,gassupply1,18.56000000000
+1,2050,R1,2030,gassupply1,18.56000000000
+1,2069,R1,2030,gassupply1,18.56000000000
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 469b0272..2c29e7f6 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,13 +1,6 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,4.53180000000
-1,2040,R1,2025,gassupply1,4.53180000000
-1,2045,R1,2025,gassupply1,4.53180000000
-1,2050,R1,2025,gassupply1,4.53180000000
-1,2064,R1,2025,gassupply1,4.53180000000
-2,2035,R1,2030,gassupply1,28.24690000000
-2,2040,R1,2030,gassupply1,28.24690000000
-2,2045,R1,2030,gassupply1,28.24690000000
-2,2050,R1,2030,gassupply1,28.24690000000
-2,2064,R1,2030,gassupply1,28.24690000000
-2,2065,R1,2030,gassupply1,28.24690000000
-2,2069,R1,2030,gassupply1,28.24690000000
+1,2035,R1,2030,gassupply1,18.56000000000
+1,2040,R1,2030,gassupply1,18.56000000000
+1,2045,R1,2030,gassupply1,18.56000000000
+1,2050,R1,2030,gassupply1,18.56000000000
+1,2069,R1,2030,gassupply1,18.56000000000
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 e5e3f682..4084954e 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,11 +1,5 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,4.53180000000
-1,2045,R1,2025,gassupply1,4.53180000000
-1,2050,R1,2025,gassupply1,4.53180000000
-1,2064,R1,2025,gassupply1,4.53180000000
-2,2040,R1,2030,gassupply1,28.24690000000
-2,2045,R1,2030,gassupply1,28.24690000000
-2,2050,R1,2030,gassupply1,28.24690000000
-2,2064,R1,2030,gassupply1,28.24690000000
-2,2065,R1,2030,gassupply1,28.24690000000
-2,2069,R1,2030,gassupply1,28.24690000000
+1,2040,R1,2030,gassupply1,18.56000000000
+1,2045,R1,2030,gassupply1,18.56000000000
+1,2050,R1,2030,gassupply1,18.56000000000
+1,2069,R1,2030,gassupply1,18.56000000000
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 0dcaa05b..dd3195af 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,9 +1,4 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,4.53180000000
-1,2050,R1,2025,gassupply1,4.53180000000
-1,2064,R1,2025,gassupply1,4.53180000000
-2,2045,R1,2030,gassupply1,28.24690000000
-2,2050,R1,2030,gassupply1,28.24690000000
-2,2064,R1,2030,gassupply1,28.24690000000
-2,2065,R1,2030,gassupply1,28.24690000000
-2,2069,R1,2030,gassupply1,28.24690000000
+1,2045,R1,2030,gassupply1,18.56000000000
+1,2050,R1,2030,gassupply1,18.56000000000
+1,2069,R1,2030,gassupply1,18.56000000000
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 39988ada..a329710d 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,9 +1,4 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,4.53180000000
-1,2055,R1,2025,gassupply1,4.53180000000
-1,2064,R1,2025,gassupply1,4.53180000000
-2,2050,R1,2030,gassupply1,28.24690000000
-2,2055,R1,2030,gassupply1,28.24690000000
-2,2064,R1,2030,gassupply1,28.24690000000
-2,2065,R1,2030,gassupply1,28.24690000000
-2,2069,R1,2030,gassupply1,28.24690000000
+1,2050,R1,2030,gassupply1,18.56000000000
+1,2055,R1,2030,gassupply1,18.56000000000
+1,2069,R1,2030,gassupply1,18.56000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
index e8ab59d7..88314c38 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
@@ -17,71 +17,51 @@ gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A2,residential,retrofit,2030,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.04070000000
+solarPV,R1,R1,A1,power,retrofit,2030,11.04070000000
 windturbine,R1,R1,A1,power,retrofit,2030,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2030,4.00000000000
-solarPV,R1,R1,A2,power,retrofit,2030,2.04070000000
+solarPV,R1,R1,A2,power,retrofit,2030,11.04070000000
 windturbine,R1,R1,A2,power,retrofit,2030,9.47970000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.26590000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,retrofit,2030,2.26590000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
 gasboiler,R1,R1,A2,residential,retrofit,2035,7.20000000000
 heatpump,R1,R1,A2,residential,retrofit,2035,28.80000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,2.04070000000
+solarPV,R1,R1,A1,power,retrofit,2035,11.04070000000
 windturbine,R1,R1,A1,power,retrofit,2035,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2035,4.00000000000
-solarPV,R1,R1,A2,power,retrofit,2035,2.04070000000
+solarPV,R1,R1,A2,power,retrofit,2035,11.04070000000
 windturbine,R1,R1,A2,power,retrofit,2035,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.26590000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,14.12340000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,2.26590000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,14.12340000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,9.28000000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,9.28000000000
 gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
 gasboiler,R1,R1,A2,residential,retrofit,2040,7.20000000000
 heatpump,R1,R1,A2,residential,retrofit,2040,28.80000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,4.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.04070000000
+solarPV,R1,R1,A1,power,retrofit,2040,11.04070000000
 windturbine,R1,R1,A1,power,retrofit,2040,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2040,4.00000000000
-solarPV,R1,R1,A2,power,retrofit,2040,2.04070000000
+solarPV,R1,R1,A2,power,retrofit,2040,11.04070000000
 windturbine,R1,R1,A2,power,retrofit,2040,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.26590000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,14.12340000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,2.26590000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,14.12340000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,9.28000000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,9.28000000000
 gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
 gasboiler,R1,R1,A2,residential,retrofit,2045,7.44000000000
 heatpump,R1,R1,A2,residential,retrofit,2045,40.56000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,4.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,2.04070000000
+solarPV,R1,R1,A1,power,retrofit,2045,11.04070000000
 windturbine,R1,R1,A1,power,retrofit,2045,9.47970000000
-gasCCGT,R1,R1,A2,power,retrofit,2045,4.00000000000
-solarPV,R1,R1,A2,power,retrofit,2045,2.04070000000
+solarPV,R1,R1,A2,power,retrofit,2045,11.04070000000
 windturbine,R1,R1,A2,power,retrofit,2045,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.26590000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,14.12340000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,2.26590000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,14.12340000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,9.28000000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,9.28000000000
 gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
 gasboiler,R1,R1,A2,residential,retrofit,2050,7.44000000000
 heatpump,R1,R1,A2,residential,retrofit,2050,40.56000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,4.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,2.04070000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.04070000000
 solarPV,R1,R1,A1,power,retrofit,2050,15.07000000000
 windturbine,R1,R1,A1,power,retrofit,2050,8.47860000000
-gasCCGT,R1,R1,A2,power,retrofit,2050,4.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,2.04070000000
+solarPV,R1,R1,A2,power,retrofit,2050,11.04070000000
 solarPV,R1,R1,A2,power,retrofit,2050,15.07000000000
 windturbine,R1,R1,A2,power,retrofit,2050,8.47860000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.26590000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,14.12340000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,2.26590000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,14.12340000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,9.28000000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,9.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
index 335e260d..a638a612 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.41420000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.99750000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63100000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.19950000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.62130000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.49630000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.67240000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.29930000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.41420000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.99750000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63100000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.19950000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.62130000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.49630000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67240000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.29930000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.24260000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.99260000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.79670000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.59850000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.82840000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.99500000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.71380000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.39900000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.74880000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04060000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72930000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.12580000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07340000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09640000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.74880000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04060000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72930000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12580000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07340000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09640000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.26720000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.22130000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.20780000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.50460000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11440000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46520000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.98150000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.32450000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.67450000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.47490000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.50560000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,1.01460000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.98150000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.32450000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.67450000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47490000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50560000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.01460000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.96530000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.12570000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.04630000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.97000000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.69950000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.35660000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.21420000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.40680000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.63970000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.82390000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.63470000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.96270000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21420000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.40680000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.63970000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82390000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.63470000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.96270000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.66340000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.41740000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.94430000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.43540000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.87910000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,1.28780000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.54070000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.41880000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.60330000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.31360000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.65980000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.90840000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.54070000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.41880000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.60330000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.31360000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.65980000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.90840000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.64270000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.50990000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.83740000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,3.08820000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.92190000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,1.21580000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.16280000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.51130000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.16680000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.58750000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.74580000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.80680000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25030000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.88500000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.16280000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.51130000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16680000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.58750000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.74580000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.80680000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25030000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.88500000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.50080000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.85350000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50050000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.79200000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.32980000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,1.12890000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33370000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,1.18490000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
index dfebe441..166dcff9 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
@@ -1,24 +1,15 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,8.00000000000
-1,2035,R1,gasCCGT,2025,8.00000000000
-1,2040,R1,gasCCGT,2025,8.00000000000
-1,2045,R1,gasCCGT,2025,8.00000000000
-1,2049,R1,gasCCGT,2025,8.00000000000
-1,2050,R1,gasCCGT,2025,8.00000000000
-1,2054,R1,gasCCGT,2025,8.00000000000
-1,2055,R1,gasCCGT,2025,8.00000000000
-1,2064,R1,gasCCGT,2025,8.00000000000
-2,2030,R1,solarPV,2025,4.08140000000
-2,2035,R1,solarPV,2025,4.08140000000
-2,2040,R1,solarPV,2025,4.08140000000
-2,2045,R1,solarPV,2025,4.08140000000
-2,2049,R1,solarPV,2025,4.08140000000
-2,2050,R1,solarPV,2025,4.08140000000
-2,2054,R1,solarPV,2025,4.08140000000
-3,2025,R1,windturbine,2020,18.95930000000
-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
+1,2030,R1,solarPV,2025,22.08140000000
+1,2035,R1,solarPV,2025,22.08140000000
+1,2040,R1,solarPV,2025,22.08140000000
+1,2045,R1,solarPV,2025,22.08140000000
+1,2049,R1,solarPV,2025,22.08140000000
+1,2050,R1,solarPV,2025,22.08140000000
+1,2054,R1,solarPV,2025,22.08140000000
+2,2025,R1,windturbine,2020,18.95930000000
+2,2030,R1,windturbine,2020,18.95930000000
+2,2035,R1,windturbine,2020,18.95930000000
+2,2040,R1,windturbine,2020,18.95930000000
+2,2045,R1,windturbine,2020,18.95930000000
+2,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 a04a9a9a..f77e5ea7 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
@@ -4,19 +4,10 @@ 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,2030,R1,2025,gasCCGT,8.00000000000
-2,2035,R1,2025,gasCCGT,8.00000000000
-2,2040,R1,2025,gasCCGT,8.00000000000
-2,2045,R1,2025,gasCCGT,8.00000000000
-2,2049,R1,2025,gasCCGT,8.00000000000
-2,2050,R1,2025,gasCCGT,8.00000000000
-2,2054,R1,2025,gasCCGT,8.00000000000
-2,2055,R1,2025,gasCCGT,8.00000000000
-2,2064,R1,2025,gasCCGT,8.00000000000
-3,2030,R1,2025,solarPV,4.08140000000
-3,2035,R1,2025,solarPV,4.08140000000
-3,2040,R1,2025,solarPV,4.08140000000
-3,2045,R1,2025,solarPV,4.08140000000
-3,2049,R1,2025,solarPV,4.08140000000
-3,2050,R1,2025,solarPV,4.08140000000
-3,2054,R1,2025,solarPV,4.08140000000
+2,2030,R1,2025,solarPV,22.08140000000
+2,2035,R1,2025,solarPV,22.08140000000
+2,2040,R1,2025,solarPV,22.08140000000
+2,2045,R1,2025,solarPV,22.08140000000
+2,2049,R1,2025,solarPV,22.08140000000
+2,2050,R1,2025,solarPV,22.08140000000
+2,2054,R1,2025,solarPV,22.08140000000
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 fbe6b430..f74f219c 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
@@ -3,17 +3,9 @@ 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,2035,R1,2025,gasCCGT,8.00000000000
-2,2040,R1,2025,gasCCGT,8.00000000000
-2,2045,R1,2025,gasCCGT,8.00000000000
-2,2049,R1,2025,gasCCGT,8.00000000000
-2,2050,R1,2025,gasCCGT,8.00000000000
-2,2054,R1,2025,gasCCGT,8.00000000000
-2,2055,R1,2025,gasCCGT,8.00000000000
-2,2064,R1,2025,gasCCGT,8.00000000000
-3,2035,R1,2025,solarPV,4.08140000000
-3,2040,R1,2025,solarPV,4.08140000000
-3,2045,R1,2025,solarPV,4.08140000000
-3,2049,R1,2025,solarPV,4.08140000000
-3,2050,R1,2025,solarPV,4.08140000000
-3,2054,R1,2025,solarPV,4.08140000000
+2,2035,R1,2025,solarPV,22.08140000000
+2,2040,R1,2025,solarPV,22.08140000000
+2,2045,R1,2025,solarPV,22.08140000000
+2,2049,R1,2025,solarPV,22.08140000000
+2,2050,R1,2025,solarPV,22.08140000000
+2,2054,R1,2025,solarPV,22.08140000000
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 af738706..0e0e5343 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
@@ -2,15 +2,8 @@ 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,8.00000000000
-2,2045,R1,2025,gasCCGT,8.00000000000
-2,2049,R1,2025,gasCCGT,8.00000000000
-2,2050,R1,2025,gasCCGT,8.00000000000
-2,2054,R1,2025,gasCCGT,8.00000000000
-2,2055,R1,2025,gasCCGT,8.00000000000
-2,2064,R1,2025,gasCCGT,8.00000000000
-3,2040,R1,2025,solarPV,4.08140000000
-3,2045,R1,2025,solarPV,4.08140000000
-3,2049,R1,2025,solarPV,4.08140000000
-3,2050,R1,2025,solarPV,4.08140000000
-3,2054,R1,2025,solarPV,4.08140000000
+2,2040,R1,2025,solarPV,22.08140000000
+2,2045,R1,2025,solarPV,22.08140000000
+2,2049,R1,2025,solarPV,22.08140000000
+2,2050,R1,2025,solarPV,22.08140000000
+2,2054,R1,2025,solarPV,22.08140000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
index 750d513b..002f8e65 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
@@ -1,25 +1,15 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasCCGT,2025,8.00000000000
-0,2049,R1,gasCCGT,2025,8.00000000000
-0,2050,R1,gasCCGT,2025,8.00000000000
-0,2054,R1,gasCCGT,2025,8.00000000000
-0,2055,R1,gasCCGT,2025,8.00000000000
-0,2064,R1,gasCCGT,2025,8.00000000000
-1,2045,R1,solarPV,2025,4.08140000000
-1,2049,R1,solarPV,2025,4.08140000000
-1,2050,R1,solarPV,2025,4.08140000000
-1,2054,R1,solarPV,2025,4.08140000000
-2,2050,R1,solarPV,2045,30.14000000000
-2,2054,R1,solarPV,2045,30.14000000000
-2,2055,R1,solarPV,2045,30.14000000000
-2,2064,R1,solarPV,2045,30.14000000000
-2,2065,R1,solarPV,2045,30.14000000000
-2,2074,R1,solarPV,2045,30.14000000000
-3,2045,R1,windturbine,2020,18.95930000000
-3,2049,R1,windturbine,2020,18.95930000000
-4,2050,R1,windturbine,2045,16.95720000000
-4,2054,R1,windturbine,2045,16.95720000000
-4,2055,R1,windturbine,2045,16.95720000000
-4,2064,R1,windturbine,2045,16.95720000000
-4,2065,R1,windturbine,2045,16.95720000000
-4,2074,R1,windturbine,2045,16.95720000000
+0,2045,R1,solarPV,2025,22.08140000000
+0,2049,R1,solarPV,2025,22.08140000000
+0,2050,R1,solarPV,2025,22.08140000000
+0,2054,R1,solarPV,2025,22.08140000000
+1,2050,R1,solarPV,2045,30.14000000000
+1,2054,R1,solarPV,2045,30.14000000000
+1,2055,R1,solarPV,2045,30.14000000000
+1,2074,R1,solarPV,2045,30.14000000000
+2,2045,R1,windturbine,2020,18.95930000000
+2,2049,R1,windturbine,2020,18.95930000000
+3,2050,R1,windturbine,2045,16.95720000000
+3,2054,R1,windturbine,2045,16.95720000000
+3,2055,R1,windturbine,2045,16.95720000000
+3,2074,R1,windturbine,2045,16.95720000000
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 7b6a31fa..08a54ed4 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,19 +1,15 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gasCCGT,8.00000000000
-1,2054,R1,2025,gasCCGT,8.00000000000
-1,2055,R1,2025,gasCCGT,8.00000000000
-1,2064,R1,2025,gasCCGT,8.00000000000
-2,2050,R1,2025,solarPV,4.08140000000
-2,2054,R1,2025,solarPV,4.08140000000
-3,2050,R1,2045,solarPV,30.14000000000
-3,2054,R1,2045,solarPV,30.14000000000
-3,2055,R1,2045,solarPV,30.14000000000
-3,2064,R1,2045,solarPV,30.14000000000
-3,2065,R1,2045,solarPV,30.14000000000
-3,2074,R1,2045,solarPV,30.14000000000
-4,2050,R1,2045,windturbine,16.95720000000
-4,2054,R1,2045,windturbine,16.95720000000
-4,2055,R1,2045,windturbine,16.95720000000
-4,2064,R1,2045,windturbine,16.95720000000
-4,2065,R1,2045,windturbine,16.95720000000
-4,2074,R1,2045,windturbine,16.95720000000
+1,2050,R1,2025,solarPV,22.08140000000
+1,2054,R1,2025,solarPV,22.08140000000
+2,2050,R1,2045,solarPV,30.14000000000
+2,2054,R1,2045,solarPV,30.14000000000
+2,2055,R1,2045,solarPV,30.14000000000
+2,2074,R1,2045,solarPV,30.14000000000
+3,2050,R1,2045,windturbine,16.95720000000
+3,2054,R1,2045,windturbine,16.95720000000
+3,2055,R1,2045,windturbine,16.95720000000
+3,2074,R1,2045,windturbine,16.95720000000
+4,2055,R1,2050,solarPV,3.14960000000
+4,2074,R1,2050,solarPV,3.14960000000
+4,2075,R1,2050,solarPV,3.14960000000
+4,2079,R1,2050,solarPV,3.14960000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
index 7c78dd4d..704d93ac 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
index 383b4523..842d3b01 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -1,17 +1,5 @@
-asset,year,technology,region,installed,capacity
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,4.57580000000
-1,2035,gassupply1,R1,2025,4.57580000000
-1,2040,gassupply1,R1,2025,4.57580000000
-1,2045,gassupply1,R1,2025,4.57580000000
-1,2050,gassupply1,R1,2025,4.57580000000
-1,2064,gassupply1,R1,2025,4.57580000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,4.57580000000
-3,2035,gassupply1,R2,2025,4.57580000000
-3,2040,gassupply1,R2,2025,4.57580000000
-3,2045,gassupply1,R2,2025,4.57580000000
-3,2050,gassupply1,R2,2025,4.57580000000
-3,2064,gassupply1,R2,2025,4.57580000000
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2025,R2,2020,gassupply1,15.00000000000
+1,2030,R2,2020,gassupply1,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 04e52a76..c0a7c56e 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,13 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,4.57580000000
-1,2035,R1,2025,gassupply1,4.57580000000
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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.57580000000
-4,2035,R2,2025,gassupply1,4.57580000000
-4,2040,R2,2025,gassupply1,4.57580000000
-4,2045,R2,2025,gassupply1,4.57580000000
-4,2050,R2,2025,gassupply1,4.57580000000
-4,2064,R2,2025,gassupply1,4.57580000000
-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
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+2,2030,R2,2020,gassupply1,7.50000000000
+3,2035,R2,2030,gassupply1,5.28440000000
+3,2040,R2,2030,gassupply1,5.28440000000
+3,2045,R2,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
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 f93dfc37..a783d6f6 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,11 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,4.57580000000
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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.57580000000
-4,2040,R2,2025,gassupply1,4.57580000000
-4,2045,R2,2025,gassupply1,4.57580000000
-4,2050,R2,2025,gassupply1,4.57580000000
-4,2064,R2,2025,gassupply1,4.57580000000
-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
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2035,R2,2030,gassupply1,5.28440000000
+3,2040,R2,2030,gassupply1,5.28440000000
+3,2045,R2,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
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 b0d943a6..1a49b5d3 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,9 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,4.57580000000
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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.57580000000
-4,2045,R2,2025,gassupply1,4.57580000000
-4,2050,R2,2025,gassupply1,4.57580000000
-4,2064,R2,2025,gassupply1,4.57580000000
-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
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2040,R2,2030,gassupply1,5.28440000000
+3,2045,R2,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
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 1afe2898..4ed429aa 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,7 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,4.57580000000
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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.57580000000
-4,2050,R2,2025,gassupply1,4.57580000000
-4,2064,R2,2025,gassupply1,4.57580000000
-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
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2045,R2,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
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 f7ed5304..7d594329 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,7 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,4.57580000000
-1,2055,R1,2025,gassupply1,4.57580000000
-1,2064,R1,2025,gassupply1,4.57580000000
-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.57580000000
-4,2055,R2,2025,gassupply1,4.57580000000
-4,2064,R2,2025,gassupply1,4.57580000000
-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
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2055,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
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 6cc73c39..a372abac 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
@@ -22,89 +22,79 @@ heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2030,9.15000000000
 windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,4.57580000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,4.57580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
 heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
 heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2035,9.15000000000
 solarPV,R2,R2,A1,power,retrofit,2035,6.00000000000
 windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,4.57580000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,5.28440000000
 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
 gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
 heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2040,9.15000000000
 solarPV,R2,R2,A1,power,retrofit,2040,6.00000000000
 solarPV,R2,R2,A1,power,retrofit,2040,9.19000000000
 windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,4.57580000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,5.28440000000
 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
 gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
 heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,4.06670000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.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
-gasCCGT,R2,R2,A1,power,retrofit,2045,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2045,9.15000000000
 solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
 solarPV,R2,R2,A1,power,retrofit,2045,9.19000000000
 solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
 windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,4.57580000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,5.28440000000
 heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,23.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
 solarPV,R1,R1,A1,power,retrofit,2050,6.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
-gasCCGT,R2,R2,A1,power,retrofit,2050,4.06670000000
+solarPV,R2,R2,A1,power,retrofit,2050,9.15000000000
 solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
 solarPV,R2,R2,A1,power,retrofit,2050,9.19000000000
 solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
 solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
 windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,4.57580000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,4.57580000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,5.28440000000
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 a44a8ef9..e867244a 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
@@ -47,291 +47,291 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68190000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.68190000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R2,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68190000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.68190000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81580000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.81580000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.72660000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.72660000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.63740000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.63740000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17720000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.17720000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.14400000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.14400000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.34640000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95810000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.95810000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.27790000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.19680000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.19680000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.52010000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63740000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.63740000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.17720000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.14400000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,14.14400000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R2,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,64.34640000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95810000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.95810000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.27790000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.19680000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.19680000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.52010000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.92880000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.92880000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62840000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.62840000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.35510000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.35510000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04300000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,65.04300000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.28030000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.28030000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38660000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.38660000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.24960000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.24960000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69410000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.69410000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.69990000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.69990000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.20410000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.20410000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.34900000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.34900000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.62730000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.05150000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,1.05150000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.32360000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.32360000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.40810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.40810000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.84190000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.69990000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.69990000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20410000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.20410000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.34900000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,11.34900000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R2,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,51.62730000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.05150000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.05150000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.32360000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.32360000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.40810000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.40810000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.84190000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.11320000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.11320000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.75320000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.75320000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.58540000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.58540000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48970000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.48970000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.40430000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.40430000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.45490000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.45490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.46720000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.46720000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05720000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,52.05720000000,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.69490000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.69490000000,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.08950000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.08950000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.11210000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,9.11210000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,41.40520000000,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,1.04360000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.04360000000,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.15500000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.15500000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.17580000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,9.17580000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62920000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,41.62920000000,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.69490000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.69490000000,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.08950000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.08950000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.11210000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,9.11210000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R2,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,41.40520000000,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,1.04360000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.04360000000,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.15500000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.15500000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.17580000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.17580000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62920000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.62920000000,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,2.09510000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.09510000000,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.43510000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43510000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.36700000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.36700000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30740000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,42.30740000000,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.39320000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.39320000000,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.23440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.23440000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.23960000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,9.23960000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85430000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,41.85430000000,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.76850000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.76850000000,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.09460000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.09460000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.32190000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,7.32190000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,33.21060000000,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,1.15390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.15390000000,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.16250000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.16250000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.38900000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,7.38900000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,33.43380000000,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.76850000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.76850000000,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.09460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.09460000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.32190000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,7.32190000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R2,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,33.21060000000,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,1.15390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15390000000,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.16250000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.16250000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.38900000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,7.38900000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.43380000000,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,2.31470000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.31470000000,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.44920000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.44920000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.59030000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.59030000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.11130000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,34.11130000000,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.54010000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.54010000000,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.24420000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.24420000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.45610000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,7.45610000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65830000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,33.65830000000,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.80750000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.80750000000,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.05480000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.05480000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.15170000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.15170000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31690000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.31690000000,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,1.21220000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.21220000000,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.10530000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.10530000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22750000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.22750000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.47940000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.47940000000,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.80750000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.80750000000,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.05480000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.05480000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15170000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.15170000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R2,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31690000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.31690000000,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,1.21220000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.21220000000,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.10530000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.10530000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22750000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.22750000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.47940000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.47940000000,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,2.43040000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.43040000000,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.34990000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.34990000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45500000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.45500000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98300000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.98300000000,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.61760000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.61760000000,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.17130000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.17130000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30330000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.30330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64460000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.64460000000,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/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
index da6b6511..9e44d4d6 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -1,26 +1,26 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,4.06670000000
-1,2035,gasCCGT,R1,2025,4.06670000000
-1,2040,gasCCGT,R1,2025,4.06670000000
-1,2045,gasCCGT,R1,2025,4.06670000000
-1,2049,gasCCGT,R1,2025,4.06670000000
-1,2050,gasCCGT,R1,2025,4.06670000000
-1,2064,gasCCGT,R1,2025,4.06670000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,4.06670000000
-3,2035,gasCCGT,R2,2025,4.06670000000
-3,2040,gasCCGT,R2,2025,4.06670000000
-3,2045,gasCCGT,R2,2025,4.06670000000
-3,2049,gasCCGT,R2,2025,4.06670000000
-3,2050,gasCCGT,R2,2025,4.06670000000
-3,2064,gasCCGT,R2,2025,4.06670000000
-4,2025,solarPV,R1,2020,6.75000000000
-4,2030,solarPV,R1,2020,6.75000000000
-4,2035,solarPV,R1,2020,6.75000000000
-4,2040,solarPV,R1,2020,6.75000000000
-4,2045,solarPV,R1,2020,6.75000000000
-4,2049,solarPV,R1,2020,6.75000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,6.75000000000
+2,2030,solarPV,R1,2020,6.75000000000
+2,2035,solarPV,R1,2020,6.75000000000
+2,2040,solarPV,R1,2020,6.75000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2030,solarPV,R1,2025,9.15000000000
+3,2035,solarPV,R1,2025,9.15000000000
+3,2040,solarPV,R1,2025,9.15000000000
+3,2045,solarPV,R1,2025,9.15000000000
+3,2049,solarPV,R1,2025,9.15000000000
+3,2050,solarPV,R1,2025,9.15000000000
+3,2054,solarPV,R1,2025,9.15000000000
+4,2030,solarPV,R2,2025,9.15000000000
+4,2035,solarPV,R2,2025,9.15000000000
+4,2040,solarPV,R2,2025,9.15000000000
+4,2045,solarPV,R2,2025,9.15000000000
+4,2049,solarPV,R2,2025,9.15000000000
+4,2050,solarPV,R2,2025,9.15000000000
+4,2054,solarPV,R2,2025,9.15000000000
 5,2025,windturbine,R1,2020,10.00000000000
 5,2030,windturbine,R1,2020,10.00000000000
 5,2035,windturbine,R1,2020,10.00000000000
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 45f7f199..1f32a4ce 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
@@ -9,38 +9,38 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2035,R1,2025,gasCCGT,4.06670000000
-3,2040,R1,2025,gasCCGT,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2030,R1,2025,solarPV,9.15000000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2035,R1,2030,solarPV,6.00000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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
 6,2030,R2,2020,windturbine,16.75000000000
 6,2035,R2,2020,windturbine,16.75000000000
 6,2040,R2,2020,windturbine,16.75000000000
 6,2045,R2,2020,windturbine,16.75000000000
 6,2049,R2,2020,windturbine,16.75000000000
-7,2030,R2,2025,gasCCGT,4.06670000000
-7,2035,R2,2025,gasCCGT,4.06670000000
-7,2040,R2,2025,gasCCGT,4.06670000000
-7,2045,R2,2025,gasCCGT,4.06670000000
-7,2049,R2,2025,gasCCGT,4.06670000000
-7,2050,R2,2025,gasCCGT,4.06670000000
-7,2059,R2,2025,gasCCGT,4.06670000000
-7,2060,R2,2025,gasCCGT,4.06670000000
-7,2064,R2,2025,gasCCGT,4.06670000000
+7,2030,R2,2025,solarPV,9.15000000000
+7,2035,R2,2025,solarPV,9.15000000000
+7,2040,R2,2025,solarPV,9.15000000000
+7,2045,R2,2025,solarPV,9.15000000000
+7,2049,R2,2025,solarPV,9.15000000000
+7,2050,R2,2025,solarPV,9.15000000000
+7,2054,R2,2025,solarPV,9.15000000000
 8,2035,R2,2030,solarPV,6.00000000000
 8,2040,R2,2030,solarPV,6.00000000000
 8,2045,R2,2030,solarPV,6.00000000000
 8,2049,R2,2030,solarPV,6.00000000000
 8,2050,R2,2030,solarPV,6.00000000000
+8,2054,R2,2030,solarPV,6.00000000000
+8,2055,R2,2030,solarPV,6.00000000000
 8,2059,R2,2030,solarPV,6.00000000000
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 d46564bb..da743220 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
@@ -7,24 +7,26 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2040,R1,2025,gasCCGT,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2035,R1,2025,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2035,R1,2030,solarPV,6.00000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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,2040,R1,2035,solarPV,9.19000000000
 5,2045,R1,2035,solarPV,9.19000000000
 5,2049,R1,2035,solarPV,9.19000000000
 5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
 5,2059,R1,2035,solarPV,9.19000000000
 5,2060,R1,2035,solarPV,9.19000000000
 5,2064,R1,2035,solarPV,9.19000000000
@@ -32,24 +34,26 @@ asset,year,region,installed,technology,capacity
 7,2040,R2,2020,windturbine,16.75000000000
 7,2045,R2,2020,windturbine,16.75000000000
 7,2049,R2,2020,windturbine,16.75000000000
-8,2035,R2,2025,gasCCGT,4.06670000000
-8,2040,R2,2025,gasCCGT,4.06670000000
-8,2045,R2,2025,gasCCGT,4.06670000000
-8,2049,R2,2025,gasCCGT,4.06670000000
-8,2050,R2,2025,gasCCGT,4.06670000000
-8,2059,R2,2025,gasCCGT,4.06670000000
-8,2060,R2,2025,gasCCGT,4.06670000000
-8,2064,R2,2025,gasCCGT,4.06670000000
+8,2035,R2,2025,solarPV,9.15000000000
+8,2040,R2,2025,solarPV,9.15000000000
+8,2045,R2,2025,solarPV,9.15000000000
+8,2049,R2,2025,solarPV,9.15000000000
+8,2050,R2,2025,solarPV,9.15000000000
+8,2054,R2,2025,solarPV,9.15000000000
 9,2035,R2,2030,solarPV,6.00000000000
 9,2040,R2,2030,solarPV,6.00000000000
 9,2045,R2,2030,solarPV,6.00000000000
 9,2049,R2,2030,solarPV,6.00000000000
 9,2050,R2,2030,solarPV,6.00000000000
+9,2054,R2,2030,solarPV,6.00000000000
+9,2055,R2,2030,solarPV,6.00000000000
 9,2059,R2,2030,solarPV,6.00000000000
 10,2040,R2,2035,solarPV,9.19000000000
 10,2045,R2,2035,solarPV,9.19000000000
 10,2049,R2,2035,solarPV,9.19000000000
 10,2050,R2,2035,solarPV,9.19000000000
+10,2054,R2,2035,solarPV,9.19000000000
+10,2055,R2,2035,solarPV,9.19000000000
 10,2059,R2,2035,solarPV,9.19000000000
 10,2060,R2,2035,solarPV,9.19000000000
 10,2064,R2,2035,solarPV,9.19000000000
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 cf421cb0..e4d90839 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
@@ -5,28 +5,32 @@ asset,year,region,installed,technology,capacity
 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,4.06670000000
-3,2045,R1,2025,gasCCGT,4.06670000000
-3,2049,R1,2025,gasCCGT,4.06670000000
-3,2050,R1,2025,gasCCGT,4.06670000000
-3,2059,R1,2025,gasCCGT,4.06670000000
-3,2060,R1,2025,gasCCGT,4.06670000000
-3,2064,R1,2025,gasCCGT,4.06670000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
 4,2040,R1,2030,solarPV,6.00000000000
 4,2045,R1,2030,solarPV,6.00000000000
 4,2049,R1,2030,solarPV,6.00000000000
 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,2040,R1,2035,solarPV,9.19000000000
 5,2045,R1,2035,solarPV,9.19000000000
 5,2049,R1,2035,solarPV,9.19000000000
 5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
 5,2059,R1,2035,solarPV,9.19000000000
 5,2060,R1,2035,solarPV,9.19000000000
 5,2064,R1,2035,solarPV,9.19000000000
 6,2045,R1,2040,solarPV,6.00000000000
 6,2049,R1,2040,solarPV,6.00000000000
 6,2050,R1,2040,solarPV,6.00000000000
+6,2054,R1,2040,solarPV,6.00000000000
+6,2055,R1,2040,solarPV,6.00000000000
 6,2059,R1,2040,solarPV,6.00000000000
 6,2060,R1,2040,solarPV,6.00000000000
 6,2064,R1,2040,solarPV,6.00000000000
@@ -35,28 +39,32 @@ asset,year,region,installed,technology,capacity
 8,2040,R2,2020,windturbine,16.75000000000
 8,2045,R2,2020,windturbine,16.75000000000
 8,2049,R2,2020,windturbine,16.75000000000
-9,2040,R2,2025,gasCCGT,4.06670000000
-9,2045,R2,2025,gasCCGT,4.06670000000
-9,2049,R2,2025,gasCCGT,4.06670000000
-9,2050,R2,2025,gasCCGT,4.06670000000
-9,2059,R2,2025,gasCCGT,4.06670000000
-9,2060,R2,2025,gasCCGT,4.06670000000
-9,2064,R2,2025,gasCCGT,4.06670000000
+9,2040,R2,2025,solarPV,9.15000000000
+9,2045,R2,2025,solarPV,9.15000000000
+9,2049,R2,2025,solarPV,9.15000000000
+9,2050,R2,2025,solarPV,9.15000000000
+9,2054,R2,2025,solarPV,9.15000000000
 10,2040,R2,2030,solarPV,6.00000000000
 10,2045,R2,2030,solarPV,6.00000000000
 10,2049,R2,2030,solarPV,6.00000000000
 10,2050,R2,2030,solarPV,6.00000000000
+10,2054,R2,2030,solarPV,6.00000000000
+10,2055,R2,2030,solarPV,6.00000000000
 10,2059,R2,2030,solarPV,6.00000000000
 11,2040,R2,2035,solarPV,9.19000000000
 11,2045,R2,2035,solarPV,9.19000000000
 11,2049,R2,2035,solarPV,9.19000000000
 11,2050,R2,2035,solarPV,9.19000000000
+11,2054,R2,2035,solarPV,9.19000000000
+11,2055,R2,2035,solarPV,9.19000000000
 11,2059,R2,2035,solarPV,9.19000000000
 11,2060,R2,2035,solarPV,9.19000000000
 11,2064,R2,2035,solarPV,9.19000000000
 12,2045,R2,2040,solarPV,6.00000000000
 12,2049,R2,2040,solarPV,6.00000000000
 12,2050,R2,2040,solarPV,6.00000000000
+12,2054,R2,2040,solarPV,6.00000000000
+12,2055,R2,2040,solarPV,6.00000000000
 12,2059,R2,2040,solarPV,6.00000000000
 12,2060,R2,2040,solarPV,6.00000000000
 12,2064,R2,2040,solarPV,6.00000000000
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 1903b624..d67966d3 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
@@ -1,63 +1,75 @@
 asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,4.06670000000
-0,2049,gasCCGT,R1,2025,4.06670000000
-0,2050,gasCCGT,R1,2025,4.06670000000
-0,2059,gasCCGT,R1,2025,4.06670000000
-0,2060,gasCCGT,R1,2025,4.06670000000
-0,2064,gasCCGT,R1,2025,4.06670000000
-1,2045,gasCCGT,R2,2025,4.06670000000
-1,2049,gasCCGT,R2,2025,4.06670000000
-1,2050,gasCCGT,R2,2025,4.06670000000
-1,2059,gasCCGT,R2,2025,4.06670000000
-1,2060,gasCCGT,R2,2025,4.06670000000
-1,2064,gasCCGT,R2,2025,4.06670000000
-2,2045,solarPV,R1,2020,6.75000000000
-2,2049,solarPV,R1,2020,6.75000000000
-3,2045,solarPV,R1,2030,6.00000000000
-3,2049,solarPV,R1,2030,6.00000000000
-3,2050,solarPV,R1,2030,6.00000000000
-3,2059,solarPV,R1,2030,6.00000000000
-4,2045,solarPV,R1,2035,9.19000000000
-4,2049,solarPV,R1,2035,9.19000000000
-4,2050,solarPV,R1,2035,9.19000000000
-4,2059,solarPV,R1,2035,9.19000000000
-4,2060,solarPV,R1,2035,9.19000000000
-4,2064,solarPV,R1,2035,9.19000000000
-5,2045,solarPV,R1,2040,6.00000000000
-5,2049,solarPV,R1,2040,6.00000000000
-5,2050,solarPV,R1,2040,6.00000000000
-5,2059,solarPV,R1,2040,6.00000000000
-5,2060,solarPV,R1,2040,6.00000000000
-5,2064,solarPV,R1,2040,6.00000000000
-5,2065,solarPV,R1,2040,6.00000000000
-5,2069,solarPV,R1,2040,6.00000000000
-6,2050,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
+0,2045,solarPV,R1,2020,6.75000000000
+0,2049,solarPV,R1,2020,6.75000000000
+1,2045,solarPV,R1,2025,9.15000000000
+1,2049,solarPV,R1,2025,9.15000000000
+1,2050,solarPV,R1,2025,9.15000000000
+1,2054,solarPV,R1,2025,9.15000000000
+2,2045,solarPV,R1,2030,6.00000000000
+2,2049,solarPV,R1,2030,6.00000000000
+2,2050,solarPV,R1,2030,6.00000000000
+2,2054,solarPV,R1,2030,6.00000000000
+2,2055,solarPV,R1,2030,6.00000000000
+2,2059,solarPV,R1,2030,6.00000000000
+3,2045,solarPV,R1,2035,9.19000000000
+3,2049,solarPV,R1,2035,9.19000000000
+3,2050,solarPV,R1,2035,9.19000000000
+3,2054,solarPV,R1,2035,9.19000000000
+3,2055,solarPV,R1,2035,9.19000000000
+3,2059,solarPV,R1,2035,9.19000000000
+3,2060,solarPV,R1,2035,9.19000000000
+3,2064,solarPV,R1,2035,9.19000000000
+4,2045,solarPV,R1,2040,6.00000000000
+4,2049,solarPV,R1,2040,6.00000000000
+4,2050,solarPV,R1,2040,6.00000000000
+4,2054,solarPV,R1,2040,6.00000000000
+4,2055,solarPV,R1,2040,6.00000000000
+4,2059,solarPV,R1,2040,6.00000000000
+4,2060,solarPV,R1,2040,6.00000000000
+4,2064,solarPV,R1,2040,6.00000000000
+4,2065,solarPV,R1,2040,6.00000000000
+4,2069,solarPV,R1,2040,6.00000000000
+5,2050,solarPV,R1,2045,16.91000000000
+5,2054,solarPV,R1,2045,16.91000000000
+5,2055,solarPV,R1,2045,16.91000000000
+5,2059,solarPV,R1,2045,16.91000000000
+5,2060,solarPV,R1,2045,16.91000000000
+5,2064,solarPV,R1,2045,16.91000000000
+5,2065,solarPV,R1,2045,16.91000000000
+5,2069,solarPV,R1,2045,16.91000000000
+5,2070,solarPV,R1,2045,16.91000000000
+5,2074,solarPV,R1,2045,16.91000000000
+6,2045,solarPV,R2,2025,9.15000000000
+6,2049,solarPV,R2,2025,9.15000000000
+6,2050,solarPV,R2,2025,9.15000000000
+6,2054,solarPV,R2,2025,9.15000000000
 7,2045,solarPV,R2,2030,6.00000000000
 7,2049,solarPV,R2,2030,6.00000000000
 7,2050,solarPV,R2,2030,6.00000000000
+7,2054,solarPV,R2,2030,6.00000000000
+7,2055,solarPV,R2,2030,6.00000000000
 7,2059,solarPV,R2,2030,6.00000000000
 8,2045,solarPV,R2,2035,9.19000000000
 8,2049,solarPV,R2,2035,9.19000000000
 8,2050,solarPV,R2,2035,9.19000000000
+8,2054,solarPV,R2,2035,9.19000000000
+8,2055,solarPV,R2,2035,9.19000000000
 8,2059,solarPV,R2,2035,9.19000000000
 8,2060,solarPV,R2,2035,9.19000000000
 8,2064,solarPV,R2,2035,9.19000000000
 9,2045,solarPV,R2,2040,6.00000000000
 9,2049,solarPV,R2,2040,6.00000000000
 9,2050,solarPV,R2,2040,6.00000000000
+9,2054,solarPV,R2,2040,6.00000000000
+9,2055,solarPV,R2,2040,6.00000000000
 9,2059,solarPV,R2,2040,6.00000000000
 9,2060,solarPV,R2,2040,6.00000000000
 9,2064,solarPV,R2,2040,6.00000000000
 9,2065,solarPV,R2,2040,6.00000000000
 9,2069,solarPV,R2,2040,6.00000000000
 10,2050,solarPV,R2,2045,16.91000000000
+10,2054,solarPV,R2,2045,16.91000000000
+10,2055,solarPV,R2,2045,16.91000000000
 10,2059,solarPV,R2,2045,16.91000000000
 10,2060,solarPV,R2,2045,16.91000000000
 10,2064,solarPV,R2,2045,16.91000000000
@@ -68,6 +80,8 @@ asset,year,technology,region,installed,capacity
 11,2045,windturbine,R1,2020,10.00000000000
 11,2049,windturbine,R1,2020,10.00000000000
 12,2050,windturbine,R1,2045,6.75000000000
+12,2054,windturbine,R1,2045,6.75000000000
+12,2055,windturbine,R1,2045,6.75000000000
 12,2059,windturbine,R1,2045,6.75000000000
 12,2060,windturbine,R1,2045,6.75000000000
 12,2064,windturbine,R1,2045,6.75000000000
@@ -78,6 +92,8 @@ asset,year,technology,region,installed,capacity
 13,2045,windturbine,R2,2020,16.75000000000
 13,2049,windturbine,R2,2020,16.75000000000
 14,2050,windturbine,R2,2045,6.75000000000
+14,2054,windturbine,R2,2045,6.75000000000
+14,2055,windturbine,R2,2045,6.75000000000
 14,2059,windturbine,R2,2045,6.75000000000
 14,2060,windturbine,R2,2045,6.75000000000
 14,2064,windturbine,R2,2045,6.75000000000
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 2ee60e9b..26d73037 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,18 +1,18 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,4.06670000000
-2,2055,R1,2025,gasCCGT,4.06670000000
-2,2059,R1,2025,gasCCGT,4.06670000000
-2,2060,R1,2025,gasCCGT,4.06670000000
-2,2064,R1,2025,gasCCGT,4.06670000000
+2,2050,R1,2025,solarPV,9.15000000000
+2,2054,R1,2025,solarPV,9.15000000000
 3,2050,R1,2030,solarPV,6.00000000000
+3,2054,R1,2030,solarPV,6.00000000000
 3,2055,R1,2030,solarPV,6.00000000000
 3,2059,R1,2030,solarPV,6.00000000000
 4,2050,R1,2035,solarPV,9.19000000000
+4,2054,R1,2035,solarPV,9.19000000000
 4,2055,R1,2035,solarPV,9.19000000000
 4,2059,R1,2035,solarPV,9.19000000000
 4,2060,R1,2035,solarPV,9.19000000000
 4,2064,R1,2035,solarPV,9.19000000000
 5,2050,R1,2040,solarPV,6.00000000000
+5,2054,R1,2040,solarPV,6.00000000000
 5,2055,R1,2040,solarPV,6.00000000000
 5,2059,R1,2040,solarPV,6.00000000000
 5,2060,R1,2040,solarPV,6.00000000000
@@ -20,6 +20,7 @@ asset,year,region,installed,technology,capacity
 5,2065,R1,2040,solarPV,6.00000000000
 5,2069,R1,2040,solarPV,6.00000000000
 6,2050,R1,2045,solarPV,16.91000000000
+6,2054,R1,2045,solarPV,16.91000000000
 6,2055,R1,2045,solarPV,16.91000000000
 6,2059,R1,2045,solarPV,16.91000000000
 6,2060,R1,2045,solarPV,16.91000000000
@@ -29,6 +30,7 @@ asset,year,region,installed,technology,capacity
 6,2070,R1,2045,solarPV,16.91000000000
 6,2074,R1,2045,solarPV,16.91000000000
 7,2050,R1,2045,windturbine,6.75000000000
+7,2054,R1,2045,windturbine,6.75000000000
 7,2055,R1,2045,windturbine,6.75000000000
 7,2059,R1,2045,windturbine,6.75000000000
 7,2060,R1,2045,windturbine,6.75000000000
@@ -37,41 +39,63 @@ asset,year,region,installed,technology,capacity
 7,2069,R1,2045,windturbine,6.75000000000
 7,2070,R1,2045,windturbine,6.75000000000
 7,2074,R1,2045,windturbine,6.75000000000
-9,2050,R2,2025,gasCCGT,4.06670000000
-9,2055,R2,2025,gasCCGT,4.06670000000
-9,2059,R2,2025,gasCCGT,4.06670000000
-9,2060,R2,2025,gasCCGT,4.06670000000
-9,2064,R2,2025,gasCCGT,4.06670000000
-10,2050,R2,2030,solarPV,6.00000000000
-10,2055,R2,2030,solarPV,6.00000000000
-10,2059,R2,2030,solarPV,6.00000000000
-11,2050,R2,2035,solarPV,9.19000000000
-11,2055,R2,2035,solarPV,9.19000000000
-11,2059,R2,2035,solarPV,9.19000000000
-11,2060,R2,2035,solarPV,9.19000000000
-11,2064,R2,2035,solarPV,9.19000000000
-12,2050,R2,2040,solarPV,6.00000000000
-12,2055,R2,2040,solarPV,6.00000000000
-12,2059,R2,2040,solarPV,6.00000000000
-12,2060,R2,2040,solarPV,6.00000000000
-12,2064,R2,2040,solarPV,6.00000000000
-12,2065,R2,2040,solarPV,6.00000000000
-12,2069,R2,2040,solarPV,6.00000000000
-13,2050,R2,2045,solarPV,16.91000000000
-13,2055,R2,2045,solarPV,16.91000000000
-13,2059,R2,2045,solarPV,16.91000000000
-13,2060,R2,2045,solarPV,16.91000000000
-13,2064,R2,2045,solarPV,16.91000000000
-13,2065,R2,2045,solarPV,16.91000000000
-13,2069,R2,2045,solarPV,16.91000000000
-13,2070,R2,2045,solarPV,16.91000000000
-13,2074,R2,2045,solarPV,16.91000000000
-14,2050,R2,2045,windturbine,6.75000000000
-14,2055,R2,2045,windturbine,6.75000000000
-14,2059,R2,2045,windturbine,6.75000000000
-14,2060,R2,2045,windturbine,6.75000000000
-14,2064,R2,2045,windturbine,6.75000000000
-14,2065,R2,2045,windturbine,6.75000000000
-14,2069,R2,2045,windturbine,6.75000000000
-14,2070,R2,2045,windturbine,6.75000000000
-14,2074,R2,2045,windturbine,6.75000000000
+8,2055,R1,2050,solarPV,9.15000000000
+8,2059,R1,2050,solarPV,9.15000000000
+8,2060,R1,2050,solarPV,9.15000000000
+8,2064,R1,2050,solarPV,9.15000000000
+8,2065,R1,2050,solarPV,9.15000000000
+8,2069,R1,2050,solarPV,9.15000000000
+8,2070,R1,2050,solarPV,9.15000000000
+8,2074,R1,2050,solarPV,9.15000000000
+8,2075,R1,2050,solarPV,9.15000000000
+8,2079,R1,2050,solarPV,9.15000000000
+10,2050,R2,2025,solarPV,9.15000000000
+10,2054,R2,2025,solarPV,9.15000000000
+11,2050,R2,2030,solarPV,6.00000000000
+11,2054,R2,2030,solarPV,6.00000000000
+11,2055,R2,2030,solarPV,6.00000000000
+11,2059,R2,2030,solarPV,6.00000000000
+12,2050,R2,2035,solarPV,9.19000000000
+12,2054,R2,2035,solarPV,9.19000000000
+12,2055,R2,2035,solarPV,9.19000000000
+12,2059,R2,2035,solarPV,9.19000000000
+12,2060,R2,2035,solarPV,9.19000000000
+12,2064,R2,2035,solarPV,9.19000000000
+13,2050,R2,2040,solarPV,6.00000000000
+13,2054,R2,2040,solarPV,6.00000000000
+13,2055,R2,2040,solarPV,6.00000000000
+13,2059,R2,2040,solarPV,6.00000000000
+13,2060,R2,2040,solarPV,6.00000000000
+13,2064,R2,2040,solarPV,6.00000000000
+13,2065,R2,2040,solarPV,6.00000000000
+13,2069,R2,2040,solarPV,6.00000000000
+14,2050,R2,2045,solarPV,16.91000000000
+14,2054,R2,2045,solarPV,16.91000000000
+14,2055,R2,2045,solarPV,16.91000000000
+14,2059,R2,2045,solarPV,16.91000000000
+14,2060,R2,2045,solarPV,16.91000000000
+14,2064,R2,2045,solarPV,16.91000000000
+14,2065,R2,2045,solarPV,16.91000000000
+14,2069,R2,2045,solarPV,16.91000000000
+14,2070,R2,2045,solarPV,16.91000000000
+14,2074,R2,2045,solarPV,16.91000000000
+15,2050,R2,2045,windturbine,6.75000000000
+15,2054,R2,2045,windturbine,6.75000000000
+15,2055,R2,2045,windturbine,6.75000000000
+15,2059,R2,2045,windturbine,6.75000000000
+15,2060,R2,2045,windturbine,6.75000000000
+15,2064,R2,2045,windturbine,6.75000000000
+15,2065,R2,2045,windturbine,6.75000000000
+15,2069,R2,2045,windturbine,6.75000000000
+15,2070,R2,2045,windturbine,6.75000000000
+15,2074,R2,2045,windturbine,6.75000000000
+16,2055,R2,2050,solarPV,9.15000000000
+16,2059,R2,2050,solarPV,9.15000000000
+16,2060,R2,2050,solarPV,9.15000000000
+16,2064,R2,2050,solarPV,9.15000000000
+16,2065,R2,2050,solarPV,9.15000000000
+16,2069,R2,2050,solarPV,9.15000000000
+16,2070,R2,2050,solarPV,9.15000000000
+16,2074,R2,2050,solarPV,9.15000000000
+16,2075,R2,2050,solarPV,9.15000000000
+16,2079,R2,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index bb490bea..d12df0db 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
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 99e10143..842d3b01 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,5 @@
-asset,year,technology,region,installed,capacity
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,3.29410000000
-1,2035,gassupply1,R1,2025,3.29410000000
-1,2040,gassupply1,R1,2025,3.29410000000
-1,2045,gassupply1,R1,2025,3.29410000000
-1,2050,gassupply1,R1,2025,3.29410000000
-1,2064,gassupply1,R1,2025,3.29410000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,3.29410000000
-3,2035,gassupply1,R2,2025,3.29410000000
-3,2040,gassupply1,R2,2025,3.29410000000
-3,2045,gassupply1,R2,2025,3.29410000000
-3,2050,gassupply1,R2,2025,3.29410000000
-3,2064,gassupply1,R2,2025,3.29410000000
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2025,R2,2020,gassupply1,15.00000000000
+1,2030,R2,2020,gassupply1,7.50000000000
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 f72e4692..b85bdbbd 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,13 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,3.29410000000
-1,2035,R1,2025,gassupply1,3.29410000000
-1,2040,R1,2025,gassupply1,3.29410000000
-1,2045,R1,2025,gassupply1,3.29410000000
-1,2050,R1,2025,gassupply1,3.29410000000
-1,2064,R1,2025,gassupply1,3.29410000000
-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,3.29410000000
-4,2035,R2,2025,gassupply1,3.29410000000
-4,2040,R2,2025,gassupply1,3.29410000000
-4,2045,R2,2025,gassupply1,3.29410000000
-4,2050,R2,2025,gassupply1,3.29410000000
-4,2064,R2,2025,gassupply1,3.29410000000
-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
+1,2035,R1,2030,gassupply1,2.76200000000
+1,2040,R1,2030,gassupply1,2.76200000000
+1,2045,R1,2030,gassupply1,2.76200000000
+1,2050,R1,2030,gassupply1,2.76200000000
+1,2069,R1,2030,gassupply1,2.76200000000
+2,2030,R2,2020,gassupply1,7.50000000000
+3,2035,R2,2030,gassupply1,2.76200000000
+3,2040,R2,2030,gassupply1,2.76200000000
+3,2045,R2,2030,gassupply1,2.76200000000
+3,2050,R2,2030,gassupply1,2.76200000000
+3,2069,R2,2030,gassupply1,2.76200000000
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 3cf095fb..bf00846b 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,11 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,3.29410000000
-1,2040,R1,2025,gassupply1,3.29410000000
-1,2045,R1,2025,gassupply1,3.29410000000
-1,2050,R1,2025,gassupply1,3.29410000000
-1,2064,R1,2025,gassupply1,3.29410000000
-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,3.29410000000
-4,2040,R2,2025,gassupply1,3.29410000000
-4,2045,R2,2025,gassupply1,3.29410000000
-4,2050,R2,2025,gassupply1,3.29410000000
-4,2064,R2,2025,gassupply1,3.29410000000
-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
+1,2035,R1,2030,gassupply1,2.76200000000
+1,2040,R1,2030,gassupply1,2.76200000000
+1,2045,R1,2030,gassupply1,2.76200000000
+1,2050,R1,2030,gassupply1,2.76200000000
+1,2069,R1,2030,gassupply1,2.76200000000
+3,2035,R2,2030,gassupply1,2.76200000000
+3,2040,R2,2030,gassupply1,2.76200000000
+3,2045,R2,2030,gassupply1,2.76200000000
+3,2050,R2,2030,gassupply1,2.76200000000
+3,2069,R2,2030,gassupply1,2.76200000000
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 a73a3436..e4511fa3 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,9 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,3.29410000000
-1,2045,R1,2025,gassupply1,3.29410000000
-1,2050,R1,2025,gassupply1,3.29410000000
-1,2064,R1,2025,gassupply1,3.29410000000
-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,3.29410000000
-4,2045,R2,2025,gassupply1,3.29410000000
-4,2050,R2,2025,gassupply1,3.29410000000
-4,2064,R2,2025,gassupply1,3.29410000000
-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
+1,2040,R1,2030,gassupply1,2.76200000000
+1,2045,R1,2030,gassupply1,2.76200000000
+1,2050,R1,2030,gassupply1,2.76200000000
+1,2069,R1,2030,gassupply1,2.76200000000
+3,2040,R2,2030,gassupply1,2.76200000000
+3,2045,R2,2030,gassupply1,2.76200000000
+3,2050,R2,2030,gassupply1,2.76200000000
+3,2069,R2,2030,gassupply1,2.76200000000
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 bf58e223..94418d7b 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,7 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,3.29410000000
-1,2050,R1,2025,gassupply1,3.29410000000
-1,2064,R1,2025,gassupply1,3.29410000000
-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,3.29410000000
-4,2050,R2,2025,gassupply1,3.29410000000
-4,2064,R2,2025,gassupply1,3.29410000000
-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
+1,2045,R1,2030,gassupply1,2.76200000000
+1,2050,R1,2030,gassupply1,2.76200000000
+1,2069,R1,2030,gassupply1,2.76200000000
+3,2045,R2,2030,gassupply1,2.76200000000
+3,2050,R2,2030,gassupply1,2.76200000000
+3,2069,R2,2030,gassupply1,2.76200000000
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 0eb40c74..0e0cd9db 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,7 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,3.29410000000
-1,2055,R1,2025,gassupply1,3.29410000000
-1,2064,R1,2025,gassupply1,3.29410000000
-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,3.29410000000
-4,2055,R2,2025,gassupply1,3.29410000000
-4,2064,R2,2025,gassupply1,3.29410000000
-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
+1,2050,R1,2030,gassupply1,2.76200000000
+1,2055,R1,2030,gassupply1,2.76200000000
+1,2069,R1,2030,gassupply1,2.76200000000
+3,2050,R2,2030,gassupply1,2.76200000000
+3,2055,R2,2030,gassupply1,2.76200000000
+3,2069,R2,2030,gassupply1,2.76200000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 42355dee..2a12dfc6 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -22,85 +22,75 @@ heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
 heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2030,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.82170000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2030,10.82170000000
 windturbine,R2,R2,A1,power,retrofit,2030,15.60870000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,3.29410000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,3.29410000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
 heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
 heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2035,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.82170000000
 solarPV,R1,R1,A1,power,retrofit,2035,5.71470000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2035,10.82170000000
 solarPV,R2,R2,A1,power,retrofit,2035,5.71470000000
 windturbine,R2,R2,A1,power,retrofit,2035,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,3.29410000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,3.29410000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.76200000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,2.76200000000
 heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
 heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2040,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2040,10.82170000000
 solarPV,R1,R1,A1,power,retrofit,2040,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2040,7.85760000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2040,10.82170000000
 solarPV,R2,R2,A1,power,retrofit,2040,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2040,7.85760000000
 windturbine,R2,R2,A1,power,retrofit,2040,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,3.29410000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,3.29410000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.76200000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.76200000000
 heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
 heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,4.80970000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2045,10.82170000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2045,7.85760000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2045,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2045,10.82170000000
 solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2045,7.85760000000
 solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
 windturbine,R2,R2,A1,power,retrofit,2045,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,3.29410000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,3.29410000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.76200000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,2.76200000000
 heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
 heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
 heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,4.80970000000
+solarPV,R1,R1,A1,power,retrofit,2050,10.82170000000
 solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2050,7.85760000000
 solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
 solarPV,R1,R1,A1,power,retrofit,2050,15.71470000000
 windturbine,R1,R1,A1,power,retrofit,2050,5.60870000000
-gasCCGT,R2,R2,A1,power,retrofit,2050,4.80970000000
+solarPV,R2,R2,A1,power,retrofit,2050,10.82170000000
 solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2050,7.85760000000
 solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
 solarPV,R2,R2,A1,power,retrofit,2050,15.71470000000
 windturbine,R2,R2,A1,power,retrofit,2050,5.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,3.29410000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,3.29410000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.76200000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,2.76200000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 627647a6..0d6c8139 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,387 +63,387 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.30330000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.30330000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.60880000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.60880000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49020000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49020000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15380000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15380000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.45500000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.45500000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.63910000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.63910000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49270000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49270000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.23070000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.23070000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.30330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.30330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.60880000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.60880000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49020000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49020000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15380000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15380000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.45500000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.45500000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63910000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63910000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49270000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49270000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.23070000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.23070000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.91030000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.91030000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73020000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73020000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50030000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50030000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46160000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46160000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.60700000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.60700000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.66960000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.66960000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.49530000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.49530000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.30780000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.30780000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.60700000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.60700000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.66960000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.66960000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49530000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49530000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.30780000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.30780000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.60700000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.60700000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.66960000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.66960000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49530000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49530000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.30780000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.30780000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.48570000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.48570000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.07490000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.10530000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.10530000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.19720000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.19720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.23750000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.23750000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.72940000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.72940000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11850000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.11850000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.13870000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.13870000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.20180000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.20180000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.35650000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.35650000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.48570000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.48570000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07490000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.10530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.10530000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19720000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19720000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.23750000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.23750000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.72940000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.72940000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11850000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11850000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.13870000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.13870000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20180000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20180000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35650000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35650000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.46510000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.46510000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27390000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27390000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.23900000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.23900000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21550000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21550000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.71470000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.71470000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.97450000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.97450000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.16630000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.16630000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.17220000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.17220000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.20630000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.20630000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.47590000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.47590000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.97450000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.97450000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16630000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16630000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,14.17220000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,14.17220000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20630000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20630000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.47590000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.47590000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.97450000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.97450000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.17220000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.17220000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.47590000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.47590000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54210000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.54210000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08760000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08760000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.30240000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.30240000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.48580000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.48580000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81400000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.81400000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.14130000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.14130000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.33810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.33810000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.62920000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.62920000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.54210000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.54210000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08760000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.30240000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.30240000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48580000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48580000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81400000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.81400000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14130000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.14130000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.33810000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.33810000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.62920000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.62920000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63330000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.63330000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34240000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.34240000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44550000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44550000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.06150000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.06150000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08710000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.08710000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.20180000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.20180000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.37400000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.37400000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.77320000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.77320000000,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', 'early-morning')",electricity,R1,1.08710000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.08710000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.20180000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.20180000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.37400000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.37400000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.77320000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.77320000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.08710000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.08710000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.20180000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.20180000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.37400000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.37400000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.77320000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.77320000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.55380000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.55380000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02840000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02840000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08840000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08840000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.33570000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.33570000000,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.83140000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.83140000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05420000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05420000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13260000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13260000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.50500000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.50500000000,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', 'mid-afternoon')",electricity,R1,0.55380000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.55380000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02840000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02840000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08840000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08840000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33570000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33570000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.83140000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.83140000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05420000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05420000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13260000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13260000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50500000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.50500000000,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.66720000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.66720000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.17870000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.17870000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26530000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26530000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.01980000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,1.01980000000,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.11010000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.11010000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.08790000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.08790000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17690000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17690000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.67590000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.67590000000,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', 'early-morning')",electricity,R1,1.11010000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.11010000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08790000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08790000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17690000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17690000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.67590000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.67590000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.11010000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.11010000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08790000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08790000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17690000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17690000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.67590000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.67590000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.61960000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.61960000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02870000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02870000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08660000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.08660000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,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.93000000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.93000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05490000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05490000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12980000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12980000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.02500000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.02500000000,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', 'mid-afternoon')",electricity,R1,0.61960000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61960000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02870000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02870000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08660000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08660000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.93000000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.93000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05490000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05490000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12980000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12980000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02500000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02500000000,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.86400000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.86400000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.18160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.18160000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.25980000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.25980000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06140000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06140000000,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.24150000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.24150000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.08920000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.08920000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17320000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17320000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.03590000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.03590000000,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', 'early-morning')",electricity,R1,1.24150000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.24150000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08920000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08920000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17320000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17320000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03590000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03590000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.24150000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.24150000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08920000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08920000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17320000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17320000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03590000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.66730000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.66730000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.03060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.08160000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08160000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,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,1.00140000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.00140000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05920000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.05920000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12240000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12240000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.02490000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.02490000000,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', 'mid-afternoon')",electricity,R1,0.66730000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66730000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03060000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03060000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08160000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08160000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00140000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.00140000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05920000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05920000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12240000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12240000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02490000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02490000000,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,2.00650000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.00650000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19840000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.19840000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24500000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24500000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06090000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06090000000,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.33670000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.33670000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.09670000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.09670000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16340000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16340000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.03570000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.03570000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.33670000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.33670000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09670000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09670000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16340000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16340000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03570000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03570000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.33670000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.33670000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09670000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09670000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16340000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16340000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03570000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03570000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index 97ed5793..9e39a658 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -1,26 +1,26 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,4.80970000000
-1,2035,gasCCGT,R1,2025,4.80970000000
-1,2040,gasCCGT,R1,2025,4.80970000000
-1,2045,gasCCGT,R1,2025,4.80970000000
-1,2049,gasCCGT,R1,2025,4.80970000000
-1,2050,gasCCGT,R1,2025,4.80970000000
-1,2064,gasCCGT,R1,2025,4.80970000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,4.80970000000
-3,2035,gasCCGT,R2,2025,4.80970000000
-3,2040,gasCCGT,R2,2025,4.80970000000
-3,2045,gasCCGT,R2,2025,4.80970000000
-3,2049,gasCCGT,R2,2025,4.80970000000
-3,2050,gasCCGT,R2,2025,4.80970000000
-3,2064,gasCCGT,R2,2025,4.80970000000
-4,2025,solarPV,R1,2020,5.60870000000
-4,2030,solarPV,R1,2020,5.60870000000
-4,2035,solarPV,R1,2020,5.60870000000
-4,2040,solarPV,R1,2020,5.60870000000
-4,2045,solarPV,R1,2020,5.60870000000
-4,2049,solarPV,R1,2020,5.60870000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,5.60870000000
+2,2030,solarPV,R1,2020,5.60870000000
+2,2035,solarPV,R1,2020,5.60870000000
+2,2040,solarPV,R1,2020,5.60870000000
+2,2045,solarPV,R1,2020,5.60870000000
+2,2049,solarPV,R1,2020,5.60870000000
+3,2030,solarPV,R1,2025,10.82170000000
+3,2035,solarPV,R1,2025,10.82170000000
+3,2040,solarPV,R1,2025,10.82170000000
+3,2045,solarPV,R1,2025,10.82170000000
+3,2049,solarPV,R1,2025,10.82170000000
+3,2050,solarPV,R1,2025,10.82170000000
+3,2054,solarPV,R1,2025,10.82170000000
+4,2030,solarPV,R2,2025,10.82170000000
+4,2035,solarPV,R2,2025,10.82170000000
+4,2040,solarPV,R2,2025,10.82170000000
+4,2045,solarPV,R2,2025,10.82170000000
+4,2049,solarPV,R2,2025,10.82170000000
+4,2050,solarPV,R2,2025,10.82170000000
+4,2054,solarPV,R2,2025,10.82170000000
 5,2025,windturbine,R1,2020,10.00000000000
 5,2030,windturbine,R1,2020,10.00000000000
 5,2035,windturbine,R1,2020,10.00000000000
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 aad3d309..297a4dee 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
@@ -9,38 +9,38 @@ asset,year,region,installed,technology,capacity
 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,4.80970000000
-3,2035,R1,2025,gasCCGT,4.80970000000
-3,2040,R1,2025,gasCCGT,4.80970000000
-3,2045,R1,2025,gasCCGT,4.80970000000
-3,2049,R1,2025,gasCCGT,4.80970000000
-3,2050,R1,2025,gasCCGT,4.80970000000
-3,2059,R1,2025,gasCCGT,4.80970000000
-3,2060,R1,2025,gasCCGT,4.80970000000
-3,2064,R1,2025,gasCCGT,4.80970000000
+3,2030,R1,2025,solarPV,10.82170000000
+3,2035,R1,2025,solarPV,10.82170000000
+3,2040,R1,2025,solarPV,10.82170000000
+3,2045,R1,2025,solarPV,10.82170000000
+3,2049,R1,2025,solarPV,10.82170000000
+3,2050,R1,2025,solarPV,10.82170000000
+3,2054,R1,2025,solarPV,10.82170000000
 4,2035,R1,2030,solarPV,5.71470000000
 4,2040,R1,2030,solarPV,5.71470000000
 4,2045,R1,2030,solarPV,5.71470000000
 4,2049,R1,2030,solarPV,5.71470000000
 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
 6,2030,R2,2020,windturbine,15.60870000000
 6,2035,R2,2020,windturbine,15.60870000000
 6,2040,R2,2020,windturbine,15.60870000000
 6,2045,R2,2020,windturbine,15.60870000000
 6,2049,R2,2020,windturbine,15.60870000000
-7,2030,R2,2025,gasCCGT,4.80970000000
-7,2035,R2,2025,gasCCGT,4.80970000000
-7,2040,R2,2025,gasCCGT,4.80970000000
-7,2045,R2,2025,gasCCGT,4.80970000000
-7,2049,R2,2025,gasCCGT,4.80970000000
-7,2050,R2,2025,gasCCGT,4.80970000000
-7,2059,R2,2025,gasCCGT,4.80970000000
-7,2060,R2,2025,gasCCGT,4.80970000000
-7,2064,R2,2025,gasCCGT,4.80970000000
+7,2030,R2,2025,solarPV,10.82170000000
+7,2035,R2,2025,solarPV,10.82170000000
+7,2040,R2,2025,solarPV,10.82170000000
+7,2045,R2,2025,solarPV,10.82170000000
+7,2049,R2,2025,solarPV,10.82170000000
+7,2050,R2,2025,solarPV,10.82170000000
+7,2054,R2,2025,solarPV,10.82170000000
 8,2035,R2,2030,solarPV,5.71470000000
 8,2040,R2,2030,solarPV,5.71470000000
 8,2045,R2,2030,solarPV,5.71470000000
 8,2049,R2,2030,solarPV,5.71470000000
 8,2050,R2,2030,solarPV,5.71470000000
+8,2054,R2,2030,solarPV,5.71470000000
+8,2055,R2,2030,solarPV,5.71470000000
 8,2059,R2,2030,solarPV,5.71470000000
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 b2807f5a..465e5569 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
@@ -7,24 +7,26 @@ asset,year,region,installed,technology,capacity
 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,4.80970000000
-3,2040,R1,2025,gasCCGT,4.80970000000
-3,2045,R1,2025,gasCCGT,4.80970000000
-3,2049,R1,2025,gasCCGT,4.80970000000
-3,2050,R1,2025,gasCCGT,4.80970000000
-3,2059,R1,2025,gasCCGT,4.80970000000
-3,2060,R1,2025,gasCCGT,4.80970000000
-3,2064,R1,2025,gasCCGT,4.80970000000
+3,2035,R1,2025,solarPV,10.82170000000
+3,2040,R1,2025,solarPV,10.82170000000
+3,2045,R1,2025,solarPV,10.82170000000
+3,2049,R1,2025,solarPV,10.82170000000
+3,2050,R1,2025,solarPV,10.82170000000
+3,2054,R1,2025,solarPV,10.82170000000
 4,2035,R1,2030,solarPV,5.71470000000
 4,2040,R1,2030,solarPV,5.71470000000
 4,2045,R1,2030,solarPV,5.71470000000
 4,2049,R1,2030,solarPV,5.71470000000
 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,2040,R1,2035,solarPV,7.85760000000
 5,2045,R1,2035,solarPV,7.85760000000
 5,2049,R1,2035,solarPV,7.85760000000
 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
@@ -32,24 +34,26 @@ asset,year,region,installed,technology,capacity
 7,2040,R2,2020,windturbine,15.60870000000
 7,2045,R2,2020,windturbine,15.60870000000
 7,2049,R2,2020,windturbine,15.60870000000
-8,2035,R2,2025,gasCCGT,4.80970000000
-8,2040,R2,2025,gasCCGT,4.80970000000
-8,2045,R2,2025,gasCCGT,4.80970000000
-8,2049,R2,2025,gasCCGT,4.80970000000
-8,2050,R2,2025,gasCCGT,4.80970000000
-8,2059,R2,2025,gasCCGT,4.80970000000
-8,2060,R2,2025,gasCCGT,4.80970000000
-8,2064,R2,2025,gasCCGT,4.80970000000
+8,2035,R2,2025,solarPV,10.82170000000
+8,2040,R2,2025,solarPV,10.82170000000
+8,2045,R2,2025,solarPV,10.82170000000
+8,2049,R2,2025,solarPV,10.82170000000
+8,2050,R2,2025,solarPV,10.82170000000
+8,2054,R2,2025,solarPV,10.82170000000
 9,2035,R2,2030,solarPV,5.71470000000
 9,2040,R2,2030,solarPV,5.71470000000
 9,2045,R2,2030,solarPV,5.71470000000
 9,2049,R2,2030,solarPV,5.71470000000
 9,2050,R2,2030,solarPV,5.71470000000
+9,2054,R2,2030,solarPV,5.71470000000
+9,2055,R2,2030,solarPV,5.71470000000
 9,2059,R2,2030,solarPV,5.71470000000
 10,2040,R2,2035,solarPV,7.85760000000
 10,2045,R2,2035,solarPV,7.85760000000
 10,2049,R2,2035,solarPV,7.85760000000
 10,2050,R2,2035,solarPV,7.85760000000
+10,2054,R2,2035,solarPV,7.85760000000
+10,2055,R2,2035,solarPV,7.85760000000
 10,2059,R2,2035,solarPV,7.85760000000
 10,2060,R2,2035,solarPV,7.85760000000
 10,2064,R2,2035,solarPV,7.85760000000
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 faf4165c..1c4a2fd3 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
@@ -5,28 +5,32 @@ asset,year,region,installed,technology,capacity
 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,4.80970000000
-3,2045,R1,2025,gasCCGT,4.80970000000
-3,2049,R1,2025,gasCCGT,4.80970000000
-3,2050,R1,2025,gasCCGT,4.80970000000
-3,2059,R1,2025,gasCCGT,4.80970000000
-3,2060,R1,2025,gasCCGT,4.80970000000
-3,2064,R1,2025,gasCCGT,4.80970000000
+3,2040,R1,2025,solarPV,10.82170000000
+3,2045,R1,2025,solarPV,10.82170000000
+3,2049,R1,2025,solarPV,10.82170000000
+3,2050,R1,2025,solarPV,10.82170000000
+3,2054,R1,2025,solarPV,10.82170000000
 4,2040,R1,2030,solarPV,5.71470000000
 4,2045,R1,2030,solarPV,5.71470000000
 4,2049,R1,2030,solarPV,5.71470000000
 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,2040,R1,2035,solarPV,7.85760000000
 5,2045,R1,2035,solarPV,7.85760000000
 5,2049,R1,2035,solarPV,7.85760000000
 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,2045,R1,2040,solarPV,5.71470000000
 6,2049,R1,2040,solarPV,5.71470000000
 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
@@ -35,28 +39,32 @@ asset,year,region,installed,technology,capacity
 8,2040,R2,2020,windturbine,15.60870000000
 8,2045,R2,2020,windturbine,15.60870000000
 8,2049,R2,2020,windturbine,15.60870000000
-9,2040,R2,2025,gasCCGT,4.80970000000
-9,2045,R2,2025,gasCCGT,4.80970000000
-9,2049,R2,2025,gasCCGT,4.80970000000
-9,2050,R2,2025,gasCCGT,4.80970000000
-9,2059,R2,2025,gasCCGT,4.80970000000
-9,2060,R2,2025,gasCCGT,4.80970000000
-9,2064,R2,2025,gasCCGT,4.80970000000
+9,2040,R2,2025,solarPV,10.82170000000
+9,2045,R2,2025,solarPV,10.82170000000
+9,2049,R2,2025,solarPV,10.82170000000
+9,2050,R2,2025,solarPV,10.82170000000
+9,2054,R2,2025,solarPV,10.82170000000
 10,2040,R2,2030,solarPV,5.71470000000
 10,2045,R2,2030,solarPV,5.71470000000
 10,2049,R2,2030,solarPV,5.71470000000
 10,2050,R2,2030,solarPV,5.71470000000
+10,2054,R2,2030,solarPV,5.71470000000
+10,2055,R2,2030,solarPV,5.71470000000
 10,2059,R2,2030,solarPV,5.71470000000
 11,2040,R2,2035,solarPV,7.85760000000
 11,2045,R2,2035,solarPV,7.85760000000
 11,2049,R2,2035,solarPV,7.85760000000
 11,2050,R2,2035,solarPV,7.85760000000
+11,2054,R2,2035,solarPV,7.85760000000
+11,2055,R2,2035,solarPV,7.85760000000
 11,2059,R2,2035,solarPV,7.85760000000
 11,2060,R2,2035,solarPV,7.85760000000
 11,2064,R2,2035,solarPV,7.85760000000
 12,2045,R2,2040,solarPV,5.71470000000
 12,2049,R2,2040,solarPV,5.71470000000
 12,2050,R2,2040,solarPV,5.71470000000
+12,2054,R2,2040,solarPV,5.71470000000
+12,2055,R2,2040,solarPV,5.71470000000
 12,2059,R2,2040,solarPV,5.71470000000
 12,2060,R2,2040,solarPV,5.71470000000
 12,2064,R2,2040,solarPV,5.71470000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index 99829cd9..96120016 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,63 +1,75 @@
 asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,4.80970000000
-0,2049,gasCCGT,R1,2025,4.80970000000
-0,2050,gasCCGT,R1,2025,4.80970000000
-0,2059,gasCCGT,R1,2025,4.80970000000
-0,2060,gasCCGT,R1,2025,4.80970000000
-0,2064,gasCCGT,R1,2025,4.80970000000
-1,2045,gasCCGT,R2,2025,4.80970000000
-1,2049,gasCCGT,R2,2025,4.80970000000
-1,2050,gasCCGT,R2,2025,4.80970000000
-1,2059,gasCCGT,R2,2025,4.80970000000
-1,2060,gasCCGT,R2,2025,4.80970000000
-1,2064,gasCCGT,R2,2025,4.80970000000
-2,2045,solarPV,R1,2020,5.60870000000
-2,2049,solarPV,R1,2020,5.60870000000
-3,2045,solarPV,R1,2030,5.71470000000
-3,2049,solarPV,R1,2030,5.71470000000
-3,2050,solarPV,R1,2030,5.71470000000
-3,2059,solarPV,R1,2030,5.71470000000
-4,2045,solarPV,R1,2035,7.85760000000
-4,2049,solarPV,R1,2035,7.85760000000
-4,2050,solarPV,R1,2035,7.85760000000
-4,2059,solarPV,R1,2035,7.85760000000
-4,2060,solarPV,R1,2035,7.85760000000
-4,2064,solarPV,R1,2035,7.85760000000
-5,2045,solarPV,R1,2040,5.71470000000
-5,2049,solarPV,R1,2040,5.71470000000
-5,2050,solarPV,R1,2040,5.71470000000
-5,2059,solarPV,R1,2040,5.71470000000
-5,2060,solarPV,R1,2040,5.71470000000
-5,2064,solarPV,R1,2040,5.71470000000
-5,2065,solarPV,R1,2040,5.71470000000
-5,2069,solarPV,R1,2040,5.71470000000
-6,2050,solarPV,R1,2045,15.71470000000
-6,2059,solarPV,R1,2045,15.71470000000
-6,2060,solarPV,R1,2045,15.71470000000
-6,2064,solarPV,R1,2045,15.71470000000
-6,2065,solarPV,R1,2045,15.71470000000
-6,2069,solarPV,R1,2045,15.71470000000
-6,2070,solarPV,R1,2045,15.71470000000
-6,2074,solarPV,R1,2045,15.71470000000
+0,2045,solarPV,R1,2020,5.60870000000
+0,2049,solarPV,R1,2020,5.60870000000
+1,2045,solarPV,R1,2025,10.82170000000
+1,2049,solarPV,R1,2025,10.82170000000
+1,2050,solarPV,R1,2025,10.82170000000
+1,2054,solarPV,R1,2025,10.82170000000
+2,2045,solarPV,R1,2030,5.71470000000
+2,2049,solarPV,R1,2030,5.71470000000
+2,2050,solarPV,R1,2030,5.71470000000
+2,2054,solarPV,R1,2030,5.71470000000
+2,2055,solarPV,R1,2030,5.71470000000
+2,2059,solarPV,R1,2030,5.71470000000
+3,2045,solarPV,R1,2035,7.85760000000
+3,2049,solarPV,R1,2035,7.85760000000
+3,2050,solarPV,R1,2035,7.85760000000
+3,2054,solarPV,R1,2035,7.85760000000
+3,2055,solarPV,R1,2035,7.85760000000
+3,2059,solarPV,R1,2035,7.85760000000
+3,2060,solarPV,R1,2035,7.85760000000
+3,2064,solarPV,R1,2035,7.85760000000
+4,2045,solarPV,R1,2040,5.71470000000
+4,2049,solarPV,R1,2040,5.71470000000
+4,2050,solarPV,R1,2040,5.71470000000
+4,2054,solarPV,R1,2040,5.71470000000
+4,2055,solarPV,R1,2040,5.71470000000
+4,2059,solarPV,R1,2040,5.71470000000
+4,2060,solarPV,R1,2040,5.71470000000
+4,2064,solarPV,R1,2040,5.71470000000
+4,2065,solarPV,R1,2040,5.71470000000
+4,2069,solarPV,R1,2040,5.71470000000
+5,2050,solarPV,R1,2045,15.71470000000
+5,2054,solarPV,R1,2045,15.71470000000
+5,2055,solarPV,R1,2045,15.71470000000
+5,2059,solarPV,R1,2045,15.71470000000
+5,2060,solarPV,R1,2045,15.71470000000
+5,2064,solarPV,R1,2045,15.71470000000
+5,2065,solarPV,R1,2045,15.71470000000
+5,2069,solarPV,R1,2045,15.71470000000
+5,2070,solarPV,R1,2045,15.71470000000
+5,2074,solarPV,R1,2045,15.71470000000
+6,2045,solarPV,R2,2025,10.82170000000
+6,2049,solarPV,R2,2025,10.82170000000
+6,2050,solarPV,R2,2025,10.82170000000
+6,2054,solarPV,R2,2025,10.82170000000
 7,2045,solarPV,R2,2030,5.71470000000
 7,2049,solarPV,R2,2030,5.71470000000
 7,2050,solarPV,R2,2030,5.71470000000
+7,2054,solarPV,R2,2030,5.71470000000
+7,2055,solarPV,R2,2030,5.71470000000
 7,2059,solarPV,R2,2030,5.71470000000
 8,2045,solarPV,R2,2035,7.85760000000
 8,2049,solarPV,R2,2035,7.85760000000
 8,2050,solarPV,R2,2035,7.85760000000
+8,2054,solarPV,R2,2035,7.85760000000
+8,2055,solarPV,R2,2035,7.85760000000
 8,2059,solarPV,R2,2035,7.85760000000
 8,2060,solarPV,R2,2035,7.85760000000
 8,2064,solarPV,R2,2035,7.85760000000
 9,2045,solarPV,R2,2040,5.71470000000
 9,2049,solarPV,R2,2040,5.71470000000
 9,2050,solarPV,R2,2040,5.71470000000
+9,2054,solarPV,R2,2040,5.71470000000
+9,2055,solarPV,R2,2040,5.71470000000
 9,2059,solarPV,R2,2040,5.71470000000
 9,2060,solarPV,R2,2040,5.71470000000
 9,2064,solarPV,R2,2040,5.71470000000
 9,2065,solarPV,R2,2040,5.71470000000
 9,2069,solarPV,R2,2040,5.71470000000
 10,2050,solarPV,R2,2045,15.71470000000
+10,2054,solarPV,R2,2045,15.71470000000
+10,2055,solarPV,R2,2045,15.71470000000
 10,2059,solarPV,R2,2045,15.71470000000
 10,2060,solarPV,R2,2045,15.71470000000
 10,2064,solarPV,R2,2045,15.71470000000
@@ -68,6 +80,8 @@ asset,year,technology,region,installed,capacity
 11,2045,windturbine,R1,2020,10.00000000000
 11,2049,windturbine,R1,2020,10.00000000000
 12,2050,windturbine,R1,2045,5.60870000000
+12,2054,windturbine,R1,2045,5.60870000000
+12,2055,windturbine,R1,2045,5.60870000000
 12,2059,windturbine,R1,2045,5.60870000000
 12,2060,windturbine,R1,2045,5.60870000000
 12,2064,windturbine,R1,2045,5.60870000000
@@ -78,6 +92,8 @@ asset,year,technology,region,installed,capacity
 13,2045,windturbine,R2,2020,15.60870000000
 13,2049,windturbine,R2,2020,15.60870000000
 14,2050,windturbine,R2,2045,5.60870000000
+14,2054,windturbine,R2,2045,5.60870000000
+14,2055,windturbine,R2,2045,5.60870000000
 14,2059,windturbine,R2,2045,5.60870000000
 14,2060,windturbine,R2,2045,5.60870000000
 14,2064,windturbine,R2,2045,5.60870000000
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 495c8a0d..eef653ae 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,18 +1,18 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,4.80970000000
-2,2055,R1,2025,gasCCGT,4.80970000000
-2,2059,R1,2025,gasCCGT,4.80970000000
-2,2060,R1,2025,gasCCGT,4.80970000000
-2,2064,R1,2025,gasCCGT,4.80970000000
+2,2050,R1,2025,solarPV,10.82170000000
+2,2054,R1,2025,solarPV,10.82170000000
 3,2050,R1,2030,solarPV,5.71470000000
+3,2054,R1,2030,solarPV,5.71470000000
 3,2055,R1,2030,solarPV,5.71470000000
 3,2059,R1,2030,solarPV,5.71470000000
 4,2050,R1,2035,solarPV,7.85760000000
+4,2054,R1,2035,solarPV,7.85760000000
 4,2055,R1,2035,solarPV,7.85760000000
 4,2059,R1,2035,solarPV,7.85760000000
 4,2060,R1,2035,solarPV,7.85760000000
 4,2064,R1,2035,solarPV,7.85760000000
 5,2050,R1,2040,solarPV,5.71470000000
+5,2054,R1,2040,solarPV,5.71470000000
 5,2055,R1,2040,solarPV,5.71470000000
 5,2059,R1,2040,solarPV,5.71470000000
 5,2060,R1,2040,solarPV,5.71470000000
@@ -20,6 +20,7 @@ asset,year,region,installed,technology,capacity
 5,2065,R1,2040,solarPV,5.71470000000
 5,2069,R1,2040,solarPV,5.71470000000
 6,2050,R1,2045,solarPV,15.71470000000
+6,2054,R1,2045,solarPV,15.71470000000
 6,2055,R1,2045,solarPV,15.71470000000
 6,2059,R1,2045,solarPV,15.71470000000
 6,2060,R1,2045,solarPV,15.71470000000
@@ -29,6 +30,7 @@ asset,year,region,installed,technology,capacity
 6,2070,R1,2045,solarPV,15.71470000000
 6,2074,R1,2045,solarPV,15.71470000000
 7,2050,R1,2045,windturbine,5.60870000000
+7,2054,R1,2045,windturbine,5.60870000000
 7,2055,R1,2045,windturbine,5.60870000000
 7,2059,R1,2045,windturbine,5.60870000000
 7,2060,R1,2045,windturbine,5.60870000000
@@ -37,41 +39,83 @@ asset,year,region,installed,technology,capacity
 7,2069,R1,2045,windturbine,5.60870000000
 7,2070,R1,2045,windturbine,5.60870000000
 7,2074,R1,2045,windturbine,5.60870000000
-9,2050,R2,2025,gasCCGT,4.80970000000
-9,2055,R2,2025,gasCCGT,4.80970000000
-9,2059,R2,2025,gasCCGT,4.80970000000
-9,2060,R2,2025,gasCCGT,4.80970000000
-9,2064,R2,2025,gasCCGT,4.80970000000
-10,2050,R2,2030,solarPV,5.71470000000
-10,2055,R2,2030,solarPV,5.71470000000
-10,2059,R2,2030,solarPV,5.71470000000
-11,2050,R2,2035,solarPV,7.85760000000
-11,2055,R2,2035,solarPV,7.85760000000
-11,2059,R2,2035,solarPV,7.85760000000
-11,2060,R2,2035,solarPV,7.85760000000
-11,2064,R2,2035,solarPV,7.85760000000
-12,2050,R2,2040,solarPV,5.71470000000
-12,2055,R2,2040,solarPV,5.71470000000
-12,2059,R2,2040,solarPV,5.71470000000
-12,2060,R2,2040,solarPV,5.71470000000
-12,2064,R2,2040,solarPV,5.71470000000
-12,2065,R2,2040,solarPV,5.71470000000
-12,2069,R2,2040,solarPV,5.71470000000
-13,2050,R2,2045,solarPV,15.71470000000
-13,2055,R2,2045,solarPV,15.71470000000
-13,2059,R2,2045,solarPV,15.71470000000
-13,2060,R2,2045,solarPV,15.71470000000
-13,2064,R2,2045,solarPV,15.71470000000
-13,2065,R2,2045,solarPV,15.71470000000
-13,2069,R2,2045,solarPV,15.71470000000
-13,2070,R2,2045,solarPV,15.71470000000
-13,2074,R2,2045,solarPV,15.71470000000
-14,2050,R2,2045,windturbine,5.60870000000
-14,2055,R2,2045,windturbine,5.60870000000
-14,2059,R2,2045,windturbine,5.60870000000
-14,2060,R2,2045,windturbine,5.60870000000
-14,2064,R2,2045,windturbine,5.60870000000
-14,2065,R2,2045,windturbine,5.60870000000
-14,2069,R2,2045,windturbine,5.60870000000
-14,2070,R2,2045,windturbine,5.60870000000
-14,2074,R2,2045,windturbine,5.60870000000
+8,2055,R1,2050,solarPV,10.00000000000
+8,2059,R1,2050,solarPV,10.00000000000
+8,2060,R1,2050,solarPV,10.00000000000
+8,2064,R1,2050,solarPV,10.00000000000
+8,2065,R1,2050,solarPV,10.00000000000
+8,2069,R1,2050,solarPV,10.00000000000
+8,2070,R1,2050,solarPV,10.00000000000
+8,2074,R1,2050,solarPV,10.00000000000
+8,2075,R1,2050,solarPV,10.00000000000
+8,2079,R1,2050,solarPV,10.00000000000
+9,2055,R1,2050,windturbine,0.82170000000
+9,2059,R1,2050,windturbine,0.82170000000
+9,2060,R1,2050,windturbine,0.82170000000
+9,2064,R1,2050,windturbine,0.82170000000
+9,2065,R1,2050,windturbine,0.82170000000
+9,2069,R1,2050,windturbine,0.82170000000
+9,2070,R1,2050,windturbine,0.82170000000
+9,2074,R1,2050,windturbine,0.82170000000
+9,2075,R1,2050,windturbine,0.82170000000
+9,2079,R1,2050,windturbine,0.82170000000
+11,2050,R2,2025,solarPV,10.82170000000
+11,2054,R2,2025,solarPV,10.82170000000
+12,2050,R2,2030,solarPV,5.71470000000
+12,2054,R2,2030,solarPV,5.71470000000
+12,2055,R2,2030,solarPV,5.71470000000
+12,2059,R2,2030,solarPV,5.71470000000
+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
+14,2050,R2,2040,solarPV,5.71470000000
+14,2054,R2,2040,solarPV,5.71470000000
+14,2055,R2,2040,solarPV,5.71470000000
+14,2059,R2,2040,solarPV,5.71470000000
+14,2060,R2,2040,solarPV,5.71470000000
+14,2064,R2,2040,solarPV,5.71470000000
+14,2065,R2,2040,solarPV,5.71470000000
+14,2069,R2,2040,solarPV,5.71470000000
+15,2050,R2,2045,solarPV,15.71470000000
+15,2054,R2,2045,solarPV,15.71470000000
+15,2055,R2,2045,solarPV,15.71470000000
+15,2059,R2,2045,solarPV,15.71470000000
+15,2060,R2,2045,solarPV,15.71470000000
+15,2064,R2,2045,solarPV,15.71470000000
+15,2065,R2,2045,solarPV,15.71470000000
+15,2069,R2,2045,solarPV,15.71470000000
+15,2070,R2,2045,solarPV,15.71470000000
+15,2074,R2,2045,solarPV,15.71470000000
+16,2050,R2,2045,windturbine,5.60870000000
+16,2054,R2,2045,windturbine,5.60870000000
+16,2055,R2,2045,windturbine,5.60870000000
+16,2059,R2,2045,windturbine,5.60870000000
+16,2060,R2,2045,windturbine,5.60870000000
+16,2064,R2,2045,windturbine,5.60870000000
+16,2065,R2,2045,windturbine,5.60870000000
+16,2069,R2,2045,windturbine,5.60870000000
+16,2070,R2,2045,windturbine,5.60870000000
+16,2074,R2,2045,windturbine,5.60870000000
+17,2055,R2,2050,solarPV,10.00000000000
+17,2059,R2,2050,solarPV,10.00000000000
+17,2060,R2,2050,solarPV,10.00000000000
+17,2064,R2,2050,solarPV,10.00000000000
+17,2065,R2,2050,solarPV,10.00000000000
+17,2069,R2,2050,solarPV,10.00000000000
+17,2070,R2,2050,solarPV,10.00000000000
+17,2074,R2,2050,solarPV,10.00000000000
+17,2075,R2,2050,solarPV,10.00000000000
+17,2079,R2,2050,solarPV,10.00000000000
+18,2055,R2,2050,windturbine,0.82170000000
+18,2059,R2,2050,windturbine,0.82170000000
+18,2060,R2,2050,windturbine,0.82170000000
+18,2064,R2,2050,windturbine,0.82170000000
+18,2065,R2,2050,windturbine,0.82170000000
+18,2069,R2,2050,windturbine,0.82170000000
+18,2070,R2,2050,windturbine,0.82170000000
+18,2074,R2,2050,windturbine,0.82170000000
+18,2075,R2,2050,windturbine,0.82170000000
+18,2079,R2,2050,windturbine,0.82170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 1de51053..c6b9c6df 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
index ef01c5df..d1d3d6e7 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
@@ -1,23 +1,9 @@
-asset,year,technology,region,installed,capacity
-0,2024,gassupply1,R1,2020,15.00000000000
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2026,gassupply1,R1,2020,7.50000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2026,gassupply1,R1,2024,2.54560000000
-1,2030,gassupply1,R1,2024,2.54560000000
-1,2035,gassupply1,R1,2024,2.54560000000
-1,2040,gassupply1,R1,2024,2.54560000000
-1,2045,gassupply1,R1,2024,2.54560000000
-1,2050,gassupply1,R1,2024,2.54560000000
-1,2060,gassupply1,R1,2024,2.54560000000
-2,2024,gassupply1,R2,2020,15.00000000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2026,gassupply1,R2,2020,7.50000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2026,gassupply1,R2,2024,2.54560000000
-3,2030,gassupply1,R2,2024,2.54560000000
-3,2035,gassupply1,R2,2024,2.54560000000
-3,2040,gassupply1,R2,2024,2.54560000000
-3,2045,gassupply1,R2,2024,2.54560000000
-3,2050,gassupply1,R2,2024,2.54560000000
-3,2060,gassupply1,R2,2024,2.54560000000
+asset,year,region,installed,technology,capacity
+0,2024,R1,2020,gassupply1,15.00000000000
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2026,R1,2020,gassupply1,7.50000000000
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2024,R2,2020,gassupply1,15.00000000000
+1,2025,R2,2020,gassupply1,15.00000000000
+1,2026,R2,2020,gassupply1,7.50000000000
+1,2030,R2,2020,gassupply1,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 1ac8ff7b..650e13f8 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
@@ -2,40 +2,6 @@ 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.54560000000
-1,2028,R1,2024,gassupply1,2.54560000000
-1,2030,R1,2024,gassupply1,2.54560000000
-1,2035,R1,2024,gassupply1,2.54560000000
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-4,2028,R2,2024,gassupply1,2.54560000000
-4,2030,R2,2024,gassupply1,2.54560000000
-4,2035,R2,2024,gassupply1,2.54560000000
-4,2040,R2,2024,gassupply1,2.54560000000
-4,2045,R2,2024,gassupply1,2.54560000000
-4,2050,R2,2024,gassupply1,2.54560000000
-4,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2026,R2,2020,gassupply1,7.50000000000
+1,2028,R2,2020,gassupply1,7.50000000000
+1,2030,R2,2020,gassupply1,7.50000000000
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 d6baaa17..b2f62d8c 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,5 @@
 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.54560000000
-1,2030,R1,2024,gassupply1,2.54560000000
-1,2035,R1,2024,gassupply1,2.54560000000
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-5,2030,R2,2024,gassupply1,2.54560000000
-5,2035,R2,2024,gassupply1,2.54560000000
-5,2040,R2,2024,gassupply1,2.54560000000
-5,2045,R2,2024,gassupply1,2.54560000000
-5,2050,R2,2024,gassupply1,2.54560000000
-5,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2028,R2,2020,gassupply1,7.50000000000
+1,2030,R2,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index ec46c1a1..68a03dc3 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,81 +1,15 @@
-asset,year,technology,region,installed,capacity
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2024,2.54560000000
-1,2032,gassupply1,R1,2024,2.54560000000
-1,2035,gassupply1,R1,2024,2.54560000000
-1,2040,gassupply1,R1,2024,2.54560000000
-1,2045,gassupply1,R1,2024,2.54560000000
-1,2050,gassupply1,R1,2024,2.54560000000
-1,2060,gassupply1,R1,2024,2.54560000000
-2,2030,gassupply1,R1,2026,1.69660000000
-2,2032,gassupply1,R1,2026,1.69660000000
-2,2035,gassupply1,R1,2026,1.69660000000
-2,2040,gassupply1,R1,2026,1.69660000000
-2,2045,gassupply1,R1,2026,1.69660000000
-2,2050,gassupply1,R1,2026,1.69660000000
-2,2060,gassupply1,R1,2026,1.69660000000
-2,2061,gassupply1,R1,2026,1.69660000000
-2,2062,gassupply1,R1,2026,1.69660000000
-3,2030,gassupply1,R1,2028,1.69660000000
-3,2032,gassupply1,R1,2028,1.69660000000
-3,2035,gassupply1,R1,2028,1.69660000000
-3,2040,gassupply1,R1,2028,1.69660000000
-3,2045,gassupply1,R1,2028,1.69660000000
-3,2050,gassupply1,R1,2028,1.69660000000
-3,2060,gassupply1,R1,2028,1.69660000000
-3,2061,gassupply1,R1,2028,1.69660000000
-3,2062,gassupply1,R1,2028,1.69660000000
-3,2063,gassupply1,R1,2028,1.69660000000
-3,2064,gassupply1,R1,2028,1.69660000000
-4,2032,gassupply1,R1,2030,9.19660000000
-4,2035,gassupply1,R1,2030,9.19660000000
-4,2040,gassupply1,R1,2030,9.19660000000
-4,2045,gassupply1,R1,2030,9.19660000000
-4,2050,gassupply1,R1,2030,9.19660000000
-4,2060,gassupply1,R1,2030,9.19660000000
-4,2061,gassupply1,R1,2030,9.19660000000
-4,2062,gassupply1,R1,2030,9.19660000000
-4,2063,gassupply1,R1,2030,9.19660000000
-4,2064,gassupply1,R1,2030,9.19660000000
-4,2065,gassupply1,R1,2030,9.19660000000
-4,2066,gassupply1,R1,2030,9.19660000000
-5,2030,gassupply1,R2,2020,7.50000000000
-6,2030,gassupply1,R2,2024,2.54560000000
-6,2032,gassupply1,R2,2024,2.54560000000
-6,2035,gassupply1,R2,2024,2.54560000000
-6,2040,gassupply1,R2,2024,2.54560000000
-6,2045,gassupply1,R2,2024,2.54560000000
-6,2050,gassupply1,R2,2024,2.54560000000
-6,2060,gassupply1,R2,2024,2.54560000000
-7,2030,gassupply1,R2,2026,1.69660000000
-7,2032,gassupply1,R2,2026,1.69660000000
-7,2035,gassupply1,R2,2026,1.69660000000
-7,2040,gassupply1,R2,2026,1.69660000000
-7,2045,gassupply1,R2,2026,1.69660000000
-7,2050,gassupply1,R2,2026,1.69660000000
-7,2060,gassupply1,R2,2026,1.69660000000
-7,2061,gassupply1,R2,2026,1.69660000000
-7,2062,gassupply1,R2,2026,1.69660000000
-8,2030,gassupply1,R2,2028,1.69660000000
-8,2032,gassupply1,R2,2028,1.69660000000
-8,2035,gassupply1,R2,2028,1.69660000000
-8,2040,gassupply1,R2,2028,1.69660000000
-8,2045,gassupply1,R2,2028,1.69660000000
-8,2050,gassupply1,R2,2028,1.69660000000
-8,2060,gassupply1,R2,2028,1.69660000000
-8,2061,gassupply1,R2,2028,1.69660000000
-8,2062,gassupply1,R2,2028,1.69660000000
-8,2063,gassupply1,R2,2028,1.69660000000
-8,2064,gassupply1,R2,2028,1.69660000000
-9,2032,gassupply1,R2,2030,9.19660000000
-9,2035,gassupply1,R2,2030,9.19660000000
-9,2040,gassupply1,R2,2030,9.19660000000
-9,2045,gassupply1,R2,2030,9.19660000000
-9,2050,gassupply1,R2,2030,9.19660000000
-9,2060,gassupply1,R2,2030,9.19660000000
-9,2061,gassupply1,R2,2030,9.19660000000
-9,2062,gassupply1,R2,2030,9.19660000000
-9,2063,gassupply1,R2,2030,9.19660000000
-9,2064,gassupply1,R2,2030,9.19660000000
-9,2065,gassupply1,R2,2030,9.19660000000
-9,2066,gassupply1,R2,2030,9.19660000000
+asset,year,region,installed,technology,capacity
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2032,R1,2030,gassupply1,2.99730000000
+1,2035,R1,2030,gassupply1,2.99730000000
+1,2040,R1,2030,gassupply1,2.99730000000
+1,2045,R1,2030,gassupply1,2.99730000000
+1,2050,R1,2030,gassupply1,2.99730000000
+1,2066,R1,2030,gassupply1,2.99730000000
+2,2030,R2,2020,gassupply1,7.50000000000
+3,2032,R2,2030,gassupply1,2.99730000000
+3,2035,R2,2030,gassupply1,2.99730000000
+3,2040,R2,2030,gassupply1,2.99730000000
+3,2045,R2,2030,gassupply1,2.99730000000
+3,2050,R2,2030,gassupply1,2.99730000000
+3,2066,R2,2030,gassupply1,2.99730000000
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 e604abaa..b1eca482 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,15 @@
 asset,year,region,installed,technology,capacity
-1,2032,R1,2024,gassupply1,2.54560000000
-1,2034,R1,2024,gassupply1,2.54560000000
-1,2035,R1,2024,gassupply1,2.54560000000
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-6,2034,R2,2024,gassupply1,2.54560000000
-6,2035,R2,2024,gassupply1,2.54560000000
-6,2040,R2,2024,gassupply1,2.54560000000
-6,2045,R2,2024,gassupply1,2.54560000000
-6,2050,R2,2024,gassupply1,2.54560000000
-6,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2032,R1,2030,gassupply1,2.99730000000
+1,2034,R1,2030,gassupply1,2.99730000000
+1,2035,R1,2030,gassupply1,2.99730000000
+1,2040,R1,2030,gassupply1,2.99730000000
+1,2045,R1,2030,gassupply1,2.99730000000
+1,2050,R1,2030,gassupply1,2.99730000000
+1,2066,R1,2030,gassupply1,2.99730000000
+3,2032,R2,2030,gassupply1,2.99730000000
+3,2034,R2,2030,gassupply1,2.99730000000
+3,2035,R2,2030,gassupply1,2.99730000000
+3,2040,R2,2030,gassupply1,2.99730000000
+3,2045,R2,2030,gassupply1,2.99730000000
+3,2050,R2,2030,gassupply1,2.99730000000
+3,2066,R2,2030,gassupply1,2.99730000000
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 5d31f52d..c03450c5 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,15 @@
 asset,year,region,installed,technology,capacity
-1,2034,R1,2024,gassupply1,2.54560000000
-1,2035,R1,2024,gassupply1,2.54560000000
-1,2036,R1,2024,gassupply1,2.54560000000
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-6,2035,R2,2024,gassupply1,2.54560000000
-6,2036,R2,2024,gassupply1,2.54560000000
-6,2040,R2,2024,gassupply1,2.54560000000
-6,2045,R2,2024,gassupply1,2.54560000000
-6,2050,R2,2024,gassupply1,2.54560000000
-6,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2034,R1,2030,gassupply1,2.99730000000
+1,2035,R1,2030,gassupply1,2.99730000000
+1,2036,R1,2030,gassupply1,2.99730000000
+1,2040,R1,2030,gassupply1,2.99730000000
+1,2045,R1,2030,gassupply1,2.99730000000
+1,2050,R1,2030,gassupply1,2.99730000000
+1,2066,R1,2030,gassupply1,2.99730000000
+3,2034,R2,2030,gassupply1,2.99730000000
+3,2035,R2,2030,gassupply1,2.99730000000
+3,2036,R2,2030,gassupply1,2.99730000000
+3,2040,R2,2030,gassupply1,2.99730000000
+3,2045,R2,2030,gassupply1,2.99730000000
+3,2050,R2,2030,gassupply1,2.99730000000
+3,2066,R2,2030,gassupply1,2.99730000000
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 0be66489..7c80bf12 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,13 @@
 asset,year,region,installed,technology,capacity
-1,2036,R1,2024,gassupply1,2.54560000000
-1,2038,R1,2024,gassupply1,2.54560000000
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-6,2038,R2,2024,gassupply1,2.54560000000
-6,2040,R2,2024,gassupply1,2.54560000000
-6,2045,R2,2024,gassupply1,2.54560000000
-6,2050,R2,2024,gassupply1,2.54560000000
-6,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2036,R1,2030,gassupply1,2.99730000000
+1,2038,R1,2030,gassupply1,2.99730000000
+1,2040,R1,2030,gassupply1,2.99730000000
+1,2045,R1,2030,gassupply1,2.99730000000
+1,2050,R1,2030,gassupply1,2.99730000000
+1,2066,R1,2030,gassupply1,2.99730000000
+3,2036,R2,2030,gassupply1,2.99730000000
+3,2038,R2,2030,gassupply1,2.99730000000
+3,2040,R2,2030,gassupply1,2.99730000000
+3,2045,R2,2030,gassupply1,2.99730000000
+3,2050,R2,2030,gassupply1,2.99730000000
+3,2066,R2,2030,gassupply1,2.99730000000
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 e5e2c159..0c3ee68d 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,11 @@
 asset,year,region,installed,technology,capacity
-1,2038,R1,2024,gassupply1,2.54560000000
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-6,2040,R2,2024,gassupply1,2.54560000000
-6,2045,R2,2024,gassupply1,2.54560000000
-6,2050,R2,2024,gassupply1,2.54560000000
-6,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2038,R1,2030,gassupply1,2.99730000000
+1,2040,R1,2030,gassupply1,2.99730000000
+1,2045,R1,2030,gassupply1,2.99730000000
+1,2050,R1,2030,gassupply1,2.99730000000
+1,2066,R1,2030,gassupply1,2.99730000000
+3,2038,R2,2030,gassupply1,2.99730000000
+3,2040,R2,2030,gassupply1,2.99730000000
+3,2045,R2,2030,gassupply1,2.99730000000
+3,2050,R2,2030,gassupply1,2.99730000000
+3,2066,R2,2030,gassupply1,2.99730000000
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 66cbc89b..2af2554d 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,11 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2024,gassupply1,2.54560000000
-1,2042,R1,2024,gassupply1,2.54560000000
-1,2045,R1,2024,gassupply1,2.54560000000
-1,2050,R1,2024,gassupply1,2.54560000000
-1,2060,R1,2024,gassupply1,2.54560000000
-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.54560000000
-6,2042,R2,2024,gassupply1,2.54560000000
-6,2045,R2,2024,gassupply1,2.54560000000
-6,2050,R2,2024,gassupply1,2.54560000000
-6,2060,R2,2024,gassupply1,2.54560000000
-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
+1,2040,R1,2030,gassupply1,2.99730000000
+1,2042,R1,2030,gassupply1,2.99730000000
+1,2045,R1,2030,gassupply1,2.99730000000
+1,2050,R1,2030,gassupply1,2.99730000000
+1,2066,R1,2030,gassupply1,2.99730000000
+3,2040,R2,2030,gassupply1,2.99730000000
+3,2042,R2,2030,gassupply1,2.99730000000
+3,2045,R2,2030,gassupply1,2.99730000000
+3,2050,R2,2030,gassupply1,2.99730000000
+3,2066,R2,2030,gassupply1,2.99730000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 0e8f4d28..2fa23ca2 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -23,12 +23,12 @@ gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
 heatpump,R2,R2,A1,residential,retrofit,2024,14.42990000000
 heatpump,R2,R2,A1,residential,retrofit,2024,2.28590000000
 gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2024,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2024,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2024,2.28590000000
 gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2024,1.01590000000
 windturbine,R2,R2,A1,power,retrofit,2024,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2024,2.28590000000
 gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2026,2.32550000000
@@ -39,17 +39,15 @@ gasboiler,R2,R2,A1,residential,retrofit,2026,2.32550000000
 heatpump,R2,R2,A1,residential,retrofit,2026,14.42990000000
 heatpump,R2,R2,A1,residential,retrofit,2026,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2026,4.96040000000
-gasCCGT,R1,R1,A1,power,retrofit,2026,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2026,3.20460000000
 solarPV,R1,R1,A1,power,retrofit,2026,4.17990000000
 windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2026,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2026,3.20460000000
+windturbine,R1,R1,A1,power,retrofit,2026,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2026,7.21040000000
 windturbine,R2,R2,A1,power,retrofit,2026,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2026,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2026,7.21040000000
 gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2026,2.54560000000
 gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2026,2.54560000000
 gasboiler,R1,R1,A1,residential,retrofit,2028,2.32550000000
 heatpump,R1,R1,A1,residential,retrofit,2028,14.42990000000
 heatpump,R1,R1,A1,residential,retrofit,2028,2.28590000000
@@ -60,21 +58,17 @@ heatpump,R2,R2,A1,residential,retrofit,2028,14.42990000000
 heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2028,4.96040000000
 heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
-gasCCGT,R1,R1,A1,power,retrofit,2028,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2028,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2028,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2028,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2028,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2028,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2028,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2028,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2028,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2028,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2028,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2028,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2028,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2028,7.21040000000
 gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2028,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2028,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2028,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2028,1.69660000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,2.32550000000
 heatpump,R1,R1,A1,residential,retrofit,2030,14.42990000000
 heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
@@ -87,25 +81,19 @@ heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2030,4.96040000000
 heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2030,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2030,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2030,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2030,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2030,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2030,7.21040000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,1.69660000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,1.69660000000
 gasboiler,R1,R1,A1,residential,retrofit,2032,2.32550000000
 heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
 heatpump,R1,R1,A1,residential,retrofit,2032,4.96040000000
@@ -118,27 +106,21 @@ heatpump,R2,R2,A1,residential,retrofit,2032,4.96040000000
 heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2032,16.71570000000
-gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2032,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2032,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2032,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2032,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2032,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2032,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2032,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2032,12.17990000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,9.19660000000
+windturbine,R2,R2,A1,power,retrofit,2032,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2032,7.21040000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,2.99730000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,2.99730000000
 gasboiler,R1,R1,A1,residential,retrofit,2034,2.32550000000
 heatpump,R1,R1,A1,residential,retrofit,2034,4.96040000000
 heatpump,R1,R1,A1,residential,retrofit,2034,2.28590000000
@@ -151,29 +133,23 @@ heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2034,16.71570000000
 heatpump,R2,R2,A1,residential,retrofit,2034,4.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2034,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2034,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2034,4.17990000000
 solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2034,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2034,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2034,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2034,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2034,12.17990000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,9.19660000000
+windturbine,R2,R2,A1,power,retrofit,2034,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2034,7.21040000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,2.99730000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,2.99730000000
 heatpump,R1,R1,A1,residential,retrofit,2036,2.28590000000
 heatpump,R1,R1,A1,residential,retrofit,2036,2.28590000000
 heatpump,R1,R1,A1,residential,retrofit,2036,16.71570000000
@@ -184,31 +160,25 @@ heatpump,R2,R2,A1,residential,retrofit,2036,2.28590000000
 heatpump,R2,R2,A1,residential,retrofit,2036,16.71570000000
 heatpump,R2,R2,A1,residential,retrofit,2036,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2036,9.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2036,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2036,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2036,4.17990000000
 solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2036,4.61130000000
 windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2036,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2036,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2036,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2036,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2036,4.61130000000
 windturbine,R2,R2,A1,power,retrofit,2036,12.17990000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,9.19660000000
+windturbine,R2,R2,A1,power,retrofit,2036,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2036,7.21040000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,2.99730000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,2.99730000000
 heatpump,R1,R1,A1,residential,retrofit,2038,2.28590000000
 heatpump,R1,R1,A1,residential,retrofit,2038,16.71570000000
 heatpump,R1,R1,A1,residential,retrofit,2038,4.57170000000
@@ -219,33 +189,27 @@ heatpump,R2,R2,A1,residential,retrofit,2038,16.71570000000
 heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2038,9.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2038,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2038,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2038,4.17990000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2038,4.61130000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2038,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2038,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2038,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2038,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2038,4.61130000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2038,12.17990000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,9.19660000000
+windturbine,R2,R2,A1,power,retrofit,2038,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2038,7.21040000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,2.99730000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,2.99730000000
 heatpump,R1,R1,A1,residential,retrofit,2040,16.71570000000
 heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
 heatpump,R1,R1,A1,residential,retrofit,2040,9.57170000000
@@ -256,32 +220,26 @@ heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2040,9.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,3.20460000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,1.01590000000
 solarPV,R1,R1,A1,power,retrofit,2040,4.17990000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2040,4.61130000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
 windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,3.20460000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,1.01590000000
+windturbine,R1,R1,A1,power,retrofit,2040,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2040,7.21040000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2040,4.61130000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
 windturbine,R2,R2,A1,power,retrofit,2040,12.17990000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.54560000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,1.69660000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,9.19660000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.54560000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,1.69660000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,9.19660000000
+windturbine,R2,R2,A1,power,retrofit,2040,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2040,7.21040000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.99730000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.99730000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 90e1c51a..e58a802a 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.32050000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,0.32050000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,0.72220000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,0.72220000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,16.44340000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,16.44340000000,2022
+"('all-year', 'all-week', 'night')",gas,R1,6.03240000000,2022
+"('all-year', 'all-week', 'night')",gas,R2,6.03240000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,80.14440000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,80.14440000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,0.48070000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,0.48070000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,1.08340000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,1.08340000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,16.47540000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,16.47540000000,2022
+"('all-year', 'all-week', 'morning')",gas,R1,6.03500000000,2022
+"('all-year', 'all-week', 'morning')",gas,R2,6.03500000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,80.21670000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,80.21670000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.32050000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.32050000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.72220000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.72220000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.44340000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.44340000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.03240000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.03240000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.14440000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.14440000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.48070000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.48070000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.08340000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.08340000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.47540000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,16.47540000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.03500000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.03500000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.21670000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.21670000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.96180000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.96180000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.16780000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.16780000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57160000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,16.57160000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.04260000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.04260000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.43360000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.43360000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,0.64140000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,0.64140000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,1.44550000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,1.44550000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,16.50750000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,16.50750000000,2022
+"('all-year', 'all-week', 'evening')",gas,R1,6.03750000000,2022
+"('all-year', 'all-week', 'evening')",gas,R2,6.03750000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,80.28910000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,80.28910000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.64140000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.64140000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.44550000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.44550000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,16.50750000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,16.50750000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.03750000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.03750000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.28910000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.28910000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.64140000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.64140000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.44550000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.44550000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.50750000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.50750000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.03750000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.03750000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.28910000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.28910000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.27380000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.27380000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,0.13860000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,0.13860000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,13.21020000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,13.21020000000,2024
+"('all-year', 'all-week', 'night')",gas,R1,4.83100000000,2024
+"('all-year', 'all-week', 'night')",gas,R2,4.83100000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,64.23710000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,64.23710000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.41120000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.41120000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,0.21350000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,0.21350000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,13.26370000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,13.26370000000,2024
+"('all-year', 'all-week', 'morning')",gas,R1,4.83560000000,2024
+"('all-year', 'all-week', 'morning')",gas,R2,4.83560000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,64.35580000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,64.35580000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.27380000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.27380000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13860000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13860000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21020000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21020000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83100000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83100000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.23710000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.23710000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.41120000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.41120000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21350000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.21350000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26370000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26370000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.83560000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.83560000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35580000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35580000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.82660000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.82660000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46120000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.46120000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.42410000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.42410000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.84920000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.84920000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.71340000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.71340000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,0.54950000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,0.54950000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,0.29250000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,0.29250000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,13.31720000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,13.31720000000,2024
+"('all-year', 'all-week', 'evening')",gas,R1,4.84010000000,2024
+"('all-year', 'all-week', 'evening')",gas,R2,4.84010000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,64.47510000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,64.47510000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.54950000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.54950000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.29250000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.29250000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.31720000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.31720000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.84010000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.84010000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.47510000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.47510000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.54950000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.54950000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.29250000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.29250000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.31720000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.31720000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84010000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84010000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.47510000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.47510000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.42850000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.42850000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.07650000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.07650000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,10.58620000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,10.58620000000,2026
+"('all-year', 'all-week', 'night')",gas,R1,3.86990000000,2026
+"('all-year', 'all-week', 'night')",gas,R2,3.86990000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,51.47940000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,51.47940000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64380000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,0.64380000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.12020000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.12020000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,10.63800000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,10.63800000000,2026
+"('all-year', 'all-week', 'morning')",gas,R1,3.87600000000,2026
+"('all-year', 'all-week', 'morning')",gas,R2,3.87600000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,51.61970000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,51.61970000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.42850000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.42850000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07650000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07650000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.58620000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.58620000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.86990000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.86990000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.47940000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.47940000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64380000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64380000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12020000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12020000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63800000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63800000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.87600000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.87600000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.61970000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.61970000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.29410000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.29410000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27360000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27360000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.79340000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,10.79340000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.89460000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.89460000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.04350000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.04350000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,0.86030000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,0.86030000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.16770000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.16770000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,10.68990000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,10.68990000000,2026
+"('all-year', 'all-week', 'evening')",gas,R1,3.88220000000,2026
+"('all-year', 'all-week', 'evening')",gas,R2,3.88220000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,51.76080000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,51.76080000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.86030000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.86030000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16770000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16770000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,10.68990000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,10.68990000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.88220000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.88220000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.76080000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.76080000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.86030000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.86030000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16770000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16770000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.68990000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.68990000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88220000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88220000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.76080000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.76080000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.51740000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.51740000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.08170000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.08170000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,8.48700000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,8.48700000000,2028
+"('all-year', 'all-week', 'night')",gas,R1,3.10100000000,2028
+"('all-year', 'all-week', 'night')",gas,R2,3.10100000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,41.25840000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,41.25840000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77720000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,0.77720000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.13110000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.13110000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,8.53740000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,8.53740000000,2028
+"('all-year', 'all-week', 'morning')",gas,R1,3.10840000000,2028
+"('all-year', 'all-week', 'morning')",gas,R2,3.10840000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,41.40850000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,41.40850000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.51740000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.51740000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08170000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08170000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.48700000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.48700000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10100000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10100000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.25840000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.25840000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77720000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77720000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13110000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13110000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53740000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53740000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10840000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10840000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.40850000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.40850000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56180000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.56180000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31400000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.31400000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.68890000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.68890000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13080000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13080000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.86280000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.86280000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03850000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,1.03850000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.18640000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.18640000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,8.58800000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,8.58800000000,2028
+"('all-year', 'all-week', 'evening')",gas,R1,3.11590000000,2028
+"('all-year', 'all-week', 'evening')",gas,R2,3.11590000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,41.55960000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,41.55960000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.03850000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.03850000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18640000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18640000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.58800000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.58800000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11590000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11590000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.55960000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.55960000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.03850000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.03850000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18640000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18640000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.58800000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.58800000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11590000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11590000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.55960000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.55960000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.60760000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.60760000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.08510000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.08510000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,6.80760000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,6.80760000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,2.48580000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,2.48580000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,33.06970000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,33.06970000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.91260000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.91260000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.13790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.13790000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,6.85700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,6.85700000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,2.49430000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,2.49430000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,33.22170000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,33.22170000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.60760000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.60760000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08510000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08510000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.80760000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.80760000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.48580000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.48580000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.06970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.06970000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.91260000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.91260000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13790000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85700000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.49430000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.49430000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.22170000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.22170000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.83340000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.83340000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33860000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.33860000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.00520000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.00520000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.51980000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.51980000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.68260000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.68260000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.21930000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.21930000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.19790000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.19790000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,6.90640000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,6.90640000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,2.50280000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,2.50280000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,33.37480000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,33.37480000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.21930000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.21930000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.19790000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.19790000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,6.90640000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,6.90640000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.50280000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.50280000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.37480000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.37480000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.21930000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.21930000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19790000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19790000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.90640000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.90640000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.50280000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.50280000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.37480000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.37480000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.73030000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.73030000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.09130000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.09130000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,5.46400000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,5.46400000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,1.99370000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,1.99370000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,26.50980000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,26.50980000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,1.09680000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,1.09680000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.14910000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.14910000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,5.51250000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,5.51250000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,2.00300000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,2.00300000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,26.65880000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,26.65880000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.73030000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.73030000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09130000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09130000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46400000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46400000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.99370000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.99370000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.50980000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.50980000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.09680000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.09680000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14910000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.14910000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.51250000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,5.51250000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.00300000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.00300000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.65880000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,26.65880000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.20230000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.20230000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37200000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.37200000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.65800000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,5.65800000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.03110000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.03110000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.11160000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,27.11160000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,1.46510000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,1.46510000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.21530000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.21530000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,5.56110000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,5.56110000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,2.01240000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,2.01240000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,26.80920000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,26.80920000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.46510000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.46510000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.21530000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.21530000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56110000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56110000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.01240000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.01240000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,26.80920000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,26.80920000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.46510000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.46510000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.21530000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.21530000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56110000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56110000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.01240000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.01240000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.80920000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.80920000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.76280000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.76280000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.09780000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.09780000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,4.38910000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,4.38910000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,21.25480000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,21.25480000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.14530000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.14530000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.16140000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.16140000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,4.43680000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,4.43680000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,21.39800000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,21.39800000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.76280000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.76280000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.09780000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.09780000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.38910000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.38910000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.25480000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.25480000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.14530000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.14530000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16140000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.16140000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43680000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43680000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,21.39800000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,21.39800000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.29890000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.29890000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.41180000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.41180000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58000000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58000000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,21.83350000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,21.83350000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,1.52980000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,1.52980000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.23510000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.23510000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,4.48460000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,4.48460000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,21.54240000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,21.54240000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.52980000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.52980000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.23510000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.23510000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48460000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48460000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,21.54240000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,21.54240000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.52980000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.52980000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.23510000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.23510000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48460000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48460000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.54240000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.54240000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.74400000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.74400000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.03470000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.03470000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.08820000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.08820000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.13820000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.13820000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,1.11700000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,1.11700000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.06840000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.06840000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13230000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13230000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.20940000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.20940000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74400000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74400000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03470000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03470000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08820000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08820000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13820000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13820000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.11700000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.11700000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06840000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06840000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13230000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13230000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20940000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.20940000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.24130000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.24130000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23570000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23570000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26480000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26480000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43130000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43130000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,1.49180000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,1.49180000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.11320000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.11320000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17660000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17660000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.28210000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.28210000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.49180000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.49180000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11320000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11320000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17660000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17660000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.28210000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.28210000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.49180000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.49180000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11320000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11320000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17660000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17660000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28210000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28210000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.76940000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.76940000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.03410000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.03410000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.08760000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.08760000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.15500000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.15500000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.06720000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.06720000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13150000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13150000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.02500000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.02500000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.76940000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.76940000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03410000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03410000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08760000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08760000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15500000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15500000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06720000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06720000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13150000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13150000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02500000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02500000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31700000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.31700000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23080000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23080000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26300000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26300000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06140000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06140000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,1.54240000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,1.54240000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.11100000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.11100000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17540000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17540000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.03590000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.03590000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.54240000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.54240000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11100000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11100000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17540000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17540000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03590000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03590000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.54240000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.54240000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11100000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11100000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17540000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17540000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03590000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03590000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.79170000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.79170000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03490000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.03490000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08700000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08700000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,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,1.18850000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.18850000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.06880000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.06880000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13050000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13050000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.02490000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.02490000000,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', 'mid-afternoon')",electricity,R1,0.79170000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.79170000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03490000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03490000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08700000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08700000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.18850000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.18850000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06880000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06880000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13050000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13050000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02490000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02490000000,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,2.38360000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.38360000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23730000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23730000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26110000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26110000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06120000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06120000000,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.58700000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.58700000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.11390000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.11390000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17410000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17410000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03580000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03580000000,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', 'early-morning')",electricity,R1,1.58700000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.58700000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11390000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11390000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17410000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17410000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03580000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03580000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.58700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.58700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11390000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11390000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17410000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17410000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03580000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03580000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 cdc4a2ff..3b96337e 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
@@ -18,16 +18,15 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2025,R1,2022,gasCCGT,1.01590000000
-3,2030,R1,2022,gasCCGT,1.01590000000
-3,2035,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
+3,2024,R1,2022,windturbine,2.28590000000
+3,2025,R1,2022,windturbine,2.28590000000
+3,2030,R1,2022,windturbine,2.28590000000
+3,2035,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
 4,2022,R2,2020,gasCCGT,1.00000000000
 4,2024,R2,2020,gasCCGT,1.00000000000
 4,2025,R2,2020,gasCCGT,1.00000000000
@@ -39,13 +38,12 @@ asset,year,region,installed,technology,capacity
 5,2040,R2,2020,windturbine,12.17990000000
 5,2045,R2,2020,windturbine,12.17990000000
 5,2046,R2,2020,windturbine,12.17990000000
-6,2024,R2,2022,gasCCGT,1.01590000000
-6,2025,R2,2022,gasCCGT,1.01590000000
-6,2030,R2,2022,gasCCGT,1.01590000000
-6,2035,R2,2022,gasCCGT,1.01590000000
-6,2040,R2,2022,gasCCGT,1.01590000000
-6,2045,R2,2022,gasCCGT,1.01590000000
-6,2046,R2,2022,gasCCGT,1.01590000000
-6,2047,R2,2022,gasCCGT,1.01590000000
-6,2050,R2,2022,gasCCGT,1.01590000000
-6,2058,R2,2022,gasCCGT,1.01590000000
+6,2024,R2,2022,windturbine,2.28590000000
+6,2025,R2,2022,windturbine,2.28590000000
+6,2030,R2,2022,windturbine,2.28590000000
+6,2035,R2,2022,windturbine,2.28590000000
+6,2040,R2,2022,windturbine,2.28590000000
+6,2045,R2,2022,windturbine,2.28590000000
+6,2046,R2,2022,windturbine,2.28590000000
+6,2047,R2,2022,windturbine,2.28590000000
+6,2048,R2,2022,windturbine,2.28590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index 330b0b0d..d921a31b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -1,73 +1,69 @@
 asset,year,technology,region,installed,capacity
 0,2024,gasCCGT,R1,2020,1.00000000000
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2024,gasCCGT,R1,2022,1.01590000000
-1,2025,gasCCGT,R1,2022,1.01590000000
-1,2026,gasCCGT,R1,2022,1.01590000000
-1,2030,gasCCGT,R1,2022,1.01590000000
-1,2035,gasCCGT,R1,2022,1.01590000000
-1,2040,gasCCGT,R1,2022,1.01590000000
-1,2045,gasCCGT,R1,2022,1.01590000000
-1,2046,gasCCGT,R1,2022,1.01590000000
-1,2047,gasCCGT,R1,2022,1.01590000000
-1,2050,gasCCGT,R1,2022,1.01590000000
-1,2058,gasCCGT,R1,2022,1.01590000000
-2,2026,gasCCGT,R1,2024,3.20460000000
-2,2030,gasCCGT,R1,2024,3.20460000000
-2,2035,gasCCGT,R1,2024,3.20460000000
-2,2040,gasCCGT,R1,2024,3.20460000000
-2,2045,gasCCGT,R1,2024,3.20460000000
-2,2046,gasCCGT,R1,2024,3.20460000000
-2,2047,gasCCGT,R1,2024,3.20460000000
-2,2050,gasCCGT,R1,2024,3.20460000000
-2,2058,gasCCGT,R1,2024,3.20460000000
-2,2059,gasCCGT,R1,2024,3.20460000000
-2,2060,gasCCGT,R1,2024,3.20460000000
-3,2024,gasCCGT,R2,2020,1.00000000000
-3,2025,gasCCGT,R2,2020,1.00000000000
-4,2024,gasCCGT,R2,2022,1.01590000000
-4,2025,gasCCGT,R2,2022,1.01590000000
-4,2026,gasCCGT,R2,2022,1.01590000000
-4,2030,gasCCGT,R2,2022,1.01590000000
-4,2035,gasCCGT,R2,2022,1.01590000000
-4,2040,gasCCGT,R2,2022,1.01590000000
-4,2045,gasCCGT,R2,2022,1.01590000000
-4,2046,gasCCGT,R2,2022,1.01590000000
-4,2047,gasCCGT,R2,2022,1.01590000000
-4,2050,gasCCGT,R2,2022,1.01590000000
-4,2058,gasCCGT,R2,2022,1.01590000000
-5,2026,gasCCGT,R2,2024,3.20460000000
-5,2030,gasCCGT,R2,2024,3.20460000000
-5,2035,gasCCGT,R2,2024,3.20460000000
-5,2040,gasCCGT,R2,2024,3.20460000000
-5,2045,gasCCGT,R2,2024,3.20460000000
-5,2046,gasCCGT,R2,2024,3.20460000000
-5,2047,gasCCGT,R2,2024,3.20460000000
-5,2050,gasCCGT,R2,2024,3.20460000000
-5,2058,gasCCGT,R2,2024,3.20460000000
-5,2059,gasCCGT,R2,2024,3.20460000000
-5,2060,gasCCGT,R2,2024,3.20460000000
-6,2024,solarPV,R1,2020,4.17990000000
-6,2025,solarPV,R1,2020,4.17990000000
-6,2026,solarPV,R1,2020,4.17990000000
-6,2030,solarPV,R1,2020,4.17990000000
-6,2035,solarPV,R1,2020,4.17990000000
-6,2040,solarPV,R1,2020,4.17990000000
-6,2045,solarPV,R1,2020,4.17990000000
-6,2046,solarPV,R1,2020,4.17990000000
-7,2024,windturbine,R1,2020,8.00000000000
-7,2025,windturbine,R1,2020,8.00000000000
-7,2026,windturbine,R1,2020,8.00000000000
-7,2030,windturbine,R1,2020,8.00000000000
-7,2035,windturbine,R1,2020,8.00000000000
-7,2040,windturbine,R1,2020,8.00000000000
-7,2045,windturbine,R1,2020,8.00000000000
-7,2046,windturbine,R1,2020,8.00000000000
-8,2024,windturbine,R2,2020,12.17990000000
-8,2025,windturbine,R2,2020,12.17990000000
-8,2026,windturbine,R2,2020,12.17990000000
-8,2030,windturbine,R2,2020,12.17990000000
-8,2035,windturbine,R2,2020,12.17990000000
-8,2040,windturbine,R2,2020,12.17990000000
-8,2045,windturbine,R2,2020,12.17990000000
-8,2046,windturbine,R2,2020,12.17990000000
+1,2024,gasCCGT,R2,2020,1.00000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2024,solarPV,R1,2020,4.17990000000
+2,2025,solarPV,R1,2020,4.17990000000
+2,2026,solarPV,R1,2020,4.17990000000
+2,2030,solarPV,R1,2020,4.17990000000
+2,2035,solarPV,R1,2020,4.17990000000
+2,2040,solarPV,R1,2020,4.17990000000
+2,2045,solarPV,R1,2020,4.17990000000
+2,2046,solarPV,R1,2020,4.17990000000
+3,2024,windturbine,R1,2020,8.00000000000
+3,2025,windturbine,R1,2020,8.00000000000
+3,2026,windturbine,R1,2020,8.00000000000
+3,2030,windturbine,R1,2020,8.00000000000
+3,2035,windturbine,R1,2020,8.00000000000
+3,2040,windturbine,R1,2020,8.00000000000
+3,2045,windturbine,R1,2020,8.00000000000
+3,2046,windturbine,R1,2020,8.00000000000
+4,2024,windturbine,R1,2022,2.28590000000
+4,2025,windturbine,R1,2022,2.28590000000
+4,2026,windturbine,R1,2022,2.28590000000
+4,2030,windturbine,R1,2022,2.28590000000
+4,2035,windturbine,R1,2022,2.28590000000
+4,2040,windturbine,R1,2022,2.28590000000
+4,2045,windturbine,R1,2022,2.28590000000
+4,2046,windturbine,R1,2022,2.28590000000
+4,2047,windturbine,R1,2022,2.28590000000
+4,2048,windturbine,R1,2022,2.28590000000
+5,2026,windturbine,R1,2024,7.21040000000
+5,2030,windturbine,R1,2024,7.21040000000
+5,2035,windturbine,R1,2024,7.21040000000
+5,2040,windturbine,R1,2024,7.21040000000
+5,2045,windturbine,R1,2024,7.21040000000
+5,2046,windturbine,R1,2024,7.21040000000
+5,2047,windturbine,R1,2024,7.21040000000
+5,2048,windturbine,R1,2024,7.21040000000
+5,2049,windturbine,R1,2024,7.21040000000
+5,2050,windturbine,R1,2024,7.21040000000
+6,2024,windturbine,R2,2020,12.17990000000
+6,2025,windturbine,R2,2020,12.17990000000
+6,2026,windturbine,R2,2020,12.17990000000
+6,2030,windturbine,R2,2020,12.17990000000
+6,2035,windturbine,R2,2020,12.17990000000
+6,2040,windturbine,R2,2020,12.17990000000
+6,2045,windturbine,R2,2020,12.17990000000
+6,2046,windturbine,R2,2020,12.17990000000
+7,2024,windturbine,R2,2022,2.28590000000
+7,2025,windturbine,R2,2022,2.28590000000
+7,2026,windturbine,R2,2022,2.28590000000
+7,2030,windturbine,R2,2022,2.28590000000
+7,2035,windturbine,R2,2022,2.28590000000
+7,2040,windturbine,R2,2022,2.28590000000
+7,2045,windturbine,R2,2022,2.28590000000
+7,2046,windturbine,R2,2022,2.28590000000
+7,2047,windturbine,R2,2022,2.28590000000
+7,2048,windturbine,R2,2022,2.28590000000
+8,2026,windturbine,R2,2024,7.21040000000
+8,2030,windturbine,R2,2024,7.21040000000
+8,2035,windturbine,R2,2024,7.21040000000
+8,2040,windturbine,R2,2024,7.21040000000
+8,2045,windturbine,R2,2024,7.21040000000
+8,2046,windturbine,R2,2024,7.21040000000
+8,2047,windturbine,R2,2024,7.21040000000
+8,2048,windturbine,R2,2024,7.21040000000
+8,2049,windturbine,R2,2024,7.21040000000
+8,2050,windturbine,R2,2024,7.21040000000
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 8bd66eba..4c7d7fd9 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
@@ -13,41 +13,38 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2028,R1,2022,gasCCGT,1.01590000000
-3,2030,R1,2022,gasCCGT,1.01590000000
-3,2035,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2026,R1,2024,gasCCGT,3.20460000000
-4,2028,R1,2024,gasCCGT,3.20460000000
-4,2030,R1,2024,gasCCGT,3.20460000000
-4,2035,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2028,R1,2026,gasCCGT,1.01590000000
-5,2030,R1,2026,gasCCGT,1.01590000000
-5,2035,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
+3,2026,R1,2022,windturbine,2.28590000000
+3,2028,R1,2022,windturbine,2.28590000000
+3,2030,R1,2022,windturbine,2.28590000000
+3,2035,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2026,R1,2024,windturbine,7.21040000000
+4,2028,R1,2024,windturbine,7.21040000000
+4,2030,R1,2024,windturbine,7.21040000000
+4,2035,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2028,R1,2026,solarPV,2.28590000000
+5,2030,R1,2026,solarPV,2.28590000000
+5,2035,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
 7,2026,R2,2020,windturbine,12.17990000000
 7,2028,R2,2020,windturbine,12.17990000000
 7,2030,R2,2020,windturbine,12.17990000000
@@ -55,38 +52,35 @@ asset,year,region,installed,technology,capacity
 7,2040,R2,2020,windturbine,12.17990000000
 7,2045,R2,2020,windturbine,12.17990000000
 7,2046,R2,2020,windturbine,12.17990000000
-8,2026,R2,2022,gasCCGT,1.01590000000
-8,2028,R2,2022,gasCCGT,1.01590000000
-8,2030,R2,2022,gasCCGT,1.01590000000
-8,2035,R2,2022,gasCCGT,1.01590000000
-8,2040,R2,2022,gasCCGT,1.01590000000
-8,2045,R2,2022,gasCCGT,1.01590000000
-8,2046,R2,2022,gasCCGT,1.01590000000
-8,2047,R2,2022,gasCCGT,1.01590000000
-8,2050,R2,2022,gasCCGT,1.01590000000
-8,2058,R2,2022,gasCCGT,1.01590000000
-9,2026,R2,2024,gasCCGT,3.20460000000
-9,2028,R2,2024,gasCCGT,3.20460000000
-9,2030,R2,2024,gasCCGT,3.20460000000
-9,2035,R2,2024,gasCCGT,3.20460000000
-9,2040,R2,2024,gasCCGT,3.20460000000
-9,2045,R2,2024,gasCCGT,3.20460000000
-9,2046,R2,2024,gasCCGT,3.20460000000
-9,2047,R2,2024,gasCCGT,3.20460000000
-9,2050,R2,2024,gasCCGT,3.20460000000
-9,2058,R2,2024,gasCCGT,3.20460000000
-9,2059,R2,2024,gasCCGT,3.20460000000
-9,2060,R2,2024,gasCCGT,3.20460000000
-10,2028,R2,2026,gasCCGT,1.01590000000
-10,2030,R2,2026,gasCCGT,1.01590000000
-10,2035,R2,2026,gasCCGT,1.01590000000
-10,2040,R2,2026,gasCCGT,1.01590000000
-10,2045,R2,2026,gasCCGT,1.01590000000
-10,2046,R2,2026,gasCCGT,1.01590000000
-10,2047,R2,2026,gasCCGT,1.01590000000
-10,2050,R2,2026,gasCCGT,1.01590000000
-10,2058,R2,2026,gasCCGT,1.01590000000
-10,2059,R2,2026,gasCCGT,1.01590000000
-10,2060,R2,2026,gasCCGT,1.01590000000
-10,2061,R2,2026,gasCCGT,1.01590000000
-10,2062,R2,2026,gasCCGT,1.01590000000
+8,2026,R2,2022,windturbine,2.28590000000
+8,2028,R2,2022,windturbine,2.28590000000
+8,2030,R2,2022,windturbine,2.28590000000
+8,2035,R2,2022,windturbine,2.28590000000
+8,2040,R2,2022,windturbine,2.28590000000
+8,2045,R2,2022,windturbine,2.28590000000
+8,2046,R2,2022,windturbine,2.28590000000
+8,2047,R2,2022,windturbine,2.28590000000
+8,2048,R2,2022,windturbine,2.28590000000
+9,2026,R2,2024,windturbine,7.21040000000
+9,2028,R2,2024,windturbine,7.21040000000
+9,2030,R2,2024,windturbine,7.21040000000
+9,2035,R2,2024,windturbine,7.21040000000
+9,2040,R2,2024,windturbine,7.21040000000
+9,2045,R2,2024,windturbine,7.21040000000
+9,2046,R2,2024,windturbine,7.21040000000
+9,2047,R2,2024,windturbine,7.21040000000
+9,2048,R2,2024,windturbine,7.21040000000
+9,2049,R2,2024,windturbine,7.21040000000
+9,2050,R2,2024,windturbine,7.21040000000
+10,2028,R2,2026,solarPV,2.28590000000
+10,2030,R2,2026,solarPV,2.28590000000
+10,2035,R2,2026,solarPV,2.28590000000
+10,2040,R2,2026,solarPV,2.28590000000
+10,2045,R2,2026,solarPV,2.28590000000
+10,2046,R2,2026,solarPV,2.28590000000
+10,2047,R2,2026,solarPV,2.28590000000
+10,2048,R2,2026,solarPV,2.28590000000
+10,2049,R2,2026,solarPV,2.28590000000
+10,2050,R2,2026,solarPV,2.28590000000
+10,2051,R2,2026,solarPV,2.28590000000
+10,2052,R2,2026,solarPV,2.28590000000
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 40fac75b..d85d7485 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
@@ -11,103 +11,95 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2030,R1,2022,gasCCGT,1.01590000000
-3,2035,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2028,R1,2024,gasCCGT,3.20460000000
-4,2030,R1,2024,gasCCGT,3.20460000000
-4,2035,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2028,R1,2026,gasCCGT,1.01590000000
-5,2030,R1,2026,gasCCGT,1.01590000000
-5,2035,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2030,R1,2028,gasCCGT,1.01590000000
-6,2035,R1,2028,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
+3,2028,R1,2022,windturbine,2.28590000000
+3,2030,R1,2022,windturbine,2.28590000000
+3,2035,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2028,R1,2024,windturbine,7.21040000000
+4,2030,R1,2024,windturbine,7.21040000000
+4,2035,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2028,R1,2026,solarPV,2.28590000000
+5,2030,R1,2026,solarPV,2.28590000000
+5,2035,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2030,R1,2028,solarPV,2.28590000000
+6,2035,R1,2028,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
 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,2028,R2,2022,gasCCGT,1.01590000000
-9,2030,R2,2022,gasCCGT,1.01590000000
-9,2035,R2,2022,gasCCGT,1.01590000000
-9,2040,R2,2022,gasCCGT,1.01590000000
-9,2045,R2,2022,gasCCGT,1.01590000000
-9,2046,R2,2022,gasCCGT,1.01590000000
-9,2047,R2,2022,gasCCGT,1.01590000000
-9,2050,R2,2022,gasCCGT,1.01590000000
-9,2058,R2,2022,gasCCGT,1.01590000000
-10,2028,R2,2024,gasCCGT,3.20460000000
-10,2030,R2,2024,gasCCGT,3.20460000000
-10,2035,R2,2024,gasCCGT,3.20460000000
-10,2040,R2,2024,gasCCGT,3.20460000000
-10,2045,R2,2024,gasCCGT,3.20460000000
-10,2046,R2,2024,gasCCGT,3.20460000000
-10,2047,R2,2024,gasCCGT,3.20460000000
-10,2050,R2,2024,gasCCGT,3.20460000000
-10,2058,R2,2024,gasCCGT,3.20460000000
-10,2059,R2,2024,gasCCGT,3.20460000000
-10,2060,R2,2024,gasCCGT,3.20460000000
-11,2028,R2,2026,gasCCGT,1.01590000000
-11,2030,R2,2026,gasCCGT,1.01590000000
-11,2035,R2,2026,gasCCGT,1.01590000000
-11,2040,R2,2026,gasCCGT,1.01590000000
-11,2045,R2,2026,gasCCGT,1.01590000000
-11,2046,R2,2026,gasCCGT,1.01590000000
-11,2047,R2,2026,gasCCGT,1.01590000000
-11,2050,R2,2026,gasCCGT,1.01590000000
-11,2058,R2,2026,gasCCGT,1.01590000000
-11,2059,R2,2026,gasCCGT,1.01590000000
-11,2060,R2,2026,gasCCGT,1.01590000000
-11,2061,R2,2026,gasCCGT,1.01590000000
-11,2062,R2,2026,gasCCGT,1.01590000000
-12,2030,R2,2028,gasCCGT,1.01590000000
-12,2035,R2,2028,gasCCGT,1.01590000000
-12,2040,R2,2028,gasCCGT,1.01590000000
-12,2045,R2,2028,gasCCGT,1.01590000000
-12,2046,R2,2028,gasCCGT,1.01590000000
-12,2047,R2,2028,gasCCGT,1.01590000000
-12,2050,R2,2028,gasCCGT,1.01590000000
-12,2058,R2,2028,gasCCGT,1.01590000000
-12,2059,R2,2028,gasCCGT,1.01590000000
-12,2060,R2,2028,gasCCGT,1.01590000000
-12,2061,R2,2028,gasCCGT,1.01590000000
-12,2062,R2,2028,gasCCGT,1.01590000000
-12,2063,R2,2028,gasCCGT,1.01590000000
-12,2064,R2,2028,gasCCGT,1.01590000000
+9,2028,R2,2022,windturbine,2.28590000000
+9,2030,R2,2022,windturbine,2.28590000000
+9,2035,R2,2022,windturbine,2.28590000000
+9,2040,R2,2022,windturbine,2.28590000000
+9,2045,R2,2022,windturbine,2.28590000000
+9,2046,R2,2022,windturbine,2.28590000000
+9,2047,R2,2022,windturbine,2.28590000000
+9,2048,R2,2022,windturbine,2.28590000000
+10,2028,R2,2024,windturbine,7.21040000000
+10,2030,R2,2024,windturbine,7.21040000000
+10,2035,R2,2024,windturbine,7.21040000000
+10,2040,R2,2024,windturbine,7.21040000000
+10,2045,R2,2024,windturbine,7.21040000000
+10,2046,R2,2024,windturbine,7.21040000000
+10,2047,R2,2024,windturbine,7.21040000000
+10,2048,R2,2024,windturbine,7.21040000000
+10,2049,R2,2024,windturbine,7.21040000000
+10,2050,R2,2024,windturbine,7.21040000000
+11,2028,R2,2026,solarPV,2.28590000000
+11,2030,R2,2026,solarPV,2.28590000000
+11,2035,R2,2026,solarPV,2.28590000000
+11,2040,R2,2026,solarPV,2.28590000000
+11,2045,R2,2026,solarPV,2.28590000000
+11,2046,R2,2026,solarPV,2.28590000000
+11,2047,R2,2026,solarPV,2.28590000000
+11,2048,R2,2026,solarPV,2.28590000000
+11,2049,R2,2026,solarPV,2.28590000000
+11,2050,R2,2026,solarPV,2.28590000000
+11,2051,R2,2026,solarPV,2.28590000000
+11,2052,R2,2026,solarPV,2.28590000000
+12,2030,R2,2028,solarPV,2.28590000000
+12,2035,R2,2028,solarPV,2.28590000000
+12,2040,R2,2028,solarPV,2.28590000000
+12,2045,R2,2028,solarPV,2.28590000000
+12,2046,R2,2028,solarPV,2.28590000000
+12,2047,R2,2028,solarPV,2.28590000000
+12,2048,R2,2028,solarPV,2.28590000000
+12,2049,R2,2028,solarPV,2.28590000000
+12,2050,R2,2028,solarPV,2.28590000000
+12,2051,R2,2028,solarPV,2.28590000000
+12,2052,R2,2028,solarPV,2.28590000000
+12,2053,R2,2028,solarPV,2.28590000000
+12,2054,R2,2028,solarPV,2.28590000000
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 b511c748..a9668782 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
@@ -11,137 +11,127 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2032,R1,2022,gasCCGT,1.01590000000
-3,2035,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2030,R1,2024,gasCCGT,3.20460000000
-4,2032,R1,2024,gasCCGT,3.20460000000
-4,2035,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2030,R1,2026,gasCCGT,1.01590000000
-5,2032,R1,2026,gasCCGT,1.01590000000
-5,2035,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2030,R1,2028,gasCCGT,1.01590000000
-6,2032,R1,2028,gasCCGT,1.01590000000
-6,2035,R1,2028,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
-7,2032,R1,2030,gasCCGT,1.01590000000
-7,2035,R1,2030,gasCCGT,1.01590000000
-7,2040,R1,2030,gasCCGT,1.01590000000
-7,2045,R1,2030,gasCCGT,1.01590000000
-7,2046,R1,2030,gasCCGT,1.01590000000
-7,2047,R1,2030,gasCCGT,1.01590000000
-7,2050,R1,2030,gasCCGT,1.01590000000
-7,2058,R1,2030,gasCCGT,1.01590000000
-7,2059,R1,2030,gasCCGT,1.01590000000
-7,2060,R1,2030,gasCCGT,1.01590000000
-7,2061,R1,2030,gasCCGT,1.01590000000
-7,2062,R1,2030,gasCCGT,1.01590000000
-7,2063,R1,2030,gasCCGT,1.01590000000
-7,2064,R1,2030,gasCCGT,1.01590000000
-7,2065,R1,2030,gasCCGT,1.01590000000
-7,2066,R1,2030,gasCCGT,1.01590000000
+3,2030,R1,2022,windturbine,2.28590000000
+3,2032,R1,2022,windturbine,2.28590000000
+3,2035,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2030,R1,2024,windturbine,7.21040000000
+4,2032,R1,2024,windturbine,7.21040000000
+4,2035,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2030,R1,2026,solarPV,2.28590000000
+5,2032,R1,2026,solarPV,2.28590000000
+5,2035,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2030,R1,2028,solarPV,2.28590000000
+6,2032,R1,2028,solarPV,2.28590000000
+6,2035,R1,2028,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
+7,2032,R1,2030,solarPV,2.28590000000
+7,2035,R1,2030,solarPV,2.28590000000
+7,2040,R1,2030,solarPV,2.28590000000
+7,2045,R1,2030,solarPV,2.28590000000
+7,2046,R1,2030,solarPV,2.28590000000
+7,2047,R1,2030,solarPV,2.28590000000
+7,2048,R1,2030,solarPV,2.28590000000
+7,2049,R1,2030,solarPV,2.28590000000
+7,2050,R1,2030,solarPV,2.28590000000
+7,2051,R1,2030,solarPV,2.28590000000
+7,2052,R1,2030,solarPV,2.28590000000
+7,2053,R1,2030,solarPV,2.28590000000
+7,2054,R1,2030,solarPV,2.28590000000
+7,2055,R1,2030,solarPV,2.28590000000
+7,2056,R1,2030,solarPV,2.28590000000
 9,2030,R2,2020,windturbine,12.17990000000
 9,2032,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,2030,R2,2022,gasCCGT,1.01590000000
-10,2032,R2,2022,gasCCGT,1.01590000000
-10,2035,R2,2022,gasCCGT,1.01590000000
-10,2040,R2,2022,gasCCGT,1.01590000000
-10,2045,R2,2022,gasCCGT,1.01590000000
-10,2046,R2,2022,gasCCGT,1.01590000000
-10,2047,R2,2022,gasCCGT,1.01590000000
-10,2050,R2,2022,gasCCGT,1.01590000000
-10,2058,R2,2022,gasCCGT,1.01590000000
-11,2030,R2,2024,gasCCGT,3.20460000000
-11,2032,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,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,2030,R2,2026,gasCCGT,1.01590000000
-12,2032,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,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
-13,2030,R2,2028,gasCCGT,1.01590000000
-13,2032,R2,2028,gasCCGT,1.01590000000
-13,2035,R2,2028,gasCCGT,1.01590000000
-13,2040,R2,2028,gasCCGT,1.01590000000
-13,2045,R2,2028,gasCCGT,1.01590000000
-13,2046,R2,2028,gasCCGT,1.01590000000
-13,2047,R2,2028,gasCCGT,1.01590000000
-13,2050,R2,2028,gasCCGT,1.01590000000
-13,2058,R2,2028,gasCCGT,1.01590000000
-13,2059,R2,2028,gasCCGT,1.01590000000
-13,2060,R2,2028,gasCCGT,1.01590000000
-13,2061,R2,2028,gasCCGT,1.01590000000
-13,2062,R2,2028,gasCCGT,1.01590000000
-13,2063,R2,2028,gasCCGT,1.01590000000
-13,2064,R2,2028,gasCCGT,1.01590000000
-14,2032,R2,2030,gasCCGT,1.01590000000
-14,2035,R2,2030,gasCCGT,1.01590000000
-14,2040,R2,2030,gasCCGT,1.01590000000
-14,2045,R2,2030,gasCCGT,1.01590000000
-14,2046,R2,2030,gasCCGT,1.01590000000
-14,2047,R2,2030,gasCCGT,1.01590000000
-14,2050,R2,2030,gasCCGT,1.01590000000
-14,2058,R2,2030,gasCCGT,1.01590000000
-14,2059,R2,2030,gasCCGT,1.01590000000
-14,2060,R2,2030,gasCCGT,1.01590000000
-14,2061,R2,2030,gasCCGT,1.01590000000
-14,2062,R2,2030,gasCCGT,1.01590000000
-14,2063,R2,2030,gasCCGT,1.01590000000
-14,2064,R2,2030,gasCCGT,1.01590000000
-14,2065,R2,2030,gasCCGT,1.01590000000
-14,2066,R2,2030,gasCCGT,1.01590000000
+10,2030,R2,2022,windturbine,2.28590000000
+10,2032,R2,2022,windturbine,2.28590000000
+10,2035,R2,2022,windturbine,2.28590000000
+10,2040,R2,2022,windturbine,2.28590000000
+10,2045,R2,2022,windturbine,2.28590000000
+10,2046,R2,2022,windturbine,2.28590000000
+10,2047,R2,2022,windturbine,2.28590000000
+10,2048,R2,2022,windturbine,2.28590000000
+11,2030,R2,2024,windturbine,7.21040000000
+11,2032,R2,2024,windturbine,7.21040000000
+11,2035,R2,2024,windturbine,7.21040000000
+11,2040,R2,2024,windturbine,7.21040000000
+11,2045,R2,2024,windturbine,7.21040000000
+11,2046,R2,2024,windturbine,7.21040000000
+11,2047,R2,2024,windturbine,7.21040000000
+11,2048,R2,2024,windturbine,7.21040000000
+11,2049,R2,2024,windturbine,7.21040000000
+11,2050,R2,2024,windturbine,7.21040000000
+12,2030,R2,2026,solarPV,2.28590000000
+12,2032,R2,2026,solarPV,2.28590000000
+12,2035,R2,2026,solarPV,2.28590000000
+12,2040,R2,2026,solarPV,2.28590000000
+12,2045,R2,2026,solarPV,2.28590000000
+12,2046,R2,2026,solarPV,2.28590000000
+12,2047,R2,2026,solarPV,2.28590000000
+12,2048,R2,2026,solarPV,2.28590000000
+12,2049,R2,2026,solarPV,2.28590000000
+12,2050,R2,2026,solarPV,2.28590000000
+12,2051,R2,2026,solarPV,2.28590000000
+12,2052,R2,2026,solarPV,2.28590000000
+13,2030,R2,2028,solarPV,2.28590000000
+13,2032,R2,2028,solarPV,2.28590000000
+13,2035,R2,2028,solarPV,2.28590000000
+13,2040,R2,2028,solarPV,2.28590000000
+13,2045,R2,2028,solarPV,2.28590000000
+13,2046,R2,2028,solarPV,2.28590000000
+13,2047,R2,2028,solarPV,2.28590000000
+13,2048,R2,2028,solarPV,2.28590000000
+13,2049,R2,2028,solarPV,2.28590000000
+13,2050,R2,2028,solarPV,2.28590000000
+13,2051,R2,2028,solarPV,2.28590000000
+13,2052,R2,2028,solarPV,2.28590000000
+13,2053,R2,2028,solarPV,2.28590000000
+13,2054,R2,2028,solarPV,2.28590000000
+14,2032,R2,2030,solarPV,2.28590000000
+14,2035,R2,2030,solarPV,2.28590000000
+14,2040,R2,2030,solarPV,2.28590000000
+14,2045,R2,2030,solarPV,2.28590000000
+14,2046,R2,2030,solarPV,2.28590000000
+14,2047,R2,2030,solarPV,2.28590000000
+14,2048,R2,2030,solarPV,2.28590000000
+14,2049,R2,2030,solarPV,2.28590000000
+14,2050,R2,2030,solarPV,2.28590000000
+14,2051,R2,2030,solarPV,2.28590000000
+14,2052,R2,2030,solarPV,2.28590000000
+14,2053,R2,2030,solarPV,2.28590000000
+14,2054,R2,2030,solarPV,2.28590000000
+14,2055,R2,2030,solarPV,2.28590000000
+14,2056,R2,2030,solarPV,2.28590000000
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 dd28bb6c..2aad1b15 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
@@ -11,78 +11,82 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2034,R1,2022,gasCCGT,1.01590000000
-3,2035,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2032,R1,2024,gasCCGT,3.20460000000
-4,2034,R1,2024,gasCCGT,3.20460000000
-4,2035,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2032,R1,2026,gasCCGT,1.01590000000
-5,2034,R1,2026,gasCCGT,1.01590000000
-5,2035,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2032,R1,2028,gasCCGT,1.01590000000
-6,2034,R1,2028,gasCCGT,1.01590000000
-6,2035,R1,2028,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
-7,2032,R1,2030,gasCCGT,1.01590000000
-7,2034,R1,2030,gasCCGT,1.01590000000
-7,2035,R1,2030,gasCCGT,1.01590000000
-7,2040,R1,2030,gasCCGT,1.01590000000
-7,2045,R1,2030,gasCCGT,1.01590000000
-7,2046,R1,2030,gasCCGT,1.01590000000
-7,2047,R1,2030,gasCCGT,1.01590000000
-7,2050,R1,2030,gasCCGT,1.01590000000
-7,2058,R1,2030,gasCCGT,1.01590000000
-7,2059,R1,2030,gasCCGT,1.01590000000
-7,2060,R1,2030,gasCCGT,1.01590000000
-7,2061,R1,2030,gasCCGT,1.01590000000
-7,2062,R1,2030,gasCCGT,1.01590000000
-7,2063,R1,2030,gasCCGT,1.01590000000
-7,2064,R1,2030,gasCCGT,1.01590000000
-7,2065,R1,2030,gasCCGT,1.01590000000
-7,2066,R1,2030,gasCCGT,1.01590000000
+3,2032,R1,2022,windturbine,2.28590000000
+3,2034,R1,2022,windturbine,2.28590000000
+3,2035,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2032,R1,2024,windturbine,7.21040000000
+4,2034,R1,2024,windturbine,7.21040000000
+4,2035,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2032,R1,2026,solarPV,2.28590000000
+5,2034,R1,2026,solarPV,2.28590000000
+5,2035,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2032,R1,2028,solarPV,2.28590000000
+6,2034,R1,2028,solarPV,2.28590000000
+6,2035,R1,2028,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
+7,2032,R1,2030,solarPV,2.28590000000
+7,2034,R1,2030,solarPV,2.28590000000
+7,2035,R1,2030,solarPV,2.28590000000
+7,2040,R1,2030,solarPV,2.28590000000
+7,2045,R1,2030,solarPV,2.28590000000
+7,2046,R1,2030,solarPV,2.28590000000
+7,2047,R1,2030,solarPV,2.28590000000
+7,2048,R1,2030,solarPV,2.28590000000
+7,2049,R1,2030,solarPV,2.28590000000
+7,2050,R1,2030,solarPV,2.28590000000
+7,2051,R1,2030,solarPV,2.28590000000
+7,2052,R1,2030,solarPV,2.28590000000
+7,2053,R1,2030,solarPV,2.28590000000
+7,2054,R1,2030,solarPV,2.28590000000
+7,2055,R1,2030,solarPV,2.28590000000
+7,2056,R1,2030,solarPV,2.28590000000
 8,2034,R1,2032,solarPV,2.28590000000
 8,2035,R1,2032,solarPV,2.28590000000
 8,2040,R1,2032,solarPV,2.28590000000
 8,2045,R1,2032,solarPV,2.28590000000
 8,2046,R1,2032,solarPV,2.28590000000
 8,2047,R1,2032,solarPV,2.28590000000
+8,2048,R1,2032,solarPV,2.28590000000
+8,2049,R1,2032,solarPV,2.28590000000
 8,2050,R1,2032,solarPV,2.28590000000
+8,2051,R1,2032,solarPV,2.28590000000
+8,2052,R1,2032,solarPV,2.28590000000
+8,2053,R1,2032,solarPV,2.28590000000
+8,2054,R1,2032,solarPV,2.28590000000
+8,2055,R1,2032,solarPV,2.28590000000
+8,2056,R1,2032,solarPV,2.28590000000
+8,2057,R1,2032,solarPV,2.28590000000
 8,2058,R1,2032,solarPV,2.28590000000
 10,2032,R2,2020,windturbine,12.17990000000
 10,2034,R2,2020,windturbine,12.17990000000
@@ -90,76 +94,80 @@ asset,year,region,installed,technology,capacity
 10,2040,R2,2020,windturbine,12.17990000000
 10,2045,R2,2020,windturbine,12.17990000000
 10,2046,R2,2020,windturbine,12.17990000000
-11,2032,R2,2022,gasCCGT,1.01590000000
-11,2034,R2,2022,gasCCGT,1.01590000000
-11,2035,R2,2022,gasCCGT,1.01590000000
-11,2040,R2,2022,gasCCGT,1.01590000000
-11,2045,R2,2022,gasCCGT,1.01590000000
-11,2046,R2,2022,gasCCGT,1.01590000000
-11,2047,R2,2022,gasCCGT,1.01590000000
-11,2050,R2,2022,gasCCGT,1.01590000000
-11,2058,R2,2022,gasCCGT,1.01590000000
-12,2032,R2,2024,gasCCGT,3.20460000000
-12,2034,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,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,2032,R2,2026,gasCCGT,1.01590000000
-13,2034,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,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,2032,R2,2028,gasCCGT,1.01590000000
-14,2034,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,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
-15,2032,R2,2030,gasCCGT,1.01590000000
-15,2034,R2,2030,gasCCGT,1.01590000000
-15,2035,R2,2030,gasCCGT,1.01590000000
-15,2040,R2,2030,gasCCGT,1.01590000000
-15,2045,R2,2030,gasCCGT,1.01590000000
-15,2046,R2,2030,gasCCGT,1.01590000000
-15,2047,R2,2030,gasCCGT,1.01590000000
-15,2050,R2,2030,gasCCGT,1.01590000000
-15,2058,R2,2030,gasCCGT,1.01590000000
-15,2059,R2,2030,gasCCGT,1.01590000000
-15,2060,R2,2030,gasCCGT,1.01590000000
-15,2061,R2,2030,gasCCGT,1.01590000000
-15,2062,R2,2030,gasCCGT,1.01590000000
-15,2063,R2,2030,gasCCGT,1.01590000000
-15,2064,R2,2030,gasCCGT,1.01590000000
-15,2065,R2,2030,gasCCGT,1.01590000000
-15,2066,R2,2030,gasCCGT,1.01590000000
+11,2032,R2,2022,windturbine,2.28590000000
+11,2034,R2,2022,windturbine,2.28590000000
+11,2035,R2,2022,windturbine,2.28590000000
+11,2040,R2,2022,windturbine,2.28590000000
+11,2045,R2,2022,windturbine,2.28590000000
+11,2046,R2,2022,windturbine,2.28590000000
+11,2047,R2,2022,windturbine,2.28590000000
+11,2048,R2,2022,windturbine,2.28590000000
+12,2032,R2,2024,windturbine,7.21040000000
+12,2034,R2,2024,windturbine,7.21040000000
+12,2035,R2,2024,windturbine,7.21040000000
+12,2040,R2,2024,windturbine,7.21040000000
+12,2045,R2,2024,windturbine,7.21040000000
+12,2046,R2,2024,windturbine,7.21040000000
+12,2047,R2,2024,windturbine,7.21040000000
+12,2048,R2,2024,windturbine,7.21040000000
+12,2049,R2,2024,windturbine,7.21040000000
+12,2050,R2,2024,windturbine,7.21040000000
+13,2032,R2,2026,solarPV,2.28590000000
+13,2034,R2,2026,solarPV,2.28590000000
+13,2035,R2,2026,solarPV,2.28590000000
+13,2040,R2,2026,solarPV,2.28590000000
+13,2045,R2,2026,solarPV,2.28590000000
+13,2046,R2,2026,solarPV,2.28590000000
+13,2047,R2,2026,solarPV,2.28590000000
+13,2048,R2,2026,solarPV,2.28590000000
+13,2049,R2,2026,solarPV,2.28590000000
+13,2050,R2,2026,solarPV,2.28590000000
+13,2051,R2,2026,solarPV,2.28590000000
+13,2052,R2,2026,solarPV,2.28590000000
+14,2032,R2,2028,solarPV,2.28590000000
+14,2034,R2,2028,solarPV,2.28590000000
+14,2035,R2,2028,solarPV,2.28590000000
+14,2040,R2,2028,solarPV,2.28590000000
+14,2045,R2,2028,solarPV,2.28590000000
+14,2046,R2,2028,solarPV,2.28590000000
+14,2047,R2,2028,solarPV,2.28590000000
+14,2048,R2,2028,solarPV,2.28590000000
+14,2049,R2,2028,solarPV,2.28590000000
+14,2050,R2,2028,solarPV,2.28590000000
+14,2051,R2,2028,solarPV,2.28590000000
+14,2052,R2,2028,solarPV,2.28590000000
+14,2053,R2,2028,solarPV,2.28590000000
+14,2054,R2,2028,solarPV,2.28590000000
+15,2032,R2,2030,solarPV,2.28590000000
+15,2034,R2,2030,solarPV,2.28590000000
+15,2035,R2,2030,solarPV,2.28590000000
+15,2040,R2,2030,solarPV,2.28590000000
+15,2045,R2,2030,solarPV,2.28590000000
+15,2046,R2,2030,solarPV,2.28590000000
+15,2047,R2,2030,solarPV,2.28590000000
+15,2048,R2,2030,solarPV,2.28590000000
+15,2049,R2,2030,solarPV,2.28590000000
+15,2050,R2,2030,solarPV,2.28590000000
+15,2051,R2,2030,solarPV,2.28590000000
+15,2052,R2,2030,solarPV,2.28590000000
+15,2053,R2,2030,solarPV,2.28590000000
+15,2054,R2,2030,solarPV,2.28590000000
+15,2055,R2,2030,solarPV,2.28590000000
+15,2056,R2,2030,solarPV,2.28590000000
 16,2034,R2,2032,solarPV,2.28590000000
 16,2035,R2,2032,solarPV,2.28590000000
 16,2040,R2,2032,solarPV,2.28590000000
 16,2045,R2,2032,solarPV,2.28590000000
 16,2046,R2,2032,solarPV,2.28590000000
 16,2047,R2,2032,solarPV,2.28590000000
+16,2048,R2,2032,solarPV,2.28590000000
+16,2049,R2,2032,solarPV,2.28590000000
 16,2050,R2,2032,solarPV,2.28590000000
+16,2051,R2,2032,solarPV,2.28590000000
+16,2052,R2,2032,solarPV,2.28590000000
+16,2053,R2,2032,solarPV,2.28590000000
+16,2054,R2,2032,solarPV,2.28590000000
+16,2055,R2,2032,solarPV,2.28590000000
+16,2056,R2,2032,solarPV,2.28590000000
+16,2057,R2,2032,solarPV,2.28590000000
 16,2058,R2,2032,solarPV,2.28590000000
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 ffb72e8c..3be6c3ca 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
@@ -11,71 +11,66 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2035,R1,2022,gasCCGT,1.01590000000
-3,2036,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2034,R1,2024,gasCCGT,3.20460000000
-4,2035,R1,2024,gasCCGT,3.20460000000
-4,2036,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2034,R1,2026,gasCCGT,1.01590000000
-5,2035,R1,2026,gasCCGT,1.01590000000
-5,2036,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2034,R1,2028,gasCCGT,1.01590000000
-6,2035,R1,2028,gasCCGT,1.01590000000
-6,2036,R1,2028,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
-7,2034,R1,2030,gasCCGT,1.01590000000
-7,2035,R1,2030,gasCCGT,1.01590000000
-7,2036,R1,2030,gasCCGT,1.01590000000
-7,2040,R1,2030,gasCCGT,1.01590000000
-7,2045,R1,2030,gasCCGT,1.01590000000
-7,2046,R1,2030,gasCCGT,1.01590000000
-7,2047,R1,2030,gasCCGT,1.01590000000
-7,2050,R1,2030,gasCCGT,1.01590000000
-7,2058,R1,2030,gasCCGT,1.01590000000
-7,2059,R1,2030,gasCCGT,1.01590000000
-7,2060,R1,2030,gasCCGT,1.01590000000
-7,2061,R1,2030,gasCCGT,1.01590000000
-7,2062,R1,2030,gasCCGT,1.01590000000
-7,2063,R1,2030,gasCCGT,1.01590000000
-7,2064,R1,2030,gasCCGT,1.01590000000
-7,2065,R1,2030,gasCCGT,1.01590000000
-7,2066,R1,2030,gasCCGT,1.01590000000
+3,2034,R1,2022,windturbine,2.28590000000
+3,2035,R1,2022,windturbine,2.28590000000
+3,2036,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2034,R1,2024,windturbine,7.21040000000
+4,2035,R1,2024,windturbine,7.21040000000
+4,2036,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2034,R1,2026,solarPV,2.28590000000
+5,2035,R1,2026,solarPV,2.28590000000
+5,2036,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2034,R1,2028,solarPV,2.28590000000
+6,2035,R1,2028,solarPV,2.28590000000
+6,2036,R1,2028,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
+7,2034,R1,2030,solarPV,2.28590000000
+7,2035,R1,2030,solarPV,2.28590000000
+7,2036,R1,2030,solarPV,2.28590000000
+7,2040,R1,2030,solarPV,2.28590000000
+7,2045,R1,2030,solarPV,2.28590000000
+7,2046,R1,2030,solarPV,2.28590000000
+7,2047,R1,2030,solarPV,2.28590000000
+7,2048,R1,2030,solarPV,2.28590000000
+7,2049,R1,2030,solarPV,2.28590000000
+7,2050,R1,2030,solarPV,2.28590000000
+7,2051,R1,2030,solarPV,2.28590000000
+7,2052,R1,2030,solarPV,2.28590000000
+7,2053,R1,2030,solarPV,2.28590000000
+7,2054,R1,2030,solarPV,2.28590000000
+7,2055,R1,2030,solarPV,2.28590000000
+7,2056,R1,2030,solarPV,2.28590000000
 8,2034,R1,2032,solarPV,2.28590000000
 8,2035,R1,2032,solarPV,2.28590000000
 8,2036,R1,2032,solarPV,2.28590000000
@@ -83,14 +78,32 @@ asset,year,region,installed,technology,capacity
 8,2045,R1,2032,solarPV,2.28590000000
 8,2046,R1,2032,solarPV,2.28590000000
 8,2047,R1,2032,solarPV,2.28590000000
+8,2048,R1,2032,solarPV,2.28590000000
+8,2049,R1,2032,solarPV,2.28590000000
 8,2050,R1,2032,solarPV,2.28590000000
+8,2051,R1,2032,solarPV,2.28590000000
+8,2052,R1,2032,solarPV,2.28590000000
+8,2053,R1,2032,solarPV,2.28590000000
+8,2054,R1,2032,solarPV,2.28590000000
+8,2055,R1,2032,solarPV,2.28590000000
+8,2056,R1,2032,solarPV,2.28590000000
+8,2057,R1,2032,solarPV,2.28590000000
 8,2058,R1,2032,solarPV,2.28590000000
 9,2036,R1,2034,solarPV,4.61130000000
 9,2040,R1,2034,solarPV,4.61130000000
 9,2045,R1,2034,solarPV,4.61130000000
 9,2046,R1,2034,solarPV,4.61130000000
 9,2047,R1,2034,solarPV,4.61130000000
+9,2048,R1,2034,solarPV,4.61130000000
+9,2049,R1,2034,solarPV,4.61130000000
 9,2050,R1,2034,solarPV,4.61130000000
+9,2051,R1,2034,solarPV,4.61130000000
+9,2052,R1,2034,solarPV,4.61130000000
+9,2053,R1,2034,solarPV,4.61130000000
+9,2054,R1,2034,solarPV,4.61130000000
+9,2055,R1,2034,solarPV,4.61130000000
+9,2056,R1,2034,solarPV,4.61130000000
+9,2057,R1,2034,solarPV,4.61130000000
 9,2058,R1,2034,solarPV,4.61130000000
 9,2059,R1,2034,solarPV,4.61130000000
 9,2060,R1,2034,solarPV,4.61130000000
@@ -100,71 +113,66 @@ asset,year,region,installed,technology,capacity
 11,2040,R2,2020,windturbine,12.17990000000
 11,2045,R2,2020,windturbine,12.17990000000
 11,2046,R2,2020,windturbine,12.17990000000
-12,2034,R2,2022,gasCCGT,1.01590000000
-12,2035,R2,2022,gasCCGT,1.01590000000
-12,2036,R2,2022,gasCCGT,1.01590000000
-12,2040,R2,2022,gasCCGT,1.01590000000
-12,2045,R2,2022,gasCCGT,1.01590000000
-12,2046,R2,2022,gasCCGT,1.01590000000
-12,2047,R2,2022,gasCCGT,1.01590000000
-12,2050,R2,2022,gasCCGT,1.01590000000
-12,2058,R2,2022,gasCCGT,1.01590000000
-13,2034,R2,2024,gasCCGT,3.20460000000
-13,2035,R2,2024,gasCCGT,3.20460000000
-13,2036,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,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,2034,R2,2026,gasCCGT,1.01590000000
-14,2035,R2,2026,gasCCGT,1.01590000000
-14,2036,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,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,2034,R2,2028,gasCCGT,1.01590000000
-15,2035,R2,2028,gasCCGT,1.01590000000
-15,2036,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,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,2034,R2,2030,gasCCGT,1.01590000000
-16,2035,R2,2030,gasCCGT,1.01590000000
-16,2036,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,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
+12,2034,R2,2022,windturbine,2.28590000000
+12,2035,R2,2022,windturbine,2.28590000000
+12,2036,R2,2022,windturbine,2.28590000000
+12,2040,R2,2022,windturbine,2.28590000000
+12,2045,R2,2022,windturbine,2.28590000000
+12,2046,R2,2022,windturbine,2.28590000000
+12,2047,R2,2022,windturbine,2.28590000000
+12,2048,R2,2022,windturbine,2.28590000000
+13,2034,R2,2024,windturbine,7.21040000000
+13,2035,R2,2024,windturbine,7.21040000000
+13,2036,R2,2024,windturbine,7.21040000000
+13,2040,R2,2024,windturbine,7.21040000000
+13,2045,R2,2024,windturbine,7.21040000000
+13,2046,R2,2024,windturbine,7.21040000000
+13,2047,R2,2024,windturbine,7.21040000000
+13,2048,R2,2024,windturbine,7.21040000000
+13,2049,R2,2024,windturbine,7.21040000000
+13,2050,R2,2024,windturbine,7.21040000000
+14,2034,R2,2026,solarPV,2.28590000000
+14,2035,R2,2026,solarPV,2.28590000000
+14,2036,R2,2026,solarPV,2.28590000000
+14,2040,R2,2026,solarPV,2.28590000000
+14,2045,R2,2026,solarPV,2.28590000000
+14,2046,R2,2026,solarPV,2.28590000000
+14,2047,R2,2026,solarPV,2.28590000000
+14,2048,R2,2026,solarPV,2.28590000000
+14,2049,R2,2026,solarPV,2.28590000000
+14,2050,R2,2026,solarPV,2.28590000000
+14,2051,R2,2026,solarPV,2.28590000000
+14,2052,R2,2026,solarPV,2.28590000000
+15,2034,R2,2028,solarPV,2.28590000000
+15,2035,R2,2028,solarPV,2.28590000000
+15,2036,R2,2028,solarPV,2.28590000000
+15,2040,R2,2028,solarPV,2.28590000000
+15,2045,R2,2028,solarPV,2.28590000000
+15,2046,R2,2028,solarPV,2.28590000000
+15,2047,R2,2028,solarPV,2.28590000000
+15,2048,R2,2028,solarPV,2.28590000000
+15,2049,R2,2028,solarPV,2.28590000000
+15,2050,R2,2028,solarPV,2.28590000000
+15,2051,R2,2028,solarPV,2.28590000000
+15,2052,R2,2028,solarPV,2.28590000000
+15,2053,R2,2028,solarPV,2.28590000000
+15,2054,R2,2028,solarPV,2.28590000000
+16,2034,R2,2030,solarPV,2.28590000000
+16,2035,R2,2030,solarPV,2.28590000000
+16,2036,R2,2030,solarPV,2.28590000000
+16,2040,R2,2030,solarPV,2.28590000000
+16,2045,R2,2030,solarPV,2.28590000000
+16,2046,R2,2030,solarPV,2.28590000000
+16,2047,R2,2030,solarPV,2.28590000000
+16,2048,R2,2030,solarPV,2.28590000000
+16,2049,R2,2030,solarPV,2.28590000000
+16,2050,R2,2030,solarPV,2.28590000000
+16,2051,R2,2030,solarPV,2.28590000000
+16,2052,R2,2030,solarPV,2.28590000000
+16,2053,R2,2030,solarPV,2.28590000000
+16,2054,R2,2030,solarPV,2.28590000000
+16,2055,R2,2030,solarPV,2.28590000000
+16,2056,R2,2030,solarPV,2.28590000000
 17,2034,R2,2032,solarPV,2.28590000000
 17,2035,R2,2032,solarPV,2.28590000000
 17,2036,R2,2032,solarPV,2.28590000000
@@ -172,14 +180,32 @@ asset,year,region,installed,technology,capacity
 17,2045,R2,2032,solarPV,2.28590000000
 17,2046,R2,2032,solarPV,2.28590000000
 17,2047,R2,2032,solarPV,2.28590000000
+17,2048,R2,2032,solarPV,2.28590000000
+17,2049,R2,2032,solarPV,2.28590000000
 17,2050,R2,2032,solarPV,2.28590000000
+17,2051,R2,2032,solarPV,2.28590000000
+17,2052,R2,2032,solarPV,2.28590000000
+17,2053,R2,2032,solarPV,2.28590000000
+17,2054,R2,2032,solarPV,2.28590000000
+17,2055,R2,2032,solarPV,2.28590000000
+17,2056,R2,2032,solarPV,2.28590000000
+17,2057,R2,2032,solarPV,2.28590000000
 17,2058,R2,2032,solarPV,2.28590000000
 18,2036,R2,2034,solarPV,4.61130000000
 18,2040,R2,2034,solarPV,4.61130000000
 18,2045,R2,2034,solarPV,4.61130000000
 18,2046,R2,2034,solarPV,4.61130000000
 18,2047,R2,2034,solarPV,4.61130000000
+18,2048,R2,2034,solarPV,4.61130000000
+18,2049,R2,2034,solarPV,4.61130000000
 18,2050,R2,2034,solarPV,4.61130000000
+18,2051,R2,2034,solarPV,4.61130000000
+18,2052,R2,2034,solarPV,4.61130000000
+18,2053,R2,2034,solarPV,4.61130000000
+18,2054,R2,2034,solarPV,4.61130000000
+18,2055,R2,2034,solarPV,4.61130000000
+18,2056,R2,2034,solarPV,4.61130000000
+18,2057,R2,2034,solarPV,4.61130000000
 18,2058,R2,2034,solarPV,4.61130000000
 18,2059,R2,2034,solarPV,4.61130000000
 18,2060,R2,2034,solarPV,4.61130000000
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 98a0880c..e1c98cf2 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
@@ -9,73 +9,77 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2038,R1,2022,gasCCGT,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2036,R1,2024,gasCCGT,3.20460000000
-4,2038,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2036,R1,2026,gasCCGT,1.01590000000
-5,2038,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2036,R1,2028,gasCCGT,1.01590000000
-6,2038,R1,2028,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
-7,2036,R1,2030,gasCCGT,1.01590000000
-7,2038,R1,2030,gasCCGT,1.01590000000
-7,2040,R1,2030,gasCCGT,1.01590000000
-7,2045,R1,2030,gasCCGT,1.01590000000
-7,2046,R1,2030,gasCCGT,1.01590000000
-7,2047,R1,2030,gasCCGT,1.01590000000
-7,2050,R1,2030,gasCCGT,1.01590000000
-7,2058,R1,2030,gasCCGT,1.01590000000
-7,2059,R1,2030,gasCCGT,1.01590000000
-7,2060,R1,2030,gasCCGT,1.01590000000
-7,2061,R1,2030,gasCCGT,1.01590000000
-7,2062,R1,2030,gasCCGT,1.01590000000
-7,2063,R1,2030,gasCCGT,1.01590000000
-7,2064,R1,2030,gasCCGT,1.01590000000
-7,2065,R1,2030,gasCCGT,1.01590000000
-7,2066,R1,2030,gasCCGT,1.01590000000
+3,2036,R1,2022,windturbine,2.28590000000
+3,2038,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2036,R1,2024,windturbine,7.21040000000
+4,2038,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2036,R1,2026,solarPV,2.28590000000
+5,2038,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2036,R1,2028,solarPV,2.28590000000
+6,2038,R1,2028,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
+7,2036,R1,2030,solarPV,2.28590000000
+7,2038,R1,2030,solarPV,2.28590000000
+7,2040,R1,2030,solarPV,2.28590000000
+7,2045,R1,2030,solarPV,2.28590000000
+7,2046,R1,2030,solarPV,2.28590000000
+7,2047,R1,2030,solarPV,2.28590000000
+7,2048,R1,2030,solarPV,2.28590000000
+7,2049,R1,2030,solarPV,2.28590000000
+7,2050,R1,2030,solarPV,2.28590000000
+7,2051,R1,2030,solarPV,2.28590000000
+7,2052,R1,2030,solarPV,2.28590000000
+7,2053,R1,2030,solarPV,2.28590000000
+7,2054,R1,2030,solarPV,2.28590000000
+7,2055,R1,2030,solarPV,2.28590000000
+7,2056,R1,2030,solarPV,2.28590000000
 8,2036,R1,2032,solarPV,2.28590000000
 8,2038,R1,2032,solarPV,2.28590000000
 8,2040,R1,2032,solarPV,2.28590000000
 8,2045,R1,2032,solarPV,2.28590000000
 8,2046,R1,2032,solarPV,2.28590000000
 8,2047,R1,2032,solarPV,2.28590000000
+8,2048,R1,2032,solarPV,2.28590000000
+8,2049,R1,2032,solarPV,2.28590000000
 8,2050,R1,2032,solarPV,2.28590000000
+8,2051,R1,2032,solarPV,2.28590000000
+8,2052,R1,2032,solarPV,2.28590000000
+8,2053,R1,2032,solarPV,2.28590000000
+8,2054,R1,2032,solarPV,2.28590000000
+8,2055,R1,2032,solarPV,2.28590000000
+8,2056,R1,2032,solarPV,2.28590000000
+8,2057,R1,2032,solarPV,2.28590000000
 8,2058,R1,2032,solarPV,2.28590000000
 9,2036,R1,2034,solarPV,4.61130000000
 9,2038,R1,2034,solarPV,4.61130000000
@@ -83,7 +87,16 @@ asset,year,region,installed,technology,capacity
 9,2045,R1,2034,solarPV,4.61130000000
 9,2046,R1,2034,solarPV,4.61130000000
 9,2047,R1,2034,solarPV,4.61130000000
+9,2048,R1,2034,solarPV,4.61130000000
+9,2049,R1,2034,solarPV,4.61130000000
 9,2050,R1,2034,solarPV,4.61130000000
+9,2051,R1,2034,solarPV,4.61130000000
+9,2052,R1,2034,solarPV,4.61130000000
+9,2053,R1,2034,solarPV,4.61130000000
+9,2054,R1,2034,solarPV,4.61130000000
+9,2055,R1,2034,solarPV,4.61130000000
+9,2056,R1,2034,solarPV,4.61130000000
+9,2057,R1,2034,solarPV,4.61130000000
 9,2058,R1,2034,solarPV,4.61130000000
 9,2059,R1,2034,solarPV,4.61130000000
 9,2060,R1,2034,solarPV,4.61130000000
@@ -92,7 +105,16 @@ asset,year,region,installed,technology,capacity
 10,2045,R1,2036,solarPV,2.28590000000
 10,2046,R1,2036,solarPV,2.28590000000
 10,2047,R1,2036,solarPV,2.28590000000
+10,2048,R1,2036,solarPV,2.28590000000
+10,2049,R1,2036,solarPV,2.28590000000
 10,2050,R1,2036,solarPV,2.28590000000
+10,2051,R1,2036,solarPV,2.28590000000
+10,2052,R1,2036,solarPV,2.28590000000
+10,2053,R1,2036,solarPV,2.28590000000
+10,2054,R1,2036,solarPV,2.28590000000
+10,2055,R1,2036,solarPV,2.28590000000
+10,2056,R1,2036,solarPV,2.28590000000
+10,2057,R1,2036,solarPV,2.28590000000
 10,2058,R1,2036,solarPV,2.28590000000
 10,2059,R1,2036,solarPV,2.28590000000
 10,2060,R1,2036,solarPV,2.28590000000
@@ -103,73 +125,77 @@ asset,year,region,installed,technology,capacity
 12,2040,R2,2020,windturbine,12.17990000000
 12,2045,R2,2020,windturbine,12.17990000000
 12,2046,R2,2020,windturbine,12.17990000000
-13,2036,R2,2022,gasCCGT,1.01590000000
-13,2038,R2,2022,gasCCGT,1.01590000000
-13,2040,R2,2022,gasCCGT,1.01590000000
-13,2045,R2,2022,gasCCGT,1.01590000000
-13,2046,R2,2022,gasCCGT,1.01590000000
-13,2047,R2,2022,gasCCGT,1.01590000000
-13,2050,R2,2022,gasCCGT,1.01590000000
-13,2058,R2,2022,gasCCGT,1.01590000000
-14,2036,R2,2024,gasCCGT,3.20460000000
-14,2038,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,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,2036,R2,2026,gasCCGT,1.01590000000
-15,2038,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,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,2036,R2,2028,gasCCGT,1.01590000000
-16,2038,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,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,2036,R2,2030,gasCCGT,1.01590000000
-17,2038,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,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
+13,2036,R2,2022,windturbine,2.28590000000
+13,2038,R2,2022,windturbine,2.28590000000
+13,2040,R2,2022,windturbine,2.28590000000
+13,2045,R2,2022,windturbine,2.28590000000
+13,2046,R2,2022,windturbine,2.28590000000
+13,2047,R2,2022,windturbine,2.28590000000
+13,2048,R2,2022,windturbine,2.28590000000
+14,2036,R2,2024,windturbine,7.21040000000
+14,2038,R2,2024,windturbine,7.21040000000
+14,2040,R2,2024,windturbine,7.21040000000
+14,2045,R2,2024,windturbine,7.21040000000
+14,2046,R2,2024,windturbine,7.21040000000
+14,2047,R2,2024,windturbine,7.21040000000
+14,2048,R2,2024,windturbine,7.21040000000
+14,2049,R2,2024,windturbine,7.21040000000
+14,2050,R2,2024,windturbine,7.21040000000
+15,2036,R2,2026,solarPV,2.28590000000
+15,2038,R2,2026,solarPV,2.28590000000
+15,2040,R2,2026,solarPV,2.28590000000
+15,2045,R2,2026,solarPV,2.28590000000
+15,2046,R2,2026,solarPV,2.28590000000
+15,2047,R2,2026,solarPV,2.28590000000
+15,2048,R2,2026,solarPV,2.28590000000
+15,2049,R2,2026,solarPV,2.28590000000
+15,2050,R2,2026,solarPV,2.28590000000
+15,2051,R2,2026,solarPV,2.28590000000
+15,2052,R2,2026,solarPV,2.28590000000
+16,2036,R2,2028,solarPV,2.28590000000
+16,2038,R2,2028,solarPV,2.28590000000
+16,2040,R2,2028,solarPV,2.28590000000
+16,2045,R2,2028,solarPV,2.28590000000
+16,2046,R2,2028,solarPV,2.28590000000
+16,2047,R2,2028,solarPV,2.28590000000
+16,2048,R2,2028,solarPV,2.28590000000
+16,2049,R2,2028,solarPV,2.28590000000
+16,2050,R2,2028,solarPV,2.28590000000
+16,2051,R2,2028,solarPV,2.28590000000
+16,2052,R2,2028,solarPV,2.28590000000
+16,2053,R2,2028,solarPV,2.28590000000
+16,2054,R2,2028,solarPV,2.28590000000
+17,2036,R2,2030,solarPV,2.28590000000
+17,2038,R2,2030,solarPV,2.28590000000
+17,2040,R2,2030,solarPV,2.28590000000
+17,2045,R2,2030,solarPV,2.28590000000
+17,2046,R2,2030,solarPV,2.28590000000
+17,2047,R2,2030,solarPV,2.28590000000
+17,2048,R2,2030,solarPV,2.28590000000
+17,2049,R2,2030,solarPV,2.28590000000
+17,2050,R2,2030,solarPV,2.28590000000
+17,2051,R2,2030,solarPV,2.28590000000
+17,2052,R2,2030,solarPV,2.28590000000
+17,2053,R2,2030,solarPV,2.28590000000
+17,2054,R2,2030,solarPV,2.28590000000
+17,2055,R2,2030,solarPV,2.28590000000
+17,2056,R2,2030,solarPV,2.28590000000
 18,2036,R2,2032,solarPV,2.28590000000
 18,2038,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,2051,R2,2032,solarPV,2.28590000000
+18,2052,R2,2032,solarPV,2.28590000000
+18,2053,R2,2032,solarPV,2.28590000000
+18,2054,R2,2032,solarPV,2.28590000000
+18,2055,R2,2032,solarPV,2.28590000000
+18,2056,R2,2032,solarPV,2.28590000000
+18,2057,R2,2032,solarPV,2.28590000000
 18,2058,R2,2032,solarPV,2.28590000000
 19,2036,R2,2034,solarPV,4.61130000000
 19,2038,R2,2034,solarPV,4.61130000000
@@ -177,7 +203,16 @@ asset,year,region,installed,technology,capacity
 19,2045,R2,2034,solarPV,4.61130000000
 19,2046,R2,2034,solarPV,4.61130000000
 19,2047,R2,2034,solarPV,4.61130000000
+19,2048,R2,2034,solarPV,4.61130000000
+19,2049,R2,2034,solarPV,4.61130000000
 19,2050,R2,2034,solarPV,4.61130000000
+19,2051,R2,2034,solarPV,4.61130000000
+19,2052,R2,2034,solarPV,4.61130000000
+19,2053,R2,2034,solarPV,4.61130000000
+19,2054,R2,2034,solarPV,4.61130000000
+19,2055,R2,2034,solarPV,4.61130000000
+19,2056,R2,2034,solarPV,4.61130000000
+19,2057,R2,2034,solarPV,4.61130000000
 19,2058,R2,2034,solarPV,4.61130000000
 19,2059,R2,2034,solarPV,4.61130000000
 19,2060,R2,2034,solarPV,4.61130000000
@@ -186,7 +221,16 @@ asset,year,region,installed,technology,capacity
 20,2045,R2,2036,solarPV,2.28590000000
 20,2046,R2,2036,solarPV,2.28590000000
 20,2047,R2,2036,solarPV,2.28590000000
+20,2048,R2,2036,solarPV,2.28590000000
+20,2049,R2,2036,solarPV,2.28590000000
 20,2050,R2,2036,solarPV,2.28590000000
+20,2051,R2,2036,solarPV,2.28590000000
+20,2052,R2,2036,solarPV,2.28590000000
+20,2053,R2,2036,solarPV,2.28590000000
+20,2054,R2,2036,solarPV,2.28590000000
+20,2055,R2,2036,solarPV,2.28590000000
+20,2056,R2,2036,solarPV,2.28590000000
+20,2057,R2,2036,solarPV,2.28590000000
 20,2058,R2,2036,solarPV,2.28590000000
 20,2059,R2,2036,solarPV,2.28590000000
 20,2060,R2,2036,solarPV,2.28590000000
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 93fcb37f..b93ccce6 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
@@ -7,74 +7,87 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2040,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2038,R1,2024,gasCCGT,3.20460000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2038,R1,2026,gasCCGT,1.01590000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2038,R1,2028,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
-7,2038,R1,2030,gasCCGT,1.01590000000
-7,2040,R1,2030,gasCCGT,1.01590000000
-7,2045,R1,2030,gasCCGT,1.01590000000
-7,2046,R1,2030,gasCCGT,1.01590000000
-7,2047,R1,2030,gasCCGT,1.01590000000
-7,2050,R1,2030,gasCCGT,1.01590000000
-7,2058,R1,2030,gasCCGT,1.01590000000
-7,2059,R1,2030,gasCCGT,1.01590000000
-7,2060,R1,2030,gasCCGT,1.01590000000
-7,2061,R1,2030,gasCCGT,1.01590000000
-7,2062,R1,2030,gasCCGT,1.01590000000
-7,2063,R1,2030,gasCCGT,1.01590000000
-7,2064,R1,2030,gasCCGT,1.01590000000
-7,2065,R1,2030,gasCCGT,1.01590000000
-7,2066,R1,2030,gasCCGT,1.01590000000
+3,2038,R1,2022,windturbine,2.28590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2038,R1,2024,windturbine,7.21040000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2038,R1,2026,solarPV,2.28590000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2038,R1,2028,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
+7,2038,R1,2030,solarPV,2.28590000000
+7,2040,R1,2030,solarPV,2.28590000000
+7,2045,R1,2030,solarPV,2.28590000000
+7,2046,R1,2030,solarPV,2.28590000000
+7,2047,R1,2030,solarPV,2.28590000000
+7,2048,R1,2030,solarPV,2.28590000000
+7,2049,R1,2030,solarPV,2.28590000000
+7,2050,R1,2030,solarPV,2.28590000000
+7,2051,R1,2030,solarPV,2.28590000000
+7,2052,R1,2030,solarPV,2.28590000000
+7,2053,R1,2030,solarPV,2.28590000000
+7,2054,R1,2030,solarPV,2.28590000000
+7,2055,R1,2030,solarPV,2.28590000000
+7,2056,R1,2030,solarPV,2.28590000000
 8,2038,R1,2032,solarPV,2.28590000000
 8,2040,R1,2032,solarPV,2.28590000000
 8,2045,R1,2032,solarPV,2.28590000000
 8,2046,R1,2032,solarPV,2.28590000000
 8,2047,R1,2032,solarPV,2.28590000000
+8,2048,R1,2032,solarPV,2.28590000000
+8,2049,R1,2032,solarPV,2.28590000000
 8,2050,R1,2032,solarPV,2.28590000000
+8,2051,R1,2032,solarPV,2.28590000000
+8,2052,R1,2032,solarPV,2.28590000000
+8,2053,R1,2032,solarPV,2.28590000000
+8,2054,R1,2032,solarPV,2.28590000000
+8,2055,R1,2032,solarPV,2.28590000000
+8,2056,R1,2032,solarPV,2.28590000000
+8,2057,R1,2032,solarPV,2.28590000000
 8,2058,R1,2032,solarPV,2.28590000000
 9,2038,R1,2034,solarPV,4.61130000000
 9,2040,R1,2034,solarPV,4.61130000000
 9,2045,R1,2034,solarPV,4.61130000000
 9,2046,R1,2034,solarPV,4.61130000000
 9,2047,R1,2034,solarPV,4.61130000000
+9,2048,R1,2034,solarPV,4.61130000000
+9,2049,R1,2034,solarPV,4.61130000000
 9,2050,R1,2034,solarPV,4.61130000000
+9,2051,R1,2034,solarPV,4.61130000000
+9,2052,R1,2034,solarPV,4.61130000000
+9,2053,R1,2034,solarPV,4.61130000000
+9,2054,R1,2034,solarPV,4.61130000000
+9,2055,R1,2034,solarPV,4.61130000000
+9,2056,R1,2034,solarPV,4.61130000000
+9,2057,R1,2034,solarPV,4.61130000000
 9,2058,R1,2034,solarPV,4.61130000000
 9,2059,R1,2034,solarPV,4.61130000000
 9,2060,R1,2034,solarPV,4.61130000000
@@ -83,7 +96,16 @@ asset,year,region,installed,technology,capacity
 10,2045,R1,2036,solarPV,2.28590000000
 10,2046,R1,2036,solarPV,2.28590000000
 10,2047,R1,2036,solarPV,2.28590000000
+10,2048,R1,2036,solarPV,2.28590000000
+10,2049,R1,2036,solarPV,2.28590000000
 10,2050,R1,2036,solarPV,2.28590000000
+10,2051,R1,2036,solarPV,2.28590000000
+10,2052,R1,2036,solarPV,2.28590000000
+10,2053,R1,2036,solarPV,2.28590000000
+10,2054,R1,2036,solarPV,2.28590000000
+10,2055,R1,2036,solarPV,2.28590000000
+10,2056,R1,2036,solarPV,2.28590000000
+10,2057,R1,2036,solarPV,2.28590000000
 10,2058,R1,2036,solarPV,2.28590000000
 10,2059,R1,2036,solarPV,2.28590000000
 10,2060,R1,2036,solarPV,2.28590000000
@@ -93,7 +115,16 @@ asset,year,region,installed,technology,capacity
 11,2045,R1,2038,solarPV,2.28590000000
 11,2046,R1,2038,solarPV,2.28590000000
 11,2047,R1,2038,solarPV,2.28590000000
+11,2048,R1,2038,solarPV,2.28590000000
+11,2049,R1,2038,solarPV,2.28590000000
 11,2050,R1,2038,solarPV,2.28590000000
+11,2051,R1,2038,solarPV,2.28590000000
+11,2052,R1,2038,solarPV,2.28590000000
+11,2053,R1,2038,solarPV,2.28590000000
+11,2054,R1,2038,solarPV,2.28590000000
+11,2055,R1,2038,solarPV,2.28590000000
+11,2056,R1,2038,solarPV,2.28590000000
+11,2057,R1,2038,solarPV,2.28590000000
 11,2058,R1,2038,solarPV,2.28590000000
 11,2059,R1,2038,solarPV,2.28590000000
 11,2060,R1,2038,solarPV,2.28590000000
@@ -105,74 +136,87 @@ asset,year,region,installed,technology,capacity
 13,2040,R2,2020,windturbine,12.17990000000
 13,2045,R2,2020,windturbine,12.17990000000
 13,2046,R2,2020,windturbine,12.17990000000
-14,2038,R2,2022,gasCCGT,1.01590000000
-14,2040,R2,2022,gasCCGT,1.01590000000
-14,2045,R2,2022,gasCCGT,1.01590000000
-14,2046,R2,2022,gasCCGT,1.01590000000
-14,2047,R2,2022,gasCCGT,1.01590000000
-14,2050,R2,2022,gasCCGT,1.01590000000
-14,2058,R2,2022,gasCCGT,1.01590000000
-15,2038,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,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,2038,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,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,2038,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,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,2038,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,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
+14,2038,R2,2022,windturbine,2.28590000000
+14,2040,R2,2022,windturbine,2.28590000000
+14,2045,R2,2022,windturbine,2.28590000000
+14,2046,R2,2022,windturbine,2.28590000000
+14,2047,R2,2022,windturbine,2.28590000000
+14,2048,R2,2022,windturbine,2.28590000000
+15,2038,R2,2024,windturbine,7.21040000000
+15,2040,R2,2024,windturbine,7.21040000000
+15,2045,R2,2024,windturbine,7.21040000000
+15,2046,R2,2024,windturbine,7.21040000000
+15,2047,R2,2024,windturbine,7.21040000000
+15,2048,R2,2024,windturbine,7.21040000000
+15,2049,R2,2024,windturbine,7.21040000000
+15,2050,R2,2024,windturbine,7.21040000000
+16,2038,R2,2026,solarPV,2.28590000000
+16,2040,R2,2026,solarPV,2.28590000000
+16,2045,R2,2026,solarPV,2.28590000000
+16,2046,R2,2026,solarPV,2.28590000000
+16,2047,R2,2026,solarPV,2.28590000000
+16,2048,R2,2026,solarPV,2.28590000000
+16,2049,R2,2026,solarPV,2.28590000000
+16,2050,R2,2026,solarPV,2.28590000000
+16,2051,R2,2026,solarPV,2.28590000000
+16,2052,R2,2026,solarPV,2.28590000000
+17,2038,R2,2028,solarPV,2.28590000000
+17,2040,R2,2028,solarPV,2.28590000000
+17,2045,R2,2028,solarPV,2.28590000000
+17,2046,R2,2028,solarPV,2.28590000000
+17,2047,R2,2028,solarPV,2.28590000000
+17,2048,R2,2028,solarPV,2.28590000000
+17,2049,R2,2028,solarPV,2.28590000000
+17,2050,R2,2028,solarPV,2.28590000000
+17,2051,R2,2028,solarPV,2.28590000000
+17,2052,R2,2028,solarPV,2.28590000000
+17,2053,R2,2028,solarPV,2.28590000000
+17,2054,R2,2028,solarPV,2.28590000000
+18,2038,R2,2030,solarPV,2.28590000000
+18,2040,R2,2030,solarPV,2.28590000000
+18,2045,R2,2030,solarPV,2.28590000000
+18,2046,R2,2030,solarPV,2.28590000000
+18,2047,R2,2030,solarPV,2.28590000000
+18,2048,R2,2030,solarPV,2.28590000000
+18,2049,R2,2030,solarPV,2.28590000000
+18,2050,R2,2030,solarPV,2.28590000000
+18,2051,R2,2030,solarPV,2.28590000000
+18,2052,R2,2030,solarPV,2.28590000000
+18,2053,R2,2030,solarPV,2.28590000000
+18,2054,R2,2030,solarPV,2.28590000000
+18,2055,R2,2030,solarPV,2.28590000000
+18,2056,R2,2030,solarPV,2.28590000000
 19,2038,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,2051,R2,2032,solarPV,2.28590000000
+19,2052,R2,2032,solarPV,2.28590000000
+19,2053,R2,2032,solarPV,2.28590000000
+19,2054,R2,2032,solarPV,2.28590000000
+19,2055,R2,2032,solarPV,2.28590000000
+19,2056,R2,2032,solarPV,2.28590000000
+19,2057,R2,2032,solarPV,2.28590000000
 19,2058,R2,2032,solarPV,2.28590000000
 20,2038,R2,2034,solarPV,4.61130000000
 20,2040,R2,2034,solarPV,4.61130000000
 20,2045,R2,2034,solarPV,4.61130000000
 20,2046,R2,2034,solarPV,4.61130000000
 20,2047,R2,2034,solarPV,4.61130000000
+20,2048,R2,2034,solarPV,4.61130000000
+20,2049,R2,2034,solarPV,4.61130000000
 20,2050,R2,2034,solarPV,4.61130000000
+20,2051,R2,2034,solarPV,4.61130000000
+20,2052,R2,2034,solarPV,4.61130000000
+20,2053,R2,2034,solarPV,4.61130000000
+20,2054,R2,2034,solarPV,4.61130000000
+20,2055,R2,2034,solarPV,4.61130000000
+20,2056,R2,2034,solarPV,4.61130000000
+20,2057,R2,2034,solarPV,4.61130000000
 20,2058,R2,2034,solarPV,4.61130000000
 20,2059,R2,2034,solarPV,4.61130000000
 20,2060,R2,2034,solarPV,4.61130000000
@@ -181,7 +225,16 @@ asset,year,region,installed,technology,capacity
 21,2045,R2,2036,solarPV,2.28590000000
 21,2046,R2,2036,solarPV,2.28590000000
 21,2047,R2,2036,solarPV,2.28590000000
+21,2048,R2,2036,solarPV,2.28590000000
+21,2049,R2,2036,solarPV,2.28590000000
 21,2050,R2,2036,solarPV,2.28590000000
+21,2051,R2,2036,solarPV,2.28590000000
+21,2052,R2,2036,solarPV,2.28590000000
+21,2053,R2,2036,solarPV,2.28590000000
+21,2054,R2,2036,solarPV,2.28590000000
+21,2055,R2,2036,solarPV,2.28590000000
+21,2056,R2,2036,solarPV,2.28590000000
+21,2057,R2,2036,solarPV,2.28590000000
 21,2058,R2,2036,solarPV,2.28590000000
 21,2059,R2,2036,solarPV,2.28590000000
 21,2060,R2,2036,solarPV,2.28590000000
@@ -191,7 +244,16 @@ asset,year,region,installed,technology,capacity
 22,2045,R2,2038,solarPV,2.28590000000
 22,2046,R2,2038,solarPV,2.28590000000
 22,2047,R2,2038,solarPV,2.28590000000
+22,2048,R2,2038,solarPV,2.28590000000
+22,2049,R2,2038,solarPV,2.28590000000
 22,2050,R2,2038,solarPV,2.28590000000
+22,2051,R2,2038,solarPV,2.28590000000
+22,2052,R2,2038,solarPV,2.28590000000
+22,2053,R2,2038,solarPV,2.28590000000
+22,2054,R2,2038,solarPV,2.28590000000
+22,2055,R2,2038,solarPV,2.28590000000
+22,2056,R2,2038,solarPV,2.28590000000
+22,2057,R2,2038,solarPV,2.28590000000
 22,2058,R2,2038,solarPV,2.28590000000
 22,2059,R2,2038,solarPV,2.28590000000
 22,2060,R2,2038,solarPV,2.28590000000
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 b2767af2..d7ffb074 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
@@ -7,74 +7,87 @@ asset,year,region,installed,technology,capacity
 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,1.01590000000
-3,2042,R1,2022,gasCCGT,1.01590000000
-3,2045,R1,2022,gasCCGT,1.01590000000
-3,2046,R1,2022,gasCCGT,1.01590000000
-3,2047,R1,2022,gasCCGT,1.01590000000
-3,2050,R1,2022,gasCCGT,1.01590000000
-3,2058,R1,2022,gasCCGT,1.01590000000
-4,2040,R1,2024,gasCCGT,3.20460000000
-4,2042,R1,2024,gasCCGT,3.20460000000
-4,2045,R1,2024,gasCCGT,3.20460000000
-4,2046,R1,2024,gasCCGT,3.20460000000
-4,2047,R1,2024,gasCCGT,3.20460000000
-4,2050,R1,2024,gasCCGT,3.20460000000
-4,2058,R1,2024,gasCCGT,3.20460000000
-4,2059,R1,2024,gasCCGT,3.20460000000
-4,2060,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2026,gasCCGT,1.01590000000
-5,2042,R1,2026,gasCCGT,1.01590000000
-5,2045,R1,2026,gasCCGT,1.01590000000
-5,2046,R1,2026,gasCCGT,1.01590000000
-5,2047,R1,2026,gasCCGT,1.01590000000
-5,2050,R1,2026,gasCCGT,1.01590000000
-5,2058,R1,2026,gasCCGT,1.01590000000
-5,2059,R1,2026,gasCCGT,1.01590000000
-5,2060,R1,2026,gasCCGT,1.01590000000
-5,2061,R1,2026,gasCCGT,1.01590000000
-5,2062,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2028,gasCCGT,1.01590000000
-6,2042,R1,2028,gasCCGT,1.01590000000
-6,2045,R1,2028,gasCCGT,1.01590000000
-6,2046,R1,2028,gasCCGT,1.01590000000
-6,2047,R1,2028,gasCCGT,1.01590000000
-6,2050,R1,2028,gasCCGT,1.01590000000
-6,2058,R1,2028,gasCCGT,1.01590000000
-6,2059,R1,2028,gasCCGT,1.01590000000
-6,2060,R1,2028,gasCCGT,1.01590000000
-6,2061,R1,2028,gasCCGT,1.01590000000
-6,2062,R1,2028,gasCCGT,1.01590000000
-6,2063,R1,2028,gasCCGT,1.01590000000
-6,2064,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2030,gasCCGT,1.01590000000
-7,2042,R1,2030,gasCCGT,1.01590000000
-7,2045,R1,2030,gasCCGT,1.01590000000
-7,2046,R1,2030,gasCCGT,1.01590000000
-7,2047,R1,2030,gasCCGT,1.01590000000
-7,2050,R1,2030,gasCCGT,1.01590000000
-7,2058,R1,2030,gasCCGT,1.01590000000
-7,2059,R1,2030,gasCCGT,1.01590000000
-7,2060,R1,2030,gasCCGT,1.01590000000
-7,2061,R1,2030,gasCCGT,1.01590000000
-7,2062,R1,2030,gasCCGT,1.01590000000
-7,2063,R1,2030,gasCCGT,1.01590000000
-7,2064,R1,2030,gasCCGT,1.01590000000
-7,2065,R1,2030,gasCCGT,1.01590000000
-7,2066,R1,2030,gasCCGT,1.01590000000
+3,2040,R1,2022,windturbine,2.28590000000
+3,2042,R1,2022,windturbine,2.28590000000
+3,2045,R1,2022,windturbine,2.28590000000
+3,2046,R1,2022,windturbine,2.28590000000
+3,2047,R1,2022,windturbine,2.28590000000
+3,2048,R1,2022,windturbine,2.28590000000
+4,2040,R1,2024,windturbine,7.21040000000
+4,2042,R1,2024,windturbine,7.21040000000
+4,2045,R1,2024,windturbine,7.21040000000
+4,2046,R1,2024,windturbine,7.21040000000
+4,2047,R1,2024,windturbine,7.21040000000
+4,2048,R1,2024,windturbine,7.21040000000
+4,2049,R1,2024,windturbine,7.21040000000
+4,2050,R1,2024,windturbine,7.21040000000
+5,2040,R1,2026,solarPV,2.28590000000
+5,2042,R1,2026,solarPV,2.28590000000
+5,2045,R1,2026,solarPV,2.28590000000
+5,2046,R1,2026,solarPV,2.28590000000
+5,2047,R1,2026,solarPV,2.28590000000
+5,2048,R1,2026,solarPV,2.28590000000
+5,2049,R1,2026,solarPV,2.28590000000
+5,2050,R1,2026,solarPV,2.28590000000
+5,2051,R1,2026,solarPV,2.28590000000
+5,2052,R1,2026,solarPV,2.28590000000
+6,2040,R1,2028,solarPV,2.28590000000
+6,2042,R1,2028,solarPV,2.28590000000
+6,2045,R1,2028,solarPV,2.28590000000
+6,2046,R1,2028,solarPV,2.28590000000
+6,2047,R1,2028,solarPV,2.28590000000
+6,2048,R1,2028,solarPV,2.28590000000
+6,2049,R1,2028,solarPV,2.28590000000
+6,2050,R1,2028,solarPV,2.28590000000
+6,2051,R1,2028,solarPV,2.28590000000
+6,2052,R1,2028,solarPV,2.28590000000
+6,2053,R1,2028,solarPV,2.28590000000
+6,2054,R1,2028,solarPV,2.28590000000
+7,2040,R1,2030,solarPV,2.28590000000
+7,2042,R1,2030,solarPV,2.28590000000
+7,2045,R1,2030,solarPV,2.28590000000
+7,2046,R1,2030,solarPV,2.28590000000
+7,2047,R1,2030,solarPV,2.28590000000
+7,2048,R1,2030,solarPV,2.28590000000
+7,2049,R1,2030,solarPV,2.28590000000
+7,2050,R1,2030,solarPV,2.28590000000
+7,2051,R1,2030,solarPV,2.28590000000
+7,2052,R1,2030,solarPV,2.28590000000
+7,2053,R1,2030,solarPV,2.28590000000
+7,2054,R1,2030,solarPV,2.28590000000
+7,2055,R1,2030,solarPV,2.28590000000
+7,2056,R1,2030,solarPV,2.28590000000
 8,2040,R1,2032,solarPV,2.28590000000
 8,2042,R1,2032,solarPV,2.28590000000
 8,2045,R1,2032,solarPV,2.28590000000
 8,2046,R1,2032,solarPV,2.28590000000
 8,2047,R1,2032,solarPV,2.28590000000
+8,2048,R1,2032,solarPV,2.28590000000
+8,2049,R1,2032,solarPV,2.28590000000
 8,2050,R1,2032,solarPV,2.28590000000
+8,2051,R1,2032,solarPV,2.28590000000
+8,2052,R1,2032,solarPV,2.28590000000
+8,2053,R1,2032,solarPV,2.28590000000
+8,2054,R1,2032,solarPV,2.28590000000
+8,2055,R1,2032,solarPV,2.28590000000
+8,2056,R1,2032,solarPV,2.28590000000
+8,2057,R1,2032,solarPV,2.28590000000
 8,2058,R1,2032,solarPV,2.28590000000
 9,2040,R1,2034,solarPV,4.61130000000
 9,2042,R1,2034,solarPV,4.61130000000
 9,2045,R1,2034,solarPV,4.61130000000
 9,2046,R1,2034,solarPV,4.61130000000
 9,2047,R1,2034,solarPV,4.61130000000
+9,2048,R1,2034,solarPV,4.61130000000
+9,2049,R1,2034,solarPV,4.61130000000
 9,2050,R1,2034,solarPV,4.61130000000
+9,2051,R1,2034,solarPV,4.61130000000
+9,2052,R1,2034,solarPV,4.61130000000
+9,2053,R1,2034,solarPV,4.61130000000
+9,2054,R1,2034,solarPV,4.61130000000
+9,2055,R1,2034,solarPV,4.61130000000
+9,2056,R1,2034,solarPV,4.61130000000
+9,2057,R1,2034,solarPV,4.61130000000
 9,2058,R1,2034,solarPV,4.61130000000
 9,2059,R1,2034,solarPV,4.61130000000
 9,2060,R1,2034,solarPV,4.61130000000
@@ -83,7 +96,16 @@ asset,year,region,installed,technology,capacity
 10,2045,R1,2036,solarPV,2.28590000000
 10,2046,R1,2036,solarPV,2.28590000000
 10,2047,R1,2036,solarPV,2.28590000000
+10,2048,R1,2036,solarPV,2.28590000000
+10,2049,R1,2036,solarPV,2.28590000000
 10,2050,R1,2036,solarPV,2.28590000000
+10,2051,R1,2036,solarPV,2.28590000000
+10,2052,R1,2036,solarPV,2.28590000000
+10,2053,R1,2036,solarPV,2.28590000000
+10,2054,R1,2036,solarPV,2.28590000000
+10,2055,R1,2036,solarPV,2.28590000000
+10,2056,R1,2036,solarPV,2.28590000000
+10,2057,R1,2036,solarPV,2.28590000000
 10,2058,R1,2036,solarPV,2.28590000000
 10,2059,R1,2036,solarPV,2.28590000000
 10,2060,R1,2036,solarPV,2.28590000000
@@ -94,7 +116,16 @@ asset,year,region,installed,technology,capacity
 11,2045,R1,2038,solarPV,2.28590000000
 11,2046,R1,2038,solarPV,2.28590000000
 11,2047,R1,2038,solarPV,2.28590000000
+11,2048,R1,2038,solarPV,2.28590000000
+11,2049,R1,2038,solarPV,2.28590000000
 11,2050,R1,2038,solarPV,2.28590000000
+11,2051,R1,2038,solarPV,2.28590000000
+11,2052,R1,2038,solarPV,2.28590000000
+11,2053,R1,2038,solarPV,2.28590000000
+11,2054,R1,2038,solarPV,2.28590000000
+11,2055,R1,2038,solarPV,2.28590000000
+11,2056,R1,2038,solarPV,2.28590000000
+11,2057,R1,2038,solarPV,2.28590000000
 11,2058,R1,2038,solarPV,2.28590000000
 11,2059,R1,2038,solarPV,2.28590000000
 11,2060,R1,2038,solarPV,2.28590000000
@@ -106,7 +137,16 @@ asset,year,region,installed,technology,capacity
 12,2045,R1,2040,solarPV,2.28590000000
 12,2046,R1,2040,solarPV,2.28590000000
 12,2047,R1,2040,solarPV,2.28590000000
+12,2048,R1,2040,solarPV,2.28590000000
+12,2049,R1,2040,solarPV,2.28590000000
 12,2050,R1,2040,solarPV,2.28590000000
+12,2051,R1,2040,solarPV,2.28590000000
+12,2052,R1,2040,solarPV,2.28590000000
+12,2053,R1,2040,solarPV,2.28590000000
+12,2054,R1,2040,solarPV,2.28590000000
+12,2055,R1,2040,solarPV,2.28590000000
+12,2056,R1,2040,solarPV,2.28590000000
+12,2057,R1,2040,solarPV,2.28590000000
 12,2058,R1,2040,solarPV,2.28590000000
 12,2059,R1,2040,solarPV,2.28590000000
 12,2060,R1,2040,solarPV,2.28590000000
@@ -120,74 +160,87 @@ asset,year,region,installed,technology,capacity
 14,2042,R2,2020,windturbine,12.17990000000
 14,2045,R2,2020,windturbine,12.17990000000
 14,2046,R2,2020,windturbine,12.17990000000
-15,2040,R2,2022,gasCCGT,1.01590000000
-15,2042,R2,2022,gasCCGT,1.01590000000
-15,2045,R2,2022,gasCCGT,1.01590000000
-15,2046,R2,2022,gasCCGT,1.01590000000
-15,2047,R2,2022,gasCCGT,1.01590000000
-15,2050,R2,2022,gasCCGT,1.01590000000
-15,2058,R2,2022,gasCCGT,1.01590000000
-16,2040,R2,2024,gasCCGT,3.20460000000
-16,2042,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,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,2040,R2,2026,gasCCGT,1.01590000000
-17,2042,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,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,2040,R2,2028,gasCCGT,1.01590000000
-18,2042,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,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,2040,R2,2030,gasCCGT,1.01590000000
-19,2042,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,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
+15,2040,R2,2022,windturbine,2.28590000000
+15,2042,R2,2022,windturbine,2.28590000000
+15,2045,R2,2022,windturbine,2.28590000000
+15,2046,R2,2022,windturbine,2.28590000000
+15,2047,R2,2022,windturbine,2.28590000000
+15,2048,R2,2022,windturbine,2.28590000000
+16,2040,R2,2024,windturbine,7.21040000000
+16,2042,R2,2024,windturbine,7.21040000000
+16,2045,R2,2024,windturbine,7.21040000000
+16,2046,R2,2024,windturbine,7.21040000000
+16,2047,R2,2024,windturbine,7.21040000000
+16,2048,R2,2024,windturbine,7.21040000000
+16,2049,R2,2024,windturbine,7.21040000000
+16,2050,R2,2024,windturbine,7.21040000000
+17,2040,R2,2026,solarPV,2.28590000000
+17,2042,R2,2026,solarPV,2.28590000000
+17,2045,R2,2026,solarPV,2.28590000000
+17,2046,R2,2026,solarPV,2.28590000000
+17,2047,R2,2026,solarPV,2.28590000000
+17,2048,R2,2026,solarPV,2.28590000000
+17,2049,R2,2026,solarPV,2.28590000000
+17,2050,R2,2026,solarPV,2.28590000000
+17,2051,R2,2026,solarPV,2.28590000000
+17,2052,R2,2026,solarPV,2.28590000000
+18,2040,R2,2028,solarPV,2.28590000000
+18,2042,R2,2028,solarPV,2.28590000000
+18,2045,R2,2028,solarPV,2.28590000000
+18,2046,R2,2028,solarPV,2.28590000000
+18,2047,R2,2028,solarPV,2.28590000000
+18,2048,R2,2028,solarPV,2.28590000000
+18,2049,R2,2028,solarPV,2.28590000000
+18,2050,R2,2028,solarPV,2.28590000000
+18,2051,R2,2028,solarPV,2.28590000000
+18,2052,R2,2028,solarPV,2.28590000000
+18,2053,R2,2028,solarPV,2.28590000000
+18,2054,R2,2028,solarPV,2.28590000000
+19,2040,R2,2030,solarPV,2.28590000000
+19,2042,R2,2030,solarPV,2.28590000000
+19,2045,R2,2030,solarPV,2.28590000000
+19,2046,R2,2030,solarPV,2.28590000000
+19,2047,R2,2030,solarPV,2.28590000000
+19,2048,R2,2030,solarPV,2.28590000000
+19,2049,R2,2030,solarPV,2.28590000000
+19,2050,R2,2030,solarPV,2.28590000000
+19,2051,R2,2030,solarPV,2.28590000000
+19,2052,R2,2030,solarPV,2.28590000000
+19,2053,R2,2030,solarPV,2.28590000000
+19,2054,R2,2030,solarPV,2.28590000000
+19,2055,R2,2030,solarPV,2.28590000000
+19,2056,R2,2030,solarPV,2.28590000000
 20,2040,R2,2032,solarPV,2.28590000000
 20,2042,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,2051,R2,2032,solarPV,2.28590000000
+20,2052,R2,2032,solarPV,2.28590000000
+20,2053,R2,2032,solarPV,2.28590000000
+20,2054,R2,2032,solarPV,2.28590000000
+20,2055,R2,2032,solarPV,2.28590000000
+20,2056,R2,2032,solarPV,2.28590000000
+20,2057,R2,2032,solarPV,2.28590000000
 20,2058,R2,2032,solarPV,2.28590000000
 21,2040,R2,2034,solarPV,4.61130000000
 21,2042,R2,2034,solarPV,4.61130000000
 21,2045,R2,2034,solarPV,4.61130000000
 21,2046,R2,2034,solarPV,4.61130000000
 21,2047,R2,2034,solarPV,4.61130000000
+21,2048,R2,2034,solarPV,4.61130000000
+21,2049,R2,2034,solarPV,4.61130000000
 21,2050,R2,2034,solarPV,4.61130000000
+21,2051,R2,2034,solarPV,4.61130000000
+21,2052,R2,2034,solarPV,4.61130000000
+21,2053,R2,2034,solarPV,4.61130000000
+21,2054,R2,2034,solarPV,4.61130000000
+21,2055,R2,2034,solarPV,4.61130000000
+21,2056,R2,2034,solarPV,4.61130000000
+21,2057,R2,2034,solarPV,4.61130000000
 21,2058,R2,2034,solarPV,4.61130000000
 21,2059,R2,2034,solarPV,4.61130000000
 21,2060,R2,2034,solarPV,4.61130000000
@@ -196,7 +249,16 @@ asset,year,region,installed,technology,capacity
 22,2045,R2,2036,solarPV,2.28590000000
 22,2046,R2,2036,solarPV,2.28590000000
 22,2047,R2,2036,solarPV,2.28590000000
+22,2048,R2,2036,solarPV,2.28590000000
+22,2049,R2,2036,solarPV,2.28590000000
 22,2050,R2,2036,solarPV,2.28590000000
+22,2051,R2,2036,solarPV,2.28590000000
+22,2052,R2,2036,solarPV,2.28590000000
+22,2053,R2,2036,solarPV,2.28590000000
+22,2054,R2,2036,solarPV,2.28590000000
+22,2055,R2,2036,solarPV,2.28590000000
+22,2056,R2,2036,solarPV,2.28590000000
+22,2057,R2,2036,solarPV,2.28590000000
 22,2058,R2,2036,solarPV,2.28590000000
 22,2059,R2,2036,solarPV,2.28590000000
 22,2060,R2,2036,solarPV,2.28590000000
@@ -207,7 +269,16 @@ asset,year,region,installed,technology,capacity
 23,2045,R2,2038,solarPV,2.28590000000
 23,2046,R2,2038,solarPV,2.28590000000
 23,2047,R2,2038,solarPV,2.28590000000
+23,2048,R2,2038,solarPV,2.28590000000
+23,2049,R2,2038,solarPV,2.28590000000
 23,2050,R2,2038,solarPV,2.28590000000
+23,2051,R2,2038,solarPV,2.28590000000
+23,2052,R2,2038,solarPV,2.28590000000
+23,2053,R2,2038,solarPV,2.28590000000
+23,2054,R2,2038,solarPV,2.28590000000
+23,2055,R2,2038,solarPV,2.28590000000
+23,2056,R2,2038,solarPV,2.28590000000
+23,2057,R2,2038,solarPV,2.28590000000
 23,2058,R2,2038,solarPV,2.28590000000
 23,2059,R2,2038,solarPV,2.28590000000
 23,2060,R2,2038,solarPV,2.28590000000
@@ -219,7 +290,16 @@ asset,year,region,installed,technology,capacity
 24,2045,R2,2040,solarPV,2.28590000000
 24,2046,R2,2040,solarPV,2.28590000000
 24,2047,R2,2040,solarPV,2.28590000000
+24,2048,R2,2040,solarPV,2.28590000000
+24,2049,R2,2040,solarPV,2.28590000000
 24,2050,R2,2040,solarPV,2.28590000000
+24,2051,R2,2040,solarPV,2.28590000000
+24,2052,R2,2040,solarPV,2.28590000000
+24,2053,R2,2040,solarPV,2.28590000000
+24,2054,R2,2040,solarPV,2.28590000000
+24,2055,R2,2040,solarPV,2.28590000000
+24,2056,R2,2040,solarPV,2.28590000000
+24,2057,R2,2040,solarPV,2.28590000000
 24,2058,R2,2040,solarPV,2.28590000000
 24,2059,R2,2040,solarPV,2.28590000000
 24,2060,R2,2040,solarPV,2.28590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 271f3f39..f3b4fe4b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
index fe314ea8..842d3b01 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
@@ -1,17 +1,5 @@
-asset,year,technology,region,installed,capacity
-0,2025,gassupply1,R1,2020,15.00000000000
-0,2030,gassupply1,R1,2020,7.50000000000
-1,2030,gassupply1,R1,2025,12.41830000000
-1,2035,gassupply1,R1,2025,12.41830000000
-1,2040,gassupply1,R1,2025,12.41830000000
-1,2045,gassupply1,R1,2025,12.41830000000
-1,2050,gassupply1,R1,2025,12.41830000000
-1,2064,gassupply1,R1,2025,12.41830000000
-2,2025,gassupply1,R2,2020,15.00000000000
-2,2030,gassupply1,R2,2020,7.50000000000
-3,2030,gassupply1,R2,2025,12.41830000000
-3,2035,gassupply1,R2,2025,12.41830000000
-3,2040,gassupply1,R2,2025,12.41830000000
-3,2045,gassupply1,R2,2025,12.41830000000
-3,2050,gassupply1,R2,2025,12.41830000000
-3,2064,gassupply1,R2,2025,12.41830000000
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2025,R2,2020,gassupply1,15.00000000000
+1,2030,R2,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index 8bf69df1..f32d264b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -1,29 +1,13 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,12.41830000000
-1,2035,R1,2025,gassupply1,12.41830000000
-1,2040,R1,2025,gassupply1,12.41830000000
-1,2045,R1,2025,gassupply1,12.41830000000
-1,2050,R1,2025,gassupply1,12.41830000000
-1,2064,R1,2025,gassupply1,12.41830000000
-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,12.41830000000
-4,2035,R2,2025,gassupply1,12.41830000000
-4,2040,R2,2025,gassupply1,12.41830000000
-4,2045,R2,2025,gassupply1,12.41830000000
-4,2050,R2,2025,gassupply1,12.41830000000
-4,2064,R2,2025,gassupply1,12.41830000000
-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
+1,2035,R1,2030,gassupply1,5.52400000000
+1,2040,R1,2030,gassupply1,5.52400000000
+1,2045,R1,2030,gassupply1,5.52400000000
+1,2050,R1,2030,gassupply1,5.52400000000
+1,2069,R1,2030,gassupply1,5.52400000000
+2,2030,R2,2020,gassupply1,7.50000000000
+3,2035,R2,2030,gassupply1,5.52400000000
+3,2040,R2,2030,gassupply1,5.52400000000
+3,2045,R2,2030,gassupply1,5.52400000000
+3,2050,R2,2030,gassupply1,5.52400000000
+3,2069,R2,2030,gassupply1,5.52400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index 06622cbc..bf048bdb 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -1,25 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,12.41830000000
-1,2040,R1,2025,gassupply1,12.41830000000
-1,2045,R1,2025,gassupply1,12.41830000000
-1,2050,R1,2025,gassupply1,12.41830000000
-1,2064,R1,2025,gassupply1,12.41830000000
-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,12.41830000000
-4,2040,R2,2025,gassupply1,12.41830000000
-4,2045,R2,2025,gassupply1,12.41830000000
-4,2050,R2,2025,gassupply1,12.41830000000
-4,2064,R2,2025,gassupply1,12.41830000000
-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
+1,2035,R1,2030,gassupply1,5.52400000000
+1,2040,R1,2030,gassupply1,5.52400000000
+1,2045,R1,2030,gassupply1,5.52400000000
+1,2050,R1,2030,gassupply1,5.52400000000
+1,2069,R1,2030,gassupply1,5.52400000000
+3,2035,R2,2030,gassupply1,5.52400000000
+3,2040,R2,2030,gassupply1,5.52400000000
+3,2045,R2,2030,gassupply1,5.52400000000
+3,2050,R2,2030,gassupply1,5.52400000000
+3,2069,R2,2030,gassupply1,5.52400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index c7ffc2ba..899ebefe 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -1,21 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,12.41830000000
-1,2045,R1,2025,gassupply1,12.41830000000
-1,2050,R1,2025,gassupply1,12.41830000000
-1,2064,R1,2025,gassupply1,12.41830000000
-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,12.41830000000
-4,2045,R2,2025,gassupply1,12.41830000000
-4,2050,R2,2025,gassupply1,12.41830000000
-4,2064,R2,2025,gassupply1,12.41830000000
-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
+1,2040,R1,2030,gassupply1,5.52400000000
+1,2045,R1,2030,gassupply1,5.52400000000
+1,2050,R1,2030,gassupply1,5.52400000000
+1,2069,R1,2030,gassupply1,5.52400000000
+3,2040,R2,2030,gassupply1,5.52400000000
+3,2045,R2,2030,gassupply1,5.52400000000
+3,2050,R2,2030,gassupply1,5.52400000000
+3,2069,R2,2030,gassupply1,5.52400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index 18543ff4..a835367d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -1,17 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,12.41830000000
-1,2050,R1,2025,gassupply1,12.41830000000
-1,2064,R1,2025,gassupply1,12.41830000000
-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,12.41830000000
-4,2050,R2,2025,gassupply1,12.41830000000
-4,2064,R2,2025,gassupply1,12.41830000000
-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
+1,2045,R1,2030,gassupply1,5.52400000000
+1,2050,R1,2030,gassupply1,5.52400000000
+1,2069,R1,2030,gassupply1,5.52400000000
+3,2045,R2,2030,gassupply1,5.52400000000
+3,2050,R2,2030,gassupply1,5.52400000000
+3,2069,R2,2030,gassupply1,5.52400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 885c23a8..109932a8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -1,17 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,12.41830000000
-1,2055,R1,2025,gassupply1,12.41830000000
-1,2064,R1,2025,gassupply1,12.41830000000
-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,12.41830000000
-4,2055,R2,2025,gassupply1,12.41830000000
-4,2064,R2,2025,gassupply1,12.41830000000
-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
+1,2050,R1,2030,gassupply1,5.52400000000
+1,2055,R1,2030,gassupply1,5.52400000000
+1,2069,R1,2030,gassupply1,5.52400000000
+3,2050,R2,2030,gassupply1,5.52400000000
+3,2055,R2,2030,gassupply1,5.52400000000
+3,2069,R2,2030,gassupply1,5.52400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 001705c4..bd6f7c42 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -34,15 +34,13 @@ gas_stove,R2,R2,A1,residential,retrofit,2030,2.14290000000
 gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
 heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2030,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2030,19.39350000000
 windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2030,8.61930000000
+solarPV,R2,R2,A1,power,retrofit,2030,19.39350000000
 windturbine,R2,R2,A1,power,retrofit,2030,33.46730000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,12.41830000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,12.41830000000
 electric_stove,R1,R1,A1,residential,retrofit,2035,8.57170000000
 electric_stove,R1,R1,A1,residential,retrofit,2035,23.57330000000
 gas_stove,R1,R1,A1,residential,retrofit,2035,2.14290000000
@@ -55,17 +53,15 @@ gas_stove,R2,R2,A1,residential,retrofit,2035,2.14290000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
 heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
 heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2035,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2035,19.39350000000
 solarPV,R1,R1,A1,power,retrofit,2035,11.42930000000
 windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2035,8.61930000000
+solarPV,R2,R2,A1,power,retrofit,2035,19.39350000000
 solarPV,R2,R2,A1,power,retrofit,2035,11.42930000000
 windturbine,R2,R2,A1,power,retrofit,2035,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,12.41830000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,12.41830000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.52400000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,5.52400000000
 electric_stove,R1,R1,A1,residential,retrofit,2040,23.57330000000
 electric_stove,R1,R1,A1,residential,retrofit,2040,16.42930000000
 heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
@@ -74,19 +70,17 @@ electric_stove,R2,R2,A1,residential,retrofit,2040,23.57330000000
 electric_stove,R2,R2,A1,residential,retrofit,2040,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
 heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2040,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2040,19.39350000000
 solarPV,R1,R1,A1,power,retrofit,2040,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2040,15.71520000000
 windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2040,8.61930000000
+solarPV,R2,R2,A1,power,retrofit,2040,19.39350000000
 solarPV,R2,R2,A1,power,retrofit,2040,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2040,15.71520000000
 windturbine,R2,R2,A1,power,retrofit,2040,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,12.41830000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,12.41830000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.52400000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,5.52400000000
 electric_stove,R1,R1,A1,residential,retrofit,2045,16.42930000000
 electric_stove,R1,R1,A1,residential,retrofit,2045,29.28800000000
 heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
@@ -95,21 +89,19 @@ electric_stove,R2,R2,A1,residential,retrofit,2045,16.42930000000
 electric_stove,R2,R2,A1,residential,retrofit,2045,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
 heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,8.61930000000
 solarPV,R1,R1,A1,power,retrofit,2045,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2045,19.39350000000
 solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2045,15.71520000000
 solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
 windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2045,8.61930000000
+solarPV,R2,R2,A1,power,retrofit,2045,19.39350000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2045,15.71520000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
 windturbine,R2,R2,A1,power,retrofit,2045,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,12.41830000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,12.41830000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.52400000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,5.52400000000
 electric_stove,R1,R1,A1,residential,retrofit,2050,29.28800000000
 electric_stove,R1,R1,A1,residential,retrofit,2050,22.14400000000
 heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
@@ -118,19 +110,17 @@ electric_stove,R2,R2,A1,residential,retrofit,2050,29.28800000000
 electric_stove,R2,R2,A1,residential,retrofit,2050,22.14400000000
 heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
 heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,8.61930000000
+solarPV,R1,R1,A1,power,retrofit,2050,19.39350000000
 solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2050,15.71520000000
 solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
 solarPV,R1,R1,A1,power,retrofit,2050,31.42930000000
 windturbine,R1,R1,A1,power,retrofit,2050,13.46730000000
-gasCCGT,R2,R2,A1,power,retrofit,2050,8.61930000000
+solarPV,R2,R2,A1,power,retrofit,2050,19.39350000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2050,15.71520000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
 solarPV,R2,R2,A1,power,retrofit,2050,31.42930000000
 windturbine,R2,R2,A1,power,retrofit,2050,13.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,12.41830000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,12.41830000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.52400000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,5.52400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index f70a1c29..df39ffdb 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,483 +79,483 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.19730000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.19730000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.58760000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.58760000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49020000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49020000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15380000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15380000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.74130000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,0.74130000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.29590000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.29590000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,80.14830000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,80.14830000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.60730000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.60730000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49270000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49270000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.23070000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.23070000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.11200000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,1.11200000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.19730000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.19730000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.76890000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.76890000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,80.22240000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,80.22240000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58760000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58760000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49020000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49020000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15380000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15380000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.74130000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.74130000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.29590000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.29590000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15340000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.15340000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.14830000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.14830000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60730000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60730000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49270000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49270000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.23070000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.23070000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.11200000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,1.11200000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.59210000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.59210000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.30780000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.30780000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,80.22240000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,80.22240000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66660000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66660000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50030000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50030000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46160000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46160000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.22500000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,2.22500000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.39480000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.39480000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,80.44500000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,80.44500000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.62710000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.62710000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.49530000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.49530000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.30780000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.30780000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.48370000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,1.48370000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.39480000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.39480000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,80.29670000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,80.29670000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62710000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62710000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49530000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49530000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.30780000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.30780000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,1.48370000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,1.48370000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.39480000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.39480000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.53890000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.53890000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,80.29670000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,80.29670000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62710000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62710000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49530000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49530000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.30780000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.30780000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.48370000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.48370000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.44470000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.44470000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07210000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.07210000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.29670000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.29670000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.08840000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.08840000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.19720000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.19720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.23740000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.23740000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.05970000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.05970000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66790000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.66790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.11220000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,64.23050000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,64.23050000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.11330000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.11330000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.20180000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.20180000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.35620000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.35620000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.09360000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.09360000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44470000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44470000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07210000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07210000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,64.34590000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,64.34590000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.08840000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.08840000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19720000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19720000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.23740000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.23740000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05970000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05970000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66790000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11220000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.23050000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.23050000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.11330000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.11330000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20180000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20180000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35620000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35620000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.09360000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.09360000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34150000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34150000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24860000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.24860000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,64.34590000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,64.34590000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.18820000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.18820000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21550000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21550000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.71370000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.71370000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.21150000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.21150000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89230000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89230000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15510000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.15510000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,64.69300000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,64.69300000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.13830000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.13830000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.20630000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.20630000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.47550000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.47550000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.13030000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,0.13030000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89230000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89230000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.15510000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.15510000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,64.46170000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,64.46170000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,14.13830000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,14.13830000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20630000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20630000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.47550000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.47550000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.13030000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.13030000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89230000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89230000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15510000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15510000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,64.46170000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,64.46170000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.13830000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.13830000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20630000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.47550000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.47550000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.13030000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.13030000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.49520000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.49520000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08650000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08650000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.46170000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.46170000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.28880000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.28880000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.48560000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.48560000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.07240000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.07240000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74360000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.74360000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.13880000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.13880000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,51.47730000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,51.47730000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.31780000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.31780000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.62870000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.62870000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.11770000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.11770000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.49520000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.49520000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08650000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08650000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,51.61620000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,51.61620000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28880000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28880000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48560000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48560000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.07240000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.07240000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74360000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.74360000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13880000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13880000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.47730000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.47730000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31780000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31780000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.62870000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.62870000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.11770000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.11770000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.49190000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.49190000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33250000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.33250000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,51.61620000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,51.61620000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40490000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.05990000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.05990000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.29020000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.29020000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.99300000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.99300000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.19740000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.19740000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,52.03490000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,52.03490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.34690000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.34690000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.77250000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.77250000000,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', 'evening')",cook,R1,0.16920000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.16920000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.99300000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.99300000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.19740000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.19740000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,51.75580000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,51.75580000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34690000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34690000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.77250000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.77250000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.16920000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.16920000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.99300000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.99300000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19740000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19740000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,51.75580000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,51.75580000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34690000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34690000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.77250000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.77250000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.16920000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.16920000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.50550000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.50550000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02700000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.75580000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.75580000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.08840000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08840000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.33530000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.33530000000,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', 'night')",cook,R1,0.02700000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.02700000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.75880000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.75880000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05120000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05120000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.33530000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.33530000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13260000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13260000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.50420000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.50420000000,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', 'morning')",cook,R1,0.05120000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.05120000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.50550000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.50550000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02700000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02700000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.50420000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.50420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08840000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08840000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33530000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02700000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02700000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.75880000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.75880000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05120000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05120000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.33530000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.33530000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13260000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13260000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50420000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.50420000000,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', 'early-peak')",cook,R1,0.05120000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05120000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.52160000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.52160000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.16650000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.16650000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.50420000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.50420000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26540000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26540000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.01630000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,1.01630000000,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', 'late-peak')",cook,R1,0.16650000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.16650000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.01320000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.01320000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.08250000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.08250000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,1.01630000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,1.01630000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17700000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.67440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.67440000000,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', 'evening')",cook,R1,0.08250000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.08250000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.01320000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.01320000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08250000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08250000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.67440000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.67440000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17700000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17700000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.67440000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.67440000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.08250000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.08250000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.01320000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.01320000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08250000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08250000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.67440000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.67440000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.67440000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.67440000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08250000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08250000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.56420000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.56420000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02730000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.02730000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.67440000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.67440000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08660000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.08660000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,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', 'night')",cook,R1,0.02730000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.02730000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.84680000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.84680000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05180000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05180000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.01540000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.01540000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12990000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12990000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.02500000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.02500000000,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', 'morning')",cook,R1,0.05180000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.05180000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.56420000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.56420000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02730000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02730000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.02500000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.02500000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08660000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08660000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02730000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02730000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.84680000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.84680000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05180000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05180000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01540000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01540000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12990000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12990000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02500000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02500000000,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', 'early-peak')",cook,R1,0.05180000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05180000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.69730000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.69730000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.16910000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.16910000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02500000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02500000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.25990000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.25990000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06140000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06140000000,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', 'late-peak')",cook,R1,0.16910000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.16910000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.13050000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.13050000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.08370000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.08370000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06140000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06140000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17330000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17330000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.03590000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.03590000000,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', 'evening')",cook,R1,0.08370000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.08370000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.13050000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.13050000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08370000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08370000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.03590000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.03590000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17330000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17330000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03590000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03590000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.08370000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.08370000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.13050000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.13050000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08370000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08370000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03590000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17330000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17330000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03590000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08370000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08370000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.60630000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.60630000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02900000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.02900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03590000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08160000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08160000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,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', 'night')",cook,R1,0.02900000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.02900000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.90990000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.90990000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05560000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.05560000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.01540000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.01540000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12230000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12230000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.02490000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.02490000000,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', 'morning')",cook,R1,0.05560000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.05560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.60630000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.60630000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02530000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02900000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02900000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.02490000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.02490000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08160000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08160000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02900000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02900000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.90990000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.90990000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03790000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05560000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01540000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01540000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12230000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12230000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02490000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02490000000,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', 'early-peak')",cook,R1,0.05560000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05560000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.82320000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.82320000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07590000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.18420000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.18420000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02490000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02490000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24480000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24480000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06090000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06090000000,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', 'late-peak')",cook,R1,0.18420000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.18420000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.21460000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.21460000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.09040000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.09040000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06090000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06090000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16320000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16320000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.03570000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.03570000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.09040000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.09040000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.21460000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.21460000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09040000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09040000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.03570000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.03570000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16320000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16320000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03570000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03570000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.09040000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.09040000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.21460000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.21460000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05060000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09040000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09040000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03570000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03570000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16320000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16320000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03570000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03570000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09040000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09040000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03570000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03570000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 3dad784d..9e311ff3 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -1,26 +1,26 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
-1,2030,gasCCGT,R1,2025,8.61930000000
-1,2035,gasCCGT,R1,2025,8.61930000000
-1,2040,gasCCGT,R1,2025,8.61930000000
-1,2045,gasCCGT,R1,2025,8.61930000000
-1,2049,gasCCGT,R1,2025,8.61930000000
-1,2050,gasCCGT,R1,2025,8.61930000000
-1,2064,gasCCGT,R1,2025,8.61930000000
-2,2025,gasCCGT,R2,2020,1.00000000000
-3,2030,gasCCGT,R2,2025,8.61930000000
-3,2035,gasCCGT,R2,2025,8.61930000000
-3,2040,gasCCGT,R2,2025,8.61930000000
-3,2045,gasCCGT,R2,2025,8.61930000000
-3,2049,gasCCGT,R2,2025,8.61930000000
-3,2050,gasCCGT,R2,2025,8.61930000000
-3,2064,gasCCGT,R2,2025,8.61930000000
-4,2025,solarPV,R1,2020,13.46730000000
-4,2030,solarPV,R1,2020,13.46730000000
-4,2035,solarPV,R1,2020,13.46730000000
-4,2040,solarPV,R1,2020,13.46730000000
-4,2045,solarPV,R1,2020,13.46730000000
-4,2049,solarPV,R1,2020,13.46730000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,13.46730000000
+2,2030,solarPV,R1,2020,13.46730000000
+2,2035,solarPV,R1,2020,13.46730000000
+2,2040,solarPV,R1,2020,13.46730000000
+2,2045,solarPV,R1,2020,13.46730000000
+2,2049,solarPV,R1,2020,13.46730000000
+3,2030,solarPV,R1,2025,19.39350000000
+3,2035,solarPV,R1,2025,19.39350000000
+3,2040,solarPV,R1,2025,19.39350000000
+3,2045,solarPV,R1,2025,19.39350000000
+3,2049,solarPV,R1,2025,19.39350000000
+3,2050,solarPV,R1,2025,19.39350000000
+3,2054,solarPV,R1,2025,19.39350000000
+4,2030,solarPV,R2,2025,19.39350000000
+4,2035,solarPV,R2,2025,19.39350000000
+4,2040,solarPV,R2,2025,19.39350000000
+4,2045,solarPV,R2,2025,19.39350000000
+4,2049,solarPV,R2,2025,19.39350000000
+4,2050,solarPV,R2,2025,19.39350000000
+4,2054,solarPV,R2,2025,19.39350000000
 5,2025,windturbine,R1,2020,20.00000000000
 5,2030,windturbine,R1,2020,20.00000000000
 5,2035,windturbine,R1,2020,20.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index 9155016d..7c8f75b1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -9,38 +9,38 @@ asset,year,region,installed,technology,capacity
 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,8.61930000000
-3,2035,R1,2025,gasCCGT,8.61930000000
-3,2040,R1,2025,gasCCGT,8.61930000000
-3,2045,R1,2025,gasCCGT,8.61930000000
-3,2049,R1,2025,gasCCGT,8.61930000000
-3,2050,R1,2025,gasCCGT,8.61930000000
-3,2059,R1,2025,gasCCGT,8.61930000000
-3,2060,R1,2025,gasCCGT,8.61930000000
-3,2064,R1,2025,gasCCGT,8.61930000000
+3,2030,R1,2025,solarPV,19.39350000000
+3,2035,R1,2025,solarPV,19.39350000000
+3,2040,R1,2025,solarPV,19.39350000000
+3,2045,R1,2025,solarPV,19.39350000000
+3,2049,R1,2025,solarPV,19.39350000000
+3,2050,R1,2025,solarPV,19.39350000000
+3,2054,R1,2025,solarPV,19.39350000000
 4,2035,R1,2030,solarPV,11.42930000000
 4,2040,R1,2030,solarPV,11.42930000000
 4,2045,R1,2030,solarPV,11.42930000000
 4,2049,R1,2030,solarPV,11.42930000000
 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
 6,2030,R2,2020,windturbine,33.46730000000
 6,2035,R2,2020,windturbine,33.46730000000
 6,2040,R2,2020,windturbine,33.46730000000
 6,2045,R2,2020,windturbine,33.46730000000
 6,2049,R2,2020,windturbine,33.46730000000
-7,2030,R2,2025,gasCCGT,8.61930000000
-7,2035,R2,2025,gasCCGT,8.61930000000
-7,2040,R2,2025,gasCCGT,8.61930000000
-7,2045,R2,2025,gasCCGT,8.61930000000
-7,2049,R2,2025,gasCCGT,8.61930000000
-7,2050,R2,2025,gasCCGT,8.61930000000
-7,2059,R2,2025,gasCCGT,8.61930000000
-7,2060,R2,2025,gasCCGT,8.61930000000
-7,2064,R2,2025,gasCCGT,8.61930000000
+7,2030,R2,2025,solarPV,19.39350000000
+7,2035,R2,2025,solarPV,19.39350000000
+7,2040,R2,2025,solarPV,19.39350000000
+7,2045,R2,2025,solarPV,19.39350000000
+7,2049,R2,2025,solarPV,19.39350000000
+7,2050,R2,2025,solarPV,19.39350000000
+7,2054,R2,2025,solarPV,19.39350000000
 8,2035,R2,2030,solarPV,11.42930000000
 8,2040,R2,2030,solarPV,11.42930000000
 8,2045,R2,2030,solarPV,11.42930000000
 8,2049,R2,2030,solarPV,11.42930000000
 8,2050,R2,2030,solarPV,11.42930000000
+8,2054,R2,2030,solarPV,11.42930000000
+8,2055,R2,2030,solarPV,11.42930000000
 8,2059,R2,2030,solarPV,11.42930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index ba65d611..18d94a50 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -7,24 +7,26 @@ asset,year,region,installed,technology,capacity
 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,8.61930000000
-3,2040,R1,2025,gasCCGT,8.61930000000
-3,2045,R1,2025,gasCCGT,8.61930000000
-3,2049,R1,2025,gasCCGT,8.61930000000
-3,2050,R1,2025,gasCCGT,8.61930000000
-3,2059,R1,2025,gasCCGT,8.61930000000
-3,2060,R1,2025,gasCCGT,8.61930000000
-3,2064,R1,2025,gasCCGT,8.61930000000
+3,2035,R1,2025,solarPV,19.39350000000
+3,2040,R1,2025,solarPV,19.39350000000
+3,2045,R1,2025,solarPV,19.39350000000
+3,2049,R1,2025,solarPV,19.39350000000
+3,2050,R1,2025,solarPV,19.39350000000
+3,2054,R1,2025,solarPV,19.39350000000
 4,2035,R1,2030,solarPV,11.42930000000
 4,2040,R1,2030,solarPV,11.42930000000
 4,2045,R1,2030,solarPV,11.42930000000
 4,2049,R1,2030,solarPV,11.42930000000
 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,2040,R1,2035,solarPV,15.71520000000
 5,2045,R1,2035,solarPV,15.71520000000
 5,2049,R1,2035,solarPV,15.71520000000
 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
@@ -32,24 +34,26 @@ asset,year,region,installed,technology,capacity
 7,2040,R2,2020,windturbine,33.46730000000
 7,2045,R2,2020,windturbine,33.46730000000
 7,2049,R2,2020,windturbine,33.46730000000
-8,2035,R2,2025,gasCCGT,8.61930000000
-8,2040,R2,2025,gasCCGT,8.61930000000
-8,2045,R2,2025,gasCCGT,8.61930000000
-8,2049,R2,2025,gasCCGT,8.61930000000
-8,2050,R2,2025,gasCCGT,8.61930000000
-8,2059,R2,2025,gasCCGT,8.61930000000
-8,2060,R2,2025,gasCCGT,8.61930000000
-8,2064,R2,2025,gasCCGT,8.61930000000
+8,2035,R2,2025,solarPV,19.39350000000
+8,2040,R2,2025,solarPV,19.39350000000
+8,2045,R2,2025,solarPV,19.39350000000
+8,2049,R2,2025,solarPV,19.39350000000
+8,2050,R2,2025,solarPV,19.39350000000
+8,2054,R2,2025,solarPV,19.39350000000
 9,2035,R2,2030,solarPV,11.42930000000
 9,2040,R2,2030,solarPV,11.42930000000
 9,2045,R2,2030,solarPV,11.42930000000
 9,2049,R2,2030,solarPV,11.42930000000
 9,2050,R2,2030,solarPV,11.42930000000
+9,2054,R2,2030,solarPV,11.42930000000
+9,2055,R2,2030,solarPV,11.42930000000
 9,2059,R2,2030,solarPV,11.42930000000
 10,2040,R2,2035,solarPV,15.71520000000
 10,2045,R2,2035,solarPV,15.71520000000
 10,2049,R2,2035,solarPV,15.71520000000
 10,2050,R2,2035,solarPV,15.71520000000
+10,2054,R2,2035,solarPV,15.71520000000
+10,2055,R2,2035,solarPV,15.71520000000
 10,2059,R2,2035,solarPV,15.71520000000
 10,2060,R2,2035,solarPV,15.71520000000
 10,2064,R2,2035,solarPV,15.71520000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index a2466d2e..24b94b36 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -5,28 +5,32 @@ asset,year,region,installed,technology,capacity
 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,8.61930000000
-3,2045,R1,2025,gasCCGT,8.61930000000
-3,2049,R1,2025,gasCCGT,8.61930000000
-3,2050,R1,2025,gasCCGT,8.61930000000
-3,2059,R1,2025,gasCCGT,8.61930000000
-3,2060,R1,2025,gasCCGT,8.61930000000
-3,2064,R1,2025,gasCCGT,8.61930000000
+3,2040,R1,2025,solarPV,19.39350000000
+3,2045,R1,2025,solarPV,19.39350000000
+3,2049,R1,2025,solarPV,19.39350000000
+3,2050,R1,2025,solarPV,19.39350000000
+3,2054,R1,2025,solarPV,19.39350000000
 4,2040,R1,2030,solarPV,11.42930000000
 4,2045,R1,2030,solarPV,11.42930000000
 4,2049,R1,2030,solarPV,11.42930000000
 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,2040,R1,2035,solarPV,15.71520000000
 5,2045,R1,2035,solarPV,15.71520000000
 5,2049,R1,2035,solarPV,15.71520000000
 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,2045,R1,2040,solarPV,11.42930000000
 6,2049,R1,2040,solarPV,11.42930000000
 6,2050,R1,2040,solarPV,11.42930000000
+6,2054,R1,2040,solarPV,11.42930000000
+6,2055,R1,2040,solarPV,11.42930000000
 6,2059,R1,2040,solarPV,11.42930000000
 6,2060,R1,2040,solarPV,11.42930000000
 6,2064,R1,2040,solarPV,11.42930000000
@@ -35,28 +39,32 @@ asset,year,region,installed,technology,capacity
 8,2040,R2,2020,windturbine,33.46730000000
 8,2045,R2,2020,windturbine,33.46730000000
 8,2049,R2,2020,windturbine,33.46730000000
-9,2040,R2,2025,gasCCGT,8.61930000000
-9,2045,R2,2025,gasCCGT,8.61930000000
-9,2049,R2,2025,gasCCGT,8.61930000000
-9,2050,R2,2025,gasCCGT,8.61930000000
-9,2059,R2,2025,gasCCGT,8.61930000000
-9,2060,R2,2025,gasCCGT,8.61930000000
-9,2064,R2,2025,gasCCGT,8.61930000000
+9,2040,R2,2025,solarPV,19.39350000000
+9,2045,R2,2025,solarPV,19.39350000000
+9,2049,R2,2025,solarPV,19.39350000000
+9,2050,R2,2025,solarPV,19.39350000000
+9,2054,R2,2025,solarPV,19.39350000000
 10,2040,R2,2030,solarPV,11.42930000000
 10,2045,R2,2030,solarPV,11.42930000000
 10,2049,R2,2030,solarPV,11.42930000000
 10,2050,R2,2030,solarPV,11.42930000000
+10,2054,R2,2030,solarPV,11.42930000000
+10,2055,R2,2030,solarPV,11.42930000000
 10,2059,R2,2030,solarPV,11.42930000000
 11,2040,R2,2035,solarPV,15.71520000000
 11,2045,R2,2035,solarPV,15.71520000000
 11,2049,R2,2035,solarPV,15.71520000000
 11,2050,R2,2035,solarPV,15.71520000000
+11,2054,R2,2035,solarPV,15.71520000000
+11,2055,R2,2035,solarPV,15.71520000000
 11,2059,R2,2035,solarPV,15.71520000000
 11,2060,R2,2035,solarPV,15.71520000000
 11,2064,R2,2035,solarPV,15.71520000000
 12,2045,R2,2040,solarPV,11.42930000000
 12,2049,R2,2040,solarPV,11.42930000000
 12,2050,R2,2040,solarPV,11.42930000000
+12,2054,R2,2040,solarPV,11.42930000000
+12,2055,R2,2040,solarPV,11.42930000000
 12,2059,R2,2040,solarPV,11.42930000000
 12,2060,R2,2040,solarPV,11.42930000000
 12,2064,R2,2040,solarPV,11.42930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index 998e9d77..71ebc5c4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,63 +1,75 @@
 asset,year,technology,region,installed,capacity
-0,2045,gasCCGT,R1,2025,8.61930000000
-0,2049,gasCCGT,R1,2025,8.61930000000
-0,2050,gasCCGT,R1,2025,8.61930000000
-0,2059,gasCCGT,R1,2025,8.61930000000
-0,2060,gasCCGT,R1,2025,8.61930000000
-0,2064,gasCCGT,R1,2025,8.61930000000
-1,2045,gasCCGT,R2,2025,8.61930000000
-1,2049,gasCCGT,R2,2025,8.61930000000
-1,2050,gasCCGT,R2,2025,8.61930000000
-1,2059,gasCCGT,R2,2025,8.61930000000
-1,2060,gasCCGT,R2,2025,8.61930000000
-1,2064,gasCCGT,R2,2025,8.61930000000
-2,2045,solarPV,R1,2020,13.46730000000
-2,2049,solarPV,R1,2020,13.46730000000
-3,2045,solarPV,R1,2030,11.42930000000
-3,2049,solarPV,R1,2030,11.42930000000
-3,2050,solarPV,R1,2030,11.42930000000
-3,2059,solarPV,R1,2030,11.42930000000
-4,2045,solarPV,R1,2035,15.71520000000
-4,2049,solarPV,R1,2035,15.71520000000
-4,2050,solarPV,R1,2035,15.71520000000
-4,2059,solarPV,R1,2035,15.71520000000
-4,2060,solarPV,R1,2035,15.71520000000
-4,2064,solarPV,R1,2035,15.71520000000
-5,2045,solarPV,R1,2040,11.42930000000
-5,2049,solarPV,R1,2040,11.42930000000
-5,2050,solarPV,R1,2040,11.42930000000
-5,2059,solarPV,R1,2040,11.42930000000
-5,2060,solarPV,R1,2040,11.42930000000
-5,2064,solarPV,R1,2040,11.42930000000
-5,2065,solarPV,R1,2040,11.42930000000
-5,2069,solarPV,R1,2040,11.42930000000
-6,2050,solarPV,R1,2045,31.42930000000
-6,2059,solarPV,R1,2045,31.42930000000
-6,2060,solarPV,R1,2045,31.42930000000
-6,2064,solarPV,R1,2045,31.42930000000
-6,2065,solarPV,R1,2045,31.42930000000
-6,2069,solarPV,R1,2045,31.42930000000
-6,2070,solarPV,R1,2045,31.42930000000
-6,2074,solarPV,R1,2045,31.42930000000
+0,2045,solarPV,R1,2020,13.46730000000
+0,2049,solarPV,R1,2020,13.46730000000
+1,2045,solarPV,R1,2025,19.39350000000
+1,2049,solarPV,R1,2025,19.39350000000
+1,2050,solarPV,R1,2025,19.39350000000
+1,2054,solarPV,R1,2025,19.39350000000
+2,2045,solarPV,R1,2030,11.42930000000
+2,2049,solarPV,R1,2030,11.42930000000
+2,2050,solarPV,R1,2030,11.42930000000
+2,2054,solarPV,R1,2030,11.42930000000
+2,2055,solarPV,R1,2030,11.42930000000
+2,2059,solarPV,R1,2030,11.42930000000
+3,2045,solarPV,R1,2035,15.71520000000
+3,2049,solarPV,R1,2035,15.71520000000
+3,2050,solarPV,R1,2035,15.71520000000
+3,2054,solarPV,R1,2035,15.71520000000
+3,2055,solarPV,R1,2035,15.71520000000
+3,2059,solarPV,R1,2035,15.71520000000
+3,2060,solarPV,R1,2035,15.71520000000
+3,2064,solarPV,R1,2035,15.71520000000
+4,2045,solarPV,R1,2040,11.42930000000
+4,2049,solarPV,R1,2040,11.42930000000
+4,2050,solarPV,R1,2040,11.42930000000
+4,2054,solarPV,R1,2040,11.42930000000
+4,2055,solarPV,R1,2040,11.42930000000
+4,2059,solarPV,R1,2040,11.42930000000
+4,2060,solarPV,R1,2040,11.42930000000
+4,2064,solarPV,R1,2040,11.42930000000
+4,2065,solarPV,R1,2040,11.42930000000
+4,2069,solarPV,R1,2040,11.42930000000
+5,2050,solarPV,R1,2045,31.42930000000
+5,2054,solarPV,R1,2045,31.42930000000
+5,2055,solarPV,R1,2045,31.42930000000
+5,2059,solarPV,R1,2045,31.42930000000
+5,2060,solarPV,R1,2045,31.42930000000
+5,2064,solarPV,R1,2045,31.42930000000
+5,2065,solarPV,R1,2045,31.42930000000
+5,2069,solarPV,R1,2045,31.42930000000
+5,2070,solarPV,R1,2045,31.42930000000
+5,2074,solarPV,R1,2045,31.42930000000
+6,2045,solarPV,R2,2025,19.39350000000
+6,2049,solarPV,R2,2025,19.39350000000
+6,2050,solarPV,R2,2025,19.39350000000
+6,2054,solarPV,R2,2025,19.39350000000
 7,2045,solarPV,R2,2030,11.42930000000
 7,2049,solarPV,R2,2030,11.42930000000
 7,2050,solarPV,R2,2030,11.42930000000
+7,2054,solarPV,R2,2030,11.42930000000
+7,2055,solarPV,R2,2030,11.42930000000
 7,2059,solarPV,R2,2030,11.42930000000
 8,2045,solarPV,R2,2035,15.71520000000
 8,2049,solarPV,R2,2035,15.71520000000
 8,2050,solarPV,R2,2035,15.71520000000
+8,2054,solarPV,R2,2035,15.71520000000
+8,2055,solarPV,R2,2035,15.71520000000
 8,2059,solarPV,R2,2035,15.71520000000
 8,2060,solarPV,R2,2035,15.71520000000
 8,2064,solarPV,R2,2035,15.71520000000
 9,2045,solarPV,R2,2040,11.42930000000
 9,2049,solarPV,R2,2040,11.42930000000
 9,2050,solarPV,R2,2040,11.42930000000
+9,2054,solarPV,R2,2040,11.42930000000
+9,2055,solarPV,R2,2040,11.42930000000
 9,2059,solarPV,R2,2040,11.42930000000
 9,2060,solarPV,R2,2040,11.42930000000
 9,2064,solarPV,R2,2040,11.42930000000
 9,2065,solarPV,R2,2040,11.42930000000
 9,2069,solarPV,R2,2040,11.42930000000
 10,2050,solarPV,R2,2045,31.42930000000
+10,2054,solarPV,R2,2045,31.42930000000
+10,2055,solarPV,R2,2045,31.42930000000
 10,2059,solarPV,R2,2045,31.42930000000
 10,2060,solarPV,R2,2045,31.42930000000
 10,2064,solarPV,R2,2045,31.42930000000
@@ -68,6 +80,8 @@ asset,year,technology,region,installed,capacity
 11,2045,windturbine,R1,2020,20.00000000000
 11,2049,windturbine,R1,2020,20.00000000000
 12,2050,windturbine,R1,2045,13.46730000000
+12,2054,windturbine,R1,2045,13.46730000000
+12,2055,windturbine,R1,2045,13.46730000000
 12,2059,windturbine,R1,2045,13.46730000000
 12,2060,windturbine,R1,2045,13.46730000000
 12,2064,windturbine,R1,2045,13.46730000000
@@ -78,6 +92,8 @@ asset,year,technology,region,installed,capacity
 13,2045,windturbine,R2,2020,33.46730000000
 13,2049,windturbine,R2,2020,33.46730000000
 14,2050,windturbine,R2,2045,13.46730000000
+14,2054,windturbine,R2,2045,13.46730000000
+14,2055,windturbine,R2,2045,13.46730000000
 14,2059,windturbine,R2,2045,13.46730000000
 14,2060,windturbine,R2,2045,13.46730000000
 14,2064,windturbine,R2,2045,13.46730000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index 98023c25..d79ef3ab 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,18 +1,18 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,8.61930000000
-2,2055,R1,2025,gasCCGT,8.61930000000
-2,2059,R1,2025,gasCCGT,8.61930000000
-2,2060,R1,2025,gasCCGT,8.61930000000
-2,2064,R1,2025,gasCCGT,8.61930000000
+2,2050,R1,2025,solarPV,19.39350000000
+2,2054,R1,2025,solarPV,19.39350000000
 3,2050,R1,2030,solarPV,11.42930000000
+3,2054,R1,2030,solarPV,11.42930000000
 3,2055,R1,2030,solarPV,11.42930000000
 3,2059,R1,2030,solarPV,11.42930000000
 4,2050,R1,2035,solarPV,15.71520000000
+4,2054,R1,2035,solarPV,15.71520000000
 4,2055,R1,2035,solarPV,15.71520000000
 4,2059,R1,2035,solarPV,15.71520000000
 4,2060,R1,2035,solarPV,15.71520000000
 4,2064,R1,2035,solarPV,15.71520000000
 5,2050,R1,2040,solarPV,11.42930000000
+5,2054,R1,2040,solarPV,11.42930000000
 5,2055,R1,2040,solarPV,11.42930000000
 5,2059,R1,2040,solarPV,11.42930000000
 5,2060,R1,2040,solarPV,11.42930000000
@@ -20,6 +20,7 @@ asset,year,region,installed,technology,capacity
 5,2065,R1,2040,solarPV,11.42930000000
 5,2069,R1,2040,solarPV,11.42930000000
 6,2050,R1,2045,solarPV,31.42930000000
+6,2054,R1,2045,solarPV,31.42930000000
 6,2055,R1,2045,solarPV,31.42930000000
 6,2059,R1,2045,solarPV,31.42930000000
 6,2060,R1,2045,solarPV,31.42930000000
@@ -29,6 +30,7 @@ asset,year,region,installed,technology,capacity
 6,2070,R1,2045,solarPV,31.42930000000
 6,2074,R1,2045,solarPV,31.42930000000
 7,2050,R1,2045,windturbine,13.46730000000
+7,2054,R1,2045,windturbine,13.46730000000
 7,2055,R1,2045,windturbine,13.46730000000
 7,2059,R1,2045,windturbine,13.46730000000
 7,2060,R1,2045,windturbine,13.46730000000
@@ -37,41 +39,63 @@ asset,year,region,installed,technology,capacity
 7,2069,R1,2045,windturbine,13.46730000000
 7,2070,R1,2045,windturbine,13.46730000000
 7,2074,R1,2045,windturbine,13.46730000000
-9,2050,R2,2025,gasCCGT,8.61930000000
-9,2055,R2,2025,gasCCGT,8.61930000000
-9,2059,R2,2025,gasCCGT,8.61930000000
-9,2060,R2,2025,gasCCGT,8.61930000000
-9,2064,R2,2025,gasCCGT,8.61930000000
-10,2050,R2,2030,solarPV,11.42930000000
-10,2055,R2,2030,solarPV,11.42930000000
-10,2059,R2,2030,solarPV,11.42930000000
-11,2050,R2,2035,solarPV,15.71520000000
-11,2055,R2,2035,solarPV,15.71520000000
-11,2059,R2,2035,solarPV,15.71520000000
-11,2060,R2,2035,solarPV,15.71520000000
-11,2064,R2,2035,solarPV,15.71520000000
-12,2050,R2,2040,solarPV,11.42930000000
-12,2055,R2,2040,solarPV,11.42930000000
-12,2059,R2,2040,solarPV,11.42930000000
-12,2060,R2,2040,solarPV,11.42930000000
-12,2064,R2,2040,solarPV,11.42930000000
-12,2065,R2,2040,solarPV,11.42930000000
-12,2069,R2,2040,solarPV,11.42930000000
-13,2050,R2,2045,solarPV,31.42930000000
-13,2055,R2,2045,solarPV,31.42930000000
-13,2059,R2,2045,solarPV,31.42930000000
-13,2060,R2,2045,solarPV,31.42930000000
-13,2064,R2,2045,solarPV,31.42930000000
-13,2065,R2,2045,solarPV,31.42930000000
-13,2069,R2,2045,solarPV,31.42930000000
-13,2070,R2,2045,solarPV,31.42930000000
-13,2074,R2,2045,solarPV,31.42930000000
-14,2050,R2,2045,windturbine,13.46730000000
-14,2055,R2,2045,windturbine,13.46730000000
-14,2059,R2,2045,windturbine,13.46730000000
-14,2060,R2,2045,windturbine,13.46730000000
-14,2064,R2,2045,windturbine,13.46730000000
-14,2065,R2,2045,windturbine,13.46730000000
-14,2069,R2,2045,windturbine,13.46730000000
-14,2070,R2,2045,windturbine,13.46730000000
-14,2074,R2,2045,windturbine,13.46730000000
+8,2055,R1,2050,solarPV,19.39350000000
+8,2059,R1,2050,solarPV,19.39350000000
+8,2060,R1,2050,solarPV,19.39350000000
+8,2064,R1,2050,solarPV,19.39350000000
+8,2065,R1,2050,solarPV,19.39350000000
+8,2069,R1,2050,solarPV,19.39350000000
+8,2070,R1,2050,solarPV,19.39350000000
+8,2074,R1,2050,solarPV,19.39350000000
+8,2075,R1,2050,solarPV,19.39350000000
+8,2079,R1,2050,solarPV,19.39350000000
+10,2050,R2,2025,solarPV,19.39350000000
+10,2054,R2,2025,solarPV,19.39350000000
+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
+12,2050,R2,2035,solarPV,15.71520000000
+12,2054,R2,2035,solarPV,15.71520000000
+12,2055,R2,2035,solarPV,15.71520000000
+12,2059,R2,2035,solarPV,15.71520000000
+12,2060,R2,2035,solarPV,15.71520000000
+12,2064,R2,2035,solarPV,15.71520000000
+13,2050,R2,2040,solarPV,11.42930000000
+13,2054,R2,2040,solarPV,11.42930000000
+13,2055,R2,2040,solarPV,11.42930000000
+13,2059,R2,2040,solarPV,11.42930000000
+13,2060,R2,2040,solarPV,11.42930000000
+13,2064,R2,2040,solarPV,11.42930000000
+13,2065,R2,2040,solarPV,11.42930000000
+13,2069,R2,2040,solarPV,11.42930000000
+14,2050,R2,2045,solarPV,31.42930000000
+14,2054,R2,2045,solarPV,31.42930000000
+14,2055,R2,2045,solarPV,31.42930000000
+14,2059,R2,2045,solarPV,31.42930000000
+14,2060,R2,2045,solarPV,31.42930000000
+14,2064,R2,2045,solarPV,31.42930000000
+14,2065,R2,2045,solarPV,31.42930000000
+14,2069,R2,2045,solarPV,31.42930000000
+14,2070,R2,2045,solarPV,31.42930000000
+14,2074,R2,2045,solarPV,31.42930000000
+15,2050,R2,2045,windturbine,13.46730000000
+15,2054,R2,2045,windturbine,13.46730000000
+15,2055,R2,2045,windturbine,13.46730000000
+15,2059,R2,2045,windturbine,13.46730000000
+15,2060,R2,2045,windturbine,13.46730000000
+15,2064,R2,2045,windturbine,13.46730000000
+15,2065,R2,2045,windturbine,13.46730000000
+15,2069,R2,2045,windturbine,13.46730000000
+15,2070,R2,2045,windturbine,13.46730000000
+15,2074,R2,2045,windturbine,13.46730000000
+16,2055,R2,2050,solarPV,19.39350000000
+16,2059,R2,2050,solarPV,19.39350000000
+16,2060,R2,2050,solarPV,19.39350000000
+16,2064,R2,2050,solarPV,19.39350000000
+16,2065,R2,2050,solarPV,19.39350000000
+16,2069,R2,2050,solarPV,19.39350000000
+16,2070,R2,2050,solarPV,19.39350000000
+16,2074,R2,2050,solarPV,19.39350000000
+16,2075,R2,2050,solarPV,19.39350000000
+16,2079,R2,2050,solarPV,19.39350000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index 1de51053..c6b9c6df 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 100
+maximum_iterations = 1
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 

From 91fc769be5a9b7d84f4ab501a7ff71285173c3a5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 22 May 2024 09:25:10 +0100
Subject: [PATCH 158/419] Small text changes

---
 .../4-modify-timing-data/generate_models.py    |  2 +-
 docs/user-guide/add-region.ipynb               |  2 +-
 docs/user-guide/add-solar.ipynb                | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 6e488673..92639893 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -44,7 +44,7 @@ def generate_model_1():
     }  # hacky way to preserve the order
     settings_file.write_text(dumps(settings))
 
-    # Change consumption profile (Undocumented)
+    # Change consumption profile
     consumption_values = [
         0.714,
         1.071,
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 7c32ab8b..41e2f05f 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. These regions do not have any energy trade. This requires us to undertake a similar process as before of modifying the input simulation data. However, this time we will also have to change the ```settings.toml``` file to achieve this.\n",
+    "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. These regions do not have any energy trade. This requires us to undertake a similar process as before of modifying the input simulation data.\n",
     "\n",
     "The process to change the ```settings.toml``` file is relatively simple. We just have to add our new region to the ```regions``` variable, in the 4th line of the ```settings.toml``` file, like so:\n",
     "\n",
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 55bfc68f..ab97d1aa 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -253,6 +253,24 @@
     "|R1|CommodityPrice|2100|21.39814806|7.373485819|100|1.871299697|0|**0**|"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Settings"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Finally, we muse make a small change to the `settings.toml` file. As `solar` is a renewable resource that isn't produced by any defined process in the model, we must add it to `excluded_commodities` in `settings.toml`, like so:\n",
+    "    \n",
+    "    excluded_commodities = [\"wind\", \"solar\"]\n",
+    "\n",
+    "This will allow MUSE to exclude `solar` from its internal supply-fulfillment checks."
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},

From fbd9053b747fb01a74b962c908225e6076b7a5cf Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 22 May 2024 10:57:42 +0100
Subject: [PATCH 159/419] Use generator expressions

---
 src/muse/wizard.py | 47 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index b450f6d1..e0b1d669 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,4 +1,5 @@
 import os
+from itertools import chain
 from pathlib import Path
 from typing import Callable, List
 
@@ -57,18 +58,18 @@ def add_new_commodity(
     df.to_csv(global_commodities_file, index=False)
 
     # Add columns to additional files
-    files_to_update = [
+    files_to_update = (
         model_path / file
-        for file in [
+        for file in (
             f"technodata/{sector}/CommIn.csv",
             f"technodata/{sector}/CommOut.csv",
             "input/BaseYearImport.csv",
             "input/BaseYearExport.csv",
             "input/Projections.csv",
-        ]
-    ] + list((model_path / "technodata/preset").glob("*"))
-
-    for file in files_to_update:
+        )
+    )
+    preset_files = (model_path / "technodata/preset").glob("*")
+    for file in chain(files_to_update, preset_files):
         df = pd.read_csv(file)
         df[commodity_name] = df[copy_from]
         df.to_csv(file, index=False)
@@ -85,15 +86,15 @@ def add_new_process(
         sector: Sector to add the process to.
         copy_from: Name of the process to copy from.
     """
-    files_to_update = [
+    files_to_update = (
         model_path / file
-        for file in [
+        for file in (
             f"technodata/{sector}/CommIn.csv",
             f"technodata/{sector}/CommOut.csv",
             f"technodata/{sector}/ExistingCapacity.csv",
             f"technodata/{sector}/Technodata.csv",
-        ]
-    ]
+        )
+    )
 
     for file in files_to_update:
         df = pd.read_csv(file)
@@ -114,10 +115,10 @@ def add_price_data_for_new_year(
         sector: Sector to add the price data to.
         copy_from: Year to copy the price data from.
     """
-    files_to_update = [
+    files_to_update = (
         model_path / f"technodata/{sector}/{file}"
         for file in ["Technodata.csv", "CommIn.csv", "CommOut.csv"]
-    ]
+    )
 
     for file in files_to_update:
         df = pd.read_csv(file)
@@ -185,30 +186,30 @@ def add_region(model_path: Path, region_name: str, copy_from: str) -> None:
     modify_toml(settings_file, lambda x: x["regions"].append(region_name))
 
     # Modify csv files
-    sector_files = [
+    sector_files = (
         model_path / "technodata" / sector / file
         for sector in get_sectors(model_path)
-        for file in [
+        for file in (
             "Technodata.csv",
             "CommIn.csv",
             "CommOut.csv",
             "ExistingCapacity.csv",
-        ]
-    ]
-    preset_files = [
+        )
+    )
+    preset_files = (
         model_path / "technodata" / "preset" / file
         for file in os.listdir(model_path / "technodata" / "preset")
-    ]
-    global_files = [
+    )
+    global_files = (
         model_path / file
-        for file in [
+        for file in (
             "technodata/Agents.csv",
             "input/BaseYearImport.csv",
             "input/BaseYearExport.csv",
             "input/Projections.csv",
-        ]
-    ]
-    for file_path in sector_files + preset_files + global_files:
+        )
+    )
+    for file_path in chain(sector_files, preset_files, global_files):
         df = pd.read_csv(file_path)
         new_rows = df[df["RegionName"] == copy_from].copy()
         new_rows["RegionName"] = region_name

From 08820bc1811781ac4e397b5c6d6853553c318fe9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 22 May 2024 12:17:16 +0100
Subject: [PATCH 160/419] Switch model order for agents tutorial

---
 .../Results/Gas/Capacity/2020.csv             |  0
 .../Results/Gas/Capacity/2025.csv             |  0
 .../Results/Gas/Capacity/2030.csv             |  0
 .../Results/Gas/Capacity/2035.csv             |  0
 .../Results/Gas/Capacity/2040.csv             |  0
 .../Results/Gas/Capacity/2045.csv             |  0
 .../Results/Gas/Capacity/2050.csv             |  0
 .../Results/MCACapacity.csv                   |  0
 .../Results/MCAPrices.csv                     |  0
 .../Results/Power/Capacity/2020.csv           |  0
 .../Results/Power/Capacity/2025.csv           |  0
 .../Results/Power/Capacity/2030.csv           |  0
 .../Results/Power/Capacity/2035.csv           |  0
 .../Results/Power/Capacity/2040.csv           |  0
 .../Results/Power/Capacity/2045.csv           |  0
 .../Results/Power/Capacity/2050.csv           |  0
 .../Results/Residential/Capacity/2020.csv     |  0
 .../Results/Residential/Capacity/2025.csv     |  0
 .../Results/Residential/Capacity/2030.csv     |  0
 .../Results/Residential/Capacity/2035.csv     |  0
 .../Results/Residential/Capacity/2040.csv     |  0
 .../Results/Residential/Capacity/2045.csv     |  0
 .../Results/Residential/Capacity/2050.csv     |  0
 .../Results/Residential/Supply/2020.csv       |  0
 .../Results/Residential/Supply/2025.csv       |  0
 .../Results/Residential/Supply/2030.csv       |  0
 .../Results/Residential/Supply/2035.csv       |  0
 .../Results/Residential/Supply/2040.csv       |  0
 .../Results/Residential/Supply/2045.csv       |  0
 .../Results/Residential/Supply/2050.csv       |  0
 .../input/BaseYearExport.csv                  |  0
 .../input/BaseYearImport.csv                  |  0
 .../input/GlobalCommodities.csv               |  0
 .../input/Projections.csv                     |  0
 .../settings.toml                             |  0
 .../technodata/Agents.csv                     |  0
 .../technodata/gas/CommIn.csv                 |  0
 .../technodata/gas/CommOut.csv                |  0
 .../technodata/gas/ExistingCapacity.csv       |  0
 .../technodata/gas/Technodata.csv             |  0
 .../technodata/power/CommIn.csv               |  0
 .../technodata/power/CommOut.csv              |  0
 .../technodata/power/ExistingCapacity.csv     |  0
 .../technodata/power/Technodata.csv           | 16 +++---
 .../preset/Residential2020Consumption.csv     |  0
 .../preset/Residential2050Consumption.csv     |  0
 .../technodata/residential/CommIn.csv         |  0
 .../technodata/residential/CommOut.csv        |  0
 .../residential/ExistingCapacity.csv          |  0
 .../technodata/residential/Technodata.csv     |  8 +--
 .../Results/Gas/Capacity/2020.csv             |  0
 .../Results/Gas/Capacity/2025.csv             |  0
 .../Results/Gas/Capacity/2030.csv             |  0
 .../Results/Gas/Capacity/2035.csv             |  0
 .../Results/Gas/Capacity/2040.csv             |  0
 .../Results/Gas/Capacity/2045.csv             |  0
 .../Results/Gas/Capacity/2050.csv             |  0
 .../Results/MCACapacity.csv                   |  0
 .../Results/MCAPrices.csv                     |  0
 .../Results/Power/Capacity/2020.csv           |  0
 .../Results/Power/Capacity/2025.csv           |  0
 .../Results/Power/Capacity/2030.csv           |  0
 .../Results/Power/Capacity/2035.csv           |  0
 .../Results/Power/Capacity/2040.csv           |  0
 .../Results/Power/Capacity/2045.csv           |  0
 .../Results/Power/Capacity/2050.csv           |  0
 .../Results/Residential/Capacity/2020.csv     |  0
 .../Results/Residential/Capacity/2025.csv     |  0
 .../Results/Residential/Capacity/2030.csv     |  0
 .../Results/Residential/Capacity/2035.csv     |  0
 .../Results/Residential/Capacity/2040.csv     |  0
 .../Results/Residential/Capacity/2045.csv     |  0
 .../Results/Residential/Capacity/2050.csv     |  0
 .../Results/Residential/Supply/2020.csv       |  0
 .../Results/Residential/Supply/2025.csv       |  0
 .../Results/Residential/Supply/2030.csv       |  0
 .../Results/Residential/Supply/2035.csv       |  0
 .../Results/Residential/Supply/2040.csv       |  0
 .../Results/Residential/Supply/2045.csv       |  0
 .../Results/Residential/Supply/2050.csv       |  0
 .../input/BaseYearExport.csv                  |  0
 .../input/BaseYearImport.csv                  |  0
 .../input/GlobalCommodities.csv               |  0
 .../input/Projections.csv                     |  0
 .../settings.toml                             |  0
 .../technodata/Agents.csv                     |  0
 .../technodata/gas/CommIn.csv                 |  0
 .../technodata/gas/CommOut.csv                |  0
 .../technodata/gas/ExistingCapacity.csv       |  0
 .../technodata/gas/Technodata.csv             |  0
 .../technodata/power/CommIn.csv               |  0
 .../technodata/power/CommOut.csv              |  0
 .../technodata/power/ExistingCapacity.csv     |  0
 .../technodata/power/Technodata.csv           | 16 +++---
 .../preset/Residential2020Consumption.csv     |  0
 .../preset/Residential2050Consumption.csv     |  0
 .../technodata/residential/CommIn.csv         |  0
 .../technodata/residential/CommOut.csv        |  0
 .../residential/ExistingCapacity.csv          |  0
 .../technodata/residential/Technodata.csv     |  8 +--
 .../2-add-agent/generate_models.py            | 23 +++-----
 docs/user-guide/add-agent.ipynb               | 55 +++++++++----------
 docs/user-guide/add-solar.ipynb               | 19 +++++--
 103 files changed, 72 insertions(+), 73 deletions(-)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/Results/Gas/Capacity/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/Results/Gas/Capacity/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Gas/Capacity/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Gas/Capacity/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Gas/Capacity/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Gas/Capacity/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Gas/Capacity/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/MCACapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/MCAPrices.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Power/Capacity/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Capacity/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/Results/Residential/Supply/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/input/BaseYearExport.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/input/BaseYearImport.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/input/GlobalCommodities.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/input/Projections.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/settings.toml (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 1-single-objective}/technodata/Agents.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/gas/CommIn.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/gas/CommOut.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/gas/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/gas/Technodata.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/power/CommIn.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/power/CommOut.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/power/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/power/Technodata.csv (99%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/preset/Residential2020Consumption.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/preset/Residential2050Consumption.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/residential/CommIn.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/residential/CommOut.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/residential/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 1-single-objective}/technodata/residential/Technodata.csv (99%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/Results/Gas/Capacity/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/Results/Gas/Capacity/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Gas/Capacity/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Gas/Capacity/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Gas/Capacity/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Gas/Capacity/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Gas/Capacity/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/MCACapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/MCAPrices.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Power/Capacity/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Capacity/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2020.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2025.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2030.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2035.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2040.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2045.csv (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/Results/Residential/Supply/2050.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/input/BaseYearExport.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/input/BaseYearImport.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/input/GlobalCommodities.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/input/Projections.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/settings.toml (100%)
 rename docs/tutorial-code/2-add-agent/{1-multiple-objective => 2-multiple-objective}/technodata/Agents.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/gas/CommIn.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/gas/CommOut.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/gas/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/gas/Technodata.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/power/CommIn.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/power/CommOut.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/power/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/power/Technodata.csv (99%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/preset/Residential2020Consumption.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/preset/Residential2050Consumption.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/residential/CommIn.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/residential/CommOut.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/residential/ExistingCapacity.csv (100%)
 rename docs/tutorial-code/2-add-agent/{2-single-objective => 2-multiple-objective}/technodata/residential/Technodata.csv (99%)

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-single-objective/Results/Gas/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
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-single-objective/Results/Gas/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2030.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/MCAPrices.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2025.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2045.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2020.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2030.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2040.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearExport.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/input/BaseYearImport.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/input/GlobalCommodities.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/input/Projections.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/settings.toml
rename to docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/Agents.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/CommIn.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommIn.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/CommOut.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/ExistingCapacity.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/ExistingCapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/gas/Technodata.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommIn.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/CommOut.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/ExistingCapacity.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
similarity index 99%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
index e69aabc4..d54a909f 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2020Consumption.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/preset/Residential2050Consumption.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/CommIn.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommIn.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/CommOut.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/ExistingCapacity.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/ExistingCapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
similarity index 99%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
rename to docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
index 1799e1f4..382dc9b9 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
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-multiple-objective/Results/Gas/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv
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-multiple-objective/Results/Gas/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2030.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/MCAPrices.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2025.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2045.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2020.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2030.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2040.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearExport.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/input/BaseYearImport.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/input/GlobalCommodities.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/input/Projections.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/settings.toml
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/CommIn.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommIn.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/CommOut.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/ExistingCapacity.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/ExistingCapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/gas/Technodata.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommIn.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/CommOut.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/ExistingCapacity.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
similarity index 99%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
index e69aabc4..d54a909f 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2020Consumption.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/preset/Residential2050Consumption.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommIn.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/CommIn.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommIn.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/CommOut.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/ExistingCapacity.csv
similarity index 100%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/ExistingCapacity.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/ExistingCapacity.csv
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
similarity index 99%
rename from docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
rename to docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
index 1799e1f4..382dc9b9 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 3e1b3592..24d6d72c 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -7,20 +7,13 @@
 parent_path = Path(__file__).parent
 
 
-"""
-Note: Generating the models in reverse order as this makes more sense programmatically.
-Consider changing the tutorial
-
-"""
-
-
-def generate_model_2():
-    """Generates the second model for tutorial 2.
+def generate_model_1():
+    """Generates the first model for tutorial 1.
 
     Adds a new agent to the model with a single objective.
 
     """
-    model_name = "2-single-objective"
+    model_name = "1-single-objective"
 
     # Starting point: copy model from previous tutorial
     model_path = parent_path / model_name
@@ -52,19 +45,19 @@ def generate_model_2():
         df.to_csv(technodata_file, index=False)
 
 
-def generate_model_1():
-    """Generates the first model for tutorial 2.
+def generate_model_2():
+    """Generates the second model for tutorial 2.
 
     Adds a second objective for agent A2.
 
     """
-    model_name = "1-multiple-objective"
+    model_name = "2-multiple-objective"
 
     # Starting point: copy model from previous tutorial
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
-    shutil.copytree(parent_path / "2-single-objective", model_path)
+    shutil.copytree(parent_path / "1-single-objective", model_path)
 
     # Add second objective for agent A2
     agents_file = model_path / "technodata/Agents.csv"
@@ -76,5 +69,5 @@ def generate_model_1():
 
 
 if __name__ == "__main__":
-    generate_model_2()
     generate_model_1()
+    generate_model_2()
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index ce110e18..9cd5e663 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -11,9 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this section, we will add a new agent called `A2`. This agent will be slightly different to the other agents in the ```default``` example, in that it will make investments based upon a mixture of [levelised cost of electricity (LCOE)](https://en.wikipedia.org/wiki/Levelized_cost_of_energy) and [equivalent annual cost (EAC)](https://en.wikipedia.org/wiki/Equivalent_annual_cost). These two objectives will be combined by calculating a weighted sum of the two when comparing potential investment options. We will give both LCOE and EAC a relative weight value of 0.5.\n",
-    "\n",
-    "We will continue to use the files from the previous tutorial where we added `solarPV` and created a new scenario. The full, finished case study can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/2-add-agent/1-multiple-objective)\n",
+    "In this section, we will add a new agent. We will continue to use the files from the previous tutorial where we added `solarPV` and created a new scenario. We will start by creating a new agent `A2` with identical properties to the existing agent `A1`, before modifying the investment strategies of the new agent.\n",
     "\n",
     "To achieve this, first, we must modify the ```Agents.csv``` file in the directory:\n",
     "\n",
@@ -24,19 +22,20 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To do this, we will add two new rows to the file. To simplify the process, we copy the data from the first two rows of agent `A1`, changing only the rows: `AgentShare` `Name`, `Objective1`, `Objective2`, `ObjData1`, `ObjData2`, `DecisionMethod` and `Quantity`. The values we changed can be seen below. Notice how we edit the `AgentShare` column. This variable allows us to split the existing capacity between the two different agents. We will also need to edit the technodata file to define these new AgentShares.\n",
+    "To start with, we will copy the data from the first two rows of agent `A1`, creating a new agent `A2` with identical objectives to `A1`. \n",
     "\n",
-    "Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent A1 makes up 50% of the population, and A2 makes up the remaining 50% of the population.\n",
+    "<!-- Notice how we edit the `AgentShare` column. This variable allows us to split the existing capacity between the two different agents. -->\n",
     "\n",
-    "Again, we only show some of the rows due to space constraints, however see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-multiple-objective/technodata/Agents.csv) for the full file.\n",
+    "<!-- Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent A1 makes up 50% of the population, and A2 makes up the remaining 50% of the population. -->\n",
     "\n",
-    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n",
-    "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Agent1|A1|R1|LCOE|||1||…|singleObj|0.5|…|New|\n",
-    "|Agent2|A1|R1|LCOE|||1||…|singleObj|0.5|…|Retrofit|\n",
-    "|**Agent3**|**A2**|**R1**|**LCOE**|**EAC**||**0.5**|**0.5**|**…**|**weighted_sum**|0.5|**…**|**New**|\n",
-    "|**Agent4**|**A2**|**R1**|**LCOE**|**EAC**||**0.5**|**0.5**|**…**|**weighted_sum**|0.5|**…**|**Retrofit**|\n",
-    "\n"
+    "Again, we only show some of the columns due to space constraints, however see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv) for the full file.\n",
+    "\n",
+    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|…|Type|\n",
+    "|-|-|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Agent1|A1|R1|LCOE|||1||…|singleObj|…|New|\n",
+    "|Agent2|A1|R1|LCOE|||1||…|singleObj|…|Retrofit|\n",
+    "|**Agent3**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|…|**New**|\n",
+    "|**Agent4**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|…|**Retrofit**|"
    ]
   },
   {
@@ -89,7 +88,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\n",
-    "    \"../tutorial-code/2-add-agent/1-multiple-objective/Results/MCACapacity.csv\"\n",
+    "    \"../tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv\"\n",
     ")\n",
     "mca_capacity.head()"
    ]
@@ -128,30 +127,30 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this scenario we can see two divergent strategies. Both agents invests heavily in `windturbine` early on, and relatively little in `gasCCGT`. The share of `solarPV` increases in later years as the price falls (as set in the previous tutorial), but this increase is more dramatic for agent `A2`.\n",
-    "\n",
-    "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation based models."
+    "In this scenario, with both agents running the same objective, identical results between agents can be seen. There is large uptake in `windturbine`, whilst `solarPV` is invested in especially in later years where a change in the price of `solarPV` was set in the previous tutorial."
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Next, we will see what occurs if the agents invest based upon the same investment strategy, with both investing using LCOE. The full finished files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/2-add-agent/2-single-objective). This requires us to edit the ```Agents.csv``` file once more, to look like the following:\n",
+    "Next, we will see what occurs if the agents invest based upon different investment strategies. We will modify `A2` to make investments based upon a mixture of [levelised cost of electricity (LCOE)](https://en.wikipedia.org/wiki/Levelized_cost_of_energy) and [equivalent annual cost (EAC)](https://en.wikipedia.org/wiki/Equivalent_annual_cost). These two objectives will be combined by calculating a weighted sum of the two when comparing potential investment options. We will give both LCOE and EAC a relative weight value of 0.5.\n",
     "\n",
-    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|…|Type|\n",
-    "|-|-|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Agent1|A1|R1|LCOE|||1||…|singleObj|…|New|\n",
-    "|Agent2|A1|R1|LCOE|||1||…|singleObj|…|Retrofit|\n",
-    "|Agent3|A2|R1|**LCOE**|||**1**||…|**singleObj**|…|New|\n",
-    "|Agent4|A2|R1|**LCOE**|||**1**||…|**singleObj**|…|Retrofit|"
+    "To do this, we need to modify the `Objective2`, `ObjData1`, `ObjData2` and `DecisionMethod` columns in the ```Agents.csv``` file, to look like the following:\n",
+    "\n",
+    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n",
+    "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Agent1|A1|R1|LCOE|||1||…|singleObj|0.5|…|New|\n",
+    "|Agent2|A1|R1|LCOE|||1||…|singleObj|0.5|…|Retrofit|\n",
+    "|Agent3|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|**…**|**weighted_sum**|0.5|…|New|\n",
+    "|Agent4|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|**…**|**weighted_sum**|0.5|…|Retrofit|"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Again, this requires the re-running of the simulation, and to visualise the results like before:"
+    "We will then re-run the simulation, and visualise the results like before:"
    ]
   },
   {
@@ -161,7 +160,7 @@
    "outputs": [],
    "source": [
     "mca_capacity = pd.read_csv(\n",
-    "    \"../tutorial-code/2-add-agent/2-single-objective/Results/MCACapacity.csv\"\n",
+    "    \"../tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv\"\n",
     ")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
@@ -184,9 +183,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this new scenario, with both agents running the same objective, identical results between agents can be seen. There is large uptake in `windturbine`, whilst `solarPV` is invested in especially in later years where a change in the price of `solarPV` was set in the previous tutorial. \n",
+    "In this scenario we can see two divergent strategies. Both agents invests heavily in `windturbine` early on, and relatively little in `gasCCGT`. The share of `solarPV` increases in later years as the price falls (as set in the previous tutorial), but this increase is more dramatic for agent `A2`.\n",
     "\n",
-    "As the two agents make the same decisions, we see the same scenario develop for both agents, unlike in the previous scenario.\n",
+    "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation based models.\n",
     "\n",
     "Have a play around with the files to see if you can come up with different scenarios!"
    ]
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index ab97d1aa..4f5dd939 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -157,7 +157,7 @@
     "\n",
     "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```Technodata.csv``` file for brevity. You can see the full file [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
     "\n",
-    "Again, flat forward extension is used here. Therefore, as in this example we only provide data for the benchmark year 2020, 2025 and the following benchmark years will keep the same characteristics, e.g. costs, for each benchmark year of the simulation."
+    "Again, flat forward extension is used here. Therefore, as in this example we only provide data for the benchmark year 2020. 2025 and the following benchmark years will keep the same characteristics, e.g. costs, for each benchmark year of the simulation."
    ]
   },
   {
@@ -264,11 +264,11 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Finally, we muse make a small change to the `settings.toml` file. As `solar` is a renewable resource that isn't produced by any defined process in the model, we must add it to `excluded_commodities` in `settings.toml`, like so:\n",
+    "Finally, we must make a small change to the `settings.toml` file. As `solar` is a renewable resource that isn't produced by any process defined in the model, we must add it to `excluded_commodities` in `settings.toml`, like so:\n",
     "    \n",
     "    excluded_commodities = [\"wind\", \"solar\"]\n",
     "\n",
-    "This will allow MUSE to exclude `solar` from its internal supply-fulfillment checks."
+    "This will ensure MUSE excludes `solar` from its internal supply-fulfillment checks."
    ]
   },
   {
@@ -315,7 +315,7 @@
    "source": [
     "Next, we will import the ```MCACapacity.csv``` file into pandas and print the first 5 lines using the ```head()``` command.\n",
     "\n",
-    "Make sure to change the file path of `\"../tutorial-code/1-add-new-technology/introduction/Results/MCACapacity.csv\"` to where the `MCACapacity.csv` is on your computer, otherwise you will receive an error when you import the csv file."
+    "Make sure to change the file path of `\"../tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv\"` to where the `MCACapacity.csv` is on your computer, otherwise you will receive an error when you import the csv file."
    ]
   },
   {
@@ -456,7 +456,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "From the results, we can see that `windturbine` increases rapidly between 2020 and 2040. However, between the years 2030 and 2050 `solarPV` increases. This is because of the changing cost of `solarPV` during these years. \n",
+    "From the results, we can see that `windturbine` now outcompetes `solarPV` in the year 2025. However, between the years 2025 and 2050, as the cost of `solarPV` decreases, the share of `solarPV` begins to increase.\n",
     "\n",
     "For the full example with the completed input files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)"
    ]
@@ -472,8 +472,15 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In the next section we will add a new agent to the simulation. Note, that we will keep the additional `solarPV` technology, as well as the changing costs in 2040."
+    "Please save a copy of the current model (with the changing costs in 2040), as we will be building on it directly in tutorials 2 and 3.\n",
+    "\n",
+    "In the next tutorial we will add a new agent to the simulation. "
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {

From 1c727d9e86d7fa39c2366fb37906ba24bb40ad1f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 22 May 2024 15:27:00 +0100
Subject: [PATCH 161/419] Simplify consumption profile for tutorial 4.

---
 .../Results/Gas/Capacity/2030.csv             |   20 +-
 .../Results/Gas/Capacity/2035.csv             |   20 +-
 .../Results/Gas/Capacity/2040.csv             |   16 +-
 .../Results/Gas/Capacity/2045.csv             |   12 +-
 .../Results/Gas/Capacity/2050.csv             |   12 +-
 .../Results/MCACapacity.csv                   |  152 +--
 .../1-modify-timeslices/Results/MCAPrices.csv |  576 +++++-----
 .../Results/Power/Capacity/2020.csv           |   24 +-
 .../Results/Power/Capacity/2025.csv           |   52 +-
 .../Results/Power/Capacity/2030.csv           |   80 +-
 .../Results/Power/Capacity/2035.csv           |  108 +-
 .../Results/Power/Capacity/2040.csv           |  136 +--
 .../Results/Power/Capacity/2045.csv           |  200 ++--
 .../Results/Power/Capacity/2050.csv           |  200 ++--
 .../Results/Residential/Capacity/2020.csv     |   12 +-
 .../Results/Residential/Capacity/2025.csv     |   44 +-
 .../Results/Residential/Capacity/2030.csv     |   56 +-
 .../Results/Residential/Capacity/2035.csv     |   48 +-
 .../Results/Residential/Capacity/2040.csv     |   40 +-
 .../Results/Residential/Capacity/2045.csv     |   40 +-
 .../Results/Residential/Capacity/2050.csv     |   40 +-
 .../Results/Residential/Supply/2020.csv       |  304 ++---
 .../Results/Residential/Supply/2025.csv       |  432 +++----
 .../Results/Residential/Supply/2030.csv       |  512 ++++-----
 .../Results/Residential/Supply/2035.csv       |  384 +++----
 .../Results/Residential/Supply/2040.csv       |  256 ++---
 .../Results/Residential/Supply/2045.csv       |  256 ++---
 .../Results/Residential/Supply/2050.csv       |  256 ++---
 .../preset/Residential2020Consumption.csv     |   32 +-
 .../preset/Residential2050Consumption.csv     |   32 +-
 .../Results/Gas/Capacity/2025.csv             |    5 +
 .../Results/Gas/Capacity/2030.csv             |   24 +-
 .../Results/Gas/Capacity/2032.csv             |   28 +-
 .../Results/Gas/Capacity/2034.csv             |   28 +-
 .../Results/Gas/Capacity/2035.csv             |   11 +
 .../Results/Gas/Capacity/2036.csv             |   24 +-
 .../Results/Gas/Capacity/2038.csv             |   20 +-
 .../Results/Gas/Capacity/2040.csv             |   20 +-
 .../Results/Gas/Capacity/2045.csv             |    7 +
 .../Results/Gas/Capacity/2050.csv             |    7 +
 .../Results/MCACapacity.csv                   |  420 +++----
 .../Results/MCAPrices.csv                     |  960 ++++++++--------
 .../Results/Power/Capacity/2020.csv           |   28 +-
 .../Results/Power/Capacity/2022.csv           |   68 +-
 .../Results/Power/Capacity/2024.csv           |  112 +-
 .../Results/Power/Capacity/2025.csv           |   35 +
 .../Results/Power/Capacity/2026.csv           |  156 +--
 .../Results/Power/Capacity/2028.csv           |  196 ++--
 .../Results/Power/Capacity/2030.csv           |  260 ++---
 .../Results/Power/Capacity/2032.csv           |  332 +++---
 .../Results/Power/Capacity/2034.csv           |  408 +++----
 .../Results/Power/Capacity/2035.csv           |   59 +
 .../Results/Power/Capacity/2036.csv           |  464 ++++----
 .../Results/Power/Capacity/2038.csv           |  516 ++++-----
 .../Results/Power/Capacity/2040.csv           |  612 +++++-----
 .../Results/Power/Capacity/2045.csv           |  103 ++
 .../Results/Power/Capacity/2050.csv           |  101 ++
 .../Results/Residential/Capacity/2020.csv     |   16 +-
 .../Results/Residential/Capacity/2022.csv     |   44 +-
 .../Results/Residential/Capacity/2024.csv     |  104 +-
 .../Results/Residential/Capacity/2025.csv     |   25 +
 .../Results/Residential/Capacity/2026.csv     |  140 +--
 .../Results/Residential/Capacity/2028.csv     |  164 +--
 .../Results/Residential/Capacity/2030.csv     |  184 +--
 .../Results/Residential/Capacity/2032.csv     |  176 +--
 .../Results/Residential/Capacity/2034.csv     |  168 +--
 .../Results/Residential/Capacity/2035.csv     |   33 +
 .../Results/Residential/Capacity/2036.csv     |  160 +--
 .../Results/Residential/Capacity/2038.csv     |  160 +--
 .../Results/Residential/Capacity/2040.csv     |  160 +--
 .../Results/Residential/Capacity/2045.csv     |   25 +
 .../Results/Residential/Capacity/2050.csv     |   21 +
 .../Results/Residential/Supply/2020.csv       |  304 ++---
 .../Results/Residential/Supply/2022.csv       |  416 +++----
 .../Results/Residential/Supply/2024.csv       |  560 ++++-----
 .../Results/Residential/Supply/2025.csv       |  169 +++
 .../Results/Residential/Supply/2026.csv       |  704 ++++++------
 .../Results/Residential/Supply/2028.csv       |  832 +++++++-------
 .../Results/Residential/Supply/2030.csv       |  896 +++++++--------
 .../Results/Residential/Supply/2032.csv       |  896 +++++++--------
 .../Results/Residential/Supply/2034.csv       |  768 ++++++-------
 .../Results/Residential/Supply/2035.csv       |  193 ++++
 .../Results/Residential/Supply/2036.csv       |  640 +++++------
 .../Results/Residential/Supply/2038.csv       |  640 +++++------
 .../Results/Residential/Supply/2040.csv       |  640 +++++------
 .../Results/Residential/Supply/2045.csv       |  145 +++
 .../Results/Residential/Supply/2050.csv       |   97 ++
 .../preset/Residential2020Consumption.csv     |   32 +-
 .../preset/Residential2050Consumption.csv     |   32 +-
 .../4-modify-timing-data/generate_models.py   |   34 +-
 .../Results/Gas/Capacity/2030.csv             |   20 +-
 .../Results/Gas/Capacity/2035.csv             |   20 +-
 .../Results/Gas/Capacity/2040.csv             |   16 +-
 .../Results/Gas/Capacity/2045.csv             |   12 +-
 .../Results/Gas/Capacity/2050.csv             |   12 +-
 .../Results/MCACapacity.csv                   |  204 ++--
 .../1-exogenous-demand/Results/MCAPrices.csv  |  768 ++++++-------
 .../Results/Power/Capacity/2020.csv           |   24 +-
 .../Results/Power/Capacity/2025.csv           |   52 +-
 .../Results/Power/Capacity/2030.csv           |   80 +-
 .../Results/Power/Capacity/2035.csv           |  108 +-
 .../Results/Power/Capacity/2040.csv           |  136 +--
 .../Results/Power/Capacity/2045.csv           |  200 ++--
 .../Results/Power/Capacity/2050.csv           |  200 ++--
 .../Results/Residential/Capacity/2020.csv     |   24 +-
 .../Results/Residential/Capacity/2025.csv     |   88 +-
 .../Results/Residential/Capacity/2030.csv     |  112 +-
 .../Results/Residential/Capacity/2035.csv     |   96 +-
 .../Results/Residential/Capacity/2040.csv     |   80 +-
 .../Results/Residential/Capacity/2045.csv     |   80 +-
 .../Results/Residential/Capacity/2050.csv     |   80 +-
 .../Results/Residential/Supply/2020.csv       |  608 +++++-----
 .../Results/Residential/Supply/2025.csv       |  864 +++++++-------
 .../Results/Residential/Supply/2030.csv       | 1024 ++++++++---------
 .../Results/Residential/Supply/2035.csv       |  768 ++++++-------
 .../Results/Residential/Supply/2040.csv       |  512 ++++-----
 .../Results/Residential/Supply/2045.csv       |  512 ++++-----
 .../Results/Residential/Supply/2050.csv       |  512 ++++-----
 .../preset/Residential2020Consumption.csv     |   32 +-
 .../preset/Residential2050Consumption.csv     |   32 +-
 docs/user-guide/modify-timing-data.ipynb      |   44 +-
 121 files changed, 13649 insertions(+), 12605 deletions(-)
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv

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 b85bdbbd..47369da0 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,13 +1,13 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,2.76200000000
-1,2040,R1,2030,gassupply1,2.76200000000
-1,2045,R1,2030,gassupply1,2.76200000000
-1,2050,R1,2030,gassupply1,2.76200000000
-1,2069,R1,2030,gassupply1,2.76200000000
+1,2035,R1,2030,gassupply1,2.73240000000
+1,2040,R1,2030,gassupply1,2.73240000000
+1,2045,R1,2030,gassupply1,2.73240000000
+1,2050,R1,2030,gassupply1,2.73240000000
+1,2069,R1,2030,gassupply1,2.73240000000
 2,2030,R2,2020,gassupply1,7.50000000000
-3,2035,R2,2030,gassupply1,2.76200000000
-3,2040,R2,2030,gassupply1,2.76200000000
-3,2045,R2,2030,gassupply1,2.76200000000
-3,2050,R2,2030,gassupply1,2.76200000000
-3,2069,R2,2030,gassupply1,2.76200000000
+3,2035,R2,2030,gassupply1,2.73240000000
+3,2040,R2,2030,gassupply1,2.73240000000
+3,2045,R2,2030,gassupply1,2.73240000000
+3,2050,R2,2030,gassupply1,2.73240000000
+3,2069,R2,2030,gassupply1,2.73240000000
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 bf00846b..e8148274 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,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,2.76200000000
-1,2040,R1,2030,gassupply1,2.76200000000
-1,2045,R1,2030,gassupply1,2.76200000000
-1,2050,R1,2030,gassupply1,2.76200000000
-1,2069,R1,2030,gassupply1,2.76200000000
-3,2035,R2,2030,gassupply1,2.76200000000
-3,2040,R2,2030,gassupply1,2.76200000000
-3,2045,R2,2030,gassupply1,2.76200000000
-3,2050,R2,2030,gassupply1,2.76200000000
-3,2069,R2,2030,gassupply1,2.76200000000
+1,2035,R1,2030,gassupply1,2.73240000000
+1,2040,R1,2030,gassupply1,2.73240000000
+1,2045,R1,2030,gassupply1,2.73240000000
+1,2050,R1,2030,gassupply1,2.73240000000
+1,2069,R1,2030,gassupply1,2.73240000000
+3,2035,R2,2030,gassupply1,2.73240000000
+3,2040,R2,2030,gassupply1,2.73240000000
+3,2045,R2,2030,gassupply1,2.73240000000
+3,2050,R2,2030,gassupply1,2.73240000000
+3,2069,R2,2030,gassupply1,2.73240000000
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 e4511fa3..1501d088 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,9 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,2.76200000000
-1,2045,R1,2030,gassupply1,2.76200000000
-1,2050,R1,2030,gassupply1,2.76200000000
-1,2069,R1,2030,gassupply1,2.76200000000
-3,2040,R2,2030,gassupply1,2.76200000000
-3,2045,R2,2030,gassupply1,2.76200000000
-3,2050,R2,2030,gassupply1,2.76200000000
-3,2069,R2,2030,gassupply1,2.76200000000
+1,2040,R1,2030,gassupply1,2.73240000000
+1,2045,R1,2030,gassupply1,2.73240000000
+1,2050,R1,2030,gassupply1,2.73240000000
+1,2069,R1,2030,gassupply1,2.73240000000
+3,2040,R2,2030,gassupply1,2.73240000000
+3,2045,R2,2030,gassupply1,2.73240000000
+3,2050,R2,2030,gassupply1,2.73240000000
+3,2069,R2,2030,gassupply1,2.73240000000
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 94418d7b..fbead2e9 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,7 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,2.76200000000
-1,2050,R1,2030,gassupply1,2.76200000000
-1,2069,R1,2030,gassupply1,2.76200000000
-3,2045,R2,2030,gassupply1,2.76200000000
-3,2050,R2,2030,gassupply1,2.76200000000
-3,2069,R2,2030,gassupply1,2.76200000000
+1,2045,R1,2030,gassupply1,2.73240000000
+1,2050,R1,2030,gassupply1,2.73240000000
+1,2069,R1,2030,gassupply1,2.73240000000
+3,2045,R2,2030,gassupply1,2.73240000000
+3,2050,R2,2030,gassupply1,2.73240000000
+3,2069,R2,2030,gassupply1,2.73240000000
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 0e0cd9db..80cf63af 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,7 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,2.76200000000
-1,2055,R1,2030,gassupply1,2.76200000000
-1,2069,R1,2030,gassupply1,2.76200000000
-3,2050,R2,2030,gassupply1,2.76200000000
-3,2055,R2,2030,gassupply1,2.76200000000
-3,2069,R2,2030,gassupply1,2.76200000000
+1,2050,R1,2030,gassupply1,2.73240000000
+1,2055,R1,2030,gassupply1,2.73240000000
+1,2069,R1,2030,gassupply1,2.73240000000
+3,2050,R2,2030,gassupply1,2.73240000000
+3,2055,R2,2030,gassupply1,2.73240000000
+3,2069,R2,2030,gassupply1,2.73240000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 2a12dfc6..0290c26f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -6,91 +6,91 @@ gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.40000000000
 gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.40000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,5.60870000000
+solarPV,R1,R1,A1,power,retrofit,2025,5.15000000000
 windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,15.60870000000
+windturbine,R2,R2,A1,power,retrofit,2025,15.15000000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
-heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
-heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
-heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
-heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-solarPV,R1,R1,A1,power,retrofit,2030,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2030,10.82170000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.12000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,8.48000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.12000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,8.48000000000
+solarPV,R1,R1,A1,power,retrofit,2030,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.73000000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,10.82170000000
-windturbine,R2,R2,A1,power,retrofit,2030,15.60870000000
+solarPV,R2,R2,A1,power,retrofit,2030,10.73000000000
+windturbine,R2,R2,A1,power,retrofit,2030,15.15000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
-heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
-heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-solarPV,R1,R1,A1,power,retrofit,2035,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2035,10.82170000000
-solarPV,R1,R1,A1,power,retrofit,2035,5.71470000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.12000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,8.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,2.12000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,8.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.60000000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,10.82170000000
-solarPV,R2,R2,A1,power,retrofit,2035,5.71470000000
-windturbine,R2,R2,A1,power,retrofit,2035,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.76200000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,2.76200000000
-heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
-heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2040,10.82170000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2040,7.85760000000
+solarPV,R2,R2,A1,power,retrofit,2035,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2035,5.60000000000
+windturbine,R2,R2,A1,power,retrofit,2035,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.73240000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,2.73240000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.20000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.20000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2040,7.72000000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,10.82170000000
-solarPV,R2,R2,A1,power,retrofit,2040,5.71470000000
-solarPV,R2,R2,A1,power,retrofit,2040,7.85760000000
-windturbine,R2,R2,A1,power,retrofit,2040,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.76200000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.76200000000
-heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
-heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
-heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.60870000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.82170000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2045,7.85760000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.71470000000
+solarPV,R2,R2,A1,power,retrofit,2040,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2040,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2040,7.72000000000
+windturbine,R2,R2,A1,power,retrofit,2040,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.73240000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.73240000000
+heatpump,R1,R1,A1,residential,retrofit,2045,16.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.20000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2045,7.72000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,10.82170000000
-solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
-solarPV,R2,R2,A1,power,retrofit,2045,7.85760000000
-solarPV,R2,R2,A1,power,retrofit,2045,5.71470000000
-windturbine,R2,R2,A1,power,retrofit,2045,15.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.76200000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,2.76200000000
-heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
-heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
-heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
-heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.82170000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2050,7.85760000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.71470000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.71470000000
-windturbine,R1,R1,A1,power,retrofit,2050,5.60870000000
-solarPV,R2,R2,A1,power,retrofit,2050,10.82170000000
-solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
-solarPV,R2,R2,A1,power,retrofit,2050,7.85760000000
-solarPV,R2,R2,A1,power,retrofit,2050,5.71470000000
-solarPV,R2,R2,A1,power,retrofit,2050,15.71470000000
-windturbine,R2,R2,A1,power,retrofit,2050,5.60870000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.76200000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,2.76200000000
+solarPV,R2,R2,A1,power,retrofit,2045,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2045,7.72000000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
+windturbine,R2,R2,A1,power,retrofit,2045,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.73240000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,2.73240000000
+heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
+solarPV,R1,R1,A1,power,retrofit,2050,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2050,7.72000000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.60000000000
+windturbine,R1,R1,A1,power,retrofit,2050,5.15000000000
+solarPV,R2,R2,A1,power,retrofit,2050,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2050,7.72000000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.60000000000
+windturbine,R2,R2,A1,power,retrofit,2050,5.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.73240000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,2.73240000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 0d6c8139..8f1f3906 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,387 +63,387 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.60880000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.60880000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49020000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,6.49020000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.15380000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.15380000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.61060000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.61060000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15600000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.63910000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.63910000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49270000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,6.49270000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.23070000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.23070000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.22280000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.60880000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.60880000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49020000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49020000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15380000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15380000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.61060000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.61060000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15600000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63910000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63910000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49270000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49270000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.23070000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.23070000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.22280000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73020000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73020000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50030000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50030000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.46160000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.46160000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73540000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73540000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46790000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.66960000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.66960000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.49530000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,6.49530000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.30780000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.30780000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.67300000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.31190000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.66960000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.66960000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49530000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49530000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.30780000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.30780000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.67300000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.31190000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.66960000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.66960000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49530000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49530000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.30780000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.30780000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.67300000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31190000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.10530000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,14.10530000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.19720000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,5.19720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.23750000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.23750000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.10690000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.10690000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.24060000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.24060000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.13870000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,14.13870000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.20180000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,5.20180000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.35650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.35650000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.13620000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.13620000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.34390000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.34390000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.10530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.10530000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19720000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19720000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.23750000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.23750000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.10690000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.10690000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24060000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24060000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.13870000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,14.13870000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.20180000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.20180000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.35650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.35650000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.13620000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.13620000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.34390000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.34390000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.23900000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.23900000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.21550000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.21550000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.71470000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.71470000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.24380000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.24380000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.72370000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.72370000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.17220000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,14.17220000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.20630000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,5.20630000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.47590000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.47590000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.17530000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.17530000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.48180000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.48180000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,14.17220000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,14.17220000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,5.20630000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,5.20630000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.47590000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.47590000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,14.17530000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,14.17530000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.48180000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.48180000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.17220000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.17220000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.47590000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.47590000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.17530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.17530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48180000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48180000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.30240000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,11.30240000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.48580000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.48580000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.30380000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.30380000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.48940000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.48940000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.33810000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,11.33810000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.62920000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.62920000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.33510000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.33510000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.61390000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.61390000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.30240000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.30240000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48580000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48580000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.30380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.30380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48940000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48940000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.33810000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.33810000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.62920000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.62920000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.33510000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.33510000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.61390000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.61390000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44550000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44550000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.06150000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.06150000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44980000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44980000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.07220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.07220000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.37400000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,11.37400000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.77320000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,51.77320000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.37680000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.37680000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.78010000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.78010000000,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', 'early-morning')",electricity,R1,11.37400000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,11.37400000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.77320000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.77320000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.37680000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.37680000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.78010000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.78010000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.37400000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.37400000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.77320000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.77320000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.37680000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.37680000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.78010000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.78010000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.08840000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08840000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.33570000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.33570000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08930000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08930000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.33930000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.33930000000,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.13260000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13260000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.50500000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.50500000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12760000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12760000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.48600000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.48600000000,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', 'mid-afternoon')",electricity,R1,0.08840000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08840000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33570000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33570000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33930000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13260000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13260000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50500000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.50500000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12760000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12760000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.48600000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.48600000000,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,0.26530000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26530000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.01980000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,1.01980000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26790000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26790000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.03060000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,1.03060000000,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,0.17690000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17690000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.67590000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.67590000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17860000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17860000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.68280000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.68280000000,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', 'early-morning')",electricity,R1,0.17690000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17690000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.67590000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.67590000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17860000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17860000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.68280000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.68280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17690000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17690000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.67590000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.67590000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17860000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17860000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.68280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.68280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.08660000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.08660000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08740000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.08740000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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.12980000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12980000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.02500000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.02500000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12490000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12490000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,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', 'mid-afternoon')",electricity,R1,0.08660000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08660000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08740000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08740000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12980000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12980000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02500000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02500000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12490000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12490000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,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,0.25980000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.25980000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06140000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06140000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26230000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26230000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06220000000,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,0.17320000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17320000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.03590000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.03590000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17490000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17490000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,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', 'early-morning')",electricity,R1,0.17320000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17320000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03590000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03590000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17490000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17490000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17320000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17320000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03590000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17490000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17490000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.08160000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.08160000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.08240000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08240000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.01550000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.01550000000,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.12240000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12240000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.02490000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.02490000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11780000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.11780000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.02370000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.02370000000,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', 'mid-afternoon')",electricity,R1,0.08160000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08160000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08240000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08240000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01550000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12240000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12240000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02490000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02490000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11780000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11780000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02370000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02370000000,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,0.24500000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24500000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06090000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06090000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24730000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24730000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06180000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06180000000,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,0.16340000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.16340000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.03570000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.03570000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16490000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16490000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.03610000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.03610000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16340000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16340000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03570000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03570000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16490000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16490000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03610000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03610000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16340000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16340000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03570000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03570000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16490000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16490000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03610000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03610000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
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 fa374881..826c68a1 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,12 +1,12 @@
 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
+1,2025,R1,2020,solarPV,5.15000000000
+1,2030,R1,2020,solarPV,5.15000000000
+1,2035,R1,2020,solarPV,5.15000000000
+1,2040,R1,2020,solarPV,5.15000000000
+1,2045,R1,2020,solarPV,5.15000000000
+1,2049,R1,2020,solarPV,5.15000000000
 2,2025,R1,2020,windturbine,10.00000000000
 2,2030,R1,2020,windturbine,10.00000000000
 2,2035,R1,2020,windturbine,10.00000000000
@@ -15,9 +15,9 @@ asset,year,region,installed,technology,capacity
 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
+4,2025,R2,2020,windturbine,15.15000000000
+4,2030,R2,2020,windturbine,15.15000000000
+4,2035,R2,2020,windturbine,15.15000000000
+4,2040,R2,2020,windturbine,15.15000000000
+4,2045,R2,2020,windturbine,15.15000000000
+4,2049,R2,2020,windturbine,15.15000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index 9e39a658..2c891b2d 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -1,35 +1,35 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
 1,2025,gasCCGT,R2,2020,1.00000000000
-2,2025,solarPV,R1,2020,5.60870000000
-2,2030,solarPV,R1,2020,5.60870000000
-2,2035,solarPV,R1,2020,5.60870000000
-2,2040,solarPV,R1,2020,5.60870000000
-2,2045,solarPV,R1,2020,5.60870000000
-2,2049,solarPV,R1,2020,5.60870000000
-3,2030,solarPV,R1,2025,10.82170000000
-3,2035,solarPV,R1,2025,10.82170000000
-3,2040,solarPV,R1,2025,10.82170000000
-3,2045,solarPV,R1,2025,10.82170000000
-3,2049,solarPV,R1,2025,10.82170000000
-3,2050,solarPV,R1,2025,10.82170000000
-3,2054,solarPV,R1,2025,10.82170000000
-4,2030,solarPV,R2,2025,10.82170000000
-4,2035,solarPV,R2,2025,10.82170000000
-4,2040,solarPV,R2,2025,10.82170000000
-4,2045,solarPV,R2,2025,10.82170000000
-4,2049,solarPV,R2,2025,10.82170000000
-4,2050,solarPV,R2,2025,10.82170000000
-4,2054,solarPV,R2,2025,10.82170000000
+2,2025,solarPV,R1,2020,5.15000000000
+2,2030,solarPV,R1,2020,5.15000000000
+2,2035,solarPV,R1,2020,5.15000000000
+2,2040,solarPV,R1,2020,5.15000000000
+2,2045,solarPV,R1,2020,5.15000000000
+2,2049,solarPV,R1,2020,5.15000000000
+3,2030,solarPV,R1,2025,10.73000000000
+3,2035,solarPV,R1,2025,10.73000000000
+3,2040,solarPV,R1,2025,10.73000000000
+3,2045,solarPV,R1,2025,10.73000000000
+3,2049,solarPV,R1,2025,10.73000000000
+3,2050,solarPV,R1,2025,10.73000000000
+3,2054,solarPV,R1,2025,10.73000000000
+4,2030,solarPV,R2,2025,10.73000000000
+4,2035,solarPV,R2,2025,10.73000000000
+4,2040,solarPV,R2,2025,10.73000000000
+4,2045,solarPV,R2,2025,10.73000000000
+4,2049,solarPV,R2,2025,10.73000000000
+4,2050,solarPV,R2,2025,10.73000000000
+4,2054,solarPV,R2,2025,10.73000000000
 5,2025,windturbine,R1,2020,10.00000000000
 5,2030,windturbine,R1,2020,10.00000000000
 5,2035,windturbine,R1,2020,10.00000000000
 5,2040,windturbine,R1,2020,10.00000000000
 5,2045,windturbine,R1,2020,10.00000000000
 5,2049,windturbine,R1,2020,10.00000000000
-6,2025,windturbine,R2,2020,15.60870000000
-6,2030,windturbine,R2,2020,15.60870000000
-6,2035,windturbine,R2,2020,15.60870000000
-6,2040,windturbine,R2,2020,15.60870000000
-6,2045,windturbine,R2,2020,15.60870000000
-6,2049,windturbine,R2,2020,15.60870000000
+6,2025,windturbine,R2,2020,15.15000000000
+6,2030,windturbine,R2,2020,15.15000000000
+6,2035,windturbine,R2,2020,15.15000000000
+6,2040,windturbine,R2,2020,15.15000000000
+6,2045,windturbine,R2,2020,15.15000000000
+6,2049,windturbine,R2,2020,15.15000000000
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 297a4dee..3d4383ee 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,46 +1,46 @@
 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
+1,2030,R1,2020,solarPV,5.15000000000
+1,2035,R1,2020,solarPV,5.15000000000
+1,2040,R1,2020,solarPV,5.15000000000
+1,2045,R1,2020,solarPV,5.15000000000
+1,2049,R1,2020,solarPV,5.15000000000
 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,solarPV,10.82170000000
-3,2035,R1,2025,solarPV,10.82170000000
-3,2040,R1,2025,solarPV,10.82170000000
-3,2045,R1,2025,solarPV,10.82170000000
-3,2049,R1,2025,solarPV,10.82170000000
-3,2050,R1,2025,solarPV,10.82170000000
-3,2054,R1,2025,solarPV,10.82170000000
-4,2035,R1,2030,solarPV,5.71470000000
-4,2040,R1,2030,solarPV,5.71470000000
-4,2045,R1,2030,solarPV,5.71470000000
-4,2049,R1,2030,solarPV,5.71470000000
-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
-6,2030,R2,2020,windturbine,15.60870000000
-6,2035,R2,2020,windturbine,15.60870000000
-6,2040,R2,2020,windturbine,15.60870000000
-6,2045,R2,2020,windturbine,15.60870000000
-6,2049,R2,2020,windturbine,15.60870000000
-7,2030,R2,2025,solarPV,10.82170000000
-7,2035,R2,2025,solarPV,10.82170000000
-7,2040,R2,2025,solarPV,10.82170000000
-7,2045,R2,2025,solarPV,10.82170000000
-7,2049,R2,2025,solarPV,10.82170000000
-7,2050,R2,2025,solarPV,10.82170000000
-7,2054,R2,2025,solarPV,10.82170000000
-8,2035,R2,2030,solarPV,5.71470000000
-8,2040,R2,2030,solarPV,5.71470000000
-8,2045,R2,2030,solarPV,5.71470000000
-8,2049,R2,2030,solarPV,5.71470000000
-8,2050,R2,2030,solarPV,5.71470000000
-8,2054,R2,2030,solarPV,5.71470000000
-8,2055,R2,2030,solarPV,5.71470000000
-8,2059,R2,2030,solarPV,5.71470000000
+3,2030,R1,2025,solarPV,10.73000000000
+3,2035,R1,2025,solarPV,10.73000000000
+3,2040,R1,2025,solarPV,10.73000000000
+3,2045,R1,2025,solarPV,10.73000000000
+3,2049,R1,2025,solarPV,10.73000000000
+3,2050,R1,2025,solarPV,10.73000000000
+3,2054,R1,2025,solarPV,10.73000000000
+4,2035,R1,2030,solarPV,5.60000000000
+4,2040,R1,2030,solarPV,5.60000000000
+4,2045,R1,2030,solarPV,5.60000000000
+4,2049,R1,2030,solarPV,5.60000000000
+4,2050,R1,2030,solarPV,5.60000000000
+4,2054,R1,2030,solarPV,5.60000000000
+4,2055,R1,2030,solarPV,5.60000000000
+4,2059,R1,2030,solarPV,5.60000000000
+6,2030,R2,2020,windturbine,15.15000000000
+6,2035,R2,2020,windturbine,15.15000000000
+6,2040,R2,2020,windturbine,15.15000000000
+6,2045,R2,2020,windturbine,15.15000000000
+6,2049,R2,2020,windturbine,15.15000000000
+7,2030,R2,2025,solarPV,10.73000000000
+7,2035,R2,2025,solarPV,10.73000000000
+7,2040,R2,2025,solarPV,10.73000000000
+7,2045,R2,2025,solarPV,10.73000000000
+7,2049,R2,2025,solarPV,10.73000000000
+7,2050,R2,2025,solarPV,10.73000000000
+7,2054,R2,2025,solarPV,10.73000000000
+8,2035,R2,2030,solarPV,5.60000000000
+8,2040,R2,2030,solarPV,5.60000000000
+8,2045,R2,2030,solarPV,5.60000000000
+8,2049,R2,2030,solarPV,5.60000000000
+8,2050,R2,2030,solarPV,5.60000000000
+8,2054,R2,2030,solarPV,5.60000000000
+8,2055,R2,2030,solarPV,5.60000000000
+8,2059,R2,2030,solarPV,5.60000000000
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 465e5569..971feef4 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,59 +1,59 @@
 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
+1,2035,R1,2020,solarPV,5.15000000000
+1,2040,R1,2020,solarPV,5.15000000000
+1,2045,R1,2020,solarPV,5.15000000000
+1,2049,R1,2020,solarPV,5.15000000000
 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,solarPV,10.82170000000
-3,2040,R1,2025,solarPV,10.82170000000
-3,2045,R1,2025,solarPV,10.82170000000
-3,2049,R1,2025,solarPV,10.82170000000
-3,2050,R1,2025,solarPV,10.82170000000
-3,2054,R1,2025,solarPV,10.82170000000
-4,2035,R1,2030,solarPV,5.71470000000
-4,2040,R1,2030,solarPV,5.71470000000
-4,2045,R1,2030,solarPV,5.71470000000
-4,2049,R1,2030,solarPV,5.71470000000
-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,2040,R1,2035,solarPV,7.85760000000
-5,2045,R1,2035,solarPV,7.85760000000
-5,2049,R1,2035,solarPV,7.85760000000
-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
-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,2035,R2,2025,solarPV,10.82170000000
-8,2040,R2,2025,solarPV,10.82170000000
-8,2045,R2,2025,solarPV,10.82170000000
-8,2049,R2,2025,solarPV,10.82170000000
-8,2050,R2,2025,solarPV,10.82170000000
-8,2054,R2,2025,solarPV,10.82170000000
-9,2035,R2,2030,solarPV,5.71470000000
-9,2040,R2,2030,solarPV,5.71470000000
-9,2045,R2,2030,solarPV,5.71470000000
-9,2049,R2,2030,solarPV,5.71470000000
-9,2050,R2,2030,solarPV,5.71470000000
-9,2054,R2,2030,solarPV,5.71470000000
-9,2055,R2,2030,solarPV,5.71470000000
-9,2059,R2,2030,solarPV,5.71470000000
-10,2040,R2,2035,solarPV,7.85760000000
-10,2045,R2,2035,solarPV,7.85760000000
-10,2049,R2,2035,solarPV,7.85760000000
-10,2050,R2,2035,solarPV,7.85760000000
-10,2054,R2,2035,solarPV,7.85760000000
-10,2055,R2,2035,solarPV,7.85760000000
-10,2059,R2,2035,solarPV,7.85760000000
-10,2060,R2,2035,solarPV,7.85760000000
-10,2064,R2,2035,solarPV,7.85760000000
+3,2035,R1,2025,solarPV,10.73000000000
+3,2040,R1,2025,solarPV,10.73000000000
+3,2045,R1,2025,solarPV,10.73000000000
+3,2049,R1,2025,solarPV,10.73000000000
+3,2050,R1,2025,solarPV,10.73000000000
+3,2054,R1,2025,solarPV,10.73000000000
+4,2035,R1,2030,solarPV,5.60000000000
+4,2040,R1,2030,solarPV,5.60000000000
+4,2045,R1,2030,solarPV,5.60000000000
+4,2049,R1,2030,solarPV,5.60000000000
+4,2050,R1,2030,solarPV,5.60000000000
+4,2054,R1,2030,solarPV,5.60000000000
+4,2055,R1,2030,solarPV,5.60000000000
+4,2059,R1,2030,solarPV,5.60000000000
+5,2040,R1,2035,solarPV,7.72000000000
+5,2045,R1,2035,solarPV,7.72000000000
+5,2049,R1,2035,solarPV,7.72000000000
+5,2050,R1,2035,solarPV,7.72000000000
+5,2054,R1,2035,solarPV,7.72000000000
+5,2055,R1,2035,solarPV,7.72000000000
+5,2059,R1,2035,solarPV,7.72000000000
+5,2060,R1,2035,solarPV,7.72000000000
+5,2064,R1,2035,solarPV,7.72000000000
+7,2035,R2,2020,windturbine,15.15000000000
+7,2040,R2,2020,windturbine,15.15000000000
+7,2045,R2,2020,windturbine,15.15000000000
+7,2049,R2,2020,windturbine,15.15000000000
+8,2035,R2,2025,solarPV,10.73000000000
+8,2040,R2,2025,solarPV,10.73000000000
+8,2045,R2,2025,solarPV,10.73000000000
+8,2049,R2,2025,solarPV,10.73000000000
+8,2050,R2,2025,solarPV,10.73000000000
+8,2054,R2,2025,solarPV,10.73000000000
+9,2035,R2,2030,solarPV,5.60000000000
+9,2040,R2,2030,solarPV,5.60000000000
+9,2045,R2,2030,solarPV,5.60000000000
+9,2049,R2,2030,solarPV,5.60000000000
+9,2050,R2,2030,solarPV,5.60000000000
+9,2054,R2,2030,solarPV,5.60000000000
+9,2055,R2,2030,solarPV,5.60000000000
+9,2059,R2,2030,solarPV,5.60000000000
+10,2040,R2,2035,solarPV,7.72000000000
+10,2045,R2,2035,solarPV,7.72000000000
+10,2049,R2,2035,solarPV,7.72000000000
+10,2050,R2,2035,solarPV,7.72000000000
+10,2054,R2,2035,solarPV,7.72000000000
+10,2055,R2,2035,solarPV,7.72000000000
+10,2059,R2,2035,solarPV,7.72000000000
+10,2060,R2,2035,solarPV,7.72000000000
+10,2064,R2,2035,solarPV,7.72000000000
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 1c4a2fd3..922e4161 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,72 +1,72 @@
 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
+1,2040,R1,2020,solarPV,5.15000000000
+1,2045,R1,2020,solarPV,5.15000000000
+1,2049,R1,2020,solarPV,5.15000000000
 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,solarPV,10.82170000000
-3,2045,R1,2025,solarPV,10.82170000000
-3,2049,R1,2025,solarPV,10.82170000000
-3,2050,R1,2025,solarPV,10.82170000000
-3,2054,R1,2025,solarPV,10.82170000000
-4,2040,R1,2030,solarPV,5.71470000000
-4,2045,R1,2030,solarPV,5.71470000000
-4,2049,R1,2030,solarPV,5.71470000000
-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,2040,R1,2035,solarPV,7.85760000000
-5,2045,R1,2035,solarPV,7.85760000000
-5,2049,R1,2035,solarPV,7.85760000000
-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,2045,R1,2040,solarPV,5.71470000000
-6,2049,R1,2040,solarPV,5.71470000000
-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
-8,2040,R2,2020,windturbine,15.60870000000
-8,2045,R2,2020,windturbine,15.60870000000
-8,2049,R2,2020,windturbine,15.60870000000
-9,2040,R2,2025,solarPV,10.82170000000
-9,2045,R2,2025,solarPV,10.82170000000
-9,2049,R2,2025,solarPV,10.82170000000
-9,2050,R2,2025,solarPV,10.82170000000
-9,2054,R2,2025,solarPV,10.82170000000
-10,2040,R2,2030,solarPV,5.71470000000
-10,2045,R2,2030,solarPV,5.71470000000
-10,2049,R2,2030,solarPV,5.71470000000
-10,2050,R2,2030,solarPV,5.71470000000
-10,2054,R2,2030,solarPV,5.71470000000
-10,2055,R2,2030,solarPV,5.71470000000
-10,2059,R2,2030,solarPV,5.71470000000
-11,2040,R2,2035,solarPV,7.85760000000
-11,2045,R2,2035,solarPV,7.85760000000
-11,2049,R2,2035,solarPV,7.85760000000
-11,2050,R2,2035,solarPV,7.85760000000
-11,2054,R2,2035,solarPV,7.85760000000
-11,2055,R2,2035,solarPV,7.85760000000
-11,2059,R2,2035,solarPV,7.85760000000
-11,2060,R2,2035,solarPV,7.85760000000
-11,2064,R2,2035,solarPV,7.85760000000
-12,2045,R2,2040,solarPV,5.71470000000
-12,2049,R2,2040,solarPV,5.71470000000
-12,2050,R2,2040,solarPV,5.71470000000
-12,2054,R2,2040,solarPV,5.71470000000
-12,2055,R2,2040,solarPV,5.71470000000
-12,2059,R2,2040,solarPV,5.71470000000
-12,2060,R2,2040,solarPV,5.71470000000
-12,2064,R2,2040,solarPV,5.71470000000
-12,2065,R2,2040,solarPV,5.71470000000
-12,2069,R2,2040,solarPV,5.71470000000
+3,2040,R1,2025,solarPV,10.73000000000
+3,2045,R1,2025,solarPV,10.73000000000
+3,2049,R1,2025,solarPV,10.73000000000
+3,2050,R1,2025,solarPV,10.73000000000
+3,2054,R1,2025,solarPV,10.73000000000
+4,2040,R1,2030,solarPV,5.60000000000
+4,2045,R1,2030,solarPV,5.60000000000
+4,2049,R1,2030,solarPV,5.60000000000
+4,2050,R1,2030,solarPV,5.60000000000
+4,2054,R1,2030,solarPV,5.60000000000
+4,2055,R1,2030,solarPV,5.60000000000
+4,2059,R1,2030,solarPV,5.60000000000
+5,2040,R1,2035,solarPV,7.72000000000
+5,2045,R1,2035,solarPV,7.72000000000
+5,2049,R1,2035,solarPV,7.72000000000
+5,2050,R1,2035,solarPV,7.72000000000
+5,2054,R1,2035,solarPV,7.72000000000
+5,2055,R1,2035,solarPV,7.72000000000
+5,2059,R1,2035,solarPV,7.72000000000
+5,2060,R1,2035,solarPV,7.72000000000
+5,2064,R1,2035,solarPV,7.72000000000
+6,2045,R1,2040,solarPV,5.60000000000
+6,2049,R1,2040,solarPV,5.60000000000
+6,2050,R1,2040,solarPV,5.60000000000
+6,2054,R1,2040,solarPV,5.60000000000
+6,2055,R1,2040,solarPV,5.60000000000
+6,2059,R1,2040,solarPV,5.60000000000
+6,2060,R1,2040,solarPV,5.60000000000
+6,2064,R1,2040,solarPV,5.60000000000
+6,2065,R1,2040,solarPV,5.60000000000
+6,2069,R1,2040,solarPV,5.60000000000
+8,2040,R2,2020,windturbine,15.15000000000
+8,2045,R2,2020,windturbine,15.15000000000
+8,2049,R2,2020,windturbine,15.15000000000
+9,2040,R2,2025,solarPV,10.73000000000
+9,2045,R2,2025,solarPV,10.73000000000
+9,2049,R2,2025,solarPV,10.73000000000
+9,2050,R2,2025,solarPV,10.73000000000
+9,2054,R2,2025,solarPV,10.73000000000
+10,2040,R2,2030,solarPV,5.60000000000
+10,2045,R2,2030,solarPV,5.60000000000
+10,2049,R2,2030,solarPV,5.60000000000
+10,2050,R2,2030,solarPV,5.60000000000
+10,2054,R2,2030,solarPV,5.60000000000
+10,2055,R2,2030,solarPV,5.60000000000
+10,2059,R2,2030,solarPV,5.60000000000
+11,2040,R2,2035,solarPV,7.72000000000
+11,2045,R2,2035,solarPV,7.72000000000
+11,2049,R2,2035,solarPV,7.72000000000
+11,2050,R2,2035,solarPV,7.72000000000
+11,2054,R2,2035,solarPV,7.72000000000
+11,2055,R2,2035,solarPV,7.72000000000
+11,2059,R2,2035,solarPV,7.72000000000
+11,2060,R2,2035,solarPV,7.72000000000
+11,2064,R2,2035,solarPV,7.72000000000
+12,2045,R2,2040,solarPV,5.60000000000
+12,2049,R2,2040,solarPV,5.60000000000
+12,2050,R2,2040,solarPV,5.60000000000
+12,2054,R2,2040,solarPV,5.60000000000
+12,2055,R2,2040,solarPV,5.60000000000
+12,2059,R2,2040,solarPV,5.60000000000
+12,2060,R2,2040,solarPV,5.60000000000
+12,2064,R2,2040,solarPV,5.60000000000
+12,2065,R2,2040,solarPV,5.60000000000
+12,2069,R2,2040,solarPV,5.60000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index 96120016..a65e7f58 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,103 +1,103 @@
 asset,year,technology,region,installed,capacity
-0,2045,solarPV,R1,2020,5.60870000000
-0,2049,solarPV,R1,2020,5.60870000000
-1,2045,solarPV,R1,2025,10.82170000000
-1,2049,solarPV,R1,2025,10.82170000000
-1,2050,solarPV,R1,2025,10.82170000000
-1,2054,solarPV,R1,2025,10.82170000000
-2,2045,solarPV,R1,2030,5.71470000000
-2,2049,solarPV,R1,2030,5.71470000000
-2,2050,solarPV,R1,2030,5.71470000000
-2,2054,solarPV,R1,2030,5.71470000000
-2,2055,solarPV,R1,2030,5.71470000000
-2,2059,solarPV,R1,2030,5.71470000000
-3,2045,solarPV,R1,2035,7.85760000000
-3,2049,solarPV,R1,2035,7.85760000000
-3,2050,solarPV,R1,2035,7.85760000000
-3,2054,solarPV,R1,2035,7.85760000000
-3,2055,solarPV,R1,2035,7.85760000000
-3,2059,solarPV,R1,2035,7.85760000000
-3,2060,solarPV,R1,2035,7.85760000000
-3,2064,solarPV,R1,2035,7.85760000000
-4,2045,solarPV,R1,2040,5.71470000000
-4,2049,solarPV,R1,2040,5.71470000000
-4,2050,solarPV,R1,2040,5.71470000000
-4,2054,solarPV,R1,2040,5.71470000000
-4,2055,solarPV,R1,2040,5.71470000000
-4,2059,solarPV,R1,2040,5.71470000000
-4,2060,solarPV,R1,2040,5.71470000000
-4,2064,solarPV,R1,2040,5.71470000000
-4,2065,solarPV,R1,2040,5.71470000000
-4,2069,solarPV,R1,2040,5.71470000000
-5,2050,solarPV,R1,2045,15.71470000000
-5,2054,solarPV,R1,2045,15.71470000000
-5,2055,solarPV,R1,2045,15.71470000000
-5,2059,solarPV,R1,2045,15.71470000000
-5,2060,solarPV,R1,2045,15.71470000000
-5,2064,solarPV,R1,2045,15.71470000000
-5,2065,solarPV,R1,2045,15.71470000000
-5,2069,solarPV,R1,2045,15.71470000000
-5,2070,solarPV,R1,2045,15.71470000000
-5,2074,solarPV,R1,2045,15.71470000000
-6,2045,solarPV,R2,2025,10.82170000000
-6,2049,solarPV,R2,2025,10.82170000000
-6,2050,solarPV,R2,2025,10.82170000000
-6,2054,solarPV,R2,2025,10.82170000000
-7,2045,solarPV,R2,2030,5.71470000000
-7,2049,solarPV,R2,2030,5.71470000000
-7,2050,solarPV,R2,2030,5.71470000000
-7,2054,solarPV,R2,2030,5.71470000000
-7,2055,solarPV,R2,2030,5.71470000000
-7,2059,solarPV,R2,2030,5.71470000000
-8,2045,solarPV,R2,2035,7.85760000000
-8,2049,solarPV,R2,2035,7.85760000000
-8,2050,solarPV,R2,2035,7.85760000000
-8,2054,solarPV,R2,2035,7.85760000000
-8,2055,solarPV,R2,2035,7.85760000000
-8,2059,solarPV,R2,2035,7.85760000000
-8,2060,solarPV,R2,2035,7.85760000000
-8,2064,solarPV,R2,2035,7.85760000000
-9,2045,solarPV,R2,2040,5.71470000000
-9,2049,solarPV,R2,2040,5.71470000000
-9,2050,solarPV,R2,2040,5.71470000000
-9,2054,solarPV,R2,2040,5.71470000000
-9,2055,solarPV,R2,2040,5.71470000000
-9,2059,solarPV,R2,2040,5.71470000000
-9,2060,solarPV,R2,2040,5.71470000000
-9,2064,solarPV,R2,2040,5.71470000000
-9,2065,solarPV,R2,2040,5.71470000000
-9,2069,solarPV,R2,2040,5.71470000000
-10,2050,solarPV,R2,2045,15.71470000000
-10,2054,solarPV,R2,2045,15.71470000000
-10,2055,solarPV,R2,2045,15.71470000000
-10,2059,solarPV,R2,2045,15.71470000000
-10,2060,solarPV,R2,2045,15.71470000000
-10,2064,solarPV,R2,2045,15.71470000000
-10,2065,solarPV,R2,2045,15.71470000000
-10,2069,solarPV,R2,2045,15.71470000000
-10,2070,solarPV,R2,2045,15.71470000000
-10,2074,solarPV,R2,2045,15.71470000000
+0,2045,solarPV,R1,2020,5.15000000000
+0,2049,solarPV,R1,2020,5.15000000000
+1,2045,solarPV,R1,2025,10.73000000000
+1,2049,solarPV,R1,2025,10.73000000000
+1,2050,solarPV,R1,2025,10.73000000000
+1,2054,solarPV,R1,2025,10.73000000000
+2,2045,solarPV,R1,2030,5.60000000000
+2,2049,solarPV,R1,2030,5.60000000000
+2,2050,solarPV,R1,2030,5.60000000000
+2,2054,solarPV,R1,2030,5.60000000000
+2,2055,solarPV,R1,2030,5.60000000000
+2,2059,solarPV,R1,2030,5.60000000000
+3,2045,solarPV,R1,2035,7.72000000000
+3,2049,solarPV,R1,2035,7.72000000000
+3,2050,solarPV,R1,2035,7.72000000000
+3,2054,solarPV,R1,2035,7.72000000000
+3,2055,solarPV,R1,2035,7.72000000000
+3,2059,solarPV,R1,2035,7.72000000000
+3,2060,solarPV,R1,2035,7.72000000000
+3,2064,solarPV,R1,2035,7.72000000000
+4,2045,solarPV,R1,2040,5.60000000000
+4,2049,solarPV,R1,2040,5.60000000000
+4,2050,solarPV,R1,2040,5.60000000000
+4,2054,solarPV,R1,2040,5.60000000000
+4,2055,solarPV,R1,2040,5.60000000000
+4,2059,solarPV,R1,2040,5.60000000000
+4,2060,solarPV,R1,2040,5.60000000000
+4,2064,solarPV,R1,2040,5.60000000000
+4,2065,solarPV,R1,2040,5.60000000000
+4,2069,solarPV,R1,2040,5.60000000000
+5,2050,solarPV,R1,2045,15.60000000000
+5,2054,solarPV,R1,2045,15.60000000000
+5,2055,solarPV,R1,2045,15.60000000000
+5,2059,solarPV,R1,2045,15.60000000000
+5,2060,solarPV,R1,2045,15.60000000000
+5,2064,solarPV,R1,2045,15.60000000000
+5,2065,solarPV,R1,2045,15.60000000000
+5,2069,solarPV,R1,2045,15.60000000000
+5,2070,solarPV,R1,2045,15.60000000000
+5,2074,solarPV,R1,2045,15.60000000000
+6,2045,solarPV,R2,2025,10.73000000000
+6,2049,solarPV,R2,2025,10.73000000000
+6,2050,solarPV,R2,2025,10.73000000000
+6,2054,solarPV,R2,2025,10.73000000000
+7,2045,solarPV,R2,2030,5.60000000000
+7,2049,solarPV,R2,2030,5.60000000000
+7,2050,solarPV,R2,2030,5.60000000000
+7,2054,solarPV,R2,2030,5.60000000000
+7,2055,solarPV,R2,2030,5.60000000000
+7,2059,solarPV,R2,2030,5.60000000000
+8,2045,solarPV,R2,2035,7.72000000000
+8,2049,solarPV,R2,2035,7.72000000000
+8,2050,solarPV,R2,2035,7.72000000000
+8,2054,solarPV,R2,2035,7.72000000000
+8,2055,solarPV,R2,2035,7.72000000000
+8,2059,solarPV,R2,2035,7.72000000000
+8,2060,solarPV,R2,2035,7.72000000000
+8,2064,solarPV,R2,2035,7.72000000000
+9,2045,solarPV,R2,2040,5.60000000000
+9,2049,solarPV,R2,2040,5.60000000000
+9,2050,solarPV,R2,2040,5.60000000000
+9,2054,solarPV,R2,2040,5.60000000000
+9,2055,solarPV,R2,2040,5.60000000000
+9,2059,solarPV,R2,2040,5.60000000000
+9,2060,solarPV,R2,2040,5.60000000000
+9,2064,solarPV,R2,2040,5.60000000000
+9,2065,solarPV,R2,2040,5.60000000000
+9,2069,solarPV,R2,2040,5.60000000000
+10,2050,solarPV,R2,2045,15.60000000000
+10,2054,solarPV,R2,2045,15.60000000000
+10,2055,solarPV,R2,2045,15.60000000000
+10,2059,solarPV,R2,2045,15.60000000000
+10,2060,solarPV,R2,2045,15.60000000000
+10,2064,solarPV,R2,2045,15.60000000000
+10,2065,solarPV,R2,2045,15.60000000000
+10,2069,solarPV,R2,2045,15.60000000000
+10,2070,solarPV,R2,2045,15.60000000000
+10,2074,solarPV,R2,2045,15.60000000000
 11,2045,windturbine,R1,2020,10.00000000000
 11,2049,windturbine,R1,2020,10.00000000000
-12,2050,windturbine,R1,2045,5.60870000000
-12,2054,windturbine,R1,2045,5.60870000000
-12,2055,windturbine,R1,2045,5.60870000000
-12,2059,windturbine,R1,2045,5.60870000000
-12,2060,windturbine,R1,2045,5.60870000000
-12,2064,windturbine,R1,2045,5.60870000000
-12,2065,windturbine,R1,2045,5.60870000000
-12,2069,windturbine,R1,2045,5.60870000000
-12,2070,windturbine,R1,2045,5.60870000000
-12,2074,windturbine,R1,2045,5.60870000000
-13,2045,windturbine,R2,2020,15.60870000000
-13,2049,windturbine,R2,2020,15.60870000000
-14,2050,windturbine,R2,2045,5.60870000000
-14,2054,windturbine,R2,2045,5.60870000000
-14,2055,windturbine,R2,2045,5.60870000000
-14,2059,windturbine,R2,2045,5.60870000000
-14,2060,windturbine,R2,2045,5.60870000000
-14,2064,windturbine,R2,2045,5.60870000000
-14,2065,windturbine,R2,2045,5.60870000000
-14,2069,windturbine,R2,2045,5.60870000000
-14,2070,windturbine,R2,2045,5.60870000000
-14,2074,windturbine,R2,2045,5.60870000000
+12,2050,windturbine,R1,2045,5.15000000000
+12,2054,windturbine,R1,2045,5.15000000000
+12,2055,windturbine,R1,2045,5.15000000000
+12,2059,windturbine,R1,2045,5.15000000000
+12,2060,windturbine,R1,2045,5.15000000000
+12,2064,windturbine,R1,2045,5.15000000000
+12,2065,windturbine,R1,2045,5.15000000000
+12,2069,windturbine,R1,2045,5.15000000000
+12,2070,windturbine,R1,2045,5.15000000000
+12,2074,windturbine,R1,2045,5.15000000000
+13,2045,windturbine,R2,2020,15.15000000000
+13,2049,windturbine,R2,2020,15.15000000000
+14,2050,windturbine,R2,2045,5.15000000000
+14,2054,windturbine,R2,2045,5.15000000000
+14,2055,windturbine,R2,2045,5.15000000000
+14,2059,windturbine,R2,2045,5.15000000000
+14,2060,windturbine,R2,2045,5.15000000000
+14,2064,windturbine,R2,2045,5.15000000000
+14,2065,windturbine,R2,2045,5.15000000000
+14,2069,windturbine,R2,2045,5.15000000000
+14,2070,windturbine,R2,2045,5.15000000000
+14,2074,windturbine,R2,2045,5.15000000000
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 eef653ae..2f1414fd 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,44 +1,44 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,10.82170000000
-2,2054,R1,2025,solarPV,10.82170000000
-3,2050,R1,2030,solarPV,5.71470000000
-3,2054,R1,2030,solarPV,5.71470000000
-3,2055,R1,2030,solarPV,5.71470000000
-3,2059,R1,2030,solarPV,5.71470000000
-4,2050,R1,2035,solarPV,7.85760000000
-4,2054,R1,2035,solarPV,7.85760000000
-4,2055,R1,2035,solarPV,7.85760000000
-4,2059,R1,2035,solarPV,7.85760000000
-4,2060,R1,2035,solarPV,7.85760000000
-4,2064,R1,2035,solarPV,7.85760000000
-5,2050,R1,2040,solarPV,5.71470000000
-5,2054,R1,2040,solarPV,5.71470000000
-5,2055,R1,2040,solarPV,5.71470000000
-5,2059,R1,2040,solarPV,5.71470000000
-5,2060,R1,2040,solarPV,5.71470000000
-5,2064,R1,2040,solarPV,5.71470000000
-5,2065,R1,2040,solarPV,5.71470000000
-5,2069,R1,2040,solarPV,5.71470000000
-6,2050,R1,2045,solarPV,15.71470000000
-6,2054,R1,2045,solarPV,15.71470000000
-6,2055,R1,2045,solarPV,15.71470000000
-6,2059,R1,2045,solarPV,15.71470000000
-6,2060,R1,2045,solarPV,15.71470000000
-6,2064,R1,2045,solarPV,15.71470000000
-6,2065,R1,2045,solarPV,15.71470000000
-6,2069,R1,2045,solarPV,15.71470000000
-6,2070,R1,2045,solarPV,15.71470000000
-6,2074,R1,2045,solarPV,15.71470000000
-7,2050,R1,2045,windturbine,5.60870000000
-7,2054,R1,2045,windturbine,5.60870000000
-7,2055,R1,2045,windturbine,5.60870000000
-7,2059,R1,2045,windturbine,5.60870000000
-7,2060,R1,2045,windturbine,5.60870000000
-7,2064,R1,2045,windturbine,5.60870000000
-7,2065,R1,2045,windturbine,5.60870000000
-7,2069,R1,2045,windturbine,5.60870000000
-7,2070,R1,2045,windturbine,5.60870000000
-7,2074,R1,2045,windturbine,5.60870000000
+2,2050,R1,2025,solarPV,10.73000000000
+2,2054,R1,2025,solarPV,10.73000000000
+3,2050,R1,2030,solarPV,5.60000000000
+3,2054,R1,2030,solarPV,5.60000000000
+3,2055,R1,2030,solarPV,5.60000000000
+3,2059,R1,2030,solarPV,5.60000000000
+4,2050,R1,2035,solarPV,7.72000000000
+4,2054,R1,2035,solarPV,7.72000000000
+4,2055,R1,2035,solarPV,7.72000000000
+4,2059,R1,2035,solarPV,7.72000000000
+4,2060,R1,2035,solarPV,7.72000000000
+4,2064,R1,2035,solarPV,7.72000000000
+5,2050,R1,2040,solarPV,5.60000000000
+5,2054,R1,2040,solarPV,5.60000000000
+5,2055,R1,2040,solarPV,5.60000000000
+5,2059,R1,2040,solarPV,5.60000000000
+5,2060,R1,2040,solarPV,5.60000000000
+5,2064,R1,2040,solarPV,5.60000000000
+5,2065,R1,2040,solarPV,5.60000000000
+5,2069,R1,2040,solarPV,5.60000000000
+6,2050,R1,2045,solarPV,15.60000000000
+6,2054,R1,2045,solarPV,15.60000000000
+6,2055,R1,2045,solarPV,15.60000000000
+6,2059,R1,2045,solarPV,15.60000000000
+6,2060,R1,2045,solarPV,15.60000000000
+6,2064,R1,2045,solarPV,15.60000000000
+6,2065,R1,2045,solarPV,15.60000000000
+6,2069,R1,2045,solarPV,15.60000000000
+6,2070,R1,2045,solarPV,15.60000000000
+6,2074,R1,2045,solarPV,15.60000000000
+7,2050,R1,2045,windturbine,5.15000000000
+7,2054,R1,2045,windturbine,5.15000000000
+7,2055,R1,2045,windturbine,5.15000000000
+7,2059,R1,2045,windturbine,5.15000000000
+7,2060,R1,2045,windturbine,5.15000000000
+7,2064,R1,2045,windturbine,5.15000000000
+7,2065,R1,2045,windturbine,5.15000000000
+7,2069,R1,2045,windturbine,5.15000000000
+7,2070,R1,2045,windturbine,5.15000000000
+7,2074,R1,2045,windturbine,5.15000000000
 8,2055,R1,2050,solarPV,10.00000000000
 8,2059,R1,2050,solarPV,10.00000000000
 8,2060,R1,2050,solarPV,10.00000000000
@@ -49,56 +49,56 @@ asset,year,region,installed,technology,capacity
 8,2074,R1,2050,solarPV,10.00000000000
 8,2075,R1,2050,solarPV,10.00000000000
 8,2079,R1,2050,solarPV,10.00000000000
-9,2055,R1,2050,windturbine,0.82170000000
-9,2059,R1,2050,windturbine,0.82170000000
-9,2060,R1,2050,windturbine,0.82170000000
-9,2064,R1,2050,windturbine,0.82170000000
-9,2065,R1,2050,windturbine,0.82170000000
-9,2069,R1,2050,windturbine,0.82170000000
-9,2070,R1,2050,windturbine,0.82170000000
-9,2074,R1,2050,windturbine,0.82170000000
-9,2075,R1,2050,windturbine,0.82170000000
-9,2079,R1,2050,windturbine,0.82170000000
-11,2050,R2,2025,solarPV,10.82170000000
-11,2054,R2,2025,solarPV,10.82170000000
-12,2050,R2,2030,solarPV,5.71470000000
-12,2054,R2,2030,solarPV,5.71470000000
-12,2055,R2,2030,solarPV,5.71470000000
-12,2059,R2,2030,solarPV,5.71470000000
-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
-14,2050,R2,2040,solarPV,5.71470000000
-14,2054,R2,2040,solarPV,5.71470000000
-14,2055,R2,2040,solarPV,5.71470000000
-14,2059,R2,2040,solarPV,5.71470000000
-14,2060,R2,2040,solarPV,5.71470000000
-14,2064,R2,2040,solarPV,5.71470000000
-14,2065,R2,2040,solarPV,5.71470000000
-14,2069,R2,2040,solarPV,5.71470000000
-15,2050,R2,2045,solarPV,15.71470000000
-15,2054,R2,2045,solarPV,15.71470000000
-15,2055,R2,2045,solarPV,15.71470000000
-15,2059,R2,2045,solarPV,15.71470000000
-15,2060,R2,2045,solarPV,15.71470000000
-15,2064,R2,2045,solarPV,15.71470000000
-15,2065,R2,2045,solarPV,15.71470000000
-15,2069,R2,2045,solarPV,15.71470000000
-15,2070,R2,2045,solarPV,15.71470000000
-15,2074,R2,2045,solarPV,15.71470000000
-16,2050,R2,2045,windturbine,5.60870000000
-16,2054,R2,2045,windturbine,5.60870000000
-16,2055,R2,2045,windturbine,5.60870000000
-16,2059,R2,2045,windturbine,5.60870000000
-16,2060,R2,2045,windturbine,5.60870000000
-16,2064,R2,2045,windturbine,5.60870000000
-16,2065,R2,2045,windturbine,5.60870000000
-16,2069,R2,2045,windturbine,5.60870000000
-16,2070,R2,2045,windturbine,5.60870000000
-16,2074,R2,2045,windturbine,5.60870000000
+9,2055,R1,2050,windturbine,0.73000000000
+9,2059,R1,2050,windturbine,0.73000000000
+9,2060,R1,2050,windturbine,0.73000000000
+9,2064,R1,2050,windturbine,0.73000000000
+9,2065,R1,2050,windturbine,0.73000000000
+9,2069,R1,2050,windturbine,0.73000000000
+9,2070,R1,2050,windturbine,0.73000000000
+9,2074,R1,2050,windturbine,0.73000000000
+9,2075,R1,2050,windturbine,0.73000000000
+9,2079,R1,2050,windturbine,0.73000000000
+11,2050,R2,2025,solarPV,10.73000000000
+11,2054,R2,2025,solarPV,10.73000000000
+12,2050,R2,2030,solarPV,5.60000000000
+12,2054,R2,2030,solarPV,5.60000000000
+12,2055,R2,2030,solarPV,5.60000000000
+12,2059,R2,2030,solarPV,5.60000000000
+13,2050,R2,2035,solarPV,7.72000000000
+13,2054,R2,2035,solarPV,7.72000000000
+13,2055,R2,2035,solarPV,7.72000000000
+13,2059,R2,2035,solarPV,7.72000000000
+13,2060,R2,2035,solarPV,7.72000000000
+13,2064,R2,2035,solarPV,7.72000000000
+14,2050,R2,2040,solarPV,5.60000000000
+14,2054,R2,2040,solarPV,5.60000000000
+14,2055,R2,2040,solarPV,5.60000000000
+14,2059,R2,2040,solarPV,5.60000000000
+14,2060,R2,2040,solarPV,5.60000000000
+14,2064,R2,2040,solarPV,5.60000000000
+14,2065,R2,2040,solarPV,5.60000000000
+14,2069,R2,2040,solarPV,5.60000000000
+15,2050,R2,2045,solarPV,15.60000000000
+15,2054,R2,2045,solarPV,15.60000000000
+15,2055,R2,2045,solarPV,15.60000000000
+15,2059,R2,2045,solarPV,15.60000000000
+15,2060,R2,2045,solarPV,15.60000000000
+15,2064,R2,2045,solarPV,15.60000000000
+15,2065,R2,2045,solarPV,15.60000000000
+15,2069,R2,2045,solarPV,15.60000000000
+15,2070,R2,2045,solarPV,15.60000000000
+15,2074,R2,2045,solarPV,15.60000000000
+16,2050,R2,2045,windturbine,5.15000000000
+16,2054,R2,2045,windturbine,5.15000000000
+16,2055,R2,2045,windturbine,5.15000000000
+16,2059,R2,2045,windturbine,5.15000000000
+16,2060,R2,2045,windturbine,5.15000000000
+16,2064,R2,2045,windturbine,5.15000000000
+16,2065,R2,2045,windturbine,5.15000000000
+16,2069,R2,2045,windturbine,5.15000000000
+16,2070,R2,2045,windturbine,5.15000000000
+16,2074,R2,2045,windturbine,5.15000000000
 17,2055,R2,2050,solarPV,10.00000000000
 17,2059,R2,2050,solarPV,10.00000000000
 17,2060,R2,2050,solarPV,10.00000000000
@@ -109,13 +109,13 @@ asset,year,region,installed,technology,capacity
 17,2074,R2,2050,solarPV,10.00000000000
 17,2075,R2,2050,solarPV,10.00000000000
 17,2079,R2,2050,solarPV,10.00000000000
-18,2055,R2,2050,windturbine,0.82170000000
-18,2059,R2,2050,windturbine,0.82170000000
-18,2060,R2,2050,windturbine,0.82170000000
-18,2064,R2,2050,windturbine,0.82170000000
-18,2065,R2,2050,windturbine,0.82170000000
-18,2069,R2,2050,windturbine,0.82170000000
-18,2070,R2,2050,windturbine,0.82170000000
-18,2074,R2,2050,windturbine,0.82170000000
-18,2075,R2,2050,windturbine,0.82170000000
-18,2079,R2,2050,windturbine,0.82170000000
+18,2055,R2,2050,windturbine,0.73000000000
+18,2059,R2,2050,windturbine,0.73000000000
+18,2060,R2,2050,windturbine,0.73000000000
+18,2064,R2,2050,windturbine,0.73000000000
+18,2065,R2,2050,windturbine,0.73000000000
+18,2069,R2,2050,windturbine,0.73000000000
+18,2070,R2,2050,windturbine,0.73000000000
+18,2074,R2,2050,windturbine,0.73000000000
+18,2075,R2,2050,windturbine,0.73000000000
+18,2079,R2,2050,windturbine,0.73000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
index bba2293b..26535f2c 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
@@ -3,9 +3,9 @@ asset,year,technology,region,installed,capacity
 0,2025,gasboiler,R1,2020,5.00000000000
 1,2020,gasboiler,R2,2020,10.00000000000
 1,2025,gasboiler,R2,2020,5.00000000000
-2,2025,heatpump,R1,2020,17.85870000000
-2,2030,heatpump,R1,2020,17.85870000000
-2,2034,heatpump,R1,2020,17.85870000000
-3,2025,heatpump,R2,2020,17.85870000000
-3,2030,heatpump,R2,2020,17.85870000000
-3,2034,heatpump,R2,2020,17.85870000000
+2,2025,heatpump,R1,2020,17.40000000000
+2,2030,heatpump,R1,2020,17.40000000000
+2,2034,heatpump,R1,2020,17.40000000000
+3,2025,heatpump,R2,2020,17.40000000000
+3,2030,heatpump,R2,2020,17.40000000000
+3,2034,heatpump,R2,2020,17.40000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
index b5155356..53b2db90 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
@@ -1,25 +1,25 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,2.14290000000
-1,2034,gasboiler,R1,2025,2.14290000000
-1,2035,gasboiler,R1,2025,2.14290000000
-1,2039,gasboiler,R1,2025,2.14290000000
+1,2030,gasboiler,R1,2025,2.12000000000
+1,2034,gasboiler,R1,2025,2.12000000000
+1,2035,gasboiler,R1,2025,2.12000000000
+1,2039,gasboiler,R1,2025,2.12000000000
 2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,2.14290000000
-3,2034,gasboiler,R2,2025,2.14290000000
-3,2035,gasboiler,R2,2025,2.14290000000
-3,2039,gasboiler,R2,2025,2.14290000000
-4,2025,heatpump,R1,2020,17.85870000000
-4,2030,heatpump,R1,2020,17.85870000000
-4,2034,heatpump,R1,2020,17.85870000000
-5,2030,heatpump,R1,2025,8.57170000000
-5,2034,heatpump,R1,2025,8.57170000000
-5,2035,heatpump,R1,2025,8.57170000000
-5,2039,heatpump,R1,2025,8.57170000000
-6,2025,heatpump,R2,2020,17.85870000000
-6,2030,heatpump,R2,2020,17.85870000000
-6,2034,heatpump,R2,2020,17.85870000000
-7,2030,heatpump,R2,2025,8.57170000000
-7,2034,heatpump,R2,2025,8.57170000000
-7,2035,heatpump,R2,2025,8.57170000000
-7,2039,heatpump,R2,2025,8.57170000000
+3,2030,gasboiler,R2,2025,2.12000000000
+3,2034,gasboiler,R2,2025,2.12000000000
+3,2035,gasboiler,R2,2025,2.12000000000
+3,2039,gasboiler,R2,2025,2.12000000000
+4,2025,heatpump,R1,2020,17.40000000000
+4,2030,heatpump,R1,2020,17.40000000000
+4,2034,heatpump,R1,2020,17.40000000000
+5,2030,heatpump,R1,2025,8.48000000000
+5,2034,heatpump,R1,2025,8.48000000000
+5,2035,heatpump,R1,2025,8.48000000000
+5,2039,heatpump,R1,2025,8.48000000000
+6,2025,heatpump,R2,2020,17.40000000000
+6,2030,heatpump,R2,2020,17.40000000000
+6,2034,heatpump,R2,2020,17.40000000000
+7,2030,heatpump,R2,2025,8.48000000000
+7,2034,heatpump,R2,2025,8.48000000000
+7,2035,heatpump,R2,2025,8.48000000000
+7,2039,heatpump,R2,2025,8.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
index 8a37b512..3b307878 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
@@ -1,29 +1,29 @@
 asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,2.14290000000
-0,2034,gasboiler,R1,2025,2.14290000000
-0,2035,gasboiler,R1,2025,2.14290000000
-0,2039,gasboiler,R1,2025,2.14290000000
-1,2030,gasboiler,R2,2025,2.14290000000
-1,2034,gasboiler,R2,2025,2.14290000000
-1,2035,gasboiler,R2,2025,2.14290000000
-1,2039,gasboiler,R2,2025,2.14290000000
-2,2030,heatpump,R1,2020,17.85870000000
-2,2034,heatpump,R1,2020,17.85870000000
-3,2030,heatpump,R1,2025,8.57170000000
-3,2034,heatpump,R1,2025,8.57170000000
-3,2035,heatpump,R1,2025,8.57170000000
-3,2039,heatpump,R1,2025,8.57170000000
-4,2035,heatpump,R1,2030,23.57330000000
-4,2039,heatpump,R1,2030,23.57330000000
-4,2040,heatpump,R1,2030,23.57330000000
-4,2044,heatpump,R1,2030,23.57330000000
-5,2030,heatpump,R2,2020,17.85870000000
-5,2034,heatpump,R2,2020,17.85870000000
-6,2030,heatpump,R2,2025,8.57170000000
-6,2034,heatpump,R2,2025,8.57170000000
-6,2035,heatpump,R2,2025,8.57170000000
-6,2039,heatpump,R2,2025,8.57170000000
-7,2035,heatpump,R2,2030,23.57330000000
-7,2039,heatpump,R2,2030,23.57330000000
-7,2040,heatpump,R2,2030,23.57330000000
-7,2044,heatpump,R2,2030,23.57330000000
+0,2030,gasboiler,R1,2025,2.12000000000
+0,2034,gasboiler,R1,2025,2.12000000000
+0,2035,gasboiler,R1,2025,2.12000000000
+0,2039,gasboiler,R1,2025,2.12000000000
+1,2030,gasboiler,R2,2025,2.12000000000
+1,2034,gasboiler,R2,2025,2.12000000000
+1,2035,gasboiler,R2,2025,2.12000000000
+1,2039,gasboiler,R2,2025,2.12000000000
+2,2030,heatpump,R1,2020,17.40000000000
+2,2034,heatpump,R1,2020,17.40000000000
+3,2030,heatpump,R1,2025,8.48000000000
+3,2034,heatpump,R1,2025,8.48000000000
+3,2035,heatpump,R1,2025,8.48000000000
+3,2039,heatpump,R1,2025,8.48000000000
+4,2035,heatpump,R1,2030,23.00000000000
+4,2039,heatpump,R1,2030,23.00000000000
+4,2040,heatpump,R1,2030,23.00000000000
+4,2044,heatpump,R1,2030,23.00000000000
+5,2030,heatpump,R2,2020,17.40000000000
+5,2034,heatpump,R2,2020,17.40000000000
+6,2030,heatpump,R2,2025,8.48000000000
+6,2034,heatpump,R2,2025,8.48000000000
+6,2035,heatpump,R2,2025,8.48000000000
+6,2039,heatpump,R2,2025,8.48000000000
+7,2035,heatpump,R2,2030,23.00000000000
+7,2039,heatpump,R2,2030,23.00000000000
+7,2040,heatpump,R2,2030,23.00000000000
+7,2044,heatpump,R2,2030,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
index d34aa52e..89ecddb8 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
@@ -1,25 +1,25 @@
 asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,2.14290000000
-0,2039,gasboiler,R1,2025,2.14290000000
-1,2035,gasboiler,R2,2025,2.14290000000
-1,2039,gasboiler,R2,2025,2.14290000000
-2,2035,heatpump,R1,2025,8.57170000000
-2,2039,heatpump,R1,2025,8.57170000000
-3,2035,heatpump,R1,2030,23.57330000000
-3,2039,heatpump,R1,2030,23.57330000000
-3,2040,heatpump,R1,2030,23.57330000000
-3,2044,heatpump,R1,2030,23.57330000000
-4,2040,heatpump,R1,2035,16.42930000000
-4,2044,heatpump,R1,2035,16.42930000000
-4,2045,heatpump,R1,2035,16.42930000000
-4,2049,heatpump,R1,2035,16.42930000000
-5,2035,heatpump,R2,2025,8.57170000000
-5,2039,heatpump,R2,2025,8.57170000000
-6,2035,heatpump,R2,2030,23.57330000000
-6,2039,heatpump,R2,2030,23.57330000000
-6,2040,heatpump,R2,2030,23.57330000000
-6,2044,heatpump,R2,2030,23.57330000000
-7,2040,heatpump,R2,2035,16.42930000000
-7,2044,heatpump,R2,2035,16.42930000000
-7,2045,heatpump,R2,2035,16.42930000000
-7,2049,heatpump,R2,2035,16.42930000000
+0,2035,gasboiler,R1,2025,2.12000000000
+0,2039,gasboiler,R1,2025,2.12000000000
+1,2035,gasboiler,R2,2025,2.12000000000
+1,2039,gasboiler,R2,2025,2.12000000000
+2,2035,heatpump,R1,2025,8.48000000000
+2,2039,heatpump,R1,2025,8.48000000000
+3,2035,heatpump,R1,2030,23.00000000000
+3,2039,heatpump,R1,2030,23.00000000000
+3,2040,heatpump,R1,2030,23.00000000000
+3,2044,heatpump,R1,2030,23.00000000000
+4,2040,heatpump,R1,2035,16.20000000000
+4,2044,heatpump,R1,2035,16.20000000000
+4,2045,heatpump,R1,2035,16.20000000000
+4,2049,heatpump,R1,2035,16.20000000000
+5,2035,heatpump,R2,2025,8.48000000000
+5,2039,heatpump,R2,2025,8.48000000000
+6,2035,heatpump,R2,2030,23.00000000000
+6,2039,heatpump,R2,2030,23.00000000000
+6,2040,heatpump,R2,2030,23.00000000000
+6,2044,heatpump,R2,2030,23.00000000000
+7,2040,heatpump,R2,2035,16.20000000000
+7,2044,heatpump,R2,2035,16.20000000000
+7,2045,heatpump,R2,2035,16.20000000000
+7,2049,heatpump,R2,2035,16.20000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
index ca3f6cfa..97cba817 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
@@ -1,21 +1,21 @@
 asset,year,technology,region,installed,capacity
-0,2040,heatpump,R1,2030,23.57330000000
-0,2044,heatpump,R1,2030,23.57330000000
-1,2040,heatpump,R1,2035,16.42930000000
-1,2044,heatpump,R1,2035,16.42930000000
-1,2045,heatpump,R1,2035,16.42930000000
-1,2049,heatpump,R1,2035,16.42930000000
-2,2045,heatpump,R1,2040,29.28800000000
-2,2049,heatpump,R1,2040,29.28800000000
-2,2050,heatpump,R1,2040,29.28800000000
-2,2054,heatpump,R1,2040,29.28800000000
-3,2040,heatpump,R2,2030,23.57330000000
-3,2044,heatpump,R2,2030,23.57330000000
-4,2040,heatpump,R2,2035,16.42930000000
-4,2044,heatpump,R2,2035,16.42930000000
-4,2045,heatpump,R2,2035,16.42930000000
-4,2049,heatpump,R2,2035,16.42930000000
-5,2045,heatpump,R2,2040,29.28800000000
-5,2049,heatpump,R2,2040,29.28800000000
-5,2050,heatpump,R2,2040,29.28800000000
-5,2054,heatpump,R2,2040,29.28800000000
+0,2040,heatpump,R1,2030,23.00000000000
+0,2044,heatpump,R1,2030,23.00000000000
+1,2040,heatpump,R1,2035,16.20000000000
+1,2044,heatpump,R1,2035,16.20000000000
+1,2045,heatpump,R1,2035,16.20000000000
+1,2049,heatpump,R1,2035,16.20000000000
+2,2045,heatpump,R1,2040,28.60000000000
+2,2049,heatpump,R1,2040,28.60000000000
+2,2050,heatpump,R1,2040,28.60000000000
+2,2054,heatpump,R1,2040,28.60000000000
+3,2040,heatpump,R2,2030,23.00000000000
+3,2044,heatpump,R2,2030,23.00000000000
+4,2040,heatpump,R2,2035,16.20000000000
+4,2044,heatpump,R2,2035,16.20000000000
+4,2045,heatpump,R2,2035,16.20000000000
+4,2049,heatpump,R2,2035,16.20000000000
+5,2045,heatpump,R2,2040,28.60000000000
+5,2049,heatpump,R2,2040,28.60000000000
+5,2050,heatpump,R2,2040,28.60000000000
+5,2054,heatpump,R2,2040,28.60000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
index 7f9d122a..8530aa6f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
@@ -1,21 +1,21 @@
 asset,year,technology,region,installed,capacity
-0,2045,heatpump,R1,2035,16.42930000000
-0,2049,heatpump,R1,2035,16.42930000000
-1,2045,heatpump,R1,2040,29.28800000000
-1,2049,heatpump,R1,2040,29.28800000000
-1,2050,heatpump,R1,2040,29.28800000000
-1,2054,heatpump,R1,2040,29.28800000000
-2,2050,heatpump,R1,2045,22.14400000000
-2,2054,heatpump,R1,2045,22.14400000000
-2,2055,heatpump,R1,2045,22.14400000000
-2,2059,heatpump,R1,2045,22.14400000000
-3,2045,heatpump,R2,2035,16.42930000000
-3,2049,heatpump,R2,2035,16.42930000000
-4,2045,heatpump,R2,2040,29.28800000000
-4,2049,heatpump,R2,2040,29.28800000000
-4,2050,heatpump,R2,2040,29.28800000000
-4,2054,heatpump,R2,2040,29.28800000000
-5,2050,heatpump,R2,2045,22.14400000000
-5,2054,heatpump,R2,2045,22.14400000000
-5,2055,heatpump,R2,2045,22.14400000000
-5,2059,heatpump,R2,2045,22.14400000000
+0,2045,heatpump,R1,2035,16.20000000000
+0,2049,heatpump,R1,2035,16.20000000000
+1,2045,heatpump,R1,2040,28.60000000000
+1,2049,heatpump,R1,2040,28.60000000000
+1,2050,heatpump,R1,2040,28.60000000000
+1,2054,heatpump,R1,2040,28.60000000000
+2,2050,heatpump,R1,2045,21.80000000000
+2,2054,heatpump,R1,2045,21.80000000000
+2,2055,heatpump,R1,2045,21.80000000000
+2,2059,heatpump,R1,2045,21.80000000000
+3,2045,heatpump,R2,2035,16.20000000000
+3,2049,heatpump,R2,2035,16.20000000000
+4,2045,heatpump,R2,2040,28.60000000000
+4,2049,heatpump,R2,2040,28.60000000000
+4,2050,heatpump,R2,2040,28.60000000000
+4,2054,heatpump,R2,2040,28.60000000000
+5,2050,heatpump,R2,2045,21.80000000000
+5,2054,heatpump,R2,2045,21.80000000000
+5,2055,heatpump,R2,2045,21.80000000000
+5,2059,heatpump,R2,2045,21.80000000000
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 02533b47..0dd9dec9 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
+1,2050,R1,2040,heatpump,28.60000000000
+1,2054,R1,2040,heatpump,28.60000000000
+2,2050,R1,2045,heatpump,21.80000000000
+2,2054,R1,2045,heatpump,21.80000000000
+2,2055,R1,2045,heatpump,21.80000000000
+2,2059,R1,2045,heatpump,21.80000000000
+3,2055,R1,2050,heatpump,28.60000000000
+3,2059,R1,2050,heatpump,28.60000000000
+3,2060,R1,2050,heatpump,28.60000000000
+3,2064,R1,2050,heatpump,28.60000000000
+5,2050,R2,2040,heatpump,28.60000000000
+5,2054,R2,2040,heatpump,28.60000000000
+6,2050,R2,2045,heatpump,21.80000000000
+6,2054,R2,2045,heatpump,21.80000000000
+6,2055,R2,2045,heatpump,21.80000000000
+6,2059,R2,2045,heatpump,21.80000000000
+7,2055,R2,2050,heatpump,28.60000000000
+7,2059,R2,2050,heatpump,28.60000000000
+7,2060,R2,2050,heatpump,28.60000000000
+7,2064,R2,2050,heatpump,28.60000000000
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 2cf8d713..f2a10f52 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
+0,heat,R1,2020,0,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R1,2020,1,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R1,2025,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,1,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,2,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2025,3,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2020,0,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R2,2020,1,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,1,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,2,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2025,3,heatpump,2020,all-year,all-week,night,0.36250000000
+0,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,night,6.74060000000
+1,heat,R1,2020,0,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R1,2020,1,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,1,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,2,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2025,3,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2020,0,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R2,2020,1,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,1,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,2,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2025,3,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,morning,9.62950000000
+2,heat,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,2,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2025,3,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,2,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2025,3,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+3,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,1,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,2,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2025,3,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,1,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,2,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2025,3,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+4,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
+4,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
 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,R1,2025,2,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2025,3,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
+4,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
 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,heat,R2,2025,2,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2025,3,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
+4,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
 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,2020,0,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
+4,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
 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
+5,heat,R1,2020,0,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R1,2020,1,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,1,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,2,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2025,3,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2020,0,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R2,2020,1,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,1,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,2,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2025,3,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,evening,13.48120000000
+6,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,1,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,2,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2025,3,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,1,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,2,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2025,3,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+7,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,2,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2025,3,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,2,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2025,3,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
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 e03b6acf..5a647211 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
+0,heat,R1,2025,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,2,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,4,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2025,6,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,3,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,4,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,5,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,6,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,7,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,2,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,4,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2025,6,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,3,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,4,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,5,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,6,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,7,heatpump,2025,all-year,all-week,night,0.17670000000
+0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,night,2.85800000000
+1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,4,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2025,6,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,3,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,4,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,5,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,6,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,7,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,4,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2025,6,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,3,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,4,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,5,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,6,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,7,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,morning,4.08290000000
+2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
 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,R1,2025,4,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-peak,0.53000000000
 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,heat,R2,2025,4,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-peak,0.53000000000
 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,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
 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
+4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,4,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2025,6,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,3,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,4,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,5,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,6,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,7,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,4,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2025,6,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,3,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,4,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,5,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,6,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,7,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,evening,5.71610000000
+6,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+7,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
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 ed5f57f1..ed7feb58 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
+0,heat,R1,2030,0,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,5,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,6,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,4,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2035,6,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,7,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2030,0,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,5,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,6,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,4,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2035,6,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,7,heatpump,2030,all-year,all-week,night,0.47920000000
+0,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+1,heat,R1,2030,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,5,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,6,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,4,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2035,6,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,7,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2030,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,5,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,6,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,4,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2035,6,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,7,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+2,heat,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,5,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,4,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,7,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,5,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,4,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,7,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+3,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+4,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+5,heat,R1,2030,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,5,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,6,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,4,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2035,6,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,7,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2030,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,5,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,6,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,4,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2035,6,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,7,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+6,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+7,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
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 f705f5ab..c646a84f 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
+0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,2,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,3,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2035,5,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,6,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,2,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,3,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2035,5,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,6,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
+0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
+1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,2,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,3,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2035,5,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,6,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,2,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,3,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2035,5,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,6,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
+2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,2,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2035,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,2,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2035,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,2,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2035,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,2,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2035,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,2,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2035,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,2,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2035,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,2,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,3,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2035,5,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,6,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,2,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,3,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2035,5,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,6,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
+6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,2,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2035,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,2,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2035,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,2,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2035,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,2,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2035,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
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 e83a6d96..0d712dd6 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
+0,heat,R1,2040,0,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,1,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,1,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,2,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,4,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,5,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2040,0,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,1,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,1,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,2,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,4,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,5,heatpump,2040,all-year,all-week,night,0.59580000000
+1,heat,R1,2040,0,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,1,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,1,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,2,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,4,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,5,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2040,0,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,1,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,1,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,2,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,4,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,5,heatpump,2040,all-year,all-week,morning,0.85120000000
+2,heat,R1,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,2,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,5,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,2,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,5,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+3,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,2,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,5,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,2,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,5,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+4,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,2,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,5,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,2,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,5,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+5,heat,R1,2040,0,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,1,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,1,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,2,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,4,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,5,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2040,0,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,1,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,1,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,2,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,4,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,5,heatpump,2040,all-year,all-week,evening,1.19170000000
+6,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,2,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,5,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,2,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,5,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+7,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,2,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,5,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,2,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,5,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
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 79c2096b..0e8f2640 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
+0,heat,R1,2045,0,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,1,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,3,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,4,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,1,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,2,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,4,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,5,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2045,0,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,1,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,3,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,4,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,1,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,2,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,4,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,5,heatpump,2045,all-year,all-week,night,0.45420000000
+1,heat,R1,2045,0,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,1,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,3,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,4,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,1,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,2,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,4,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,5,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2045,0,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,1,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,3,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,4,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,1,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,2,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,4,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,5,heatpump,2045,all-year,all-week,morning,0.64880000000
+2,heat,R1,2045,0,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,2,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,5,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2045,0,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,2,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,5,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+3,heat,R1,2045,0,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,2,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,5,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2045,0,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,2,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,5,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+4,heat,R1,2045,0,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,2,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,5,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2045,0,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,2,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,5,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+5,heat,R1,2045,0,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,1,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,3,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,4,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,1,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,2,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,4,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,5,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2045,0,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,1,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,3,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,4,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,1,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,2,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,4,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,5,heatpump,2045,all-year,all-week,evening,0.90830000000
+6,heat,R1,2045,0,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,2,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,5,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2045,0,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,2,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,5,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+7,heat,R1,2045,0,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,2,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,5,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2045,0,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,2,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,5,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
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 bff478f6..7621d849 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
+0,heat,R1,2050,1,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,2,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,5,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,6,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,2,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,3,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2055,6,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,1,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,2,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,5,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,6,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,2,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,3,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2055,6,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
+1,heat,R1,2050,1,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,2,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,5,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,6,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,2,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,3,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2055,6,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,1,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,2,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,5,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,6,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,2,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,3,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2055,6,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
+2,heat,R1,2050,1,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,3,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2055,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,1,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,3,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2055,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+3,heat,R1,2050,1,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,3,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2055,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,1,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,3,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2055,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+4,heat,R1,2050,1,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,3,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2055,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,1,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,3,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2055,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+5,heat,R1,2050,1,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,2,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,5,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,6,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,2,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,3,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2055,6,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,1,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,2,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,5,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,6,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,2,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,3,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2055,6,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
+6,heat,R1,2050,1,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,3,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2055,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,1,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,3,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2055,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+7,heat,R1,2050,1,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,3,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2055,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,1,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,3,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2055,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
index 97378524..9e363207 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
 RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,0.714,0,0,0
-R1,gasboiler,2,0,0,1.071,0,0,0
-R1,gasboiler,3,0,0,0.714,0,0,0
-R1,gasboiler,4,0,0,1.071,0,0,0
-R1,gasboiler,5,0,0,2.143,0,0,0
-R1,gasboiler,6,0,0,1.429,0,0,0
-R1,gasboiler,7,0,0,1.429,0,0,0
-R1,gasboiler,8,0,0,1.429,0,0,0
-R2,gasboiler,1,0,0,0.714,0,0,0
-R2,gasboiler,2,0,0,1.071,0,0,0
-R2,gasboiler,3,0,0,0.714,0,0,0
-R2,gasboiler,4,0,0,1.071,0,0,0
-R2,gasboiler,5,0,0,2.143,0,0,0
-R2,gasboiler,6,0,0,1.429,0,0,0
-R2,gasboiler,7,0,0,1.429,0,0,0
-R2,gasboiler,8,0,0,1.429,0,0,0
+R1,gasboiler,1,0,0,0.7,0,0,0
+R1,gasboiler,2,0,0,1.0,0,0,0
+R1,gasboiler,3,0,0,0.7,0,0,0
+R1,gasboiler,4,0,0,1.0,0,0,0
+R1,gasboiler,5,0,0,2.1,0,0,0
+R1,gasboiler,6,0,0,1.4,0,0,0
+R1,gasboiler,7,0,0,1.4,0,0,0
+R1,gasboiler,8,0,0,1.4,0,0,0
+R2,gasboiler,1,0,0,0.7,0,0,0
+R2,gasboiler,2,0,0,1.0,0,0,0
+R2,gasboiler,3,0,0,0.7,0,0,0
+R2,gasboiler,4,0,0,1.0,0,0,0
+R2,gasboiler,5,0,0,2.1,0,0,0
+R2,gasboiler,6,0,0,1.4,0,0,0
+R2,gasboiler,7,0,0,1.4,0,0,0
+R2,gasboiler,8,0,0,1.4,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
index 5e20cf90..3edb36b0 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
 RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,2.142,0,0,0
-R1,gasboiler,2,0,0,3.213,0,0,0
-R1,gasboiler,3,0,0,2.142,0,0,0
-R1,gasboiler,4,0,0,3.213,0,0,0
-R1,gasboiler,5,0,0,6.428999999999999,0,0,0
-R1,gasboiler,6,0,0,4.287,0,0,0
-R1,gasboiler,7,0,0,4.287,0,0,0
-R1,gasboiler,8,0,0,4.287,0,0,0
-R2,gasboiler,1,0,0,2.142,0,0,0
-R2,gasboiler,2,0,0,3.213,0,0,0
-R2,gasboiler,3,0,0,2.142,0,0,0
-R2,gasboiler,4,0,0,3.213,0,0,0
-R2,gasboiler,5,0,0,6.428999999999999,0,0,0
-R2,gasboiler,6,0,0,4.287,0,0,0
-R2,gasboiler,7,0,0,4.287,0,0,0
-R2,gasboiler,8,0,0,4.287,0,0,0
+R1,gasboiler,1,0,0,2.1,0,0,0
+R1,gasboiler,2,0,0,3.0,0,0,0
+R1,gasboiler,3,0,0,2.1,0,0,0
+R1,gasboiler,4,0,0,3.0,0,0,0
+R1,gasboiler,5,0,0,6.3,0,0,0
+R1,gasboiler,6,0,0,4.2,0,0,0
+R1,gasboiler,7,0,0,4.2,0,0,0
+R1,gasboiler,8,0,0,4.2,0,0,0
+R2,gasboiler,1,0,0,2.1,0,0,0
+R2,gasboiler,2,0,0,3.0,0,0,0
+R2,gasboiler,3,0,0,2.1,0,0,0
+R2,gasboiler,4,0,0,3.0,0,0,0
+R2,gasboiler,5,0,0,6.3,0,0,0
+R2,gasboiler,6,0,0,4.2,0,0,0
+R2,gasboiler,7,0,0,4.2,0,0,0
+R2,gasboiler,8,0,0,4.2,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..842d3b01
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,5 @@
+asset,year,region,installed,technology,capacity
+0,2025,R1,2020,gassupply1,15.00000000000
+0,2030,R1,2020,gassupply1,7.50000000000
+1,2025,R2,2020,gassupply1,15.00000000000
+1,2030,R2,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index 68a03dc3..45ee801b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,15 +1,15 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2032,R1,2030,gassupply1,2.99730000000
-1,2035,R1,2030,gassupply1,2.99730000000
-1,2040,R1,2030,gassupply1,2.99730000000
-1,2045,R1,2030,gassupply1,2.99730000000
-1,2050,R1,2030,gassupply1,2.99730000000
-1,2066,R1,2030,gassupply1,2.99730000000
+1,2032,R1,2030,gassupply1,3.08710000000
+1,2035,R1,2030,gassupply1,3.08710000000
+1,2040,R1,2030,gassupply1,3.08710000000
+1,2045,R1,2030,gassupply1,3.08710000000
+1,2050,R1,2030,gassupply1,3.08710000000
+1,2066,R1,2030,gassupply1,3.08710000000
 2,2030,R2,2020,gassupply1,7.50000000000
-3,2032,R2,2030,gassupply1,2.99730000000
-3,2035,R2,2030,gassupply1,2.99730000000
-3,2040,R2,2030,gassupply1,2.99730000000
-3,2045,R2,2030,gassupply1,2.99730000000
-3,2050,R2,2030,gassupply1,2.99730000000
-3,2066,R2,2030,gassupply1,2.99730000000
+3,2032,R2,2030,gassupply1,3.08710000000
+3,2035,R2,2030,gassupply1,3.08710000000
+3,2040,R2,2030,gassupply1,3.08710000000
+3,2045,R2,2030,gassupply1,3.08710000000
+3,2050,R2,2030,gassupply1,3.08710000000
+3,2066,R2,2030,gassupply1,3.08710000000
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 b1eca482..70439426 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,15 +1,15 @@
 asset,year,region,installed,technology,capacity
-1,2032,R1,2030,gassupply1,2.99730000000
-1,2034,R1,2030,gassupply1,2.99730000000
-1,2035,R1,2030,gassupply1,2.99730000000
-1,2040,R1,2030,gassupply1,2.99730000000
-1,2045,R1,2030,gassupply1,2.99730000000
-1,2050,R1,2030,gassupply1,2.99730000000
-1,2066,R1,2030,gassupply1,2.99730000000
-3,2032,R2,2030,gassupply1,2.99730000000
-3,2034,R2,2030,gassupply1,2.99730000000
-3,2035,R2,2030,gassupply1,2.99730000000
-3,2040,R2,2030,gassupply1,2.99730000000
-3,2045,R2,2030,gassupply1,2.99730000000
-3,2050,R2,2030,gassupply1,2.99730000000
-3,2066,R2,2030,gassupply1,2.99730000000
+1,2032,R1,2030,gassupply1,3.08710000000
+1,2034,R1,2030,gassupply1,3.08710000000
+1,2035,R1,2030,gassupply1,3.08710000000
+1,2040,R1,2030,gassupply1,3.08710000000
+1,2045,R1,2030,gassupply1,3.08710000000
+1,2050,R1,2030,gassupply1,3.08710000000
+1,2066,R1,2030,gassupply1,3.08710000000
+3,2032,R2,2030,gassupply1,3.08710000000
+3,2034,R2,2030,gassupply1,3.08710000000
+3,2035,R2,2030,gassupply1,3.08710000000
+3,2040,R2,2030,gassupply1,3.08710000000
+3,2045,R2,2030,gassupply1,3.08710000000
+3,2050,R2,2030,gassupply1,3.08710000000
+3,2066,R2,2030,gassupply1,3.08710000000
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 c03450c5..d80a692f 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,15 +1,15 @@
 asset,year,region,installed,technology,capacity
-1,2034,R1,2030,gassupply1,2.99730000000
-1,2035,R1,2030,gassupply1,2.99730000000
-1,2036,R1,2030,gassupply1,2.99730000000
-1,2040,R1,2030,gassupply1,2.99730000000
-1,2045,R1,2030,gassupply1,2.99730000000
-1,2050,R1,2030,gassupply1,2.99730000000
-1,2066,R1,2030,gassupply1,2.99730000000
-3,2034,R2,2030,gassupply1,2.99730000000
-3,2035,R2,2030,gassupply1,2.99730000000
-3,2036,R2,2030,gassupply1,2.99730000000
-3,2040,R2,2030,gassupply1,2.99730000000
-3,2045,R2,2030,gassupply1,2.99730000000
-3,2050,R2,2030,gassupply1,2.99730000000
-3,2066,R2,2030,gassupply1,2.99730000000
+1,2034,R1,2030,gassupply1,3.08710000000
+1,2035,R1,2030,gassupply1,3.08710000000
+1,2036,R1,2030,gassupply1,3.08710000000
+1,2040,R1,2030,gassupply1,3.08710000000
+1,2045,R1,2030,gassupply1,3.08710000000
+1,2050,R1,2030,gassupply1,3.08710000000
+1,2066,R1,2030,gassupply1,3.08710000000
+3,2034,R2,2030,gassupply1,3.08710000000
+3,2035,R2,2030,gassupply1,3.08710000000
+3,2036,R2,2030,gassupply1,3.08710000000
+3,2040,R2,2030,gassupply1,3.08710000000
+3,2045,R2,2030,gassupply1,3.08710000000
+3,2050,R2,2030,gassupply1,3.08710000000
+3,2066,R2,2030,gassupply1,3.08710000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..a783d6f6
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,11 @@
+asset,year,region,installed,technology,capacity
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2035,R2,2030,gassupply1,5.28440000000
+3,2040,R2,2030,gassupply1,5.28440000000
+3,2045,R2,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
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 7c80bf12..e8bfc232 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,13 +1,13 @@
 asset,year,region,installed,technology,capacity
-1,2036,R1,2030,gassupply1,2.99730000000
-1,2038,R1,2030,gassupply1,2.99730000000
-1,2040,R1,2030,gassupply1,2.99730000000
-1,2045,R1,2030,gassupply1,2.99730000000
-1,2050,R1,2030,gassupply1,2.99730000000
-1,2066,R1,2030,gassupply1,2.99730000000
-3,2036,R2,2030,gassupply1,2.99730000000
-3,2038,R2,2030,gassupply1,2.99730000000
-3,2040,R2,2030,gassupply1,2.99730000000
-3,2045,R2,2030,gassupply1,2.99730000000
-3,2050,R2,2030,gassupply1,2.99730000000
-3,2066,R2,2030,gassupply1,2.99730000000
+1,2036,R1,2030,gassupply1,3.08710000000
+1,2038,R1,2030,gassupply1,3.08710000000
+1,2040,R1,2030,gassupply1,3.08710000000
+1,2045,R1,2030,gassupply1,3.08710000000
+1,2050,R1,2030,gassupply1,3.08710000000
+1,2066,R1,2030,gassupply1,3.08710000000
+3,2036,R2,2030,gassupply1,3.08710000000
+3,2038,R2,2030,gassupply1,3.08710000000
+3,2040,R2,2030,gassupply1,3.08710000000
+3,2045,R2,2030,gassupply1,3.08710000000
+3,2050,R2,2030,gassupply1,3.08710000000
+3,2066,R2,2030,gassupply1,3.08710000000
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 0c3ee68d..1fa27c3e 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,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2038,R1,2030,gassupply1,2.99730000000
-1,2040,R1,2030,gassupply1,2.99730000000
-1,2045,R1,2030,gassupply1,2.99730000000
-1,2050,R1,2030,gassupply1,2.99730000000
-1,2066,R1,2030,gassupply1,2.99730000000
-3,2038,R2,2030,gassupply1,2.99730000000
-3,2040,R2,2030,gassupply1,2.99730000000
-3,2045,R2,2030,gassupply1,2.99730000000
-3,2050,R2,2030,gassupply1,2.99730000000
-3,2066,R2,2030,gassupply1,2.99730000000
+1,2038,R1,2030,gassupply1,3.08710000000
+1,2040,R1,2030,gassupply1,3.08710000000
+1,2045,R1,2030,gassupply1,3.08710000000
+1,2050,R1,2030,gassupply1,3.08710000000
+1,2066,R1,2030,gassupply1,3.08710000000
+3,2038,R2,2030,gassupply1,3.08710000000
+3,2040,R2,2030,gassupply1,3.08710000000
+3,2045,R2,2030,gassupply1,3.08710000000
+3,2050,R2,2030,gassupply1,3.08710000000
+3,2066,R2,2030,gassupply1,3.08710000000
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 2af2554d..887e8fe5 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,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,2.99730000000
-1,2042,R1,2030,gassupply1,2.99730000000
-1,2045,R1,2030,gassupply1,2.99730000000
-1,2050,R1,2030,gassupply1,2.99730000000
-1,2066,R1,2030,gassupply1,2.99730000000
-3,2040,R2,2030,gassupply1,2.99730000000
-3,2042,R2,2030,gassupply1,2.99730000000
-3,2045,R2,2030,gassupply1,2.99730000000
-3,2050,R2,2030,gassupply1,2.99730000000
-3,2066,R2,2030,gassupply1,2.99730000000
+1,2040,R1,2030,gassupply1,3.08710000000
+1,2042,R1,2030,gassupply1,3.08710000000
+1,2045,R1,2030,gassupply1,3.08710000000
+1,2050,R1,2030,gassupply1,3.08710000000
+1,2066,R1,2030,gassupply1,3.08710000000
+3,2040,R2,2030,gassupply1,3.08710000000
+3,2042,R2,2030,gassupply1,3.08710000000
+3,2045,R2,2030,gassupply1,3.08710000000
+3,2050,R2,2030,gassupply1,3.08710000000
+3,2066,R2,2030,gassupply1,3.08710000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..4ed429aa
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,7 @@
+asset,year,region,installed,technology,capacity
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2045,R2,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..7d594329
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,7 @@
+asset,year,region,installed,technology,capacity
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
+3,2050,R2,2030,gassupply1,5.28440000000
+3,2055,R2,2030,gassupply1,5.28440000000
+3,2069,R2,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 2fa23ca2..3fa140ea 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -6,240 +6,240 @@ gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2022,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2022,14.42990000000
+heatpump,R1,R1,A1,residential,retrofit,2022,14.04000000000
 gasboiler,R2,R2,A1,residential,retrofit,2022,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2022,14.42990000000
+heatpump,R2,R2,A1,residential,retrofit,2022,14.04000000000
 gasCCGT,R1,R1,A1,power,retrofit,2022,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2022,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2022,3.79000000000
 windturbine,R1,R1,A1,power,retrofit,2022,8.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2022,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2022,12.17990000000
+windturbine,R2,R2,A1,power,retrofit,2022,11.79000000000
 gassupply1,R1,R1,A1,gas,retrofit,2022,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2022,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2024,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2024,14.42990000000
-heatpump,R1,R1,A1,residential,retrofit,2024,2.28590000000
+heatpump,R1,R1,A1,residential,retrofit,2024,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2024,2.24000000000
 gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2024,14.42990000000
-heatpump,R2,R2,A1,residential,retrofit,2024,2.28590000000
+heatpump,R2,R2,A1,residential,retrofit,2024,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2024,2.24000000000
 gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2024,4.17990000000
+solarPV,R1,R1,A1,power,retrofit,2024,3.79000000000
 windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2024,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2024,2.24000000000
 gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2024,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2024,2.28590000000
+windturbine,R2,R2,A1,power,retrofit,2024,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2024,2.24000000000
 gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2026,2.32550000000
-heatpump,R1,R1,A1,residential,retrofit,2026,14.42990000000
-heatpump,R1,R1,A1,residential,retrofit,2026,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2026,4.96040000000
-gasboiler,R2,R2,A1,residential,retrofit,2026,2.32550000000
-heatpump,R2,R2,A1,residential,retrofit,2026,14.42990000000
-heatpump,R2,R2,A1,residential,retrofit,2026,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2026,4.96040000000
-solarPV,R1,R1,A1,power,retrofit,2026,4.17990000000
+gasboiler,R1,R1,A1,residential,retrofit,2026,2.39520000000
+heatpump,R1,R1,A1,residential,retrofit,2026,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2026,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2026,4.84480000000
+gasboiler,R2,R2,A1,residential,retrofit,2026,2.39520000000
+heatpump,R2,R2,A1,residential,retrofit,2026,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2026,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2026,4.84480000000
+solarPV,R1,R1,A1,power,retrofit,2026,3.79000000000
 windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2026,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2026,7.21040000000
-windturbine,R2,R2,A1,power,retrofit,2026,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2026,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2026,7.21040000000
+windturbine,R1,R1,A1,power,retrofit,2026,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2026,7.09480000000
+windturbine,R2,R2,A1,power,retrofit,2026,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2026,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2026,7.09480000000
 gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2028,2.32550000000
-heatpump,R1,R1,A1,residential,retrofit,2028,14.42990000000
-heatpump,R1,R1,A1,residential,retrofit,2028,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2028,4.96040000000
-heatpump,R1,R1,A1,residential,retrofit,2028,2.28590000000
-gasboiler,R2,R2,A1,residential,retrofit,2028,2.32550000000
-heatpump,R2,R2,A1,residential,retrofit,2028,14.42990000000
-heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2028,4.96040000000
-heatpump,R2,R2,A1,residential,retrofit,2028,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2028,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2028,2.28590000000
+gasboiler,R1,R1,A1,residential,retrofit,2028,2.39520000000
+heatpump,R1,R1,A1,residential,retrofit,2028,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2028,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2028,4.84480000000
+heatpump,R1,R1,A1,residential,retrofit,2028,2.24000000000
+gasboiler,R2,R2,A1,residential,retrofit,2028,2.39520000000
+heatpump,R2,R2,A1,residential,retrofit,2028,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2028,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2028,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2028,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2028,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2028,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2028,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2028,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2028,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2028,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2028,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2028,7.21040000000
+windturbine,R1,R1,A1,power,retrofit,2028,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2028,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2028,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2028,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2028,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2028,7.09480000000
 gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.32550000000
-heatpump,R1,R1,A1,residential,retrofit,2030,14.42990000000
-heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2030,4.96040000000
-heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2030,2.28590000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.32550000000
-heatpump,R2,R2,A1,residential,retrofit,2030,14.42990000000
-heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2030,4.96040000000
-heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2030,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2030,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.28590000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.39520000000
+heatpump,R1,R1,A1,residential,retrofit,2030,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,4.84480000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.39520000000
+heatpump,R2,R2,A1,residential,retrofit,2030,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2030,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2030,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2030,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2030,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2030,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2030,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2030,7.21040000000
+windturbine,R1,R1,A1,power,retrofit,2030,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2030,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2030,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2030,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2030,7.09480000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2032,2.32550000000
-heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2032,4.96040000000
-heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2032,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2032,16.71570000000
-gasboiler,R2,R2,A1,residential,retrofit,2032,2.32550000000
-heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2032,4.96040000000
-heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2032,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2032,16.71570000000
-solarPV,R1,R1,A1,power,retrofit,2032,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2032,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2032,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2032,2.28590000000
+gasboiler,R1,R1,A1,residential,retrofit,2032,2.39520000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2032,4.84480000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2032,16.28000000000
+gasboiler,R2,R2,A1,residential,retrofit,2032,2.39520000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2032,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2032,16.28000000000
+solarPV,R1,R1,A1,power,retrofit,2032,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2032,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2032,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2032,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2032,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2032,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2032,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2032,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2032,7.21040000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,2.99730000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,2.99730000000
-gasboiler,R1,R1,A1,residential,retrofit,2034,2.32550000000
-heatpump,R1,R1,A1,residential,retrofit,2034,4.96040000000
-heatpump,R1,R1,A1,residential,retrofit,2034,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2034,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2034,16.71570000000
-heatpump,R1,R1,A1,residential,retrofit,2034,4.57170000000
-gasboiler,R2,R2,A1,residential,retrofit,2034,2.32550000000
-heatpump,R2,R2,A1,residential,retrofit,2034,4.96040000000
-heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2034,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2034,16.71570000000
-heatpump,R2,R2,A1,residential,retrofit,2034,4.57170000000
-solarPV,R1,R1,A1,power,retrofit,2034,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2032,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2032,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2032,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2032,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2032,7.09480000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,3.08710000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,3.08710000000
+gasboiler,R1,R1,A1,residential,retrofit,2034,2.39520000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.84480000000
+heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2034,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.48000000000
+gasboiler,R2,R2,A1,residential,retrofit,2034,2.39520000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2034,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.48000000000
+solarPV,R1,R1,A1,power,retrofit,2034,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2034,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2034,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2034,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2034,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2034,7.21040000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,2.99730000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,2.99730000000
-heatpump,R1,R1,A1,residential,retrofit,2036,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2036,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2036,16.71570000000
-heatpump,R1,R1,A1,residential,retrofit,2036,4.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2036,9.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2036,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2036,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2036,16.71570000000
-heatpump,R2,R2,A1,residential,retrofit,2036,4.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2036,9.57170000000
-solarPV,R1,R1,A1,power,retrofit,2036,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2036,4.61130000000
+windturbine,R1,R1,A1,power,retrofit,2034,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2034,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2034,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2034,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2034,7.09480000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,3.08710000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,3.08710000000
+heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,9.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,9.48000000000
+solarPV,R1,R1,A1,power,retrofit,2036,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,4.63520000000
 windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2036,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2036,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2036,4.61130000000
-windturbine,R2,R2,A1,power,retrofit,2036,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2036,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2036,7.21040000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,2.99730000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,2.99730000000
-heatpump,R1,R1,A1,residential,retrofit,2038,2.28590000000
-heatpump,R1,R1,A1,residential,retrofit,2038,16.71570000000
-heatpump,R1,R1,A1,residential,retrofit,2038,4.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2038,9.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2038,4.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2038,2.28590000000
-heatpump,R2,R2,A1,residential,retrofit,2038,16.71570000000
-heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2038,9.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2038,4.57170000000
-solarPV,R1,R1,A1,power,retrofit,2038,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2038,4.61130000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2036,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2036,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,4.63520000000
+windturbine,R2,R2,A1,power,retrofit,2036,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2036,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2036,7.09480000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,3.08710000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,3.08710000000
+heatpump,R1,R1,A1,residential,retrofit,2038,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,9.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,9.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,4.48000000000
+solarPV,R1,R1,A1,power,retrofit,2038,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,4.63520000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2038,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2038,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2038,4.61130000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2038,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2038,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2038,7.21040000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,2.99730000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,2.99730000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.71570000000
-heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2040,9.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2040,4.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.71570000000
-heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2040,9.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2040,4.57170000000
-solarPV,R1,R1,A1,power,retrofit,2040,4.17990000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2040,4.61130000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.28590000000
+windturbine,R1,R1,A1,power,retrofit,2038,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2038,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,4.63520000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2038,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2038,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2038,7.09480000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,3.08710000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,3.08710000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,9.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,9.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
+solarPV,R1,R1,A1,power,retrofit,2040,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,4.63520000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,2.28590000000
-windturbine,R1,R1,A1,power,retrofit,2040,7.21040000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2040,4.61130000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2040,12.17990000000
-windturbine,R2,R2,A1,power,retrofit,2040,2.28590000000
-windturbine,R2,R2,A1,power,retrofit,2040,7.21040000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.99730000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.99730000000
+windturbine,R1,R1,A1,power,retrofit,2040,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2040,7.09480000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,4.63520000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2040,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2040,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2040,7.09480000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,3.08710000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,3.08710000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index e58a802a..63152a1c 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,16.44340000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,16.44340000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,6.03240000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,6.03240000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,80.14440000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,80.14440000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,16.44530000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,16.44530000000,2022
+"('all-year', 'all-week', 'night')",gas,R1,6.03250000000,2022
+"('all-year', 'all-week', 'night')",gas,R2,6.03250000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,80.14650000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,80.14650000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,16.47540000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,16.47540000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,6.03500000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,6.03500000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,80.21670000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,80.21670000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,16.47360000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,16.47360000000,2022
+"('all-year', 'all-week', 'morning')",gas,R1,6.03470000000,2022
+"('all-year', 'all-week', 'morning')",gas,R2,6.03470000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,80.20930000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,80.20930000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.44340000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.44340000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.03240000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.03240000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.14440000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.14440000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.44530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.44530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.03250000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.03250000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.14650000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.14650000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.47540000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,16.47540000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.03500000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.03500000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.21670000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.21670000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.47360000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,16.47360000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.03470000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.03470000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.20930000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.20930000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57160000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,16.57160000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.04260000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.04260000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.43360000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.43360000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57740000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,16.57740000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.04270000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.04270000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.43950000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.43950000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,16.50750000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,16.50750000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,6.03750000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,6.03750000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,80.28910000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,80.28910000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,16.51140000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'evening')",gas,R1,6.03760000000,2022
+"('all-year', 'all-week', 'evening')",gas,R2,6.03760000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,80.29300000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,80.29300000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,16.50750000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,16.50750000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.03750000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.03750000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.28910000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.28910000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,16.51140000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.03760000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.03760000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.29300000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.29300000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.50750000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.50750000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.03750000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.03750000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.28910000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.28910000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.51140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.03760000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.03760000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.29300000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.29300000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,13.21020000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,13.21020000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,4.83100000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,4.83100000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,64.23710000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,64.23710000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,13.21340000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,13.21340000000,2024
+"('all-year', 'all-week', 'night')",gas,R1,4.83110000000,2024
+"('all-year', 'all-week', 'night')",gas,R2,4.83110000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,64.24060000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,64.24060000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,13.26370000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,13.26370000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,4.83560000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,4.83560000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,64.35580000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,64.35580000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,13.26050000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,13.26050000000,2024
+"('all-year', 'all-week', 'morning')",gas,R1,4.83510000000,2024
+"('all-year', 'all-week', 'morning')",gas,R2,4.83510000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,64.34380000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,64.34380000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21020000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21020000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83100000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83100000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.23710000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.23710000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83110000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83110000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24060000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24060000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26370000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26370000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.83560000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.83560000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.35580000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.35580000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26050000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26050000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.83510000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.83510000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.34380000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.34380000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.42410000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.42410000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.84920000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.84920000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.71340000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.71340000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.43350000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.43350000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.84950000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.84950000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.72350000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.72350000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,13.31720000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,13.31720000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,4.84010000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,4.84010000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,64.47510000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,64.47510000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,13.32340000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,13.32340000000,2024
+"('all-year', 'all-week', 'evening')",gas,R1,4.84030000000,2024
+"('all-year', 'all-week', 'evening')",gas,R2,4.84030000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,64.48170000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,64.48170000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,13.31720000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,13.31720000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.84010000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.84010000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.47510000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.47510000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.32340000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.32340000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.84030000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.84030000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.48170000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.48170000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.31720000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.31720000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84010000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84010000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.47510000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.47510000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.32340000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.32340000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84030000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84030000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48170000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48170000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,10.58620000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,10.58620000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,3.86990000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,3.86990000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,51.47940000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,51.47940000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,10.58890000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,10.58890000000,2026
+"('all-year', 'all-week', 'night')",gas,R1,3.87000000000,2026
+"('all-year', 'all-week', 'night')",gas,R2,3.87000000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,51.48380000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,51.48380000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,10.63800000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,10.63800000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,3.87600000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,3.87600000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,51.61970000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,51.61970000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,10.63440000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,10.63440000000,2026
+"('all-year', 'all-week', 'morning')",gas,R1,3.87530000000,2026
+"('all-year', 'all-week', 'morning')",gas,R2,3.87530000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,51.60590000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,51.60590000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.58620000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.58620000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.86990000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.86990000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.47940000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.47940000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.58890000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.58890000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.87000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.87000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48380000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48380000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63800000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63800000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.87600000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.87600000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.61970000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.61970000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63440000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63440000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.87530000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.87530000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.60590000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.60590000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.79340000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,10.79340000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.89460000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.89460000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.04350000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.04350000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.80140000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,10.80140000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.89490000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.89490000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.05630000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.05630000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,10.68990000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,10.68990000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,3.88220000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,3.88220000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,51.76080000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,51.76080000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,10.69510000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,10.69510000000,2026
+"('all-year', 'all-week', 'evening')",gas,R1,3.88250000000,2026
+"('all-year', 'all-week', 'evening')",gas,R2,3.88250000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,51.76920000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,51.76920000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,10.68990000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,10.68990000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.88220000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.88220000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.76080000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.76080000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,10.69510000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,10.69510000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.88250000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.88250000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.76920000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.76920000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.68990000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.68990000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88220000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88220000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.76080000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.76080000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.69510000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.69510000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88250000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88250000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.76920000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.76920000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,8.48700000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,8.48700000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,3.10100000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,3.10100000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,41.25840000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,41.25840000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,8.48940000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,8.48940000000,2028
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2028
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,41.26330000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,41.26330000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,8.53740000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,8.53740000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,3.10840000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,3.10840000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,41.40850000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,41.40850000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,8.53360000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,8.53360000000,2028
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2028
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,41.39410000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,41.39410000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.48700000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.48700000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10100000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10100000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.25840000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.25840000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.48940000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.48940000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.26330000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.26330000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53740000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53740000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10840000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10840000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.40850000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.40850000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53360000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53360000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.39410000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.39410000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.68890000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,8.68890000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13080000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13080000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,41.86280000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,41.86280000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.69580000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.69580000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.87740000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.87740000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,8.58800000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,8.58800000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,3.11590000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,3.11590000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,41.55960000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,41.55960000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,8.59260000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,8.59260000000,2028
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2028
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,41.56910000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,41.56910000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,8.58800000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,8.58800000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11590000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11590000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,41.55960000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,41.55960000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.59260000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.59260000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.56910000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.56910000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.58800000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.58800000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11590000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11590000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.55960000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.55960000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.59260000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.59260000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.56910000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.56910000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,6.80760000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,6.80760000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,2.48580000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,2.48580000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,33.06970000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,33.06970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,6.80970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,6.80970000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,2.48600000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,2.48600000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,33.07490000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,33.07490000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,6.85700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,6.85700000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,2.49430000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,2.49430000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,33.22170000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,33.22170000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,6.85290000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,6.85290000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,2.49340000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,2.49340000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,33.20740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,33.20740000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.80760000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.80760000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.48580000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.48580000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.06970000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.06970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.80970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.80970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.48600000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.48600000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.07490000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.07490000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85700000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.49430000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.49430000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.22170000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,33.22170000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85290000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85290000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.49340000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.49340000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.20740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.20740000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.00520000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,7.00520000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.51980000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.51980000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,33.68260000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,33.68260000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.01120000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.01120000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.52040000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.52040000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.69810000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.69810000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,6.90640000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,6.90640000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,2.50280000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,2.50280000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,33.37480000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,33.37480000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,6.91040000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,6.91040000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,2.50320000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,2.50320000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,33.38500000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,33.38500000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,6.90640000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,6.90640000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.50280000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.50280000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,33.37480000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,33.37480000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,6.91040000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,6.91040000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.50320000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.50320000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.38500000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.38500000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.90640000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.90640000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.50280000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.50280000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.37480000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.37480000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.91040000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.91040000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.50320000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.50320000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.38500000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.38500000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,5.46400000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,5.46400000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,1.99370000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,1.99370000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,26.50980000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,26.50980000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,5.46590000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,5.46590000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,1.99390000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,1.99390000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,26.51520000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,26.51520000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,5.51250000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,5.51250000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,2.00300000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,2.00300000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,26.65880000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,26.65880000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,5.50820000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,5.50820000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,2.00200000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,2.00200000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,26.64530000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,26.64530000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46400000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46400000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.99370000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.99370000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.50980000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.50980000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46590000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46590000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.99390000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.99390000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.51520000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.51520000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.51250000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,5.51250000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.00300000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.00300000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.65880000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,26.65880000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.50820000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,5.50820000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.00200000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.00200000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.64530000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,26.64530000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.65800000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,5.65800000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.03110000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.03110000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.11160000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,27.11160000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.66340000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,5.66340000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.03160000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.03160000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.12780000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,27.12780000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,5.56110000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,5.56110000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,2.01240000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,2.01240000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,26.80920000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,26.80920000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,5.56460000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,5.56460000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,2.01280000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,2.01280000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,26.81970000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,26.81970000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56110000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56110000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.01240000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.01240000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,26.80920000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,26.80920000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56460000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56460000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.01280000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.01280000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,26.81970000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,26.81970000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.01240000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.01240000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.80920000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.80920000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56460000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56460000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.01280000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.01280000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.81970000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.81970000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,4.38910000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,4.38910000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,21.25480000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,21.25480000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,4.39070000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,4.39070000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,21.26040000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,21.26040000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,4.43680000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,4.43680000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,21.39800000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,21.39800000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,4.43230000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,4.43230000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,21.38540000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,21.38540000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.38910000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.38910000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.25480000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.25480000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.39070000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.39070000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.26040000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.26040000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43680000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43680000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,21.39800000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,21.39800000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43230000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43230000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,21.38540000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,21.38540000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58000000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58000000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,21.83350000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,21.83350000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58480000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58480000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,21.85010000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,21.85010000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,4.48460000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,4.48460000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,21.54240000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,21.54240000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,4.48780000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,4.48780000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,21.55320000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,21.55320000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48460000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48460000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,21.54240000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,21.54240000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48780000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48780000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,21.55320000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,21.55320000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48460000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48460000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.54240000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.54240000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48780000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48780000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.55320000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.55320000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.08820000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.08820000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.13820000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.13820000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.08910000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.08910000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.13980000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.13980000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13230000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13230000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.20940000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.20940000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12730000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12730000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.20140000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.20140000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08820000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08820000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13820000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13820000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08910000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08910000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13980000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13980000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13230000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13230000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20940000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.20940000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12730000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12730000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20140000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.20140000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26480000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26480000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43130000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43130000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26730000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26730000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43610000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43610000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17660000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17660000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.28210000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.28210000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17820000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17820000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.28510000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.28510000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17660000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17660000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.28210000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.28210000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17820000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17820000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.28510000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.28510000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17660000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17660000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28210000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28210000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17820000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17820000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28510000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28510000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.08760000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.08760000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.08850000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.08850000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13150000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13150000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.02500000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.02500000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12640000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12640000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08760000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08760000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08850000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08850000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13150000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13150000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02500000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02500000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12640000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12640000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26300000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26300000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06140000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06140000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26550000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26550000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06220000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06220000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17540000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17540000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.03590000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.03590000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17700000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17700000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17540000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17540000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03590000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03590000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17700000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17700000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17540000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17540000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03590000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03590000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17700000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17700000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.08700000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08700000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,1.60000000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,1.60000000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08790000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08790000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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.13050000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13050000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,1.61000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,1.61000000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.02490000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.02490000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12550000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12550000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,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', 'mid-afternoon')",electricity,R1,0.08700000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08700000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60000000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60000000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08790000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08790000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13050000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13050000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.61000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.61000000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02490000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02490000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12550000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12550000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,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,0.26110000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26110000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64000000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06120000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06120000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26360000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26360000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06200000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06200000000,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,0.17410000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17410000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,1.62000000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,1.62000000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.03580000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.03580000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17570000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17570000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,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', 'early-morning')",electricity,R1,0.17410000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17410000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62000000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62000000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03580000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03580000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17570000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17570000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17410000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17410000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62000000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62000000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03580000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03580000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17570000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17570000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 f6737d1d..9f38e323 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
@@ -2,13 +2,13 @@ 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
+1,2022,R1,2020,solarPV,3.79000000000
+1,2025,R1,2020,solarPV,3.79000000000
+1,2030,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 2,2022,R1,2020,windturbine,8.00000000000
 2,2025,R1,2020,windturbine,8.00000000000
 2,2030,R1,2020,windturbine,8.00000000000
@@ -19,10 +19,10 @@ asset,year,region,installed,technology,capacity
 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
+4,2022,R2,2020,windturbine,11.79000000000
+4,2025,R2,2020,windturbine,11.79000000000
+4,2030,R2,2020,windturbine,11.79000000000
+4,2035,R2,2020,windturbine,11.79000000000
+4,2040,R2,2020,windturbine,11.79000000000
+4,2045,R2,2020,windturbine,11.79000000000
+4,2046,R2,2020,windturbine,11.79000000000
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 3b96337e..090b0ef6 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
@@ -2,14 +2,14 @@ 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
+1,2022,R1,2020,solarPV,3.79000000000
+1,2024,R1,2020,solarPV,3.79000000000
+1,2025,R1,2020,solarPV,3.79000000000
+1,2030,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 2,2022,R1,2020,windturbine,8.00000000000
 2,2024,R1,2020,windturbine,8.00000000000
 2,2025,R1,2020,windturbine,8.00000000000
@@ -18,32 +18,32 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.28590000000
-3,2025,R1,2022,windturbine,2.28590000000
-3,2030,R1,2022,windturbine,2.28590000000
-3,2035,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
+3,2024,R1,2022,windturbine,2.24000000000
+3,2025,R1,2022,windturbine,2.24000000000
+3,2030,R1,2022,windturbine,2.24000000000
+3,2035,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
 4,2022,R2,2020,gasCCGT,1.00000000000
 4,2024,R2,2020,gasCCGT,1.00000000000
 4,2025,R2,2020,gasCCGT,1.00000000000
-5,2022,R2,2020,windturbine,12.17990000000
-5,2024,R2,2020,windturbine,12.17990000000
-5,2025,R2,2020,windturbine,12.17990000000
-5,2030,R2,2020,windturbine,12.17990000000
-5,2035,R2,2020,windturbine,12.17990000000
-5,2040,R2,2020,windturbine,12.17990000000
-5,2045,R2,2020,windturbine,12.17990000000
-5,2046,R2,2020,windturbine,12.17990000000
-6,2024,R2,2022,windturbine,2.28590000000
-6,2025,R2,2022,windturbine,2.28590000000
-6,2030,R2,2022,windturbine,2.28590000000
-6,2035,R2,2022,windturbine,2.28590000000
-6,2040,R2,2022,windturbine,2.28590000000
-6,2045,R2,2022,windturbine,2.28590000000
-6,2046,R2,2022,windturbine,2.28590000000
-6,2047,R2,2022,windturbine,2.28590000000
-6,2048,R2,2022,windturbine,2.28590000000
+5,2022,R2,2020,windturbine,11.79000000000
+5,2024,R2,2020,windturbine,11.79000000000
+5,2025,R2,2020,windturbine,11.79000000000
+5,2030,R2,2020,windturbine,11.79000000000
+5,2035,R2,2020,windturbine,11.79000000000
+5,2040,R2,2020,windturbine,11.79000000000
+5,2045,R2,2020,windturbine,11.79000000000
+5,2046,R2,2020,windturbine,11.79000000000
+6,2024,R2,2022,windturbine,2.24000000000
+6,2025,R2,2022,windturbine,2.24000000000
+6,2030,R2,2022,windturbine,2.24000000000
+6,2035,R2,2022,windturbine,2.24000000000
+6,2040,R2,2022,windturbine,2.24000000000
+6,2045,R2,2022,windturbine,2.24000000000
+6,2046,R2,2022,windturbine,2.24000000000
+6,2047,R2,2022,windturbine,2.24000000000
+6,2048,R2,2022,windturbine,2.24000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index d921a31b..dcc9ed18 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -3,14 +3,14 @@ asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
 1,2024,gasCCGT,R2,2020,1.00000000000
 1,2025,gasCCGT,R2,2020,1.00000000000
-2,2024,solarPV,R1,2020,4.17990000000
-2,2025,solarPV,R1,2020,4.17990000000
-2,2026,solarPV,R1,2020,4.17990000000
-2,2030,solarPV,R1,2020,4.17990000000
-2,2035,solarPV,R1,2020,4.17990000000
-2,2040,solarPV,R1,2020,4.17990000000
-2,2045,solarPV,R1,2020,4.17990000000
-2,2046,solarPV,R1,2020,4.17990000000
+2,2024,solarPV,R1,2020,3.79000000000
+2,2025,solarPV,R1,2020,3.79000000000
+2,2026,solarPV,R1,2020,3.79000000000
+2,2030,solarPV,R1,2020,3.79000000000
+2,2035,solarPV,R1,2020,3.79000000000
+2,2040,solarPV,R1,2020,3.79000000000
+2,2045,solarPV,R1,2020,3.79000000000
+2,2046,solarPV,R1,2020,3.79000000000
 3,2024,windturbine,R1,2020,8.00000000000
 3,2025,windturbine,R1,2020,8.00000000000
 3,2026,windturbine,R1,2020,8.00000000000
@@ -19,51 +19,51 @@ asset,year,technology,region,installed,capacity
 3,2040,windturbine,R1,2020,8.00000000000
 3,2045,windturbine,R1,2020,8.00000000000
 3,2046,windturbine,R1,2020,8.00000000000
-4,2024,windturbine,R1,2022,2.28590000000
-4,2025,windturbine,R1,2022,2.28590000000
-4,2026,windturbine,R1,2022,2.28590000000
-4,2030,windturbine,R1,2022,2.28590000000
-4,2035,windturbine,R1,2022,2.28590000000
-4,2040,windturbine,R1,2022,2.28590000000
-4,2045,windturbine,R1,2022,2.28590000000
-4,2046,windturbine,R1,2022,2.28590000000
-4,2047,windturbine,R1,2022,2.28590000000
-4,2048,windturbine,R1,2022,2.28590000000
-5,2026,windturbine,R1,2024,7.21040000000
-5,2030,windturbine,R1,2024,7.21040000000
-5,2035,windturbine,R1,2024,7.21040000000
-5,2040,windturbine,R1,2024,7.21040000000
-5,2045,windturbine,R1,2024,7.21040000000
-5,2046,windturbine,R1,2024,7.21040000000
-5,2047,windturbine,R1,2024,7.21040000000
-5,2048,windturbine,R1,2024,7.21040000000
-5,2049,windturbine,R1,2024,7.21040000000
-5,2050,windturbine,R1,2024,7.21040000000
-6,2024,windturbine,R2,2020,12.17990000000
-6,2025,windturbine,R2,2020,12.17990000000
-6,2026,windturbine,R2,2020,12.17990000000
-6,2030,windturbine,R2,2020,12.17990000000
-6,2035,windturbine,R2,2020,12.17990000000
-6,2040,windturbine,R2,2020,12.17990000000
-6,2045,windturbine,R2,2020,12.17990000000
-6,2046,windturbine,R2,2020,12.17990000000
-7,2024,windturbine,R2,2022,2.28590000000
-7,2025,windturbine,R2,2022,2.28590000000
-7,2026,windturbine,R2,2022,2.28590000000
-7,2030,windturbine,R2,2022,2.28590000000
-7,2035,windturbine,R2,2022,2.28590000000
-7,2040,windturbine,R2,2022,2.28590000000
-7,2045,windturbine,R2,2022,2.28590000000
-7,2046,windturbine,R2,2022,2.28590000000
-7,2047,windturbine,R2,2022,2.28590000000
-7,2048,windturbine,R2,2022,2.28590000000
-8,2026,windturbine,R2,2024,7.21040000000
-8,2030,windturbine,R2,2024,7.21040000000
-8,2035,windturbine,R2,2024,7.21040000000
-8,2040,windturbine,R2,2024,7.21040000000
-8,2045,windturbine,R2,2024,7.21040000000
-8,2046,windturbine,R2,2024,7.21040000000
-8,2047,windturbine,R2,2024,7.21040000000
-8,2048,windturbine,R2,2024,7.21040000000
-8,2049,windturbine,R2,2024,7.21040000000
-8,2050,windturbine,R2,2024,7.21040000000
+4,2024,windturbine,R1,2022,2.24000000000
+4,2025,windturbine,R1,2022,2.24000000000
+4,2026,windturbine,R1,2022,2.24000000000
+4,2030,windturbine,R1,2022,2.24000000000
+4,2035,windturbine,R1,2022,2.24000000000
+4,2040,windturbine,R1,2022,2.24000000000
+4,2045,windturbine,R1,2022,2.24000000000
+4,2046,windturbine,R1,2022,2.24000000000
+4,2047,windturbine,R1,2022,2.24000000000
+4,2048,windturbine,R1,2022,2.24000000000
+5,2026,windturbine,R1,2024,7.09480000000
+5,2030,windturbine,R1,2024,7.09480000000
+5,2035,windturbine,R1,2024,7.09480000000
+5,2040,windturbine,R1,2024,7.09480000000
+5,2045,windturbine,R1,2024,7.09480000000
+5,2046,windturbine,R1,2024,7.09480000000
+5,2047,windturbine,R1,2024,7.09480000000
+5,2048,windturbine,R1,2024,7.09480000000
+5,2049,windturbine,R1,2024,7.09480000000
+5,2050,windturbine,R1,2024,7.09480000000
+6,2024,windturbine,R2,2020,11.79000000000
+6,2025,windturbine,R2,2020,11.79000000000
+6,2026,windturbine,R2,2020,11.79000000000
+6,2030,windturbine,R2,2020,11.79000000000
+6,2035,windturbine,R2,2020,11.79000000000
+6,2040,windturbine,R2,2020,11.79000000000
+6,2045,windturbine,R2,2020,11.79000000000
+6,2046,windturbine,R2,2020,11.79000000000
+7,2024,windturbine,R2,2022,2.24000000000
+7,2025,windturbine,R2,2022,2.24000000000
+7,2026,windturbine,R2,2022,2.24000000000
+7,2030,windturbine,R2,2022,2.24000000000
+7,2035,windturbine,R2,2022,2.24000000000
+7,2040,windturbine,R2,2022,2.24000000000
+7,2045,windturbine,R2,2022,2.24000000000
+7,2046,windturbine,R2,2022,2.24000000000
+7,2047,windturbine,R2,2022,2.24000000000
+7,2048,windturbine,R2,2022,2.24000000000
+8,2026,windturbine,R2,2024,7.09480000000
+8,2030,windturbine,R2,2024,7.09480000000
+8,2035,windturbine,R2,2024,7.09480000000
+8,2040,windturbine,R2,2024,7.09480000000
+8,2045,windturbine,R2,2024,7.09480000000
+8,2046,windturbine,R2,2024,7.09480000000
+8,2047,windturbine,R2,2024,7.09480000000
+8,2048,windturbine,R2,2024,7.09480000000
+8,2049,windturbine,R2,2024,7.09480000000
+8,2050,windturbine,R2,2024,7.09480000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..9e44d4d6
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
@@ -0,0 +1,35 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,6.75000000000
+2,2030,solarPV,R1,2020,6.75000000000
+2,2035,solarPV,R1,2020,6.75000000000
+2,2040,solarPV,R1,2020,6.75000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2030,solarPV,R1,2025,9.15000000000
+3,2035,solarPV,R1,2025,9.15000000000
+3,2040,solarPV,R1,2025,9.15000000000
+3,2045,solarPV,R1,2025,9.15000000000
+3,2049,solarPV,R1,2025,9.15000000000
+3,2050,solarPV,R1,2025,9.15000000000
+3,2054,solarPV,R1,2025,9.15000000000
+4,2030,solarPV,R2,2025,9.15000000000
+4,2035,solarPV,R2,2025,9.15000000000
+4,2040,solarPV,R2,2025,9.15000000000
+4,2045,solarPV,R2,2025,9.15000000000
+4,2049,solarPV,R2,2025,9.15000000000
+4,2050,solarPV,R2,2025,9.15000000000
+4,2054,solarPV,R2,2025,9.15000000000
+5,2025,windturbine,R1,2020,10.00000000000
+5,2030,windturbine,R1,2020,10.00000000000
+5,2035,windturbine,R1,2020,10.00000000000
+5,2040,windturbine,R1,2020,10.00000000000
+5,2045,windturbine,R1,2020,10.00000000000
+5,2049,windturbine,R1,2020,10.00000000000
+6,2025,windturbine,R2,2020,16.75000000000
+6,2030,windturbine,R2,2020,16.75000000000
+6,2035,windturbine,R2,2020,16.75000000000
+6,2040,windturbine,R2,2020,16.75000000000
+6,2045,windturbine,R2,2020,16.75000000000
+6,2049,windturbine,R2,2020,16.75000000000
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 4c7d7fd9..05ed3c5d 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,11 +1,11 @@
 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
+1,2026,R1,2020,solarPV,3.79000000000
+1,2028,R1,2020,solarPV,3.79000000000
+1,2030,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 2,2026,R1,2020,windturbine,8.00000000000
 2,2028,R1,2020,windturbine,8.00000000000
 2,2030,R1,2020,windturbine,8.00000000000
@@ -13,74 +13,74 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.28590000000
-3,2028,R1,2022,windturbine,2.28590000000
-3,2030,R1,2022,windturbine,2.28590000000
-3,2035,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2026,R1,2024,windturbine,7.21040000000
-4,2028,R1,2024,windturbine,7.21040000000
-4,2030,R1,2024,windturbine,7.21040000000
-4,2035,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2028,R1,2026,solarPV,2.28590000000
-5,2030,R1,2026,solarPV,2.28590000000
-5,2035,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-7,2026,R2,2020,windturbine,12.17990000000
-7,2028,R2,2020,windturbine,12.17990000000
-7,2030,R2,2020,windturbine,12.17990000000
-7,2035,R2,2020,windturbine,12.17990000000
-7,2040,R2,2020,windturbine,12.17990000000
-7,2045,R2,2020,windturbine,12.17990000000
-7,2046,R2,2020,windturbine,12.17990000000
-8,2026,R2,2022,windturbine,2.28590000000
-8,2028,R2,2022,windturbine,2.28590000000
-8,2030,R2,2022,windturbine,2.28590000000
-8,2035,R2,2022,windturbine,2.28590000000
-8,2040,R2,2022,windturbine,2.28590000000
-8,2045,R2,2022,windturbine,2.28590000000
-8,2046,R2,2022,windturbine,2.28590000000
-8,2047,R2,2022,windturbine,2.28590000000
-8,2048,R2,2022,windturbine,2.28590000000
-9,2026,R2,2024,windturbine,7.21040000000
-9,2028,R2,2024,windturbine,7.21040000000
-9,2030,R2,2024,windturbine,7.21040000000
-9,2035,R2,2024,windturbine,7.21040000000
-9,2040,R2,2024,windturbine,7.21040000000
-9,2045,R2,2024,windturbine,7.21040000000
-9,2046,R2,2024,windturbine,7.21040000000
-9,2047,R2,2024,windturbine,7.21040000000
-9,2048,R2,2024,windturbine,7.21040000000
-9,2049,R2,2024,windturbine,7.21040000000
-9,2050,R2,2024,windturbine,7.21040000000
-10,2028,R2,2026,solarPV,2.28590000000
-10,2030,R2,2026,solarPV,2.28590000000
-10,2035,R2,2026,solarPV,2.28590000000
-10,2040,R2,2026,solarPV,2.28590000000
-10,2045,R2,2026,solarPV,2.28590000000
-10,2046,R2,2026,solarPV,2.28590000000
-10,2047,R2,2026,solarPV,2.28590000000
-10,2048,R2,2026,solarPV,2.28590000000
-10,2049,R2,2026,solarPV,2.28590000000
-10,2050,R2,2026,solarPV,2.28590000000
-10,2051,R2,2026,solarPV,2.28590000000
-10,2052,R2,2026,solarPV,2.28590000000
+3,2026,R1,2022,windturbine,2.24000000000
+3,2028,R1,2022,windturbine,2.24000000000
+3,2030,R1,2022,windturbine,2.24000000000
+3,2035,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2026,R1,2024,windturbine,7.09480000000
+4,2028,R1,2024,windturbine,7.09480000000
+4,2030,R1,2024,windturbine,7.09480000000
+4,2035,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2028,R1,2026,solarPV,2.24000000000
+5,2030,R1,2026,solarPV,2.24000000000
+5,2035,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+7,2026,R2,2020,windturbine,11.79000000000
+7,2028,R2,2020,windturbine,11.79000000000
+7,2030,R2,2020,windturbine,11.79000000000
+7,2035,R2,2020,windturbine,11.79000000000
+7,2040,R2,2020,windturbine,11.79000000000
+7,2045,R2,2020,windturbine,11.79000000000
+7,2046,R2,2020,windturbine,11.79000000000
+8,2026,R2,2022,windturbine,2.24000000000
+8,2028,R2,2022,windturbine,2.24000000000
+8,2030,R2,2022,windturbine,2.24000000000
+8,2035,R2,2022,windturbine,2.24000000000
+8,2040,R2,2022,windturbine,2.24000000000
+8,2045,R2,2022,windturbine,2.24000000000
+8,2046,R2,2022,windturbine,2.24000000000
+8,2047,R2,2022,windturbine,2.24000000000
+8,2048,R2,2022,windturbine,2.24000000000
+9,2026,R2,2024,windturbine,7.09480000000
+9,2028,R2,2024,windturbine,7.09480000000
+9,2030,R2,2024,windturbine,7.09480000000
+9,2035,R2,2024,windturbine,7.09480000000
+9,2040,R2,2024,windturbine,7.09480000000
+9,2045,R2,2024,windturbine,7.09480000000
+9,2046,R2,2024,windturbine,7.09480000000
+9,2047,R2,2024,windturbine,7.09480000000
+9,2048,R2,2024,windturbine,7.09480000000
+9,2049,R2,2024,windturbine,7.09480000000
+9,2050,R2,2024,windturbine,7.09480000000
+10,2028,R2,2026,solarPV,2.24000000000
+10,2030,R2,2026,solarPV,2.24000000000
+10,2035,R2,2026,solarPV,2.24000000000
+10,2040,R2,2026,solarPV,2.24000000000
+10,2045,R2,2026,solarPV,2.24000000000
+10,2046,R2,2026,solarPV,2.24000000000
+10,2047,R2,2026,solarPV,2.24000000000
+10,2048,R2,2026,solarPV,2.24000000000
+10,2049,R2,2026,solarPV,2.24000000000
+10,2050,R2,2026,solarPV,2.24000000000
+10,2051,R2,2026,solarPV,2.24000000000
+10,2052,R2,2026,solarPV,2.24000000000
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 d85d7485..db6af830 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,105 +1,105 @@
 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
+1,2028,R1,2020,solarPV,3.79000000000
+1,2030,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2030,R1,2022,windturbine,2.28590000000
-3,2035,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2028,R1,2024,windturbine,7.21040000000
-4,2030,R1,2024,windturbine,7.21040000000
-4,2035,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2028,R1,2026,solarPV,2.28590000000
-5,2030,R1,2026,solarPV,2.28590000000
-5,2035,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2030,R1,2028,solarPV,2.28590000000
-6,2035,R1,2028,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-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,2028,R2,2022,windturbine,2.28590000000
-9,2030,R2,2022,windturbine,2.28590000000
-9,2035,R2,2022,windturbine,2.28590000000
-9,2040,R2,2022,windturbine,2.28590000000
-9,2045,R2,2022,windturbine,2.28590000000
-9,2046,R2,2022,windturbine,2.28590000000
-9,2047,R2,2022,windturbine,2.28590000000
-9,2048,R2,2022,windturbine,2.28590000000
-10,2028,R2,2024,windturbine,7.21040000000
-10,2030,R2,2024,windturbine,7.21040000000
-10,2035,R2,2024,windturbine,7.21040000000
-10,2040,R2,2024,windturbine,7.21040000000
-10,2045,R2,2024,windturbine,7.21040000000
-10,2046,R2,2024,windturbine,7.21040000000
-10,2047,R2,2024,windturbine,7.21040000000
-10,2048,R2,2024,windturbine,7.21040000000
-10,2049,R2,2024,windturbine,7.21040000000
-10,2050,R2,2024,windturbine,7.21040000000
-11,2028,R2,2026,solarPV,2.28590000000
-11,2030,R2,2026,solarPV,2.28590000000
-11,2035,R2,2026,solarPV,2.28590000000
-11,2040,R2,2026,solarPV,2.28590000000
-11,2045,R2,2026,solarPV,2.28590000000
-11,2046,R2,2026,solarPV,2.28590000000
-11,2047,R2,2026,solarPV,2.28590000000
-11,2048,R2,2026,solarPV,2.28590000000
-11,2049,R2,2026,solarPV,2.28590000000
-11,2050,R2,2026,solarPV,2.28590000000
-11,2051,R2,2026,solarPV,2.28590000000
-11,2052,R2,2026,solarPV,2.28590000000
-12,2030,R2,2028,solarPV,2.28590000000
-12,2035,R2,2028,solarPV,2.28590000000
-12,2040,R2,2028,solarPV,2.28590000000
-12,2045,R2,2028,solarPV,2.28590000000
-12,2046,R2,2028,solarPV,2.28590000000
-12,2047,R2,2028,solarPV,2.28590000000
-12,2048,R2,2028,solarPV,2.28590000000
-12,2049,R2,2028,solarPV,2.28590000000
-12,2050,R2,2028,solarPV,2.28590000000
-12,2051,R2,2028,solarPV,2.28590000000
-12,2052,R2,2028,solarPV,2.28590000000
-12,2053,R2,2028,solarPV,2.28590000000
-12,2054,R2,2028,solarPV,2.28590000000
+3,2028,R1,2022,windturbine,2.24000000000
+3,2030,R1,2022,windturbine,2.24000000000
+3,2035,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2028,R1,2024,windturbine,7.09480000000
+4,2030,R1,2024,windturbine,7.09480000000
+4,2035,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2028,R1,2026,solarPV,2.24000000000
+5,2030,R1,2026,solarPV,2.24000000000
+5,2035,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2030,R1,2028,solarPV,2.24000000000
+6,2035,R1,2028,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+8,2028,R2,2020,windturbine,11.79000000000
+8,2030,R2,2020,windturbine,11.79000000000
+8,2035,R2,2020,windturbine,11.79000000000
+8,2040,R2,2020,windturbine,11.79000000000
+8,2045,R2,2020,windturbine,11.79000000000
+8,2046,R2,2020,windturbine,11.79000000000
+9,2028,R2,2022,windturbine,2.24000000000
+9,2030,R2,2022,windturbine,2.24000000000
+9,2035,R2,2022,windturbine,2.24000000000
+9,2040,R2,2022,windturbine,2.24000000000
+9,2045,R2,2022,windturbine,2.24000000000
+9,2046,R2,2022,windturbine,2.24000000000
+9,2047,R2,2022,windturbine,2.24000000000
+9,2048,R2,2022,windturbine,2.24000000000
+10,2028,R2,2024,windturbine,7.09480000000
+10,2030,R2,2024,windturbine,7.09480000000
+10,2035,R2,2024,windturbine,7.09480000000
+10,2040,R2,2024,windturbine,7.09480000000
+10,2045,R2,2024,windturbine,7.09480000000
+10,2046,R2,2024,windturbine,7.09480000000
+10,2047,R2,2024,windturbine,7.09480000000
+10,2048,R2,2024,windturbine,7.09480000000
+10,2049,R2,2024,windturbine,7.09480000000
+10,2050,R2,2024,windturbine,7.09480000000
+11,2028,R2,2026,solarPV,2.24000000000
+11,2030,R2,2026,solarPV,2.24000000000
+11,2035,R2,2026,solarPV,2.24000000000
+11,2040,R2,2026,solarPV,2.24000000000
+11,2045,R2,2026,solarPV,2.24000000000
+11,2046,R2,2026,solarPV,2.24000000000
+11,2047,R2,2026,solarPV,2.24000000000
+11,2048,R2,2026,solarPV,2.24000000000
+11,2049,R2,2026,solarPV,2.24000000000
+11,2050,R2,2026,solarPV,2.24000000000
+11,2051,R2,2026,solarPV,2.24000000000
+11,2052,R2,2026,solarPV,2.24000000000
+12,2030,R2,2028,solarPV,2.24000000000
+12,2035,R2,2028,solarPV,2.24000000000
+12,2040,R2,2028,solarPV,2.24000000000
+12,2045,R2,2028,solarPV,2.24000000000
+12,2046,R2,2028,solarPV,2.24000000000
+12,2047,R2,2028,solarPV,2.24000000000
+12,2048,R2,2028,solarPV,2.24000000000
+12,2049,R2,2028,solarPV,2.24000000000
+12,2050,R2,2028,solarPV,2.24000000000
+12,2051,R2,2028,solarPV,2.24000000000
+12,2052,R2,2028,solarPV,2.24000000000
+12,2053,R2,2028,solarPV,2.24000000000
+12,2054,R2,2028,solarPV,2.24000000000
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 a9668782..5e733a4c 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,137 +1,137 @@
 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
+1,2030,R1,2020,solarPV,3.79000000000
+1,2032,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2032,R1,2022,windturbine,2.28590000000
-3,2035,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2030,R1,2024,windturbine,7.21040000000
-4,2032,R1,2024,windturbine,7.21040000000
-4,2035,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2030,R1,2026,solarPV,2.28590000000
-5,2032,R1,2026,solarPV,2.28590000000
-5,2035,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2030,R1,2028,solarPV,2.28590000000
-6,2032,R1,2028,solarPV,2.28590000000
-6,2035,R1,2028,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-7,2032,R1,2030,solarPV,2.28590000000
-7,2035,R1,2030,solarPV,2.28590000000
-7,2040,R1,2030,solarPV,2.28590000000
-7,2045,R1,2030,solarPV,2.28590000000
-7,2046,R1,2030,solarPV,2.28590000000
-7,2047,R1,2030,solarPV,2.28590000000
-7,2048,R1,2030,solarPV,2.28590000000
-7,2049,R1,2030,solarPV,2.28590000000
-7,2050,R1,2030,solarPV,2.28590000000
-7,2051,R1,2030,solarPV,2.28590000000
-7,2052,R1,2030,solarPV,2.28590000000
-7,2053,R1,2030,solarPV,2.28590000000
-7,2054,R1,2030,solarPV,2.28590000000
-7,2055,R1,2030,solarPV,2.28590000000
-7,2056,R1,2030,solarPV,2.28590000000
-9,2030,R2,2020,windturbine,12.17990000000
-9,2032,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,2030,R2,2022,windturbine,2.28590000000
-10,2032,R2,2022,windturbine,2.28590000000
-10,2035,R2,2022,windturbine,2.28590000000
-10,2040,R2,2022,windturbine,2.28590000000
-10,2045,R2,2022,windturbine,2.28590000000
-10,2046,R2,2022,windturbine,2.28590000000
-10,2047,R2,2022,windturbine,2.28590000000
-10,2048,R2,2022,windturbine,2.28590000000
-11,2030,R2,2024,windturbine,7.21040000000
-11,2032,R2,2024,windturbine,7.21040000000
-11,2035,R2,2024,windturbine,7.21040000000
-11,2040,R2,2024,windturbine,7.21040000000
-11,2045,R2,2024,windturbine,7.21040000000
-11,2046,R2,2024,windturbine,7.21040000000
-11,2047,R2,2024,windturbine,7.21040000000
-11,2048,R2,2024,windturbine,7.21040000000
-11,2049,R2,2024,windturbine,7.21040000000
-11,2050,R2,2024,windturbine,7.21040000000
-12,2030,R2,2026,solarPV,2.28590000000
-12,2032,R2,2026,solarPV,2.28590000000
-12,2035,R2,2026,solarPV,2.28590000000
-12,2040,R2,2026,solarPV,2.28590000000
-12,2045,R2,2026,solarPV,2.28590000000
-12,2046,R2,2026,solarPV,2.28590000000
-12,2047,R2,2026,solarPV,2.28590000000
-12,2048,R2,2026,solarPV,2.28590000000
-12,2049,R2,2026,solarPV,2.28590000000
-12,2050,R2,2026,solarPV,2.28590000000
-12,2051,R2,2026,solarPV,2.28590000000
-12,2052,R2,2026,solarPV,2.28590000000
-13,2030,R2,2028,solarPV,2.28590000000
-13,2032,R2,2028,solarPV,2.28590000000
-13,2035,R2,2028,solarPV,2.28590000000
-13,2040,R2,2028,solarPV,2.28590000000
-13,2045,R2,2028,solarPV,2.28590000000
-13,2046,R2,2028,solarPV,2.28590000000
-13,2047,R2,2028,solarPV,2.28590000000
-13,2048,R2,2028,solarPV,2.28590000000
-13,2049,R2,2028,solarPV,2.28590000000
-13,2050,R2,2028,solarPV,2.28590000000
-13,2051,R2,2028,solarPV,2.28590000000
-13,2052,R2,2028,solarPV,2.28590000000
-13,2053,R2,2028,solarPV,2.28590000000
-13,2054,R2,2028,solarPV,2.28590000000
-14,2032,R2,2030,solarPV,2.28590000000
-14,2035,R2,2030,solarPV,2.28590000000
-14,2040,R2,2030,solarPV,2.28590000000
-14,2045,R2,2030,solarPV,2.28590000000
-14,2046,R2,2030,solarPV,2.28590000000
-14,2047,R2,2030,solarPV,2.28590000000
-14,2048,R2,2030,solarPV,2.28590000000
-14,2049,R2,2030,solarPV,2.28590000000
-14,2050,R2,2030,solarPV,2.28590000000
-14,2051,R2,2030,solarPV,2.28590000000
-14,2052,R2,2030,solarPV,2.28590000000
-14,2053,R2,2030,solarPV,2.28590000000
-14,2054,R2,2030,solarPV,2.28590000000
-14,2055,R2,2030,solarPV,2.28590000000
-14,2056,R2,2030,solarPV,2.28590000000
+3,2030,R1,2022,windturbine,2.24000000000
+3,2032,R1,2022,windturbine,2.24000000000
+3,2035,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2030,R1,2024,windturbine,7.09480000000
+4,2032,R1,2024,windturbine,7.09480000000
+4,2035,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2030,R1,2026,solarPV,2.24000000000
+5,2032,R1,2026,solarPV,2.24000000000
+5,2035,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2030,R1,2028,solarPV,2.24000000000
+6,2032,R1,2028,solarPV,2.24000000000
+6,2035,R1,2028,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+7,2032,R1,2030,solarPV,2.24000000000
+7,2035,R1,2030,solarPV,2.24000000000
+7,2040,R1,2030,solarPV,2.24000000000
+7,2045,R1,2030,solarPV,2.24000000000
+7,2046,R1,2030,solarPV,2.24000000000
+7,2047,R1,2030,solarPV,2.24000000000
+7,2048,R1,2030,solarPV,2.24000000000
+7,2049,R1,2030,solarPV,2.24000000000
+7,2050,R1,2030,solarPV,2.24000000000
+7,2051,R1,2030,solarPV,2.24000000000
+7,2052,R1,2030,solarPV,2.24000000000
+7,2053,R1,2030,solarPV,2.24000000000
+7,2054,R1,2030,solarPV,2.24000000000
+7,2055,R1,2030,solarPV,2.24000000000
+7,2056,R1,2030,solarPV,2.24000000000
+9,2030,R2,2020,windturbine,11.79000000000
+9,2032,R2,2020,windturbine,11.79000000000
+9,2035,R2,2020,windturbine,11.79000000000
+9,2040,R2,2020,windturbine,11.79000000000
+9,2045,R2,2020,windturbine,11.79000000000
+9,2046,R2,2020,windturbine,11.79000000000
+10,2030,R2,2022,windturbine,2.24000000000
+10,2032,R2,2022,windturbine,2.24000000000
+10,2035,R2,2022,windturbine,2.24000000000
+10,2040,R2,2022,windturbine,2.24000000000
+10,2045,R2,2022,windturbine,2.24000000000
+10,2046,R2,2022,windturbine,2.24000000000
+10,2047,R2,2022,windturbine,2.24000000000
+10,2048,R2,2022,windturbine,2.24000000000
+11,2030,R2,2024,windturbine,7.09480000000
+11,2032,R2,2024,windturbine,7.09480000000
+11,2035,R2,2024,windturbine,7.09480000000
+11,2040,R2,2024,windturbine,7.09480000000
+11,2045,R2,2024,windturbine,7.09480000000
+11,2046,R2,2024,windturbine,7.09480000000
+11,2047,R2,2024,windturbine,7.09480000000
+11,2048,R2,2024,windturbine,7.09480000000
+11,2049,R2,2024,windturbine,7.09480000000
+11,2050,R2,2024,windturbine,7.09480000000
+12,2030,R2,2026,solarPV,2.24000000000
+12,2032,R2,2026,solarPV,2.24000000000
+12,2035,R2,2026,solarPV,2.24000000000
+12,2040,R2,2026,solarPV,2.24000000000
+12,2045,R2,2026,solarPV,2.24000000000
+12,2046,R2,2026,solarPV,2.24000000000
+12,2047,R2,2026,solarPV,2.24000000000
+12,2048,R2,2026,solarPV,2.24000000000
+12,2049,R2,2026,solarPV,2.24000000000
+12,2050,R2,2026,solarPV,2.24000000000
+12,2051,R2,2026,solarPV,2.24000000000
+12,2052,R2,2026,solarPV,2.24000000000
+13,2030,R2,2028,solarPV,2.24000000000
+13,2032,R2,2028,solarPV,2.24000000000
+13,2035,R2,2028,solarPV,2.24000000000
+13,2040,R2,2028,solarPV,2.24000000000
+13,2045,R2,2028,solarPV,2.24000000000
+13,2046,R2,2028,solarPV,2.24000000000
+13,2047,R2,2028,solarPV,2.24000000000
+13,2048,R2,2028,solarPV,2.24000000000
+13,2049,R2,2028,solarPV,2.24000000000
+13,2050,R2,2028,solarPV,2.24000000000
+13,2051,R2,2028,solarPV,2.24000000000
+13,2052,R2,2028,solarPV,2.24000000000
+13,2053,R2,2028,solarPV,2.24000000000
+13,2054,R2,2028,solarPV,2.24000000000
+14,2032,R2,2030,solarPV,2.24000000000
+14,2035,R2,2030,solarPV,2.24000000000
+14,2040,R2,2030,solarPV,2.24000000000
+14,2045,R2,2030,solarPV,2.24000000000
+14,2046,R2,2030,solarPV,2.24000000000
+14,2047,R2,2030,solarPV,2.24000000000
+14,2048,R2,2030,solarPV,2.24000000000
+14,2049,R2,2030,solarPV,2.24000000000
+14,2050,R2,2030,solarPV,2.24000000000
+14,2051,R2,2030,solarPV,2.24000000000
+14,2052,R2,2030,solarPV,2.24000000000
+14,2053,R2,2030,solarPV,2.24000000000
+14,2054,R2,2030,solarPV,2.24000000000
+14,2055,R2,2030,solarPV,2.24000000000
+14,2056,R2,2030,solarPV,2.24000000000
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 2aad1b15..6786b085 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,173 +1,173 @@
 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
+1,2032,R1,2020,solarPV,3.79000000000
+1,2034,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2034,R1,2022,windturbine,2.28590000000
-3,2035,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2032,R1,2024,windturbine,7.21040000000
-4,2034,R1,2024,windturbine,7.21040000000
-4,2035,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2032,R1,2026,solarPV,2.28590000000
-5,2034,R1,2026,solarPV,2.28590000000
-5,2035,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2032,R1,2028,solarPV,2.28590000000
-6,2034,R1,2028,solarPV,2.28590000000
-6,2035,R1,2028,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-7,2032,R1,2030,solarPV,2.28590000000
-7,2034,R1,2030,solarPV,2.28590000000
-7,2035,R1,2030,solarPV,2.28590000000
-7,2040,R1,2030,solarPV,2.28590000000
-7,2045,R1,2030,solarPV,2.28590000000
-7,2046,R1,2030,solarPV,2.28590000000
-7,2047,R1,2030,solarPV,2.28590000000
-7,2048,R1,2030,solarPV,2.28590000000
-7,2049,R1,2030,solarPV,2.28590000000
-7,2050,R1,2030,solarPV,2.28590000000
-7,2051,R1,2030,solarPV,2.28590000000
-7,2052,R1,2030,solarPV,2.28590000000
-7,2053,R1,2030,solarPV,2.28590000000
-7,2054,R1,2030,solarPV,2.28590000000
-7,2055,R1,2030,solarPV,2.28590000000
-7,2056,R1,2030,solarPV,2.28590000000
-8,2034,R1,2032,solarPV,2.28590000000
-8,2035,R1,2032,solarPV,2.28590000000
-8,2040,R1,2032,solarPV,2.28590000000
-8,2045,R1,2032,solarPV,2.28590000000
-8,2046,R1,2032,solarPV,2.28590000000
-8,2047,R1,2032,solarPV,2.28590000000
-8,2048,R1,2032,solarPV,2.28590000000
-8,2049,R1,2032,solarPV,2.28590000000
-8,2050,R1,2032,solarPV,2.28590000000
-8,2051,R1,2032,solarPV,2.28590000000
-8,2052,R1,2032,solarPV,2.28590000000
-8,2053,R1,2032,solarPV,2.28590000000
-8,2054,R1,2032,solarPV,2.28590000000
-8,2055,R1,2032,solarPV,2.28590000000
-8,2056,R1,2032,solarPV,2.28590000000
-8,2057,R1,2032,solarPV,2.28590000000
-8,2058,R1,2032,solarPV,2.28590000000
-10,2032,R2,2020,windturbine,12.17990000000
-10,2034,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,2032,R2,2022,windturbine,2.28590000000
-11,2034,R2,2022,windturbine,2.28590000000
-11,2035,R2,2022,windturbine,2.28590000000
-11,2040,R2,2022,windturbine,2.28590000000
-11,2045,R2,2022,windturbine,2.28590000000
-11,2046,R2,2022,windturbine,2.28590000000
-11,2047,R2,2022,windturbine,2.28590000000
-11,2048,R2,2022,windturbine,2.28590000000
-12,2032,R2,2024,windturbine,7.21040000000
-12,2034,R2,2024,windturbine,7.21040000000
-12,2035,R2,2024,windturbine,7.21040000000
-12,2040,R2,2024,windturbine,7.21040000000
-12,2045,R2,2024,windturbine,7.21040000000
-12,2046,R2,2024,windturbine,7.21040000000
-12,2047,R2,2024,windturbine,7.21040000000
-12,2048,R2,2024,windturbine,7.21040000000
-12,2049,R2,2024,windturbine,7.21040000000
-12,2050,R2,2024,windturbine,7.21040000000
-13,2032,R2,2026,solarPV,2.28590000000
-13,2034,R2,2026,solarPV,2.28590000000
-13,2035,R2,2026,solarPV,2.28590000000
-13,2040,R2,2026,solarPV,2.28590000000
-13,2045,R2,2026,solarPV,2.28590000000
-13,2046,R2,2026,solarPV,2.28590000000
-13,2047,R2,2026,solarPV,2.28590000000
-13,2048,R2,2026,solarPV,2.28590000000
-13,2049,R2,2026,solarPV,2.28590000000
-13,2050,R2,2026,solarPV,2.28590000000
-13,2051,R2,2026,solarPV,2.28590000000
-13,2052,R2,2026,solarPV,2.28590000000
-14,2032,R2,2028,solarPV,2.28590000000
-14,2034,R2,2028,solarPV,2.28590000000
-14,2035,R2,2028,solarPV,2.28590000000
-14,2040,R2,2028,solarPV,2.28590000000
-14,2045,R2,2028,solarPV,2.28590000000
-14,2046,R2,2028,solarPV,2.28590000000
-14,2047,R2,2028,solarPV,2.28590000000
-14,2048,R2,2028,solarPV,2.28590000000
-14,2049,R2,2028,solarPV,2.28590000000
-14,2050,R2,2028,solarPV,2.28590000000
-14,2051,R2,2028,solarPV,2.28590000000
-14,2052,R2,2028,solarPV,2.28590000000
-14,2053,R2,2028,solarPV,2.28590000000
-14,2054,R2,2028,solarPV,2.28590000000
-15,2032,R2,2030,solarPV,2.28590000000
-15,2034,R2,2030,solarPV,2.28590000000
-15,2035,R2,2030,solarPV,2.28590000000
-15,2040,R2,2030,solarPV,2.28590000000
-15,2045,R2,2030,solarPV,2.28590000000
-15,2046,R2,2030,solarPV,2.28590000000
-15,2047,R2,2030,solarPV,2.28590000000
-15,2048,R2,2030,solarPV,2.28590000000
-15,2049,R2,2030,solarPV,2.28590000000
-15,2050,R2,2030,solarPV,2.28590000000
-15,2051,R2,2030,solarPV,2.28590000000
-15,2052,R2,2030,solarPV,2.28590000000
-15,2053,R2,2030,solarPV,2.28590000000
-15,2054,R2,2030,solarPV,2.28590000000
-15,2055,R2,2030,solarPV,2.28590000000
-15,2056,R2,2030,solarPV,2.28590000000
-16,2034,R2,2032,solarPV,2.28590000000
-16,2035,R2,2032,solarPV,2.28590000000
-16,2040,R2,2032,solarPV,2.28590000000
-16,2045,R2,2032,solarPV,2.28590000000
-16,2046,R2,2032,solarPV,2.28590000000
-16,2047,R2,2032,solarPV,2.28590000000
-16,2048,R2,2032,solarPV,2.28590000000
-16,2049,R2,2032,solarPV,2.28590000000
-16,2050,R2,2032,solarPV,2.28590000000
-16,2051,R2,2032,solarPV,2.28590000000
-16,2052,R2,2032,solarPV,2.28590000000
-16,2053,R2,2032,solarPV,2.28590000000
-16,2054,R2,2032,solarPV,2.28590000000
-16,2055,R2,2032,solarPV,2.28590000000
-16,2056,R2,2032,solarPV,2.28590000000
-16,2057,R2,2032,solarPV,2.28590000000
-16,2058,R2,2032,solarPV,2.28590000000
+3,2032,R1,2022,windturbine,2.24000000000
+3,2034,R1,2022,windturbine,2.24000000000
+3,2035,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2032,R1,2024,windturbine,7.09480000000
+4,2034,R1,2024,windturbine,7.09480000000
+4,2035,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2032,R1,2026,solarPV,2.24000000000
+5,2034,R1,2026,solarPV,2.24000000000
+5,2035,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2032,R1,2028,solarPV,2.24000000000
+6,2034,R1,2028,solarPV,2.24000000000
+6,2035,R1,2028,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+7,2032,R1,2030,solarPV,2.24000000000
+7,2034,R1,2030,solarPV,2.24000000000
+7,2035,R1,2030,solarPV,2.24000000000
+7,2040,R1,2030,solarPV,2.24000000000
+7,2045,R1,2030,solarPV,2.24000000000
+7,2046,R1,2030,solarPV,2.24000000000
+7,2047,R1,2030,solarPV,2.24000000000
+7,2048,R1,2030,solarPV,2.24000000000
+7,2049,R1,2030,solarPV,2.24000000000
+7,2050,R1,2030,solarPV,2.24000000000
+7,2051,R1,2030,solarPV,2.24000000000
+7,2052,R1,2030,solarPV,2.24000000000
+7,2053,R1,2030,solarPV,2.24000000000
+7,2054,R1,2030,solarPV,2.24000000000
+7,2055,R1,2030,solarPV,2.24000000000
+7,2056,R1,2030,solarPV,2.24000000000
+8,2034,R1,2032,solarPV,2.24000000000
+8,2035,R1,2032,solarPV,2.24000000000
+8,2040,R1,2032,solarPV,2.24000000000
+8,2045,R1,2032,solarPV,2.24000000000
+8,2046,R1,2032,solarPV,2.24000000000
+8,2047,R1,2032,solarPV,2.24000000000
+8,2048,R1,2032,solarPV,2.24000000000
+8,2049,R1,2032,solarPV,2.24000000000
+8,2050,R1,2032,solarPV,2.24000000000
+8,2051,R1,2032,solarPV,2.24000000000
+8,2052,R1,2032,solarPV,2.24000000000
+8,2053,R1,2032,solarPV,2.24000000000
+8,2054,R1,2032,solarPV,2.24000000000
+8,2055,R1,2032,solarPV,2.24000000000
+8,2056,R1,2032,solarPV,2.24000000000
+8,2057,R1,2032,solarPV,2.24000000000
+8,2058,R1,2032,solarPV,2.24000000000
+10,2032,R2,2020,windturbine,11.79000000000
+10,2034,R2,2020,windturbine,11.79000000000
+10,2035,R2,2020,windturbine,11.79000000000
+10,2040,R2,2020,windturbine,11.79000000000
+10,2045,R2,2020,windturbine,11.79000000000
+10,2046,R2,2020,windturbine,11.79000000000
+11,2032,R2,2022,windturbine,2.24000000000
+11,2034,R2,2022,windturbine,2.24000000000
+11,2035,R2,2022,windturbine,2.24000000000
+11,2040,R2,2022,windturbine,2.24000000000
+11,2045,R2,2022,windturbine,2.24000000000
+11,2046,R2,2022,windturbine,2.24000000000
+11,2047,R2,2022,windturbine,2.24000000000
+11,2048,R2,2022,windturbine,2.24000000000
+12,2032,R2,2024,windturbine,7.09480000000
+12,2034,R2,2024,windturbine,7.09480000000
+12,2035,R2,2024,windturbine,7.09480000000
+12,2040,R2,2024,windturbine,7.09480000000
+12,2045,R2,2024,windturbine,7.09480000000
+12,2046,R2,2024,windturbine,7.09480000000
+12,2047,R2,2024,windturbine,7.09480000000
+12,2048,R2,2024,windturbine,7.09480000000
+12,2049,R2,2024,windturbine,7.09480000000
+12,2050,R2,2024,windturbine,7.09480000000
+13,2032,R2,2026,solarPV,2.24000000000
+13,2034,R2,2026,solarPV,2.24000000000
+13,2035,R2,2026,solarPV,2.24000000000
+13,2040,R2,2026,solarPV,2.24000000000
+13,2045,R2,2026,solarPV,2.24000000000
+13,2046,R2,2026,solarPV,2.24000000000
+13,2047,R2,2026,solarPV,2.24000000000
+13,2048,R2,2026,solarPV,2.24000000000
+13,2049,R2,2026,solarPV,2.24000000000
+13,2050,R2,2026,solarPV,2.24000000000
+13,2051,R2,2026,solarPV,2.24000000000
+13,2052,R2,2026,solarPV,2.24000000000
+14,2032,R2,2028,solarPV,2.24000000000
+14,2034,R2,2028,solarPV,2.24000000000
+14,2035,R2,2028,solarPV,2.24000000000
+14,2040,R2,2028,solarPV,2.24000000000
+14,2045,R2,2028,solarPV,2.24000000000
+14,2046,R2,2028,solarPV,2.24000000000
+14,2047,R2,2028,solarPV,2.24000000000
+14,2048,R2,2028,solarPV,2.24000000000
+14,2049,R2,2028,solarPV,2.24000000000
+14,2050,R2,2028,solarPV,2.24000000000
+14,2051,R2,2028,solarPV,2.24000000000
+14,2052,R2,2028,solarPV,2.24000000000
+14,2053,R2,2028,solarPV,2.24000000000
+14,2054,R2,2028,solarPV,2.24000000000
+15,2032,R2,2030,solarPV,2.24000000000
+15,2034,R2,2030,solarPV,2.24000000000
+15,2035,R2,2030,solarPV,2.24000000000
+15,2040,R2,2030,solarPV,2.24000000000
+15,2045,R2,2030,solarPV,2.24000000000
+15,2046,R2,2030,solarPV,2.24000000000
+15,2047,R2,2030,solarPV,2.24000000000
+15,2048,R2,2030,solarPV,2.24000000000
+15,2049,R2,2030,solarPV,2.24000000000
+15,2050,R2,2030,solarPV,2.24000000000
+15,2051,R2,2030,solarPV,2.24000000000
+15,2052,R2,2030,solarPV,2.24000000000
+15,2053,R2,2030,solarPV,2.24000000000
+15,2054,R2,2030,solarPV,2.24000000000
+15,2055,R2,2030,solarPV,2.24000000000
+15,2056,R2,2030,solarPV,2.24000000000
+16,2034,R2,2032,solarPV,2.24000000000
+16,2035,R2,2032,solarPV,2.24000000000
+16,2040,R2,2032,solarPV,2.24000000000
+16,2045,R2,2032,solarPV,2.24000000000
+16,2046,R2,2032,solarPV,2.24000000000
+16,2047,R2,2032,solarPV,2.24000000000
+16,2048,R2,2032,solarPV,2.24000000000
+16,2049,R2,2032,solarPV,2.24000000000
+16,2050,R2,2032,solarPV,2.24000000000
+16,2051,R2,2032,solarPV,2.24000000000
+16,2052,R2,2032,solarPV,2.24000000000
+16,2053,R2,2032,solarPV,2.24000000000
+16,2054,R2,2032,solarPV,2.24000000000
+16,2055,R2,2032,solarPV,2.24000000000
+16,2056,R2,2032,solarPV,2.24000000000
+16,2057,R2,2032,solarPV,2.24000000000
+16,2058,R2,2032,solarPV,2.24000000000
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 3be6c3ca..2e35199b 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,211 +1,211 @@
 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
+1,2034,R1,2020,solarPV,3.79000000000
+1,2035,R1,2020,solarPV,3.79000000000
+1,2036,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2035,R1,2022,windturbine,2.28590000000
-3,2036,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2034,R1,2024,windturbine,7.21040000000
-4,2035,R1,2024,windturbine,7.21040000000
-4,2036,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2034,R1,2026,solarPV,2.28590000000
-5,2035,R1,2026,solarPV,2.28590000000
-5,2036,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2034,R1,2028,solarPV,2.28590000000
-6,2035,R1,2028,solarPV,2.28590000000
-6,2036,R1,2028,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-7,2034,R1,2030,solarPV,2.28590000000
-7,2035,R1,2030,solarPV,2.28590000000
-7,2036,R1,2030,solarPV,2.28590000000
-7,2040,R1,2030,solarPV,2.28590000000
-7,2045,R1,2030,solarPV,2.28590000000
-7,2046,R1,2030,solarPV,2.28590000000
-7,2047,R1,2030,solarPV,2.28590000000
-7,2048,R1,2030,solarPV,2.28590000000
-7,2049,R1,2030,solarPV,2.28590000000
-7,2050,R1,2030,solarPV,2.28590000000
-7,2051,R1,2030,solarPV,2.28590000000
-7,2052,R1,2030,solarPV,2.28590000000
-7,2053,R1,2030,solarPV,2.28590000000
-7,2054,R1,2030,solarPV,2.28590000000
-7,2055,R1,2030,solarPV,2.28590000000
-7,2056,R1,2030,solarPV,2.28590000000
-8,2034,R1,2032,solarPV,2.28590000000
-8,2035,R1,2032,solarPV,2.28590000000
-8,2036,R1,2032,solarPV,2.28590000000
-8,2040,R1,2032,solarPV,2.28590000000
-8,2045,R1,2032,solarPV,2.28590000000
-8,2046,R1,2032,solarPV,2.28590000000
-8,2047,R1,2032,solarPV,2.28590000000
-8,2048,R1,2032,solarPV,2.28590000000
-8,2049,R1,2032,solarPV,2.28590000000
-8,2050,R1,2032,solarPV,2.28590000000
-8,2051,R1,2032,solarPV,2.28590000000
-8,2052,R1,2032,solarPV,2.28590000000
-8,2053,R1,2032,solarPV,2.28590000000
-8,2054,R1,2032,solarPV,2.28590000000
-8,2055,R1,2032,solarPV,2.28590000000
-8,2056,R1,2032,solarPV,2.28590000000
-8,2057,R1,2032,solarPV,2.28590000000
-8,2058,R1,2032,solarPV,2.28590000000
-9,2036,R1,2034,solarPV,4.61130000000
-9,2040,R1,2034,solarPV,4.61130000000
-9,2045,R1,2034,solarPV,4.61130000000
-9,2046,R1,2034,solarPV,4.61130000000
-9,2047,R1,2034,solarPV,4.61130000000
-9,2048,R1,2034,solarPV,4.61130000000
-9,2049,R1,2034,solarPV,4.61130000000
-9,2050,R1,2034,solarPV,4.61130000000
-9,2051,R1,2034,solarPV,4.61130000000
-9,2052,R1,2034,solarPV,4.61130000000
-9,2053,R1,2034,solarPV,4.61130000000
-9,2054,R1,2034,solarPV,4.61130000000
-9,2055,R1,2034,solarPV,4.61130000000
-9,2056,R1,2034,solarPV,4.61130000000
-9,2057,R1,2034,solarPV,4.61130000000
-9,2058,R1,2034,solarPV,4.61130000000
-9,2059,R1,2034,solarPV,4.61130000000
-9,2060,R1,2034,solarPV,4.61130000000
-11,2034,R2,2020,windturbine,12.17990000000
-11,2035,R2,2020,windturbine,12.17990000000
-11,2036,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,2034,R2,2022,windturbine,2.28590000000
-12,2035,R2,2022,windturbine,2.28590000000
-12,2036,R2,2022,windturbine,2.28590000000
-12,2040,R2,2022,windturbine,2.28590000000
-12,2045,R2,2022,windturbine,2.28590000000
-12,2046,R2,2022,windturbine,2.28590000000
-12,2047,R2,2022,windturbine,2.28590000000
-12,2048,R2,2022,windturbine,2.28590000000
-13,2034,R2,2024,windturbine,7.21040000000
-13,2035,R2,2024,windturbine,7.21040000000
-13,2036,R2,2024,windturbine,7.21040000000
-13,2040,R2,2024,windturbine,7.21040000000
-13,2045,R2,2024,windturbine,7.21040000000
-13,2046,R2,2024,windturbine,7.21040000000
-13,2047,R2,2024,windturbine,7.21040000000
-13,2048,R2,2024,windturbine,7.21040000000
-13,2049,R2,2024,windturbine,7.21040000000
-13,2050,R2,2024,windturbine,7.21040000000
-14,2034,R2,2026,solarPV,2.28590000000
-14,2035,R2,2026,solarPV,2.28590000000
-14,2036,R2,2026,solarPV,2.28590000000
-14,2040,R2,2026,solarPV,2.28590000000
-14,2045,R2,2026,solarPV,2.28590000000
-14,2046,R2,2026,solarPV,2.28590000000
-14,2047,R2,2026,solarPV,2.28590000000
-14,2048,R2,2026,solarPV,2.28590000000
-14,2049,R2,2026,solarPV,2.28590000000
-14,2050,R2,2026,solarPV,2.28590000000
-14,2051,R2,2026,solarPV,2.28590000000
-14,2052,R2,2026,solarPV,2.28590000000
-15,2034,R2,2028,solarPV,2.28590000000
-15,2035,R2,2028,solarPV,2.28590000000
-15,2036,R2,2028,solarPV,2.28590000000
-15,2040,R2,2028,solarPV,2.28590000000
-15,2045,R2,2028,solarPV,2.28590000000
-15,2046,R2,2028,solarPV,2.28590000000
-15,2047,R2,2028,solarPV,2.28590000000
-15,2048,R2,2028,solarPV,2.28590000000
-15,2049,R2,2028,solarPV,2.28590000000
-15,2050,R2,2028,solarPV,2.28590000000
-15,2051,R2,2028,solarPV,2.28590000000
-15,2052,R2,2028,solarPV,2.28590000000
-15,2053,R2,2028,solarPV,2.28590000000
-15,2054,R2,2028,solarPV,2.28590000000
-16,2034,R2,2030,solarPV,2.28590000000
-16,2035,R2,2030,solarPV,2.28590000000
-16,2036,R2,2030,solarPV,2.28590000000
-16,2040,R2,2030,solarPV,2.28590000000
-16,2045,R2,2030,solarPV,2.28590000000
-16,2046,R2,2030,solarPV,2.28590000000
-16,2047,R2,2030,solarPV,2.28590000000
-16,2048,R2,2030,solarPV,2.28590000000
-16,2049,R2,2030,solarPV,2.28590000000
-16,2050,R2,2030,solarPV,2.28590000000
-16,2051,R2,2030,solarPV,2.28590000000
-16,2052,R2,2030,solarPV,2.28590000000
-16,2053,R2,2030,solarPV,2.28590000000
-16,2054,R2,2030,solarPV,2.28590000000
-16,2055,R2,2030,solarPV,2.28590000000
-16,2056,R2,2030,solarPV,2.28590000000
-17,2034,R2,2032,solarPV,2.28590000000
-17,2035,R2,2032,solarPV,2.28590000000
-17,2036,R2,2032,solarPV,2.28590000000
-17,2040,R2,2032,solarPV,2.28590000000
-17,2045,R2,2032,solarPV,2.28590000000
-17,2046,R2,2032,solarPV,2.28590000000
-17,2047,R2,2032,solarPV,2.28590000000
-17,2048,R2,2032,solarPV,2.28590000000
-17,2049,R2,2032,solarPV,2.28590000000
-17,2050,R2,2032,solarPV,2.28590000000
-17,2051,R2,2032,solarPV,2.28590000000
-17,2052,R2,2032,solarPV,2.28590000000
-17,2053,R2,2032,solarPV,2.28590000000
-17,2054,R2,2032,solarPV,2.28590000000
-17,2055,R2,2032,solarPV,2.28590000000
-17,2056,R2,2032,solarPV,2.28590000000
-17,2057,R2,2032,solarPV,2.28590000000
-17,2058,R2,2032,solarPV,2.28590000000
-18,2036,R2,2034,solarPV,4.61130000000
-18,2040,R2,2034,solarPV,4.61130000000
-18,2045,R2,2034,solarPV,4.61130000000
-18,2046,R2,2034,solarPV,4.61130000000
-18,2047,R2,2034,solarPV,4.61130000000
-18,2048,R2,2034,solarPV,4.61130000000
-18,2049,R2,2034,solarPV,4.61130000000
-18,2050,R2,2034,solarPV,4.61130000000
-18,2051,R2,2034,solarPV,4.61130000000
-18,2052,R2,2034,solarPV,4.61130000000
-18,2053,R2,2034,solarPV,4.61130000000
-18,2054,R2,2034,solarPV,4.61130000000
-18,2055,R2,2034,solarPV,4.61130000000
-18,2056,R2,2034,solarPV,4.61130000000
-18,2057,R2,2034,solarPV,4.61130000000
-18,2058,R2,2034,solarPV,4.61130000000
-18,2059,R2,2034,solarPV,4.61130000000
-18,2060,R2,2034,solarPV,4.61130000000
+3,2034,R1,2022,windturbine,2.24000000000
+3,2035,R1,2022,windturbine,2.24000000000
+3,2036,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2034,R1,2024,windturbine,7.09480000000
+4,2035,R1,2024,windturbine,7.09480000000
+4,2036,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2034,R1,2026,solarPV,2.24000000000
+5,2035,R1,2026,solarPV,2.24000000000
+5,2036,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2034,R1,2028,solarPV,2.24000000000
+6,2035,R1,2028,solarPV,2.24000000000
+6,2036,R1,2028,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+7,2034,R1,2030,solarPV,2.24000000000
+7,2035,R1,2030,solarPV,2.24000000000
+7,2036,R1,2030,solarPV,2.24000000000
+7,2040,R1,2030,solarPV,2.24000000000
+7,2045,R1,2030,solarPV,2.24000000000
+7,2046,R1,2030,solarPV,2.24000000000
+7,2047,R1,2030,solarPV,2.24000000000
+7,2048,R1,2030,solarPV,2.24000000000
+7,2049,R1,2030,solarPV,2.24000000000
+7,2050,R1,2030,solarPV,2.24000000000
+7,2051,R1,2030,solarPV,2.24000000000
+7,2052,R1,2030,solarPV,2.24000000000
+7,2053,R1,2030,solarPV,2.24000000000
+7,2054,R1,2030,solarPV,2.24000000000
+7,2055,R1,2030,solarPV,2.24000000000
+7,2056,R1,2030,solarPV,2.24000000000
+8,2034,R1,2032,solarPV,2.24000000000
+8,2035,R1,2032,solarPV,2.24000000000
+8,2036,R1,2032,solarPV,2.24000000000
+8,2040,R1,2032,solarPV,2.24000000000
+8,2045,R1,2032,solarPV,2.24000000000
+8,2046,R1,2032,solarPV,2.24000000000
+8,2047,R1,2032,solarPV,2.24000000000
+8,2048,R1,2032,solarPV,2.24000000000
+8,2049,R1,2032,solarPV,2.24000000000
+8,2050,R1,2032,solarPV,2.24000000000
+8,2051,R1,2032,solarPV,2.24000000000
+8,2052,R1,2032,solarPV,2.24000000000
+8,2053,R1,2032,solarPV,2.24000000000
+8,2054,R1,2032,solarPV,2.24000000000
+8,2055,R1,2032,solarPV,2.24000000000
+8,2056,R1,2032,solarPV,2.24000000000
+8,2057,R1,2032,solarPV,2.24000000000
+8,2058,R1,2032,solarPV,2.24000000000
+9,2036,R1,2034,solarPV,4.63520000000
+9,2040,R1,2034,solarPV,4.63520000000
+9,2045,R1,2034,solarPV,4.63520000000
+9,2046,R1,2034,solarPV,4.63520000000
+9,2047,R1,2034,solarPV,4.63520000000
+9,2048,R1,2034,solarPV,4.63520000000
+9,2049,R1,2034,solarPV,4.63520000000
+9,2050,R1,2034,solarPV,4.63520000000
+9,2051,R1,2034,solarPV,4.63520000000
+9,2052,R1,2034,solarPV,4.63520000000
+9,2053,R1,2034,solarPV,4.63520000000
+9,2054,R1,2034,solarPV,4.63520000000
+9,2055,R1,2034,solarPV,4.63520000000
+9,2056,R1,2034,solarPV,4.63520000000
+9,2057,R1,2034,solarPV,4.63520000000
+9,2058,R1,2034,solarPV,4.63520000000
+9,2059,R1,2034,solarPV,4.63520000000
+9,2060,R1,2034,solarPV,4.63520000000
+11,2034,R2,2020,windturbine,11.79000000000
+11,2035,R2,2020,windturbine,11.79000000000
+11,2036,R2,2020,windturbine,11.79000000000
+11,2040,R2,2020,windturbine,11.79000000000
+11,2045,R2,2020,windturbine,11.79000000000
+11,2046,R2,2020,windturbine,11.79000000000
+12,2034,R2,2022,windturbine,2.24000000000
+12,2035,R2,2022,windturbine,2.24000000000
+12,2036,R2,2022,windturbine,2.24000000000
+12,2040,R2,2022,windturbine,2.24000000000
+12,2045,R2,2022,windturbine,2.24000000000
+12,2046,R2,2022,windturbine,2.24000000000
+12,2047,R2,2022,windturbine,2.24000000000
+12,2048,R2,2022,windturbine,2.24000000000
+13,2034,R2,2024,windturbine,7.09480000000
+13,2035,R2,2024,windturbine,7.09480000000
+13,2036,R2,2024,windturbine,7.09480000000
+13,2040,R2,2024,windturbine,7.09480000000
+13,2045,R2,2024,windturbine,7.09480000000
+13,2046,R2,2024,windturbine,7.09480000000
+13,2047,R2,2024,windturbine,7.09480000000
+13,2048,R2,2024,windturbine,7.09480000000
+13,2049,R2,2024,windturbine,7.09480000000
+13,2050,R2,2024,windturbine,7.09480000000
+14,2034,R2,2026,solarPV,2.24000000000
+14,2035,R2,2026,solarPV,2.24000000000
+14,2036,R2,2026,solarPV,2.24000000000
+14,2040,R2,2026,solarPV,2.24000000000
+14,2045,R2,2026,solarPV,2.24000000000
+14,2046,R2,2026,solarPV,2.24000000000
+14,2047,R2,2026,solarPV,2.24000000000
+14,2048,R2,2026,solarPV,2.24000000000
+14,2049,R2,2026,solarPV,2.24000000000
+14,2050,R2,2026,solarPV,2.24000000000
+14,2051,R2,2026,solarPV,2.24000000000
+14,2052,R2,2026,solarPV,2.24000000000
+15,2034,R2,2028,solarPV,2.24000000000
+15,2035,R2,2028,solarPV,2.24000000000
+15,2036,R2,2028,solarPV,2.24000000000
+15,2040,R2,2028,solarPV,2.24000000000
+15,2045,R2,2028,solarPV,2.24000000000
+15,2046,R2,2028,solarPV,2.24000000000
+15,2047,R2,2028,solarPV,2.24000000000
+15,2048,R2,2028,solarPV,2.24000000000
+15,2049,R2,2028,solarPV,2.24000000000
+15,2050,R2,2028,solarPV,2.24000000000
+15,2051,R2,2028,solarPV,2.24000000000
+15,2052,R2,2028,solarPV,2.24000000000
+15,2053,R2,2028,solarPV,2.24000000000
+15,2054,R2,2028,solarPV,2.24000000000
+16,2034,R2,2030,solarPV,2.24000000000
+16,2035,R2,2030,solarPV,2.24000000000
+16,2036,R2,2030,solarPV,2.24000000000
+16,2040,R2,2030,solarPV,2.24000000000
+16,2045,R2,2030,solarPV,2.24000000000
+16,2046,R2,2030,solarPV,2.24000000000
+16,2047,R2,2030,solarPV,2.24000000000
+16,2048,R2,2030,solarPV,2.24000000000
+16,2049,R2,2030,solarPV,2.24000000000
+16,2050,R2,2030,solarPV,2.24000000000
+16,2051,R2,2030,solarPV,2.24000000000
+16,2052,R2,2030,solarPV,2.24000000000
+16,2053,R2,2030,solarPV,2.24000000000
+16,2054,R2,2030,solarPV,2.24000000000
+16,2055,R2,2030,solarPV,2.24000000000
+16,2056,R2,2030,solarPV,2.24000000000
+17,2034,R2,2032,solarPV,2.24000000000
+17,2035,R2,2032,solarPV,2.24000000000
+17,2036,R2,2032,solarPV,2.24000000000
+17,2040,R2,2032,solarPV,2.24000000000
+17,2045,R2,2032,solarPV,2.24000000000
+17,2046,R2,2032,solarPV,2.24000000000
+17,2047,R2,2032,solarPV,2.24000000000
+17,2048,R2,2032,solarPV,2.24000000000
+17,2049,R2,2032,solarPV,2.24000000000
+17,2050,R2,2032,solarPV,2.24000000000
+17,2051,R2,2032,solarPV,2.24000000000
+17,2052,R2,2032,solarPV,2.24000000000
+17,2053,R2,2032,solarPV,2.24000000000
+17,2054,R2,2032,solarPV,2.24000000000
+17,2055,R2,2032,solarPV,2.24000000000
+17,2056,R2,2032,solarPV,2.24000000000
+17,2057,R2,2032,solarPV,2.24000000000
+17,2058,R2,2032,solarPV,2.24000000000
+18,2036,R2,2034,solarPV,4.63520000000
+18,2040,R2,2034,solarPV,4.63520000000
+18,2045,R2,2034,solarPV,4.63520000000
+18,2046,R2,2034,solarPV,4.63520000000
+18,2047,R2,2034,solarPV,4.63520000000
+18,2048,R2,2034,solarPV,4.63520000000
+18,2049,R2,2034,solarPV,4.63520000000
+18,2050,R2,2034,solarPV,4.63520000000
+18,2051,R2,2034,solarPV,4.63520000000
+18,2052,R2,2034,solarPV,4.63520000000
+18,2053,R2,2034,solarPV,4.63520000000
+18,2054,R2,2034,solarPV,4.63520000000
+18,2055,R2,2034,solarPV,4.63520000000
+18,2056,R2,2034,solarPV,4.63520000000
+18,2057,R2,2034,solarPV,4.63520000000
+18,2058,R2,2034,solarPV,4.63520000000
+18,2059,R2,2034,solarPV,4.63520000000
+18,2060,R2,2034,solarPV,4.63520000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..da743220
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
@@ -0,0 +1,59 @@
+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,solarPV,9.15000000000
+3,2040,R1,2025,solarPV,9.15000000000
+3,2045,R1,2025,solarPV,9.15000000000
+3,2049,R1,2025,solarPV,9.15000000000
+3,2050,R1,2025,solarPV,9.15000000000
+3,2054,R1,2025,solarPV,9.15000000000
+4,2035,R1,2030,solarPV,6.00000000000
+4,2040,R1,2030,solarPV,6.00000000000
+4,2045,R1,2030,solarPV,6.00000000000
+4,2049,R1,2030,solarPV,6.00000000000
+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,2040,R1,2035,solarPV,9.19000000000
+5,2045,R1,2035,solarPV,9.19000000000
+5,2049,R1,2035,solarPV,9.19000000000
+5,2050,R1,2035,solarPV,9.19000000000
+5,2054,R1,2035,solarPV,9.19000000000
+5,2055,R1,2035,solarPV,9.19000000000
+5,2059,R1,2035,solarPV,9.19000000000
+5,2060,R1,2035,solarPV,9.19000000000
+5,2064,R1,2035,solarPV,9.19000000000
+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,2035,R2,2025,solarPV,9.15000000000
+8,2040,R2,2025,solarPV,9.15000000000
+8,2045,R2,2025,solarPV,9.15000000000
+8,2049,R2,2025,solarPV,9.15000000000
+8,2050,R2,2025,solarPV,9.15000000000
+8,2054,R2,2025,solarPV,9.15000000000
+9,2035,R2,2030,solarPV,6.00000000000
+9,2040,R2,2030,solarPV,6.00000000000
+9,2045,R2,2030,solarPV,6.00000000000
+9,2049,R2,2030,solarPV,6.00000000000
+9,2050,R2,2030,solarPV,6.00000000000
+9,2054,R2,2030,solarPV,6.00000000000
+9,2055,R2,2030,solarPV,6.00000000000
+9,2059,R2,2030,solarPV,6.00000000000
+10,2040,R2,2035,solarPV,9.19000000000
+10,2045,R2,2035,solarPV,9.19000000000
+10,2049,R2,2035,solarPV,9.19000000000
+10,2050,R2,2035,solarPV,9.19000000000
+10,2054,R2,2035,solarPV,9.19000000000
+10,2055,R2,2035,solarPV,9.19000000000
+10,2059,R2,2035,solarPV,9.19000000000
+10,2060,R2,2035,solarPV,9.19000000000
+10,2064,R2,2035,solarPV,9.19000000000
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 e1c98cf2..3aa67908 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,238 +1,238 @@
 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
+1,2036,R1,2020,solarPV,3.79000000000
+1,2038,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2038,R1,2022,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2036,R1,2024,windturbine,7.21040000000
-4,2038,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2036,R1,2026,solarPV,2.28590000000
-5,2038,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2036,R1,2028,solarPV,2.28590000000
-6,2038,R1,2028,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-7,2036,R1,2030,solarPV,2.28590000000
-7,2038,R1,2030,solarPV,2.28590000000
-7,2040,R1,2030,solarPV,2.28590000000
-7,2045,R1,2030,solarPV,2.28590000000
-7,2046,R1,2030,solarPV,2.28590000000
-7,2047,R1,2030,solarPV,2.28590000000
-7,2048,R1,2030,solarPV,2.28590000000
-7,2049,R1,2030,solarPV,2.28590000000
-7,2050,R1,2030,solarPV,2.28590000000
-7,2051,R1,2030,solarPV,2.28590000000
-7,2052,R1,2030,solarPV,2.28590000000
-7,2053,R1,2030,solarPV,2.28590000000
-7,2054,R1,2030,solarPV,2.28590000000
-7,2055,R1,2030,solarPV,2.28590000000
-7,2056,R1,2030,solarPV,2.28590000000
-8,2036,R1,2032,solarPV,2.28590000000
-8,2038,R1,2032,solarPV,2.28590000000
-8,2040,R1,2032,solarPV,2.28590000000
-8,2045,R1,2032,solarPV,2.28590000000
-8,2046,R1,2032,solarPV,2.28590000000
-8,2047,R1,2032,solarPV,2.28590000000
-8,2048,R1,2032,solarPV,2.28590000000
-8,2049,R1,2032,solarPV,2.28590000000
-8,2050,R1,2032,solarPV,2.28590000000
-8,2051,R1,2032,solarPV,2.28590000000
-8,2052,R1,2032,solarPV,2.28590000000
-8,2053,R1,2032,solarPV,2.28590000000
-8,2054,R1,2032,solarPV,2.28590000000
-8,2055,R1,2032,solarPV,2.28590000000
-8,2056,R1,2032,solarPV,2.28590000000
-8,2057,R1,2032,solarPV,2.28590000000
-8,2058,R1,2032,solarPV,2.28590000000
-9,2036,R1,2034,solarPV,4.61130000000
-9,2038,R1,2034,solarPV,4.61130000000
-9,2040,R1,2034,solarPV,4.61130000000
-9,2045,R1,2034,solarPV,4.61130000000
-9,2046,R1,2034,solarPV,4.61130000000
-9,2047,R1,2034,solarPV,4.61130000000
-9,2048,R1,2034,solarPV,4.61130000000
-9,2049,R1,2034,solarPV,4.61130000000
-9,2050,R1,2034,solarPV,4.61130000000
-9,2051,R1,2034,solarPV,4.61130000000
-9,2052,R1,2034,solarPV,4.61130000000
-9,2053,R1,2034,solarPV,4.61130000000
-9,2054,R1,2034,solarPV,4.61130000000
-9,2055,R1,2034,solarPV,4.61130000000
-9,2056,R1,2034,solarPV,4.61130000000
-9,2057,R1,2034,solarPV,4.61130000000
-9,2058,R1,2034,solarPV,4.61130000000
-9,2059,R1,2034,solarPV,4.61130000000
-9,2060,R1,2034,solarPV,4.61130000000
-10,2038,R1,2036,solarPV,2.28590000000
-10,2040,R1,2036,solarPV,2.28590000000
-10,2045,R1,2036,solarPV,2.28590000000
-10,2046,R1,2036,solarPV,2.28590000000
-10,2047,R1,2036,solarPV,2.28590000000
-10,2048,R1,2036,solarPV,2.28590000000
-10,2049,R1,2036,solarPV,2.28590000000
-10,2050,R1,2036,solarPV,2.28590000000
-10,2051,R1,2036,solarPV,2.28590000000
-10,2052,R1,2036,solarPV,2.28590000000
-10,2053,R1,2036,solarPV,2.28590000000
-10,2054,R1,2036,solarPV,2.28590000000
-10,2055,R1,2036,solarPV,2.28590000000
-10,2056,R1,2036,solarPV,2.28590000000
-10,2057,R1,2036,solarPV,2.28590000000
-10,2058,R1,2036,solarPV,2.28590000000
-10,2059,R1,2036,solarPV,2.28590000000
-10,2060,R1,2036,solarPV,2.28590000000
-10,2061,R1,2036,solarPV,2.28590000000
-10,2062,R1,2036,solarPV,2.28590000000
-12,2036,R2,2020,windturbine,12.17990000000
-12,2038,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,2036,R2,2022,windturbine,2.28590000000
-13,2038,R2,2022,windturbine,2.28590000000
-13,2040,R2,2022,windturbine,2.28590000000
-13,2045,R2,2022,windturbine,2.28590000000
-13,2046,R2,2022,windturbine,2.28590000000
-13,2047,R2,2022,windturbine,2.28590000000
-13,2048,R2,2022,windturbine,2.28590000000
-14,2036,R2,2024,windturbine,7.21040000000
-14,2038,R2,2024,windturbine,7.21040000000
-14,2040,R2,2024,windturbine,7.21040000000
-14,2045,R2,2024,windturbine,7.21040000000
-14,2046,R2,2024,windturbine,7.21040000000
-14,2047,R2,2024,windturbine,7.21040000000
-14,2048,R2,2024,windturbine,7.21040000000
-14,2049,R2,2024,windturbine,7.21040000000
-14,2050,R2,2024,windturbine,7.21040000000
-15,2036,R2,2026,solarPV,2.28590000000
-15,2038,R2,2026,solarPV,2.28590000000
-15,2040,R2,2026,solarPV,2.28590000000
-15,2045,R2,2026,solarPV,2.28590000000
-15,2046,R2,2026,solarPV,2.28590000000
-15,2047,R2,2026,solarPV,2.28590000000
-15,2048,R2,2026,solarPV,2.28590000000
-15,2049,R2,2026,solarPV,2.28590000000
-15,2050,R2,2026,solarPV,2.28590000000
-15,2051,R2,2026,solarPV,2.28590000000
-15,2052,R2,2026,solarPV,2.28590000000
-16,2036,R2,2028,solarPV,2.28590000000
-16,2038,R2,2028,solarPV,2.28590000000
-16,2040,R2,2028,solarPV,2.28590000000
-16,2045,R2,2028,solarPV,2.28590000000
-16,2046,R2,2028,solarPV,2.28590000000
-16,2047,R2,2028,solarPV,2.28590000000
-16,2048,R2,2028,solarPV,2.28590000000
-16,2049,R2,2028,solarPV,2.28590000000
-16,2050,R2,2028,solarPV,2.28590000000
-16,2051,R2,2028,solarPV,2.28590000000
-16,2052,R2,2028,solarPV,2.28590000000
-16,2053,R2,2028,solarPV,2.28590000000
-16,2054,R2,2028,solarPV,2.28590000000
-17,2036,R2,2030,solarPV,2.28590000000
-17,2038,R2,2030,solarPV,2.28590000000
-17,2040,R2,2030,solarPV,2.28590000000
-17,2045,R2,2030,solarPV,2.28590000000
-17,2046,R2,2030,solarPV,2.28590000000
-17,2047,R2,2030,solarPV,2.28590000000
-17,2048,R2,2030,solarPV,2.28590000000
-17,2049,R2,2030,solarPV,2.28590000000
-17,2050,R2,2030,solarPV,2.28590000000
-17,2051,R2,2030,solarPV,2.28590000000
-17,2052,R2,2030,solarPV,2.28590000000
-17,2053,R2,2030,solarPV,2.28590000000
-17,2054,R2,2030,solarPV,2.28590000000
-17,2055,R2,2030,solarPV,2.28590000000
-17,2056,R2,2030,solarPV,2.28590000000
-18,2036,R2,2032,solarPV,2.28590000000
-18,2038,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,2051,R2,2032,solarPV,2.28590000000
-18,2052,R2,2032,solarPV,2.28590000000
-18,2053,R2,2032,solarPV,2.28590000000
-18,2054,R2,2032,solarPV,2.28590000000
-18,2055,R2,2032,solarPV,2.28590000000
-18,2056,R2,2032,solarPV,2.28590000000
-18,2057,R2,2032,solarPV,2.28590000000
-18,2058,R2,2032,solarPV,2.28590000000
-19,2036,R2,2034,solarPV,4.61130000000
-19,2038,R2,2034,solarPV,4.61130000000
-19,2040,R2,2034,solarPV,4.61130000000
-19,2045,R2,2034,solarPV,4.61130000000
-19,2046,R2,2034,solarPV,4.61130000000
-19,2047,R2,2034,solarPV,4.61130000000
-19,2048,R2,2034,solarPV,4.61130000000
-19,2049,R2,2034,solarPV,4.61130000000
-19,2050,R2,2034,solarPV,4.61130000000
-19,2051,R2,2034,solarPV,4.61130000000
-19,2052,R2,2034,solarPV,4.61130000000
-19,2053,R2,2034,solarPV,4.61130000000
-19,2054,R2,2034,solarPV,4.61130000000
-19,2055,R2,2034,solarPV,4.61130000000
-19,2056,R2,2034,solarPV,4.61130000000
-19,2057,R2,2034,solarPV,4.61130000000
-19,2058,R2,2034,solarPV,4.61130000000
-19,2059,R2,2034,solarPV,4.61130000000
-19,2060,R2,2034,solarPV,4.61130000000
-20,2038,R2,2036,solarPV,2.28590000000
-20,2040,R2,2036,solarPV,2.28590000000
-20,2045,R2,2036,solarPV,2.28590000000
-20,2046,R2,2036,solarPV,2.28590000000
-20,2047,R2,2036,solarPV,2.28590000000
-20,2048,R2,2036,solarPV,2.28590000000
-20,2049,R2,2036,solarPV,2.28590000000
-20,2050,R2,2036,solarPV,2.28590000000
-20,2051,R2,2036,solarPV,2.28590000000
-20,2052,R2,2036,solarPV,2.28590000000
-20,2053,R2,2036,solarPV,2.28590000000
-20,2054,R2,2036,solarPV,2.28590000000
-20,2055,R2,2036,solarPV,2.28590000000
-20,2056,R2,2036,solarPV,2.28590000000
-20,2057,R2,2036,solarPV,2.28590000000
-20,2058,R2,2036,solarPV,2.28590000000
-20,2059,R2,2036,solarPV,2.28590000000
-20,2060,R2,2036,solarPV,2.28590000000
-20,2061,R2,2036,solarPV,2.28590000000
-20,2062,R2,2036,solarPV,2.28590000000
+3,2036,R1,2022,windturbine,2.24000000000
+3,2038,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2036,R1,2024,windturbine,7.09480000000
+4,2038,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2036,R1,2026,solarPV,2.24000000000
+5,2038,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2036,R1,2028,solarPV,2.24000000000
+6,2038,R1,2028,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+7,2036,R1,2030,solarPV,2.24000000000
+7,2038,R1,2030,solarPV,2.24000000000
+7,2040,R1,2030,solarPV,2.24000000000
+7,2045,R1,2030,solarPV,2.24000000000
+7,2046,R1,2030,solarPV,2.24000000000
+7,2047,R1,2030,solarPV,2.24000000000
+7,2048,R1,2030,solarPV,2.24000000000
+7,2049,R1,2030,solarPV,2.24000000000
+7,2050,R1,2030,solarPV,2.24000000000
+7,2051,R1,2030,solarPV,2.24000000000
+7,2052,R1,2030,solarPV,2.24000000000
+7,2053,R1,2030,solarPV,2.24000000000
+7,2054,R1,2030,solarPV,2.24000000000
+7,2055,R1,2030,solarPV,2.24000000000
+7,2056,R1,2030,solarPV,2.24000000000
+8,2036,R1,2032,solarPV,2.24000000000
+8,2038,R1,2032,solarPV,2.24000000000
+8,2040,R1,2032,solarPV,2.24000000000
+8,2045,R1,2032,solarPV,2.24000000000
+8,2046,R1,2032,solarPV,2.24000000000
+8,2047,R1,2032,solarPV,2.24000000000
+8,2048,R1,2032,solarPV,2.24000000000
+8,2049,R1,2032,solarPV,2.24000000000
+8,2050,R1,2032,solarPV,2.24000000000
+8,2051,R1,2032,solarPV,2.24000000000
+8,2052,R1,2032,solarPV,2.24000000000
+8,2053,R1,2032,solarPV,2.24000000000
+8,2054,R1,2032,solarPV,2.24000000000
+8,2055,R1,2032,solarPV,2.24000000000
+8,2056,R1,2032,solarPV,2.24000000000
+8,2057,R1,2032,solarPV,2.24000000000
+8,2058,R1,2032,solarPV,2.24000000000
+9,2036,R1,2034,solarPV,4.63520000000
+9,2038,R1,2034,solarPV,4.63520000000
+9,2040,R1,2034,solarPV,4.63520000000
+9,2045,R1,2034,solarPV,4.63520000000
+9,2046,R1,2034,solarPV,4.63520000000
+9,2047,R1,2034,solarPV,4.63520000000
+9,2048,R1,2034,solarPV,4.63520000000
+9,2049,R1,2034,solarPV,4.63520000000
+9,2050,R1,2034,solarPV,4.63520000000
+9,2051,R1,2034,solarPV,4.63520000000
+9,2052,R1,2034,solarPV,4.63520000000
+9,2053,R1,2034,solarPV,4.63520000000
+9,2054,R1,2034,solarPV,4.63520000000
+9,2055,R1,2034,solarPV,4.63520000000
+9,2056,R1,2034,solarPV,4.63520000000
+9,2057,R1,2034,solarPV,4.63520000000
+9,2058,R1,2034,solarPV,4.63520000000
+9,2059,R1,2034,solarPV,4.63520000000
+9,2060,R1,2034,solarPV,4.63520000000
+10,2038,R1,2036,solarPV,2.24000000000
+10,2040,R1,2036,solarPV,2.24000000000
+10,2045,R1,2036,solarPV,2.24000000000
+10,2046,R1,2036,solarPV,2.24000000000
+10,2047,R1,2036,solarPV,2.24000000000
+10,2048,R1,2036,solarPV,2.24000000000
+10,2049,R1,2036,solarPV,2.24000000000
+10,2050,R1,2036,solarPV,2.24000000000
+10,2051,R1,2036,solarPV,2.24000000000
+10,2052,R1,2036,solarPV,2.24000000000
+10,2053,R1,2036,solarPV,2.24000000000
+10,2054,R1,2036,solarPV,2.24000000000
+10,2055,R1,2036,solarPV,2.24000000000
+10,2056,R1,2036,solarPV,2.24000000000
+10,2057,R1,2036,solarPV,2.24000000000
+10,2058,R1,2036,solarPV,2.24000000000
+10,2059,R1,2036,solarPV,2.24000000000
+10,2060,R1,2036,solarPV,2.24000000000
+10,2061,R1,2036,solarPV,2.24000000000
+10,2062,R1,2036,solarPV,2.24000000000
+12,2036,R2,2020,windturbine,11.79000000000
+12,2038,R2,2020,windturbine,11.79000000000
+12,2040,R2,2020,windturbine,11.79000000000
+12,2045,R2,2020,windturbine,11.79000000000
+12,2046,R2,2020,windturbine,11.79000000000
+13,2036,R2,2022,windturbine,2.24000000000
+13,2038,R2,2022,windturbine,2.24000000000
+13,2040,R2,2022,windturbine,2.24000000000
+13,2045,R2,2022,windturbine,2.24000000000
+13,2046,R2,2022,windturbine,2.24000000000
+13,2047,R2,2022,windturbine,2.24000000000
+13,2048,R2,2022,windturbine,2.24000000000
+14,2036,R2,2024,windturbine,7.09480000000
+14,2038,R2,2024,windturbine,7.09480000000
+14,2040,R2,2024,windturbine,7.09480000000
+14,2045,R2,2024,windturbine,7.09480000000
+14,2046,R2,2024,windturbine,7.09480000000
+14,2047,R2,2024,windturbine,7.09480000000
+14,2048,R2,2024,windturbine,7.09480000000
+14,2049,R2,2024,windturbine,7.09480000000
+14,2050,R2,2024,windturbine,7.09480000000
+15,2036,R2,2026,solarPV,2.24000000000
+15,2038,R2,2026,solarPV,2.24000000000
+15,2040,R2,2026,solarPV,2.24000000000
+15,2045,R2,2026,solarPV,2.24000000000
+15,2046,R2,2026,solarPV,2.24000000000
+15,2047,R2,2026,solarPV,2.24000000000
+15,2048,R2,2026,solarPV,2.24000000000
+15,2049,R2,2026,solarPV,2.24000000000
+15,2050,R2,2026,solarPV,2.24000000000
+15,2051,R2,2026,solarPV,2.24000000000
+15,2052,R2,2026,solarPV,2.24000000000
+16,2036,R2,2028,solarPV,2.24000000000
+16,2038,R2,2028,solarPV,2.24000000000
+16,2040,R2,2028,solarPV,2.24000000000
+16,2045,R2,2028,solarPV,2.24000000000
+16,2046,R2,2028,solarPV,2.24000000000
+16,2047,R2,2028,solarPV,2.24000000000
+16,2048,R2,2028,solarPV,2.24000000000
+16,2049,R2,2028,solarPV,2.24000000000
+16,2050,R2,2028,solarPV,2.24000000000
+16,2051,R2,2028,solarPV,2.24000000000
+16,2052,R2,2028,solarPV,2.24000000000
+16,2053,R2,2028,solarPV,2.24000000000
+16,2054,R2,2028,solarPV,2.24000000000
+17,2036,R2,2030,solarPV,2.24000000000
+17,2038,R2,2030,solarPV,2.24000000000
+17,2040,R2,2030,solarPV,2.24000000000
+17,2045,R2,2030,solarPV,2.24000000000
+17,2046,R2,2030,solarPV,2.24000000000
+17,2047,R2,2030,solarPV,2.24000000000
+17,2048,R2,2030,solarPV,2.24000000000
+17,2049,R2,2030,solarPV,2.24000000000
+17,2050,R2,2030,solarPV,2.24000000000
+17,2051,R2,2030,solarPV,2.24000000000
+17,2052,R2,2030,solarPV,2.24000000000
+17,2053,R2,2030,solarPV,2.24000000000
+17,2054,R2,2030,solarPV,2.24000000000
+17,2055,R2,2030,solarPV,2.24000000000
+17,2056,R2,2030,solarPV,2.24000000000
+18,2036,R2,2032,solarPV,2.24000000000
+18,2038,R2,2032,solarPV,2.24000000000
+18,2040,R2,2032,solarPV,2.24000000000
+18,2045,R2,2032,solarPV,2.24000000000
+18,2046,R2,2032,solarPV,2.24000000000
+18,2047,R2,2032,solarPV,2.24000000000
+18,2048,R2,2032,solarPV,2.24000000000
+18,2049,R2,2032,solarPV,2.24000000000
+18,2050,R2,2032,solarPV,2.24000000000
+18,2051,R2,2032,solarPV,2.24000000000
+18,2052,R2,2032,solarPV,2.24000000000
+18,2053,R2,2032,solarPV,2.24000000000
+18,2054,R2,2032,solarPV,2.24000000000
+18,2055,R2,2032,solarPV,2.24000000000
+18,2056,R2,2032,solarPV,2.24000000000
+18,2057,R2,2032,solarPV,2.24000000000
+18,2058,R2,2032,solarPV,2.24000000000
+19,2036,R2,2034,solarPV,4.63520000000
+19,2038,R2,2034,solarPV,4.63520000000
+19,2040,R2,2034,solarPV,4.63520000000
+19,2045,R2,2034,solarPV,4.63520000000
+19,2046,R2,2034,solarPV,4.63520000000
+19,2047,R2,2034,solarPV,4.63520000000
+19,2048,R2,2034,solarPV,4.63520000000
+19,2049,R2,2034,solarPV,4.63520000000
+19,2050,R2,2034,solarPV,4.63520000000
+19,2051,R2,2034,solarPV,4.63520000000
+19,2052,R2,2034,solarPV,4.63520000000
+19,2053,R2,2034,solarPV,4.63520000000
+19,2054,R2,2034,solarPV,4.63520000000
+19,2055,R2,2034,solarPV,4.63520000000
+19,2056,R2,2034,solarPV,4.63520000000
+19,2057,R2,2034,solarPV,4.63520000000
+19,2058,R2,2034,solarPV,4.63520000000
+19,2059,R2,2034,solarPV,4.63520000000
+19,2060,R2,2034,solarPV,4.63520000000
+20,2038,R2,2036,solarPV,2.24000000000
+20,2040,R2,2036,solarPV,2.24000000000
+20,2045,R2,2036,solarPV,2.24000000000
+20,2046,R2,2036,solarPV,2.24000000000
+20,2047,R2,2036,solarPV,2.24000000000
+20,2048,R2,2036,solarPV,2.24000000000
+20,2049,R2,2036,solarPV,2.24000000000
+20,2050,R2,2036,solarPV,2.24000000000
+20,2051,R2,2036,solarPV,2.24000000000
+20,2052,R2,2036,solarPV,2.24000000000
+20,2053,R2,2036,solarPV,2.24000000000
+20,2054,R2,2036,solarPV,2.24000000000
+20,2055,R2,2036,solarPV,2.24000000000
+20,2056,R2,2036,solarPV,2.24000000000
+20,2057,R2,2036,solarPV,2.24000000000
+20,2058,R2,2036,solarPV,2.24000000000
+20,2059,R2,2036,solarPV,2.24000000000
+20,2060,R2,2036,solarPV,2.24000000000
+20,2061,R2,2036,solarPV,2.24000000000
+20,2062,R2,2036,solarPV,2.24000000000
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 b93ccce6..eb095b2e 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,263 +1,263 @@
 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
+1,2038,R1,2020,solarPV,3.79000000000
+1,2040,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2040,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2038,R1,2024,windturbine,7.21040000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2038,R1,2026,solarPV,2.28590000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2038,R1,2028,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-7,2038,R1,2030,solarPV,2.28590000000
-7,2040,R1,2030,solarPV,2.28590000000
-7,2045,R1,2030,solarPV,2.28590000000
-7,2046,R1,2030,solarPV,2.28590000000
-7,2047,R1,2030,solarPV,2.28590000000
-7,2048,R1,2030,solarPV,2.28590000000
-7,2049,R1,2030,solarPV,2.28590000000
-7,2050,R1,2030,solarPV,2.28590000000
-7,2051,R1,2030,solarPV,2.28590000000
-7,2052,R1,2030,solarPV,2.28590000000
-7,2053,R1,2030,solarPV,2.28590000000
-7,2054,R1,2030,solarPV,2.28590000000
-7,2055,R1,2030,solarPV,2.28590000000
-7,2056,R1,2030,solarPV,2.28590000000
-8,2038,R1,2032,solarPV,2.28590000000
-8,2040,R1,2032,solarPV,2.28590000000
-8,2045,R1,2032,solarPV,2.28590000000
-8,2046,R1,2032,solarPV,2.28590000000
-8,2047,R1,2032,solarPV,2.28590000000
-8,2048,R1,2032,solarPV,2.28590000000
-8,2049,R1,2032,solarPV,2.28590000000
-8,2050,R1,2032,solarPV,2.28590000000
-8,2051,R1,2032,solarPV,2.28590000000
-8,2052,R1,2032,solarPV,2.28590000000
-8,2053,R1,2032,solarPV,2.28590000000
-8,2054,R1,2032,solarPV,2.28590000000
-8,2055,R1,2032,solarPV,2.28590000000
-8,2056,R1,2032,solarPV,2.28590000000
-8,2057,R1,2032,solarPV,2.28590000000
-8,2058,R1,2032,solarPV,2.28590000000
-9,2038,R1,2034,solarPV,4.61130000000
-9,2040,R1,2034,solarPV,4.61130000000
-9,2045,R1,2034,solarPV,4.61130000000
-9,2046,R1,2034,solarPV,4.61130000000
-9,2047,R1,2034,solarPV,4.61130000000
-9,2048,R1,2034,solarPV,4.61130000000
-9,2049,R1,2034,solarPV,4.61130000000
-9,2050,R1,2034,solarPV,4.61130000000
-9,2051,R1,2034,solarPV,4.61130000000
-9,2052,R1,2034,solarPV,4.61130000000
-9,2053,R1,2034,solarPV,4.61130000000
-9,2054,R1,2034,solarPV,4.61130000000
-9,2055,R1,2034,solarPV,4.61130000000
-9,2056,R1,2034,solarPV,4.61130000000
-9,2057,R1,2034,solarPV,4.61130000000
-9,2058,R1,2034,solarPV,4.61130000000
-9,2059,R1,2034,solarPV,4.61130000000
-9,2060,R1,2034,solarPV,4.61130000000
-10,2038,R1,2036,solarPV,2.28590000000
-10,2040,R1,2036,solarPV,2.28590000000
-10,2045,R1,2036,solarPV,2.28590000000
-10,2046,R1,2036,solarPV,2.28590000000
-10,2047,R1,2036,solarPV,2.28590000000
-10,2048,R1,2036,solarPV,2.28590000000
-10,2049,R1,2036,solarPV,2.28590000000
-10,2050,R1,2036,solarPV,2.28590000000
-10,2051,R1,2036,solarPV,2.28590000000
-10,2052,R1,2036,solarPV,2.28590000000
-10,2053,R1,2036,solarPV,2.28590000000
-10,2054,R1,2036,solarPV,2.28590000000
-10,2055,R1,2036,solarPV,2.28590000000
-10,2056,R1,2036,solarPV,2.28590000000
-10,2057,R1,2036,solarPV,2.28590000000
-10,2058,R1,2036,solarPV,2.28590000000
-10,2059,R1,2036,solarPV,2.28590000000
-10,2060,R1,2036,solarPV,2.28590000000
-10,2061,R1,2036,solarPV,2.28590000000
-10,2062,R1,2036,solarPV,2.28590000000
-11,2040,R1,2038,solarPV,2.28590000000
-11,2045,R1,2038,solarPV,2.28590000000
-11,2046,R1,2038,solarPV,2.28590000000
-11,2047,R1,2038,solarPV,2.28590000000
-11,2048,R1,2038,solarPV,2.28590000000
-11,2049,R1,2038,solarPV,2.28590000000
-11,2050,R1,2038,solarPV,2.28590000000
-11,2051,R1,2038,solarPV,2.28590000000
-11,2052,R1,2038,solarPV,2.28590000000
-11,2053,R1,2038,solarPV,2.28590000000
-11,2054,R1,2038,solarPV,2.28590000000
-11,2055,R1,2038,solarPV,2.28590000000
-11,2056,R1,2038,solarPV,2.28590000000
-11,2057,R1,2038,solarPV,2.28590000000
-11,2058,R1,2038,solarPV,2.28590000000
-11,2059,R1,2038,solarPV,2.28590000000
-11,2060,R1,2038,solarPV,2.28590000000
-11,2061,R1,2038,solarPV,2.28590000000
-11,2062,R1,2038,solarPV,2.28590000000
-11,2063,R1,2038,solarPV,2.28590000000
-11,2064,R1,2038,solarPV,2.28590000000
-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,2038,R2,2022,windturbine,2.28590000000
-14,2040,R2,2022,windturbine,2.28590000000
-14,2045,R2,2022,windturbine,2.28590000000
-14,2046,R2,2022,windturbine,2.28590000000
-14,2047,R2,2022,windturbine,2.28590000000
-14,2048,R2,2022,windturbine,2.28590000000
-15,2038,R2,2024,windturbine,7.21040000000
-15,2040,R2,2024,windturbine,7.21040000000
-15,2045,R2,2024,windturbine,7.21040000000
-15,2046,R2,2024,windturbine,7.21040000000
-15,2047,R2,2024,windturbine,7.21040000000
-15,2048,R2,2024,windturbine,7.21040000000
-15,2049,R2,2024,windturbine,7.21040000000
-15,2050,R2,2024,windturbine,7.21040000000
-16,2038,R2,2026,solarPV,2.28590000000
-16,2040,R2,2026,solarPV,2.28590000000
-16,2045,R2,2026,solarPV,2.28590000000
-16,2046,R2,2026,solarPV,2.28590000000
-16,2047,R2,2026,solarPV,2.28590000000
-16,2048,R2,2026,solarPV,2.28590000000
-16,2049,R2,2026,solarPV,2.28590000000
-16,2050,R2,2026,solarPV,2.28590000000
-16,2051,R2,2026,solarPV,2.28590000000
-16,2052,R2,2026,solarPV,2.28590000000
-17,2038,R2,2028,solarPV,2.28590000000
-17,2040,R2,2028,solarPV,2.28590000000
-17,2045,R2,2028,solarPV,2.28590000000
-17,2046,R2,2028,solarPV,2.28590000000
-17,2047,R2,2028,solarPV,2.28590000000
-17,2048,R2,2028,solarPV,2.28590000000
-17,2049,R2,2028,solarPV,2.28590000000
-17,2050,R2,2028,solarPV,2.28590000000
-17,2051,R2,2028,solarPV,2.28590000000
-17,2052,R2,2028,solarPV,2.28590000000
-17,2053,R2,2028,solarPV,2.28590000000
-17,2054,R2,2028,solarPV,2.28590000000
-18,2038,R2,2030,solarPV,2.28590000000
-18,2040,R2,2030,solarPV,2.28590000000
-18,2045,R2,2030,solarPV,2.28590000000
-18,2046,R2,2030,solarPV,2.28590000000
-18,2047,R2,2030,solarPV,2.28590000000
-18,2048,R2,2030,solarPV,2.28590000000
-18,2049,R2,2030,solarPV,2.28590000000
-18,2050,R2,2030,solarPV,2.28590000000
-18,2051,R2,2030,solarPV,2.28590000000
-18,2052,R2,2030,solarPV,2.28590000000
-18,2053,R2,2030,solarPV,2.28590000000
-18,2054,R2,2030,solarPV,2.28590000000
-18,2055,R2,2030,solarPV,2.28590000000
-18,2056,R2,2030,solarPV,2.28590000000
-19,2038,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,2051,R2,2032,solarPV,2.28590000000
-19,2052,R2,2032,solarPV,2.28590000000
-19,2053,R2,2032,solarPV,2.28590000000
-19,2054,R2,2032,solarPV,2.28590000000
-19,2055,R2,2032,solarPV,2.28590000000
-19,2056,R2,2032,solarPV,2.28590000000
-19,2057,R2,2032,solarPV,2.28590000000
-19,2058,R2,2032,solarPV,2.28590000000
-20,2038,R2,2034,solarPV,4.61130000000
-20,2040,R2,2034,solarPV,4.61130000000
-20,2045,R2,2034,solarPV,4.61130000000
-20,2046,R2,2034,solarPV,4.61130000000
-20,2047,R2,2034,solarPV,4.61130000000
-20,2048,R2,2034,solarPV,4.61130000000
-20,2049,R2,2034,solarPV,4.61130000000
-20,2050,R2,2034,solarPV,4.61130000000
-20,2051,R2,2034,solarPV,4.61130000000
-20,2052,R2,2034,solarPV,4.61130000000
-20,2053,R2,2034,solarPV,4.61130000000
-20,2054,R2,2034,solarPV,4.61130000000
-20,2055,R2,2034,solarPV,4.61130000000
-20,2056,R2,2034,solarPV,4.61130000000
-20,2057,R2,2034,solarPV,4.61130000000
-20,2058,R2,2034,solarPV,4.61130000000
-20,2059,R2,2034,solarPV,4.61130000000
-20,2060,R2,2034,solarPV,4.61130000000
-21,2038,R2,2036,solarPV,2.28590000000
-21,2040,R2,2036,solarPV,2.28590000000
-21,2045,R2,2036,solarPV,2.28590000000
-21,2046,R2,2036,solarPV,2.28590000000
-21,2047,R2,2036,solarPV,2.28590000000
-21,2048,R2,2036,solarPV,2.28590000000
-21,2049,R2,2036,solarPV,2.28590000000
-21,2050,R2,2036,solarPV,2.28590000000
-21,2051,R2,2036,solarPV,2.28590000000
-21,2052,R2,2036,solarPV,2.28590000000
-21,2053,R2,2036,solarPV,2.28590000000
-21,2054,R2,2036,solarPV,2.28590000000
-21,2055,R2,2036,solarPV,2.28590000000
-21,2056,R2,2036,solarPV,2.28590000000
-21,2057,R2,2036,solarPV,2.28590000000
-21,2058,R2,2036,solarPV,2.28590000000
-21,2059,R2,2036,solarPV,2.28590000000
-21,2060,R2,2036,solarPV,2.28590000000
-21,2061,R2,2036,solarPV,2.28590000000
-21,2062,R2,2036,solarPV,2.28590000000
-22,2040,R2,2038,solarPV,2.28590000000
-22,2045,R2,2038,solarPV,2.28590000000
-22,2046,R2,2038,solarPV,2.28590000000
-22,2047,R2,2038,solarPV,2.28590000000
-22,2048,R2,2038,solarPV,2.28590000000
-22,2049,R2,2038,solarPV,2.28590000000
-22,2050,R2,2038,solarPV,2.28590000000
-22,2051,R2,2038,solarPV,2.28590000000
-22,2052,R2,2038,solarPV,2.28590000000
-22,2053,R2,2038,solarPV,2.28590000000
-22,2054,R2,2038,solarPV,2.28590000000
-22,2055,R2,2038,solarPV,2.28590000000
-22,2056,R2,2038,solarPV,2.28590000000
-22,2057,R2,2038,solarPV,2.28590000000
-22,2058,R2,2038,solarPV,2.28590000000
-22,2059,R2,2038,solarPV,2.28590000000
-22,2060,R2,2038,solarPV,2.28590000000
-22,2061,R2,2038,solarPV,2.28590000000
-22,2062,R2,2038,solarPV,2.28590000000
-22,2063,R2,2038,solarPV,2.28590000000
-22,2064,R2,2038,solarPV,2.28590000000
+3,2038,R1,2022,windturbine,2.24000000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2038,R1,2024,windturbine,7.09480000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2038,R1,2026,solarPV,2.24000000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2038,R1,2028,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+7,2038,R1,2030,solarPV,2.24000000000
+7,2040,R1,2030,solarPV,2.24000000000
+7,2045,R1,2030,solarPV,2.24000000000
+7,2046,R1,2030,solarPV,2.24000000000
+7,2047,R1,2030,solarPV,2.24000000000
+7,2048,R1,2030,solarPV,2.24000000000
+7,2049,R1,2030,solarPV,2.24000000000
+7,2050,R1,2030,solarPV,2.24000000000
+7,2051,R1,2030,solarPV,2.24000000000
+7,2052,R1,2030,solarPV,2.24000000000
+7,2053,R1,2030,solarPV,2.24000000000
+7,2054,R1,2030,solarPV,2.24000000000
+7,2055,R1,2030,solarPV,2.24000000000
+7,2056,R1,2030,solarPV,2.24000000000
+8,2038,R1,2032,solarPV,2.24000000000
+8,2040,R1,2032,solarPV,2.24000000000
+8,2045,R1,2032,solarPV,2.24000000000
+8,2046,R1,2032,solarPV,2.24000000000
+8,2047,R1,2032,solarPV,2.24000000000
+8,2048,R1,2032,solarPV,2.24000000000
+8,2049,R1,2032,solarPV,2.24000000000
+8,2050,R1,2032,solarPV,2.24000000000
+8,2051,R1,2032,solarPV,2.24000000000
+8,2052,R1,2032,solarPV,2.24000000000
+8,2053,R1,2032,solarPV,2.24000000000
+8,2054,R1,2032,solarPV,2.24000000000
+8,2055,R1,2032,solarPV,2.24000000000
+8,2056,R1,2032,solarPV,2.24000000000
+8,2057,R1,2032,solarPV,2.24000000000
+8,2058,R1,2032,solarPV,2.24000000000
+9,2038,R1,2034,solarPV,4.63520000000
+9,2040,R1,2034,solarPV,4.63520000000
+9,2045,R1,2034,solarPV,4.63520000000
+9,2046,R1,2034,solarPV,4.63520000000
+9,2047,R1,2034,solarPV,4.63520000000
+9,2048,R1,2034,solarPV,4.63520000000
+9,2049,R1,2034,solarPV,4.63520000000
+9,2050,R1,2034,solarPV,4.63520000000
+9,2051,R1,2034,solarPV,4.63520000000
+9,2052,R1,2034,solarPV,4.63520000000
+9,2053,R1,2034,solarPV,4.63520000000
+9,2054,R1,2034,solarPV,4.63520000000
+9,2055,R1,2034,solarPV,4.63520000000
+9,2056,R1,2034,solarPV,4.63520000000
+9,2057,R1,2034,solarPV,4.63520000000
+9,2058,R1,2034,solarPV,4.63520000000
+9,2059,R1,2034,solarPV,4.63520000000
+9,2060,R1,2034,solarPV,4.63520000000
+10,2038,R1,2036,solarPV,2.24000000000
+10,2040,R1,2036,solarPV,2.24000000000
+10,2045,R1,2036,solarPV,2.24000000000
+10,2046,R1,2036,solarPV,2.24000000000
+10,2047,R1,2036,solarPV,2.24000000000
+10,2048,R1,2036,solarPV,2.24000000000
+10,2049,R1,2036,solarPV,2.24000000000
+10,2050,R1,2036,solarPV,2.24000000000
+10,2051,R1,2036,solarPV,2.24000000000
+10,2052,R1,2036,solarPV,2.24000000000
+10,2053,R1,2036,solarPV,2.24000000000
+10,2054,R1,2036,solarPV,2.24000000000
+10,2055,R1,2036,solarPV,2.24000000000
+10,2056,R1,2036,solarPV,2.24000000000
+10,2057,R1,2036,solarPV,2.24000000000
+10,2058,R1,2036,solarPV,2.24000000000
+10,2059,R1,2036,solarPV,2.24000000000
+10,2060,R1,2036,solarPV,2.24000000000
+10,2061,R1,2036,solarPV,2.24000000000
+10,2062,R1,2036,solarPV,2.24000000000
+11,2040,R1,2038,solarPV,2.24000000000
+11,2045,R1,2038,solarPV,2.24000000000
+11,2046,R1,2038,solarPV,2.24000000000
+11,2047,R1,2038,solarPV,2.24000000000
+11,2048,R1,2038,solarPV,2.24000000000
+11,2049,R1,2038,solarPV,2.24000000000
+11,2050,R1,2038,solarPV,2.24000000000
+11,2051,R1,2038,solarPV,2.24000000000
+11,2052,R1,2038,solarPV,2.24000000000
+11,2053,R1,2038,solarPV,2.24000000000
+11,2054,R1,2038,solarPV,2.24000000000
+11,2055,R1,2038,solarPV,2.24000000000
+11,2056,R1,2038,solarPV,2.24000000000
+11,2057,R1,2038,solarPV,2.24000000000
+11,2058,R1,2038,solarPV,2.24000000000
+11,2059,R1,2038,solarPV,2.24000000000
+11,2060,R1,2038,solarPV,2.24000000000
+11,2061,R1,2038,solarPV,2.24000000000
+11,2062,R1,2038,solarPV,2.24000000000
+11,2063,R1,2038,solarPV,2.24000000000
+11,2064,R1,2038,solarPV,2.24000000000
+13,2038,R2,2020,windturbine,11.79000000000
+13,2040,R2,2020,windturbine,11.79000000000
+13,2045,R2,2020,windturbine,11.79000000000
+13,2046,R2,2020,windturbine,11.79000000000
+14,2038,R2,2022,windturbine,2.24000000000
+14,2040,R2,2022,windturbine,2.24000000000
+14,2045,R2,2022,windturbine,2.24000000000
+14,2046,R2,2022,windturbine,2.24000000000
+14,2047,R2,2022,windturbine,2.24000000000
+14,2048,R2,2022,windturbine,2.24000000000
+15,2038,R2,2024,windturbine,7.09480000000
+15,2040,R2,2024,windturbine,7.09480000000
+15,2045,R2,2024,windturbine,7.09480000000
+15,2046,R2,2024,windturbine,7.09480000000
+15,2047,R2,2024,windturbine,7.09480000000
+15,2048,R2,2024,windturbine,7.09480000000
+15,2049,R2,2024,windturbine,7.09480000000
+15,2050,R2,2024,windturbine,7.09480000000
+16,2038,R2,2026,solarPV,2.24000000000
+16,2040,R2,2026,solarPV,2.24000000000
+16,2045,R2,2026,solarPV,2.24000000000
+16,2046,R2,2026,solarPV,2.24000000000
+16,2047,R2,2026,solarPV,2.24000000000
+16,2048,R2,2026,solarPV,2.24000000000
+16,2049,R2,2026,solarPV,2.24000000000
+16,2050,R2,2026,solarPV,2.24000000000
+16,2051,R2,2026,solarPV,2.24000000000
+16,2052,R2,2026,solarPV,2.24000000000
+17,2038,R2,2028,solarPV,2.24000000000
+17,2040,R2,2028,solarPV,2.24000000000
+17,2045,R2,2028,solarPV,2.24000000000
+17,2046,R2,2028,solarPV,2.24000000000
+17,2047,R2,2028,solarPV,2.24000000000
+17,2048,R2,2028,solarPV,2.24000000000
+17,2049,R2,2028,solarPV,2.24000000000
+17,2050,R2,2028,solarPV,2.24000000000
+17,2051,R2,2028,solarPV,2.24000000000
+17,2052,R2,2028,solarPV,2.24000000000
+17,2053,R2,2028,solarPV,2.24000000000
+17,2054,R2,2028,solarPV,2.24000000000
+18,2038,R2,2030,solarPV,2.24000000000
+18,2040,R2,2030,solarPV,2.24000000000
+18,2045,R2,2030,solarPV,2.24000000000
+18,2046,R2,2030,solarPV,2.24000000000
+18,2047,R2,2030,solarPV,2.24000000000
+18,2048,R2,2030,solarPV,2.24000000000
+18,2049,R2,2030,solarPV,2.24000000000
+18,2050,R2,2030,solarPV,2.24000000000
+18,2051,R2,2030,solarPV,2.24000000000
+18,2052,R2,2030,solarPV,2.24000000000
+18,2053,R2,2030,solarPV,2.24000000000
+18,2054,R2,2030,solarPV,2.24000000000
+18,2055,R2,2030,solarPV,2.24000000000
+18,2056,R2,2030,solarPV,2.24000000000
+19,2038,R2,2032,solarPV,2.24000000000
+19,2040,R2,2032,solarPV,2.24000000000
+19,2045,R2,2032,solarPV,2.24000000000
+19,2046,R2,2032,solarPV,2.24000000000
+19,2047,R2,2032,solarPV,2.24000000000
+19,2048,R2,2032,solarPV,2.24000000000
+19,2049,R2,2032,solarPV,2.24000000000
+19,2050,R2,2032,solarPV,2.24000000000
+19,2051,R2,2032,solarPV,2.24000000000
+19,2052,R2,2032,solarPV,2.24000000000
+19,2053,R2,2032,solarPV,2.24000000000
+19,2054,R2,2032,solarPV,2.24000000000
+19,2055,R2,2032,solarPV,2.24000000000
+19,2056,R2,2032,solarPV,2.24000000000
+19,2057,R2,2032,solarPV,2.24000000000
+19,2058,R2,2032,solarPV,2.24000000000
+20,2038,R2,2034,solarPV,4.63520000000
+20,2040,R2,2034,solarPV,4.63520000000
+20,2045,R2,2034,solarPV,4.63520000000
+20,2046,R2,2034,solarPV,4.63520000000
+20,2047,R2,2034,solarPV,4.63520000000
+20,2048,R2,2034,solarPV,4.63520000000
+20,2049,R2,2034,solarPV,4.63520000000
+20,2050,R2,2034,solarPV,4.63520000000
+20,2051,R2,2034,solarPV,4.63520000000
+20,2052,R2,2034,solarPV,4.63520000000
+20,2053,R2,2034,solarPV,4.63520000000
+20,2054,R2,2034,solarPV,4.63520000000
+20,2055,R2,2034,solarPV,4.63520000000
+20,2056,R2,2034,solarPV,4.63520000000
+20,2057,R2,2034,solarPV,4.63520000000
+20,2058,R2,2034,solarPV,4.63520000000
+20,2059,R2,2034,solarPV,4.63520000000
+20,2060,R2,2034,solarPV,4.63520000000
+21,2038,R2,2036,solarPV,2.24000000000
+21,2040,R2,2036,solarPV,2.24000000000
+21,2045,R2,2036,solarPV,2.24000000000
+21,2046,R2,2036,solarPV,2.24000000000
+21,2047,R2,2036,solarPV,2.24000000000
+21,2048,R2,2036,solarPV,2.24000000000
+21,2049,R2,2036,solarPV,2.24000000000
+21,2050,R2,2036,solarPV,2.24000000000
+21,2051,R2,2036,solarPV,2.24000000000
+21,2052,R2,2036,solarPV,2.24000000000
+21,2053,R2,2036,solarPV,2.24000000000
+21,2054,R2,2036,solarPV,2.24000000000
+21,2055,R2,2036,solarPV,2.24000000000
+21,2056,R2,2036,solarPV,2.24000000000
+21,2057,R2,2036,solarPV,2.24000000000
+21,2058,R2,2036,solarPV,2.24000000000
+21,2059,R2,2036,solarPV,2.24000000000
+21,2060,R2,2036,solarPV,2.24000000000
+21,2061,R2,2036,solarPV,2.24000000000
+21,2062,R2,2036,solarPV,2.24000000000
+22,2040,R2,2038,solarPV,2.24000000000
+22,2045,R2,2038,solarPV,2.24000000000
+22,2046,R2,2038,solarPV,2.24000000000
+22,2047,R2,2038,solarPV,2.24000000000
+22,2048,R2,2038,solarPV,2.24000000000
+22,2049,R2,2038,solarPV,2.24000000000
+22,2050,R2,2038,solarPV,2.24000000000
+22,2051,R2,2038,solarPV,2.24000000000
+22,2052,R2,2038,solarPV,2.24000000000
+22,2053,R2,2038,solarPV,2.24000000000
+22,2054,R2,2038,solarPV,2.24000000000
+22,2055,R2,2038,solarPV,2.24000000000
+22,2056,R2,2038,solarPV,2.24000000000
+22,2057,R2,2038,solarPV,2.24000000000
+22,2058,R2,2038,solarPV,2.24000000000
+22,2059,R2,2038,solarPV,2.24000000000
+22,2060,R2,2038,solarPV,2.24000000000
+22,2061,R2,2038,solarPV,2.24000000000
+22,2062,R2,2038,solarPV,2.24000000000
+22,2063,R2,2038,solarPV,2.24000000000
+22,2064,R2,2038,solarPV,2.24000000000
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 d7ffb074..5d03ac67 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,311 +1,311 @@
 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
+1,2040,R1,2020,solarPV,3.79000000000
+1,2042,R1,2020,solarPV,3.79000000000
+1,2045,R1,2020,solarPV,3.79000000000
+1,2046,R1,2020,solarPV,3.79000000000
 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,windturbine,2.28590000000
-3,2042,R1,2022,windturbine,2.28590000000
-3,2045,R1,2022,windturbine,2.28590000000
-3,2046,R1,2022,windturbine,2.28590000000
-3,2047,R1,2022,windturbine,2.28590000000
-3,2048,R1,2022,windturbine,2.28590000000
-4,2040,R1,2024,windturbine,7.21040000000
-4,2042,R1,2024,windturbine,7.21040000000
-4,2045,R1,2024,windturbine,7.21040000000
-4,2046,R1,2024,windturbine,7.21040000000
-4,2047,R1,2024,windturbine,7.21040000000
-4,2048,R1,2024,windturbine,7.21040000000
-4,2049,R1,2024,windturbine,7.21040000000
-4,2050,R1,2024,windturbine,7.21040000000
-5,2040,R1,2026,solarPV,2.28590000000
-5,2042,R1,2026,solarPV,2.28590000000
-5,2045,R1,2026,solarPV,2.28590000000
-5,2046,R1,2026,solarPV,2.28590000000
-5,2047,R1,2026,solarPV,2.28590000000
-5,2048,R1,2026,solarPV,2.28590000000
-5,2049,R1,2026,solarPV,2.28590000000
-5,2050,R1,2026,solarPV,2.28590000000
-5,2051,R1,2026,solarPV,2.28590000000
-5,2052,R1,2026,solarPV,2.28590000000
-6,2040,R1,2028,solarPV,2.28590000000
-6,2042,R1,2028,solarPV,2.28590000000
-6,2045,R1,2028,solarPV,2.28590000000
-6,2046,R1,2028,solarPV,2.28590000000
-6,2047,R1,2028,solarPV,2.28590000000
-6,2048,R1,2028,solarPV,2.28590000000
-6,2049,R1,2028,solarPV,2.28590000000
-6,2050,R1,2028,solarPV,2.28590000000
-6,2051,R1,2028,solarPV,2.28590000000
-6,2052,R1,2028,solarPV,2.28590000000
-6,2053,R1,2028,solarPV,2.28590000000
-6,2054,R1,2028,solarPV,2.28590000000
-7,2040,R1,2030,solarPV,2.28590000000
-7,2042,R1,2030,solarPV,2.28590000000
-7,2045,R1,2030,solarPV,2.28590000000
-7,2046,R1,2030,solarPV,2.28590000000
-7,2047,R1,2030,solarPV,2.28590000000
-7,2048,R1,2030,solarPV,2.28590000000
-7,2049,R1,2030,solarPV,2.28590000000
-7,2050,R1,2030,solarPV,2.28590000000
-7,2051,R1,2030,solarPV,2.28590000000
-7,2052,R1,2030,solarPV,2.28590000000
-7,2053,R1,2030,solarPV,2.28590000000
-7,2054,R1,2030,solarPV,2.28590000000
-7,2055,R1,2030,solarPV,2.28590000000
-7,2056,R1,2030,solarPV,2.28590000000
-8,2040,R1,2032,solarPV,2.28590000000
-8,2042,R1,2032,solarPV,2.28590000000
-8,2045,R1,2032,solarPV,2.28590000000
-8,2046,R1,2032,solarPV,2.28590000000
-8,2047,R1,2032,solarPV,2.28590000000
-8,2048,R1,2032,solarPV,2.28590000000
-8,2049,R1,2032,solarPV,2.28590000000
-8,2050,R1,2032,solarPV,2.28590000000
-8,2051,R1,2032,solarPV,2.28590000000
-8,2052,R1,2032,solarPV,2.28590000000
-8,2053,R1,2032,solarPV,2.28590000000
-8,2054,R1,2032,solarPV,2.28590000000
-8,2055,R1,2032,solarPV,2.28590000000
-8,2056,R1,2032,solarPV,2.28590000000
-8,2057,R1,2032,solarPV,2.28590000000
-8,2058,R1,2032,solarPV,2.28590000000
-9,2040,R1,2034,solarPV,4.61130000000
-9,2042,R1,2034,solarPV,4.61130000000
-9,2045,R1,2034,solarPV,4.61130000000
-9,2046,R1,2034,solarPV,4.61130000000
-9,2047,R1,2034,solarPV,4.61130000000
-9,2048,R1,2034,solarPV,4.61130000000
-9,2049,R1,2034,solarPV,4.61130000000
-9,2050,R1,2034,solarPV,4.61130000000
-9,2051,R1,2034,solarPV,4.61130000000
-9,2052,R1,2034,solarPV,4.61130000000
-9,2053,R1,2034,solarPV,4.61130000000
-9,2054,R1,2034,solarPV,4.61130000000
-9,2055,R1,2034,solarPV,4.61130000000
-9,2056,R1,2034,solarPV,4.61130000000
-9,2057,R1,2034,solarPV,4.61130000000
-9,2058,R1,2034,solarPV,4.61130000000
-9,2059,R1,2034,solarPV,4.61130000000
-9,2060,R1,2034,solarPV,4.61130000000
-10,2040,R1,2036,solarPV,2.28590000000
-10,2042,R1,2036,solarPV,2.28590000000
-10,2045,R1,2036,solarPV,2.28590000000
-10,2046,R1,2036,solarPV,2.28590000000
-10,2047,R1,2036,solarPV,2.28590000000
-10,2048,R1,2036,solarPV,2.28590000000
-10,2049,R1,2036,solarPV,2.28590000000
-10,2050,R1,2036,solarPV,2.28590000000
-10,2051,R1,2036,solarPV,2.28590000000
-10,2052,R1,2036,solarPV,2.28590000000
-10,2053,R1,2036,solarPV,2.28590000000
-10,2054,R1,2036,solarPV,2.28590000000
-10,2055,R1,2036,solarPV,2.28590000000
-10,2056,R1,2036,solarPV,2.28590000000
-10,2057,R1,2036,solarPV,2.28590000000
-10,2058,R1,2036,solarPV,2.28590000000
-10,2059,R1,2036,solarPV,2.28590000000
-10,2060,R1,2036,solarPV,2.28590000000
-10,2061,R1,2036,solarPV,2.28590000000
-10,2062,R1,2036,solarPV,2.28590000000
-11,2040,R1,2038,solarPV,2.28590000000
-11,2042,R1,2038,solarPV,2.28590000000
-11,2045,R1,2038,solarPV,2.28590000000
-11,2046,R1,2038,solarPV,2.28590000000
-11,2047,R1,2038,solarPV,2.28590000000
-11,2048,R1,2038,solarPV,2.28590000000
-11,2049,R1,2038,solarPV,2.28590000000
-11,2050,R1,2038,solarPV,2.28590000000
-11,2051,R1,2038,solarPV,2.28590000000
-11,2052,R1,2038,solarPV,2.28590000000
-11,2053,R1,2038,solarPV,2.28590000000
-11,2054,R1,2038,solarPV,2.28590000000
-11,2055,R1,2038,solarPV,2.28590000000
-11,2056,R1,2038,solarPV,2.28590000000
-11,2057,R1,2038,solarPV,2.28590000000
-11,2058,R1,2038,solarPV,2.28590000000
-11,2059,R1,2038,solarPV,2.28590000000
-11,2060,R1,2038,solarPV,2.28590000000
-11,2061,R1,2038,solarPV,2.28590000000
-11,2062,R1,2038,solarPV,2.28590000000
-11,2063,R1,2038,solarPV,2.28590000000
-11,2064,R1,2038,solarPV,2.28590000000
-12,2042,R1,2040,solarPV,2.28590000000
-12,2045,R1,2040,solarPV,2.28590000000
-12,2046,R1,2040,solarPV,2.28590000000
-12,2047,R1,2040,solarPV,2.28590000000
-12,2048,R1,2040,solarPV,2.28590000000
-12,2049,R1,2040,solarPV,2.28590000000
-12,2050,R1,2040,solarPV,2.28590000000
-12,2051,R1,2040,solarPV,2.28590000000
-12,2052,R1,2040,solarPV,2.28590000000
-12,2053,R1,2040,solarPV,2.28590000000
-12,2054,R1,2040,solarPV,2.28590000000
-12,2055,R1,2040,solarPV,2.28590000000
-12,2056,R1,2040,solarPV,2.28590000000
-12,2057,R1,2040,solarPV,2.28590000000
-12,2058,R1,2040,solarPV,2.28590000000
-12,2059,R1,2040,solarPV,2.28590000000
-12,2060,R1,2040,solarPV,2.28590000000
-12,2061,R1,2040,solarPV,2.28590000000
-12,2062,R1,2040,solarPV,2.28590000000
-12,2063,R1,2040,solarPV,2.28590000000
-12,2064,R1,2040,solarPV,2.28590000000
-12,2065,R1,2040,solarPV,2.28590000000
-12,2066,R1,2040,solarPV,2.28590000000
-14,2040,R2,2020,windturbine,12.17990000000
-14,2042,R2,2020,windturbine,12.17990000000
-14,2045,R2,2020,windturbine,12.17990000000
-14,2046,R2,2020,windturbine,12.17990000000
-15,2040,R2,2022,windturbine,2.28590000000
-15,2042,R2,2022,windturbine,2.28590000000
-15,2045,R2,2022,windturbine,2.28590000000
-15,2046,R2,2022,windturbine,2.28590000000
-15,2047,R2,2022,windturbine,2.28590000000
-15,2048,R2,2022,windturbine,2.28590000000
-16,2040,R2,2024,windturbine,7.21040000000
-16,2042,R2,2024,windturbine,7.21040000000
-16,2045,R2,2024,windturbine,7.21040000000
-16,2046,R2,2024,windturbine,7.21040000000
-16,2047,R2,2024,windturbine,7.21040000000
-16,2048,R2,2024,windturbine,7.21040000000
-16,2049,R2,2024,windturbine,7.21040000000
-16,2050,R2,2024,windturbine,7.21040000000
-17,2040,R2,2026,solarPV,2.28590000000
-17,2042,R2,2026,solarPV,2.28590000000
-17,2045,R2,2026,solarPV,2.28590000000
-17,2046,R2,2026,solarPV,2.28590000000
-17,2047,R2,2026,solarPV,2.28590000000
-17,2048,R2,2026,solarPV,2.28590000000
-17,2049,R2,2026,solarPV,2.28590000000
-17,2050,R2,2026,solarPV,2.28590000000
-17,2051,R2,2026,solarPV,2.28590000000
-17,2052,R2,2026,solarPV,2.28590000000
-18,2040,R2,2028,solarPV,2.28590000000
-18,2042,R2,2028,solarPV,2.28590000000
-18,2045,R2,2028,solarPV,2.28590000000
-18,2046,R2,2028,solarPV,2.28590000000
-18,2047,R2,2028,solarPV,2.28590000000
-18,2048,R2,2028,solarPV,2.28590000000
-18,2049,R2,2028,solarPV,2.28590000000
-18,2050,R2,2028,solarPV,2.28590000000
-18,2051,R2,2028,solarPV,2.28590000000
-18,2052,R2,2028,solarPV,2.28590000000
-18,2053,R2,2028,solarPV,2.28590000000
-18,2054,R2,2028,solarPV,2.28590000000
-19,2040,R2,2030,solarPV,2.28590000000
-19,2042,R2,2030,solarPV,2.28590000000
-19,2045,R2,2030,solarPV,2.28590000000
-19,2046,R2,2030,solarPV,2.28590000000
-19,2047,R2,2030,solarPV,2.28590000000
-19,2048,R2,2030,solarPV,2.28590000000
-19,2049,R2,2030,solarPV,2.28590000000
-19,2050,R2,2030,solarPV,2.28590000000
-19,2051,R2,2030,solarPV,2.28590000000
-19,2052,R2,2030,solarPV,2.28590000000
-19,2053,R2,2030,solarPV,2.28590000000
-19,2054,R2,2030,solarPV,2.28590000000
-19,2055,R2,2030,solarPV,2.28590000000
-19,2056,R2,2030,solarPV,2.28590000000
-20,2040,R2,2032,solarPV,2.28590000000
-20,2042,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,2051,R2,2032,solarPV,2.28590000000
-20,2052,R2,2032,solarPV,2.28590000000
-20,2053,R2,2032,solarPV,2.28590000000
-20,2054,R2,2032,solarPV,2.28590000000
-20,2055,R2,2032,solarPV,2.28590000000
-20,2056,R2,2032,solarPV,2.28590000000
-20,2057,R2,2032,solarPV,2.28590000000
-20,2058,R2,2032,solarPV,2.28590000000
-21,2040,R2,2034,solarPV,4.61130000000
-21,2042,R2,2034,solarPV,4.61130000000
-21,2045,R2,2034,solarPV,4.61130000000
-21,2046,R2,2034,solarPV,4.61130000000
-21,2047,R2,2034,solarPV,4.61130000000
-21,2048,R2,2034,solarPV,4.61130000000
-21,2049,R2,2034,solarPV,4.61130000000
-21,2050,R2,2034,solarPV,4.61130000000
-21,2051,R2,2034,solarPV,4.61130000000
-21,2052,R2,2034,solarPV,4.61130000000
-21,2053,R2,2034,solarPV,4.61130000000
-21,2054,R2,2034,solarPV,4.61130000000
-21,2055,R2,2034,solarPV,4.61130000000
-21,2056,R2,2034,solarPV,4.61130000000
-21,2057,R2,2034,solarPV,4.61130000000
-21,2058,R2,2034,solarPV,4.61130000000
-21,2059,R2,2034,solarPV,4.61130000000
-21,2060,R2,2034,solarPV,4.61130000000
-22,2040,R2,2036,solarPV,2.28590000000
-22,2042,R2,2036,solarPV,2.28590000000
-22,2045,R2,2036,solarPV,2.28590000000
-22,2046,R2,2036,solarPV,2.28590000000
-22,2047,R2,2036,solarPV,2.28590000000
-22,2048,R2,2036,solarPV,2.28590000000
-22,2049,R2,2036,solarPV,2.28590000000
-22,2050,R2,2036,solarPV,2.28590000000
-22,2051,R2,2036,solarPV,2.28590000000
-22,2052,R2,2036,solarPV,2.28590000000
-22,2053,R2,2036,solarPV,2.28590000000
-22,2054,R2,2036,solarPV,2.28590000000
-22,2055,R2,2036,solarPV,2.28590000000
-22,2056,R2,2036,solarPV,2.28590000000
-22,2057,R2,2036,solarPV,2.28590000000
-22,2058,R2,2036,solarPV,2.28590000000
-22,2059,R2,2036,solarPV,2.28590000000
-22,2060,R2,2036,solarPV,2.28590000000
-22,2061,R2,2036,solarPV,2.28590000000
-22,2062,R2,2036,solarPV,2.28590000000
-23,2040,R2,2038,solarPV,2.28590000000
-23,2042,R2,2038,solarPV,2.28590000000
-23,2045,R2,2038,solarPV,2.28590000000
-23,2046,R2,2038,solarPV,2.28590000000
-23,2047,R2,2038,solarPV,2.28590000000
-23,2048,R2,2038,solarPV,2.28590000000
-23,2049,R2,2038,solarPV,2.28590000000
-23,2050,R2,2038,solarPV,2.28590000000
-23,2051,R2,2038,solarPV,2.28590000000
-23,2052,R2,2038,solarPV,2.28590000000
-23,2053,R2,2038,solarPV,2.28590000000
-23,2054,R2,2038,solarPV,2.28590000000
-23,2055,R2,2038,solarPV,2.28590000000
-23,2056,R2,2038,solarPV,2.28590000000
-23,2057,R2,2038,solarPV,2.28590000000
-23,2058,R2,2038,solarPV,2.28590000000
-23,2059,R2,2038,solarPV,2.28590000000
-23,2060,R2,2038,solarPV,2.28590000000
-23,2061,R2,2038,solarPV,2.28590000000
-23,2062,R2,2038,solarPV,2.28590000000
-23,2063,R2,2038,solarPV,2.28590000000
-23,2064,R2,2038,solarPV,2.28590000000
-24,2042,R2,2040,solarPV,2.28590000000
-24,2045,R2,2040,solarPV,2.28590000000
-24,2046,R2,2040,solarPV,2.28590000000
-24,2047,R2,2040,solarPV,2.28590000000
-24,2048,R2,2040,solarPV,2.28590000000
-24,2049,R2,2040,solarPV,2.28590000000
-24,2050,R2,2040,solarPV,2.28590000000
-24,2051,R2,2040,solarPV,2.28590000000
-24,2052,R2,2040,solarPV,2.28590000000
-24,2053,R2,2040,solarPV,2.28590000000
-24,2054,R2,2040,solarPV,2.28590000000
-24,2055,R2,2040,solarPV,2.28590000000
-24,2056,R2,2040,solarPV,2.28590000000
-24,2057,R2,2040,solarPV,2.28590000000
-24,2058,R2,2040,solarPV,2.28590000000
-24,2059,R2,2040,solarPV,2.28590000000
-24,2060,R2,2040,solarPV,2.28590000000
-24,2061,R2,2040,solarPV,2.28590000000
-24,2062,R2,2040,solarPV,2.28590000000
-24,2063,R2,2040,solarPV,2.28590000000
-24,2064,R2,2040,solarPV,2.28590000000
-24,2065,R2,2040,solarPV,2.28590000000
-24,2066,R2,2040,solarPV,2.28590000000
+3,2040,R1,2022,windturbine,2.24000000000
+3,2042,R1,2022,windturbine,2.24000000000
+3,2045,R1,2022,windturbine,2.24000000000
+3,2046,R1,2022,windturbine,2.24000000000
+3,2047,R1,2022,windturbine,2.24000000000
+3,2048,R1,2022,windturbine,2.24000000000
+4,2040,R1,2024,windturbine,7.09480000000
+4,2042,R1,2024,windturbine,7.09480000000
+4,2045,R1,2024,windturbine,7.09480000000
+4,2046,R1,2024,windturbine,7.09480000000
+4,2047,R1,2024,windturbine,7.09480000000
+4,2048,R1,2024,windturbine,7.09480000000
+4,2049,R1,2024,windturbine,7.09480000000
+4,2050,R1,2024,windturbine,7.09480000000
+5,2040,R1,2026,solarPV,2.24000000000
+5,2042,R1,2026,solarPV,2.24000000000
+5,2045,R1,2026,solarPV,2.24000000000
+5,2046,R1,2026,solarPV,2.24000000000
+5,2047,R1,2026,solarPV,2.24000000000
+5,2048,R1,2026,solarPV,2.24000000000
+5,2049,R1,2026,solarPV,2.24000000000
+5,2050,R1,2026,solarPV,2.24000000000
+5,2051,R1,2026,solarPV,2.24000000000
+5,2052,R1,2026,solarPV,2.24000000000
+6,2040,R1,2028,solarPV,2.24000000000
+6,2042,R1,2028,solarPV,2.24000000000
+6,2045,R1,2028,solarPV,2.24000000000
+6,2046,R1,2028,solarPV,2.24000000000
+6,2047,R1,2028,solarPV,2.24000000000
+6,2048,R1,2028,solarPV,2.24000000000
+6,2049,R1,2028,solarPV,2.24000000000
+6,2050,R1,2028,solarPV,2.24000000000
+6,2051,R1,2028,solarPV,2.24000000000
+6,2052,R1,2028,solarPV,2.24000000000
+6,2053,R1,2028,solarPV,2.24000000000
+6,2054,R1,2028,solarPV,2.24000000000
+7,2040,R1,2030,solarPV,2.24000000000
+7,2042,R1,2030,solarPV,2.24000000000
+7,2045,R1,2030,solarPV,2.24000000000
+7,2046,R1,2030,solarPV,2.24000000000
+7,2047,R1,2030,solarPV,2.24000000000
+7,2048,R1,2030,solarPV,2.24000000000
+7,2049,R1,2030,solarPV,2.24000000000
+7,2050,R1,2030,solarPV,2.24000000000
+7,2051,R1,2030,solarPV,2.24000000000
+7,2052,R1,2030,solarPV,2.24000000000
+7,2053,R1,2030,solarPV,2.24000000000
+7,2054,R1,2030,solarPV,2.24000000000
+7,2055,R1,2030,solarPV,2.24000000000
+7,2056,R1,2030,solarPV,2.24000000000
+8,2040,R1,2032,solarPV,2.24000000000
+8,2042,R1,2032,solarPV,2.24000000000
+8,2045,R1,2032,solarPV,2.24000000000
+8,2046,R1,2032,solarPV,2.24000000000
+8,2047,R1,2032,solarPV,2.24000000000
+8,2048,R1,2032,solarPV,2.24000000000
+8,2049,R1,2032,solarPV,2.24000000000
+8,2050,R1,2032,solarPV,2.24000000000
+8,2051,R1,2032,solarPV,2.24000000000
+8,2052,R1,2032,solarPV,2.24000000000
+8,2053,R1,2032,solarPV,2.24000000000
+8,2054,R1,2032,solarPV,2.24000000000
+8,2055,R1,2032,solarPV,2.24000000000
+8,2056,R1,2032,solarPV,2.24000000000
+8,2057,R1,2032,solarPV,2.24000000000
+8,2058,R1,2032,solarPV,2.24000000000
+9,2040,R1,2034,solarPV,4.63520000000
+9,2042,R1,2034,solarPV,4.63520000000
+9,2045,R1,2034,solarPV,4.63520000000
+9,2046,R1,2034,solarPV,4.63520000000
+9,2047,R1,2034,solarPV,4.63520000000
+9,2048,R1,2034,solarPV,4.63520000000
+9,2049,R1,2034,solarPV,4.63520000000
+9,2050,R1,2034,solarPV,4.63520000000
+9,2051,R1,2034,solarPV,4.63520000000
+9,2052,R1,2034,solarPV,4.63520000000
+9,2053,R1,2034,solarPV,4.63520000000
+9,2054,R1,2034,solarPV,4.63520000000
+9,2055,R1,2034,solarPV,4.63520000000
+9,2056,R1,2034,solarPV,4.63520000000
+9,2057,R1,2034,solarPV,4.63520000000
+9,2058,R1,2034,solarPV,4.63520000000
+9,2059,R1,2034,solarPV,4.63520000000
+9,2060,R1,2034,solarPV,4.63520000000
+10,2040,R1,2036,solarPV,2.24000000000
+10,2042,R1,2036,solarPV,2.24000000000
+10,2045,R1,2036,solarPV,2.24000000000
+10,2046,R1,2036,solarPV,2.24000000000
+10,2047,R1,2036,solarPV,2.24000000000
+10,2048,R1,2036,solarPV,2.24000000000
+10,2049,R1,2036,solarPV,2.24000000000
+10,2050,R1,2036,solarPV,2.24000000000
+10,2051,R1,2036,solarPV,2.24000000000
+10,2052,R1,2036,solarPV,2.24000000000
+10,2053,R1,2036,solarPV,2.24000000000
+10,2054,R1,2036,solarPV,2.24000000000
+10,2055,R1,2036,solarPV,2.24000000000
+10,2056,R1,2036,solarPV,2.24000000000
+10,2057,R1,2036,solarPV,2.24000000000
+10,2058,R1,2036,solarPV,2.24000000000
+10,2059,R1,2036,solarPV,2.24000000000
+10,2060,R1,2036,solarPV,2.24000000000
+10,2061,R1,2036,solarPV,2.24000000000
+10,2062,R1,2036,solarPV,2.24000000000
+11,2040,R1,2038,solarPV,2.24000000000
+11,2042,R1,2038,solarPV,2.24000000000
+11,2045,R1,2038,solarPV,2.24000000000
+11,2046,R1,2038,solarPV,2.24000000000
+11,2047,R1,2038,solarPV,2.24000000000
+11,2048,R1,2038,solarPV,2.24000000000
+11,2049,R1,2038,solarPV,2.24000000000
+11,2050,R1,2038,solarPV,2.24000000000
+11,2051,R1,2038,solarPV,2.24000000000
+11,2052,R1,2038,solarPV,2.24000000000
+11,2053,R1,2038,solarPV,2.24000000000
+11,2054,R1,2038,solarPV,2.24000000000
+11,2055,R1,2038,solarPV,2.24000000000
+11,2056,R1,2038,solarPV,2.24000000000
+11,2057,R1,2038,solarPV,2.24000000000
+11,2058,R1,2038,solarPV,2.24000000000
+11,2059,R1,2038,solarPV,2.24000000000
+11,2060,R1,2038,solarPV,2.24000000000
+11,2061,R1,2038,solarPV,2.24000000000
+11,2062,R1,2038,solarPV,2.24000000000
+11,2063,R1,2038,solarPV,2.24000000000
+11,2064,R1,2038,solarPV,2.24000000000
+12,2042,R1,2040,solarPV,2.24000000000
+12,2045,R1,2040,solarPV,2.24000000000
+12,2046,R1,2040,solarPV,2.24000000000
+12,2047,R1,2040,solarPV,2.24000000000
+12,2048,R1,2040,solarPV,2.24000000000
+12,2049,R1,2040,solarPV,2.24000000000
+12,2050,R1,2040,solarPV,2.24000000000
+12,2051,R1,2040,solarPV,2.24000000000
+12,2052,R1,2040,solarPV,2.24000000000
+12,2053,R1,2040,solarPV,2.24000000000
+12,2054,R1,2040,solarPV,2.24000000000
+12,2055,R1,2040,solarPV,2.24000000000
+12,2056,R1,2040,solarPV,2.24000000000
+12,2057,R1,2040,solarPV,2.24000000000
+12,2058,R1,2040,solarPV,2.24000000000
+12,2059,R1,2040,solarPV,2.24000000000
+12,2060,R1,2040,solarPV,2.24000000000
+12,2061,R1,2040,solarPV,2.24000000000
+12,2062,R1,2040,solarPV,2.24000000000
+12,2063,R1,2040,solarPV,2.24000000000
+12,2064,R1,2040,solarPV,2.24000000000
+12,2065,R1,2040,solarPV,2.24000000000
+12,2066,R1,2040,solarPV,2.24000000000
+14,2040,R2,2020,windturbine,11.79000000000
+14,2042,R2,2020,windturbine,11.79000000000
+14,2045,R2,2020,windturbine,11.79000000000
+14,2046,R2,2020,windturbine,11.79000000000
+15,2040,R2,2022,windturbine,2.24000000000
+15,2042,R2,2022,windturbine,2.24000000000
+15,2045,R2,2022,windturbine,2.24000000000
+15,2046,R2,2022,windturbine,2.24000000000
+15,2047,R2,2022,windturbine,2.24000000000
+15,2048,R2,2022,windturbine,2.24000000000
+16,2040,R2,2024,windturbine,7.09480000000
+16,2042,R2,2024,windturbine,7.09480000000
+16,2045,R2,2024,windturbine,7.09480000000
+16,2046,R2,2024,windturbine,7.09480000000
+16,2047,R2,2024,windturbine,7.09480000000
+16,2048,R2,2024,windturbine,7.09480000000
+16,2049,R2,2024,windturbine,7.09480000000
+16,2050,R2,2024,windturbine,7.09480000000
+17,2040,R2,2026,solarPV,2.24000000000
+17,2042,R2,2026,solarPV,2.24000000000
+17,2045,R2,2026,solarPV,2.24000000000
+17,2046,R2,2026,solarPV,2.24000000000
+17,2047,R2,2026,solarPV,2.24000000000
+17,2048,R2,2026,solarPV,2.24000000000
+17,2049,R2,2026,solarPV,2.24000000000
+17,2050,R2,2026,solarPV,2.24000000000
+17,2051,R2,2026,solarPV,2.24000000000
+17,2052,R2,2026,solarPV,2.24000000000
+18,2040,R2,2028,solarPV,2.24000000000
+18,2042,R2,2028,solarPV,2.24000000000
+18,2045,R2,2028,solarPV,2.24000000000
+18,2046,R2,2028,solarPV,2.24000000000
+18,2047,R2,2028,solarPV,2.24000000000
+18,2048,R2,2028,solarPV,2.24000000000
+18,2049,R2,2028,solarPV,2.24000000000
+18,2050,R2,2028,solarPV,2.24000000000
+18,2051,R2,2028,solarPV,2.24000000000
+18,2052,R2,2028,solarPV,2.24000000000
+18,2053,R2,2028,solarPV,2.24000000000
+18,2054,R2,2028,solarPV,2.24000000000
+19,2040,R2,2030,solarPV,2.24000000000
+19,2042,R2,2030,solarPV,2.24000000000
+19,2045,R2,2030,solarPV,2.24000000000
+19,2046,R2,2030,solarPV,2.24000000000
+19,2047,R2,2030,solarPV,2.24000000000
+19,2048,R2,2030,solarPV,2.24000000000
+19,2049,R2,2030,solarPV,2.24000000000
+19,2050,R2,2030,solarPV,2.24000000000
+19,2051,R2,2030,solarPV,2.24000000000
+19,2052,R2,2030,solarPV,2.24000000000
+19,2053,R2,2030,solarPV,2.24000000000
+19,2054,R2,2030,solarPV,2.24000000000
+19,2055,R2,2030,solarPV,2.24000000000
+19,2056,R2,2030,solarPV,2.24000000000
+20,2040,R2,2032,solarPV,2.24000000000
+20,2042,R2,2032,solarPV,2.24000000000
+20,2045,R2,2032,solarPV,2.24000000000
+20,2046,R2,2032,solarPV,2.24000000000
+20,2047,R2,2032,solarPV,2.24000000000
+20,2048,R2,2032,solarPV,2.24000000000
+20,2049,R2,2032,solarPV,2.24000000000
+20,2050,R2,2032,solarPV,2.24000000000
+20,2051,R2,2032,solarPV,2.24000000000
+20,2052,R2,2032,solarPV,2.24000000000
+20,2053,R2,2032,solarPV,2.24000000000
+20,2054,R2,2032,solarPV,2.24000000000
+20,2055,R2,2032,solarPV,2.24000000000
+20,2056,R2,2032,solarPV,2.24000000000
+20,2057,R2,2032,solarPV,2.24000000000
+20,2058,R2,2032,solarPV,2.24000000000
+21,2040,R2,2034,solarPV,4.63520000000
+21,2042,R2,2034,solarPV,4.63520000000
+21,2045,R2,2034,solarPV,4.63520000000
+21,2046,R2,2034,solarPV,4.63520000000
+21,2047,R2,2034,solarPV,4.63520000000
+21,2048,R2,2034,solarPV,4.63520000000
+21,2049,R2,2034,solarPV,4.63520000000
+21,2050,R2,2034,solarPV,4.63520000000
+21,2051,R2,2034,solarPV,4.63520000000
+21,2052,R2,2034,solarPV,4.63520000000
+21,2053,R2,2034,solarPV,4.63520000000
+21,2054,R2,2034,solarPV,4.63520000000
+21,2055,R2,2034,solarPV,4.63520000000
+21,2056,R2,2034,solarPV,4.63520000000
+21,2057,R2,2034,solarPV,4.63520000000
+21,2058,R2,2034,solarPV,4.63520000000
+21,2059,R2,2034,solarPV,4.63520000000
+21,2060,R2,2034,solarPV,4.63520000000
+22,2040,R2,2036,solarPV,2.24000000000
+22,2042,R2,2036,solarPV,2.24000000000
+22,2045,R2,2036,solarPV,2.24000000000
+22,2046,R2,2036,solarPV,2.24000000000
+22,2047,R2,2036,solarPV,2.24000000000
+22,2048,R2,2036,solarPV,2.24000000000
+22,2049,R2,2036,solarPV,2.24000000000
+22,2050,R2,2036,solarPV,2.24000000000
+22,2051,R2,2036,solarPV,2.24000000000
+22,2052,R2,2036,solarPV,2.24000000000
+22,2053,R2,2036,solarPV,2.24000000000
+22,2054,R2,2036,solarPV,2.24000000000
+22,2055,R2,2036,solarPV,2.24000000000
+22,2056,R2,2036,solarPV,2.24000000000
+22,2057,R2,2036,solarPV,2.24000000000
+22,2058,R2,2036,solarPV,2.24000000000
+22,2059,R2,2036,solarPV,2.24000000000
+22,2060,R2,2036,solarPV,2.24000000000
+22,2061,R2,2036,solarPV,2.24000000000
+22,2062,R2,2036,solarPV,2.24000000000
+23,2040,R2,2038,solarPV,2.24000000000
+23,2042,R2,2038,solarPV,2.24000000000
+23,2045,R2,2038,solarPV,2.24000000000
+23,2046,R2,2038,solarPV,2.24000000000
+23,2047,R2,2038,solarPV,2.24000000000
+23,2048,R2,2038,solarPV,2.24000000000
+23,2049,R2,2038,solarPV,2.24000000000
+23,2050,R2,2038,solarPV,2.24000000000
+23,2051,R2,2038,solarPV,2.24000000000
+23,2052,R2,2038,solarPV,2.24000000000
+23,2053,R2,2038,solarPV,2.24000000000
+23,2054,R2,2038,solarPV,2.24000000000
+23,2055,R2,2038,solarPV,2.24000000000
+23,2056,R2,2038,solarPV,2.24000000000
+23,2057,R2,2038,solarPV,2.24000000000
+23,2058,R2,2038,solarPV,2.24000000000
+23,2059,R2,2038,solarPV,2.24000000000
+23,2060,R2,2038,solarPV,2.24000000000
+23,2061,R2,2038,solarPV,2.24000000000
+23,2062,R2,2038,solarPV,2.24000000000
+23,2063,R2,2038,solarPV,2.24000000000
+23,2064,R2,2038,solarPV,2.24000000000
+24,2042,R2,2040,solarPV,2.24000000000
+24,2045,R2,2040,solarPV,2.24000000000
+24,2046,R2,2040,solarPV,2.24000000000
+24,2047,R2,2040,solarPV,2.24000000000
+24,2048,R2,2040,solarPV,2.24000000000
+24,2049,R2,2040,solarPV,2.24000000000
+24,2050,R2,2040,solarPV,2.24000000000
+24,2051,R2,2040,solarPV,2.24000000000
+24,2052,R2,2040,solarPV,2.24000000000
+24,2053,R2,2040,solarPV,2.24000000000
+24,2054,R2,2040,solarPV,2.24000000000
+24,2055,R2,2040,solarPV,2.24000000000
+24,2056,R2,2040,solarPV,2.24000000000
+24,2057,R2,2040,solarPV,2.24000000000
+24,2058,R2,2040,solarPV,2.24000000000
+24,2059,R2,2040,solarPV,2.24000000000
+24,2060,R2,2040,solarPV,2.24000000000
+24,2061,R2,2040,solarPV,2.24000000000
+24,2062,R2,2040,solarPV,2.24000000000
+24,2063,R2,2040,solarPV,2.24000000000
+24,2064,R2,2040,solarPV,2.24000000000
+24,2065,R2,2040,solarPV,2.24000000000
+24,2066,R2,2040,solarPV,2.24000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..d67966d3
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
@@ -0,0 +1,103 @@
+asset,year,technology,region,installed,capacity
+0,2045,solarPV,R1,2020,6.75000000000
+0,2049,solarPV,R1,2020,6.75000000000
+1,2045,solarPV,R1,2025,9.15000000000
+1,2049,solarPV,R1,2025,9.15000000000
+1,2050,solarPV,R1,2025,9.15000000000
+1,2054,solarPV,R1,2025,9.15000000000
+2,2045,solarPV,R1,2030,6.00000000000
+2,2049,solarPV,R1,2030,6.00000000000
+2,2050,solarPV,R1,2030,6.00000000000
+2,2054,solarPV,R1,2030,6.00000000000
+2,2055,solarPV,R1,2030,6.00000000000
+2,2059,solarPV,R1,2030,6.00000000000
+3,2045,solarPV,R1,2035,9.19000000000
+3,2049,solarPV,R1,2035,9.19000000000
+3,2050,solarPV,R1,2035,9.19000000000
+3,2054,solarPV,R1,2035,9.19000000000
+3,2055,solarPV,R1,2035,9.19000000000
+3,2059,solarPV,R1,2035,9.19000000000
+3,2060,solarPV,R1,2035,9.19000000000
+3,2064,solarPV,R1,2035,9.19000000000
+4,2045,solarPV,R1,2040,6.00000000000
+4,2049,solarPV,R1,2040,6.00000000000
+4,2050,solarPV,R1,2040,6.00000000000
+4,2054,solarPV,R1,2040,6.00000000000
+4,2055,solarPV,R1,2040,6.00000000000
+4,2059,solarPV,R1,2040,6.00000000000
+4,2060,solarPV,R1,2040,6.00000000000
+4,2064,solarPV,R1,2040,6.00000000000
+4,2065,solarPV,R1,2040,6.00000000000
+4,2069,solarPV,R1,2040,6.00000000000
+5,2050,solarPV,R1,2045,16.91000000000
+5,2054,solarPV,R1,2045,16.91000000000
+5,2055,solarPV,R1,2045,16.91000000000
+5,2059,solarPV,R1,2045,16.91000000000
+5,2060,solarPV,R1,2045,16.91000000000
+5,2064,solarPV,R1,2045,16.91000000000
+5,2065,solarPV,R1,2045,16.91000000000
+5,2069,solarPV,R1,2045,16.91000000000
+5,2070,solarPV,R1,2045,16.91000000000
+5,2074,solarPV,R1,2045,16.91000000000
+6,2045,solarPV,R2,2025,9.15000000000
+6,2049,solarPV,R2,2025,9.15000000000
+6,2050,solarPV,R2,2025,9.15000000000
+6,2054,solarPV,R2,2025,9.15000000000
+7,2045,solarPV,R2,2030,6.00000000000
+7,2049,solarPV,R2,2030,6.00000000000
+7,2050,solarPV,R2,2030,6.00000000000
+7,2054,solarPV,R2,2030,6.00000000000
+7,2055,solarPV,R2,2030,6.00000000000
+7,2059,solarPV,R2,2030,6.00000000000
+8,2045,solarPV,R2,2035,9.19000000000
+8,2049,solarPV,R2,2035,9.19000000000
+8,2050,solarPV,R2,2035,9.19000000000
+8,2054,solarPV,R2,2035,9.19000000000
+8,2055,solarPV,R2,2035,9.19000000000
+8,2059,solarPV,R2,2035,9.19000000000
+8,2060,solarPV,R2,2035,9.19000000000
+8,2064,solarPV,R2,2035,9.19000000000
+9,2045,solarPV,R2,2040,6.00000000000
+9,2049,solarPV,R2,2040,6.00000000000
+9,2050,solarPV,R2,2040,6.00000000000
+9,2054,solarPV,R2,2040,6.00000000000
+9,2055,solarPV,R2,2040,6.00000000000
+9,2059,solarPV,R2,2040,6.00000000000
+9,2060,solarPV,R2,2040,6.00000000000
+9,2064,solarPV,R2,2040,6.00000000000
+9,2065,solarPV,R2,2040,6.00000000000
+9,2069,solarPV,R2,2040,6.00000000000
+10,2050,solarPV,R2,2045,16.91000000000
+10,2054,solarPV,R2,2045,16.91000000000
+10,2055,solarPV,R2,2045,16.91000000000
+10,2059,solarPV,R2,2045,16.91000000000
+10,2060,solarPV,R2,2045,16.91000000000
+10,2064,solarPV,R2,2045,16.91000000000
+10,2065,solarPV,R2,2045,16.91000000000
+10,2069,solarPV,R2,2045,16.91000000000
+10,2070,solarPV,R2,2045,16.91000000000
+10,2074,solarPV,R2,2045,16.91000000000
+11,2045,windturbine,R1,2020,10.00000000000
+11,2049,windturbine,R1,2020,10.00000000000
+12,2050,windturbine,R1,2045,6.75000000000
+12,2054,windturbine,R1,2045,6.75000000000
+12,2055,windturbine,R1,2045,6.75000000000
+12,2059,windturbine,R1,2045,6.75000000000
+12,2060,windturbine,R1,2045,6.75000000000
+12,2064,windturbine,R1,2045,6.75000000000
+12,2065,windturbine,R1,2045,6.75000000000
+12,2069,windturbine,R1,2045,6.75000000000
+12,2070,windturbine,R1,2045,6.75000000000
+12,2074,windturbine,R1,2045,6.75000000000
+13,2045,windturbine,R2,2020,16.75000000000
+13,2049,windturbine,R2,2020,16.75000000000
+14,2050,windturbine,R2,2045,6.75000000000
+14,2054,windturbine,R2,2045,6.75000000000
+14,2055,windturbine,R2,2045,6.75000000000
+14,2059,windturbine,R2,2045,6.75000000000
+14,2060,windturbine,R2,2045,6.75000000000
+14,2064,windturbine,R2,2045,6.75000000000
+14,2065,windturbine,R2,2045,6.75000000000
+14,2069,windturbine,R2,2045,6.75000000000
+14,2070,windturbine,R2,2045,6.75000000000
+14,2074,windturbine,R2,2045,6.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..26d73037
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
@@ -0,0 +1,101 @@
+asset,year,region,installed,technology,capacity
+2,2050,R1,2025,solarPV,9.15000000000
+2,2054,R1,2025,solarPV,9.15000000000
+3,2050,R1,2030,solarPV,6.00000000000
+3,2054,R1,2030,solarPV,6.00000000000
+3,2055,R1,2030,solarPV,6.00000000000
+3,2059,R1,2030,solarPV,6.00000000000
+4,2050,R1,2035,solarPV,9.19000000000
+4,2054,R1,2035,solarPV,9.19000000000
+4,2055,R1,2035,solarPV,9.19000000000
+4,2059,R1,2035,solarPV,9.19000000000
+4,2060,R1,2035,solarPV,9.19000000000
+4,2064,R1,2035,solarPV,9.19000000000
+5,2050,R1,2040,solarPV,6.00000000000
+5,2054,R1,2040,solarPV,6.00000000000
+5,2055,R1,2040,solarPV,6.00000000000
+5,2059,R1,2040,solarPV,6.00000000000
+5,2060,R1,2040,solarPV,6.00000000000
+5,2064,R1,2040,solarPV,6.00000000000
+5,2065,R1,2040,solarPV,6.00000000000
+5,2069,R1,2040,solarPV,6.00000000000
+6,2050,R1,2045,solarPV,16.91000000000
+6,2054,R1,2045,solarPV,16.91000000000
+6,2055,R1,2045,solarPV,16.91000000000
+6,2059,R1,2045,solarPV,16.91000000000
+6,2060,R1,2045,solarPV,16.91000000000
+6,2064,R1,2045,solarPV,16.91000000000
+6,2065,R1,2045,solarPV,16.91000000000
+6,2069,R1,2045,solarPV,16.91000000000
+6,2070,R1,2045,solarPV,16.91000000000
+6,2074,R1,2045,solarPV,16.91000000000
+7,2050,R1,2045,windturbine,6.75000000000
+7,2054,R1,2045,windturbine,6.75000000000
+7,2055,R1,2045,windturbine,6.75000000000
+7,2059,R1,2045,windturbine,6.75000000000
+7,2060,R1,2045,windturbine,6.75000000000
+7,2064,R1,2045,windturbine,6.75000000000
+7,2065,R1,2045,windturbine,6.75000000000
+7,2069,R1,2045,windturbine,6.75000000000
+7,2070,R1,2045,windturbine,6.75000000000
+7,2074,R1,2045,windturbine,6.75000000000
+8,2055,R1,2050,solarPV,9.15000000000
+8,2059,R1,2050,solarPV,9.15000000000
+8,2060,R1,2050,solarPV,9.15000000000
+8,2064,R1,2050,solarPV,9.15000000000
+8,2065,R1,2050,solarPV,9.15000000000
+8,2069,R1,2050,solarPV,9.15000000000
+8,2070,R1,2050,solarPV,9.15000000000
+8,2074,R1,2050,solarPV,9.15000000000
+8,2075,R1,2050,solarPV,9.15000000000
+8,2079,R1,2050,solarPV,9.15000000000
+10,2050,R2,2025,solarPV,9.15000000000
+10,2054,R2,2025,solarPV,9.15000000000
+11,2050,R2,2030,solarPV,6.00000000000
+11,2054,R2,2030,solarPV,6.00000000000
+11,2055,R2,2030,solarPV,6.00000000000
+11,2059,R2,2030,solarPV,6.00000000000
+12,2050,R2,2035,solarPV,9.19000000000
+12,2054,R2,2035,solarPV,9.19000000000
+12,2055,R2,2035,solarPV,9.19000000000
+12,2059,R2,2035,solarPV,9.19000000000
+12,2060,R2,2035,solarPV,9.19000000000
+12,2064,R2,2035,solarPV,9.19000000000
+13,2050,R2,2040,solarPV,6.00000000000
+13,2054,R2,2040,solarPV,6.00000000000
+13,2055,R2,2040,solarPV,6.00000000000
+13,2059,R2,2040,solarPV,6.00000000000
+13,2060,R2,2040,solarPV,6.00000000000
+13,2064,R2,2040,solarPV,6.00000000000
+13,2065,R2,2040,solarPV,6.00000000000
+13,2069,R2,2040,solarPV,6.00000000000
+14,2050,R2,2045,solarPV,16.91000000000
+14,2054,R2,2045,solarPV,16.91000000000
+14,2055,R2,2045,solarPV,16.91000000000
+14,2059,R2,2045,solarPV,16.91000000000
+14,2060,R2,2045,solarPV,16.91000000000
+14,2064,R2,2045,solarPV,16.91000000000
+14,2065,R2,2045,solarPV,16.91000000000
+14,2069,R2,2045,solarPV,16.91000000000
+14,2070,R2,2045,solarPV,16.91000000000
+14,2074,R2,2045,solarPV,16.91000000000
+15,2050,R2,2045,windturbine,6.75000000000
+15,2054,R2,2045,windturbine,6.75000000000
+15,2055,R2,2045,windturbine,6.75000000000
+15,2059,R2,2045,windturbine,6.75000000000
+15,2060,R2,2045,windturbine,6.75000000000
+15,2064,R2,2045,windturbine,6.75000000000
+15,2065,R2,2045,windturbine,6.75000000000
+15,2069,R2,2045,windturbine,6.75000000000
+15,2070,R2,2045,windturbine,6.75000000000
+15,2074,R2,2045,windturbine,6.75000000000
+16,2055,R2,2050,solarPV,9.15000000000
+16,2059,R2,2050,solarPV,9.15000000000
+16,2060,R2,2050,solarPV,9.15000000000
+16,2064,R2,2050,solarPV,9.15000000000
+16,2065,R2,2050,solarPV,9.15000000000
+16,2069,R2,2050,solarPV,9.15000000000
+16,2070,R2,2050,solarPV,9.15000000000
+16,2074,R2,2050,solarPV,9.15000000000
+16,2075,R2,2050,solarPV,9.15000000000
+16,2079,R2,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
index 8e165158..151ff0b4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
@@ -5,11 +5,11 @@ asset,year,technology,region,installed,capacity
 1,2020,gasboiler,R2,2020,10.00000000000
 1,2022,gasboiler,R2,2020,5.00000000000
 1,2025,gasboiler,R2,2020,5.00000000000
-2,2022,heatpump,R1,2020,14.42990000000
-2,2025,heatpump,R1,2020,14.42990000000
-2,2030,heatpump,R1,2020,14.42990000000
-2,2031,heatpump,R1,2020,14.42990000000
-3,2022,heatpump,R2,2020,14.42990000000
-3,2025,heatpump,R2,2020,14.42990000000
-3,2030,heatpump,R2,2020,14.42990000000
-3,2031,heatpump,R2,2020,14.42990000000
+2,2022,heatpump,R1,2020,14.04000000000
+2,2025,heatpump,R1,2020,14.04000000000
+2,2030,heatpump,R1,2020,14.04000000000
+2,2031,heatpump,R1,2020,14.04000000000
+3,2022,heatpump,R2,2020,14.04000000000
+3,2025,heatpump,R2,2020,14.04000000000
+3,2030,heatpump,R2,2020,14.04000000000
+3,2031,heatpump,R2,2020,14.04000000000
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 aa3089b3..7f09fb5d 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
@@ -2,28 +2,28 @@ 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
+1,2022,R1,2020,heatpump,14.04000000000
+1,2024,R1,2020,heatpump,14.04000000000
+1,2025,R1,2020,heatpump,14.04000000000
+1,2030,R1,2020,heatpump,14.04000000000
+1,2031,R1,2020,heatpump,14.04000000000
+2,2024,R1,2022,heatpump,2.24000000000
+2,2025,R1,2022,heatpump,2.24000000000
+2,2030,R1,2022,heatpump,2.24000000000
+2,2031,R1,2022,heatpump,2.24000000000
+2,2032,R1,2022,heatpump,2.24000000000
+2,2033,R1,2022,heatpump,2.24000000000
 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
+4,2022,R2,2020,heatpump,14.04000000000
+4,2024,R2,2020,heatpump,14.04000000000
+4,2025,R2,2020,heatpump,14.04000000000
+4,2030,R2,2020,heatpump,14.04000000000
+4,2031,R2,2020,heatpump,14.04000000000
+5,2024,R2,2022,heatpump,2.24000000000
+5,2025,R2,2022,heatpump,2.24000000000
+5,2030,R2,2022,heatpump,2.24000000000
+5,2031,R2,2022,heatpump,2.24000000000
+5,2032,R2,2022,heatpump,2.24000000000
+5,2033,R2,2022,heatpump,2.24000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
index a749693b..1a948a79 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
@@ -1,57 +1,57 @@
 asset,year,technology,region,installed,capacity
 0,2024,gasboiler,R1,2020,5.00000000000
 0,2025,gasboiler,R1,2020,5.00000000000
-1,2026,gasboiler,R1,2024,2.32550000000
-1,2030,gasboiler,R1,2024,2.32550000000
-1,2031,gasboiler,R1,2024,2.32550000000
-1,2032,gasboiler,R1,2024,2.32550000000
-1,2033,gasboiler,R1,2024,2.32550000000
-1,2034,gasboiler,R1,2024,2.32550000000
-1,2035,gasboiler,R1,2024,2.32550000000
+1,2026,gasboiler,R1,2024,2.39520000000
+1,2030,gasboiler,R1,2024,2.39520000000
+1,2031,gasboiler,R1,2024,2.39520000000
+1,2032,gasboiler,R1,2024,2.39520000000
+1,2033,gasboiler,R1,2024,2.39520000000
+1,2034,gasboiler,R1,2024,2.39520000000
+1,2035,gasboiler,R1,2024,2.39520000000
 2,2024,gasboiler,R2,2020,5.00000000000
 2,2025,gasboiler,R2,2020,5.00000000000
-3,2026,gasboiler,R2,2024,2.32550000000
-3,2030,gasboiler,R2,2024,2.32550000000
-3,2031,gasboiler,R2,2024,2.32550000000
-3,2032,gasboiler,R2,2024,2.32550000000
-3,2033,gasboiler,R2,2024,2.32550000000
-3,2034,gasboiler,R2,2024,2.32550000000
-3,2035,gasboiler,R2,2024,2.32550000000
-4,2024,heatpump,R1,2020,14.42990000000
-4,2025,heatpump,R1,2020,14.42990000000
-4,2026,heatpump,R1,2020,14.42990000000
-4,2030,heatpump,R1,2020,14.42990000000
-4,2031,heatpump,R1,2020,14.42990000000
-5,2024,heatpump,R1,2022,2.28590000000
-5,2025,heatpump,R1,2022,2.28590000000
-5,2026,heatpump,R1,2022,2.28590000000
-5,2030,heatpump,R1,2022,2.28590000000
-5,2031,heatpump,R1,2022,2.28590000000
-5,2032,heatpump,R1,2022,2.28590000000
-5,2033,heatpump,R1,2022,2.28590000000
-6,2026,heatpump,R1,2024,4.96040000000
-6,2030,heatpump,R1,2024,4.96040000000
-6,2031,heatpump,R1,2024,4.96040000000
-6,2032,heatpump,R1,2024,4.96040000000
-6,2033,heatpump,R1,2024,4.96040000000
-6,2034,heatpump,R1,2024,4.96040000000
-6,2035,heatpump,R1,2024,4.96040000000
-7,2024,heatpump,R2,2020,14.42990000000
-7,2025,heatpump,R2,2020,14.42990000000
-7,2026,heatpump,R2,2020,14.42990000000
-7,2030,heatpump,R2,2020,14.42990000000
-7,2031,heatpump,R2,2020,14.42990000000
-8,2024,heatpump,R2,2022,2.28590000000
-8,2025,heatpump,R2,2022,2.28590000000
-8,2026,heatpump,R2,2022,2.28590000000
-8,2030,heatpump,R2,2022,2.28590000000
-8,2031,heatpump,R2,2022,2.28590000000
-8,2032,heatpump,R2,2022,2.28590000000
-8,2033,heatpump,R2,2022,2.28590000000
-9,2026,heatpump,R2,2024,4.96040000000
-9,2030,heatpump,R2,2024,4.96040000000
-9,2031,heatpump,R2,2024,4.96040000000
-9,2032,heatpump,R2,2024,4.96040000000
-9,2033,heatpump,R2,2024,4.96040000000
-9,2034,heatpump,R2,2024,4.96040000000
-9,2035,heatpump,R2,2024,4.96040000000
+3,2026,gasboiler,R2,2024,2.39520000000
+3,2030,gasboiler,R2,2024,2.39520000000
+3,2031,gasboiler,R2,2024,2.39520000000
+3,2032,gasboiler,R2,2024,2.39520000000
+3,2033,gasboiler,R2,2024,2.39520000000
+3,2034,gasboiler,R2,2024,2.39520000000
+3,2035,gasboiler,R2,2024,2.39520000000
+4,2024,heatpump,R1,2020,14.04000000000
+4,2025,heatpump,R1,2020,14.04000000000
+4,2026,heatpump,R1,2020,14.04000000000
+4,2030,heatpump,R1,2020,14.04000000000
+4,2031,heatpump,R1,2020,14.04000000000
+5,2024,heatpump,R1,2022,2.24000000000
+5,2025,heatpump,R1,2022,2.24000000000
+5,2026,heatpump,R1,2022,2.24000000000
+5,2030,heatpump,R1,2022,2.24000000000
+5,2031,heatpump,R1,2022,2.24000000000
+5,2032,heatpump,R1,2022,2.24000000000
+5,2033,heatpump,R1,2022,2.24000000000
+6,2026,heatpump,R1,2024,4.84480000000
+6,2030,heatpump,R1,2024,4.84480000000
+6,2031,heatpump,R1,2024,4.84480000000
+6,2032,heatpump,R1,2024,4.84480000000
+6,2033,heatpump,R1,2024,4.84480000000
+6,2034,heatpump,R1,2024,4.84480000000
+6,2035,heatpump,R1,2024,4.84480000000
+7,2024,heatpump,R2,2020,14.04000000000
+7,2025,heatpump,R2,2020,14.04000000000
+7,2026,heatpump,R2,2020,14.04000000000
+7,2030,heatpump,R2,2020,14.04000000000
+7,2031,heatpump,R2,2020,14.04000000000
+8,2024,heatpump,R2,2022,2.24000000000
+8,2025,heatpump,R2,2022,2.24000000000
+8,2026,heatpump,R2,2022,2.24000000000
+8,2030,heatpump,R2,2022,2.24000000000
+8,2031,heatpump,R2,2022,2.24000000000
+8,2032,heatpump,R2,2022,2.24000000000
+8,2033,heatpump,R2,2022,2.24000000000
+9,2026,heatpump,R2,2024,4.84480000000
+9,2030,heatpump,R2,2024,4.84480000000
+9,2031,heatpump,R2,2024,4.84480000000
+9,2032,heatpump,R2,2024,4.84480000000
+9,2033,heatpump,R2,2024,4.84480000000
+9,2034,heatpump,R2,2024,4.84480000000
+9,2035,heatpump,R2,2024,4.84480000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..34d42206
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,4.10000000000
+1,2034,gasboiler,R1,2025,4.10000000000
+1,2035,gasboiler,R1,2025,4.10000000000
+1,2039,gasboiler,R1,2025,4.10000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,4.10000000000
+3,2034,gasboiler,R2,2025,4.10000000000
+3,2035,gasboiler,R2,2025,4.10000000000
+3,2039,gasboiler,R2,2025,4.10000000000
+4,2025,heatpump,R1,2020,19.00000000000
+4,2030,heatpump,R1,2020,19.00000000000
+4,2034,heatpump,R1,2020,19.00000000000
+5,2030,heatpump,R1,2025,6.90000000000
+5,2034,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2025,6.90000000000
+5,2039,heatpump,R1,2025,6.90000000000
+6,2025,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2020,19.00000000000
+6,2034,heatpump,R2,2020,19.00000000000
+7,2030,heatpump,R2,2025,6.90000000000
+7,2034,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
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 b3b9d8fd..1a3e71b6 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
+1,2026,R1,2020,heatpump,14.04000000000
+1,2028,R1,2020,heatpump,14.04000000000
+1,2030,R1,2020,heatpump,14.04000000000
+1,2031,R1,2020,heatpump,14.04000000000
+2,2026,R1,2022,heatpump,2.24000000000
+2,2028,R1,2022,heatpump,2.24000000000
+2,2030,R1,2022,heatpump,2.24000000000
+2,2031,R1,2022,heatpump,2.24000000000
+2,2032,R1,2022,heatpump,2.24000000000
+2,2033,R1,2022,heatpump,2.24000000000
+3,2026,R1,2024,gasboiler,2.39520000000
+3,2028,R1,2024,gasboiler,2.39520000000
+3,2030,R1,2024,gasboiler,2.39520000000
+3,2031,R1,2024,gasboiler,2.39520000000
+3,2032,R1,2024,gasboiler,2.39520000000
+3,2033,R1,2024,gasboiler,2.39520000000
+3,2034,R1,2024,gasboiler,2.39520000000
+3,2035,R1,2024,gasboiler,2.39520000000
+4,2026,R1,2024,heatpump,4.84480000000
+4,2028,R1,2024,heatpump,4.84480000000
+4,2030,R1,2024,heatpump,4.84480000000
+4,2031,R1,2024,heatpump,4.84480000000
+4,2032,R1,2024,heatpump,4.84480000000
+4,2033,R1,2024,heatpump,4.84480000000
+4,2034,R1,2024,heatpump,4.84480000000
+4,2035,R1,2024,heatpump,4.84480000000
+5,2028,R1,2026,heatpump,2.24000000000
+5,2030,R1,2026,heatpump,2.24000000000
+5,2031,R1,2026,heatpump,2.24000000000
+5,2032,R1,2026,heatpump,2.24000000000
+5,2033,R1,2026,heatpump,2.24000000000
+5,2034,R1,2026,heatpump,2.24000000000
+5,2035,R1,2026,heatpump,2.24000000000
+5,2036,R1,2026,heatpump,2.24000000000
+5,2037,R1,2026,heatpump,2.24000000000
+7,2026,R2,2020,heatpump,14.04000000000
+7,2028,R2,2020,heatpump,14.04000000000
+7,2030,R2,2020,heatpump,14.04000000000
+7,2031,R2,2020,heatpump,14.04000000000
+8,2026,R2,2022,heatpump,2.24000000000
+8,2028,R2,2022,heatpump,2.24000000000
+8,2030,R2,2022,heatpump,2.24000000000
+8,2031,R2,2022,heatpump,2.24000000000
+8,2032,R2,2022,heatpump,2.24000000000
+8,2033,R2,2022,heatpump,2.24000000000
+9,2026,R2,2024,gasboiler,2.39520000000
+9,2028,R2,2024,gasboiler,2.39520000000
+9,2030,R2,2024,gasboiler,2.39520000000
+9,2031,R2,2024,gasboiler,2.39520000000
+9,2032,R2,2024,gasboiler,2.39520000000
+9,2033,R2,2024,gasboiler,2.39520000000
+9,2034,R2,2024,gasboiler,2.39520000000
+9,2035,R2,2024,gasboiler,2.39520000000
+10,2026,R2,2024,heatpump,4.84480000000
+10,2028,R2,2024,heatpump,4.84480000000
+10,2030,R2,2024,heatpump,4.84480000000
+10,2031,R2,2024,heatpump,4.84480000000
+10,2032,R2,2024,heatpump,4.84480000000
+10,2033,R2,2024,heatpump,4.84480000000
+10,2034,R2,2024,heatpump,4.84480000000
+10,2035,R2,2024,heatpump,4.84480000000
+11,2028,R2,2026,heatpump,2.24000000000
+11,2030,R2,2026,heatpump,2.24000000000
+11,2031,R2,2026,heatpump,2.24000000000
+11,2032,R2,2026,heatpump,2.24000000000
+11,2033,R2,2026,heatpump,2.24000000000
+11,2034,R2,2026,heatpump,2.24000000000
+11,2035,R2,2026,heatpump,2.24000000000
+11,2036,R2,2026,heatpump,2.24000000000
+11,2037,R2,2026,heatpump,2.24000000000
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 d49c6f24..a34d9c85 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
+1,2028,R1,2020,heatpump,14.04000000000
+1,2030,R1,2020,heatpump,14.04000000000
+1,2031,R1,2020,heatpump,14.04000000000
+2,2028,R1,2022,heatpump,2.24000000000
+2,2030,R1,2022,heatpump,2.24000000000
+2,2031,R1,2022,heatpump,2.24000000000
+2,2032,R1,2022,heatpump,2.24000000000
+2,2033,R1,2022,heatpump,2.24000000000
+3,2028,R1,2024,gasboiler,2.39520000000
+3,2030,R1,2024,gasboiler,2.39520000000
+3,2031,R1,2024,gasboiler,2.39520000000
+3,2032,R1,2024,gasboiler,2.39520000000
+3,2033,R1,2024,gasboiler,2.39520000000
+3,2034,R1,2024,gasboiler,2.39520000000
+3,2035,R1,2024,gasboiler,2.39520000000
+4,2028,R1,2024,heatpump,4.84480000000
+4,2030,R1,2024,heatpump,4.84480000000
+4,2031,R1,2024,heatpump,4.84480000000
+4,2032,R1,2024,heatpump,4.84480000000
+4,2033,R1,2024,heatpump,4.84480000000
+4,2034,R1,2024,heatpump,4.84480000000
+4,2035,R1,2024,heatpump,4.84480000000
+5,2028,R1,2026,heatpump,2.24000000000
+5,2030,R1,2026,heatpump,2.24000000000
+5,2031,R1,2026,heatpump,2.24000000000
+5,2032,R1,2026,heatpump,2.24000000000
+5,2033,R1,2026,heatpump,2.24000000000
+5,2034,R1,2026,heatpump,2.24000000000
+5,2035,R1,2026,heatpump,2.24000000000
+5,2036,R1,2026,heatpump,2.24000000000
+5,2037,R1,2026,heatpump,2.24000000000
+6,2030,R1,2028,heatpump,2.24000000000
+6,2031,R1,2028,heatpump,2.24000000000
+6,2032,R1,2028,heatpump,2.24000000000
+6,2033,R1,2028,heatpump,2.24000000000
+6,2034,R1,2028,heatpump,2.24000000000
+6,2035,R1,2028,heatpump,2.24000000000
+6,2036,R1,2028,heatpump,2.24000000000
+6,2037,R1,2028,heatpump,2.24000000000
+6,2038,R1,2028,heatpump,2.24000000000
+6,2039,R1,2028,heatpump,2.24000000000
+8,2028,R2,2020,heatpump,14.04000000000
+8,2030,R2,2020,heatpump,14.04000000000
+8,2031,R2,2020,heatpump,14.04000000000
+9,2028,R2,2022,heatpump,2.24000000000
+9,2030,R2,2022,heatpump,2.24000000000
+9,2031,R2,2022,heatpump,2.24000000000
+9,2032,R2,2022,heatpump,2.24000000000
+9,2033,R2,2022,heatpump,2.24000000000
+10,2028,R2,2024,gasboiler,2.39520000000
+10,2030,R2,2024,gasboiler,2.39520000000
+10,2031,R2,2024,gasboiler,2.39520000000
+10,2032,R2,2024,gasboiler,2.39520000000
+10,2033,R2,2024,gasboiler,2.39520000000
+10,2034,R2,2024,gasboiler,2.39520000000
+10,2035,R2,2024,gasboiler,2.39520000000
+11,2028,R2,2024,heatpump,4.84480000000
+11,2030,R2,2024,heatpump,4.84480000000
+11,2031,R2,2024,heatpump,4.84480000000
+11,2032,R2,2024,heatpump,4.84480000000
+11,2033,R2,2024,heatpump,4.84480000000
+11,2034,R2,2024,heatpump,4.84480000000
+11,2035,R2,2024,heatpump,4.84480000000
+12,2028,R2,2026,heatpump,2.24000000000
+12,2030,R2,2026,heatpump,2.24000000000
+12,2031,R2,2026,heatpump,2.24000000000
+12,2032,R2,2026,heatpump,2.24000000000
+12,2033,R2,2026,heatpump,2.24000000000
+12,2034,R2,2026,heatpump,2.24000000000
+12,2035,R2,2026,heatpump,2.24000000000
+12,2036,R2,2026,heatpump,2.24000000000
+12,2037,R2,2026,heatpump,2.24000000000
+13,2030,R2,2028,heatpump,2.24000000000
+13,2031,R2,2028,heatpump,2.24000000000
+13,2032,R2,2028,heatpump,2.24000000000
+13,2033,R2,2028,heatpump,2.24000000000
+13,2034,R2,2028,heatpump,2.24000000000
+13,2035,R2,2028,heatpump,2.24000000000
+13,2036,R2,2028,heatpump,2.24000000000
+13,2037,R2,2028,heatpump,2.24000000000
+13,2038,R2,2028,heatpump,2.24000000000
+13,2039,R2,2028,heatpump,2.24000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
index 34abbefd..c4489f71 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
@@ -1,93 +1,93 @@
 asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2024,2.32550000000
-0,2031,gasboiler,R1,2024,2.32550000000
-0,2032,gasboiler,R1,2024,2.32550000000
-0,2033,gasboiler,R1,2024,2.32550000000
-0,2034,gasboiler,R1,2024,2.32550000000
-0,2035,gasboiler,R1,2024,2.32550000000
-1,2030,gasboiler,R2,2024,2.32550000000
-1,2031,gasboiler,R2,2024,2.32550000000
-1,2032,gasboiler,R2,2024,2.32550000000
-1,2033,gasboiler,R2,2024,2.32550000000
-1,2034,gasboiler,R2,2024,2.32550000000
-1,2035,gasboiler,R2,2024,2.32550000000
-2,2030,heatpump,R1,2020,14.42990000000
-2,2031,heatpump,R1,2020,14.42990000000
-3,2030,heatpump,R1,2022,2.28590000000
-3,2031,heatpump,R1,2022,2.28590000000
-3,2032,heatpump,R1,2022,2.28590000000
-3,2033,heatpump,R1,2022,2.28590000000
-4,2030,heatpump,R1,2024,4.96040000000
-4,2031,heatpump,R1,2024,4.96040000000
-4,2032,heatpump,R1,2024,4.96040000000
-4,2033,heatpump,R1,2024,4.96040000000
-4,2034,heatpump,R1,2024,4.96040000000
-4,2035,heatpump,R1,2024,4.96040000000
-5,2030,heatpump,R1,2026,2.28590000000
-5,2031,heatpump,R1,2026,2.28590000000
-5,2032,heatpump,R1,2026,2.28590000000
-5,2033,heatpump,R1,2026,2.28590000000
-5,2034,heatpump,R1,2026,2.28590000000
-5,2035,heatpump,R1,2026,2.28590000000
-5,2036,heatpump,R1,2026,2.28590000000
-5,2037,heatpump,R1,2026,2.28590000000
-6,2030,heatpump,R1,2028,2.28590000000
-6,2031,heatpump,R1,2028,2.28590000000
-6,2032,heatpump,R1,2028,2.28590000000
-6,2033,heatpump,R1,2028,2.28590000000
-6,2034,heatpump,R1,2028,2.28590000000
-6,2035,heatpump,R1,2028,2.28590000000
-6,2036,heatpump,R1,2028,2.28590000000
-6,2037,heatpump,R1,2028,2.28590000000
-6,2038,heatpump,R1,2028,2.28590000000
-6,2039,heatpump,R1,2028,2.28590000000
-7,2032,heatpump,R1,2030,16.71570000000
-7,2033,heatpump,R1,2030,16.71570000000
-7,2034,heatpump,R1,2030,16.71570000000
-7,2035,heatpump,R1,2030,16.71570000000
-7,2036,heatpump,R1,2030,16.71570000000
-7,2037,heatpump,R1,2030,16.71570000000
-7,2038,heatpump,R1,2030,16.71570000000
-7,2039,heatpump,R1,2030,16.71570000000
-7,2040,heatpump,R1,2030,16.71570000000
-7,2041,heatpump,R1,2030,16.71570000000
-8,2030,heatpump,R2,2020,14.42990000000
-8,2031,heatpump,R2,2020,14.42990000000
-9,2030,heatpump,R2,2022,2.28590000000
-9,2031,heatpump,R2,2022,2.28590000000
-9,2032,heatpump,R2,2022,2.28590000000
-9,2033,heatpump,R2,2022,2.28590000000
-10,2030,heatpump,R2,2024,4.96040000000
-10,2031,heatpump,R2,2024,4.96040000000
-10,2032,heatpump,R2,2024,4.96040000000
-10,2033,heatpump,R2,2024,4.96040000000
-10,2034,heatpump,R2,2024,4.96040000000
-10,2035,heatpump,R2,2024,4.96040000000
-11,2030,heatpump,R2,2026,2.28590000000
-11,2031,heatpump,R2,2026,2.28590000000
-11,2032,heatpump,R2,2026,2.28590000000
-11,2033,heatpump,R2,2026,2.28590000000
-11,2034,heatpump,R2,2026,2.28590000000
-11,2035,heatpump,R2,2026,2.28590000000
-11,2036,heatpump,R2,2026,2.28590000000
-11,2037,heatpump,R2,2026,2.28590000000
-12,2030,heatpump,R2,2028,2.28590000000
-12,2031,heatpump,R2,2028,2.28590000000
-12,2032,heatpump,R2,2028,2.28590000000
-12,2033,heatpump,R2,2028,2.28590000000
-12,2034,heatpump,R2,2028,2.28590000000
-12,2035,heatpump,R2,2028,2.28590000000
-12,2036,heatpump,R2,2028,2.28590000000
-12,2037,heatpump,R2,2028,2.28590000000
-12,2038,heatpump,R2,2028,2.28590000000
-12,2039,heatpump,R2,2028,2.28590000000
-13,2032,heatpump,R2,2030,16.71570000000
-13,2033,heatpump,R2,2030,16.71570000000
-13,2034,heatpump,R2,2030,16.71570000000
-13,2035,heatpump,R2,2030,16.71570000000
-13,2036,heatpump,R2,2030,16.71570000000
-13,2037,heatpump,R2,2030,16.71570000000
-13,2038,heatpump,R2,2030,16.71570000000
-13,2039,heatpump,R2,2030,16.71570000000
-13,2040,heatpump,R2,2030,16.71570000000
-13,2041,heatpump,R2,2030,16.71570000000
+0,2030,gasboiler,R1,2024,2.39520000000
+0,2031,gasboiler,R1,2024,2.39520000000
+0,2032,gasboiler,R1,2024,2.39520000000
+0,2033,gasboiler,R1,2024,2.39520000000
+0,2034,gasboiler,R1,2024,2.39520000000
+0,2035,gasboiler,R1,2024,2.39520000000
+1,2030,gasboiler,R2,2024,2.39520000000
+1,2031,gasboiler,R2,2024,2.39520000000
+1,2032,gasboiler,R2,2024,2.39520000000
+1,2033,gasboiler,R2,2024,2.39520000000
+1,2034,gasboiler,R2,2024,2.39520000000
+1,2035,gasboiler,R2,2024,2.39520000000
+2,2030,heatpump,R1,2020,14.04000000000
+2,2031,heatpump,R1,2020,14.04000000000
+3,2030,heatpump,R1,2022,2.24000000000
+3,2031,heatpump,R1,2022,2.24000000000
+3,2032,heatpump,R1,2022,2.24000000000
+3,2033,heatpump,R1,2022,2.24000000000
+4,2030,heatpump,R1,2024,4.84480000000
+4,2031,heatpump,R1,2024,4.84480000000
+4,2032,heatpump,R1,2024,4.84480000000
+4,2033,heatpump,R1,2024,4.84480000000
+4,2034,heatpump,R1,2024,4.84480000000
+4,2035,heatpump,R1,2024,4.84480000000
+5,2030,heatpump,R1,2026,2.24000000000
+5,2031,heatpump,R1,2026,2.24000000000
+5,2032,heatpump,R1,2026,2.24000000000
+5,2033,heatpump,R1,2026,2.24000000000
+5,2034,heatpump,R1,2026,2.24000000000
+5,2035,heatpump,R1,2026,2.24000000000
+5,2036,heatpump,R1,2026,2.24000000000
+5,2037,heatpump,R1,2026,2.24000000000
+6,2030,heatpump,R1,2028,2.24000000000
+6,2031,heatpump,R1,2028,2.24000000000
+6,2032,heatpump,R1,2028,2.24000000000
+6,2033,heatpump,R1,2028,2.24000000000
+6,2034,heatpump,R1,2028,2.24000000000
+6,2035,heatpump,R1,2028,2.24000000000
+6,2036,heatpump,R1,2028,2.24000000000
+6,2037,heatpump,R1,2028,2.24000000000
+6,2038,heatpump,R1,2028,2.24000000000
+6,2039,heatpump,R1,2028,2.24000000000
+7,2032,heatpump,R1,2030,16.28000000000
+7,2033,heatpump,R1,2030,16.28000000000
+7,2034,heatpump,R1,2030,16.28000000000
+7,2035,heatpump,R1,2030,16.28000000000
+7,2036,heatpump,R1,2030,16.28000000000
+7,2037,heatpump,R1,2030,16.28000000000
+7,2038,heatpump,R1,2030,16.28000000000
+7,2039,heatpump,R1,2030,16.28000000000
+7,2040,heatpump,R1,2030,16.28000000000
+7,2041,heatpump,R1,2030,16.28000000000
+8,2030,heatpump,R2,2020,14.04000000000
+8,2031,heatpump,R2,2020,14.04000000000
+9,2030,heatpump,R2,2022,2.24000000000
+9,2031,heatpump,R2,2022,2.24000000000
+9,2032,heatpump,R2,2022,2.24000000000
+9,2033,heatpump,R2,2022,2.24000000000
+10,2030,heatpump,R2,2024,4.84480000000
+10,2031,heatpump,R2,2024,4.84480000000
+10,2032,heatpump,R2,2024,4.84480000000
+10,2033,heatpump,R2,2024,4.84480000000
+10,2034,heatpump,R2,2024,4.84480000000
+10,2035,heatpump,R2,2024,4.84480000000
+11,2030,heatpump,R2,2026,2.24000000000
+11,2031,heatpump,R2,2026,2.24000000000
+11,2032,heatpump,R2,2026,2.24000000000
+11,2033,heatpump,R2,2026,2.24000000000
+11,2034,heatpump,R2,2026,2.24000000000
+11,2035,heatpump,R2,2026,2.24000000000
+11,2036,heatpump,R2,2026,2.24000000000
+11,2037,heatpump,R2,2026,2.24000000000
+12,2030,heatpump,R2,2028,2.24000000000
+12,2031,heatpump,R2,2028,2.24000000000
+12,2032,heatpump,R2,2028,2.24000000000
+12,2033,heatpump,R2,2028,2.24000000000
+12,2034,heatpump,R2,2028,2.24000000000
+12,2035,heatpump,R2,2028,2.24000000000
+12,2036,heatpump,R2,2028,2.24000000000
+12,2037,heatpump,R2,2028,2.24000000000
+12,2038,heatpump,R2,2028,2.24000000000
+12,2039,heatpump,R2,2028,2.24000000000
+13,2032,heatpump,R2,2030,16.28000000000
+13,2033,heatpump,R2,2030,16.28000000000
+13,2034,heatpump,R2,2030,16.28000000000
+13,2035,heatpump,R2,2030,16.28000000000
+13,2036,heatpump,R2,2030,16.28000000000
+13,2037,heatpump,R2,2030,16.28000000000
+13,2038,heatpump,R2,2030,16.28000000000
+13,2039,heatpump,R2,2030,16.28000000000
+13,2040,heatpump,R2,2030,16.28000000000
+13,2041,heatpump,R2,2030,16.28000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
index cf84841d..8e89ac68 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
@@ -1,89 +1,89 @@
 asset,year,technology,region,installed,capacity
-0,2032,gasboiler,R1,2024,2.32550000000
-0,2033,gasboiler,R1,2024,2.32550000000
-0,2034,gasboiler,R1,2024,2.32550000000
-0,2035,gasboiler,R1,2024,2.32550000000
-1,2032,gasboiler,R2,2024,2.32550000000
-1,2033,gasboiler,R2,2024,2.32550000000
-1,2034,gasboiler,R2,2024,2.32550000000
-1,2035,gasboiler,R2,2024,2.32550000000
-2,2032,heatpump,R1,2022,2.28590000000
-2,2033,heatpump,R1,2022,2.28590000000
-3,2032,heatpump,R1,2024,4.96040000000
-3,2033,heatpump,R1,2024,4.96040000000
-3,2034,heatpump,R1,2024,4.96040000000
-3,2035,heatpump,R1,2024,4.96040000000
-4,2032,heatpump,R1,2026,2.28590000000
-4,2033,heatpump,R1,2026,2.28590000000
-4,2034,heatpump,R1,2026,2.28590000000
-4,2035,heatpump,R1,2026,2.28590000000
-4,2036,heatpump,R1,2026,2.28590000000
-4,2037,heatpump,R1,2026,2.28590000000
-5,2032,heatpump,R1,2028,2.28590000000
-5,2033,heatpump,R1,2028,2.28590000000
-5,2034,heatpump,R1,2028,2.28590000000
-5,2035,heatpump,R1,2028,2.28590000000
-5,2036,heatpump,R1,2028,2.28590000000
-5,2037,heatpump,R1,2028,2.28590000000
-5,2038,heatpump,R1,2028,2.28590000000
-5,2039,heatpump,R1,2028,2.28590000000
-6,2032,heatpump,R1,2030,16.71570000000
-6,2033,heatpump,R1,2030,16.71570000000
-6,2034,heatpump,R1,2030,16.71570000000
-6,2035,heatpump,R1,2030,16.71570000000
-6,2036,heatpump,R1,2030,16.71570000000
-6,2037,heatpump,R1,2030,16.71570000000
-6,2038,heatpump,R1,2030,16.71570000000
-6,2039,heatpump,R1,2030,16.71570000000
-6,2040,heatpump,R1,2030,16.71570000000
-6,2041,heatpump,R1,2030,16.71570000000
-7,2034,heatpump,R1,2032,4.57170000000
-7,2035,heatpump,R1,2032,4.57170000000
-7,2036,heatpump,R1,2032,4.57170000000
-7,2037,heatpump,R1,2032,4.57170000000
-7,2038,heatpump,R1,2032,4.57170000000
-7,2039,heatpump,R1,2032,4.57170000000
-7,2040,heatpump,R1,2032,4.57170000000
-7,2041,heatpump,R1,2032,4.57170000000
-7,2042,heatpump,R1,2032,4.57170000000
-7,2043,heatpump,R1,2032,4.57170000000
-8,2032,heatpump,R2,2022,2.28590000000
-8,2033,heatpump,R2,2022,2.28590000000
-9,2032,heatpump,R2,2024,4.96040000000
-9,2033,heatpump,R2,2024,4.96040000000
-9,2034,heatpump,R2,2024,4.96040000000
-9,2035,heatpump,R2,2024,4.96040000000
-10,2032,heatpump,R2,2026,2.28590000000
-10,2033,heatpump,R2,2026,2.28590000000
-10,2034,heatpump,R2,2026,2.28590000000
-10,2035,heatpump,R2,2026,2.28590000000
-10,2036,heatpump,R2,2026,2.28590000000
-10,2037,heatpump,R2,2026,2.28590000000
-11,2032,heatpump,R2,2028,2.28590000000
-11,2033,heatpump,R2,2028,2.28590000000
-11,2034,heatpump,R2,2028,2.28590000000
-11,2035,heatpump,R2,2028,2.28590000000
-11,2036,heatpump,R2,2028,2.28590000000
-11,2037,heatpump,R2,2028,2.28590000000
-11,2038,heatpump,R2,2028,2.28590000000
-11,2039,heatpump,R2,2028,2.28590000000
-12,2032,heatpump,R2,2030,16.71570000000
-12,2033,heatpump,R2,2030,16.71570000000
-12,2034,heatpump,R2,2030,16.71570000000
-12,2035,heatpump,R2,2030,16.71570000000
-12,2036,heatpump,R2,2030,16.71570000000
-12,2037,heatpump,R2,2030,16.71570000000
-12,2038,heatpump,R2,2030,16.71570000000
-12,2039,heatpump,R2,2030,16.71570000000
-12,2040,heatpump,R2,2030,16.71570000000
-12,2041,heatpump,R2,2030,16.71570000000
-13,2034,heatpump,R2,2032,4.57170000000
-13,2035,heatpump,R2,2032,4.57170000000
-13,2036,heatpump,R2,2032,4.57170000000
-13,2037,heatpump,R2,2032,4.57170000000
-13,2038,heatpump,R2,2032,4.57170000000
-13,2039,heatpump,R2,2032,4.57170000000
-13,2040,heatpump,R2,2032,4.57170000000
-13,2041,heatpump,R2,2032,4.57170000000
-13,2042,heatpump,R2,2032,4.57170000000
-13,2043,heatpump,R2,2032,4.57170000000
+0,2032,gasboiler,R1,2024,2.39520000000
+0,2033,gasboiler,R1,2024,2.39520000000
+0,2034,gasboiler,R1,2024,2.39520000000
+0,2035,gasboiler,R1,2024,2.39520000000
+1,2032,gasboiler,R2,2024,2.39520000000
+1,2033,gasboiler,R2,2024,2.39520000000
+1,2034,gasboiler,R2,2024,2.39520000000
+1,2035,gasboiler,R2,2024,2.39520000000
+2,2032,heatpump,R1,2022,2.24000000000
+2,2033,heatpump,R1,2022,2.24000000000
+3,2032,heatpump,R1,2024,4.84480000000
+3,2033,heatpump,R1,2024,4.84480000000
+3,2034,heatpump,R1,2024,4.84480000000
+3,2035,heatpump,R1,2024,4.84480000000
+4,2032,heatpump,R1,2026,2.24000000000
+4,2033,heatpump,R1,2026,2.24000000000
+4,2034,heatpump,R1,2026,2.24000000000
+4,2035,heatpump,R1,2026,2.24000000000
+4,2036,heatpump,R1,2026,2.24000000000
+4,2037,heatpump,R1,2026,2.24000000000
+5,2032,heatpump,R1,2028,2.24000000000
+5,2033,heatpump,R1,2028,2.24000000000
+5,2034,heatpump,R1,2028,2.24000000000
+5,2035,heatpump,R1,2028,2.24000000000
+5,2036,heatpump,R1,2028,2.24000000000
+5,2037,heatpump,R1,2028,2.24000000000
+5,2038,heatpump,R1,2028,2.24000000000
+5,2039,heatpump,R1,2028,2.24000000000
+6,2032,heatpump,R1,2030,16.28000000000
+6,2033,heatpump,R1,2030,16.28000000000
+6,2034,heatpump,R1,2030,16.28000000000
+6,2035,heatpump,R1,2030,16.28000000000
+6,2036,heatpump,R1,2030,16.28000000000
+6,2037,heatpump,R1,2030,16.28000000000
+6,2038,heatpump,R1,2030,16.28000000000
+6,2039,heatpump,R1,2030,16.28000000000
+6,2040,heatpump,R1,2030,16.28000000000
+6,2041,heatpump,R1,2030,16.28000000000
+7,2034,heatpump,R1,2032,4.48000000000
+7,2035,heatpump,R1,2032,4.48000000000
+7,2036,heatpump,R1,2032,4.48000000000
+7,2037,heatpump,R1,2032,4.48000000000
+7,2038,heatpump,R1,2032,4.48000000000
+7,2039,heatpump,R1,2032,4.48000000000
+7,2040,heatpump,R1,2032,4.48000000000
+7,2041,heatpump,R1,2032,4.48000000000
+7,2042,heatpump,R1,2032,4.48000000000
+7,2043,heatpump,R1,2032,4.48000000000
+8,2032,heatpump,R2,2022,2.24000000000
+8,2033,heatpump,R2,2022,2.24000000000
+9,2032,heatpump,R2,2024,4.84480000000
+9,2033,heatpump,R2,2024,4.84480000000
+9,2034,heatpump,R2,2024,4.84480000000
+9,2035,heatpump,R2,2024,4.84480000000
+10,2032,heatpump,R2,2026,2.24000000000
+10,2033,heatpump,R2,2026,2.24000000000
+10,2034,heatpump,R2,2026,2.24000000000
+10,2035,heatpump,R2,2026,2.24000000000
+10,2036,heatpump,R2,2026,2.24000000000
+10,2037,heatpump,R2,2026,2.24000000000
+11,2032,heatpump,R2,2028,2.24000000000
+11,2033,heatpump,R2,2028,2.24000000000
+11,2034,heatpump,R2,2028,2.24000000000
+11,2035,heatpump,R2,2028,2.24000000000
+11,2036,heatpump,R2,2028,2.24000000000
+11,2037,heatpump,R2,2028,2.24000000000
+11,2038,heatpump,R2,2028,2.24000000000
+11,2039,heatpump,R2,2028,2.24000000000
+12,2032,heatpump,R2,2030,16.28000000000
+12,2033,heatpump,R2,2030,16.28000000000
+12,2034,heatpump,R2,2030,16.28000000000
+12,2035,heatpump,R2,2030,16.28000000000
+12,2036,heatpump,R2,2030,16.28000000000
+12,2037,heatpump,R2,2030,16.28000000000
+12,2038,heatpump,R2,2030,16.28000000000
+12,2039,heatpump,R2,2030,16.28000000000
+12,2040,heatpump,R2,2030,16.28000000000
+12,2041,heatpump,R2,2030,16.28000000000
+13,2034,heatpump,R2,2032,4.48000000000
+13,2035,heatpump,R2,2032,4.48000000000
+13,2036,heatpump,R2,2032,4.48000000000
+13,2037,heatpump,R2,2032,4.48000000000
+13,2038,heatpump,R2,2032,4.48000000000
+13,2039,heatpump,R2,2032,4.48000000000
+13,2040,heatpump,R2,2032,4.48000000000
+13,2041,heatpump,R2,2032,4.48000000000
+13,2042,heatpump,R2,2032,4.48000000000
+13,2043,heatpump,R2,2032,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
index 0d4fdd2a..70192a70 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
@@ -1,85 +1,85 @@
 asset,year,technology,region,installed,capacity
-0,2034,gasboiler,R1,2024,2.32550000000
-0,2035,gasboiler,R1,2024,2.32550000000
-1,2034,gasboiler,R2,2024,2.32550000000
-1,2035,gasboiler,R2,2024,2.32550000000
-2,2034,heatpump,R1,2024,4.96040000000
-2,2035,heatpump,R1,2024,4.96040000000
-3,2034,heatpump,R1,2026,2.28590000000
-3,2035,heatpump,R1,2026,2.28590000000
-3,2036,heatpump,R1,2026,2.28590000000
-3,2037,heatpump,R1,2026,2.28590000000
-4,2034,heatpump,R1,2028,2.28590000000
-4,2035,heatpump,R1,2028,2.28590000000
-4,2036,heatpump,R1,2028,2.28590000000
-4,2037,heatpump,R1,2028,2.28590000000
-4,2038,heatpump,R1,2028,2.28590000000
-4,2039,heatpump,R1,2028,2.28590000000
-5,2034,heatpump,R1,2030,16.71570000000
-5,2035,heatpump,R1,2030,16.71570000000
-5,2036,heatpump,R1,2030,16.71570000000
-5,2037,heatpump,R1,2030,16.71570000000
-5,2038,heatpump,R1,2030,16.71570000000
-5,2039,heatpump,R1,2030,16.71570000000
-5,2040,heatpump,R1,2030,16.71570000000
-5,2041,heatpump,R1,2030,16.71570000000
-6,2034,heatpump,R1,2032,4.57170000000
-6,2035,heatpump,R1,2032,4.57170000000
-6,2036,heatpump,R1,2032,4.57170000000
-6,2037,heatpump,R1,2032,4.57170000000
-6,2038,heatpump,R1,2032,4.57170000000
-6,2039,heatpump,R1,2032,4.57170000000
-6,2040,heatpump,R1,2032,4.57170000000
-6,2041,heatpump,R1,2032,4.57170000000
-6,2042,heatpump,R1,2032,4.57170000000
-6,2043,heatpump,R1,2032,4.57170000000
-7,2036,heatpump,R1,2034,9.57170000000
-7,2037,heatpump,R1,2034,9.57170000000
-7,2038,heatpump,R1,2034,9.57170000000
-7,2039,heatpump,R1,2034,9.57170000000
-7,2040,heatpump,R1,2034,9.57170000000
-7,2041,heatpump,R1,2034,9.57170000000
-7,2042,heatpump,R1,2034,9.57170000000
-7,2043,heatpump,R1,2034,9.57170000000
-7,2044,heatpump,R1,2034,9.57170000000
-7,2045,heatpump,R1,2034,9.57170000000
-8,2034,heatpump,R2,2024,4.96040000000
-8,2035,heatpump,R2,2024,4.96040000000
-9,2034,heatpump,R2,2026,2.28590000000
-9,2035,heatpump,R2,2026,2.28590000000
-9,2036,heatpump,R2,2026,2.28590000000
-9,2037,heatpump,R2,2026,2.28590000000
-10,2034,heatpump,R2,2028,2.28590000000
-10,2035,heatpump,R2,2028,2.28590000000
-10,2036,heatpump,R2,2028,2.28590000000
-10,2037,heatpump,R2,2028,2.28590000000
-10,2038,heatpump,R2,2028,2.28590000000
-10,2039,heatpump,R2,2028,2.28590000000
-11,2034,heatpump,R2,2030,16.71570000000
-11,2035,heatpump,R2,2030,16.71570000000
-11,2036,heatpump,R2,2030,16.71570000000
-11,2037,heatpump,R2,2030,16.71570000000
-11,2038,heatpump,R2,2030,16.71570000000
-11,2039,heatpump,R2,2030,16.71570000000
-11,2040,heatpump,R2,2030,16.71570000000
-11,2041,heatpump,R2,2030,16.71570000000
-12,2034,heatpump,R2,2032,4.57170000000
-12,2035,heatpump,R2,2032,4.57170000000
-12,2036,heatpump,R2,2032,4.57170000000
-12,2037,heatpump,R2,2032,4.57170000000
-12,2038,heatpump,R2,2032,4.57170000000
-12,2039,heatpump,R2,2032,4.57170000000
-12,2040,heatpump,R2,2032,4.57170000000
-12,2041,heatpump,R2,2032,4.57170000000
-12,2042,heatpump,R2,2032,4.57170000000
-12,2043,heatpump,R2,2032,4.57170000000
-13,2036,heatpump,R2,2034,9.57170000000
-13,2037,heatpump,R2,2034,9.57170000000
-13,2038,heatpump,R2,2034,9.57170000000
-13,2039,heatpump,R2,2034,9.57170000000
-13,2040,heatpump,R2,2034,9.57170000000
-13,2041,heatpump,R2,2034,9.57170000000
-13,2042,heatpump,R2,2034,9.57170000000
-13,2043,heatpump,R2,2034,9.57170000000
-13,2044,heatpump,R2,2034,9.57170000000
-13,2045,heatpump,R2,2034,9.57170000000
+0,2034,gasboiler,R1,2024,2.39520000000
+0,2035,gasboiler,R1,2024,2.39520000000
+1,2034,gasboiler,R2,2024,2.39520000000
+1,2035,gasboiler,R2,2024,2.39520000000
+2,2034,heatpump,R1,2024,4.84480000000
+2,2035,heatpump,R1,2024,4.84480000000
+3,2034,heatpump,R1,2026,2.24000000000
+3,2035,heatpump,R1,2026,2.24000000000
+3,2036,heatpump,R1,2026,2.24000000000
+3,2037,heatpump,R1,2026,2.24000000000
+4,2034,heatpump,R1,2028,2.24000000000
+4,2035,heatpump,R1,2028,2.24000000000
+4,2036,heatpump,R1,2028,2.24000000000
+4,2037,heatpump,R1,2028,2.24000000000
+4,2038,heatpump,R1,2028,2.24000000000
+4,2039,heatpump,R1,2028,2.24000000000
+5,2034,heatpump,R1,2030,16.28000000000
+5,2035,heatpump,R1,2030,16.28000000000
+5,2036,heatpump,R1,2030,16.28000000000
+5,2037,heatpump,R1,2030,16.28000000000
+5,2038,heatpump,R1,2030,16.28000000000
+5,2039,heatpump,R1,2030,16.28000000000
+5,2040,heatpump,R1,2030,16.28000000000
+5,2041,heatpump,R1,2030,16.28000000000
+6,2034,heatpump,R1,2032,4.48000000000
+6,2035,heatpump,R1,2032,4.48000000000
+6,2036,heatpump,R1,2032,4.48000000000
+6,2037,heatpump,R1,2032,4.48000000000
+6,2038,heatpump,R1,2032,4.48000000000
+6,2039,heatpump,R1,2032,4.48000000000
+6,2040,heatpump,R1,2032,4.48000000000
+6,2041,heatpump,R1,2032,4.48000000000
+6,2042,heatpump,R1,2032,4.48000000000
+6,2043,heatpump,R1,2032,4.48000000000
+7,2036,heatpump,R1,2034,9.48000000000
+7,2037,heatpump,R1,2034,9.48000000000
+7,2038,heatpump,R1,2034,9.48000000000
+7,2039,heatpump,R1,2034,9.48000000000
+7,2040,heatpump,R1,2034,9.48000000000
+7,2041,heatpump,R1,2034,9.48000000000
+7,2042,heatpump,R1,2034,9.48000000000
+7,2043,heatpump,R1,2034,9.48000000000
+7,2044,heatpump,R1,2034,9.48000000000
+7,2045,heatpump,R1,2034,9.48000000000
+8,2034,heatpump,R2,2024,4.84480000000
+8,2035,heatpump,R2,2024,4.84480000000
+9,2034,heatpump,R2,2026,2.24000000000
+9,2035,heatpump,R2,2026,2.24000000000
+9,2036,heatpump,R2,2026,2.24000000000
+9,2037,heatpump,R2,2026,2.24000000000
+10,2034,heatpump,R2,2028,2.24000000000
+10,2035,heatpump,R2,2028,2.24000000000
+10,2036,heatpump,R2,2028,2.24000000000
+10,2037,heatpump,R2,2028,2.24000000000
+10,2038,heatpump,R2,2028,2.24000000000
+10,2039,heatpump,R2,2028,2.24000000000
+11,2034,heatpump,R2,2030,16.28000000000
+11,2035,heatpump,R2,2030,16.28000000000
+11,2036,heatpump,R2,2030,16.28000000000
+11,2037,heatpump,R2,2030,16.28000000000
+11,2038,heatpump,R2,2030,16.28000000000
+11,2039,heatpump,R2,2030,16.28000000000
+11,2040,heatpump,R2,2030,16.28000000000
+11,2041,heatpump,R2,2030,16.28000000000
+12,2034,heatpump,R2,2032,4.48000000000
+12,2035,heatpump,R2,2032,4.48000000000
+12,2036,heatpump,R2,2032,4.48000000000
+12,2037,heatpump,R2,2032,4.48000000000
+12,2038,heatpump,R2,2032,4.48000000000
+12,2039,heatpump,R2,2032,4.48000000000
+12,2040,heatpump,R2,2032,4.48000000000
+12,2041,heatpump,R2,2032,4.48000000000
+12,2042,heatpump,R2,2032,4.48000000000
+12,2043,heatpump,R2,2032,4.48000000000
+13,2036,heatpump,R2,2034,9.48000000000
+13,2037,heatpump,R2,2034,9.48000000000
+13,2038,heatpump,R2,2034,9.48000000000
+13,2039,heatpump,R2,2034,9.48000000000
+13,2040,heatpump,R2,2034,9.48000000000
+13,2041,heatpump,R2,2034,9.48000000000
+13,2042,heatpump,R2,2034,9.48000000000
+13,2043,heatpump,R2,2034,9.48000000000
+13,2044,heatpump,R2,2034,9.48000000000
+13,2045,heatpump,R2,2034,9.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..fa9e8bca
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2040,gasboiler,R1,2035,0.91000000000
+1,2044,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R1,2035,0.91000000000
+1,2049,gasboiler,R1,2035,0.91000000000
+2,2035,gasboiler,R2,2025,4.10000000000
+2,2039,gasboiler,R2,2025,4.10000000000
+3,2040,gasboiler,R2,2035,0.91000000000
+3,2044,gasboiler,R2,2035,0.91000000000
+3,2045,gasboiler,R2,2035,0.91000000000
+3,2049,gasboiler,R2,2035,0.91000000000
+4,2035,heatpump,R1,2025,6.90000000000
+4,2039,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2030,25.00000000000
+5,2039,heatpump,R1,2030,25.00000000000
+5,2040,heatpump,R1,2030,25.00000000000
+5,2044,heatpump,R1,2030,25.00000000000
+6,2040,heatpump,R1,2035,16.09000000000
+6,2044,heatpump,R1,2035,16.09000000000
+6,2045,heatpump,R1,2035,16.09000000000
+6,2049,heatpump,R1,2035,16.09000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
+8,2035,heatpump,R2,2030,25.00000000000
+8,2039,heatpump,R2,2030,25.00000000000
+8,2040,heatpump,R2,2030,25.00000000000
+8,2044,heatpump,R2,2030,25.00000000000
+9,2040,heatpump,R2,2035,16.09000000000
+9,2044,heatpump,R2,2035,16.09000000000
+9,2045,heatpump,R2,2035,16.09000000000
+9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
index a5d05756..81417240 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
@@ -1,81 +1,81 @@
 asset,year,technology,region,installed,capacity
-0,2036,heatpump,R1,2026,2.28590000000
-0,2037,heatpump,R1,2026,2.28590000000
-1,2036,heatpump,R1,2028,2.28590000000
-1,2037,heatpump,R1,2028,2.28590000000
-1,2038,heatpump,R1,2028,2.28590000000
-1,2039,heatpump,R1,2028,2.28590000000
-2,2036,heatpump,R1,2030,16.71570000000
-2,2037,heatpump,R1,2030,16.71570000000
-2,2038,heatpump,R1,2030,16.71570000000
-2,2039,heatpump,R1,2030,16.71570000000
-2,2040,heatpump,R1,2030,16.71570000000
-2,2041,heatpump,R1,2030,16.71570000000
-3,2036,heatpump,R1,2032,4.57170000000
-3,2037,heatpump,R1,2032,4.57170000000
-3,2038,heatpump,R1,2032,4.57170000000
-3,2039,heatpump,R1,2032,4.57170000000
-3,2040,heatpump,R1,2032,4.57170000000
-3,2041,heatpump,R1,2032,4.57170000000
-3,2042,heatpump,R1,2032,4.57170000000
-3,2043,heatpump,R1,2032,4.57170000000
-4,2036,heatpump,R1,2034,9.57170000000
-4,2037,heatpump,R1,2034,9.57170000000
-4,2038,heatpump,R1,2034,9.57170000000
-4,2039,heatpump,R1,2034,9.57170000000
-4,2040,heatpump,R1,2034,9.57170000000
-4,2041,heatpump,R1,2034,9.57170000000
-4,2042,heatpump,R1,2034,9.57170000000
-4,2043,heatpump,R1,2034,9.57170000000
-4,2044,heatpump,R1,2034,9.57170000000
-4,2045,heatpump,R1,2034,9.57170000000
-5,2038,heatpump,R1,2036,4.57170000000
-5,2039,heatpump,R1,2036,4.57170000000
-5,2040,heatpump,R1,2036,4.57170000000
-5,2041,heatpump,R1,2036,4.57170000000
-5,2042,heatpump,R1,2036,4.57170000000
-5,2043,heatpump,R1,2036,4.57170000000
-5,2044,heatpump,R1,2036,4.57170000000
-5,2045,heatpump,R1,2036,4.57170000000
-5,2046,heatpump,R1,2036,4.57170000000
-5,2047,heatpump,R1,2036,4.57170000000
-6,2036,heatpump,R2,2026,2.28590000000
-6,2037,heatpump,R2,2026,2.28590000000
-7,2036,heatpump,R2,2028,2.28590000000
-7,2037,heatpump,R2,2028,2.28590000000
-7,2038,heatpump,R2,2028,2.28590000000
-7,2039,heatpump,R2,2028,2.28590000000
-8,2036,heatpump,R2,2030,16.71570000000
-8,2037,heatpump,R2,2030,16.71570000000
-8,2038,heatpump,R2,2030,16.71570000000
-8,2039,heatpump,R2,2030,16.71570000000
-8,2040,heatpump,R2,2030,16.71570000000
-8,2041,heatpump,R2,2030,16.71570000000
-9,2036,heatpump,R2,2032,4.57170000000
-9,2037,heatpump,R2,2032,4.57170000000
-9,2038,heatpump,R2,2032,4.57170000000
-9,2039,heatpump,R2,2032,4.57170000000
-9,2040,heatpump,R2,2032,4.57170000000
-9,2041,heatpump,R2,2032,4.57170000000
-9,2042,heatpump,R2,2032,4.57170000000
-9,2043,heatpump,R2,2032,4.57170000000
-10,2036,heatpump,R2,2034,9.57170000000
-10,2037,heatpump,R2,2034,9.57170000000
-10,2038,heatpump,R2,2034,9.57170000000
-10,2039,heatpump,R2,2034,9.57170000000
-10,2040,heatpump,R2,2034,9.57170000000
-10,2041,heatpump,R2,2034,9.57170000000
-10,2042,heatpump,R2,2034,9.57170000000
-10,2043,heatpump,R2,2034,9.57170000000
-10,2044,heatpump,R2,2034,9.57170000000
-10,2045,heatpump,R2,2034,9.57170000000
-11,2038,heatpump,R2,2036,4.57170000000
-11,2039,heatpump,R2,2036,4.57170000000
-11,2040,heatpump,R2,2036,4.57170000000
-11,2041,heatpump,R2,2036,4.57170000000
-11,2042,heatpump,R2,2036,4.57170000000
-11,2043,heatpump,R2,2036,4.57170000000
-11,2044,heatpump,R2,2036,4.57170000000
-11,2045,heatpump,R2,2036,4.57170000000
-11,2046,heatpump,R2,2036,4.57170000000
-11,2047,heatpump,R2,2036,4.57170000000
+0,2036,heatpump,R1,2026,2.24000000000
+0,2037,heatpump,R1,2026,2.24000000000
+1,2036,heatpump,R1,2028,2.24000000000
+1,2037,heatpump,R1,2028,2.24000000000
+1,2038,heatpump,R1,2028,2.24000000000
+1,2039,heatpump,R1,2028,2.24000000000
+2,2036,heatpump,R1,2030,16.28000000000
+2,2037,heatpump,R1,2030,16.28000000000
+2,2038,heatpump,R1,2030,16.28000000000
+2,2039,heatpump,R1,2030,16.28000000000
+2,2040,heatpump,R1,2030,16.28000000000
+2,2041,heatpump,R1,2030,16.28000000000
+3,2036,heatpump,R1,2032,4.48000000000
+3,2037,heatpump,R1,2032,4.48000000000
+3,2038,heatpump,R1,2032,4.48000000000
+3,2039,heatpump,R1,2032,4.48000000000
+3,2040,heatpump,R1,2032,4.48000000000
+3,2041,heatpump,R1,2032,4.48000000000
+3,2042,heatpump,R1,2032,4.48000000000
+3,2043,heatpump,R1,2032,4.48000000000
+4,2036,heatpump,R1,2034,9.48000000000
+4,2037,heatpump,R1,2034,9.48000000000
+4,2038,heatpump,R1,2034,9.48000000000
+4,2039,heatpump,R1,2034,9.48000000000
+4,2040,heatpump,R1,2034,9.48000000000
+4,2041,heatpump,R1,2034,9.48000000000
+4,2042,heatpump,R1,2034,9.48000000000
+4,2043,heatpump,R1,2034,9.48000000000
+4,2044,heatpump,R1,2034,9.48000000000
+4,2045,heatpump,R1,2034,9.48000000000
+5,2038,heatpump,R1,2036,4.48000000000
+5,2039,heatpump,R1,2036,4.48000000000
+5,2040,heatpump,R1,2036,4.48000000000
+5,2041,heatpump,R1,2036,4.48000000000
+5,2042,heatpump,R1,2036,4.48000000000
+5,2043,heatpump,R1,2036,4.48000000000
+5,2044,heatpump,R1,2036,4.48000000000
+5,2045,heatpump,R1,2036,4.48000000000
+5,2046,heatpump,R1,2036,4.48000000000
+5,2047,heatpump,R1,2036,4.48000000000
+6,2036,heatpump,R2,2026,2.24000000000
+6,2037,heatpump,R2,2026,2.24000000000
+7,2036,heatpump,R2,2028,2.24000000000
+7,2037,heatpump,R2,2028,2.24000000000
+7,2038,heatpump,R2,2028,2.24000000000
+7,2039,heatpump,R2,2028,2.24000000000
+8,2036,heatpump,R2,2030,16.28000000000
+8,2037,heatpump,R2,2030,16.28000000000
+8,2038,heatpump,R2,2030,16.28000000000
+8,2039,heatpump,R2,2030,16.28000000000
+8,2040,heatpump,R2,2030,16.28000000000
+8,2041,heatpump,R2,2030,16.28000000000
+9,2036,heatpump,R2,2032,4.48000000000
+9,2037,heatpump,R2,2032,4.48000000000
+9,2038,heatpump,R2,2032,4.48000000000
+9,2039,heatpump,R2,2032,4.48000000000
+9,2040,heatpump,R2,2032,4.48000000000
+9,2041,heatpump,R2,2032,4.48000000000
+9,2042,heatpump,R2,2032,4.48000000000
+9,2043,heatpump,R2,2032,4.48000000000
+10,2036,heatpump,R2,2034,9.48000000000
+10,2037,heatpump,R2,2034,9.48000000000
+10,2038,heatpump,R2,2034,9.48000000000
+10,2039,heatpump,R2,2034,9.48000000000
+10,2040,heatpump,R2,2034,9.48000000000
+10,2041,heatpump,R2,2034,9.48000000000
+10,2042,heatpump,R2,2034,9.48000000000
+10,2043,heatpump,R2,2034,9.48000000000
+10,2044,heatpump,R2,2034,9.48000000000
+10,2045,heatpump,R2,2034,9.48000000000
+11,2038,heatpump,R2,2036,4.48000000000
+11,2039,heatpump,R2,2036,4.48000000000
+11,2040,heatpump,R2,2036,4.48000000000
+11,2041,heatpump,R2,2036,4.48000000000
+11,2042,heatpump,R2,2036,4.48000000000
+11,2043,heatpump,R2,2036,4.48000000000
+11,2044,heatpump,R2,2036,4.48000000000
+11,2045,heatpump,R2,2036,4.48000000000
+11,2046,heatpump,R2,2036,4.48000000000
+11,2047,heatpump,R2,2036,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
index 430766a0..39a4f21d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
@@ -1,81 +1,81 @@
 asset,year,technology,region,installed,capacity
-0,2038,heatpump,R1,2028,2.28590000000
-0,2039,heatpump,R1,2028,2.28590000000
-1,2038,heatpump,R1,2030,16.71570000000
-1,2039,heatpump,R1,2030,16.71570000000
-1,2040,heatpump,R1,2030,16.71570000000
-1,2041,heatpump,R1,2030,16.71570000000
-2,2038,heatpump,R1,2032,4.57170000000
-2,2039,heatpump,R1,2032,4.57170000000
-2,2040,heatpump,R1,2032,4.57170000000
-2,2041,heatpump,R1,2032,4.57170000000
-2,2042,heatpump,R1,2032,4.57170000000
-2,2043,heatpump,R1,2032,4.57170000000
-3,2038,heatpump,R1,2034,9.57170000000
-3,2039,heatpump,R1,2034,9.57170000000
-3,2040,heatpump,R1,2034,9.57170000000
-3,2041,heatpump,R1,2034,9.57170000000
-3,2042,heatpump,R1,2034,9.57170000000
-3,2043,heatpump,R1,2034,9.57170000000
-3,2044,heatpump,R1,2034,9.57170000000
-3,2045,heatpump,R1,2034,9.57170000000
-4,2038,heatpump,R1,2036,4.57170000000
-4,2039,heatpump,R1,2036,4.57170000000
-4,2040,heatpump,R1,2036,4.57170000000
-4,2041,heatpump,R1,2036,4.57170000000
-4,2042,heatpump,R1,2036,4.57170000000
-4,2043,heatpump,R1,2036,4.57170000000
-4,2044,heatpump,R1,2036,4.57170000000
-4,2045,heatpump,R1,2036,4.57170000000
-4,2046,heatpump,R1,2036,4.57170000000
-4,2047,heatpump,R1,2036,4.57170000000
-5,2040,heatpump,R1,2038,4.57170000000
-5,2041,heatpump,R1,2038,4.57170000000
-5,2042,heatpump,R1,2038,4.57170000000
-5,2043,heatpump,R1,2038,4.57170000000
-5,2044,heatpump,R1,2038,4.57170000000
-5,2045,heatpump,R1,2038,4.57170000000
-5,2046,heatpump,R1,2038,4.57170000000
-5,2047,heatpump,R1,2038,4.57170000000
-5,2048,heatpump,R1,2038,4.57170000000
-5,2049,heatpump,R1,2038,4.57170000000
-6,2038,heatpump,R2,2028,2.28590000000
-6,2039,heatpump,R2,2028,2.28590000000
-7,2038,heatpump,R2,2030,16.71570000000
-7,2039,heatpump,R2,2030,16.71570000000
-7,2040,heatpump,R2,2030,16.71570000000
-7,2041,heatpump,R2,2030,16.71570000000
-8,2038,heatpump,R2,2032,4.57170000000
-8,2039,heatpump,R2,2032,4.57170000000
-8,2040,heatpump,R2,2032,4.57170000000
-8,2041,heatpump,R2,2032,4.57170000000
-8,2042,heatpump,R2,2032,4.57170000000
-8,2043,heatpump,R2,2032,4.57170000000
-9,2038,heatpump,R2,2034,9.57170000000
-9,2039,heatpump,R2,2034,9.57170000000
-9,2040,heatpump,R2,2034,9.57170000000
-9,2041,heatpump,R2,2034,9.57170000000
-9,2042,heatpump,R2,2034,9.57170000000
-9,2043,heatpump,R2,2034,9.57170000000
-9,2044,heatpump,R2,2034,9.57170000000
-9,2045,heatpump,R2,2034,9.57170000000
-10,2038,heatpump,R2,2036,4.57170000000
-10,2039,heatpump,R2,2036,4.57170000000
-10,2040,heatpump,R2,2036,4.57170000000
-10,2041,heatpump,R2,2036,4.57170000000
-10,2042,heatpump,R2,2036,4.57170000000
-10,2043,heatpump,R2,2036,4.57170000000
-10,2044,heatpump,R2,2036,4.57170000000
-10,2045,heatpump,R2,2036,4.57170000000
-10,2046,heatpump,R2,2036,4.57170000000
-10,2047,heatpump,R2,2036,4.57170000000
-11,2040,heatpump,R2,2038,4.57170000000
-11,2041,heatpump,R2,2038,4.57170000000
-11,2042,heatpump,R2,2038,4.57170000000
-11,2043,heatpump,R2,2038,4.57170000000
-11,2044,heatpump,R2,2038,4.57170000000
-11,2045,heatpump,R2,2038,4.57170000000
-11,2046,heatpump,R2,2038,4.57170000000
-11,2047,heatpump,R2,2038,4.57170000000
-11,2048,heatpump,R2,2038,4.57170000000
-11,2049,heatpump,R2,2038,4.57170000000
+0,2038,heatpump,R1,2028,2.24000000000
+0,2039,heatpump,R1,2028,2.24000000000
+1,2038,heatpump,R1,2030,16.28000000000
+1,2039,heatpump,R1,2030,16.28000000000
+1,2040,heatpump,R1,2030,16.28000000000
+1,2041,heatpump,R1,2030,16.28000000000
+2,2038,heatpump,R1,2032,4.48000000000
+2,2039,heatpump,R1,2032,4.48000000000
+2,2040,heatpump,R1,2032,4.48000000000
+2,2041,heatpump,R1,2032,4.48000000000
+2,2042,heatpump,R1,2032,4.48000000000
+2,2043,heatpump,R1,2032,4.48000000000
+3,2038,heatpump,R1,2034,9.48000000000
+3,2039,heatpump,R1,2034,9.48000000000
+3,2040,heatpump,R1,2034,9.48000000000
+3,2041,heatpump,R1,2034,9.48000000000
+3,2042,heatpump,R1,2034,9.48000000000
+3,2043,heatpump,R1,2034,9.48000000000
+3,2044,heatpump,R1,2034,9.48000000000
+3,2045,heatpump,R1,2034,9.48000000000
+4,2038,heatpump,R1,2036,4.48000000000
+4,2039,heatpump,R1,2036,4.48000000000
+4,2040,heatpump,R1,2036,4.48000000000
+4,2041,heatpump,R1,2036,4.48000000000
+4,2042,heatpump,R1,2036,4.48000000000
+4,2043,heatpump,R1,2036,4.48000000000
+4,2044,heatpump,R1,2036,4.48000000000
+4,2045,heatpump,R1,2036,4.48000000000
+4,2046,heatpump,R1,2036,4.48000000000
+4,2047,heatpump,R1,2036,4.48000000000
+5,2040,heatpump,R1,2038,4.48000000000
+5,2041,heatpump,R1,2038,4.48000000000
+5,2042,heatpump,R1,2038,4.48000000000
+5,2043,heatpump,R1,2038,4.48000000000
+5,2044,heatpump,R1,2038,4.48000000000
+5,2045,heatpump,R1,2038,4.48000000000
+5,2046,heatpump,R1,2038,4.48000000000
+5,2047,heatpump,R1,2038,4.48000000000
+5,2048,heatpump,R1,2038,4.48000000000
+5,2049,heatpump,R1,2038,4.48000000000
+6,2038,heatpump,R2,2028,2.24000000000
+6,2039,heatpump,R2,2028,2.24000000000
+7,2038,heatpump,R2,2030,16.28000000000
+7,2039,heatpump,R2,2030,16.28000000000
+7,2040,heatpump,R2,2030,16.28000000000
+7,2041,heatpump,R2,2030,16.28000000000
+8,2038,heatpump,R2,2032,4.48000000000
+8,2039,heatpump,R2,2032,4.48000000000
+8,2040,heatpump,R2,2032,4.48000000000
+8,2041,heatpump,R2,2032,4.48000000000
+8,2042,heatpump,R2,2032,4.48000000000
+8,2043,heatpump,R2,2032,4.48000000000
+9,2038,heatpump,R2,2034,9.48000000000
+9,2039,heatpump,R2,2034,9.48000000000
+9,2040,heatpump,R2,2034,9.48000000000
+9,2041,heatpump,R2,2034,9.48000000000
+9,2042,heatpump,R2,2034,9.48000000000
+9,2043,heatpump,R2,2034,9.48000000000
+9,2044,heatpump,R2,2034,9.48000000000
+9,2045,heatpump,R2,2034,9.48000000000
+10,2038,heatpump,R2,2036,4.48000000000
+10,2039,heatpump,R2,2036,4.48000000000
+10,2040,heatpump,R2,2036,4.48000000000
+10,2041,heatpump,R2,2036,4.48000000000
+10,2042,heatpump,R2,2036,4.48000000000
+10,2043,heatpump,R2,2036,4.48000000000
+10,2044,heatpump,R2,2036,4.48000000000
+10,2045,heatpump,R2,2036,4.48000000000
+10,2046,heatpump,R2,2036,4.48000000000
+10,2047,heatpump,R2,2036,4.48000000000
+11,2040,heatpump,R2,2038,4.48000000000
+11,2041,heatpump,R2,2038,4.48000000000
+11,2042,heatpump,R2,2038,4.48000000000
+11,2043,heatpump,R2,2038,4.48000000000
+11,2044,heatpump,R2,2038,4.48000000000
+11,2045,heatpump,R2,2038,4.48000000000
+11,2046,heatpump,R2,2038,4.48000000000
+11,2047,heatpump,R2,2038,4.48000000000
+11,2048,heatpump,R2,2038,4.48000000000
+11,2049,heatpump,R2,2038,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
index 71bf41cf..a0b1670c 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
@@ -1,81 +1,81 @@
 asset,year,technology,region,installed,capacity
-0,2040,heatpump,R1,2030,16.71570000000
-0,2041,heatpump,R1,2030,16.71570000000
-1,2040,heatpump,R1,2032,4.57170000000
-1,2041,heatpump,R1,2032,4.57170000000
-1,2042,heatpump,R1,2032,4.57170000000
-1,2043,heatpump,R1,2032,4.57170000000
-2,2040,heatpump,R1,2034,9.57170000000
-2,2041,heatpump,R1,2034,9.57170000000
-2,2042,heatpump,R1,2034,9.57170000000
-2,2043,heatpump,R1,2034,9.57170000000
-2,2044,heatpump,R1,2034,9.57170000000
-2,2045,heatpump,R1,2034,9.57170000000
-3,2040,heatpump,R1,2036,4.57170000000
-3,2041,heatpump,R1,2036,4.57170000000
-3,2042,heatpump,R1,2036,4.57170000000
-3,2043,heatpump,R1,2036,4.57170000000
-3,2044,heatpump,R1,2036,4.57170000000
-3,2045,heatpump,R1,2036,4.57170000000
-3,2046,heatpump,R1,2036,4.57170000000
-3,2047,heatpump,R1,2036,4.57170000000
-4,2040,heatpump,R1,2038,4.57170000000
-4,2041,heatpump,R1,2038,4.57170000000
-4,2042,heatpump,R1,2038,4.57170000000
-4,2043,heatpump,R1,2038,4.57170000000
-4,2044,heatpump,R1,2038,4.57170000000
-4,2045,heatpump,R1,2038,4.57170000000
-4,2046,heatpump,R1,2038,4.57170000000
-4,2047,heatpump,R1,2038,4.57170000000
-4,2048,heatpump,R1,2038,4.57170000000
-4,2049,heatpump,R1,2038,4.57170000000
-5,2042,heatpump,R1,2040,19.00160000000
-5,2043,heatpump,R1,2040,19.00160000000
-5,2044,heatpump,R1,2040,19.00160000000
-5,2045,heatpump,R1,2040,19.00160000000
-5,2046,heatpump,R1,2040,19.00160000000
-5,2047,heatpump,R1,2040,19.00160000000
-5,2048,heatpump,R1,2040,19.00160000000
-5,2049,heatpump,R1,2040,19.00160000000
-5,2050,heatpump,R1,2040,19.00160000000
-5,2051,heatpump,R1,2040,19.00160000000
-6,2040,heatpump,R2,2030,16.71570000000
-6,2041,heatpump,R2,2030,16.71570000000
-7,2040,heatpump,R2,2032,4.57170000000
-7,2041,heatpump,R2,2032,4.57170000000
-7,2042,heatpump,R2,2032,4.57170000000
-7,2043,heatpump,R2,2032,4.57170000000
-8,2040,heatpump,R2,2034,9.57170000000
-8,2041,heatpump,R2,2034,9.57170000000
-8,2042,heatpump,R2,2034,9.57170000000
-8,2043,heatpump,R2,2034,9.57170000000
-8,2044,heatpump,R2,2034,9.57170000000
-8,2045,heatpump,R2,2034,9.57170000000
-9,2040,heatpump,R2,2036,4.57170000000
-9,2041,heatpump,R2,2036,4.57170000000
-9,2042,heatpump,R2,2036,4.57170000000
-9,2043,heatpump,R2,2036,4.57170000000
-9,2044,heatpump,R2,2036,4.57170000000
-9,2045,heatpump,R2,2036,4.57170000000
-9,2046,heatpump,R2,2036,4.57170000000
-9,2047,heatpump,R2,2036,4.57170000000
-10,2040,heatpump,R2,2038,4.57170000000
-10,2041,heatpump,R2,2038,4.57170000000
-10,2042,heatpump,R2,2038,4.57170000000
-10,2043,heatpump,R2,2038,4.57170000000
-10,2044,heatpump,R2,2038,4.57170000000
-10,2045,heatpump,R2,2038,4.57170000000
-10,2046,heatpump,R2,2038,4.57170000000
-10,2047,heatpump,R2,2038,4.57170000000
-10,2048,heatpump,R2,2038,4.57170000000
-10,2049,heatpump,R2,2038,4.57170000000
-11,2042,heatpump,R2,2040,19.00160000000
-11,2043,heatpump,R2,2040,19.00160000000
-11,2044,heatpump,R2,2040,19.00160000000
-11,2045,heatpump,R2,2040,19.00160000000
-11,2046,heatpump,R2,2040,19.00160000000
-11,2047,heatpump,R2,2040,19.00160000000
-11,2048,heatpump,R2,2040,19.00160000000
-11,2049,heatpump,R2,2040,19.00160000000
-11,2050,heatpump,R2,2040,19.00160000000
-11,2051,heatpump,R2,2040,19.00160000000
+0,2040,heatpump,R1,2030,16.28000000000
+0,2041,heatpump,R1,2030,16.28000000000
+1,2040,heatpump,R1,2032,4.48000000000
+1,2041,heatpump,R1,2032,4.48000000000
+1,2042,heatpump,R1,2032,4.48000000000
+1,2043,heatpump,R1,2032,4.48000000000
+2,2040,heatpump,R1,2034,9.48000000000
+2,2041,heatpump,R1,2034,9.48000000000
+2,2042,heatpump,R1,2034,9.48000000000
+2,2043,heatpump,R1,2034,9.48000000000
+2,2044,heatpump,R1,2034,9.48000000000
+2,2045,heatpump,R1,2034,9.48000000000
+3,2040,heatpump,R1,2036,4.48000000000
+3,2041,heatpump,R1,2036,4.48000000000
+3,2042,heatpump,R1,2036,4.48000000000
+3,2043,heatpump,R1,2036,4.48000000000
+3,2044,heatpump,R1,2036,4.48000000000
+3,2045,heatpump,R1,2036,4.48000000000
+3,2046,heatpump,R1,2036,4.48000000000
+3,2047,heatpump,R1,2036,4.48000000000
+4,2040,heatpump,R1,2038,4.48000000000
+4,2041,heatpump,R1,2038,4.48000000000
+4,2042,heatpump,R1,2038,4.48000000000
+4,2043,heatpump,R1,2038,4.48000000000
+4,2044,heatpump,R1,2038,4.48000000000
+4,2045,heatpump,R1,2038,4.48000000000
+4,2046,heatpump,R1,2038,4.48000000000
+4,2047,heatpump,R1,2038,4.48000000000
+4,2048,heatpump,R1,2038,4.48000000000
+4,2049,heatpump,R1,2038,4.48000000000
+5,2042,heatpump,R1,2040,18.52000000000
+5,2043,heatpump,R1,2040,18.52000000000
+5,2044,heatpump,R1,2040,18.52000000000
+5,2045,heatpump,R1,2040,18.52000000000
+5,2046,heatpump,R1,2040,18.52000000000
+5,2047,heatpump,R1,2040,18.52000000000
+5,2048,heatpump,R1,2040,18.52000000000
+5,2049,heatpump,R1,2040,18.52000000000
+5,2050,heatpump,R1,2040,18.52000000000
+5,2051,heatpump,R1,2040,18.52000000000
+6,2040,heatpump,R2,2030,16.28000000000
+6,2041,heatpump,R2,2030,16.28000000000
+7,2040,heatpump,R2,2032,4.48000000000
+7,2041,heatpump,R2,2032,4.48000000000
+7,2042,heatpump,R2,2032,4.48000000000
+7,2043,heatpump,R2,2032,4.48000000000
+8,2040,heatpump,R2,2034,9.48000000000
+8,2041,heatpump,R2,2034,9.48000000000
+8,2042,heatpump,R2,2034,9.48000000000
+8,2043,heatpump,R2,2034,9.48000000000
+8,2044,heatpump,R2,2034,9.48000000000
+8,2045,heatpump,R2,2034,9.48000000000
+9,2040,heatpump,R2,2036,4.48000000000
+9,2041,heatpump,R2,2036,4.48000000000
+9,2042,heatpump,R2,2036,4.48000000000
+9,2043,heatpump,R2,2036,4.48000000000
+9,2044,heatpump,R2,2036,4.48000000000
+9,2045,heatpump,R2,2036,4.48000000000
+9,2046,heatpump,R2,2036,4.48000000000
+9,2047,heatpump,R2,2036,4.48000000000
+10,2040,heatpump,R2,2038,4.48000000000
+10,2041,heatpump,R2,2038,4.48000000000
+10,2042,heatpump,R2,2038,4.48000000000
+10,2043,heatpump,R2,2038,4.48000000000
+10,2044,heatpump,R2,2038,4.48000000000
+10,2045,heatpump,R2,2038,4.48000000000
+10,2046,heatpump,R2,2038,4.48000000000
+10,2047,heatpump,R2,2038,4.48000000000
+10,2048,heatpump,R2,2038,4.48000000000
+10,2049,heatpump,R2,2038,4.48000000000
+11,2042,heatpump,R2,2040,18.52000000000
+11,2043,heatpump,R2,2040,18.52000000000
+11,2044,heatpump,R2,2040,18.52000000000
+11,2045,heatpump,R2,2040,18.52000000000
+11,2046,heatpump,R2,2040,18.52000000000
+11,2047,heatpump,R2,2040,18.52000000000
+11,2048,heatpump,R2,2040,18.52000000000
+11,2049,heatpump,R2,2040,18.52000000000
+11,2050,heatpump,R2,2040,18.52000000000
+11,2051,heatpump,R2,2040,18.52000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..0b5fe3de
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2045,heatpump,R1,2035,16.09000000000
+2,2049,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2040,31.00000000000
+3,2049,heatpump,R1,2040,31.00000000000
+3,2050,heatpump,R1,2040,31.00000000000
+3,2054,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2045,23.00000000000
+4,2054,heatpump,R1,2045,23.00000000000
+4,2055,heatpump,R1,2045,23.00000000000
+4,2059,heatpump,R1,2045,23.00000000000
+5,2045,heatpump,R2,2035,16.09000000000
+5,2049,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2040,31.00000000000
+6,2049,heatpump,R2,2040,31.00000000000
+6,2050,heatpump,R2,2040,31.00000000000
+6,2054,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2045,23.00000000000
+7,2054,heatpump,R2,2045,23.00000000000
+7,2055,heatpump,R2,2045,23.00000000000
+7,2059,heatpump,R2,2045,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..eb21c442
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
@@ -0,0 +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
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 7a199736..d5a5dcb6 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
+0,heat,R1,2020,0,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R1,2020,1,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R1,2022,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2022,1,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2022,2,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2022,3,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2020,0,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R2,2020,1,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R2,2022,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2022,1,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2022,2,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2022,3,heatpump,2020,all-year,all-week,night,0.29250000000
+0,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,night,6.74060000000
+1,heat,R1,2020,0,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R1,2020,1,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R1,2022,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2022,1,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2022,2,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2022,3,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2020,0,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R2,2020,1,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R2,2022,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2022,1,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2022,2,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2022,3,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,morning,9.62950000000
+2,heat,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R1,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2022,2,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2022,3,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R2,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2022,2,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2022,3,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+3,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R1,2022,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2022,1,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2022,2,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2022,3,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R2,2022,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2022,1,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2022,2,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2022,3,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+4,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
+4,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
 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,R1,2022,2,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2022,3,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
+4,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
 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,heat,R2,2022,2,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2022,3,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
+4,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
 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,2020,0,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
+4,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
 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
+5,heat,R1,2020,0,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R1,2020,1,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R1,2022,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2022,1,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2022,2,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2022,3,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2020,0,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R2,2020,1,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R2,2022,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2022,1,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2022,2,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2022,3,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,evening,13.48120000000
+6,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R1,2022,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2022,1,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2022,2,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2022,3,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R2,2022,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2022,1,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2022,2,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2022,3,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+7,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R1,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2022,2,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2022,3,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R2,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2022,2,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2022,3,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
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 6f689597..fa50a492 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,136 +1,136 @@
 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
+0,heat,R1,2022,0,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R1,2022,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2022,3,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R1,2022,4,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,0,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R1,2024,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2024,3,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R1,2024,4,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,5,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2022,0,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R2,2022,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2022,3,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R2,2022,4,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,0,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R2,2024,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2024,3,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R2,2024,4,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,5,2022,heatpump,all-year,all-week,night,0.04670000000
+0,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+1,heat,R1,2022,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R1,2022,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2022,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R1,2022,4,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R1,2024,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2024,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R1,2024,4,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,5,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2022,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R2,2022,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2022,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R2,2022,4,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R2,2024,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2024,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R2,2024,4,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,5,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+2,heat,R1,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2022,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2022,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2024,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2024,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,5,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2022,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2022,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2024,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2024,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,5,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+3,heat,R1,2022,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2022,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2022,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2022,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2024,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2024,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2024,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,5,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2022,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2022,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2022,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2022,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2024,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2024,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2024,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,5,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
 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,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
 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,2022,4,2020,heatpump,all-year,all-week,late-peak,0.87750000000
 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,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
 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,R1,2024,4,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,5,2022,heatpump,all-year,all-week,late-peak,0.14000000000
 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,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
 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,2022,4,2020,heatpump,all-year,all-week,late-peak,0.87750000000
 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,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
 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,heat,R2,2024,4,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,5,2022,heatpump,all-year,all-week,late-peak,0.14000000000
 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
@@ -139,87 +139,87 @@ timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
 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
+5,heat,R1,2022,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R1,2022,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2022,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R1,2022,4,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R1,2024,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2024,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R1,2024,4,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,5,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2022,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R2,2022,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2022,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R2,2022,4,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R2,2024,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2024,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R2,2024,4,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,5,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+6,heat,R1,2022,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2022,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2022,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2022,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2024,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2024,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2024,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,5,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2022,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2022,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2022,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2022,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2024,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2024,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2024,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,5,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+7,heat,R1,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2022,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2022,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2024,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2024,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,5,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2022,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2022,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2024,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2024,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,5,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
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 5b8d3bd3..fce4b977 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
+0,heat,R1,2024,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2024,2,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2024,4,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,5,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2024,7,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,8,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2026,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2026,3,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2026,4,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,5,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2026,6,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2026,7,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,8,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2026,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2024,0,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2024,2,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2024,4,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,5,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2024,7,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,8,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2026,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2026,3,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2026,4,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,5,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2026,6,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2026,7,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,8,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2026,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,night,3.22900000000
+1,heat,R1,2024,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2024,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2024,4,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,5,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2024,7,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,8,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2026,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2026,3,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2026,4,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,5,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2026,6,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2026,7,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,8,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2026,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2024,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2024,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2024,4,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,5,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2024,7,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,8,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2026,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2026,3,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2026,4,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,5,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2026,6,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2026,7,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,8,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2026,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,morning,4.61290000000
+2,heat,R1,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2024,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2024,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2026,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2026,6,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2026,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2026,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2024,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2024,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2026,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2026,6,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2026,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2026,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+3,heat,R1,2024,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2024,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2024,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2024,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2026,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2026,3,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2026,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2026,6,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2026,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2026,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2024,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2024,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2024,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2024,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2026,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2026,3,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2026,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2026,6,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2026,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2026,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
 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,R1,2024,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2024,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2026,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2026,3,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2026,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2026,6,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2026,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2026,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
 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,heat,R2,2024,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2024,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2026,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2026,3,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2026,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2026,6,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2026,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2026,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
 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,R1,2026,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
 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
+4,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+5,heat,R1,2024,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2024,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2024,4,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,5,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2024,7,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,8,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2026,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2026,3,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2026,4,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,5,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2026,6,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2026,7,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,8,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2026,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2024,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2024,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2024,4,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,5,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2024,7,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,8,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2026,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2026,3,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2026,4,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,5,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2026,6,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2026,7,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,8,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2026,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,evening,6.45810000000
+6,heat,R1,2024,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2024,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2024,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2024,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2026,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2026,3,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2026,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2026,6,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2026,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2026,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2024,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2024,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2024,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2024,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2026,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2026,3,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2026,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2026,6,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2026,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2026,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+7,heat,R1,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2024,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2024,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2026,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2026,6,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2026,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2026,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2024,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2024,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2026,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2026,6,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2026,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2026,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..eb9ddd9d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
@@ -0,0 +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
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 ee0bdf3d..832a2f4f 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
+0,heat,R1,2026,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2026,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2026,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2026,7,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,8,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2026,9,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2026,10,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,7,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2028,8,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,9,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2028,10,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2028,11,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2026,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2026,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2026,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2026,7,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,8,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2026,9,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2026,10,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,7,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2028,8,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,9,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2028,10,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2028,11,2026,heatpump,all-year,all-week,night,0.04670000000
+0,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,night,3.22900000000
+1,heat,R1,2026,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2026,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2026,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2026,7,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,8,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2026,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2026,10,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,7,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2028,8,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2028,10,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2028,11,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2026,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2026,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2026,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2026,7,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,8,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2026,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2026,10,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,7,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2028,8,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2028,10,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2028,11,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
+2,heat,R1,2026,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2026,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2026,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2026,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2028,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2028,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2028,11,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2026,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2026,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2026,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2026,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2028,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2028,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2028,11,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+3,heat,R1,2026,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2026,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2026,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2026,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2026,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2026,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2028,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2028,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2028,11,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2026,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2026,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2026,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2026,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2026,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2026,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2028,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2028,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2028,11,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+4,heat,R1,2026,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2026,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2026,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2026,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2026,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2026,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2028,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2028,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2028,11,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2026,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2026,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2026,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2026,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2026,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2026,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2028,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2028,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2028,11,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+5,heat,R1,2026,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2026,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2026,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2026,7,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,8,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2026,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2026,10,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,7,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2028,8,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2028,10,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2028,11,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2026,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2026,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2026,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2026,7,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,8,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2026,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2026,10,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,7,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2028,8,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2028,10,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2028,11,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
+6,heat,R1,2026,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2026,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2026,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2026,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2026,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2026,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2028,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2028,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2028,11,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2026,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2026,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2026,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2026,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2026,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2026,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2028,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2028,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2028,11,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+7,heat,R1,2026,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2026,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2026,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2026,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2028,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2028,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2028,11,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2026,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2026,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2026,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2026,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2028,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2028,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2028,11,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
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 5e12685c..a20e7edb 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
+0,heat,R1,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2028,9,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,10,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2028,11,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2028,12,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2030,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2030,5,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,6,2028,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,9,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,10,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R1,2030,11,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2030,12,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,13,2028,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2028,9,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,10,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2028,11,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2028,12,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,1,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,2,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,3,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2030,4,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2030,5,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,6,2028,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,9,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,10,2024,gasboiler,all-year,all-week,night,0.04990000000
+0,heat,R2,2030,11,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2030,12,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,13,2028,heatpump,all-year,all-week,night,0.04670000000
+0,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,night,3.22900000000
+1,heat,R1,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2028,9,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2028,11,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2028,12,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2030,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2030,5,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,6,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,9,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R1,2030,11,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2030,12,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,13,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2028,9,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2028,11,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2028,12,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,1,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,2,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2030,4,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2030,5,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,6,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,9,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
+1,heat,R2,2030,11,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2030,12,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,13,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
+2,heat,R1,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2028,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2028,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2028,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2030,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2030,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,6,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2030,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2030,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,13,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2028,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2028,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2028,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2030,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2030,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,6,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2030,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2030,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,13,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+3,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2028,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2028,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2028,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2030,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2030,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,6,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2030,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2030,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,13,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2028,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2028,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2028,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2030,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2030,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,6,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2030,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2030,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,13,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+4,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2028,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2028,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2028,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2030,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2030,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,6,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2030,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2030,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,13,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2028,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2028,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2028,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2030,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2030,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,6,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2030,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2030,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,13,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+5,heat,R1,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2028,9,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2028,11,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2028,12,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2030,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2030,5,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,6,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,9,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R1,2030,11,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2030,12,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,13,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2028,9,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2028,11,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2028,12,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,1,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,2,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2030,4,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2030,5,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,6,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,9,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
+5,heat,R2,2030,11,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2030,12,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,13,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
+6,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2028,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2028,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2028,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2030,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2030,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,6,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2030,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2030,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,13,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2028,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2028,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2028,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2030,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2030,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,6,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2030,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2030,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,13,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+7,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2028,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2028,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2028,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2030,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2030,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,6,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2030,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2030,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,13,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2028,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2028,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2028,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2030,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2030,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,6,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2030,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2030,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,13,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
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 eef20226..8e4ac9fd 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
+0,heat,R1,2030,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2030,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,3,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,4,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2030,5,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,6,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,8,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,9,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,10,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2030,11,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,12,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2032,3,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,4,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2032,5,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,6,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,7,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2032,9,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,10,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2032,11,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,12,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,13,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2030,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2030,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,3,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,4,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2030,5,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,6,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,8,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,9,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,10,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2030,11,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,12,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2032,3,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,4,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2032,5,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,6,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,7,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2032,9,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,10,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2032,11,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,12,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,13,heatpump,2030,all-year,all-week,night,0.33920000000
+0,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+1,heat,R1,2030,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2030,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,3,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,4,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2030,5,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,6,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,8,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,9,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,10,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2030,11,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,12,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2032,3,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,4,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2032,5,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,6,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,7,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2032,9,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,10,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2032,11,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,12,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,13,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2030,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2030,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,3,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,4,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2030,5,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,6,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,8,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,9,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,10,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2030,11,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,12,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2032,3,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,4,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2032,5,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,6,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,7,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2032,9,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,10,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2032,11,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,12,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,13,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+2,heat,R1,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2030,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,8,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2030,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2032,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2032,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2032,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2032,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,13,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2030,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,8,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2030,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2032,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2032,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2032,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2032,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,13,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+3,heat,R1,2030,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2030,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,8,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2030,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2032,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2032,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2032,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2032,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,13,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2030,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2030,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,8,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2030,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2032,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2032,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2032,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2032,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,13,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+4,heat,R1,2030,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2030,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,8,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2030,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2032,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2032,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2032,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2032,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,13,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2030,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2030,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,8,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2030,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2032,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2032,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2032,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2032,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,13,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+5,heat,R1,2030,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2030,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,3,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,4,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2030,5,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,6,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,8,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,9,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,10,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2030,11,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,12,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2032,3,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,4,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2032,5,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,6,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,7,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2032,9,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,10,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2032,11,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,12,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,13,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2030,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2030,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,3,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,4,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2030,5,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,6,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,8,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,9,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,10,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2030,11,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,12,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2032,3,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,4,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2032,5,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,6,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,7,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2032,9,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,10,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2032,11,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,12,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,13,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+6,heat,R1,2030,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2030,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,8,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2030,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2032,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2032,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2032,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2032,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,13,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2030,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2030,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,8,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2030,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2032,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2032,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2032,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2032,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,13,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+7,heat,R1,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2030,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,8,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2030,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2032,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2032,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2032,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2032,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,13,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2030,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,8,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2030,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2032,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2032,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2032,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2032,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,13,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
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 3aa4b2d0..511bbd8e 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
+0,heat,R1,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2032,2,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,3,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2032,4,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,5,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,6,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2032,8,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2032,10,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,11,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,12,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2034,3,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2034,4,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,5,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,6,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,7,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2034,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2034,10,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,11,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,12,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,13,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2032,2,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,3,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2032,4,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,5,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,6,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2032,8,heatpump,2022,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2032,10,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,11,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,12,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2034,3,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2034,4,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,5,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,6,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,7,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2034,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2034,10,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,11,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,12,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,13,heatpump,2032,all-year,all-week,night,0.09330000000
+0,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+1,heat,R1,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2032,2,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,3,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2032,4,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,5,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,6,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2032,8,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2032,10,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,11,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,12,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2034,3,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2034,4,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,5,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,6,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,7,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2034,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2034,10,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,11,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,12,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,13,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2032,2,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,3,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2032,4,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,5,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,6,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2032,8,heatpump,2022,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2032,10,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,11,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,12,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2034,3,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2034,4,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,5,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,6,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,7,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2034,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2034,10,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,11,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,12,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,13,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+2,heat,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2032,2,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2032,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2032,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2032,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2034,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2034,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2034,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2034,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,13,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2032,2,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2032,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2032,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2032,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2034,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2034,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2034,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2034,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,13,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+3,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2032,2,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2032,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2032,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2032,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2034,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2034,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2034,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2034,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,13,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2032,2,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2032,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2032,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2032,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2034,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2034,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2034,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2034,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,13,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+4,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2032,2,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2032,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2032,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2032,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2034,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2034,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2034,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2034,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,13,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2032,2,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2032,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2032,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2032,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2034,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2034,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2034,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2034,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,13,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+5,heat,R1,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2032,2,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,3,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2032,4,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,5,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,6,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2032,8,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2032,10,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,11,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,12,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2034,3,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2034,4,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,5,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,6,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,7,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2034,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2034,10,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,11,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,12,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,13,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2032,2,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,3,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2032,4,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,5,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,6,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2032,8,heatpump,2022,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2032,10,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,11,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,12,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2034,3,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2034,4,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,5,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,6,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,7,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2034,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2034,10,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,11,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,12,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,13,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+6,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2032,2,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2032,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2032,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2032,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2034,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2034,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2034,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2034,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,13,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2032,2,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2032,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2032,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2032,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2034,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2034,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2034,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2034,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,13,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+7,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2032,2,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2032,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2032,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2032,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2034,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2034,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2034,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2034,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,13,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2032,2,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2032,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2032,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2032,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2034,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2034,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2034,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2034,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,13,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
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 fe8d5955..78c19098 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
+0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R1,2034,2,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2034,3,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,4,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,5,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,6,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2034,8,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2034,9,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,10,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,11,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,12,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2036,3,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,4,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,5,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2036,6,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2036,7,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2036,9,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,10,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,11,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2036,12,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2036,13,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
+0,heat,R2,2034,2,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2034,3,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,4,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,5,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,6,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2034,8,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2034,9,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,10,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,11,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,12,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2036,3,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,4,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,5,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2036,6,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2036,7,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2036,9,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,10,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,11,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2036,12,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2036,13,heatpump,2034,all-year,all-week,night,0.19750000000
+0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
+1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R1,2034,2,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2034,3,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,4,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,5,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,6,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2034,8,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2034,9,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,10,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,11,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,12,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2036,3,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,4,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,5,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2036,6,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2036,7,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2036,9,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,10,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,11,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2036,12,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2036,13,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
+1,heat,R2,2034,2,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2034,3,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,4,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,5,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,6,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2034,8,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2034,9,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,10,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,11,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,12,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2036,3,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,4,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,5,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2036,6,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2036,7,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2036,9,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,10,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,11,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2036,12,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2036,13,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
+2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R1,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2034,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,5,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2034,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2036,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,5,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2036,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2036,7,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2036,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2036,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2036,13,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
+2,heat,R2,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2034,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,5,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2034,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2036,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,5,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2036,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2036,7,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2036,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2036,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2036,13,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2034,3,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,4,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,5,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,6,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2034,9,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,10,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,12,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2036,3,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,4,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,5,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2036,6,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2036,7,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2036,9,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,10,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2036,12,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2036,13,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
+3,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2034,3,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,4,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,5,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,6,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2034,9,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,10,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,12,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2036,3,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,4,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,5,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2036,6,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2036,7,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2036,9,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,10,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2036,12,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2036,13,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2034,3,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,4,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,5,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,6,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2034,9,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,10,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,12,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2036,3,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,4,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,5,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2036,6,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2036,7,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2036,9,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,10,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2036,12,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2036,13,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
+4,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2034,3,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,4,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,5,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,6,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2034,9,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,10,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,12,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2036,3,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,4,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,5,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2036,6,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2036,7,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2036,9,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,10,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2036,12,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2036,13,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R1,2034,2,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2034,3,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,4,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,5,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,6,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2034,8,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2034,9,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,10,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,11,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,12,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2036,3,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,4,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,5,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2036,6,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2036,7,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2036,9,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,10,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,11,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2036,12,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2036,13,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
+5,heat,R2,2034,2,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2034,3,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,4,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,5,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,6,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2034,8,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2034,9,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,10,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,11,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,12,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2036,3,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,4,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,5,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2036,6,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2036,7,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2036,9,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,10,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,11,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2036,12,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2036,13,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
+6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2034,3,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,4,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,5,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,6,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2034,9,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,10,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,12,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2036,3,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,4,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,5,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2036,6,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2036,7,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2036,9,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,10,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2036,12,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2036,13,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
+6,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2034,3,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,4,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,5,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,6,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2034,9,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,10,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,12,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2036,3,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,4,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,5,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2036,6,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2036,7,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2036,9,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,10,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2036,12,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2036,13,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2034,3,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,4,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,5,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,6,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2034,9,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,10,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,12,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2036,3,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,4,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,5,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2036,6,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2036,7,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2036,9,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,10,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2036,12,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2036,13,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
+7,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2034,3,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,4,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,5,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,6,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2034,9,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,10,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,12,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2036,3,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,4,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,5,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2036,6,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2036,7,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2036,9,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,10,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2036,12,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2036,13,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..21119f08
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
@@ -0,0 +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
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 121eb083..6b0d125c 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
+0,heat,R1,2036,0,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,1,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,2,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2036,3,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2036,4,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2036,6,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2036,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2036,9,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2036,10,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2038,1,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2038,2,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2038,3,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2038,4,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2038,5,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2038,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2038,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2038,9,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2038,10,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2038,11,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2036,0,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,1,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,2,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2036,3,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2036,4,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2036,6,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2036,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2036,9,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2036,10,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2038,1,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2038,2,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2038,3,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,4,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2038,5,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2038,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2038,9,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,10,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2038,11,heatpump,2036,all-year,all-week,night,0.09330000000
+1,heat,R1,2036,0,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,1,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,2,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2036,3,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2036,4,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2036,6,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2036,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2036,9,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2036,10,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2038,1,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2038,2,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2038,3,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2038,4,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2038,5,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2038,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2038,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2038,9,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2038,10,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2038,11,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2036,0,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,1,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,2,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2036,3,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2036,4,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2036,6,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2036,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2036,9,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2036,10,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2038,1,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2038,2,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2038,3,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,4,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2038,5,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2038,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2038,9,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,10,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2038,11,heatpump,2036,all-year,all-week,morning,0.13330000000
+2,heat,R1,2036,0,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,2,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2036,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2036,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2036,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2036,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2036,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2036,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2038,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2038,2,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2038,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2038,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2038,5,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2038,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2038,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2038,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2038,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2038,11,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2036,0,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,2,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2036,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2036,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2036,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2036,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2036,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2036,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2038,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2038,2,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2038,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2038,5,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2038,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2038,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2038,11,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+3,heat,R1,2036,0,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,1,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,2,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2036,3,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2036,4,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2036,6,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2036,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2036,9,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2036,10,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2038,1,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2038,2,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2038,3,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2038,4,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2038,5,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2038,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2038,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2038,9,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2038,10,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2038,11,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2036,0,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,1,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,2,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2036,3,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2036,4,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2036,6,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2036,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2036,9,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2036,10,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2038,1,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2038,2,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2038,3,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,4,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2038,5,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2038,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2038,9,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,10,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2038,11,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+4,heat,R1,2036,0,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,1,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,2,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2036,3,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2036,4,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2036,6,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2036,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2036,9,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2036,10,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2038,1,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2038,2,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2038,3,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2038,4,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2038,5,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2038,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2038,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2038,9,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2038,10,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2038,11,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2036,0,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,1,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,2,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2036,3,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2036,4,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2036,6,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2036,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2036,9,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2036,10,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2038,1,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2038,2,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2038,3,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,4,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2038,5,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2038,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2038,9,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,10,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2038,11,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+5,heat,R1,2036,0,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,1,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,2,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2036,3,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2036,4,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2036,6,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2036,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2036,9,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2036,10,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2038,1,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2038,2,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2038,3,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2038,4,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2038,5,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2038,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2038,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2038,9,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2038,10,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2038,11,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2036,0,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,1,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,2,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2036,3,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2036,4,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2036,6,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2036,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2036,9,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2036,10,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2038,1,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2038,2,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2038,3,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,4,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2038,5,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2038,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2038,9,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,10,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2038,11,heatpump,2036,all-year,all-week,evening,0.18670000000
+6,heat,R1,2036,0,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,1,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,2,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2036,3,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2036,4,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2036,6,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2036,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2036,9,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2036,10,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2038,1,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2038,2,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2038,3,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2038,4,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2038,5,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2038,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2038,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2038,9,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2038,10,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2038,11,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2036,0,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,1,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,2,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2036,3,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2036,4,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2036,6,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2036,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2036,9,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2036,10,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2038,1,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2038,2,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2038,3,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,4,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2038,5,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2038,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2038,9,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,10,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2038,11,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+7,heat,R1,2036,0,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,1,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,2,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2036,3,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2036,4,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2036,6,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2036,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2036,9,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2036,10,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2038,1,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2038,2,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2038,3,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2038,4,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2038,5,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2038,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2038,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2038,9,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2038,10,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2038,11,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2036,0,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,1,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,2,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2036,3,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2036,4,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2036,6,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2036,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2036,9,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2036,10,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2038,1,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2038,2,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2038,3,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,4,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2038,5,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2038,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2038,9,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,10,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2038,11,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
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 89992632..a16389e9 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
+0,heat,R1,2038,0,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2038,1,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2038,2,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2038,3,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2038,4,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2038,6,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2038,7,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2038,8,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2038,9,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2038,10,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,1,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2040,2,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,3,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2040,4,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,5,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,7,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2040,8,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,9,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2040,10,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,11,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,0,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2038,1,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2038,2,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,3,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2038,4,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,6,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2038,7,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2038,8,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2038,9,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2038,10,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,1,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2040,2,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,3,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2040,4,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,5,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,7,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2040,8,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,9,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2040,10,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,11,heatpump,2038,all-year,all-week,night,0.09330000000
+1,heat,R1,2038,0,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2038,1,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2038,2,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2038,3,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2038,4,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2038,6,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2038,7,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2038,8,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2038,9,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2038,10,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,1,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2040,2,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,3,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2040,4,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,5,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,7,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2040,8,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,9,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2040,10,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,11,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,0,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2038,1,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2038,2,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,3,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2038,4,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,6,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2038,7,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2038,8,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2038,9,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2038,10,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,1,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2040,2,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,3,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2040,4,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,5,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,7,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2040,8,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,9,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2040,10,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,11,heatpump,2038,all-year,all-week,morning,0.13330000000
+2,heat,R1,2038,0,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2038,1,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2038,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2038,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2038,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2038,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2038,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2038,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2038,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2038,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,1,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2040,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2040,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,5,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2040,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2040,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,11,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,0,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2038,1,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2038,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2038,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2038,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2038,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2038,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2038,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,1,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2040,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2040,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,5,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2040,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2040,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,11,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+3,heat,R1,2038,0,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2038,1,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2038,2,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2038,3,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2038,4,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2038,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2038,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2038,8,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2038,9,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2038,10,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,1,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2040,2,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,3,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2040,4,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,5,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2040,8,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,9,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2040,10,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,11,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,0,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2038,1,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2038,2,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,3,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2038,4,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2038,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2038,8,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2038,9,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2038,10,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,1,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2040,2,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,3,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2040,4,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,5,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2040,8,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,9,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2040,10,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,11,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+4,heat,R1,2038,0,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2038,1,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2038,2,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2038,3,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2038,4,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2038,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2038,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2038,8,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2038,9,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2038,10,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,1,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2040,2,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,3,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2040,4,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,5,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2040,8,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,9,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2040,10,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,11,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,0,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2038,1,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2038,2,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,3,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2038,4,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2038,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2038,8,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2038,9,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2038,10,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,1,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2040,2,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,3,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2040,4,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,5,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2040,8,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,9,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2040,10,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,11,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+5,heat,R1,2038,0,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2038,1,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2038,2,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2038,3,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2038,4,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2038,6,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2038,7,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2038,8,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2038,9,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2038,10,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,1,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2040,2,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,3,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2040,4,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,5,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,7,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2040,8,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,9,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2040,10,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,11,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,0,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2038,1,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2038,2,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,3,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2038,4,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,6,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2038,7,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2038,8,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2038,9,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2038,10,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,1,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2040,2,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,3,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2040,4,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,5,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,7,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2040,8,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,9,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2040,10,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,11,heatpump,2038,all-year,all-week,evening,0.18670000000
+6,heat,R1,2038,0,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2038,1,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2038,2,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2038,3,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2038,4,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2038,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2038,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2038,8,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2038,9,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2038,10,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,1,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2040,2,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,3,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2040,4,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,5,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2040,8,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,9,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2040,10,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,11,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,0,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2038,1,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2038,2,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,3,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2038,4,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2038,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2038,8,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2038,9,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2038,10,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,1,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2040,2,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,3,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2040,4,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,5,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2040,8,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,9,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2040,10,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,11,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+7,heat,R1,2038,0,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2038,1,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2038,2,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2038,3,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2038,4,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2038,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2038,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2038,8,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2038,9,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2038,10,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,1,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2040,2,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,3,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2040,4,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,5,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2040,8,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,9,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2040,10,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,11,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,0,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2038,1,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2038,2,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,3,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2038,4,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2038,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2038,8,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2038,9,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2038,10,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,1,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2040,2,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,3,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2040,4,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,5,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2040,8,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,9,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2040,10,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,11,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
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 b0cd3e1d..40315173 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
+0,heat,R1,2040,0,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2040,1,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,2,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2040,3,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,4,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2040,7,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,8,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2040,9,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2040,10,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,1,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,2,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2042,3,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,4,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,5,heatpump,2040,all-year,all-week,night,0.38580000000
+0,heat,R1,2042,7,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,8,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R1,2042,9,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,10,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R1,2042,11,heatpump,2040,all-year,all-week,night,0.38580000000
+0,heat,R2,2040,0,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2040,1,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,2,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2040,3,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,4,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2040,7,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,8,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2040,9,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2040,10,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,1,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,2,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2042,3,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,4,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,5,heatpump,2040,all-year,all-week,night,0.38580000000
+0,heat,R2,2042,7,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,8,heatpump,2034,all-year,all-week,night,0.19750000000
+0,heat,R2,2042,9,heatpump,2036,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,10,heatpump,2038,all-year,all-week,night,0.09330000000
+0,heat,R2,2042,11,heatpump,2040,all-year,all-week,night,0.38580000000
+1,heat,R1,2040,0,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2040,1,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,2,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2040,3,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,4,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2040,7,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,8,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2040,9,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2040,10,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,1,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,2,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2042,3,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,4,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,5,heatpump,2040,all-year,all-week,morning,0.55120000000
+1,heat,R1,2042,7,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,8,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R1,2042,9,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,10,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R1,2042,11,heatpump,2040,all-year,all-week,morning,0.55120000000
+1,heat,R2,2040,0,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2040,1,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,2,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2040,3,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,4,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2040,7,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,8,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2040,9,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2040,10,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,1,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,2,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2042,3,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,4,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,5,heatpump,2040,all-year,all-week,morning,0.55120000000
+1,heat,R2,2042,7,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,8,heatpump,2034,all-year,all-week,morning,0.28210000000
+1,heat,R2,2042,9,heatpump,2036,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,10,heatpump,2038,all-year,all-week,morning,0.13330000000
+1,heat,R2,2042,11,heatpump,2040,all-year,all-week,morning,0.55120000000
+2,heat,R1,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2040,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2040,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2040,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2040,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2040,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2042,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,5,heatpump,2040,all-year,all-week,mid-afternoon,0.38580000000
+2,heat,R1,2042,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R1,2042,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2042,11,heatpump,2040,all-year,all-week,mid-afternoon,0.38580000000
+2,heat,R2,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2040,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2040,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2040,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2040,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2040,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2042,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,5,heatpump,2040,all-year,all-week,mid-afternoon,0.38580000000
+2,heat,R2,2042,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
+2,heat,R2,2042,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2042,11,heatpump,2040,all-year,all-week,mid-afternoon,0.38580000000
+3,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2040,1,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,2,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2040,3,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,4,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2040,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,8,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2040,9,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2040,10,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,1,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,2,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2042,3,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,4,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,5,heatpump,2040,all-year,all-week,early-peak,0.55120000000
+3,heat,R1,2042,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,8,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R1,2042,9,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,10,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2042,11,heatpump,2040,all-year,all-week,early-peak,0.55120000000
+3,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2040,1,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,2,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2040,3,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,4,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2040,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,8,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2040,9,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2040,10,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,1,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,2,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2042,3,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,4,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,5,heatpump,2040,all-year,all-week,early-peak,0.55120000000
+3,heat,R2,2042,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,8,heatpump,2034,all-year,all-week,early-peak,0.28210000000
+3,heat,R2,2042,9,heatpump,2036,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,10,heatpump,2038,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2042,11,heatpump,2040,all-year,all-week,early-peak,0.55120000000
+4,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2040,1,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,2,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2040,3,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,4,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2040,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,8,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2040,9,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2040,10,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,1,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,2,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2042,3,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,4,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,5,heatpump,2040,all-year,all-week,late-peak,1.15750000000
+4,heat,R1,2042,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,8,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R1,2042,9,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,10,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2042,11,heatpump,2040,all-year,all-week,late-peak,1.15750000000
+4,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2040,1,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,2,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2040,3,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,4,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2040,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,8,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2040,9,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2040,10,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,1,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,2,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2042,3,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,4,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,5,heatpump,2040,all-year,all-week,late-peak,1.15750000000
+4,heat,R2,2042,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,8,heatpump,2034,all-year,all-week,late-peak,0.59250000000
+4,heat,R2,2042,9,heatpump,2036,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,10,heatpump,2038,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2042,11,heatpump,2040,all-year,all-week,late-peak,1.15750000000
+5,heat,R1,2040,0,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2040,1,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,2,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2040,3,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,4,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2040,7,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,8,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2040,9,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2040,10,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,1,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,2,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2042,3,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,4,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,5,heatpump,2040,all-year,all-week,evening,0.77170000000
+5,heat,R1,2042,7,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,8,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R1,2042,9,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,10,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R1,2042,11,heatpump,2040,all-year,all-week,evening,0.77170000000
+5,heat,R2,2040,0,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2040,1,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,2,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2040,3,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,4,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2040,7,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,8,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2040,9,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2040,10,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,1,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,2,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2042,3,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,4,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,5,heatpump,2040,all-year,all-week,evening,0.77170000000
+5,heat,R2,2042,7,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,8,heatpump,2034,all-year,all-week,evening,0.39500000000
+5,heat,R2,2042,9,heatpump,2036,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,10,heatpump,2038,all-year,all-week,evening,0.18670000000
+5,heat,R2,2042,11,heatpump,2040,all-year,all-week,evening,0.77170000000
+6,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2040,1,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,2,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2040,3,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,4,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2040,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,8,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2040,9,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2040,10,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,1,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,2,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2042,3,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,4,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,5,heatpump,2040,all-year,all-week,early-morning,0.77170000000
+6,heat,R1,2042,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,8,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R1,2042,9,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,10,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2042,11,heatpump,2040,all-year,all-week,early-morning,0.77170000000
+6,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2040,1,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,2,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2040,3,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,4,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2040,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,8,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2040,9,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2040,10,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,1,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,2,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2042,3,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,4,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,5,heatpump,2040,all-year,all-week,early-morning,0.77170000000
+6,heat,R2,2042,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,8,heatpump,2034,all-year,all-week,early-morning,0.39500000000
+6,heat,R2,2042,9,heatpump,2036,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,10,heatpump,2038,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2042,11,heatpump,2040,all-year,all-week,early-morning,0.77170000000
+7,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2040,1,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,2,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2040,3,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,4,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2040,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,8,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2040,9,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2040,10,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,1,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,2,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2042,3,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,4,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,5,heatpump,2040,all-year,all-week,late-afternoon,0.77170000000
+7,heat,R1,2042,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,8,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R1,2042,9,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,10,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2042,11,heatpump,2040,all-year,all-week,late-afternoon,0.77170000000
+7,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2040,1,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,2,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2040,3,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,4,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2040,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,8,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2040,9,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2040,10,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,1,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,2,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2042,3,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,4,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,5,heatpump,2040,all-year,all-week,late-afternoon,0.77170000000
+7,heat,R2,2042,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,8,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
+7,heat,R2,2042,9,heatpump,2036,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,10,heatpump,2038,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2042,11,heatpump,2040,all-year,all-week,late-afternoon,0.77170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..98be95de
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..26d4aa26
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
@@ -0,0 +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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
index 97378524..9e363207 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
 RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,0.714,0,0,0
-R1,gasboiler,2,0,0,1.071,0,0,0
-R1,gasboiler,3,0,0,0.714,0,0,0
-R1,gasboiler,4,0,0,1.071,0,0,0
-R1,gasboiler,5,0,0,2.143,0,0,0
-R1,gasboiler,6,0,0,1.429,0,0,0
-R1,gasboiler,7,0,0,1.429,0,0,0
-R1,gasboiler,8,0,0,1.429,0,0,0
-R2,gasboiler,1,0,0,0.714,0,0,0
-R2,gasboiler,2,0,0,1.071,0,0,0
-R2,gasboiler,3,0,0,0.714,0,0,0
-R2,gasboiler,4,0,0,1.071,0,0,0
-R2,gasboiler,5,0,0,2.143,0,0,0
-R2,gasboiler,6,0,0,1.429,0,0,0
-R2,gasboiler,7,0,0,1.429,0,0,0
-R2,gasboiler,8,0,0,1.429,0,0,0
+R1,gasboiler,1,0,0,0.7,0,0,0
+R1,gasboiler,2,0,0,1.0,0,0,0
+R1,gasboiler,3,0,0,0.7,0,0,0
+R1,gasboiler,4,0,0,1.0,0,0,0
+R1,gasboiler,5,0,0,2.1,0,0,0
+R1,gasboiler,6,0,0,1.4,0,0,0
+R1,gasboiler,7,0,0,1.4,0,0,0
+R1,gasboiler,8,0,0,1.4,0,0,0
+R2,gasboiler,1,0,0,0.7,0,0,0
+R2,gasboiler,2,0,0,1.0,0,0,0
+R2,gasboiler,3,0,0,0.7,0,0,0
+R2,gasboiler,4,0,0,1.0,0,0,0
+R2,gasboiler,5,0,0,2.1,0,0,0
+R2,gasboiler,6,0,0,1.4,0,0,0
+R2,gasboiler,7,0,0,1.4,0,0,0
+R2,gasboiler,8,0,0,1.4,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
index 5e20cf90..3edb36b0 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
 RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
-R1,gasboiler,1,0,0,2.142,0,0,0
-R1,gasboiler,2,0,0,3.213,0,0,0
-R1,gasboiler,3,0,0,2.142,0,0,0
-R1,gasboiler,4,0,0,3.213,0,0,0
-R1,gasboiler,5,0,0,6.428999999999999,0,0,0
-R1,gasboiler,6,0,0,4.287,0,0,0
-R1,gasboiler,7,0,0,4.287,0,0,0
-R1,gasboiler,8,0,0,4.287,0,0,0
-R2,gasboiler,1,0,0,2.142,0,0,0
-R2,gasboiler,2,0,0,3.213,0,0,0
-R2,gasboiler,3,0,0,2.142,0,0,0
-R2,gasboiler,4,0,0,3.213,0,0,0
-R2,gasboiler,5,0,0,6.428999999999999,0,0,0
-R2,gasboiler,6,0,0,4.287,0,0,0
-R2,gasboiler,7,0,0,4.287,0,0,0
-R2,gasboiler,8,0,0,4.287,0,0,0
+R1,gasboiler,1,0,0,2.1,0,0,0
+R1,gasboiler,2,0,0,3.0,0,0,0
+R1,gasboiler,3,0,0,2.1,0,0,0
+R1,gasboiler,4,0,0,3.0,0,0,0
+R1,gasboiler,5,0,0,6.3,0,0,0
+R1,gasboiler,6,0,0,4.2,0,0,0
+R1,gasboiler,7,0,0,4.2,0,0,0
+R1,gasboiler,8,0,0,4.2,0,0,0
+R2,gasboiler,1,0,0,2.1,0,0,0
+R2,gasboiler,2,0,0,3.0,0,0,0
+R2,gasboiler,3,0,0,2.1,0,0,0
+R2,gasboiler,4,0,0,3.0,0,0,0
+R2,gasboiler,5,0,0,6.3,0,0,0
+R2,gasboiler,6,0,0,4.2,0,0,0
+R2,gasboiler,7,0,0,4.2,0,0,0
+R2,gasboiler,8,0,0,4.2,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 92639893..b651c51e 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -46,27 +46,27 @@ def generate_model_1():
 
     # Change consumption profile
     consumption_values = [
-        0.714,
-        1.071,
-        0.714,
-        1.071,
-        2.143,
-        1.429,
-        1.429,
-        1.429,
-        0.714,
-        1.071,
-        0.714,
-        1.071,
-        2.143,
-        1.429,
-        1.429,
-        1.429,
+        0.7,
+        1.0,
+        0.7,
+        1.0,
+        2.1,
+        1.4,
+        1.4,
+        1.4,
+        0.7,
+        1.0,
+        0.7,
+        1.0,
+        2.1,
+        1.4,
+        1.4,
+        1.4,
     ]
     for year, multiplier in zip([2020, 2050], [1, 3]):
         file = model_path / f"technodata/preset/Residential{year}Consumption.csv"
         df = pd.read_csv(file)
-        df["heat"] = [i * multiplier for i in consumption_values]
+        df["heat"] = [round(i * multiplier, 1) for i in consumption_values]
         df.to_csv(file, index=False)
 
 
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index f32d264b..002d4862 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -1,13 +1,13 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,5.52400000000
-1,2040,R1,2030,gassupply1,5.52400000000
-1,2045,R1,2030,gassupply1,5.52400000000
-1,2050,R1,2030,gassupply1,5.52400000000
-1,2069,R1,2030,gassupply1,5.52400000000
+1,2035,R1,2030,gassupply1,5.46490000000
+1,2040,R1,2030,gassupply1,5.46490000000
+1,2045,R1,2030,gassupply1,5.46490000000
+1,2050,R1,2030,gassupply1,5.46490000000
+1,2069,R1,2030,gassupply1,5.46490000000
 2,2030,R2,2020,gassupply1,7.50000000000
-3,2035,R2,2030,gassupply1,5.52400000000
-3,2040,R2,2030,gassupply1,5.52400000000
-3,2045,R2,2030,gassupply1,5.52400000000
-3,2050,R2,2030,gassupply1,5.52400000000
-3,2069,R2,2030,gassupply1,5.52400000000
+3,2035,R2,2030,gassupply1,5.46490000000
+3,2040,R2,2030,gassupply1,5.46490000000
+3,2045,R2,2030,gassupply1,5.46490000000
+3,2050,R2,2030,gassupply1,5.46490000000
+3,2069,R2,2030,gassupply1,5.46490000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index bf048bdb..7a126f21 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -1,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,5.52400000000
-1,2040,R1,2030,gassupply1,5.52400000000
-1,2045,R1,2030,gassupply1,5.52400000000
-1,2050,R1,2030,gassupply1,5.52400000000
-1,2069,R1,2030,gassupply1,5.52400000000
-3,2035,R2,2030,gassupply1,5.52400000000
-3,2040,R2,2030,gassupply1,5.52400000000
-3,2045,R2,2030,gassupply1,5.52400000000
-3,2050,R2,2030,gassupply1,5.52400000000
-3,2069,R2,2030,gassupply1,5.52400000000
+1,2035,R1,2030,gassupply1,5.46490000000
+1,2040,R1,2030,gassupply1,5.46490000000
+1,2045,R1,2030,gassupply1,5.46490000000
+1,2050,R1,2030,gassupply1,5.46490000000
+1,2069,R1,2030,gassupply1,5.46490000000
+3,2035,R2,2030,gassupply1,5.46490000000
+3,2040,R2,2030,gassupply1,5.46490000000
+3,2045,R2,2030,gassupply1,5.46490000000
+3,2050,R2,2030,gassupply1,5.46490000000
+3,2069,R2,2030,gassupply1,5.46490000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index 899ebefe..05f99016 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -1,9 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,5.52400000000
-1,2045,R1,2030,gassupply1,5.52400000000
-1,2050,R1,2030,gassupply1,5.52400000000
-1,2069,R1,2030,gassupply1,5.52400000000
-3,2040,R2,2030,gassupply1,5.52400000000
-3,2045,R2,2030,gassupply1,5.52400000000
-3,2050,R2,2030,gassupply1,5.52400000000
-3,2069,R2,2030,gassupply1,5.52400000000
+1,2040,R1,2030,gassupply1,5.46490000000
+1,2045,R1,2030,gassupply1,5.46490000000
+1,2050,R1,2030,gassupply1,5.46490000000
+1,2069,R1,2030,gassupply1,5.46490000000
+3,2040,R2,2030,gassupply1,5.46490000000
+3,2045,R2,2030,gassupply1,5.46490000000
+3,2050,R2,2030,gassupply1,5.46490000000
+3,2069,R2,2030,gassupply1,5.46490000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index a835367d..3af53f48 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -1,7 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,5.52400000000
-1,2050,R1,2030,gassupply1,5.52400000000
-1,2069,R1,2030,gassupply1,5.52400000000
-3,2045,R2,2030,gassupply1,5.52400000000
-3,2050,R2,2030,gassupply1,5.52400000000
-3,2069,R2,2030,gassupply1,5.52400000000
+1,2045,R1,2030,gassupply1,5.46490000000
+1,2050,R1,2030,gassupply1,5.46490000000
+1,2069,R1,2030,gassupply1,5.46490000000
+3,2045,R2,2030,gassupply1,5.46490000000
+3,2050,R2,2030,gassupply1,5.46490000000
+3,2069,R2,2030,gassupply1,5.46490000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 109932a8..5210fc08 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -1,7 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,5.52400000000
-1,2055,R1,2030,gassupply1,5.52400000000
-1,2069,R1,2030,gassupply1,5.52400000000
-3,2050,R2,2030,gassupply1,5.52400000000
-3,2055,R2,2030,gassupply1,5.52400000000
-3,2069,R2,2030,gassupply1,5.52400000000
+1,2050,R1,2030,gassupply1,5.46490000000
+1,2055,R1,2030,gassupply1,5.46490000000
+1,2069,R1,2030,gassupply1,5.46490000000
+3,2050,R2,2030,gassupply1,5.46490000000
+3,2055,R2,2030,gassupply1,5.46490000000
+3,2069,R2,2030,gassupply1,5.46490000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index bd6f7c42..c6e6f49a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -7,120 +7,120 @@ gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-electric_stove,R1,R1,A1,residential,retrofit,2025,17.85870000000
+electric_stove,R1,R1,A1,residential,retrofit,2025,17.40000000000
 gas_stove,R1,R1,A1,residential,retrofit,2025,5.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,17.85870000000
-electric_stove,R2,R2,A1,residential,retrofit,2025,17.85870000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.40000000000
+electric_stove,R2,R2,A1,residential,retrofit,2025,17.40000000000
 gas_stove,R2,R2,A1,residential,retrofit,2025,5.00000000000
 gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,17.85870000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.40000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,13.46730000000
+solarPV,R1,R1,A1,power,retrofit,2025,12.55000000000
 windturbine,R1,R1,A1,power,retrofit,2025,20.00000000000
 gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,33.46730000000
+windturbine,R2,R2,A1,power,retrofit,2025,32.55000000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-electric_stove,R1,R1,A1,residential,retrofit,2030,17.85870000000
-electric_stove,R1,R1,A1,residential,retrofit,2030,8.57170000000
-gas_stove,R1,R1,A1,residential,retrofit,2030,2.14290000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.14290000000
-heatpump,R1,R1,A1,residential,retrofit,2030,17.85870000000
-heatpump,R1,R1,A1,residential,retrofit,2030,8.57170000000
-electric_stove,R2,R2,A1,residential,retrofit,2030,17.85870000000
-electric_stove,R2,R2,A1,residential,retrofit,2030,8.57170000000
-gas_stove,R2,R2,A1,residential,retrofit,2030,2.14290000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.14290000000
-heatpump,R2,R2,A1,residential,retrofit,2030,17.85870000000
-heatpump,R2,R2,A1,residential,retrofit,2030,8.57170000000
-solarPV,R1,R1,A1,power,retrofit,2030,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2030,19.39350000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,17.40000000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,8.48000000000
+gas_stove,R1,R1,A1,residential,retrofit,2030,2.12000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.12000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,8.48000000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,17.40000000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,8.48000000000
+gas_stove,R2,R2,A1,residential,retrofit,2030,2.12000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,2.12000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,8.48000000000
+solarPV,R1,R1,A1,power,retrofit,2030,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2030,19.21000000000
 windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,19.39350000000
-windturbine,R2,R2,A1,power,retrofit,2030,33.46730000000
+solarPV,R2,R2,A1,power,retrofit,2030,19.21000000000
+windturbine,R2,R2,A1,power,retrofit,2030,32.55000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-electric_stove,R1,R1,A1,residential,retrofit,2035,8.57170000000
-electric_stove,R1,R1,A1,residential,retrofit,2035,23.57330000000
-gas_stove,R1,R1,A1,residential,retrofit,2035,2.14290000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.14290000000
-heatpump,R1,R1,A1,residential,retrofit,2035,8.57170000000
-heatpump,R1,R1,A1,residential,retrofit,2035,23.57330000000
-electric_stove,R2,R2,A1,residential,retrofit,2035,8.57170000000
-electric_stove,R2,R2,A1,residential,retrofit,2035,23.57330000000
-gas_stove,R2,R2,A1,residential,retrofit,2035,2.14290000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,2.14290000000
-heatpump,R2,R2,A1,residential,retrofit,2035,8.57170000000
-heatpump,R2,R2,A1,residential,retrofit,2035,23.57330000000
-solarPV,R1,R1,A1,power,retrofit,2035,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2035,19.39350000000
-solarPV,R1,R1,A1,power,retrofit,2035,11.42930000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,8.48000000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,23.00000000000
+gas_stove,R1,R1,A1,residential,retrofit,2035,2.12000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.12000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,8.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,8.48000000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,23.00000000000
+gas_stove,R2,R2,A1,residential,retrofit,2035,2.12000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,2.12000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,8.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2035,19.21000000000
+solarPV,R1,R1,A1,power,retrofit,2035,11.20000000000
 windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,19.39350000000
-solarPV,R2,R2,A1,power,retrofit,2035,11.42930000000
-windturbine,R2,R2,A1,power,retrofit,2035,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.52400000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,5.52400000000
-electric_stove,R1,R1,A1,residential,retrofit,2040,23.57330000000
-electric_stove,R1,R1,A1,residential,retrofit,2040,16.42930000000
-heatpump,R1,R1,A1,residential,retrofit,2040,23.57330000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.42930000000
-electric_stove,R2,R2,A1,residential,retrofit,2040,23.57330000000
-electric_stove,R2,R2,A1,residential,retrofit,2040,16.42930000000
-heatpump,R2,R2,A1,residential,retrofit,2040,23.57330000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.42930000000
-solarPV,R1,R1,A1,power,retrofit,2040,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2040,19.39350000000
-solarPV,R1,R1,A1,power,retrofit,2040,11.42930000000
-solarPV,R1,R1,A1,power,retrofit,2040,15.71520000000
+solarPV,R2,R2,A1,power,retrofit,2035,19.21000000000
+solarPV,R2,R2,A1,power,retrofit,2035,11.20000000000
+windturbine,R2,R2,A1,power,retrofit,2035,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.46490000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,5.46490000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,23.00000000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,16.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.20000000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,23.00000000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,16.20000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.20000000000
+solarPV,R1,R1,A1,power,retrofit,2040,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2040,19.21000000000
+solarPV,R1,R1,A1,power,retrofit,2040,11.20000000000
+solarPV,R1,R1,A1,power,retrofit,2040,15.44000000000
 windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,19.39350000000
-solarPV,R2,R2,A1,power,retrofit,2040,11.42930000000
-solarPV,R2,R2,A1,power,retrofit,2040,15.71520000000
-windturbine,R2,R2,A1,power,retrofit,2040,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.52400000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,5.52400000000
-electric_stove,R1,R1,A1,residential,retrofit,2045,16.42930000000
-electric_stove,R1,R1,A1,residential,retrofit,2045,29.28800000000
-heatpump,R1,R1,A1,residential,retrofit,2045,16.42930000000
-heatpump,R1,R1,A1,residential,retrofit,2045,29.28800000000
-electric_stove,R2,R2,A1,residential,retrofit,2045,16.42930000000
-electric_stove,R2,R2,A1,residential,retrofit,2045,29.28800000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.42930000000
-heatpump,R2,R2,A1,residential,retrofit,2045,29.28800000000
-solarPV,R1,R1,A1,power,retrofit,2045,13.46730000000
-solarPV,R1,R1,A1,power,retrofit,2045,19.39350000000
-solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
-solarPV,R1,R1,A1,power,retrofit,2045,15.71520000000
-solarPV,R1,R1,A1,power,retrofit,2045,11.42930000000
+solarPV,R2,R2,A1,power,retrofit,2040,19.21000000000
+solarPV,R2,R2,A1,power,retrofit,2040,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2040,15.44000000000
+windturbine,R2,R2,A1,power,retrofit,2040,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.46490000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,5.46490000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,16.20000000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,28.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,16.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,16.20000000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,28.60000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.20000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
+solarPV,R1,R1,A1,power,retrofit,2045,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2045,19.21000000000
+solarPV,R1,R1,A1,power,retrofit,2045,11.20000000000
+solarPV,R1,R1,A1,power,retrofit,2045,15.44000000000
+solarPV,R1,R1,A1,power,retrofit,2045,11.20000000000
 windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,19.39350000000
-solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
-solarPV,R2,R2,A1,power,retrofit,2045,15.71520000000
-solarPV,R2,R2,A1,power,retrofit,2045,11.42930000000
-windturbine,R2,R2,A1,power,retrofit,2045,33.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.52400000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,5.52400000000
-electric_stove,R1,R1,A1,residential,retrofit,2050,29.28800000000
-electric_stove,R1,R1,A1,residential,retrofit,2050,22.14400000000
-heatpump,R1,R1,A1,residential,retrofit,2050,29.28800000000
-heatpump,R1,R1,A1,residential,retrofit,2050,22.14400000000
-electric_stove,R2,R2,A1,residential,retrofit,2050,29.28800000000
-electric_stove,R2,R2,A1,residential,retrofit,2050,22.14400000000
-heatpump,R2,R2,A1,residential,retrofit,2050,29.28800000000
-heatpump,R2,R2,A1,residential,retrofit,2050,22.14400000000
-solarPV,R1,R1,A1,power,retrofit,2050,19.39350000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.71520000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.42930000000
-solarPV,R1,R1,A1,power,retrofit,2050,31.42930000000
-windturbine,R1,R1,A1,power,retrofit,2050,13.46730000000
-solarPV,R2,R2,A1,power,retrofit,2050,19.39350000000
-solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
-solarPV,R2,R2,A1,power,retrofit,2050,15.71520000000
-solarPV,R2,R2,A1,power,retrofit,2050,11.42930000000
-solarPV,R2,R2,A1,power,retrofit,2050,31.42930000000
-windturbine,R2,R2,A1,power,retrofit,2050,13.46730000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.52400000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,5.52400000000
+solarPV,R2,R2,A1,power,retrofit,2045,19.21000000000
+solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2045,15.44000000000
+solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
+windturbine,R2,R2,A1,power,retrofit,2045,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.46490000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,5.46490000000
+electric_stove,R1,R1,A1,residential,retrofit,2050,28.60000000000
+electric_stove,R1,R1,A1,residential,retrofit,2050,21.80000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
+electric_stove,R2,R2,A1,residential,retrofit,2050,28.60000000000
+electric_stove,R2,R2,A1,residential,retrofit,2050,21.80000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
+solarPV,R1,R1,A1,power,retrofit,2050,19.21000000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.20000000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.44000000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.20000000000
+solarPV,R1,R1,A1,power,retrofit,2050,31.20000000000
+windturbine,R1,R1,A1,power,retrofit,2050,12.55000000000
+solarPV,R2,R2,A1,power,retrofit,2050,19.21000000000
+solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.44000000000
+solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2050,31.20000000000
+windturbine,R2,R2,A1,power,retrofit,2050,12.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.46490000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,5.46490000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index df39ffdb..e4a9ee99 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,483 +79,483 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.58760000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.58760000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49020000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,6.49020000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.15380000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.15380000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.58860000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.58860000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15600000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,80.14830000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,80.14830000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.60730000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.60730000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49270000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,6.49270000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.23070000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.23070000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,80.15030000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,80.15030000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.60590000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.60590000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.22280000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,80.22240000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,80.22240000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58760000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58760000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49020000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49020000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15380000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15380000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,80.21470000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,80.21470000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58860000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58860000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15600000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.14830000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.14830000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60730000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60730000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49270000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49270000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.23070000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.23070000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.15030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.15030000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60590000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60590000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.22280000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,80.22240000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,80.22240000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66660000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66660000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50030000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50030000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.46160000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.46160000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,80.21470000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,80.21470000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66940000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66940000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46790000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,80.44500000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,80.44500000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.62710000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.62710000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.49530000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,6.49530000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.30780000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.30780000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,80.45080000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,80.45080000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.62900000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.31190000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,80.29670000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,80.29670000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62710000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62710000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49530000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49530000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.30780000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.30780000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,80.30060000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,80.30060000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62900000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.31190000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,80.29670000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,80.29670000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62710000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62710000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49530000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49530000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.30780000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.30780000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,80.30060000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,80.30060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62900000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31190000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.29670000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.29670000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.08840000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,14.08840000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.19720000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,5.19720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.23740000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.23740000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.30060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.30060000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.08930000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.08930000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.24040000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.24040000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,64.23050000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,64.23050000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.11330000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,14.11330000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.20180000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,5.20180000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.35620000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.35620000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,64.23340000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,64.23340000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.11110000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.11110000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.34360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.34360000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,64.34590000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,64.34590000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.08840000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.08840000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19720000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19720000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.23740000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.23740000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,64.33350000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,64.33350000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.08930000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.08930000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24040000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.23050000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.23050000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.11330000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,14.11330000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.20180000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.20180000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.35620000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.35620000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.23340000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.23340000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.34360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.34360000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,64.34590000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,64.34590000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.18820000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.18820000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.21550000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.21550000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.71370000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.71370000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,64.33350000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,64.33350000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.19100000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.19100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.72270000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.72270000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,64.69300000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,64.69300000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.13830000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,14.13830000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.20630000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,5.20630000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.47550000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.47550000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,64.70140000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,64.70140000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.14020000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.14020000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.48130000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.48130000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,64.46170000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,64.46170000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,14.13830000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,14.13830000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,5.20630000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,5.20630000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.47550000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.47550000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,64.46720000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,64.46720000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,14.14020000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,14.14020000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.48130000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.48130000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,64.46170000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,64.46170000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.13830000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.13830000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20630000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.47550000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.47550000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,64.46720000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,64.46720000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.14020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.14020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48130000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48130000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.46170000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.46170000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.28880000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,11.28880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.48560000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.48560000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.46720000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.46720000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.28980000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.28980000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.48920000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.48920000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,51.47730000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,51.47730000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.31780000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,11.31780000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.62870000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.62870000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,51.48070000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,51.48070000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.31500000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.31500000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.61350000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.61350000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,51.61620000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,51.61620000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28880000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28880000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48560000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,51.60130000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,51.60130000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28980000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28980000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48920000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48920000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.47730000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.47730000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31780000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31780000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.62870000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.62870000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.48070000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.48070000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31500000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31500000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.61350000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.61350000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,51.61620000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,51.61620000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40490000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.05990000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.05990000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,51.60130000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,51.60130000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40770000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40770000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.07050000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.07050000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,52.03490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,52.03490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.34690000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,11.34690000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.77250000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,51.77250000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,52.04480000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,52.04480000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.34870000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.34870000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.77940000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.77940000000,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', 'evening')",cook,R1,51.75580000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,51.75580000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34690000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34690000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.77250000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.77250000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,51.76230000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,51.76230000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34870000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34870000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.77940000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.77940000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,51.75580000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,51.75580000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34690000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34690000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.77250000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.77250000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,51.76230000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,51.76230000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34870000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34870000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.77940000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.77940000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.75580000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.75580000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.08840000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08840000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.33530000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.33530000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.76230000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.76230000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.08930000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08930000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.33890000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.33890000000,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', 'night')",cook,R1,0.33530000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.33530000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13260000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13260000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.50420000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.50420000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.33890000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.33890000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12760000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12760000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.48520000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.48520000000,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', 'morning')",cook,R1,0.50420000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.50420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08840000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08840000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33530000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.48520000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.48520000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33890000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33890000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.33530000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.33530000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13260000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13260000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50420000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.50420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.33890000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.33890000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12760000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12760000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.48520000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.48520000000,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', 'early-peak')",cook,R1,0.50420000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.50420000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26540000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26540000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.01630000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,1.01630000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.48520000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.48520000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26800000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26800000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.02690000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,1.02690000000,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', 'late-peak')",cook,R1,1.01630000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,1.01630000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17700000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17700000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.67440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.67440000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,1.02690000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,1.02690000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17870000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17870000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.68120000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.68120000000,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', 'evening')",cook,R1,0.67440000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.67440000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17700000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17700000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.67440000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.67440000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.68120000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.68120000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17870000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17870000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.68120000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.68120000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.67440000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.67440000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.67440000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.67440000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.68120000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.68120000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17870000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17870000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.68120000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.68120000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.67440000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.67440000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.08660000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.08660000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.68120000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.68120000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08750000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.08750000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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', 'night')",cook,R1,0.01540000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.01540000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12990000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12990000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.02500000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.02500000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.01560000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.01560000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12500000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12500000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,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', 'morning')",cook,R1,0.02500000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.02500000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08660000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08660000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.02390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08750000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08750000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01540000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01540000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12990000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12990000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02500000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02500000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01560000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12500000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12500000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,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', 'early-peak')",cook,R1,0.02500000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02500000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.25990000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.25990000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06140000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06140000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26250000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26250000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06230000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06230000000,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', 'late-peak')",cook,R1,0.06140000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06140000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17330000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.03590000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.03590000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06230000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06230000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17500000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17500000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,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', 'evening')",cook,R1,0.03590000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.03590000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17330000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17330000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03590000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03590000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.03630000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.03630000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17500000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17500000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03590000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03590000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17330000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17330000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03590000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03590000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03630000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03630000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17500000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17500000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03590000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03590000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.08160000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.08160000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,4.16280000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,4.16280000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.01540000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.01540000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03630000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03630000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08240000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08240000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.01550000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.01550000000,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', 'night')",cook,R1,0.01540000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.01540000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12230000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12230000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,4.16900000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,4.16900000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.02490000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.02490000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.01550000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.01550000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11770000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.11770000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.02370000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.02370000000,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', 'morning')",cook,R1,0.02490000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.02490000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08160000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08160000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16280000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16280000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01540000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01540000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.02370000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.02370000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08240000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08240000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01550000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01540000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01540000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12230000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12230000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16900000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16900000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02490000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02490000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01550000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11770000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11770000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02370000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02370000000,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', 'early-peak')",cook,R1,0.02490000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02490000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24480000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24480000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18750000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18750000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06090000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06090000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02370000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02370000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24710000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24710000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06180000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06180000000,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', 'late-peak')",cook,R1,0.06090000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06090000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.16320000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.16320000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,4.17520000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,4.17520000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.03570000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.03570000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06180000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06180000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16470000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16470000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.03610000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.03610000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.03570000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.03570000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16320000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16320000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17520000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17520000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03570000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03570000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.03610000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.03610000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16470000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16470000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03610000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03610000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03570000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03570000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16320000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16320000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17520000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17520000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03570000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03570000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03610000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03610000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16470000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16470000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03610000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03610000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03570000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03570000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03610000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03610000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
index 39fc1925..a91ec824 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
@@ -1,12 +1,12 @@
 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
+1,2025,R1,2020,solarPV,12.55000000000
+1,2030,R1,2020,solarPV,12.55000000000
+1,2035,R1,2020,solarPV,12.55000000000
+1,2040,R1,2020,solarPV,12.55000000000
+1,2045,R1,2020,solarPV,12.55000000000
+1,2049,R1,2020,solarPV,12.55000000000
 2,2025,R1,2020,windturbine,20.00000000000
 2,2030,R1,2020,windturbine,20.00000000000
 2,2035,R1,2020,windturbine,20.00000000000
@@ -15,9 +15,9 @@ asset,year,region,installed,technology,capacity
 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,windturbine,33.46730000000
-4,2030,R2,2020,windturbine,33.46730000000
-4,2035,R2,2020,windturbine,33.46730000000
-4,2040,R2,2020,windturbine,33.46730000000
-4,2045,R2,2020,windturbine,33.46730000000
-4,2049,R2,2020,windturbine,33.46730000000
+4,2025,R2,2020,windturbine,32.55000000000
+4,2030,R2,2020,windturbine,32.55000000000
+4,2035,R2,2020,windturbine,32.55000000000
+4,2040,R2,2020,windturbine,32.55000000000
+4,2045,R2,2020,windturbine,32.55000000000
+4,2049,R2,2020,windturbine,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 9e311ff3..11b93bd1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -1,35 +1,35 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasCCGT,R1,2020,1.00000000000
 1,2025,gasCCGT,R2,2020,1.00000000000
-2,2025,solarPV,R1,2020,13.46730000000
-2,2030,solarPV,R1,2020,13.46730000000
-2,2035,solarPV,R1,2020,13.46730000000
-2,2040,solarPV,R1,2020,13.46730000000
-2,2045,solarPV,R1,2020,13.46730000000
-2,2049,solarPV,R1,2020,13.46730000000
-3,2030,solarPV,R1,2025,19.39350000000
-3,2035,solarPV,R1,2025,19.39350000000
-3,2040,solarPV,R1,2025,19.39350000000
-3,2045,solarPV,R1,2025,19.39350000000
-3,2049,solarPV,R1,2025,19.39350000000
-3,2050,solarPV,R1,2025,19.39350000000
-3,2054,solarPV,R1,2025,19.39350000000
-4,2030,solarPV,R2,2025,19.39350000000
-4,2035,solarPV,R2,2025,19.39350000000
-4,2040,solarPV,R2,2025,19.39350000000
-4,2045,solarPV,R2,2025,19.39350000000
-4,2049,solarPV,R2,2025,19.39350000000
-4,2050,solarPV,R2,2025,19.39350000000
-4,2054,solarPV,R2,2025,19.39350000000
+2,2025,solarPV,R1,2020,12.55000000000
+2,2030,solarPV,R1,2020,12.55000000000
+2,2035,solarPV,R1,2020,12.55000000000
+2,2040,solarPV,R1,2020,12.55000000000
+2,2045,solarPV,R1,2020,12.55000000000
+2,2049,solarPV,R1,2020,12.55000000000
+3,2030,solarPV,R1,2025,19.21000000000
+3,2035,solarPV,R1,2025,19.21000000000
+3,2040,solarPV,R1,2025,19.21000000000
+3,2045,solarPV,R1,2025,19.21000000000
+3,2049,solarPV,R1,2025,19.21000000000
+3,2050,solarPV,R1,2025,19.21000000000
+3,2054,solarPV,R1,2025,19.21000000000
+4,2030,solarPV,R2,2025,19.21000000000
+4,2035,solarPV,R2,2025,19.21000000000
+4,2040,solarPV,R2,2025,19.21000000000
+4,2045,solarPV,R2,2025,19.21000000000
+4,2049,solarPV,R2,2025,19.21000000000
+4,2050,solarPV,R2,2025,19.21000000000
+4,2054,solarPV,R2,2025,19.21000000000
 5,2025,windturbine,R1,2020,20.00000000000
 5,2030,windturbine,R1,2020,20.00000000000
 5,2035,windturbine,R1,2020,20.00000000000
 5,2040,windturbine,R1,2020,20.00000000000
 5,2045,windturbine,R1,2020,20.00000000000
 5,2049,windturbine,R1,2020,20.00000000000
-6,2025,windturbine,R2,2020,33.46730000000
-6,2030,windturbine,R2,2020,33.46730000000
-6,2035,windturbine,R2,2020,33.46730000000
-6,2040,windturbine,R2,2020,33.46730000000
-6,2045,windturbine,R2,2020,33.46730000000
-6,2049,windturbine,R2,2020,33.46730000000
+6,2025,windturbine,R2,2020,32.55000000000
+6,2030,windturbine,R2,2020,32.55000000000
+6,2035,windturbine,R2,2020,32.55000000000
+6,2040,windturbine,R2,2020,32.55000000000
+6,2045,windturbine,R2,2020,32.55000000000
+6,2049,windturbine,R2,2020,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index 7c8f75b1..81bd7d49 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -1,46 +1,46 @@
 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
+1,2030,R1,2020,solarPV,12.55000000000
+1,2035,R1,2020,solarPV,12.55000000000
+1,2040,R1,2020,solarPV,12.55000000000
+1,2045,R1,2020,solarPV,12.55000000000
+1,2049,R1,2020,solarPV,12.55000000000
 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,solarPV,19.39350000000
-3,2035,R1,2025,solarPV,19.39350000000
-3,2040,R1,2025,solarPV,19.39350000000
-3,2045,R1,2025,solarPV,19.39350000000
-3,2049,R1,2025,solarPV,19.39350000000
-3,2050,R1,2025,solarPV,19.39350000000
-3,2054,R1,2025,solarPV,19.39350000000
-4,2035,R1,2030,solarPV,11.42930000000
-4,2040,R1,2030,solarPV,11.42930000000
-4,2045,R1,2030,solarPV,11.42930000000
-4,2049,R1,2030,solarPV,11.42930000000
-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
-6,2030,R2,2020,windturbine,33.46730000000
-6,2035,R2,2020,windturbine,33.46730000000
-6,2040,R2,2020,windturbine,33.46730000000
-6,2045,R2,2020,windturbine,33.46730000000
-6,2049,R2,2020,windturbine,33.46730000000
-7,2030,R2,2025,solarPV,19.39350000000
-7,2035,R2,2025,solarPV,19.39350000000
-7,2040,R2,2025,solarPV,19.39350000000
-7,2045,R2,2025,solarPV,19.39350000000
-7,2049,R2,2025,solarPV,19.39350000000
-7,2050,R2,2025,solarPV,19.39350000000
-7,2054,R2,2025,solarPV,19.39350000000
-8,2035,R2,2030,solarPV,11.42930000000
-8,2040,R2,2030,solarPV,11.42930000000
-8,2045,R2,2030,solarPV,11.42930000000
-8,2049,R2,2030,solarPV,11.42930000000
-8,2050,R2,2030,solarPV,11.42930000000
-8,2054,R2,2030,solarPV,11.42930000000
-8,2055,R2,2030,solarPV,11.42930000000
-8,2059,R2,2030,solarPV,11.42930000000
+3,2030,R1,2025,solarPV,19.21000000000
+3,2035,R1,2025,solarPV,19.21000000000
+3,2040,R1,2025,solarPV,19.21000000000
+3,2045,R1,2025,solarPV,19.21000000000
+3,2049,R1,2025,solarPV,19.21000000000
+3,2050,R1,2025,solarPV,19.21000000000
+3,2054,R1,2025,solarPV,19.21000000000
+4,2035,R1,2030,solarPV,11.20000000000
+4,2040,R1,2030,solarPV,11.20000000000
+4,2045,R1,2030,solarPV,11.20000000000
+4,2049,R1,2030,solarPV,11.20000000000
+4,2050,R1,2030,solarPV,11.20000000000
+4,2054,R1,2030,solarPV,11.20000000000
+4,2055,R1,2030,solarPV,11.20000000000
+4,2059,R1,2030,solarPV,11.20000000000
+6,2030,R2,2020,windturbine,32.55000000000
+6,2035,R2,2020,windturbine,32.55000000000
+6,2040,R2,2020,windturbine,32.55000000000
+6,2045,R2,2020,windturbine,32.55000000000
+6,2049,R2,2020,windturbine,32.55000000000
+7,2030,R2,2025,solarPV,19.21000000000
+7,2035,R2,2025,solarPV,19.21000000000
+7,2040,R2,2025,solarPV,19.21000000000
+7,2045,R2,2025,solarPV,19.21000000000
+7,2049,R2,2025,solarPV,19.21000000000
+7,2050,R2,2025,solarPV,19.21000000000
+7,2054,R2,2025,solarPV,19.21000000000
+8,2035,R2,2030,solarPV,11.20000000000
+8,2040,R2,2030,solarPV,11.20000000000
+8,2045,R2,2030,solarPV,11.20000000000
+8,2049,R2,2030,solarPV,11.20000000000
+8,2050,R2,2030,solarPV,11.20000000000
+8,2054,R2,2030,solarPV,11.20000000000
+8,2055,R2,2030,solarPV,11.20000000000
+8,2059,R2,2030,solarPV,11.20000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index 18d94a50..47c177de 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -1,59 +1,59 @@
 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
+1,2035,R1,2020,solarPV,12.55000000000
+1,2040,R1,2020,solarPV,12.55000000000
+1,2045,R1,2020,solarPV,12.55000000000
+1,2049,R1,2020,solarPV,12.55000000000
 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,solarPV,19.39350000000
-3,2040,R1,2025,solarPV,19.39350000000
-3,2045,R1,2025,solarPV,19.39350000000
-3,2049,R1,2025,solarPV,19.39350000000
-3,2050,R1,2025,solarPV,19.39350000000
-3,2054,R1,2025,solarPV,19.39350000000
-4,2035,R1,2030,solarPV,11.42930000000
-4,2040,R1,2030,solarPV,11.42930000000
-4,2045,R1,2030,solarPV,11.42930000000
-4,2049,R1,2030,solarPV,11.42930000000
-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,2040,R1,2035,solarPV,15.71520000000
-5,2045,R1,2035,solarPV,15.71520000000
-5,2049,R1,2035,solarPV,15.71520000000
-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
-7,2035,R2,2020,windturbine,33.46730000000
-7,2040,R2,2020,windturbine,33.46730000000
-7,2045,R2,2020,windturbine,33.46730000000
-7,2049,R2,2020,windturbine,33.46730000000
-8,2035,R2,2025,solarPV,19.39350000000
-8,2040,R2,2025,solarPV,19.39350000000
-8,2045,R2,2025,solarPV,19.39350000000
-8,2049,R2,2025,solarPV,19.39350000000
-8,2050,R2,2025,solarPV,19.39350000000
-8,2054,R2,2025,solarPV,19.39350000000
-9,2035,R2,2030,solarPV,11.42930000000
-9,2040,R2,2030,solarPV,11.42930000000
-9,2045,R2,2030,solarPV,11.42930000000
-9,2049,R2,2030,solarPV,11.42930000000
-9,2050,R2,2030,solarPV,11.42930000000
-9,2054,R2,2030,solarPV,11.42930000000
-9,2055,R2,2030,solarPV,11.42930000000
-9,2059,R2,2030,solarPV,11.42930000000
-10,2040,R2,2035,solarPV,15.71520000000
-10,2045,R2,2035,solarPV,15.71520000000
-10,2049,R2,2035,solarPV,15.71520000000
-10,2050,R2,2035,solarPV,15.71520000000
-10,2054,R2,2035,solarPV,15.71520000000
-10,2055,R2,2035,solarPV,15.71520000000
-10,2059,R2,2035,solarPV,15.71520000000
-10,2060,R2,2035,solarPV,15.71520000000
-10,2064,R2,2035,solarPV,15.71520000000
+3,2035,R1,2025,solarPV,19.21000000000
+3,2040,R1,2025,solarPV,19.21000000000
+3,2045,R1,2025,solarPV,19.21000000000
+3,2049,R1,2025,solarPV,19.21000000000
+3,2050,R1,2025,solarPV,19.21000000000
+3,2054,R1,2025,solarPV,19.21000000000
+4,2035,R1,2030,solarPV,11.20000000000
+4,2040,R1,2030,solarPV,11.20000000000
+4,2045,R1,2030,solarPV,11.20000000000
+4,2049,R1,2030,solarPV,11.20000000000
+4,2050,R1,2030,solarPV,11.20000000000
+4,2054,R1,2030,solarPV,11.20000000000
+4,2055,R1,2030,solarPV,11.20000000000
+4,2059,R1,2030,solarPV,11.20000000000
+5,2040,R1,2035,solarPV,15.44000000000
+5,2045,R1,2035,solarPV,15.44000000000
+5,2049,R1,2035,solarPV,15.44000000000
+5,2050,R1,2035,solarPV,15.44000000000
+5,2054,R1,2035,solarPV,15.44000000000
+5,2055,R1,2035,solarPV,15.44000000000
+5,2059,R1,2035,solarPV,15.44000000000
+5,2060,R1,2035,solarPV,15.44000000000
+5,2064,R1,2035,solarPV,15.44000000000
+7,2035,R2,2020,windturbine,32.55000000000
+7,2040,R2,2020,windturbine,32.55000000000
+7,2045,R2,2020,windturbine,32.55000000000
+7,2049,R2,2020,windturbine,32.55000000000
+8,2035,R2,2025,solarPV,19.21000000000
+8,2040,R2,2025,solarPV,19.21000000000
+8,2045,R2,2025,solarPV,19.21000000000
+8,2049,R2,2025,solarPV,19.21000000000
+8,2050,R2,2025,solarPV,19.21000000000
+8,2054,R2,2025,solarPV,19.21000000000
+9,2035,R2,2030,solarPV,11.20000000000
+9,2040,R2,2030,solarPV,11.20000000000
+9,2045,R2,2030,solarPV,11.20000000000
+9,2049,R2,2030,solarPV,11.20000000000
+9,2050,R2,2030,solarPV,11.20000000000
+9,2054,R2,2030,solarPV,11.20000000000
+9,2055,R2,2030,solarPV,11.20000000000
+9,2059,R2,2030,solarPV,11.20000000000
+10,2040,R2,2035,solarPV,15.44000000000
+10,2045,R2,2035,solarPV,15.44000000000
+10,2049,R2,2035,solarPV,15.44000000000
+10,2050,R2,2035,solarPV,15.44000000000
+10,2054,R2,2035,solarPV,15.44000000000
+10,2055,R2,2035,solarPV,15.44000000000
+10,2059,R2,2035,solarPV,15.44000000000
+10,2060,R2,2035,solarPV,15.44000000000
+10,2064,R2,2035,solarPV,15.44000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index 24b94b36..e5961aa4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -1,72 +1,72 @@
 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
+1,2040,R1,2020,solarPV,12.55000000000
+1,2045,R1,2020,solarPV,12.55000000000
+1,2049,R1,2020,solarPV,12.55000000000
 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,solarPV,19.39350000000
-3,2045,R1,2025,solarPV,19.39350000000
-3,2049,R1,2025,solarPV,19.39350000000
-3,2050,R1,2025,solarPV,19.39350000000
-3,2054,R1,2025,solarPV,19.39350000000
-4,2040,R1,2030,solarPV,11.42930000000
-4,2045,R1,2030,solarPV,11.42930000000
-4,2049,R1,2030,solarPV,11.42930000000
-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,2040,R1,2035,solarPV,15.71520000000
-5,2045,R1,2035,solarPV,15.71520000000
-5,2049,R1,2035,solarPV,15.71520000000
-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,2045,R1,2040,solarPV,11.42930000000
-6,2049,R1,2040,solarPV,11.42930000000
-6,2050,R1,2040,solarPV,11.42930000000
-6,2054,R1,2040,solarPV,11.42930000000
-6,2055,R1,2040,solarPV,11.42930000000
-6,2059,R1,2040,solarPV,11.42930000000
-6,2060,R1,2040,solarPV,11.42930000000
-6,2064,R1,2040,solarPV,11.42930000000
-6,2065,R1,2040,solarPV,11.42930000000
-6,2069,R1,2040,solarPV,11.42930000000
-8,2040,R2,2020,windturbine,33.46730000000
-8,2045,R2,2020,windturbine,33.46730000000
-8,2049,R2,2020,windturbine,33.46730000000
-9,2040,R2,2025,solarPV,19.39350000000
-9,2045,R2,2025,solarPV,19.39350000000
-9,2049,R2,2025,solarPV,19.39350000000
-9,2050,R2,2025,solarPV,19.39350000000
-9,2054,R2,2025,solarPV,19.39350000000
-10,2040,R2,2030,solarPV,11.42930000000
-10,2045,R2,2030,solarPV,11.42930000000
-10,2049,R2,2030,solarPV,11.42930000000
-10,2050,R2,2030,solarPV,11.42930000000
-10,2054,R2,2030,solarPV,11.42930000000
-10,2055,R2,2030,solarPV,11.42930000000
-10,2059,R2,2030,solarPV,11.42930000000
-11,2040,R2,2035,solarPV,15.71520000000
-11,2045,R2,2035,solarPV,15.71520000000
-11,2049,R2,2035,solarPV,15.71520000000
-11,2050,R2,2035,solarPV,15.71520000000
-11,2054,R2,2035,solarPV,15.71520000000
-11,2055,R2,2035,solarPV,15.71520000000
-11,2059,R2,2035,solarPV,15.71520000000
-11,2060,R2,2035,solarPV,15.71520000000
-11,2064,R2,2035,solarPV,15.71520000000
-12,2045,R2,2040,solarPV,11.42930000000
-12,2049,R2,2040,solarPV,11.42930000000
-12,2050,R2,2040,solarPV,11.42930000000
-12,2054,R2,2040,solarPV,11.42930000000
-12,2055,R2,2040,solarPV,11.42930000000
-12,2059,R2,2040,solarPV,11.42930000000
-12,2060,R2,2040,solarPV,11.42930000000
-12,2064,R2,2040,solarPV,11.42930000000
-12,2065,R2,2040,solarPV,11.42930000000
-12,2069,R2,2040,solarPV,11.42930000000
+3,2040,R1,2025,solarPV,19.21000000000
+3,2045,R1,2025,solarPV,19.21000000000
+3,2049,R1,2025,solarPV,19.21000000000
+3,2050,R1,2025,solarPV,19.21000000000
+3,2054,R1,2025,solarPV,19.21000000000
+4,2040,R1,2030,solarPV,11.20000000000
+4,2045,R1,2030,solarPV,11.20000000000
+4,2049,R1,2030,solarPV,11.20000000000
+4,2050,R1,2030,solarPV,11.20000000000
+4,2054,R1,2030,solarPV,11.20000000000
+4,2055,R1,2030,solarPV,11.20000000000
+4,2059,R1,2030,solarPV,11.20000000000
+5,2040,R1,2035,solarPV,15.44000000000
+5,2045,R1,2035,solarPV,15.44000000000
+5,2049,R1,2035,solarPV,15.44000000000
+5,2050,R1,2035,solarPV,15.44000000000
+5,2054,R1,2035,solarPV,15.44000000000
+5,2055,R1,2035,solarPV,15.44000000000
+5,2059,R1,2035,solarPV,15.44000000000
+5,2060,R1,2035,solarPV,15.44000000000
+5,2064,R1,2035,solarPV,15.44000000000
+6,2045,R1,2040,solarPV,11.20000000000
+6,2049,R1,2040,solarPV,11.20000000000
+6,2050,R1,2040,solarPV,11.20000000000
+6,2054,R1,2040,solarPV,11.20000000000
+6,2055,R1,2040,solarPV,11.20000000000
+6,2059,R1,2040,solarPV,11.20000000000
+6,2060,R1,2040,solarPV,11.20000000000
+6,2064,R1,2040,solarPV,11.20000000000
+6,2065,R1,2040,solarPV,11.20000000000
+6,2069,R1,2040,solarPV,11.20000000000
+8,2040,R2,2020,windturbine,32.55000000000
+8,2045,R2,2020,windturbine,32.55000000000
+8,2049,R2,2020,windturbine,32.55000000000
+9,2040,R2,2025,solarPV,19.21000000000
+9,2045,R2,2025,solarPV,19.21000000000
+9,2049,R2,2025,solarPV,19.21000000000
+9,2050,R2,2025,solarPV,19.21000000000
+9,2054,R2,2025,solarPV,19.21000000000
+10,2040,R2,2030,solarPV,11.20000000000
+10,2045,R2,2030,solarPV,11.20000000000
+10,2049,R2,2030,solarPV,11.20000000000
+10,2050,R2,2030,solarPV,11.20000000000
+10,2054,R2,2030,solarPV,11.20000000000
+10,2055,R2,2030,solarPV,11.20000000000
+10,2059,R2,2030,solarPV,11.20000000000
+11,2040,R2,2035,solarPV,15.44000000000
+11,2045,R2,2035,solarPV,15.44000000000
+11,2049,R2,2035,solarPV,15.44000000000
+11,2050,R2,2035,solarPV,15.44000000000
+11,2054,R2,2035,solarPV,15.44000000000
+11,2055,R2,2035,solarPV,15.44000000000
+11,2059,R2,2035,solarPV,15.44000000000
+11,2060,R2,2035,solarPV,15.44000000000
+11,2064,R2,2035,solarPV,15.44000000000
+12,2045,R2,2040,solarPV,11.20000000000
+12,2049,R2,2040,solarPV,11.20000000000
+12,2050,R2,2040,solarPV,11.20000000000
+12,2054,R2,2040,solarPV,11.20000000000
+12,2055,R2,2040,solarPV,11.20000000000
+12,2059,R2,2040,solarPV,11.20000000000
+12,2060,R2,2040,solarPV,11.20000000000
+12,2064,R2,2040,solarPV,11.20000000000
+12,2065,R2,2040,solarPV,11.20000000000
+12,2069,R2,2040,solarPV,11.20000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index 71ebc5c4..24fc7b49 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,103 +1,103 @@
 asset,year,technology,region,installed,capacity
-0,2045,solarPV,R1,2020,13.46730000000
-0,2049,solarPV,R1,2020,13.46730000000
-1,2045,solarPV,R1,2025,19.39350000000
-1,2049,solarPV,R1,2025,19.39350000000
-1,2050,solarPV,R1,2025,19.39350000000
-1,2054,solarPV,R1,2025,19.39350000000
-2,2045,solarPV,R1,2030,11.42930000000
-2,2049,solarPV,R1,2030,11.42930000000
-2,2050,solarPV,R1,2030,11.42930000000
-2,2054,solarPV,R1,2030,11.42930000000
-2,2055,solarPV,R1,2030,11.42930000000
-2,2059,solarPV,R1,2030,11.42930000000
-3,2045,solarPV,R1,2035,15.71520000000
-3,2049,solarPV,R1,2035,15.71520000000
-3,2050,solarPV,R1,2035,15.71520000000
-3,2054,solarPV,R1,2035,15.71520000000
-3,2055,solarPV,R1,2035,15.71520000000
-3,2059,solarPV,R1,2035,15.71520000000
-3,2060,solarPV,R1,2035,15.71520000000
-3,2064,solarPV,R1,2035,15.71520000000
-4,2045,solarPV,R1,2040,11.42930000000
-4,2049,solarPV,R1,2040,11.42930000000
-4,2050,solarPV,R1,2040,11.42930000000
-4,2054,solarPV,R1,2040,11.42930000000
-4,2055,solarPV,R1,2040,11.42930000000
-4,2059,solarPV,R1,2040,11.42930000000
-4,2060,solarPV,R1,2040,11.42930000000
-4,2064,solarPV,R1,2040,11.42930000000
-4,2065,solarPV,R1,2040,11.42930000000
-4,2069,solarPV,R1,2040,11.42930000000
-5,2050,solarPV,R1,2045,31.42930000000
-5,2054,solarPV,R1,2045,31.42930000000
-5,2055,solarPV,R1,2045,31.42930000000
-5,2059,solarPV,R1,2045,31.42930000000
-5,2060,solarPV,R1,2045,31.42930000000
-5,2064,solarPV,R1,2045,31.42930000000
-5,2065,solarPV,R1,2045,31.42930000000
-5,2069,solarPV,R1,2045,31.42930000000
-5,2070,solarPV,R1,2045,31.42930000000
-5,2074,solarPV,R1,2045,31.42930000000
-6,2045,solarPV,R2,2025,19.39350000000
-6,2049,solarPV,R2,2025,19.39350000000
-6,2050,solarPV,R2,2025,19.39350000000
-6,2054,solarPV,R2,2025,19.39350000000
-7,2045,solarPV,R2,2030,11.42930000000
-7,2049,solarPV,R2,2030,11.42930000000
-7,2050,solarPV,R2,2030,11.42930000000
-7,2054,solarPV,R2,2030,11.42930000000
-7,2055,solarPV,R2,2030,11.42930000000
-7,2059,solarPV,R2,2030,11.42930000000
-8,2045,solarPV,R2,2035,15.71520000000
-8,2049,solarPV,R2,2035,15.71520000000
-8,2050,solarPV,R2,2035,15.71520000000
-8,2054,solarPV,R2,2035,15.71520000000
-8,2055,solarPV,R2,2035,15.71520000000
-8,2059,solarPV,R2,2035,15.71520000000
-8,2060,solarPV,R2,2035,15.71520000000
-8,2064,solarPV,R2,2035,15.71520000000
-9,2045,solarPV,R2,2040,11.42930000000
-9,2049,solarPV,R2,2040,11.42930000000
-9,2050,solarPV,R2,2040,11.42930000000
-9,2054,solarPV,R2,2040,11.42930000000
-9,2055,solarPV,R2,2040,11.42930000000
-9,2059,solarPV,R2,2040,11.42930000000
-9,2060,solarPV,R2,2040,11.42930000000
-9,2064,solarPV,R2,2040,11.42930000000
-9,2065,solarPV,R2,2040,11.42930000000
-9,2069,solarPV,R2,2040,11.42930000000
-10,2050,solarPV,R2,2045,31.42930000000
-10,2054,solarPV,R2,2045,31.42930000000
-10,2055,solarPV,R2,2045,31.42930000000
-10,2059,solarPV,R2,2045,31.42930000000
-10,2060,solarPV,R2,2045,31.42930000000
-10,2064,solarPV,R2,2045,31.42930000000
-10,2065,solarPV,R2,2045,31.42930000000
-10,2069,solarPV,R2,2045,31.42930000000
-10,2070,solarPV,R2,2045,31.42930000000
-10,2074,solarPV,R2,2045,31.42930000000
+0,2045,solarPV,R1,2020,12.55000000000
+0,2049,solarPV,R1,2020,12.55000000000
+1,2045,solarPV,R1,2025,19.21000000000
+1,2049,solarPV,R1,2025,19.21000000000
+1,2050,solarPV,R1,2025,19.21000000000
+1,2054,solarPV,R1,2025,19.21000000000
+2,2045,solarPV,R1,2030,11.20000000000
+2,2049,solarPV,R1,2030,11.20000000000
+2,2050,solarPV,R1,2030,11.20000000000
+2,2054,solarPV,R1,2030,11.20000000000
+2,2055,solarPV,R1,2030,11.20000000000
+2,2059,solarPV,R1,2030,11.20000000000
+3,2045,solarPV,R1,2035,15.44000000000
+3,2049,solarPV,R1,2035,15.44000000000
+3,2050,solarPV,R1,2035,15.44000000000
+3,2054,solarPV,R1,2035,15.44000000000
+3,2055,solarPV,R1,2035,15.44000000000
+3,2059,solarPV,R1,2035,15.44000000000
+3,2060,solarPV,R1,2035,15.44000000000
+3,2064,solarPV,R1,2035,15.44000000000
+4,2045,solarPV,R1,2040,11.20000000000
+4,2049,solarPV,R1,2040,11.20000000000
+4,2050,solarPV,R1,2040,11.20000000000
+4,2054,solarPV,R1,2040,11.20000000000
+4,2055,solarPV,R1,2040,11.20000000000
+4,2059,solarPV,R1,2040,11.20000000000
+4,2060,solarPV,R1,2040,11.20000000000
+4,2064,solarPV,R1,2040,11.20000000000
+4,2065,solarPV,R1,2040,11.20000000000
+4,2069,solarPV,R1,2040,11.20000000000
+5,2050,solarPV,R1,2045,31.20000000000
+5,2054,solarPV,R1,2045,31.20000000000
+5,2055,solarPV,R1,2045,31.20000000000
+5,2059,solarPV,R1,2045,31.20000000000
+5,2060,solarPV,R1,2045,31.20000000000
+5,2064,solarPV,R1,2045,31.20000000000
+5,2065,solarPV,R1,2045,31.20000000000
+5,2069,solarPV,R1,2045,31.20000000000
+5,2070,solarPV,R1,2045,31.20000000000
+5,2074,solarPV,R1,2045,31.20000000000
+6,2045,solarPV,R2,2025,19.21000000000
+6,2049,solarPV,R2,2025,19.21000000000
+6,2050,solarPV,R2,2025,19.21000000000
+6,2054,solarPV,R2,2025,19.21000000000
+7,2045,solarPV,R2,2030,11.20000000000
+7,2049,solarPV,R2,2030,11.20000000000
+7,2050,solarPV,R2,2030,11.20000000000
+7,2054,solarPV,R2,2030,11.20000000000
+7,2055,solarPV,R2,2030,11.20000000000
+7,2059,solarPV,R2,2030,11.20000000000
+8,2045,solarPV,R2,2035,15.44000000000
+8,2049,solarPV,R2,2035,15.44000000000
+8,2050,solarPV,R2,2035,15.44000000000
+8,2054,solarPV,R2,2035,15.44000000000
+8,2055,solarPV,R2,2035,15.44000000000
+8,2059,solarPV,R2,2035,15.44000000000
+8,2060,solarPV,R2,2035,15.44000000000
+8,2064,solarPV,R2,2035,15.44000000000
+9,2045,solarPV,R2,2040,11.20000000000
+9,2049,solarPV,R2,2040,11.20000000000
+9,2050,solarPV,R2,2040,11.20000000000
+9,2054,solarPV,R2,2040,11.20000000000
+9,2055,solarPV,R2,2040,11.20000000000
+9,2059,solarPV,R2,2040,11.20000000000
+9,2060,solarPV,R2,2040,11.20000000000
+9,2064,solarPV,R2,2040,11.20000000000
+9,2065,solarPV,R2,2040,11.20000000000
+9,2069,solarPV,R2,2040,11.20000000000
+10,2050,solarPV,R2,2045,31.20000000000
+10,2054,solarPV,R2,2045,31.20000000000
+10,2055,solarPV,R2,2045,31.20000000000
+10,2059,solarPV,R2,2045,31.20000000000
+10,2060,solarPV,R2,2045,31.20000000000
+10,2064,solarPV,R2,2045,31.20000000000
+10,2065,solarPV,R2,2045,31.20000000000
+10,2069,solarPV,R2,2045,31.20000000000
+10,2070,solarPV,R2,2045,31.20000000000
+10,2074,solarPV,R2,2045,31.20000000000
 11,2045,windturbine,R1,2020,20.00000000000
 11,2049,windturbine,R1,2020,20.00000000000
-12,2050,windturbine,R1,2045,13.46730000000
-12,2054,windturbine,R1,2045,13.46730000000
-12,2055,windturbine,R1,2045,13.46730000000
-12,2059,windturbine,R1,2045,13.46730000000
-12,2060,windturbine,R1,2045,13.46730000000
-12,2064,windturbine,R1,2045,13.46730000000
-12,2065,windturbine,R1,2045,13.46730000000
-12,2069,windturbine,R1,2045,13.46730000000
-12,2070,windturbine,R1,2045,13.46730000000
-12,2074,windturbine,R1,2045,13.46730000000
-13,2045,windturbine,R2,2020,33.46730000000
-13,2049,windturbine,R2,2020,33.46730000000
-14,2050,windturbine,R2,2045,13.46730000000
-14,2054,windturbine,R2,2045,13.46730000000
-14,2055,windturbine,R2,2045,13.46730000000
-14,2059,windturbine,R2,2045,13.46730000000
-14,2060,windturbine,R2,2045,13.46730000000
-14,2064,windturbine,R2,2045,13.46730000000
-14,2065,windturbine,R2,2045,13.46730000000
-14,2069,windturbine,R2,2045,13.46730000000
-14,2070,windturbine,R2,2045,13.46730000000
-14,2074,windturbine,R2,2045,13.46730000000
+12,2050,windturbine,R1,2045,12.55000000000
+12,2054,windturbine,R1,2045,12.55000000000
+12,2055,windturbine,R1,2045,12.55000000000
+12,2059,windturbine,R1,2045,12.55000000000
+12,2060,windturbine,R1,2045,12.55000000000
+12,2064,windturbine,R1,2045,12.55000000000
+12,2065,windturbine,R1,2045,12.55000000000
+12,2069,windturbine,R1,2045,12.55000000000
+12,2070,windturbine,R1,2045,12.55000000000
+12,2074,windturbine,R1,2045,12.55000000000
+13,2045,windturbine,R2,2020,32.55000000000
+13,2049,windturbine,R2,2020,32.55000000000
+14,2050,windturbine,R2,2045,12.55000000000
+14,2054,windturbine,R2,2045,12.55000000000
+14,2055,windturbine,R2,2045,12.55000000000
+14,2059,windturbine,R2,2045,12.55000000000
+14,2060,windturbine,R2,2045,12.55000000000
+14,2064,windturbine,R2,2045,12.55000000000
+14,2065,windturbine,R2,2045,12.55000000000
+14,2069,windturbine,R2,2045,12.55000000000
+14,2070,windturbine,R2,2045,12.55000000000
+14,2074,windturbine,R2,2045,12.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index d79ef3ab..c6c24b25 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,101 +1,101 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,19.39350000000
-2,2054,R1,2025,solarPV,19.39350000000
-3,2050,R1,2030,solarPV,11.42930000000
-3,2054,R1,2030,solarPV,11.42930000000
-3,2055,R1,2030,solarPV,11.42930000000
-3,2059,R1,2030,solarPV,11.42930000000
-4,2050,R1,2035,solarPV,15.71520000000
-4,2054,R1,2035,solarPV,15.71520000000
-4,2055,R1,2035,solarPV,15.71520000000
-4,2059,R1,2035,solarPV,15.71520000000
-4,2060,R1,2035,solarPV,15.71520000000
-4,2064,R1,2035,solarPV,15.71520000000
-5,2050,R1,2040,solarPV,11.42930000000
-5,2054,R1,2040,solarPV,11.42930000000
-5,2055,R1,2040,solarPV,11.42930000000
-5,2059,R1,2040,solarPV,11.42930000000
-5,2060,R1,2040,solarPV,11.42930000000
-5,2064,R1,2040,solarPV,11.42930000000
-5,2065,R1,2040,solarPV,11.42930000000
-5,2069,R1,2040,solarPV,11.42930000000
-6,2050,R1,2045,solarPV,31.42930000000
-6,2054,R1,2045,solarPV,31.42930000000
-6,2055,R1,2045,solarPV,31.42930000000
-6,2059,R1,2045,solarPV,31.42930000000
-6,2060,R1,2045,solarPV,31.42930000000
-6,2064,R1,2045,solarPV,31.42930000000
-6,2065,R1,2045,solarPV,31.42930000000
-6,2069,R1,2045,solarPV,31.42930000000
-6,2070,R1,2045,solarPV,31.42930000000
-6,2074,R1,2045,solarPV,31.42930000000
-7,2050,R1,2045,windturbine,13.46730000000
-7,2054,R1,2045,windturbine,13.46730000000
-7,2055,R1,2045,windturbine,13.46730000000
-7,2059,R1,2045,windturbine,13.46730000000
-7,2060,R1,2045,windturbine,13.46730000000
-7,2064,R1,2045,windturbine,13.46730000000
-7,2065,R1,2045,windturbine,13.46730000000
-7,2069,R1,2045,windturbine,13.46730000000
-7,2070,R1,2045,windturbine,13.46730000000
-7,2074,R1,2045,windturbine,13.46730000000
-8,2055,R1,2050,solarPV,19.39350000000
-8,2059,R1,2050,solarPV,19.39350000000
-8,2060,R1,2050,solarPV,19.39350000000
-8,2064,R1,2050,solarPV,19.39350000000
-8,2065,R1,2050,solarPV,19.39350000000
-8,2069,R1,2050,solarPV,19.39350000000
-8,2070,R1,2050,solarPV,19.39350000000
-8,2074,R1,2050,solarPV,19.39350000000
-8,2075,R1,2050,solarPV,19.39350000000
-8,2079,R1,2050,solarPV,19.39350000000
-10,2050,R2,2025,solarPV,19.39350000000
-10,2054,R2,2025,solarPV,19.39350000000
-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
-12,2050,R2,2035,solarPV,15.71520000000
-12,2054,R2,2035,solarPV,15.71520000000
-12,2055,R2,2035,solarPV,15.71520000000
-12,2059,R2,2035,solarPV,15.71520000000
-12,2060,R2,2035,solarPV,15.71520000000
-12,2064,R2,2035,solarPV,15.71520000000
-13,2050,R2,2040,solarPV,11.42930000000
-13,2054,R2,2040,solarPV,11.42930000000
-13,2055,R2,2040,solarPV,11.42930000000
-13,2059,R2,2040,solarPV,11.42930000000
-13,2060,R2,2040,solarPV,11.42930000000
-13,2064,R2,2040,solarPV,11.42930000000
-13,2065,R2,2040,solarPV,11.42930000000
-13,2069,R2,2040,solarPV,11.42930000000
-14,2050,R2,2045,solarPV,31.42930000000
-14,2054,R2,2045,solarPV,31.42930000000
-14,2055,R2,2045,solarPV,31.42930000000
-14,2059,R2,2045,solarPV,31.42930000000
-14,2060,R2,2045,solarPV,31.42930000000
-14,2064,R2,2045,solarPV,31.42930000000
-14,2065,R2,2045,solarPV,31.42930000000
-14,2069,R2,2045,solarPV,31.42930000000
-14,2070,R2,2045,solarPV,31.42930000000
-14,2074,R2,2045,solarPV,31.42930000000
-15,2050,R2,2045,windturbine,13.46730000000
-15,2054,R2,2045,windturbine,13.46730000000
-15,2055,R2,2045,windturbine,13.46730000000
-15,2059,R2,2045,windturbine,13.46730000000
-15,2060,R2,2045,windturbine,13.46730000000
-15,2064,R2,2045,windturbine,13.46730000000
-15,2065,R2,2045,windturbine,13.46730000000
-15,2069,R2,2045,windturbine,13.46730000000
-15,2070,R2,2045,windturbine,13.46730000000
-15,2074,R2,2045,windturbine,13.46730000000
-16,2055,R2,2050,solarPV,19.39350000000
-16,2059,R2,2050,solarPV,19.39350000000
-16,2060,R2,2050,solarPV,19.39350000000
-16,2064,R2,2050,solarPV,19.39350000000
-16,2065,R2,2050,solarPV,19.39350000000
-16,2069,R2,2050,solarPV,19.39350000000
-16,2070,R2,2050,solarPV,19.39350000000
-16,2074,R2,2050,solarPV,19.39350000000
-16,2075,R2,2050,solarPV,19.39350000000
-16,2079,R2,2050,solarPV,19.39350000000
+2,2050,R1,2025,solarPV,19.21000000000
+2,2054,R1,2025,solarPV,19.21000000000
+3,2050,R1,2030,solarPV,11.20000000000
+3,2054,R1,2030,solarPV,11.20000000000
+3,2055,R1,2030,solarPV,11.20000000000
+3,2059,R1,2030,solarPV,11.20000000000
+4,2050,R1,2035,solarPV,15.44000000000
+4,2054,R1,2035,solarPV,15.44000000000
+4,2055,R1,2035,solarPV,15.44000000000
+4,2059,R1,2035,solarPV,15.44000000000
+4,2060,R1,2035,solarPV,15.44000000000
+4,2064,R1,2035,solarPV,15.44000000000
+5,2050,R1,2040,solarPV,11.20000000000
+5,2054,R1,2040,solarPV,11.20000000000
+5,2055,R1,2040,solarPV,11.20000000000
+5,2059,R1,2040,solarPV,11.20000000000
+5,2060,R1,2040,solarPV,11.20000000000
+5,2064,R1,2040,solarPV,11.20000000000
+5,2065,R1,2040,solarPV,11.20000000000
+5,2069,R1,2040,solarPV,11.20000000000
+6,2050,R1,2045,solarPV,31.20000000000
+6,2054,R1,2045,solarPV,31.20000000000
+6,2055,R1,2045,solarPV,31.20000000000
+6,2059,R1,2045,solarPV,31.20000000000
+6,2060,R1,2045,solarPV,31.20000000000
+6,2064,R1,2045,solarPV,31.20000000000
+6,2065,R1,2045,solarPV,31.20000000000
+6,2069,R1,2045,solarPV,31.20000000000
+6,2070,R1,2045,solarPV,31.20000000000
+6,2074,R1,2045,solarPV,31.20000000000
+7,2050,R1,2045,windturbine,12.55000000000
+7,2054,R1,2045,windturbine,12.55000000000
+7,2055,R1,2045,windturbine,12.55000000000
+7,2059,R1,2045,windturbine,12.55000000000
+7,2060,R1,2045,windturbine,12.55000000000
+7,2064,R1,2045,windturbine,12.55000000000
+7,2065,R1,2045,windturbine,12.55000000000
+7,2069,R1,2045,windturbine,12.55000000000
+7,2070,R1,2045,windturbine,12.55000000000
+7,2074,R1,2045,windturbine,12.55000000000
+8,2055,R1,2050,solarPV,19.21000000000
+8,2059,R1,2050,solarPV,19.21000000000
+8,2060,R1,2050,solarPV,19.21000000000
+8,2064,R1,2050,solarPV,19.21000000000
+8,2065,R1,2050,solarPV,19.21000000000
+8,2069,R1,2050,solarPV,19.21000000000
+8,2070,R1,2050,solarPV,19.21000000000
+8,2074,R1,2050,solarPV,19.21000000000
+8,2075,R1,2050,solarPV,19.21000000000
+8,2079,R1,2050,solarPV,19.21000000000
+10,2050,R2,2025,solarPV,19.21000000000
+10,2054,R2,2025,solarPV,19.21000000000
+11,2050,R2,2030,solarPV,11.20000000000
+11,2054,R2,2030,solarPV,11.20000000000
+11,2055,R2,2030,solarPV,11.20000000000
+11,2059,R2,2030,solarPV,11.20000000000
+12,2050,R2,2035,solarPV,15.44000000000
+12,2054,R2,2035,solarPV,15.44000000000
+12,2055,R2,2035,solarPV,15.44000000000
+12,2059,R2,2035,solarPV,15.44000000000
+12,2060,R2,2035,solarPV,15.44000000000
+12,2064,R2,2035,solarPV,15.44000000000
+13,2050,R2,2040,solarPV,11.20000000000
+13,2054,R2,2040,solarPV,11.20000000000
+13,2055,R2,2040,solarPV,11.20000000000
+13,2059,R2,2040,solarPV,11.20000000000
+13,2060,R2,2040,solarPV,11.20000000000
+13,2064,R2,2040,solarPV,11.20000000000
+13,2065,R2,2040,solarPV,11.20000000000
+13,2069,R2,2040,solarPV,11.20000000000
+14,2050,R2,2045,solarPV,31.20000000000
+14,2054,R2,2045,solarPV,31.20000000000
+14,2055,R2,2045,solarPV,31.20000000000
+14,2059,R2,2045,solarPV,31.20000000000
+14,2060,R2,2045,solarPV,31.20000000000
+14,2064,R2,2045,solarPV,31.20000000000
+14,2065,R2,2045,solarPV,31.20000000000
+14,2069,R2,2045,solarPV,31.20000000000
+14,2070,R2,2045,solarPV,31.20000000000
+14,2074,R2,2045,solarPV,31.20000000000
+15,2050,R2,2045,windturbine,12.55000000000
+15,2054,R2,2045,windturbine,12.55000000000
+15,2055,R2,2045,windturbine,12.55000000000
+15,2059,R2,2045,windturbine,12.55000000000
+15,2060,R2,2045,windturbine,12.55000000000
+15,2064,R2,2045,windturbine,12.55000000000
+15,2065,R2,2045,windturbine,12.55000000000
+15,2069,R2,2045,windturbine,12.55000000000
+15,2070,R2,2045,windturbine,12.55000000000
+15,2074,R2,2045,windturbine,12.55000000000
+16,2055,R2,2050,solarPV,19.21000000000
+16,2059,R2,2050,solarPV,19.21000000000
+16,2060,R2,2050,solarPV,19.21000000000
+16,2064,R2,2050,solarPV,19.21000000000
+16,2065,R2,2050,solarPV,19.21000000000
+16,2069,R2,2050,solarPV,19.21000000000
+16,2070,R2,2050,solarPV,19.21000000000
+16,2074,R2,2050,solarPV,19.21000000000
+16,2075,R2,2050,solarPV,19.21000000000
+16,2079,R2,2050,solarPV,19.21000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
index 5db0ff89..debb0db9 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
@@ -1,10 +1,10 @@
 asset,year,technology,region,installed,capacity
-0,2025,electric_stove,R1,2020,17.85870000000
-0,2030,electric_stove,R1,2020,17.85870000000
-0,2034,electric_stove,R1,2020,17.85870000000
-1,2025,electric_stove,R2,2020,17.85870000000
-1,2030,electric_stove,R2,2020,17.85870000000
-1,2034,electric_stove,R2,2020,17.85870000000
+0,2025,electric_stove,R1,2020,17.40000000000
+0,2030,electric_stove,R1,2020,17.40000000000
+0,2034,electric_stove,R1,2020,17.40000000000
+1,2025,electric_stove,R2,2020,17.40000000000
+1,2030,electric_stove,R2,2020,17.40000000000
+1,2034,electric_stove,R2,2020,17.40000000000
 2,2020,gas_stove,R1,2020,10.00000000000
 2,2025,gas_stove,R1,2020,5.00000000000
 3,2020,gas_stove,R2,2020,10.00000000000
@@ -13,9 +13,9 @@ asset,year,technology,region,installed,capacity
 4,2025,gasboiler,R1,2020,5.00000000000
 5,2020,gasboiler,R2,2020,10.00000000000
 5,2025,gasboiler,R2,2020,5.00000000000
-6,2025,heatpump,R1,2020,17.85870000000
-6,2030,heatpump,R1,2020,17.85870000000
-6,2034,heatpump,R1,2020,17.85870000000
-7,2025,heatpump,R2,2020,17.85870000000
-7,2030,heatpump,R2,2020,17.85870000000
-7,2034,heatpump,R2,2020,17.85870000000
+6,2025,heatpump,R1,2020,17.40000000000
+6,2030,heatpump,R1,2020,17.40000000000
+6,2034,heatpump,R1,2020,17.40000000000
+7,2025,heatpump,R2,2020,17.40000000000
+7,2030,heatpump,R2,2020,17.40000000000
+7,2034,heatpump,R2,2020,17.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
index 26dcc6c8..e05cf1d9 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
@@ -1,49 +1,49 @@
 asset,year,technology,region,installed,capacity
-0,2025,electric_stove,R1,2020,17.85870000000
-0,2030,electric_stove,R1,2020,17.85870000000
-0,2034,electric_stove,R1,2020,17.85870000000
-1,2030,electric_stove,R1,2025,8.57170000000
-1,2034,electric_stove,R1,2025,8.57170000000
-1,2035,electric_stove,R1,2025,8.57170000000
-1,2039,electric_stove,R1,2025,8.57170000000
-2,2025,electric_stove,R2,2020,17.85870000000
-2,2030,electric_stove,R2,2020,17.85870000000
-2,2034,electric_stove,R2,2020,17.85870000000
-3,2030,electric_stove,R2,2025,8.57170000000
-3,2034,electric_stove,R2,2025,8.57170000000
-3,2035,electric_stove,R2,2025,8.57170000000
-3,2039,electric_stove,R2,2025,8.57170000000
+0,2025,electric_stove,R1,2020,17.40000000000
+0,2030,electric_stove,R1,2020,17.40000000000
+0,2034,electric_stove,R1,2020,17.40000000000
+1,2030,electric_stove,R1,2025,8.48000000000
+1,2034,electric_stove,R1,2025,8.48000000000
+1,2035,electric_stove,R1,2025,8.48000000000
+1,2039,electric_stove,R1,2025,8.48000000000
+2,2025,electric_stove,R2,2020,17.40000000000
+2,2030,electric_stove,R2,2020,17.40000000000
+2,2034,electric_stove,R2,2020,17.40000000000
+3,2030,electric_stove,R2,2025,8.48000000000
+3,2034,electric_stove,R2,2025,8.48000000000
+3,2035,electric_stove,R2,2025,8.48000000000
+3,2039,electric_stove,R2,2025,8.48000000000
 4,2025,gas_stove,R1,2020,5.00000000000
-5,2030,gas_stove,R1,2025,2.14290000000
-5,2034,gas_stove,R1,2025,2.14290000000
-5,2035,gas_stove,R1,2025,2.14290000000
-5,2039,gas_stove,R1,2025,2.14290000000
+5,2030,gas_stove,R1,2025,2.12000000000
+5,2034,gas_stove,R1,2025,2.12000000000
+5,2035,gas_stove,R1,2025,2.12000000000
+5,2039,gas_stove,R1,2025,2.12000000000
 6,2025,gas_stove,R2,2020,5.00000000000
-7,2030,gas_stove,R2,2025,2.14290000000
-7,2034,gas_stove,R2,2025,2.14290000000
-7,2035,gas_stove,R2,2025,2.14290000000
-7,2039,gas_stove,R2,2025,2.14290000000
+7,2030,gas_stove,R2,2025,2.12000000000
+7,2034,gas_stove,R2,2025,2.12000000000
+7,2035,gas_stove,R2,2025,2.12000000000
+7,2039,gas_stove,R2,2025,2.12000000000
 8,2025,gasboiler,R1,2020,5.00000000000
-9,2030,gasboiler,R1,2025,2.14290000000
-9,2034,gasboiler,R1,2025,2.14290000000
-9,2035,gasboiler,R1,2025,2.14290000000
-9,2039,gasboiler,R1,2025,2.14290000000
+9,2030,gasboiler,R1,2025,2.12000000000
+9,2034,gasboiler,R1,2025,2.12000000000
+9,2035,gasboiler,R1,2025,2.12000000000
+9,2039,gasboiler,R1,2025,2.12000000000
 10,2025,gasboiler,R2,2020,5.00000000000
-11,2030,gasboiler,R2,2025,2.14290000000
-11,2034,gasboiler,R2,2025,2.14290000000
-11,2035,gasboiler,R2,2025,2.14290000000
-11,2039,gasboiler,R2,2025,2.14290000000
-12,2025,heatpump,R1,2020,17.85870000000
-12,2030,heatpump,R1,2020,17.85870000000
-12,2034,heatpump,R1,2020,17.85870000000
-13,2030,heatpump,R1,2025,8.57170000000
-13,2034,heatpump,R1,2025,8.57170000000
-13,2035,heatpump,R1,2025,8.57170000000
-13,2039,heatpump,R1,2025,8.57170000000
-14,2025,heatpump,R2,2020,17.85870000000
-14,2030,heatpump,R2,2020,17.85870000000
-14,2034,heatpump,R2,2020,17.85870000000
-15,2030,heatpump,R2,2025,8.57170000000
-15,2034,heatpump,R2,2025,8.57170000000
-15,2035,heatpump,R2,2025,8.57170000000
-15,2039,heatpump,R2,2025,8.57170000000
+11,2030,gasboiler,R2,2025,2.12000000000
+11,2034,gasboiler,R2,2025,2.12000000000
+11,2035,gasboiler,R2,2025,2.12000000000
+11,2039,gasboiler,R2,2025,2.12000000000
+12,2025,heatpump,R1,2020,17.40000000000
+12,2030,heatpump,R1,2020,17.40000000000
+12,2034,heatpump,R1,2020,17.40000000000
+13,2030,heatpump,R1,2025,8.48000000000
+13,2034,heatpump,R1,2025,8.48000000000
+13,2035,heatpump,R1,2025,8.48000000000
+13,2039,heatpump,R1,2025,8.48000000000
+14,2025,heatpump,R2,2020,17.40000000000
+14,2030,heatpump,R2,2020,17.40000000000
+14,2034,heatpump,R2,2020,17.40000000000
+15,2030,heatpump,R2,2025,8.48000000000
+15,2034,heatpump,R2,2025,8.48000000000
+15,2035,heatpump,R2,2025,8.48000000000
+15,2039,heatpump,R2,2025,8.48000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
index 0db0f069..33ecdbe9 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
@@ -1,57 +1,57 @@
 asset,year,technology,region,installed,capacity
-0,2030,electric_stove,R1,2020,17.85870000000
-0,2034,electric_stove,R1,2020,17.85870000000
-1,2030,electric_stove,R1,2025,8.57170000000
-1,2034,electric_stove,R1,2025,8.57170000000
-1,2035,electric_stove,R1,2025,8.57170000000
-1,2039,electric_stove,R1,2025,8.57170000000
-2,2035,electric_stove,R1,2030,23.57330000000
-2,2039,electric_stove,R1,2030,23.57330000000
-2,2040,electric_stove,R1,2030,23.57330000000
-2,2044,electric_stove,R1,2030,23.57330000000
-3,2030,electric_stove,R2,2020,17.85870000000
-3,2034,electric_stove,R2,2020,17.85870000000
-4,2030,electric_stove,R2,2025,8.57170000000
-4,2034,electric_stove,R2,2025,8.57170000000
-4,2035,electric_stove,R2,2025,8.57170000000
-4,2039,electric_stove,R2,2025,8.57170000000
-5,2035,electric_stove,R2,2030,23.57330000000
-5,2039,electric_stove,R2,2030,23.57330000000
-5,2040,electric_stove,R2,2030,23.57330000000
-5,2044,electric_stove,R2,2030,23.57330000000
-6,2030,gas_stove,R1,2025,2.14290000000
-6,2034,gas_stove,R1,2025,2.14290000000
-6,2035,gas_stove,R1,2025,2.14290000000
-6,2039,gas_stove,R1,2025,2.14290000000
-7,2030,gas_stove,R2,2025,2.14290000000
-7,2034,gas_stove,R2,2025,2.14290000000
-7,2035,gas_stove,R2,2025,2.14290000000
-7,2039,gas_stove,R2,2025,2.14290000000
-8,2030,gasboiler,R1,2025,2.14290000000
-8,2034,gasboiler,R1,2025,2.14290000000
-8,2035,gasboiler,R1,2025,2.14290000000
-8,2039,gasboiler,R1,2025,2.14290000000
-9,2030,gasboiler,R2,2025,2.14290000000
-9,2034,gasboiler,R2,2025,2.14290000000
-9,2035,gasboiler,R2,2025,2.14290000000
-9,2039,gasboiler,R2,2025,2.14290000000
-10,2030,heatpump,R1,2020,17.85870000000
-10,2034,heatpump,R1,2020,17.85870000000
-11,2030,heatpump,R1,2025,8.57170000000
-11,2034,heatpump,R1,2025,8.57170000000
-11,2035,heatpump,R1,2025,8.57170000000
-11,2039,heatpump,R1,2025,8.57170000000
-12,2035,heatpump,R1,2030,23.57330000000
-12,2039,heatpump,R1,2030,23.57330000000
-12,2040,heatpump,R1,2030,23.57330000000
-12,2044,heatpump,R1,2030,23.57330000000
-13,2030,heatpump,R2,2020,17.85870000000
-13,2034,heatpump,R2,2020,17.85870000000
-14,2030,heatpump,R2,2025,8.57170000000
-14,2034,heatpump,R2,2025,8.57170000000
-14,2035,heatpump,R2,2025,8.57170000000
-14,2039,heatpump,R2,2025,8.57170000000
-15,2035,heatpump,R2,2030,23.57330000000
-15,2039,heatpump,R2,2030,23.57330000000
-15,2040,heatpump,R2,2030,23.57330000000
-15,2044,heatpump,R2,2030,23.57330000000
+0,2030,electric_stove,R1,2020,17.40000000000
+0,2034,electric_stove,R1,2020,17.40000000000
+1,2030,electric_stove,R1,2025,8.48000000000
+1,2034,electric_stove,R1,2025,8.48000000000
+1,2035,electric_stove,R1,2025,8.48000000000
+1,2039,electric_stove,R1,2025,8.48000000000
+2,2035,electric_stove,R1,2030,23.00000000000
+2,2039,electric_stove,R1,2030,23.00000000000
+2,2040,electric_stove,R1,2030,23.00000000000
+2,2044,electric_stove,R1,2030,23.00000000000
+3,2030,electric_stove,R2,2020,17.40000000000
+3,2034,electric_stove,R2,2020,17.40000000000
+4,2030,electric_stove,R2,2025,8.48000000000
+4,2034,electric_stove,R2,2025,8.48000000000
+4,2035,electric_stove,R2,2025,8.48000000000
+4,2039,electric_stove,R2,2025,8.48000000000
+5,2035,electric_stove,R2,2030,23.00000000000
+5,2039,electric_stove,R2,2030,23.00000000000
+5,2040,electric_stove,R2,2030,23.00000000000
+5,2044,electric_stove,R2,2030,23.00000000000
+6,2030,gas_stove,R1,2025,2.12000000000
+6,2034,gas_stove,R1,2025,2.12000000000
+6,2035,gas_stove,R1,2025,2.12000000000
+6,2039,gas_stove,R1,2025,2.12000000000
+7,2030,gas_stove,R2,2025,2.12000000000
+7,2034,gas_stove,R2,2025,2.12000000000
+7,2035,gas_stove,R2,2025,2.12000000000
+7,2039,gas_stove,R2,2025,2.12000000000
+8,2030,gasboiler,R1,2025,2.12000000000
+8,2034,gasboiler,R1,2025,2.12000000000
+8,2035,gasboiler,R1,2025,2.12000000000
+8,2039,gasboiler,R1,2025,2.12000000000
+9,2030,gasboiler,R2,2025,2.12000000000
+9,2034,gasboiler,R2,2025,2.12000000000
+9,2035,gasboiler,R2,2025,2.12000000000
+9,2039,gasboiler,R2,2025,2.12000000000
+10,2030,heatpump,R1,2020,17.40000000000
+10,2034,heatpump,R1,2020,17.40000000000
+11,2030,heatpump,R1,2025,8.48000000000
+11,2034,heatpump,R1,2025,8.48000000000
+11,2035,heatpump,R1,2025,8.48000000000
+11,2039,heatpump,R1,2025,8.48000000000
+12,2035,heatpump,R1,2030,23.00000000000
+12,2039,heatpump,R1,2030,23.00000000000
+12,2040,heatpump,R1,2030,23.00000000000
+12,2044,heatpump,R1,2030,23.00000000000
+13,2030,heatpump,R2,2020,17.40000000000
+13,2034,heatpump,R2,2020,17.40000000000
+14,2030,heatpump,R2,2025,8.48000000000
+14,2034,heatpump,R2,2025,8.48000000000
+14,2035,heatpump,R2,2025,8.48000000000
+14,2039,heatpump,R2,2025,8.48000000000
+15,2035,heatpump,R2,2030,23.00000000000
+15,2039,heatpump,R2,2030,23.00000000000
+15,2040,heatpump,R2,2030,23.00000000000
+15,2044,heatpump,R2,2030,23.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
index f64aac9e..7e2526ff 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
@@ -1,49 +1,49 @@
 asset,year,technology,region,installed,capacity
-0,2035,electric_stove,R1,2025,8.57170000000
-0,2039,electric_stove,R1,2025,8.57170000000
-1,2035,electric_stove,R1,2030,23.57330000000
-1,2039,electric_stove,R1,2030,23.57330000000
-1,2040,electric_stove,R1,2030,23.57330000000
-1,2044,electric_stove,R1,2030,23.57330000000
-2,2040,electric_stove,R1,2035,16.42930000000
-2,2044,electric_stove,R1,2035,16.42930000000
-2,2045,electric_stove,R1,2035,16.42930000000
-2,2049,electric_stove,R1,2035,16.42930000000
-3,2035,electric_stove,R2,2025,8.57170000000
-3,2039,electric_stove,R2,2025,8.57170000000
-4,2035,electric_stove,R2,2030,23.57330000000
-4,2039,electric_stove,R2,2030,23.57330000000
-4,2040,electric_stove,R2,2030,23.57330000000
-4,2044,electric_stove,R2,2030,23.57330000000
-5,2040,electric_stove,R2,2035,16.42930000000
-5,2044,electric_stove,R2,2035,16.42930000000
-5,2045,electric_stove,R2,2035,16.42930000000
-5,2049,electric_stove,R2,2035,16.42930000000
-6,2035,gas_stove,R1,2025,2.14290000000
-6,2039,gas_stove,R1,2025,2.14290000000
-7,2035,gas_stove,R2,2025,2.14290000000
-7,2039,gas_stove,R2,2025,2.14290000000
-8,2035,gasboiler,R1,2025,2.14290000000
-8,2039,gasboiler,R1,2025,2.14290000000
-9,2035,gasboiler,R2,2025,2.14290000000
-9,2039,gasboiler,R2,2025,2.14290000000
-10,2035,heatpump,R1,2025,8.57170000000
-10,2039,heatpump,R1,2025,8.57170000000
-11,2035,heatpump,R1,2030,23.57330000000
-11,2039,heatpump,R1,2030,23.57330000000
-11,2040,heatpump,R1,2030,23.57330000000
-11,2044,heatpump,R1,2030,23.57330000000
-12,2040,heatpump,R1,2035,16.42930000000
-12,2044,heatpump,R1,2035,16.42930000000
-12,2045,heatpump,R1,2035,16.42930000000
-12,2049,heatpump,R1,2035,16.42930000000
-13,2035,heatpump,R2,2025,8.57170000000
-13,2039,heatpump,R2,2025,8.57170000000
-14,2035,heatpump,R2,2030,23.57330000000
-14,2039,heatpump,R2,2030,23.57330000000
-14,2040,heatpump,R2,2030,23.57330000000
-14,2044,heatpump,R2,2030,23.57330000000
-15,2040,heatpump,R2,2035,16.42930000000
-15,2044,heatpump,R2,2035,16.42930000000
-15,2045,heatpump,R2,2035,16.42930000000
-15,2049,heatpump,R2,2035,16.42930000000
+0,2035,electric_stove,R1,2025,8.48000000000
+0,2039,electric_stove,R1,2025,8.48000000000
+1,2035,electric_stove,R1,2030,23.00000000000
+1,2039,electric_stove,R1,2030,23.00000000000
+1,2040,electric_stove,R1,2030,23.00000000000
+1,2044,electric_stove,R1,2030,23.00000000000
+2,2040,electric_stove,R1,2035,16.20000000000
+2,2044,electric_stove,R1,2035,16.20000000000
+2,2045,electric_stove,R1,2035,16.20000000000
+2,2049,electric_stove,R1,2035,16.20000000000
+3,2035,electric_stove,R2,2025,8.48000000000
+3,2039,electric_stove,R2,2025,8.48000000000
+4,2035,electric_stove,R2,2030,23.00000000000
+4,2039,electric_stove,R2,2030,23.00000000000
+4,2040,electric_stove,R2,2030,23.00000000000
+4,2044,electric_stove,R2,2030,23.00000000000
+5,2040,electric_stove,R2,2035,16.20000000000
+5,2044,electric_stove,R2,2035,16.20000000000
+5,2045,electric_stove,R2,2035,16.20000000000
+5,2049,electric_stove,R2,2035,16.20000000000
+6,2035,gas_stove,R1,2025,2.12000000000
+6,2039,gas_stove,R1,2025,2.12000000000
+7,2035,gas_stove,R2,2025,2.12000000000
+7,2039,gas_stove,R2,2025,2.12000000000
+8,2035,gasboiler,R1,2025,2.12000000000
+8,2039,gasboiler,R1,2025,2.12000000000
+9,2035,gasboiler,R2,2025,2.12000000000
+9,2039,gasboiler,R2,2025,2.12000000000
+10,2035,heatpump,R1,2025,8.48000000000
+10,2039,heatpump,R1,2025,8.48000000000
+11,2035,heatpump,R1,2030,23.00000000000
+11,2039,heatpump,R1,2030,23.00000000000
+11,2040,heatpump,R1,2030,23.00000000000
+11,2044,heatpump,R1,2030,23.00000000000
+12,2040,heatpump,R1,2035,16.20000000000
+12,2044,heatpump,R1,2035,16.20000000000
+12,2045,heatpump,R1,2035,16.20000000000
+12,2049,heatpump,R1,2035,16.20000000000
+13,2035,heatpump,R2,2025,8.48000000000
+13,2039,heatpump,R2,2025,8.48000000000
+14,2035,heatpump,R2,2030,23.00000000000
+14,2039,heatpump,R2,2030,23.00000000000
+14,2040,heatpump,R2,2030,23.00000000000
+14,2044,heatpump,R2,2030,23.00000000000
+15,2040,heatpump,R2,2035,16.20000000000
+15,2044,heatpump,R2,2035,16.20000000000
+15,2045,heatpump,R2,2035,16.20000000000
+15,2049,heatpump,R2,2035,16.20000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
index f81f7695..4eabd1e2 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
@@ -1,41 +1,41 @@
 asset,year,technology,region,installed,capacity
-0,2040,electric_stove,R1,2030,23.57330000000
-0,2044,electric_stove,R1,2030,23.57330000000
-1,2040,electric_stove,R1,2035,16.42930000000
-1,2044,electric_stove,R1,2035,16.42930000000
-1,2045,electric_stove,R1,2035,16.42930000000
-1,2049,electric_stove,R1,2035,16.42930000000
-2,2045,electric_stove,R1,2040,29.28800000000
-2,2049,electric_stove,R1,2040,29.28800000000
-2,2050,electric_stove,R1,2040,29.28800000000
-2,2054,electric_stove,R1,2040,29.28800000000
-3,2040,electric_stove,R2,2030,23.57330000000
-3,2044,electric_stove,R2,2030,23.57330000000
-4,2040,electric_stove,R2,2035,16.42930000000
-4,2044,electric_stove,R2,2035,16.42930000000
-4,2045,electric_stove,R2,2035,16.42930000000
-4,2049,electric_stove,R2,2035,16.42930000000
-5,2045,electric_stove,R2,2040,29.28800000000
-5,2049,electric_stove,R2,2040,29.28800000000
-5,2050,electric_stove,R2,2040,29.28800000000
-5,2054,electric_stove,R2,2040,29.28800000000
-6,2040,heatpump,R1,2030,23.57330000000
-6,2044,heatpump,R1,2030,23.57330000000
-7,2040,heatpump,R1,2035,16.42930000000
-7,2044,heatpump,R1,2035,16.42930000000
-7,2045,heatpump,R1,2035,16.42930000000
-7,2049,heatpump,R1,2035,16.42930000000
-8,2045,heatpump,R1,2040,29.28800000000
-8,2049,heatpump,R1,2040,29.28800000000
-8,2050,heatpump,R1,2040,29.28800000000
-8,2054,heatpump,R1,2040,29.28800000000
-9,2040,heatpump,R2,2030,23.57330000000
-9,2044,heatpump,R2,2030,23.57330000000
-10,2040,heatpump,R2,2035,16.42930000000
-10,2044,heatpump,R2,2035,16.42930000000
-10,2045,heatpump,R2,2035,16.42930000000
-10,2049,heatpump,R2,2035,16.42930000000
-11,2045,heatpump,R2,2040,29.28800000000
-11,2049,heatpump,R2,2040,29.28800000000
-11,2050,heatpump,R2,2040,29.28800000000
-11,2054,heatpump,R2,2040,29.28800000000
+0,2040,electric_stove,R1,2030,23.00000000000
+0,2044,electric_stove,R1,2030,23.00000000000
+1,2040,electric_stove,R1,2035,16.20000000000
+1,2044,electric_stove,R1,2035,16.20000000000
+1,2045,electric_stove,R1,2035,16.20000000000
+1,2049,electric_stove,R1,2035,16.20000000000
+2,2045,electric_stove,R1,2040,28.60000000000
+2,2049,electric_stove,R1,2040,28.60000000000
+2,2050,electric_stove,R1,2040,28.60000000000
+2,2054,electric_stove,R1,2040,28.60000000000
+3,2040,electric_stove,R2,2030,23.00000000000
+3,2044,electric_stove,R2,2030,23.00000000000
+4,2040,electric_stove,R2,2035,16.20000000000
+4,2044,electric_stove,R2,2035,16.20000000000
+4,2045,electric_stove,R2,2035,16.20000000000
+4,2049,electric_stove,R2,2035,16.20000000000
+5,2045,electric_stove,R2,2040,28.60000000000
+5,2049,electric_stove,R2,2040,28.60000000000
+5,2050,electric_stove,R2,2040,28.60000000000
+5,2054,electric_stove,R2,2040,28.60000000000
+6,2040,heatpump,R1,2030,23.00000000000
+6,2044,heatpump,R1,2030,23.00000000000
+7,2040,heatpump,R1,2035,16.20000000000
+7,2044,heatpump,R1,2035,16.20000000000
+7,2045,heatpump,R1,2035,16.20000000000
+7,2049,heatpump,R1,2035,16.20000000000
+8,2045,heatpump,R1,2040,28.60000000000
+8,2049,heatpump,R1,2040,28.60000000000
+8,2050,heatpump,R1,2040,28.60000000000
+8,2054,heatpump,R1,2040,28.60000000000
+9,2040,heatpump,R2,2030,23.00000000000
+9,2044,heatpump,R2,2030,23.00000000000
+10,2040,heatpump,R2,2035,16.20000000000
+10,2044,heatpump,R2,2035,16.20000000000
+10,2045,heatpump,R2,2035,16.20000000000
+10,2049,heatpump,R2,2035,16.20000000000
+11,2045,heatpump,R2,2040,28.60000000000
+11,2049,heatpump,R2,2040,28.60000000000
+11,2050,heatpump,R2,2040,28.60000000000
+11,2054,heatpump,R2,2040,28.60000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
index ccde9c72..3d4542bd 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
@@ -1,41 +1,41 @@
 asset,year,technology,region,installed,capacity
-0,2045,electric_stove,R1,2035,16.42930000000
-0,2049,electric_stove,R1,2035,16.42930000000
-1,2045,electric_stove,R1,2040,29.28800000000
-1,2049,electric_stove,R1,2040,29.28800000000
-1,2050,electric_stove,R1,2040,29.28800000000
-1,2054,electric_stove,R1,2040,29.28800000000
-2,2050,electric_stove,R1,2045,22.14400000000
-2,2054,electric_stove,R1,2045,22.14400000000
-2,2055,electric_stove,R1,2045,22.14400000000
-2,2059,electric_stove,R1,2045,22.14400000000
-3,2045,electric_stove,R2,2035,16.42930000000
-3,2049,electric_stove,R2,2035,16.42930000000
-4,2045,electric_stove,R2,2040,29.28800000000
-4,2049,electric_stove,R2,2040,29.28800000000
-4,2050,electric_stove,R2,2040,29.28800000000
-4,2054,electric_stove,R2,2040,29.28800000000
-5,2050,electric_stove,R2,2045,22.14400000000
-5,2054,electric_stove,R2,2045,22.14400000000
-5,2055,electric_stove,R2,2045,22.14400000000
-5,2059,electric_stove,R2,2045,22.14400000000
-6,2045,heatpump,R1,2035,16.42930000000
-6,2049,heatpump,R1,2035,16.42930000000
-7,2045,heatpump,R1,2040,29.28800000000
-7,2049,heatpump,R1,2040,29.28800000000
-7,2050,heatpump,R1,2040,29.28800000000
-7,2054,heatpump,R1,2040,29.28800000000
-8,2050,heatpump,R1,2045,22.14400000000
-8,2054,heatpump,R1,2045,22.14400000000
-8,2055,heatpump,R1,2045,22.14400000000
-8,2059,heatpump,R1,2045,22.14400000000
-9,2045,heatpump,R2,2035,16.42930000000
-9,2049,heatpump,R2,2035,16.42930000000
-10,2045,heatpump,R2,2040,29.28800000000
-10,2049,heatpump,R2,2040,29.28800000000
-10,2050,heatpump,R2,2040,29.28800000000
-10,2054,heatpump,R2,2040,29.28800000000
-11,2050,heatpump,R2,2045,22.14400000000
-11,2054,heatpump,R2,2045,22.14400000000
-11,2055,heatpump,R2,2045,22.14400000000
-11,2059,heatpump,R2,2045,22.14400000000
+0,2045,electric_stove,R1,2035,16.20000000000
+0,2049,electric_stove,R1,2035,16.20000000000
+1,2045,electric_stove,R1,2040,28.60000000000
+1,2049,electric_stove,R1,2040,28.60000000000
+1,2050,electric_stove,R1,2040,28.60000000000
+1,2054,electric_stove,R1,2040,28.60000000000
+2,2050,electric_stove,R1,2045,21.80000000000
+2,2054,electric_stove,R1,2045,21.80000000000
+2,2055,electric_stove,R1,2045,21.80000000000
+2,2059,electric_stove,R1,2045,21.80000000000
+3,2045,electric_stove,R2,2035,16.20000000000
+3,2049,electric_stove,R2,2035,16.20000000000
+4,2045,electric_stove,R2,2040,28.60000000000
+4,2049,electric_stove,R2,2040,28.60000000000
+4,2050,electric_stove,R2,2040,28.60000000000
+4,2054,electric_stove,R2,2040,28.60000000000
+5,2050,electric_stove,R2,2045,21.80000000000
+5,2054,electric_stove,R2,2045,21.80000000000
+5,2055,electric_stove,R2,2045,21.80000000000
+5,2059,electric_stove,R2,2045,21.80000000000
+6,2045,heatpump,R1,2035,16.20000000000
+6,2049,heatpump,R1,2035,16.20000000000
+7,2045,heatpump,R1,2040,28.60000000000
+7,2049,heatpump,R1,2040,28.60000000000
+7,2050,heatpump,R1,2040,28.60000000000
+7,2054,heatpump,R1,2040,28.60000000000
+8,2050,heatpump,R1,2045,21.80000000000
+8,2054,heatpump,R1,2045,21.80000000000
+8,2055,heatpump,R1,2045,21.80000000000
+8,2059,heatpump,R1,2045,21.80000000000
+9,2045,heatpump,R2,2035,16.20000000000
+9,2049,heatpump,R2,2035,16.20000000000
+10,2045,heatpump,R2,2040,28.60000000000
+10,2049,heatpump,R2,2040,28.60000000000
+10,2050,heatpump,R2,2040,28.60000000000
+10,2054,heatpump,R2,2040,28.60000000000
+11,2050,heatpump,R2,2045,21.80000000000
+11,2054,heatpump,R2,2045,21.80000000000
+11,2055,heatpump,R2,2045,21.80000000000
+11,2059,heatpump,R2,2045,21.80000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
index 7892705e..83b548ff 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
@@ -1,41 +1,41 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2040,electric_stove,29.28800000000
-2,2054,R1,2040,electric_stove,29.28800000000
-3,2050,R1,2040,heatpump,29.28800000000
-3,2054,R1,2040,heatpump,29.28800000000
-4,2050,R1,2045,electric_stove,22.14400000000
-4,2054,R1,2045,electric_stove,22.14400000000
-4,2055,R1,2045,electric_stove,22.14400000000
-4,2059,R1,2045,electric_stove,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,electric_stove,29.28800000000
-6,2059,R1,2050,electric_stove,29.28800000000
-6,2060,R1,2050,electric_stove,29.28800000000
-6,2064,R1,2050,electric_stove,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,electric_stove,29.28800000000
-10,2054,R2,2040,electric_stove,29.28800000000
-11,2050,R2,2040,heatpump,29.28800000000
-11,2054,R2,2040,heatpump,29.28800000000
-12,2050,R2,2045,electric_stove,22.14400000000
-12,2054,R2,2045,electric_stove,22.14400000000
-12,2055,R2,2045,electric_stove,22.14400000000
-12,2059,R2,2045,electric_stove,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,electric_stove,29.28800000000
-14,2059,R2,2050,electric_stove,29.28800000000
-14,2060,R2,2050,electric_stove,29.28800000000
-14,2064,R2,2050,electric_stove,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
+2,2050,R1,2040,electric_stove,28.60000000000
+2,2054,R1,2040,electric_stove,28.60000000000
+3,2050,R1,2040,heatpump,28.60000000000
+3,2054,R1,2040,heatpump,28.60000000000
+4,2050,R1,2045,electric_stove,21.80000000000
+4,2054,R1,2045,electric_stove,21.80000000000
+4,2055,R1,2045,electric_stove,21.80000000000
+4,2059,R1,2045,electric_stove,21.80000000000
+5,2050,R1,2045,heatpump,21.80000000000
+5,2054,R1,2045,heatpump,21.80000000000
+5,2055,R1,2045,heatpump,21.80000000000
+5,2059,R1,2045,heatpump,21.80000000000
+6,2055,R1,2050,electric_stove,28.60000000000
+6,2059,R1,2050,electric_stove,28.60000000000
+6,2060,R1,2050,electric_stove,28.60000000000
+6,2064,R1,2050,electric_stove,28.60000000000
+7,2055,R1,2050,heatpump,28.60000000000
+7,2059,R1,2050,heatpump,28.60000000000
+7,2060,R1,2050,heatpump,28.60000000000
+7,2064,R1,2050,heatpump,28.60000000000
+10,2050,R2,2040,electric_stove,28.60000000000
+10,2054,R2,2040,electric_stove,28.60000000000
+11,2050,R2,2040,heatpump,28.60000000000
+11,2054,R2,2040,heatpump,28.60000000000
+12,2050,R2,2045,electric_stove,21.80000000000
+12,2054,R2,2045,electric_stove,21.80000000000
+12,2055,R2,2045,electric_stove,21.80000000000
+12,2059,R2,2045,electric_stove,21.80000000000
+13,2050,R2,2045,heatpump,21.80000000000
+13,2054,R2,2045,heatpump,21.80000000000
+13,2055,R2,2045,heatpump,21.80000000000
+13,2059,R2,2045,heatpump,21.80000000000
+14,2055,R2,2050,electric_stove,28.60000000000
+14,2059,R2,2050,electric_stove,28.60000000000
+14,2060,R2,2050,electric_stove,28.60000000000
+14,2064,R2,2050,electric_stove,28.60000000000
+15,2055,R2,2050,heatpump,28.60000000000
+15,2059,R2,2050,heatpump,28.60000000000
+15,2060,R2,2050,heatpump,28.60000000000
+15,2064,R2,2050,heatpump,28.60000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
index 79dfdaff..9bf955ba 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2025,1,electric_stove,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
+0,heat,R1,2020,4,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R1,2020,5,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R1,2025,4,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,5,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,6,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2025,7,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2020,4,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R2,2020,5,gasboiler,2020,all-year,all-week,night,0.35000000000
+0,heat,R2,2025,4,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,5,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,6,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2025,7,heatpump,2020,all-year,all-week,night,0.36250000000
+0,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,night,17.50000000000
+0,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,night,17.50000000000
+0,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,night,17.50000000000
+0,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,night,17.50000000000
+0,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,night,22.64850000000
+0,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,cook,R1,2020,2,gas_stove,2020,all-year,all-week,night,0.35000000000
+0,cook,R1,2020,3,gas_stove,2020,all-year,all-week,night,0.35000000000
+0,cook,R1,2025,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2025,1,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2025,2,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R1,2025,3,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R2,2020,2,gas_stove,2020,all-year,all-week,night,0.35000000000
+0,cook,R2,2020,3,gas_stove,2020,all-year,all-week,night,0.35000000000
+0,cook,R2,2025,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2025,1,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2025,2,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R2,2025,3,gas_stove,2020,all-year,all-week,night,0.10420000000
+1,heat,R1,2020,4,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R1,2020,5,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R1,2025,4,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,5,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,6,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2025,7,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2020,4,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R2,2020,5,gasboiler,2020,all-year,all-week,morning,0.50000000000
+1,heat,R2,2025,4,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,5,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,6,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2025,7,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,morning,25.00000000000
+1,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,morning,25.00000000000
+1,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,morning,25.00000000000
+1,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,morning,25.00000000000
+1,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,morning,32.35500000000
+1,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,cook,R1,2020,2,gas_stove,2020,all-year,all-week,morning,0.50000000000
+1,cook,R1,2020,3,gas_stove,2020,all-year,all-week,morning,0.50000000000
+1,cook,R1,2025,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2025,1,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2025,2,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R1,2025,3,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R2,2020,2,gas_stove,2020,all-year,all-week,morning,0.50000000000
+1,cook,R2,2020,3,gas_stove,2020,all-year,all-week,morning,0.50000000000
+1,cook,R2,2025,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2025,1,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2025,2,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R2,2025,3,gas_stove,2020,all-year,all-week,morning,0.14880000000
+2,heat,R1,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R1,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R1,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2025,7,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R2,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,heat,R2,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2025,7,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,17.50000000000
+2,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,17.50000000000
+2,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,17.50000000000
+2,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,17.50000000000
+2,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,22.64850000000
+2,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,cook,R1,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,cook,R1,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,cook,R1,2025,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2025,1,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R1,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R2,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,cook,R2,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.35000000000
+2,cook,R2,2025,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2025,1,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R2,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+3,heat,R1,2020,4,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R1,2020,5,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R1,2025,4,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,5,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2025,7,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2020,4,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R2,2020,5,gasboiler,2020,all-year,all-week,early-peak,0.50000000000
+3,heat,R2,2025,4,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,5,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2025,7,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,early-peak,25.00000000000
+3,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,early-peak,25.00000000000
+3,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,early-peak,25.00000000000
+3,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,early-peak,25.00000000000
+3,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,early-peak,32.35500000000
+3,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,cook,R1,2020,2,gas_stove,2020,all-year,all-week,early-peak,0.50000000000
+3,cook,R1,2020,3,gas_stove,2020,all-year,all-week,early-peak,0.50000000000
+3,cook,R1,2025,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2025,1,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2025,2,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R1,2025,3,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R2,2020,2,gas_stove,2020,all-year,all-week,early-peak,0.50000000000
+3,cook,R2,2020,3,gas_stove,2020,all-year,all-week,early-peak,0.50000000000
+3,cook,R2,2025,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2025,1,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2025,2,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R2,2025,3,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+4,heat,R1,2020,4,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
+4,heat,R1,2020,5,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
 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,R1,2025,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2025,7,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2020,4,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
+4,heat,R2,2020,5,gasboiler,2020,all-year,all-week,late-peak,1.05000000000
 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,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2025,7,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,late-peak,52.50000000000
+4,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,late-peak,52.50000000000
+4,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
+4,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
 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,2020,2,gas_stove,2020,all-year,all-week,late-peak,52.50000000000
+4,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,late-peak,52.50000000000
+4,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
+4,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,late-peak,67.94550000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2025,1,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2020,2,gas_stove,2020,all-year,all-week,late-peak,1.05000000000
+4,cook,R1,2020,3,gas_stove,2020,all-year,all-week,late-peak,1.05000000000
+4,cook,R1,2025,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R1,2025,1,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2025,1,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R2,2020,2,gas_stove,2020,all-year,all-week,late-peak,1.05000000000
+4,cook,R2,2020,3,gas_stove,2020,all-year,all-week,late-peak,1.05000000000
+4,cook,R2,2025,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R2,2025,1,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2025,1,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2025,1,electric_stove,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
+5,heat,R1,2020,4,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R1,2020,5,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R1,2025,4,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,5,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,6,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2025,7,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2020,4,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R2,2020,5,gasboiler,2020,all-year,all-week,evening,0.70000000000
+5,heat,R2,2025,4,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,5,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,6,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2025,7,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,evening,35.00000000000
+5,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,evening,35.00000000000
+5,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,evening,35.00000000000
+5,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,evening,35.00000000000
+5,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,evening,45.29700000000
+5,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,cook,R1,2020,2,gas_stove,2020,all-year,all-week,evening,0.70000000000
+5,cook,R1,2020,3,gas_stove,2020,all-year,all-week,evening,0.70000000000
+5,cook,R1,2025,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2025,1,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2025,2,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R1,2025,3,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R2,2020,2,gas_stove,2020,all-year,all-week,evening,0.70000000000
+5,cook,R2,2020,3,gas_stove,2020,all-year,all-week,evening,0.70000000000
+5,cook,R2,2025,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2025,1,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2025,2,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R2,2025,3,gas_stove,2020,all-year,all-week,evening,0.20830000000
+6,heat,R1,2020,4,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R1,2020,5,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R1,2025,4,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,5,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2025,7,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2020,4,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R2,2020,5,gasboiler,2020,all-year,all-week,early-morning,0.70000000000
+6,heat,R2,2025,4,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,5,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2025,7,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,early-morning,35.00000000000
+6,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,early-morning,35.00000000000
+6,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,early-morning,35.00000000000
+6,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,early-morning,35.00000000000
+6,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,early-morning,45.29700000000
+6,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,cook,R1,2020,2,gas_stove,2020,all-year,all-week,early-morning,0.70000000000
+6,cook,R1,2020,3,gas_stove,2020,all-year,all-week,early-morning,0.70000000000
+6,cook,R1,2025,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2025,1,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2025,2,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R1,2025,3,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R2,2020,2,gas_stove,2020,all-year,all-week,early-morning,0.70000000000
+6,cook,R2,2020,3,gas_stove,2020,all-year,all-week,early-morning,0.70000000000
+6,cook,R2,2025,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2025,1,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2025,2,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R2,2025,3,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+7,heat,R1,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R1,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R1,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2025,7,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R2,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,0.70000000000
+7,heat,R2,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2025,7,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,35.00000000000
+7,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,35.00000000000
+7,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,35.00000000000
+7,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,35.00000000000
+7,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,45.29700000000
+7,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,cook,R1,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,0.70000000000
+7,cook,R1,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,0.70000000000
+7,cook,R1,2025,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2025,1,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R1,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R2,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,0.70000000000
+7,cook,R2,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,0.70000000000
+7,cook,R2,2025,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2025,1,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R2,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
index 4cff2b0a..b195bea8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2030,2,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2030,2,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2030,2,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2030,2,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,3,electric_stove,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
+0,heat,R1,2025,8,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,10,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2025,12,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2025,14,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,11,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,12,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,13,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,14,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,15,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2025,8,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,10,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2025,12,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2025,14,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,11,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,12,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,13,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,14,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,15,heatpump,2025,all-year,all-week,night,0.17670000000
+0,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,night,5.20830000000
+0,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,cook,R1,2025,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2025,2,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2025,4,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R1,2025,6,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R1,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,2,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2030,3,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,5,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2025,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2025,2,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2025,4,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R2,2025,6,gas_stove,2020,all-year,all-week,night,0.10420000000
+0,cook,R2,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,2,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2030,3,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,5,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+1,heat,R1,2025,8,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,10,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2025,12,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2025,14,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,11,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,12,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,13,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,14,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,15,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2025,8,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,10,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2025,12,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2025,14,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,11,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,12,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,13,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,14,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,15,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,morning,7.44050000000
+1,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,cook,R1,2025,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2025,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2025,4,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R1,2025,6,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R1,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2030,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,5,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2025,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2025,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2025,4,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R2,2025,6,gas_stove,2020,all-year,all-week,morning,0.14880000000
+1,cook,R2,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2030,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,5,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+2,heat,R1,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2025,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2025,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2025,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2025,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
+2,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,cook,R1,2025,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2025,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R1,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R1,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2030,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2025,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2025,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R2,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,cook,R2,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2030,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+3,heat,R1,2025,8,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,10,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2025,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2025,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2025,8,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,10,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2025,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2025,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
+3,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,cook,R1,2025,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2025,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2025,4,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R1,2025,6,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2030,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2025,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2025,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2025,4,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R2,2025,6,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
+3,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2030,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
 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,R1,2025,12,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2025,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,12,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-peak,0.53000000000
 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,heat,R2,2025,12,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2025,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,12,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-peak,0.53000000000
 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,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2025,2,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,cook,R1,2025,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R1,2025,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2025,2,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
+4,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R1,2030,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2025,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R2,2025,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2030,2,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2030,2,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,3,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2025,2,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,3,electric_stove,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
+4,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R2,2030,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+5,heat,R1,2025,8,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,10,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2025,12,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2025,14,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,11,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,12,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,13,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,14,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,15,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2025,8,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,10,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2025,12,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2025,14,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,11,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,12,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,13,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,14,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,15,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,evening,10.41670000000
+5,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,cook,R1,2025,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2025,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2025,4,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R1,2025,6,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R1,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2030,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,5,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2025,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2025,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2025,4,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R2,2025,6,gas_stove,2020,all-year,all-week,evening,0.20830000000
+5,cook,R2,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2030,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,5,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+6,heat,R1,2025,8,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,10,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2025,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2025,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2025,8,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,10,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2025,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2025,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
+6,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,cook,R1,2025,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2025,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2025,4,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R1,2025,6,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2030,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2025,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2025,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2025,4,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R2,2025,6,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
+6,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2030,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+7,heat,R1,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2025,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2025,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2025,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2025,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
+7,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,cook,R1,2025,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2025,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R1,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2030,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2025,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2025,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R2,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
+7,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2030,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
index 86e7a961..51d562bc 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2030,3,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,2,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2035,4,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2030,3,electric_stove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,2,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2035,4,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2030,3,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,2,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2035,4,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2030,3,electric_stove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,2,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2035,4,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2030,3,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,2,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2035,4,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2030,3,electric_stove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,2,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2035,4,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,5,electric_stove,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,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,4,electric_stove,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,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,5,electric_stove,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
+0,heat,R1,2030,8,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,10,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,13,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R1,2030,14,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,12,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2035,14,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,15,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2030,8,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,10,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,13,heatpump,2020,all-year,all-week,night,0.36250000000
+0,heat,R2,2030,14,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,12,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2035,14,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,15,heatpump,2030,all-year,all-week,night,0.47920000000
+0,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,cook,R1,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,3,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R1,2030,4,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,6,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2035,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2035,2,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2035,4,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2035,5,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,3,electric_stove,2020,all-year,all-week,night,0.36250000000
+0,cook,R2,2030,4,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,6,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2035,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2035,2,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2035,4,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2035,5,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+1,heat,R1,2030,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,10,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,13,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R1,2030,14,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,12,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2035,14,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,15,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2030,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,10,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,13,heatpump,2020,all-year,all-week,morning,0.51790000000
+1,heat,R2,2030,14,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,12,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2035,14,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,15,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,cook,R1,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,3,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R1,2030,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2035,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2035,2,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2035,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2035,5,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,3,electric_stove,2020,all-year,all-week,morning,0.51790000000
+1,cook,R2,2030,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2035,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2035,2,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2035,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2035,5,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+2,heat,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,13,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R1,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,12,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,13,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,heat,R2,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,12,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,cook,R1,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R1,2030,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2035,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2035,5,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
+2,cook,R2,2030,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2035,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2035,5,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+3,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,13,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,12,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,13,heatpump,2020,all-year,all-week,early-peak,0.51790000000
+3,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,12,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R1,2030,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2035,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2035,5,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
+3,cook,R2,2030,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2035,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2035,5,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+4,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,13,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,12,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,13,heatpump,2020,all-year,all-week,late-peak,1.08750000000
+4,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,12,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R1,2030,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2035,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2035,5,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
+4,cook,R2,2030,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2035,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2035,5,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+5,heat,R1,2030,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,10,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,13,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R1,2030,14,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,12,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2035,14,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,15,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2030,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,10,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,13,heatpump,2020,all-year,all-week,evening,0.72500000000
+5,heat,R2,2030,14,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,12,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2035,14,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,15,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,cook,R1,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,3,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R1,2030,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2035,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2035,2,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2035,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2035,5,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,3,electric_stove,2020,all-year,all-week,evening,0.72500000000
+5,cook,R2,2030,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2035,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2035,2,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2035,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2035,5,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+6,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,13,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,12,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,13,heatpump,2020,all-year,all-week,early-morning,0.72500000000
+6,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,12,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R1,2030,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2035,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2035,5,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
+6,cook,R2,2030,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2035,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2035,5,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+7,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,13,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,12,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,13,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
+7,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,12,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R1,2030,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2035,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2035,5,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
+7,cook,R2,2030,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2035,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2035,5,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
index 9919735a..de7a392b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,1,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2035,3,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,2,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2040,4,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,5,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2035,0,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,1,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2035,3,electric_stove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,2,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2040,4,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,1,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2035,3,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,2,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2040,4,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,5,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2035,0,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,1,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2035,3,electric_stove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,2,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2040,4,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,1,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2035,3,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,2,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2040,4,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,5,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2035,0,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,1,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2035,3,electric_stove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,2,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2040,4,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,5,electric_stove,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,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,4,electric_stove,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,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
+0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2035,10,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,11,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2035,13,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,14,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,11,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,12,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2040,14,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,15,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2035,10,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,11,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2035,13,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,14,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,11,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,12,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2040,14,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,15,heatpump,2035,all-year,all-week,night,0.33750000000
+0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
+0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,cook,R1,2035,0,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2035,1,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2035,3,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2035,4,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2040,1,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2040,2,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2040,4,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2040,5,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2035,0,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2035,1,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2035,3,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2035,4,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2040,1,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2040,2,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2040,4,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2040,5,electric_stove,2035,all-year,all-week,night,0.33750000000
+1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2035,10,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,11,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2035,13,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,14,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,11,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,12,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2040,14,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,15,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2035,10,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,11,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2035,13,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,14,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,11,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,12,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2040,14,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,15,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
+1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,cook,R1,2035,0,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2035,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2035,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2035,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2040,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2040,2,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2040,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2040,5,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2035,0,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2035,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2035,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2035,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2040,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2040,2,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2040,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2040,5,electric_stove,2035,all-year,all-week,morning,0.48210000000
+2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2035,10,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2035,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,12,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2040,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,15,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2035,10,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2035,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,12,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2040,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,15,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
+2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,cook,R1,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2035,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2040,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2035,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2040,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2035,10,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2035,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,12,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2040,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,15,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2035,10,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2035,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,12,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2040,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,15,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
+3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,cook,R1,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2035,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2040,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2035,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2040,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2035,10,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2035,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,12,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2040,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,15,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2035,10,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2035,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,12,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2040,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,15,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
+4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,cook,R1,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2035,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2040,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2035,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2040,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2035,10,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,11,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2035,13,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,14,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,11,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,12,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2040,14,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,15,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2035,10,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,11,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2035,13,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,14,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,11,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,12,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2040,14,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,15,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
+5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,cook,R1,2035,0,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2035,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2035,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2035,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2040,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2040,2,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2040,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2040,5,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2035,0,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2035,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2035,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2035,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2040,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2040,2,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2040,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2040,5,electric_stove,2035,all-year,all-week,evening,0.67500000000
+6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2035,10,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2035,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,12,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2040,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,15,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2035,10,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2035,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,12,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2040,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,15,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
+6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,cook,R1,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2035,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2040,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2035,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2040,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2035,10,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2035,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,12,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2040,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,15,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2035,10,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2035,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,12,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2040,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,15,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
+7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,cook,R1,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2035,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2040,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2035,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2040,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
index 959ed730..20e18335 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,1,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2040,3,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,4,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,1,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,2,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2045,4,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,5,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2040,0,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,1,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2040,3,electric_stove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,4,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,1,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,2,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2045,4,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2040,3,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,2,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2045,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,5,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2040,0,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2040,3,electric_stove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,1,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,2,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2045,4,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,5,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2040,0,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2040,3,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,2,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2045,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,5,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2040,0,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2040,3,electric_stove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,1,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,2,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2045,4,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,5,electric_stove,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,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
+0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2040,9,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,10,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,7,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,8,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,10,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2040,9,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,10,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,7,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,8,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,10,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2040,0,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2040,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2040,3,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R1,2040,4,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,2,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2045,4,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,5,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2040,0,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2040,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2040,3,electric_stove,2030,all-year,all-week,night,0.47920000000
+0,cook,R2,2040,4,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,2,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2045,4,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,5,electric_stove,2040,all-year,all-week,night,0.59580000000
+1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2040,9,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,10,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,7,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,8,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,10,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2040,9,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,10,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,7,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,8,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,10,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2040,0,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2040,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2040,3,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R1,2040,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,2,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2045,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,5,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2040,0,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2040,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2040,3,electric_stove,2030,all-year,all-week,morning,0.68450000000
+1,cook,R2,2040,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,2,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2045,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,5,electric_stove,2040,all-year,all-week,morning,0.85120000000
+2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2040,9,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,8,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2040,9,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,8,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2040,0,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R1,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,5,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2040,0,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,cook,R2,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,5,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2040,9,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,8,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2040,9,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,8,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2040,0,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
+3,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,5,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2040,9,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,8,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2040,9,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,8,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2040,0,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
+4,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,5,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2040,9,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,10,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,7,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,8,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,10,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2040,9,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,10,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,7,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,8,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,10,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2040,0,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2040,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2040,3,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R1,2040,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,2,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2045,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,5,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2040,0,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2040,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2040,3,electric_stove,2030,all-year,all-week,evening,0.95830000000
+5,cook,R2,2040,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,2,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2045,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,5,electric_stove,2040,all-year,all-week,evening,1.19170000000
+6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2040,9,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,8,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2040,9,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,8,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2040,0,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
+6,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,5,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2040,9,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,8,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2040,9,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,8,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2040,0,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
+7,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
index 93dda046..9129bf3f 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,1,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2045,3,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,4,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,1,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,2,electric_stove,2045,all-year,all-week,night,0.46110000000
-0,cook,R1,2050,4,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,5,electric_stove,2045,all-year,all-week,night,0.46110000000
-0,cook,R2,2045,0,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,1,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2045,3,electric_stove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,4,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,1,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,2,electric_stove,2045,all-year,all-week,night,0.46110000000
-0,cook,R2,2050,4,electric_stove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2045,3,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,2,electric_stove,2045,all-year,all-week,morning,0.69170000000
-1,cook,R1,2050,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,5,electric_stove,2045,all-year,all-week,morning,0.69170000000
-1,cook,R2,2045,0,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2045,3,electric_stove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,1,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,2,electric_stove,2045,all-year,all-week,morning,0.69170000000
-1,cook,R2,2050,4,electric_stove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,5,electric_stove,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2045,3,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,2,electric_stove,2045,all-year,all-week,evening,0.92290000000
-5,cook,R1,2050,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,5,electric_stove,2045,all-year,all-week,evening,0.92290000000
-5,cook,R2,2045,0,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2045,3,electric_stove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,1,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,2,electric_stove,2045,all-year,all-week,evening,0.92290000000
-5,cook,R2,2050,4,electric_stove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,5,electric_stove,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,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.92290000000
+0,heat,R1,2045,6,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,7,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,9,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,10,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,7,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,8,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,10,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,11,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2045,6,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,7,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,9,heatpump,2035,all-year,all-week,night,0.33750000000
+0,heat,R2,2045,10,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,7,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,8,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,10,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,11,heatpump,2045,all-year,all-week,night,0.45420000000
+0,cook,R1,2045,0,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,1,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2045,3,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,4,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,1,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,2,electric_stove,2045,all-year,all-week,night,0.45420000000
+0,cook,R1,2050,4,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,5,electric_stove,2045,all-year,all-week,night,0.45420000000
+0,cook,R2,2045,0,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,1,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2045,3,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,4,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,1,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,2,electric_stove,2045,all-year,all-week,night,0.45420000000
+0,cook,R2,2050,4,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,5,electric_stove,2045,all-year,all-week,night,0.45420000000
+1,heat,R1,2045,6,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,7,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,9,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,10,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,7,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,8,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,10,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,11,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2045,6,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,7,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,9,heatpump,2035,all-year,all-week,morning,0.48210000000
+1,heat,R2,2045,10,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,7,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,8,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,10,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,11,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,cook,R1,2045,0,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2045,3,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,2,electric_stove,2045,all-year,all-week,morning,0.64880000000
+1,cook,R1,2050,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,5,electric_stove,2045,all-year,all-week,morning,0.64880000000
+1,cook,R2,2045,0,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2045,3,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,2,electric_stove,2045,all-year,all-week,morning,0.64880000000
+1,cook,R2,2050,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,5,electric_stove,2045,all-year,all-week,morning,0.64880000000
+2,heat,R1,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,9,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,8,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,11,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,9,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R2,2045,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,8,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,11,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,5,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,5,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
+3,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,9,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,8,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,11,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,9,heatpump,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R2,2045,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,8,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,11,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,5,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
+4,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,9,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,8,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,11,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,9,heatpump,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R2,2045,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,8,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,11,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2045,0,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,5,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
+5,heat,R1,2045,6,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,7,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,9,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,10,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,7,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,8,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,10,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,11,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2045,6,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,7,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,9,heatpump,2035,all-year,all-week,evening,0.67500000000
+5,heat,R2,2045,10,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,7,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,8,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,10,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,11,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,cook,R1,2045,0,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2045,3,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,2,electric_stove,2045,all-year,all-week,evening,0.90830000000
+5,cook,R1,2050,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,5,electric_stove,2045,all-year,all-week,evening,0.90830000000
+5,cook,R2,2045,0,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2045,3,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,2,electric_stove,2045,all-year,all-week,evening,0.90830000000
+5,cook,R2,2050,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,5,electric_stove,2045,all-year,all-week,evening,0.90830000000
+6,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,9,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,8,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,11,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,9,heatpump,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R2,2045,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,8,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,11,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,5,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
+7,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,9,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,8,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,11,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,9,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R2,2045,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,8,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,11,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
index 3302b285..e5e77549 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,4,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R1,2050,10,2040,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,12,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R1,2055,4,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R1,2055,6,2050,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R1,2055,12,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R1,2055,14,2050,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,2,2040,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,4,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R2,2050,10,2040,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,12,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R2,2055,4,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R2,2055,6,2050,electric_stove,all-year,all-week,night,0.60990000000
-0,cook,R2,2055,12,2045,electric_stove,all-year,all-week,night,0.46110000000
-0,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2050,10,2040,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2055,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2055,6,2050,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R1,2055,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2055,14,2050,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,2,2040,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2050,10,2040,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2055,4,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2055,6,2050,electric_stove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2055,12,2045,electric_stove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2055,14,2050,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,2,2040,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2050,10,2040,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2055,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2055,6,2050,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R1,2055,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2055,14,2050,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,2,2040,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2050,10,2040,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2055,4,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2055,6,2050,electric_stove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2055,12,2045,electric_stove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2055,14,2050,electric_stove,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,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.22060000000
+0,heat,R1,2050,3,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,5,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,11,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,13,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,5,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2055,13,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,15,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,3,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,5,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,11,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,13,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,5,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2055,13,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,15,2050,heatpump,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,2,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,4,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2050,10,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,12,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2055,4,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2055,6,2050,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R1,2055,12,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2055,14,2050,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,2,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,4,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2050,10,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,12,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2055,4,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2055,6,2050,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2055,12,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2055,14,2050,electric_stove,all-year,all-week,night,0.59580000000
+1,heat,R1,2050,3,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,5,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,11,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,13,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,5,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2055,13,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,15,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,3,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,5,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,11,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,13,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,5,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2055,13,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,15,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,2,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2050,10,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2055,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2055,6,2050,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R1,2055,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2055,14,2050,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,2,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2050,10,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2055,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2055,6,2050,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2055,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2055,14,2050,electric_stove,all-year,all-week,morning,0.85120000000
+2,heat,R1,2050,3,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,11,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2055,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,15,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,3,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,11,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2055,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,15,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,2,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2055,14,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,2,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2055,14,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+3,heat,R1,2050,3,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,11,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2055,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,15,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,3,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,11,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2055,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,15,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,2,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2055,14,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+4,heat,R1,2050,3,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,11,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2055,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,15,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,3,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,11,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2055,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,15,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,2,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2055,14,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+5,heat,R1,2050,3,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,5,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,11,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,13,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,5,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2055,13,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,15,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,3,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,5,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,11,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,13,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,5,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2055,13,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,15,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,2,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2050,10,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2055,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2055,6,2050,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R1,2055,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2055,14,2050,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,2,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2050,10,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2055,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2055,6,2050,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2055,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2055,14,2050,electric_stove,all-year,all-week,evening,1.19170000000
+6,heat,R1,2050,3,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,11,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2055,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,15,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,3,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,11,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2055,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,15,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,2,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2055,14,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+7,heat,R1,2050,3,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,11,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2055,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,15,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,3,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,11,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2055,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,15,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,2,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
index 60cdda57..289f431a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
@@ -1,17 +1,17 @@
 RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
-R1,gasboiler,1,0,0,0.714,0,0,0,0.714
-R1,gasboiler,2,0,0,1.071,0,0,0,1.071
-R1,gasboiler,3,0,0,0.714,0,0,0,0.714
-R1,gasboiler,4,0,0,1.071,0,0,0,1.071
-R1,gasboiler,5,0,0,2.143,0,0,0,2.143
-R1,gasboiler,6,0,0,1.429,0,0,0,1.429
-R1,gasboiler,7,0,0,1.429,0,0,0,1.429
-R1,gasboiler,8,0,0,1.429,0,0,0,1.429
-R2,gasboiler,1,0,0,0.714,0,0,0,0.714
-R2,gasboiler,2,0,0,1.071,0,0,0,1.071
-R2,gasboiler,3,0,0,0.714,0,0,0,0.714
-R2,gasboiler,4,0,0,1.071,0,0,0,1.071
-R2,gasboiler,5,0,0,2.143,0,0,0,2.143
-R2,gasboiler,6,0,0,1.429,0,0,0,1.429
-R2,gasboiler,7,0,0,1.429,0,0,0,1.429
-R2,gasboiler,8,0,0,1.429,0,0,0,1.429
+R1,gasboiler,1,0,0,0.7,0,0,0,0.7
+R1,gasboiler,2,0,0,1.0,0,0,0,1.0
+R1,gasboiler,3,0,0,0.7,0,0,0,0.7
+R1,gasboiler,4,0,0,1.0,0,0,0,1.0
+R1,gasboiler,5,0,0,2.1,0,0,0,2.1
+R1,gasboiler,6,0,0,1.4,0,0,0,1.4
+R1,gasboiler,7,0,0,1.4,0,0,0,1.4
+R1,gasboiler,8,0,0,1.4,0,0,0,1.4
+R2,gasboiler,1,0,0,0.7,0,0,0,0.7
+R2,gasboiler,2,0,0,1.0,0,0,0,1.0
+R2,gasboiler,3,0,0,0.7,0,0,0,0.7
+R2,gasboiler,4,0,0,1.0,0,0,0,1.0
+R2,gasboiler,5,0,0,2.1,0,0,0,2.1
+R2,gasboiler,6,0,0,1.4,0,0,0,1.4
+R2,gasboiler,7,0,0,1.4,0,0,0,1.4
+R2,gasboiler,8,0,0,1.4,0,0,0,1.4
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
index 35043ae3..c02bc258 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
@@ -1,17 +1,17 @@
 RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
-R1,gasboiler,1,0,0,2.142,0,0,0,2.142
-R1,gasboiler,2,0,0,3.213,0,0,0,3.213
-R1,gasboiler,3,0,0,2.142,0,0,0,2.142
-R1,gasboiler,4,0,0,3.213,0,0,0,3.213
-R1,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
-R1,gasboiler,6,0,0,4.287,0,0,0,4.287
-R1,gasboiler,7,0,0,4.287,0,0,0,4.287
-R1,gasboiler,8,0,0,4.287,0,0,0,4.287
-R2,gasboiler,1,0,0,2.142,0,0,0,2.142
-R2,gasboiler,2,0,0,3.213,0,0,0,3.213
-R2,gasboiler,3,0,0,2.142,0,0,0,2.142
-R2,gasboiler,4,0,0,3.213,0,0,0,3.213
-R2,gasboiler,5,0,0,6.428999999999999,0,0,0,6.428999999999999
-R2,gasboiler,6,0,0,4.287,0,0,0,4.287
-R2,gasboiler,7,0,0,4.287,0,0,0,4.287
-R2,gasboiler,8,0,0,4.287,0,0,0,4.287
+R1,gasboiler,1,0,0,2.1,0,0,0,2.1
+R1,gasboiler,2,0,0,3.0,0,0,0,3.0
+R1,gasboiler,3,0,0,2.1,0,0,0,2.1
+R1,gasboiler,4,0,0,3.0,0,0,0,3.0
+R1,gasboiler,5,0,0,6.3,0,0,0,6.3
+R1,gasboiler,6,0,0,4.2,0,0,0,4.2
+R1,gasboiler,7,0,0,4.2,0,0,0,4.2
+R1,gasboiler,8,0,0,4.2,0,0,0,4.2
+R2,gasboiler,1,0,0,2.1,0,0,0,2.1
+R2,gasboiler,2,0,0,3.0,0,0,0,3.0
+R2,gasboiler,3,0,0,2.1,0,0,0,2.1
+R2,gasboiler,4,0,0,3.0,0,0,0,3.0
+R2,gasboiler,5,0,0,6.3,0,0,0,6.3
+R2,gasboiler,6,0,0,4.2,0,0,0,4.2
+R2,gasboiler,7,0,0,4.2,0,0,0,4.2
+R2,gasboiler,8,0,0,4.2,0,0,0,4.2
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 4587ec11..b661bd24 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -51,22 +51,22 @@
     " \n",
     "|RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|solar|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|R1|gasboiler|1|0|0|**0.714**|0|0|0|\n",
-    "|R1|gasboiler|2|0|0|**1.071**|0|0|0|\n",
-    "|R1|gasboiler|3|0|0|**0.714**|0|0|0|\n",
-    "|R1|gasboiler|4|0|0|**1.071**|0|0|0|\n",
-    "|R1|gasboiler|5|0|0|**2.143**|0|0|0|\n",
-    "|R1|gasboiler|6|0|0|**1.429**|0|0|0|\n",
-    "|**R1**|**gasboiler**|**7**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
-    "|**R1**|**gasboiler**|**8**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
-    "|R2|gasboiler|1|0|0|**0.714**|0|0|0|\n",
-    "|R2|gasboiler|2|0|0|**1.071**|0|0|0|\n",
-    "|R2|gasboiler|3|0|0|**0.714**|0|0|0|\n",
-    "|R2|gasboiler|4|0|0|**1.071**|0|0|0|\n",
-    "|R2|gasboiler|5|0|0|**2.143**|0|0|0|\n",
-    "|R2|gasboiler|6|0|0|**1.429**|0|0|0|\n",
-    "|**R2**|**gasboiler**|**7**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
-    "|**R2**|**gasboiler**|**8**|**0**|**0**|**1.429**|**0**|**0**|**0**|\n",
+    "|R1|gasboiler|1|0|0|**0.7**|0|0|0|\n",
+    "|R1|gasboiler|2|0|0|**1.0**|0|0|0|\n",
+    "|R1|gasboiler|3|0|0|**0.7**|0|0|0|\n",
+    "|R1|gasboiler|4|0|0|**1.0**|0|0|0|\n",
+    "|R1|gasboiler|5|0|0|**2.1**|0|0|0|\n",
+    "|R1|gasboiler|6|0|0|**1.4**|0|0|0|\n",
+    "|**R1**|**gasboiler**|**7**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n",
+    "|**R1**|**gasboiler**|**8**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n",
+    "|R2|gasboiler|1|0|0|**0.7**|0|0|0|\n",
+    "|R2|gasboiler|2|0|0|**1.0**|0|0|0|\n",
+    "|R2|gasboiler|3|0|0|**0.7**|0|0|0|\n",
+    "|R2|gasboiler|4|0|0|**1.0**|0|0|0|\n",
+    "|R2|gasboiler|5|0|0|**2.1**|0|0|0|\n",
+    "|R2|gasboiler|6|0|0|**1.4**|0|0|0|\n",
+    "|**R2**|**gasboiler**|**7**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n",
+    "|**R2**|**gasboiler**|**8**|**0**|**0**|**1.4**|**0**|**0**|**0**|\n",
     "\n",
     "The `ProcessName` must be reported, but it is not binding on the results. It is just the way that the model reads the input data.\n",
     "\n",
@@ -132,7 +132,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Compared to the scenario where we added a [region](add-region.ipynb), there is a smaller increase in solarPV in region `R2` in the power sector. However, the rest remains largely unchanged. \n",
+    "Compared to the scenario where we added a [region](add-region.ipynb), there is a slight increase in `solarPV` across both regions in the power sector. However, the rest remains largely unchanged. \n",
     "\n",
     "This example shows the trade-off between time granularity and speed of computation. This is due to the fact that as we add more timesteps, the model takes longer to run, but slightly different scenarios emerge. It is up to you to decide what level of granularity is required for your use case."
    ]
@@ -150,7 +150,7 @@
    "source": [
     "For the previous examples, we have run the scenario from 2020 to 2050, in 5 year time steps per benchmark year. This has been set at the top of the ```settings.toml``` file. However, we may want to run a more detailed scenario, with 2 year time steps, and up until the year 2040.\n",
     "\n",
-    "Making this change is quite simple as we only have two lines to change. We will modify line 2 and 3 of the ```settings.toml``` file, as follows:"
+    "Making this change is quite simple as we only have two lines to change. We will modify the first two lines of the ```settings.toml``` file, as follows:"
    ]
   },
   {
@@ -168,6 +168,14 @@
    "source": [
     "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n",
     "\n",
+    "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.retro_and_new` section should look as follows:\n",
+    "\n",
+    "    [sectors.power.subsectors.retro_and_new]\n",
+    "    agents = '{path}/technodata/Agents.csv'\n",
+    "    existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'\n",
+    "    lpsolver = \"scipy\"\n",
+    "    forecast = 2\n",
+    "\n",
     "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv``` (we will double `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
     "\n",
     "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",

From 9e5db91f4ca5d7051e512ee015df52a11cfbf37c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 22 May 2024 15:27:40 +0100
Subject: [PATCH 162/419] Small text improvements for tutorials 2 and 3

---
 docs/user-guide/add-agent.ipynb  |  7 ++++++-
 docs/user-guide/add-region.ipynb | 12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 9cd5e663..5b9aa6d3 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -201,8 +201,13 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In the next section we will show you how to add a new region. We will maintain the two agents in this next section, and all the work done in the previous tutorials."
+    "In the next section we will show you how to add a new region. The next tutorial will build on the model from tutorial 1 (with just one agent), so the model from this tutorial can be left aside for now."
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 41e2f05f..260591c2 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -11,9 +11,13 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. These regions do not have any energy trade. This requires us to undertake a similar process as before of modifying the input simulation data.\n",
+    "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. This requires us to undertake a similar process as before of modifying the input simulation data.\n",
     "\n",
-    "The process to change the ```settings.toml``` file is relatively simple. We just have to add our new region to the ```regions``` variable, in the 4th line of the ```settings.toml``` file, like so:\n",
+    "<!-- These regions do not have any energy trade.  -->\n",
+    "\n",
+    "This tutorial will follow on from the model in tutorial 1 (including the price change in 2040, but before adding the second agent in tutorial 2). To begin, copy your files from tutorial 1 to a new location.\n",
+    "\n",
+    "To add a new region, we begin by modifying the ```settings.toml``` file. We just have to add our new region to the ```regions``` variable, in the 4th line of the file, like so:\n",
     "\n",
     "    regions = [\"R1\", \"R2\"]\n",
     "\n",
@@ -28,7 +32,7 @@
    "source": [
     "Effectively, for this example, we will copy and paste the results for each of the input files from region `R1`, and change the name of the region for the new rows to `R2`. \n",
     "\n",
-    "However, as we are increasing the demand by adding a region, as well as modifying the costs of technologies, it may be the case that a higher growth in technology is required. For example, there may be no possible solution to meet demand without increasing the ```windturbine``` maximum allowed limit. We will therefore increase the allowed limits for ```windturbine``` in region `R2`.\n",
+    "<!-- However, as we are increasing the demand by adding a region, as well as modifying the costs of technologies, it may be the case that a higher growth in technology is required. For example, there may be no possible solution to meet demand without increasing the ```windturbine``` maximum allowed limit. We will therefore increase the allowed limits for ```windturbine``` in region `R2`. -->\n",
     "\n",
     "We have placed two examples as to how to edit the residential sector below. Again, the edited data are highlighted in **bold**, with the original data in normal text. \n",
     "\n",
@@ -54,7 +58,7 @@
     "|**gasboiler**|**R2**|**PJ/y**|**10**|**5**|**0**|**0**|**0**|**0**|**0**|\n",
     "|**heatpump**|**R2**|**PJ/y**|**0**|**0**|**0**|**0**|**0**|**0**|**0**|\n",
     "\n",
-    "Below is the reduced ```/technodata/power/Technodata.csv``` file, showing the increased capacity for ```windturbine``` in `R2`. For this, we highlight only the elements we changed from the rows in `R1`. The rest of the elements are the same for `R1` as they are for `R2`.\n",
+    "We will follow a similar process in the ```/technodata/power/Technodata.csv``` file, copying the lines from `R1` to create `R2`. In this tutorial we will test the scenario where `windturbine` in `R2` has increase capacity limits compared to `R1`, which is highlighted below in bold. The rest of the elements are the same for `R1` as they are for `R2`.\n",
     "\n",
     "Again, we don't show the entries for 2040, apart from the edited windturbine row, for the sake of brevity.\n",
     "\n",

From 1af5ca19ab8d9cf8038139ad0ea1804fa6bf0760 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 23 May 2024 11:30:35 +0100
Subject: [PATCH 163/419] Simplify tutorial 7

---
 .../min-max-timeslice-constraints.ipynb       | 155 +++++++-----------
 1 file changed, 58 insertions(+), 97 deletions(-)

diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index cea9dc83..8be9ea97 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -22,21 +22,30 @@
    "source": [
     "## Minimum timeslice\n",
     "\n",
-    "In this tutorial we will be amending the default example, which you can find [here](https://github.com/SGIModel/MUSE_OS/tree/main/src/muse/data/example/default). Firstly, we will be imposing a minimum service factor for gasCCGT in the power sector. This is the minimum that a technology can output per timeslice. \n",
+    "In this tutorial we will be amending the `default_timeslice` example.\n",
     "\n",
-    "To do this, we will need to create a new `csv` file that specifies the minimum service factor per timeslice.\n",
+    "To get this model and be able to edit the files use:\n",
     "\n",
-    "An example of the file can be seen below, and downloaded [here](https://github.com/SGIModel/MUSE_OS/blob/main/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv).\n",
+    "```bash\n",
+    "python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n",
+    "```\n",
+    "\n",
+    "You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` and `residential` sectors, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n",
+    "The majority of these columns are self explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
+    "The `UtilizationFactor` column specifies the maximum utilization factor for the respective technologies in the respective timeslices, and the `MinimumServiceFactor` specifies the minimum service factor of a technology.\n",
+    "The timeslice based columns, however, are dynamic and will match the levels as defined in the `toml` file. \n",
+    "\n",
+    "We will modify the minimum service factor for `gasCCGT` in the `power` sector as follows.\n",
     "\n",
     "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
     "|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|-|-|-|-|-|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|night|1|0.2|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|morning|1|0.4|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|0.6|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|0.4|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|0.8|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|evening|1|1|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|night|1|**0.2**|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|morning|1|**0.4**|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|**0.6**|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|**0.4**|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|**0.8**|\n",
+    "|gasCCGT|R1|2020|all-year|all-week|evening|1|**1**|\n",
     "|windturbine|R1|2020|all-year|all-week|night|1|1|\n",
     "|windturbine|R1|2020|all-year|all-week|morning|1|1|\n",
     "|windturbine|R1|2020|all-year|all-week|afternoon|1|1|\n",
@@ -49,13 +58,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Notice that we have to specify the following columns: `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`\n",
-    "\n",
-    "The majority of these columns are self explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. The timeslice based columns, however, are dynamic and will match the levels as defined in the `toml` file. \n",
-    "\n",
-    "The `UtilizationFactor` column specifies the maximum utilization factor for the respective technologies in the respective timeslices, and the `MinimumServiceFactor` specifies the minimum service factor of a technology.\n",
-    "\n",
-    "Next, we must link this file to the `settings.toml` file. This is done by modifying the respective section. As we are modifying the power sector, we have to add it to the following section:\n",
+    "Looking at `settings.toml` file, you should see that the file has already been linked to the appropriate sector:\n",
     "\n",
     "    [sectors.power]\n",
     "    type = 'default'\n",
@@ -66,63 +69,7 @@
     "    commodities_out = '{path}/technodata/power/CommOut.csv'\n",
     "    technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'\n",
     "    \n",
-    "Notice the technodata_timeslices path in the bottom row of the code above."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "For the next part, we want to visualise the output of supply per technology, per timeslice. To do so, we will need to create our own output function. Creating our own output functions will be explored in later tutorials, so don't worry about understanding the code posted below for now.\n",
-    "\n",
-    "Just copy and paste the code below into a python file called `output.py` and link to it in your `settings.toml` file as shown below:\n",
-    "\n",
-    "    plugins = \"{path}/output.py\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from typing import List, Optional, Text\n",
-    "\n",
-    "import xarray as xr\n",
-    "from muse.outputs.sector import market_quantity, register_output_quantity\n",
-    "\n",
-    "\n",
-    "@register_output_quantity\n",
-    "def supply_timeslice(\n",
-    "    market: xr.Dataset,\n",
-    "    capacity: xr.DataArray,\n",
-    "    technologies: xr.Dataset,\n",
-    "    sum_over: Optional[List[Text]] = None,\n",
-    "    drop: Optional[List[Text]] = None,\n",
-    "    rounding: int = 4,\n",
-    ") -> xr.DataArray:\n",
-    "    \"\"\"Current supply.\"\"\"\n",
-    "    market = market.reset_index(\"timeslice\")\n",
-    "    result = (\n",
-    "        market_quantity(market.supply, sum_over=sum_over, drop=drop)\n",
-    "        .rename(\"supply\")\n",
-    "        .to_dataframe()\n",
-    "        .round(rounding)\n",
-    "    )\n",
-    "    return result[result.supply != 0]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "To link to our new output `supply_timeslice` we must paste the following code in our `settings.toml` file.\n",
-    "\n",
-    "    [[sectors.power.outputs]]\n",
-    "    filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'\n",
-    "    quantity = \"supply_timeslice\"\n",
-    "    sink = \"csv\"\n",
-    "    overwrite = true"
+    "Notice the `technodata_timeslices` path in the bottom row of the code above."
    ]
   },
   {
@@ -133,7 +80,7 @@
     "\n",
     "    python -m muse settings.toml\n",
     "\n",
-    "Next, we will visualise the output of the technologies as before. However, this time we will visualise the supply outputs that we created with the previous function per technology and per timeslice."
+    "Next, we will visualise the output of the technologies as before. However, this time we will visualise the supply outputs per technology and per timeslice."
    ]
   },
   {
@@ -155,12 +102,19 @@
     "power_supply_2020 = pd.read_csv(\n",
     "    \"../tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv\"\n",
     ")\n",
+    "gassCCGT_electricity_supply_2020 = (\n",
+    "    power_supply_2020[\n",
+    "        (power_supply_2020.technology == \"gasCCGT\")\n",
+    "        & (power_supply_2020.commodity == \"electricity\")\n",
+    "        & (power_supply_2020.year == 2020)\n",
+    "    ]\n",
+    "    .groupby([\"timeslice\", \"technology\"])\n",
+    "    .sum()\n",
+    "    .reset_index()\n",
+    ")\n",
     "\n",
     "ax = sns.barplot(\n",
-    "    data=power_supply_2020[\n",
-    "        (power_supply_2020.commodity == \"electricity\")\n",
-    "        & (power_supply_2020.year == 2020)\n",
-    "    ],\n",
+    "    data=gassCCGT_electricity_supply_2020,\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
     "    hue=\"technology\",\n",
@@ -186,7 +140,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Next, we want to ensure that the supply of `windturbine` does not exceed a certain value during the day. This may be because, for example, there is reduced wind during the day. We will, therefore, modify the `TechnodataTimeslices.csv` file by changing the values of `UtilizationFactor`.\n",
+    "Next, we want to ensure that the supply of `windturbine` does not exceed a certain value during the day. This may be because, for example, there is reduced wind during the day. We will, therefore, modify the `TechnodataTimeslices.csv` file by changing the values of `UtilizationFactor` and `MinimumServiceFactor` as shown.\n",
     "\n",
     "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
     "|-|-|-|-|-|-|-|-|\n",
@@ -197,12 +151,12 @@
     "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|0.4|\n",
     "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|0.8|\n",
     "|gasCCGT|R1|2020|all-year|all-week|evening|1|1|\n",
-    "|windturbine|R1|2020|all-year|all-week|night|1|0|\n",
-    "|windturbine|R1|2020|all-year|all-week|morning|0.5|0|\n",
-    "|windturbine|R1|2020|all-year|all-week|afternoon|0.5|0|\n",
-    "|windturbine|R1|2020|all-year|all-week|early-peak|1|0|\n",
-    "|windturbine|R1|2020|all-year|all-week|late-peak|1|0|\n",
-    "|windturbine|R1|2020|all-year|all-week|evening|1|0|\n"
+    "|windturbine|R1|2020|all-year|all-week|night|1|**0**|\n",
+    "|windturbine|R1|2020|all-year|all-week|morning|**0.5**|**0**|\n",
+    "|windturbine|R1|2020|all-year|all-week|afternoon|**0.5**|**0**|\n",
+    "|windturbine|R1|2020|all-year|all-week|early-peak|1|**0**|\n",
+    "|windturbine|R1|2020|all-year|all-week|late-peak|1|**0**|\n",
+    "|windturbine|R1|2020|all-year|all-week|evening|1|**0**|\n"
    ]
   },
   {
@@ -218,18 +172,22 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_supply_2025 = pd.read_csv(\n",
-    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv\"\n",
+    "power_supply_2030 = pd.read_csv(\n",
+    "    \"../tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv\"\n",
     ")\n",
-    "\n",
-    "ax = sns.barplot(\n",
-    "    data=power_supply_2025[\n",
-    "        (power_supply_2025.technology == \"windturbine\")\n",
-    "        & (power_supply_2025.year == 2030)\n",
+    "windturbine_electricity_supply_2030 = (\n",
+    "    power_supply_2030[\n",
+    "        (power_supply_2030.technology == \"windturbine\")\n",
+    "        & (power_supply_2030.commodity == \"electricity\")\n",
+    "        & (power_supply_2030.year == 2030)\n",
     "    ]\n",
-    "    .groupby([\"timeslice\", \"year\", \"technology\"])\n",
+    "    .groupby([\"timeslice\", \"technology\"])\n",
     "    .sum()\n",
-    "    .reset_index(),\n",
+    "    .reset_index()\n",
+    ")\n",
+    "\n",
+    "ax = sns.barplot(\n",
+    "    data=windturbine_electricity_supply_2030,\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
     "    hue=\"technology\",\n",
@@ -245,10 +203,13 @@
     "\n",
     "## Next steps\n",
     "\n",
-    "This brings us to the end of the user guide! Using the information explained in this tutorial, or following similar steps, you will be able to create complex scenarios of your choosing.\n",
-    "\n",
-    "For the full code to generate the final results, see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint)."
+    "This brings us to the end of the user guide! Using the information explained in this tutorial, or following similar steps, you will be able to create complex scenarios of your choosing."
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {

From 341b465613e3a81acd764451421347ac10a86a1b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 23 May 2024 11:44:35 +0100
Subject: [PATCH 164/419] Small text changes to several notebooks

---
 .../1-add-new-technology/generate_models.py   |  2 +-
 .../3-add-region/generate_models.py           |  2 +-
 .../add-gdp-correlation-demand.ipynb          | 36 +++++--------------
 docs/user-guide/add-region.ipynb              |  2 +-
 docs/user-guide/add-solar.ipynb               |  2 +-
 docs/user-guide/addition-service-demand.ipynb |  7 ++--
 docs/user-guide/modify-timing-data.ipynb      | 13 +++++--
 7 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index 9a2e226c..eb93aaf7 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -50,7 +50,7 @@ def generate_model_1() -> None:
     df.loc[df["ProcessName"] == "solarPV", "Fuel"] = "solar"
     df.to_csv(technodata_file, index=False)
 
-    # Add solar to excluded commodities (Undocumented)
+    # Add solar to excluded commodities
     settings_file = model_path / "settings.toml"
     modify_toml(
         settings_file, lambda settings: settings["excluded_commodities"].append("solar")
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index e79b069c..f584cee5 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -29,7 +29,7 @@ def generate_model_1():
     df = pd.read_csv(technodata_file)
     mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "windturbine")
     df.loc[mask, "MaxCapacityAddition"] = 5
-    df.loc[mask, "MaxCapacityGrowth"] = 0.5  # incorrect in notebook
+    df.loc[mask, "MaxCapacityGrowth"] = 0.5
     df.loc[mask, "TotalCapacityLimit"] = 100
     df.to_csv(technodata_file, index=False)
 
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 34540b99..8a5f67fd 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -11,12 +11,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In the previous section we added an exogenous service demand. That is, we explicitly specified what the demand would be per year.\n",
-    "\n",
+    "In the previous section we added an exogenous service demand. That is, we explicitly specified what the demand would be per year. \n",
     "However, we may not know what the electricity demand may be per year. Instead, we may conclude that our electricity demand is a function of the GDP and population of a particular region. \n",
-    "\n",
     "To accommodate such a scenario, MUSE enables us to choose a regression function that estimates service demands from GDP and population, which may be more certain in your case.\n",
-    "\n",
     "In this section we will show how this can be done."
    ]
   },
@@ -33,9 +30,13 @@
    "source": [
     "For this work, we will use the `default` example from the MUSE repository, and will not build on the previous examples. This is done to simplify the model at this point.\n",
     "\n",
-    "The full scenario files for the `default` example can be found [here](https://github.com/SGIModel/MUSE_OS/tree/main/src/muse/data/example/default). We recommend that you download these files and save them to a location convenient to you, as we will be amending these throughout this tutorial.\n",
+    "To get the default model and be able to edit the files use:\n",
+    "\n",
+    "```bash\n",
+    "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n",
+    "```\n",
     "\n",
-    "Similarly to before, we must amend the `preset` folder for this. However, we no longer require the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files. These files set the exogenous service demand for the residential sector.\n",
+    "Similarly to before, we must amend the `technodata/preset` folder for this. However, we no longer require the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files. These files set the exogenous service demand for the residential sector.\n",
     "\n",
     "We must replace these files, with the following files:\n",
     "\n",
@@ -96,27 +97,6 @@
     "We effectively linked the new files to MUSE."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Increasing capacity constraints\n",
-    "\n",
-    "Again, we must increase the capacity constraints. This is because the data in our GDP PPP and population files create a much higher demand than our previous toy example, due to the fact that it is more realistic for our particular region.\n",
-    "\n",
-    "To ensure that we don't encounter any problems, we will relax our capacity constraints considerably.\n",
-    "\n",
-    "For the full files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/6-add-correlation-demand/1-correlation). Make sure to take note of the columns:\n",
-    "\n",
-    "- MaxCapacityAddition\n",
-    "\n",
-    "- MaxCapacityGrowth\n",
-    "\n",
-    "- TotalCapacityLimit\n",
-    "\n",
-    "for the `Technodata.csv` files for each of the sectors. "
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -128,7 +108,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "With those changes made, we are now able to run our modified model, with the `python -m muse settings.toml` command in anaconda prompt, as before.\n",
+    "With those changes made, we are now able to run our modified model, with the `python -m muse settings.toml` command in the command line, as before.\n",
     "\n",
     "As before, we will now visualise the output."
    ]
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 260591c2..e5a5804f 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -81,7 +81,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Again, we will run the results using the ```python -m pip muse settings.toml``` in anaconda prompt, and analyse the data as follows:"
+    "Again, we will run the results using the ```python -m pip muse settings.toml``` in the command line, and analyse the data as follows:"
    ]
   },
   {
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 4f5dd939..8a094a7f 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -284,7 +284,7 @@
    "source": [
     "Now we are able to run our simulation, with the new solar power technology.\n",
     "\n",
-    "To do this we run the same run command as previously in the anaconda command prompt:\n",
+    "To do this we run the same run command as previously in the command line:\n",
     "\n",
     "```bash\n",
     "python -m muse settings.toml\n",
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index c694e944..1aab8f5e 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -12,10 +12,9 @@
    "metadata": {},
    "source": [
     "In this section, we detail how to add a service demand to MUSE. \n",
-    "\n",
     "In the residential sector, a service demand could be cooking. Houses require energy to cook food and a technology to service this demand, such as an electric stove. \n",
-    "\n",
-    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socio-economic development of a region or country. In addition, a technology must be added to service this new demand."
+    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socio-economic development of a region or country. \n",
+    "In addition, a technology must be added to service this new demand."
    ]
   },
   {
@@ -29,6 +28,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+    "The model in this tutorial will build directly on the model from the previous tutorial (with the additional timeslices, but before modifying the time horizon)\n",
+    "\n",
     "Firstly, we must add the demand section. In this example, we will add a cooking preset demand. To achieve this, we will now edit the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files, found within the `technodata/preset/` directory.\n",
     "\n",
     "The `Residential2020Consumption.csv` file allows us to specify the demand in 2020 for each region and technology per timeslice. The `Residential2050Consumption.csv` file does the same but for the year 2050. The datapoints between these are interpolated.\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index b661bd24..d483e841 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -148,7 +148,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "For the previous examples, we have run the scenario from 2020 to 2050, in 5 year time steps per benchmark year. This has been set at the top of the ```settings.toml``` file. However, we may want to run a more detailed scenario, with 2 year time steps, and up until the year 2040.\n",
+    "For the previous examples, we have run the scenario from 2020 to 2050, in 5 year time steps per benchmark year. However, we may want to run a more detailed scenario, with 2 year time steps, and up until the year 2040.\n",
+    "\n",
+    "We will make this change by modifying the current model. However, before doing so, please make a copy of the current model as the next tutorial will build directly off the model in its current state.\n",
     "\n",
     "Making this change is quite simple as we only have two lines to change. We will modify the first two lines of the ```settings.toml``` file, as follows:"
    ]
@@ -168,7 +170,7 @@
    "source": [
     "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n",
     "\n",
-    "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.retro_and_new` section should look as follows:\n",
+    "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.retro_and_new` section should now look as follows:\n",
     "\n",
     "    [sectors.power.subsectors.retro_and_new]\n",
     "    agents = '{path}/technodata/Agents.csv'\n",
@@ -252,8 +254,13 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In the next section we detail how to add an exogenous service demand, such as demand for heating or cooking."
+    "In the next section we detail how to add an exogenous service demand, such as demand for heating or cooking. The next tutorial will build directly on from the model in this tutorial."
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {

From 9553f7097ce6d6727a4484ab01df35d5be098d31 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 23 May 2024 11:53:05 +0100
Subject: [PATCH 165/419] Small change to tutorial 4 model, update notebook

---
 .../Results/Gas/Capacity/2030.csv             |   20 +-
 .../Results/Gas/Capacity/2035.csv             |   20 +-
 .../Results/Gas/Capacity/2040.csv             |   16 +-
 .../Results/Gas/Capacity/2045.csv             |   12 +-
 .../Results/Gas/Capacity/2050.csv             |   12 +-
 .../Results/MCACapacity.csv                   |   80 +-
 .../1-modify-timeslices/Results/MCAPrices.csv |  360 +++---
 .../Results/Power/Capacity/2025.csv           |   28 +-
 .../Results/Power/Capacity/2030.csv           |   28 +-
 .../Results/Power/Capacity/2035.csv           |   60 +-
 .../Results/Power/Capacity/2040.csv           |   56 +-
 .../Results/Power/Capacity/2045.csv           |   88 +-
 .../Results/Power/Capacity/2050.csv           |  176 ++-
 .../Results/Residential/Capacity/2025.csv     |   32 +-
 .../Results/Residential/Capacity/2030.csv     |   32 +-
 .../Results/Residential/Capacity/2035.csv     |   56 +-
 .../Results/Residential/Capacity/2040.csv     |   48 +-
 .../Results/Residential/Capacity/2045.csv     |   44 +-
 .../Results/Residential/Capacity/2050.csv     |   40 +-
 .../Results/Residential/Supply/2025.csv       |  192 ++--
 .../Results/Residential/Supply/2030.csv       |  384 +++----
 .../Results/Residential/Supply/2035.csv       |  448 ++++----
 .../Results/Residential/Supply/2040.csv       |  384 ++++---
 .../Results/Residential/Supply/2045.csv       |  320 +++---
 .../Results/Residential/Supply/2050.csv       |  256 ++---
 .../technodata/residential/Technodata.csv     |    8 +-
 .../Results/Gas/Capacity/2030.csv             |   24 +-
 .../Results/Gas/Capacity/2032.csv             |   28 +-
 .../Results/Gas/Capacity/2034.csv             |   28 +-
 .../Results/Gas/Capacity/2036.csv             |   24 +-
 .../Results/Gas/Capacity/2038.csv             |   20 +-
 .../Results/Gas/Capacity/2040.csv             |   20 +-
 .../Results/MCACapacity.csv                   |  186 +--
 .../Results/MCAPrices.csv                     |  512 ++++-----
 .../Results/Power/Capacity/2022.csv           |   36 +-
 .../Results/Power/Capacity/2024.csv           |   80 +-
 .../Results/Power/Capacity/2026.csv           |   80 +-
 .../Results/Power/Capacity/2028.csv           |   72 +-
 .../Results/Power/Capacity/2030.csv           |   72 +-
 .../Results/Power/Capacity/2032.csv           |  140 +--
 .../Results/Power/Capacity/2034.csv           |  216 ++--
 .../Results/Power/Capacity/2036.csv           |  208 ++--
 .../Results/Power/Capacity/2038.csv           |  192 ++--
 .../Results/Power/Capacity/2040.csv           |  192 ++--
 .../Results/Residential/Capacity/2022.csv     |   52 +-
 .../Results/Residential/Capacity/2024.csv     |  122 +-
 .../Results/Residential/Capacity/2026.csv     |  144 +--
 .../Results/Residential/Capacity/2028.csv     |  168 +--
 .../Results/Residential/Capacity/2030.csv     |  192 ++--
 .../Results/Residential/Capacity/2032.csv     |  180 +--
 .../Results/Residential/Capacity/2034.csv     |   16 +-
 .../Results/Residential/Supply/2022.csv       |  320 +++---
 .../Results/Residential/Supply/2024.csv       |  640 ++++++-----
 .../Results/Residential/Supply/2026.csv       |  768 +++++++------
 .../Results/Residential/Supply/2028.csv       |  896 ++++++++-------
 .../Results/Residential/Supply/2030.csv       | 1024 +++++++++--------
 .../Results/Residential/Supply/2032.csv       |  960 ++++++++--------
 .../Results/Residential/Supply/2034.csv       |  192 ++--
 .../technodata/residential/Technodata.csv     |    8 +-
 .../4-modify-timing-data/generate_models.py   |    8 +-
 docs/user-guide/modify-timing-data.ipynb      |   15 +-
 61 files changed, 5998 insertions(+), 5037 deletions(-)

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 47369da0..e4105ce1 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,13 +1,13 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,2.73240000000
-1,2040,R1,2030,gassupply1,2.73240000000
-1,2045,R1,2030,gassupply1,2.73240000000
-1,2050,R1,2030,gassupply1,2.73240000000
-1,2069,R1,2030,gassupply1,2.73240000000
+1,2035,R1,2030,gassupply1,4.97510000000
+1,2040,R1,2030,gassupply1,4.97510000000
+1,2045,R1,2030,gassupply1,4.97510000000
+1,2050,R1,2030,gassupply1,4.97510000000
+1,2069,R1,2030,gassupply1,4.97510000000
 2,2030,R2,2020,gassupply1,7.50000000000
-3,2035,R2,2030,gassupply1,2.73240000000
-3,2040,R2,2030,gassupply1,2.73240000000
-3,2045,R2,2030,gassupply1,2.73240000000
-3,2050,R2,2030,gassupply1,2.73240000000
-3,2069,R2,2030,gassupply1,2.73240000000
+3,2035,R2,2030,gassupply1,4.97510000000
+3,2040,R2,2030,gassupply1,4.97510000000
+3,2045,R2,2030,gassupply1,4.97510000000
+3,2050,R2,2030,gassupply1,4.97510000000
+3,2069,R2,2030,gassupply1,4.97510000000
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 e8148274..42804715 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,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,2.73240000000
-1,2040,R1,2030,gassupply1,2.73240000000
-1,2045,R1,2030,gassupply1,2.73240000000
-1,2050,R1,2030,gassupply1,2.73240000000
-1,2069,R1,2030,gassupply1,2.73240000000
-3,2035,R2,2030,gassupply1,2.73240000000
-3,2040,R2,2030,gassupply1,2.73240000000
-3,2045,R2,2030,gassupply1,2.73240000000
-3,2050,R2,2030,gassupply1,2.73240000000
-3,2069,R2,2030,gassupply1,2.73240000000
+1,2035,R1,2030,gassupply1,4.97510000000
+1,2040,R1,2030,gassupply1,4.97510000000
+1,2045,R1,2030,gassupply1,4.97510000000
+1,2050,R1,2030,gassupply1,4.97510000000
+1,2069,R1,2030,gassupply1,4.97510000000
+3,2035,R2,2030,gassupply1,4.97510000000
+3,2040,R2,2030,gassupply1,4.97510000000
+3,2045,R2,2030,gassupply1,4.97510000000
+3,2050,R2,2030,gassupply1,4.97510000000
+3,2069,R2,2030,gassupply1,4.97510000000
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 1501d088..f0dd13fa 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,9 +1,9 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,2.73240000000
-1,2045,R1,2030,gassupply1,2.73240000000
-1,2050,R1,2030,gassupply1,2.73240000000
-1,2069,R1,2030,gassupply1,2.73240000000
-3,2040,R2,2030,gassupply1,2.73240000000
-3,2045,R2,2030,gassupply1,2.73240000000
-3,2050,R2,2030,gassupply1,2.73240000000
-3,2069,R2,2030,gassupply1,2.73240000000
+1,2040,R1,2030,gassupply1,4.97510000000
+1,2045,R1,2030,gassupply1,4.97510000000
+1,2050,R1,2030,gassupply1,4.97510000000
+1,2069,R1,2030,gassupply1,4.97510000000
+3,2040,R2,2030,gassupply1,4.97510000000
+3,2045,R2,2030,gassupply1,4.97510000000
+3,2050,R2,2030,gassupply1,4.97510000000
+3,2069,R2,2030,gassupply1,4.97510000000
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 fbead2e9..0dad7b98 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,7 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,2.73240000000
-1,2050,R1,2030,gassupply1,2.73240000000
-1,2069,R1,2030,gassupply1,2.73240000000
-3,2045,R2,2030,gassupply1,2.73240000000
-3,2050,R2,2030,gassupply1,2.73240000000
-3,2069,R2,2030,gassupply1,2.73240000000
+1,2045,R1,2030,gassupply1,4.97510000000
+1,2050,R1,2030,gassupply1,4.97510000000
+1,2069,R1,2030,gassupply1,4.97510000000
+3,2045,R2,2030,gassupply1,4.97510000000
+3,2050,R2,2030,gassupply1,4.97510000000
+3,2069,R2,2030,gassupply1,4.97510000000
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 80cf63af..f55b2ae6 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,7 +1,7 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,2.73240000000
-1,2055,R1,2030,gassupply1,2.73240000000
-1,2069,R1,2030,gassupply1,2.73240000000
-3,2050,R2,2030,gassupply1,2.73240000000
-3,2055,R2,2030,gassupply1,2.73240000000
-3,2069,R2,2030,gassupply1,2.73240000000
+1,2050,R1,2030,gassupply1,4.97510000000
+1,2055,R1,2030,gassupply1,4.97510000000
+1,2069,R1,2030,gassupply1,4.97510000000
+3,2050,R2,2030,gassupply1,4.97510000000
+3,2055,R2,2030,gassupply1,4.97510000000
+3,2069,R2,2030,gassupply1,4.97510000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 0290c26f..b913b4c0 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -16,81 +16,85 @@ gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
 windturbine,R2,R2,A1,power,retrofit,2025,15.15000000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.12000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.86000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,8.48000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.12000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.74000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,3.86000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,8.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.74000000000
 solarPV,R1,R1,A1,power,retrofit,2030,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2030,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2030,8.99000000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2030,8.99000000000
 windturbine,R2,R2,A1,power,retrofit,2030,15.15000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.12000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,8.48000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.86000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.74000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,2.12000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,8.48000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,3.86000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.74000000000
 heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
 solarPV,R1,R1,A1,power,retrofit,2035,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2035,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2035,8.99000000000
 solarPV,R1,R1,A1,power,retrofit,2035,5.60000000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2035,8.99000000000
 solarPV,R2,R2,A1,power,retrofit,2035,5.60000000000
 windturbine,R2,R2,A1,power,retrofit,2035,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.73240000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,2.73240000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,4.97510000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,0.88600000000
 heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,15.31400000000
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.88600000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.20000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,15.31400000000
 solarPV,R1,R1,A1,power,retrofit,2040,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2040,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2040,8.99000000000
 solarPV,R1,R1,A1,power,retrofit,2040,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2040,7.72000000000
+solarPV,R1,R1,A1,power,retrofit,2040,8.57400000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2040,8.99000000000
 solarPV,R2,R2,A1,power,retrofit,2040,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2040,7.72000000000
+solarPV,R2,R2,A1,power,retrofit,2040,8.57400000000
 windturbine,R2,R2,A1,power,retrofit,2040,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.73240000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.73240000000
-heatpump,R1,R1,A1,residential,retrofit,2045,16.20000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,4.97510000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,0.88600000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.31400000000
 heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.20000000000
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.88600000000
+heatpump,R2,R2,A1,residential,retrofit,2045,15.31400000000
 heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.99000000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2045,7.72000000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.57400000000
 solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2045,8.99000000000
 solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2045,7.72000000000
+solarPV,R2,R2,A1,power,retrofit,2045,8.57400000000
 solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
 windturbine,R2,R2,A1,power,retrofit,2045,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.73240000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,2.73240000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,4.97510000000
 heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.73000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.99000000000
 solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2050,7.72000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.57400000000
 solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.60000000000
+solarPV,R1,R1,A1,power,retrofit,2050,16.48600000000
 windturbine,R1,R1,A1,power,retrofit,2050,5.15000000000
-solarPV,R2,R2,A1,power,retrofit,2050,10.73000000000
+solarPV,R2,R2,A1,power,retrofit,2050,8.99000000000
 solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2050,7.72000000000
+solarPV,R2,R2,A1,power,retrofit,2050,8.57400000000
 solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2050,15.60000000000
+solarPV,R2,R2,A1,power,retrofit,2050,16.48600000000
 windturbine,R2,R2,A1,power,retrofit,2050,5.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.73240000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,2.73240000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,4.97510000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 8f1f3906..3f147241 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -131,319 +131,319 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'night')",electricity,R2,14.10690000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.24060000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.24060000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.25000000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.25000000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,14.13620000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R2,14.13620000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.34390000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.34390000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.35740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.35740000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.10690000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.10690000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24060000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24060000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.25000000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.25000000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,14.13620000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R2,14.13620000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.34390000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.34390000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35740000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.24380000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.24380000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.24370000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.24370000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.72370000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.72370000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.75200000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.75200000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,14.17530000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R2,14.17530000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.48180000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.48180000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.50070000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.50070000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",electricity,R1,14.17530000000,2030
 "('all-year', 'all-week', 'early-morning')",electricity,R2,14.17530000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.48180000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.48180000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.50070000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.50070000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.17530000000,2030
 "('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.17530000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48180000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48180000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.50070000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.50070000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,11.30380000000,2035
 "('all-year', 'all-week', 'night')",electricity,R2,11.30380000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.48940000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.48940000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.50760000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.50760000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R1,11.33510000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R2,11.33510000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.61390000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.61390000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.63980000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.63980000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.30380000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.30380000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48940000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48940000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50760000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R1,11.33510000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R2,11.33510000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.61390000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.61390000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.63980000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.63980000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44980000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44980000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44970000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44970000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.07220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.07220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.12650000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.12650000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R1,11.37680000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R2,11.37680000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.78010000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,51.78010000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.81640000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.81640000000,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', 'early-morning')",electricity,R1,11.37680000000,2035
 "('all-year', 'all-week', 'early-morning')",electricity,R2,11.37680000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.78010000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.78010000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.81640000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.81640000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.37680000000,2035
 "('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.37680000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.78010000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.78010000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81640000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81640000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.08930000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08930000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.33930000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.33930000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.06080000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,9.06080000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.27980000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,41.27980000000,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.12760000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12760000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.48600000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.48600000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.09350000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,9.09350000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.41740000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,41.41740000000,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', 'mid-afternoon')",electricity,R1,0.08930000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08930000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33930000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33930000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,9.06080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.06080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27980000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27980000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12760000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12760000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.48600000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.48600000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.09350000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.09350000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41740000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41740000000,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,0.26790000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26790000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.03060000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,1.03060000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.21310000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.21310000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.92480000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.92480000000,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,0.17860000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17860000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.68280000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.68280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.13700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,9.13700000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.60130000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,41.60130000000,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', 'early-morning')",electricity,R1,0.17860000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17860000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.68280000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.68280000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,9.13700000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,9.13700000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.60130000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.60130000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17860000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17860000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.68280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.68280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.13700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.13700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60130000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60130000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.08740000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.08740000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.26610000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,7.26610000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.08530000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,33.08530000000,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.12490000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12490000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.29970000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,7.29970000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.22200000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,33.22200000000,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', 'mid-afternoon')",electricity,R1,0.08740000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08740000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,7.26610000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,7.26610000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.08530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.08530000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12490000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12490000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.29970000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,7.29970000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.22200000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.22200000000,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,0.26230000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26230000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06220000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.42280000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.42280000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.72690000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.72690000000,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,0.17490000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17490000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.34440000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,7.34440000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.40490000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,33.40490000000,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', 'early-morning')",electricity,R1,0.17490000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17490000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,7.34440000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,7.34440000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.40490000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.40490000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17490000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17490000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,7.34440000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,7.34440000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.40490000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.40490000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.08240000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.08240000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.01550000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.01550000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.08190000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08190000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.22280000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.22280000000,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.11780000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.11780000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.02370000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.02370000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11700000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.11700000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.31960000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.31960000000,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', 'mid-afternoon')",electricity,R1,0.08240000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08240000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01550000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08190000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08190000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.22280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.22280000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11780000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11780000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02370000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02370000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11700000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11700000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31960000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.31960000000,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,0.24730000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24730000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06180000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06180000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24570000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24570000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.68180000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.68180000000,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,0.16490000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.16490000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.03610000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.03610000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16380000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.45000000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.45000000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16490000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16490000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03610000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03610000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16380000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.45000000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.45000000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16490000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16490000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03610000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03610000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.45000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.45000000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index 2c891b2d..91056903 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -7,20 +7,20 @@ asset,year,technology,region,installed,capacity
 2,2040,solarPV,R1,2020,5.15000000000
 2,2045,solarPV,R1,2020,5.15000000000
 2,2049,solarPV,R1,2020,5.15000000000
-3,2030,solarPV,R1,2025,10.73000000000
-3,2035,solarPV,R1,2025,10.73000000000
-3,2040,solarPV,R1,2025,10.73000000000
-3,2045,solarPV,R1,2025,10.73000000000
-3,2049,solarPV,R1,2025,10.73000000000
-3,2050,solarPV,R1,2025,10.73000000000
-3,2054,solarPV,R1,2025,10.73000000000
-4,2030,solarPV,R2,2025,10.73000000000
-4,2035,solarPV,R2,2025,10.73000000000
-4,2040,solarPV,R2,2025,10.73000000000
-4,2045,solarPV,R2,2025,10.73000000000
-4,2049,solarPV,R2,2025,10.73000000000
-4,2050,solarPV,R2,2025,10.73000000000
-4,2054,solarPV,R2,2025,10.73000000000
+3,2030,solarPV,R1,2025,8.99000000000
+3,2035,solarPV,R1,2025,8.99000000000
+3,2040,solarPV,R1,2025,8.99000000000
+3,2045,solarPV,R1,2025,8.99000000000
+3,2049,solarPV,R1,2025,8.99000000000
+3,2050,solarPV,R1,2025,8.99000000000
+3,2054,solarPV,R1,2025,8.99000000000
+4,2030,solarPV,R2,2025,8.99000000000
+4,2035,solarPV,R2,2025,8.99000000000
+4,2040,solarPV,R2,2025,8.99000000000
+4,2045,solarPV,R2,2025,8.99000000000
+4,2049,solarPV,R2,2025,8.99000000000
+4,2050,solarPV,R2,2025,8.99000000000
+4,2054,solarPV,R2,2025,8.99000000000
 5,2025,windturbine,R1,2020,10.00000000000
 5,2030,windturbine,R1,2020,10.00000000000
 5,2035,windturbine,R1,2020,10.00000000000
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 3d4383ee..15882446 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
@@ -9,13 +9,13 @@ asset,year,region,installed,technology,capacity
 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,solarPV,10.73000000000
-3,2035,R1,2025,solarPV,10.73000000000
-3,2040,R1,2025,solarPV,10.73000000000
-3,2045,R1,2025,solarPV,10.73000000000
-3,2049,R1,2025,solarPV,10.73000000000
-3,2050,R1,2025,solarPV,10.73000000000
-3,2054,R1,2025,solarPV,10.73000000000
+3,2030,R1,2025,solarPV,8.99000000000
+3,2035,R1,2025,solarPV,8.99000000000
+3,2040,R1,2025,solarPV,8.99000000000
+3,2045,R1,2025,solarPV,8.99000000000
+3,2049,R1,2025,solarPV,8.99000000000
+3,2050,R1,2025,solarPV,8.99000000000
+3,2054,R1,2025,solarPV,8.99000000000
 4,2035,R1,2030,solarPV,5.60000000000
 4,2040,R1,2030,solarPV,5.60000000000
 4,2045,R1,2030,solarPV,5.60000000000
@@ -29,13 +29,13 @@ asset,year,region,installed,technology,capacity
 6,2040,R2,2020,windturbine,15.15000000000
 6,2045,R2,2020,windturbine,15.15000000000
 6,2049,R2,2020,windturbine,15.15000000000
-7,2030,R2,2025,solarPV,10.73000000000
-7,2035,R2,2025,solarPV,10.73000000000
-7,2040,R2,2025,solarPV,10.73000000000
-7,2045,R2,2025,solarPV,10.73000000000
-7,2049,R2,2025,solarPV,10.73000000000
-7,2050,R2,2025,solarPV,10.73000000000
-7,2054,R2,2025,solarPV,10.73000000000
+7,2030,R2,2025,solarPV,8.99000000000
+7,2035,R2,2025,solarPV,8.99000000000
+7,2040,R2,2025,solarPV,8.99000000000
+7,2045,R2,2025,solarPV,8.99000000000
+7,2049,R2,2025,solarPV,8.99000000000
+7,2050,R2,2025,solarPV,8.99000000000
+7,2054,R2,2025,solarPV,8.99000000000
 8,2035,R2,2030,solarPV,5.60000000000
 8,2040,R2,2030,solarPV,5.60000000000
 8,2045,R2,2030,solarPV,5.60000000000
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 971feef4..3a8f94a5 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
@@ -7,12 +7,12 @@ asset,year,region,installed,technology,capacity
 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,solarPV,10.73000000000
-3,2040,R1,2025,solarPV,10.73000000000
-3,2045,R1,2025,solarPV,10.73000000000
-3,2049,R1,2025,solarPV,10.73000000000
-3,2050,R1,2025,solarPV,10.73000000000
-3,2054,R1,2025,solarPV,10.73000000000
+3,2035,R1,2025,solarPV,8.99000000000
+3,2040,R1,2025,solarPV,8.99000000000
+3,2045,R1,2025,solarPV,8.99000000000
+3,2049,R1,2025,solarPV,8.99000000000
+3,2050,R1,2025,solarPV,8.99000000000
+3,2054,R1,2025,solarPV,8.99000000000
 4,2035,R1,2030,solarPV,5.60000000000
 4,2040,R1,2030,solarPV,5.60000000000
 4,2045,R1,2030,solarPV,5.60000000000
@@ -21,25 +21,25 @@ asset,year,region,installed,technology,capacity
 4,2054,R1,2030,solarPV,5.60000000000
 4,2055,R1,2030,solarPV,5.60000000000
 4,2059,R1,2030,solarPV,5.60000000000
-5,2040,R1,2035,solarPV,7.72000000000
-5,2045,R1,2035,solarPV,7.72000000000
-5,2049,R1,2035,solarPV,7.72000000000
-5,2050,R1,2035,solarPV,7.72000000000
-5,2054,R1,2035,solarPV,7.72000000000
-5,2055,R1,2035,solarPV,7.72000000000
-5,2059,R1,2035,solarPV,7.72000000000
-5,2060,R1,2035,solarPV,7.72000000000
-5,2064,R1,2035,solarPV,7.72000000000
+5,2040,R1,2035,solarPV,8.57400000000
+5,2045,R1,2035,solarPV,8.57400000000
+5,2049,R1,2035,solarPV,8.57400000000
+5,2050,R1,2035,solarPV,8.57400000000
+5,2054,R1,2035,solarPV,8.57400000000
+5,2055,R1,2035,solarPV,8.57400000000
+5,2059,R1,2035,solarPV,8.57400000000
+5,2060,R1,2035,solarPV,8.57400000000
+5,2064,R1,2035,solarPV,8.57400000000
 7,2035,R2,2020,windturbine,15.15000000000
 7,2040,R2,2020,windturbine,15.15000000000
 7,2045,R2,2020,windturbine,15.15000000000
 7,2049,R2,2020,windturbine,15.15000000000
-8,2035,R2,2025,solarPV,10.73000000000
-8,2040,R2,2025,solarPV,10.73000000000
-8,2045,R2,2025,solarPV,10.73000000000
-8,2049,R2,2025,solarPV,10.73000000000
-8,2050,R2,2025,solarPV,10.73000000000
-8,2054,R2,2025,solarPV,10.73000000000
+8,2035,R2,2025,solarPV,8.99000000000
+8,2040,R2,2025,solarPV,8.99000000000
+8,2045,R2,2025,solarPV,8.99000000000
+8,2049,R2,2025,solarPV,8.99000000000
+8,2050,R2,2025,solarPV,8.99000000000
+8,2054,R2,2025,solarPV,8.99000000000
 9,2035,R2,2030,solarPV,5.60000000000
 9,2040,R2,2030,solarPV,5.60000000000
 9,2045,R2,2030,solarPV,5.60000000000
@@ -48,12 +48,12 @@ asset,year,region,installed,technology,capacity
 9,2054,R2,2030,solarPV,5.60000000000
 9,2055,R2,2030,solarPV,5.60000000000
 9,2059,R2,2030,solarPV,5.60000000000
-10,2040,R2,2035,solarPV,7.72000000000
-10,2045,R2,2035,solarPV,7.72000000000
-10,2049,R2,2035,solarPV,7.72000000000
-10,2050,R2,2035,solarPV,7.72000000000
-10,2054,R2,2035,solarPV,7.72000000000
-10,2055,R2,2035,solarPV,7.72000000000
-10,2059,R2,2035,solarPV,7.72000000000
-10,2060,R2,2035,solarPV,7.72000000000
-10,2064,R2,2035,solarPV,7.72000000000
+10,2040,R2,2035,solarPV,8.57400000000
+10,2045,R2,2035,solarPV,8.57400000000
+10,2049,R2,2035,solarPV,8.57400000000
+10,2050,R2,2035,solarPV,8.57400000000
+10,2054,R2,2035,solarPV,8.57400000000
+10,2055,R2,2035,solarPV,8.57400000000
+10,2059,R2,2035,solarPV,8.57400000000
+10,2060,R2,2035,solarPV,8.57400000000
+10,2064,R2,2035,solarPV,8.57400000000
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 922e4161..9ea97cda 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
@@ -5,11 +5,11 @@ asset,year,region,installed,technology,capacity
 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,solarPV,10.73000000000
-3,2045,R1,2025,solarPV,10.73000000000
-3,2049,R1,2025,solarPV,10.73000000000
-3,2050,R1,2025,solarPV,10.73000000000
-3,2054,R1,2025,solarPV,10.73000000000
+3,2040,R1,2025,solarPV,8.99000000000
+3,2045,R1,2025,solarPV,8.99000000000
+3,2049,R1,2025,solarPV,8.99000000000
+3,2050,R1,2025,solarPV,8.99000000000
+3,2054,R1,2025,solarPV,8.99000000000
 4,2040,R1,2030,solarPV,5.60000000000
 4,2045,R1,2030,solarPV,5.60000000000
 4,2049,R1,2030,solarPV,5.60000000000
@@ -17,15 +17,15 @@ asset,year,region,installed,technology,capacity
 4,2054,R1,2030,solarPV,5.60000000000
 4,2055,R1,2030,solarPV,5.60000000000
 4,2059,R1,2030,solarPV,5.60000000000
-5,2040,R1,2035,solarPV,7.72000000000
-5,2045,R1,2035,solarPV,7.72000000000
-5,2049,R1,2035,solarPV,7.72000000000
-5,2050,R1,2035,solarPV,7.72000000000
-5,2054,R1,2035,solarPV,7.72000000000
-5,2055,R1,2035,solarPV,7.72000000000
-5,2059,R1,2035,solarPV,7.72000000000
-5,2060,R1,2035,solarPV,7.72000000000
-5,2064,R1,2035,solarPV,7.72000000000
+5,2040,R1,2035,solarPV,8.57400000000
+5,2045,R1,2035,solarPV,8.57400000000
+5,2049,R1,2035,solarPV,8.57400000000
+5,2050,R1,2035,solarPV,8.57400000000
+5,2054,R1,2035,solarPV,8.57400000000
+5,2055,R1,2035,solarPV,8.57400000000
+5,2059,R1,2035,solarPV,8.57400000000
+5,2060,R1,2035,solarPV,8.57400000000
+5,2064,R1,2035,solarPV,8.57400000000
 6,2045,R1,2040,solarPV,5.60000000000
 6,2049,R1,2040,solarPV,5.60000000000
 6,2050,R1,2040,solarPV,5.60000000000
@@ -39,11 +39,11 @@ asset,year,region,installed,technology,capacity
 8,2040,R2,2020,windturbine,15.15000000000
 8,2045,R2,2020,windturbine,15.15000000000
 8,2049,R2,2020,windturbine,15.15000000000
-9,2040,R2,2025,solarPV,10.73000000000
-9,2045,R2,2025,solarPV,10.73000000000
-9,2049,R2,2025,solarPV,10.73000000000
-9,2050,R2,2025,solarPV,10.73000000000
-9,2054,R2,2025,solarPV,10.73000000000
+9,2040,R2,2025,solarPV,8.99000000000
+9,2045,R2,2025,solarPV,8.99000000000
+9,2049,R2,2025,solarPV,8.99000000000
+9,2050,R2,2025,solarPV,8.99000000000
+9,2054,R2,2025,solarPV,8.99000000000
 10,2040,R2,2030,solarPV,5.60000000000
 10,2045,R2,2030,solarPV,5.60000000000
 10,2049,R2,2030,solarPV,5.60000000000
@@ -51,15 +51,15 @@ asset,year,region,installed,technology,capacity
 10,2054,R2,2030,solarPV,5.60000000000
 10,2055,R2,2030,solarPV,5.60000000000
 10,2059,R2,2030,solarPV,5.60000000000
-11,2040,R2,2035,solarPV,7.72000000000
-11,2045,R2,2035,solarPV,7.72000000000
-11,2049,R2,2035,solarPV,7.72000000000
-11,2050,R2,2035,solarPV,7.72000000000
-11,2054,R2,2035,solarPV,7.72000000000
-11,2055,R2,2035,solarPV,7.72000000000
-11,2059,R2,2035,solarPV,7.72000000000
-11,2060,R2,2035,solarPV,7.72000000000
-11,2064,R2,2035,solarPV,7.72000000000
+11,2040,R2,2035,solarPV,8.57400000000
+11,2045,R2,2035,solarPV,8.57400000000
+11,2049,R2,2035,solarPV,8.57400000000
+11,2050,R2,2035,solarPV,8.57400000000
+11,2054,R2,2035,solarPV,8.57400000000
+11,2055,R2,2035,solarPV,8.57400000000
+11,2059,R2,2035,solarPV,8.57400000000
+11,2060,R2,2035,solarPV,8.57400000000
+11,2064,R2,2035,solarPV,8.57400000000
 12,2045,R2,2040,solarPV,5.60000000000
 12,2049,R2,2040,solarPV,5.60000000000
 12,2050,R2,2040,solarPV,5.60000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index a65e7f58..4e320235 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,24 +1,24 @@
 asset,year,technology,region,installed,capacity
 0,2045,solarPV,R1,2020,5.15000000000
 0,2049,solarPV,R1,2020,5.15000000000
-1,2045,solarPV,R1,2025,10.73000000000
-1,2049,solarPV,R1,2025,10.73000000000
-1,2050,solarPV,R1,2025,10.73000000000
-1,2054,solarPV,R1,2025,10.73000000000
+1,2045,solarPV,R1,2025,8.99000000000
+1,2049,solarPV,R1,2025,8.99000000000
+1,2050,solarPV,R1,2025,8.99000000000
+1,2054,solarPV,R1,2025,8.99000000000
 2,2045,solarPV,R1,2030,5.60000000000
 2,2049,solarPV,R1,2030,5.60000000000
 2,2050,solarPV,R1,2030,5.60000000000
 2,2054,solarPV,R1,2030,5.60000000000
 2,2055,solarPV,R1,2030,5.60000000000
 2,2059,solarPV,R1,2030,5.60000000000
-3,2045,solarPV,R1,2035,7.72000000000
-3,2049,solarPV,R1,2035,7.72000000000
-3,2050,solarPV,R1,2035,7.72000000000
-3,2054,solarPV,R1,2035,7.72000000000
-3,2055,solarPV,R1,2035,7.72000000000
-3,2059,solarPV,R1,2035,7.72000000000
-3,2060,solarPV,R1,2035,7.72000000000
-3,2064,solarPV,R1,2035,7.72000000000
+3,2045,solarPV,R1,2035,8.57400000000
+3,2049,solarPV,R1,2035,8.57400000000
+3,2050,solarPV,R1,2035,8.57400000000
+3,2054,solarPV,R1,2035,8.57400000000
+3,2055,solarPV,R1,2035,8.57400000000
+3,2059,solarPV,R1,2035,8.57400000000
+3,2060,solarPV,R1,2035,8.57400000000
+3,2064,solarPV,R1,2035,8.57400000000
 4,2045,solarPV,R1,2040,5.60000000000
 4,2049,solarPV,R1,2040,5.60000000000
 4,2050,solarPV,R1,2040,5.60000000000
@@ -29,34 +29,34 @@ asset,year,technology,region,installed,capacity
 4,2064,solarPV,R1,2040,5.60000000000
 4,2065,solarPV,R1,2040,5.60000000000
 4,2069,solarPV,R1,2040,5.60000000000
-5,2050,solarPV,R1,2045,15.60000000000
-5,2054,solarPV,R1,2045,15.60000000000
-5,2055,solarPV,R1,2045,15.60000000000
-5,2059,solarPV,R1,2045,15.60000000000
-5,2060,solarPV,R1,2045,15.60000000000
-5,2064,solarPV,R1,2045,15.60000000000
-5,2065,solarPV,R1,2045,15.60000000000
-5,2069,solarPV,R1,2045,15.60000000000
-5,2070,solarPV,R1,2045,15.60000000000
-5,2074,solarPV,R1,2045,15.60000000000
-6,2045,solarPV,R2,2025,10.73000000000
-6,2049,solarPV,R2,2025,10.73000000000
-6,2050,solarPV,R2,2025,10.73000000000
-6,2054,solarPV,R2,2025,10.73000000000
+5,2050,solarPV,R1,2045,16.48600000000
+5,2054,solarPV,R1,2045,16.48600000000
+5,2055,solarPV,R1,2045,16.48600000000
+5,2059,solarPV,R1,2045,16.48600000000
+5,2060,solarPV,R1,2045,16.48600000000
+5,2064,solarPV,R1,2045,16.48600000000
+5,2065,solarPV,R1,2045,16.48600000000
+5,2069,solarPV,R1,2045,16.48600000000
+5,2070,solarPV,R1,2045,16.48600000000
+5,2074,solarPV,R1,2045,16.48600000000
+6,2045,solarPV,R2,2025,8.99000000000
+6,2049,solarPV,R2,2025,8.99000000000
+6,2050,solarPV,R2,2025,8.99000000000
+6,2054,solarPV,R2,2025,8.99000000000
 7,2045,solarPV,R2,2030,5.60000000000
 7,2049,solarPV,R2,2030,5.60000000000
 7,2050,solarPV,R2,2030,5.60000000000
 7,2054,solarPV,R2,2030,5.60000000000
 7,2055,solarPV,R2,2030,5.60000000000
 7,2059,solarPV,R2,2030,5.60000000000
-8,2045,solarPV,R2,2035,7.72000000000
-8,2049,solarPV,R2,2035,7.72000000000
-8,2050,solarPV,R2,2035,7.72000000000
-8,2054,solarPV,R2,2035,7.72000000000
-8,2055,solarPV,R2,2035,7.72000000000
-8,2059,solarPV,R2,2035,7.72000000000
-8,2060,solarPV,R2,2035,7.72000000000
-8,2064,solarPV,R2,2035,7.72000000000
+8,2045,solarPV,R2,2035,8.57400000000
+8,2049,solarPV,R2,2035,8.57400000000
+8,2050,solarPV,R2,2035,8.57400000000
+8,2054,solarPV,R2,2035,8.57400000000
+8,2055,solarPV,R2,2035,8.57400000000
+8,2059,solarPV,R2,2035,8.57400000000
+8,2060,solarPV,R2,2035,8.57400000000
+8,2064,solarPV,R2,2035,8.57400000000
 9,2045,solarPV,R2,2040,5.60000000000
 9,2049,solarPV,R2,2040,5.60000000000
 9,2050,solarPV,R2,2040,5.60000000000
@@ -67,16 +67,16 @@ asset,year,technology,region,installed,capacity
 9,2064,solarPV,R2,2040,5.60000000000
 9,2065,solarPV,R2,2040,5.60000000000
 9,2069,solarPV,R2,2040,5.60000000000
-10,2050,solarPV,R2,2045,15.60000000000
-10,2054,solarPV,R2,2045,15.60000000000
-10,2055,solarPV,R2,2045,15.60000000000
-10,2059,solarPV,R2,2045,15.60000000000
-10,2060,solarPV,R2,2045,15.60000000000
-10,2064,solarPV,R2,2045,15.60000000000
-10,2065,solarPV,R2,2045,15.60000000000
-10,2069,solarPV,R2,2045,15.60000000000
-10,2070,solarPV,R2,2045,15.60000000000
-10,2074,solarPV,R2,2045,15.60000000000
+10,2050,solarPV,R2,2045,16.48600000000
+10,2054,solarPV,R2,2045,16.48600000000
+10,2055,solarPV,R2,2045,16.48600000000
+10,2059,solarPV,R2,2045,16.48600000000
+10,2060,solarPV,R2,2045,16.48600000000
+10,2064,solarPV,R2,2045,16.48600000000
+10,2065,solarPV,R2,2045,16.48600000000
+10,2069,solarPV,R2,2045,16.48600000000
+10,2070,solarPV,R2,2045,16.48600000000
+10,2074,solarPV,R2,2045,16.48600000000
 11,2045,windturbine,R1,2020,10.00000000000
 11,2049,windturbine,R1,2020,10.00000000000
 12,2050,windturbine,R1,2045,5.15000000000
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 2f1414fd..a40afb88 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,16 +1,16 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,10.73000000000
-2,2054,R1,2025,solarPV,10.73000000000
+2,2050,R1,2025,solarPV,8.99000000000
+2,2054,R1,2025,solarPV,8.99000000000
 3,2050,R1,2030,solarPV,5.60000000000
 3,2054,R1,2030,solarPV,5.60000000000
 3,2055,R1,2030,solarPV,5.60000000000
 3,2059,R1,2030,solarPV,5.60000000000
-4,2050,R1,2035,solarPV,7.72000000000
-4,2054,R1,2035,solarPV,7.72000000000
-4,2055,R1,2035,solarPV,7.72000000000
-4,2059,R1,2035,solarPV,7.72000000000
-4,2060,R1,2035,solarPV,7.72000000000
-4,2064,R1,2035,solarPV,7.72000000000
+4,2050,R1,2035,solarPV,8.57400000000
+4,2054,R1,2035,solarPV,8.57400000000
+4,2055,R1,2035,solarPV,8.57400000000
+4,2059,R1,2035,solarPV,8.57400000000
+4,2060,R1,2035,solarPV,8.57400000000
+4,2064,R1,2035,solarPV,8.57400000000
 5,2050,R1,2040,solarPV,5.60000000000
 5,2054,R1,2040,solarPV,5.60000000000
 5,2055,R1,2040,solarPV,5.60000000000
@@ -19,16 +19,16 @@ asset,year,region,installed,technology,capacity
 5,2064,R1,2040,solarPV,5.60000000000
 5,2065,R1,2040,solarPV,5.60000000000
 5,2069,R1,2040,solarPV,5.60000000000
-6,2050,R1,2045,solarPV,15.60000000000
-6,2054,R1,2045,solarPV,15.60000000000
-6,2055,R1,2045,solarPV,15.60000000000
-6,2059,R1,2045,solarPV,15.60000000000
-6,2060,R1,2045,solarPV,15.60000000000
-6,2064,R1,2045,solarPV,15.60000000000
-6,2065,R1,2045,solarPV,15.60000000000
-6,2069,R1,2045,solarPV,15.60000000000
-6,2070,R1,2045,solarPV,15.60000000000
-6,2074,R1,2045,solarPV,15.60000000000
+6,2050,R1,2045,solarPV,16.48600000000
+6,2054,R1,2045,solarPV,16.48600000000
+6,2055,R1,2045,solarPV,16.48600000000
+6,2059,R1,2045,solarPV,16.48600000000
+6,2060,R1,2045,solarPV,16.48600000000
+6,2064,R1,2045,solarPV,16.48600000000
+6,2065,R1,2045,solarPV,16.48600000000
+6,2069,R1,2045,solarPV,16.48600000000
+6,2070,R1,2045,solarPV,16.48600000000
+6,2074,R1,2045,solarPV,16.48600000000
 7,2050,R1,2045,windturbine,5.15000000000
 7,2054,R1,2045,windturbine,5.15000000000
 7,2055,R1,2045,windturbine,5.15000000000
@@ -39,83 +39,63 @@ asset,year,region,installed,technology,capacity
 7,2069,R1,2045,windturbine,5.15000000000
 7,2070,R1,2045,windturbine,5.15000000000
 7,2074,R1,2045,windturbine,5.15000000000
-8,2055,R1,2050,solarPV,10.00000000000
-8,2059,R1,2050,solarPV,10.00000000000
-8,2060,R1,2050,solarPV,10.00000000000
-8,2064,R1,2050,solarPV,10.00000000000
-8,2065,R1,2050,solarPV,10.00000000000
-8,2069,R1,2050,solarPV,10.00000000000
-8,2070,R1,2050,solarPV,10.00000000000
-8,2074,R1,2050,solarPV,10.00000000000
-8,2075,R1,2050,solarPV,10.00000000000
-8,2079,R1,2050,solarPV,10.00000000000
-9,2055,R1,2050,windturbine,0.73000000000
-9,2059,R1,2050,windturbine,0.73000000000
-9,2060,R1,2050,windturbine,0.73000000000
-9,2064,R1,2050,windturbine,0.73000000000
-9,2065,R1,2050,windturbine,0.73000000000
-9,2069,R1,2050,windturbine,0.73000000000
-9,2070,R1,2050,windturbine,0.73000000000
-9,2074,R1,2050,windturbine,0.73000000000
-9,2075,R1,2050,windturbine,0.73000000000
-9,2079,R1,2050,windturbine,0.73000000000
-11,2050,R2,2025,solarPV,10.73000000000
-11,2054,R2,2025,solarPV,10.73000000000
-12,2050,R2,2030,solarPV,5.60000000000
-12,2054,R2,2030,solarPV,5.60000000000
-12,2055,R2,2030,solarPV,5.60000000000
-12,2059,R2,2030,solarPV,5.60000000000
-13,2050,R2,2035,solarPV,7.72000000000
-13,2054,R2,2035,solarPV,7.72000000000
-13,2055,R2,2035,solarPV,7.72000000000
-13,2059,R2,2035,solarPV,7.72000000000
-13,2060,R2,2035,solarPV,7.72000000000
-13,2064,R2,2035,solarPV,7.72000000000
-14,2050,R2,2040,solarPV,5.60000000000
-14,2054,R2,2040,solarPV,5.60000000000
-14,2055,R2,2040,solarPV,5.60000000000
-14,2059,R2,2040,solarPV,5.60000000000
-14,2060,R2,2040,solarPV,5.60000000000
-14,2064,R2,2040,solarPV,5.60000000000
-14,2065,R2,2040,solarPV,5.60000000000
-14,2069,R2,2040,solarPV,5.60000000000
-15,2050,R2,2045,solarPV,15.60000000000
-15,2054,R2,2045,solarPV,15.60000000000
-15,2055,R2,2045,solarPV,15.60000000000
-15,2059,R2,2045,solarPV,15.60000000000
-15,2060,R2,2045,solarPV,15.60000000000
-15,2064,R2,2045,solarPV,15.60000000000
-15,2065,R2,2045,solarPV,15.60000000000
-15,2069,R2,2045,solarPV,15.60000000000
-15,2070,R2,2045,solarPV,15.60000000000
-15,2074,R2,2045,solarPV,15.60000000000
-16,2050,R2,2045,windturbine,5.15000000000
-16,2054,R2,2045,windturbine,5.15000000000
-16,2055,R2,2045,windturbine,5.15000000000
-16,2059,R2,2045,windturbine,5.15000000000
-16,2060,R2,2045,windturbine,5.15000000000
-16,2064,R2,2045,windturbine,5.15000000000
-16,2065,R2,2045,windturbine,5.15000000000
-16,2069,R2,2045,windturbine,5.15000000000
-16,2070,R2,2045,windturbine,5.15000000000
-16,2074,R2,2045,windturbine,5.15000000000
-17,2055,R2,2050,solarPV,10.00000000000
-17,2059,R2,2050,solarPV,10.00000000000
-17,2060,R2,2050,solarPV,10.00000000000
-17,2064,R2,2050,solarPV,10.00000000000
-17,2065,R2,2050,solarPV,10.00000000000
-17,2069,R2,2050,solarPV,10.00000000000
-17,2070,R2,2050,solarPV,10.00000000000
-17,2074,R2,2050,solarPV,10.00000000000
-17,2075,R2,2050,solarPV,10.00000000000
-17,2079,R2,2050,solarPV,10.00000000000
-18,2055,R2,2050,windturbine,0.73000000000
-18,2059,R2,2050,windturbine,0.73000000000
-18,2060,R2,2050,windturbine,0.73000000000
-18,2064,R2,2050,windturbine,0.73000000000
-18,2065,R2,2050,windturbine,0.73000000000
-18,2069,R2,2050,windturbine,0.73000000000
-18,2070,R2,2050,windturbine,0.73000000000
-18,2074,R2,2050,windturbine,0.73000000000
-18,2075,R2,2050,windturbine,0.73000000000
-18,2079,R2,2050,windturbine,0.73000000000
+8,2055,R1,2050,solarPV,8.99000000000
+8,2059,R1,2050,solarPV,8.99000000000
+8,2060,R1,2050,solarPV,8.99000000000
+8,2064,R1,2050,solarPV,8.99000000000
+8,2065,R1,2050,solarPV,8.99000000000
+8,2069,R1,2050,solarPV,8.99000000000
+8,2070,R1,2050,solarPV,8.99000000000
+8,2074,R1,2050,solarPV,8.99000000000
+8,2075,R1,2050,solarPV,8.99000000000
+8,2079,R1,2050,solarPV,8.99000000000
+10,2050,R2,2025,solarPV,8.99000000000
+10,2054,R2,2025,solarPV,8.99000000000
+11,2050,R2,2030,solarPV,5.60000000000
+11,2054,R2,2030,solarPV,5.60000000000
+11,2055,R2,2030,solarPV,5.60000000000
+11,2059,R2,2030,solarPV,5.60000000000
+12,2050,R2,2035,solarPV,8.57400000000
+12,2054,R2,2035,solarPV,8.57400000000
+12,2055,R2,2035,solarPV,8.57400000000
+12,2059,R2,2035,solarPV,8.57400000000
+12,2060,R2,2035,solarPV,8.57400000000
+12,2064,R2,2035,solarPV,8.57400000000
+13,2050,R2,2040,solarPV,5.60000000000
+13,2054,R2,2040,solarPV,5.60000000000
+13,2055,R2,2040,solarPV,5.60000000000
+13,2059,R2,2040,solarPV,5.60000000000
+13,2060,R2,2040,solarPV,5.60000000000
+13,2064,R2,2040,solarPV,5.60000000000
+13,2065,R2,2040,solarPV,5.60000000000
+13,2069,R2,2040,solarPV,5.60000000000
+14,2050,R2,2045,solarPV,16.48600000000
+14,2054,R2,2045,solarPV,16.48600000000
+14,2055,R2,2045,solarPV,16.48600000000
+14,2059,R2,2045,solarPV,16.48600000000
+14,2060,R2,2045,solarPV,16.48600000000
+14,2064,R2,2045,solarPV,16.48600000000
+14,2065,R2,2045,solarPV,16.48600000000
+14,2069,R2,2045,solarPV,16.48600000000
+14,2070,R2,2045,solarPV,16.48600000000
+14,2074,R2,2045,solarPV,16.48600000000
+15,2050,R2,2045,windturbine,5.15000000000
+15,2054,R2,2045,windturbine,5.15000000000
+15,2055,R2,2045,windturbine,5.15000000000
+15,2059,R2,2045,windturbine,5.15000000000
+15,2060,R2,2045,windturbine,5.15000000000
+15,2064,R2,2045,windturbine,5.15000000000
+15,2065,R2,2045,windturbine,5.15000000000
+15,2069,R2,2045,windturbine,5.15000000000
+15,2070,R2,2045,windturbine,5.15000000000
+15,2074,R2,2045,windturbine,5.15000000000
+16,2055,R2,2050,solarPV,8.99000000000
+16,2059,R2,2050,solarPV,8.99000000000
+16,2060,R2,2050,solarPV,8.99000000000
+16,2064,R2,2050,solarPV,8.99000000000
+16,2065,R2,2050,solarPV,8.99000000000
+16,2069,R2,2050,solarPV,8.99000000000
+16,2070,R2,2050,solarPV,8.99000000000
+16,2074,R2,2050,solarPV,8.99000000000
+16,2075,R2,2050,solarPV,8.99000000000
+16,2079,R2,2050,solarPV,8.99000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
index 53b2db90..a6720c51 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
@@ -1,25 +1,25 @@
 asset,year,technology,region,installed,capacity
 0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,2.12000000000
-1,2034,gasboiler,R1,2025,2.12000000000
-1,2035,gasboiler,R1,2025,2.12000000000
-1,2039,gasboiler,R1,2025,2.12000000000
+1,2030,gasboiler,R1,2025,3.86000000000
+1,2034,gasboiler,R1,2025,3.86000000000
+1,2035,gasboiler,R1,2025,3.86000000000
+1,2039,gasboiler,R1,2025,3.86000000000
 2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,2.12000000000
-3,2034,gasboiler,R2,2025,2.12000000000
-3,2035,gasboiler,R2,2025,2.12000000000
-3,2039,gasboiler,R2,2025,2.12000000000
+3,2030,gasboiler,R2,2025,3.86000000000
+3,2034,gasboiler,R2,2025,3.86000000000
+3,2035,gasboiler,R2,2025,3.86000000000
+3,2039,gasboiler,R2,2025,3.86000000000
 4,2025,heatpump,R1,2020,17.40000000000
 4,2030,heatpump,R1,2020,17.40000000000
 4,2034,heatpump,R1,2020,17.40000000000
-5,2030,heatpump,R1,2025,8.48000000000
-5,2034,heatpump,R1,2025,8.48000000000
-5,2035,heatpump,R1,2025,8.48000000000
-5,2039,heatpump,R1,2025,8.48000000000
+5,2030,heatpump,R1,2025,6.74000000000
+5,2034,heatpump,R1,2025,6.74000000000
+5,2035,heatpump,R1,2025,6.74000000000
+5,2039,heatpump,R1,2025,6.74000000000
 6,2025,heatpump,R2,2020,17.40000000000
 6,2030,heatpump,R2,2020,17.40000000000
 6,2034,heatpump,R2,2020,17.40000000000
-7,2030,heatpump,R2,2025,8.48000000000
-7,2034,heatpump,R2,2025,8.48000000000
-7,2035,heatpump,R2,2025,8.48000000000
-7,2039,heatpump,R2,2025,8.48000000000
+7,2030,heatpump,R2,2025,6.74000000000
+7,2034,heatpump,R2,2025,6.74000000000
+7,2035,heatpump,R2,2025,6.74000000000
+7,2039,heatpump,R2,2025,6.74000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
index 3b307878..f6556372 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
@@ -1,28 +1,28 @@
 asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,2.12000000000
-0,2034,gasboiler,R1,2025,2.12000000000
-0,2035,gasboiler,R1,2025,2.12000000000
-0,2039,gasboiler,R1,2025,2.12000000000
-1,2030,gasboiler,R2,2025,2.12000000000
-1,2034,gasboiler,R2,2025,2.12000000000
-1,2035,gasboiler,R2,2025,2.12000000000
-1,2039,gasboiler,R2,2025,2.12000000000
+0,2030,gasboiler,R1,2025,3.86000000000
+0,2034,gasboiler,R1,2025,3.86000000000
+0,2035,gasboiler,R1,2025,3.86000000000
+0,2039,gasboiler,R1,2025,3.86000000000
+1,2030,gasboiler,R2,2025,3.86000000000
+1,2034,gasboiler,R2,2025,3.86000000000
+1,2035,gasboiler,R2,2025,3.86000000000
+1,2039,gasboiler,R2,2025,3.86000000000
 2,2030,heatpump,R1,2020,17.40000000000
 2,2034,heatpump,R1,2020,17.40000000000
-3,2030,heatpump,R1,2025,8.48000000000
-3,2034,heatpump,R1,2025,8.48000000000
-3,2035,heatpump,R1,2025,8.48000000000
-3,2039,heatpump,R1,2025,8.48000000000
+3,2030,heatpump,R1,2025,6.74000000000
+3,2034,heatpump,R1,2025,6.74000000000
+3,2035,heatpump,R1,2025,6.74000000000
+3,2039,heatpump,R1,2025,6.74000000000
 4,2035,heatpump,R1,2030,23.00000000000
 4,2039,heatpump,R1,2030,23.00000000000
 4,2040,heatpump,R1,2030,23.00000000000
 4,2044,heatpump,R1,2030,23.00000000000
 5,2030,heatpump,R2,2020,17.40000000000
 5,2034,heatpump,R2,2020,17.40000000000
-6,2030,heatpump,R2,2025,8.48000000000
-6,2034,heatpump,R2,2025,8.48000000000
-6,2035,heatpump,R2,2025,8.48000000000
-6,2039,heatpump,R2,2025,8.48000000000
+6,2030,heatpump,R2,2025,6.74000000000
+6,2034,heatpump,R2,2025,6.74000000000
+6,2035,heatpump,R2,2025,6.74000000000
+6,2039,heatpump,R2,2025,6.74000000000
 7,2035,heatpump,R2,2030,23.00000000000
 7,2039,heatpump,R2,2030,23.00000000000
 7,2040,heatpump,R2,2030,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
index 89ecddb8..a3ca6aa5 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
@@ -1,25 +1,33 @@
 asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,2.12000000000
-0,2039,gasboiler,R1,2025,2.12000000000
-1,2035,gasboiler,R2,2025,2.12000000000
-1,2039,gasboiler,R2,2025,2.12000000000
-2,2035,heatpump,R1,2025,8.48000000000
-2,2039,heatpump,R1,2025,8.48000000000
-3,2035,heatpump,R1,2030,23.00000000000
-3,2039,heatpump,R1,2030,23.00000000000
-3,2040,heatpump,R1,2030,23.00000000000
-3,2044,heatpump,R1,2030,23.00000000000
-4,2040,heatpump,R1,2035,16.20000000000
-4,2044,heatpump,R1,2035,16.20000000000
-4,2045,heatpump,R1,2035,16.20000000000
-4,2049,heatpump,R1,2035,16.20000000000
-5,2035,heatpump,R2,2025,8.48000000000
-5,2039,heatpump,R2,2025,8.48000000000
-6,2035,heatpump,R2,2030,23.00000000000
-6,2039,heatpump,R2,2030,23.00000000000
-6,2040,heatpump,R2,2030,23.00000000000
-6,2044,heatpump,R2,2030,23.00000000000
-7,2040,heatpump,R2,2035,16.20000000000
-7,2044,heatpump,R2,2035,16.20000000000
-7,2045,heatpump,R2,2035,16.20000000000
-7,2049,heatpump,R2,2035,16.20000000000
+0,2035,gasboiler,R1,2025,3.86000000000
+0,2039,gasboiler,R1,2025,3.86000000000
+1,2040,gasboiler,R1,2035,0.88600000000
+1,2044,gasboiler,R1,2035,0.88600000000
+1,2045,gasboiler,R1,2035,0.88600000000
+1,2049,gasboiler,R1,2035,0.88600000000
+2,2035,gasboiler,R2,2025,3.86000000000
+2,2039,gasboiler,R2,2025,3.86000000000
+3,2040,gasboiler,R2,2035,0.88600000000
+3,2044,gasboiler,R2,2035,0.88600000000
+3,2045,gasboiler,R2,2035,0.88600000000
+3,2049,gasboiler,R2,2035,0.88600000000
+4,2035,heatpump,R1,2025,6.74000000000
+4,2039,heatpump,R1,2025,6.74000000000
+5,2035,heatpump,R1,2030,23.00000000000
+5,2039,heatpump,R1,2030,23.00000000000
+5,2040,heatpump,R1,2030,23.00000000000
+5,2044,heatpump,R1,2030,23.00000000000
+6,2040,heatpump,R1,2035,15.31400000000
+6,2044,heatpump,R1,2035,15.31400000000
+6,2045,heatpump,R1,2035,15.31400000000
+6,2049,heatpump,R1,2035,15.31400000000
+7,2035,heatpump,R2,2025,6.74000000000
+7,2039,heatpump,R2,2025,6.74000000000
+8,2035,heatpump,R2,2030,23.00000000000
+8,2039,heatpump,R2,2030,23.00000000000
+8,2040,heatpump,R2,2030,23.00000000000
+8,2044,heatpump,R2,2030,23.00000000000
+9,2040,heatpump,R2,2035,15.31400000000
+9,2044,heatpump,R2,2035,15.31400000000
+9,2045,heatpump,R2,2035,15.31400000000
+9,2049,heatpump,R2,2035,15.31400000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
index 97cba817..7285c2c7 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
@@ -1,21 +1,29 @@
 asset,year,technology,region,installed,capacity
-0,2040,heatpump,R1,2030,23.00000000000
-0,2044,heatpump,R1,2030,23.00000000000
-1,2040,heatpump,R1,2035,16.20000000000
-1,2044,heatpump,R1,2035,16.20000000000
-1,2045,heatpump,R1,2035,16.20000000000
-1,2049,heatpump,R1,2035,16.20000000000
-2,2045,heatpump,R1,2040,28.60000000000
-2,2049,heatpump,R1,2040,28.60000000000
-2,2050,heatpump,R1,2040,28.60000000000
-2,2054,heatpump,R1,2040,28.60000000000
-3,2040,heatpump,R2,2030,23.00000000000
-3,2044,heatpump,R2,2030,23.00000000000
-4,2040,heatpump,R2,2035,16.20000000000
-4,2044,heatpump,R2,2035,16.20000000000
-4,2045,heatpump,R2,2035,16.20000000000
-4,2049,heatpump,R2,2035,16.20000000000
-5,2045,heatpump,R2,2040,28.60000000000
-5,2049,heatpump,R2,2040,28.60000000000
-5,2050,heatpump,R2,2040,28.60000000000
-5,2054,heatpump,R2,2040,28.60000000000
+0,2040,gasboiler,R1,2035,0.88600000000
+0,2044,gasboiler,R1,2035,0.88600000000
+0,2045,gasboiler,R1,2035,0.88600000000
+0,2049,gasboiler,R1,2035,0.88600000000
+1,2040,gasboiler,R2,2035,0.88600000000
+1,2044,gasboiler,R2,2035,0.88600000000
+1,2045,gasboiler,R2,2035,0.88600000000
+1,2049,gasboiler,R2,2035,0.88600000000
+2,2040,heatpump,R1,2030,23.00000000000
+2,2044,heatpump,R1,2030,23.00000000000
+3,2040,heatpump,R1,2035,15.31400000000
+3,2044,heatpump,R1,2035,15.31400000000
+3,2045,heatpump,R1,2035,15.31400000000
+3,2049,heatpump,R1,2035,15.31400000000
+4,2045,heatpump,R1,2040,28.60000000000
+4,2049,heatpump,R1,2040,28.60000000000
+4,2050,heatpump,R1,2040,28.60000000000
+4,2054,heatpump,R1,2040,28.60000000000
+5,2040,heatpump,R2,2030,23.00000000000
+5,2044,heatpump,R2,2030,23.00000000000
+6,2040,heatpump,R2,2035,15.31400000000
+6,2044,heatpump,R2,2035,15.31400000000
+6,2045,heatpump,R2,2035,15.31400000000
+6,2049,heatpump,R2,2035,15.31400000000
+7,2045,heatpump,R2,2040,28.60000000000
+7,2049,heatpump,R2,2040,28.60000000000
+7,2050,heatpump,R2,2040,28.60000000000
+7,2054,heatpump,R2,2040,28.60000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
index 8530aa6f..a54ec89d 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
@@ -1,21 +1,25 @@
 asset,year,technology,region,installed,capacity
-0,2045,heatpump,R1,2035,16.20000000000
-0,2049,heatpump,R1,2035,16.20000000000
-1,2045,heatpump,R1,2040,28.60000000000
-1,2049,heatpump,R1,2040,28.60000000000
-1,2050,heatpump,R1,2040,28.60000000000
-1,2054,heatpump,R1,2040,28.60000000000
-2,2050,heatpump,R1,2045,21.80000000000
-2,2054,heatpump,R1,2045,21.80000000000
-2,2055,heatpump,R1,2045,21.80000000000
-2,2059,heatpump,R1,2045,21.80000000000
-3,2045,heatpump,R2,2035,16.20000000000
-3,2049,heatpump,R2,2035,16.20000000000
-4,2045,heatpump,R2,2040,28.60000000000
-4,2049,heatpump,R2,2040,28.60000000000
-4,2050,heatpump,R2,2040,28.60000000000
-4,2054,heatpump,R2,2040,28.60000000000
-5,2050,heatpump,R2,2045,21.80000000000
-5,2054,heatpump,R2,2045,21.80000000000
-5,2055,heatpump,R2,2045,21.80000000000
-5,2059,heatpump,R2,2045,21.80000000000
+0,2045,gasboiler,R1,2035,0.88600000000
+0,2049,gasboiler,R1,2035,0.88600000000
+1,2045,gasboiler,R2,2035,0.88600000000
+1,2049,gasboiler,R2,2035,0.88600000000
+2,2045,heatpump,R1,2035,15.31400000000
+2,2049,heatpump,R1,2035,15.31400000000
+3,2045,heatpump,R1,2040,28.60000000000
+3,2049,heatpump,R1,2040,28.60000000000
+3,2050,heatpump,R1,2040,28.60000000000
+3,2054,heatpump,R1,2040,28.60000000000
+4,2050,heatpump,R1,2045,21.80000000000
+4,2054,heatpump,R1,2045,21.80000000000
+4,2055,heatpump,R1,2045,21.80000000000
+4,2059,heatpump,R1,2045,21.80000000000
+5,2045,heatpump,R2,2035,15.31400000000
+5,2049,heatpump,R2,2035,15.31400000000
+6,2045,heatpump,R2,2040,28.60000000000
+6,2049,heatpump,R2,2040,28.60000000000
+6,2050,heatpump,R2,2040,28.60000000000
+6,2054,heatpump,R2,2040,28.60000000000
+7,2050,heatpump,R2,2045,21.80000000000
+7,2054,heatpump,R2,2045,21.80000000000
+7,2055,heatpump,R2,2045,21.80000000000
+7,2059,heatpump,R2,2045,21.80000000000
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 0dd9dec9..579eb060 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,28.60000000000
-1,2054,R1,2040,heatpump,28.60000000000
-2,2050,R1,2045,heatpump,21.80000000000
-2,2054,R1,2045,heatpump,21.80000000000
-2,2055,R1,2045,heatpump,21.80000000000
-2,2059,R1,2045,heatpump,21.80000000000
-3,2055,R1,2050,heatpump,28.60000000000
-3,2059,R1,2050,heatpump,28.60000000000
-3,2060,R1,2050,heatpump,28.60000000000
-3,2064,R1,2050,heatpump,28.60000000000
-5,2050,R2,2040,heatpump,28.60000000000
-5,2054,R2,2040,heatpump,28.60000000000
-6,2050,R2,2045,heatpump,21.80000000000
-6,2054,R2,2045,heatpump,21.80000000000
-6,2055,R2,2045,heatpump,21.80000000000
-6,2059,R2,2045,heatpump,21.80000000000
-7,2055,R2,2050,heatpump,28.60000000000
-7,2059,R2,2050,heatpump,28.60000000000
-7,2060,R2,2050,heatpump,28.60000000000
-7,2064,R2,2050,heatpump,28.60000000000
+2,2050,R1,2040,heatpump,28.60000000000
+2,2054,R1,2040,heatpump,28.60000000000
+3,2050,R1,2045,heatpump,21.80000000000
+3,2054,R1,2045,heatpump,21.80000000000
+3,2055,R1,2045,heatpump,21.80000000000
+3,2059,R1,2045,heatpump,21.80000000000
+4,2055,R1,2050,heatpump,28.60000000000
+4,2059,R1,2050,heatpump,28.60000000000
+4,2060,R1,2050,heatpump,28.60000000000
+4,2064,R1,2050,heatpump,28.60000000000
+7,2050,R2,2040,heatpump,28.60000000000
+7,2054,R2,2040,heatpump,28.60000000000
+8,2050,R2,2045,heatpump,21.80000000000
+8,2054,R2,2045,heatpump,21.80000000000
+8,2055,R2,2045,heatpump,21.80000000000
+8,2059,R2,2045,heatpump,21.80000000000
+9,2055,R2,2050,heatpump,28.60000000000
+9,2059,R2,2050,heatpump,28.60000000000
+9,2060,R2,2050,heatpump,28.60000000000
+9,2064,R2,2050,heatpump,28.60000000000
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 5a647211..15c74cb2 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
@@ -3,223 +3,223 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 0,heat,R1,2025,2,gasboiler,2020,all-year,all-week,night,0.10420000000
 0,heat,R1,2025,4,heatpump,2020,all-year,all-week,night,0.36250000000
 0,heat,R1,2025,6,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2030,3,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2030,3,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R1,2030,4,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,5,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,5,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2030,6,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,7,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,7,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.10420000000
 0,heat,R2,2025,2,gasboiler,2020,all-year,all-week,night,0.10420000000
 0,heat,R2,2025,4,heatpump,2020,all-year,all-week,night,0.36250000000
 0,heat,R2,2025,6,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2030,3,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2030,3,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R2,2030,4,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,5,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,5,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2030,6,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,7,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,7,heatpump,2025,all-year,all-week,night,0.14040000000
 0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,6.74060000000
 0,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,night,5.20380000000
 0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,6.74060000000
 0,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,night,5.20380000000
 1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R1,2025,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R1,2025,4,heatpump,2020,all-year,all-week,morning,0.51790000000
 1,heat,R1,2025,6,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2030,3,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2030,3,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R1,2030,4,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,5,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,5,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2030,6,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,7,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,7,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R2,2025,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R2,2025,4,heatpump,2020,all-year,all-week,morning,0.51790000000
 1,heat,R2,2025,6,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2030,3,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2030,3,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R2,2030,4,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,5,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,5,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2030,6,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,7,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,7,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
 1,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,morning,7.43390000000
 1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
 1,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,morning,7.43390000000
 2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R1,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R1,2025,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,heat,R1,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R1,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2030,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R2,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R2,2025,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,heat,R2,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R2,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2030,6,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
 2,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
 2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
 2,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
 3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
 3,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
 3,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
 3,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
 3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
 3,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
 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.08750000000
 4,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 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.08750000000
 4,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 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.57410000000
-4,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
 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.57410000000
-4,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
 5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R1,2025,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R1,2025,4,heatpump,2020,all-year,all-week,evening,0.72500000000
 5,heat,R1,2025,6,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2030,3,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2030,3,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R1,2030,4,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,5,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,5,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2030,6,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,7,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,7,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R2,2025,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R2,2025,4,heatpump,2020,all-year,all-week,evening,0.72500000000
 5,heat,R2,2025,6,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2030,3,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2030,3,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R2,2030,4,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,5,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,5,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2030,6,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,7,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,7,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
 5,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,evening,10.40750000000
 5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
 5,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,evening,10.40750000000
 6,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
 6,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
 6,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
 6,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
 6,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
 6,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
 7,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R1,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R1,2025,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
 7,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R2,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R2,2025,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
 7,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
 7,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
 7,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
 7,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
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 ed7feb58..55f060d2 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.04420000000
-0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,0,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,3,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2030,5,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,6,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,6,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,3,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2035,4,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2035,6,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,6,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2035,7,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2030,0,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,0,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,3,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2030,5,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,6,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,3,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,6,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,3,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2035,4,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2035,6,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,6,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2035,7,heatpump,2030,all-year,all-week,night,0.47920000000
-0,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-1,heat,R1,2030,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+0,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,5.20380000000
+1,heat,R1,2030,0,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,3,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2030,5,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,6,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,6,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,3,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2035,4,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2035,6,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,6,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2035,7,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2030,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,0,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,3,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2030,5,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,6,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,3,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,6,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,3,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2035,4,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2035,6,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,6,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2035,7,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-2,heat,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+1,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,7.43390000000
+2,heat,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R1,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2030,5,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2035,4,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2035,7,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R2,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2030,5,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2035,4,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2035,7,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-3,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+2,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+3,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-4,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+3,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+4,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-5,heat,R1,2030,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+4,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+5,heat,R1,2030,0,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,3,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2030,5,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,6,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,6,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,3,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2035,4,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2035,6,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,6,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2035,7,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2030,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,0,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,3,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2030,5,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,6,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,3,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,6,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,3,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2035,4,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2035,6,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,6,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2035,7,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-6,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+5,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,10.40750000000
+6,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-7,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+6,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+7,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
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 c646a84f..8ecb1f57 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,257 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,2,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R1,2035,3,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2035,5,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R1,2035,6,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,2,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R2,2035,3,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2035,5,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R2,2035,6,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
-0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,2.85800000000
-1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,2,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R1,2035,3,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2035,5,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R1,2035,6,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,2,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R2,2035,3,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2035,5,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R2,2035,6,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,4.08290000000
-2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,2,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R1,2035,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2035,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R1,2035,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,2,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R2,2035,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2035,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R2,2035,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,2,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R1,2035,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2035,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R1,2035,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,2,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R2,2035,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2035,5,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R2,2035,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,2,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R1,2035,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2035,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R1,2035,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,2,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R2,2035,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2035,5,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R2,2035,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,2,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R1,2035,3,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2035,5,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R1,2035,6,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,2,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R2,2035,3,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2035,5,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R2,2035,6,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,5.71610000000
-6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,2,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R1,2035,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2035,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R1,2035,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,2,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R2,2035,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2035,5,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R2,2035,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,2,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R1,2035,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2035,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R1,2035,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,2,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R2,2035,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2035,5,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R2,2035,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,2,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,4,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R1,2035,5,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2035,7,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R1,2035,8,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,3,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,5,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,6,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2040,8,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,9,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,2,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,4,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R2,2035,5,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2035,7,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R2,2035,8,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,3,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,5,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,6,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2040,8,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,9,heatpump,2035,all-year,all-week,night,0.31900000000
+0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,night,1.19440000000
+1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,2,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,4,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R1,2035,5,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2035,7,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R1,2035,8,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,3,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,5,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,6,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2040,8,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,9,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,2,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,4,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R2,2035,5,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2035,7,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R2,2035,8,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,3,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,5,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,6,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2040,8,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,9,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,morning,1.70630000000
+2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,2,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,4,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R1,2035,5,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2035,7,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R1,2035,8,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,3,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,5,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,6,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2040,8,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,9,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,2,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,4,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R2,2035,5,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2035,7,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R2,2035,8,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,3,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,5,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,6,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2040,8,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,9,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,2,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,4,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R1,2035,5,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2035,7,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R1,2035,8,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,3,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,5,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,6,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2040,8,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,9,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,2,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,4,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R2,2035,5,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2035,7,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R2,2035,8,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,3,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,5,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,6,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2040,8,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,9,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,2,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,4,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R1,2035,5,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2035,7,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R1,2035,8,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,3,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,5,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,6,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2040,8,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,9,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,2,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,4,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R2,2035,5,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2035,7,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R2,2035,8,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,3,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,5,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,6,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2040,8,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,9,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,2,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,4,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R1,2035,5,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2035,7,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R1,2035,8,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,3,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,5,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,6,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2040,8,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,9,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,2,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,4,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R2,2035,5,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2035,7,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R2,2035,8,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,3,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,5,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,6,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2040,8,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,9,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,evening,2.38890000000
+6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,2,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,4,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R1,2035,5,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2035,7,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R1,2035,8,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,3,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,5,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,6,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2040,8,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,9,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,2,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,4,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R2,2035,5,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2035,7,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R2,2035,8,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,3,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,5,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,6,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2040,8,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,9,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,2,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,4,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R1,2035,5,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2035,7,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R1,2035,8,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,3,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,5,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,6,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2040,8,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,9,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,2,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,4,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R2,2035,5,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2035,7,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R2,2035,8,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,3,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,5,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,6,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2040,8,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,9,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
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 0d712dd6..16b7549a 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,257 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2040,0,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,1,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,1,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,2,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2045,4,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,5,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2040,0,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,1,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2040,3,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,4,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,1,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,2,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2045,4,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,5,heatpump,2040,all-year,all-week,night,0.59580000000
-1,heat,R1,2040,0,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,1,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,1,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,2,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2045,4,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,5,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2040,0,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,1,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2040,3,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,4,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,1,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,2,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2045,4,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,5,heatpump,2040,all-year,all-week,morning,0.85120000000
-2,heat,R1,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,2,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2045,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,5,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,1,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,2,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2045,4,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,5,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-3,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,2,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2045,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,5,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,1,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,2,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2045,4,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,5,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-4,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,2,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2045,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,5,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,1,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,2,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2045,4,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,5,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-5,heat,R1,2040,0,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,1,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,1,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,2,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2045,4,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,5,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2040,0,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,1,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2040,3,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,4,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,1,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,2,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2045,4,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,5,heatpump,2040,all-year,all-week,evening,1.19170000000
-6,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,2,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2045,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,5,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,1,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,2,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2045,4,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,5,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-7,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,2,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2045,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,5,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,1,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,2,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2045,4,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,5,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+0,heat,R1,2040,0,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,2,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,3,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2040,5,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,6,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,0,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,3,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,4,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,6,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,7,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2040,0,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,2,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,3,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2040,5,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,6,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,0,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,3,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,4,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,6,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,7,heatpump,2040,all-year,all-week,night,0.59580000000
+0,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+1,heat,R1,2040,0,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,2,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,3,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2040,5,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,6,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,0,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,3,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,4,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,6,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,7,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2040,0,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,2,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,3,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2040,5,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,6,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,0,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,3,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,4,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,6,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,7,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+2,heat,R1,2040,0,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,2,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,3,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2040,5,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,6,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2040,0,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,2,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,3,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2040,5,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,6,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+3,heat,R1,2040,0,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,2,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,3,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2040,5,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,6,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2040,0,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,2,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,3,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2040,5,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,6,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+4,heat,R1,2040,0,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,2,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,3,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2040,5,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,6,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2040,0,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,2,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,3,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2040,5,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,6,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+5,heat,R1,2040,0,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,2,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,3,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2040,5,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,6,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,0,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,3,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,4,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,6,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,7,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2040,0,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,2,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,3,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2040,5,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,6,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,0,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,3,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,4,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,6,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,7,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+6,heat,R1,2040,0,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,2,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,3,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2040,5,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,6,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,0,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2040,0,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,2,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,3,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2040,5,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,6,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,0,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+7,heat,R1,2040,0,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,2,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,3,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2040,5,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,6,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2040,0,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,2,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,3,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2040,5,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,6,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
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 0e8f2640..4ccbdace 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,193 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2045,0,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,1,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2045,3,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,4,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,1,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,2,heatpump,2045,all-year,all-week,night,0.45420000000
-0,heat,R1,2050,4,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,5,heatpump,2045,all-year,all-week,night,0.45420000000
-0,heat,R2,2045,0,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,1,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2045,3,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,4,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,1,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,2,heatpump,2045,all-year,all-week,night,0.45420000000
-0,heat,R2,2050,4,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,5,heatpump,2045,all-year,all-week,night,0.45420000000
-1,heat,R1,2045,0,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,1,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2045,3,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,4,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,1,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,2,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,heat,R1,2050,4,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,5,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,heat,R2,2045,0,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,1,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2045,3,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,4,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,1,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,2,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,heat,R2,2050,4,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,5,heatpump,2045,all-year,all-week,morning,0.64880000000
-2,heat,R1,2045,0,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,2,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2050,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,5,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2045,0,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,1,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,2,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2050,4,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,5,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-3,heat,R1,2045,0,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,2,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2050,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,5,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2045,0,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,1,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,2,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2050,4,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,5,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-4,heat,R1,2045,0,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,2,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2050,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,5,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2045,0,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,1,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,2,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2050,4,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,5,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-5,heat,R1,2045,0,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,1,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2045,3,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,4,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,1,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,2,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,heat,R1,2050,4,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,5,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,heat,R2,2045,0,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,1,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2045,3,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,4,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,1,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,2,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,heat,R2,2050,4,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,5,heatpump,2045,all-year,all-week,evening,0.90830000000
-6,heat,R1,2045,0,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,2,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2050,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,5,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2045,0,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,1,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,2,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2050,4,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,5,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-7,heat,R1,2045,0,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,2,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2050,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,5,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2045,0,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,1,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,2,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2050,4,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,5,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+0,heat,R1,2045,0,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,2,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,3,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,5,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,6,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,3,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,4,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,6,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,7,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2045,0,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,1,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,2,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,3,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,5,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,6,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,3,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,4,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,6,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,7,heatpump,2045,all-year,all-week,night,0.45420000000
+0,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,night,1.19440000000
+1,heat,R1,2045,0,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,2,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,3,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,5,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,6,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,3,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,4,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,6,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,7,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2045,0,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,1,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,2,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,3,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,5,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,6,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,3,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,4,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,6,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,7,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,morning,1.70630000000
+2,heat,R1,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,2,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,3,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,5,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,6,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,3,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,4,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,6,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,7,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,2,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,3,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,5,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,6,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,3,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,4,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,6,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,7,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+3,heat,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,2,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,3,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,5,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,6,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,3,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,4,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,6,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,7,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,2,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,3,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,5,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,6,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,3,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,4,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,6,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,7,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+4,heat,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,2,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,3,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,5,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,6,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,3,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,4,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,6,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,7,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,2,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,3,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,5,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,6,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,3,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,4,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,6,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,7,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+5,heat,R1,2045,0,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,2,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,3,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,5,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,6,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,3,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,4,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,6,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,7,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2045,0,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,1,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,2,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,3,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,5,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,6,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,3,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,4,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,6,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,7,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,evening,2.38890000000
+6,heat,R1,2045,0,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,2,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,3,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,5,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,6,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,3,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,4,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,6,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,7,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2045,0,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,1,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,2,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,3,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,5,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,6,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,3,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,4,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,6,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,7,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+7,heat,R1,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,2,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,3,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,5,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,6,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,3,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,4,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,6,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,7,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,2,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,3,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,5,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,6,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,3,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,4,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,6,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,7,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
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 7621d849..5b74fd4b 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.59580000000
-0,heat,R1,2050,2,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2050,5,2040,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,6,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2055,2,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2055,3,2050,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R1,2055,6,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,1,2040,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,2,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2050,5,2040,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,6,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2055,2,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2055,3,2050,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2055,6,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
-1,heat,R1,2050,1,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,2,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2050,5,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,6,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2055,2,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2055,3,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R1,2055,6,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,1,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,2,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2050,5,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,6,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2055,2,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2055,3,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2055,6,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
-2,heat,R1,2050,1,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2055,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2055,3,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2055,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,1,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2055,2,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2055,3,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2055,6,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-3,heat,R1,2050,1,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2055,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2055,3,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2055,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,1,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2055,2,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2055,3,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2055,6,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-4,heat,R1,2050,1,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2055,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2055,3,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2055,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,1,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2055,2,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2055,3,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2055,6,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-5,heat,R1,2050,1,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,2,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2050,5,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,6,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2055,2,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2055,3,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R1,2055,6,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,1,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,2,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2050,5,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,6,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2055,2,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2055,3,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2055,6,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
-6,heat,R1,2050,1,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2055,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2055,3,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2055,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,1,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2055,2,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2055,3,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2055,6,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-7,heat,R1,2050,1,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2055,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2055,3,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2055,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,1,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2055,2,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2055,3,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2055,6,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+0,heat,R1,2050,2,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,3,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,7,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,8,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,3,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,4,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2055,8,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,9,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,2,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,3,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,7,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,8,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,3,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,4,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2055,8,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,9,2050,heatpump,all-year,all-week,night,0.59580000000
+1,heat,R1,2050,2,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,3,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,7,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,8,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,3,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,4,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2055,8,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,9,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,2,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,3,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,7,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,8,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,3,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,4,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2055,8,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,9,2050,heatpump,all-year,all-week,morning,0.85120000000
+2,heat,R1,2050,2,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,3,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,7,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,8,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,3,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,4,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2055,8,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,9,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,2,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,3,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,7,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,8,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,3,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,4,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2055,8,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,9,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+3,heat,R1,2050,2,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,3,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,7,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,8,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,3,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,4,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2055,8,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,9,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,2,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,3,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,7,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,8,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,3,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,4,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2055,8,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,9,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+4,heat,R1,2050,2,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,3,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,7,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,8,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,3,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,4,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2055,8,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,9,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,2,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,3,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,7,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,8,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,3,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,4,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2055,8,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,9,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+5,heat,R1,2050,2,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,3,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,7,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,8,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,3,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,4,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2055,8,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,9,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,2,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,3,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,7,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,8,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,3,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,4,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2055,8,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,9,2050,heatpump,all-year,all-week,evening,1.19170000000
+6,heat,R1,2050,2,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,3,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,7,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,8,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,3,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,4,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2055,8,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,9,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,2,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,3,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,7,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,8,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,3,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,4,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2055,8,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,9,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+7,heat,R1,2050,2,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,3,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,7,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,8,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,3,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,4,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2055,8,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,9,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,2,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,3,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,7,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,8,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,3,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,4,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2055,8,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,9,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
index 94fe36a0..02d90fc2 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index 45ee801b..7be499c2 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,15 +1,15 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2032,R1,2030,gassupply1,3.08710000000
-1,2035,R1,2030,gassupply1,3.08710000000
-1,2040,R1,2030,gassupply1,3.08710000000
-1,2045,R1,2030,gassupply1,3.08710000000
-1,2050,R1,2030,gassupply1,3.08710000000
-1,2066,R1,2030,gassupply1,3.08710000000
+1,2032,R1,2030,gassupply1,4.72790000000
+1,2035,R1,2030,gassupply1,4.72790000000
+1,2040,R1,2030,gassupply1,4.72790000000
+1,2045,R1,2030,gassupply1,4.72790000000
+1,2050,R1,2030,gassupply1,4.72790000000
+1,2066,R1,2030,gassupply1,4.72790000000
 2,2030,R2,2020,gassupply1,7.50000000000
-3,2032,R2,2030,gassupply1,3.08710000000
-3,2035,R2,2030,gassupply1,3.08710000000
-3,2040,R2,2030,gassupply1,3.08710000000
-3,2045,R2,2030,gassupply1,3.08710000000
-3,2050,R2,2030,gassupply1,3.08710000000
-3,2066,R2,2030,gassupply1,3.08710000000
+3,2032,R2,2030,gassupply1,4.72790000000
+3,2035,R2,2030,gassupply1,4.72790000000
+3,2040,R2,2030,gassupply1,4.72790000000
+3,2045,R2,2030,gassupply1,4.72790000000
+3,2050,R2,2030,gassupply1,4.72790000000
+3,2066,R2,2030,gassupply1,4.72790000000
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 70439426..a263593a 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,15 +1,15 @@
 asset,year,region,installed,technology,capacity
-1,2032,R1,2030,gassupply1,3.08710000000
-1,2034,R1,2030,gassupply1,3.08710000000
-1,2035,R1,2030,gassupply1,3.08710000000
-1,2040,R1,2030,gassupply1,3.08710000000
-1,2045,R1,2030,gassupply1,3.08710000000
-1,2050,R1,2030,gassupply1,3.08710000000
-1,2066,R1,2030,gassupply1,3.08710000000
-3,2032,R2,2030,gassupply1,3.08710000000
-3,2034,R2,2030,gassupply1,3.08710000000
-3,2035,R2,2030,gassupply1,3.08710000000
-3,2040,R2,2030,gassupply1,3.08710000000
-3,2045,R2,2030,gassupply1,3.08710000000
-3,2050,R2,2030,gassupply1,3.08710000000
-3,2066,R2,2030,gassupply1,3.08710000000
+1,2032,R1,2030,gassupply1,4.72790000000
+1,2034,R1,2030,gassupply1,4.72790000000
+1,2035,R1,2030,gassupply1,4.72790000000
+1,2040,R1,2030,gassupply1,4.72790000000
+1,2045,R1,2030,gassupply1,4.72790000000
+1,2050,R1,2030,gassupply1,4.72790000000
+1,2066,R1,2030,gassupply1,4.72790000000
+3,2032,R2,2030,gassupply1,4.72790000000
+3,2034,R2,2030,gassupply1,4.72790000000
+3,2035,R2,2030,gassupply1,4.72790000000
+3,2040,R2,2030,gassupply1,4.72790000000
+3,2045,R2,2030,gassupply1,4.72790000000
+3,2050,R2,2030,gassupply1,4.72790000000
+3,2066,R2,2030,gassupply1,4.72790000000
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 d80a692f..93d7d70a 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,15 +1,15 @@
 asset,year,region,installed,technology,capacity
-1,2034,R1,2030,gassupply1,3.08710000000
-1,2035,R1,2030,gassupply1,3.08710000000
-1,2036,R1,2030,gassupply1,3.08710000000
-1,2040,R1,2030,gassupply1,3.08710000000
-1,2045,R1,2030,gassupply1,3.08710000000
-1,2050,R1,2030,gassupply1,3.08710000000
-1,2066,R1,2030,gassupply1,3.08710000000
-3,2034,R2,2030,gassupply1,3.08710000000
-3,2035,R2,2030,gassupply1,3.08710000000
-3,2036,R2,2030,gassupply1,3.08710000000
-3,2040,R2,2030,gassupply1,3.08710000000
-3,2045,R2,2030,gassupply1,3.08710000000
-3,2050,R2,2030,gassupply1,3.08710000000
-3,2066,R2,2030,gassupply1,3.08710000000
+1,2034,R1,2030,gassupply1,4.72790000000
+1,2035,R1,2030,gassupply1,4.72790000000
+1,2036,R1,2030,gassupply1,4.72790000000
+1,2040,R1,2030,gassupply1,4.72790000000
+1,2045,R1,2030,gassupply1,4.72790000000
+1,2050,R1,2030,gassupply1,4.72790000000
+1,2066,R1,2030,gassupply1,4.72790000000
+3,2034,R2,2030,gassupply1,4.72790000000
+3,2035,R2,2030,gassupply1,4.72790000000
+3,2036,R2,2030,gassupply1,4.72790000000
+3,2040,R2,2030,gassupply1,4.72790000000
+3,2045,R2,2030,gassupply1,4.72790000000
+3,2050,R2,2030,gassupply1,4.72790000000
+3,2066,R2,2030,gassupply1,4.72790000000
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 e8bfc232..1bae96d1 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,13 +1,13 @@
 asset,year,region,installed,technology,capacity
-1,2036,R1,2030,gassupply1,3.08710000000
-1,2038,R1,2030,gassupply1,3.08710000000
-1,2040,R1,2030,gassupply1,3.08710000000
-1,2045,R1,2030,gassupply1,3.08710000000
-1,2050,R1,2030,gassupply1,3.08710000000
-1,2066,R1,2030,gassupply1,3.08710000000
-3,2036,R2,2030,gassupply1,3.08710000000
-3,2038,R2,2030,gassupply1,3.08710000000
-3,2040,R2,2030,gassupply1,3.08710000000
-3,2045,R2,2030,gassupply1,3.08710000000
-3,2050,R2,2030,gassupply1,3.08710000000
-3,2066,R2,2030,gassupply1,3.08710000000
+1,2036,R1,2030,gassupply1,4.72790000000
+1,2038,R1,2030,gassupply1,4.72790000000
+1,2040,R1,2030,gassupply1,4.72790000000
+1,2045,R1,2030,gassupply1,4.72790000000
+1,2050,R1,2030,gassupply1,4.72790000000
+1,2066,R1,2030,gassupply1,4.72790000000
+3,2036,R2,2030,gassupply1,4.72790000000
+3,2038,R2,2030,gassupply1,4.72790000000
+3,2040,R2,2030,gassupply1,4.72790000000
+3,2045,R2,2030,gassupply1,4.72790000000
+3,2050,R2,2030,gassupply1,4.72790000000
+3,2066,R2,2030,gassupply1,4.72790000000
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 1fa27c3e..59ea2b31 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,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2038,R1,2030,gassupply1,3.08710000000
-1,2040,R1,2030,gassupply1,3.08710000000
-1,2045,R1,2030,gassupply1,3.08710000000
-1,2050,R1,2030,gassupply1,3.08710000000
-1,2066,R1,2030,gassupply1,3.08710000000
-3,2038,R2,2030,gassupply1,3.08710000000
-3,2040,R2,2030,gassupply1,3.08710000000
-3,2045,R2,2030,gassupply1,3.08710000000
-3,2050,R2,2030,gassupply1,3.08710000000
-3,2066,R2,2030,gassupply1,3.08710000000
+1,2038,R1,2030,gassupply1,4.72790000000
+1,2040,R1,2030,gassupply1,4.72790000000
+1,2045,R1,2030,gassupply1,4.72790000000
+1,2050,R1,2030,gassupply1,4.72790000000
+1,2066,R1,2030,gassupply1,4.72790000000
+3,2038,R2,2030,gassupply1,4.72790000000
+3,2040,R2,2030,gassupply1,4.72790000000
+3,2045,R2,2030,gassupply1,4.72790000000
+3,2050,R2,2030,gassupply1,4.72790000000
+3,2066,R2,2030,gassupply1,4.72790000000
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 887e8fe5..a211d083 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,11 +1,11 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,3.08710000000
-1,2042,R1,2030,gassupply1,3.08710000000
-1,2045,R1,2030,gassupply1,3.08710000000
-1,2050,R1,2030,gassupply1,3.08710000000
-1,2066,R1,2030,gassupply1,3.08710000000
-3,2040,R2,2030,gassupply1,3.08710000000
-3,2042,R2,2030,gassupply1,3.08710000000
-3,2045,R2,2030,gassupply1,3.08710000000
-3,2050,R2,2030,gassupply1,3.08710000000
-3,2066,R2,2030,gassupply1,3.08710000000
+1,2040,R1,2030,gassupply1,4.72790000000
+1,2042,R1,2030,gassupply1,4.72790000000
+1,2045,R1,2030,gassupply1,4.72790000000
+1,2050,R1,2030,gassupply1,4.72790000000
+1,2066,R1,2030,gassupply1,4.72790000000
+3,2040,R2,2030,gassupply1,4.72790000000
+3,2042,R2,2030,gassupply1,4.72790000000
+3,2045,R2,2030,gassupply1,4.72790000000
+3,2050,R2,2030,gassupply1,4.72790000000
+3,2066,R2,2030,gassupply1,4.72790000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 3fa140ea..71d791e1 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -17,92 +17,102 @@ windturbine,R2,R2,A1,power,retrofit,2022,11.79000000000
 gassupply1,R1,R1,A1,gas,retrofit,2022,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2022,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2024,5.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2024,0.55520000000
 heatpump,R1,R1,A1,residential,retrofit,2024,14.04000000000
-heatpump,R1,R1,A1,residential,retrofit,2024,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2024,1.68480000000
 gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2024,0.55520000000
 heatpump,R2,R2,A1,residential,retrofit,2024,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2024,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2024,1.68480000000
 gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
 solarPV,R1,R1,A1,power,retrofit,2024,3.79000000000
 windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2024,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2024,1.68480000000
 gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
 windturbine,R2,R2,A1,power,retrofit,2024,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2024,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2024,1.68480000000
 gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2026,2.39520000000
+gasboiler,R1,R1,A1,residential,retrofit,2026,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2026,3.11300000000
 heatpump,R1,R1,A1,residential,retrofit,2026,14.04000000000
-heatpump,R1,R1,A1,residential,retrofit,2026,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2026,4.84480000000
-gasboiler,R2,R2,A1,residential,retrofit,2026,2.39520000000
+heatpump,R1,R1,A1,residential,retrofit,2026,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2026,4.12700000000
+gasboiler,R2,R2,A1,residential,retrofit,2026,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2026,3.11300000000
 heatpump,R2,R2,A1,residential,retrofit,2026,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2026,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2026,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2026,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2026,4.12700000000
 solarPV,R1,R1,A1,power,retrofit,2026,3.79000000000
 windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2026,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2026,7.09480000000
+windturbine,R1,R1,A1,power,retrofit,2026,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2026,6.37700000000
 windturbine,R2,R2,A1,power,retrofit,2026,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2026,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2026,7.09480000000
+windturbine,R2,R2,A1,power,retrofit,2026,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2026,6.37700000000
 gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2028,2.39520000000
+gasboiler,R1,R1,A1,residential,retrofit,2028,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2028,3.11300000000
 heatpump,R1,R1,A1,residential,retrofit,2028,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2028,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2028,4.12700000000
 heatpump,R1,R1,A1,residential,retrofit,2028,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2028,4.84480000000
-heatpump,R1,R1,A1,residential,retrofit,2028,2.24000000000
-gasboiler,R2,R2,A1,residential,retrofit,2028,2.39520000000
+gasboiler,R2,R2,A1,residential,retrofit,2028,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2028,3.11300000000
 heatpump,R2,R2,A1,residential,retrofit,2028,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2028,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2028,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2028,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2028,4.12700000000
 heatpump,R2,R2,A1,residential,retrofit,2028,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2028,3.79000000000
 solarPV,R1,R1,A1,power,retrofit,2028,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2028,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2028,7.09480000000
+windturbine,R1,R1,A1,power,retrofit,2028,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2028,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2028,2.24000000000
 windturbine,R2,R2,A1,power,retrofit,2028,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2028,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2028,7.09480000000
+windturbine,R2,R2,A1,power,retrofit,2028,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2028,6.37700000000
 gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.39520000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.11300000000
 heatpump,R1,R1,A1,residential,retrofit,2030,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2030,4.12700000000
 heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,4.84480000000
 heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.39520000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,3.11300000000
 heatpump,R2,R2,A1,residential,retrofit,2030,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,4.84480000000
+heatpump,R2,R2,A1,residential,retrofit,2030,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2030,4.12700000000
 heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2030,3.79000000000
 solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2030,7.09480000000
+windturbine,R1,R1,A1,power,retrofit,2030,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2030,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
 windturbine,R2,R2,A1,power,retrofit,2030,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2030,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2030,7.09480000000
+windturbine,R2,R2,A1,power,retrofit,2030,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2030,6.37700000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2032,2.39520000000
-heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2032,4.84480000000
+gasboiler,R1,R1,A1,residential,retrofit,2032,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2032,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2032,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2032,4.12700000000
 heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2032,16.28000000000
-gasboiler,R2,R2,A1,residential,retrofit,2032,2.39520000000
-heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2032,4.84480000000
+gasboiler,R2,R2,A1,residential,retrofit,2032,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2032,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2032,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2032,4.12700000000
 heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
 heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
 heatpump,R2,R2,A1,residential,retrofit,2032,16.28000000000
@@ -111,24 +121,24 @@ solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2032,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2032,7.09480000000
+windturbine,R1,R1,A1,power,retrofit,2032,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2032,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
 windturbine,R2,R2,A1,power,retrofit,2032,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2032,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2032,7.09480000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,3.08710000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,3.08710000000
-gasboiler,R1,R1,A1,residential,retrofit,2034,2.39520000000
-heatpump,R1,R1,A1,residential,retrofit,2034,4.84480000000
+windturbine,R2,R2,A1,power,retrofit,2032,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2032,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,4.72790000000
+gasboiler,R1,R1,A1,residential,retrofit,2034,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.12700000000
 heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2034,16.28000000000
 heatpump,R1,R1,A1,residential,retrofit,2034,4.48000000000
-gasboiler,R2,R2,A1,residential,retrofit,2034,2.39520000000
-heatpump,R2,R2,A1,residential,retrofit,2034,4.84480000000
+gasboiler,R2,R2,A1,residential,retrofit,2034,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.12700000000
 heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
 heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
 heatpump,R2,R2,A1,residential,retrofit,2034,16.28000000000
@@ -137,19 +147,19 @@ solarPV,R1,R1,A1,power,retrofit,2034,3.79000000000
 solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.79520000000
 windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2034,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2034,7.09480000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2034,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2034,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.79520000000
 windturbine,R2,R2,A1,power,retrofit,2034,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2034,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2034,7.09480000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,3.08710000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,3.08710000000
+windturbine,R2,R2,A1,power,retrofit,2034,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2034,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,4.72790000000
 heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2036,16.28000000000
@@ -164,21 +174,21 @@ solarPV,R1,R1,A1,power,retrofit,2036,3.79000000000
 solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2036,4.63520000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.79520000000
+solarPV,R1,R1,A1,power,retrofit,2036,5.35300000000
 windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2036,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2036,7.09480000000
+windturbine,R1,R1,A1,power,retrofit,2036,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2036,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2036,4.63520000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.79520000000
+solarPV,R2,R2,A1,power,retrofit,2036,5.35300000000
 windturbine,R2,R2,A1,power,retrofit,2036,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2036,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2036,7.09480000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,3.08710000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,3.08710000000
+windturbine,R2,R2,A1,power,retrofit,2036,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2036,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,4.72790000000
 heatpump,R1,R1,A1,residential,retrofit,2038,2.24000000000
 heatpump,R1,R1,A1,residential,retrofit,2038,16.28000000000
 heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
@@ -193,23 +203,23 @@ solarPV,R1,R1,A1,power,retrofit,2038,3.79000000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2038,4.63520000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.79520000000
+solarPV,R1,R1,A1,power,retrofit,2038,5.35300000000
 solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2038,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2038,7.09480000000
+windturbine,R1,R1,A1,power,retrofit,2038,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2038,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2038,4.63520000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.79520000000
+solarPV,R2,R2,A1,power,retrofit,2038,5.35300000000
 solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
 windturbine,R2,R2,A1,power,retrofit,2038,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2038,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2038,7.09480000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,3.08710000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,3.08710000000
+windturbine,R2,R2,A1,power,retrofit,2038,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2038,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,4.72790000000
 heatpump,R1,R1,A1,residential,retrofit,2040,16.28000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,9.48000000000
@@ -224,22 +234,22 @@ solarPV,R1,R1,A1,power,retrofit,2040,3.79000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2040,4.63520000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.79520000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.35300000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
 windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2040,7.09480000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2040,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2040,6.37700000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2040,4.63520000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.79520000000
+solarPV,R2,R2,A1,power,retrofit,2040,5.35300000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
 windturbine,R2,R2,A1,power,retrofit,2040,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2040,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2040,7.09480000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,3.08710000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,3.08710000000
+windturbine,R2,R2,A1,power,retrofit,2040,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2040,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,4.72790000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 63152a1c..4c4f6643 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -127,579 +127,579 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,80.29300000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,13.21340000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,13.21340000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,13.21480000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,13.21480000000,2024
 "('all-year', 'all-week', 'night')",gas,R1,4.83110000000,2024
 "('all-year', 'all-week', 'night')",gas,R2,4.83110000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,64.24060000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,64.24060000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,64.24340000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,64.24340000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,13.26050000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,13.26050000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,13.26250000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,13.26250000000,2024
 "('all-year', 'all-week', 'morning')",gas,R1,4.83510000000,2024
 "('all-year', 'all-week', 'morning')",gas,R2,4.83510000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,64.34380000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,64.34380000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,64.34790000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,64.34790000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21340000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21480000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21480000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83110000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24060000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24060000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24340000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26050000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26050000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26250000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26250000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.83510000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R2,4.83510000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.34380000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.34380000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.34790000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.34790000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.43350000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.43350000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.43760000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.43760000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.84950000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R2,4.84950000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.72350000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.72350000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.73210000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.73210000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,13.32340000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,13.32340000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,13.32620000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,13.32620000000,2024
 "('all-year', 'all-week', 'evening')",gas,R1,4.84030000000,2024
 "('all-year', 'all-week', 'evening')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,64.48170000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,64.48170000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,64.48750000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,64.48750000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,13.32340000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,13.32340000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.32620000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.32620000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R1,4.84030000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.48170000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.48170000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.48750000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.48750000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.32340000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.32340000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.32620000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.32620000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84030000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48170000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48170000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48750000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48750000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,10.58890000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,10.58890000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,10.59000000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,10.59000000000,2026
 "('all-year', 'all-week', 'night')",gas,R1,3.87000000000,2026
 "('all-year', 'all-week', 'night')",gas,R2,3.87000000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,51.48380000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,51.48380000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,51.49270000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,51.49270000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,10.63440000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,10.63440000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,10.63600000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,10.63600000000,2026
 "('all-year', 'all-week', 'morning')",gas,R1,3.87530000000,2026
 "('all-year', 'all-week', 'morning')",gas,R2,3.87530000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,51.60590000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,51.60590000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,51.61860000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,51.61860000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.58890000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.58890000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.59000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.59000000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.87000000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.87000000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48380000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48380000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.49270000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.49270000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63440000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63440000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63600000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63600000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.87530000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R2,3.87530000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.60590000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.60590000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.61860000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.61860000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.80140000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,10.80140000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.80470000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,10.80470000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.89490000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R2,3.89490000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.05630000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.05630000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.08290000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.08290000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,10.69510000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,10.69510000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,10.69740000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,10.69740000000,2026
 "('all-year', 'all-week', 'evening')",gas,R1,3.88250000000,2026
 "('all-year', 'all-week', 'evening')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,51.76920000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,51.76920000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,51.78700000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,51.78700000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,10.69510000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,10.69510000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,10.69740000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,10.69740000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R1,3.88250000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.76920000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.76920000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.78700000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.78700000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.69510000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.69510000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.69740000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.69740000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88250000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.76920000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.76920000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.78700000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.78700000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,8.48940000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,8.48940000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,8.49030000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,8.49030000000,2028
 "('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2028
 "('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,41.26330000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,41.26330000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,41.27710000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,41.27710000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,8.53360000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,8.53360000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,8.53490000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,8.53490000000,2028
 "('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2028
 "('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,41.39410000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,41.39410000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,41.41380000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,41.41380000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.48940000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.48940000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.49030000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.49030000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.26330000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.26330000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27710000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27710000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53360000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53360000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53490000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53490000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.39410000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.39410000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41380000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41380000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.69580000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,8.69580000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.69850000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.69850000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,41.87740000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,41.87740000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.91860000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.91860000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,8.59260000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,8.59260000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,8.59440000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,8.59440000000,2028
 "('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2028
 "('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,41.56910000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,41.56910000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,41.59660000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,41.59660000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,8.59260000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,8.59260000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.59440000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.59440000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,41.56910000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,41.56910000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.59660000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.59660000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.59260000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.59260000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.59440000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.59440000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.56910000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.56910000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.59660000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.59660000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,6.80970000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,6.80970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,6.81040000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,6.81040000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,2.48600000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,2.48600000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,33.07490000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,33.07490000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,33.09270000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,33.09270000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,6.85290000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,6.85290000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,6.85390000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,6.85390000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,2.49340000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,2.49340000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,33.20740000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,33.20740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,33.23280000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,33.23280000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.80970000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.80970000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.81040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.81040000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.48600000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.48600000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.07490000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.07490000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.09270000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.09270000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85290000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85290000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85390000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85390000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.49340000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,2.49340000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.20740000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,33.20740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.23280000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.23280000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.01120000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,7.01120000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.01340000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.01340000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.52040000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,2.52040000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,33.69810000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,33.69810000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.75120000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.75120000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,6.91040000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,6.91040000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,6.91190000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,6.91190000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,2.50320000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,2.50320000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,33.38500000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,33.38500000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,33.42050000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,33.42050000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,6.91040000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,6.91040000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,6.91190000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,6.91190000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,2.50320000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,2.50320000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,33.38500000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,33.38500000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.42050000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.42050000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.91040000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.91040000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.91190000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.91190000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,2.50320000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,2.50320000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.38500000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.38500000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.42050000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.42050000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,5.46590000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,5.46590000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,5.46650000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,5.46650000000,2032
 "('all-year', 'all-week', 'night')",gas,R1,1.99390000000,2032
 "('all-year', 'all-week', 'night')",gas,R2,1.99390000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,26.51520000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,26.51520000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,26.53660000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,26.53660000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,5.50820000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,5.50820000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,5.50900000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,5.50900000000,2032
 "('all-year', 'all-week', 'morning')",gas,R1,2.00200000000,2032
 "('all-year', 'all-week', 'morning')",gas,R2,2.00200000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,26.64530000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,26.64530000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,26.67580000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,26.67580000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46590000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46590000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46650000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46650000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.99390000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.99390000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.51520000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.51520000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.53660000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.53660000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.50820000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,5.50820000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.50900000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,5.50900000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.00200000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R2,2.00200000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.64530000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,26.64530000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.67580000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,26.67580000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.66340000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,5.66340000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.66510000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,5.66510000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.03160000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R2,2.03160000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.12780000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,27.12780000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.19160000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,27.19160000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,5.56460000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,5.56460000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,5.56580000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,5.56580000000,2032
 "('all-year', 'all-week', 'evening')",gas,R1,2.01280000000,2032
 "('all-year', 'all-week', 'evening')",gas,R2,2.01280000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,26.81970000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,26.81970000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,26.86230000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,26.86230000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56460000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56460000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56580000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56580000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R1,2.01280000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R2,2.01280000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,26.81970000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,26.81970000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,26.86230000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,26.86230000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56460000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56460000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56580000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56580000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,2.01280000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,2.01280000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.81970000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.81970000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.86230000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.86230000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,4.39070000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,4.39070000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,4.39120000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,4.39120000000,2034
 "('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2034
 "('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,21.26040000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,21.26040000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,21.28170000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,21.28170000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,4.43230000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,4.43230000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,4.43300000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,4.43300000000,2034
 "('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2034
 "('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,21.38540000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,21.38540000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,21.41580000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,21.41580000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.39070000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.39070000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.39120000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.39120000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.26040000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.26040000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.28170000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.28170000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43230000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43230000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43300000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43300000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,21.38540000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,21.38540000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,21.41580000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,21.41580000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58480000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58480000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58610000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58610000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,21.85010000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,21.85010000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,21.91370000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,21.91370000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,4.48780000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,4.48780000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,4.48870000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,4.48870000000,2034
 "('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2034
 "('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,21.55320000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,21.55320000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,21.59570000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,21.59570000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48780000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48780000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48870000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48870000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,21.55320000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,21.55320000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,21.59570000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,21.59570000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48780000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48780000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48870000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48870000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.55320000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.55320000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.59570000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.59570000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.08910000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.08910000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.08880000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.08880000000,2036
 "('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2036
 "('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2036
 "('all-year', 'all-week', 'night')",heat,R1,0.13980000000,2036
 "('all-year', 'all-week', 'night')",heat,R2,0.13980000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12730000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12730000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12690000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12690000000,2036
 "('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2036
 "('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2036
 "('all-year', 'all-week', 'morning')",heat,R1,0.20140000000,2036
 "('all-year', 'all-week', 'morning')",heat,R2,0.20140000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08910000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08910000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08880000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08880000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13980000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13980000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12730000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12730000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12690000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12690000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2036
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.20140000000,2036
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.20140000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26730000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26730000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26650000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26650000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43610000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43610000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43620000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43620000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17820000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17820000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17770000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17770000000,2036
 "('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2036
 "('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.28510000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.28510000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.28520000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.28520000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17820000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17820000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17770000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17770000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.28510000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.28510000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.28520000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.28520000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17820000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17820000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17770000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17770000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28510000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28510000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28520000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28520000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.08850000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.08850000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.08830000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.08830000000,2038
 "('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2038
 "('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2038
 "('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2038
 "('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12640000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12640000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12610000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12610000000,2038
 "('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2038
 "('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2038
 "('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2038
 "('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08850000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08850000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08830000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08830000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12640000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12640000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12610000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12610000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2038
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2038
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26550000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26550000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26480000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26480000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06220000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06220000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06210000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06210000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17700000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17700000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17650000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17650000000,2038
 "('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2038
 "('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2038
 "('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2038
 "('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17700000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17700000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17650000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17650000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2038
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2038
 "('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17700000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17700000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17650000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17650000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2038
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2038
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.08790000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08790000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08760000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08760000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2040
 "('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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.12550000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12550000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12520000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12520000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2040
 "('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,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', 'mid-afternoon')",electricity,R1,0.08790000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08790000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08760000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08760000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12550000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12550000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12520000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12520000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,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,0.26360000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26360000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26290000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26290000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.06200000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R2,0.06200000000,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,0.17570000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17570000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17520000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17520000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03620000000,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', 'early-morning')",electricity,R1,0.17570000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17570000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17520000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03620000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03620000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17570000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17570000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17520000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03620000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03620000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 090b0ef6..57fed576 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
@@ -18,15 +18,15 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2025,R1,2022,windturbine,2.24000000000
-3,2030,R1,2022,windturbine,2.24000000000
-3,2035,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
+3,2024,R1,2022,windturbine,1.68480000000
+3,2025,R1,2022,windturbine,1.68480000000
+3,2030,R1,2022,windturbine,1.68480000000
+3,2035,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
 4,2022,R2,2020,gasCCGT,1.00000000000
 4,2024,R2,2020,gasCCGT,1.00000000000
 4,2025,R2,2020,gasCCGT,1.00000000000
@@ -38,12 +38,12 @@ asset,year,region,installed,technology,capacity
 5,2040,R2,2020,windturbine,11.79000000000
 5,2045,R2,2020,windturbine,11.79000000000
 5,2046,R2,2020,windturbine,11.79000000000
-6,2024,R2,2022,windturbine,2.24000000000
-6,2025,R2,2022,windturbine,2.24000000000
-6,2030,R2,2022,windturbine,2.24000000000
-6,2035,R2,2022,windturbine,2.24000000000
-6,2040,R2,2022,windturbine,2.24000000000
-6,2045,R2,2022,windturbine,2.24000000000
-6,2046,R2,2022,windturbine,2.24000000000
-6,2047,R2,2022,windturbine,2.24000000000
-6,2048,R2,2022,windturbine,2.24000000000
+6,2024,R2,2022,windturbine,1.68480000000
+6,2025,R2,2022,windturbine,1.68480000000
+6,2030,R2,2022,windturbine,1.68480000000
+6,2035,R2,2022,windturbine,1.68480000000
+6,2040,R2,2022,windturbine,1.68480000000
+6,2045,R2,2022,windturbine,1.68480000000
+6,2046,R2,2022,windturbine,1.68480000000
+6,2047,R2,2022,windturbine,1.68480000000
+6,2048,R2,2022,windturbine,1.68480000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index dcc9ed18..418c25a1 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -19,26 +19,26 @@ asset,year,technology,region,installed,capacity
 3,2040,windturbine,R1,2020,8.00000000000
 3,2045,windturbine,R1,2020,8.00000000000
 3,2046,windturbine,R1,2020,8.00000000000
-4,2024,windturbine,R1,2022,2.24000000000
-4,2025,windturbine,R1,2022,2.24000000000
-4,2026,windturbine,R1,2022,2.24000000000
-4,2030,windturbine,R1,2022,2.24000000000
-4,2035,windturbine,R1,2022,2.24000000000
-4,2040,windturbine,R1,2022,2.24000000000
-4,2045,windturbine,R1,2022,2.24000000000
-4,2046,windturbine,R1,2022,2.24000000000
-4,2047,windturbine,R1,2022,2.24000000000
-4,2048,windturbine,R1,2022,2.24000000000
-5,2026,windturbine,R1,2024,7.09480000000
-5,2030,windturbine,R1,2024,7.09480000000
-5,2035,windturbine,R1,2024,7.09480000000
-5,2040,windturbine,R1,2024,7.09480000000
-5,2045,windturbine,R1,2024,7.09480000000
-5,2046,windturbine,R1,2024,7.09480000000
-5,2047,windturbine,R1,2024,7.09480000000
-5,2048,windturbine,R1,2024,7.09480000000
-5,2049,windturbine,R1,2024,7.09480000000
-5,2050,windturbine,R1,2024,7.09480000000
+4,2024,windturbine,R1,2022,1.68480000000
+4,2025,windturbine,R1,2022,1.68480000000
+4,2026,windturbine,R1,2022,1.68480000000
+4,2030,windturbine,R1,2022,1.68480000000
+4,2035,windturbine,R1,2022,1.68480000000
+4,2040,windturbine,R1,2022,1.68480000000
+4,2045,windturbine,R1,2022,1.68480000000
+4,2046,windturbine,R1,2022,1.68480000000
+4,2047,windturbine,R1,2022,1.68480000000
+4,2048,windturbine,R1,2022,1.68480000000
+5,2026,windturbine,R1,2024,6.37700000000
+5,2030,windturbine,R1,2024,6.37700000000
+5,2035,windturbine,R1,2024,6.37700000000
+5,2040,windturbine,R1,2024,6.37700000000
+5,2045,windturbine,R1,2024,6.37700000000
+5,2046,windturbine,R1,2024,6.37700000000
+5,2047,windturbine,R1,2024,6.37700000000
+5,2048,windturbine,R1,2024,6.37700000000
+5,2049,windturbine,R1,2024,6.37700000000
+5,2050,windturbine,R1,2024,6.37700000000
 6,2024,windturbine,R2,2020,11.79000000000
 6,2025,windturbine,R2,2020,11.79000000000
 6,2026,windturbine,R2,2020,11.79000000000
@@ -47,23 +47,23 @@ asset,year,technology,region,installed,capacity
 6,2040,windturbine,R2,2020,11.79000000000
 6,2045,windturbine,R2,2020,11.79000000000
 6,2046,windturbine,R2,2020,11.79000000000
-7,2024,windturbine,R2,2022,2.24000000000
-7,2025,windturbine,R2,2022,2.24000000000
-7,2026,windturbine,R2,2022,2.24000000000
-7,2030,windturbine,R2,2022,2.24000000000
-7,2035,windturbine,R2,2022,2.24000000000
-7,2040,windturbine,R2,2022,2.24000000000
-7,2045,windturbine,R2,2022,2.24000000000
-7,2046,windturbine,R2,2022,2.24000000000
-7,2047,windturbine,R2,2022,2.24000000000
-7,2048,windturbine,R2,2022,2.24000000000
-8,2026,windturbine,R2,2024,7.09480000000
-8,2030,windturbine,R2,2024,7.09480000000
-8,2035,windturbine,R2,2024,7.09480000000
-8,2040,windturbine,R2,2024,7.09480000000
-8,2045,windturbine,R2,2024,7.09480000000
-8,2046,windturbine,R2,2024,7.09480000000
-8,2047,windturbine,R2,2024,7.09480000000
-8,2048,windturbine,R2,2024,7.09480000000
-8,2049,windturbine,R2,2024,7.09480000000
-8,2050,windturbine,R2,2024,7.09480000000
+7,2024,windturbine,R2,2022,1.68480000000
+7,2025,windturbine,R2,2022,1.68480000000
+7,2026,windturbine,R2,2022,1.68480000000
+7,2030,windturbine,R2,2022,1.68480000000
+7,2035,windturbine,R2,2022,1.68480000000
+7,2040,windturbine,R2,2022,1.68480000000
+7,2045,windturbine,R2,2022,1.68480000000
+7,2046,windturbine,R2,2022,1.68480000000
+7,2047,windturbine,R2,2022,1.68480000000
+7,2048,windturbine,R2,2022,1.68480000000
+8,2026,windturbine,R2,2024,6.37700000000
+8,2030,windturbine,R2,2024,6.37700000000
+8,2035,windturbine,R2,2024,6.37700000000
+8,2040,windturbine,R2,2024,6.37700000000
+8,2045,windturbine,R2,2024,6.37700000000
+8,2046,windturbine,R2,2024,6.37700000000
+8,2047,windturbine,R2,2024,6.37700000000
+8,2048,windturbine,R2,2024,6.37700000000
+8,2049,windturbine,R2,2024,6.37700000000
+8,2050,windturbine,R2,2024,6.37700000000
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 05ed3c5d..92e8ce46 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
@@ -13,26 +13,26 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2028,R1,2022,windturbine,2.24000000000
-3,2030,R1,2022,windturbine,2.24000000000
-3,2035,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2026,R1,2024,windturbine,7.09480000000
-4,2028,R1,2024,windturbine,7.09480000000
-4,2030,R1,2024,windturbine,7.09480000000
-4,2035,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2026,R1,2022,windturbine,1.68480000000
+3,2028,R1,2022,windturbine,1.68480000000
+3,2030,R1,2022,windturbine,1.68480000000
+3,2035,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2026,R1,2024,windturbine,6.37700000000
+4,2028,R1,2024,windturbine,6.37700000000
+4,2030,R1,2024,windturbine,6.37700000000
+4,2035,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2028,R1,2026,solarPV,2.24000000000
 5,2030,R1,2026,solarPV,2.24000000000
 5,2035,R1,2026,solarPV,2.24000000000
@@ -52,26 +52,26 @@ asset,year,region,installed,technology,capacity
 7,2040,R2,2020,windturbine,11.79000000000
 7,2045,R2,2020,windturbine,11.79000000000
 7,2046,R2,2020,windturbine,11.79000000000
-8,2026,R2,2022,windturbine,2.24000000000
-8,2028,R2,2022,windturbine,2.24000000000
-8,2030,R2,2022,windturbine,2.24000000000
-8,2035,R2,2022,windturbine,2.24000000000
-8,2040,R2,2022,windturbine,2.24000000000
-8,2045,R2,2022,windturbine,2.24000000000
-8,2046,R2,2022,windturbine,2.24000000000
-8,2047,R2,2022,windturbine,2.24000000000
-8,2048,R2,2022,windturbine,2.24000000000
-9,2026,R2,2024,windturbine,7.09480000000
-9,2028,R2,2024,windturbine,7.09480000000
-9,2030,R2,2024,windturbine,7.09480000000
-9,2035,R2,2024,windturbine,7.09480000000
-9,2040,R2,2024,windturbine,7.09480000000
-9,2045,R2,2024,windturbine,7.09480000000
-9,2046,R2,2024,windturbine,7.09480000000
-9,2047,R2,2024,windturbine,7.09480000000
-9,2048,R2,2024,windturbine,7.09480000000
-9,2049,R2,2024,windturbine,7.09480000000
-9,2050,R2,2024,windturbine,7.09480000000
+8,2026,R2,2022,windturbine,1.68480000000
+8,2028,R2,2022,windturbine,1.68480000000
+8,2030,R2,2022,windturbine,1.68480000000
+8,2035,R2,2022,windturbine,1.68480000000
+8,2040,R2,2022,windturbine,1.68480000000
+8,2045,R2,2022,windturbine,1.68480000000
+8,2046,R2,2022,windturbine,1.68480000000
+8,2047,R2,2022,windturbine,1.68480000000
+8,2048,R2,2022,windturbine,1.68480000000
+9,2026,R2,2024,windturbine,6.37700000000
+9,2028,R2,2024,windturbine,6.37700000000
+9,2030,R2,2024,windturbine,6.37700000000
+9,2035,R2,2024,windturbine,6.37700000000
+9,2040,R2,2024,windturbine,6.37700000000
+9,2045,R2,2024,windturbine,6.37700000000
+9,2046,R2,2024,windturbine,6.37700000000
+9,2047,R2,2024,windturbine,6.37700000000
+9,2048,R2,2024,windturbine,6.37700000000
+9,2049,R2,2024,windturbine,6.37700000000
+9,2050,R2,2024,windturbine,6.37700000000
 10,2028,R2,2026,solarPV,2.24000000000
 10,2030,R2,2026,solarPV,2.24000000000
 10,2035,R2,2026,solarPV,2.24000000000
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 db6af830..fdf1b721 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
@@ -11,24 +11,24 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2030,R1,2022,windturbine,2.24000000000
-3,2035,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2028,R1,2024,windturbine,7.09480000000
-4,2030,R1,2024,windturbine,7.09480000000
-4,2035,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2028,R1,2022,windturbine,1.68480000000
+3,2030,R1,2022,windturbine,1.68480000000
+3,2035,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2028,R1,2024,windturbine,6.37700000000
+4,2030,R1,2024,windturbine,6.37700000000
+4,2035,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2028,R1,2026,solarPV,2.24000000000
 5,2030,R1,2026,solarPV,2.24000000000
 5,2035,R1,2026,solarPV,2.24000000000
@@ -60,24 +60,24 @@ asset,year,region,installed,technology,capacity
 8,2040,R2,2020,windturbine,11.79000000000
 8,2045,R2,2020,windturbine,11.79000000000
 8,2046,R2,2020,windturbine,11.79000000000
-9,2028,R2,2022,windturbine,2.24000000000
-9,2030,R2,2022,windturbine,2.24000000000
-9,2035,R2,2022,windturbine,2.24000000000
-9,2040,R2,2022,windturbine,2.24000000000
-9,2045,R2,2022,windturbine,2.24000000000
-9,2046,R2,2022,windturbine,2.24000000000
-9,2047,R2,2022,windturbine,2.24000000000
-9,2048,R2,2022,windturbine,2.24000000000
-10,2028,R2,2024,windturbine,7.09480000000
-10,2030,R2,2024,windturbine,7.09480000000
-10,2035,R2,2024,windturbine,7.09480000000
-10,2040,R2,2024,windturbine,7.09480000000
-10,2045,R2,2024,windturbine,7.09480000000
-10,2046,R2,2024,windturbine,7.09480000000
-10,2047,R2,2024,windturbine,7.09480000000
-10,2048,R2,2024,windturbine,7.09480000000
-10,2049,R2,2024,windturbine,7.09480000000
-10,2050,R2,2024,windturbine,7.09480000000
+9,2028,R2,2022,windturbine,1.68480000000
+9,2030,R2,2022,windturbine,1.68480000000
+9,2035,R2,2022,windturbine,1.68480000000
+9,2040,R2,2022,windturbine,1.68480000000
+9,2045,R2,2022,windturbine,1.68480000000
+9,2046,R2,2022,windturbine,1.68480000000
+9,2047,R2,2022,windturbine,1.68480000000
+9,2048,R2,2022,windturbine,1.68480000000
+10,2028,R2,2024,windturbine,6.37700000000
+10,2030,R2,2024,windturbine,6.37700000000
+10,2035,R2,2024,windturbine,6.37700000000
+10,2040,R2,2024,windturbine,6.37700000000
+10,2045,R2,2024,windturbine,6.37700000000
+10,2046,R2,2024,windturbine,6.37700000000
+10,2047,R2,2024,windturbine,6.37700000000
+10,2048,R2,2024,windturbine,6.37700000000
+10,2049,R2,2024,windturbine,6.37700000000
+10,2050,R2,2024,windturbine,6.37700000000
 11,2028,R2,2026,solarPV,2.24000000000
 11,2030,R2,2026,solarPV,2.24000000000
 11,2035,R2,2026,solarPV,2.24000000000
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 5e733a4c..5cf20606 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
@@ -11,24 +11,24 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2032,R1,2022,windturbine,2.24000000000
-3,2035,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2030,R1,2024,windturbine,7.09480000000
-4,2032,R1,2024,windturbine,7.09480000000
-4,2035,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2030,R1,2022,windturbine,1.68480000000
+3,2032,R1,2022,windturbine,1.68480000000
+3,2035,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2030,R1,2024,windturbine,6.37700000000
+4,2032,R1,2024,windturbine,6.37700000000
+4,2035,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2030,R1,2026,solarPV,2.24000000000
 5,2032,R1,2026,solarPV,2.24000000000
 5,2035,R1,2026,solarPV,2.24000000000
@@ -76,24 +76,24 @@ asset,year,region,installed,technology,capacity
 9,2040,R2,2020,windturbine,11.79000000000
 9,2045,R2,2020,windturbine,11.79000000000
 9,2046,R2,2020,windturbine,11.79000000000
-10,2030,R2,2022,windturbine,2.24000000000
-10,2032,R2,2022,windturbine,2.24000000000
-10,2035,R2,2022,windturbine,2.24000000000
-10,2040,R2,2022,windturbine,2.24000000000
-10,2045,R2,2022,windturbine,2.24000000000
-10,2046,R2,2022,windturbine,2.24000000000
-10,2047,R2,2022,windturbine,2.24000000000
-10,2048,R2,2022,windturbine,2.24000000000
-11,2030,R2,2024,windturbine,7.09480000000
-11,2032,R2,2024,windturbine,7.09480000000
-11,2035,R2,2024,windturbine,7.09480000000
-11,2040,R2,2024,windturbine,7.09480000000
-11,2045,R2,2024,windturbine,7.09480000000
-11,2046,R2,2024,windturbine,7.09480000000
-11,2047,R2,2024,windturbine,7.09480000000
-11,2048,R2,2024,windturbine,7.09480000000
-11,2049,R2,2024,windturbine,7.09480000000
-11,2050,R2,2024,windturbine,7.09480000000
+10,2030,R2,2022,windturbine,1.68480000000
+10,2032,R2,2022,windturbine,1.68480000000
+10,2035,R2,2022,windturbine,1.68480000000
+10,2040,R2,2022,windturbine,1.68480000000
+10,2045,R2,2022,windturbine,1.68480000000
+10,2046,R2,2022,windturbine,1.68480000000
+10,2047,R2,2022,windturbine,1.68480000000
+10,2048,R2,2022,windturbine,1.68480000000
+11,2030,R2,2024,windturbine,6.37700000000
+11,2032,R2,2024,windturbine,6.37700000000
+11,2035,R2,2024,windturbine,6.37700000000
+11,2040,R2,2024,windturbine,6.37700000000
+11,2045,R2,2024,windturbine,6.37700000000
+11,2046,R2,2024,windturbine,6.37700000000
+11,2047,R2,2024,windturbine,6.37700000000
+11,2048,R2,2024,windturbine,6.37700000000
+11,2049,R2,2024,windturbine,6.37700000000
+11,2050,R2,2024,windturbine,6.37700000000
 12,2030,R2,2026,solarPV,2.24000000000
 12,2032,R2,2026,solarPV,2.24000000000
 12,2035,R2,2026,solarPV,2.24000000000
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 6786b085..f8d4c72f 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
@@ -11,24 +11,24 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2034,R1,2022,windturbine,2.24000000000
-3,2035,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2032,R1,2024,windturbine,7.09480000000
-4,2034,R1,2024,windturbine,7.09480000000
-4,2035,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2032,R1,2022,windturbine,1.68480000000
+3,2034,R1,2022,windturbine,1.68480000000
+3,2035,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2032,R1,2024,windturbine,6.37700000000
+4,2034,R1,2024,windturbine,6.37700000000
+4,2035,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2032,R1,2026,solarPV,2.24000000000
 5,2034,R1,2026,solarPV,2.24000000000
 5,2035,R1,2026,solarPV,2.24000000000
@@ -71,47 +71,47 @@ asset,year,region,installed,technology,capacity
 7,2054,R1,2030,solarPV,2.24000000000
 7,2055,R1,2030,solarPV,2.24000000000
 7,2056,R1,2030,solarPV,2.24000000000
-8,2034,R1,2032,solarPV,2.24000000000
-8,2035,R1,2032,solarPV,2.24000000000
-8,2040,R1,2032,solarPV,2.24000000000
-8,2045,R1,2032,solarPV,2.24000000000
-8,2046,R1,2032,solarPV,2.24000000000
-8,2047,R1,2032,solarPV,2.24000000000
-8,2048,R1,2032,solarPV,2.24000000000
-8,2049,R1,2032,solarPV,2.24000000000
-8,2050,R1,2032,solarPV,2.24000000000
-8,2051,R1,2032,solarPV,2.24000000000
-8,2052,R1,2032,solarPV,2.24000000000
-8,2053,R1,2032,solarPV,2.24000000000
-8,2054,R1,2032,solarPV,2.24000000000
-8,2055,R1,2032,solarPV,2.24000000000
-8,2056,R1,2032,solarPV,2.24000000000
-8,2057,R1,2032,solarPV,2.24000000000
-8,2058,R1,2032,solarPV,2.24000000000
+8,2034,R1,2032,solarPV,2.79520000000
+8,2035,R1,2032,solarPV,2.79520000000
+8,2040,R1,2032,solarPV,2.79520000000
+8,2045,R1,2032,solarPV,2.79520000000
+8,2046,R1,2032,solarPV,2.79520000000
+8,2047,R1,2032,solarPV,2.79520000000
+8,2048,R1,2032,solarPV,2.79520000000
+8,2049,R1,2032,solarPV,2.79520000000
+8,2050,R1,2032,solarPV,2.79520000000
+8,2051,R1,2032,solarPV,2.79520000000
+8,2052,R1,2032,solarPV,2.79520000000
+8,2053,R1,2032,solarPV,2.79520000000
+8,2054,R1,2032,solarPV,2.79520000000
+8,2055,R1,2032,solarPV,2.79520000000
+8,2056,R1,2032,solarPV,2.79520000000
+8,2057,R1,2032,solarPV,2.79520000000
+8,2058,R1,2032,solarPV,2.79520000000
 10,2032,R2,2020,windturbine,11.79000000000
 10,2034,R2,2020,windturbine,11.79000000000
 10,2035,R2,2020,windturbine,11.79000000000
 10,2040,R2,2020,windturbine,11.79000000000
 10,2045,R2,2020,windturbine,11.79000000000
 10,2046,R2,2020,windturbine,11.79000000000
-11,2032,R2,2022,windturbine,2.24000000000
-11,2034,R2,2022,windturbine,2.24000000000
-11,2035,R2,2022,windturbine,2.24000000000
-11,2040,R2,2022,windturbine,2.24000000000
-11,2045,R2,2022,windturbine,2.24000000000
-11,2046,R2,2022,windturbine,2.24000000000
-11,2047,R2,2022,windturbine,2.24000000000
-11,2048,R2,2022,windturbine,2.24000000000
-12,2032,R2,2024,windturbine,7.09480000000
-12,2034,R2,2024,windturbine,7.09480000000
-12,2035,R2,2024,windturbine,7.09480000000
-12,2040,R2,2024,windturbine,7.09480000000
-12,2045,R2,2024,windturbine,7.09480000000
-12,2046,R2,2024,windturbine,7.09480000000
-12,2047,R2,2024,windturbine,7.09480000000
-12,2048,R2,2024,windturbine,7.09480000000
-12,2049,R2,2024,windturbine,7.09480000000
-12,2050,R2,2024,windturbine,7.09480000000
+11,2032,R2,2022,windturbine,1.68480000000
+11,2034,R2,2022,windturbine,1.68480000000
+11,2035,R2,2022,windturbine,1.68480000000
+11,2040,R2,2022,windturbine,1.68480000000
+11,2045,R2,2022,windturbine,1.68480000000
+11,2046,R2,2022,windturbine,1.68480000000
+11,2047,R2,2022,windturbine,1.68480000000
+11,2048,R2,2022,windturbine,1.68480000000
+12,2032,R2,2024,windturbine,6.37700000000
+12,2034,R2,2024,windturbine,6.37700000000
+12,2035,R2,2024,windturbine,6.37700000000
+12,2040,R2,2024,windturbine,6.37700000000
+12,2045,R2,2024,windturbine,6.37700000000
+12,2046,R2,2024,windturbine,6.37700000000
+12,2047,R2,2024,windturbine,6.37700000000
+12,2048,R2,2024,windturbine,6.37700000000
+12,2049,R2,2024,windturbine,6.37700000000
+12,2050,R2,2024,windturbine,6.37700000000
 13,2032,R2,2026,solarPV,2.24000000000
 13,2034,R2,2026,solarPV,2.24000000000
 13,2035,R2,2026,solarPV,2.24000000000
@@ -154,20 +154,20 @@ asset,year,region,installed,technology,capacity
 15,2054,R2,2030,solarPV,2.24000000000
 15,2055,R2,2030,solarPV,2.24000000000
 15,2056,R2,2030,solarPV,2.24000000000
-16,2034,R2,2032,solarPV,2.24000000000
-16,2035,R2,2032,solarPV,2.24000000000
-16,2040,R2,2032,solarPV,2.24000000000
-16,2045,R2,2032,solarPV,2.24000000000
-16,2046,R2,2032,solarPV,2.24000000000
-16,2047,R2,2032,solarPV,2.24000000000
-16,2048,R2,2032,solarPV,2.24000000000
-16,2049,R2,2032,solarPV,2.24000000000
-16,2050,R2,2032,solarPV,2.24000000000
-16,2051,R2,2032,solarPV,2.24000000000
-16,2052,R2,2032,solarPV,2.24000000000
-16,2053,R2,2032,solarPV,2.24000000000
-16,2054,R2,2032,solarPV,2.24000000000
-16,2055,R2,2032,solarPV,2.24000000000
-16,2056,R2,2032,solarPV,2.24000000000
-16,2057,R2,2032,solarPV,2.24000000000
-16,2058,R2,2032,solarPV,2.24000000000
+16,2034,R2,2032,solarPV,2.79520000000
+16,2035,R2,2032,solarPV,2.79520000000
+16,2040,R2,2032,solarPV,2.79520000000
+16,2045,R2,2032,solarPV,2.79520000000
+16,2046,R2,2032,solarPV,2.79520000000
+16,2047,R2,2032,solarPV,2.79520000000
+16,2048,R2,2032,solarPV,2.79520000000
+16,2049,R2,2032,solarPV,2.79520000000
+16,2050,R2,2032,solarPV,2.79520000000
+16,2051,R2,2032,solarPV,2.79520000000
+16,2052,R2,2032,solarPV,2.79520000000
+16,2053,R2,2032,solarPV,2.79520000000
+16,2054,R2,2032,solarPV,2.79520000000
+16,2055,R2,2032,solarPV,2.79520000000
+16,2056,R2,2032,solarPV,2.79520000000
+16,2057,R2,2032,solarPV,2.79520000000
+16,2058,R2,2032,solarPV,2.79520000000
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 2e35199b..10c13938 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
@@ -11,24 +11,24 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2035,R1,2022,windturbine,2.24000000000
-3,2036,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2034,R1,2024,windturbine,7.09480000000
-4,2035,R1,2024,windturbine,7.09480000000
-4,2036,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2034,R1,2022,windturbine,1.68480000000
+3,2035,R1,2022,windturbine,1.68480000000
+3,2036,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2034,R1,2024,windturbine,6.37700000000
+4,2035,R1,2024,windturbine,6.37700000000
+4,2036,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2034,R1,2026,solarPV,2.24000000000
 5,2035,R1,2026,solarPV,2.24000000000
 5,2036,R1,2026,solarPV,2.24000000000
@@ -71,66 +71,66 @@ asset,year,region,installed,technology,capacity
 7,2054,R1,2030,solarPV,2.24000000000
 7,2055,R1,2030,solarPV,2.24000000000
 7,2056,R1,2030,solarPV,2.24000000000
-8,2034,R1,2032,solarPV,2.24000000000
-8,2035,R1,2032,solarPV,2.24000000000
-8,2036,R1,2032,solarPV,2.24000000000
-8,2040,R1,2032,solarPV,2.24000000000
-8,2045,R1,2032,solarPV,2.24000000000
-8,2046,R1,2032,solarPV,2.24000000000
-8,2047,R1,2032,solarPV,2.24000000000
-8,2048,R1,2032,solarPV,2.24000000000
-8,2049,R1,2032,solarPV,2.24000000000
-8,2050,R1,2032,solarPV,2.24000000000
-8,2051,R1,2032,solarPV,2.24000000000
-8,2052,R1,2032,solarPV,2.24000000000
-8,2053,R1,2032,solarPV,2.24000000000
-8,2054,R1,2032,solarPV,2.24000000000
-8,2055,R1,2032,solarPV,2.24000000000
-8,2056,R1,2032,solarPV,2.24000000000
-8,2057,R1,2032,solarPV,2.24000000000
-8,2058,R1,2032,solarPV,2.24000000000
-9,2036,R1,2034,solarPV,4.63520000000
-9,2040,R1,2034,solarPV,4.63520000000
-9,2045,R1,2034,solarPV,4.63520000000
-9,2046,R1,2034,solarPV,4.63520000000
-9,2047,R1,2034,solarPV,4.63520000000
-9,2048,R1,2034,solarPV,4.63520000000
-9,2049,R1,2034,solarPV,4.63520000000
-9,2050,R1,2034,solarPV,4.63520000000
-9,2051,R1,2034,solarPV,4.63520000000
-9,2052,R1,2034,solarPV,4.63520000000
-9,2053,R1,2034,solarPV,4.63520000000
-9,2054,R1,2034,solarPV,4.63520000000
-9,2055,R1,2034,solarPV,4.63520000000
-9,2056,R1,2034,solarPV,4.63520000000
-9,2057,R1,2034,solarPV,4.63520000000
-9,2058,R1,2034,solarPV,4.63520000000
-9,2059,R1,2034,solarPV,4.63520000000
-9,2060,R1,2034,solarPV,4.63520000000
+8,2034,R1,2032,solarPV,2.79520000000
+8,2035,R1,2032,solarPV,2.79520000000
+8,2036,R1,2032,solarPV,2.79520000000
+8,2040,R1,2032,solarPV,2.79520000000
+8,2045,R1,2032,solarPV,2.79520000000
+8,2046,R1,2032,solarPV,2.79520000000
+8,2047,R1,2032,solarPV,2.79520000000
+8,2048,R1,2032,solarPV,2.79520000000
+8,2049,R1,2032,solarPV,2.79520000000
+8,2050,R1,2032,solarPV,2.79520000000
+8,2051,R1,2032,solarPV,2.79520000000
+8,2052,R1,2032,solarPV,2.79520000000
+8,2053,R1,2032,solarPV,2.79520000000
+8,2054,R1,2032,solarPV,2.79520000000
+8,2055,R1,2032,solarPV,2.79520000000
+8,2056,R1,2032,solarPV,2.79520000000
+8,2057,R1,2032,solarPV,2.79520000000
+8,2058,R1,2032,solarPV,2.79520000000
+9,2036,R1,2034,solarPV,5.35300000000
+9,2040,R1,2034,solarPV,5.35300000000
+9,2045,R1,2034,solarPV,5.35300000000
+9,2046,R1,2034,solarPV,5.35300000000
+9,2047,R1,2034,solarPV,5.35300000000
+9,2048,R1,2034,solarPV,5.35300000000
+9,2049,R1,2034,solarPV,5.35300000000
+9,2050,R1,2034,solarPV,5.35300000000
+9,2051,R1,2034,solarPV,5.35300000000
+9,2052,R1,2034,solarPV,5.35300000000
+9,2053,R1,2034,solarPV,5.35300000000
+9,2054,R1,2034,solarPV,5.35300000000
+9,2055,R1,2034,solarPV,5.35300000000
+9,2056,R1,2034,solarPV,5.35300000000
+9,2057,R1,2034,solarPV,5.35300000000
+9,2058,R1,2034,solarPV,5.35300000000
+9,2059,R1,2034,solarPV,5.35300000000
+9,2060,R1,2034,solarPV,5.35300000000
 11,2034,R2,2020,windturbine,11.79000000000
 11,2035,R2,2020,windturbine,11.79000000000
 11,2036,R2,2020,windturbine,11.79000000000
 11,2040,R2,2020,windturbine,11.79000000000
 11,2045,R2,2020,windturbine,11.79000000000
 11,2046,R2,2020,windturbine,11.79000000000
-12,2034,R2,2022,windturbine,2.24000000000
-12,2035,R2,2022,windturbine,2.24000000000
-12,2036,R2,2022,windturbine,2.24000000000
-12,2040,R2,2022,windturbine,2.24000000000
-12,2045,R2,2022,windturbine,2.24000000000
-12,2046,R2,2022,windturbine,2.24000000000
-12,2047,R2,2022,windturbine,2.24000000000
-12,2048,R2,2022,windturbine,2.24000000000
-13,2034,R2,2024,windturbine,7.09480000000
-13,2035,R2,2024,windturbine,7.09480000000
-13,2036,R2,2024,windturbine,7.09480000000
-13,2040,R2,2024,windturbine,7.09480000000
-13,2045,R2,2024,windturbine,7.09480000000
-13,2046,R2,2024,windturbine,7.09480000000
-13,2047,R2,2024,windturbine,7.09480000000
-13,2048,R2,2024,windturbine,7.09480000000
-13,2049,R2,2024,windturbine,7.09480000000
-13,2050,R2,2024,windturbine,7.09480000000
+12,2034,R2,2022,windturbine,1.68480000000
+12,2035,R2,2022,windturbine,1.68480000000
+12,2036,R2,2022,windturbine,1.68480000000
+12,2040,R2,2022,windturbine,1.68480000000
+12,2045,R2,2022,windturbine,1.68480000000
+12,2046,R2,2022,windturbine,1.68480000000
+12,2047,R2,2022,windturbine,1.68480000000
+12,2048,R2,2022,windturbine,1.68480000000
+13,2034,R2,2024,windturbine,6.37700000000
+13,2035,R2,2024,windturbine,6.37700000000
+13,2036,R2,2024,windturbine,6.37700000000
+13,2040,R2,2024,windturbine,6.37700000000
+13,2045,R2,2024,windturbine,6.37700000000
+13,2046,R2,2024,windturbine,6.37700000000
+13,2047,R2,2024,windturbine,6.37700000000
+13,2048,R2,2024,windturbine,6.37700000000
+13,2049,R2,2024,windturbine,6.37700000000
+13,2050,R2,2024,windturbine,6.37700000000
 14,2034,R2,2026,solarPV,2.24000000000
 14,2035,R2,2026,solarPV,2.24000000000
 14,2036,R2,2026,solarPV,2.24000000000
@@ -173,39 +173,39 @@ asset,year,region,installed,technology,capacity
 16,2054,R2,2030,solarPV,2.24000000000
 16,2055,R2,2030,solarPV,2.24000000000
 16,2056,R2,2030,solarPV,2.24000000000
-17,2034,R2,2032,solarPV,2.24000000000
-17,2035,R2,2032,solarPV,2.24000000000
-17,2036,R2,2032,solarPV,2.24000000000
-17,2040,R2,2032,solarPV,2.24000000000
-17,2045,R2,2032,solarPV,2.24000000000
-17,2046,R2,2032,solarPV,2.24000000000
-17,2047,R2,2032,solarPV,2.24000000000
-17,2048,R2,2032,solarPV,2.24000000000
-17,2049,R2,2032,solarPV,2.24000000000
-17,2050,R2,2032,solarPV,2.24000000000
-17,2051,R2,2032,solarPV,2.24000000000
-17,2052,R2,2032,solarPV,2.24000000000
-17,2053,R2,2032,solarPV,2.24000000000
-17,2054,R2,2032,solarPV,2.24000000000
-17,2055,R2,2032,solarPV,2.24000000000
-17,2056,R2,2032,solarPV,2.24000000000
-17,2057,R2,2032,solarPV,2.24000000000
-17,2058,R2,2032,solarPV,2.24000000000
-18,2036,R2,2034,solarPV,4.63520000000
-18,2040,R2,2034,solarPV,4.63520000000
-18,2045,R2,2034,solarPV,4.63520000000
-18,2046,R2,2034,solarPV,4.63520000000
-18,2047,R2,2034,solarPV,4.63520000000
-18,2048,R2,2034,solarPV,4.63520000000
-18,2049,R2,2034,solarPV,4.63520000000
-18,2050,R2,2034,solarPV,4.63520000000
-18,2051,R2,2034,solarPV,4.63520000000
-18,2052,R2,2034,solarPV,4.63520000000
-18,2053,R2,2034,solarPV,4.63520000000
-18,2054,R2,2034,solarPV,4.63520000000
-18,2055,R2,2034,solarPV,4.63520000000
-18,2056,R2,2034,solarPV,4.63520000000
-18,2057,R2,2034,solarPV,4.63520000000
-18,2058,R2,2034,solarPV,4.63520000000
-18,2059,R2,2034,solarPV,4.63520000000
-18,2060,R2,2034,solarPV,4.63520000000
+17,2034,R2,2032,solarPV,2.79520000000
+17,2035,R2,2032,solarPV,2.79520000000
+17,2036,R2,2032,solarPV,2.79520000000
+17,2040,R2,2032,solarPV,2.79520000000
+17,2045,R2,2032,solarPV,2.79520000000
+17,2046,R2,2032,solarPV,2.79520000000
+17,2047,R2,2032,solarPV,2.79520000000
+17,2048,R2,2032,solarPV,2.79520000000
+17,2049,R2,2032,solarPV,2.79520000000
+17,2050,R2,2032,solarPV,2.79520000000
+17,2051,R2,2032,solarPV,2.79520000000
+17,2052,R2,2032,solarPV,2.79520000000
+17,2053,R2,2032,solarPV,2.79520000000
+17,2054,R2,2032,solarPV,2.79520000000
+17,2055,R2,2032,solarPV,2.79520000000
+17,2056,R2,2032,solarPV,2.79520000000
+17,2057,R2,2032,solarPV,2.79520000000
+17,2058,R2,2032,solarPV,2.79520000000
+18,2036,R2,2034,solarPV,5.35300000000
+18,2040,R2,2034,solarPV,5.35300000000
+18,2045,R2,2034,solarPV,5.35300000000
+18,2046,R2,2034,solarPV,5.35300000000
+18,2047,R2,2034,solarPV,5.35300000000
+18,2048,R2,2034,solarPV,5.35300000000
+18,2049,R2,2034,solarPV,5.35300000000
+18,2050,R2,2034,solarPV,5.35300000000
+18,2051,R2,2034,solarPV,5.35300000000
+18,2052,R2,2034,solarPV,5.35300000000
+18,2053,R2,2034,solarPV,5.35300000000
+18,2054,R2,2034,solarPV,5.35300000000
+18,2055,R2,2034,solarPV,5.35300000000
+18,2056,R2,2034,solarPV,5.35300000000
+18,2057,R2,2034,solarPV,5.35300000000
+18,2058,R2,2034,solarPV,5.35300000000
+18,2059,R2,2034,solarPV,5.35300000000
+18,2060,R2,2034,solarPV,5.35300000000
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 3aa67908..d86419e4 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
@@ -9,22 +9,22 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2038,R1,2022,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2036,R1,2024,windturbine,7.09480000000
-4,2038,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2036,R1,2022,windturbine,1.68480000000
+3,2038,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2036,R1,2024,windturbine,6.37700000000
+4,2038,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2036,R1,2026,solarPV,2.24000000000
 5,2038,R1,2026,solarPV,2.24000000000
 5,2040,R1,2026,solarPV,2.24000000000
@@ -64,42 +64,42 @@ asset,year,region,installed,technology,capacity
 7,2054,R1,2030,solarPV,2.24000000000
 7,2055,R1,2030,solarPV,2.24000000000
 7,2056,R1,2030,solarPV,2.24000000000
-8,2036,R1,2032,solarPV,2.24000000000
-8,2038,R1,2032,solarPV,2.24000000000
-8,2040,R1,2032,solarPV,2.24000000000
-8,2045,R1,2032,solarPV,2.24000000000
-8,2046,R1,2032,solarPV,2.24000000000
-8,2047,R1,2032,solarPV,2.24000000000
-8,2048,R1,2032,solarPV,2.24000000000
-8,2049,R1,2032,solarPV,2.24000000000
-8,2050,R1,2032,solarPV,2.24000000000
-8,2051,R1,2032,solarPV,2.24000000000
-8,2052,R1,2032,solarPV,2.24000000000
-8,2053,R1,2032,solarPV,2.24000000000
-8,2054,R1,2032,solarPV,2.24000000000
-8,2055,R1,2032,solarPV,2.24000000000
-8,2056,R1,2032,solarPV,2.24000000000
-8,2057,R1,2032,solarPV,2.24000000000
-8,2058,R1,2032,solarPV,2.24000000000
-9,2036,R1,2034,solarPV,4.63520000000
-9,2038,R1,2034,solarPV,4.63520000000
-9,2040,R1,2034,solarPV,4.63520000000
-9,2045,R1,2034,solarPV,4.63520000000
-9,2046,R1,2034,solarPV,4.63520000000
-9,2047,R1,2034,solarPV,4.63520000000
-9,2048,R1,2034,solarPV,4.63520000000
-9,2049,R1,2034,solarPV,4.63520000000
-9,2050,R1,2034,solarPV,4.63520000000
-9,2051,R1,2034,solarPV,4.63520000000
-9,2052,R1,2034,solarPV,4.63520000000
-9,2053,R1,2034,solarPV,4.63520000000
-9,2054,R1,2034,solarPV,4.63520000000
-9,2055,R1,2034,solarPV,4.63520000000
-9,2056,R1,2034,solarPV,4.63520000000
-9,2057,R1,2034,solarPV,4.63520000000
-9,2058,R1,2034,solarPV,4.63520000000
-9,2059,R1,2034,solarPV,4.63520000000
-9,2060,R1,2034,solarPV,4.63520000000
+8,2036,R1,2032,solarPV,2.79520000000
+8,2038,R1,2032,solarPV,2.79520000000
+8,2040,R1,2032,solarPV,2.79520000000
+8,2045,R1,2032,solarPV,2.79520000000
+8,2046,R1,2032,solarPV,2.79520000000
+8,2047,R1,2032,solarPV,2.79520000000
+8,2048,R1,2032,solarPV,2.79520000000
+8,2049,R1,2032,solarPV,2.79520000000
+8,2050,R1,2032,solarPV,2.79520000000
+8,2051,R1,2032,solarPV,2.79520000000
+8,2052,R1,2032,solarPV,2.79520000000
+8,2053,R1,2032,solarPV,2.79520000000
+8,2054,R1,2032,solarPV,2.79520000000
+8,2055,R1,2032,solarPV,2.79520000000
+8,2056,R1,2032,solarPV,2.79520000000
+8,2057,R1,2032,solarPV,2.79520000000
+8,2058,R1,2032,solarPV,2.79520000000
+9,2036,R1,2034,solarPV,5.35300000000
+9,2038,R1,2034,solarPV,5.35300000000
+9,2040,R1,2034,solarPV,5.35300000000
+9,2045,R1,2034,solarPV,5.35300000000
+9,2046,R1,2034,solarPV,5.35300000000
+9,2047,R1,2034,solarPV,5.35300000000
+9,2048,R1,2034,solarPV,5.35300000000
+9,2049,R1,2034,solarPV,5.35300000000
+9,2050,R1,2034,solarPV,5.35300000000
+9,2051,R1,2034,solarPV,5.35300000000
+9,2052,R1,2034,solarPV,5.35300000000
+9,2053,R1,2034,solarPV,5.35300000000
+9,2054,R1,2034,solarPV,5.35300000000
+9,2055,R1,2034,solarPV,5.35300000000
+9,2056,R1,2034,solarPV,5.35300000000
+9,2057,R1,2034,solarPV,5.35300000000
+9,2058,R1,2034,solarPV,5.35300000000
+9,2059,R1,2034,solarPV,5.35300000000
+9,2060,R1,2034,solarPV,5.35300000000
 10,2038,R1,2036,solarPV,2.24000000000
 10,2040,R1,2036,solarPV,2.24000000000
 10,2045,R1,2036,solarPV,2.24000000000
@@ -125,22 +125,22 @@ asset,year,region,installed,technology,capacity
 12,2040,R2,2020,windturbine,11.79000000000
 12,2045,R2,2020,windturbine,11.79000000000
 12,2046,R2,2020,windturbine,11.79000000000
-13,2036,R2,2022,windturbine,2.24000000000
-13,2038,R2,2022,windturbine,2.24000000000
-13,2040,R2,2022,windturbine,2.24000000000
-13,2045,R2,2022,windturbine,2.24000000000
-13,2046,R2,2022,windturbine,2.24000000000
-13,2047,R2,2022,windturbine,2.24000000000
-13,2048,R2,2022,windturbine,2.24000000000
-14,2036,R2,2024,windturbine,7.09480000000
-14,2038,R2,2024,windturbine,7.09480000000
-14,2040,R2,2024,windturbine,7.09480000000
-14,2045,R2,2024,windturbine,7.09480000000
-14,2046,R2,2024,windturbine,7.09480000000
-14,2047,R2,2024,windturbine,7.09480000000
-14,2048,R2,2024,windturbine,7.09480000000
-14,2049,R2,2024,windturbine,7.09480000000
-14,2050,R2,2024,windturbine,7.09480000000
+13,2036,R2,2022,windturbine,1.68480000000
+13,2038,R2,2022,windturbine,1.68480000000
+13,2040,R2,2022,windturbine,1.68480000000
+13,2045,R2,2022,windturbine,1.68480000000
+13,2046,R2,2022,windturbine,1.68480000000
+13,2047,R2,2022,windturbine,1.68480000000
+13,2048,R2,2022,windturbine,1.68480000000
+14,2036,R2,2024,windturbine,6.37700000000
+14,2038,R2,2024,windturbine,6.37700000000
+14,2040,R2,2024,windturbine,6.37700000000
+14,2045,R2,2024,windturbine,6.37700000000
+14,2046,R2,2024,windturbine,6.37700000000
+14,2047,R2,2024,windturbine,6.37700000000
+14,2048,R2,2024,windturbine,6.37700000000
+14,2049,R2,2024,windturbine,6.37700000000
+14,2050,R2,2024,windturbine,6.37700000000
 15,2036,R2,2026,solarPV,2.24000000000
 15,2038,R2,2026,solarPV,2.24000000000
 15,2040,R2,2026,solarPV,2.24000000000
@@ -180,42 +180,42 @@ asset,year,region,installed,technology,capacity
 17,2054,R2,2030,solarPV,2.24000000000
 17,2055,R2,2030,solarPV,2.24000000000
 17,2056,R2,2030,solarPV,2.24000000000
-18,2036,R2,2032,solarPV,2.24000000000
-18,2038,R2,2032,solarPV,2.24000000000
-18,2040,R2,2032,solarPV,2.24000000000
-18,2045,R2,2032,solarPV,2.24000000000
-18,2046,R2,2032,solarPV,2.24000000000
-18,2047,R2,2032,solarPV,2.24000000000
-18,2048,R2,2032,solarPV,2.24000000000
-18,2049,R2,2032,solarPV,2.24000000000
-18,2050,R2,2032,solarPV,2.24000000000
-18,2051,R2,2032,solarPV,2.24000000000
-18,2052,R2,2032,solarPV,2.24000000000
-18,2053,R2,2032,solarPV,2.24000000000
-18,2054,R2,2032,solarPV,2.24000000000
-18,2055,R2,2032,solarPV,2.24000000000
-18,2056,R2,2032,solarPV,2.24000000000
-18,2057,R2,2032,solarPV,2.24000000000
-18,2058,R2,2032,solarPV,2.24000000000
-19,2036,R2,2034,solarPV,4.63520000000
-19,2038,R2,2034,solarPV,4.63520000000
-19,2040,R2,2034,solarPV,4.63520000000
-19,2045,R2,2034,solarPV,4.63520000000
-19,2046,R2,2034,solarPV,4.63520000000
-19,2047,R2,2034,solarPV,4.63520000000
-19,2048,R2,2034,solarPV,4.63520000000
-19,2049,R2,2034,solarPV,4.63520000000
-19,2050,R2,2034,solarPV,4.63520000000
-19,2051,R2,2034,solarPV,4.63520000000
-19,2052,R2,2034,solarPV,4.63520000000
-19,2053,R2,2034,solarPV,4.63520000000
-19,2054,R2,2034,solarPV,4.63520000000
-19,2055,R2,2034,solarPV,4.63520000000
-19,2056,R2,2034,solarPV,4.63520000000
-19,2057,R2,2034,solarPV,4.63520000000
-19,2058,R2,2034,solarPV,4.63520000000
-19,2059,R2,2034,solarPV,4.63520000000
-19,2060,R2,2034,solarPV,4.63520000000
+18,2036,R2,2032,solarPV,2.79520000000
+18,2038,R2,2032,solarPV,2.79520000000
+18,2040,R2,2032,solarPV,2.79520000000
+18,2045,R2,2032,solarPV,2.79520000000
+18,2046,R2,2032,solarPV,2.79520000000
+18,2047,R2,2032,solarPV,2.79520000000
+18,2048,R2,2032,solarPV,2.79520000000
+18,2049,R2,2032,solarPV,2.79520000000
+18,2050,R2,2032,solarPV,2.79520000000
+18,2051,R2,2032,solarPV,2.79520000000
+18,2052,R2,2032,solarPV,2.79520000000
+18,2053,R2,2032,solarPV,2.79520000000
+18,2054,R2,2032,solarPV,2.79520000000
+18,2055,R2,2032,solarPV,2.79520000000
+18,2056,R2,2032,solarPV,2.79520000000
+18,2057,R2,2032,solarPV,2.79520000000
+18,2058,R2,2032,solarPV,2.79520000000
+19,2036,R2,2034,solarPV,5.35300000000
+19,2038,R2,2034,solarPV,5.35300000000
+19,2040,R2,2034,solarPV,5.35300000000
+19,2045,R2,2034,solarPV,5.35300000000
+19,2046,R2,2034,solarPV,5.35300000000
+19,2047,R2,2034,solarPV,5.35300000000
+19,2048,R2,2034,solarPV,5.35300000000
+19,2049,R2,2034,solarPV,5.35300000000
+19,2050,R2,2034,solarPV,5.35300000000
+19,2051,R2,2034,solarPV,5.35300000000
+19,2052,R2,2034,solarPV,5.35300000000
+19,2053,R2,2034,solarPV,5.35300000000
+19,2054,R2,2034,solarPV,5.35300000000
+19,2055,R2,2034,solarPV,5.35300000000
+19,2056,R2,2034,solarPV,5.35300000000
+19,2057,R2,2034,solarPV,5.35300000000
+19,2058,R2,2034,solarPV,5.35300000000
+19,2059,R2,2034,solarPV,5.35300000000
+19,2060,R2,2034,solarPV,5.35300000000
 20,2038,R2,2036,solarPV,2.24000000000
 20,2040,R2,2036,solarPV,2.24000000000
 20,2045,R2,2036,solarPV,2.24000000000
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 eb095b2e..ee3c56d9 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
@@ -7,20 +7,20 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2040,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2038,R1,2024,windturbine,7.09480000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2038,R1,2022,windturbine,1.68480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2038,R1,2024,windturbine,6.37700000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2038,R1,2026,solarPV,2.24000000000
 5,2040,R1,2026,solarPV,2.24000000000
 5,2045,R1,2026,solarPV,2.24000000000
@@ -57,40 +57,40 @@ asset,year,region,installed,technology,capacity
 7,2054,R1,2030,solarPV,2.24000000000
 7,2055,R1,2030,solarPV,2.24000000000
 7,2056,R1,2030,solarPV,2.24000000000
-8,2038,R1,2032,solarPV,2.24000000000
-8,2040,R1,2032,solarPV,2.24000000000
-8,2045,R1,2032,solarPV,2.24000000000
-8,2046,R1,2032,solarPV,2.24000000000
-8,2047,R1,2032,solarPV,2.24000000000
-8,2048,R1,2032,solarPV,2.24000000000
-8,2049,R1,2032,solarPV,2.24000000000
-8,2050,R1,2032,solarPV,2.24000000000
-8,2051,R1,2032,solarPV,2.24000000000
-8,2052,R1,2032,solarPV,2.24000000000
-8,2053,R1,2032,solarPV,2.24000000000
-8,2054,R1,2032,solarPV,2.24000000000
-8,2055,R1,2032,solarPV,2.24000000000
-8,2056,R1,2032,solarPV,2.24000000000
-8,2057,R1,2032,solarPV,2.24000000000
-8,2058,R1,2032,solarPV,2.24000000000
-9,2038,R1,2034,solarPV,4.63520000000
-9,2040,R1,2034,solarPV,4.63520000000
-9,2045,R1,2034,solarPV,4.63520000000
-9,2046,R1,2034,solarPV,4.63520000000
-9,2047,R1,2034,solarPV,4.63520000000
-9,2048,R1,2034,solarPV,4.63520000000
-9,2049,R1,2034,solarPV,4.63520000000
-9,2050,R1,2034,solarPV,4.63520000000
-9,2051,R1,2034,solarPV,4.63520000000
-9,2052,R1,2034,solarPV,4.63520000000
-9,2053,R1,2034,solarPV,4.63520000000
-9,2054,R1,2034,solarPV,4.63520000000
-9,2055,R1,2034,solarPV,4.63520000000
-9,2056,R1,2034,solarPV,4.63520000000
-9,2057,R1,2034,solarPV,4.63520000000
-9,2058,R1,2034,solarPV,4.63520000000
-9,2059,R1,2034,solarPV,4.63520000000
-9,2060,R1,2034,solarPV,4.63520000000
+8,2038,R1,2032,solarPV,2.79520000000
+8,2040,R1,2032,solarPV,2.79520000000
+8,2045,R1,2032,solarPV,2.79520000000
+8,2046,R1,2032,solarPV,2.79520000000
+8,2047,R1,2032,solarPV,2.79520000000
+8,2048,R1,2032,solarPV,2.79520000000
+8,2049,R1,2032,solarPV,2.79520000000
+8,2050,R1,2032,solarPV,2.79520000000
+8,2051,R1,2032,solarPV,2.79520000000
+8,2052,R1,2032,solarPV,2.79520000000
+8,2053,R1,2032,solarPV,2.79520000000
+8,2054,R1,2032,solarPV,2.79520000000
+8,2055,R1,2032,solarPV,2.79520000000
+8,2056,R1,2032,solarPV,2.79520000000
+8,2057,R1,2032,solarPV,2.79520000000
+8,2058,R1,2032,solarPV,2.79520000000
+9,2038,R1,2034,solarPV,5.35300000000
+9,2040,R1,2034,solarPV,5.35300000000
+9,2045,R1,2034,solarPV,5.35300000000
+9,2046,R1,2034,solarPV,5.35300000000
+9,2047,R1,2034,solarPV,5.35300000000
+9,2048,R1,2034,solarPV,5.35300000000
+9,2049,R1,2034,solarPV,5.35300000000
+9,2050,R1,2034,solarPV,5.35300000000
+9,2051,R1,2034,solarPV,5.35300000000
+9,2052,R1,2034,solarPV,5.35300000000
+9,2053,R1,2034,solarPV,5.35300000000
+9,2054,R1,2034,solarPV,5.35300000000
+9,2055,R1,2034,solarPV,5.35300000000
+9,2056,R1,2034,solarPV,5.35300000000
+9,2057,R1,2034,solarPV,5.35300000000
+9,2058,R1,2034,solarPV,5.35300000000
+9,2059,R1,2034,solarPV,5.35300000000
+9,2060,R1,2034,solarPV,5.35300000000
 10,2038,R1,2036,solarPV,2.24000000000
 10,2040,R1,2036,solarPV,2.24000000000
 10,2045,R1,2036,solarPV,2.24000000000
@@ -136,20 +136,20 @@ asset,year,region,installed,technology,capacity
 13,2040,R2,2020,windturbine,11.79000000000
 13,2045,R2,2020,windturbine,11.79000000000
 13,2046,R2,2020,windturbine,11.79000000000
-14,2038,R2,2022,windturbine,2.24000000000
-14,2040,R2,2022,windturbine,2.24000000000
-14,2045,R2,2022,windturbine,2.24000000000
-14,2046,R2,2022,windturbine,2.24000000000
-14,2047,R2,2022,windturbine,2.24000000000
-14,2048,R2,2022,windturbine,2.24000000000
-15,2038,R2,2024,windturbine,7.09480000000
-15,2040,R2,2024,windturbine,7.09480000000
-15,2045,R2,2024,windturbine,7.09480000000
-15,2046,R2,2024,windturbine,7.09480000000
-15,2047,R2,2024,windturbine,7.09480000000
-15,2048,R2,2024,windturbine,7.09480000000
-15,2049,R2,2024,windturbine,7.09480000000
-15,2050,R2,2024,windturbine,7.09480000000
+14,2038,R2,2022,windturbine,1.68480000000
+14,2040,R2,2022,windturbine,1.68480000000
+14,2045,R2,2022,windturbine,1.68480000000
+14,2046,R2,2022,windturbine,1.68480000000
+14,2047,R2,2022,windturbine,1.68480000000
+14,2048,R2,2022,windturbine,1.68480000000
+15,2038,R2,2024,windturbine,6.37700000000
+15,2040,R2,2024,windturbine,6.37700000000
+15,2045,R2,2024,windturbine,6.37700000000
+15,2046,R2,2024,windturbine,6.37700000000
+15,2047,R2,2024,windturbine,6.37700000000
+15,2048,R2,2024,windturbine,6.37700000000
+15,2049,R2,2024,windturbine,6.37700000000
+15,2050,R2,2024,windturbine,6.37700000000
 16,2038,R2,2026,solarPV,2.24000000000
 16,2040,R2,2026,solarPV,2.24000000000
 16,2045,R2,2026,solarPV,2.24000000000
@@ -186,40 +186,40 @@ asset,year,region,installed,technology,capacity
 18,2054,R2,2030,solarPV,2.24000000000
 18,2055,R2,2030,solarPV,2.24000000000
 18,2056,R2,2030,solarPV,2.24000000000
-19,2038,R2,2032,solarPV,2.24000000000
-19,2040,R2,2032,solarPV,2.24000000000
-19,2045,R2,2032,solarPV,2.24000000000
-19,2046,R2,2032,solarPV,2.24000000000
-19,2047,R2,2032,solarPV,2.24000000000
-19,2048,R2,2032,solarPV,2.24000000000
-19,2049,R2,2032,solarPV,2.24000000000
-19,2050,R2,2032,solarPV,2.24000000000
-19,2051,R2,2032,solarPV,2.24000000000
-19,2052,R2,2032,solarPV,2.24000000000
-19,2053,R2,2032,solarPV,2.24000000000
-19,2054,R2,2032,solarPV,2.24000000000
-19,2055,R2,2032,solarPV,2.24000000000
-19,2056,R2,2032,solarPV,2.24000000000
-19,2057,R2,2032,solarPV,2.24000000000
-19,2058,R2,2032,solarPV,2.24000000000
-20,2038,R2,2034,solarPV,4.63520000000
-20,2040,R2,2034,solarPV,4.63520000000
-20,2045,R2,2034,solarPV,4.63520000000
-20,2046,R2,2034,solarPV,4.63520000000
-20,2047,R2,2034,solarPV,4.63520000000
-20,2048,R2,2034,solarPV,4.63520000000
-20,2049,R2,2034,solarPV,4.63520000000
-20,2050,R2,2034,solarPV,4.63520000000
-20,2051,R2,2034,solarPV,4.63520000000
-20,2052,R2,2034,solarPV,4.63520000000
-20,2053,R2,2034,solarPV,4.63520000000
-20,2054,R2,2034,solarPV,4.63520000000
-20,2055,R2,2034,solarPV,4.63520000000
-20,2056,R2,2034,solarPV,4.63520000000
-20,2057,R2,2034,solarPV,4.63520000000
-20,2058,R2,2034,solarPV,4.63520000000
-20,2059,R2,2034,solarPV,4.63520000000
-20,2060,R2,2034,solarPV,4.63520000000
+19,2038,R2,2032,solarPV,2.79520000000
+19,2040,R2,2032,solarPV,2.79520000000
+19,2045,R2,2032,solarPV,2.79520000000
+19,2046,R2,2032,solarPV,2.79520000000
+19,2047,R2,2032,solarPV,2.79520000000
+19,2048,R2,2032,solarPV,2.79520000000
+19,2049,R2,2032,solarPV,2.79520000000
+19,2050,R2,2032,solarPV,2.79520000000
+19,2051,R2,2032,solarPV,2.79520000000
+19,2052,R2,2032,solarPV,2.79520000000
+19,2053,R2,2032,solarPV,2.79520000000
+19,2054,R2,2032,solarPV,2.79520000000
+19,2055,R2,2032,solarPV,2.79520000000
+19,2056,R2,2032,solarPV,2.79520000000
+19,2057,R2,2032,solarPV,2.79520000000
+19,2058,R2,2032,solarPV,2.79520000000
+20,2038,R2,2034,solarPV,5.35300000000
+20,2040,R2,2034,solarPV,5.35300000000
+20,2045,R2,2034,solarPV,5.35300000000
+20,2046,R2,2034,solarPV,5.35300000000
+20,2047,R2,2034,solarPV,5.35300000000
+20,2048,R2,2034,solarPV,5.35300000000
+20,2049,R2,2034,solarPV,5.35300000000
+20,2050,R2,2034,solarPV,5.35300000000
+20,2051,R2,2034,solarPV,5.35300000000
+20,2052,R2,2034,solarPV,5.35300000000
+20,2053,R2,2034,solarPV,5.35300000000
+20,2054,R2,2034,solarPV,5.35300000000
+20,2055,R2,2034,solarPV,5.35300000000
+20,2056,R2,2034,solarPV,5.35300000000
+20,2057,R2,2034,solarPV,5.35300000000
+20,2058,R2,2034,solarPV,5.35300000000
+20,2059,R2,2034,solarPV,5.35300000000
+20,2060,R2,2034,solarPV,5.35300000000
 21,2038,R2,2036,solarPV,2.24000000000
 21,2040,R2,2036,solarPV,2.24000000000
 21,2045,R2,2036,solarPV,2.24000000000
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 5d03ac67..c888c352 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
@@ -7,20 +7,20 @@ asset,year,region,installed,technology,capacity
 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,windturbine,2.24000000000
-3,2042,R1,2022,windturbine,2.24000000000
-3,2045,R1,2022,windturbine,2.24000000000
-3,2046,R1,2022,windturbine,2.24000000000
-3,2047,R1,2022,windturbine,2.24000000000
-3,2048,R1,2022,windturbine,2.24000000000
-4,2040,R1,2024,windturbine,7.09480000000
-4,2042,R1,2024,windturbine,7.09480000000
-4,2045,R1,2024,windturbine,7.09480000000
-4,2046,R1,2024,windturbine,7.09480000000
-4,2047,R1,2024,windturbine,7.09480000000
-4,2048,R1,2024,windturbine,7.09480000000
-4,2049,R1,2024,windturbine,7.09480000000
-4,2050,R1,2024,windturbine,7.09480000000
+3,2040,R1,2022,windturbine,1.68480000000
+3,2042,R1,2022,windturbine,1.68480000000
+3,2045,R1,2022,windturbine,1.68480000000
+3,2046,R1,2022,windturbine,1.68480000000
+3,2047,R1,2022,windturbine,1.68480000000
+3,2048,R1,2022,windturbine,1.68480000000
+4,2040,R1,2024,windturbine,6.37700000000
+4,2042,R1,2024,windturbine,6.37700000000
+4,2045,R1,2024,windturbine,6.37700000000
+4,2046,R1,2024,windturbine,6.37700000000
+4,2047,R1,2024,windturbine,6.37700000000
+4,2048,R1,2024,windturbine,6.37700000000
+4,2049,R1,2024,windturbine,6.37700000000
+4,2050,R1,2024,windturbine,6.37700000000
 5,2040,R1,2026,solarPV,2.24000000000
 5,2042,R1,2026,solarPV,2.24000000000
 5,2045,R1,2026,solarPV,2.24000000000
@@ -57,40 +57,40 @@ asset,year,region,installed,technology,capacity
 7,2054,R1,2030,solarPV,2.24000000000
 7,2055,R1,2030,solarPV,2.24000000000
 7,2056,R1,2030,solarPV,2.24000000000
-8,2040,R1,2032,solarPV,2.24000000000
-8,2042,R1,2032,solarPV,2.24000000000
-8,2045,R1,2032,solarPV,2.24000000000
-8,2046,R1,2032,solarPV,2.24000000000
-8,2047,R1,2032,solarPV,2.24000000000
-8,2048,R1,2032,solarPV,2.24000000000
-8,2049,R1,2032,solarPV,2.24000000000
-8,2050,R1,2032,solarPV,2.24000000000
-8,2051,R1,2032,solarPV,2.24000000000
-8,2052,R1,2032,solarPV,2.24000000000
-8,2053,R1,2032,solarPV,2.24000000000
-8,2054,R1,2032,solarPV,2.24000000000
-8,2055,R1,2032,solarPV,2.24000000000
-8,2056,R1,2032,solarPV,2.24000000000
-8,2057,R1,2032,solarPV,2.24000000000
-8,2058,R1,2032,solarPV,2.24000000000
-9,2040,R1,2034,solarPV,4.63520000000
-9,2042,R1,2034,solarPV,4.63520000000
-9,2045,R1,2034,solarPV,4.63520000000
-9,2046,R1,2034,solarPV,4.63520000000
-9,2047,R1,2034,solarPV,4.63520000000
-9,2048,R1,2034,solarPV,4.63520000000
-9,2049,R1,2034,solarPV,4.63520000000
-9,2050,R1,2034,solarPV,4.63520000000
-9,2051,R1,2034,solarPV,4.63520000000
-9,2052,R1,2034,solarPV,4.63520000000
-9,2053,R1,2034,solarPV,4.63520000000
-9,2054,R1,2034,solarPV,4.63520000000
-9,2055,R1,2034,solarPV,4.63520000000
-9,2056,R1,2034,solarPV,4.63520000000
-9,2057,R1,2034,solarPV,4.63520000000
-9,2058,R1,2034,solarPV,4.63520000000
-9,2059,R1,2034,solarPV,4.63520000000
-9,2060,R1,2034,solarPV,4.63520000000
+8,2040,R1,2032,solarPV,2.79520000000
+8,2042,R1,2032,solarPV,2.79520000000
+8,2045,R1,2032,solarPV,2.79520000000
+8,2046,R1,2032,solarPV,2.79520000000
+8,2047,R1,2032,solarPV,2.79520000000
+8,2048,R1,2032,solarPV,2.79520000000
+8,2049,R1,2032,solarPV,2.79520000000
+8,2050,R1,2032,solarPV,2.79520000000
+8,2051,R1,2032,solarPV,2.79520000000
+8,2052,R1,2032,solarPV,2.79520000000
+8,2053,R1,2032,solarPV,2.79520000000
+8,2054,R1,2032,solarPV,2.79520000000
+8,2055,R1,2032,solarPV,2.79520000000
+8,2056,R1,2032,solarPV,2.79520000000
+8,2057,R1,2032,solarPV,2.79520000000
+8,2058,R1,2032,solarPV,2.79520000000
+9,2040,R1,2034,solarPV,5.35300000000
+9,2042,R1,2034,solarPV,5.35300000000
+9,2045,R1,2034,solarPV,5.35300000000
+9,2046,R1,2034,solarPV,5.35300000000
+9,2047,R1,2034,solarPV,5.35300000000
+9,2048,R1,2034,solarPV,5.35300000000
+9,2049,R1,2034,solarPV,5.35300000000
+9,2050,R1,2034,solarPV,5.35300000000
+9,2051,R1,2034,solarPV,5.35300000000
+9,2052,R1,2034,solarPV,5.35300000000
+9,2053,R1,2034,solarPV,5.35300000000
+9,2054,R1,2034,solarPV,5.35300000000
+9,2055,R1,2034,solarPV,5.35300000000
+9,2056,R1,2034,solarPV,5.35300000000
+9,2057,R1,2034,solarPV,5.35300000000
+9,2058,R1,2034,solarPV,5.35300000000
+9,2059,R1,2034,solarPV,5.35300000000
+9,2060,R1,2034,solarPV,5.35300000000
 10,2040,R1,2036,solarPV,2.24000000000
 10,2042,R1,2036,solarPV,2.24000000000
 10,2045,R1,2036,solarPV,2.24000000000
@@ -160,20 +160,20 @@ asset,year,region,installed,technology,capacity
 14,2042,R2,2020,windturbine,11.79000000000
 14,2045,R2,2020,windturbine,11.79000000000
 14,2046,R2,2020,windturbine,11.79000000000
-15,2040,R2,2022,windturbine,2.24000000000
-15,2042,R2,2022,windturbine,2.24000000000
-15,2045,R2,2022,windturbine,2.24000000000
-15,2046,R2,2022,windturbine,2.24000000000
-15,2047,R2,2022,windturbine,2.24000000000
-15,2048,R2,2022,windturbine,2.24000000000
-16,2040,R2,2024,windturbine,7.09480000000
-16,2042,R2,2024,windturbine,7.09480000000
-16,2045,R2,2024,windturbine,7.09480000000
-16,2046,R2,2024,windturbine,7.09480000000
-16,2047,R2,2024,windturbine,7.09480000000
-16,2048,R2,2024,windturbine,7.09480000000
-16,2049,R2,2024,windturbine,7.09480000000
-16,2050,R2,2024,windturbine,7.09480000000
+15,2040,R2,2022,windturbine,1.68480000000
+15,2042,R2,2022,windturbine,1.68480000000
+15,2045,R2,2022,windturbine,1.68480000000
+15,2046,R2,2022,windturbine,1.68480000000
+15,2047,R2,2022,windturbine,1.68480000000
+15,2048,R2,2022,windturbine,1.68480000000
+16,2040,R2,2024,windturbine,6.37700000000
+16,2042,R2,2024,windturbine,6.37700000000
+16,2045,R2,2024,windturbine,6.37700000000
+16,2046,R2,2024,windturbine,6.37700000000
+16,2047,R2,2024,windturbine,6.37700000000
+16,2048,R2,2024,windturbine,6.37700000000
+16,2049,R2,2024,windturbine,6.37700000000
+16,2050,R2,2024,windturbine,6.37700000000
 17,2040,R2,2026,solarPV,2.24000000000
 17,2042,R2,2026,solarPV,2.24000000000
 17,2045,R2,2026,solarPV,2.24000000000
@@ -210,40 +210,40 @@ asset,year,region,installed,technology,capacity
 19,2054,R2,2030,solarPV,2.24000000000
 19,2055,R2,2030,solarPV,2.24000000000
 19,2056,R2,2030,solarPV,2.24000000000
-20,2040,R2,2032,solarPV,2.24000000000
-20,2042,R2,2032,solarPV,2.24000000000
-20,2045,R2,2032,solarPV,2.24000000000
-20,2046,R2,2032,solarPV,2.24000000000
-20,2047,R2,2032,solarPV,2.24000000000
-20,2048,R2,2032,solarPV,2.24000000000
-20,2049,R2,2032,solarPV,2.24000000000
-20,2050,R2,2032,solarPV,2.24000000000
-20,2051,R2,2032,solarPV,2.24000000000
-20,2052,R2,2032,solarPV,2.24000000000
-20,2053,R2,2032,solarPV,2.24000000000
-20,2054,R2,2032,solarPV,2.24000000000
-20,2055,R2,2032,solarPV,2.24000000000
-20,2056,R2,2032,solarPV,2.24000000000
-20,2057,R2,2032,solarPV,2.24000000000
-20,2058,R2,2032,solarPV,2.24000000000
-21,2040,R2,2034,solarPV,4.63520000000
-21,2042,R2,2034,solarPV,4.63520000000
-21,2045,R2,2034,solarPV,4.63520000000
-21,2046,R2,2034,solarPV,4.63520000000
-21,2047,R2,2034,solarPV,4.63520000000
-21,2048,R2,2034,solarPV,4.63520000000
-21,2049,R2,2034,solarPV,4.63520000000
-21,2050,R2,2034,solarPV,4.63520000000
-21,2051,R2,2034,solarPV,4.63520000000
-21,2052,R2,2034,solarPV,4.63520000000
-21,2053,R2,2034,solarPV,4.63520000000
-21,2054,R2,2034,solarPV,4.63520000000
-21,2055,R2,2034,solarPV,4.63520000000
-21,2056,R2,2034,solarPV,4.63520000000
-21,2057,R2,2034,solarPV,4.63520000000
-21,2058,R2,2034,solarPV,4.63520000000
-21,2059,R2,2034,solarPV,4.63520000000
-21,2060,R2,2034,solarPV,4.63520000000
+20,2040,R2,2032,solarPV,2.79520000000
+20,2042,R2,2032,solarPV,2.79520000000
+20,2045,R2,2032,solarPV,2.79520000000
+20,2046,R2,2032,solarPV,2.79520000000
+20,2047,R2,2032,solarPV,2.79520000000
+20,2048,R2,2032,solarPV,2.79520000000
+20,2049,R2,2032,solarPV,2.79520000000
+20,2050,R2,2032,solarPV,2.79520000000
+20,2051,R2,2032,solarPV,2.79520000000
+20,2052,R2,2032,solarPV,2.79520000000
+20,2053,R2,2032,solarPV,2.79520000000
+20,2054,R2,2032,solarPV,2.79520000000
+20,2055,R2,2032,solarPV,2.79520000000
+20,2056,R2,2032,solarPV,2.79520000000
+20,2057,R2,2032,solarPV,2.79520000000
+20,2058,R2,2032,solarPV,2.79520000000
+21,2040,R2,2034,solarPV,5.35300000000
+21,2042,R2,2034,solarPV,5.35300000000
+21,2045,R2,2034,solarPV,5.35300000000
+21,2046,R2,2034,solarPV,5.35300000000
+21,2047,R2,2034,solarPV,5.35300000000
+21,2048,R2,2034,solarPV,5.35300000000
+21,2049,R2,2034,solarPV,5.35300000000
+21,2050,R2,2034,solarPV,5.35300000000
+21,2051,R2,2034,solarPV,5.35300000000
+21,2052,R2,2034,solarPV,5.35300000000
+21,2053,R2,2034,solarPV,5.35300000000
+21,2054,R2,2034,solarPV,5.35300000000
+21,2055,R2,2034,solarPV,5.35300000000
+21,2056,R2,2034,solarPV,5.35300000000
+21,2057,R2,2034,solarPV,5.35300000000
+21,2058,R2,2034,solarPV,5.35300000000
+21,2059,R2,2034,solarPV,5.35300000000
+21,2060,R2,2034,solarPV,5.35300000000
 22,2040,R2,2036,solarPV,2.24000000000
 22,2042,R2,2036,solarPV,2.24000000000
 22,2045,R2,2036,solarPV,2.24000000000
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 7f09fb5d..3a7ef7c2 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
@@ -7,23 +7,35 @@ asset,year,region,installed,technology,capacity
 1,2025,R1,2020,heatpump,14.04000000000
 1,2030,R1,2020,heatpump,14.04000000000
 1,2031,R1,2020,heatpump,14.04000000000
-2,2024,R1,2022,heatpump,2.24000000000
-2,2025,R1,2022,heatpump,2.24000000000
-2,2030,R1,2022,heatpump,2.24000000000
-2,2031,R1,2022,heatpump,2.24000000000
-2,2032,R1,2022,heatpump,2.24000000000
-2,2033,R1,2022,heatpump,2.24000000000
-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.04000000000
-4,2024,R2,2020,heatpump,14.04000000000
-4,2025,R2,2020,heatpump,14.04000000000
-4,2030,R2,2020,heatpump,14.04000000000
-4,2031,R2,2020,heatpump,14.04000000000
-5,2024,R2,2022,heatpump,2.24000000000
-5,2025,R2,2022,heatpump,2.24000000000
-5,2030,R2,2022,heatpump,2.24000000000
-5,2031,R2,2022,heatpump,2.24000000000
-5,2032,R2,2022,heatpump,2.24000000000
-5,2033,R2,2022,heatpump,2.24000000000
+2,2024,R1,2022,gasboiler,0.55520000000
+2,2025,R1,2022,gasboiler,0.55520000000
+2,2030,R1,2022,gasboiler,0.55520000000
+2,2031,R1,2022,gasboiler,0.55520000000
+2,2032,R1,2022,gasboiler,0.55520000000
+2,2033,R1,2022,gasboiler,0.55520000000
+3,2024,R1,2022,heatpump,1.68480000000
+3,2025,R1,2022,heatpump,1.68480000000
+3,2030,R1,2022,heatpump,1.68480000000
+3,2031,R1,2022,heatpump,1.68480000000
+3,2032,R1,2022,heatpump,1.68480000000
+3,2033,R1,2022,heatpump,1.68480000000
+4,2022,R2,2020,gasboiler,5.00000000000
+4,2024,R2,2020,gasboiler,5.00000000000
+4,2025,R2,2020,gasboiler,5.00000000000
+5,2022,R2,2020,heatpump,14.04000000000
+5,2024,R2,2020,heatpump,14.04000000000
+5,2025,R2,2020,heatpump,14.04000000000
+5,2030,R2,2020,heatpump,14.04000000000
+5,2031,R2,2020,heatpump,14.04000000000
+6,2024,R2,2022,gasboiler,0.55520000000
+6,2025,R2,2022,gasboiler,0.55520000000
+6,2030,R2,2022,gasboiler,0.55520000000
+6,2031,R2,2022,gasboiler,0.55520000000
+6,2032,R2,2022,gasboiler,0.55520000000
+6,2033,R2,2022,gasboiler,0.55520000000
+7,2024,R2,2022,heatpump,1.68480000000
+7,2025,R2,2022,heatpump,1.68480000000
+7,2030,R2,2022,heatpump,1.68480000000
+7,2031,R2,2022,heatpump,1.68480000000
+7,2032,R2,2022,heatpump,1.68480000000
+7,2033,R2,2022,heatpump,1.68480000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
index 1a948a79..5ae5a58f 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
@@ -1,57 +1,71 @@
 asset,year,technology,region,installed,capacity
 0,2024,gasboiler,R1,2020,5.00000000000
 0,2025,gasboiler,R1,2020,5.00000000000
-1,2026,gasboiler,R1,2024,2.39520000000
-1,2030,gasboiler,R1,2024,2.39520000000
-1,2031,gasboiler,R1,2024,2.39520000000
-1,2032,gasboiler,R1,2024,2.39520000000
-1,2033,gasboiler,R1,2024,2.39520000000
-1,2034,gasboiler,R1,2024,2.39520000000
-1,2035,gasboiler,R1,2024,2.39520000000
-2,2024,gasboiler,R2,2020,5.00000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2026,gasboiler,R2,2024,2.39520000000
-3,2030,gasboiler,R2,2024,2.39520000000
-3,2031,gasboiler,R2,2024,2.39520000000
-3,2032,gasboiler,R2,2024,2.39520000000
-3,2033,gasboiler,R2,2024,2.39520000000
-3,2034,gasboiler,R2,2024,2.39520000000
-3,2035,gasboiler,R2,2024,2.39520000000
-4,2024,heatpump,R1,2020,14.04000000000
-4,2025,heatpump,R1,2020,14.04000000000
-4,2026,heatpump,R1,2020,14.04000000000
-4,2030,heatpump,R1,2020,14.04000000000
-4,2031,heatpump,R1,2020,14.04000000000
-5,2024,heatpump,R1,2022,2.24000000000
-5,2025,heatpump,R1,2022,2.24000000000
-5,2026,heatpump,R1,2022,2.24000000000
-5,2030,heatpump,R1,2022,2.24000000000
-5,2031,heatpump,R1,2022,2.24000000000
-5,2032,heatpump,R1,2022,2.24000000000
-5,2033,heatpump,R1,2022,2.24000000000
-6,2026,heatpump,R1,2024,4.84480000000
-6,2030,heatpump,R1,2024,4.84480000000
-6,2031,heatpump,R1,2024,4.84480000000
-6,2032,heatpump,R1,2024,4.84480000000
-6,2033,heatpump,R1,2024,4.84480000000
-6,2034,heatpump,R1,2024,4.84480000000
-6,2035,heatpump,R1,2024,4.84480000000
-7,2024,heatpump,R2,2020,14.04000000000
-7,2025,heatpump,R2,2020,14.04000000000
-7,2026,heatpump,R2,2020,14.04000000000
-7,2030,heatpump,R2,2020,14.04000000000
-7,2031,heatpump,R2,2020,14.04000000000
-8,2024,heatpump,R2,2022,2.24000000000
-8,2025,heatpump,R2,2022,2.24000000000
-8,2026,heatpump,R2,2022,2.24000000000
-8,2030,heatpump,R2,2022,2.24000000000
-8,2031,heatpump,R2,2022,2.24000000000
-8,2032,heatpump,R2,2022,2.24000000000
-8,2033,heatpump,R2,2022,2.24000000000
-9,2026,heatpump,R2,2024,4.84480000000
-9,2030,heatpump,R2,2024,4.84480000000
-9,2031,heatpump,R2,2024,4.84480000000
-9,2032,heatpump,R2,2024,4.84480000000
-9,2033,heatpump,R2,2024,4.84480000000
-9,2034,heatpump,R2,2024,4.84480000000
-9,2035,heatpump,R2,2024,4.84480000000
+1,2024,gasboiler,R1,2022,0.55520000000
+1,2025,gasboiler,R1,2022,0.55520000000
+1,2026,gasboiler,R1,2022,0.55520000000
+1,2030,gasboiler,R1,2022,0.55520000000
+1,2031,gasboiler,R1,2022,0.55520000000
+1,2032,gasboiler,R1,2022,0.55520000000
+1,2033,gasboiler,R1,2022,0.55520000000
+2,2026,gasboiler,R1,2024,3.11300000000
+2,2030,gasboiler,R1,2024,3.11300000000
+2,2031,gasboiler,R1,2024,3.11300000000
+2,2032,gasboiler,R1,2024,3.11300000000
+2,2033,gasboiler,R1,2024,3.11300000000
+2,2034,gasboiler,R1,2024,3.11300000000
+2,2035,gasboiler,R1,2024,3.11300000000
+3,2024,gasboiler,R2,2020,5.00000000000
+3,2025,gasboiler,R2,2020,5.00000000000
+4,2024,gasboiler,R2,2022,0.55520000000
+4,2025,gasboiler,R2,2022,0.55520000000
+4,2026,gasboiler,R2,2022,0.55520000000
+4,2030,gasboiler,R2,2022,0.55520000000
+4,2031,gasboiler,R2,2022,0.55520000000
+4,2032,gasboiler,R2,2022,0.55520000000
+4,2033,gasboiler,R2,2022,0.55520000000
+5,2026,gasboiler,R2,2024,3.11300000000
+5,2030,gasboiler,R2,2024,3.11300000000
+5,2031,gasboiler,R2,2024,3.11300000000
+5,2032,gasboiler,R2,2024,3.11300000000
+5,2033,gasboiler,R2,2024,3.11300000000
+5,2034,gasboiler,R2,2024,3.11300000000
+5,2035,gasboiler,R2,2024,3.11300000000
+6,2024,heatpump,R1,2020,14.04000000000
+6,2025,heatpump,R1,2020,14.04000000000
+6,2026,heatpump,R1,2020,14.04000000000
+6,2030,heatpump,R1,2020,14.04000000000
+6,2031,heatpump,R1,2020,14.04000000000
+7,2024,heatpump,R1,2022,1.68480000000
+7,2025,heatpump,R1,2022,1.68480000000
+7,2026,heatpump,R1,2022,1.68480000000
+7,2030,heatpump,R1,2022,1.68480000000
+7,2031,heatpump,R1,2022,1.68480000000
+7,2032,heatpump,R1,2022,1.68480000000
+7,2033,heatpump,R1,2022,1.68480000000
+8,2026,heatpump,R1,2024,4.12700000000
+8,2030,heatpump,R1,2024,4.12700000000
+8,2031,heatpump,R1,2024,4.12700000000
+8,2032,heatpump,R1,2024,4.12700000000
+8,2033,heatpump,R1,2024,4.12700000000
+8,2034,heatpump,R1,2024,4.12700000000
+8,2035,heatpump,R1,2024,4.12700000000
+9,2024,heatpump,R2,2020,14.04000000000
+9,2025,heatpump,R2,2020,14.04000000000
+9,2026,heatpump,R2,2020,14.04000000000
+9,2030,heatpump,R2,2020,14.04000000000
+9,2031,heatpump,R2,2020,14.04000000000
+10,2024,heatpump,R2,2022,1.68480000000
+10,2025,heatpump,R2,2022,1.68480000000
+10,2026,heatpump,R2,2022,1.68480000000
+10,2030,heatpump,R2,2022,1.68480000000
+10,2031,heatpump,R2,2022,1.68480000000
+10,2032,heatpump,R2,2022,1.68480000000
+10,2033,heatpump,R2,2022,1.68480000000
+11,2026,heatpump,R2,2024,4.12700000000
+11,2030,heatpump,R2,2024,4.12700000000
+11,2031,heatpump,R2,2024,4.12700000000
+11,2032,heatpump,R2,2024,4.12700000000
+11,2033,heatpump,R2,2024,4.12700000000
+11,2034,heatpump,R2,2024,4.12700000000
+11,2035,heatpump,R2,2024,4.12700000000
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 1a3e71b6..60aa1e7e 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
@@ -3,69 +3,81 @@ asset,year,region,installed,technology,capacity
 1,2028,R1,2020,heatpump,14.04000000000
 1,2030,R1,2020,heatpump,14.04000000000
 1,2031,R1,2020,heatpump,14.04000000000
-2,2026,R1,2022,heatpump,2.24000000000
-2,2028,R1,2022,heatpump,2.24000000000
-2,2030,R1,2022,heatpump,2.24000000000
-2,2031,R1,2022,heatpump,2.24000000000
-2,2032,R1,2022,heatpump,2.24000000000
-2,2033,R1,2022,heatpump,2.24000000000
-3,2026,R1,2024,gasboiler,2.39520000000
-3,2028,R1,2024,gasboiler,2.39520000000
-3,2030,R1,2024,gasboiler,2.39520000000
-3,2031,R1,2024,gasboiler,2.39520000000
-3,2032,R1,2024,gasboiler,2.39520000000
-3,2033,R1,2024,gasboiler,2.39520000000
-3,2034,R1,2024,gasboiler,2.39520000000
-3,2035,R1,2024,gasboiler,2.39520000000
-4,2026,R1,2024,heatpump,4.84480000000
-4,2028,R1,2024,heatpump,4.84480000000
-4,2030,R1,2024,heatpump,4.84480000000
-4,2031,R1,2024,heatpump,4.84480000000
-4,2032,R1,2024,heatpump,4.84480000000
-4,2033,R1,2024,heatpump,4.84480000000
-4,2034,R1,2024,heatpump,4.84480000000
-4,2035,R1,2024,heatpump,4.84480000000
-5,2028,R1,2026,heatpump,2.24000000000
-5,2030,R1,2026,heatpump,2.24000000000
-5,2031,R1,2026,heatpump,2.24000000000
-5,2032,R1,2026,heatpump,2.24000000000
-5,2033,R1,2026,heatpump,2.24000000000
-5,2034,R1,2026,heatpump,2.24000000000
-5,2035,R1,2026,heatpump,2.24000000000
-5,2036,R1,2026,heatpump,2.24000000000
-5,2037,R1,2026,heatpump,2.24000000000
-7,2026,R2,2020,heatpump,14.04000000000
-7,2028,R2,2020,heatpump,14.04000000000
-7,2030,R2,2020,heatpump,14.04000000000
-7,2031,R2,2020,heatpump,14.04000000000
-8,2026,R2,2022,heatpump,2.24000000000
-8,2028,R2,2022,heatpump,2.24000000000
-8,2030,R2,2022,heatpump,2.24000000000
-8,2031,R2,2022,heatpump,2.24000000000
-8,2032,R2,2022,heatpump,2.24000000000
-8,2033,R2,2022,heatpump,2.24000000000
-9,2026,R2,2024,gasboiler,2.39520000000
-9,2028,R2,2024,gasboiler,2.39520000000
-9,2030,R2,2024,gasboiler,2.39520000000
-9,2031,R2,2024,gasboiler,2.39520000000
-9,2032,R2,2024,gasboiler,2.39520000000
-9,2033,R2,2024,gasboiler,2.39520000000
-9,2034,R2,2024,gasboiler,2.39520000000
-9,2035,R2,2024,gasboiler,2.39520000000
-10,2026,R2,2024,heatpump,4.84480000000
-10,2028,R2,2024,heatpump,4.84480000000
-10,2030,R2,2024,heatpump,4.84480000000
-10,2031,R2,2024,heatpump,4.84480000000
-10,2032,R2,2024,heatpump,4.84480000000
-10,2033,R2,2024,heatpump,4.84480000000
-10,2034,R2,2024,heatpump,4.84480000000
-10,2035,R2,2024,heatpump,4.84480000000
-11,2028,R2,2026,heatpump,2.24000000000
-11,2030,R2,2026,heatpump,2.24000000000
-11,2031,R2,2026,heatpump,2.24000000000
-11,2032,R2,2026,heatpump,2.24000000000
-11,2033,R2,2026,heatpump,2.24000000000
-11,2034,R2,2026,heatpump,2.24000000000
-11,2035,R2,2026,heatpump,2.24000000000
-11,2036,R2,2026,heatpump,2.24000000000
-11,2037,R2,2026,heatpump,2.24000000000
+2,2026,R1,2022,gasboiler,0.55520000000
+2,2028,R1,2022,gasboiler,0.55520000000
+2,2030,R1,2022,gasboiler,0.55520000000
+2,2031,R1,2022,gasboiler,0.55520000000
+2,2032,R1,2022,gasboiler,0.55520000000
+2,2033,R1,2022,gasboiler,0.55520000000
+3,2026,R1,2022,heatpump,1.68480000000
+3,2028,R1,2022,heatpump,1.68480000000
+3,2030,R1,2022,heatpump,1.68480000000
+3,2031,R1,2022,heatpump,1.68480000000
+3,2032,R1,2022,heatpump,1.68480000000
+3,2033,R1,2022,heatpump,1.68480000000
+4,2026,R1,2024,gasboiler,3.11300000000
+4,2028,R1,2024,gasboiler,3.11300000000
+4,2030,R1,2024,gasboiler,3.11300000000
+4,2031,R1,2024,gasboiler,3.11300000000
+4,2032,R1,2024,gasboiler,3.11300000000
+4,2033,R1,2024,gasboiler,3.11300000000
+4,2034,R1,2024,gasboiler,3.11300000000
+4,2035,R1,2024,gasboiler,3.11300000000
+5,2026,R1,2024,heatpump,4.12700000000
+5,2028,R1,2024,heatpump,4.12700000000
+5,2030,R1,2024,heatpump,4.12700000000
+5,2031,R1,2024,heatpump,4.12700000000
+5,2032,R1,2024,heatpump,4.12700000000
+5,2033,R1,2024,heatpump,4.12700000000
+5,2034,R1,2024,heatpump,4.12700000000
+5,2035,R1,2024,heatpump,4.12700000000
+6,2028,R1,2026,heatpump,2.24000000000
+6,2030,R1,2026,heatpump,2.24000000000
+6,2031,R1,2026,heatpump,2.24000000000
+6,2032,R1,2026,heatpump,2.24000000000
+6,2033,R1,2026,heatpump,2.24000000000
+6,2034,R1,2026,heatpump,2.24000000000
+6,2035,R1,2026,heatpump,2.24000000000
+6,2036,R1,2026,heatpump,2.24000000000
+6,2037,R1,2026,heatpump,2.24000000000
+8,2026,R2,2020,heatpump,14.04000000000
+8,2028,R2,2020,heatpump,14.04000000000
+8,2030,R2,2020,heatpump,14.04000000000
+8,2031,R2,2020,heatpump,14.04000000000
+9,2026,R2,2022,gasboiler,0.55520000000
+9,2028,R2,2022,gasboiler,0.55520000000
+9,2030,R2,2022,gasboiler,0.55520000000
+9,2031,R2,2022,gasboiler,0.55520000000
+9,2032,R2,2022,gasboiler,0.55520000000
+9,2033,R2,2022,gasboiler,0.55520000000
+10,2026,R2,2022,heatpump,1.68480000000
+10,2028,R2,2022,heatpump,1.68480000000
+10,2030,R2,2022,heatpump,1.68480000000
+10,2031,R2,2022,heatpump,1.68480000000
+10,2032,R2,2022,heatpump,1.68480000000
+10,2033,R2,2022,heatpump,1.68480000000
+11,2026,R2,2024,gasboiler,3.11300000000
+11,2028,R2,2024,gasboiler,3.11300000000
+11,2030,R2,2024,gasboiler,3.11300000000
+11,2031,R2,2024,gasboiler,3.11300000000
+11,2032,R2,2024,gasboiler,3.11300000000
+11,2033,R2,2024,gasboiler,3.11300000000
+11,2034,R2,2024,gasboiler,3.11300000000
+11,2035,R2,2024,gasboiler,3.11300000000
+12,2026,R2,2024,heatpump,4.12700000000
+12,2028,R2,2024,heatpump,4.12700000000
+12,2030,R2,2024,heatpump,4.12700000000
+12,2031,R2,2024,heatpump,4.12700000000
+12,2032,R2,2024,heatpump,4.12700000000
+12,2033,R2,2024,heatpump,4.12700000000
+12,2034,R2,2024,heatpump,4.12700000000
+12,2035,R2,2024,heatpump,4.12700000000
+13,2028,R2,2026,heatpump,2.24000000000
+13,2030,R2,2026,heatpump,2.24000000000
+13,2031,R2,2026,heatpump,2.24000000000
+13,2032,R2,2026,heatpump,2.24000000000
+13,2033,R2,2026,heatpump,2.24000000000
+13,2034,R2,2026,heatpump,2.24000000000
+13,2035,R2,2026,heatpump,2.24000000000
+13,2036,R2,2026,heatpump,2.24000000000
+13,2037,R2,2026,heatpump,2.24000000000
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 a34d9c85..f172c235 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
@@ -2,82 +2,92 @@ asset,year,region,installed,technology,capacity
 1,2028,R1,2020,heatpump,14.04000000000
 1,2030,R1,2020,heatpump,14.04000000000
 1,2031,R1,2020,heatpump,14.04000000000
-2,2028,R1,2022,heatpump,2.24000000000
-2,2030,R1,2022,heatpump,2.24000000000
-2,2031,R1,2022,heatpump,2.24000000000
-2,2032,R1,2022,heatpump,2.24000000000
-2,2033,R1,2022,heatpump,2.24000000000
-3,2028,R1,2024,gasboiler,2.39520000000
-3,2030,R1,2024,gasboiler,2.39520000000
-3,2031,R1,2024,gasboiler,2.39520000000
-3,2032,R1,2024,gasboiler,2.39520000000
-3,2033,R1,2024,gasboiler,2.39520000000
-3,2034,R1,2024,gasboiler,2.39520000000
-3,2035,R1,2024,gasboiler,2.39520000000
-4,2028,R1,2024,heatpump,4.84480000000
-4,2030,R1,2024,heatpump,4.84480000000
-4,2031,R1,2024,heatpump,4.84480000000
-4,2032,R1,2024,heatpump,4.84480000000
-4,2033,R1,2024,heatpump,4.84480000000
-4,2034,R1,2024,heatpump,4.84480000000
-4,2035,R1,2024,heatpump,4.84480000000
-5,2028,R1,2026,heatpump,2.24000000000
-5,2030,R1,2026,heatpump,2.24000000000
-5,2031,R1,2026,heatpump,2.24000000000
-5,2032,R1,2026,heatpump,2.24000000000
-5,2033,R1,2026,heatpump,2.24000000000
-5,2034,R1,2026,heatpump,2.24000000000
-5,2035,R1,2026,heatpump,2.24000000000
-5,2036,R1,2026,heatpump,2.24000000000
-5,2037,R1,2026,heatpump,2.24000000000
-6,2030,R1,2028,heatpump,2.24000000000
-6,2031,R1,2028,heatpump,2.24000000000
-6,2032,R1,2028,heatpump,2.24000000000
-6,2033,R1,2028,heatpump,2.24000000000
-6,2034,R1,2028,heatpump,2.24000000000
-6,2035,R1,2028,heatpump,2.24000000000
-6,2036,R1,2028,heatpump,2.24000000000
-6,2037,R1,2028,heatpump,2.24000000000
-6,2038,R1,2028,heatpump,2.24000000000
-6,2039,R1,2028,heatpump,2.24000000000
-8,2028,R2,2020,heatpump,14.04000000000
-8,2030,R2,2020,heatpump,14.04000000000
-8,2031,R2,2020,heatpump,14.04000000000
-9,2028,R2,2022,heatpump,2.24000000000
-9,2030,R2,2022,heatpump,2.24000000000
-9,2031,R2,2022,heatpump,2.24000000000
-9,2032,R2,2022,heatpump,2.24000000000
-9,2033,R2,2022,heatpump,2.24000000000
-10,2028,R2,2024,gasboiler,2.39520000000
-10,2030,R2,2024,gasboiler,2.39520000000
-10,2031,R2,2024,gasboiler,2.39520000000
-10,2032,R2,2024,gasboiler,2.39520000000
-10,2033,R2,2024,gasboiler,2.39520000000
-10,2034,R2,2024,gasboiler,2.39520000000
-10,2035,R2,2024,gasboiler,2.39520000000
-11,2028,R2,2024,heatpump,4.84480000000
-11,2030,R2,2024,heatpump,4.84480000000
-11,2031,R2,2024,heatpump,4.84480000000
-11,2032,R2,2024,heatpump,4.84480000000
-11,2033,R2,2024,heatpump,4.84480000000
-11,2034,R2,2024,heatpump,4.84480000000
-11,2035,R2,2024,heatpump,4.84480000000
-12,2028,R2,2026,heatpump,2.24000000000
-12,2030,R2,2026,heatpump,2.24000000000
-12,2031,R2,2026,heatpump,2.24000000000
-12,2032,R2,2026,heatpump,2.24000000000
-12,2033,R2,2026,heatpump,2.24000000000
-12,2034,R2,2026,heatpump,2.24000000000
-12,2035,R2,2026,heatpump,2.24000000000
-12,2036,R2,2026,heatpump,2.24000000000
-12,2037,R2,2026,heatpump,2.24000000000
-13,2030,R2,2028,heatpump,2.24000000000
-13,2031,R2,2028,heatpump,2.24000000000
-13,2032,R2,2028,heatpump,2.24000000000
-13,2033,R2,2028,heatpump,2.24000000000
-13,2034,R2,2028,heatpump,2.24000000000
-13,2035,R2,2028,heatpump,2.24000000000
-13,2036,R2,2028,heatpump,2.24000000000
-13,2037,R2,2028,heatpump,2.24000000000
-13,2038,R2,2028,heatpump,2.24000000000
-13,2039,R2,2028,heatpump,2.24000000000
+2,2028,R1,2022,gasboiler,0.55520000000
+2,2030,R1,2022,gasboiler,0.55520000000
+2,2031,R1,2022,gasboiler,0.55520000000
+2,2032,R1,2022,gasboiler,0.55520000000
+2,2033,R1,2022,gasboiler,0.55520000000
+3,2028,R1,2022,heatpump,1.68480000000
+3,2030,R1,2022,heatpump,1.68480000000
+3,2031,R1,2022,heatpump,1.68480000000
+3,2032,R1,2022,heatpump,1.68480000000
+3,2033,R1,2022,heatpump,1.68480000000
+4,2028,R1,2024,gasboiler,3.11300000000
+4,2030,R1,2024,gasboiler,3.11300000000
+4,2031,R1,2024,gasboiler,3.11300000000
+4,2032,R1,2024,gasboiler,3.11300000000
+4,2033,R1,2024,gasboiler,3.11300000000
+4,2034,R1,2024,gasboiler,3.11300000000
+4,2035,R1,2024,gasboiler,3.11300000000
+5,2028,R1,2024,heatpump,4.12700000000
+5,2030,R1,2024,heatpump,4.12700000000
+5,2031,R1,2024,heatpump,4.12700000000
+5,2032,R1,2024,heatpump,4.12700000000
+5,2033,R1,2024,heatpump,4.12700000000
+5,2034,R1,2024,heatpump,4.12700000000
+5,2035,R1,2024,heatpump,4.12700000000
+6,2028,R1,2026,heatpump,2.24000000000
+6,2030,R1,2026,heatpump,2.24000000000
+6,2031,R1,2026,heatpump,2.24000000000
+6,2032,R1,2026,heatpump,2.24000000000
+6,2033,R1,2026,heatpump,2.24000000000
+6,2034,R1,2026,heatpump,2.24000000000
+6,2035,R1,2026,heatpump,2.24000000000
+6,2036,R1,2026,heatpump,2.24000000000
+6,2037,R1,2026,heatpump,2.24000000000
+7,2030,R1,2028,heatpump,2.24000000000
+7,2031,R1,2028,heatpump,2.24000000000
+7,2032,R1,2028,heatpump,2.24000000000
+7,2033,R1,2028,heatpump,2.24000000000
+7,2034,R1,2028,heatpump,2.24000000000
+7,2035,R1,2028,heatpump,2.24000000000
+7,2036,R1,2028,heatpump,2.24000000000
+7,2037,R1,2028,heatpump,2.24000000000
+7,2038,R1,2028,heatpump,2.24000000000
+7,2039,R1,2028,heatpump,2.24000000000
+9,2028,R2,2020,heatpump,14.04000000000
+9,2030,R2,2020,heatpump,14.04000000000
+9,2031,R2,2020,heatpump,14.04000000000
+10,2028,R2,2022,gasboiler,0.55520000000
+10,2030,R2,2022,gasboiler,0.55520000000
+10,2031,R2,2022,gasboiler,0.55520000000
+10,2032,R2,2022,gasboiler,0.55520000000
+10,2033,R2,2022,gasboiler,0.55520000000
+11,2028,R2,2022,heatpump,1.68480000000
+11,2030,R2,2022,heatpump,1.68480000000
+11,2031,R2,2022,heatpump,1.68480000000
+11,2032,R2,2022,heatpump,1.68480000000
+11,2033,R2,2022,heatpump,1.68480000000
+12,2028,R2,2024,gasboiler,3.11300000000
+12,2030,R2,2024,gasboiler,3.11300000000
+12,2031,R2,2024,gasboiler,3.11300000000
+12,2032,R2,2024,gasboiler,3.11300000000
+12,2033,R2,2024,gasboiler,3.11300000000
+12,2034,R2,2024,gasboiler,3.11300000000
+12,2035,R2,2024,gasboiler,3.11300000000
+13,2028,R2,2024,heatpump,4.12700000000
+13,2030,R2,2024,heatpump,4.12700000000
+13,2031,R2,2024,heatpump,4.12700000000
+13,2032,R2,2024,heatpump,4.12700000000
+13,2033,R2,2024,heatpump,4.12700000000
+13,2034,R2,2024,heatpump,4.12700000000
+13,2035,R2,2024,heatpump,4.12700000000
+14,2028,R2,2026,heatpump,2.24000000000
+14,2030,R2,2026,heatpump,2.24000000000
+14,2031,R2,2026,heatpump,2.24000000000
+14,2032,R2,2026,heatpump,2.24000000000
+14,2033,R2,2026,heatpump,2.24000000000
+14,2034,R2,2026,heatpump,2.24000000000
+14,2035,R2,2026,heatpump,2.24000000000
+14,2036,R2,2026,heatpump,2.24000000000
+14,2037,R2,2026,heatpump,2.24000000000
+15,2030,R2,2028,heatpump,2.24000000000
+15,2031,R2,2028,heatpump,2.24000000000
+15,2032,R2,2028,heatpump,2.24000000000
+15,2033,R2,2028,heatpump,2.24000000000
+15,2034,R2,2028,heatpump,2.24000000000
+15,2035,R2,2028,heatpump,2.24000000000
+15,2036,R2,2028,heatpump,2.24000000000
+15,2037,R2,2028,heatpump,2.24000000000
+15,2038,R2,2028,heatpump,2.24000000000
+15,2039,R2,2028,heatpump,2.24000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
index c4489f71..f015a71b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
@@ -1,93 +1,101 @@
 asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2024,2.39520000000
-0,2031,gasboiler,R1,2024,2.39520000000
-0,2032,gasboiler,R1,2024,2.39520000000
-0,2033,gasboiler,R1,2024,2.39520000000
-0,2034,gasboiler,R1,2024,2.39520000000
-0,2035,gasboiler,R1,2024,2.39520000000
-1,2030,gasboiler,R2,2024,2.39520000000
-1,2031,gasboiler,R2,2024,2.39520000000
-1,2032,gasboiler,R2,2024,2.39520000000
-1,2033,gasboiler,R2,2024,2.39520000000
-1,2034,gasboiler,R2,2024,2.39520000000
-1,2035,gasboiler,R2,2024,2.39520000000
-2,2030,heatpump,R1,2020,14.04000000000
-2,2031,heatpump,R1,2020,14.04000000000
-3,2030,heatpump,R1,2022,2.24000000000
-3,2031,heatpump,R1,2022,2.24000000000
-3,2032,heatpump,R1,2022,2.24000000000
-3,2033,heatpump,R1,2022,2.24000000000
-4,2030,heatpump,R1,2024,4.84480000000
-4,2031,heatpump,R1,2024,4.84480000000
-4,2032,heatpump,R1,2024,4.84480000000
-4,2033,heatpump,R1,2024,4.84480000000
-4,2034,heatpump,R1,2024,4.84480000000
-4,2035,heatpump,R1,2024,4.84480000000
-5,2030,heatpump,R1,2026,2.24000000000
-5,2031,heatpump,R1,2026,2.24000000000
-5,2032,heatpump,R1,2026,2.24000000000
-5,2033,heatpump,R1,2026,2.24000000000
-5,2034,heatpump,R1,2026,2.24000000000
-5,2035,heatpump,R1,2026,2.24000000000
-5,2036,heatpump,R1,2026,2.24000000000
-5,2037,heatpump,R1,2026,2.24000000000
-6,2030,heatpump,R1,2028,2.24000000000
-6,2031,heatpump,R1,2028,2.24000000000
-6,2032,heatpump,R1,2028,2.24000000000
-6,2033,heatpump,R1,2028,2.24000000000
-6,2034,heatpump,R1,2028,2.24000000000
-6,2035,heatpump,R1,2028,2.24000000000
-6,2036,heatpump,R1,2028,2.24000000000
-6,2037,heatpump,R1,2028,2.24000000000
-6,2038,heatpump,R1,2028,2.24000000000
-6,2039,heatpump,R1,2028,2.24000000000
-7,2032,heatpump,R1,2030,16.28000000000
-7,2033,heatpump,R1,2030,16.28000000000
-7,2034,heatpump,R1,2030,16.28000000000
-7,2035,heatpump,R1,2030,16.28000000000
-7,2036,heatpump,R1,2030,16.28000000000
-7,2037,heatpump,R1,2030,16.28000000000
-7,2038,heatpump,R1,2030,16.28000000000
-7,2039,heatpump,R1,2030,16.28000000000
-7,2040,heatpump,R1,2030,16.28000000000
-7,2041,heatpump,R1,2030,16.28000000000
-8,2030,heatpump,R2,2020,14.04000000000
-8,2031,heatpump,R2,2020,14.04000000000
-9,2030,heatpump,R2,2022,2.24000000000
-9,2031,heatpump,R2,2022,2.24000000000
-9,2032,heatpump,R2,2022,2.24000000000
-9,2033,heatpump,R2,2022,2.24000000000
-10,2030,heatpump,R2,2024,4.84480000000
-10,2031,heatpump,R2,2024,4.84480000000
-10,2032,heatpump,R2,2024,4.84480000000
-10,2033,heatpump,R2,2024,4.84480000000
-10,2034,heatpump,R2,2024,4.84480000000
-10,2035,heatpump,R2,2024,4.84480000000
-11,2030,heatpump,R2,2026,2.24000000000
-11,2031,heatpump,R2,2026,2.24000000000
-11,2032,heatpump,R2,2026,2.24000000000
-11,2033,heatpump,R2,2026,2.24000000000
-11,2034,heatpump,R2,2026,2.24000000000
-11,2035,heatpump,R2,2026,2.24000000000
-11,2036,heatpump,R2,2026,2.24000000000
-11,2037,heatpump,R2,2026,2.24000000000
-12,2030,heatpump,R2,2028,2.24000000000
-12,2031,heatpump,R2,2028,2.24000000000
-12,2032,heatpump,R2,2028,2.24000000000
-12,2033,heatpump,R2,2028,2.24000000000
-12,2034,heatpump,R2,2028,2.24000000000
-12,2035,heatpump,R2,2028,2.24000000000
-12,2036,heatpump,R2,2028,2.24000000000
-12,2037,heatpump,R2,2028,2.24000000000
-12,2038,heatpump,R2,2028,2.24000000000
-12,2039,heatpump,R2,2028,2.24000000000
-13,2032,heatpump,R2,2030,16.28000000000
-13,2033,heatpump,R2,2030,16.28000000000
-13,2034,heatpump,R2,2030,16.28000000000
-13,2035,heatpump,R2,2030,16.28000000000
-13,2036,heatpump,R2,2030,16.28000000000
-13,2037,heatpump,R2,2030,16.28000000000
-13,2038,heatpump,R2,2030,16.28000000000
-13,2039,heatpump,R2,2030,16.28000000000
-13,2040,heatpump,R2,2030,16.28000000000
-13,2041,heatpump,R2,2030,16.28000000000
+0,2030,gasboiler,R1,2022,0.55520000000
+0,2031,gasboiler,R1,2022,0.55520000000
+0,2032,gasboiler,R1,2022,0.55520000000
+0,2033,gasboiler,R1,2022,0.55520000000
+1,2030,gasboiler,R1,2024,3.11300000000
+1,2031,gasboiler,R1,2024,3.11300000000
+1,2032,gasboiler,R1,2024,3.11300000000
+1,2033,gasboiler,R1,2024,3.11300000000
+1,2034,gasboiler,R1,2024,3.11300000000
+1,2035,gasboiler,R1,2024,3.11300000000
+2,2030,gasboiler,R2,2022,0.55520000000
+2,2031,gasboiler,R2,2022,0.55520000000
+2,2032,gasboiler,R2,2022,0.55520000000
+2,2033,gasboiler,R2,2022,0.55520000000
+3,2030,gasboiler,R2,2024,3.11300000000
+3,2031,gasboiler,R2,2024,3.11300000000
+3,2032,gasboiler,R2,2024,3.11300000000
+3,2033,gasboiler,R2,2024,3.11300000000
+3,2034,gasboiler,R2,2024,3.11300000000
+3,2035,gasboiler,R2,2024,3.11300000000
+4,2030,heatpump,R1,2020,14.04000000000
+4,2031,heatpump,R1,2020,14.04000000000
+5,2030,heatpump,R1,2022,1.68480000000
+5,2031,heatpump,R1,2022,1.68480000000
+5,2032,heatpump,R1,2022,1.68480000000
+5,2033,heatpump,R1,2022,1.68480000000
+6,2030,heatpump,R1,2024,4.12700000000
+6,2031,heatpump,R1,2024,4.12700000000
+6,2032,heatpump,R1,2024,4.12700000000
+6,2033,heatpump,R1,2024,4.12700000000
+6,2034,heatpump,R1,2024,4.12700000000
+6,2035,heatpump,R1,2024,4.12700000000
+7,2030,heatpump,R1,2026,2.24000000000
+7,2031,heatpump,R1,2026,2.24000000000
+7,2032,heatpump,R1,2026,2.24000000000
+7,2033,heatpump,R1,2026,2.24000000000
+7,2034,heatpump,R1,2026,2.24000000000
+7,2035,heatpump,R1,2026,2.24000000000
+7,2036,heatpump,R1,2026,2.24000000000
+7,2037,heatpump,R1,2026,2.24000000000
+8,2030,heatpump,R1,2028,2.24000000000
+8,2031,heatpump,R1,2028,2.24000000000
+8,2032,heatpump,R1,2028,2.24000000000
+8,2033,heatpump,R1,2028,2.24000000000
+8,2034,heatpump,R1,2028,2.24000000000
+8,2035,heatpump,R1,2028,2.24000000000
+8,2036,heatpump,R1,2028,2.24000000000
+8,2037,heatpump,R1,2028,2.24000000000
+8,2038,heatpump,R1,2028,2.24000000000
+8,2039,heatpump,R1,2028,2.24000000000
+9,2032,heatpump,R1,2030,16.28000000000
+9,2033,heatpump,R1,2030,16.28000000000
+9,2034,heatpump,R1,2030,16.28000000000
+9,2035,heatpump,R1,2030,16.28000000000
+9,2036,heatpump,R1,2030,16.28000000000
+9,2037,heatpump,R1,2030,16.28000000000
+9,2038,heatpump,R1,2030,16.28000000000
+9,2039,heatpump,R1,2030,16.28000000000
+9,2040,heatpump,R1,2030,16.28000000000
+9,2041,heatpump,R1,2030,16.28000000000
+10,2030,heatpump,R2,2020,14.04000000000
+10,2031,heatpump,R2,2020,14.04000000000
+11,2030,heatpump,R2,2022,1.68480000000
+11,2031,heatpump,R2,2022,1.68480000000
+11,2032,heatpump,R2,2022,1.68480000000
+11,2033,heatpump,R2,2022,1.68480000000
+12,2030,heatpump,R2,2024,4.12700000000
+12,2031,heatpump,R2,2024,4.12700000000
+12,2032,heatpump,R2,2024,4.12700000000
+12,2033,heatpump,R2,2024,4.12700000000
+12,2034,heatpump,R2,2024,4.12700000000
+12,2035,heatpump,R2,2024,4.12700000000
+13,2030,heatpump,R2,2026,2.24000000000
+13,2031,heatpump,R2,2026,2.24000000000
+13,2032,heatpump,R2,2026,2.24000000000
+13,2033,heatpump,R2,2026,2.24000000000
+13,2034,heatpump,R2,2026,2.24000000000
+13,2035,heatpump,R2,2026,2.24000000000
+13,2036,heatpump,R2,2026,2.24000000000
+13,2037,heatpump,R2,2026,2.24000000000
+14,2030,heatpump,R2,2028,2.24000000000
+14,2031,heatpump,R2,2028,2.24000000000
+14,2032,heatpump,R2,2028,2.24000000000
+14,2033,heatpump,R2,2028,2.24000000000
+14,2034,heatpump,R2,2028,2.24000000000
+14,2035,heatpump,R2,2028,2.24000000000
+14,2036,heatpump,R2,2028,2.24000000000
+14,2037,heatpump,R2,2028,2.24000000000
+14,2038,heatpump,R2,2028,2.24000000000
+14,2039,heatpump,R2,2028,2.24000000000
+15,2032,heatpump,R2,2030,16.28000000000
+15,2033,heatpump,R2,2030,16.28000000000
+15,2034,heatpump,R2,2030,16.28000000000
+15,2035,heatpump,R2,2030,16.28000000000
+15,2036,heatpump,R2,2030,16.28000000000
+15,2037,heatpump,R2,2030,16.28000000000
+15,2038,heatpump,R2,2030,16.28000000000
+15,2039,heatpump,R2,2030,16.28000000000
+15,2040,heatpump,R2,2030,16.28000000000
+15,2041,heatpump,R2,2030,16.28000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
index 8e89ac68..82582b38 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
@@ -1,89 +1,93 @@
 asset,year,technology,region,installed,capacity
-0,2032,gasboiler,R1,2024,2.39520000000
-0,2033,gasboiler,R1,2024,2.39520000000
-0,2034,gasboiler,R1,2024,2.39520000000
-0,2035,gasboiler,R1,2024,2.39520000000
-1,2032,gasboiler,R2,2024,2.39520000000
-1,2033,gasboiler,R2,2024,2.39520000000
-1,2034,gasboiler,R2,2024,2.39520000000
-1,2035,gasboiler,R2,2024,2.39520000000
-2,2032,heatpump,R1,2022,2.24000000000
-2,2033,heatpump,R1,2022,2.24000000000
-3,2032,heatpump,R1,2024,4.84480000000
-3,2033,heatpump,R1,2024,4.84480000000
-3,2034,heatpump,R1,2024,4.84480000000
-3,2035,heatpump,R1,2024,4.84480000000
-4,2032,heatpump,R1,2026,2.24000000000
-4,2033,heatpump,R1,2026,2.24000000000
-4,2034,heatpump,R1,2026,2.24000000000
-4,2035,heatpump,R1,2026,2.24000000000
-4,2036,heatpump,R1,2026,2.24000000000
-4,2037,heatpump,R1,2026,2.24000000000
-5,2032,heatpump,R1,2028,2.24000000000
-5,2033,heatpump,R1,2028,2.24000000000
-5,2034,heatpump,R1,2028,2.24000000000
-5,2035,heatpump,R1,2028,2.24000000000
-5,2036,heatpump,R1,2028,2.24000000000
-5,2037,heatpump,R1,2028,2.24000000000
-5,2038,heatpump,R1,2028,2.24000000000
-5,2039,heatpump,R1,2028,2.24000000000
-6,2032,heatpump,R1,2030,16.28000000000
-6,2033,heatpump,R1,2030,16.28000000000
-6,2034,heatpump,R1,2030,16.28000000000
-6,2035,heatpump,R1,2030,16.28000000000
-6,2036,heatpump,R1,2030,16.28000000000
-6,2037,heatpump,R1,2030,16.28000000000
-6,2038,heatpump,R1,2030,16.28000000000
-6,2039,heatpump,R1,2030,16.28000000000
-6,2040,heatpump,R1,2030,16.28000000000
-6,2041,heatpump,R1,2030,16.28000000000
-7,2034,heatpump,R1,2032,4.48000000000
-7,2035,heatpump,R1,2032,4.48000000000
-7,2036,heatpump,R1,2032,4.48000000000
-7,2037,heatpump,R1,2032,4.48000000000
-7,2038,heatpump,R1,2032,4.48000000000
-7,2039,heatpump,R1,2032,4.48000000000
-7,2040,heatpump,R1,2032,4.48000000000
-7,2041,heatpump,R1,2032,4.48000000000
-7,2042,heatpump,R1,2032,4.48000000000
-7,2043,heatpump,R1,2032,4.48000000000
-8,2032,heatpump,R2,2022,2.24000000000
-8,2033,heatpump,R2,2022,2.24000000000
-9,2032,heatpump,R2,2024,4.84480000000
-9,2033,heatpump,R2,2024,4.84480000000
-9,2034,heatpump,R2,2024,4.84480000000
-9,2035,heatpump,R2,2024,4.84480000000
-10,2032,heatpump,R2,2026,2.24000000000
-10,2033,heatpump,R2,2026,2.24000000000
-10,2034,heatpump,R2,2026,2.24000000000
-10,2035,heatpump,R2,2026,2.24000000000
-10,2036,heatpump,R2,2026,2.24000000000
-10,2037,heatpump,R2,2026,2.24000000000
-11,2032,heatpump,R2,2028,2.24000000000
-11,2033,heatpump,R2,2028,2.24000000000
-11,2034,heatpump,R2,2028,2.24000000000
-11,2035,heatpump,R2,2028,2.24000000000
-11,2036,heatpump,R2,2028,2.24000000000
-11,2037,heatpump,R2,2028,2.24000000000
-11,2038,heatpump,R2,2028,2.24000000000
-11,2039,heatpump,R2,2028,2.24000000000
-12,2032,heatpump,R2,2030,16.28000000000
-12,2033,heatpump,R2,2030,16.28000000000
-12,2034,heatpump,R2,2030,16.28000000000
-12,2035,heatpump,R2,2030,16.28000000000
-12,2036,heatpump,R2,2030,16.28000000000
-12,2037,heatpump,R2,2030,16.28000000000
-12,2038,heatpump,R2,2030,16.28000000000
-12,2039,heatpump,R2,2030,16.28000000000
-12,2040,heatpump,R2,2030,16.28000000000
-12,2041,heatpump,R2,2030,16.28000000000
-13,2034,heatpump,R2,2032,4.48000000000
-13,2035,heatpump,R2,2032,4.48000000000
-13,2036,heatpump,R2,2032,4.48000000000
-13,2037,heatpump,R2,2032,4.48000000000
-13,2038,heatpump,R2,2032,4.48000000000
-13,2039,heatpump,R2,2032,4.48000000000
-13,2040,heatpump,R2,2032,4.48000000000
-13,2041,heatpump,R2,2032,4.48000000000
-13,2042,heatpump,R2,2032,4.48000000000
-13,2043,heatpump,R2,2032,4.48000000000
+0,2032,gasboiler,R1,2022,0.55520000000
+0,2033,gasboiler,R1,2022,0.55520000000
+1,2032,gasboiler,R1,2024,3.11300000000
+1,2033,gasboiler,R1,2024,3.11300000000
+1,2034,gasboiler,R1,2024,3.11300000000
+1,2035,gasboiler,R1,2024,3.11300000000
+2,2032,gasboiler,R2,2022,0.55520000000
+2,2033,gasboiler,R2,2022,0.55520000000
+3,2032,gasboiler,R2,2024,3.11300000000
+3,2033,gasboiler,R2,2024,3.11300000000
+3,2034,gasboiler,R2,2024,3.11300000000
+3,2035,gasboiler,R2,2024,3.11300000000
+4,2032,heatpump,R1,2022,1.68480000000
+4,2033,heatpump,R1,2022,1.68480000000
+5,2032,heatpump,R1,2024,4.12700000000
+5,2033,heatpump,R1,2024,4.12700000000
+5,2034,heatpump,R1,2024,4.12700000000
+5,2035,heatpump,R1,2024,4.12700000000
+6,2032,heatpump,R1,2026,2.24000000000
+6,2033,heatpump,R1,2026,2.24000000000
+6,2034,heatpump,R1,2026,2.24000000000
+6,2035,heatpump,R1,2026,2.24000000000
+6,2036,heatpump,R1,2026,2.24000000000
+6,2037,heatpump,R1,2026,2.24000000000
+7,2032,heatpump,R1,2028,2.24000000000
+7,2033,heatpump,R1,2028,2.24000000000
+7,2034,heatpump,R1,2028,2.24000000000
+7,2035,heatpump,R1,2028,2.24000000000
+7,2036,heatpump,R1,2028,2.24000000000
+7,2037,heatpump,R1,2028,2.24000000000
+7,2038,heatpump,R1,2028,2.24000000000
+7,2039,heatpump,R1,2028,2.24000000000
+8,2032,heatpump,R1,2030,16.28000000000
+8,2033,heatpump,R1,2030,16.28000000000
+8,2034,heatpump,R1,2030,16.28000000000
+8,2035,heatpump,R1,2030,16.28000000000
+8,2036,heatpump,R1,2030,16.28000000000
+8,2037,heatpump,R1,2030,16.28000000000
+8,2038,heatpump,R1,2030,16.28000000000
+8,2039,heatpump,R1,2030,16.28000000000
+8,2040,heatpump,R1,2030,16.28000000000
+8,2041,heatpump,R1,2030,16.28000000000
+9,2034,heatpump,R1,2032,4.48000000000
+9,2035,heatpump,R1,2032,4.48000000000
+9,2036,heatpump,R1,2032,4.48000000000
+9,2037,heatpump,R1,2032,4.48000000000
+9,2038,heatpump,R1,2032,4.48000000000
+9,2039,heatpump,R1,2032,4.48000000000
+9,2040,heatpump,R1,2032,4.48000000000
+9,2041,heatpump,R1,2032,4.48000000000
+9,2042,heatpump,R1,2032,4.48000000000
+9,2043,heatpump,R1,2032,4.48000000000
+10,2032,heatpump,R2,2022,1.68480000000
+10,2033,heatpump,R2,2022,1.68480000000
+11,2032,heatpump,R2,2024,4.12700000000
+11,2033,heatpump,R2,2024,4.12700000000
+11,2034,heatpump,R2,2024,4.12700000000
+11,2035,heatpump,R2,2024,4.12700000000
+12,2032,heatpump,R2,2026,2.24000000000
+12,2033,heatpump,R2,2026,2.24000000000
+12,2034,heatpump,R2,2026,2.24000000000
+12,2035,heatpump,R2,2026,2.24000000000
+12,2036,heatpump,R2,2026,2.24000000000
+12,2037,heatpump,R2,2026,2.24000000000
+13,2032,heatpump,R2,2028,2.24000000000
+13,2033,heatpump,R2,2028,2.24000000000
+13,2034,heatpump,R2,2028,2.24000000000
+13,2035,heatpump,R2,2028,2.24000000000
+13,2036,heatpump,R2,2028,2.24000000000
+13,2037,heatpump,R2,2028,2.24000000000
+13,2038,heatpump,R2,2028,2.24000000000
+13,2039,heatpump,R2,2028,2.24000000000
+14,2032,heatpump,R2,2030,16.28000000000
+14,2033,heatpump,R2,2030,16.28000000000
+14,2034,heatpump,R2,2030,16.28000000000
+14,2035,heatpump,R2,2030,16.28000000000
+14,2036,heatpump,R2,2030,16.28000000000
+14,2037,heatpump,R2,2030,16.28000000000
+14,2038,heatpump,R2,2030,16.28000000000
+14,2039,heatpump,R2,2030,16.28000000000
+14,2040,heatpump,R2,2030,16.28000000000
+14,2041,heatpump,R2,2030,16.28000000000
+15,2034,heatpump,R2,2032,4.48000000000
+15,2035,heatpump,R2,2032,4.48000000000
+15,2036,heatpump,R2,2032,4.48000000000
+15,2037,heatpump,R2,2032,4.48000000000
+15,2038,heatpump,R2,2032,4.48000000000
+15,2039,heatpump,R2,2032,4.48000000000
+15,2040,heatpump,R2,2032,4.48000000000
+15,2041,heatpump,R2,2032,4.48000000000
+15,2042,heatpump,R2,2032,4.48000000000
+15,2043,heatpump,R2,2032,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
index 70192a70..d7027c5b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
@@ -1,10 +1,10 @@
 asset,year,technology,region,installed,capacity
-0,2034,gasboiler,R1,2024,2.39520000000
-0,2035,gasboiler,R1,2024,2.39520000000
-1,2034,gasboiler,R2,2024,2.39520000000
-1,2035,gasboiler,R2,2024,2.39520000000
-2,2034,heatpump,R1,2024,4.84480000000
-2,2035,heatpump,R1,2024,4.84480000000
+0,2034,gasboiler,R1,2024,3.11300000000
+0,2035,gasboiler,R1,2024,3.11300000000
+1,2034,gasboiler,R2,2024,3.11300000000
+1,2035,gasboiler,R2,2024,3.11300000000
+2,2034,heatpump,R1,2024,4.12700000000
+2,2035,heatpump,R1,2024,4.12700000000
 3,2034,heatpump,R1,2026,2.24000000000
 3,2035,heatpump,R1,2026,2.24000000000
 3,2036,heatpump,R1,2026,2.24000000000
@@ -43,8 +43,8 @@ asset,year,technology,region,installed,capacity
 7,2043,heatpump,R1,2034,9.48000000000
 7,2044,heatpump,R1,2034,9.48000000000
 7,2045,heatpump,R1,2034,9.48000000000
-8,2034,heatpump,R2,2024,4.84480000000
-8,2035,heatpump,R2,2024,4.84480000000
+8,2034,heatpump,R2,2024,4.12700000000
+8,2035,heatpump,R2,2024,4.12700000000
 9,2034,heatpump,R2,2026,2.24000000000
 9,2035,heatpump,R2,2026,2.24000000000
 9,2036,heatpump,R2,2026,2.24000000000
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 fa50a492..9a28605f 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,289 @@
 timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
 0,heat,R1,2022,0,2020,gasboiler,all-year,all-week,night,0.10420000000
 0,heat,R1,2022,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2022,3,2020,gasboiler,all-year,all-week,night,0.10420000000
-0,heat,R1,2022,4,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2022,4,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R1,2022,5,2020,heatpump,all-year,all-week,night,0.29250000000
 0,heat,R1,2024,0,2020,gasboiler,all-year,all-week,night,0.10420000000
 0,heat,R1,2024,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2024,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2024,3,2020,gasboiler,all-year,all-week,night,0.10420000000
-0,heat,R1,2024,4,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2024,5,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2024,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2024,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2024,4,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R1,2024,5,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,6,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2024,7,2022,heatpump,all-year,all-week,night,0.03510000000
 0,heat,R2,2022,0,2020,gasboiler,all-year,all-week,night,0.10420000000
 0,heat,R2,2022,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2022,3,2020,gasboiler,all-year,all-week,night,0.10420000000
-0,heat,R2,2022,4,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2022,4,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R2,2022,5,2020,heatpump,all-year,all-week,night,0.29250000000
 0,heat,R2,2024,0,2020,gasboiler,all-year,all-week,night,0.10420000000
 0,heat,R2,2024,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2024,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2024,3,2020,gasboiler,all-year,all-week,night,0.10420000000
-0,heat,R2,2024,4,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2024,5,2022,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2024,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2024,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2024,4,2020,gasboiler,all-year,all-week,night,0.10420000000
+0,heat,R2,2024,5,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,6,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2024,7,2022,heatpump,all-year,all-week,night,0.03510000000
 0,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,night,6.74060000000
-0,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,night,6.74060000000
 0,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,night,6.74060000000
-0,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,night,0.74850000000
 0,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,night,6.74060000000
-0,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,night,6.74060000000
 0,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,night,6.74060000000
-0,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,night,0.74850000000
 1,heat,R1,2022,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
 1,heat,R1,2022,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2022,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
-1,heat,R1,2022,4,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2022,4,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R1,2022,5,2020,heatpump,all-year,all-week,morning,0.41790000000
 1,heat,R1,2024,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
 1,heat,R1,2024,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2024,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2024,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
-1,heat,R1,2024,4,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2024,5,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2024,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2024,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2024,4,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R1,2024,5,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,6,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2024,7,2022,heatpump,all-year,all-week,morning,0.05010000000
 1,heat,R2,2022,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
 1,heat,R2,2022,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2022,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
-1,heat,R2,2022,4,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2022,4,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R2,2022,5,2020,heatpump,all-year,all-week,morning,0.41790000000
 1,heat,R2,2024,0,2020,gasboiler,all-year,all-week,morning,0.14880000000
 1,heat,R2,2024,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2024,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2024,3,2020,gasboiler,all-year,all-week,morning,0.14880000000
-1,heat,R2,2024,4,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2024,5,2022,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2024,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2024,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2024,4,2020,gasboiler,all-year,all-week,morning,0.14880000000
+1,heat,R2,2024,5,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,6,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2024,7,2022,heatpump,all-year,all-week,morning,0.05010000000
 1,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
-1,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,morning,9.62950000000
 1,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
-1,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,morning,1.06930000000
 1,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
-1,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,morning,9.62950000000
 1,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,morning,9.62950000000
-1,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,morning,1.06930000000
 2,heat,R1,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R1,2022,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R1,2022,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2022,4,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2022,5,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
 2,heat,R1,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R1,2024,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2024,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R1,2024,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2024,5,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2024,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2024,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2024,4,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2024,5,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,6,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2024,7,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
 2,heat,R2,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R2,2022,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R2,2022,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2022,4,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2022,5,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
 2,heat,R2,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R2,2024,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2024,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R2,2024,4,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2024,5,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2024,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2024,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2024,4,2020,gasboiler,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2024,5,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,6,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2024,7,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
 2,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
 2,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
 2,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
 2,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
 3,heat,R1,2022,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
 3,heat,R1,2022,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2022,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
-3,heat,R1,2022,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2022,4,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2022,5,2020,heatpump,all-year,all-week,early-peak,0.41790000000
 3,heat,R1,2024,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
 3,heat,R1,2024,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2024,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2024,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
-3,heat,R1,2024,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2024,5,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2024,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2024,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2024,4,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2024,5,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,6,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2024,7,2022,heatpump,all-year,all-week,early-peak,0.05010000000
 3,heat,R2,2022,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
 3,heat,R2,2022,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2022,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
-3,heat,R2,2022,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2022,4,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2022,5,2020,heatpump,all-year,all-week,early-peak,0.41790000000
 3,heat,R2,2024,0,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
 3,heat,R2,2024,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2024,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2024,3,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
-3,heat,R2,2024,4,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2024,5,2022,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2024,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2024,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2024,4,2020,gasboiler,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2024,5,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,6,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2024,7,2022,heatpump,all-year,all-week,early-peak,0.05010000000
 3,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
 3,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
 3,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
 3,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
 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.87750000000
-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.87750000000
+4,heat,R1,2022,4,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
+4,heat,R1,2022,5,2020,heatpump,all-year,all-week,late-peak,0.87750000000
 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.87750000000
-4,heat,R1,2024,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-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.87750000000
-4,heat,R1,2024,5,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2024,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2024,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2024,4,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
+4,heat,R1,2024,5,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,6,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2024,7,2022,heatpump,all-year,all-week,late-peak,0.10530000000
 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.87750000000
-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.87750000000
+4,heat,R2,2022,4,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
+4,heat,R2,2022,5,2020,heatpump,all-year,all-week,late-peak,0.87750000000
 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.87750000000
-4,heat,R2,2024,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-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.87750000000
-4,heat,R2,2024,5,2022,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2024,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2024,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2024,4,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
+4,heat,R2,2024,5,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,6,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2024,7,2022,heatpump,all-year,all-week,late-peak,0.10530000000
 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,2022,4,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,R1,2024,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
+4,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
 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,2022,4,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
+4,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
+4,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
 5,heat,R1,2022,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
 5,heat,R1,2022,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2022,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
-5,heat,R1,2022,4,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2022,4,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R1,2022,5,2020,heatpump,all-year,all-week,evening,0.58500000000
 5,heat,R1,2024,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
 5,heat,R1,2024,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2024,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2024,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
-5,heat,R1,2024,4,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2024,5,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2024,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2024,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2024,4,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R1,2024,5,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,6,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2024,7,2022,heatpump,all-year,all-week,evening,0.07020000000
 5,heat,R2,2022,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
 5,heat,R2,2022,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2022,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
-5,heat,R2,2022,4,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2022,4,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R2,2022,5,2020,heatpump,all-year,all-week,evening,0.58500000000
 5,heat,R2,2024,0,2020,gasboiler,all-year,all-week,evening,0.20830000000
 5,heat,R2,2024,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2024,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2024,3,2020,gasboiler,all-year,all-week,evening,0.20830000000
-5,heat,R2,2024,4,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2024,5,2022,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2024,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2024,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2024,4,2020,gasboiler,all-year,all-week,evening,0.20830000000
+5,heat,R2,2024,5,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,6,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2024,7,2022,heatpump,all-year,all-week,evening,0.07020000000
 5,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
-5,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,evening,13.48120000000
 5,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
-5,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,evening,1.49700000000
 5,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
-5,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,evening,13.48120000000
 5,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,evening,13.48120000000
-5,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,evening,1.49700000000
 6,heat,R1,2022,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
 6,heat,R1,2022,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2022,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
-6,heat,R1,2022,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2022,4,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2022,5,2020,heatpump,all-year,all-week,early-morning,0.58500000000
 6,heat,R1,2024,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
 6,heat,R1,2024,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2024,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2024,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
-6,heat,R1,2024,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2024,5,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2024,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2024,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2024,4,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2024,5,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,6,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2024,7,2022,heatpump,all-year,all-week,early-morning,0.07020000000
 6,heat,R2,2022,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
 6,heat,R2,2022,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2022,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
-6,heat,R2,2022,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2022,4,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2022,5,2020,heatpump,all-year,all-week,early-morning,0.58500000000
 6,heat,R2,2024,0,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
 6,heat,R2,2024,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2024,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2024,3,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
-6,heat,R2,2024,4,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2024,5,2022,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2024,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2024,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2024,4,2020,gasboiler,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2024,5,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,6,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2024,7,2022,heatpump,all-year,all-week,early-morning,0.07020000000
 6,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
 6,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
 6,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
 6,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
 7,heat,R1,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R1,2022,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R1,2022,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2022,4,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2022,5,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
 7,heat,R1,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R1,2024,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2024,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R1,2024,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2024,5,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2024,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2024,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2024,4,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2024,5,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,6,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2024,7,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
 7,heat,R2,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R2,2022,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R2,2022,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2022,4,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2022,5,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
 7,heat,R2,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R2,2024,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2024,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R2,2024,4,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2024,5,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2024,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2024,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2024,4,2020,gasboiler,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2024,5,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,6,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2024,7,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
 7,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2022,4,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
 7,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2024,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2024,4,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2024,6,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
 7,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2022,4,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
 7,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2024,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2024,4,2020,gasboiler,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2024,6,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
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 fce4b977..ed1218de 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,417 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 0,heat,R1,2024,0,gasboiler,2020,all-year,all-week,night,0.10420000000
-0,heat,R1,2024,2,gasboiler,2020,all-year,all-week,night,0.10420000000
-0,heat,R1,2024,4,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R1,2024,5,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2024,7,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R1,2024,8,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2026,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2026,3,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2026,4,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R1,2026,5,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2026,6,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2026,7,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R1,2026,8,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2026,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2024,1,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2024,3,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R1,2024,4,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2024,6,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,7,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2024,9,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2024,10,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2026,1,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2026,2,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2026,4,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2026,5,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2026,6,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,7,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2026,8,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2026,9,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,10,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2026,11,heatpump,2024,all-year,all-week,night,0.08600000000
 0,heat,R2,2024,0,gasboiler,2020,all-year,all-week,night,0.10420000000
-0,heat,R2,2024,2,gasboiler,2020,all-year,all-week,night,0.10420000000
-0,heat,R2,2024,4,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R2,2024,5,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2024,7,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R2,2024,8,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2026,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2026,3,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2026,4,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R2,2026,5,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2026,6,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2026,7,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R2,2026,8,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2026,9,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2024,1,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2024,3,gasboiler,2020,all-year,all-week,night,0.10420000000
+0,heat,R2,2024,4,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2024,6,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,7,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2024,9,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2024,10,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2026,1,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2026,2,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2026,4,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2026,5,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2026,6,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,7,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2026,8,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2026,9,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,10,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2026,11,heatpump,2024,all-year,all-week,night,0.08600000000
 0,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,night,4.19670000000
 0,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,night,3.22900000000
+0,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,night,6.74060000000
+0,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,night,4.19670000000
 1,heat,R1,2024,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
-1,heat,R1,2024,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
-1,heat,R1,2024,4,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R1,2024,5,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2024,7,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R1,2024,8,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2026,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2026,3,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2026,4,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R1,2026,5,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2026,6,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2026,7,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R1,2026,8,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2026,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2024,1,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2024,3,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R1,2024,4,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2024,6,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,7,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2024,9,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2024,10,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2026,1,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2026,2,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2026,4,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2026,5,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2026,6,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,7,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2026,8,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2026,9,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,10,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2026,11,heatpump,2024,all-year,all-week,morning,0.12280000000
 1,heat,R2,2024,0,gasboiler,2020,all-year,all-week,morning,0.14880000000
-1,heat,R2,2024,2,gasboiler,2020,all-year,all-week,morning,0.14880000000
-1,heat,R2,2024,4,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R2,2024,5,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2024,7,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R2,2024,8,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2026,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2026,3,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2026,4,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R2,2026,5,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2026,6,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2026,7,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R2,2026,8,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2026,9,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2024,1,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2024,3,gasboiler,2020,all-year,all-week,morning,0.14880000000
+1,heat,R2,2024,4,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2024,6,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,7,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2024,9,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2024,10,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2026,1,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2026,2,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2026,4,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2026,5,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2026,6,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,7,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2026,8,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2026,9,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,10,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2026,11,heatpump,2024,all-year,all-week,morning,0.12280000000
 1,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,morning,5.99540000000
 1,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,morning,4.61290000000
+1,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,morning,9.62950000000
+1,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,morning,5.99540000000
 2,heat,R1,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R1,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R1,2024,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2024,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2024,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2024,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2026,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2026,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2026,6,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2026,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2026,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2026,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2024,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2024,3,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R1,2024,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2024,6,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,7,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2024,9,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2024,10,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2026,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2026,2,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2026,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2026,5,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2026,6,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,7,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2026,8,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2026,9,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,10,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2026,11,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R2,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R2,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
-2,heat,R2,2024,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2024,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2024,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2024,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2026,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2026,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2026,6,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2026,7,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2026,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2026,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2024,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2024,3,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
+2,heat,R2,2024,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2024,6,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,7,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2024,9,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2024,10,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2026,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2026,2,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2026,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2026,5,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2026,6,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,7,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2026,8,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2026,9,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,10,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2026,11,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
 2,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
 2,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
+2,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
+2,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
 3,heat,R1,2024,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
-3,heat,R1,2024,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
-3,heat,R1,2024,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2024,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2024,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2024,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2026,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2026,3,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2026,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2026,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2026,6,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2026,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2026,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2026,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2024,1,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2024,3,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R1,2024,4,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2024,6,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,7,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2024,9,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2024,10,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2026,1,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2026,2,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2026,4,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2026,5,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2026,6,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,7,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2026,8,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2026,9,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,10,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2026,11,heatpump,2024,all-year,all-week,early-peak,0.12280000000
 3,heat,R2,2024,0,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
-3,heat,R2,2024,2,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
-3,heat,R2,2024,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2024,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2024,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2024,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2026,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2026,3,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2026,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2026,5,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2026,6,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2026,7,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2026,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2026,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2024,1,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2024,3,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
+3,heat,R2,2024,4,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2024,6,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,7,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2024,9,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2024,10,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2026,1,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2026,2,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2026,4,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2026,5,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2026,6,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,7,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2026,8,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2026,9,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,10,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2026,11,heatpump,2024,all-year,all-week,early-peak,0.12280000000
 3,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
 3,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
+3,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
+3,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
 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.87750000000
-4,heat,R1,2024,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2024,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2024,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2026,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2026,3,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2026,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2026,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2026,6,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2026,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2026,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2026,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2024,1,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2024,3,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
+4,heat,R1,2024,4,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2024,6,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,7,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2024,9,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2024,10,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2026,1,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2026,2,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2026,4,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2026,5,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2026,6,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,7,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2026,8,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2026,9,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,10,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2026,11,heatpump,2024,all-year,all-week,late-peak,0.25790000000
 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.87750000000
-4,heat,R2,2024,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2024,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2024,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2026,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2026,3,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2026,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2026,5,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2026,6,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2026,7,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2026,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2026,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2024,1,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2024,3,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
+4,heat,R2,2024,4,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2024,6,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,7,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2024,9,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2024,10,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2026,1,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2026,2,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2026,4,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2026,5,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2026,6,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,7,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2026,8,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2026,9,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,10,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2026,11,heatpump,2024,all-year,all-week,late-peak,0.25790000000
 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.68710000000
-4,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
+4,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
 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.68710000000
-4,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
+4,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
+4,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
 5,heat,R1,2024,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
-5,heat,R1,2024,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
-5,heat,R1,2024,4,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R1,2024,5,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2024,7,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R1,2024,8,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2026,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2026,3,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2026,4,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R1,2026,5,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2026,6,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2026,7,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R1,2026,8,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2026,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2024,1,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2024,3,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R1,2024,4,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2024,6,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,7,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2024,9,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2024,10,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2026,1,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2026,2,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2026,4,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2026,5,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2026,6,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,7,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2026,8,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2026,9,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,10,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2026,11,heatpump,2024,all-year,all-week,evening,0.17200000000
 5,heat,R2,2024,0,gasboiler,2020,all-year,all-week,evening,0.20830000000
-5,heat,R2,2024,2,gasboiler,2020,all-year,all-week,evening,0.20830000000
-5,heat,R2,2024,4,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R2,2024,5,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2024,7,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R2,2024,8,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2026,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2026,3,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2026,4,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R2,2026,5,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2026,6,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2026,7,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R2,2026,8,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2026,9,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2024,1,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2024,3,gasboiler,2020,all-year,all-week,evening,0.20830000000
+5,heat,R2,2024,4,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2024,6,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,7,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2024,9,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2024,10,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2026,1,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2026,2,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2026,4,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2026,5,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2026,6,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,7,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2026,8,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2026,9,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,10,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2026,11,heatpump,2024,all-year,all-week,evening,0.17200000000
 5,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,evening,8.39350000000
 5,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,evening,6.45810000000
+5,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,evening,13.48120000000
+5,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,evening,8.39350000000
 6,heat,R1,2024,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
-6,heat,R1,2024,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
-6,heat,R1,2024,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2024,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2024,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2024,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2026,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2026,3,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2026,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2026,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2026,6,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2026,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2026,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2026,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2024,1,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2024,3,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R1,2024,4,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2024,6,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,7,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2024,9,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2024,10,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2026,1,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2026,2,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2026,4,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2026,5,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2026,6,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,7,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2026,8,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2026,9,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,10,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2026,11,heatpump,2024,all-year,all-week,early-morning,0.17200000000
 6,heat,R2,2024,0,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
-6,heat,R2,2024,2,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
-6,heat,R2,2024,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2024,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2024,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2024,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2026,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2026,3,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2026,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2026,5,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2026,6,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2026,7,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2026,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2026,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2024,1,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2024,3,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
+6,heat,R2,2024,4,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2024,6,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,7,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2024,9,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2024,10,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2026,1,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2026,2,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2026,4,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2026,5,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2026,6,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,7,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2026,8,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2026,9,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,10,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2026,11,heatpump,2024,all-year,all-week,early-morning,0.17200000000
 6,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
 6,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
+6,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
+6,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
 7,heat,R1,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R1,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R1,2024,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2024,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2024,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2024,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2026,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2026,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2026,6,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2026,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2026,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2026,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2024,1,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2024,3,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R1,2024,4,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2024,6,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,7,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2024,9,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2024,10,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2026,1,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2026,2,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2026,4,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2026,5,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2026,6,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,7,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2026,8,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2026,9,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,10,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2026,11,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R2,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R2,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
-7,heat,R2,2024,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2024,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2024,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2024,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2026,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2026,5,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2026,6,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2026,7,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2026,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2026,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2024,1,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2024,3,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
+7,heat,R2,2024,4,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2024,6,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,7,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2024,9,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2024,10,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2026,1,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2026,2,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2026,4,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2026,5,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2026,6,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,7,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2026,8,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2026,9,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,10,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2026,11,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
 7,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2024,1,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2024,3,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R1,2024,4,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2026,1,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2026,2,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2026,4,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2026,5,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
 7,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R2,2024,1,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2024,3,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
+7,CO2f,R2,2024,4,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2026,1,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2026,2,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2026,4,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2026,5,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
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 832a2f4f..de3b17b3 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,481 @@
 timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
 0,heat,R1,2026,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2026,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2026,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2026,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2026,7,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2026,8,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2026,9,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2026,10,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R1,2026,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2026,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2026,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2026,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2026,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2026,9,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2026,10,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2026,11,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2026,12,2024,heatpump,all-year,all-week,night,0.08600000000
 0,heat,R1,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2028,7,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2028,8,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2028,9,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2028,10,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2028,11,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2028,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2028,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2028,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2028,6,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2028,9,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2028,10,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2028,11,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2028,12,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2028,13,2026,heatpump,all-year,all-week,night,0.04670000000
 0,heat,R2,2026,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2026,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2026,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2026,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2026,7,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2026,8,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2026,9,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2026,10,2024,heatpump,all-year,all-week,night,0.10090000000
+0,heat,R2,2026,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2026,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2026,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2026,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2026,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2026,9,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2026,10,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2026,11,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2026,12,2024,heatpump,all-year,all-week,night,0.08600000000
 0,heat,R2,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2028,7,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2028,8,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2028,9,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2028,10,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2028,11,2026,heatpump,all-year,all-week,night,0.04670000000
-0,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,heat,R2,2028,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2028,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2028,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2028,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2028,6,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,8,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2028,9,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2028,10,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2028,11,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2028,12,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2028,13,2026,heatpump,all-year,all-week,night,0.04670000000
+0,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,night,4.19670000000
 1,heat,R1,2026,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2026,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2026,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2026,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2026,7,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2026,8,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2026,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2026,10,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R1,2026,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2026,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2026,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2026,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2026,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2026,9,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2026,10,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2026,11,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2026,12,2024,heatpump,all-year,all-week,morning,0.12280000000
 1,heat,R1,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2028,7,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2028,8,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2028,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2028,10,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2028,11,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2028,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2028,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2028,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2028,6,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2028,9,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2028,10,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2028,11,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2028,12,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2028,13,2026,heatpump,all-year,all-week,morning,0.06670000000
 1,heat,R2,2026,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2026,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2026,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2026,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2026,7,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2026,8,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2026,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2026,10,2024,heatpump,all-year,all-week,morning,0.14420000000
+1,heat,R2,2026,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2026,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2026,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2026,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2026,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2026,9,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2026,10,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2026,11,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2026,12,2024,heatpump,all-year,all-week,morning,0.12280000000
 1,heat,R2,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2028,7,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2028,8,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2028,9,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2028,10,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2028,11,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,heat,R2,2028,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2028,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2028,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2028,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2028,6,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,8,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2028,9,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2028,10,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2028,11,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2028,12,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2028,13,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,morning,5.99540000000
 2,heat,R1,2026,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2026,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2026,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2026,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2026,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2026,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2026,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2026,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2026,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2026,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2026,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2026,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2026,10,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2026,11,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2026,12,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R1,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2028,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2028,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2028,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2028,11,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2028,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2028,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2028,6,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2028,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2028,10,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2028,11,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2028,12,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2028,13,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2026,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2026,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2026,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2026,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2026,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2026,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2026,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2026,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2026,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2026,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2026,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2026,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2026,10,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2026,11,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2026,12,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R2,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2028,7,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2028,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2028,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2028,11,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,heat,R2,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2028,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2028,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2028,6,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2028,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2028,10,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2028,11,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2028,12,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2028,13,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
 3,heat,R1,2026,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2026,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2026,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2026,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2026,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2026,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2026,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2026,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2026,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2026,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2026,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2026,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2026,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2026,9,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2026,10,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2026,11,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2026,12,2024,heatpump,all-year,all-week,early-peak,0.12280000000
 3,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2028,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2028,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2028,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2028,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2028,11,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2028,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2028,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2028,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2028,6,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2028,9,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2028,10,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2028,11,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2028,12,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2028,13,2026,heatpump,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2026,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2026,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2026,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2026,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2026,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2026,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2026,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2026,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2026,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2026,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2026,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2026,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2026,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2026,9,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2026,10,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2026,11,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2026,12,2024,heatpump,all-year,all-week,early-peak,0.12280000000
 3,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2028,7,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2028,8,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2028,9,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2028,10,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2028,11,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,heat,R2,2028,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2028,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2028,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2028,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2028,6,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2028,9,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2028,10,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2028,11,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2028,12,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2028,13,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
 4,heat,R1,2026,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2026,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2026,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2026,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2026,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2026,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2026,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2026,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2026,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2026,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2026,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2026,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2026,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2026,9,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2026,10,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2026,11,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2026,12,2024,heatpump,all-year,all-week,late-peak,0.25790000000
 4,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2028,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2028,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2028,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2028,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2028,11,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2028,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2028,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2028,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2028,6,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2028,9,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2028,10,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2028,11,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2028,12,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2028,13,2026,heatpump,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2026,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2026,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2026,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2026,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2026,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2026,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2026,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2026,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2026,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2026,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2026,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2026,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2026,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2026,9,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2026,10,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2026,11,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2026,12,2024,heatpump,all-year,all-week,late-peak,0.25790000000
 4,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2028,7,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2028,8,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2028,9,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2028,10,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2028,11,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,heat,R2,2028,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2028,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2028,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2028,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2028,6,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2028,9,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2028,10,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2028,11,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2028,12,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2028,13,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
 5,heat,R1,2026,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2026,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2026,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2026,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2026,7,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2026,8,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2026,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2026,10,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R1,2026,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2026,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2026,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2026,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2026,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2026,9,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2026,10,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2026,11,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2026,12,2024,heatpump,all-year,all-week,evening,0.17200000000
 5,heat,R1,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2028,7,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2028,8,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2028,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2028,10,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2028,11,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2028,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2028,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2028,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2028,6,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2028,9,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2028,10,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2028,11,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2028,12,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2028,13,2026,heatpump,all-year,all-week,evening,0.09330000000
 5,heat,R2,2026,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2026,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2026,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2026,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2026,7,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2026,8,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2026,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2026,10,2024,heatpump,all-year,all-week,evening,0.20190000000
+5,heat,R2,2026,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2026,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2026,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2026,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2026,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2026,9,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2026,10,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2026,11,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2026,12,2024,heatpump,all-year,all-week,evening,0.17200000000
 5,heat,R2,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2028,7,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2028,8,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2028,9,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2028,10,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2028,11,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,heat,R2,2028,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2028,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2028,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2028,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2028,6,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,8,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2028,9,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2028,10,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2028,11,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2028,12,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2028,13,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,evening,8.39350000000
 6,heat,R1,2026,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2026,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2026,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2026,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2026,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2026,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2026,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2026,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2026,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2026,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2026,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2026,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2026,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2026,9,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2026,10,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2026,11,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2026,12,2024,heatpump,all-year,all-week,early-morning,0.17200000000
 6,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2028,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2028,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2028,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2028,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2028,11,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2028,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2028,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2028,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2028,6,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2028,9,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2028,10,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2028,11,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2028,12,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2028,13,2026,heatpump,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2026,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2026,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2026,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2026,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2026,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2026,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2026,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2026,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2026,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2026,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2026,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2026,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2026,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2026,9,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2026,10,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2026,11,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2026,12,2024,heatpump,all-year,all-week,early-morning,0.17200000000
 6,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2028,7,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2028,8,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2028,9,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2028,10,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2028,11,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,heat,R2,2028,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2028,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2028,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2028,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2028,6,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2028,9,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2028,10,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2028,11,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2028,12,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2028,13,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
 7,heat,R1,2026,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2026,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2026,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2026,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2026,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2026,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2026,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2026,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2026,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2026,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2026,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2026,9,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2026,10,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2026,11,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2026,12,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2028,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2028,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2028,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2028,11,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2028,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2028,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2028,6,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2028,9,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2028,10,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2028,11,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2028,12,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2028,13,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2026,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2026,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2026,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2026,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2026,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2026,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2026,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2026,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2026,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2026,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2026,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2026,9,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2026,10,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2026,11,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2026,12,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2028,7,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2028,8,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2028,10,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2028,11,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,heat,R2,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2028,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2028,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2028,6,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2028,9,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2028,10,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2028,11,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2028,12,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2028,13,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,CO2f,R1,2026,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2026,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2026,9,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2026,11,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2028,9,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2028,11,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2026,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2026,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2026,9,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2026,11,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2028,9,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2028,11,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
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 a20e7edb..92740114 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,545 @@
 timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
 0,heat,R1,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2028,8,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2028,9,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2028,10,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2028,11,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2028,12,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2028,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2028,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2028,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2028,6,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2028,9,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2028,10,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2028,11,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2028,12,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2028,13,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2028,14,2026,heatpump,all-year,all-week,night,0.04670000000
 0,heat,R1,2030,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2030,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2030,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2030,5,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,6,2028,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,8,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R1,2030,9,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,10,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R1,2030,11,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R1,2030,12,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,13,2028,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2030,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2030,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2030,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2030,6,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,7,2028,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,9,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,10,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R1,2030,11,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R1,2030,12,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R1,2030,13,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R1,2030,14,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,15,2028,heatpump,all-year,all-week,night,0.04670000000
 0,heat,R2,2028,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2028,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2028,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2028,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2028,5,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2028,8,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2028,9,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2028,10,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2028,11,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2028,12,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2028,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2028,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2028,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2028,6,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2028,9,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2028,10,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2028,11,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2028,12,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2028,13,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2028,14,2026,heatpump,all-year,all-week,night,0.04670000000
 0,heat,R2,2030,1,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2030,2,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,3,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2030,4,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2030,5,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,6,2028,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,8,2020,heatpump,all-year,all-week,night,0.29250000000
-0,heat,R2,2030,9,2022,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,10,2024,gasboiler,all-year,all-week,night,0.04990000000
-0,heat,R2,2030,11,2024,heatpump,all-year,all-week,night,0.10090000000
-0,heat,R2,2030,12,2026,heatpump,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,13,2028,heatpump,all-year,all-week,night,0.04670000000
-0,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,night,3.22900000000
+0,heat,R2,2030,2,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2030,3,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2030,4,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2030,5,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2030,6,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,7,2028,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,9,2020,heatpump,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,10,2022,gasboiler,all-year,all-week,night,0.01160000000
+0,heat,R2,2030,11,2022,heatpump,all-year,all-week,night,0.03510000000
+0,heat,R2,2030,12,2024,gasboiler,all-year,all-week,night,0.06490000000
+0,heat,R2,2030,13,2024,heatpump,all-year,all-week,night,0.08600000000
+0,heat,R2,2030,14,2026,heatpump,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,15,2028,heatpump,all-year,all-week,night,0.04670000000
+0,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,night,4.19670000000
 1,heat,R1,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2028,8,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2028,9,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2028,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2028,11,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2028,12,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2028,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2028,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2028,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2028,6,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2028,9,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2028,10,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2028,11,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2028,12,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2028,13,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2028,14,2026,heatpump,all-year,all-week,morning,0.06670000000
 1,heat,R1,2030,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2030,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2030,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2030,5,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,6,2028,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,8,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R1,2030,9,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R1,2030,11,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R1,2030,12,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,13,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2030,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2030,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2030,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2030,6,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,7,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,9,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,10,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R1,2030,11,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R1,2030,12,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R1,2030,13,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R1,2030,14,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,15,2028,heatpump,all-year,all-week,morning,0.06670000000
 1,heat,R2,2028,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2028,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2028,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2028,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2028,5,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2028,8,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2028,9,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2028,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2028,11,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2028,12,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2028,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2028,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2028,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2028,6,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2028,9,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2028,10,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2028,11,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2028,12,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2028,13,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2028,14,2026,heatpump,all-year,all-week,morning,0.06670000000
 1,heat,R2,2030,1,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2030,2,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,3,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2030,4,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2030,5,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,6,2028,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,8,2020,heatpump,all-year,all-week,morning,0.41790000000
-1,heat,R2,2030,9,2022,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,10,2024,gasboiler,all-year,all-week,morning,0.07130000000
-1,heat,R2,2030,11,2024,heatpump,all-year,all-week,morning,0.14420000000
-1,heat,R2,2030,12,2026,heatpump,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,13,2028,heatpump,all-year,all-week,morning,0.06670000000
-1,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,morning,4.61290000000
+1,heat,R2,2030,2,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2030,3,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2030,4,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2030,5,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2030,6,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,7,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,9,2020,heatpump,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,10,2022,gasboiler,all-year,all-week,morning,0.01650000000
+1,heat,R2,2030,11,2022,heatpump,all-year,all-week,morning,0.05010000000
+1,heat,R2,2030,12,2024,gasboiler,all-year,all-week,morning,0.09260000000
+1,heat,R2,2030,13,2024,heatpump,all-year,all-week,morning,0.12280000000
+1,heat,R2,2030,14,2026,heatpump,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,15,2028,heatpump,all-year,all-week,morning,0.06670000000
+1,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,morning,5.99540000000
 2,heat,R1,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2028,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2028,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2028,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2028,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2028,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2028,6,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2028,9,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2028,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2028,11,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2028,12,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2028,13,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2028,14,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R1,2030,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2030,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2030,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2030,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,6,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2030,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2030,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2030,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,13,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2030,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2030,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2030,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2030,6,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,7,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,9,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2030,11,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2030,12,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2030,13,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2030,14,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,15,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2028,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2028,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2028,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2028,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2028,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2028,6,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2028,9,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2028,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2028,11,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2028,12,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2028,13,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2028,14,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2030,1,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2030,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2030,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2030,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,6,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,8,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2030,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2030,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2030,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,13,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
-2,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.22900000000
+2,heat,R2,2030,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2030,3,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2030,4,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2030,5,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2030,6,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,7,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,9,2020,heatpump,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2030,11,2022,heatpump,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2030,12,2024,gasboiler,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2030,13,2024,heatpump,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2030,14,2026,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,15,2028,heatpump,all-year,all-week,mid-afternoon,0.04670000000
+2,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,mid-afternoon,4.19670000000
 3,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2028,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2028,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2028,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2028,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2028,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2028,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2028,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2028,6,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2028,9,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2028,10,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2028,11,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2028,12,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2028,13,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2028,14,2026,heatpump,all-year,all-week,early-peak,0.06670000000
 3,heat,R1,2030,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2030,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2030,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2030,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,6,2028,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2030,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2030,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2030,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,13,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2030,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2030,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2030,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2030,6,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,7,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,9,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,10,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2030,11,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2030,12,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2030,13,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2030,14,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,15,2028,heatpump,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2028,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2028,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2028,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2028,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2028,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2028,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2028,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2028,6,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2028,9,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2028,10,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2028,11,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2028,12,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2028,13,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2028,14,2026,heatpump,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2030,1,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2030,2,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,3,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2030,4,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2030,5,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,6,2028,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,8,2020,heatpump,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2030,9,2022,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,10,2024,gasboiler,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2030,11,2024,heatpump,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2030,12,2026,heatpump,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,13,2028,heatpump,all-year,all-week,early-peak,0.06670000000
-3,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,early-peak,4.61290000000
+3,heat,R2,2030,2,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2030,3,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2030,4,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2030,5,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2030,6,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,7,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,9,2020,heatpump,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,10,2022,gasboiler,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2030,11,2022,heatpump,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2030,12,2024,gasboiler,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2030,13,2024,heatpump,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2030,14,2026,heatpump,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,15,2028,heatpump,all-year,all-week,early-peak,0.06670000000
+3,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,early-peak,5.99540000000
 4,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2028,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2028,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2028,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2028,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2028,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2028,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2028,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2028,6,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2028,9,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2028,10,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2028,11,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2028,12,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2028,13,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2028,14,2026,heatpump,all-year,all-week,late-peak,0.14000000000
 4,heat,R1,2030,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2030,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2030,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2030,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,6,2028,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2030,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2030,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2030,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,13,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2030,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2030,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2030,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2030,6,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,7,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,9,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,10,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2030,11,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2030,12,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2030,13,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2030,14,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,15,2028,heatpump,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2028,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2028,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2028,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2028,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2028,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2028,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2028,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2028,6,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2028,9,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2028,10,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2028,11,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2028,12,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2028,13,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2028,14,2026,heatpump,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2030,1,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2030,2,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,3,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2030,4,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2030,5,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,6,2028,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,8,2020,heatpump,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2030,9,2022,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,10,2024,gasboiler,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2030,11,2024,heatpump,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2030,12,2026,heatpump,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,13,2028,heatpump,all-year,all-week,late-peak,0.14000000000
-4,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,late-peak,9.68710000000
+4,heat,R2,2030,2,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2030,3,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2030,4,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2030,5,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2030,6,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,7,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,9,2020,heatpump,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,10,2022,gasboiler,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2030,11,2022,heatpump,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2030,12,2024,gasboiler,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2030,13,2024,heatpump,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2030,14,2026,heatpump,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,15,2028,heatpump,all-year,all-week,late-peak,0.14000000000
+4,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,late-peak,12.59020000000
 5,heat,R1,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2028,8,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2028,9,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2028,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2028,11,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2028,12,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2028,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2028,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2028,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2028,6,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2028,9,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2028,10,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2028,11,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2028,12,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2028,13,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2028,14,2026,heatpump,all-year,all-week,evening,0.09330000000
 5,heat,R1,2030,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2030,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2030,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2030,5,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,6,2028,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,8,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R1,2030,9,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R1,2030,11,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R1,2030,12,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,13,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2030,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2030,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2030,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2030,6,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,7,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,9,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,10,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R1,2030,11,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R1,2030,12,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R1,2030,13,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R1,2030,14,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,15,2028,heatpump,all-year,all-week,evening,0.09330000000
 5,heat,R2,2028,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2028,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2028,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2028,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2028,5,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2028,8,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2028,9,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2028,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2028,11,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2028,12,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2028,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2028,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2028,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2028,6,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2028,9,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2028,10,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2028,11,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2028,12,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2028,13,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2028,14,2026,heatpump,all-year,all-week,evening,0.09330000000
 5,heat,R2,2030,1,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2030,2,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,3,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2030,4,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2030,5,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,6,2028,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,8,2020,heatpump,all-year,all-week,evening,0.58500000000
-5,heat,R2,2030,9,2022,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,10,2024,gasboiler,all-year,all-week,evening,0.09980000000
-5,heat,R2,2030,11,2024,heatpump,all-year,all-week,evening,0.20190000000
-5,heat,R2,2030,12,2026,heatpump,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,13,2028,heatpump,all-year,all-week,evening,0.09330000000
-5,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,evening,6.45810000000
+5,heat,R2,2030,2,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2030,3,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2030,4,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2030,5,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2030,6,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,7,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,9,2020,heatpump,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,10,2022,gasboiler,all-year,all-week,evening,0.02310000000
+5,heat,R2,2030,11,2022,heatpump,all-year,all-week,evening,0.07020000000
+5,heat,R2,2030,12,2024,gasboiler,all-year,all-week,evening,0.12970000000
+5,heat,R2,2030,13,2024,heatpump,all-year,all-week,evening,0.17200000000
+5,heat,R2,2030,14,2026,heatpump,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,15,2028,heatpump,all-year,all-week,evening,0.09330000000
+5,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,evening,8.39350000000
 6,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2028,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2028,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2028,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2028,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2028,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2028,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2028,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2028,6,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2028,9,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2028,10,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2028,11,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2028,12,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2028,13,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2028,14,2026,heatpump,all-year,all-week,early-morning,0.09330000000
 6,heat,R1,2030,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2030,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2030,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2030,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,6,2028,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2030,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2030,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2030,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,13,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2030,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2030,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2030,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2030,6,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,7,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,9,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,10,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2030,11,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2030,12,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2030,13,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2030,14,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,15,2028,heatpump,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2028,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2028,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2028,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2028,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2028,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2028,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2028,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2028,6,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2028,9,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2028,10,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2028,11,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2028,12,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2028,13,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2028,14,2026,heatpump,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2030,1,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2030,2,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,3,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2030,4,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2030,5,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,6,2028,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,8,2020,heatpump,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2030,9,2022,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,10,2024,gasboiler,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2030,11,2024,heatpump,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2030,12,2026,heatpump,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,13,2028,heatpump,all-year,all-week,early-morning,0.09330000000
-6,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,early-morning,6.45810000000
+6,heat,R2,2030,2,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2030,3,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2030,4,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2030,5,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2030,6,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,7,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,9,2020,heatpump,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,10,2022,gasboiler,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2030,11,2022,heatpump,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2030,12,2024,gasboiler,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2030,13,2024,heatpump,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2030,14,2026,heatpump,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,15,2028,heatpump,all-year,all-week,early-morning,0.09330000000
+6,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,early-morning,8.39350000000
 7,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2028,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2028,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2028,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2028,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2028,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2028,6,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2028,9,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2028,10,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2028,11,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2028,12,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2028,13,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2028,14,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R1,2030,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2030,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2030,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2030,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,6,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2030,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2030,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2030,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,13,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2030,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2030,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2030,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2030,6,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,7,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,9,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,10,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2030,11,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2030,12,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2030,13,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2030,14,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,15,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2028,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2028,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2028,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2028,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2028,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2028,6,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2028,9,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2028,10,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2028,11,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2028,12,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2028,13,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2028,14,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2030,1,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2030,2,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2030,4,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2030,5,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,6,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,8,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2030,9,2022,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2030,11,2024,heatpump,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2030,12,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,13,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
-7,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,6.45810000000
+7,heat,R2,2030,2,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2030,3,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2030,4,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2030,5,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2030,6,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,7,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,9,2020,heatpump,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,10,2022,gasboiler,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2030,11,2022,heatpump,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2030,12,2024,gasboiler,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2030,13,2024,heatpump,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2030,14,2026,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,15,2028,heatpump,all-year,all-week,late-afternoon,0.09330000000
+7,CO2f,R1,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2028,10,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2028,12,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2030,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2030,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2030,10,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2030,12,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2028,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2028,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2028,10,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2028,12,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2030,2,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2030,4,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2030,10,2022,gasboiler,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2030,12,2024,gasboiler,all-year,all-week,late-afternoon,8.39350000000
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 8e4ac9fd..e92bd9bd 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,577 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2030,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2030,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R1,2030,3,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,4,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2030,5,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,6,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,8,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R1,2030,9,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,10,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2030,11,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2030,12,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2032,3,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,4,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2032,5,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,6,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,7,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R1,2032,9,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,10,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2032,11,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,12,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,13,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R2,2030,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2030,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R2,2030,3,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,4,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2030,5,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,6,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,8,heatpump,2020,all-year,all-week,night,0.29250000000
-0,heat,R2,2030,9,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,10,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2030,11,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2030,12,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2032,3,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,4,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2032,5,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,6,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,7,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R2,2032,9,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,10,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2032,11,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,12,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,13,heatpump,2030,all-year,all-week,night,0.33920000000
-0,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-1,heat,R1,2030,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2030,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R1,2030,3,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,4,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2030,5,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,6,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,8,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R1,2030,9,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,10,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2030,11,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2030,12,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2032,3,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,4,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2032,5,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,6,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,7,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R1,2032,9,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,10,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2032,11,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,12,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,13,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R2,2030,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2030,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R2,2030,3,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,4,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2030,5,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,6,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,8,heatpump,2020,all-year,all-week,morning,0.41790000000
-1,heat,R2,2030,9,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,10,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2030,11,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2030,12,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2032,3,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,4,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2032,5,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,6,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,7,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R2,2032,9,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,10,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2032,11,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,12,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,13,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-2,heat,R1,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2030,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2030,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,8,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R1,2030,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2030,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2030,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2032,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2032,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R1,2032,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2032,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,13,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R2,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2030,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2030,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,8,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
-2,heat,R2,2030,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2030,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2030,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2032,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2032,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,7,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R2,2032,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2032,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,13,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-3,heat,R1,2030,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2030,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2030,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,8,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R1,2030,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2030,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2030,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2032,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2032,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R1,2032,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2032,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,13,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R2,2030,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2030,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2030,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,8,heatpump,2020,all-year,all-week,early-peak,0.41790000000
-3,heat,R2,2030,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2030,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2030,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2032,3,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,4,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2032,5,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,6,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,7,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R2,2032,9,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,10,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2032,11,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,12,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,13,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-4,heat,R1,2030,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2030,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2030,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,8,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R1,2030,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2030,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2030,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2032,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2032,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R1,2032,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2032,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,13,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R2,2030,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2030,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2030,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,8,heatpump,2020,all-year,all-week,late-peak,0.87750000000
-4,heat,R2,2030,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2030,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2030,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2032,3,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,4,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2032,5,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,6,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,7,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R2,2032,9,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,10,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2032,11,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,12,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,13,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-5,heat,R1,2030,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2030,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R1,2030,3,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,4,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2030,5,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,6,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,8,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R1,2030,9,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,10,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2030,11,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2030,12,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2032,3,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,4,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2032,5,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,6,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,7,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R1,2032,9,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,10,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2032,11,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,12,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,13,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R2,2030,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2030,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R2,2030,3,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,4,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2030,5,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,6,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,8,heatpump,2020,all-year,all-week,evening,0.58500000000
-5,heat,R2,2030,9,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,10,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2030,11,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2030,12,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2032,3,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,4,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2032,5,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,6,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,7,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R2,2032,9,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,10,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2032,11,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,12,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,13,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-6,heat,R1,2030,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2030,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2030,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,8,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R1,2030,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2030,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2030,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2032,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2032,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R1,2032,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2032,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,13,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R2,2030,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2030,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2030,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,8,heatpump,2020,all-year,all-week,early-morning,0.58500000000
-6,heat,R2,2030,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2030,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2030,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2032,3,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,4,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2032,5,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,6,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,7,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R2,2032,9,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,10,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2032,11,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,12,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,13,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-7,heat,R1,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2030,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2030,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,8,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R1,2030,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2030,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2030,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2032,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2032,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R1,2032,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2032,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,13,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R2,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2030,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2030,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,8,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
-7,heat,R2,2030,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2030,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2030,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2032,3,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,4,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2032,5,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,6,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,7,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R2,2032,9,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,10,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2032,11,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,12,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,13,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+0,heat,R1,2030,0,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2030,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2030,2,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2030,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2030,4,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,5,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2030,6,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2030,7,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,8,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,10,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R1,2030,11,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2030,12,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2030,13,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2030,14,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,0,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2032,2,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2032,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2032,5,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2032,6,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2032,7,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,8,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,9,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2032,11,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2032,12,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2032,13,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,14,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,15,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2030,0,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2030,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2030,2,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2030,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2030,4,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,5,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2030,6,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2030,7,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,8,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,10,heatpump,2020,all-year,all-week,night,0.29250000000
+0,heat,R2,2030,11,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2030,12,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2030,13,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2030,14,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,0,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2032,2,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2032,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2032,5,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2032,6,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2032,7,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,8,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,9,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2032,11,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2032,12,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2032,13,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,14,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,15,heatpump,2030,all-year,all-week,night,0.33920000000
+0,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+1,heat,R1,2030,0,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2030,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2030,2,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2030,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2030,4,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,5,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2030,6,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2030,7,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,8,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,10,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R1,2030,11,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2030,12,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2030,13,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2030,14,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,0,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2032,2,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2032,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2032,5,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2032,6,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2032,7,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,8,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,9,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2032,11,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2032,12,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2032,13,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,14,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,15,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2030,0,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2030,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2030,2,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2030,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2030,4,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,5,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2030,6,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2030,7,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,8,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,10,heatpump,2020,all-year,all-week,morning,0.41790000000
+1,heat,R2,2030,11,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2030,12,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2030,13,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2030,14,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,0,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2032,2,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2032,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2032,5,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2032,6,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2032,7,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,8,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,9,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2032,11,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2032,12,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2032,13,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,14,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,15,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+2,heat,R1,2030,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2030,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2030,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,5,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2030,6,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2030,7,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,8,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R1,2030,11,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2030,12,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2030,13,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2030,14,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2032,5,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2032,6,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2032,7,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,8,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,9,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2032,11,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2032,12,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2032,13,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,14,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,15,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2030,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2030,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2030,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,5,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2030,6,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2030,7,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,8,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.29250000000
+2,heat,R2,2030,11,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2030,12,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2030,13,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2030,14,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2032,5,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2032,6,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2032,7,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,8,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,9,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2032,11,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2032,12,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2032,13,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,14,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,15,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+3,heat,R1,2030,0,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2030,2,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2030,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,5,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2030,6,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2030,7,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,8,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R1,2030,11,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2030,12,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2030,13,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2030,14,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,0,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2032,2,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2032,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2032,5,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2032,6,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2032,7,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,8,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,9,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2032,11,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2032,12,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2032,13,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,14,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,15,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2030,0,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2030,2,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2030,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,5,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2030,6,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2030,7,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,8,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-peak,0.41790000000
+3,heat,R2,2030,11,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2030,12,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2030,13,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2030,14,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,0,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2032,2,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2032,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2032,5,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2032,6,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2032,7,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,8,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,9,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2032,11,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2032,12,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2032,13,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,14,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,15,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+4,heat,R1,2030,0,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2030,2,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2030,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,5,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2030,6,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2030,7,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,8,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R1,2030,11,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2030,12,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2030,13,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2030,14,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,0,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2032,2,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2032,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2032,5,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2032,6,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2032,7,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,8,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,9,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2032,11,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2032,12,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2032,13,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,14,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,15,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2030,0,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2030,2,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2030,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,5,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2030,6,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2030,7,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,8,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-peak,0.87750000000
+4,heat,R2,2030,11,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2030,12,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2030,13,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2030,14,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,0,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2032,2,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2032,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2032,5,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2032,6,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2032,7,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,8,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,9,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2032,11,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2032,12,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2032,13,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,14,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,15,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+5,heat,R1,2030,0,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2030,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2030,2,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2030,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2030,4,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,5,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2030,6,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2030,7,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,8,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,10,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R1,2030,11,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2030,12,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2030,13,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2030,14,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,0,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2032,2,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2032,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2032,5,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2032,6,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2032,7,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,8,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,9,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2032,11,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2032,12,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2032,13,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,14,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,15,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2030,0,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2030,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2030,2,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2030,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2030,4,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,5,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2030,6,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2030,7,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,8,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,10,heatpump,2020,all-year,all-week,evening,0.58500000000
+5,heat,R2,2030,11,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2030,12,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2030,13,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2030,14,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,0,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2032,2,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2032,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2032,5,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2032,6,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2032,7,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,8,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,9,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2032,11,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2032,12,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2032,13,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,14,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,15,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+6,heat,R1,2030,0,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2030,2,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2030,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,5,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2030,6,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2030,7,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,8,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R1,2030,11,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2030,12,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2030,13,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2030,14,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,0,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2032,2,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2032,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2032,5,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2032,6,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2032,7,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,8,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,9,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2032,11,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2032,12,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2032,13,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,14,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,15,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2030,0,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2030,2,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2030,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,5,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2030,6,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2030,7,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,8,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-morning,0.58500000000
+6,heat,R2,2030,11,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2030,12,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2030,13,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2030,14,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,0,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2032,2,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2032,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2032,5,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2032,6,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2032,7,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,8,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,9,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2032,11,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2032,12,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2032,13,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,14,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,15,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+7,heat,R1,2030,0,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2030,2,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2030,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,5,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2030,6,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2030,7,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,8,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R1,2030,11,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2030,12,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2030,13,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2030,14,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2032,5,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2032,6,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2032,7,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,8,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,9,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2032,11,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2032,12,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2032,13,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,14,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,15,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2030,0,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2030,2,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2030,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,5,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2030,6,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2030,7,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,8,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.58500000000
+7,heat,R2,2030,11,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2030,12,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2030,13,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2030,14,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2032,5,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2032,6,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2032,7,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,8,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,9,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2032,11,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2032,12,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2032,13,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,14,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,15,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,CO2f,R1,2030,0,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2030,2,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2030,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2030,0,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2030,2,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2030,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
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 511bbd8e..05293c2f 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,513 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2032,2,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,3,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2032,4,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,5,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,6,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R1,2032,8,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,9,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2032,10,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,11,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2032,12,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2034,3,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2034,4,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2034,5,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2034,6,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R1,2034,7,heatpump,2032,all-year,all-week,night,0.09330000000
-0,heat,R1,2034,9,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R1,2034,10,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R1,2034,11,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R1,2034,12,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R1,2034,13,heatpump,2032,all-year,all-week,night,0.09330000000
-0,heat,R2,2032,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2032,2,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,3,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2032,4,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,5,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,6,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R2,2032,8,heatpump,2022,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,9,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2032,10,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,11,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2032,12,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2034,3,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2034,4,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2034,5,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2034,6,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R2,2034,7,heatpump,2032,all-year,all-week,night,0.09330000000
-0,heat,R2,2034,9,heatpump,2024,all-year,all-week,night,0.10090000000
-0,heat,R2,2034,10,heatpump,2026,all-year,all-week,night,0.04670000000
-0,heat,R2,2034,11,heatpump,2028,all-year,all-week,night,0.04670000000
-0,heat,R2,2034,12,heatpump,2030,all-year,all-week,night,0.33920000000
-0,heat,R2,2034,13,heatpump,2032,all-year,all-week,night,0.09330000000
-0,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-1,heat,R1,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2032,2,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,3,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2032,4,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,5,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,6,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R1,2032,8,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,9,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2032,10,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,11,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2032,12,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2034,3,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2034,4,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2034,5,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2034,6,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R1,2034,7,heatpump,2032,all-year,all-week,morning,0.13330000000
-1,heat,R1,2034,9,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R1,2034,10,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R1,2034,11,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R1,2034,12,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R1,2034,13,heatpump,2032,all-year,all-week,morning,0.13330000000
-1,heat,R2,2032,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2032,2,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,3,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2032,4,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,5,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,6,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R2,2032,8,heatpump,2022,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,9,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2032,10,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,11,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2032,12,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2034,3,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2034,4,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2034,5,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2034,6,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R2,2034,7,heatpump,2032,all-year,all-week,morning,0.13330000000
-1,heat,R2,2034,9,heatpump,2024,all-year,all-week,morning,0.14420000000
-1,heat,R2,2034,10,heatpump,2026,all-year,all-week,morning,0.06670000000
-1,heat,R2,2034,11,heatpump,2028,all-year,all-week,morning,0.06670000000
-1,heat,R2,2034,12,heatpump,2030,all-year,all-week,morning,0.48450000000
-1,heat,R2,2034,13,heatpump,2032,all-year,all-week,morning,0.13330000000
-1,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-2,heat,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2032,2,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2032,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R1,2032,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2032,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2032,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2034,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2034,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2034,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2034,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R1,2034,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
-2,heat,R1,2034,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R1,2034,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2034,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R1,2034,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R1,2034,13,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
-2,heat,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2032,2,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2032,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R2,2032,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2032,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2032,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2034,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2034,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2034,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2034,6,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R2,2034,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
-2,heat,R2,2034,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
-2,heat,R2,2034,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2034,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
-2,heat,R2,2034,12,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
-2,heat,R2,2034,13,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
-2,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-3,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2032,2,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2032,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R1,2032,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2032,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2032,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2034,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2034,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2034,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2034,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R1,2034,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
-3,heat,R1,2034,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R1,2034,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2034,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R1,2034,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R1,2034,13,heatpump,2032,all-year,all-week,early-peak,0.13330000000
-3,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2032,2,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2032,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R2,2032,8,heatpump,2022,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2032,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2032,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2034,3,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2034,4,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2034,5,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2034,6,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R2,2034,7,heatpump,2032,all-year,all-week,early-peak,0.13330000000
-3,heat,R2,2034,9,heatpump,2024,all-year,all-week,early-peak,0.14420000000
-3,heat,R2,2034,10,heatpump,2026,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2034,11,heatpump,2028,all-year,all-week,early-peak,0.06670000000
-3,heat,R2,2034,12,heatpump,2030,all-year,all-week,early-peak,0.48450000000
-3,heat,R2,2034,13,heatpump,2032,all-year,all-week,early-peak,0.13330000000
-3,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-4,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2032,2,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2032,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R1,2032,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2032,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2032,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2034,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2034,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2034,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2034,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R1,2034,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
-4,heat,R1,2034,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R1,2034,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2034,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R1,2034,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R1,2034,13,heatpump,2032,all-year,all-week,late-peak,0.28000000000
-4,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2032,2,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2032,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R2,2032,8,heatpump,2022,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2032,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2032,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2034,3,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2034,4,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2034,5,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2034,6,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R2,2034,7,heatpump,2032,all-year,all-week,late-peak,0.28000000000
-4,heat,R2,2034,9,heatpump,2024,all-year,all-week,late-peak,0.30280000000
-4,heat,R2,2034,10,heatpump,2026,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2034,11,heatpump,2028,all-year,all-week,late-peak,0.14000000000
-4,heat,R2,2034,12,heatpump,2030,all-year,all-week,late-peak,1.01750000000
-4,heat,R2,2034,13,heatpump,2032,all-year,all-week,late-peak,0.28000000000
-4,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-5,heat,R1,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2032,2,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,3,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2032,4,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,5,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,6,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R1,2032,8,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,9,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2032,10,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,11,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2032,12,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2034,3,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2034,4,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2034,5,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2034,6,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R1,2034,7,heatpump,2032,all-year,all-week,evening,0.18670000000
-5,heat,R1,2034,9,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R1,2034,10,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R1,2034,11,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R1,2034,12,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R1,2034,13,heatpump,2032,all-year,all-week,evening,0.18670000000
-5,heat,R2,2032,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2032,2,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,3,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2032,4,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,5,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,6,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R2,2032,8,heatpump,2022,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,9,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2032,10,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,11,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2032,12,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2034,3,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2034,4,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2034,5,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2034,6,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R2,2034,7,heatpump,2032,all-year,all-week,evening,0.18670000000
-5,heat,R2,2034,9,heatpump,2024,all-year,all-week,evening,0.20190000000
-5,heat,R2,2034,10,heatpump,2026,all-year,all-week,evening,0.09330000000
-5,heat,R2,2034,11,heatpump,2028,all-year,all-week,evening,0.09330000000
-5,heat,R2,2034,12,heatpump,2030,all-year,all-week,evening,0.67830000000
-5,heat,R2,2034,13,heatpump,2032,all-year,all-week,evening,0.18670000000
-5,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-6,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2032,2,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2032,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R1,2032,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2032,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2032,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2034,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2034,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2034,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2034,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R1,2034,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
-6,heat,R1,2034,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R1,2034,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2034,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R1,2034,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R1,2034,13,heatpump,2032,all-year,all-week,early-morning,0.18670000000
-6,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2032,2,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2032,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R2,2032,8,heatpump,2022,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2032,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2032,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2034,3,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2034,4,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2034,5,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2034,6,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R2,2034,7,heatpump,2032,all-year,all-week,early-morning,0.18670000000
-6,heat,R2,2034,9,heatpump,2024,all-year,all-week,early-morning,0.20190000000
-6,heat,R2,2034,10,heatpump,2026,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2034,11,heatpump,2028,all-year,all-week,early-morning,0.09330000000
-6,heat,R2,2034,12,heatpump,2030,all-year,all-week,early-morning,0.67830000000
-6,heat,R2,2034,13,heatpump,2032,all-year,all-week,early-morning,0.18670000000
-6,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-7,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2032,2,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2032,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R1,2032,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2032,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2032,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2034,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2034,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2034,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2034,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R1,2034,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
-7,heat,R1,2034,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R1,2034,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2034,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R1,2034,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R1,2034,13,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
-7,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2032,2,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2032,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R2,2032,8,heatpump,2022,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2032,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2032,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2034,3,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2034,4,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2034,5,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2034,6,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R2,2034,7,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
-7,heat,R2,2034,9,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
-7,heat,R2,2034,10,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2034,11,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
-7,heat,R2,2034,12,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
-7,heat,R2,2034,13,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
-7,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+0,heat,R1,2032,0,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2032,2,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R1,2032,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2032,4,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2032,5,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2032,6,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2032,10,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R1,2032,11,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2032,12,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,13,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2032,14,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2034,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2034,5,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2034,6,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,9,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R1,2034,11,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R1,2034,12,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,13,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R1,2034,14,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R1,2034,15,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2032,0,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2032,2,gasboiler,2022,all-year,all-week,night,0.01160000000
+0,heat,R2,2032,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2032,4,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2032,5,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2032,6,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2032,10,heatpump,2022,all-year,all-week,night,0.03510000000
+0,heat,R2,2032,11,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2032,12,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,13,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2032,14,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2034,3,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2034,5,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2034,6,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,7,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,8,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,9,heatpump,2032,all-year,all-week,night,0.09330000000
+0,heat,R2,2034,11,heatpump,2024,all-year,all-week,night,0.08600000000
+0,heat,R2,2034,12,heatpump,2026,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,13,heatpump,2028,all-year,all-week,night,0.04670000000
+0,heat,R2,2034,14,heatpump,2030,all-year,all-week,night,0.33920000000
+0,heat,R2,2034,15,heatpump,2032,all-year,all-week,night,0.09330000000
+0,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,night,0.74850000000
+0,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,night,4.19670000000
+1,heat,R1,2032,0,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2032,2,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R1,2032,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2032,4,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2032,5,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2032,6,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2032,10,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R1,2032,11,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2032,12,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,13,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2032,14,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2034,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2034,5,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2034,6,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,9,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R1,2034,11,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R1,2034,12,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,13,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R1,2034,14,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R1,2034,15,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2032,0,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2032,2,gasboiler,2022,all-year,all-week,morning,0.01650000000
+1,heat,R2,2032,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2032,4,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2032,5,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2032,6,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2032,10,heatpump,2022,all-year,all-week,morning,0.05010000000
+1,heat,R2,2032,11,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2032,12,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,13,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2032,14,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2034,3,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2034,5,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2034,6,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,7,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,8,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,9,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,heat,R2,2034,11,heatpump,2024,all-year,all-week,morning,0.12280000000
+1,heat,R2,2034,12,heatpump,2026,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,13,heatpump,2028,all-year,all-week,morning,0.06670000000
+1,heat,R2,2034,14,heatpump,2030,all-year,all-week,morning,0.48450000000
+1,heat,R2,2034,15,heatpump,2032,all-year,all-week,morning,0.13330000000
+1,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,morning,1.06930000000
+1,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,morning,5.99540000000
+2,heat,R1,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R1,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2032,4,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2032,5,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2032,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2032,10,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R1,2032,11,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2032,12,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,13,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2032,14,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2034,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2034,5,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2034,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R1,2034,11,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R1,2034,12,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,13,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R1,2034,14,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R1,2034,15,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.01160000000
+2,heat,R2,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2032,4,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2032,5,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2032,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2032,10,heatpump,2022,all-year,all-week,mid-afternoon,0.03510000000
+2,heat,R2,2032,11,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2032,12,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,13,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2032,14,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2034,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2034,5,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2034,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,8,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,heat,R2,2034,11,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
+2,heat,R2,2034,12,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,13,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
+2,heat,R2,2034,14,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
+2,heat,R2,2034,15,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
+2,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,mid-afternoon,0.74850000000
+2,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+3,heat,R1,2032,0,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2032,2,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R1,2032,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2032,4,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2032,5,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2032,6,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2032,10,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R1,2032,11,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2032,12,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,13,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2032,14,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2034,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2034,5,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2034,6,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,9,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R1,2034,11,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R1,2034,12,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,13,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R1,2034,14,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R1,2034,15,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2032,0,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2032,2,gasboiler,2022,all-year,all-week,early-peak,0.01650000000
+3,heat,R2,2032,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2032,4,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2032,5,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2032,6,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2032,10,heatpump,2022,all-year,all-week,early-peak,0.05010000000
+3,heat,R2,2032,11,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2032,12,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,13,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2032,14,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2034,3,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2034,5,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2034,6,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,7,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,8,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,9,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,heat,R2,2034,11,heatpump,2024,all-year,all-week,early-peak,0.12280000000
+3,heat,R2,2034,12,heatpump,2026,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,13,heatpump,2028,all-year,all-week,early-peak,0.06670000000
+3,heat,R2,2034,14,heatpump,2030,all-year,all-week,early-peak,0.48450000000
+3,heat,R2,2034,15,heatpump,2032,all-year,all-week,early-peak,0.13330000000
+3,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,early-peak,1.06930000000
+3,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+4,heat,R1,2032,0,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2032,2,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R1,2032,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2032,4,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2032,5,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2032,6,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2032,10,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R1,2032,11,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2032,12,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,13,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2032,14,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2034,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2034,5,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2034,6,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,9,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R1,2034,11,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R1,2034,12,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,13,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R1,2034,14,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R1,2034,15,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2032,0,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2032,2,gasboiler,2022,all-year,all-week,late-peak,0.03470000000
+4,heat,R2,2032,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2032,4,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2032,5,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2032,6,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2032,10,heatpump,2022,all-year,all-week,late-peak,0.10530000000
+4,heat,R2,2032,11,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2032,12,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,13,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2032,14,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2034,3,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2034,5,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2034,6,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,7,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,8,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,9,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,heat,R2,2034,11,heatpump,2024,all-year,all-week,late-peak,0.25790000000
+4,heat,R2,2034,12,heatpump,2026,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,13,heatpump,2028,all-year,all-week,late-peak,0.14000000000
+4,heat,R2,2034,14,heatpump,2030,all-year,all-week,late-peak,1.01750000000
+4,heat,R2,2034,15,heatpump,2032,all-year,all-week,late-peak,0.28000000000
+4,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,late-peak,2.24540000000
+4,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+5,heat,R1,2032,0,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2032,2,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R1,2032,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2032,4,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2032,5,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2032,6,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2032,10,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R1,2032,11,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2032,12,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,13,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2032,14,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2034,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2034,5,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2034,6,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,9,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R1,2034,11,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R1,2034,12,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,13,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R1,2034,14,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R1,2034,15,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2032,0,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2032,2,gasboiler,2022,all-year,all-week,evening,0.02310000000
+5,heat,R2,2032,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2032,4,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2032,5,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2032,6,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2032,10,heatpump,2022,all-year,all-week,evening,0.07020000000
+5,heat,R2,2032,11,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2032,12,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,13,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2032,14,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2034,3,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2034,5,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2034,6,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,7,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,8,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,9,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,heat,R2,2034,11,heatpump,2024,all-year,all-week,evening,0.17200000000
+5,heat,R2,2034,12,heatpump,2026,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,13,heatpump,2028,all-year,all-week,evening,0.09330000000
+5,heat,R2,2034,14,heatpump,2030,all-year,all-week,evening,0.67830000000
+5,heat,R2,2034,15,heatpump,2032,all-year,all-week,evening,0.18670000000
+5,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,evening,1.49700000000
+5,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,evening,8.39350000000
+6,heat,R1,2032,0,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2032,2,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R1,2032,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2032,4,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2032,5,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2032,6,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2032,10,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R1,2032,11,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2032,12,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,13,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2032,14,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2034,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2034,5,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2034,6,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,9,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R1,2034,11,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R1,2034,12,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,13,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R1,2034,14,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R1,2034,15,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2032,0,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2032,2,gasboiler,2022,all-year,all-week,early-morning,0.02310000000
+6,heat,R2,2032,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2032,4,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2032,5,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2032,6,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2032,10,heatpump,2022,all-year,all-week,early-morning,0.07020000000
+6,heat,R2,2032,11,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2032,12,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,13,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2032,14,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2034,3,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2034,5,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2034,6,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,7,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,8,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,9,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,heat,R2,2034,11,heatpump,2024,all-year,all-week,early-morning,0.17200000000
+6,heat,R2,2034,12,heatpump,2026,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,13,heatpump,2028,all-year,all-week,early-morning,0.09330000000
+6,heat,R2,2034,14,heatpump,2030,all-year,all-week,early-morning,0.67830000000
+6,heat,R2,2034,15,heatpump,2032,all-year,all-week,early-morning,0.18670000000
+6,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,early-morning,1.49700000000
+6,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+7,heat,R1,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R1,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2032,4,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2032,5,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2032,6,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2032,10,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R1,2032,11,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2032,12,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,13,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2032,14,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2034,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2034,5,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2034,6,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,9,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R1,2034,11,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R1,2034,12,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,13,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R1,2034,14,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R1,2034,15,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,0.02310000000
+7,heat,R2,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2032,4,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2032,5,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2032,6,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2032,10,heatpump,2022,all-year,all-week,late-afternoon,0.07020000000
+7,heat,R2,2032,11,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2032,12,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,13,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2032,14,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2034,3,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2034,5,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2034,6,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,7,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,8,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,9,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,heat,R2,2034,11,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
+7,heat,R2,2034,12,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,13,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
+7,heat,R2,2034,14,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
+7,heat,R2,2034,15,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
+7,CO2f,R1,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R1,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2034,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2032,0,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2032,2,gasboiler,2022,all-year,all-week,late-afternoon,1.49700000000
+7,CO2f,R2,2032,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2034,3,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
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 78c19098..e5d31a48 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,12 +1,12 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R1,2034,2,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R1,2034,2,heatpump,2024,all-year,all-week,night,0.08600000000
 0,heat,R1,2034,3,heatpump,2026,all-year,all-week,night,0.04670000000
 0,heat,R1,2034,4,heatpump,2028,all-year,all-week,night,0.04670000000
 0,heat,R1,2034,5,heatpump,2030,all-year,all-week,night,0.33920000000
 0,heat,R1,2034,6,heatpump,2032,all-year,all-week,night,0.09330000000
-0,heat,R1,2034,8,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R1,2034,8,heatpump,2024,all-year,all-week,night,0.08600000000
 0,heat,R1,2034,9,heatpump,2026,all-year,all-week,night,0.04670000000
 0,heat,R1,2034,10,heatpump,2028,all-year,all-week,night,0.04670000000
 0,heat,R1,2034,11,heatpump,2030,all-year,all-week,night,0.33920000000
@@ -21,14 +21,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 0,heat,R1,2036,11,heatpump,2030,all-year,all-week,night,0.33920000000
 0,heat,R1,2036,12,heatpump,2032,all-year,all-week,night,0.09330000000
 0,heat,R1,2036,13,heatpump,2034,all-year,all-week,night,0.19750000000
-0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.04990000000
-0,heat,R2,2034,2,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.06490000000
+0,heat,R2,2034,2,heatpump,2024,all-year,all-week,night,0.08600000000
 0,heat,R2,2034,3,heatpump,2026,all-year,all-week,night,0.04670000000
 0,heat,R2,2034,4,heatpump,2028,all-year,all-week,night,0.04670000000
 0,heat,R2,2034,5,heatpump,2030,all-year,all-week,night,0.33920000000
 0,heat,R2,2034,6,heatpump,2032,all-year,all-week,night,0.09330000000
-0,heat,R2,2034,8,heatpump,2024,all-year,all-week,night,0.10090000000
+0,heat,R2,2034,8,heatpump,2024,all-year,all-week,night,0.08600000000
 0,heat,R2,2034,9,heatpump,2026,all-year,all-week,night,0.04670000000
 0,heat,R2,2034,10,heatpump,2028,all-year,all-week,night,0.04670000000
 0,heat,R2,2034,11,heatpump,2030,all-year,all-week,night,0.33920000000
@@ -43,18 +43,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 0,heat,R2,2036,11,heatpump,2030,all-year,all-week,night,0.33920000000
 0,heat,R2,2036,12,heatpump,2032,all-year,all-week,night,0.09330000000
 0,heat,R2,2036,13,heatpump,2034,all-year,all-week,night,0.19750000000
-0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,3.22900000000
-0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,3.22900000000
-1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R1,2034,2,heatpump,2024,all-year,all-week,morning,0.14420000000
+0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,4.19670000000
+0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,4.19670000000
+1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R1,2034,2,heatpump,2024,all-year,all-week,morning,0.12280000000
 1,heat,R1,2034,3,heatpump,2026,all-year,all-week,morning,0.06670000000
 1,heat,R1,2034,4,heatpump,2028,all-year,all-week,morning,0.06670000000
 1,heat,R1,2034,5,heatpump,2030,all-year,all-week,morning,0.48450000000
 1,heat,R1,2034,6,heatpump,2032,all-year,all-week,morning,0.13330000000
-1,heat,R1,2034,8,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R1,2034,8,heatpump,2024,all-year,all-week,morning,0.12280000000
 1,heat,R1,2034,9,heatpump,2026,all-year,all-week,morning,0.06670000000
 1,heat,R1,2034,10,heatpump,2028,all-year,all-week,morning,0.06670000000
 1,heat,R1,2034,11,heatpump,2030,all-year,all-week,morning,0.48450000000
@@ -69,14 +69,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 1,heat,R1,2036,11,heatpump,2030,all-year,all-week,morning,0.48450000000
 1,heat,R1,2036,12,heatpump,2032,all-year,all-week,morning,0.13330000000
 1,heat,R1,2036,13,heatpump,2034,all-year,all-week,morning,0.28210000000
-1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.07130000000
-1,heat,R2,2034,2,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.09260000000
+1,heat,R2,2034,2,heatpump,2024,all-year,all-week,morning,0.12280000000
 1,heat,R2,2034,3,heatpump,2026,all-year,all-week,morning,0.06670000000
 1,heat,R2,2034,4,heatpump,2028,all-year,all-week,morning,0.06670000000
 1,heat,R2,2034,5,heatpump,2030,all-year,all-week,morning,0.48450000000
 1,heat,R2,2034,6,heatpump,2032,all-year,all-week,morning,0.13330000000
-1,heat,R2,2034,8,heatpump,2024,all-year,all-week,morning,0.14420000000
+1,heat,R2,2034,8,heatpump,2024,all-year,all-week,morning,0.12280000000
 1,heat,R2,2034,9,heatpump,2026,all-year,all-week,morning,0.06670000000
 1,heat,R2,2034,10,heatpump,2028,all-year,all-week,morning,0.06670000000
 1,heat,R2,2034,11,heatpump,2030,all-year,all-week,morning,0.48450000000
@@ -91,18 +91,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 1,heat,R2,2036,11,heatpump,2030,all-year,all-week,morning,0.48450000000
 1,heat,R2,2036,12,heatpump,2032,all-year,all-week,morning,0.13330000000
 1,heat,R2,2036,13,heatpump,2034,all-year,all-week,morning,0.28210000000
-1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,4.61290000000
-1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,4.61290000000
-2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R1,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,5.99540000000
+1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,5.99540000000
+2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R1,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R1,2034,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R1,2034,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R1,2034,5,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
 2,heat,R1,2034,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
-2,heat,R1,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R1,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R1,2034,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R1,2034,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R1,2034,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
@@ -117,14 +117,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 2,heat,R1,2036,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
 2,heat,R1,2036,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
 2,heat,R1,2036,13,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
-2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04990000000
-2,heat,R2,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.06490000000
+2,heat,R2,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R2,2034,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2034,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2034,5,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
 2,heat,R2,2034,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
-2,heat,R2,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.10090000000
+2,heat,R2,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.08600000000
 2,heat,R2,2034,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2034,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04670000000
 2,heat,R2,2034,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
@@ -139,18 +139,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 2,heat,R2,2036,11,heatpump,2030,all-year,all-week,mid-afternoon,0.33920000000
 2,heat,R2,2036,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09330000000
 2,heat,R2,2036,13,heatpump,2034,all-year,all-week,mid-afternoon,0.19750000000
-2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.22900000000
-3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,4.19670000000
+3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-peak,0.12280000000
 3,heat,R1,2034,3,heatpump,2026,all-year,all-week,early-peak,0.06670000000
 3,heat,R1,2034,4,heatpump,2028,all-year,all-week,early-peak,0.06670000000
 3,heat,R1,2034,5,heatpump,2030,all-year,all-week,early-peak,0.48450000000
 3,heat,R1,2034,6,heatpump,2032,all-year,all-week,early-peak,0.13330000000
-3,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-peak,0.12280000000
 3,heat,R1,2034,9,heatpump,2026,all-year,all-week,early-peak,0.06670000000
 3,heat,R1,2034,10,heatpump,2028,all-year,all-week,early-peak,0.06670000000
 3,heat,R1,2034,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
@@ -165,14 +165,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 3,heat,R1,2036,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
 3,heat,R1,2036,12,heatpump,2032,all-year,all-week,early-peak,0.13330000000
 3,heat,R1,2036,13,heatpump,2034,all-year,all-week,early-peak,0.28210000000
-3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07130000000
-3,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.09260000000
+3,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-peak,0.12280000000
 3,heat,R2,2034,3,heatpump,2026,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2034,4,heatpump,2028,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2034,5,heatpump,2030,all-year,all-week,early-peak,0.48450000000
 3,heat,R2,2034,6,heatpump,2032,all-year,all-week,early-peak,0.13330000000
-3,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-peak,0.14420000000
+3,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-peak,0.12280000000
 3,heat,R2,2034,9,heatpump,2026,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2034,10,heatpump,2028,all-year,all-week,early-peak,0.06670000000
 3,heat,R2,2034,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
@@ -187,18 +187,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 3,heat,R2,2036,11,heatpump,2030,all-year,all-week,early-peak,0.48450000000
 3,heat,R2,2036,12,heatpump,2032,all-year,all-week,early-peak,0.13330000000
 3,heat,R2,2036,13,heatpump,2034,all-year,all-week,early-peak,0.28210000000
-3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.61290000000
-4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,5.99540000000
+4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-peak,0.25790000000
 4,heat,R1,2034,3,heatpump,2026,all-year,all-week,late-peak,0.14000000000
 4,heat,R1,2034,4,heatpump,2028,all-year,all-week,late-peak,0.14000000000
 4,heat,R1,2034,5,heatpump,2030,all-year,all-week,late-peak,1.01750000000
 4,heat,R1,2034,6,heatpump,2032,all-year,all-week,late-peak,0.28000000000
-4,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-peak,0.25790000000
 4,heat,R1,2034,9,heatpump,2026,all-year,all-week,late-peak,0.14000000000
 4,heat,R1,2034,10,heatpump,2028,all-year,all-week,late-peak,0.14000000000
 4,heat,R1,2034,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
@@ -213,14 +213,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 4,heat,R1,2036,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
 4,heat,R1,2036,12,heatpump,2032,all-year,all-week,late-peak,0.28000000000
 4,heat,R1,2036,13,heatpump,2034,all-year,all-week,late-peak,0.59250000000
-4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14970000000
-4,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.19460000000
+4,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-peak,0.25790000000
 4,heat,R2,2034,3,heatpump,2026,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2034,4,heatpump,2028,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2034,5,heatpump,2030,all-year,all-week,late-peak,1.01750000000
 4,heat,R2,2034,6,heatpump,2032,all-year,all-week,late-peak,0.28000000000
-4,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-peak,0.30280000000
+4,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-peak,0.25790000000
 4,heat,R2,2034,9,heatpump,2026,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2034,10,heatpump,2028,all-year,all-week,late-peak,0.14000000000
 4,heat,R2,2034,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
@@ -235,18 +235,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 4,heat,R2,2036,11,heatpump,2030,all-year,all-week,late-peak,1.01750000000
 4,heat,R2,2036,12,heatpump,2032,all-year,all-week,late-peak,0.28000000000
 4,heat,R2,2036,13,heatpump,2034,all-year,all-week,late-peak,0.59250000000
-4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.68710000000
-5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R1,2034,2,heatpump,2024,all-year,all-week,evening,0.20190000000
+4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,12.59020000000
+5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R1,2034,2,heatpump,2024,all-year,all-week,evening,0.17200000000
 5,heat,R1,2034,3,heatpump,2026,all-year,all-week,evening,0.09330000000
 5,heat,R1,2034,4,heatpump,2028,all-year,all-week,evening,0.09330000000
 5,heat,R1,2034,5,heatpump,2030,all-year,all-week,evening,0.67830000000
 5,heat,R1,2034,6,heatpump,2032,all-year,all-week,evening,0.18670000000
-5,heat,R1,2034,8,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R1,2034,8,heatpump,2024,all-year,all-week,evening,0.17200000000
 5,heat,R1,2034,9,heatpump,2026,all-year,all-week,evening,0.09330000000
 5,heat,R1,2034,10,heatpump,2028,all-year,all-week,evening,0.09330000000
 5,heat,R1,2034,11,heatpump,2030,all-year,all-week,evening,0.67830000000
@@ -261,14 +261,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 5,heat,R1,2036,11,heatpump,2030,all-year,all-week,evening,0.67830000000
 5,heat,R1,2036,12,heatpump,2032,all-year,all-week,evening,0.18670000000
 5,heat,R1,2036,13,heatpump,2034,all-year,all-week,evening,0.39500000000
-5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.09980000000
-5,heat,R2,2034,2,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.12970000000
+5,heat,R2,2034,2,heatpump,2024,all-year,all-week,evening,0.17200000000
 5,heat,R2,2034,3,heatpump,2026,all-year,all-week,evening,0.09330000000
 5,heat,R2,2034,4,heatpump,2028,all-year,all-week,evening,0.09330000000
 5,heat,R2,2034,5,heatpump,2030,all-year,all-week,evening,0.67830000000
 5,heat,R2,2034,6,heatpump,2032,all-year,all-week,evening,0.18670000000
-5,heat,R2,2034,8,heatpump,2024,all-year,all-week,evening,0.20190000000
+5,heat,R2,2034,8,heatpump,2024,all-year,all-week,evening,0.17200000000
 5,heat,R2,2034,9,heatpump,2026,all-year,all-week,evening,0.09330000000
 5,heat,R2,2034,10,heatpump,2028,all-year,all-week,evening,0.09330000000
 5,heat,R2,2034,11,heatpump,2030,all-year,all-week,evening,0.67830000000
@@ -283,18 +283,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 5,heat,R2,2036,11,heatpump,2030,all-year,all-week,evening,0.67830000000
 5,heat,R2,2036,12,heatpump,2032,all-year,all-week,evening,0.18670000000
 5,heat,R2,2036,13,heatpump,2034,all-year,all-week,evening,0.39500000000
-5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,6.45810000000
-5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,6.45810000000
-6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,8.39350000000
+5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,8.39350000000
+6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-morning,0.17200000000
 6,heat,R1,2034,3,heatpump,2026,all-year,all-week,early-morning,0.09330000000
 6,heat,R1,2034,4,heatpump,2028,all-year,all-week,early-morning,0.09330000000
 6,heat,R1,2034,5,heatpump,2030,all-year,all-week,early-morning,0.67830000000
 6,heat,R1,2034,6,heatpump,2032,all-year,all-week,early-morning,0.18670000000
-6,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-morning,0.17200000000
 6,heat,R1,2034,9,heatpump,2026,all-year,all-week,early-morning,0.09330000000
 6,heat,R1,2034,10,heatpump,2028,all-year,all-week,early-morning,0.09330000000
 6,heat,R1,2034,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
@@ -309,14 +309,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 6,heat,R1,2036,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
 6,heat,R1,2036,12,heatpump,2032,all-year,all-week,early-morning,0.18670000000
 6,heat,R1,2036,13,heatpump,2034,all-year,all-week,early-morning,0.39500000000
-6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09980000000
-6,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.12970000000
+6,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-morning,0.17200000000
 6,heat,R2,2034,3,heatpump,2026,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2034,4,heatpump,2028,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2034,5,heatpump,2030,all-year,all-week,early-morning,0.67830000000
 6,heat,R2,2034,6,heatpump,2032,all-year,all-week,early-morning,0.18670000000
-6,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-morning,0.20190000000
+6,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-morning,0.17200000000
 6,heat,R2,2034,9,heatpump,2026,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2034,10,heatpump,2028,all-year,all-week,early-morning,0.09330000000
 6,heat,R2,2034,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
@@ -331,18 +331,18 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 6,heat,R2,2036,11,heatpump,2030,all-year,all-week,early-morning,0.67830000000
 6,heat,R2,2036,12,heatpump,2032,all-year,all-week,early-morning,0.18670000000
 6,heat,R2,2036,13,heatpump,2034,all-year,all-week,early-morning,0.39500000000
-6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.45810000000
-7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,8.39350000000
+7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R1,2034,3,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R1,2034,4,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R1,2034,5,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
 7,heat,R1,2034,6,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
-7,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R1,2034,9,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R1,2034,10,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R1,2034,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
@@ -357,14 +357,14 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 7,heat,R1,2036,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
 7,heat,R1,2036,12,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
 7,heat,R1,2036,13,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
-7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09980000000
-7,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.12970000000
+7,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R2,2034,3,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2034,4,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2034,5,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
 7,heat,R2,2034,6,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
-7,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.20190000000
+7,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.17200000000
 7,heat,R2,2034,9,heatpump,2026,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2034,10,heatpump,2028,all-year,all-week,late-afternoon,0.09330000000
 7,heat,R2,2034,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
@@ -379,7 +379,7 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 7,heat,R2,2036,11,heatpump,2030,all-year,all-week,late-afternoon,0.67830000000
 7,heat,R2,2036,12,heatpump,2032,all-year,all-week,late-afternoon,0.18670000000
 7,heat,R2,2036,13,heatpump,2034,all-year,all-week,late-afternoon,0.39500000000
-7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
-7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.45810000000
+7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
+7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,8.39350000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 959cd528..8ba199f3 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,20,0.08,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index b651c51e..1c890b73 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -22,12 +22,6 @@ def generate_model_1():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "../3-add-region/1-new-region", model_path)
 
-    # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/residential/Technodata.csv"
-    df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityGrowth"] = 0.04
-    df.to_csv(technodata_file, index=False)
-
     # Add timeslices
     add_timeslice(model_path, timeslice_name="early-morning", copy_from="evening")
     add_timeslice(model_path, timeslice_name="late-afternoon", copy_from="evening")
@@ -114,7 +108,7 @@ def generate_model_2():
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
     df.loc[1:, "MaxCapacityAddition"] *= 2
     df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
-    df.loc[1:, "MaxCapacityGrowth"] *= 2
+    df.loc[1:, "MaxCapacityGrowth"] *= 3
     df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
     df.loc[1:, "TotalCapacityLimit"] *= 2
     df.to_csv(technodata_file, index=False)
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index d483e841..9715d11c 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -191,22 +191,19 @@
     "|solarPV|R2|…|**4**|**0.4**|**120**|…|1|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector (also doubling `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
+    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector (doubling `MaxCapacityAddition` and `TotalCapacityLimit`, and tripling  `MaxCapacityGrowth`), as shown below:\n",
     "\n",
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gasboiler|R1|2020|…|**20**|**0.08**|**120**|…|1|\n",
-    "|heatpump|R1|2020|…|**20**|**0.08**|**120**|…|1|\n",
-    "|gasboiler|R2|2020|…|**20**|**0.08**|**120**|…|1|\n",
-    "|heatpump|R2|2020|…|**20**|**0.08**|**120**|…|1|\n",
+    "|gasboiler|R1|2020|…|**20**|**0.06**|**120**|…|1|\n",
+    "|heatpump|R1|2020|…|**20**|**0.06**|**120**|…|1|\n",
+    "|gasboiler|R2|2020|…|**20**|**0.06**|**120**|…|1|\n",
+    "|heatpump|R2|2020|…|**20**|**0.06**|**120**|…|1|\n",
     "\n",
     "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",
-    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n",
-    "\n",
-    "<!-- Again, we run the simulation and ensure that the constraints allow for the demand to be met by modifying the `Technodata.csv` files. See [here (INSERT LINK HERE)](github-horizon-periods) for the modified full example, including the `Technodata.csv` files.\n",
-    " -->\n"
+    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n"
    ]
   },
   {

From 329624a531bda2d4a00008dec7fa12c430e0e623 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 23 May 2024 11:56:56 +0100
Subject: [PATCH 166/419] Fix paths

---
 .../2-add-agent/visualise-new-agent-multiple-objective.ipynb    | 2 +-
 .../2-add-agent/visualise-new-agent-single-objective.ipynb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb b/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
index fddbd7f0..b197a116 100644
--- a/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"1-multiple-objective/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"1-single-objective/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\", \"agent\"])\n",
diff --git a/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb b/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
index 1c30c78b..8ca059c6 100644
--- a/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"2-single-objective/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"2-multiple-objective/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\", \"agent\"])\n",

From ce02987acaaf5d0c2272281a20a7710d5f4cdf27 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 23 May 2024 14:10:20 +0100
Subject: [PATCH 167/419] Fix Quantity error in agents model

---
 docs/inputs/technodata.rst                    |   2 +-
 .../Results/Gas/Capacity/2030.csv             |  10 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |   8 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   | 130 +++++++-----
 .../1-single-objective/Results/MCAPrices.csv  | 192 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  12 +-
 .../Results/Power/Capacity/2025.csv           |  26 +--
 .../Results/Power/Capacity/2030.csv           |  32 +--
 .../Results/Power/Capacity/2035.csv           |  39 +++-
 .../Results/Power/Capacity/2040.csv           |  44 +++-
 .../Results/Power/Capacity/2045.csv           |  54 +++--
 .../Results/Power/Capacity/2050.csv           |  54 +++--
 .../Results/Residential/Capacity/2020.csv     |   6 +-
 .../Results/Residential/Capacity/2025.csv     |  18 +-
 .../Results/Residential/Capacity/2030.csv     |  22 +-
 .../Results/Residential/Capacity/2035.csv     |  24 ++-
 .../Results/Residential/Capacity/2040.csv     |  24 ++-
 .../Results/Residential/Capacity/2045.csv     |  20 +-
 .../Results/Residential/Capacity/2050.csv     |  18 +-
 .../Results/Residential/Supply/2020.csv       |  36 ++--
 .../Results/Residential/Supply/2025.csv       |  68 ++++---
 .../Results/Residential/Supply/2030.csv       |  72 ++++---
 .../Results/Residential/Supply/2035.csv       |  86 ++++----
 .../Results/Residential/Supply/2040.csv       |  84 ++++----
 .../Results/Residential/Supply/2045.csv       |  74 +++----
 .../Results/Residential/Supply/2050.csv       |  60 +++---
 .../1-single-objective/technodata/Agents.csv  |   8 +-
 .../technodata/residential/Technodata.csv     |   4 +-
 .../Results/Gas/Capacity/2030.csv             |  10 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |   8 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   |  88 +++-----
 .../Results/MCAPrices.csv                     | 144 ++++++-------
 .../Results/Power/Capacity/2020.csv           |  18 +-
 .../Results/Power/Capacity/2025.csv           |  39 ++--
 .../Results/Power/Capacity/2030.csv           |  36 ++--
 .../Results/Power/Capacity/2035.csv           |  37 +---
 .../Results/Power/Capacity/2040.csv           |  37 ++--
 .../Results/Power/Capacity/2045.csv           |  48 ++---
 .../Results/Power/Capacity/2050.csv           |  38 ++--
 .../Results/Residential/Capacity/2020.csv     |   6 +-
 .../Results/Residential/Capacity/2025.csv     |   6 +-
 .../Results/Residential/Capacity/2030.csv     |  16 +-
 .../Results/Residential/Capacity/2035.csv     |  12 +-
 .../Results/Residential/Capacity/2040.csv     |  20 +-
 .../Results/Residential/Capacity/2045.csv     |  12 +-
 .../Results/Residential/Capacity/2050.csv     |  16 +-
 .../Results/Residential/Supply/2020.csv       |  36 ++--
 .../Results/Residential/Supply/2025.csv       |  36 ++--
 .../Results/Residential/Supply/2030.csv       |  36 ++--
 .../Results/Residential/Supply/2035.csv       |  72 +++----
 .../Results/Residential/Supply/2040.csv       |  72 +++----
 .../Results/Residential/Supply/2045.csv       |  72 +++----
 .../Results/Residential/Supply/2050.csv       |  72 +++----
 .../technodata/Agents.csv                     |   8 +-
 .../2-add-agent/generate_models.py            |  19 +-
 61 files changed, 1208 insertions(+), 1077 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 913d8a8c..8595a8e4 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -154,7 +154,7 @@ Agent_0, ..., Agent_N
    In a two-agent simulation, a new column needs to be added for each retrofit agent belonging to the new-retrofit agent pair.
    The column heading refers each retrofit agent "AgentShare" as defined in the agents' definition (see :ref:`inputs-agents`).
    Assuming a split of the initial capacity into 30 \% and 70 \% for each retrofit agent, the model table would be setup as follows.
-   The values of the "AgetnShare" needs to reflect the demand split represented by the "Quantity" attribute (see :ref:`inputs-agents`),
+   The values of the "AgentShare" needs to reflect the demand split represented by the "Quantity" attribute (see :ref:`inputs-agents`),
    to make sure that the initial demand is fulfilled with the initial stock.
 
    .. csv-table:: Techno-data: AgentShare - 2 agents
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
index d48e7ac8..46ed388e 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/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,18.56000000000
-1,2040,R1,2030,gassupply1,18.56000000000
-1,2045,R1,2030,gassupply1,18.56000000000
-1,2050,R1,2030,gassupply1,18.56000000000
-1,2069,R1,2030,gassupply1,18.56000000000
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
index 2c29e7f6..4a49ec7f 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,6 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,18.56000000000
-1,2040,R1,2030,gassupply1,18.56000000000
-1,2045,R1,2030,gassupply1,18.56000000000
-1,2050,R1,2030,gassupply1,18.56000000000
-1,2069,R1,2030,gassupply1,18.56000000000
+1,2035,R1,2030,gassupply1,5.28440000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
index 4084954e..54d8f5f5 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,5 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,18.56000000000
-1,2045,R1,2030,gassupply1,18.56000000000
-1,2050,R1,2030,gassupply1,18.56000000000
-1,2069,R1,2030,gassupply1,18.56000000000
+1,2040,R1,2030,gassupply1,5.28440000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
index dd3195af..18de09c4 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,18.56000000000
-1,2050,R1,2030,gassupply1,18.56000000000
-1,2069,R1,2030,gassupply1,18.56000000000
+1,2045,R1,2030,gassupply1,5.28440000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
index a329710d..efec1bce 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,18.56000000000
-1,2055,R1,2030,gassupply1,18.56000000000
-1,2069,R1,2030,gassupply1,18.56000000000
+1,2050,R1,2030,gassupply1,5.28440000000
+1,2055,R1,2030,gassupply1,5.28440000000
+1,2069,R1,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
index 88314c38..8ccabec8 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -6,62 +6,88 @@ gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,19.00000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,9.50000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A1,power,retrofit,2025,9.47970000000
+windturbine,R1,R1,A1,power,retrofit,2025,4.18750000000
 gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A2,power,retrofit,2025,9.47970000000
+windturbine,R1,R1,A2,power,retrofit,2025,4.18750000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,19.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,11.04070000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.47970000000
-solarPV,R1,R1,A2,power,retrofit,2030,11.04070000000
-windturbine,R1,R1,A2,power,retrofit,2030,9.47970000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.05000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,3.45000000000
+gasboiler,R1,R1,A2,residential,retrofit,2030,2.05000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,9.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,3.45000000000
+solarPV,R1,R1,A1,power,retrofit,2030,8.76250000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2030,8.76250000000
+windturbine,R1,R1,A2,power,retrofit,2030,4.18750000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
-gasboiler,R1,R1,A2,residential,retrofit,2035,7.20000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,28.80000000000
-solarPV,R1,R1,A1,power,retrofit,2035,11.04070000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.47970000000
-solarPV,R1,R1,A2,power,retrofit,2035,11.04070000000
-windturbine,R1,R1,A2,power,retrofit,2035,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,9.28000000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,9.28000000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
-gasboiler,R1,R1,A2,residential,retrofit,2040,7.20000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,28.80000000000
-solarPV,R1,R1,A1,power,retrofit,2040,11.04070000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.47970000000
-solarPV,R1,R1,A2,power,retrofit,2040,11.04070000000
-windturbine,R1,R1,A2,power,retrofit,2040,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,9.28000000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,9.28000000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
-gasboiler,R1,R1,A2,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,40.56000000000
-solarPV,R1,R1,A1,power,retrofit,2045,11.04070000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.47970000000
-solarPV,R1,R1,A2,power,retrofit,2045,11.04070000000
-windturbine,R1,R1,A2,power,retrofit,2045,9.47970000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,9.28000000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,9.28000000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
-gasboiler,R1,R1,A2,residential,retrofit,2050,7.44000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,40.56000000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.04070000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.07000000000
-windturbine,R1,R1,A1,power,retrofit,2050,8.47860000000
-solarPV,R1,R1,A2,power,retrofit,2050,11.04070000000
-solarPV,R1,R1,A2,power,retrofit,2050,15.07000000000
-windturbine,R1,R1,A2,power,retrofit,2050,8.47860000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,9.28000000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,9.28000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.05000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,3.45000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,12.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2035,2.05000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,3.45000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,12.50000000000
+solarPV,R1,R1,A1,power,retrofit,2035,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2035,1.50000000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2035,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2035,1.50000000000
+windturbine,R1,R1,A2,power,retrofit,2035,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,2.64220000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,0.45500000000
+heatpump,R1,R1,A1,residential,retrofit,2040,12.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,8.04500000000
+gasboiler,R1,R1,A2,residential,retrofit,2040,0.45500000000
+heatpump,R1,R1,A2,residential,retrofit,2040,12.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,8.04500000000
+solarPV,R1,R1,A1,power,retrofit,2040,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2040,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2040,3.79750000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2040,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2040,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2040,3.79750000000
+windturbine,R1,R1,A2,power,retrofit,2040,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,2.64220000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,0.45500000000
+heatpump,R1,R1,A1,residential,retrofit,2045,8.04500000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2045,0.45500000000
+heatpump,R1,R1,A2,residential,retrofit,2045,8.04500000000
+heatpump,R1,R1,A2,residential,retrofit,2045,15.50000000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2045,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2045,3.79750000000
+solarPV,R1,R1,A1,power,retrofit,2045,3.79750000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2045,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2045,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.79750000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.79750000000
+windturbine,R1,R1,A2,power,retrofit,2045,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,2.64220000000
+heatpump,R1,R1,A1,residential,retrofit,2050,15.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,11.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,15.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,11.50000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2050,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A1,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.14250000000
+solarPV,R1,R1,A2,power,retrofit,2050,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2050,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A2,power,retrofit,2050,9.14250000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,2.64220000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index a638a612..3677d535 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63100000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.68030000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.19950000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.67240000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.74640000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.29930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63100000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.68030000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.19950000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67240000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.74640000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.29930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.79670000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94460000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.59850000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.71380000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.81250000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.39900000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72930000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.17830000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34670000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09640000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.24820000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52070000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72930000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.17830000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34670000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09640000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.24820000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52070000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.20780000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.45790000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04570000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46520000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.31810000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69520000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.67450000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.37650000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62780000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,1.01460000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.44940000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84300000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.67450000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.37650000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62780000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.01460000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.44940000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84300000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.04630000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.66800000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.49410000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.35660000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.52220000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05910000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.63970000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.13430000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40580000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.96270000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.20910000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.63060000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.63970000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.13430000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40580000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.96270000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.20910000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.63060000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.94430000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.43350000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.31280000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,1.28780000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.28390000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85670000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.60330000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.33950000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21120000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.90840000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.41540000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43530000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.60330000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.33950000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21120000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.90840000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.41540000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43530000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.83740000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.64300000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.11710000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,1.21580000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.49130000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.66090000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.16680000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.15180000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.58750000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31760000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25030000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22770000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.88500000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.48100000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16680000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15180000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.58750000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31760000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25030000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22770000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.88500000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.48100000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50050000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45530000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.79200000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98930000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33370000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30350000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,1.18490000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64740000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
index e51bf8d5..72201b9a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-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
+1,2025,R1,2020,windturbine,8.37500000000
+1,2030,R1,2020,windturbine,8.37500000000
+1,2035,R1,2020,windturbine,8.37500000000
+1,2040,R1,2020,windturbine,8.37500000000
+1,2045,R1,2020,windturbine,8.37500000000
+1,2049,R1,2020,windturbine,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
index 166dcff9..a7007923 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
@@ -1,15 +1,15 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,22.08140000000
-1,2035,R1,solarPV,2025,22.08140000000
-1,2040,R1,solarPV,2025,22.08140000000
-1,2045,R1,solarPV,2025,22.08140000000
-1,2049,R1,solarPV,2025,22.08140000000
-1,2050,R1,solarPV,2025,22.08140000000
-1,2054,R1,solarPV,2025,22.08140000000
-2,2025,R1,windturbine,2020,18.95930000000
-2,2030,R1,windturbine,2020,18.95930000000
-2,2035,R1,windturbine,2020,18.95930000000
-2,2040,R1,windturbine,2020,18.95930000000
-2,2045,R1,windturbine,2020,18.95930000000
-2,2049,R1,windturbine,2020,18.95930000000
+1,2030,R1,solarPV,2025,17.52500000000
+1,2035,R1,solarPV,2025,17.52500000000
+1,2040,R1,solarPV,2025,17.52500000000
+1,2045,R1,solarPV,2025,17.52500000000
+1,2049,R1,solarPV,2025,17.52500000000
+1,2050,R1,solarPV,2025,17.52500000000
+1,2054,R1,solarPV,2025,17.52500000000
+2,2025,R1,windturbine,2020,8.37500000000
+2,2030,R1,windturbine,2020,8.37500000000
+2,2035,R1,windturbine,2020,8.37500000000
+2,2040,R1,windturbine,2020,8.37500000000
+2,2045,R1,windturbine,2020,8.37500000000
+2,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
index f77e5ea7..4730672c 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
@@ -1,13 +1,21 @@
 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,solarPV,22.08140000000
-2,2035,R1,2025,solarPV,22.08140000000
-2,2040,R1,2025,solarPV,22.08140000000
-2,2045,R1,2025,solarPV,22.08140000000
-2,2049,R1,2025,solarPV,22.08140000000
-2,2050,R1,2025,solarPV,22.08140000000
-2,2054,R1,2025,solarPV,22.08140000000
+1,2030,R1,2020,windturbine,8.37500000000
+1,2035,R1,2020,windturbine,8.37500000000
+1,2040,R1,2020,windturbine,8.37500000000
+1,2045,R1,2020,windturbine,8.37500000000
+1,2049,R1,2020,windturbine,8.37500000000
+2,2030,R1,2025,solarPV,17.52500000000
+2,2035,R1,2025,solarPV,17.52500000000
+2,2040,R1,2025,solarPV,17.52500000000
+2,2045,R1,2025,solarPV,17.52500000000
+2,2049,R1,2025,solarPV,17.52500000000
+2,2050,R1,2025,solarPV,17.52500000000
+2,2054,R1,2025,solarPV,17.52500000000
+3,2035,R1,2030,solarPV,3.00000000000
+3,2040,R1,2030,solarPV,3.00000000000
+3,2045,R1,2030,solarPV,3.00000000000
+3,2049,R1,2030,solarPV,3.00000000000
+3,2050,R1,2030,solarPV,3.00000000000
+3,2054,R1,2030,solarPV,3.00000000000
+3,2055,R1,2030,solarPV,3.00000000000
+3,2059,R1,2030,solarPV,3.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
index f74f219c..81d09e1c 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
@@ -1,11 +1,28 @@
-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,solarPV,22.08140000000
-2,2040,R1,2025,solarPV,22.08140000000
-2,2045,R1,2025,solarPV,22.08140000000
-2,2049,R1,2025,solarPV,22.08140000000
-2,2050,R1,2025,solarPV,22.08140000000
-2,2054,R1,2025,solarPV,22.08140000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,solarPV,2025,17.52500000000
+0,2040,R1,solarPV,2025,17.52500000000
+0,2045,R1,solarPV,2025,17.52500000000
+0,2049,R1,solarPV,2025,17.52500000000
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2035,R1,solarPV,2030,3.00000000000
+1,2040,R1,solarPV,2030,3.00000000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2035,7.59500000000
+2,2045,R1,solarPV,2035,7.59500000000
+2,2049,R1,solarPV,2035,7.59500000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
index 0e0e5343..8d652a35 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
@@ -1,9 +1,35 @@
-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,solarPV,22.08140000000
-2,2045,R1,2025,solarPV,22.08140000000
-2,2049,R1,2025,solarPV,22.08140000000
-2,2050,R1,2025,solarPV,22.08140000000
-2,2054,R1,2025,solarPV,22.08140000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,solarPV,2025,17.52500000000
+0,2045,R1,solarPV,2025,17.52500000000
+0,2049,R1,solarPV,2025,17.52500000000
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2040,R1,solarPV,2030,3.00000000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2035,7.59500000000
+2,2045,R1,solarPV,2035,7.59500000000
+2,2049,R1,solarPV,2035,7.59500000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2045,R1,solarPV,2040,7.59500000000
+3,2049,R1,solarPV,2040,7.59500000000
+3,2050,R1,solarPV,2040,7.59500000000
+3,2054,R1,solarPV,2040,7.59500000000
+3,2055,R1,solarPV,2040,7.59500000000
+3,2059,R1,solarPV,2040,7.59500000000
+3,2060,R1,solarPV,2040,7.59500000000
+3,2064,R1,solarPV,2040,7.59500000000
+3,2065,R1,solarPV,2040,7.59500000000
+3,2069,R1,solarPV,2040,7.59500000000
+4,2040,R1,windturbine,2020,8.37500000000
+4,2045,R1,windturbine,2020,8.37500000000
+4,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
index 002f8e65..2b37067f 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
@@ -1,15 +1,41 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2025,22.08140000000
-0,2049,R1,solarPV,2025,22.08140000000
-0,2050,R1,solarPV,2025,22.08140000000
-0,2054,R1,solarPV,2025,22.08140000000
-1,2050,R1,solarPV,2045,30.14000000000
-1,2054,R1,solarPV,2045,30.14000000000
-1,2055,R1,solarPV,2045,30.14000000000
-1,2074,R1,solarPV,2045,30.14000000000
-2,2045,R1,windturbine,2020,18.95930000000
-2,2049,R1,windturbine,2020,18.95930000000
-3,2050,R1,windturbine,2045,16.95720000000
-3,2054,R1,windturbine,2045,16.95720000000
-3,2055,R1,windturbine,2045,16.95720000000
-3,2074,R1,windturbine,2045,16.95720000000
+0,2045,R1,solarPV,2025,17.52500000000
+0,2049,R1,solarPV,2025,17.52500000000
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2035,7.59500000000
+2,2049,R1,solarPV,2035,7.59500000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2045,R1,solarPV,2040,7.59500000000
+3,2049,R1,solarPV,2040,7.59500000000
+3,2050,R1,solarPV,2040,7.59500000000
+3,2054,R1,solarPV,2040,7.59500000000
+3,2055,R1,solarPV,2040,7.59500000000
+3,2059,R1,solarPV,2040,7.59500000000
+3,2060,R1,solarPV,2040,7.59500000000
+3,2064,R1,solarPV,2040,7.59500000000
+3,2065,R1,solarPV,2040,7.59500000000
+3,2069,R1,solarPV,2040,7.59500000000
+4,2050,R1,solarPV,2045,18.28500000000
+4,2054,R1,solarPV,2045,18.28500000000
+4,2055,R1,solarPV,2045,18.28500000000
+4,2059,R1,solarPV,2045,18.28500000000
+4,2060,R1,solarPV,2045,18.28500000000
+4,2064,R1,solarPV,2045,18.28500000000
+4,2065,R1,solarPV,2045,18.28500000000
+4,2069,R1,solarPV,2045,18.28500000000
+4,2070,R1,solarPV,2045,18.28500000000
+4,2074,R1,solarPV,2045,18.28500000000
+5,2045,R1,windturbine,2020,8.37500000000
+5,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
index 08a54ed4..6deb2251 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
@@ -1,15 +1,41 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2025,solarPV,22.08140000000
-1,2054,R1,2025,solarPV,22.08140000000
-2,2050,R1,2045,solarPV,30.14000000000
-2,2054,R1,2045,solarPV,30.14000000000
-2,2055,R1,2045,solarPV,30.14000000000
-2,2074,R1,2045,solarPV,30.14000000000
-3,2050,R1,2045,windturbine,16.95720000000
-3,2054,R1,2045,windturbine,16.95720000000
-3,2055,R1,2045,windturbine,16.95720000000
-3,2074,R1,2045,windturbine,16.95720000000
-4,2055,R1,2050,solarPV,3.14960000000
-4,2074,R1,2050,solarPV,3.14960000000
-4,2075,R1,2050,solarPV,3.14960000000
-4,2079,R1,2050,solarPV,3.14960000000
+1,2050,R1,2025,solarPV,17.52500000000
+1,2054,R1,2025,solarPV,17.52500000000
+2,2050,R1,2030,solarPV,3.00000000000
+2,2054,R1,2030,solarPV,3.00000000000
+2,2055,R1,2030,solarPV,3.00000000000
+2,2059,R1,2030,solarPV,3.00000000000
+3,2050,R1,2035,solarPV,7.59500000000
+3,2054,R1,2035,solarPV,7.59500000000
+3,2055,R1,2035,solarPV,7.59500000000
+3,2059,R1,2035,solarPV,7.59500000000
+3,2060,R1,2035,solarPV,7.59500000000
+3,2064,R1,2035,solarPV,7.59500000000
+4,2050,R1,2040,solarPV,7.59500000000
+4,2054,R1,2040,solarPV,7.59500000000
+4,2055,R1,2040,solarPV,7.59500000000
+4,2059,R1,2040,solarPV,7.59500000000
+4,2060,R1,2040,solarPV,7.59500000000
+4,2064,R1,2040,solarPV,7.59500000000
+4,2065,R1,2040,solarPV,7.59500000000
+4,2069,R1,2040,solarPV,7.59500000000
+5,2050,R1,2045,solarPV,18.28500000000
+5,2054,R1,2045,solarPV,18.28500000000
+5,2055,R1,2045,solarPV,18.28500000000
+5,2059,R1,2045,solarPV,18.28500000000
+5,2060,R1,2045,solarPV,18.28500000000
+5,2064,R1,2045,solarPV,18.28500000000
+5,2065,R1,2045,solarPV,18.28500000000
+5,2069,R1,2045,solarPV,18.28500000000
+5,2070,R1,2045,solarPV,18.28500000000
+5,2074,R1,2045,solarPV,18.28500000000
+6,2055,R1,2050,solarPV,17.52500000000
+6,2059,R1,2050,solarPV,17.52500000000
+6,2060,R1,2050,solarPV,17.52500000000
+6,2064,R1,2050,solarPV,17.52500000000
+6,2065,R1,2050,solarPV,17.52500000000
+6,2069,R1,2050,solarPV,17.52500000000
+6,2070,R1,2050,solarPV,17.52500000000
+6,2074,R1,2050,solarPV,17.52500000000
+6,2075,R1,2050,solarPV,17.52500000000
+6,2079,R1,2050,solarPV,17.52500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
index 4122d90b..bcdf148c 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 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
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
index 08d92bf4..2eb0ec15 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
@@ -1,5 +1,13 @@
-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,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
index 0ee56685..22334ba5 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
@@ -1,9 +1,15 @@
 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
-1,2030,R1,heatpump,2020,38.00000000000
-1,2034,R1,heatpump,2020,38.00000000000
-2,2035,R1,heatpump,2030,57.60000000000
-2,2040,R1,heatpump,2030,57.60000000000
-2,2044,R1,heatpump,2030,57.60000000000
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
index 2363ffb8..452c6c8a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
@@ -1,7 +1,17 @@
-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,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
index cd28d615..e3ecc1d0 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
@@ -1,11 +1,15 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,14.40000000000
-0,2044,R1,gasboiler,2030,14.40000000000
-1,2045,R1,gasboiler,2040,14.88000000000
-1,2050,R1,gasboiler,2040,14.88000000000
-1,2054,R1,gasboiler,2040,14.88000000000
-2,2040,R1,heatpump,2030,57.60000000000
-2,2044,R1,heatpump,2030,57.60000000000
-3,2045,R1,heatpump,2040,81.12000000000
-3,2050,R1,heatpump,2040,81.12000000000
-3,2054,R1,heatpump,2040,81.12000000000
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
index 939e3e56..82b22d9b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
@@ -1,7 +1,13 @@
-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
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
index 6aff1325..305b627b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
@@ -1,9 +1,11 @@
 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
+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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
index 62937431..a44059a3 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-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,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,10.03260000000
+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.23260000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.76740000000
+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,15.04880000000
+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.15500000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.17830000000
+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,10.03260000000
+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.23260000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.76740000000
+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,15.04880000000
+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.46510000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.53490000000
+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,30.09770000000
+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.31010000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.35660000000
+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,20.06510000000
+5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
index f9894bba..c9ed8c00 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
@@ -1,25 +1,43 @@
-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,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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
index 514bc0ff..61ae1198 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,49 @@
 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
+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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
index 80e72327..89e0bd4e 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
@@ -1,37 +1,49 @@
-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,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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
index 2c074d4d..663e47a5 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
@@ -1,37 +1,49 @@
 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
+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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
index aa751b65..6e2884e6 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-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,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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
index 79dedd79..61004cae 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
@@ -1,37 +1,25 @@
 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
+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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
index a73ed075..13701454 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
@@ -1,5 +1,5 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
-Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
-Agent3,A2,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent4,A2,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
+Agent3,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
+Agent4,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
index 382dc9b9..e1a43e99 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index 2c637fd8..db31cfc2 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/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,24.95650000000
-1,2040,R1,2030,gassupply1,24.95650000000
-1,2045,R1,2030,gassupply1,24.95650000000
-1,2050,R1,2030,gassupply1,24.95650000000
-1,2069,R1,2030,gassupply1,24.95650000000
+1,2035,R1,2030,gassupply1,23.20780000000
+1,2040,R1,2030,gassupply1,23.20780000000
+1,2045,R1,2030,gassupply1,23.20780000000
+1,2050,R1,2030,gassupply1,23.20780000000
+1,2069,R1,2030,gassupply1,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index 720f4883..3c98c7f5 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,6 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,24.95650000000
-1,2040,R1,2030,gassupply1,24.95650000000
-1,2045,R1,2030,gassupply1,24.95650000000
-1,2050,R1,2030,gassupply1,24.95650000000
-1,2069,R1,2030,gassupply1,24.95650000000
+1,2035,R1,2030,gassupply1,23.20780000000
+1,2040,R1,2030,gassupply1,23.20780000000
+1,2045,R1,2030,gassupply1,23.20780000000
+1,2050,R1,2030,gassupply1,23.20780000000
+1,2069,R1,2030,gassupply1,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index 5186f9e0..4266e08f 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,5 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,24.95650000000
-1,2045,R1,2030,gassupply1,24.95650000000
-1,2050,R1,2030,gassupply1,24.95650000000
-1,2069,R1,2030,gassupply1,24.95650000000
+1,2040,R1,2030,gassupply1,23.20780000000
+1,2045,R1,2030,gassupply1,23.20780000000
+1,2050,R1,2030,gassupply1,23.20780000000
+1,2069,R1,2030,gassupply1,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index 968b462b..0742cded 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,24.95650000000
-1,2050,R1,2030,gassupply1,24.95650000000
-1,2069,R1,2030,gassupply1,24.95650000000
+1,2045,R1,2030,gassupply1,23.20780000000
+1,2050,R1,2030,gassupply1,23.20780000000
+1,2069,R1,2030,gassupply1,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index f7e7b55e..dea3ed9a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,24.95650000000
-1,2055,R1,2030,gassupply1,24.95650000000
-1,2069,R1,2030,gassupply1,24.95650000000
+1,2050,R1,2030,gassupply1,23.20780000000
+1,2055,R1,2030,gassupply1,23.20780000000
+1,2069,R1,2030,gassupply1,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 22e82dbb..6d7e2601 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -6,84 +6,60 @@ gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
 heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-solarPV,R1,R1,A1,power,retrofit,2025,0.39110000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,5.17550000000
 gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-solarPV,R1,R1,A2,power,retrofit,2025,0.39110000000
 windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
 heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2030,4.20560000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,5.01210000000
-solarPV,R1,R1,A2,power,retrofit,2030,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2030,4.20560000000
+solarPV,R1,R1,A1,power,retrofit,2030,7.41230000000
+windturbine,R1,R1,A1,power,retrofit,2030,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2030,20.00000000000
 windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2030,5.01210000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,28.80000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,14.40000000000
 heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2035,4.20560000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,5.01210000000
-solarPV,R1,R1,A2,power,retrofit,2035,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2035,4.20560000000
+solarPV,R1,R1,A1,power,retrofit,2035,7.41230000000
+windturbine,R1,R1,A1,power,retrofit,2035,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2035,20.00000000000
 windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2035,5.01210000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.45650000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,0.70780000000
 gassupply1,R1,R1,A2,gas,retrofit,2035,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,7.20000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,28.80000000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,3.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,14.40000000000
 heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2040,4.20560000000
-solarPV,R1,R1,A1,power,retrofit,2040,0.27940000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,5.01210000000
-solarPV,R1,R1,A2,power,retrofit,2040,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2040,4.20560000000
-solarPV,R1,R1,A2,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,7.41230000000
+windturbine,R1,R1,A1,power,retrofit,2040,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2040,20.00000000000
 windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2040,5.01210000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.45650000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,0.70780000000
 gassupply1,R1,R1,A2,gas,retrofit,2040,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,40.56000000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,3.72000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,20.28000000000
 heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A1,power,retrofit,2045,4.20560000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.27940000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,5.01210000000
-solarPV,R1,R1,A2,power,retrofit,2045,0.39110000000
-solarPV,R1,R1,A2,power,retrofit,2045,4.20560000000
+solarPV,R1,R1,A1,power,retrofit,2045,7.41230000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.99310000000
+windturbine,R1,R1,A1,power,retrofit,2045,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2045,20.00000000000
 solarPV,R1,R1,A2,power,retrofit,2045,10.00000000000
 windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2045,5.01210000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.45650000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.70780000000
 gassupply1,R1,R1,A2,gas,retrofit,2045,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,40.56000000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,3.72000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,20.28000000000
 heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,4.20560000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.27940000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.69840000000
-windturbine,R1,R1,A1,power,retrofit,2050,5.01210000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.87220000000
-solarPV,R1,R1,A2,power,retrofit,2050,4.20560000000
+solarPV,R1,R1,A1,power,retrofit,2050,7.41230000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.99310000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.98730000000
+solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
 solarPV,R1,R1,A2,power,retrofit,2050,10.00000000000
 solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2050,5.01210000000
-windturbine,R1,R1,A2,power,retrofit,2050,6.87220000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.45650000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.70780000000
 gassupply1,R1,R1,A2,gas,retrofit,2050,22.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 25f0e059..cd286e91 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.62720000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.64170000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.18700000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.18750000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.66670000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68850000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.28040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.28130000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.62720000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.64170000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.18700000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.18750000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.66670000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68850000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.28040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.28130000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.78530000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.82890000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.56090000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.56250000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.70620000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.73530000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.37390000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.37500000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.16820000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72910000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72970000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25230000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09610000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09740000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16820000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72910000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72970000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25230000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09610000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09740000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50450000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.20640000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.21160000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33640000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46460000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46690000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.16820000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.61190000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.60290000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25230000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.92080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.90760000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16820000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.61190000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.60290000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25230000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.92080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.90760000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50450000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.85870000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.83460000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33640000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.23150000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.21440000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16740000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.52060000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.50280000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25110000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.78410000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.75780000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16740000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.52060000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50280000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25110000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.78410000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.75780000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50220000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.58780000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.53720000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33480000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,1.04990000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,1.01520000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16680000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16890000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.45030000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.42500000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25330000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.67900000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.64130000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16680000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16890000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.45030000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.42500000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25330000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.67900000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.64130000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50030000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50660000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.37960000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.30590000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33350000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33770000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.91020000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.86020000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.16550000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.39840000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.36520000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24560000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24830000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.60140000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.55190000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16550000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.39840000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.36520000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24560000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24830000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.60140000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.55190000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49130000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49650000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.22590000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.12850000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.32750000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33100000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.80700000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.74140000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
index 48bcd2e6..c1259ba8 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,15 +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,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
+1,2025,R1,2020,windturbine,15.17550000000
+1,2030,R1,2020,windturbine,15.17550000000
+1,2035,R1,2020,windturbine,15.17550000000
+1,2040,R1,2020,windturbine,15.17550000000
+1,2045,R1,2020,windturbine,15.17550000000
+1,2049,R1,2020,windturbine,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index 826d2c60..d45cd142 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,28 +1,15 @@
 asset,year,region,technology,installed,capacity
 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,2030,R1,solarPV,2025,8.41130000000
-2,2035,R1,solarPV,2025,8.41130000000
-2,2040,R1,solarPV,2025,8.41130000000
-2,2045,R1,solarPV,2025,8.41130000000
-2,2049,R1,solarPV,2025,8.41130000000
-2,2050,R1,solarPV,2025,8.41130000000
-2,2054,R1,solarPV,2025,8.41130000000
-3,2025,R1,windturbine,2020,20.00000000000
-3,2030,R1,windturbine,2020,20.00000000000
-3,2035,R1,windturbine,2020,20.00000000000
-3,2040,R1,windturbine,2020,20.00000000000
-3,2045,R1,windturbine,2020,20.00000000000
-3,2049,R1,windturbine,2020,20.00000000000
-4,2030,R1,windturbine,2025,10.02420000000
-4,2035,R1,windturbine,2025,10.02420000000
-4,2040,R1,windturbine,2025,10.02420000000
-4,2045,R1,windturbine,2025,10.02420000000
-4,2049,R1,windturbine,2025,10.02420000000
-4,2050,R1,windturbine,2025,10.02420000000
-4,2054,R1,windturbine,2025,10.02420000000
+1,2030,R1,solarPV,2025,27.41230000000
+1,2035,R1,solarPV,2025,27.41230000000
+1,2040,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2025,27.41230000000
+1,2049,R1,solarPV,2025,27.41230000000
+1,2050,R1,solarPV,2025,27.41230000000
+1,2054,R1,solarPV,2025,27.41230000000
+2,2025,R1,windturbine,2020,15.17550000000
+2,2030,R1,windturbine,2020,15.17550000000
+2,2035,R1,windturbine,2020,15.17550000000
+2,2040,R1,windturbine,2020,15.17550000000
+2,2045,R1,windturbine,2020,15.17550000000
+2,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index 5c1bbb7f..1caf5b8a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,25 +1,13 @@
 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,solarPV,8.41130000000
-3,2035,R1,2025,solarPV,8.41130000000
-3,2040,R1,2025,solarPV,8.41130000000
-3,2045,R1,2025,solarPV,8.41130000000
-3,2049,R1,2025,solarPV,8.41130000000
-3,2050,R1,2025,solarPV,8.41130000000
-3,2054,R1,2025,solarPV,8.41130000000
-4,2030,R1,2025,windturbine,10.02420000000
-4,2035,R1,2025,windturbine,10.02420000000
-4,2040,R1,2025,windturbine,10.02420000000
-4,2045,R1,2025,windturbine,10.02420000000
-4,2049,R1,2025,windturbine,10.02420000000
-4,2050,R1,2025,windturbine,10.02420000000
-4,2054,R1,2025,windturbine,10.02420000000
+1,2030,R1,2020,windturbine,15.17550000000
+1,2035,R1,2020,windturbine,15.17550000000
+1,2040,R1,2020,windturbine,15.17550000000
+1,2045,R1,2020,windturbine,15.17550000000
+1,2049,R1,2020,windturbine,15.17550000000
+2,2030,R1,2025,solarPV,27.41230000000
+2,2035,R1,2025,solarPV,27.41230000000
+2,2040,R1,2025,solarPV,27.41230000000
+2,2045,R1,2025,solarPV,27.41230000000
+2,2049,R1,2025,solarPV,27.41230000000
+2,2050,R1,2025,solarPV,27.41230000000
+2,2054,R1,2025,solarPV,27.41230000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index 218c07ff..77bab0a3 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,28 +1,11 @@
 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,solarPV,8.41130000000
-3,2040,R1,2025,solarPV,8.41130000000
-3,2045,R1,2025,solarPV,8.41130000000
-3,2049,R1,2025,solarPV,8.41130000000
-3,2050,R1,2025,solarPV,8.41130000000
-3,2054,R1,2025,solarPV,8.41130000000
-4,2035,R1,2025,windturbine,10.02420000000
-4,2040,R1,2025,windturbine,10.02420000000
-4,2045,R1,2025,windturbine,10.02420000000
-4,2049,R1,2025,windturbine,10.02420000000
-4,2050,R1,2025,windturbine,10.02420000000
-4,2054,R1,2025,windturbine,10.02420000000
-5,2040,R1,2035,solarPV,10.27940000000
-5,2045,R1,2035,solarPV,10.27940000000
-5,2049,R1,2035,solarPV,10.27940000000
-5,2050,R1,2035,solarPV,10.27940000000
-5,2054,R1,2035,solarPV,10.27940000000
-5,2055,R1,2035,solarPV,10.27940000000
-5,2064,R1,2035,solarPV,10.27940000000
+1,2035,R1,2020,windturbine,15.17550000000
+1,2040,R1,2020,windturbine,15.17550000000
+1,2045,R1,2020,windturbine,15.17550000000
+1,2049,R1,2020,windturbine,15.17550000000
+2,2035,R1,2025,solarPV,27.41230000000
+2,2040,R1,2025,solarPV,27.41230000000
+2,2045,R1,2025,solarPV,27.41230000000
+2,2049,R1,2025,solarPV,27.41230000000
+2,2050,R1,2025,solarPV,27.41230000000
+2,2054,R1,2025,solarPV,27.41230000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index 30bdc897..02f74045 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,24 +1,15 @@
 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,solarPV,8.41130000000
-3,2045,R1,2025,solarPV,8.41130000000
-3,2049,R1,2025,solarPV,8.41130000000
-3,2050,R1,2025,solarPV,8.41130000000
-3,2054,R1,2025,solarPV,8.41130000000
-4,2040,R1,2025,windturbine,10.02420000000
-4,2045,R1,2025,windturbine,10.02420000000
-4,2049,R1,2025,windturbine,10.02420000000
-4,2050,R1,2025,windturbine,10.02420000000
-4,2054,R1,2025,windturbine,10.02420000000
-5,2040,R1,2035,solarPV,10.27940000000
-5,2045,R1,2035,solarPV,10.27940000000
-5,2049,R1,2035,solarPV,10.27940000000
-5,2050,R1,2035,solarPV,10.27940000000
-5,2054,R1,2035,solarPV,10.27940000000
-5,2055,R1,2035,solarPV,10.27940000000
-5,2064,R1,2035,solarPV,10.27940000000
+1,2040,R1,2020,windturbine,15.17550000000
+1,2045,R1,2020,windturbine,15.17550000000
+1,2049,R1,2020,windturbine,15.17550000000
+2,2040,R1,2025,solarPV,27.41230000000
+2,2045,R1,2025,solarPV,27.41230000000
+2,2049,R1,2025,solarPV,27.41230000000
+2,2050,R1,2025,solarPV,27.41230000000
+2,2054,R1,2025,solarPV,27.41230000000
+3,2045,R1,2040,solarPV,10.99310000000
+3,2049,R1,2040,solarPV,10.99310000000
+3,2050,R1,2040,solarPV,10.99310000000
+3,2054,R1,2040,solarPV,10.99310000000
+3,2055,R1,2040,solarPV,10.99310000000
+3,2069,R1,2040,solarPV,10.99310000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index 40e25f85..280cff3b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,31 +1,19 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2020,0.78230000000
-0,2049,R1,solarPV,2020,0.78230000000
-1,2045,R1,solarPV,2025,8.41130000000
-1,2049,R1,solarPV,2025,8.41130000000
-1,2050,R1,solarPV,2025,8.41130000000
-1,2054,R1,solarPV,2025,8.41130000000
-2,2045,R1,solarPV,2035,10.27940000000
-2,2049,R1,solarPV,2035,10.27940000000
-2,2050,R1,solarPV,2035,10.27940000000
-2,2054,R1,solarPV,2035,10.27940000000
-2,2055,R1,solarPV,2035,10.27940000000
-2,2064,R1,solarPV,2035,10.27940000000
-3,2050,R1,solarPV,2045,35.69840000000
-3,2054,R1,solarPV,2045,35.69840000000
-3,2055,R1,solarPV,2045,35.69840000000
-3,2064,R1,solarPV,2045,35.69840000000
-3,2065,R1,solarPV,2045,35.69840000000
-3,2074,R1,solarPV,2045,35.69840000000
-4,2045,R1,windturbine,2020,20.00000000000
-4,2049,R1,windturbine,2020,20.00000000000
-5,2045,R1,windturbine,2025,10.02420000000
-5,2049,R1,windturbine,2025,10.02420000000
-5,2050,R1,windturbine,2025,10.02420000000
-5,2054,R1,windturbine,2025,10.02420000000
-6,2050,R1,windturbine,2045,13.74440000000
-6,2054,R1,windturbine,2045,13.74440000000
-6,2055,R1,windturbine,2045,13.74440000000
-6,2064,R1,windturbine,2045,13.74440000000
-6,2065,R1,windturbine,2045,13.74440000000
-6,2074,R1,windturbine,2045,13.74440000000
+0,2045,R1,solarPV,2025,27.41230000000
+0,2049,R1,solarPV,2025,27.41230000000
+0,2050,R1,solarPV,2025,27.41230000000
+0,2054,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2040,10.99310000000
+1,2049,R1,solarPV,2040,10.99310000000
+1,2050,R1,solarPV,2040,10.99310000000
+1,2054,R1,solarPV,2040,10.99310000000
+1,2055,R1,solarPV,2040,10.99310000000
+1,2069,R1,solarPV,2040,10.99310000000
+2,2050,R1,solarPV,2045,26.98730000000
+2,2054,R1,solarPV,2045,26.98730000000
+2,2055,R1,solarPV,2045,26.98730000000
+2,2069,R1,solarPV,2045,26.98730000000
+2,2070,R1,solarPV,2045,26.98730000000
+2,2074,R1,solarPV,2045,26.98730000000
+3,2045,R1,windturbine,2020,15.17550000000
+3,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index 7ecfe57c..dec1fce5 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,21 +1,19 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,8.41130000000
-2,2054,R1,2025,solarPV,8.41130000000
-3,2050,R1,2025,windturbine,10.02420000000
-3,2054,R1,2025,windturbine,10.02420000000
-4,2050,R1,2035,solarPV,10.27940000000
-4,2054,R1,2035,solarPV,10.27940000000
-4,2055,R1,2035,solarPV,10.27940000000
-4,2064,R1,2035,solarPV,10.27940000000
-5,2050,R1,2045,solarPV,35.69840000000
-5,2054,R1,2045,solarPV,35.69840000000
-5,2055,R1,2045,solarPV,35.69840000000
-5,2064,R1,2045,solarPV,35.69840000000
-5,2065,R1,2045,solarPV,35.69840000000
-5,2074,R1,2045,solarPV,35.69840000000
-6,2050,R1,2045,windturbine,13.74440000000
-6,2054,R1,2045,windturbine,13.74440000000
-6,2055,R1,2045,windturbine,13.74440000000
-6,2064,R1,2045,windturbine,13.74440000000
-6,2065,R1,2045,windturbine,13.74440000000
-6,2074,R1,2045,windturbine,13.74440000000
+1,2050,R1,2025,solarPV,27.41230000000
+1,2054,R1,2025,solarPV,27.41230000000
+2,2050,R1,2040,solarPV,10.99310000000
+2,2054,R1,2040,solarPV,10.99310000000
+2,2055,R1,2040,solarPV,10.99310000000
+2,2069,R1,2040,solarPV,10.99310000000
+3,2050,R1,2045,solarPV,26.98730000000
+3,2054,R1,2045,solarPV,26.98730000000
+3,2055,R1,2045,solarPV,26.98730000000
+3,2069,R1,2045,solarPV,26.98730000000
+3,2070,R1,2045,solarPV,26.98730000000
+3,2074,R1,2045,solarPV,26.98730000000
+4,2055,R1,2050,solarPV,17.07570000000
+4,2069,R1,2050,solarPV,17.07570000000
+4,2070,R1,2050,solarPV,17.07570000000
+4,2074,R1,2050,solarPV,17.07570000000
+4,2075,R1,2050,solarPV,17.07570000000
+4,2079,R1,2050,solarPV,17.07570000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
index 9458be5c..1d1cd64d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 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
+1,2025,R1,heatpump,2020,109.50000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
index db6e6073..910a9683 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+1,2025,R1,2020,heatpump,109.50000000000
+1,2030,R1,2020,heatpump,109.50000000000
+1,2034,R1,2020,heatpump,109.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
index 1434998a..e29079aa 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -1,9 +1,9 @@
 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
-1,2030,R1,heatpump,2020,119.00000000000
-1,2034,R1,heatpump,2020,119.00000000000
-2,2035,R1,heatpump,2030,128.80000000000
-2,2040,R1,heatpump,2030,128.80000000000
-2,2044,R1,heatpump,2030,128.80000000000
+0,2035,R1,gasboiler,2030,3.60000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
+2,2035,R1,heatpump,2030,114.40000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
index 6d888046..8883a5e1 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+1,2035,R1,2030,gasboiler,3.60000000000
+1,2040,R1,2030,gasboiler,3.60000000000
+1,2044,R1,2030,gasboiler,3.60000000000
+2,2035,R1,2030,heatpump,114.40000000000
+2,2040,R1,2030,heatpump,114.40000000000
+2,2044,R1,2030,heatpump,114.40000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
index 0e46259b..9da5588c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -1,11 +1,11 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,7.20000000000
-0,2044,R1,gasboiler,2030,7.20000000000
-1,2045,R1,gasboiler,2040,7.44000000000
-1,2050,R1,gasboiler,2040,7.44000000000
-1,2054,R1,gasboiler,2040,7.44000000000
-2,2040,R1,heatpump,2030,128.80000000000
-2,2044,R1,heatpump,2030,128.80000000000
-3,2045,R1,heatpump,2040,140.56000000000
-3,2050,R1,heatpump,2040,140.56000000000
-3,2054,R1,heatpump,2040,140.56000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+1,2045,R1,gasboiler,2040,3.72000000000
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
+3,2045,R1,heatpump,2040,120.28000000000
+3,2050,R1,heatpump,2040,120.28000000000
+3,2054,R1,heatpump,2040,120.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
index 799a0664..cc994105 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+2,2045,R1,2040,gasboiler,3.72000000000
+2,2050,R1,2040,gasboiler,3.72000000000
+2,2054,R1,2040,gasboiler,3.72000000000
+3,2045,R1,2040,heatpump,120.28000000000
+3,2050,R1,2040,heatpump,120.28000000000
+3,2054,R1,2040,heatpump,120.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
index 85bfbefa..081c315b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+2,2050,R1,2040,gasboiler,3.72000000000
+2,2054,R1,2040,gasboiler,3.72000000000
+3,2050,R1,2040,heatpump,120.28000000000
+3,2054,R1,2040,heatpump,120.28000000000
+4,2055,R1,2050,gasboiler,2.66400000000
+4,2064,R1,2050,gasboiler,2.66400000000
+5,2055,R1,2050,heatpump,74.33600000000
+5,2064,R1,2050,heatpump,74.33600000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index 57fe2699..26b72143 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-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,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.05820000000
+0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.27510000000
 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
+0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,3.76770000000
 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,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.08730000000
+1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.91270000000
 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
+1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,5.65150000000
 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,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.05820000000
+2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.27510000000
 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
+2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,3.76770000000
 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,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.08730000000
+3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.91270000000
 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
+3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,5.65150000000
 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,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.17470000000
+4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.82530000000
 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
+4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,11.30310000000
 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,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.11640000000
+5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.55020000000
 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
+5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,7.53540000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index 1339d7d2..c951d449 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-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,2025,0,R1,2020,gasboiler,all-year,all-week,night,0.05820000000
+0,heat,2025,1,R1,2020,heatpump,all-year,all-week,night,1.27510000000
 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
+0,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,night,3.76770000000
+1,heat,2025,0,R1,2020,gasboiler,all-year,all-week,morning,0.08730000000
+1,heat,2025,1,R1,2020,heatpump,all-year,all-week,morning,1.91270000000
 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
+1,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,morning,5.65150000000
+2,heat,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,0.05820000000
+2,heat,2025,1,R1,2020,heatpump,all-year,all-week,afternoon,1.27510000000
 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
+2,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,3.76770000000
+3,heat,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,0.08730000000
+3,heat,2025,1,R1,2020,heatpump,all-year,all-week,early-peak,1.91270000000
 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
+3,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,5.65150000000
+4,heat,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,0.17470000000
+4,heat,2025,1,R1,2020,heatpump,all-year,all-week,late-peak,3.82530000000
 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
+4,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,11.30310000000
+5,heat,2025,0,R1,2020,gasboiler,all-year,all-week,evening,0.11640000000
+5,heat,2025,1,R1,2020,heatpump,all-year,all-week,evening,2.55020000000
 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
+5,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,evening,7.53540000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index 9c87f423..f3e4c392 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+0,heat,2035,0,R1,gasboiler,2030,all-year,all-week,night,0.06100000000
+0,heat,2035,2,R1,heatpump,2030,all-year,all-week,night,1.93900000000
+0,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,night,3.94840000000
 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
+1,heat,2035,0,R1,gasboiler,2030,all-year,all-week,morning,0.09150000000
+1,heat,2035,2,R1,heatpump,2030,all-year,all-week,morning,2.90850000000
+1,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,morning,5.92260000000
 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
+2,heat,2035,0,R1,gasboiler,2030,all-year,all-week,afternoon,0.06100000000
+2,heat,2035,2,R1,heatpump,2030,all-year,all-week,afternoon,1.93900000000
+2,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,afternoon,3.94840000000
 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
+3,heat,2035,0,R1,gasboiler,2030,all-year,all-week,early-peak,0.09150000000
+3,heat,2035,2,R1,heatpump,2030,all-year,all-week,early-peak,2.90850000000
+3,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,early-peak,5.92260000000
 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
+4,heat,2035,0,R1,gasboiler,2030,all-year,all-week,late-peak,0.18310000000
+4,heat,2035,2,R1,heatpump,2030,all-year,all-week,late-peak,5.81690000000
+4,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,late-peak,11.84520000000
 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
+5,heat,2035,0,R1,gasboiler,2030,all-year,all-week,evening,0.12200000000
+5,heat,2035,2,R1,heatpump,2030,all-year,all-week,evening,3.87800000000
+5,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,evening,7.89680000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index f8de2157..1cad44f0 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+0,heat,2035,1,R1,2030,gasboiler,all-year,all-week,night,0.06100000000
+0,heat,2035,2,R1,2030,heatpump,all-year,all-week,night,1.93900000000
+0,heat,2040,1,R1,2030,gasboiler,all-year,all-week,night,0.07120000000
+0,heat,2040,2,R1,2030,heatpump,all-year,all-week,night,2.26210000000
+0,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,night,3.94840000000
+0,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,night,4.60650000000
+1,heat,2035,1,R1,2030,gasboiler,all-year,all-week,morning,0.09150000000
+1,heat,2035,2,R1,2030,heatpump,all-year,all-week,morning,2.90850000000
+1,heat,2040,1,R1,2030,gasboiler,all-year,all-week,morning,0.10680000000
+1,heat,2040,2,R1,2030,heatpump,all-year,all-week,morning,3.39320000000
+1,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,morning,5.92260000000
+1,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,morning,6.90970000000
+2,heat,2035,1,R1,2030,gasboiler,all-year,all-week,afternoon,0.06100000000
+2,heat,2035,2,R1,2030,heatpump,all-year,all-week,afternoon,1.93900000000
+2,heat,2040,1,R1,2030,gasboiler,all-year,all-week,afternoon,0.07120000000
+2,heat,2040,2,R1,2030,heatpump,all-year,all-week,afternoon,2.26210000000
+2,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,afternoon,3.94840000000
+2,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,afternoon,4.60650000000
+3,heat,2035,1,R1,2030,gasboiler,all-year,all-week,early-peak,0.09150000000
+3,heat,2035,2,R1,2030,heatpump,all-year,all-week,early-peak,2.90850000000
+3,heat,2040,1,R1,2030,gasboiler,all-year,all-week,early-peak,0.10680000000
+3,heat,2040,2,R1,2030,heatpump,all-year,all-week,early-peak,3.39320000000
+3,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,early-peak,5.92260000000
+3,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,early-peak,6.90970000000
+4,heat,2035,1,R1,2030,gasboiler,all-year,all-week,late-peak,0.18310000000
+4,heat,2035,2,R1,2030,heatpump,all-year,all-week,late-peak,5.81690000000
+4,heat,2040,1,R1,2030,gasboiler,all-year,all-week,late-peak,0.21360000000
+4,heat,2040,2,R1,2030,heatpump,all-year,all-week,late-peak,6.78640000000
+4,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,late-peak,11.84520000000
+4,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,late-peak,13.81940000000
+5,heat,2035,1,R1,2030,gasboiler,all-year,all-week,evening,0.12200000000
+5,heat,2035,2,R1,2030,heatpump,all-year,all-week,evening,3.87800000000
+5,heat,2040,1,R1,2030,gasboiler,all-year,all-week,evening,0.14240000000
+5,heat,2040,2,R1,2030,heatpump,all-year,all-week,evening,4.52430000000
+5,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,evening,7.89680000000
+5,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,evening,9.21290000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index 9a26b20d..e6895ac7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+0,heat,2040,0,R1,gasboiler,2030,all-year,all-week,night,0.07120000000
+0,heat,2040,2,R1,heatpump,2030,all-year,all-week,night,2.26210000000
+0,heat,2045,1,R1,gasboiler,2040,all-year,all-week,night,0.08000000000
+0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,2.58670000000
+0,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,night,4.60650000000
+0,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,night,5.17680000000
+1,heat,2040,0,R1,gasboiler,2030,all-year,all-week,morning,0.10680000000
+1,heat,2040,2,R1,heatpump,2030,all-year,all-week,morning,3.39320000000
+1,heat,2045,1,R1,gasboiler,2040,all-year,all-week,morning,0.12000000000
+1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,3.88000000000
+1,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,morning,6.90970000000
+1,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,morning,7.76520000000
+2,heat,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,0.07120000000
+2,heat,2040,2,R1,heatpump,2030,all-year,all-week,afternoon,2.26210000000
+2,heat,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,0.08000000000
+2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,2.58670000000
+2,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,4.60650000000
+2,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,5.17680000000
+3,heat,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,0.10680000000
+3,heat,2040,2,R1,heatpump,2030,all-year,all-week,early-peak,3.39320000000
+3,heat,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,0.12000000000
+3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,3.88000000000
+3,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,6.90970000000
+3,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,7.76520000000
+4,heat,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,0.21360000000
+4,heat,2040,2,R1,heatpump,2030,all-year,all-week,late-peak,6.78640000000
+4,heat,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,0.24000000000
+4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,7.76000000000
+4,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,13.81940000000
+4,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,15.53040000000
+5,heat,2040,0,R1,gasboiler,2030,all-year,all-week,evening,0.14240000000
+5,heat,2040,2,R1,heatpump,2030,all-year,all-week,evening,4.52430000000
+5,heat,2045,1,R1,gasboiler,2040,all-year,all-week,evening,0.16000000000
+5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,5.17330000000
+5,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,evening,9.21290000000
+5,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,evening,10.35360000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index cf942a49..1bdfa598 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+0,heat,2045,2,R1,2040,gasboiler,all-year,all-week,night,0.08000000000
+0,heat,2045,3,R1,2040,heatpump,all-year,all-week,night,2.58670000000
+0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,0.09000000000
+0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,2.91000000000
+0,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,night,5.17680000000
+0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,5.82390000000
+1,heat,2045,2,R1,2040,gasboiler,all-year,all-week,morning,0.12000000000
+1,heat,2045,3,R1,2040,heatpump,all-year,all-week,morning,3.88000000000
+1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,0.13500000000
+1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,4.36500000000
+1,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,morning,7.76520000000
+1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,8.73580000000
+2,heat,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.08000000000
+2,heat,2045,3,R1,2040,heatpump,all-year,all-week,afternoon,2.58670000000
+2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.09000000000
+2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,2.91000000000
+2,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,5.17680000000
+2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,5.82390000000
+3,heat,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.12000000000
+3,heat,2045,3,R1,2040,heatpump,all-year,all-week,early-peak,3.88000000000
+3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.13500000000
+3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,4.36500000000
+3,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,7.76520000000
+3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,8.73580000000
+4,heat,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,0.24000000000
+4,heat,2045,3,R1,2040,heatpump,all-year,all-week,late-peak,7.76000000000
+4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,0.27000000000
+4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,8.73000000000
+4,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,15.53040000000
+4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,17.47170000000
+5,heat,2045,2,R1,2040,gasboiler,all-year,all-week,evening,0.16000000000
+5,heat,2045,3,R1,2040,heatpump,all-year,all-week,evening,5.17330000000
+5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,0.18000000000
+5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,5.82000000000
+5,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,evening,10.35360000000
+5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,11.64780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 9d4b068a..474f31a7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-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
+0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,0.09000000000
+0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,2.91000000000
+0,heat,2055,4,R1,2050,gasboiler,all-year,all-week,night,0.10380000000
+0,heat,2055,5,R1,2050,heatpump,all-year,all-week,night,2.89620000000
+0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,5.82390000000
+0,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,night,6.71640000000
+1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,0.13500000000
+1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,4.36500000000
+1,heat,2055,4,R1,2050,gasboiler,all-year,all-week,morning,0.15570000000
+1,heat,2055,5,R1,2050,heatpump,all-year,all-week,morning,4.34430000000
+1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,8.73580000000
+1,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,morning,10.07460000000
+2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.09000000000
+2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,2.91000000000
+2,heat,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,0.10380000000
+2,heat,2055,5,R1,2050,heatpump,all-year,all-week,afternoon,2.89620000000
+2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,5.82390000000
+2,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,6.71640000000
+3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.13500000000
+3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,4.36500000000
+3,heat,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,0.15570000000
+3,heat,2055,5,R1,2050,heatpump,all-year,all-week,early-peak,4.34430000000
+3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,8.73580000000
+3,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,10.07460000000
+4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,0.27000000000
+4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,8.73000000000
+4,heat,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,0.31140000000
+4,heat,2055,5,R1,2050,heatpump,all-year,all-week,late-peak,8.68860000000
+4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,17.47170000000
+4,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,20.14920000000
+5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,0.18000000000
+5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,5.82000000000
+5,heat,2055,4,R1,2050,gasboiler,all-year,all-week,evening,0.20760000000
+5,heat,2055,5,R1,2050,heatpump,all-year,all-week,evening,5.79240000000
+5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,11.64780000000
+5,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,evening,13.43280000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
index 47c77448..dd05673c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
@@ -1,5 +1,5 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
-Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,1,-1,inf,Retrofit
-Agent3,A2,R1,LCOE,EAC,,0.5,0.5,,True,,,all,weighted_sum,1,-1,inf,New
-Agent4,A2,R1,LCOE,EAC,,0.5,0.5,,True,,,all,weighted_sum,1,-1,inf,Retrofit
+Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,New
+Agent2,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
+Agent3,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,New
+Agent4,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 24d6d72c..0ca888a8 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -21,12 +21,6 @@ def generate_model_1():
         shutil.rmtree(model_path)
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
 
-    # Modify MaxCapacityGrowth (Undocumented)
-    technodata_file = model_path / "technodata/residential/Technodata.csv"
-    df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityGrowth"] = 0.04
-    df.to_csv(technodata_file, index=False)
-
     # Copy agent A1 -> A2
     add_agent(
         model_path,
@@ -36,6 +30,12 @@ def generate_model_1():
         agentshare_retrofit="Agent4",
     )
 
+    # Split population between the two agents
+    agents_file = model_path / "technodata/Agents.csv"
+    df = pd.read_csv(agents_file)
+    df.loc[:, "Quantity"] = 0.5
+    df.to_csv(agents_file, index=False)
+
     # Split capacity equally between the two agents
     for sector in get_sectors(model_path):
         technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
@@ -65,8 +65,15 @@ def generate_model_2():
     df.loc[df["Name"] == "A2", "Objective2"] = "EAC"
     df.loc[df["Name"] == "A2", "DecisionMethod"] = "weighted_sum"
     df.loc[df["Name"] == "A2", ["ObjData1", "ObjData2"]] = 0.5
+    df.loc[df["Name"] == "A2", "Objsort2"] = True
     df.to_csv(agents_file, index=False)
 
+    # Modify residential sector MaxCapacityGrowth (Undocumented)
+    technodata_file = model_path / "technodata/residential/Technodata.csv"
+    df = pd.read_csv(technodata_file)
+    df.loc[1:, "MaxCapacityGrowth"] = 0.04
+    df.to_csv(technodata_file, index=False)
+
 
 if __name__ == "__main__":
     generate_model_1()

From abcbef1a2a8f9d6b12c76e3f3910f7f99d97d611 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 23 May 2024 14:49:46 +0100
Subject: [PATCH 168/419] Agents tutorial - plot all sectors, improve text

---
 .../2-add-agent/generate_models.py            |  2 +-
 docs/user-guide/add-agent.ipynb               | 95 ++++++++++---------
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 0ca888a8..b734f63f 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -68,7 +68,7 @@ def generate_model_2():
     df.loc[df["Name"] == "A2", "Objsort2"] = True
     df.to_csv(agents_file, index=False)
 
-    # Modify residential sector MaxCapacityGrowth (Undocumented)
+    # Modify residential sector MaxCapacityGrowth
     technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityGrowth"] = 0.04
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 5b9aa6d3..56a38884 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -24,18 +24,16 @@
    "source": [
     "To start with, we will copy the data from the first two rows of agent `A1`, creating a new agent `A2` with identical objectives to `A1`. \n",
     "\n",
-    "<!-- Notice how we edit the `AgentShare` column. This variable allows us to split the existing capacity between the two different agents. -->\n",
-    "\n",
-    "<!-- Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent A1 makes up 50% of the population, and A2 makes up the remaining 50% of the population. -->\n",
+    "Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent A1 makes up 50% of the population, and A2 makes up the remaining 50% of the population.\n",
     "\n",
     "Again, we only show some of the columns due to space constraints, however see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv) for the full file.\n",
     "\n",
-    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|…|Type|\n",
-    "|-|-|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Agent1|A1|R1|LCOE|||1||…|singleObj|…|New|\n",
-    "|Agent2|A1|R1|LCOE|||1||…|singleObj|…|Retrofit|\n",
-    "|**Agent3**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|…|**New**|\n",
-    "|**Agent4**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|…|**Retrofit**|"
+    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n",
+    "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Agent1|A1|R1|LCOE|||1||…|singleObj|**0.5**|…|New|\n",
+    "|Agent2|A1|R1|LCOE|||1||…|singleObj|**0.5**|…|Retrofit|\n",
+    "|**Agent3**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|**0.5**|…|**New**|\n",
+    "|**Agent4**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|**0.5**|…|**Retrofit**|"
    ]
   },
   {
@@ -63,7 +61,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will now save this file and run the new simulation model using the following command in Anaconda prompt:\n",
+    "We will now save this file and run the new simulation model using the following command-line prompt:\n",
     "\n",
     "    python -m muse settings.toml\n",
     "\n",
@@ -106,21 +104,24 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_sector = (\n",
-    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
-    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
+    "mca_capacity = pd.read_csv(\n",
+    "    \"../tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv\"\n",
     ")\n",
     "\n",
-    "g = sns.FacetGrid(power_sector, col=\"agent\")\n",
-    "g.map_dataframe(\n",
-    "    lambda data, **kwargs: data.pivot(\n",
-    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "    ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
-    ")\n",
-    "g.add_legend()\n",
-    "g.set_ylabels(\"Capacity (PJ)\")"
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"year\", \"agent\", \"technology\"]).sum().reset_index()\n",
+    "    )\n",
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"agent\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
+    "    g.add_legend()\n",
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
   {
@@ -136,21 +137,25 @@
    "source": [
     "Next, we will see what occurs if the agents invest based upon different investment strategies. We will modify `A2` to make investments based upon a mixture of [levelised cost of electricity (LCOE)](https://en.wikipedia.org/wiki/Levelized_cost_of_energy) and [equivalent annual cost (EAC)](https://en.wikipedia.org/wiki/Equivalent_annual_cost). These two objectives will be combined by calculating a weighted sum of the two when comparing potential investment options. We will give both LCOE and EAC a relative weight value of 0.5.\n",
     "\n",
-    "To do this, we need to modify the `Objective2`, `ObjData1`, `ObjData2` and `DecisionMethod` columns in the ```Agents.csv``` file, to look like the following:\n",
+    "To do this, we need to modify the `Objective2`, `ObjData1`, `ObjData2`, `Objsort2` and `DecisionMethod` columns in the ```Agents.csv``` file, to look like the following:\n",
     "\n",
-    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n",
-    "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Agent1|A1|R1|LCOE|||1||…|singleObj|0.5|…|New|\n",
-    "|Agent2|A1|R1|LCOE|||1||…|singleObj|0.5|…|Retrofit|\n",
-    "|Agent3|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|**…**|**weighted_sum**|0.5|…|New|\n",
-    "|Agent4|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|**…**|**weighted_sum**|0.5|…|Retrofit|"
+    "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|Objsort2|…|DecisionMethod|Quantity|…|Type|\n",
+    "|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Agent1|A1|R1|LCOE|||1||…||…|singleObj|0.5|…|New|\n",
+    "|Agent2|A1|R1|LCOE|||1||…||…|singleObj|0.5|…|Retrofit|\n",
+    "|Agent3|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|New|\n",
+    "|Agent4|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|Retrofit|"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will then re-run the simulation, and visualise the results like before:"
+    "The `Objsort2` parameter indicates that the new objective should be minimised, rather than maximised.\n",
+    "\n",
+    "We will then re-run the simulation. You may find that the simulation fails to complete due to insufficient capacity limits in the `residential` sector. In this case, try doubling `MaxCapacityGrowth` for `gasboiler` and `heatpump` in the `technodata/residential/Technodata.csv` file to 0.04 and running the simulation again.\n",
+    "\n",
+    "Once the model has run to completion, we can visualise the results like before:"
    ]
   },
   {
@@ -162,21 +167,21 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv\"\n",
     ")\n",
-    "power_sector = (\n",
-    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
-    "    .groupby([\"technology\", \"year\", \"agent\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
-    ")\n",
     "\n",
-    "g = sns.FacetGrid(power_sector, col=\"agent\")\n",
-    "g.map_dataframe(\n",
-    "    lambda data, **kwargs: data.pivot(\n",
-    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "    ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
-    ")\n",
-    "g.add_legend()\n",
-    "g.set_ylabels(\"Capacity (PJ)\")"
+    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "    sector_capacity = (\n",
+    "        sector_data.groupby([\"year\", \"agent\", \"technology\"]).sum().reset_index()\n",
+    "    )\n",
+    "    g = sns.FacetGrid(data=sector_capacity, col=\"agent\")\n",
+    "    g.map_dataframe(\n",
+    "        lambda data, **kwargs: data.pivot(\n",
+    "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "    )\n",
+    "    g.add_legend()\n",
+    "    g.set_ylabels(\"Capacity (PJ)\")\n",
+    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
   {

From b836be5c68d8469be6ce41cf49f53bfd19883c50 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 24 May 2024 10:15:25 +0100
Subject: [PATCH 169/419] Update homerenergy links

---
 src/muse/objectives.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index d73dec4e..81651df5 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -523,7 +523,7 @@ def capital_recovery_factor(
     Energy.
 
     .. _capital recovery factor:
-        https://www.homerenergy.com/products/pro/docs/3.11/capital_recovery_factor.html
+        https://www.homerenergy.com/products/pro/docs/3.15/capital_recovery_factor.html
 
     Arguments:
         agent: The agent of interest
@@ -702,7 +702,7 @@ def net_present_value(
     it. Follows the definition of the `net present cost`_ given by HOMER Energy.
     Metrics are calculated
     .. _net present cost:
-    ..      https://www.homerenergy.com/products/pro/docs/3.11/net_present_cost.html
+    ..      https://www.homerenergy.com/products/pro/docs/3.15/net_present_cost.html
 
     - energy commodities INPUTS are related to fuel costs
     - environmental commodities OUTPUTS are related to environmental costs
@@ -910,7 +910,7 @@ def equivalent_annual_cost(
     `annualized cost`_ expression given by HOMER Energy.
 
     .. _annualized cost:
-        https://www.homerenergy.com/products/pro/docs/3.11/annualized_cost.html
+        https://www.homerenergy.com/products/pro/docs/3.15/annualized_cost.html
 
     Arguments:
         agent: The agent of interest

From c4f112f2545f7b37e8171fa35e49e41478e3fc17 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 24 May 2024 13:16:10 +0100
Subject: [PATCH 170/419] Re-running simulations

---
 .../Results/Gas/Capacity/2025.csv             |   5 -
 .../Results/Gas/Capacity/2035.csv             |  11 -
 .../Results/Gas/Capacity/2045.csv             |   7 -
 .../Results/Gas/Capacity/2050.csv             |   7 -
 .../Results/Power/Capacity/2025.csv           |  35 -
 .../Results/Power/Capacity/2035.csv           |  59 --
 .../Results/Power/Capacity/2045.csv           | 103 ---
 .../Results/Power/Capacity/2050.csv           | 101 ---
 .../Results/Residential/Capacity/2025.csv     |  25 -
 .../Results/Residential/Capacity/2035.csv     |  33 -
 .../Results/Residential/Capacity/2045.csv     |  25 -
 .../Results/Residential/Capacity/2050.csv     |  21 -
 .../Results/Residential/Supply/2025.csv       | 169 ----
 .../Results/Residential/Supply/2035.csv       | 193 -----
 .../Results/Residential/Supply/2045.csv       | 145 ----
 .../Results/Residential/Supply/2050.csv       |  97 ---
 .../Results/Gas/Capacity/2025.csv             |  16 +-
 .../Results/Gas/Capacity/2030.csv             |  38 +-
 .../Results/Gas/Capacity/2035.csv             |  34 +-
 .../Results/Gas/Capacity/2040.csv             |  28 +-
 .../Results/Gas/Capacity/2045.csv             |  22 +-
 .../Results/Gas/Capacity/2050.csv             |  22 +-
 .../Results/MCACapacity.csv                   | 130 +--
 .../1-exogenous-demand/Results/MCAPrices.csv  | 544 ++++++-------
 .../Results/Power/Capacity/2025.csv           |  28 +-
 .../Results/Power/Capacity/2030.csv           |  78 +-
 .../Results/Power/Capacity/2035.csv           | 108 +--
 .../Results/Power/Capacity/2040.csv           | 137 ++--
 .../Results/Power/Capacity/2045.csv           | 150 ++--
 .../Results/Power/Capacity/2050.csv           | 204 ++---
 .../Results/Residential/Capacity/2025.csv     |  64 +-
 .../Results/Residential/Capacity/2030.csv     |  64 +-
 .../Results/Residential/Capacity/2035.csv     |  96 ++-
 .../Results/Residential/Capacity/2040.csv     |  72 +-
 .../Results/Residential/Capacity/2045.csv     |  56 +-
 .../Results/Residential/Capacity/2050.csv     |  80 +-
 .../Results/Residential/Supply/2025.csv       | 384 ++++-----
 .../Results/Residential/Supply/2030.csv       | 768 +++++++++---------
 .../Results/Residential/Supply/2035.csv       | 768 ++++++++++--------
 .../Results/Residential/Supply/2040.csv       | 640 ++++++++++-----
 .../Results/Residential/Supply/2045.csv       | 448 ++++++----
 .../Results/Residential/Supply/2050.csv       | 512 ++++++------
 .../technodata/residential/Technodata.csv     |  16 +-
 43 files changed, 3094 insertions(+), 3449 deletions(-)
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv

diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 842d3b01..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index a783d6f6..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,5.28440000000
-1,2040,R1,2030,gassupply1,5.28440000000
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
-3,2035,R2,2030,gassupply1,5.28440000000
-3,2040,R2,2030,gassupply1,5.28440000000
-3,2045,R2,2030,gassupply1,5.28440000000
-3,2050,R2,2030,gassupply1,5.28440000000
-3,2069,R2,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index 4ed429aa..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,5.28440000000
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
-3,2045,R2,2030,gassupply1,5.28440000000
-3,2050,R2,2030,gassupply1,5.28440000000
-3,2069,R2,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index 7d594329..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,5.28440000000
-1,2055,R1,2030,gassupply1,5.28440000000
-1,2069,R1,2030,gassupply1,5.28440000000
-3,2050,R2,2030,gassupply1,5.28440000000
-3,2055,R2,2030,gassupply1,5.28440000000
-3,2069,R2,2030,gassupply1,5.28440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
deleted file mode 100644
index 9e44d4d6..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2025,gasCCGT,R2,2020,1.00000000000
-2,2025,solarPV,R1,2020,6.75000000000
-2,2030,solarPV,R1,2020,6.75000000000
-2,2035,solarPV,R1,2020,6.75000000000
-2,2040,solarPV,R1,2020,6.75000000000
-2,2045,solarPV,R1,2020,6.75000000000
-2,2049,solarPV,R1,2020,6.75000000000
-3,2030,solarPV,R1,2025,9.15000000000
-3,2035,solarPV,R1,2025,9.15000000000
-3,2040,solarPV,R1,2025,9.15000000000
-3,2045,solarPV,R1,2025,9.15000000000
-3,2049,solarPV,R1,2025,9.15000000000
-3,2050,solarPV,R1,2025,9.15000000000
-3,2054,solarPV,R1,2025,9.15000000000
-4,2030,solarPV,R2,2025,9.15000000000
-4,2035,solarPV,R2,2025,9.15000000000
-4,2040,solarPV,R2,2025,9.15000000000
-4,2045,solarPV,R2,2025,9.15000000000
-4,2049,solarPV,R2,2025,9.15000000000
-4,2050,solarPV,R2,2025,9.15000000000
-4,2054,solarPV,R2,2025,9.15000000000
-5,2025,windturbine,R1,2020,10.00000000000
-5,2030,windturbine,R1,2020,10.00000000000
-5,2035,windturbine,R1,2020,10.00000000000
-5,2040,windturbine,R1,2020,10.00000000000
-5,2045,windturbine,R1,2020,10.00000000000
-5,2049,windturbine,R1,2020,10.00000000000
-6,2025,windturbine,R2,2020,16.75000000000
-6,2030,windturbine,R2,2020,16.75000000000
-6,2035,windturbine,R2,2020,16.75000000000
-6,2040,windturbine,R2,2020,16.75000000000
-6,2045,windturbine,R2,2020,16.75000000000
-6,2049,windturbine,R2,2020,16.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
deleted file mode 100644
index da743220..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,59 +0,0 @@
-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,solarPV,9.15000000000
-3,2040,R1,2025,solarPV,9.15000000000
-3,2045,R1,2025,solarPV,9.15000000000
-3,2049,R1,2025,solarPV,9.15000000000
-3,2050,R1,2025,solarPV,9.15000000000
-3,2054,R1,2025,solarPV,9.15000000000
-4,2035,R1,2030,solarPV,6.00000000000
-4,2040,R1,2030,solarPV,6.00000000000
-4,2045,R1,2030,solarPV,6.00000000000
-4,2049,R1,2030,solarPV,6.00000000000
-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,2040,R1,2035,solarPV,9.19000000000
-5,2045,R1,2035,solarPV,9.19000000000
-5,2049,R1,2035,solarPV,9.19000000000
-5,2050,R1,2035,solarPV,9.19000000000
-5,2054,R1,2035,solarPV,9.19000000000
-5,2055,R1,2035,solarPV,9.19000000000
-5,2059,R1,2035,solarPV,9.19000000000
-5,2060,R1,2035,solarPV,9.19000000000
-5,2064,R1,2035,solarPV,9.19000000000
-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,2035,R2,2025,solarPV,9.15000000000
-8,2040,R2,2025,solarPV,9.15000000000
-8,2045,R2,2025,solarPV,9.15000000000
-8,2049,R2,2025,solarPV,9.15000000000
-8,2050,R2,2025,solarPV,9.15000000000
-8,2054,R2,2025,solarPV,9.15000000000
-9,2035,R2,2030,solarPV,6.00000000000
-9,2040,R2,2030,solarPV,6.00000000000
-9,2045,R2,2030,solarPV,6.00000000000
-9,2049,R2,2030,solarPV,6.00000000000
-9,2050,R2,2030,solarPV,6.00000000000
-9,2054,R2,2030,solarPV,6.00000000000
-9,2055,R2,2030,solarPV,6.00000000000
-9,2059,R2,2030,solarPV,6.00000000000
-10,2040,R2,2035,solarPV,9.19000000000
-10,2045,R2,2035,solarPV,9.19000000000
-10,2049,R2,2035,solarPV,9.19000000000
-10,2050,R2,2035,solarPV,9.19000000000
-10,2054,R2,2035,solarPV,9.19000000000
-10,2055,R2,2035,solarPV,9.19000000000
-10,2059,R2,2035,solarPV,9.19000000000
-10,2060,R2,2035,solarPV,9.19000000000
-10,2064,R2,2035,solarPV,9.19000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
deleted file mode 100644
index d67966d3..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,103 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,solarPV,R1,2020,6.75000000000
-0,2049,solarPV,R1,2020,6.75000000000
-1,2045,solarPV,R1,2025,9.15000000000
-1,2049,solarPV,R1,2025,9.15000000000
-1,2050,solarPV,R1,2025,9.15000000000
-1,2054,solarPV,R1,2025,9.15000000000
-2,2045,solarPV,R1,2030,6.00000000000
-2,2049,solarPV,R1,2030,6.00000000000
-2,2050,solarPV,R1,2030,6.00000000000
-2,2054,solarPV,R1,2030,6.00000000000
-2,2055,solarPV,R1,2030,6.00000000000
-2,2059,solarPV,R1,2030,6.00000000000
-3,2045,solarPV,R1,2035,9.19000000000
-3,2049,solarPV,R1,2035,9.19000000000
-3,2050,solarPV,R1,2035,9.19000000000
-3,2054,solarPV,R1,2035,9.19000000000
-3,2055,solarPV,R1,2035,9.19000000000
-3,2059,solarPV,R1,2035,9.19000000000
-3,2060,solarPV,R1,2035,9.19000000000
-3,2064,solarPV,R1,2035,9.19000000000
-4,2045,solarPV,R1,2040,6.00000000000
-4,2049,solarPV,R1,2040,6.00000000000
-4,2050,solarPV,R1,2040,6.00000000000
-4,2054,solarPV,R1,2040,6.00000000000
-4,2055,solarPV,R1,2040,6.00000000000
-4,2059,solarPV,R1,2040,6.00000000000
-4,2060,solarPV,R1,2040,6.00000000000
-4,2064,solarPV,R1,2040,6.00000000000
-4,2065,solarPV,R1,2040,6.00000000000
-4,2069,solarPV,R1,2040,6.00000000000
-5,2050,solarPV,R1,2045,16.91000000000
-5,2054,solarPV,R1,2045,16.91000000000
-5,2055,solarPV,R1,2045,16.91000000000
-5,2059,solarPV,R1,2045,16.91000000000
-5,2060,solarPV,R1,2045,16.91000000000
-5,2064,solarPV,R1,2045,16.91000000000
-5,2065,solarPV,R1,2045,16.91000000000
-5,2069,solarPV,R1,2045,16.91000000000
-5,2070,solarPV,R1,2045,16.91000000000
-5,2074,solarPV,R1,2045,16.91000000000
-6,2045,solarPV,R2,2025,9.15000000000
-6,2049,solarPV,R2,2025,9.15000000000
-6,2050,solarPV,R2,2025,9.15000000000
-6,2054,solarPV,R2,2025,9.15000000000
-7,2045,solarPV,R2,2030,6.00000000000
-7,2049,solarPV,R2,2030,6.00000000000
-7,2050,solarPV,R2,2030,6.00000000000
-7,2054,solarPV,R2,2030,6.00000000000
-7,2055,solarPV,R2,2030,6.00000000000
-7,2059,solarPV,R2,2030,6.00000000000
-8,2045,solarPV,R2,2035,9.19000000000
-8,2049,solarPV,R2,2035,9.19000000000
-8,2050,solarPV,R2,2035,9.19000000000
-8,2054,solarPV,R2,2035,9.19000000000
-8,2055,solarPV,R2,2035,9.19000000000
-8,2059,solarPV,R2,2035,9.19000000000
-8,2060,solarPV,R2,2035,9.19000000000
-8,2064,solarPV,R2,2035,9.19000000000
-9,2045,solarPV,R2,2040,6.00000000000
-9,2049,solarPV,R2,2040,6.00000000000
-9,2050,solarPV,R2,2040,6.00000000000
-9,2054,solarPV,R2,2040,6.00000000000
-9,2055,solarPV,R2,2040,6.00000000000
-9,2059,solarPV,R2,2040,6.00000000000
-9,2060,solarPV,R2,2040,6.00000000000
-9,2064,solarPV,R2,2040,6.00000000000
-9,2065,solarPV,R2,2040,6.00000000000
-9,2069,solarPV,R2,2040,6.00000000000
-10,2050,solarPV,R2,2045,16.91000000000
-10,2054,solarPV,R2,2045,16.91000000000
-10,2055,solarPV,R2,2045,16.91000000000
-10,2059,solarPV,R2,2045,16.91000000000
-10,2060,solarPV,R2,2045,16.91000000000
-10,2064,solarPV,R2,2045,16.91000000000
-10,2065,solarPV,R2,2045,16.91000000000
-10,2069,solarPV,R2,2045,16.91000000000
-10,2070,solarPV,R2,2045,16.91000000000
-10,2074,solarPV,R2,2045,16.91000000000
-11,2045,windturbine,R1,2020,10.00000000000
-11,2049,windturbine,R1,2020,10.00000000000
-12,2050,windturbine,R1,2045,6.75000000000
-12,2054,windturbine,R1,2045,6.75000000000
-12,2055,windturbine,R1,2045,6.75000000000
-12,2059,windturbine,R1,2045,6.75000000000
-12,2060,windturbine,R1,2045,6.75000000000
-12,2064,windturbine,R1,2045,6.75000000000
-12,2065,windturbine,R1,2045,6.75000000000
-12,2069,windturbine,R1,2045,6.75000000000
-12,2070,windturbine,R1,2045,6.75000000000
-12,2074,windturbine,R1,2045,6.75000000000
-13,2045,windturbine,R2,2020,16.75000000000
-13,2049,windturbine,R2,2020,16.75000000000
-14,2050,windturbine,R2,2045,6.75000000000
-14,2054,windturbine,R2,2045,6.75000000000
-14,2055,windturbine,R2,2045,6.75000000000
-14,2059,windturbine,R2,2045,6.75000000000
-14,2060,windturbine,R2,2045,6.75000000000
-14,2064,windturbine,R2,2045,6.75000000000
-14,2065,windturbine,R2,2045,6.75000000000
-14,2069,windturbine,R2,2045,6.75000000000
-14,2070,windturbine,R2,2045,6.75000000000
-14,2074,windturbine,R2,2045,6.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 26d73037..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,9.15000000000
-2,2054,R1,2025,solarPV,9.15000000000
-3,2050,R1,2030,solarPV,6.00000000000
-3,2054,R1,2030,solarPV,6.00000000000
-3,2055,R1,2030,solarPV,6.00000000000
-3,2059,R1,2030,solarPV,6.00000000000
-4,2050,R1,2035,solarPV,9.19000000000
-4,2054,R1,2035,solarPV,9.19000000000
-4,2055,R1,2035,solarPV,9.19000000000
-4,2059,R1,2035,solarPV,9.19000000000
-4,2060,R1,2035,solarPV,9.19000000000
-4,2064,R1,2035,solarPV,9.19000000000
-5,2050,R1,2040,solarPV,6.00000000000
-5,2054,R1,2040,solarPV,6.00000000000
-5,2055,R1,2040,solarPV,6.00000000000
-5,2059,R1,2040,solarPV,6.00000000000
-5,2060,R1,2040,solarPV,6.00000000000
-5,2064,R1,2040,solarPV,6.00000000000
-5,2065,R1,2040,solarPV,6.00000000000
-5,2069,R1,2040,solarPV,6.00000000000
-6,2050,R1,2045,solarPV,16.91000000000
-6,2054,R1,2045,solarPV,16.91000000000
-6,2055,R1,2045,solarPV,16.91000000000
-6,2059,R1,2045,solarPV,16.91000000000
-6,2060,R1,2045,solarPV,16.91000000000
-6,2064,R1,2045,solarPV,16.91000000000
-6,2065,R1,2045,solarPV,16.91000000000
-6,2069,R1,2045,solarPV,16.91000000000
-6,2070,R1,2045,solarPV,16.91000000000
-6,2074,R1,2045,solarPV,16.91000000000
-7,2050,R1,2045,windturbine,6.75000000000
-7,2054,R1,2045,windturbine,6.75000000000
-7,2055,R1,2045,windturbine,6.75000000000
-7,2059,R1,2045,windturbine,6.75000000000
-7,2060,R1,2045,windturbine,6.75000000000
-7,2064,R1,2045,windturbine,6.75000000000
-7,2065,R1,2045,windturbine,6.75000000000
-7,2069,R1,2045,windturbine,6.75000000000
-7,2070,R1,2045,windturbine,6.75000000000
-7,2074,R1,2045,windturbine,6.75000000000
-8,2055,R1,2050,solarPV,9.15000000000
-8,2059,R1,2050,solarPV,9.15000000000
-8,2060,R1,2050,solarPV,9.15000000000
-8,2064,R1,2050,solarPV,9.15000000000
-8,2065,R1,2050,solarPV,9.15000000000
-8,2069,R1,2050,solarPV,9.15000000000
-8,2070,R1,2050,solarPV,9.15000000000
-8,2074,R1,2050,solarPV,9.15000000000
-8,2075,R1,2050,solarPV,9.15000000000
-8,2079,R1,2050,solarPV,9.15000000000
-10,2050,R2,2025,solarPV,9.15000000000
-10,2054,R2,2025,solarPV,9.15000000000
-11,2050,R2,2030,solarPV,6.00000000000
-11,2054,R2,2030,solarPV,6.00000000000
-11,2055,R2,2030,solarPV,6.00000000000
-11,2059,R2,2030,solarPV,6.00000000000
-12,2050,R2,2035,solarPV,9.19000000000
-12,2054,R2,2035,solarPV,9.19000000000
-12,2055,R2,2035,solarPV,9.19000000000
-12,2059,R2,2035,solarPV,9.19000000000
-12,2060,R2,2035,solarPV,9.19000000000
-12,2064,R2,2035,solarPV,9.19000000000
-13,2050,R2,2040,solarPV,6.00000000000
-13,2054,R2,2040,solarPV,6.00000000000
-13,2055,R2,2040,solarPV,6.00000000000
-13,2059,R2,2040,solarPV,6.00000000000
-13,2060,R2,2040,solarPV,6.00000000000
-13,2064,R2,2040,solarPV,6.00000000000
-13,2065,R2,2040,solarPV,6.00000000000
-13,2069,R2,2040,solarPV,6.00000000000
-14,2050,R2,2045,solarPV,16.91000000000
-14,2054,R2,2045,solarPV,16.91000000000
-14,2055,R2,2045,solarPV,16.91000000000
-14,2059,R2,2045,solarPV,16.91000000000
-14,2060,R2,2045,solarPV,16.91000000000
-14,2064,R2,2045,solarPV,16.91000000000
-14,2065,R2,2045,solarPV,16.91000000000
-14,2069,R2,2045,solarPV,16.91000000000
-14,2070,R2,2045,solarPV,16.91000000000
-14,2074,R2,2045,solarPV,16.91000000000
-15,2050,R2,2045,windturbine,6.75000000000
-15,2054,R2,2045,windturbine,6.75000000000
-15,2055,R2,2045,windturbine,6.75000000000
-15,2059,R2,2045,windturbine,6.75000000000
-15,2060,R2,2045,windturbine,6.75000000000
-15,2064,R2,2045,windturbine,6.75000000000
-15,2065,R2,2045,windturbine,6.75000000000
-15,2069,R2,2045,windturbine,6.75000000000
-15,2070,R2,2045,windturbine,6.75000000000
-15,2074,R2,2045,windturbine,6.75000000000
-16,2055,R2,2050,solarPV,9.15000000000
-16,2059,R2,2050,solarPV,9.15000000000
-16,2060,R2,2050,solarPV,9.15000000000
-16,2064,R2,2050,solarPV,9.15000000000
-16,2065,R2,2050,solarPV,9.15000000000
-16,2069,R2,2050,solarPV,9.15000000000
-16,2070,R2,2050,solarPV,9.15000000000
-16,2074,R2,2050,solarPV,9.15000000000
-16,2075,R2,2050,solarPV,9.15000000000
-16,2079,R2,2050,solarPV,9.15000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 34d42206..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,4.10000000000
-1,2034,gasboiler,R1,2025,4.10000000000
-1,2035,gasboiler,R1,2025,4.10000000000
-1,2039,gasboiler,R1,2025,4.10000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,4.10000000000
-3,2034,gasboiler,R2,2025,4.10000000000
-3,2035,gasboiler,R2,2025,4.10000000000
-3,2039,gasboiler,R2,2025,4.10000000000
-4,2025,heatpump,R1,2020,19.00000000000
-4,2030,heatpump,R1,2020,19.00000000000
-4,2034,heatpump,R1,2020,19.00000000000
-5,2030,heatpump,R1,2025,6.90000000000
-5,2034,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2025,6.90000000000
-5,2039,heatpump,R1,2025,6.90000000000
-6,2025,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2020,19.00000000000
-6,2034,heatpump,R2,2020,19.00000000000
-7,2030,heatpump,R2,2025,6.90000000000
-7,2034,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index fa9e8bca..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2040,gasboiler,R1,2035,0.91000000000
-1,2044,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R1,2035,0.91000000000
-1,2049,gasboiler,R1,2035,0.91000000000
-2,2035,gasboiler,R2,2025,4.10000000000
-2,2039,gasboiler,R2,2025,4.10000000000
-3,2040,gasboiler,R2,2035,0.91000000000
-3,2044,gasboiler,R2,2035,0.91000000000
-3,2045,gasboiler,R2,2035,0.91000000000
-3,2049,gasboiler,R2,2035,0.91000000000
-4,2035,heatpump,R1,2025,6.90000000000
-4,2039,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2030,25.00000000000
-5,2039,heatpump,R1,2030,25.00000000000
-5,2040,heatpump,R1,2030,25.00000000000
-5,2044,heatpump,R1,2030,25.00000000000
-6,2040,heatpump,R1,2035,16.09000000000
-6,2044,heatpump,R1,2035,16.09000000000
-6,2045,heatpump,R1,2035,16.09000000000
-6,2049,heatpump,R1,2035,16.09000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
-8,2035,heatpump,R2,2030,25.00000000000
-8,2039,heatpump,R2,2030,25.00000000000
-8,2040,heatpump,R2,2030,25.00000000000
-8,2044,heatpump,R2,2030,25.00000000000
-9,2040,heatpump,R2,2035,16.09000000000
-9,2044,heatpump,R2,2035,16.09000000000
-9,2045,heatpump,R2,2035,16.09000000000
-9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index 0b5fe3de..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2045,heatpump,R1,2035,16.09000000000
-2,2049,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2040,31.00000000000
-3,2049,heatpump,R1,2040,31.00000000000
-3,2050,heatpump,R1,2040,31.00000000000
-3,2054,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2045,23.00000000000
-4,2054,heatpump,R1,2045,23.00000000000
-4,2055,heatpump,R1,2045,23.00000000000
-4,2059,heatpump,R1,2045,23.00000000000
-5,2045,heatpump,R2,2035,16.09000000000
-5,2049,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2040,31.00000000000
-6,2049,heatpump,R2,2040,31.00000000000
-6,2050,heatpump,R2,2040,31.00000000000
-6,2054,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2045,23.00000000000
-7,2054,heatpump,R2,2045,23.00000000000
-7,2055,heatpump,R2,2045,23.00000000000
-7,2059,heatpump,R2,2045,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index eb21c442..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
deleted file mode 100644
index eb9ddd9d..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,169 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
deleted file mode 100644
index 21119f08..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,193 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 98be95de..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,145 +0,0 @@
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 26d4aa26..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-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
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
index 842d3b01..01bc290c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
@@ -1,5 +1,17 @@
 asset,year,region,installed,technology,capacity
 0,2025,R1,2020,gassupply1,15.00000000000
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
+1,2030,R1,2025,gassupply1,2.45020000000
+1,2035,R1,2025,gassupply1,2.45020000000
+1,2040,R1,2025,gassupply1,2.45020000000
+1,2045,R1,2025,gassupply1,2.45020000000
+1,2050,R1,2025,gassupply1,2.45020000000
+1,2064,R1,2025,gassupply1,2.45020000000
+2,2025,R2,2020,gassupply1,15.00000000000
+2,2030,R2,2020,gassupply1,7.50000000000
+3,2030,R2,2025,gassupply1,2.45020000000
+3,2035,R2,2025,gassupply1,2.45020000000
+3,2040,R2,2025,gassupply1,2.45020000000
+3,2045,R2,2025,gassupply1,2.45020000000
+3,2050,R2,2025,gassupply1,2.45020000000
+3,2064,R2,2025,gassupply1,2.45020000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index 002d4862..aab51d44 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -1,13 +1,29 @@
 asset,year,region,installed,technology,capacity
 0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,5.46490000000
-1,2040,R1,2030,gassupply1,5.46490000000
-1,2045,R1,2030,gassupply1,5.46490000000
-1,2050,R1,2030,gassupply1,5.46490000000
-1,2069,R1,2030,gassupply1,5.46490000000
-2,2030,R2,2020,gassupply1,7.50000000000
-3,2035,R2,2030,gassupply1,5.46490000000
-3,2040,R2,2030,gassupply1,5.46490000000
-3,2045,R2,2030,gassupply1,5.46490000000
-3,2050,R2,2030,gassupply1,5.46490000000
-3,2069,R2,2030,gassupply1,5.46490000000
+1,2030,R1,2025,gassupply1,2.45020000000
+1,2035,R1,2025,gassupply1,2.45020000000
+1,2040,R1,2025,gassupply1,2.45020000000
+1,2045,R1,2025,gassupply1,2.45020000000
+1,2050,R1,2025,gassupply1,2.45020000000
+1,2064,R1,2025,gassupply1,2.45020000000
+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.45020000000
+4,2035,R2,2025,gassupply1,2.45020000000
+4,2040,R2,2025,gassupply1,2.45020000000
+4,2045,R2,2025,gassupply1,2.45020000000
+4,2050,R2,2025,gassupply1,2.45020000000
+4,2064,R2,2025,gassupply1,2.45020000000
+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
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index 7a126f21..bd9192b4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -1,11 +1,25 @@
 asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,5.46490000000
-1,2040,R1,2030,gassupply1,5.46490000000
-1,2045,R1,2030,gassupply1,5.46490000000
-1,2050,R1,2030,gassupply1,5.46490000000
-1,2069,R1,2030,gassupply1,5.46490000000
-3,2035,R2,2030,gassupply1,5.46490000000
-3,2040,R2,2030,gassupply1,5.46490000000
-3,2045,R2,2030,gassupply1,5.46490000000
-3,2050,R2,2030,gassupply1,5.46490000000
-3,2069,R2,2030,gassupply1,5.46490000000
+1,2035,R1,2025,gassupply1,2.45020000000
+1,2040,R1,2025,gassupply1,2.45020000000
+1,2045,R1,2025,gassupply1,2.45020000000
+1,2050,R1,2025,gassupply1,2.45020000000
+1,2064,R1,2025,gassupply1,2.45020000000
+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.45020000000
+4,2040,R2,2025,gassupply1,2.45020000000
+4,2045,R2,2025,gassupply1,2.45020000000
+4,2050,R2,2025,gassupply1,2.45020000000
+4,2064,R2,2025,gassupply1,2.45020000000
+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
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index 05f99016..c694cb96 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -1,9 +1,21 @@
 asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,5.46490000000
-1,2045,R1,2030,gassupply1,5.46490000000
-1,2050,R1,2030,gassupply1,5.46490000000
-1,2069,R1,2030,gassupply1,5.46490000000
-3,2040,R2,2030,gassupply1,5.46490000000
-3,2045,R2,2030,gassupply1,5.46490000000
-3,2050,R2,2030,gassupply1,5.46490000000
-3,2069,R2,2030,gassupply1,5.46490000000
+1,2040,R1,2025,gassupply1,2.45020000000
+1,2045,R1,2025,gassupply1,2.45020000000
+1,2050,R1,2025,gassupply1,2.45020000000
+1,2064,R1,2025,gassupply1,2.45020000000
+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.45020000000
+4,2045,R2,2025,gassupply1,2.45020000000
+4,2050,R2,2025,gassupply1,2.45020000000
+4,2064,R2,2025,gassupply1,2.45020000000
+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
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index 3af53f48..63e41e9c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -1,7 +1,17 @@
 asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,5.46490000000
-1,2050,R1,2030,gassupply1,5.46490000000
-1,2069,R1,2030,gassupply1,5.46490000000
-3,2045,R2,2030,gassupply1,5.46490000000
-3,2050,R2,2030,gassupply1,5.46490000000
-3,2069,R2,2030,gassupply1,5.46490000000
+1,2045,R1,2025,gassupply1,2.45020000000
+1,2050,R1,2025,gassupply1,2.45020000000
+1,2064,R1,2025,gassupply1,2.45020000000
+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.45020000000
+4,2050,R2,2025,gassupply1,2.45020000000
+4,2064,R2,2025,gassupply1,2.45020000000
+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
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 5210fc08..c5097759 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -1,7 +1,17 @@
 asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,5.46490000000
-1,2055,R1,2030,gassupply1,5.46490000000
-1,2069,R1,2030,gassupply1,5.46490000000
-3,2050,R2,2030,gassupply1,5.46490000000
-3,2055,R2,2030,gassupply1,5.46490000000
-3,2069,R2,2030,gassupply1,5.46490000000
+1,2050,R1,2025,gassupply1,2.45020000000
+1,2055,R1,2025,gassupply1,2.45020000000
+1,2064,R1,2025,gassupply1,2.45020000000
+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.45020000000
+4,2055,R2,2025,gassupply1,2.45020000000
+4,2064,R2,2025,gassupply1,2.45020000000
+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
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index c6e6f49a..5943301c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -23,85 +23,104 @@ windturbine,R2,R2,A1,power,retrofit,2025,32.55000000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
 gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
 electric_stove,R1,R1,A1,residential,retrofit,2030,17.40000000000
-electric_stove,R1,R1,A1,residential,retrofit,2030,8.48000000000
-gas_stove,R1,R1,A1,residential,retrofit,2030,2.12000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.12000000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,6.74000000000
+gas_stove,R1,R1,A1,residential,retrofit,2030,3.86000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.86000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,8.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.74000000000
 electric_stove,R2,R2,A1,residential,retrofit,2030,17.40000000000
-electric_stove,R2,R2,A1,residential,retrofit,2030,8.48000000000
-gas_stove,R2,R2,A1,residential,retrofit,2030,2.12000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,2.12000000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,6.74000000000
+gas_stove,R2,R2,A1,residential,retrofit,2030,3.86000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,3.86000000000
 heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,8.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.74000000000
 solarPV,R1,R1,A1,power,retrofit,2030,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2030,19.21000000000
+solarPV,R1,R1,A1,power,retrofit,2030,15.73000000000
 windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,19.21000000000
+solarPV,R2,R2,A1,power,retrofit,2030,15.73000000000
 windturbine,R2,R2,A1,power,retrofit,2030,32.55000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.45020000000
 gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-electric_stove,R1,R1,A1,residential,retrofit,2035,8.48000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,2.45020000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,6.74000000000
 electric_stove,R1,R1,A1,residential,retrofit,2035,23.00000000000
-gas_stove,R1,R1,A1,residential,retrofit,2035,2.12000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.12000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,8.48000000000
+gas_stove,R1,R1,A1,residential,retrofit,2035,3.86000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.86000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.74000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
-electric_stove,R2,R2,A1,residential,retrofit,2035,8.48000000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,6.74000000000
 electric_stove,R2,R2,A1,residential,retrofit,2035,23.00000000000
-gas_stove,R2,R2,A1,residential,retrofit,2035,2.12000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,2.12000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,8.48000000000
+gas_stove,R2,R2,A1,residential,retrofit,2035,3.86000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,3.86000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.74000000000
 heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
 solarPV,R1,R1,A1,power,retrofit,2035,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2035,19.21000000000
-solarPV,R1,R1,A1,power,retrofit,2035,11.20000000000
+solarPV,R1,R1,A1,power,retrofit,2035,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2035,20.00000000000
 windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,19.21000000000
+windturbine,R1,R1,A1,power,retrofit,2035,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2035,15.73000000000
 solarPV,R2,R2,A1,power,retrofit,2035,11.20000000000
 windturbine,R2,R2,A1,power,retrofit,2035,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.46490000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,5.46490000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
 electric_stove,R1,R1,A1,residential,retrofit,2040,23.00000000000
-electric_stove,R1,R1,A1,residential,retrofit,2040,16.20000000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,15.31400000000
+gas_stove,R1,R1,A1,residential,retrofit,2040,0.88600000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,0.88600000000
 heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.20000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,15.31400000000
 electric_stove,R2,R2,A1,residential,retrofit,2040,23.00000000000
-electric_stove,R2,R2,A1,residential,retrofit,2040,16.20000000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,15.31400000000
+gas_stove,R2,R2,A1,residential,retrofit,2040,0.88600000000
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.88600000000
 heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.20000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,15.31400000000
 solarPV,R1,R1,A1,power,retrofit,2040,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2040,19.21000000000
-solarPV,R1,R1,A1,power,retrofit,2040,11.20000000000
-solarPV,R1,R1,A1,power,retrofit,2040,15.44000000000
+solarPV,R1,R1,A1,power,retrofit,2040,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2040,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.94800000000
 windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,19.21000000000
+windturbine,R1,R1,A1,power,retrofit,2040,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2040,15.73000000000
 solarPV,R2,R2,A1,power,retrofit,2040,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2040,15.44000000000
+solarPV,R2,R2,A1,power,retrofit,2040,17.14800000000
 windturbine,R2,R2,A1,power,retrofit,2040,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.46490000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,5.46490000000
-electric_stove,R1,R1,A1,residential,retrofit,2045,16.20000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,15.31400000000
 electric_stove,R1,R1,A1,residential,retrofit,2045,28.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,16.20000000000
+gas_stove,R1,R1,A1,residential,retrofit,2045,0.88600000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,0.88600000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.31400000000
 heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
-electric_stove,R2,R2,A1,residential,retrofit,2045,16.20000000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,15.31400000000
 electric_stove,R2,R2,A1,residential,retrofit,2045,28.60000000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.20000000000
+gas_stove,R2,R2,A1,residential,retrofit,2045,0.88600000000
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.88600000000
+heatpump,R2,R2,A1,residential,retrofit,2045,15.31400000000
 heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
 solarPV,R1,R1,A1,power,retrofit,2045,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2045,19.21000000000
-solarPV,R1,R1,A1,power,retrofit,2045,11.20000000000
-solarPV,R1,R1,A1,power,retrofit,2045,15.44000000000
+solarPV,R1,R1,A1,power,retrofit,2045,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2045,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.94800000000
 solarPV,R1,R1,A1,power,retrofit,2045,11.20000000000
 windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,19.21000000000
+windturbine,R1,R1,A1,power,retrofit,2045,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2045,15.73000000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2045,15.44000000000
+solarPV,R2,R2,A1,power,retrofit,2045,17.14800000000
 solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
 windturbine,R2,R2,A1,power,retrofit,2045,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.46490000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,5.46490000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
 electric_stove,R1,R1,A1,residential,retrofit,2050,28.60000000000
 electric_stove,R1,R1,A1,residential,retrofit,2050,21.80000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
@@ -110,17 +129,20 @@ electric_stove,R2,R2,A1,residential,retrofit,2050,28.60000000000
 electric_stove,R2,R2,A1,residential,retrofit,2050,21.80000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
 heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
-solarPV,R1,R1,A1,power,retrofit,2050,19.21000000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.20000000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.44000000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2050,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.94800000000
 solarPV,R1,R1,A1,power,retrofit,2050,11.20000000000
-solarPV,R1,R1,A1,power,retrofit,2050,31.20000000000
+solarPV,R1,R1,A1,power,retrofit,2050,32.97200000000
+windturbine,R1,R1,A1,power,retrofit,2050,2.40000000000
 windturbine,R1,R1,A1,power,retrofit,2050,12.55000000000
-solarPV,R2,R2,A1,power,retrofit,2050,19.21000000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.73000000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2050,15.44000000000
+solarPV,R2,R2,A1,power,retrofit,2050,17.14800000000
 solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2050,31.20000000000
+solarPV,R2,R2,A1,power,retrofit,2050,32.97200000000
 windturbine,R2,R2,A1,power,retrofit,2050,12.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.46490000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,5.46490000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index e4a9ee99..ec72ee70 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -163,399 +163,399 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'night')",electricity,R2,14.08930000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.24040000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.24040000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.24990000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.24990000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,64.23340000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,64.23340000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,64.24080000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,64.24080000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,14.11110000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R2,14.11110000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.34360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.34360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.35710000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.35710000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,64.33350000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,64.33350000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,64.34410000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,64.34410000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.08930000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.08930000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24040000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24990000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24990000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.23340000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.23340000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.24080000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.24080000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,14.11110000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R2,14.11110000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.34360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.34360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35710000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35710000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,64.33350000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,64.33350000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,64.34410000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,64.34410000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,14.19100000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R2,14.19100000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.72270000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.72270000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.75100000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.75100000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,64.70140000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,64.70140000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,64.72360000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,64.72360000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,14.14020000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R2,14.14020000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.48130000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.48130000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.50020000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.50020000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,64.46720000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,64.46720000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,64.48200000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,64.48200000000,2030
 "('all-year', 'all-week', 'early-morning')",electricity,R1,14.14020000000,2030
 "('all-year', 'all-week', 'early-morning')",electricity,R2,14.14020000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.48130000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.48130000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.50020000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.50020000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,64.46720000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,64.46720000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,64.48200000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,64.48200000000,2030
 "('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.14020000000,2030
 "('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.14020000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48130000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48130000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.50020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.50020000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.46720000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.46720000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.28980000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,11.28980000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.48200000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.48200000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.28970000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.28970000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.48920000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.48920000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.50740000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.50740000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,51.48070000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,51.48070000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.31500000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,11.31500000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,51.49480000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,51.49480000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.31490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.31490000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.61350000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.61350000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.63940000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.63940000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,51.60130000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,51.60130000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28980000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28980000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,51.62150000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,51.62150000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28970000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28970000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.48920000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.48920000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50740000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50740000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.48070000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.48070000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31500000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31500000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.49480000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.49480000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31490000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.61350000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.61350000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.63940000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.63940000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,51.60130000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,51.60130000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40770000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40770000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,51.62150000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,51.62150000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40740000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40740000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.07050000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.07050000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.12490000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.12490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,52.04480000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,52.04480000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.34870000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,11.34870000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,52.08720000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,52.08720000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.34850000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.34850000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.77940000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,51.77940000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.81570000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.81570000000,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', 'evening')",cook,R1,51.76230000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,51.76230000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34870000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34870000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,51.79060000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,51.79060000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34850000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34850000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.77940000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.77940000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.81570000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.81570000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,51.76230000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,51.76230000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34870000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34870000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,51.79060000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,51.79060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34850000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34850000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.77940000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.77940000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81570000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81570000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.76230000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.76230000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.08930000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08930000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.33890000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.33890000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.79060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.79060000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.04960000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,9.04960000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.27950000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,41.27950000000,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', 'night')",cook,R1,0.33890000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.33890000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12760000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12760000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.48520000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.48520000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,41.26820000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,41.26820000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.07750000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,9.07750000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.41690000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,41.41690000000,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', 'morning')",cook,R1,0.48520000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.48520000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08930000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08930000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.33890000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.33890000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,41.40070000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,41.40070000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,9.04960000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.04960000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27950000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27950000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.33890000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.33890000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12760000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12760000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.48520000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.48520000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,41.26820000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,41.26820000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.07750000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.07750000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41690000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41690000000,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', 'early-peak')",cook,R1,0.48520000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.48520000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26800000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26800000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.02690000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,1.02690000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,41.40070000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,41.40070000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.17960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.17960000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.92280000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.92280000000,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', 'late-peak')",cook,R1,1.02690000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,1.02690000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17870000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17870000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.68120000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.68120000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,41.88870000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,41.88870000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.11460000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,9.11460000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.60050000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,41.60050000000,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', 'evening')",cook,R1,0.68120000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.68120000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17870000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17870000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.68120000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.68120000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,41.57770000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,41.57770000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,9.11460000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,9.11460000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.60050000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.60050000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.68120000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.68120000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17870000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17870000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.68120000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.68120000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,41.57770000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,41.57770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.11460000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.11460000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60050000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60050000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.68120000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.68120000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.08750000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.08750000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,41.57770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,41.57770000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.25720000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,7.25720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.08510000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,33.08510000000,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', 'night')",cook,R1,0.01560000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.01560000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12500000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12500000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,33.07450000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,33.07450000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.28700000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,7.28700000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.22150000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,33.22150000000,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', 'morning')",cook,R1,0.02390000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.02390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08750000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08750000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,33.20640000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,33.20640000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,7.25720000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,7.25720000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.08510000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.08510000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01560000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12500000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12500000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,33.07450000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,33.07450000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.28700000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,7.28700000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.22150000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.22150000000,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', 'early-peak')",cook,R1,0.02390000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26250000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26250000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06230000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06230000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,33.20640000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,33.20640000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.39620000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.39620000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.72470000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.72470000000,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', 'late-peak')",cook,R1,0.06230000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06230000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17500000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17500000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,33.69300000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,33.69300000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.32670000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,7.32670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.40400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,33.40400000000,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', 'evening')",cook,R1,0.03630000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.03630000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17500000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17500000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,33.38280000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,33.38280000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,7.32670000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,7.32670000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.40400000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.40400000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03630000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03630000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17500000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17500000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,33.38280000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,33.38280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,7.32670000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,7.32670000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.40400000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.40400000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03630000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03630000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.08240000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.08240000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.01550000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.01550000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,33.38280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,33.38280000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08220000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08220000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.22250000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.22250000000,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', 'night')",cook,R1,0.01550000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.01550000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11770000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.11770000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.02370000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.02370000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.22250000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.22250000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11740000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.11740000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.31910000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.31910000000,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', 'morning')",cook,R1,0.02370000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.02370000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08240000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08240000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01550000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01550000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.31910000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.31910000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08220000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08220000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.22250000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.22250000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01550000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01550000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11770000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11770000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02370000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02370000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.22250000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.22250000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11740000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11740000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31910000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.31910000000,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', 'early-peak')",cook,R1,0.02370000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02370000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24710000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24710000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06180000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06180000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.31910000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.31910000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24660000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24660000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.67950000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.67950000000,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', 'late-peak')",cook,R1,0.06180000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06180000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.16470000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.16470000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.03610000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.03610000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.67950000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.67950000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16440000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16440000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.44900000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.44900000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.03610000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.03610000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16470000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16470000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03610000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03610000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.44900000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16440000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16440000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.44900000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03610000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03610000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16470000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16470000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03610000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03610000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16440000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16440000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.44900000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03610000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03610000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.44900000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 11b93bd1..75731cdd 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -7,20 +7,20 @@ asset,year,technology,region,installed,capacity
 2,2040,solarPV,R1,2020,12.55000000000
 2,2045,solarPV,R1,2020,12.55000000000
 2,2049,solarPV,R1,2020,12.55000000000
-3,2030,solarPV,R1,2025,19.21000000000
-3,2035,solarPV,R1,2025,19.21000000000
-3,2040,solarPV,R1,2025,19.21000000000
-3,2045,solarPV,R1,2025,19.21000000000
-3,2049,solarPV,R1,2025,19.21000000000
-3,2050,solarPV,R1,2025,19.21000000000
-3,2054,solarPV,R1,2025,19.21000000000
-4,2030,solarPV,R2,2025,19.21000000000
-4,2035,solarPV,R2,2025,19.21000000000
-4,2040,solarPV,R2,2025,19.21000000000
-4,2045,solarPV,R2,2025,19.21000000000
-4,2049,solarPV,R2,2025,19.21000000000
-4,2050,solarPV,R2,2025,19.21000000000
-4,2054,solarPV,R2,2025,19.21000000000
+3,2030,solarPV,R1,2025,15.73000000000
+3,2035,solarPV,R1,2025,15.73000000000
+3,2040,solarPV,R1,2025,15.73000000000
+3,2045,solarPV,R1,2025,15.73000000000
+3,2049,solarPV,R1,2025,15.73000000000
+3,2050,solarPV,R1,2025,15.73000000000
+3,2054,solarPV,R1,2025,15.73000000000
+4,2030,solarPV,R2,2025,15.73000000000
+4,2035,solarPV,R2,2025,15.73000000000
+4,2040,solarPV,R2,2025,15.73000000000
+4,2045,solarPV,R2,2025,15.73000000000
+4,2049,solarPV,R2,2025,15.73000000000
+4,2050,solarPV,R2,2025,15.73000000000
+4,2054,solarPV,R2,2025,15.73000000000
 5,2025,windturbine,R1,2020,20.00000000000
 5,2030,windturbine,R1,2020,20.00000000000
 5,2035,windturbine,R1,2020,20.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index 81bd7d49..04feb80d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -9,38 +9,46 @@ asset,year,region,installed,technology,capacity
 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,solarPV,19.21000000000
-3,2035,R1,2025,solarPV,19.21000000000
-3,2040,R1,2025,solarPV,19.21000000000
-3,2045,R1,2025,solarPV,19.21000000000
-3,2049,R1,2025,solarPV,19.21000000000
-3,2050,R1,2025,solarPV,19.21000000000
-3,2054,R1,2025,solarPV,19.21000000000
-4,2035,R1,2030,solarPV,11.20000000000
-4,2040,R1,2030,solarPV,11.20000000000
-4,2045,R1,2030,solarPV,11.20000000000
-4,2049,R1,2030,solarPV,11.20000000000
-4,2050,R1,2030,solarPV,11.20000000000
-4,2054,R1,2030,solarPV,11.20000000000
-4,2055,R1,2030,solarPV,11.20000000000
-4,2059,R1,2030,solarPV,11.20000000000
-6,2030,R2,2020,windturbine,32.55000000000
-6,2035,R2,2020,windturbine,32.55000000000
-6,2040,R2,2020,windturbine,32.55000000000
-6,2045,R2,2020,windturbine,32.55000000000
-6,2049,R2,2020,windturbine,32.55000000000
-7,2030,R2,2025,solarPV,19.21000000000
-7,2035,R2,2025,solarPV,19.21000000000
-7,2040,R2,2025,solarPV,19.21000000000
-7,2045,R2,2025,solarPV,19.21000000000
-7,2049,R2,2025,solarPV,19.21000000000
-7,2050,R2,2025,solarPV,19.21000000000
-7,2054,R2,2025,solarPV,19.21000000000
-8,2035,R2,2030,solarPV,11.20000000000
-8,2040,R2,2030,solarPV,11.20000000000
-8,2045,R2,2030,solarPV,11.20000000000
-8,2049,R2,2030,solarPV,11.20000000000
-8,2050,R2,2030,solarPV,11.20000000000
-8,2054,R2,2030,solarPV,11.20000000000
-8,2055,R2,2030,solarPV,11.20000000000
-8,2059,R2,2030,solarPV,11.20000000000
+3,2030,R1,2025,solarPV,15.73000000000
+3,2035,R1,2025,solarPV,15.73000000000
+3,2040,R1,2025,solarPV,15.73000000000
+3,2045,R1,2025,solarPV,15.73000000000
+3,2049,R1,2025,solarPV,15.73000000000
+3,2050,R1,2025,solarPV,15.73000000000
+3,2054,R1,2025,solarPV,15.73000000000
+4,2035,R1,2030,solarPV,20.00000000000
+4,2040,R1,2030,solarPV,20.00000000000
+4,2045,R1,2030,solarPV,20.00000000000
+4,2049,R1,2030,solarPV,20.00000000000
+4,2050,R1,2030,solarPV,20.00000000000
+4,2054,R1,2030,solarPV,20.00000000000
+4,2055,R1,2030,solarPV,20.00000000000
+4,2059,R1,2030,solarPV,20.00000000000
+5,2035,R1,2030,windturbine,2.40000000000
+5,2040,R1,2030,windturbine,2.40000000000
+5,2045,R1,2030,windturbine,2.40000000000
+5,2049,R1,2030,windturbine,2.40000000000
+5,2050,R1,2030,windturbine,2.40000000000
+5,2054,R1,2030,windturbine,2.40000000000
+5,2055,R1,2030,windturbine,2.40000000000
+5,2059,R1,2030,windturbine,2.40000000000
+7,2030,R2,2020,windturbine,32.55000000000
+7,2035,R2,2020,windturbine,32.55000000000
+7,2040,R2,2020,windturbine,32.55000000000
+7,2045,R2,2020,windturbine,32.55000000000
+7,2049,R2,2020,windturbine,32.55000000000
+8,2030,R2,2025,solarPV,15.73000000000
+8,2035,R2,2025,solarPV,15.73000000000
+8,2040,R2,2025,solarPV,15.73000000000
+8,2045,R2,2025,solarPV,15.73000000000
+8,2049,R2,2025,solarPV,15.73000000000
+8,2050,R2,2025,solarPV,15.73000000000
+8,2054,R2,2025,solarPV,15.73000000000
+9,2035,R2,2030,solarPV,11.20000000000
+9,2040,R2,2030,solarPV,11.20000000000
+9,2045,R2,2030,solarPV,11.20000000000
+9,2049,R2,2030,solarPV,11.20000000000
+9,2050,R2,2030,solarPV,11.20000000000
+9,2054,R2,2030,solarPV,11.20000000000
+9,2055,R2,2030,solarPV,11.20000000000
+9,2059,R2,2030,solarPV,11.20000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index 47c177de..47e19154 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -7,53 +7,61 @@ asset,year,region,installed,technology,capacity
 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,solarPV,19.21000000000
-3,2040,R1,2025,solarPV,19.21000000000
-3,2045,R1,2025,solarPV,19.21000000000
-3,2049,R1,2025,solarPV,19.21000000000
-3,2050,R1,2025,solarPV,19.21000000000
-3,2054,R1,2025,solarPV,19.21000000000
-4,2035,R1,2030,solarPV,11.20000000000
-4,2040,R1,2030,solarPV,11.20000000000
-4,2045,R1,2030,solarPV,11.20000000000
-4,2049,R1,2030,solarPV,11.20000000000
-4,2050,R1,2030,solarPV,11.20000000000
-4,2054,R1,2030,solarPV,11.20000000000
-4,2055,R1,2030,solarPV,11.20000000000
-4,2059,R1,2030,solarPV,11.20000000000
-5,2040,R1,2035,solarPV,15.44000000000
-5,2045,R1,2035,solarPV,15.44000000000
-5,2049,R1,2035,solarPV,15.44000000000
-5,2050,R1,2035,solarPV,15.44000000000
-5,2054,R1,2035,solarPV,15.44000000000
-5,2055,R1,2035,solarPV,15.44000000000
-5,2059,R1,2035,solarPV,15.44000000000
-5,2060,R1,2035,solarPV,15.44000000000
-5,2064,R1,2035,solarPV,15.44000000000
-7,2035,R2,2020,windturbine,32.55000000000
-7,2040,R2,2020,windturbine,32.55000000000
-7,2045,R2,2020,windturbine,32.55000000000
-7,2049,R2,2020,windturbine,32.55000000000
-8,2035,R2,2025,solarPV,19.21000000000
-8,2040,R2,2025,solarPV,19.21000000000
-8,2045,R2,2025,solarPV,19.21000000000
-8,2049,R2,2025,solarPV,19.21000000000
-8,2050,R2,2025,solarPV,19.21000000000
-8,2054,R2,2025,solarPV,19.21000000000
-9,2035,R2,2030,solarPV,11.20000000000
-9,2040,R2,2030,solarPV,11.20000000000
-9,2045,R2,2030,solarPV,11.20000000000
-9,2049,R2,2030,solarPV,11.20000000000
-9,2050,R2,2030,solarPV,11.20000000000
-9,2054,R2,2030,solarPV,11.20000000000
-9,2055,R2,2030,solarPV,11.20000000000
-9,2059,R2,2030,solarPV,11.20000000000
-10,2040,R2,2035,solarPV,15.44000000000
-10,2045,R2,2035,solarPV,15.44000000000
-10,2049,R2,2035,solarPV,15.44000000000
-10,2050,R2,2035,solarPV,15.44000000000
-10,2054,R2,2035,solarPV,15.44000000000
-10,2055,R2,2035,solarPV,15.44000000000
-10,2059,R2,2035,solarPV,15.44000000000
-10,2060,R2,2035,solarPV,15.44000000000
-10,2064,R2,2035,solarPV,15.44000000000
+3,2035,R1,2025,solarPV,15.73000000000
+3,2040,R1,2025,solarPV,15.73000000000
+3,2045,R1,2025,solarPV,15.73000000000
+3,2049,R1,2025,solarPV,15.73000000000
+3,2050,R1,2025,solarPV,15.73000000000
+3,2054,R1,2025,solarPV,15.73000000000
+4,2035,R1,2030,solarPV,20.00000000000
+4,2040,R1,2030,solarPV,20.00000000000
+4,2045,R1,2030,solarPV,20.00000000000
+4,2049,R1,2030,solarPV,20.00000000000
+4,2050,R1,2030,solarPV,20.00000000000
+4,2054,R1,2030,solarPV,20.00000000000
+4,2055,R1,2030,solarPV,20.00000000000
+4,2059,R1,2030,solarPV,20.00000000000
+5,2035,R1,2030,windturbine,2.40000000000
+5,2040,R1,2030,windturbine,2.40000000000
+5,2045,R1,2030,windturbine,2.40000000000
+5,2049,R1,2030,windturbine,2.40000000000
+5,2050,R1,2030,windturbine,2.40000000000
+5,2054,R1,2030,windturbine,2.40000000000
+5,2055,R1,2030,windturbine,2.40000000000
+5,2059,R1,2030,windturbine,2.40000000000
+6,2040,R1,2035,solarPV,5.94800000000
+6,2045,R1,2035,solarPV,5.94800000000
+6,2049,R1,2035,solarPV,5.94800000000
+6,2050,R1,2035,solarPV,5.94800000000
+6,2054,R1,2035,solarPV,5.94800000000
+6,2055,R1,2035,solarPV,5.94800000000
+6,2059,R1,2035,solarPV,5.94800000000
+6,2060,R1,2035,solarPV,5.94800000000
+6,2064,R1,2035,solarPV,5.94800000000
+8,2035,R2,2020,windturbine,32.55000000000
+8,2040,R2,2020,windturbine,32.55000000000
+8,2045,R2,2020,windturbine,32.55000000000
+8,2049,R2,2020,windturbine,32.55000000000
+9,2035,R2,2025,solarPV,15.73000000000
+9,2040,R2,2025,solarPV,15.73000000000
+9,2045,R2,2025,solarPV,15.73000000000
+9,2049,R2,2025,solarPV,15.73000000000
+9,2050,R2,2025,solarPV,15.73000000000
+9,2054,R2,2025,solarPV,15.73000000000
+10,2035,R2,2030,solarPV,11.20000000000
+10,2040,R2,2030,solarPV,11.20000000000
+10,2045,R2,2030,solarPV,11.20000000000
+10,2049,R2,2030,solarPV,11.20000000000
+10,2050,R2,2030,solarPV,11.20000000000
+10,2054,R2,2030,solarPV,11.20000000000
+10,2055,R2,2030,solarPV,11.20000000000
+10,2059,R2,2030,solarPV,11.20000000000
+11,2040,R2,2035,solarPV,17.14800000000
+11,2045,R2,2035,solarPV,17.14800000000
+11,2049,R2,2035,solarPV,17.14800000000
+11,2050,R2,2035,solarPV,17.14800000000
+11,2054,R2,2035,solarPV,17.14800000000
+11,2055,R2,2035,solarPV,17.14800000000
+11,2059,R2,2035,solarPV,17.14800000000
+11,2060,R2,2035,solarPV,17.14800000000
+11,2064,R2,2035,solarPV,17.14800000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index e5961aa4..801d2f7b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -5,68 +5,75 @@ asset,year,region,installed,technology,capacity
 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,solarPV,19.21000000000
-3,2045,R1,2025,solarPV,19.21000000000
-3,2049,R1,2025,solarPV,19.21000000000
-3,2050,R1,2025,solarPV,19.21000000000
-3,2054,R1,2025,solarPV,19.21000000000
-4,2040,R1,2030,solarPV,11.20000000000
-4,2045,R1,2030,solarPV,11.20000000000
-4,2049,R1,2030,solarPV,11.20000000000
-4,2050,R1,2030,solarPV,11.20000000000
-4,2054,R1,2030,solarPV,11.20000000000
-4,2055,R1,2030,solarPV,11.20000000000
-4,2059,R1,2030,solarPV,11.20000000000
-5,2040,R1,2035,solarPV,15.44000000000
-5,2045,R1,2035,solarPV,15.44000000000
-5,2049,R1,2035,solarPV,15.44000000000
-5,2050,R1,2035,solarPV,15.44000000000
-5,2054,R1,2035,solarPV,15.44000000000
-5,2055,R1,2035,solarPV,15.44000000000
-5,2059,R1,2035,solarPV,15.44000000000
-5,2060,R1,2035,solarPV,15.44000000000
-5,2064,R1,2035,solarPV,15.44000000000
-6,2045,R1,2040,solarPV,11.20000000000
-6,2049,R1,2040,solarPV,11.20000000000
-6,2050,R1,2040,solarPV,11.20000000000
-6,2054,R1,2040,solarPV,11.20000000000
-6,2055,R1,2040,solarPV,11.20000000000
-6,2059,R1,2040,solarPV,11.20000000000
-6,2060,R1,2040,solarPV,11.20000000000
-6,2064,R1,2040,solarPV,11.20000000000
-6,2065,R1,2040,solarPV,11.20000000000
-6,2069,R1,2040,solarPV,11.20000000000
-8,2040,R2,2020,windturbine,32.55000000000
-8,2045,R2,2020,windturbine,32.55000000000
-8,2049,R2,2020,windturbine,32.55000000000
-9,2040,R2,2025,solarPV,19.21000000000
-9,2045,R2,2025,solarPV,19.21000000000
-9,2049,R2,2025,solarPV,19.21000000000
-9,2050,R2,2025,solarPV,19.21000000000
-9,2054,R2,2025,solarPV,19.21000000000
-10,2040,R2,2030,solarPV,11.20000000000
-10,2045,R2,2030,solarPV,11.20000000000
-10,2049,R2,2030,solarPV,11.20000000000
-10,2050,R2,2030,solarPV,11.20000000000
-10,2054,R2,2030,solarPV,11.20000000000
-10,2055,R2,2030,solarPV,11.20000000000
-10,2059,R2,2030,solarPV,11.20000000000
-11,2040,R2,2035,solarPV,15.44000000000
-11,2045,R2,2035,solarPV,15.44000000000
-11,2049,R2,2035,solarPV,15.44000000000
-11,2050,R2,2035,solarPV,15.44000000000
-11,2054,R2,2035,solarPV,15.44000000000
-11,2055,R2,2035,solarPV,15.44000000000
-11,2059,R2,2035,solarPV,15.44000000000
-11,2060,R2,2035,solarPV,15.44000000000
-11,2064,R2,2035,solarPV,15.44000000000
-12,2045,R2,2040,solarPV,11.20000000000
-12,2049,R2,2040,solarPV,11.20000000000
-12,2050,R2,2040,solarPV,11.20000000000
-12,2054,R2,2040,solarPV,11.20000000000
-12,2055,R2,2040,solarPV,11.20000000000
-12,2059,R2,2040,solarPV,11.20000000000
-12,2060,R2,2040,solarPV,11.20000000000
-12,2064,R2,2040,solarPV,11.20000000000
-12,2065,R2,2040,solarPV,11.20000000000
-12,2069,R2,2040,solarPV,11.20000000000
+3,2040,R1,2025,solarPV,15.73000000000
+3,2045,R1,2025,solarPV,15.73000000000
+3,2049,R1,2025,solarPV,15.73000000000
+3,2050,R1,2025,solarPV,15.73000000000
+3,2054,R1,2025,solarPV,15.73000000000
+4,2040,R1,2030,solarPV,20.00000000000
+4,2045,R1,2030,solarPV,20.00000000000
+4,2049,R1,2030,solarPV,20.00000000000
+4,2050,R1,2030,solarPV,20.00000000000
+4,2054,R1,2030,solarPV,20.00000000000
+4,2055,R1,2030,solarPV,20.00000000000
+4,2059,R1,2030,solarPV,20.00000000000
+5,2040,R1,2030,windturbine,2.40000000000
+5,2045,R1,2030,windturbine,2.40000000000
+5,2049,R1,2030,windturbine,2.40000000000
+5,2050,R1,2030,windturbine,2.40000000000
+5,2054,R1,2030,windturbine,2.40000000000
+5,2055,R1,2030,windturbine,2.40000000000
+5,2059,R1,2030,windturbine,2.40000000000
+6,2040,R1,2035,solarPV,5.94800000000
+6,2045,R1,2035,solarPV,5.94800000000
+6,2049,R1,2035,solarPV,5.94800000000
+6,2050,R1,2035,solarPV,5.94800000000
+6,2054,R1,2035,solarPV,5.94800000000
+6,2055,R1,2035,solarPV,5.94800000000
+6,2059,R1,2035,solarPV,5.94800000000
+6,2060,R1,2035,solarPV,5.94800000000
+6,2064,R1,2035,solarPV,5.94800000000
+7,2045,R1,2040,solarPV,11.20000000000
+7,2049,R1,2040,solarPV,11.20000000000
+7,2050,R1,2040,solarPV,11.20000000000
+7,2054,R1,2040,solarPV,11.20000000000
+7,2055,R1,2040,solarPV,11.20000000000
+7,2059,R1,2040,solarPV,11.20000000000
+7,2060,R1,2040,solarPV,11.20000000000
+7,2064,R1,2040,solarPV,11.20000000000
+7,2065,R1,2040,solarPV,11.20000000000
+7,2069,R1,2040,solarPV,11.20000000000
+9,2040,R2,2020,windturbine,32.55000000000
+9,2045,R2,2020,windturbine,32.55000000000
+9,2049,R2,2020,windturbine,32.55000000000
+10,2040,R2,2025,solarPV,15.73000000000
+10,2045,R2,2025,solarPV,15.73000000000
+10,2049,R2,2025,solarPV,15.73000000000
+10,2050,R2,2025,solarPV,15.73000000000
+10,2054,R2,2025,solarPV,15.73000000000
+11,2040,R2,2030,solarPV,11.20000000000
+11,2045,R2,2030,solarPV,11.20000000000
+11,2049,R2,2030,solarPV,11.20000000000
+11,2050,R2,2030,solarPV,11.20000000000
+11,2054,R2,2030,solarPV,11.20000000000
+11,2055,R2,2030,solarPV,11.20000000000
+11,2059,R2,2030,solarPV,11.20000000000
+12,2040,R2,2035,solarPV,17.14800000000
+12,2045,R2,2035,solarPV,17.14800000000
+12,2049,R2,2035,solarPV,17.14800000000
+12,2050,R2,2035,solarPV,17.14800000000
+12,2054,R2,2035,solarPV,17.14800000000
+12,2055,R2,2035,solarPV,17.14800000000
+12,2059,R2,2035,solarPV,17.14800000000
+12,2060,R2,2035,solarPV,17.14800000000
+12,2064,R2,2035,solarPV,17.14800000000
+13,2045,R2,2040,solarPV,11.20000000000
+13,2049,R2,2040,solarPV,11.20000000000
+13,2050,R2,2040,solarPV,11.20000000000
+13,2054,R2,2040,solarPV,11.20000000000
+13,2055,R2,2040,solarPV,11.20000000000
+13,2059,R2,2040,solarPV,11.20000000000
+13,2060,R2,2040,solarPV,11.20000000000
+13,2064,R2,2040,solarPV,11.20000000000
+13,2065,R2,2040,solarPV,11.20000000000
+13,2069,R2,2040,solarPV,11.20000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index 24fc7b49..bec5d675 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,24 +1,24 @@
 asset,year,technology,region,installed,capacity
 0,2045,solarPV,R1,2020,12.55000000000
 0,2049,solarPV,R1,2020,12.55000000000
-1,2045,solarPV,R1,2025,19.21000000000
-1,2049,solarPV,R1,2025,19.21000000000
-1,2050,solarPV,R1,2025,19.21000000000
-1,2054,solarPV,R1,2025,19.21000000000
-2,2045,solarPV,R1,2030,11.20000000000
-2,2049,solarPV,R1,2030,11.20000000000
-2,2050,solarPV,R1,2030,11.20000000000
-2,2054,solarPV,R1,2030,11.20000000000
-2,2055,solarPV,R1,2030,11.20000000000
-2,2059,solarPV,R1,2030,11.20000000000
-3,2045,solarPV,R1,2035,15.44000000000
-3,2049,solarPV,R1,2035,15.44000000000
-3,2050,solarPV,R1,2035,15.44000000000
-3,2054,solarPV,R1,2035,15.44000000000
-3,2055,solarPV,R1,2035,15.44000000000
-3,2059,solarPV,R1,2035,15.44000000000
-3,2060,solarPV,R1,2035,15.44000000000
-3,2064,solarPV,R1,2035,15.44000000000
+1,2045,solarPV,R1,2025,15.73000000000
+1,2049,solarPV,R1,2025,15.73000000000
+1,2050,solarPV,R1,2025,15.73000000000
+1,2054,solarPV,R1,2025,15.73000000000
+2,2045,solarPV,R1,2030,20.00000000000
+2,2049,solarPV,R1,2030,20.00000000000
+2,2050,solarPV,R1,2030,20.00000000000
+2,2054,solarPV,R1,2030,20.00000000000
+2,2055,solarPV,R1,2030,20.00000000000
+2,2059,solarPV,R1,2030,20.00000000000
+3,2045,solarPV,R1,2035,5.94800000000
+3,2049,solarPV,R1,2035,5.94800000000
+3,2050,solarPV,R1,2035,5.94800000000
+3,2054,solarPV,R1,2035,5.94800000000
+3,2055,solarPV,R1,2035,5.94800000000
+3,2059,solarPV,R1,2035,5.94800000000
+3,2060,solarPV,R1,2035,5.94800000000
+3,2064,solarPV,R1,2035,5.94800000000
 4,2045,solarPV,R1,2040,11.20000000000
 4,2049,solarPV,R1,2040,11.20000000000
 4,2050,solarPV,R1,2040,11.20000000000
@@ -29,34 +29,34 @@ asset,year,technology,region,installed,capacity
 4,2064,solarPV,R1,2040,11.20000000000
 4,2065,solarPV,R1,2040,11.20000000000
 4,2069,solarPV,R1,2040,11.20000000000
-5,2050,solarPV,R1,2045,31.20000000000
-5,2054,solarPV,R1,2045,31.20000000000
-5,2055,solarPV,R1,2045,31.20000000000
-5,2059,solarPV,R1,2045,31.20000000000
-5,2060,solarPV,R1,2045,31.20000000000
-5,2064,solarPV,R1,2045,31.20000000000
-5,2065,solarPV,R1,2045,31.20000000000
-5,2069,solarPV,R1,2045,31.20000000000
-5,2070,solarPV,R1,2045,31.20000000000
-5,2074,solarPV,R1,2045,31.20000000000
-6,2045,solarPV,R2,2025,19.21000000000
-6,2049,solarPV,R2,2025,19.21000000000
-6,2050,solarPV,R2,2025,19.21000000000
-6,2054,solarPV,R2,2025,19.21000000000
+5,2050,solarPV,R1,2045,32.97200000000
+5,2054,solarPV,R1,2045,32.97200000000
+5,2055,solarPV,R1,2045,32.97200000000
+5,2059,solarPV,R1,2045,32.97200000000
+5,2060,solarPV,R1,2045,32.97200000000
+5,2064,solarPV,R1,2045,32.97200000000
+5,2065,solarPV,R1,2045,32.97200000000
+5,2069,solarPV,R1,2045,32.97200000000
+5,2070,solarPV,R1,2045,32.97200000000
+5,2074,solarPV,R1,2045,32.97200000000
+6,2045,solarPV,R2,2025,15.73000000000
+6,2049,solarPV,R2,2025,15.73000000000
+6,2050,solarPV,R2,2025,15.73000000000
+6,2054,solarPV,R2,2025,15.73000000000
 7,2045,solarPV,R2,2030,11.20000000000
 7,2049,solarPV,R2,2030,11.20000000000
 7,2050,solarPV,R2,2030,11.20000000000
 7,2054,solarPV,R2,2030,11.20000000000
 7,2055,solarPV,R2,2030,11.20000000000
 7,2059,solarPV,R2,2030,11.20000000000
-8,2045,solarPV,R2,2035,15.44000000000
-8,2049,solarPV,R2,2035,15.44000000000
-8,2050,solarPV,R2,2035,15.44000000000
-8,2054,solarPV,R2,2035,15.44000000000
-8,2055,solarPV,R2,2035,15.44000000000
-8,2059,solarPV,R2,2035,15.44000000000
-8,2060,solarPV,R2,2035,15.44000000000
-8,2064,solarPV,R2,2035,15.44000000000
+8,2045,solarPV,R2,2035,17.14800000000
+8,2049,solarPV,R2,2035,17.14800000000
+8,2050,solarPV,R2,2035,17.14800000000
+8,2054,solarPV,R2,2035,17.14800000000
+8,2055,solarPV,R2,2035,17.14800000000
+8,2059,solarPV,R2,2035,17.14800000000
+8,2060,solarPV,R2,2035,17.14800000000
+8,2064,solarPV,R2,2035,17.14800000000
 9,2045,solarPV,R2,2040,11.20000000000
 9,2049,solarPV,R2,2040,11.20000000000
 9,2050,solarPV,R2,2040,11.20000000000
@@ -67,37 +67,43 @@ asset,year,technology,region,installed,capacity
 9,2064,solarPV,R2,2040,11.20000000000
 9,2065,solarPV,R2,2040,11.20000000000
 9,2069,solarPV,R2,2040,11.20000000000
-10,2050,solarPV,R2,2045,31.20000000000
-10,2054,solarPV,R2,2045,31.20000000000
-10,2055,solarPV,R2,2045,31.20000000000
-10,2059,solarPV,R2,2045,31.20000000000
-10,2060,solarPV,R2,2045,31.20000000000
-10,2064,solarPV,R2,2045,31.20000000000
-10,2065,solarPV,R2,2045,31.20000000000
-10,2069,solarPV,R2,2045,31.20000000000
-10,2070,solarPV,R2,2045,31.20000000000
-10,2074,solarPV,R2,2045,31.20000000000
+10,2050,solarPV,R2,2045,32.97200000000
+10,2054,solarPV,R2,2045,32.97200000000
+10,2055,solarPV,R2,2045,32.97200000000
+10,2059,solarPV,R2,2045,32.97200000000
+10,2060,solarPV,R2,2045,32.97200000000
+10,2064,solarPV,R2,2045,32.97200000000
+10,2065,solarPV,R2,2045,32.97200000000
+10,2069,solarPV,R2,2045,32.97200000000
+10,2070,solarPV,R2,2045,32.97200000000
+10,2074,solarPV,R2,2045,32.97200000000
 11,2045,windturbine,R1,2020,20.00000000000
 11,2049,windturbine,R1,2020,20.00000000000
-12,2050,windturbine,R1,2045,12.55000000000
-12,2054,windturbine,R1,2045,12.55000000000
-12,2055,windturbine,R1,2045,12.55000000000
-12,2059,windturbine,R1,2045,12.55000000000
-12,2060,windturbine,R1,2045,12.55000000000
-12,2064,windturbine,R1,2045,12.55000000000
-12,2065,windturbine,R1,2045,12.55000000000
-12,2069,windturbine,R1,2045,12.55000000000
-12,2070,windturbine,R1,2045,12.55000000000
-12,2074,windturbine,R1,2045,12.55000000000
-13,2045,windturbine,R2,2020,32.55000000000
-13,2049,windturbine,R2,2020,32.55000000000
-14,2050,windturbine,R2,2045,12.55000000000
-14,2054,windturbine,R2,2045,12.55000000000
-14,2055,windturbine,R2,2045,12.55000000000
-14,2059,windturbine,R2,2045,12.55000000000
-14,2060,windturbine,R2,2045,12.55000000000
-14,2064,windturbine,R2,2045,12.55000000000
-14,2065,windturbine,R2,2045,12.55000000000
-14,2069,windturbine,R2,2045,12.55000000000
-14,2070,windturbine,R2,2045,12.55000000000
-14,2074,windturbine,R2,2045,12.55000000000
+12,2045,windturbine,R1,2030,2.40000000000
+12,2049,windturbine,R1,2030,2.40000000000
+12,2050,windturbine,R1,2030,2.40000000000
+12,2054,windturbine,R1,2030,2.40000000000
+12,2055,windturbine,R1,2030,2.40000000000
+12,2059,windturbine,R1,2030,2.40000000000
+13,2050,windturbine,R1,2045,12.55000000000
+13,2054,windturbine,R1,2045,12.55000000000
+13,2055,windturbine,R1,2045,12.55000000000
+13,2059,windturbine,R1,2045,12.55000000000
+13,2060,windturbine,R1,2045,12.55000000000
+13,2064,windturbine,R1,2045,12.55000000000
+13,2065,windturbine,R1,2045,12.55000000000
+13,2069,windturbine,R1,2045,12.55000000000
+13,2070,windturbine,R1,2045,12.55000000000
+13,2074,windturbine,R1,2045,12.55000000000
+14,2045,windturbine,R2,2020,32.55000000000
+14,2049,windturbine,R2,2020,32.55000000000
+15,2050,windturbine,R2,2045,12.55000000000
+15,2054,windturbine,R2,2045,12.55000000000
+15,2055,windturbine,R2,2045,12.55000000000
+15,2059,windturbine,R2,2045,12.55000000000
+15,2060,windturbine,R2,2045,12.55000000000
+15,2064,windturbine,R2,2045,12.55000000000
+15,2065,windturbine,R2,2045,12.55000000000
+15,2069,windturbine,R2,2045,12.55000000000
+15,2070,windturbine,R2,2045,12.55000000000
+15,2074,windturbine,R2,2045,12.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index c6c24b25..69841ef9 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,101 +1,105 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2025,solarPV,19.21000000000
-2,2054,R1,2025,solarPV,19.21000000000
-3,2050,R1,2030,solarPV,11.20000000000
-3,2054,R1,2030,solarPV,11.20000000000
-3,2055,R1,2030,solarPV,11.20000000000
-3,2059,R1,2030,solarPV,11.20000000000
-4,2050,R1,2035,solarPV,15.44000000000
-4,2054,R1,2035,solarPV,15.44000000000
-4,2055,R1,2035,solarPV,15.44000000000
-4,2059,R1,2035,solarPV,15.44000000000
-4,2060,R1,2035,solarPV,15.44000000000
-4,2064,R1,2035,solarPV,15.44000000000
-5,2050,R1,2040,solarPV,11.20000000000
-5,2054,R1,2040,solarPV,11.20000000000
-5,2055,R1,2040,solarPV,11.20000000000
-5,2059,R1,2040,solarPV,11.20000000000
-5,2060,R1,2040,solarPV,11.20000000000
-5,2064,R1,2040,solarPV,11.20000000000
-5,2065,R1,2040,solarPV,11.20000000000
-5,2069,R1,2040,solarPV,11.20000000000
-6,2050,R1,2045,solarPV,31.20000000000
-6,2054,R1,2045,solarPV,31.20000000000
-6,2055,R1,2045,solarPV,31.20000000000
-6,2059,R1,2045,solarPV,31.20000000000
-6,2060,R1,2045,solarPV,31.20000000000
-6,2064,R1,2045,solarPV,31.20000000000
-6,2065,R1,2045,solarPV,31.20000000000
-6,2069,R1,2045,solarPV,31.20000000000
-6,2070,R1,2045,solarPV,31.20000000000
-6,2074,R1,2045,solarPV,31.20000000000
-7,2050,R1,2045,windturbine,12.55000000000
-7,2054,R1,2045,windturbine,12.55000000000
-7,2055,R1,2045,windturbine,12.55000000000
-7,2059,R1,2045,windturbine,12.55000000000
-7,2060,R1,2045,windturbine,12.55000000000
-7,2064,R1,2045,windturbine,12.55000000000
-7,2065,R1,2045,windturbine,12.55000000000
-7,2069,R1,2045,windturbine,12.55000000000
-7,2070,R1,2045,windturbine,12.55000000000
-7,2074,R1,2045,windturbine,12.55000000000
-8,2055,R1,2050,solarPV,19.21000000000
-8,2059,R1,2050,solarPV,19.21000000000
-8,2060,R1,2050,solarPV,19.21000000000
-8,2064,R1,2050,solarPV,19.21000000000
-8,2065,R1,2050,solarPV,19.21000000000
-8,2069,R1,2050,solarPV,19.21000000000
-8,2070,R1,2050,solarPV,19.21000000000
-8,2074,R1,2050,solarPV,19.21000000000
-8,2075,R1,2050,solarPV,19.21000000000
-8,2079,R1,2050,solarPV,19.21000000000
-10,2050,R2,2025,solarPV,19.21000000000
-10,2054,R2,2025,solarPV,19.21000000000
-11,2050,R2,2030,solarPV,11.20000000000
-11,2054,R2,2030,solarPV,11.20000000000
-11,2055,R2,2030,solarPV,11.20000000000
-11,2059,R2,2030,solarPV,11.20000000000
-12,2050,R2,2035,solarPV,15.44000000000
-12,2054,R2,2035,solarPV,15.44000000000
-12,2055,R2,2035,solarPV,15.44000000000
-12,2059,R2,2035,solarPV,15.44000000000
-12,2060,R2,2035,solarPV,15.44000000000
-12,2064,R2,2035,solarPV,15.44000000000
-13,2050,R2,2040,solarPV,11.20000000000
-13,2054,R2,2040,solarPV,11.20000000000
-13,2055,R2,2040,solarPV,11.20000000000
-13,2059,R2,2040,solarPV,11.20000000000
-13,2060,R2,2040,solarPV,11.20000000000
-13,2064,R2,2040,solarPV,11.20000000000
-13,2065,R2,2040,solarPV,11.20000000000
-13,2069,R2,2040,solarPV,11.20000000000
-14,2050,R2,2045,solarPV,31.20000000000
-14,2054,R2,2045,solarPV,31.20000000000
-14,2055,R2,2045,solarPV,31.20000000000
-14,2059,R2,2045,solarPV,31.20000000000
-14,2060,R2,2045,solarPV,31.20000000000
-14,2064,R2,2045,solarPV,31.20000000000
-14,2065,R2,2045,solarPV,31.20000000000
-14,2069,R2,2045,solarPV,31.20000000000
-14,2070,R2,2045,solarPV,31.20000000000
-14,2074,R2,2045,solarPV,31.20000000000
-15,2050,R2,2045,windturbine,12.55000000000
-15,2054,R2,2045,windturbine,12.55000000000
-15,2055,R2,2045,windturbine,12.55000000000
-15,2059,R2,2045,windturbine,12.55000000000
-15,2060,R2,2045,windturbine,12.55000000000
-15,2064,R2,2045,windturbine,12.55000000000
-15,2065,R2,2045,windturbine,12.55000000000
-15,2069,R2,2045,windturbine,12.55000000000
-15,2070,R2,2045,windturbine,12.55000000000
-15,2074,R2,2045,windturbine,12.55000000000
-16,2055,R2,2050,solarPV,19.21000000000
-16,2059,R2,2050,solarPV,19.21000000000
-16,2060,R2,2050,solarPV,19.21000000000
-16,2064,R2,2050,solarPV,19.21000000000
-16,2065,R2,2050,solarPV,19.21000000000
-16,2069,R2,2050,solarPV,19.21000000000
-16,2070,R2,2050,solarPV,19.21000000000
-16,2074,R2,2050,solarPV,19.21000000000
-16,2075,R2,2050,solarPV,19.21000000000
-16,2079,R2,2050,solarPV,19.21000000000
+2,2050,R1,2025,solarPV,15.73000000000
+2,2054,R1,2025,solarPV,15.73000000000
+3,2050,R1,2030,solarPV,20.00000000000
+3,2054,R1,2030,solarPV,20.00000000000
+3,2055,R1,2030,solarPV,20.00000000000
+3,2059,R1,2030,solarPV,20.00000000000
+4,2050,R1,2030,windturbine,2.40000000000
+4,2054,R1,2030,windturbine,2.40000000000
+4,2055,R1,2030,windturbine,2.40000000000
+4,2059,R1,2030,windturbine,2.40000000000
+5,2050,R1,2035,solarPV,5.94800000000
+5,2054,R1,2035,solarPV,5.94800000000
+5,2055,R1,2035,solarPV,5.94800000000
+5,2059,R1,2035,solarPV,5.94800000000
+5,2060,R1,2035,solarPV,5.94800000000
+5,2064,R1,2035,solarPV,5.94800000000
+6,2050,R1,2040,solarPV,11.20000000000
+6,2054,R1,2040,solarPV,11.20000000000
+6,2055,R1,2040,solarPV,11.20000000000
+6,2059,R1,2040,solarPV,11.20000000000
+6,2060,R1,2040,solarPV,11.20000000000
+6,2064,R1,2040,solarPV,11.20000000000
+6,2065,R1,2040,solarPV,11.20000000000
+6,2069,R1,2040,solarPV,11.20000000000
+7,2050,R1,2045,solarPV,32.97200000000
+7,2054,R1,2045,solarPV,32.97200000000
+7,2055,R1,2045,solarPV,32.97200000000
+7,2059,R1,2045,solarPV,32.97200000000
+7,2060,R1,2045,solarPV,32.97200000000
+7,2064,R1,2045,solarPV,32.97200000000
+7,2065,R1,2045,solarPV,32.97200000000
+7,2069,R1,2045,solarPV,32.97200000000
+7,2070,R1,2045,solarPV,32.97200000000
+7,2074,R1,2045,solarPV,32.97200000000
+8,2050,R1,2045,windturbine,12.55000000000
+8,2054,R1,2045,windturbine,12.55000000000
+8,2055,R1,2045,windturbine,12.55000000000
+8,2059,R1,2045,windturbine,12.55000000000
+8,2060,R1,2045,windturbine,12.55000000000
+8,2064,R1,2045,windturbine,12.55000000000
+8,2065,R1,2045,windturbine,12.55000000000
+8,2069,R1,2045,windturbine,12.55000000000
+8,2070,R1,2045,windturbine,12.55000000000
+8,2074,R1,2045,windturbine,12.55000000000
+9,2055,R1,2050,solarPV,15.73000000000
+9,2059,R1,2050,solarPV,15.73000000000
+9,2060,R1,2050,solarPV,15.73000000000
+9,2064,R1,2050,solarPV,15.73000000000
+9,2065,R1,2050,solarPV,15.73000000000
+9,2069,R1,2050,solarPV,15.73000000000
+9,2070,R1,2050,solarPV,15.73000000000
+9,2074,R1,2050,solarPV,15.73000000000
+9,2075,R1,2050,solarPV,15.73000000000
+9,2079,R1,2050,solarPV,15.73000000000
+11,2050,R2,2025,solarPV,15.73000000000
+11,2054,R2,2025,solarPV,15.73000000000
+12,2050,R2,2030,solarPV,11.20000000000
+12,2054,R2,2030,solarPV,11.20000000000
+12,2055,R2,2030,solarPV,11.20000000000
+12,2059,R2,2030,solarPV,11.20000000000
+13,2050,R2,2035,solarPV,17.14800000000
+13,2054,R2,2035,solarPV,17.14800000000
+13,2055,R2,2035,solarPV,17.14800000000
+13,2059,R2,2035,solarPV,17.14800000000
+13,2060,R2,2035,solarPV,17.14800000000
+13,2064,R2,2035,solarPV,17.14800000000
+14,2050,R2,2040,solarPV,11.20000000000
+14,2054,R2,2040,solarPV,11.20000000000
+14,2055,R2,2040,solarPV,11.20000000000
+14,2059,R2,2040,solarPV,11.20000000000
+14,2060,R2,2040,solarPV,11.20000000000
+14,2064,R2,2040,solarPV,11.20000000000
+14,2065,R2,2040,solarPV,11.20000000000
+14,2069,R2,2040,solarPV,11.20000000000
+15,2050,R2,2045,solarPV,32.97200000000
+15,2054,R2,2045,solarPV,32.97200000000
+15,2055,R2,2045,solarPV,32.97200000000
+15,2059,R2,2045,solarPV,32.97200000000
+15,2060,R2,2045,solarPV,32.97200000000
+15,2064,R2,2045,solarPV,32.97200000000
+15,2065,R2,2045,solarPV,32.97200000000
+15,2069,R2,2045,solarPV,32.97200000000
+15,2070,R2,2045,solarPV,32.97200000000
+15,2074,R2,2045,solarPV,32.97200000000
+16,2050,R2,2045,windturbine,12.55000000000
+16,2054,R2,2045,windturbine,12.55000000000
+16,2055,R2,2045,windturbine,12.55000000000
+16,2059,R2,2045,windturbine,12.55000000000
+16,2060,R2,2045,windturbine,12.55000000000
+16,2064,R2,2045,windturbine,12.55000000000
+16,2065,R2,2045,windturbine,12.55000000000
+16,2069,R2,2045,windturbine,12.55000000000
+16,2070,R2,2045,windturbine,12.55000000000
+16,2074,R2,2045,windturbine,12.55000000000
+17,2055,R2,2050,solarPV,15.73000000000
+17,2059,R2,2050,solarPV,15.73000000000
+17,2060,R2,2050,solarPV,15.73000000000
+17,2064,R2,2050,solarPV,15.73000000000
+17,2065,R2,2050,solarPV,15.73000000000
+17,2069,R2,2050,solarPV,15.73000000000
+17,2070,R2,2050,solarPV,15.73000000000
+17,2074,R2,2050,solarPV,15.73000000000
+17,2075,R2,2050,solarPV,15.73000000000
+17,2079,R2,2050,solarPV,15.73000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
index e05cf1d9..4eb9a0ef 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
@@ -2,48 +2,48 @@ asset,year,technology,region,installed,capacity
 0,2025,electric_stove,R1,2020,17.40000000000
 0,2030,electric_stove,R1,2020,17.40000000000
 0,2034,electric_stove,R1,2020,17.40000000000
-1,2030,electric_stove,R1,2025,8.48000000000
-1,2034,electric_stove,R1,2025,8.48000000000
-1,2035,electric_stove,R1,2025,8.48000000000
-1,2039,electric_stove,R1,2025,8.48000000000
+1,2030,electric_stove,R1,2025,6.74000000000
+1,2034,electric_stove,R1,2025,6.74000000000
+1,2035,electric_stove,R1,2025,6.74000000000
+1,2039,electric_stove,R1,2025,6.74000000000
 2,2025,electric_stove,R2,2020,17.40000000000
 2,2030,electric_stove,R2,2020,17.40000000000
 2,2034,electric_stove,R2,2020,17.40000000000
-3,2030,electric_stove,R2,2025,8.48000000000
-3,2034,electric_stove,R2,2025,8.48000000000
-3,2035,electric_stove,R2,2025,8.48000000000
-3,2039,electric_stove,R2,2025,8.48000000000
+3,2030,electric_stove,R2,2025,6.74000000000
+3,2034,electric_stove,R2,2025,6.74000000000
+3,2035,electric_stove,R2,2025,6.74000000000
+3,2039,electric_stove,R2,2025,6.74000000000
 4,2025,gas_stove,R1,2020,5.00000000000
-5,2030,gas_stove,R1,2025,2.12000000000
-5,2034,gas_stove,R1,2025,2.12000000000
-5,2035,gas_stove,R1,2025,2.12000000000
-5,2039,gas_stove,R1,2025,2.12000000000
+5,2030,gas_stove,R1,2025,3.86000000000
+5,2034,gas_stove,R1,2025,3.86000000000
+5,2035,gas_stove,R1,2025,3.86000000000
+5,2039,gas_stove,R1,2025,3.86000000000
 6,2025,gas_stove,R2,2020,5.00000000000
-7,2030,gas_stove,R2,2025,2.12000000000
-7,2034,gas_stove,R2,2025,2.12000000000
-7,2035,gas_stove,R2,2025,2.12000000000
-7,2039,gas_stove,R2,2025,2.12000000000
+7,2030,gas_stove,R2,2025,3.86000000000
+7,2034,gas_stove,R2,2025,3.86000000000
+7,2035,gas_stove,R2,2025,3.86000000000
+7,2039,gas_stove,R2,2025,3.86000000000
 8,2025,gasboiler,R1,2020,5.00000000000
-9,2030,gasboiler,R1,2025,2.12000000000
-9,2034,gasboiler,R1,2025,2.12000000000
-9,2035,gasboiler,R1,2025,2.12000000000
-9,2039,gasboiler,R1,2025,2.12000000000
+9,2030,gasboiler,R1,2025,3.86000000000
+9,2034,gasboiler,R1,2025,3.86000000000
+9,2035,gasboiler,R1,2025,3.86000000000
+9,2039,gasboiler,R1,2025,3.86000000000
 10,2025,gasboiler,R2,2020,5.00000000000
-11,2030,gasboiler,R2,2025,2.12000000000
-11,2034,gasboiler,R2,2025,2.12000000000
-11,2035,gasboiler,R2,2025,2.12000000000
-11,2039,gasboiler,R2,2025,2.12000000000
+11,2030,gasboiler,R2,2025,3.86000000000
+11,2034,gasboiler,R2,2025,3.86000000000
+11,2035,gasboiler,R2,2025,3.86000000000
+11,2039,gasboiler,R2,2025,3.86000000000
 12,2025,heatpump,R1,2020,17.40000000000
 12,2030,heatpump,R1,2020,17.40000000000
 12,2034,heatpump,R1,2020,17.40000000000
-13,2030,heatpump,R1,2025,8.48000000000
-13,2034,heatpump,R1,2025,8.48000000000
-13,2035,heatpump,R1,2025,8.48000000000
-13,2039,heatpump,R1,2025,8.48000000000
+13,2030,heatpump,R1,2025,6.74000000000
+13,2034,heatpump,R1,2025,6.74000000000
+13,2035,heatpump,R1,2025,6.74000000000
+13,2039,heatpump,R1,2025,6.74000000000
 14,2025,heatpump,R2,2020,17.40000000000
 14,2030,heatpump,R2,2020,17.40000000000
 14,2034,heatpump,R2,2020,17.40000000000
-15,2030,heatpump,R2,2025,8.48000000000
-15,2034,heatpump,R2,2025,8.48000000000
-15,2035,heatpump,R2,2025,8.48000000000
-15,2039,heatpump,R2,2025,8.48000000000
+15,2030,heatpump,R2,2025,6.74000000000
+15,2034,heatpump,R2,2025,6.74000000000
+15,2035,heatpump,R2,2025,6.74000000000
+15,2039,heatpump,R2,2025,6.74000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
index 33ecdbe9..55b4cfea 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
@@ -1,56 +1,56 @@
 asset,year,technology,region,installed,capacity
 0,2030,electric_stove,R1,2020,17.40000000000
 0,2034,electric_stove,R1,2020,17.40000000000
-1,2030,electric_stove,R1,2025,8.48000000000
-1,2034,electric_stove,R1,2025,8.48000000000
-1,2035,electric_stove,R1,2025,8.48000000000
-1,2039,electric_stove,R1,2025,8.48000000000
+1,2030,electric_stove,R1,2025,6.74000000000
+1,2034,electric_stove,R1,2025,6.74000000000
+1,2035,electric_stove,R1,2025,6.74000000000
+1,2039,electric_stove,R1,2025,6.74000000000
 2,2035,electric_stove,R1,2030,23.00000000000
 2,2039,electric_stove,R1,2030,23.00000000000
 2,2040,electric_stove,R1,2030,23.00000000000
 2,2044,electric_stove,R1,2030,23.00000000000
 3,2030,electric_stove,R2,2020,17.40000000000
 3,2034,electric_stove,R2,2020,17.40000000000
-4,2030,electric_stove,R2,2025,8.48000000000
-4,2034,electric_stove,R2,2025,8.48000000000
-4,2035,electric_stove,R2,2025,8.48000000000
-4,2039,electric_stove,R2,2025,8.48000000000
+4,2030,electric_stove,R2,2025,6.74000000000
+4,2034,electric_stove,R2,2025,6.74000000000
+4,2035,electric_stove,R2,2025,6.74000000000
+4,2039,electric_stove,R2,2025,6.74000000000
 5,2035,electric_stove,R2,2030,23.00000000000
 5,2039,electric_stove,R2,2030,23.00000000000
 5,2040,electric_stove,R2,2030,23.00000000000
 5,2044,electric_stove,R2,2030,23.00000000000
-6,2030,gas_stove,R1,2025,2.12000000000
-6,2034,gas_stove,R1,2025,2.12000000000
-6,2035,gas_stove,R1,2025,2.12000000000
-6,2039,gas_stove,R1,2025,2.12000000000
-7,2030,gas_stove,R2,2025,2.12000000000
-7,2034,gas_stove,R2,2025,2.12000000000
-7,2035,gas_stove,R2,2025,2.12000000000
-7,2039,gas_stove,R2,2025,2.12000000000
-8,2030,gasboiler,R1,2025,2.12000000000
-8,2034,gasboiler,R1,2025,2.12000000000
-8,2035,gasboiler,R1,2025,2.12000000000
-8,2039,gasboiler,R1,2025,2.12000000000
-9,2030,gasboiler,R2,2025,2.12000000000
-9,2034,gasboiler,R2,2025,2.12000000000
-9,2035,gasboiler,R2,2025,2.12000000000
-9,2039,gasboiler,R2,2025,2.12000000000
+6,2030,gas_stove,R1,2025,3.86000000000
+6,2034,gas_stove,R1,2025,3.86000000000
+6,2035,gas_stove,R1,2025,3.86000000000
+6,2039,gas_stove,R1,2025,3.86000000000
+7,2030,gas_stove,R2,2025,3.86000000000
+7,2034,gas_stove,R2,2025,3.86000000000
+7,2035,gas_stove,R2,2025,3.86000000000
+7,2039,gas_stove,R2,2025,3.86000000000
+8,2030,gasboiler,R1,2025,3.86000000000
+8,2034,gasboiler,R1,2025,3.86000000000
+8,2035,gasboiler,R1,2025,3.86000000000
+8,2039,gasboiler,R1,2025,3.86000000000
+9,2030,gasboiler,R2,2025,3.86000000000
+9,2034,gasboiler,R2,2025,3.86000000000
+9,2035,gasboiler,R2,2025,3.86000000000
+9,2039,gasboiler,R2,2025,3.86000000000
 10,2030,heatpump,R1,2020,17.40000000000
 10,2034,heatpump,R1,2020,17.40000000000
-11,2030,heatpump,R1,2025,8.48000000000
-11,2034,heatpump,R1,2025,8.48000000000
-11,2035,heatpump,R1,2025,8.48000000000
-11,2039,heatpump,R1,2025,8.48000000000
+11,2030,heatpump,R1,2025,6.74000000000
+11,2034,heatpump,R1,2025,6.74000000000
+11,2035,heatpump,R1,2025,6.74000000000
+11,2039,heatpump,R1,2025,6.74000000000
 12,2035,heatpump,R1,2030,23.00000000000
 12,2039,heatpump,R1,2030,23.00000000000
 12,2040,heatpump,R1,2030,23.00000000000
 12,2044,heatpump,R1,2030,23.00000000000
 13,2030,heatpump,R2,2020,17.40000000000
 13,2034,heatpump,R2,2020,17.40000000000
-14,2030,heatpump,R2,2025,8.48000000000
-14,2034,heatpump,R2,2025,8.48000000000
-14,2035,heatpump,R2,2025,8.48000000000
-14,2039,heatpump,R2,2025,8.48000000000
+14,2030,heatpump,R2,2025,6.74000000000
+14,2034,heatpump,R2,2025,6.74000000000
+14,2035,heatpump,R2,2025,6.74000000000
+14,2039,heatpump,R2,2025,6.74000000000
 15,2035,heatpump,R2,2030,23.00000000000
 15,2039,heatpump,R2,2030,23.00000000000
 15,2040,heatpump,R2,2030,23.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
index 7e2526ff..982d4e66 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
@@ -1,49 +1,65 @@
 asset,year,technology,region,installed,capacity
-0,2035,electric_stove,R1,2025,8.48000000000
-0,2039,electric_stove,R1,2025,8.48000000000
+0,2035,electric_stove,R1,2025,6.74000000000
+0,2039,electric_stove,R1,2025,6.74000000000
 1,2035,electric_stove,R1,2030,23.00000000000
 1,2039,electric_stove,R1,2030,23.00000000000
 1,2040,electric_stove,R1,2030,23.00000000000
 1,2044,electric_stove,R1,2030,23.00000000000
-2,2040,electric_stove,R1,2035,16.20000000000
-2,2044,electric_stove,R1,2035,16.20000000000
-2,2045,electric_stove,R1,2035,16.20000000000
-2,2049,electric_stove,R1,2035,16.20000000000
-3,2035,electric_stove,R2,2025,8.48000000000
-3,2039,electric_stove,R2,2025,8.48000000000
+2,2040,electric_stove,R1,2035,15.31400000000
+2,2044,electric_stove,R1,2035,15.31400000000
+2,2045,electric_stove,R1,2035,15.31400000000
+2,2049,electric_stove,R1,2035,15.31400000000
+3,2035,electric_stove,R2,2025,6.74000000000
+3,2039,electric_stove,R2,2025,6.74000000000
 4,2035,electric_stove,R2,2030,23.00000000000
 4,2039,electric_stove,R2,2030,23.00000000000
 4,2040,electric_stove,R2,2030,23.00000000000
 4,2044,electric_stove,R2,2030,23.00000000000
-5,2040,electric_stove,R2,2035,16.20000000000
-5,2044,electric_stove,R2,2035,16.20000000000
-5,2045,electric_stove,R2,2035,16.20000000000
-5,2049,electric_stove,R2,2035,16.20000000000
-6,2035,gas_stove,R1,2025,2.12000000000
-6,2039,gas_stove,R1,2025,2.12000000000
-7,2035,gas_stove,R2,2025,2.12000000000
-7,2039,gas_stove,R2,2025,2.12000000000
-8,2035,gasboiler,R1,2025,2.12000000000
-8,2039,gasboiler,R1,2025,2.12000000000
-9,2035,gasboiler,R2,2025,2.12000000000
-9,2039,gasboiler,R2,2025,2.12000000000
-10,2035,heatpump,R1,2025,8.48000000000
-10,2039,heatpump,R1,2025,8.48000000000
-11,2035,heatpump,R1,2030,23.00000000000
-11,2039,heatpump,R1,2030,23.00000000000
-11,2040,heatpump,R1,2030,23.00000000000
-11,2044,heatpump,R1,2030,23.00000000000
-12,2040,heatpump,R1,2035,16.20000000000
-12,2044,heatpump,R1,2035,16.20000000000
-12,2045,heatpump,R1,2035,16.20000000000
-12,2049,heatpump,R1,2035,16.20000000000
-13,2035,heatpump,R2,2025,8.48000000000
-13,2039,heatpump,R2,2025,8.48000000000
-14,2035,heatpump,R2,2030,23.00000000000
-14,2039,heatpump,R2,2030,23.00000000000
-14,2040,heatpump,R2,2030,23.00000000000
-14,2044,heatpump,R2,2030,23.00000000000
-15,2040,heatpump,R2,2035,16.20000000000
-15,2044,heatpump,R2,2035,16.20000000000
-15,2045,heatpump,R2,2035,16.20000000000
-15,2049,heatpump,R2,2035,16.20000000000
+5,2040,electric_stove,R2,2035,15.31400000000
+5,2044,electric_stove,R2,2035,15.31400000000
+5,2045,electric_stove,R2,2035,15.31400000000
+5,2049,electric_stove,R2,2035,15.31400000000
+6,2035,gas_stove,R1,2025,3.86000000000
+6,2039,gas_stove,R1,2025,3.86000000000
+7,2040,gas_stove,R1,2035,0.88600000000
+7,2044,gas_stove,R1,2035,0.88600000000
+7,2045,gas_stove,R1,2035,0.88600000000
+7,2049,gas_stove,R1,2035,0.88600000000
+8,2035,gas_stove,R2,2025,3.86000000000
+8,2039,gas_stove,R2,2025,3.86000000000
+9,2040,gas_stove,R2,2035,0.88600000000
+9,2044,gas_stove,R2,2035,0.88600000000
+9,2045,gas_stove,R2,2035,0.88600000000
+9,2049,gas_stove,R2,2035,0.88600000000
+10,2035,gasboiler,R1,2025,3.86000000000
+10,2039,gasboiler,R1,2025,3.86000000000
+11,2040,gasboiler,R1,2035,0.88600000000
+11,2044,gasboiler,R1,2035,0.88600000000
+11,2045,gasboiler,R1,2035,0.88600000000
+11,2049,gasboiler,R1,2035,0.88600000000
+12,2035,gasboiler,R2,2025,3.86000000000
+12,2039,gasboiler,R2,2025,3.86000000000
+13,2040,gasboiler,R2,2035,0.88600000000
+13,2044,gasboiler,R2,2035,0.88600000000
+13,2045,gasboiler,R2,2035,0.88600000000
+13,2049,gasboiler,R2,2035,0.88600000000
+14,2035,heatpump,R1,2025,6.74000000000
+14,2039,heatpump,R1,2025,6.74000000000
+15,2035,heatpump,R1,2030,23.00000000000
+15,2039,heatpump,R1,2030,23.00000000000
+15,2040,heatpump,R1,2030,23.00000000000
+15,2044,heatpump,R1,2030,23.00000000000
+16,2040,heatpump,R1,2035,15.31400000000
+16,2044,heatpump,R1,2035,15.31400000000
+16,2045,heatpump,R1,2035,15.31400000000
+16,2049,heatpump,R1,2035,15.31400000000
+17,2035,heatpump,R2,2025,6.74000000000
+17,2039,heatpump,R2,2025,6.74000000000
+18,2035,heatpump,R2,2030,23.00000000000
+18,2039,heatpump,R2,2030,23.00000000000
+18,2040,heatpump,R2,2030,23.00000000000
+18,2044,heatpump,R2,2030,23.00000000000
+19,2040,heatpump,R2,2035,15.31400000000
+19,2044,heatpump,R2,2035,15.31400000000
+19,2045,heatpump,R2,2035,15.31400000000
+19,2049,heatpump,R2,2035,15.31400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
index 4eabd1e2..b3406b4c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
@@ -1,41 +1,57 @@
 asset,year,technology,region,installed,capacity
 0,2040,electric_stove,R1,2030,23.00000000000
 0,2044,electric_stove,R1,2030,23.00000000000
-1,2040,electric_stove,R1,2035,16.20000000000
-1,2044,electric_stove,R1,2035,16.20000000000
-1,2045,electric_stove,R1,2035,16.20000000000
-1,2049,electric_stove,R1,2035,16.20000000000
+1,2040,electric_stove,R1,2035,15.31400000000
+1,2044,electric_stove,R1,2035,15.31400000000
+1,2045,electric_stove,R1,2035,15.31400000000
+1,2049,electric_stove,R1,2035,15.31400000000
 2,2045,electric_stove,R1,2040,28.60000000000
 2,2049,electric_stove,R1,2040,28.60000000000
 2,2050,electric_stove,R1,2040,28.60000000000
 2,2054,electric_stove,R1,2040,28.60000000000
 3,2040,electric_stove,R2,2030,23.00000000000
 3,2044,electric_stove,R2,2030,23.00000000000
-4,2040,electric_stove,R2,2035,16.20000000000
-4,2044,electric_stove,R2,2035,16.20000000000
-4,2045,electric_stove,R2,2035,16.20000000000
-4,2049,electric_stove,R2,2035,16.20000000000
+4,2040,electric_stove,R2,2035,15.31400000000
+4,2044,electric_stove,R2,2035,15.31400000000
+4,2045,electric_stove,R2,2035,15.31400000000
+4,2049,electric_stove,R2,2035,15.31400000000
 5,2045,electric_stove,R2,2040,28.60000000000
 5,2049,electric_stove,R2,2040,28.60000000000
 5,2050,electric_stove,R2,2040,28.60000000000
 5,2054,electric_stove,R2,2040,28.60000000000
-6,2040,heatpump,R1,2030,23.00000000000
-6,2044,heatpump,R1,2030,23.00000000000
-7,2040,heatpump,R1,2035,16.20000000000
-7,2044,heatpump,R1,2035,16.20000000000
-7,2045,heatpump,R1,2035,16.20000000000
-7,2049,heatpump,R1,2035,16.20000000000
-8,2045,heatpump,R1,2040,28.60000000000
-8,2049,heatpump,R1,2040,28.60000000000
-8,2050,heatpump,R1,2040,28.60000000000
-8,2054,heatpump,R1,2040,28.60000000000
-9,2040,heatpump,R2,2030,23.00000000000
-9,2044,heatpump,R2,2030,23.00000000000
-10,2040,heatpump,R2,2035,16.20000000000
-10,2044,heatpump,R2,2035,16.20000000000
-10,2045,heatpump,R2,2035,16.20000000000
-10,2049,heatpump,R2,2035,16.20000000000
-11,2045,heatpump,R2,2040,28.60000000000
-11,2049,heatpump,R2,2040,28.60000000000
-11,2050,heatpump,R2,2040,28.60000000000
-11,2054,heatpump,R2,2040,28.60000000000
+6,2040,gas_stove,R1,2035,0.88600000000
+6,2044,gas_stove,R1,2035,0.88600000000
+6,2045,gas_stove,R1,2035,0.88600000000
+6,2049,gas_stove,R1,2035,0.88600000000
+7,2040,gas_stove,R2,2035,0.88600000000
+7,2044,gas_stove,R2,2035,0.88600000000
+7,2045,gas_stove,R2,2035,0.88600000000
+7,2049,gas_stove,R2,2035,0.88600000000
+8,2040,gasboiler,R1,2035,0.88600000000
+8,2044,gasboiler,R1,2035,0.88600000000
+8,2045,gasboiler,R1,2035,0.88600000000
+8,2049,gasboiler,R1,2035,0.88600000000
+9,2040,gasboiler,R2,2035,0.88600000000
+9,2044,gasboiler,R2,2035,0.88600000000
+9,2045,gasboiler,R2,2035,0.88600000000
+9,2049,gasboiler,R2,2035,0.88600000000
+10,2040,heatpump,R1,2030,23.00000000000
+10,2044,heatpump,R1,2030,23.00000000000
+11,2040,heatpump,R1,2035,15.31400000000
+11,2044,heatpump,R1,2035,15.31400000000
+11,2045,heatpump,R1,2035,15.31400000000
+11,2049,heatpump,R1,2035,15.31400000000
+12,2045,heatpump,R1,2040,28.60000000000
+12,2049,heatpump,R1,2040,28.60000000000
+12,2050,heatpump,R1,2040,28.60000000000
+12,2054,heatpump,R1,2040,28.60000000000
+13,2040,heatpump,R2,2030,23.00000000000
+13,2044,heatpump,R2,2030,23.00000000000
+14,2040,heatpump,R2,2035,15.31400000000
+14,2044,heatpump,R2,2035,15.31400000000
+14,2045,heatpump,R2,2035,15.31400000000
+14,2049,heatpump,R2,2035,15.31400000000
+15,2045,heatpump,R2,2040,28.60000000000
+15,2049,heatpump,R2,2040,28.60000000000
+15,2050,heatpump,R2,2040,28.60000000000
+15,2054,heatpump,R2,2040,28.60000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
index 3d4542bd..7162fb9e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
@@ -1,6 +1,6 @@
 asset,year,technology,region,installed,capacity
-0,2045,electric_stove,R1,2035,16.20000000000
-0,2049,electric_stove,R1,2035,16.20000000000
+0,2045,electric_stove,R1,2035,15.31400000000
+0,2049,electric_stove,R1,2035,15.31400000000
 1,2045,electric_stove,R1,2040,28.60000000000
 1,2049,electric_stove,R1,2040,28.60000000000
 1,2050,electric_stove,R1,2040,28.60000000000
@@ -9,8 +9,8 @@ asset,year,technology,region,installed,capacity
 2,2054,electric_stove,R1,2045,21.80000000000
 2,2055,electric_stove,R1,2045,21.80000000000
 2,2059,electric_stove,R1,2045,21.80000000000
-3,2045,electric_stove,R2,2035,16.20000000000
-3,2049,electric_stove,R2,2035,16.20000000000
+3,2045,electric_stove,R2,2035,15.31400000000
+3,2049,electric_stove,R2,2035,15.31400000000
 4,2045,electric_stove,R2,2040,28.60000000000
 4,2049,electric_stove,R2,2040,28.60000000000
 4,2050,electric_stove,R2,2040,28.60000000000
@@ -19,23 +19,31 @@ asset,year,technology,region,installed,capacity
 5,2054,electric_stove,R2,2045,21.80000000000
 5,2055,electric_stove,R2,2045,21.80000000000
 5,2059,electric_stove,R2,2045,21.80000000000
-6,2045,heatpump,R1,2035,16.20000000000
-6,2049,heatpump,R1,2035,16.20000000000
-7,2045,heatpump,R1,2040,28.60000000000
-7,2049,heatpump,R1,2040,28.60000000000
-7,2050,heatpump,R1,2040,28.60000000000
-7,2054,heatpump,R1,2040,28.60000000000
-8,2050,heatpump,R1,2045,21.80000000000
-8,2054,heatpump,R1,2045,21.80000000000
-8,2055,heatpump,R1,2045,21.80000000000
-8,2059,heatpump,R1,2045,21.80000000000
-9,2045,heatpump,R2,2035,16.20000000000
-9,2049,heatpump,R2,2035,16.20000000000
-10,2045,heatpump,R2,2040,28.60000000000
-10,2049,heatpump,R2,2040,28.60000000000
-10,2050,heatpump,R2,2040,28.60000000000
-10,2054,heatpump,R2,2040,28.60000000000
-11,2050,heatpump,R2,2045,21.80000000000
-11,2054,heatpump,R2,2045,21.80000000000
-11,2055,heatpump,R2,2045,21.80000000000
-11,2059,heatpump,R2,2045,21.80000000000
+6,2045,gas_stove,R1,2035,0.88600000000
+6,2049,gas_stove,R1,2035,0.88600000000
+7,2045,gas_stove,R2,2035,0.88600000000
+7,2049,gas_stove,R2,2035,0.88600000000
+8,2045,gasboiler,R1,2035,0.88600000000
+8,2049,gasboiler,R1,2035,0.88600000000
+9,2045,gasboiler,R2,2035,0.88600000000
+9,2049,gasboiler,R2,2035,0.88600000000
+10,2045,heatpump,R1,2035,15.31400000000
+10,2049,heatpump,R1,2035,15.31400000000
+11,2045,heatpump,R1,2040,28.60000000000
+11,2049,heatpump,R1,2040,28.60000000000
+11,2050,heatpump,R1,2040,28.60000000000
+11,2054,heatpump,R1,2040,28.60000000000
+12,2050,heatpump,R1,2045,21.80000000000
+12,2054,heatpump,R1,2045,21.80000000000
+12,2055,heatpump,R1,2045,21.80000000000
+12,2059,heatpump,R1,2045,21.80000000000
+13,2045,heatpump,R2,2035,15.31400000000
+13,2049,heatpump,R2,2035,15.31400000000
+14,2045,heatpump,R2,2040,28.60000000000
+14,2049,heatpump,R2,2040,28.60000000000
+14,2050,heatpump,R2,2040,28.60000000000
+14,2054,heatpump,R2,2040,28.60000000000
+15,2050,heatpump,R2,2045,21.80000000000
+15,2054,heatpump,R2,2045,21.80000000000
+15,2055,heatpump,R2,2045,21.80000000000
+15,2059,heatpump,R2,2045,21.80000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
index 83b548ff..22fb2549 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
@@ -1,41 +1,41 @@
 asset,year,region,installed,technology,capacity
-2,2050,R1,2040,electric_stove,28.60000000000
-2,2054,R1,2040,electric_stove,28.60000000000
-3,2050,R1,2040,heatpump,28.60000000000
-3,2054,R1,2040,heatpump,28.60000000000
-4,2050,R1,2045,electric_stove,21.80000000000
-4,2054,R1,2045,electric_stove,21.80000000000
-4,2055,R1,2045,electric_stove,21.80000000000
-4,2059,R1,2045,electric_stove,21.80000000000
-5,2050,R1,2045,heatpump,21.80000000000
-5,2054,R1,2045,heatpump,21.80000000000
-5,2055,R1,2045,heatpump,21.80000000000
-5,2059,R1,2045,heatpump,21.80000000000
-6,2055,R1,2050,electric_stove,28.60000000000
-6,2059,R1,2050,electric_stove,28.60000000000
-6,2060,R1,2050,electric_stove,28.60000000000
-6,2064,R1,2050,electric_stove,28.60000000000
-7,2055,R1,2050,heatpump,28.60000000000
-7,2059,R1,2050,heatpump,28.60000000000
-7,2060,R1,2050,heatpump,28.60000000000
-7,2064,R1,2050,heatpump,28.60000000000
-10,2050,R2,2040,electric_stove,28.60000000000
-10,2054,R2,2040,electric_stove,28.60000000000
-11,2050,R2,2040,heatpump,28.60000000000
-11,2054,R2,2040,heatpump,28.60000000000
-12,2050,R2,2045,electric_stove,21.80000000000
-12,2054,R2,2045,electric_stove,21.80000000000
-12,2055,R2,2045,electric_stove,21.80000000000
-12,2059,R2,2045,electric_stove,21.80000000000
-13,2050,R2,2045,heatpump,21.80000000000
-13,2054,R2,2045,heatpump,21.80000000000
-13,2055,R2,2045,heatpump,21.80000000000
-13,2059,R2,2045,heatpump,21.80000000000
-14,2055,R2,2050,electric_stove,28.60000000000
-14,2059,R2,2050,electric_stove,28.60000000000
-14,2060,R2,2050,electric_stove,28.60000000000
-14,2064,R2,2050,electric_stove,28.60000000000
-15,2055,R2,2050,heatpump,28.60000000000
-15,2059,R2,2050,heatpump,28.60000000000
-15,2060,R2,2050,heatpump,28.60000000000
-15,2064,R2,2050,heatpump,28.60000000000
+4,2050,R1,2040,electric_stove,28.60000000000
+4,2054,R1,2040,electric_stove,28.60000000000
+5,2050,R1,2040,heatpump,28.60000000000
+5,2054,R1,2040,heatpump,28.60000000000
+6,2050,R1,2045,electric_stove,21.80000000000
+6,2054,R1,2045,electric_stove,21.80000000000
+6,2055,R1,2045,electric_stove,21.80000000000
+6,2059,R1,2045,electric_stove,21.80000000000
+7,2050,R1,2045,heatpump,21.80000000000
+7,2054,R1,2045,heatpump,21.80000000000
+7,2055,R1,2045,heatpump,21.80000000000
+7,2059,R1,2045,heatpump,21.80000000000
+8,2055,R1,2050,electric_stove,28.60000000000
+8,2059,R1,2050,electric_stove,28.60000000000
+8,2060,R1,2050,electric_stove,28.60000000000
+8,2064,R1,2050,electric_stove,28.60000000000
+9,2055,R1,2050,heatpump,28.60000000000
+9,2059,R1,2050,heatpump,28.60000000000
+9,2060,R1,2050,heatpump,28.60000000000
+9,2064,R1,2050,heatpump,28.60000000000
+14,2050,R2,2040,electric_stove,28.60000000000
+14,2054,R2,2040,electric_stove,28.60000000000
+15,2050,R2,2040,heatpump,28.60000000000
+15,2054,R2,2040,heatpump,28.60000000000
+16,2050,R2,2045,electric_stove,21.80000000000
+16,2054,R2,2045,electric_stove,21.80000000000
+16,2055,R2,2045,electric_stove,21.80000000000
+16,2059,R2,2045,electric_stove,21.80000000000
+17,2050,R2,2045,heatpump,21.80000000000
+17,2054,R2,2045,heatpump,21.80000000000
+17,2055,R2,2045,heatpump,21.80000000000
+17,2059,R2,2045,heatpump,21.80000000000
+18,2055,R2,2050,electric_stove,28.60000000000
+18,2059,R2,2050,electric_stove,28.60000000000
+18,2060,R2,2050,electric_stove,28.60000000000
+18,2064,R2,2050,electric_stove,28.60000000000
+19,2055,R2,2050,heatpump,28.60000000000
+19,2059,R2,2050,heatpump,28.60000000000
+19,2060,R2,2050,heatpump,28.60000000000
+19,2064,R2,2050,heatpump,28.60000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
index b195bea8..be043488 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
@@ -3,447 +3,447 @@ timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
 0,heat,R1,2025,10,gasboiler,2020,all-year,all-week,night,0.10420000000
 0,heat,R1,2025,12,heatpump,2020,all-year,all-week,night,0.36250000000
 0,heat,R1,2025,14,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2030,11,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2030,11,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R1,2030,12,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,13,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,13,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2030,14,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,15,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,15,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2025,8,gasboiler,2020,all-year,all-week,night,0.10420000000
 0,heat,R2,2025,10,gasboiler,2020,all-year,all-week,night,0.10420000000
 0,heat,R2,2025,12,heatpump,2020,all-year,all-week,night,0.36250000000
 0,heat,R2,2025,14,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2030,11,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2030,11,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R2,2030,12,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,13,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,13,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2030,14,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,15,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,15,heatpump,2025,all-year,all-week,night,0.14040000000
 0,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,night,5.20830000000
 0,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,night,5.20830000000
 0,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,night,6.74060000000
 0,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,night,5.20380000000
 0,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,night,5.20830000000
 0,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,night,5.20830000000
 0,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,night,6.74060000000
 0,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,night,6.74060000000
-0,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,night,5.20380000000
 0,cook,R1,2025,0,electric_stove,2020,all-year,all-week,night,0.36250000000
 0,cook,R1,2025,2,electric_stove,2020,all-year,all-week,night,0.36250000000
 0,cook,R1,2025,4,gas_stove,2020,all-year,all-week,night,0.10420000000
 0,cook,R1,2025,6,gas_stove,2020,all-year,all-week,night,0.10420000000
 0,cook,R1,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R1,2030,2,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R1,2030,3,electric_stove,2025,all-year,all-week,night,0.17670000000
-0,cook,R1,2030,5,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2030,3,electric_stove,2025,all-year,all-week,night,0.14040000000
+0,cook,R1,2030,5,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.08040000000
 0,cook,R2,2025,0,electric_stove,2020,all-year,all-week,night,0.36250000000
 0,cook,R2,2025,2,electric_stove,2020,all-year,all-week,night,0.36250000000
 0,cook,R2,2025,4,gas_stove,2020,all-year,all-week,night,0.10420000000
 0,cook,R2,2025,6,gas_stove,2020,all-year,all-week,night,0.10420000000
 0,cook,R2,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R2,2030,2,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R2,2030,3,electric_stove,2025,all-year,all-week,night,0.17670000000
-0,cook,R2,2030,5,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2030,3,electric_stove,2025,all-year,all-week,night,0.14040000000
+0,cook,R2,2030,5,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.08040000000
 1,heat,R1,2025,8,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R1,2025,10,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R1,2025,12,heatpump,2020,all-year,all-week,morning,0.51790000000
 1,heat,R1,2025,14,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2030,11,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2030,11,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R1,2030,12,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,13,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,13,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2030,14,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,15,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,15,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2025,8,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R2,2025,10,gasboiler,2020,all-year,all-week,morning,0.14880000000
 1,heat,R2,2025,12,heatpump,2020,all-year,all-week,morning,0.51790000000
 1,heat,R2,2025,14,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2030,11,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2030,11,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R2,2030,12,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,13,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,13,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2030,14,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,15,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,15,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,morning,7.44050000000
 1,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,morning,7.44050000000
 1,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,morning,9.62950000000
 1,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,morning,7.43390000000
 1,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,morning,7.44050000000
 1,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,morning,7.44050000000
 1,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,morning,9.62950000000
 1,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,morning,9.62950000000
-1,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,morning,7.43390000000
 1,cook,R1,2025,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
 1,cook,R1,2025,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
 1,cook,R1,2025,4,gas_stove,2020,all-year,all-week,morning,0.14880000000
 1,cook,R1,2025,6,gas_stove,2020,all-year,all-week,morning,0.14880000000
 1,cook,R1,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R1,2030,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R1,2030,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
-1,cook,R1,2030,5,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2030,3,electric_stove,2025,all-year,all-week,morning,0.20060000000
+1,cook,R1,2030,5,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.11490000000
 1,cook,R2,2025,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
 1,cook,R2,2025,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
 1,cook,R2,2025,4,gas_stove,2020,all-year,all-week,morning,0.14880000000
 1,cook,R2,2025,6,gas_stove,2020,all-year,all-week,morning,0.14880000000
 1,cook,R2,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R2,2030,2,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R2,2030,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
-1,cook,R2,2030,5,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2030,3,electric_stove,2025,all-year,all-week,morning,0.20060000000
+1,cook,R2,2030,5,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.11490000000
 2,heat,R1,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R1,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R1,2025,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,heat,R1,2025,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R1,2030,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2030,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R2,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,heat,R2,2025,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,heat,R2,2025,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R2,2030,12,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2030,14,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
 2,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
 2,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
 2,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
 2,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
 2,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,5.20830000000
 2,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
 2,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,6.74060000000
-2,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
 2,cook,R1,2025,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,cook,R1,2025,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,cook,R1,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,cook,R1,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,cook,R1,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R1,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R1,2030,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,cook,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2030,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,cook,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,cook,R2,2025,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,cook,R2,2025,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
 2,cook,R2,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,cook,R2,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,0.10420000000
 2,cook,R2,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R2,2030,2,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R2,2030,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,cook,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2030,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,cook,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
 3,heat,R1,2025,8,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R1,2025,10,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R1,2025,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
 3,heat,R1,2025,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R1,2030,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2030,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2025,8,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R2,2025,10,gasboiler,2020,all-year,all-week,early-peak,0.14880000000
 3,heat,R2,2025,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
 3,heat,R2,2025,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R2,2030,12,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2030,14,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
 3,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
 3,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
 3,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
 3,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
 3,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,early-peak,7.44050000000
 3,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
 3,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,early-peak,9.62950000000
-3,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
 3,cook,R1,2025,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
 3,cook,R1,2025,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
 3,cook,R1,2025,4,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
 3,cook,R1,2025,6,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
 3,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R1,2030,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
-3,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2030,3,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
+3,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
 3,cook,R2,2025,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
 3,cook,R2,2025,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
 3,cook,R2,2025,4,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
 3,cook,R2,2025,6,gas_stove,2020,all-year,all-week,early-peak,0.14880000000
 3,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R2,2030,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
-3,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2030,3,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
+3,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
 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.08750000000
 4,heat,R1,2025,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R1,2030,12,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2030,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 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.08750000000
 4,heat,R2,2025,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R2,2030,12,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2030,14,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 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.62500000000
-4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
 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.62500000000
-4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
 4,cook,R1,2025,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 4,cook,R1,2025,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R1,2030,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
-4,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2030,3,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
+4,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
 4,cook,R2,2025,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 4,cook,R2,2025,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
 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,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R2,2030,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
-4,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2030,3,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
+4,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
 5,heat,R1,2025,8,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R1,2025,10,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R1,2025,12,heatpump,2020,all-year,all-week,evening,0.72500000000
 5,heat,R1,2025,14,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2030,11,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2030,11,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R1,2030,12,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,13,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,13,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2030,14,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,15,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,15,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2025,8,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R2,2025,10,gasboiler,2020,all-year,all-week,evening,0.20830000000
 5,heat,R2,2025,12,heatpump,2020,all-year,all-week,evening,0.72500000000
 5,heat,R2,2025,14,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2030,11,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2030,11,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R2,2030,12,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,13,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,13,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2030,14,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,15,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,15,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,evening,10.41670000000
 5,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,evening,10.41670000000
 5,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,evening,13.48120000000
 5,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,evening,10.40750000000
 5,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,evening,10.41670000000
 5,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,evening,10.41670000000
 5,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,evening,13.48120000000
 5,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,evening,13.48120000000
-5,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,evening,10.40750000000
 5,cook,R1,2025,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
 5,cook,R1,2025,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
 5,cook,R1,2025,4,gas_stove,2020,all-year,all-week,evening,0.20830000000
 5,cook,R1,2025,6,gas_stove,2020,all-year,all-week,evening,0.20830000000
 5,cook,R1,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R1,2030,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R1,2030,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
-5,cook,R1,2030,5,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2030,3,electric_stove,2025,all-year,all-week,evening,0.28080000000
+5,cook,R1,2030,5,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.16080000000
 5,cook,R2,2025,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
 5,cook,R2,2025,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
 5,cook,R2,2025,4,gas_stove,2020,all-year,all-week,evening,0.20830000000
 5,cook,R2,2025,6,gas_stove,2020,all-year,all-week,evening,0.20830000000
 5,cook,R2,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R2,2030,2,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R2,2030,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
-5,cook,R2,2030,5,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2030,3,electric_stove,2025,all-year,all-week,evening,0.28080000000
+5,cook,R2,2030,5,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.16080000000
 6,heat,R1,2025,8,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R1,2025,10,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R1,2025,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
 6,heat,R1,2025,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R1,2030,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2030,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2025,8,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R2,2025,10,gasboiler,2020,all-year,all-week,early-morning,0.20830000000
 6,heat,R2,2025,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
 6,heat,R2,2025,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R2,2030,12,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2030,14,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
 6,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
 6,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
 6,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
 6,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
 6,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,early-morning,10.41670000000
 6,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
 6,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,early-morning,13.48120000000
-6,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
 6,cook,R1,2025,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
 6,cook,R1,2025,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
 6,cook,R1,2025,4,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
 6,cook,R1,2025,6,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
 6,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R1,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R1,2030,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
-6,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2030,3,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
+6,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
 6,cook,R2,2025,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
 6,cook,R2,2025,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
 6,cook,R2,2025,4,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
 6,cook,R2,2025,6,gas_stove,2020,all-year,all-week,early-morning,0.20830000000
 6,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R2,2030,2,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R2,2030,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
-6,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2030,3,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
+6,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
 7,heat,R1,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R1,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R1,2025,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
 7,heat,R1,2025,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R1,2030,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2030,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R2,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,0.20830000000
 7,heat,R2,2025,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
 7,heat,R2,2025,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R2,2030,12,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2030,14,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
 7,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
 7,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
 7,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
 7,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
 7,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,10.41670000000
 7,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
 7,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,13.48120000000
-7,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
 7,cook,R1,2025,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
 7,cook,R1,2025,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
 7,cook,R1,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
 7,cook,R1,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
 7,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R1,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R1,2030,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
-7,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2030,3,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
+7,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
 7,cook,R2,2025,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
 7,cook,R2,2025,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
 7,cook,R2,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
 7,cook,R2,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,0.20830000000
 7,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R2,2030,2,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R2,2030,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
-7,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2030,3,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
+7,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
index 51d562bc..5958017c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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.04420000000
-0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R1,2030,8,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R1,2030,10,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,11,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2030,13,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R1,2030,14,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2030,14,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,11,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2035,12,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2035,14,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,14,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R1,2035,15,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2030,8,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.04420000000
+0,heat,R2,2030,8,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.08040000000
 0,heat,R2,2030,10,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,11,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2030,13,heatpump,2020,all-year,all-week,night,0.36250000000
-0,heat,R2,2030,14,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,11,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2030,14,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,11,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2035,12,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2035,14,heatpump,2025,all-year,all-week,night,0.17670000000
+0,heat,R2,2035,14,heatpump,2025,all-year,all-week,night,0.14040000000
 0,heat,R2,2035,15,heatpump,2030,all-year,all-week,night,0.47920000000
-0,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
+0,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,5.20380000000
 0,cook,R1,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,1,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R1,2030,3,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R1,2030,4,electric_stove,2025,all-year,all-week,night,0.17670000000
-0,cook,R1,2030,6,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R1,2035,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2030,4,electric_stove,2025,all-year,all-week,night,0.14040000000
+0,cook,R1,2030,6,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R1,2035,1,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R1,2035,2,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2035,4,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2035,4,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R1,2035,5,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.08040000000
 0,cook,R2,2030,0,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,1,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R2,2030,3,electric_stove,2020,all-year,all-week,night,0.36250000000
-0,cook,R2,2030,4,electric_stove,2025,all-year,all-week,night,0.17670000000
-0,cook,R2,2030,6,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R2,2035,1,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2030,4,electric_stove,2025,all-year,all-week,night,0.14040000000
+0,cook,R2,2030,6,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R2,2035,1,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R2,2035,2,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2035,4,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2035,4,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R2,2035,5,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
-1,heat,R1,2030,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.08040000000
+1,heat,R1,2030,8,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R1,2030,10,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,11,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2030,13,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R1,2030,14,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2030,14,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,11,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2035,12,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2035,14,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R1,2035,14,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R1,2035,15,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2030,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
+1,heat,R2,2030,8,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.11490000000
 1,heat,R2,2030,10,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,11,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2030,13,heatpump,2020,all-year,all-week,morning,0.51790000000
-1,heat,R2,2030,14,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,11,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2030,14,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,11,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2035,12,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2035,14,heatpump,2025,all-year,all-week,morning,0.25240000000
+1,heat,R2,2035,14,heatpump,2025,all-year,all-week,morning,0.20060000000
 1,heat,R2,2035,15,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
+1,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,7.43390000000
 1,cook,R1,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,1,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R1,2030,3,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R1,2030,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
-1,cook,R1,2030,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R1,2035,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2030,4,electric_stove,2025,all-year,all-week,morning,0.20060000000
+1,cook,R1,2030,6,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R1,2035,1,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R1,2035,2,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2035,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2035,4,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R1,2035,5,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.11490000000
 1,cook,R2,2030,0,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,1,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R2,2030,3,electric_stove,2020,all-year,all-week,morning,0.51790000000
-1,cook,R2,2030,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
-1,cook,R2,2030,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R2,2035,1,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2030,4,electric_stove,2025,all-year,all-week,morning,0.20060000000
+1,cook,R2,2030,6,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R2,2035,1,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R2,2035,2,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2035,4,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2035,4,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R2,2035,5,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
-2,heat,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.11490000000
+2,heat,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R1,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2030,13,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R1,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2035,12,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R1,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R1,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,heat,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,heat,R2,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2030,13,heatpump,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,heat,R2,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2035,12,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,heat,R2,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,heat,R2,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
+2,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
 2,cook,R1,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R1,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R1,2030,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,cook,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R1,2035,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2030,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,cook,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R1,2035,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R1,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R1,2035,5,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,cook,R2,2030,0,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R2,2030,3,electric_stove,2020,all-year,all-week,mid-afternoon,0.36250000000
-2,cook,R2,2030,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,cook,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R2,2035,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2030,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,cook,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R2,2035,1,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R2,2035,2,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2035,4,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R2,2035,5,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-3,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+3,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2030,13,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2035,12,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
+3,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
 3,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2030,13,heatpump,2020,all-year,all-week,early-peak,0.51790000000
-3,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2035,12,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-peak,0.25240000000
+3,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-peak,0.20060000000
 3,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
+3,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
 3,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R1,2030,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
-3,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R1,2035,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2030,4,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
+3,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R1,2035,1,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R1,2035,5,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
 3,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-peak,0.51790000000
-3,cook,R2,2030,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
-3,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R2,2035,1,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2030,4,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
+3,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R2,2035,1,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R2,2035,5,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-4,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+4,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2030,13,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2035,12,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
+4,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
 4,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2030,13,heatpump,2020,all-year,all-week,late-peak,1.08750000000
-4,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2035,12,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-peak,0.53000000000
+4,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-peak,0.42130000000
 4,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
+4,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
 4,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R1,2030,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
-4,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R1,2035,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2030,4,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
+4,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R1,2035,1,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R1,2035,5,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
 4,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-peak,1.08750000000
-4,cook,R2,2030,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
-4,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R2,2035,1,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2030,4,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
+4,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R2,2035,1,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R2,2035,5,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-5,heat,R1,2030,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+5,heat,R1,2030,8,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R1,2030,10,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,11,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2030,13,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R1,2030,14,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2030,14,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,11,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2035,12,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2035,14,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R1,2035,14,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R1,2035,15,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2030,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
+5,heat,R2,2030,8,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.16080000000
 5,heat,R2,2030,10,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,11,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2030,13,heatpump,2020,all-year,all-week,evening,0.72500000000
-5,heat,R2,2030,14,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,11,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2030,14,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,11,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2035,12,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2035,14,heatpump,2025,all-year,all-week,evening,0.35330000000
+5,heat,R2,2035,14,heatpump,2025,all-year,all-week,evening,0.28080000000
 5,heat,R2,2035,15,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
+5,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,10.40750000000
 5,cook,R1,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,1,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R1,2030,3,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R1,2030,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
-5,cook,R1,2030,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R1,2035,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2030,4,electric_stove,2025,all-year,all-week,evening,0.28080000000
+5,cook,R1,2030,6,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R1,2035,1,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R1,2035,2,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2035,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2035,4,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R1,2035,5,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.16080000000
 5,cook,R2,2030,0,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,1,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R2,2030,3,electric_stove,2020,all-year,all-week,evening,0.72500000000
-5,cook,R2,2030,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
-5,cook,R2,2030,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R2,2035,1,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2030,4,electric_stove,2025,all-year,all-week,evening,0.28080000000
+5,cook,R2,2030,6,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R2,2035,1,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R2,2035,2,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2035,4,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2035,4,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R2,2035,5,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
-6,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.16080000000
+6,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2030,13,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2035,12,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
+6,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
 6,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2030,13,heatpump,2020,all-year,all-week,early-morning,0.72500000000
-6,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2035,12,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-morning,0.35330000000
+6,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-morning,0.28080000000
 6,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
+6,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
 6,cook,R1,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R1,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R1,2030,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
-6,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R1,2035,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2030,4,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
+6,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R1,2035,1,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R1,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R1,2035,5,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
 6,cook,R2,2030,0,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,1,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R2,2030,3,electric_stove,2020,all-year,all-week,early-morning,0.72500000000
-6,cook,R2,2030,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
-6,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R2,2035,1,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2030,4,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
+6,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R2,2035,1,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R2,2035,2,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2035,4,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R2,2035,5,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-7,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+7,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2030,13,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2035,12,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
+7,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
 7,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2030,13,heatpump,2020,all-year,all-week,late-afternoon,0.72500000000
-7,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2035,12,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
+7,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
 7,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
+7,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
 7,cook,R1,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R1,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R1,2030,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
-7,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R1,2035,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2030,4,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
+7,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R1,2035,1,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R1,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R1,2035,5,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
 7,cook,R2,2030,0,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,1,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R2,2030,3,electric_stove,2020,all-year,all-week,late-afternoon,0.72500000000
-7,cook,R2,2030,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
-7,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R2,2035,1,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2030,4,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
+7,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R2,2035,1,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R2,2035,2,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2035,4,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R2,2035,5,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
index de7a392b..a7d8596e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
@@ -1,385 +1,513 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R1,2035,10,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R1,2035,11,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2035,13,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R1,2035,14,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,11,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,12,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2040,14,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,15,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.04420000000
-0,heat,R2,2035,10,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R2,2035,11,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2035,13,heatpump,2025,all-year,all-week,night,0.17670000000
-0,heat,R2,2035,14,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,11,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,12,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2040,14,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,15,heatpump,2035,all-year,all-week,night,0.33750000000
-0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,2.20830000000
-0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,2.85800000000
-0,cook,R1,2035,0,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,heat,R1,2035,10,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,12,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R1,2035,14,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R1,2035,15,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2035,17,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R1,2035,18,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,11,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,13,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,15,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,16,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2040,18,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,19,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2035,10,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,12,gasboiler,2025,all-year,all-week,night,0.08040000000
+0,heat,R2,2035,14,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R2,2035,15,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2035,17,heatpump,2025,all-year,all-week,night,0.14040000000
+0,heat,R2,2035,18,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,11,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,13,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,15,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,16,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2040,18,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,19,heatpump,2035,all-year,all-week,night,0.31900000000
+0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,night,4.02080000000
+0,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,night,5.20380000000
+0,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,cook,R1,2035,0,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R1,2035,1,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2035,3,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2035,3,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R1,2035,4,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R1,2035,8,gas_stove,2025,all-year,all-week,night,0.08040000000
 0,cook,R1,2040,1,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2040,2,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2040,2,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R1,2040,4,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2040,5,electric_stove,2035,all-year,all-week,night,0.33750000000
-0,cook,R2,2035,0,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R1,2040,5,electric_stove,2035,all-year,all-week,night,0.31900000000
+0,cook,R1,2040,7,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R1,2040,9,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R2,2035,0,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R2,2035,1,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2035,3,electric_stove,2025,all-year,all-week,night,0.17670000000
+0,cook,R2,2035,3,electric_stove,2025,all-year,all-week,night,0.14040000000
 0,cook,R2,2035,4,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.04420000000
-0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.04420000000
+0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.08040000000
+0,cook,R2,2035,8,gas_stove,2025,all-year,all-week,night,0.08040000000
 0,cook,R2,2040,1,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2040,2,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2040,2,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R2,2040,4,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2040,5,electric_stove,2035,all-year,all-week,night,0.33750000000
-1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R1,2035,10,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R1,2035,11,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2035,13,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R1,2035,14,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,11,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,12,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2040,14,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,15,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.06310000000
-1,heat,R2,2035,10,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R2,2035,11,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2035,13,heatpump,2025,all-year,all-week,morning,0.25240000000
-1,heat,R2,2035,14,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,11,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,12,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2040,14,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,15,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,3.15480000000
-1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,4.08290000000
-1,cook,R1,2035,0,electric_stove,2025,all-year,all-week,morning,0.25240000000
+0,cook,R2,2040,5,electric_stove,2035,all-year,all-week,night,0.31900000000
+0,cook,R2,2040,7,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R2,2040,9,gas_stove,2035,all-year,all-week,night,0.01850000000
+1,heat,R1,2035,10,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,12,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R1,2035,14,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R1,2035,15,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2035,17,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R1,2035,18,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,11,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,13,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,15,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,16,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2040,18,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,19,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2035,10,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,12,gasboiler,2025,all-year,all-week,morning,0.11490000000
+1,heat,R2,2035,14,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R2,2035,15,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2035,17,heatpump,2025,all-year,all-week,morning,0.20060000000
+1,heat,R2,2035,18,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,11,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,13,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,15,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,16,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2040,18,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,19,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,morning,5.74400000000
+1,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,morning,7.43390000000
+1,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,cook,R1,2035,0,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R1,2035,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2035,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2035,3,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R1,2035,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R1,2035,8,gas_stove,2025,all-year,all-week,morning,0.11490000000
 1,cook,R1,2040,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2040,2,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2040,2,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R1,2040,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2040,5,electric_stove,2035,all-year,all-week,morning,0.48210000000
-1,cook,R2,2035,0,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R1,2040,5,electric_stove,2035,all-year,all-week,morning,0.45580000000
+1,cook,R1,2040,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R1,2040,9,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R2,2035,0,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R2,2035,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2035,3,electric_stove,2025,all-year,all-week,morning,0.25240000000
+1,cook,R2,2035,3,electric_stove,2025,all-year,all-week,morning,0.20060000000
 1,cook,R2,2035,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.06310000000
-1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.06310000000
+1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.11490000000
+1,cook,R2,2035,8,gas_stove,2025,all-year,all-week,morning,0.11490000000
 1,cook,R2,2040,1,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2040,2,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2040,2,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R2,2040,4,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2040,5,electric_stove,2035,all-year,all-week,morning,0.48210000000
-2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R1,2035,10,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R1,2035,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2035,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R1,2035,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,12,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2040,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,15,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,heat,R2,2035,10,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R2,2035,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2035,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17670000000
-2,heat,R2,2035,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,11,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,12,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2040,14,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,15,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.20830000000
-2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.85800000000
-2,cook,R1,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+1,cook,R2,2040,5,electric_stove,2035,all-year,all-week,morning,0.45580000000
+1,cook,R2,2040,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R2,2040,9,gas_stove,2035,all-year,all-week,morning,0.02640000000
+2,heat,R1,2035,10,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,12,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R1,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R1,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2035,17,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R1,2035,18,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,11,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,13,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,16,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2040,18,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,19,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2035,10,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,12,gasboiler,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,heat,R2,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R2,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2035,17,heatpump,2025,all-year,all-week,mid-afternoon,0.14040000000
+2,heat,R2,2035,18,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,11,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,13,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,15,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,16,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2040,18,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,19,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,mid-afternoon,4.02080000000
+2,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,mid-afternoon,5.20380000000
+2,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,cook,R1,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R1,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R1,2035,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R1,2035,8,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,cook,R1,2040,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R1,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,cook,R2,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R1,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,cook,R1,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R1,2040,9,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R2,2035,0,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R2,2035,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.17670000000
+2,cook,R2,2035,3,electric_stove,2025,all-year,all-week,mid-afternoon,0.14040000000
 2,cook,R2,2035,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
-2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04420000000
+2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
+2,cook,R2,2035,8,gas_stove,2025,all-year,all-week,mid-afternoon,0.08040000000
 2,cook,R2,2040,1,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2040,2,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R2,2040,4,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
-3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R1,2035,10,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R1,2035,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2035,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R1,2035,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,12,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2040,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,15,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06310000000
-3,heat,R2,2035,10,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R2,2035,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2035,13,heatpump,2025,all-year,all-week,early-peak,0.25240000000
-3,heat,R2,2035,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,11,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,12,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2040,14,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,15,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.15480000000
-3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.08290000000
-3,cook,R1,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+2,cook,R2,2040,5,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,cook,R2,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R2,2040,9,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+3,heat,R1,2035,10,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,12,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2035,17,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R1,2035,18,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,11,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,13,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,16,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2040,18,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,19,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2035,10,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,12,gasboiler,2025,all-year,all-week,early-peak,0.11490000000
+3,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2035,17,heatpump,2025,all-year,all-week,early-peak,0.20060000000
+3,heat,R2,2035,18,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,11,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,13,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,15,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,16,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2040,18,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,19,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,early-peak,5.74400000000
+3,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,early-peak,7.43390000000
+3,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,cook,R1,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R1,2035,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R1,2035,8,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
 3,cook,R1,2040,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
-3,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
+3,cook,R1,2040,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R1,2040,9,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.25240000000
+3,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-peak,0.20060000000
 3,cook,R2,2035,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
-3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06310000000
+3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
+3,cook,R2,2035,8,gas_stove,2025,all-year,all-week,early-peak,0.11490000000
 3,cook,R2,2040,1,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
-4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R1,2035,10,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R1,2035,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2035,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R1,2035,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,12,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2040,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,15,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13250000000
-4,heat,R2,2035,10,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R2,2035,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2035,13,heatpump,2025,all-year,all-week,late-peak,0.53000000000
-4,heat,R2,2035,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,11,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,12,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2040,14,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,15,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.62500000000
-4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.57410000000
-4,cook,R1,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+3,cook,R2,2040,5,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
+3,cook,R2,2040,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R2,2040,9,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+4,heat,R1,2035,10,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,12,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2035,17,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R1,2035,18,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,11,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,13,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,16,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2040,18,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,19,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2035,10,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,12,gasboiler,2025,all-year,all-week,late-peak,0.24120000000
+4,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2035,17,heatpump,2025,all-year,all-week,late-peak,0.42130000000
+4,heat,R2,2035,18,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,11,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,13,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,15,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,16,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2040,18,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,19,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,late-peak,12.06250000000
+4,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,late-peak,15.61130000000
+4,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,cook,R1,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R1,2035,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R1,2035,8,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
 4,cook,R1,2040,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
-4,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
+4,cook,R1,2040,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R1,2040,9,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.53000000000
+4,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-peak,0.42130000000
 4,cook,R2,2035,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
-4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13250000000
+4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
+4,cook,R2,2035,8,gas_stove,2025,all-year,all-week,late-peak,0.24120000000
 4,cook,R2,2040,1,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
-5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R1,2035,10,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R1,2035,11,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2035,13,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R1,2035,14,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,11,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,12,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2040,14,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,15,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.08830000000
-5,heat,R2,2035,10,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R2,2035,11,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2035,13,heatpump,2025,all-year,all-week,evening,0.35330000000
-5,heat,R2,2035,14,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,11,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,12,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2040,14,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,15,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,4.41670000000
-5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,5.71610000000
-5,cook,R1,2035,0,electric_stove,2025,all-year,all-week,evening,0.35330000000
+4,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
+4,cook,R2,2040,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R2,2040,9,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+5,heat,R1,2035,10,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,12,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R1,2035,14,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R1,2035,15,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2035,17,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R1,2035,18,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,11,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,13,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,15,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,16,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2040,18,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,19,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2035,10,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,12,gasboiler,2025,all-year,all-week,evening,0.16080000000
+5,heat,R2,2035,14,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R2,2035,15,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2035,17,heatpump,2025,all-year,all-week,evening,0.28080000000
+5,heat,R2,2035,18,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,11,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,13,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,15,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,16,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2040,18,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,19,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,evening,8.04170000000
+5,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,evening,10.40750000000
+5,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,cook,R1,2035,0,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R1,2035,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2035,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2035,3,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R1,2035,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R1,2035,8,gas_stove,2025,all-year,all-week,evening,0.16080000000
 5,cook,R1,2040,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2040,2,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2040,2,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R1,2040,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2040,5,electric_stove,2035,all-year,all-week,evening,0.67500000000
-5,cook,R2,2035,0,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R1,2040,5,electric_stove,2035,all-year,all-week,evening,0.63810000000
+5,cook,R1,2040,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R1,2040,9,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R2,2035,0,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R2,2035,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2035,3,electric_stove,2025,all-year,all-week,evening,0.35330000000
+5,cook,R2,2035,3,electric_stove,2025,all-year,all-week,evening,0.28080000000
 5,cook,R2,2035,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.08830000000
-5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.08830000000
+5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.16080000000
+5,cook,R2,2035,8,gas_stove,2025,all-year,all-week,evening,0.16080000000
 5,cook,R2,2040,1,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2040,2,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2040,2,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R2,2040,4,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2040,5,electric_stove,2035,all-year,all-week,evening,0.67500000000
-6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R1,2035,10,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R1,2035,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2035,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R1,2035,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,12,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2040,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,15,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08830000000
-6,heat,R2,2035,10,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R2,2035,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2035,13,heatpump,2025,all-year,all-week,early-morning,0.35330000000
-6,heat,R2,2035,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,11,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,12,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2040,14,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,15,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.41670000000
-6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.71610000000
-6,cook,R1,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+5,cook,R2,2040,5,electric_stove,2035,all-year,all-week,evening,0.63810000000
+5,cook,R2,2040,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R2,2040,9,gas_stove,2035,all-year,all-week,evening,0.03690000000
+6,heat,R1,2035,10,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,12,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2035,17,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R1,2035,18,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,11,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,13,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,16,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2040,18,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,19,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2035,10,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,12,gasboiler,2025,all-year,all-week,early-morning,0.16080000000
+6,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2035,17,heatpump,2025,all-year,all-week,early-morning,0.28080000000
+6,heat,R2,2035,18,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,11,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,13,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,15,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,16,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2040,18,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,19,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,early-morning,8.04170000000
+6,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,early-morning,10.40750000000
+6,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,cook,R1,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R1,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R1,2035,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R1,2035,8,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
 6,cook,R1,2040,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R1,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
-6,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R1,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
+6,cook,R1,2040,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R1,2040,9,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R2,2035,0,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R2,2035,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.35330000000
+6,cook,R2,2035,3,electric_stove,2025,all-year,all-week,early-morning,0.28080000000
 6,cook,R2,2035,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
-6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08830000000
+6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
+6,cook,R2,2035,8,gas_stove,2025,all-year,all-week,early-morning,0.16080000000
 6,cook,R2,2040,1,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2040,2,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R2,2040,4,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
-7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R1,2035,10,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R1,2035,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2035,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R1,2035,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,12,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2040,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,15,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08830000000
-7,heat,R2,2035,10,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R2,2035,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2035,13,heatpump,2025,all-year,all-week,late-afternoon,0.35330000000
-7,heat,R2,2035,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,11,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,12,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2040,14,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,15,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.41670000000
-7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.71610000000
-7,cook,R1,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+6,cook,R2,2040,5,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
+6,cook,R2,2040,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R2,2040,9,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+7,heat,R1,2035,10,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,12,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2035,17,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R1,2035,18,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,11,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,13,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,16,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2040,18,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,19,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2035,10,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,12,gasboiler,2025,all-year,all-week,late-afternoon,0.16080000000
+7,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2035,17,heatpump,2025,all-year,all-week,late-afternoon,0.28080000000
+7,heat,R2,2035,18,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,11,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,13,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,15,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,16,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2040,18,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,19,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2035,8,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R1,2035,10,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2035,12,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2040,9,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2040,11,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2040,13,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2035,8,gas_stove,2025,all-year,all-week,late-afternoon,8.04170000000
+7,CO2f,R2,2035,10,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2035,12,gasboiler,2025,all-year,all-week,late-afternoon,10.40750000000
+7,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2040,9,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2040,11,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2040,13,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,cook,R1,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R1,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R1,2035,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R1,2035,8,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
 7,cook,R1,2040,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R1,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
-7,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R1,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
+7,cook,R1,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R1,2040,9,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R2,2035,0,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R2,2035,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.35330000000
+7,cook,R2,2035,3,electric_stove,2025,all-year,all-week,late-afternoon,0.28080000000
 7,cook,R2,2035,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
-7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08830000000
+7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
+7,cook,R2,2035,8,gas_stove,2025,all-year,all-week,late-afternoon,0.16080000000
 7,cook,R2,2040,1,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2040,2,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R2,2040,4,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2040,5,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
+7,cook,R2,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R2,2040,9,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
index 20e18335..53321d1b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
@@ -1,257 +1,513 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2040,9,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R1,2040,10,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,7,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,8,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2045,10,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,11,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,7,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2040,9,heatpump,2030,all-year,all-week,night,0.47920000000
-0,heat,R2,2040,10,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,7,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,8,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2045,10,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2040,8,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,9,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2040,10,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,11,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2040,13,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R1,2040,14,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,8,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,9,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,11,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,12,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,14,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,15,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2040,8,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,9,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2040,10,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,11,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2040,13,heatpump,2030,all-year,all-week,night,0.47920000000
+0,heat,R2,2040,14,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,8,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,9,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,11,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,12,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,14,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,15,heatpump,2040,all-year,all-week,night,0.59580000000
+0,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,night,1.19440000000
 0,cook,R1,2040,0,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2040,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2040,1,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R1,2040,3,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R1,2040,4,electric_stove,2035,all-year,all-week,night,0.33750000000
-0,cook,R1,2045,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2040,4,electric_stove,2035,all-year,all-week,night,0.31900000000
+0,cook,R1,2040,6,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R1,2040,7,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R1,2045,1,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R1,2045,2,electric_stove,2040,all-year,all-week,night,0.59580000000
-0,cook,R1,2045,4,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,4,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R1,2045,5,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2045,6,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R1,2045,7,gas_stove,2035,all-year,all-week,night,0.01850000000
 0,cook,R2,2040,0,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2040,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2040,1,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R2,2040,3,electric_stove,2030,all-year,all-week,night,0.47920000000
-0,cook,R2,2040,4,electric_stove,2035,all-year,all-week,night,0.33750000000
-0,cook,R2,2045,1,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2040,4,electric_stove,2035,all-year,all-week,night,0.31900000000
+0,cook,R2,2040,6,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R2,2040,7,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R2,2045,1,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R2,2045,2,electric_stove,2040,all-year,all-week,night,0.59580000000
-0,cook,R2,2045,4,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,4,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R2,2045,5,electric_stove,2040,all-year,all-week,night,0.59580000000
-1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2040,9,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R1,2040,10,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,7,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,8,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2045,10,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,11,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,7,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2040,9,heatpump,2030,all-year,all-week,morning,0.68450000000
-1,heat,R2,2040,10,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,7,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,8,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2045,10,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+0,cook,R2,2045,6,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R2,2045,7,gas_stove,2035,all-year,all-week,night,0.01850000000
+1,heat,R1,2040,8,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,9,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2040,10,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,11,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2040,13,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R1,2040,14,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,8,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,9,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,11,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,12,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,14,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,15,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2040,8,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,9,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2040,10,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,11,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2040,13,heatpump,2030,all-year,all-week,morning,0.68450000000
+1,heat,R2,2040,14,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,8,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,9,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,11,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,12,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,14,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,15,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,morning,1.70630000000
 1,cook,R1,2040,0,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2040,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2040,1,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R1,2040,3,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R1,2040,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
-1,cook,R1,2045,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2040,4,electric_stove,2035,all-year,all-week,morning,0.45580000000
+1,cook,R1,2040,6,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R1,2040,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R1,2045,1,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R1,2045,2,electric_stove,2040,all-year,all-week,morning,0.85120000000
-1,cook,R1,2045,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,4,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R1,2045,5,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2045,6,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R1,2045,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
 1,cook,R2,2040,0,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2040,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2040,1,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R2,2040,3,electric_stove,2030,all-year,all-week,morning,0.68450000000
-1,cook,R2,2040,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
-1,cook,R2,2045,1,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2040,4,electric_stove,2035,all-year,all-week,morning,0.45580000000
+1,cook,R2,2040,6,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R2,2040,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R2,2045,1,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R2,2045,2,electric_stove,2040,all-year,all-week,morning,0.85120000000
-1,cook,R2,2045,4,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,4,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R2,2045,5,electric_stove,2040,all-year,all-week,morning,0.85120000000
-2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2040,9,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R1,2040,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,8,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2040,9,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,heat,R2,2040,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,7,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,8,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+1,cook,R2,2045,6,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R2,2045,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
+2,heat,R1,2040,8,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,9,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2040,10,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,11,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2040,13,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R1,2040,14,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,11,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,12,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,14,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,15,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2040,8,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,9,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2040,10,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,11,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2040,13,heatpump,2030,all-year,all-week,mid-afternoon,0.47920000000
+2,heat,R2,2040,14,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,11,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,12,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,14,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,15,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
 2,cook,R1,2040,0,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R1,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R1,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,cook,R1,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,cook,R1,2040,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R1,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R1,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R1,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R1,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R1,2045,5,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R1,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
 2,cook,R2,2040,0,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2040,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R2,2040,3,electric_stove,2030,all-year,all-week,mid-afternoon,0.47920000000
-2,cook,R2,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,cook,R2,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2040,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,cook,R2,2040,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R2,2040,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R2,2045,1,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R2,2045,2,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R2,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,4,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R2,2045,5,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
-3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2040,9,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R1,2040,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,8,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2040,9,heatpump,2030,all-year,all-week,early-peak,0.68450000000
-3,heat,R2,2040,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,7,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,8,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+2,cook,R2,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R2,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+3,heat,R1,2040,8,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,9,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2040,10,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,11,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2040,13,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R1,2040,14,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,8,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,9,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,11,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,12,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,14,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,15,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2040,8,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,9,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2040,10,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,11,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2040,13,heatpump,2030,all-year,all-week,early-peak,0.68450000000
+3,heat,R2,2040,14,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,8,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,9,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,11,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,12,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,14,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,15,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
 3,cook,R1,2040,0,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
-3,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
+3,cook,R1,2040,6,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R1,2040,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
-3,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2045,6,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R1,2045,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
 3,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-peak,0.68450000000
-3,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
-3,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
+3,cook,R2,2040,6,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R2,2040,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
-3,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R2,2045,5,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
-4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2040,9,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R1,2040,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,8,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2040,9,heatpump,2030,all-year,all-week,late-peak,1.43750000000
-4,heat,R2,2040,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,7,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,8,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+3,cook,R2,2045,6,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R2,2045,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+4,heat,R1,2040,8,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,9,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2040,10,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,11,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2040,13,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R1,2040,14,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,8,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,9,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,11,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,12,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,14,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,15,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2040,8,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,9,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2040,10,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,11,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2040,13,heatpump,2030,all-year,all-week,late-peak,1.43750000000
+4,heat,R2,2040,14,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,8,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,9,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,11,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,12,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,14,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,15,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
 4,cook,R1,2040,0,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
-4,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
+4,cook,R1,2040,6,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R1,2040,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
-4,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2045,6,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R1,2045,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
 4,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-peak,1.43750000000
-4,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
-4,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
+4,cook,R2,2040,6,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R2,2040,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
-4,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R2,2045,5,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
-5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2040,9,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R1,2040,10,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,7,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,8,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2045,10,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,11,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,7,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2040,9,heatpump,2030,all-year,all-week,evening,0.95830000000
-5,heat,R2,2040,10,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,7,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,8,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2045,10,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+4,cook,R2,2045,6,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R2,2045,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+5,heat,R1,2040,8,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,9,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2040,10,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,11,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2040,13,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R1,2040,14,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,8,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,9,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,11,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,12,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,14,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,15,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2040,8,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,9,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2040,10,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,11,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2040,13,heatpump,2030,all-year,all-week,evening,0.95830000000
+5,heat,R2,2040,14,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,8,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,9,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,11,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,12,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,14,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,15,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,evening,2.38890000000
 5,cook,R1,2040,0,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2040,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2040,1,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R1,2040,3,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R1,2040,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
-5,cook,R1,2045,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2040,4,electric_stove,2035,all-year,all-week,evening,0.63810000000
+5,cook,R1,2040,6,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R1,2040,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R1,2045,1,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R1,2045,2,electric_stove,2040,all-year,all-week,evening,1.19170000000
-5,cook,R1,2045,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,4,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R1,2045,5,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2045,6,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R1,2045,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
 5,cook,R2,2040,0,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2040,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2040,1,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R2,2040,3,electric_stove,2030,all-year,all-week,evening,0.95830000000
-5,cook,R2,2040,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
-5,cook,R2,2045,1,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2040,4,electric_stove,2035,all-year,all-week,evening,0.63810000000
+5,cook,R2,2040,6,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R2,2040,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R2,2045,1,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R2,2045,2,electric_stove,2040,all-year,all-week,evening,1.19170000000
-5,cook,R2,2045,4,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,4,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R2,2045,5,electric_stove,2040,all-year,all-week,evening,1.19170000000
-6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2040,9,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R1,2040,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,8,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2040,9,heatpump,2030,all-year,all-week,early-morning,0.95830000000
-6,heat,R2,2040,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,7,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,8,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+5,cook,R2,2045,6,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R2,2045,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
+6,heat,R1,2040,8,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,9,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2040,10,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,11,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2040,13,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R1,2040,14,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,8,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,9,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,11,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,12,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,14,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,15,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2040,8,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,9,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2040,10,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,11,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2040,13,heatpump,2030,all-year,all-week,early-morning,0.95830000000
+6,heat,R2,2040,14,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,8,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,9,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,11,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,12,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,14,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,15,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
 6,cook,R1,2040,0,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R1,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
-6,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
+6,cook,R1,2040,6,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R1,2040,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R1,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R1,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
-6,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R1,2045,5,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2045,6,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R1,2045,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
 6,cook,R2,2040,0,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2040,1,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R2,2040,3,electric_stove,2030,all-year,all-week,early-morning,0.95830000000
-6,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
-6,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2040,4,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
+6,cook,R2,2040,6,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R2,2040,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R2,2045,1,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R2,2045,2,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
-6,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,4,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R2,2045,5,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
-7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2040,9,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R1,2040,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,8,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2040,9,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
-7,heat,R2,2040,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,7,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,8,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+6,cook,R2,2045,6,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R2,2045,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+7,heat,R1,2040,8,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,9,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2040,10,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,11,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2040,13,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R1,2040,14,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,11,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,12,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,14,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,15,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2040,8,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,9,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2040,10,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,11,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2040,13,heatpump,2030,all-year,all-week,late-afternoon,0.95830000000
+7,heat,R2,2040,14,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,11,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,12,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,14,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,15,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,CO2f,R1,2040,6,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2040,8,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2040,9,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2040,6,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2040,8,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2040,9,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
 7,cook,R1,2040,0,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R1,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
-7,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
+7,cook,R1,2040,6,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R1,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R1,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R1,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R1,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R1,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
 7,cook,R2,2040,0,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2040,1,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R2,2040,3,electric_stove,2030,all-year,all-week,late-afternoon,0.95830000000
-7,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
-7,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2040,4,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
+7,cook,R2,2040,6,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R2,2040,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R2,2045,1,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R2,2045,2,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,4,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R2,2045,5,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R2,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
index 9129bf3f..7b830edb 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
@@ -1,256 +1,384 @@
 timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2045,6,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,7,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2045,9,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R1,2045,10,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,7,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,8,heatpump,2045,all-year,all-week,night,0.45420000000
-0,heat,R1,2050,10,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,11,heatpump,2045,all-year,all-week,night,0.45420000000
-0,heat,R2,2045,6,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,7,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2045,9,heatpump,2035,all-year,all-week,night,0.33750000000
-0,heat,R2,2045,10,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,7,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,8,heatpump,2045,all-year,all-week,night,0.45420000000
-0,heat,R2,2050,10,heatpump,2040,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,11,heatpump,2045,all-year,all-week,night,0.45420000000
-0,cook,R1,2045,0,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,heat,R1,2045,8,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,9,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R1,2045,10,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2045,13,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R1,2045,14,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,12,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,14,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,15,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2045,8,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,9,gasboiler,2035,all-year,all-week,night,0.01850000000
+0,heat,R2,2045,10,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2045,13,heatpump,2035,all-year,all-week,night,0.31900000000
+0,heat,R2,2045,14,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,11,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,12,heatpump,2045,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,14,heatpump,2040,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,15,heatpump,2045,all-year,all-week,night,0.45420000000
+0,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,night,0.92290000000
+0,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,night,1.19440000000
+0,cook,R1,2045,0,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R1,2045,1,electric_stove,2040,all-year,all-week,night,0.59580000000
-0,cook,R1,2045,3,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R1,2045,3,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R1,2045,4,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R1,2045,6,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R1,2045,7,gas_stove,2035,all-year,all-week,night,0.01850000000
 0,cook,R1,2050,1,electric_stove,2040,all-year,all-week,night,0.59580000000
 0,cook,R1,2050,2,electric_stove,2045,all-year,all-week,night,0.45420000000
 0,cook,R1,2050,4,electric_stove,2040,all-year,all-week,night,0.59580000000
 0,cook,R1,2050,5,electric_stove,2045,all-year,all-week,night,0.45420000000
-0,cook,R2,2045,0,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,0,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R2,2045,1,electric_stove,2040,all-year,all-week,night,0.59580000000
-0,cook,R2,2045,3,electric_stove,2035,all-year,all-week,night,0.33750000000
+0,cook,R2,2045,3,electric_stove,2035,all-year,all-week,night,0.31900000000
 0,cook,R2,2045,4,electric_stove,2040,all-year,all-week,night,0.59580000000
+0,cook,R2,2045,6,gas_stove,2035,all-year,all-week,night,0.01850000000
+0,cook,R2,2045,7,gas_stove,2035,all-year,all-week,night,0.01850000000
 0,cook,R2,2050,1,electric_stove,2040,all-year,all-week,night,0.59580000000
 0,cook,R2,2050,2,electric_stove,2045,all-year,all-week,night,0.45420000000
 0,cook,R2,2050,4,electric_stove,2040,all-year,all-week,night,0.59580000000
 0,cook,R2,2050,5,electric_stove,2045,all-year,all-week,night,0.45420000000
-1,heat,R1,2045,6,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,7,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2045,9,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R1,2045,10,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,7,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,8,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,heat,R1,2050,10,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,11,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,heat,R2,2045,6,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,7,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2045,9,heatpump,2035,all-year,all-week,morning,0.48210000000
-1,heat,R2,2045,10,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,7,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,8,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,heat,R2,2050,10,heatpump,2040,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,11,heatpump,2045,all-year,all-week,morning,0.64880000000
-1,cook,R1,2045,0,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,heat,R1,2045,8,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,9,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R1,2045,10,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2045,13,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R1,2045,14,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,12,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,14,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,15,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2045,8,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,9,gasboiler,2035,all-year,all-week,morning,0.02640000000
+1,heat,R2,2045,10,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2045,13,heatpump,2035,all-year,all-week,morning,0.45580000000
+1,heat,R2,2045,14,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,11,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,12,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,14,heatpump,2040,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,15,heatpump,2045,all-year,all-week,morning,0.64880000000
+1,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,morning,1.31850000000
+1,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,morning,1.70630000000
+1,cook,R1,2045,0,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R1,2045,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
-1,cook,R1,2045,3,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R1,2045,3,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R1,2045,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R1,2045,6,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R1,2045,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
 1,cook,R1,2050,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
 1,cook,R1,2050,2,electric_stove,2045,all-year,all-week,morning,0.64880000000
 1,cook,R1,2050,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
 1,cook,R1,2050,5,electric_stove,2045,all-year,all-week,morning,0.64880000000
-1,cook,R2,2045,0,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,0,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R2,2045,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
-1,cook,R2,2045,3,electric_stove,2035,all-year,all-week,morning,0.48210000000
+1,cook,R2,2045,3,electric_stove,2035,all-year,all-week,morning,0.45580000000
 1,cook,R2,2045,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
+1,cook,R2,2045,6,gas_stove,2035,all-year,all-week,morning,0.02640000000
+1,cook,R2,2045,7,gas_stove,2035,all-year,all-week,morning,0.02640000000
 1,cook,R2,2050,1,electric_stove,2040,all-year,all-week,morning,0.85120000000
 1,cook,R2,2050,2,electric_stove,2045,all-year,all-week,morning,0.64880000000
 1,cook,R2,2050,4,electric_stove,2040,all-year,all-week,morning,0.85120000000
 1,cook,R2,2050,5,electric_stove,2045,all-year,all-week,morning,0.64880000000
-2,heat,R1,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2045,9,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R1,2045,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,8,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2050,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,11,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2045,9,heatpump,2035,all-year,all-week,mid-afternoon,0.33750000000
-2,heat,R2,2045,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,7,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,8,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2050,10,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,11,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R1,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,heat,R1,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R1,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2045,13,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R1,2045,14,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,12,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,14,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,15,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,heat,R2,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2045,13,heatpump,2035,all-year,all-week,mid-afternoon,0.31900000000
+2,heat,R2,2045,14,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,11,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,12,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,14,heatpump,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,15,heatpump,2045,all-year,all-week,mid-afternoon,0.45420000000
+2,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.92290000000
+2,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,mid-afternoon,1.19440000000
+2,cook,R1,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R1,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R1,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R1,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R1,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R1,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
 2,cook,R1,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
 2,cook,R1,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
 2,cook,R1,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
 2,cook,R1,2050,5,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R2,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,0,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R2,2045,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R2,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.33750000000
+2,cook,R2,2045,3,electric_stove,2035,all-year,all-week,mid-afternoon,0.31900000000
 2,cook,R2,2045,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2045,6,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
+2,cook,R2,2045,7,gas_stove,2035,all-year,all-week,mid-afternoon,0.01850000000
 2,cook,R2,2050,1,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
 2,cook,R2,2050,2,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
 2,cook,R2,2050,4,electric_stove,2040,all-year,all-week,mid-afternoon,0.59580000000
 2,cook,R2,2050,5,electric_stove,2045,all-year,all-week,mid-afternoon,0.45420000000
-3,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2045,9,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R1,2045,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,8,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2050,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,11,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2045,9,heatpump,2035,all-year,all-week,early-peak,0.48210000000
-3,heat,R2,2045,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,7,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,8,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2050,10,heatpump,2040,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,11,heatpump,2045,all-year,all-week,early-peak,0.64880000000
-3,cook,R1,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,heat,R1,2045,8,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,9,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2045,13,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R1,2045,14,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,12,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,14,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,15,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2045,8,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,9,gasboiler,2035,all-year,all-week,early-peak,0.02640000000
+3,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2045,13,heatpump,2035,all-year,all-week,early-peak,0.45580000000
+3,heat,R2,2045,14,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,11,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,12,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,14,heatpump,2040,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,15,heatpump,2045,all-year,all-week,early-peak,0.64880000000
+3,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,early-peak,1.31850000000
+3,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,early-peak,1.70630000000
+3,cook,R1,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
-3,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2045,6,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R1,2045,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
 3,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
 3,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
 3,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
 3,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
-3,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
-3,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.48210000000
+3,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-peak,0.45580000000
 3,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2045,6,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
+3,cook,R2,2045,7,gas_stove,2035,all-year,all-week,early-peak,0.02640000000
 3,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
 3,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
 3,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-peak,0.85120000000
 3,cook,R2,2050,5,electric_stove,2045,all-year,all-week,early-peak,0.64880000000
-4,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2045,9,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R1,2045,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,8,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2050,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,11,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2045,9,heatpump,2035,all-year,all-week,late-peak,1.01250000000
-4,heat,R2,2045,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,7,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,8,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2050,10,heatpump,2040,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,11,heatpump,2045,all-year,all-week,late-peak,1.36250000000
-4,cook,R1,2045,0,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,heat,R1,2045,8,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,9,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2045,13,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R1,2045,14,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,12,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,14,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,15,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2045,8,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,9,gasboiler,2035,all-year,all-week,late-peak,0.05540000000
+4,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2045,13,heatpump,2035,all-year,all-week,late-peak,0.95710000000
+4,heat,R2,2045,14,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,11,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,12,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,14,heatpump,2040,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,15,heatpump,2045,all-year,all-week,late-peak,1.36250000000
+4,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,late-peak,2.76870000000
+4,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,late-peak,3.58330000000
+4,cook,R1,2045,0,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
-4,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2045,6,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R1,2045,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
 4,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
 4,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
 4,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
 4,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
-4,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
-4,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-peak,1.01250000000
+4,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-peak,0.95710000000
 4,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2045,6,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
+4,cook,R2,2045,7,gas_stove,2035,all-year,all-week,late-peak,0.05540000000
 4,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
 4,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
 4,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-peak,1.78750000000
 4,cook,R2,2050,5,electric_stove,2045,all-year,all-week,late-peak,1.36250000000
-5,heat,R1,2045,6,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,7,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2045,9,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R1,2045,10,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,7,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,8,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,heat,R1,2050,10,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,11,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,heat,R2,2045,6,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,7,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2045,9,heatpump,2035,all-year,all-week,evening,0.67500000000
-5,heat,R2,2045,10,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,7,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,8,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,heat,R2,2050,10,heatpump,2040,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,11,heatpump,2045,all-year,all-week,evening,0.90830000000
-5,cook,R1,2045,0,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,heat,R1,2045,8,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,9,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R1,2045,10,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2045,13,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R1,2045,14,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,12,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,14,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,15,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2045,8,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,9,gasboiler,2035,all-year,all-week,evening,0.03690000000
+5,heat,R2,2045,10,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2045,13,heatpump,2035,all-year,all-week,evening,0.63810000000
+5,heat,R2,2045,14,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,11,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,12,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,14,heatpump,2040,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,15,heatpump,2045,all-year,all-week,evening,0.90830000000
+5,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,evening,1.84580000000
+5,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,evening,2.38890000000
+5,cook,R1,2045,0,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R1,2045,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
-5,cook,R1,2045,3,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R1,2045,3,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R1,2045,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R1,2045,6,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R1,2045,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
 5,cook,R1,2050,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
 5,cook,R1,2050,2,electric_stove,2045,all-year,all-week,evening,0.90830000000
 5,cook,R1,2050,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
 5,cook,R1,2050,5,electric_stove,2045,all-year,all-week,evening,0.90830000000
-5,cook,R2,2045,0,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,0,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R2,2045,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
-5,cook,R2,2045,3,electric_stove,2035,all-year,all-week,evening,0.67500000000
+5,cook,R2,2045,3,electric_stove,2035,all-year,all-week,evening,0.63810000000
 5,cook,R2,2045,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
+5,cook,R2,2045,6,gas_stove,2035,all-year,all-week,evening,0.03690000000
+5,cook,R2,2045,7,gas_stove,2035,all-year,all-week,evening,0.03690000000
 5,cook,R2,2050,1,electric_stove,2040,all-year,all-week,evening,1.19170000000
 5,cook,R2,2050,2,electric_stove,2045,all-year,all-week,evening,0.90830000000
 5,cook,R2,2050,4,electric_stove,2040,all-year,all-week,evening,1.19170000000
 5,cook,R2,2050,5,electric_stove,2045,all-year,all-week,evening,0.90830000000
-6,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2045,9,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R1,2045,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,8,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2050,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,11,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2045,9,heatpump,2035,all-year,all-week,early-morning,0.67500000000
-6,heat,R2,2045,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,7,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,8,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2050,10,heatpump,2040,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,11,heatpump,2045,all-year,all-week,early-morning,0.90830000000
-6,cook,R1,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,heat,R1,2045,8,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,9,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2045,13,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R1,2045,14,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,12,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,14,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,15,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2045,8,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,9,gasboiler,2035,all-year,all-week,early-morning,0.03690000000
+6,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2045,13,heatpump,2035,all-year,all-week,early-morning,0.63810000000
+6,heat,R2,2045,14,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,11,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,12,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,14,heatpump,2040,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,15,heatpump,2045,all-year,all-week,early-morning,0.90830000000
+6,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,early-morning,1.84580000000
+6,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,early-morning,2.38890000000
+6,cook,R1,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R1,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
-6,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R1,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R1,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2045,6,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R1,2045,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
 6,cook,R1,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
 6,cook,R1,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
 6,cook,R1,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
 6,cook,R1,2050,5,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
-6,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,0,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R2,2045,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
-6,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.67500000000
+6,cook,R2,2045,3,electric_stove,2035,all-year,all-week,early-morning,0.63810000000
 6,cook,R2,2045,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2045,6,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
+6,cook,R2,2045,7,gas_stove,2035,all-year,all-week,early-morning,0.03690000000
 6,cook,R2,2050,1,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
 6,cook,R2,2050,2,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
 6,cook,R2,2050,4,electric_stove,2040,all-year,all-week,early-morning,1.19170000000
 6,cook,R2,2050,5,electric_stove,2045,all-year,all-week,early-morning,0.90830000000
-7,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2045,9,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R1,2045,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,8,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2050,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,11,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2045,9,heatpump,2035,all-year,all-week,late-afternoon,0.67500000000
-7,heat,R2,2045,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,7,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,8,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2050,10,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,11,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R1,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,heat,R1,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2045,13,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R1,2045,14,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,12,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,14,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,15,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,0.03690000000
+7,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2045,13,heatpump,2035,all-year,all-week,late-afternoon,0.63810000000
+7,heat,R2,2045,14,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,11,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,12,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,14,heatpump,2040,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,15,heatpump,2045,all-year,all-week,late-afternoon,0.90830000000
+7,CO2f,R1,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R1,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R1,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,1.84580000000
+7,CO2f,R2,2045,8,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,CO2f,R2,2045,9,gasboiler,2035,all-year,all-week,late-afternoon,2.38890000000
+7,cook,R1,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R1,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R1,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R1,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R1,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
 7,cook,R1,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
 7,cook,R1,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
 7,cook,R1,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
 7,cook,R1,2050,5,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,0,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R2,2045,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.67500000000
+7,cook,R2,2045,3,electric_stove,2035,all-year,all-week,late-afternoon,0.63810000000
 7,cook,R2,2045,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2045,6,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
+7,cook,R2,2045,7,gas_stove,2035,all-year,all-week,late-afternoon,0.03690000000
 7,cook,R2,2050,1,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
 7,cook,R2,2050,2,electric_stove,2045,all-year,all-week,late-afternoon,0.90830000000
 7,cook,R2,2050,4,electric_stove,2040,all-year,all-week,late-afternoon,1.19170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
index e5e77549..7d84c53a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-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.59580000000
-0,heat,R1,2050,5,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2050,11,2040,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R1,2050,13,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2055,5,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R1,2055,13,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R1,2055,15,2050,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,3,2040,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,5,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2050,11,2040,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2050,13,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2055,5,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2055,7,2050,heatpump,all-year,all-week,night,0.59580000000
-0,heat,R2,2055,13,2045,heatpump,all-year,all-week,night,0.45420000000
-0,heat,R2,2055,15,2050,heatpump,all-year,all-week,night,0.59580000000
-0,cook,R1,2050,2,2040,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R1,2050,4,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R1,2050,10,2040,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R1,2050,12,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R1,2055,4,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R1,2055,6,2050,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R1,2055,12,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R1,2055,14,2050,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R2,2050,2,2040,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R2,2050,4,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R2,2050,10,2040,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R2,2050,12,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R2,2055,4,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R2,2055,6,2050,electric_stove,all-year,all-week,night,0.59580000000
-0,cook,R2,2055,12,2045,electric_stove,all-year,all-week,night,0.45420000000
-0,cook,R2,2055,14,2050,electric_stove,all-year,all-week,night,0.59580000000
-1,heat,R1,2050,3,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,5,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2050,11,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R1,2050,13,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2055,5,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R1,2055,13,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R1,2055,15,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,3,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,5,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2050,11,2040,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2050,13,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2055,5,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2055,7,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,heat,R2,2055,13,2045,heatpump,all-year,all-week,morning,0.64880000000
-1,heat,R2,2055,15,2050,heatpump,all-year,all-week,morning,0.85120000000
-1,cook,R1,2050,2,2040,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R1,2050,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R1,2050,10,2040,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R1,2050,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R1,2055,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R1,2055,6,2050,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R1,2055,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R1,2055,14,2050,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R2,2050,2,2040,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R2,2050,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R2,2050,10,2040,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R2,2050,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R2,2055,4,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R2,2055,6,2050,electric_stove,all-year,all-week,morning,0.85120000000
-1,cook,R2,2055,12,2045,electric_stove,all-year,all-week,morning,0.64880000000
-1,cook,R2,2055,14,2050,electric_stove,all-year,all-week,morning,0.85120000000
-2,heat,R1,2050,3,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2050,11,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2050,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2055,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R1,2055,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R1,2055,15,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,3,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2050,11,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2050,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2055,5,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,heat,R2,2055,13,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
-2,heat,R2,2055,15,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R1,2050,2,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R1,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R1,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R1,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R1,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R1,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R1,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R1,2055,14,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R2,2050,2,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R2,2050,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R2,2050,10,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R2,2050,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R2,2055,4,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R2,2055,6,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-2,cook,R2,2055,12,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
-2,cook,R2,2055,14,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
-3,heat,R1,2050,3,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2050,11,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2050,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2055,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R1,2055,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R1,2055,15,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,3,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2050,11,2040,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2050,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2055,5,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,heat,R2,2055,13,2045,heatpump,all-year,all-week,early-peak,0.64880000000
-3,heat,R2,2055,15,2050,heatpump,all-year,all-week,early-peak,0.85120000000
-3,cook,R1,2050,2,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
-3,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
-3,cook,R2,2055,14,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
-4,heat,R1,2050,3,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2050,11,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2050,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2055,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R1,2055,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R1,2055,15,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,3,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2050,11,2040,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2050,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2055,5,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,heat,R2,2055,13,2045,heatpump,all-year,all-week,late-peak,1.36250000000
-4,heat,R2,2055,15,2050,heatpump,all-year,all-week,late-peak,1.78750000000
-4,cook,R1,2050,2,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
-4,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
-4,cook,R2,2055,14,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
-5,heat,R1,2050,3,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,5,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2050,11,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R1,2050,13,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2055,5,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R1,2055,13,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R1,2055,15,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,3,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,5,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2050,11,2040,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2050,13,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2055,5,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2055,7,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,heat,R2,2055,13,2045,heatpump,all-year,all-week,evening,0.90830000000
-5,heat,R2,2055,15,2050,heatpump,all-year,all-week,evening,1.19170000000
-5,cook,R1,2050,2,2040,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R1,2050,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R1,2050,10,2040,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R1,2050,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R1,2055,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R1,2055,6,2050,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R1,2055,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R1,2055,14,2050,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R2,2050,2,2040,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R2,2050,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R2,2050,10,2040,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R2,2050,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R2,2055,4,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R2,2055,6,2050,electric_stove,all-year,all-week,evening,1.19170000000
-5,cook,R2,2055,12,2045,electric_stove,all-year,all-week,evening,0.90830000000
-5,cook,R2,2055,14,2050,electric_stove,all-year,all-week,evening,1.19170000000
-6,heat,R1,2050,3,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2050,11,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2050,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2055,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R1,2055,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R1,2055,15,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,3,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2050,11,2040,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2050,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2055,5,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,heat,R2,2055,13,2045,heatpump,all-year,all-week,early-morning,0.90830000000
-6,heat,R2,2055,15,2050,heatpump,all-year,all-week,early-morning,1.19170000000
-6,cook,R1,2050,2,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R1,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R1,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R1,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R1,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R1,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R1,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R1,2055,14,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R2,2050,2,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R2,2050,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R2,2050,10,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R2,2050,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R2,2055,4,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R2,2055,6,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
-6,cook,R2,2055,12,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
-6,cook,R2,2055,14,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
-7,heat,R1,2050,3,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2050,11,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2050,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2055,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R1,2055,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R1,2055,15,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,3,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2050,11,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2050,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2055,5,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,heat,R2,2055,13,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
-7,heat,R2,2055,15,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R1,2050,2,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R1,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R1,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R1,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R1,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R1,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R1,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R1,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R2,2050,2,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R2,2050,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R2,2050,10,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R2,2050,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R2,2055,4,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R2,2055,6,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
-7,cook,R2,2055,12,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
-7,cook,R2,2055,14,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+0,heat,R1,2050,5,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,7,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2050,15,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2050,17,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,7,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,9,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R1,2055,17,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R1,2055,19,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,5,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,7,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2050,15,2040,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2050,17,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,7,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,9,2050,heatpump,all-year,all-week,night,0.59580000000
+0,heat,R2,2055,17,2045,heatpump,all-year,all-week,night,0.45420000000
+0,heat,R2,2055,19,2050,heatpump,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,4,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,6,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2050,14,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R1,2050,16,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2055,6,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2055,8,2050,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R1,2055,16,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R1,2055,18,2050,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,4,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,6,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2050,14,2040,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2050,16,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2055,6,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2055,8,2050,electric_stove,all-year,all-week,night,0.59580000000
+0,cook,R2,2055,16,2045,electric_stove,all-year,all-week,night,0.45420000000
+0,cook,R2,2055,18,2050,electric_stove,all-year,all-week,night,0.59580000000
+1,heat,R1,2050,5,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,7,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2050,15,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2050,17,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,7,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,9,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R1,2055,17,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R1,2055,19,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,5,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,7,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2050,15,2040,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2050,17,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,7,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,9,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,heat,R2,2055,17,2045,heatpump,all-year,all-week,morning,0.64880000000
+1,heat,R2,2055,19,2050,heatpump,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,4,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,6,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2050,14,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R1,2050,16,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2055,6,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2055,8,2050,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R1,2055,16,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R1,2055,18,2050,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,4,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,6,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2050,14,2040,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2050,16,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2055,6,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2055,8,2050,electric_stove,all-year,all-week,morning,0.85120000000
+1,cook,R2,2055,16,2045,electric_stove,all-year,all-week,morning,0.64880000000
+1,cook,R2,2055,18,2050,electric_stove,all-year,all-week,morning,0.85120000000
+2,heat,R1,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,7,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2050,15,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2050,17,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,7,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,9,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R1,2055,17,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R1,2055,19,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,7,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2050,15,2040,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2050,17,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,7,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,9,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,heat,R2,2055,17,2045,heatpump,all-year,all-week,mid-afternoon,0.45420000000
+2,heat,R2,2055,19,2050,heatpump,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,4,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,6,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2050,14,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2050,16,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2055,6,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2055,8,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R1,2055,16,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R1,2055,18,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,4,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,6,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2050,14,2040,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2050,16,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2055,6,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2055,8,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+2,cook,R2,2055,16,2045,electric_stove,all-year,all-week,mid-afternoon,0.45420000000
+2,cook,R2,2055,18,2050,electric_stove,all-year,all-week,mid-afternoon,0.59580000000
+3,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,7,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2050,15,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2050,17,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,7,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,9,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R1,2055,17,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R1,2055,19,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,7,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2050,15,2040,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2050,17,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,7,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,9,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,heat,R2,2055,17,2045,heatpump,all-year,all-week,early-peak,0.64880000000
+3,heat,R2,2055,19,2050,heatpump,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,4,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,6,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2050,14,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2050,16,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2055,6,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2055,8,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R1,2055,16,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R1,2055,18,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,4,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,6,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2050,14,2040,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2050,16,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2055,6,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2055,8,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+3,cook,R2,2055,16,2045,electric_stove,all-year,all-week,early-peak,0.64880000000
+3,cook,R2,2055,18,2050,electric_stove,all-year,all-week,early-peak,0.85120000000
+4,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,7,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2050,15,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2050,17,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,7,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,9,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R1,2055,17,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R1,2055,19,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,7,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2050,15,2040,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2050,17,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,7,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,9,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,heat,R2,2055,17,2045,heatpump,all-year,all-week,late-peak,1.36250000000
+4,heat,R2,2055,19,2050,heatpump,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,4,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,6,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2050,14,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2050,16,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2055,6,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2055,8,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R1,2055,16,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R1,2055,18,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,4,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,6,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2050,14,2040,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2050,16,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2055,6,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2055,8,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+4,cook,R2,2055,16,2045,electric_stove,all-year,all-week,late-peak,1.36250000000
+4,cook,R2,2055,18,2050,electric_stove,all-year,all-week,late-peak,1.78750000000
+5,heat,R1,2050,5,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,7,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2050,15,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2050,17,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,7,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,9,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R1,2055,17,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R1,2055,19,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,5,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,7,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2050,15,2040,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2050,17,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,7,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,9,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,heat,R2,2055,17,2045,heatpump,all-year,all-week,evening,0.90830000000
+5,heat,R2,2055,19,2050,heatpump,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,4,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,6,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2050,14,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R1,2050,16,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2055,6,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2055,8,2050,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R1,2055,16,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R1,2055,18,2050,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,4,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,6,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2050,14,2040,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2050,16,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2055,6,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2055,8,2050,electric_stove,all-year,all-week,evening,1.19170000000
+5,cook,R2,2055,16,2045,electric_stove,all-year,all-week,evening,0.90830000000
+5,cook,R2,2055,18,2050,electric_stove,all-year,all-week,evening,1.19170000000
+6,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,7,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2050,15,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2050,17,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,7,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,9,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R1,2055,17,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R1,2055,19,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,7,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2050,15,2040,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2050,17,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,7,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,9,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,heat,R2,2055,17,2045,heatpump,all-year,all-week,early-morning,0.90830000000
+6,heat,R2,2055,19,2050,heatpump,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,4,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,6,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2050,14,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2050,16,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2055,6,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2055,8,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R1,2055,16,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R1,2055,18,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,4,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,6,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2050,14,2040,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2050,16,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2055,6,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2055,8,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+6,cook,R2,2055,16,2045,electric_stove,all-year,all-week,early-morning,0.90830000000
+6,cook,R2,2055,18,2050,electric_stove,all-year,all-week,early-morning,1.19170000000
+7,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,7,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2050,15,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2050,17,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,7,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,9,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R1,2055,17,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R1,2055,19,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,7,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2050,15,2040,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2050,17,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,7,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,9,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,heat,R2,2055,17,2045,heatpump,all-year,all-week,late-afternoon,0.90830000000
+7,heat,R2,2055,19,2050,heatpump,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,4,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,6,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2050,14,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2050,16,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2055,6,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2055,8,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R1,2055,16,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R1,2055,18,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,4,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,6,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2050,14,2040,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2050,16,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2055,6,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2055,8,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
+7,cook,R2,2055,16,2045,electric_stove,all-year,all-week,late-afternoon,0.90830000000
+7,cook,R2,2055,18,2050,electric_stove,all-year,all-week,late-afternoon,1.19170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
index 8339479f..53d32926 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
@@ -1,10 +1,10 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
-electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
-gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1

From b78ecb727989639d5ef4363f8df412c47005feae Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 24 May 2024 13:16:28 +0100
Subject: [PATCH 171/419] Fix typo

---
 src/muse/decisions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index 4494e2b5..0fb371ca 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -141,7 +141,7 @@ def weighted_sum(objectives: Dataset, parameters: Mapping[Text, float]) -> DataA
         \sum_m c_m \frac{A_m - \min(A_m)}{\max(A_m) - \min(A_m)}
 
     where sum runs over the different objectives, c_m is a scalar coefficient,
-    A_m is a matrix with dimensions (existing tech, replacemnt tech). `max(A)`
+    A_m is a matrix with dimensions (existing tech, replacement tech). `max(A)`
     and `min(A)` return the largest and smallest component of the input matrix.
     If c_m is positive, then that particular objective is minimized, whereas if
     it is negative, that particular objective is maximized.

From abe6bd97b36621f8fc6e6b60e30383691b3d46df Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 30 May 2024 10:18:00 +0100
Subject: [PATCH 172/419] Better descriptions for UtilizationFactor

---
 docs/inputs/technodata.rst            | 2 +-
 docs/inputs/technodata_timeslices.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 913d8a8c..bfe95c45 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -115,7 +115,7 @@ TechnicalLife
    represents the number of years that a technology operates before it is decommissioned.
 
 UtilizationFactor
-   represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year.
+   represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year. Should be between 0 and 1.
 
 ScalingSize
    represents the reference capacity at which capital costs are estimated when used as agents' objective as described in :ref:`inputs-agents`.
diff --git a/docs/inputs/technodata_timeslices.rst b/docs/inputs/technodata_timeslices.rst
index 3e2b9e29..2d33ba3b 100644
--- a/docs/inputs/technodata_timeslices.rst
+++ b/docs/inputs/technodata_timeslices.rst
@@ -34,7 +34,7 @@ hour
    represents the third level of the timeslice.
 
 UtilizationFactor
-   represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year per timeslice. This overwrites the UtilizationFactor in the technodata file.
+   represents the maximum actual output of the technology in a timeslice, divided by the theoretical maximum output if the technology were operating at full capacity for the whole timeslice. Should be between 0 and 1. This overwrites the UtilizationFactor in the technodata file.
 
 MinimumServiceFactor
    represents the minimum service that a technology can output. For instance, the minimum amount of electricity that can be output from a nuclear power plant at a particular timeslice.

From f3a9336d4af5534c436305204dda26faf115679e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 30 May 2024 11:52:24 +0100
Subject: [PATCH 173/419] Improve figures

---
 docs/example-output.ipynb                     |  2 +-
 docs/running-muse-example.ipynb               | 19 +++++--
 .../add-gdp-correlation-demand.ipynb          | 23 ++++----
 docs/user-guide/add-solar.ipynb               | 57 +++++++++++--------
 4 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/docs/example-output.ipynb b/docs/example-output.ipynb
index 121d86a5..11c8ec9f 100644
--- a/docs/example-output.ipynb
+++ b/docs/example-output.ipynb
@@ -33,7 +33,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.9.18"
   }
  },
  "nbformat": 4,
diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index b4c5499d..5e1e1a2f 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -156,6 +156,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd"
    ]
   },
@@ -191,14 +192,20 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
+    "fig, axes = plt.subplots(1, 3)\n",
+    "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
     "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    ax = sector_capacity.pivot(\n",
-    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "    ).plot(kind=\"bar\", stacked=True)\n",
-    "    ax.set_title(\"{} Sector\".format(sector_name.capitalize()))\n",
+    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "        kind=\"bar\", stacked=True, ax=ax\n",
+    "    )\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
-    "    ax.tick_params(axis=\"x\", labelrotation=0)"
+    "    ax.set_xlabel(\"Year\")\n",
+    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.legend(title=None, prop={\"size\": 8})\n",
+    "    ax.tick_params(axis=\"both\", labelsize=8)\n",
+    "\n",
+    "fig.set_size_inches(9, 2.5)\n",
+    "fig.subplots_adjust(wspace=0.5)"
    ]
   },
   {
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 8a5f67fd..3fc86d9d 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -119,6 +119,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd"
    ]
   },
@@ -140,18 +141,20 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
-    "    sector_capacity = (\n",
-    "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
-    "    )\n",
-    "    ax = (\n",
-    "        sector_capacity[sector_capacity.region == \"R1\"]\n",
-    "        .pivot(index=\"year\", columns=\"technology\", values=\"capacity\")\n",
-    "        .plot(kind=\"bar\", stacked=True)\n",
+    "fig, axes = plt.subplots(1, 3)\n",
+    "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
+    "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
+    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "        kind=\"bar\", stacked=True, ax=ax\n",
     "    )\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
-    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()))\n",
-    "    ax.tick_params(axis=\"x\", labelrotation=0)"
+    "    ax.set_xlabel(\"Year\")\n",
+    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.legend(title=None, prop={\"size\": 8})\n",
+    "    ax.tick_params(axis=\"both\", labelsize=8)\n",
+    "\n",
+    "fig.set_size_inches(9, 2.5)\n",
+    "fig.subplots_adjust(wspace=0.5)"
    ]
   },
   {
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 8a094a7f..21699178 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -297,7 +297,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "If the simulation has run successfully, you should now have a folder in the same location as your `settings.toml` file called `Results`. The next step is to visualise the results using the data analysis library ```pandas```."
+    "If the simulation has run successfully, you should now have a folder in the same location as your `settings.toml` file called `Results`. The next step is to visualise the results using the data analysis library ```pandas``` and the plotting library ```matplotlib```."
    ]
   },
   {
@@ -306,6 +306,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd"
    ]
   },
@@ -334,7 +335,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will only visualise the power sector in this example, as this was the only sector we changed. Therefore, we filter for this sector, sum the capacity for each technology, and then plot a stacked bar chart:"
+    "We will then visualise the results:"
    ]
   },
   {
@@ -343,25 +344,27 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "power_capacity = (\n",
-    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
-    "    .groupby([\"technology\", \"year\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
-    ")\n",
+    "fig, axes = plt.subplots(1, 3)\n",
+    "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
+    "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
+    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "        kind=\"bar\", stacked=True, ax=ax\n",
+    "    )\n",
+    "    ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "    ax.set_xlabel(\"Year\")\n",
+    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.legend(title=None, prop={\"size\": 8})\n",
+    "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
-    "ax = power_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
-    "    kind=\"bar\", stacked=True\n",
-    ")\n",
-    "ax.set_ylabel(\"Capacity (PJ)\")\n",
-    "ax.tick_params(axis=\"x\", labelrotation=0)"
+    "fig.set_size_inches(9, 2.5)\n",
+    "fig.subplots_adjust(wspace=0.5)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We can now see that there is solarPV in addition to windturbine and gasCCGT, when compared to the example [here](../running-muse-example.ipynb)! That's great and means it worked! \n",
+    "We can now see that there is solarPV in the power sector in addition to windturbine and gasCCGT, when compared to the example [here](../running-muse-example.ipynb)! That's great and means it worked! \n",
     "\n",
     "The difference in uptake of `solarPV` compared to `windturbine` is due to the fact that ```solarPV``` has a lower ```cap_par``` cost of 30, compared to the ```windturbine```. Meaning that ```solarPV``` outcompetes both ```windturbine``` and ```gasCCGT``` in the electricity market."
    ]
@@ -439,17 +442,21 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv\"\n",
     ")\n",
-    "power_capacity = (\n",
-    "    mca_capacity[mca_capacity.sector == \"power\"]\n",
-    "    .groupby([\"technology\", \"year\"])\n",
-    "    .sum()\n",
-    "    .reset_index()\n",
-    ")\n",
-    "ax = power_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
-    "    kind=\"bar\", stacked=True\n",
-    ")\n",
-    "ax.set_ylabel(\"Capacity (PJ)\")\n",
-    "ax.tick_params(axis=\"x\", labelrotation=0)"
+    "\n",
+    "fig, axes = plt.subplots(1, 3)\n",
+    "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
+    "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
+    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
+    "        kind=\"bar\", stacked=True, ax=ax\n",
+    "    )\n",
+    "    ax.set_ylabel(\"Capacity (PJ)\")\n",
+    "    ax.set_xlabel(\"Year\")\n",
+    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.legend(title=None, prop={\"size\": 8})\n",
+    "    ax.tick_params(axis=\"both\", labelsize=8)\n",
+    "\n",
+    "fig.set_size_inches(9, 2.5)\n",
+    "fig.subplots_adjust(wspace=0.5)"
    ]
   },
   {

From bd92b4e302d03962d7ff55c04f8c641f1dddf19b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 30 May 2024 11:54:54 +0100
Subject: [PATCH 174/419] Should -> must

---
 docs/inputs/technodata.rst            | 2 +-
 docs/inputs/technodata_timeslices.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index bfe95c45..611d2aa6 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -115,7 +115,7 @@ TechnicalLife
    represents the number of years that a technology operates before it is decommissioned.
 
 UtilizationFactor
-   represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year. Should be between 0 and 1.
+   represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year. Must be between 0 and 1.
 
 ScalingSize
    represents the reference capacity at which capital costs are estimated when used as agents' objective as described in :ref:`inputs-agents`.
diff --git a/docs/inputs/technodata_timeslices.rst b/docs/inputs/technodata_timeslices.rst
index 2d33ba3b..7fdd1072 100644
--- a/docs/inputs/technodata_timeslices.rst
+++ b/docs/inputs/technodata_timeslices.rst
@@ -34,7 +34,7 @@ hour
    represents the third level of the timeslice.
 
 UtilizationFactor
-   represents the maximum actual output of the technology in a timeslice, divided by the theoretical maximum output if the technology were operating at full capacity for the whole timeslice. Should be between 0 and 1. This overwrites the UtilizationFactor in the technodata file.
+   represents the maximum actual output of the technology in a timeslice, divided by the theoretical maximum output if the technology were operating at full capacity for the whole timeslice. Must be between 0 and 1. This overwrites the UtilizationFactor in the technodata file.
 
 MinimumServiceFactor
    represents the minimum service that a technology can output. For instance, the minimum amount of electricity that can be output from a nuclear power plant at a particular timeslice.

From cf5fd8f067ceddfc40b75d63a28a82931b8b63f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 12:42:35 +0100
Subject: [PATCH 175/419] Fix medium model outputs

---
 src/muse/outputs/mca.py                       |  14 +-
 .../medium/Residential/Capacity/2050.csv      |  50 +++---
 .../medium/Residential/Supply/2020.csv        |  86 +++++------
 .../medium/Residential/Supply/2025.csv        | 122 +++++++--------
 .../medium/Residential/Supply/2030.csv        | 146 +++++++++---------
 .../medium/Residential/Supply/2035.csv        | 146 +++++++++---------
 .../medium/Residential/Supply/2040.csv        | 146 +++++++++---------
 .../medium/Residential/Supply/2045.csv        | 146 +++++++++---------
 .../medium/Residential/Supply/2050.csv        | 146 +++++++++---------
 9 files changed, 506 insertions(+), 496 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 01d2c298..19830842 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
 
 
diff --git a/tests/example_outputs/medium/Residential/Capacity/2050.csv b/tests/example_outputs/medium/Residential/Capacity/2050.csv
index 02d86fe7..c9363ce7 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 2c2d874d..c5696bda 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 fbc63d53..c770030e 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 14a44952..cf2cde7e 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 47d661d4..962b162f 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 b5f47f36..5fa835b2 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 aecfc127..e7610fcc 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 e4342fef..08447a87 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

From abf669a20de8e5ed0aaa37b69dfaf67142c51604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 15:58:51 +0100
Subject: [PATCH 176/419] Fix deprecated use of python in launcher

---
 .vscode/launch.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 338d58fe..8efb5126 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"]

From 888eff96a720b3804d9ccc0ba53b2a8921348cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 15:59:38 +0100
Subject: [PATCH 177/419] Fix minimum_service outputs

---
 src/muse/outputs/mca.py                       |   1 +
 .../Industry/Capacity/2010.csv                | 122 +++---
 .../Industry/Capacity/2015.csv                | 142 +++---
 .../Industry/Capacity/2030.csv                | 166 +++----
 .../Industry/Capacity/2035.csv                | 144 +++----
 .../Industry/Capacity/2040.csv                | 106 ++---
 .../Industry/Capacity/2045.csv                |  82 ++--
 .../Industry/Capacity/2050.csv                |  58 +--
 .../minimum_service/Industry/Supply/2010.csv  |  50 +--
 .../minimum_service/Industry/Supply/2015.csv  |  62 +--
 .../minimum_service/Industry/Supply/2020.csv  |  86 ++--
 .../minimum_service/Industry/Supply/2025.csv  | 110 ++---
 .../minimum_service/Industry/Supply/2030.csv  | 134 +++---
 .../minimum_service/Industry/Supply/2035.csv  | 122 +++---
 .../minimum_service/Industry/Supply/2040.csv  |  98 ++---
 .../minimum_service/Industry/Supply/2045.csv  |  98 ++---
 .../minimum_service/Industry/Supply/2050.csv  |  98 ++---
 .../minimum_service/MCAMetric_Supply.csv      | 408 +++++++++---------
 18 files changed, 1044 insertions(+), 1043 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 19830842..00bd0b12 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -403,6 +403,7 @@ 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.drop(
                     ["month", "day", "hour"], axis=1, errors="ignore"
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv
index a029b855..9198760c 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 c12af06e..b19cd90a 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 acdd1076..84f7fc0f 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 bc72ed0f..f9cb9656 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 c5fb6176..75d1da9f 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 de5a53ac..39bf2bb1 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 848fbb69..4944fcf3 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 070d9f71..d0e14abf 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 fc5fd2bc..b7ce66c2 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 19f1a145..bc309292 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 9df08ee3..618f9819 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 b405de93..971a1bc6 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 82b3aa48..68b96dd6 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 0d4ad5ea..21e8b0e5 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 fe2c2514..91510f36 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 aaf0dd60..5c1490c8 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 ea65fda6..9cf2795a 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

From 837d281fabfe98ba33aa3dc4f7dc0c67d7eb2ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 16:26:04 +0100
Subject: [PATCH 178/419] Fix tutorial 3

---
 src/muse/objectives.py            |  5 ++++-
 src/muse/readers/csv.py           |  1 -
 src/muse/sectors/preset_sector.py | 15 +++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index d73dec4e..cfc6d060 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/readers/csv.py b/src/muse/readers/csv.py
index 8eb5da8f..5df1fc1a 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -502,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
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 0446b2e0..67327c5d 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -75,10 +75,17 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
                 )
                 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.assign_coords(timeslice=timeslice)
+                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)

From 573faf1b8560d3e7d09f35badae3a1fcfa0e880c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 16:43:01 +0100
Subject: [PATCH 179/419] Update workflow file

---
 .github/workflows/ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0044c0ed..94c4fac1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,10 +25,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 unit tests, with coverage under linux
       - name: Unit tests (linux)

From 6360fa72dfb49454b2a109ba8120d3bfd0beaafc Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 15:43:16 +0000
Subject: [PATCH 180/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/muse/readers/csv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 5df1fc1a..44af8d96 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

From 96971c762a4071a2a7cc755c465ba70cdefa8ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 16:45:57 +0100
Subject: [PATCH 181/419] Update workflow file, again

---
 .github/workflows/ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94c4fac1..c2911faa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,10 +62,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

From 3280dfafff41d9d2ae166a50d6ff208632061279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 31 May 2024 16:51:16 +0100
Subject: [PATCH 182/419] Keep linters happy

---
 src/muse/utilities.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index 2c6c285c..56f19d53 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] + names)
+    result = data.drop_vars([dimension, *names])
     for name, coord in coords.items():
         result[name] = dimension, coord
     if isinstance(result, xr.Dataset):
@@ -395,7 +395,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(
             (

From 889131283d8e4a3c7dfc3e7a28ba5363f63c5096 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 17:02:40 +0000
Subject: [PATCH 183/419] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.4 → v0.4.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.4...v0.4.7)
- [github.com/igorshubovych/markdownlint-cli: v0.40.0 → v0.41.0](https://github.com/igorshubovych/markdownlint-cli/compare/v0.40.0...v0.41.0)
- [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](https://github.com/codespell-project/codespell/compare/v2.2.6...v2.3.0)
---
 .pre-commit-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 38aa6702..8c6c885a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.4.7
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]
@@ -17,7 +17,7 @@ repos:
         types_or: [python, pyi, jupyter]
         args: [--fix]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.40.0
+    rev: v0.41.0
     hooks:
       - id: markdownlint-fix
   - repo: https://github.com/kynan/nbstripout
@@ -36,7 +36,7 @@ repos:
       - id: pretty-format-toml
         args: [--autofix, --indent, "4", --no-sort]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         args: [--ignore-words, .codespell_ignore.txt]

From c3f86ee430006e487493f2c6fa41e54dae07cb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 06:27:03 +0100
Subject: [PATCH 184/419] Skip parts of doctests comparing xarray outputs

---
 src/muse/readers/toml.py | 19 ++++++++-----------
 src/muse/utilities.py    | 16 ++++++++++------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index faa8416a..f05d4788 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> Size: 216B
-        Dimensions:          (timeslice: 6)
-        Coordinates:
-          * timeslice        (timeslice) object 48B MultiIndex
-          * semester         (timeslice) object 48B 'summer' 'summer' ... 'winter'
-          * week             (timeslice) object 48B 'weekday' 'weekend' ... 'weekend'
-          * day              (timeslice) object 48B 'allday' 'dusk' ... 'dusk' 'allday'
-            represent_hours  (timeslice) int32 24B 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/utilities.py b/src/muse/utilities.py
index 56f19d53..1f1f9325 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -115,7 +115,7 @@ def reduce_assets(
         The point of `reduce_assets` is to aggregate assets that refer to the
         same process:
 
-        >>> reduce_assets(data.capacity)
+        >>> reduce_assets(data.capacity)  # doctest: +ELLIPSIS
         <xarray.DataArray 'capacity' (year: 3, asset: 3)> Size: 36B
         array([[ 0,  3,  3],
                [ 4,  7, 11],
@@ -134,7 +134,7 @@ def reduce_assets(
         ...     data.capacity,
         ...     coords=('technology', 'installed'),
         ...     operation = lambda x: x.mean(dim='asset')
-        ... )
+        ... )  # doctest: +ELLIPSIS
         <xarray.DataArray 'capacity' (year: 3, asset: 3)> Size: 72B
         array([[ 0. ,  1.5,  3. ],
                [ 4. ,  5.5,  7. ],
@@ -491,7 +491,7 @@ 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)
+        >>> future_propagation(data, future, threshold=0.1)  # doctest: +ELLIPSIS
         <xarray.DataArray (fuel: 2, year: 4)> Size: 64B
         array([[ 0. ,  1.2,  1.2,  1.2],
                [-5. , -4. , -3. , -2. ]])
@@ -505,14 +505,18 @@ 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)
+        >>> future_propagation(
+        ...    data, future.sel(fuel="gas", drop=True), threshold=0.1
+        ... )  # doctest: +ELLIPSIS
         <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) int32 16B 2020 2025 2030 2035
           * fuel     (fuel) <U4 32B 'gas' 'coal'
-        >>> future_propagation(data, future.sel(fuel="coal", drop=True), threshold=0.1)
+        >>> future_propagation(
+        ...     data, future.sel(fuel="coal", drop=True), threshold=0.1
+        ... )  # doctest: +ELLIPSIS
         <xarray.DataArray (fuel: 2, year: 4)> Size: 64B
         array([[ 0.  , -3.95, -3.95, -3.95],
                [-5.  , -4.  , -3.  , -2.  ]])
@@ -560,7 +564,7 @@ def agent_concatenation(
 
         >>> from muse.utilities import agent_concatenation
         >>> aggregate = agent_concatenation(assets)
-        >>> aggregate
+        >>> aggregate # doctest: +ELLIPSIS
         <xarray.Dataset> Size: 4kB
         Dimensions:     (asset: 19, year: 12)
         Coordinates:

From c55258a35c637d6567f972ba9f23bbd21e257851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 06:35:00 +0100
Subject: [PATCH 185/419] (really) Skip parts of doctests comparing xarray
 outputs

---
 src/muse/utilities.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index 1f1f9325..e0b8d0a2 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -115,7 +115,7 @@ def reduce_assets(
         The point of `reduce_assets` is to aggregate assets that refer to the
         same process:
 
-        >>> reduce_assets(data.capacity)  # doctest: +ELLIPSIS
+        >>> reduce_assets(data.capacity)  # doctest: +SKIP
         <xarray.DataArray 'capacity' (year: 3, asset: 3)> Size: 36B
         array([[ 0,  3,  3],
                [ 4,  7, 11],
@@ -134,7 +134,7 @@ def reduce_assets(
         ...     data.capacity,
         ...     coords=('technology', 'installed'),
         ...     operation = lambda x: x.mean(dim='asset')
-        ... )  # doctest: +ELLIPSIS
+        ... )  # doctest: +SKIP
         <xarray.DataArray 'capacity' (year: 3, asset: 3)> Size: 72B
         array([[ 0. ,  1.5,  3. ],
                [ 4. ,  5.5,  7. ],
@@ -491,7 +491,7 @@ 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)  # doctest: +ELLIPSIS
+        >>> 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. ]])
@@ -507,7 +507,7 @@ def future_propagation(
 
         >>> future_propagation(
         ...    data, future.sel(fuel="gas", drop=True), threshold=0.1
-        ... )  # doctest: +ELLIPSIS
+        ... )  # 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]])
@@ -516,7 +516,7 @@ def future_propagation(
           * fuel     (fuel) <U4 32B 'gas' 'coal'
         >>> future_propagation(
         ...     data, future.sel(fuel="coal", drop=True), threshold=0.1
-        ... )  # doctest: +ELLIPSIS
+        ... )  # doctest: +SKIP
         <xarray.DataArray (fuel: 2, year: 4)> Size: 64B
         array([[ 0.  , -3.95, -3.95, -3.95],
                [-5.  , -4.  , -3.  , -2.  ]])
@@ -564,7 +564,7 @@ def agent_concatenation(
 
         >>> from muse.utilities import agent_concatenation
         >>> aggregate = agent_concatenation(assets)
-        >>> aggregate # doctest: +ELLIPSIS
+        >>> aggregate # doctest: +SKIP
         <xarray.Dataset> Size: 4kB
         Dimensions:     (asset: 19, year: 12)
         Coordinates:

From 719ae1218ede3f0d39983b7b48d2a049fceed99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 06:44:42 +0100
Subject: [PATCH 186/419] Avoid comparison of sizes in doctests

---
 src/muse/timeslices.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 97f20450..8bb8a318 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -104,7 +104,7 @@ def reference_timeslice(
         ...     summer.weekend = 2
         ...     level_names = ["season", "week"]
         ...     """
-        ... )
+        ... )  # doctest: +SKIP
         <xarray.DataArray (timeslice: 8)> Size: 32B
         array([5, 2, 5, 2, 5, 2, 5, 2])
         Coordinates:
@@ -294,7 +294,7 @@ def timeslice_projector(
         ...     },
         ...     dims="timeslice"
         ... )
-        >>> input_ts
+        >>> input_ts  # doctest: +SKIP
         <xarray.DataArray (timeslice: 3)> Size: 12B
         array([1, 2, 3])
         Coordinates:

From 0614e74600527d37ce8ec6c2f65ac536e5838d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 08:10:54 +0100
Subject: [PATCH 187/419] Avoid (more) comparison of sizes in doctests

---
 src/muse/timeslices.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 8bb8a318..0255a6a8 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -308,7 +308,7 @@ def timeslice_projector(
         it to the equivalent times in the finest timeslice:
 
         >>> from muse.timeslices import timeslice_projector
-        >>> timeslice_projector(input_ts, ref, transforms)
+        >>> 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],
@@ -334,7 +334,7 @@ def timeslice_projector(
         own:
 
         >>> nots = DataArray([5.0, 1.0, 2.0], dims="a", coords={'a': [1, 2, 3]})
-        >>> timeslice_projector(nots, ref, transforms).T
+        >>> 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:

From 3a4148ec932171a8fbcaf3fdfc2c8ab1cc4ec2de Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 4 Jun 2024 08:25:05 +0100
Subject: [PATCH 188/419] Fix spelling mistakes

---
 docs/muse-components.rst                      | 2 +-
 docs/user-guide/addition-service-demand.ipynb | 2 +-
 src/muse/decisions.py                         | 4 ++--
 src/muse/errors.py                            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/muse-components.rst b/docs/muse-components.rst
index 75422795..5f4deae3 100644
--- a/docs/muse-components.rst
+++ b/docs/muse-components.rst
@@ -23,7 +23,7 @@ Service Demand
 
 The energy service demand is a user input which defines the demand that an end-use sector has. An example of this is the service demand commodity of heat or cooling that the residential sector requires. End-use in this case, refers to the energy which is utilised at the very final stage, after both extraction and conversion.
 
-The estimate of the energy service is the first step. This estimate can be an exogenous input derived from the user, or correlations of GDP and population which reflect the socio-economic development of a region or country.
+The estimate of the energy service is the first step. This estimate can be an exogenous input derived from the user, or correlations of GDP and population which reflect the socioeconomic development of a region or country.
 
 
 
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 61053943..55b2a712 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -15,7 +15,7 @@
     "\n",
     "In the residential sector, a service demand could be cooking. Houses require energy to cook food and a technology to service this demand, such as an electric stove. \n",
     "\n",
-    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socio-economic development of a region or country. In addition, a technology must be added to service this new demand."
+    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socioeconomic development of a region or country. In addition, a technology must be added to service this new demand."
    ]
   },
   {
diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index 4494e2b5..577d101e 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -92,12 +92,12 @@ def decorated(*args, **kwargs) -> DataArray:
     return decorated
 
 
-def coeff_sign(domin: bool, coeff: Any):
+def coeff_sign(domain: bool, coeff: Any):
     """Adds sign to coefficient depending on minimizing or maximizing.
 
     This function standardizes across the decision methods.
     """
-    return coeff if domin else -coeff
+    return coeff if domain else -coeff
 
 
 def factory(settings: Union[Text, Mapping] = "mean") -> Callable:
diff --git a/src/muse/errors.py b/src/muse/errors.py
index 929e411c..9288dc89 100644
--- a/src/muse/errors.py
+++ b/src/muse/errors.py
@@ -14,7 +14,7 @@ def __str__(self):
 
 
 class UnitsConflictInCommodities(Exception):
-    """Indicates that there is a conflcit in the commodity units between files."""
+    """Indicates that there is a conflict in the commodity units between files."""
 
     msg = """The units of “CommIn” “CommOut” and “GlobalCommodities” files must be the
 same, including the casing. Check the consistency of the units across those three files.
@@ -28,7 +28,7 @@ class GrowthOfCapacityTooConstrained(Exception):
     """Indicates that the investment step failed because capacity could not grow."""
 
     msg = """Error during the investment process. The capacity was not allowed to grow
-sufficiently in order to match the demand. Consider increating the MaxCapacityAddition
+sufficiently in order to match the demand. Consider increasing the MaxCapacityAddition
 and/or the MaxCapacityGrowth in the technodata."""
 
     def __str__(self):

From 0477785bd27531e16a576b278746ab1465bba03e Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 4 Jun 2024 09:53:25 +0100
Subject: [PATCH 189/419] Fix: domin actually refers to minimisation

---
 src/muse/decisions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index 577d101e..56154895 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -92,12 +92,12 @@ def decorated(*args, **kwargs) -> DataArray:
     return decorated
 
 
-def coeff_sign(domain: bool, coeff: Any):
+def coeff_sign(minimise: bool, coeff: Any):
     """Adds sign to coefficient depending on minimizing or maximizing.
 
     This function standardizes across the decision methods.
     """
-    return coeff if domain else -coeff
+    return coeff if minimise else -coeff
 
 
 def factory(settings: Union[Text, Mapping] = "mean") -> Callable:

From d87040aa222d128dc30fe9393410b1923d7d3344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 10:52:57 +0100
Subject: [PATCH 190/419] Add new pytest marks

---
 pyproject.toml                   | 6 ++++--
 tests/test_fullsim_regression.py | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ce0bafa9..43b539f0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,8 +88,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/tests/test_fullsim_regression.py b/tests/test_fullsim_regression.py
index 54e41dbc..8e285a5e 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

From c0dba1b2390dbce1394ad23bc98ce8248a0ca507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:18:48 +0100
Subject: [PATCH 191/419] Update outputs to show commodity use as str

---
 src/muse/outputs/mca.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 00bd0b12..9424ea31 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -529,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]
@@ -570,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]
@@ -648,6 +650,7 @@ 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.drop(
                     ["month", "day", "hour"], axis=1, errors="ignore"
@@ -726,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]

From 75509a2236a97b78b7ddaf2915f49516b1677d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:19:25 +0100
Subject: [PATCH 192/419] Replace output files
 tutorial-code/0-new-decision-metric

---
 .../Results/MCACapacity.csv                   |  46 +-
 .../Results/MCAMetric_Consumption.csv         | 612 ++++++------
 .../Results/MCAMetric_Supply.csv              | 918 +++++++++---------
 .../Results/MCAPrices.csv                     |  60 +-
 4 files changed, 783 insertions(+), 853 deletions(-)

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 1def068e..f307ea6d 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 c6cacd79..3cbf732a 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 93ccbd1e..33284fc1 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 f4d602c4..c303e3a9 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

From bb5f9c07e784873e66baf5260644169be0de37ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:24:38 +0100
Subject: [PATCH 193/419] Replace output files
 tutorial-code\1-add-new-technology\1-introduction

---
 .../Results/Gas/Capacity/2020.csv             |   8 +-
 .../Results/Gas/Capacity/2030.csv             |  30 ++---
 .../Results/Gas/Capacity/2035.csv             |  26 ++--
 .../Results/Gas/Capacity/2040.csv             |  22 ++--
 .../Results/Gas/Capacity/2045.csv             |  18 +--
 .../Results/Gas/Capacity/2050.csv             |  18 +--
 .../1-introduction/Results/MCACapacity.csv    |  14 +--
 .../1-introduction/Results/MCAPrices.csv      |  60 ++++-----
 .../Results/Power/Capacity/2020.csv           |  30 ++---
 .../Results/Power/Capacity/2030.csv           |  74 ++++++------
 .../Results/Power/Capacity/2035.csv           | 104 +++++++---------
 .../Results/Power/Capacity/2040.csv           | 104 ++++++++--------
 .../Results/Power/Capacity/2045.csv           |  88 +++++++-------
 .../Results/Power/Capacity/2050.csv           | 114 +++++++++---------
 .../Results/Residential/Capacity/2050.csv     |  22 ++--
 .../Results/Residential/Supply/2020.csv       |  62 +++++-----
 .../Results/Residential/Supply/2025.csv       |  86 ++++++-------
 .../Results/Residential/Supply/2030.csv       |  98 +++++++--------
 .../Results/Residential/Supply/2035.csv       |  98 +++++++--------
 .../Results/Residential/Supply/2040.csv       |  98 +++++++--------
 .../Results/Residential/Supply/2045.csv       |  74 ++++++------
 .../Results/Residential/Supply/2050.csv       |  50 ++++----
 22 files changed, 630 insertions(+), 668 deletions(-)

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 fdbb2d27..d1ee882b 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 298f6c89..e84ef6dc 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 e368dd50..ccf34c3d 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 4d55f6f7..79fdfddb 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 e5d560fc..b2ca194f 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 4a7d05fa..4f3e3a18 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 9d868b1d..6a9a3148 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 f4d602c4..c303e3a9 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 beea1d34..e62bab81 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 26ce8db8..f1d62d69 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 3f21815e..25a2d0fc 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 0ab7f9bf..c076a27c 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 3d2ca0a4..3b950a24 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 43ea9b82..44998230 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From ad6adbd6e8a3ae86a2b320328c5db7b6196a321c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:47:23 +0100
Subject: [PATCH 194/419] Replace output files
 tutorial-code\1-add-new-technology\2-scenario

---
 .../2-scenario/Results/Gas/Capacity/2020.csv  |   8 +-
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  30 ++---
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  26 ++---
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  22 ++--
 .../2-scenario/Results/Gas/Capacity/2045.csv  |  18 +--
 .../2-scenario/Results/Gas/Capacity/2050.csv  |  18 +--
 .../2-scenario/Results/MCACapacity.csv        |  13 +--
 .../2-scenario/Results/MCAPrices.csv          |  60 +++++-----
 .../Results/Power/Capacity/2020.csv           |  30 ++---
 .../Results/Power/Capacity/2030.csv           |  74 ++++++------
 .../Results/Power/Capacity/2035.csv           |  93 +++++++--------
 .../Results/Power/Capacity/2040.csv           |  93 +++++++--------
 .../Results/Power/Capacity/2045.csv           |  74 ++++++------
 .../Results/Power/Capacity/2050.csv           | 106 ++++++++++--------
 .../Results/Residential/Capacity/2050.csv     |  22 ++--
 .../Results/Residential/Supply/2020.csv       |  62 +++++-----
 .../Results/Residential/Supply/2025.csv       |  86 +++++++-------
 .../Results/Residential/Supply/2030.csv       |  98 ++++++++--------
 .../Results/Residential/Supply/2035.csv       |  98 ++++++++--------
 .../Results/Residential/Supply/2040.csv       |  98 ++++++++--------
 .../Results/Residential/Supply/2045.csv       |  74 ++++++------
 .../Results/Residential/Supply/2050.csv       |  50 ++++-----
 22 files changed, 629 insertions(+), 624 deletions(-)

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 fdbb2d27..d1ee882b 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 298f6c89..e84ef6dc 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 e368dd50..ccf34c3d 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 4d55f6f7..79fdfddb 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 e5d560fc..b2ca194f 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 4a7d05fa..4f3e3a18 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 5f93911e..907f0026 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 d29309c0..1e6fcccc 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 f194e742..32dbf0a5 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 3739f2ea..7a86e052 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 94a5d1ab..3c54dd71 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 5e8f56bc..5b645c70 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 c64073d2..4b3e364d 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 fbf5711d..44998230 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From 53b0d46edae1230b56bf66a10061ca6d39fb2157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:51:23 +0100
Subject: [PATCH 195/419] Replace output files
 tutorial-code\2-add-agent\1-multiple-objective

---
 .../Results/Gas/Capacity/2020.csv             |   8 +-
 .../Results/Gas/Capacity/2025.csv             |   6 +-
 .../Results/Gas/Capacity/2035.csv             |  12 +--
 .../Results/Gas/Capacity/2040.csv             |  10 +-
 .../Results/Gas/Capacity/2045.csv             |   8 +-
 .../Results/Gas/Capacity/2050.csv             |   8 +-
 .../Results/Power/Capacity/2020.csv           |  30 +++---
 .../Results/Power/Capacity/2030.csv           |  68 ++++++------
 .../Results/Power/Capacity/2035.csv           |  72 ++++++-------
 .../Results/Power/Capacity/2040.csv           |  94 ++++++++--------
 .../Results/Power/Capacity/2050.csv           | 102 +++++++++---------
 .../Results/Residential/Capacity/2025.csv     |  10 +-
 .../Results/Residential/Capacity/2035.csv     |  14 +--
 .../Results/Residential/Capacity/2045.csv     |  14 +--
 .../Results/Residential/Capacity/2050.csv     |  18 ++--
 .../Results/Residential/Supply/2020.csv       |  62 +++++------
 .../Results/Residential/Supply/2025.csv       |  50 ++++-----
 .../Results/Residential/Supply/2030.csv       |  50 ++++-----
 .../Results/Residential/Supply/2035.csv       |  74 ++++++-------
 .../Results/Residential/Supply/2040.csv       |  74 ++++++-------
 .../Results/Residential/Supply/2045.csv       |  74 ++++++-------
 .../Results/Residential/Supply/2050.csv       |  74 ++++++-------
 22 files changed, 466 insertions(+), 466 deletions(-)

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 fdbb2d27..d1ee882b 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 f2ad7b02..d42ba410 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 39ffacce..44a4859e 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 cc87d2bd..e2f2b70b 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 c7248804..3923060e 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 90a0f85e..a9f4bcda 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 48bcd2e6..e5915556 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 68b049a3..77e18c05 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 ca175287..69e37a64 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 3969a49d..21f523e8 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 e3a24169..76dd0b6b 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 db6e6073..bba2b270 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 6d888046..acf60310 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 799a0664..c4060b3e 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 85bfbefa..7c95de2a 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 57fe2699..93c5f764 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 1339d7d2..1de5dcc2 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 9c87f423..9dac1d1f 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 f8de2157..c6d2e57f 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 9a26b20d..f0709c73 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 cf942a49..7771a5f6 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 9d4b068a..d8f4b150 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

From 988bc50fc4a8dde6f17cd670e1788fae3e32ef98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:53:14 +0100
Subject: [PATCH 196/419] Replace output files
 tutorial-code\2-add-agent\2-single-objective

---
 .../Results/Gas/Capacity/2020.csv             |  8 +-
 .../Results/Gas/Capacity/2025.csv             |  6 +-
 .../Results/Gas/Capacity/2035.csv             | 12 +--
 .../Results/Gas/Capacity/2040.csv             | 10 +--
 .../Results/Gas/Capacity/2045.csv             |  8 +-
 .../Results/Gas/Capacity/2050.csv             |  8 +-
 .../Results/Power/Capacity/2020.csv           | 18 ++---
 .../Results/Power/Capacity/2030.csv           | 44 +++++------
 .../Results/Power/Capacity/2035.csv           | 38 +++++-----
 .../Results/Power/Capacity/2040.csv           | 32 ++++----
 .../Results/Power/Capacity/2050.csv           | 54 +++++++-------
 .../Results/Residential/Capacity/2025.csv     | 10 +--
 .../Results/Residential/Capacity/2035.csv     | 14 ++--
 .../Results/Residential/Capacity/2045.csv     | 14 ++--
 .../Results/Residential/Capacity/2050.csv     | 18 ++---
 .../Results/Residential/Supply/2020.csv       | 62 ++++++++--------
 .../Results/Residential/Supply/2025.csv       | 50 ++++++-------
 .../Results/Residential/Supply/2030.csv       | 50 ++++++-------
 .../Results/Residential/Supply/2035.csv       | 74 +++++++++----------
 .../Results/Residential/Supply/2040.csv       | 74 +++++++++----------
 .../Results/Residential/Supply/2045.csv       | 74 +++++++++----------
 .../Results/Residential/Supply/2050.csv       | 74 +++++++++----------
 22 files changed, 376 insertions(+), 376 deletions(-)

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 fdbb2d27..d1ee882b 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 f2ad7b02..d42ba410 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 d5dee8bb..7634e12c 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 08966a42..8bcd1d83 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 fe3133ab..74ed4ef7 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 f3a800dd..e69b5daa 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 e51bf8d5..cef51025 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 a3e0e3c7..95ca8db9 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 e66e2fa3..9658f690 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 c4711009..b38ab808 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 e4440602..f22e262f 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 08d92bf4..6e14af34 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 2363ffb8..97713bf3 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 939e3e56..3cf57347 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 6aff1325..dfe77dba 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 62937431..4606e6a0 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 f9894bba..7f9bcda1 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 514bc0ff..c8a7993e 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 80e72327..405c4def 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 2c074d4d..9e06cf10 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 aa751b65..4e469dbf 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 79dedd79..d306c336 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

From 9f5694289b7304c7049e314f277ec84f3b18b278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:55:21 +0100
Subject: [PATCH 197/419] Replace output files
 tutorial-code\3-add-region\1-new-region

---
 .../Results/Gas/Capacity/2020.csv             |  14 +-
 .../Results/Gas/Capacity/2030.csv             |  58 +--
 .../Results/Gas/Capacity/2035.csv             |  50 +--
 .../Results/Gas/Capacity/2040.csv             |  42 +-
 .../Results/Gas/Capacity/2045.csv             |  34 +-
 .../Results/Gas/Capacity/2050.csv             |  34 +-
 .../1-new-region/Results/MCACapacity.csv      |  13 +-
 .../1-new-region/Results/MCAPrices.csv        | 120 +++---
 .../Results/Power/Capacity/2020.csv           |  46 +--
 .../Results/Power/Capacity/2030.csv           | 152 +++----
 .../Results/Power/Capacity/2035.csv           | 201 +++++----
 .../Results/Power/Capacity/2040.csv           | 211 +++++-----
 .../Results/Power/Capacity/2045.csv           | 154 +++----
 .../Results/Power/Capacity/2050.csv           | 244 +++++------
 .../Results/Residential/Capacity/2050.csv     |  42 +-
 .../Results/Residential/Supply/2020.csv       | 242 +++++------
 .../Results/Residential/Supply/2025.csv       | 338 +++++++--------
 .../Results/Residential/Supply/2030.csv       | 386 +++++++++---------
 .../Results/Residential/Supply/2035.csv       | 386 +++++++++---------
 .../Results/Residential/Supply/2040.csv       | 386 +++++++++---------
 .../Results/Residential/Supply/2045.csv       | 290 ++++++-------
 .../Results/Residential/Supply/2050.csv       | 194 ++++-----
 22 files changed, 1816 insertions(+), 1821 deletions(-)

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 192f9bf9..1d028468 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 223a9793..03ee962c 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 be63ee95..fbf2a30d 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 301ed041..66e14fbb 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 33d01ddd..b13eda0e 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 59af6136..5abfb8ed 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 c1b43bb2..607c8695 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 ce14d096..2c23130d 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 b5425c1b..7cbcccfb 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 ca265d0a..2bb5bf69 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 bc71a6d4..60a03abc 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 bda10415..7758d83e 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 b04feb4a..5b7e02f4 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 37b2c93a..d7a9a1ee 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 eb21c442..2910cd50 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 8e6f8adf..84bd25f2 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 eb9ddd9d..266a52a2 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 af0c152b..993fd437 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 21119f08..953fbe67 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 503b4b8c..af3cd108 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 98be95de..9d3de5da 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 26d4aa26..95e99a1c 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

From 34f4365d6430613d4566006170d7f942b58e577d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:57:11 +0100
Subject: [PATCH 198/419] Replace output files
 tutorial-code\4-modify-timing-data\1-modify-timeslices

---
 .../Results/Gas/Capacity/2020.csv             |  14 +-
 .../Results/Gas/Capacity/2025.csv             |  34 +-
 .../Results/Gas/Capacity/2030.csv             |  58 +-
 .../Results/Gas/Capacity/2035.csv             |  50 +-
 .../Results/Gas/Capacity/2040.csv             |  42 +-
 .../Results/Gas/Capacity/2045.csv             |  34 +-
 .../Results/Gas/Capacity/2050.csv             |  34 +-
 .../Results/Power/Capacity/2020.csv           |  46 +-
 .../Results/Power/Capacity/2030.csv           | 152 +++---
 .../Results/Power/Capacity/2035.csv           | 174 +++---
 .../Results/Power/Capacity/2040.csv           | 194 +++----
 .../Results/Power/Capacity/2050.csv           | 234 ++++----
 .../Results/Residential/Capacity/2050.csv     |  42 +-
 .../Results/Residential/Supply/2020.csv       | 322 +++++------
 .../Results/Residential/Supply/2025.csv       | 450 +++++++--------
 .../Results/Residential/Supply/2030.csv       | 514 +++++++++---------
 .../Results/Residential/Supply/2035.csv       | 386 ++++++-------
 .../Results/Residential/Supply/2040.csv       | 258 ++++-----
 .../Results/Residential/Supply/2045.csv       | 258 ++++-----
 .../Results/Residential/Supply/2050.csv       | 258 ++++-----
 20 files changed, 1777 insertions(+), 1777 deletions(-)

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 192f9bf9..1d028468 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 3c032c34..8fb7bfc1 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 8951d4a9..17bb49b7 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 a056e261..0fa955e8 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 0c2112af..73e0fda6 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 20d6c8b3..615e96d1 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 857dfbd4..6cf92b7f 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 fa374881..3cc9d052 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 91268246..973bfbcb 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 9eb83457..ad730ffc 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 f78b605a..c1665788 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 db2da871..a9657cc4 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 02533b47..cac57b15 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 2cf8d713..bcb016d9 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 e03b6acf..47d99e92 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 ed5f57f1..6882e943 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 f705f5ab..961a0e30 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 e83a6d96..7d51bac9 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 79c2096b..9d640006 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 bff478f6..3a03b1e3 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

From 6129b38b903e511fe8aae8d84a4791aedee3d3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 13:59:36 +0100
Subject: [PATCH 199/419] Replace output files
 tutorial-code\4-modify-timing-data\2-modify-time-framework

---
 .../Results/Gas/Capacity/2020.csv             |  18 +-
 .../Results/Gas/Capacity/2022.csv             |  18 +-
 .../Results/Gas/Capacity/2026.csv             |  82 +-
 .../Results/Gas/Capacity/2028.csv             | 114 +--
 .../Results/Gas/Capacity/2032.csv             | 162 ++--
 .../Results/Gas/Capacity/2034.csv             | 162 ++--
 .../Results/Gas/Capacity/2036.csv             | 146 +--
 .../Results/Gas/Capacity/2038.csv             | 130 +--
 .../Results/Gas/Capacity/2040.csv             | 130 +--
 .../Results/Power/Capacity/2020.csv           |  56 +-
 .../Results/Power/Capacity/2022.csv           | 146 +--
 .../Results/Power/Capacity/2026.csv           | 244 ++---
 .../Results/Power/Capacity/2028.csv           | 290 +++---
 .../Results/Power/Capacity/2030.csv           | 366 +++----
 .../Results/Power/Capacity/2032.csv           | 410 ++++----
 .../Results/Power/Capacity/2034.csv           | 480 +++++-----
 .../Results/Power/Capacity/2036.csv           | 504 +++++-----
 .../Results/Power/Capacity/2038.csv           | 520 +++++-----
 .../Results/Power/Capacity/2040.csv           | 588 ++++++------
 .../Results/Residential/Capacity/2022.csv     |  58 +-
 .../Results/Residential/Capacity/2026.csv     | 142 +--
 .../Results/Residential/Capacity/2028.csv     | 166 ++--
 .../Results/Residential/Supply/2020.csv       | 322 +++----
 .../Results/Residential/Supply/2022.csv       | 450 ++++-----
 .../Results/Residential/Supply/2024.csv       | 578 +++++------
 .../Results/Residential/Supply/2026.csv       | 706 +++++++-------
 .../Results/Residential/Supply/2028.csv       | 834 ++++++++--------
 .../Results/Residential/Supply/2030.csv       | 898 +++++++++---------
 .../Results/Residential/Supply/2032.csv       | 898 +++++++++---------
 .../Results/Residential/Supply/2034.csv       | 770 +++++++--------
 .../Results/Residential/Supply/2036.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2038.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2040.csv       | 642 ++++++-------
 33 files changed, 6157 insertions(+), 6157 deletions(-)

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 29ae58ec..e8d6cefe 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 0eb22015..2c4700cb 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 4f172556..525b4410 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 67c69d2c..06275547 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 b40fbda2..c3985ac4 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 04997302..50fdb27e 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 72aa33a6..47f0665c 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 de3b2958..b8ad0c84 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 e36b5e9e..2a28b22f 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 f6737d1d..c5f09e31 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 350eac06..53ca221d 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 76da3da0..0ac3ac2b 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 9bcf9d75..89063057 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 90db9e92..39f35794 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 8700e017..d9b12ffd 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 f5d513a8..74a26d6b 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 911983cc..aaafb15e 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 06e4c47c..46187e91 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 0ee948ae..78e6801e 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 aa3089b3..9983e72d 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 b3b9d8fd..e2b801b4 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 d49c6f24..2c783aae 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 7a199736..decbc990 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 6f689597..105935ca 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 5b8d3bd3..e3bd2ae3 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 ee0bdf3d..970f2b58 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 5e12685c..925b57fd 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 eef20226..cf3ede35 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 3aa4b2d0..6810097f 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 fe8d5955..d18aca82 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 121eb083..e143766a 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 89992632..d2c29412 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 b0cd3e1d..0fab7de0 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

From b034af080bdc83a889cacb9cf75f3c2ed6a83154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 14:03:05 +0100
Subject: [PATCH 200/419] Replace output files
 tutorial-code\5-add-service-demand\1-new-service-demand\settings.toml

---
 .../Results/Gas/Capacity/2020.csv             |   14 +-
 .../Results/Gas/Capacity/2025.csv             |   34 +-
 .../Results/Gas/Capacity/2030.csv             |   58 +-
 .../Results/Gas/Capacity/2035.csv             |   50 +-
 .../Results/Gas/Capacity/2040.csv             |   42 +-
 .../Results/Gas/Capacity/2045.csv             |   34 +-
 .../Results/Gas/Capacity/2050.csv             |   34 +-
 .../Results/Power/Capacity/2020.csv           |   58 +-
 .../Results/Power/Capacity/2030.csv           |  146 +--
 .../Results/Power/Capacity/2035.csv           |  166 +--
 .../Results/Power/Capacity/2040.csv           |  226 ++--
 .../Results/Power/Capacity/2050.csv           |  258 ++---
 .../Results/Residential/Capacity/2050.csv     |   82 +-
 .../Results/Residential/Supply/2020.csv       |  642 +++++------
 .../Results/Residential/Supply/2025.csv       |  898 +++++++--------
 .../Results/Residential/Supply/2030.csv       | 1026 ++++++++---------
 .../Results/Residential/Supply/2035.csv       |  770 ++++++-------
 .../Results/Residential/Supply/2040.csv       |  514 ++++-----
 .../Results/Residential/Supply/2045.csv       |  514 ++++-----
 .../Results/Residential/Supply/2050.csv       |  514 ++++-----
 20 files changed, 3040 insertions(+), 3040 deletions(-)

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 192f9bf9..1d028468 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 9836bff0..a5827773 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 9dd42497..870d5a27 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 48ffe4c5..1fa9d0e5 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 ff57f6c8..06c54c7e 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 865dc571..27d05c29 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 50f6271d..3e6eb8a2 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 c4dfc406..b0d9e28b 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 5920f22e..f3bc2558 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 73f39dde..c2cb9070 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 5aecf3d9..d400caf7 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 6092e062..8a614458 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 81136126..3702353c 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 0155957b..f2ccd997 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 a0be87ad..7a3d489c 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 683124bd..fac0c637 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 b2e9f555..bd809a20 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 a46c9d61..2d971d43 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 6d7f6711..c0568a1c 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 f046e7e7..bce2faa6 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

From 67c7358257f4b214b75d31a42ed9c16545006439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 14:04:17 +0100
Subject: [PATCH 201/419] Replace output files
 tutorial-code\6-add-correlation-demand\1-correlation\settings.toml

---
 .../Results/Gas/Capacity/2020.csv             |  8 +-
 .../Results/Gas/Capacity/2025.csv             |  6 +-
 .../Results/Gas/Capacity/2030.csv             | 14 +--
 .../Results/Gas/Capacity/2035.csv             | 12 +--
 .../Results/Gas/Capacity/2040.csv             | 10 +-
 .../Results/Gas/Capacity/2045.csv             |  8 +-
 .../Results/Gas/Capacity/2050.csv             |  8 +-
 .../Results/Power/Capacity/2020.csv           | 18 ++--
 .../Results/Power/Capacity/2030.csv           | 42 ++++----
 .../Results/Power/Capacity/2035.csv           | 56 +++++------
 .../Results/Power/Capacity/2040.csv           | 70 ++++++-------
 .../Results/Residential/Supply/2020.csv       | 62 ++++++------
 .../Results/Residential/Supply/2025.csv       | 86 ++++++++--------
 .../Results/Residential/Supply/2030.csv       | 98 +++++++++----------
 .../Results/Residential/Supply/2035.csv       | 98 +++++++++----------
 .../Results/Residential/Supply/2040.csv       | 98 +++++++++----------
 .../Results/Residential/Supply/2045.csv       | 98 +++++++++----------
 .../Results/Residential/Supply/2050.csv       | 98 +++++++++----------
 18 files changed, 445 insertions(+), 445 deletions(-)

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 fdbb2d27..d1ee882b 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 f2ad7b02..d42ba410 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 c7297452..85cb6585 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 f3e4bf75..21b6abc4 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 23ed9376..49c4e9fe 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 821a7afa..e9db3788 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 0032cb9b..6206749d 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 bbb50094..1043ca6b 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 76ad67dd..31c131b7 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 ac33bd58..9b1130de 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 cb1a0914..f5239465 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 23ffa638..75a7bdf1 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 fa269fb1..09ca76ed 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 3351505d..457bc6d0 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 8c9ac46b..bfad9bde 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 5e3fa1f0..0ab204b7 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 3e65d64a..28a974df 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 59bd881e..72c9b548 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

From dc66d394be894af4dd7b7e75e7f61ad8cb3afc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 14:10:48 +0100
Subject: [PATCH 202/419] Replace output files
 tutorial-code\7-min-max-timeslice-constraints\1-min-constraint\settings.toml

---
 .../Results/Gas/Capacity/2020.csv             |  18 +-
 .../Results/Gas/Capacity/2025.csv             |  16 +-
 .../Results/Gas/Capacity/2030.csv             |  28 +-
 .../Results/Gas/Capacity/2035.csv             |  26 +-
 .../Results/Gas/Capacity/2040.csv             |  22 +-
 .../Results/Gas/Capacity/2045.csv             |  18 +-
 .../Results/Gas/Capacity/2050.csv             |  18 +-
 .../Results/MCAMetric_Consumption.csv         | 456 ++++++------
 .../Results/MCAMetric_Supply.csv              | 648 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  18 +-
 .../Results/Power/Capacity/2050.csv           |  82 +--
 .../Results/Power/Supply/2020.csv             |  62 +-
 .../Results/Power/Supply/2025.csv             |  62 +-
 .../Results/Power/Supply/2030.csv             |  62 +-
 .../Results/Power/Supply/2035.csv             |  86 +--
 .../Results/Power/Supply/2040.csv             | 110 +--
 .../Results/Power/Supply/2045.csv             | 122 ++--
 .../Results/Power/Supply/2050.csv             | 122 ++--
 .../Results/Residential/Capacity/2050.csv     |  22 +-
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  86 +--
 .../Results/Residential/Supply/2030.csv       |  98 +--
 .../Results/Residential/Supply/2035.csv       |  98 +--
 .../Results/Residential/Supply/2040.csv       |  98 +--
 .../Results/Residential/Supply/2045.csv       |  74 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 26 files changed, 1282 insertions(+), 1282 deletions(-)

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 5c04a79f..33bbbed3 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 83f68b79..9d035dfd 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 ec7a9590..4cae2884 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 5c5b3b30..772418b7 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 b2702c26..70eb04b5 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 e8be0bbd..fdf6b01b 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 cd8cdf35..ed1ed9d4 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 3013fe14..69eb3a4f 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 37d1c853..e5a087bc 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 0745318f..69c4d338 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 e61276d3..26c19754 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 ce41a4a7..01ce902e 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 959636f2..7e48eea4 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 d39ab64c..04fdc53e 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 70cf1860..6199673d 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 469339f6..a51edca3 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 b4e174f3..d8adfe54 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 06be5a1f..0f54b428 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From 90954d177b1193e4fb91762f6638734ddbfa747a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 14:13:35 +0100
Subject: [PATCH 203/419] Replace output files
 tutorial-code\7-min-max-timeslice-constraints\2-max-constraint\settings.toml

---
 .../Results/Gas/Capacity/2020.csv             |  18 +-
 .../Results/Gas/Capacity/2025.csv             |  16 +-
 .../Results/Gas/Capacity/2030.csv             |  28 +-
 .../Results/Gas/Capacity/2035.csv             |  26 +-
 .../Results/Gas/Capacity/2040.csv             |  22 +-
 .../Results/Gas/Capacity/2045.csv             |  18 +-
 .../Results/Gas/Capacity/2050.csv             |  18 +-
 .../2-max-constraint/Results/MCACapacity.csv  |  40 +-
 .../Results/MCAMetric_Consumption.csv         | 456 ++++++------
 .../Results/MCAMetric_Supply.csv              | 648 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  18 +-
 .../Results/Power/Capacity/2025.csv           |  26 +-
 .../Results/Power/Capacity/2030.csv           |  40 +-
 .../Results/Power/Capacity/2035.csv           |  54 +-
 .../Results/Power/Capacity/2040.csv           |  68 +-
 .../Results/Power/Capacity/2045.csv           |  80 +--
 .../Results/Power/Capacity/2050.csv           |  82 +--
 .../Results/Power/Supply/2020.csv             |  58 +-
 .../Results/Power/Supply/2025.csv             |  58 +-
 .../Results/Power/Supply/2030.csv             |  62 +-
 .../Results/Power/Supply/2035.csv             |  86 +--
 .../Results/Power/Supply/2040.csv             | 110 +--
 .../Results/Power/Supply/2045.csv             | 122 ++--
 .../Results/Power/Supply/2050.csv             | 122 ++--
 .../Results/Residential/Capacity/2050.csv     |  22 +-
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  86 +--
 .../Results/Residential/Supply/2030.csv       |  98 +--
 .../Results/Residential/Supply/2035.csv       |  98 +--
 .../Results/Residential/Supply/2040.csv       |  98 +--
 .../Results/Residential/Supply/2045.csv       |  74 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 32 files changed, 1432 insertions(+), 1432 deletions(-)

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 5c04a79f..33bbbed3 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 83f68b79..9d035dfd 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 ec7a9590..4cae2884 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 5c5b3b30..772418b7 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 b2702c26..70eb04b5 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 e8be0bbd..fdf6b01b 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 cd8cdf35..ed1ed9d4 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 55d57422..07d7b4ce 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 f024353b..203194bc 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 a6d6edc5..d24d8c30 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 0745318f..f79ba32f 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 7d9d9278..525499d5 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 7b5158ef..98ef6ffe 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 a09a20c7..e9cb4c69 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 146d05f9..4aa4b743 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 b1c0a3b7..16a516dc 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 b69d9788..bc415559 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 cb7d1aae..aa3821f8 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 8f130d01..e841617e 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 3c07d73d..0480fdee 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 5324d255..8d7d43bd 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 f300181b..cb0ec8b6 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 c42cbd4c..4b2628f7 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 bd71ce59..05f58095 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From b7ba0834d880cc86b96c54572dad494fe8c7c365 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:22:36 +0000
Subject: [PATCH 204/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 43b539f0..6068e7a6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -91,7 +91,7 @@ markers = [
     "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",
+    "tutorial: a test which consist in running a tutorial"
 ]
 
 [tool.mypy]

From 02955857d4259cfdf2167dd9d388ed8fad2b6ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 4 Jun 2024 14:31:32 +0100
Subject: [PATCH 205/419] Update pyproject.toml with valid python versions

---
 pyproject.toml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 43b539f0..8c4c8f53 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,12 +8,14 @@ name = "MUSE_OS"
 description = "Energy System Model"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">= 3.8, <3.13"
+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)"

From 04135b93bd9f5374b42cb3d1888092063afa9f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:16:21 +0100
Subject: [PATCH 206/419] Update docs with valid python versions

---
 docs/installation/pipx-based.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index bbcf5e01..902bb5b6 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``.
 

From ef4b4b78fddb809c5a416e2f9dfb83265e9e4496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:16:48 +0100
Subject: [PATCH 207/419] Use python 3.12 when building the docs

---
 .github/workflows/documentation.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index b7ff0af9..c4d14b92 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: |

From 71dcdd6c0c73201017743885f679c1f50c0e23c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:22:35 +0100
Subject: [PATCH 208/419] Update default model outputs

---
 .../default/Gas/Capacity/2020.csv             |  8 +-
 .../default/Gas/Capacity/2025.csv             | 18 ++--
 .../default/Gas/Capacity/2030.csv             | 30 +++---
 .../default/Gas/Capacity/2035.csv             | 26 ++---
 .../default/Gas/Capacity/2040.csv             | 22 ++---
 .../default/Gas/Capacity/2045.csv             | 18 ++--
 .../default/Gas/Capacity/2050.csv             | 18 ++--
 .../default/Power/Capacity/2020.csv           | 32 +++---
 .../default/Power/Capacity/2030.csv           | 60 ++++++------
 .../default/Power/Capacity/2035.csv           | 72 +++++++-------
 .../default/Power/Capacity/2040.csv           | 84 ++++++++--------
 .../default/Power/Capacity/2050.csv           | 90 ++++++++---------
 .../default/Residential/Capacity/2050.csv     | 22 ++---
 .../default/Residential/Supply/2020.csv       | 62 ++++++------
 .../default/Residential/Supply/2025.csv       | 86 ++++++++--------
 .../default/Residential/Supply/2030.csv       | 98 +++++++++----------
 .../default/Residential/Supply/2035.csv       | 98 +++++++++----------
 .../default/Residential/Supply/2040.csv       | 98 +++++++++----------
 .../default/Residential/Supply/2045.csv       | 74 +++++++-------
 .../default/Residential/Supply/2050.csv       | 50 +++++-----
 20 files changed, 533 insertions(+), 533 deletions(-)

diff --git a/tests/example_outputs/default/Gas/Capacity/2020.csv b/tests/example_outputs/default/Gas/Capacity/2020.csv
index fdbb2d27..d1ee882b 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 33746c9c..d1fb99f5 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 298f6c89..e84ef6dc 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 e368dd50..ccf34c3d 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 4d55f6f7..79fdfddb 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 e5d560fc..b2ca194f 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 4a7d05fa..4f3e3a18 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 62349ecf..bdc2b6a7 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 62db4566..a6c53c55 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 048c07ae..60e997ea 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 715ec9ef..1cba828b 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 6fa217fc..13bd77c9 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From 11741ed780d83466a7d91e16291b2b61a995533c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:24:36 +0100
Subject: [PATCH 209/419] Update default_timeslice model outputs

---
 .../default_timeslice/Gas/Capacity/2020.csv   |  18 +-
 .../default_timeslice/Gas/Capacity/2025.csv   |  16 +-
 .../default_timeslice/Gas/Capacity/2030.csv   |  28 +-
 .../default_timeslice/Gas/Capacity/2035.csv   |  26 +-
 .../default_timeslice/Gas/Capacity/2040.csv   |  22 +-
 .../default_timeslice/Gas/Capacity/2045.csv   |  18 +-
 .../default_timeslice/Gas/Capacity/2050.csv   |  18 +-
 .../MCAMetric_Consumption.csv                 | 456 ++++++------
 .../default_timeslice/MCAMetric_Supply.csv    | 648 +++++++++---------
 .../default_timeslice/Power/Capacity/2020.csv |  18 +-
 .../default_timeslice/Power/Capacity/2050.csv |  82 +--
 .../default_timeslice/Power/Supply/2020.csv   |  62 +-
 .../default_timeslice/Power/Supply/2025.csv   |  62 +-
 .../default_timeslice/Power/Supply/2030.csv   |  62 +-
 .../default_timeslice/Power/Supply/2035.csv   |  86 +--
 .../default_timeslice/Power/Supply/2040.csv   | 110 +--
 .../default_timeslice/Power/Supply/2045.csv   | 122 ++--
 .../default_timeslice/Power/Supply/2050.csv   | 122 ++--
 .../Residential/Capacity/2050.csv             |  22 +-
 .../Residential/Supply/2020.csv               |  62 +-
 .../Residential/Supply/2025.csv               |  86 +--
 .../Residential/Supply/2030.csv               |  98 +--
 .../Residential/Supply/2035.csv               |  98 +--
 .../Residential/Supply/2040.csv               |  98 +--
 .../Residential/Supply/2045.csv               |  74 +-
 .../Residential/Supply/2050.csv               |  50 +-
 26 files changed, 1282 insertions(+), 1282 deletions(-)

diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
index 371cd8ea..c62b307b 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 2afc1e47..5faecc71 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 3ebe1998..9b16b8ea 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 882acc45..b9161b88 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 9512c0de..6e2627f0 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 33eaf061..3d611266 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 c9001996..36035897 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 3013fe14..69eb3a4f 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 b289c102..0f6d4a88 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 0745318f..69c4d338 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 e61276d3..26c19754 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 b346de20..44dbdf95 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 cf76dc0a..a4d417f5 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 d39ab64c..04fdc53e 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 70cf1860..6199673d 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 469339f6..a51edca3 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 b4e174f3..d8adfe54 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 06be5a1f..0f54b428 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From 98284e22f2eb2775bc877256e991bca2f9fdd2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:25:43 +0100
Subject: [PATCH 210/419] Update medium model outputs

---
 .../medium/Gas/Capacity/2035.csv              | 64 +++++++--------
 .../medium/Gas/Capacity/2040.csv              | 80 +++++++++---------
 .../medium/Gas/Capacity/2045.csv              | 72 ++++++++--------
 .../medium/Gas/Capacity/2050.csv              | 72 ++++++++--------
 .../medium/Power/Capacity/2020.csv            | 18 ++--
 .../medium/Power/Capacity/2030.csv            | 42 +++++-----
 .../medium/Power/Capacity/2035.csv            | 56 ++++++-------
 .../medium/Power/Capacity/2040.csv            | 70 ++++++++--------
 .../medium/Power/Capacity/2050.csv            | 82 +++++++++----------
 9 files changed, 278 insertions(+), 278 deletions(-)

diff --git a/tests/example_outputs/medium/Gas/Capacity/2035.csv b/tests/example_outputs/medium/Gas/Capacity/2035.csv
index b3a9223e..093329d2 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 fc71225c..fc101b3a 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 728fa8fc..3af77c5c 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 7efa053e..26ecd19b 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 60d0bc16..ca1b2bcc 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 d94a5a44..e06eb458 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 5d9c0245..3e285fc4 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 c91fd0f1..de0aa375 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 be4c1631..2f4a74a6 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

From 99e07cb6e70b31250351222f32a2d42ef9424a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:27:48 +0100
Subject: [PATCH 211/419] Update multiple_agents model outputs

---
 .../multiple_agents/Gas/Capacity/2020.csv     |  8 +-
 .../multiple_agents/Gas/Capacity/2025.csv     | 18 ++--
 .../multiple_agents/Gas/Capacity/2030.csv     | 30 +++---
 .../multiple_agents/Gas/Capacity/2035.csv     | 26 ++---
 .../multiple_agents/Gas/Capacity/2040.csv     | 22 ++---
 .../multiple_agents/Gas/Capacity/2045.csv     | 18 ++--
 .../multiple_agents/Gas/Capacity/2050.csv     | 18 ++--
 .../multiple_agents/Power/Capacity/2020.csv   | 32 +++---
 .../multiple_agents/Power/Capacity/2030.csv   | 60 ++++++------
 .../multiple_agents/Power/Capacity/2035.csv   | 72 +++++++-------
 .../multiple_agents/Power/Capacity/2040.csv   | 84 ++++++++--------
 .../multiple_agents/Power/Capacity/2050.csv   | 90 ++++++++---------
 .../Residential/Capacity/2050.csv             | 22 ++---
 .../Residential/Supply/2020.csv               | 62 ++++++------
 .../Residential/Supply/2025.csv               | 86 ++++++++--------
 .../Residential/Supply/2030.csv               | 98 +++++++++----------
 .../Residential/Supply/2035.csv               | 98 +++++++++----------
 .../Residential/Supply/2040.csv               | 98 +++++++++----------
 .../Residential/Supply/2045.csv               | 74 +++++++-------
 .../Residential/Supply/2050.csv               | 50 +++++-----
 20 files changed, 533 insertions(+), 533 deletions(-)

diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
index fdbb2d27..d1ee882b 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 33746c9c..d1fb99f5 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 298f6c89..e84ef6dc 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 e368dd50..ccf34c3d 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 4d55f6f7..79fdfddb 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 e5d560fc..b2ca194f 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 4a7d05fa..4f3e3a18 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 62349ecf..bdc2b6a7 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 62db4566..a6c53c55 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 048c07ae..60e997ea 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 715ec9ef..1cba828b 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 6fa217fc..13bd77c9 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 305b627b..42f4be20 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 a44059a3..7b8c4061 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 c9ed8c00..bfe116d0 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 61ae1198..82873caa 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 89e0bd4e..741ea3c6 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 663e47a5..c802f340 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 6e2884e6..c7be86b2 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 61004cae..8c187153 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

From 39b3f88f93735e23e3ed8cea5b4def91886fea0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 05:28:53 +0100
Subject: [PATCH 212/419] Update trade model outputs

---
 .../trade/Gas/Capacity/2020.csv               | 11 ++++++
 .../trade/Gas/Capacity/2025.csv               |  9 +++++
 .../trade/Gas/Capacity/2030.csv               |  9 +++++
 .../trade/Gas/Capacity/2035.csv               |  7 ++++
 .../trade/Power/Capacity/2020.csv             | 15 ++++++++
 .../trade/Power/Capacity/2025.csv             | 13 +++++++
 .../trade/Power/Capacity/2030.csv             | 11 ++++++
 .../trade/Power/Capacity/2035.csv             |  9 +++++
 .../trade/Residential/Capacity/2020.csv       | 18 ++++++++++
 .../trade/Residential/Capacity/2025.csv       | 22 ++++++++++++
 .../trade/Residential/Capacity/2030.csv       | 32 +++++++++++++++++
 .../trade/Residential/Capacity/2035.csv       | 34 +++++++++++++++++++
 12 files changed, 190 insertions(+)
 create mode 100644 tests/example_outputs/trade/Gas/Capacity/2020.csv
 create mode 100644 tests/example_outputs/trade/Gas/Capacity/2025.csv
 create mode 100644 tests/example_outputs/trade/Gas/Capacity/2030.csv
 create mode 100644 tests/example_outputs/trade/Gas/Capacity/2035.csv
 create mode 100644 tests/example_outputs/trade/Power/Capacity/2020.csv
 create mode 100644 tests/example_outputs/trade/Power/Capacity/2025.csv
 create mode 100644 tests/example_outputs/trade/Power/Capacity/2030.csv
 create mode 100644 tests/example_outputs/trade/Power/Capacity/2035.csv
 create mode 100644 tests/example_outputs/trade/Residential/Capacity/2020.csv
 create mode 100644 tests/example_outputs/trade/Residential/Capacity/2025.csv
 create mode 100644 tests/example_outputs/trade/Residential/Capacity/2030.csv
 create mode 100644 tests/example_outputs/trade/Residential/Capacity/2035.csv

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 00000000..a35c2ed5
--- /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 00000000..9777d794
--- /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 00000000..023078ee
--- /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 00000000..c232f077
--- /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 00000000..66b1b173
--- /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 00000000..2e29060b
--- /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 00000000..bb6eddda
--- /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 00000000..768699fc
--- /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 00000000..67b762dd
--- /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 00000000..7a0a26c0
--- /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 00000000..1609a5d5
--- /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 00000000..ab3a3848
--- /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

From 4872f41a082e0df56d2d6e7ac2b650cd122a335a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 06:23:41 +0100
Subject: [PATCH 213/419] Add hack to get comm usage consistently

---
 src/muse/commodities.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 383b505c..6ff27f59 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

From 09f9ada6abb13cf468ef01b1d7fdf4a7ef2c7ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 06:59:14 +0100
Subject: [PATCH 214/419] Add a more flexible version of comparing outputs

---
 tests/conftest.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index c6385ee7..f7d01593 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -77,9 +77,18 @@ 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 sets are equal as sometimes
+            # the order of the rows is different because of different sorting algorithms
+            try:
+                assert set(actual_col) == set(expected_col)
+            except AssertionError:
+                print(f"file: {msg}, column: {col}")
+                raise
 
 
 @fixture

From ad7b501617b95fb52cc2ea81faaf1f29f6b0082f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 06:59:45 +0100
Subject: [PATCH 215/419] Test only in earliest and latest python supported

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b808c3b..d801d5e6 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.9", "3.10", "3.11", "3.12"]
+        # Test with the earliest and the latest python versions supported
+        python-version: ["3.9", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -56,7 +57,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        # Test with the earliest and the latest python versions supported
+        python-version: ["3.9", "3.12"]
 
     steps:
       - uses: actions/checkout@v4

From 05d85e849eaf26586ea3d9010be6426e199b7414 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 09:05:54 +0100
Subject: [PATCH 216/419] CI: Enable caching of pip packages

Closes #322.
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 15cb2530..69566f86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
 
       - name: Install dependencies
         run: |

From e59cc5b165496c18b78923ad0f99866d0faac79e Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 10:52:47 +0100
Subject: [PATCH 217/419] Spelling

---
 src/muse/constraints.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 6ac3c725..01bc717d 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -1,6 +1,6 @@
 r"""Investment constraints.
 
-Constraints on investements ensure that investements match some given criteria. For
+Constraints on investments ensure that investments match some given criteria. For
 instance, the constraints could ensure that only so much of a new asset can be built
 every year.
 
@@ -8,7 +8,7 @@
 :py:meth:`~muse.constraints.register_constraints`. This registration step makes it
 possible for constraints to be declared in the TOML file.
 
-Generally, LP solvers accept linear constraint defined as:
+Generally, LP solvers accept linear constraints defined as:
 
 .. math::
 
@@ -16,8 +16,8 @@
 
 with :math:`A` a matrix, :math:`x` the decision variables, and :math:`b` a vector.
 However, these quantities are dimensionless. They do no have timeslices, assets, or
-replacement technologies, or any other dimensions that users have set-up in their model.
-The crux is to translates from MUSE's data-structures to a consistent dimensionless
+replacement technologies, or any other dimensions that users have set up in their model.
+The crux is to translate from MUSE's data-structures to a consistent dimensionless
 format.
 
 In MUSE, users can register constraints functions that return fully dimensional
@@ -44,8 +44,8 @@
 - Any dimension in :math:`A_c .* x_c` (:math:`A_p .* x_p`) that is also in :math:`b`
   defines diagonal entries into the left (right) submatrix of :math:`A`.
 - Any dimension in :math:`A_c .* x_c` (:math:`A_p .* x_b`) and missing from
-  :math:`b` is reduce by summation over a row in the left (right) submatrix of
-  :math:`A`. In other words, those dimension do become part of a standard tensor
+  :math:`b` is reduced by summation over a row in the left (right) submatrix of
+  :math:`A`. In other words, those dimensions become part of a standard tensor
   reduction or matrix multiplication.
 
 There are two additional rules. However, they are likely to be the result of an
@@ -288,7 +288,7 @@ def max_capacity_expansion(
     :math:`y=y_1` is the year marking the end of the investment period.
 
     Let :math:`\mathcal{A}^{i, r}_{t, \iota}(y)` be the current assets, before
-    invesment, and let :math:`\Delta\mathcal{A}^{i,r}_t` be the future investements.
+    investment, and let :math:`\Delta\mathcal{A}^{i,r}_t` be the future investments.
     The the constraint on agent :math:`i` are given as:
 
     .. math::

From c7a0101fb494d337020e90e02170f94462fd73cf Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 11:40:18 +0100
Subject: [PATCH 218/419] Raise error if minimum service factor is <0 or >1

Fixes #320.
---
 src/muse/constraints.py       | 7 +++++++
 tests/test_minimum_service.py | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 01bc717d..e4beb1e1 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -519,6 +519,13 @@ def minimum_service(
         return None
     if np.all(technologies["minimum_service_factor"] == 0):
         return None
+
+    min_service_factor = technologies["minimum_service_factor"]
+    if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
+        raise ValueError(
+            "Minimum service factor values must all be between 0 and 1 inclusive"
+        )
+
     if year is None:
         year = int(market.year.min())
     commodities = technologies.commodity.sel(
diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index ded2b50d..0f33599e 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -1,3 +1,4 @@
+import numpy as np
 from pytest import mark
 
 
@@ -23,7 +24,8 @@ def modify_minimum_service_factors(
 
 @mark.parametrize("process_name", [("gasCCGT", "windturbine")])
 @mark.parametrize(
-    "minimum_service_factor", [([1, 2, 3, 4, 5, 6], [0] * 6), ([0], [1, 2, 3, 4, 5, 6])]
+    "minimum_service_factor",
+    [(np.linspace(0, 1, 6), [0] * 6), ([0], np.linspace(0, 1, 6))],
 )
 def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
     import pandas as pd

From 7a1751b7bafd51858d4b30b5bca675dc0b266d52 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 14:18:54 +0100
Subject: [PATCH 219/419] Remove pointless return value

The data argument is just passed through unchanged.
---
 src/muse/readers/csv.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index a7bc5ba7..581cafec 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -129,7 +129,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 = check_utilization_not_all_zero(data, filename)
+    check_utilization_not_all_zero(data, filename)
 
     ts = pd.MultiIndex.from_frame(
         data.drop(
@@ -921,4 +921,3 @@ def check_utilization_not_all_zero(data, filename):
             """A technology can not have a utilization factor of 0 for every
                 timeslice. Please check file {}.""".format(filename)
         )
-    return data

From fe1fc9690012fd5b8ecea54d9416c784f6b97a8b Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 14:44:53 +0100
Subject: [PATCH 220/419] test_minimum_service.py: Refactor for readability

---
 tests/test_minimum_service.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 0f33599e..2064cf86 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -1,9 +1,11 @@
+from itertools import permutations
+
 import numpy as np
 from pytest import mark
 
 
 def modify_minimum_service_factors(
-    model_path, sector, process_name, minimum_service_factor
+    model_path, sector, processes, minimum_service_factors
 ):
     import pandas as pd
 
@@ -11,28 +13,25 @@ def modify_minimum_service_factors(
         model_path / "technodata" / sector / "TechnodataTimeslices.csv"
     )
 
-    technodata_timeslices.loc[
-        technodata_timeslices["ProcessName"] == process_name[0], "MinimumServiceFactor"
-    ] = minimum_service_factor[0]
-
-    technodata_timeslices.loc[
-        technodata_timeslices["ProcessName"] == process_name[1], "MinimumServiceFactor"
-    ] = minimum_service_factor[1]
+    for process, minimum in zip(processes, minimum_service_factors):
+        technodata_timeslices.loc[
+            technodata_timeslices["ProcessName"] == process, "MinimumServiceFactor"
+        ] = minimum
 
     return technodata_timeslices
 
 
-@mark.parametrize("process_name", [("gasCCGT", "windturbine")])
 @mark.parametrize(
-    "minimum_service_factor",
-    [(np.linspace(0, 1, 6), [0] * 6), ([0], np.linspace(0, 1, 6))],
+    "minimum_service_factors",
+    permutations((np.linspace(0, 1, 6), [0] * 6)),
 )
-def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
+def test_minimum_service_factor(tmpdir, minimum_service_factors):
     import pandas as pd
     from muse import examples
     from muse.mca import MCA
 
     sector = "power"
+    processes = ("gasCCGT", "windturbine")
 
     # Copy the model inputs to tmpdir
     model_path = examples.copy_model(
@@ -42,8 +41,8 @@ def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
     technodata_timeslices = modify_minimum_service_factors(
         model_path=model_path,
         sector=sector,
-        process_name=process_name,
-        minimum_service_factor=minimum_service_factor,
+        processes=processes,
+        minimum_service_factors=minimum_service_factors,
     )
 
     technodata_timeslices.to_csv(
@@ -55,7 +54,7 @@ def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
 
     supply_timeslice = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
 
-    for process, service_factor in zip(process_name, minimum_service_factor):
+    for process, service_factor in zip(processes, minimum_service_factors):
         for i, factor in enumerate(service_factor):
             assert (
                 supply_timeslice[

From 945eb54bfefeb3f4333d7a2a8a3ab1ce48517de9 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 15:33:35 +0100
Subject: [PATCH 221/419] Move check that minimum service factors are in range
 to csv.py

---
 src/muse/constraints.py |  7 -------
 src/muse/readers/csv.py | 12 ++++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index e4beb1e1..01bc717d 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -519,13 +519,6 @@ def minimum_service(
         return None
     if np.all(technologies["minimum_service_factor"] == 0):
         return None
-
-    min_service_factor = technologies["minimum_service_factor"]
-    if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
-        raise ValueError(
-            "Minimum service factor values must all be between 0 and 1 inclusive"
-        )
-
     if year is None:
         year = int(market.year.min())
     commodities = technologies.commodity.sel(
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 581cafec..2f8608c4 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -114,6 +114,9 @@ def to_agent_share(name):
 
     if "year" in result.dims and len(result.year) == 1:
         result = result.isel(year=0, drop=True)
+
+    check_minimum_service_factors_in_range(data, filename)
+
     return result
 
 
@@ -921,3 +924,12 @@ def check_utilization_not_all_zero(data, filename):
             """A technology can not have a utilization factor of 0 for every
                 timeslice. Please check file {}.""".format(filename)
         )
+
+
+def check_minimum_service_factors_in_range(data, filename):
+    min_service_factor = data["minimum_service_factor"]
+    if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
+        raise ValueError(
+            f"""Minimum service factor values must all be between 0 and 1 inclusive.
+             Please check file {filename}."""
+        )

From 320738cf8fa6c6b8bcc16a84cec7771b9eba091f Mon Sep 17 00:00:00 2001
From: Alex Dewar <alexdewar@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:47:56 +0100
Subject: [PATCH 222/419] Revert "Enforce minimum service factor limits"

---
 src/muse/constraints.py       | 14 +++++++-------
 src/muse/readers/csv.py       | 15 ++-------------
 tests/test_minimum_service.py | 29 ++++++++++++++---------------
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 01bc717d..6ac3c725 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -1,6 +1,6 @@
 r"""Investment constraints.
 
-Constraints on investments ensure that investments match some given criteria. For
+Constraints on investements ensure that investements match some given criteria. For
 instance, the constraints could ensure that only so much of a new asset can be built
 every year.
 
@@ -8,7 +8,7 @@
 :py:meth:`~muse.constraints.register_constraints`. This registration step makes it
 possible for constraints to be declared in the TOML file.
 
-Generally, LP solvers accept linear constraints defined as:
+Generally, LP solvers accept linear constraint defined as:
 
 .. math::
 
@@ -16,8 +16,8 @@
 
 with :math:`A` a matrix, :math:`x` the decision variables, and :math:`b` a vector.
 However, these quantities are dimensionless. They do no have timeslices, assets, or
-replacement technologies, or any other dimensions that users have set up in their model.
-The crux is to translate from MUSE's data-structures to a consistent dimensionless
+replacement technologies, or any other dimensions that users have set-up in their model.
+The crux is to translates from MUSE's data-structures to a consistent dimensionless
 format.
 
 In MUSE, users can register constraints functions that return fully dimensional
@@ -44,8 +44,8 @@
 - Any dimension in :math:`A_c .* x_c` (:math:`A_p .* x_p`) that is also in :math:`b`
   defines diagonal entries into the left (right) submatrix of :math:`A`.
 - Any dimension in :math:`A_c .* x_c` (:math:`A_p .* x_b`) and missing from
-  :math:`b` is reduced by summation over a row in the left (right) submatrix of
-  :math:`A`. In other words, those dimensions become part of a standard tensor
+  :math:`b` is reduce by summation over a row in the left (right) submatrix of
+  :math:`A`. In other words, those dimension do become part of a standard tensor
   reduction or matrix multiplication.
 
 There are two additional rules. However, they are likely to be the result of an
@@ -288,7 +288,7 @@ def max_capacity_expansion(
     :math:`y=y_1` is the year marking the end of the investment period.
 
     Let :math:`\mathcal{A}^{i, r}_{t, \iota}(y)` be the current assets, before
-    investment, and let :math:`\Delta\mathcal{A}^{i,r}_t` be the future investments.
+    invesment, and let :math:`\Delta\mathcal{A}^{i,r}_t` be the future investements.
     The the constraint on agent :math:`i` are given as:
 
     .. math::
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 2f8608c4..a7bc5ba7 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -114,9 +114,6 @@ def to_agent_share(name):
 
     if "year" in result.dims and len(result.year) == 1:
         result = result.isel(year=0, drop=True)
-
-    check_minimum_service_factors_in_range(data, filename)
-
     return result
 
 
@@ -132,7 +129,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"))
-    check_utilization_not_all_zero(data, filename)
+    data = check_utilization_not_all_zero(data, filename)
 
     ts = pd.MultiIndex.from_frame(
         data.drop(
@@ -924,12 +921,4 @@ def check_utilization_not_all_zero(data, filename):
             """A technology can not have a utilization factor of 0 for every
                 timeslice. Please check file {}.""".format(filename)
         )
-
-
-def check_minimum_service_factors_in_range(data, filename):
-    min_service_factor = data["minimum_service_factor"]
-    if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
-        raise ValueError(
-            f"""Minimum service factor values must all be between 0 and 1 inclusive.
-             Please check file {filename}."""
-        )
+    return data
diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 2064cf86..ded2b50d 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -1,11 +1,8 @@
-from itertools import permutations
-
-import numpy as np
 from pytest import mark
 
 
 def modify_minimum_service_factors(
-    model_path, sector, processes, minimum_service_factors
+    model_path, sector, process_name, minimum_service_factor
 ):
     import pandas as pd
 
@@ -13,25 +10,27 @@ def modify_minimum_service_factors(
         model_path / "technodata" / sector / "TechnodataTimeslices.csv"
     )
 
-    for process, minimum in zip(processes, minimum_service_factors):
-        technodata_timeslices.loc[
-            technodata_timeslices["ProcessName"] == process, "MinimumServiceFactor"
-        ] = minimum
+    technodata_timeslices.loc[
+        technodata_timeslices["ProcessName"] == process_name[0], "MinimumServiceFactor"
+    ] = minimum_service_factor[0]
+
+    technodata_timeslices.loc[
+        technodata_timeslices["ProcessName"] == process_name[1], "MinimumServiceFactor"
+    ] = minimum_service_factor[1]
 
     return technodata_timeslices
 
 
+@mark.parametrize("process_name", [("gasCCGT", "windturbine")])
 @mark.parametrize(
-    "minimum_service_factors",
-    permutations((np.linspace(0, 1, 6), [0] * 6)),
+    "minimum_service_factor", [([1, 2, 3, 4, 5, 6], [0] * 6), ([0], [1, 2, 3, 4, 5, 6])]
 )
-def test_minimum_service_factor(tmpdir, minimum_service_factors):
+def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
     import pandas as pd
     from muse import examples
     from muse.mca import MCA
 
     sector = "power"
-    processes = ("gasCCGT", "windturbine")
 
     # Copy the model inputs to tmpdir
     model_path = examples.copy_model(
@@ -41,8 +40,8 @@ def test_minimum_service_factor(tmpdir, minimum_service_factors):
     technodata_timeslices = modify_minimum_service_factors(
         model_path=model_path,
         sector=sector,
-        processes=processes,
-        minimum_service_factors=minimum_service_factors,
+        process_name=process_name,
+        minimum_service_factor=minimum_service_factor,
     )
 
     technodata_timeslices.to_csv(
@@ -54,7 +53,7 @@ def test_minimum_service_factor(tmpdir, minimum_service_factors):
 
     supply_timeslice = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
 
-    for process, service_factor in zip(processes, minimum_service_factors):
+    for process, service_factor in zip(process_name, minimum_service_factor):
         for i, factor in enumerate(service_factor):
             assert (
                 supply_timeslice[

From 1cf267ed7b6bfd71cef3b420289948a8c6c06e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <6095790+dalonsoa@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:02:30 +0100
Subject: [PATCH 223/419] Update src/muse/utilities.py

Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
---
 src/muse/utilities.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index e0b8d0a2..de377c09 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -48,8 +48,7 @@ def coords_to_multiindex(
     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)
     mindex_coords = xr.Coordinates.from_pandas_multiindex(index, dimension)
-    result = data.drop_vars(names).assign_coords(mindex_coords)
-    return result
+    return data.drop_vars(names).assign_coords(mindex_coords)
 
 
 def reduce_assets(

From d888013e2497d66ff309b931166b00fec02bcbe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 17:06:04 +0100
Subject: [PATCH 224/419] Fix aggegate sink

---
 docs/tutorial-code/0-new-decision-metric/settings.toml | 8 ++++----
 src/muse/outputs/cache.py                              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index 3e0e8f9c..50058a1a 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/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index 78f125f6..19eb6442 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -396,9 +396,9 @@ def check_col(colname: str) -> str:
     return reduce(
         lambda left, right: pd.DataFrame.merge(left, right, how="outer", on=cols)
         .T.groupby(check_col)
-        .last(),
+        .last().T,
         data,
-    ).T
+    )
 
 
 def consolidate_quantity(

From 3dfac29f9542fc2d96b51e695e256b8b42709628 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:06:28 +0000
Subject: [PATCH 225/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/muse/outputs/cache.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index 19eb6442..76d018e3 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -396,7 +396,8 @@ def check_col(colname: str) -> str:
     return reduce(
         lambda left, right: pd.DataFrame.merge(left, right, how="outer", on=cols)
         .T.groupby(check_col)
-        .last().T,
+        .last()
+        .T,
         data,
     )
 

From 6c7262dcc7dd7a2f2cb936ef9c547ff712a4070c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Wed, 5 Jun 2024 17:37:39 +0100
Subject: [PATCH 226/419] Make compare dataframes more robust

---
 tests/conftest.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index f7d01593..523bea0d 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
@@ -82,10 +83,13 @@ def compare_df(
                 expected_col, rel=rtol, abs=atol, nan_ok=equal_nan
             )
         except AssertionError:
-            # if the columns are not equal, we check if the sets are equal as sometimes
-            # the order of the rows is different because of different sorting algorithms
+            # 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 set(actual_col) == set(expected_col)
+                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

From b93b7c722089f4e73d40e55c04d03f06636c8b35 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 10 Jun 2024 12:27:31 +0100
Subject: [PATCH 227/419] Fix typo

---
 docs/user-guide/addition-service-demand.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index 1aab8f5e..c861c6ec 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -13,7 +13,7 @@
    "source": [
     "In this section, we detail how to add a service demand to MUSE. \n",
     "In the residential sector, a service demand could be cooking. Houses require energy to cook food and a technology to service this demand, such as an electric stove. \n",
-    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socio-economic development of a region or country. \n",
+    "This process consists of setting a demand, either through inputs derived from the user or correlations of GDP and population which reflect the socioeconomic development of a region or country. \n",
     "In addition, a technology must be added to service this new demand."
    ]
   },

From a5f9b4b415cbcd97364bdd39c792d728c4da61e3 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 10 Jun 2024 12:28:39 +0100
Subject: [PATCH 228/419] Change MinimumServiceFactor

---
 .../1-min-constraint/Results/MCAPrices.csv    | 132 +++++++++---------
 .../Results/Power/Supply/2020.csv             |  10 +-
 .../Results/Power/Supply/2025.csv             |  34 +++--
 .../Results/Power/Supply/2030.csv             |  60 ++++----
 .../Results/Power/Supply/2035.csv             |  84 +++++------
 .../Results/Power/Supply/2040.csv             | 108 +++++++-------
 .../Results/Power/Supply/2045.csv             | 120 ++++++++--------
 .../Results/Power/Supply/2050.csv             | 120 ++++++++--------
 .../technodata/power/TechnodataTimeslices.csv |  12 +-
 .../generate_models.py                        |   4 +-
 10 files changed, 340 insertions(+), 344 deletions(-)

diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index 0e22feda..065b72d2 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.57240000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.07160000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.22540000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.57070000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.07160000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.06980000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.56890000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.18130000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.29850000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.35830000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21640000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.29850000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70330000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.50340000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.18540000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.27860000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.27800000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18540000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18380000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27860000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56000000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.37210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06650000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.09980000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.09910000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06650000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06470000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09980000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.20010000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13320000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07170000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.10760000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.10690000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07170000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06990000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10760000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21570000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14360000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 ce41a4a7..cb7d1aae 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
@@ -3,29 +3,27 @@ timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
 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
+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,1.10000000000
+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
-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
+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,1.10000000000
+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
-5,1,2025,electricity,R1,2020,windturbine,all-year,all-week,evening,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 959636f2..c141ce82 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,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,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
+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.23950000000
+0,2,2030,electricity,R1,windturbine,2025,all-year,all-week,night,0.33600000000
 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
+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.35930000000
+1,2,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,0.50410000000
 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
+2,1,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.23950000000
+2,2,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.33600000000
 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
+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.35930000000
+3,2,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.50410000000
 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
+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.71850000000
+4,2,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.00810000000
 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
+5,1,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,0.47900000000
+5,2,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,0.67210000000
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 d39ab64c..bb2acce6 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
+0,0,2030,electricity,R1,windturbine,2020,all-year,all-week,night,0.23950000000
+0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,0.18010000000
+0,1,2030,electricity,R1,windturbine,2025,all-year,all-week,night,0.33600000000
+0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,0.25270000000
+0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,0.27610000000
+1,0,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,0.35930000000
+1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,0.27020000000
+1,1,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,0.50410000000
+1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,0.37910000000
+1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,0.41410000000
+2,0,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.23950000000
+2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.18010000000
+2,1,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.33600000000
+2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.25270000000
+2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.27610000000
+3,0,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.35930000000
+3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.27020000000
+3,1,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.50410000000
+3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.37910000000
+3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.41410000000
+4,0,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.71850000000
+4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.54030000000
+4,1,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.00810000000
+4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.75810000000
+4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.82820000000
+5,0,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,0.47900000000
+5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,0.36020000000
+5,1,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,0.67210000000
+5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,0.50540000000
+5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,0.55220000000
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 70cf1860..60b41e55 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
+0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,0.18010000000
+0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,0.15820000000
+0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,0.25270000000
+0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,0.22200000000
+0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,0.27610000000
+0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,0.24260000000
+0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,0.29030000000
+1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,0.27020000000
+1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,0.23740000000
+1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,0.37910000000
+1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,0.33300000000
+1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,0.41410000000
+1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,0.36380000000
+1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,0.43540000000
+2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.18010000000
+2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.15820000000
+2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.25270000000
+2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.22200000000
+2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.27610000000
+2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.24260000000
+2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.29030000000
+3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.27020000000
+3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.23740000000
+3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.37910000000
+3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.33300000000
+3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.41410000000
+3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.36380000000
+3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.43540000000
+4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.54030000000
+4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.47470000000
+4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.75810000000
+4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.66610000000
+4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.82820000000
+4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.72770000000
+4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.87080000000
+5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,0.36020000000
+5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,0.31650000000
+5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,0.50540000000
+5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,0.44400000000
+5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,0.55220000000
+5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,0.48510000000
+5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,0.58060000000
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 469339f6..274de33b 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
+0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,0.15820000000
+0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,0.13660000000
+0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,0.22200000000
+0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,0.19160000000
+0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,0.24260000000
+0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,0.20930000000
+0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,0.29030000000
+0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,0.25050000000
+0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,0.25840000000
+1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,0.23740000000
+1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,0.20490000000
+1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,0.33300000000
+1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,0.28740000000
+1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,0.36380000000
+1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,0.31400000000
+1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,0.43540000000
+1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,0.37580000000
+1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,0.38760000000
+2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.15820000000
+2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.13660000000
+2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.22200000000
+2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.19160000000
+2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.24260000000
+2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.20930000000
+2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.29030000000
+2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.25050000000
+2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,0.25840000000
+3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.23740000000
+3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.20490000000
+3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.33300000000
+3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.28740000000
+3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.36380000000
+3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.31400000000
+3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.43540000000
+3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.37580000000
+3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,0.38760000000
+4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.47470000000
+4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.40970000000
+4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.66610000000
+4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.57480000000
+4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.72770000000
+4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.62800000000
+4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.87080000000
+4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.75150000000
+4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,0.77530000000
+5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,0.31650000000
+5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,0.27310000000
+5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,0.44400000000
+5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,0.38320000000
+5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,0.48510000000
+5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,0.41870000000
+5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,0.58060000000
+5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,0.50100000000
+5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,0.51680000000
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 b4e174f3..c5767929 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
+0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,0.13660000000
+0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,0.19160000000
+0,1,2050,electricity,R1,windturbine,2025,all-year,all-week,night,0.19080000000
+0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,0.20930000000
+0,2,2050,electricity,R1,windturbine,2030,all-year,all-week,night,0.20840000000
+0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,0.25050000000
+0,3,2050,electricity,R1,windturbine,2035,all-year,all-week,night,0.24940000000
+0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,0.25840000000
+0,4,2050,electricity,R1,windturbine,2040,all-year,all-week,night,0.25730000000
+0,5,2050,electricity,R1,windturbine,2045,all-year,all-week,night,0.29400000000
+1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,0.20490000000
+1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,0.28740000000
+1,1,2050,electricity,R1,windturbine,2025,all-year,all-week,morning,0.28620000000
+1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,0.31400000000
+1,2,2050,electricity,R1,windturbine,2030,all-year,all-week,morning,0.31270000000
+1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,0.37580000000
+1,3,2050,electricity,R1,windturbine,2035,all-year,all-week,morning,0.37420000000
+1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,0.38760000000
+1,4,2050,electricity,R1,windturbine,2040,all-year,all-week,morning,0.38600000000
+1,5,2050,electricity,R1,windturbine,2045,all-year,all-week,morning,0.44110000000
+2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.13660000000
+2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.19160000000
+2,1,2050,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.19080000000
+2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.20930000000
+2,2,2050,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.20840000000
+2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.25050000000
+2,3,2050,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.24940000000
+2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,0.25840000000
+2,4,2050,electricity,R1,windturbine,2040,all-year,all-week,afternoon,0.25730000000
+2,5,2050,electricity,R1,windturbine,2045,all-year,all-week,afternoon,0.29400000000
+3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.20490000000
+3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.28740000000
+3,1,2050,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.28620000000
+3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.31400000000
+3,2,2050,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.31270000000
+3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.37580000000
+3,3,2050,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.37420000000
+3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,0.38760000000
+3,4,2050,electricity,R1,windturbine,2040,all-year,all-week,early-peak,0.38600000000
+3,5,2050,electricity,R1,windturbine,2045,all-year,all-week,early-peak,0.44110000000
+4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.40970000000
+4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.57480000000
+4,1,2050,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.57240000000
+4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.62800000000
+4,2,2050,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.62530000000
+4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.75150000000
+4,3,2050,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.74830000000
+4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,0.77530000000
+4,4,2050,electricity,R1,windturbine,2040,all-year,all-week,late-peak,0.77190000000
+4,5,2050,electricity,R1,windturbine,2045,all-year,all-week,late-peak,0.88210000000
+5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,0.27310000000
+5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,0.38320000000
+5,1,2050,electricity,R1,windturbine,2025,all-year,all-week,evening,0.38160000000
+5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,0.41870000000
+5,2,2050,electricity,R1,windturbine,2030,all-year,all-week,evening,0.41690000000
+5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,0.50100000000
+5,3,2050,electricity,R1,windturbine,2035,all-year,all-week,evening,0.49890000000
+5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,0.51680000000
+5,4,2050,electricity,R1,windturbine,2040,all-year,all-week,evening,0.51460000000
+5,5,2050,electricity,R1,windturbine,2045,all-year,all-week,evening,0.58810000000
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 06be5a1f..152fc6cf 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
+0,1,2050,electricity,R1,2025,windturbine,all-year,all-week,night,0.19080000000
+0,2,2050,electricity,R1,2030,windturbine,all-year,all-week,night,0.20840000000
+0,2,2055,electricity,R1,2030,windturbine,all-year,all-week,night,0.19450000000
+0,3,2050,electricity,R1,2035,windturbine,all-year,all-week,night,0.24940000000
+0,3,2055,electricity,R1,2035,windturbine,all-year,all-week,night,0.23270000000
+0,4,2050,electricity,R1,2040,windturbine,all-year,all-week,night,0.25730000000
+0,4,2055,electricity,R1,2040,windturbine,all-year,all-week,night,0.24010000000
+0,5,2050,electricity,R1,2045,windturbine,all-year,all-week,night,0.29400000000
+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.25830000000
+1,1,2050,electricity,R1,2025,windturbine,all-year,all-week,morning,0.28620000000
+1,2,2050,electricity,R1,2030,windturbine,all-year,all-week,morning,0.31270000000
+1,2,2055,electricity,R1,2030,windturbine,all-year,all-week,morning,0.29170000000
+1,3,2050,electricity,R1,2035,windturbine,all-year,all-week,morning,0.37420000000
+1,3,2055,electricity,R1,2035,windturbine,all-year,all-week,morning,0.34910000000
+1,4,2050,electricity,R1,2040,windturbine,all-year,all-week,morning,0.38600000000
+1,4,2055,electricity,R1,2040,windturbine,all-year,all-week,morning,0.36010000000
+1,5,2050,electricity,R1,2045,windturbine,all-year,all-week,morning,0.44110000000
+1,5,2055,electricity,R1,2045,windturbine,all-year,all-week,morning,0.41150000000
+1,6,2055,electricity,R1,2050,windturbine,all-year,all-week,morning,0.38750000000
+2,1,2050,electricity,R1,2025,windturbine,all-year,all-week,afternoon,0.19080000000
+2,2,2050,electricity,R1,2030,windturbine,all-year,all-week,afternoon,0.20840000000
+2,2,2055,electricity,R1,2030,windturbine,all-year,all-week,afternoon,0.19450000000
+2,3,2050,electricity,R1,2035,windturbine,all-year,all-week,afternoon,0.24940000000
+2,3,2055,electricity,R1,2035,windturbine,all-year,all-week,afternoon,0.23270000000
+2,4,2050,electricity,R1,2040,windturbine,all-year,all-week,afternoon,0.25730000000
+2,4,2055,electricity,R1,2040,windturbine,all-year,all-week,afternoon,0.24010000000
+2,5,2050,electricity,R1,2045,windturbine,all-year,all-week,afternoon,0.29400000000
+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.25830000000
+3,1,2050,electricity,R1,2025,windturbine,all-year,all-week,early-peak,0.28620000000
+3,2,2050,electricity,R1,2030,windturbine,all-year,all-week,early-peak,0.31270000000
+3,2,2055,electricity,R1,2030,windturbine,all-year,all-week,early-peak,0.29170000000
+3,3,2050,electricity,R1,2035,windturbine,all-year,all-week,early-peak,0.37420000000
+3,3,2055,electricity,R1,2035,windturbine,all-year,all-week,early-peak,0.34910000000
+3,4,2050,electricity,R1,2040,windturbine,all-year,all-week,early-peak,0.38600000000
+3,4,2055,electricity,R1,2040,windturbine,all-year,all-week,early-peak,0.36010000000
+3,5,2050,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.44110000000
+3,5,2055,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.41150000000
+3,6,2055,electricity,R1,2050,windturbine,all-year,all-week,early-peak,0.38750000000
+4,1,2050,electricity,R1,2025,windturbine,all-year,all-week,late-peak,0.57240000000
+4,2,2050,electricity,R1,2030,windturbine,all-year,all-week,late-peak,0.62530000000
+4,2,2055,electricity,R1,2030,windturbine,all-year,all-week,late-peak,0.58350000000
+4,3,2050,electricity,R1,2035,windturbine,all-year,all-week,late-peak,0.74830000000
+4,3,2055,electricity,R1,2035,windturbine,all-year,all-week,late-peak,0.69820000000
+4,4,2050,electricity,R1,2040,windturbine,all-year,all-week,late-peak,0.77190000000
+4,4,2055,electricity,R1,2040,windturbine,all-year,all-week,late-peak,0.72030000000
+4,5,2050,electricity,R1,2045,windturbine,all-year,all-week,late-peak,0.88210000000
+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.77490000000
+5,1,2050,electricity,R1,2025,windturbine,all-year,all-week,evening,0.38160000000
+5,2,2050,electricity,R1,2030,windturbine,all-year,all-week,evening,0.41690000000
+5,2,2055,electricity,R1,2030,windturbine,all-year,all-week,evening,0.38900000000
+5,3,2050,electricity,R1,2035,windturbine,all-year,all-week,evening,0.49890000000
+5,3,2055,electricity,R1,2035,windturbine,all-year,all-week,evening,0.46550000000
+5,4,2050,electricity,R1,2040,windturbine,all-year,all-week,evening,0.51460000000
+5,4,2055,electricity,R1,2040,windturbine,all-year,all-week,evening,0.48020000000
+5,5,2050,electricity,R1,2045,windturbine,all-year,all-week,evening,0.58810000000
+5,5,2055,electricity,R1,2045,windturbine,all-year,all-week,evening,0.54870000000
+5,6,2055,electricity,R1,2050,windturbine,all-year,all-week,evening,0.51660000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
index e761b4c5..9516eab6 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv
@@ -6,9 +6,9 @@ gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6
 gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4
 gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8
 gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
-windturbine,R1,2020,upper,all-year,all-week,night,1,1
-windturbine,R1,2020,upper,all-year,all-week,morning,1,1
-windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1
-windturbine,R1,2020,upper,all-year,all-week,early-peak,1,1
-windturbine,R1,2020,upper,all-year,all-week,late-peak,1,1
-windturbine,R1,2020,upper,all-year,all-week,evening,1,1
+windturbine,R1,2020,upper,all-year,all-week,night,1,0
+windturbine,R1,2020,upper,all-year,all-week,morning,1,0
+windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0
+windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
+windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
+windturbine,R1,2020,upper,all-year,all-week,evening,1,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index 22b7b9d8..8e5e0a53 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -26,6 +26,7 @@ def generate_model_1() -> None:
     # Modify MinimumServiceFactor for gasCCGT
     timeslices_file = model_path / "technodata/power/TechnodataTimeslices.csv"
     df = pd.read_csv(timeslices_file)
+    df.loc[1:, "MinimumServiceFactor"] = 0
     df.loc[df["ProcessName"] == "gasCCGT", "MinimumServiceFactor"] = [
         0.2,
         0.4,
@@ -48,13 +49,12 @@ def generate_model_2() -> None:
     if model_path.exists():
         shutil.rmtree(model_path)
 
-    # Starting point: copy model from 1-introduction
+    # Starting point: copy model from 1-min-constraint
     shutil.copytree(parent_path / "1-min-constraint", model_path)
 
     # Modify UtilizationFactor and MinimumServiceFactor for windturbine
     timeslices_file = model_path / "technodata/power/TechnodataTimeslices.csv"
     df = pd.read_csv(timeslices_file)
-    df.loc[df["ProcessName"] == "windturbine", "MinimumServiceFactor"] = 0
     df.loc[
         (df["ProcessName"] == "windturbine")
         & (df["hour"].isin(["morning", "afternoon"])),

From 7f0028bf996d72a37c68ca5f7162b5b6ca2718c0 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 10 Jun 2024 15:03:49 +0100
Subject: [PATCH 229/419] Re-generate output files

---
 .../Results/MCACapacity.csv                   |  63 ++
 .../Results/MCAMetric_Consumption.csv         | 295 ++++++++
 .../Results/MCAMetric_Supply.csv              | 439 +++++++++++
 .../Results/MCAPrices.csv                     | 169 +++++
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../1-introduction/Results/MCACapacity.csv    |  53 ++
 .../1-introduction/Results/MCAPrices.csv      | 169 +++++
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  21 +
 .../Results/Power/Capacity/2030.csv           |  26 +
 .../Results/Power/Capacity/2035.csv           |  32 +
 .../Results/Power/Capacity/2040.csv           |  38 +
 .../Results/Power/Capacity/2045.csv           |  53 ++
 .../Results/Power/Capacity/2050.csv           |  51 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 +
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../2-scenario/Results/Gas/Capacity/2020.csv  |   4 +
 .../2-scenario/Results/Gas/Capacity/2025.csv  |   3 +
 .../2-scenario/Results/Gas/Capacity/2030.csv  |   7 +
 .../2-scenario/Results/Gas/Capacity/2035.csv  |   6 +
 .../2-scenario/Results/Gas/Capacity/2040.csv  |   5 +
 .../2-scenario/Results/Gas/Capacity/2045.csv  |   4 +
 .../2-scenario/Results/Gas/Capacity/2050.csv  |   4 +
 .../2-scenario/Results/MCACapacity.csv        |  53 ++
 .../2-scenario/Results/MCAPrices.csv          | 169 +++++
 .../Results/Power/Capacity/2020.csv           |  15 +
 .../Results/Power/Capacity/2025.csv           |  21 +
 .../Results/Power/Capacity/2030.csv           |  26 +
 .../Results/Power/Capacity/2035.csv           |  32 +
 .../Results/Power/Capacity/2040.csv           |  38 +
 .../Results/Power/Capacity/2045.csv           |  53 ++
 .../Results/Power/Capacity/2050.csv           |  51 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 +
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../Results/MCACapacity.csv                   |  93 +++
 .../1-single-objective/Results/MCAPrices.csv  | 169 +++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 +
 .../Results/Power/Capacity/2045.csv           |  41 +
 .../Results/Power/Capacity/2050.csv           |  41 +
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 +
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../input/BaseYearExport.csv                  |  21 +
 .../input/BaseYearImport.csv                  |  21 +
 .../input/GlobalCommodities.csv               |   7 +
 .../1-single-objective/input/Projections.csv  |  21 +
 .../1-single-objective/settings.toml          | 148 ++++
 .../1-single-objective/technodata/Agents.csv  |   5 +
 .../technodata/gas/CommIn.csv                 |   3 +
 .../technodata/gas/CommOut.csv                |   3 +
 .../technodata/gas/ExistingCapacity.csv       |   2 +
 .../technodata/gas/Technodata.csv             |   3 +
 .../technodata/power/CommIn.csv               |   8 +
 .../technodata/power/CommOut.csv              |   8 +
 .../technodata/power/ExistingCapacity.csv     |   4 +
 .../technodata/power/Technodata.csv           |   8 +
 .../preset/Residential2020Consumption.csv     |   7 +
 .../preset/Residential2050Consumption.csv     |   7 +
 .../technodata/residential/CommIn.csv         |   4 +
 .../technodata/residential/CommOut.csv        |   4 +
 .../residential/ExistingCapacity.csv          |   3 +
 .../technodata/residential/Technodata.csv     |   4 +
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../Results/MCACapacity.csv                   |  65 ++
 .../Results/MCAPrices.csv                     | 169 +++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  13 +
 .../Results/Power/Capacity/2035.csv           |  11 +
 .../Results/Power/Capacity/2040.csv           |  15 +
 .../Results/Power/Capacity/2045.csv           |  19 +
 .../Results/Power/Capacity/2050.csv           |  19 +
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |   5 +
 .../Results/Residential/Capacity/2030.csv     |   9 +
 .../Results/Residential/Capacity/2035.csv     |   7 +
 .../Results/Residential/Capacity/2040.csv     |  11 +
 .../Results/Residential/Capacity/2045.csv     |   7 +
 .../Results/Residential/Capacity/2050.csv     |   9 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  25 +
 .../Results/Residential/Supply/2030.csv       |  25 +
 .../Results/Residential/Supply/2035.csv       |  37 +
 .../Results/Residential/Supply/2040.csv       |  37 +
 .../Results/Residential/Supply/2045.csv       |  37 +
 .../Results/Residential/Supply/2050.csv       |  37 +
 .../input/BaseYearExport.csv                  |  21 +
 .../input/BaseYearImport.csv                  |  21 +
 .../input/GlobalCommodities.csv               |   7 +
 .../input/Projections.csv                     |  21 +
 .../2-multiple-objective/settings.toml        | 148 ++++
 .../technodata/Agents.csv                     |   5 +
 .../technodata/gas/CommIn.csv                 |   3 +
 .../technodata/gas/CommOut.csv                |   3 +
 .../technodata/gas/ExistingCapacity.csv       |   2 +
 .../technodata/gas/Technodata.csv             |   3 +
 .../technodata/power/CommIn.csv               |   8 +
 .../technodata/power/CommOut.csv              |   8 +
 .../technodata/power/ExistingCapacity.csv     |   4 +
 .../technodata/power/Technodata.csv           |   8 +
 .../preset/Residential2020Consumption.csv     |   7 +
 .../preset/Residential2050Consumption.csv     |   7 +
 .../technodata/residential/CommIn.csv         |   4 +
 .../technodata/residential/CommOut.csv        |   4 +
 .../residential/ExistingCapacity.csv          |   3 +
 .../technodata/residential/Technodata.csv     |   4 +
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/Gas/Capacity/2025.csv             |   5 +
 .../Results/Gas/Capacity/2030.csv             |  13 +
 .../Results/Gas/Capacity/2035.csv             |  11 +
 .../Results/Gas/Capacity/2040.csv             |   9 +
 .../Results/Gas/Capacity/2045.csv             |   7 +
 .../Results/Gas/Capacity/2050.csv             |   7 +
 .../1-new-region/Results/MCACapacity.csv      | 100 +++
 .../1-new-region/Results/MCAPrices.csv        | 337 +++++++++
 .../Results/Power/Capacity/2020.csv           |  23 +
 .../Results/Power/Capacity/2025.csv           |  35 +
 .../Results/Power/Capacity/2030.csv           |  46 ++
 .../Results/Power/Capacity/2035.csv           |  59 ++
 .../Results/Power/Capacity/2040.csv           |  72 ++
 .../Results/Power/Capacity/2045.csv           | 103 +++
 .../Results/Power/Capacity/2050.csv           | 101 +++
 .../Results/Residential/Capacity/2020.csv     |  11 +
 .../Results/Residential/Capacity/2025.csv     |  25 +
 .../Results/Residential/Capacity/2030.csv     |  29 +
 .../Results/Residential/Capacity/2035.csv     |  33 +
 .../Results/Residential/Capacity/2040.csv     |  29 +
 .../Results/Residential/Capacity/2045.csv     |  25 +
 .../Results/Residential/Capacity/2050.csv     |  21 +
 .../Results/Residential/Supply/2020.csv       | 121 +++
 .../Results/Residential/Supply/2025.csv       | 169 +++++
 .../Results/Residential/Supply/2030.csv       | 193 +++++
 .../Results/Residential/Supply/2035.csv       | 193 +++++
 .../Results/Residential/Supply/2040.csv       | 193 +++++
 .../Results/Residential/Supply/2045.csv       | 145 ++++
 .../Results/Residential/Supply/2050.csv       |  97 +++
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/Gas/Capacity/2025.csv             |   5 +
 .../Results/Gas/Capacity/2030.csv             |  13 +
 .../Results/Gas/Capacity/2035.csv             |  11 +
 .../Results/Gas/Capacity/2040.csv             |   9 +
 .../Results/Gas/Capacity/2045.csv             |   7 +
 .../Results/Gas/Capacity/2050.csv             |   7 +
 .../Results/MCACapacity.csv                   | 100 +++
 .../1-modify-timeslices/Results/MCAPrices.csv | 449 +++++++++++
 .../Results/Power/Capacity/2020.csv           |  23 +
 .../Results/Power/Capacity/2025.csv           |  35 +
 .../Results/Power/Capacity/2030.csv           |  46 ++
 .../Results/Power/Capacity/2035.csv           |  59 ++
 .../Results/Power/Capacity/2040.csv           |  72 ++
 .../Results/Power/Capacity/2045.csv           | 103 +++
 .../Results/Power/Capacity/2050.csv           | 101 +++
 .../Results/Residential/Capacity/2020.csv     |  11 +
 .../Results/Residential/Capacity/2025.csv     |  25 +
 .../Results/Residential/Capacity/2030.csv     |  29 +
 .../Results/Residential/Capacity/2035.csv     |  33 +
 .../Results/Residential/Capacity/2040.csv     |  29 +
 .../Results/Residential/Capacity/2045.csv     |  25 +
 .../Results/Residential/Capacity/2050.csv     |  21 +
 .../Results/Residential/Supply/2020.csv       | 161 ++++
 .../Results/Residential/Supply/2025.csv       | 225 ++++++
 .../Results/Residential/Supply/2030.csv       | 257 +++++++
 .../Results/Residential/Supply/2035.csv       | 257 +++++++
 .../Results/Residential/Supply/2040.csv       | 257 +++++++
 .../Results/Residential/Supply/2045.csv       | 193 +++++
 .../Results/Residential/Supply/2050.csv       | 129 ++++
 .../Results/Gas/Capacity/2020.csv             |   9 +
 .../Results/Gas/Capacity/2022.csv             |   9 +
 .../Results/Gas/Capacity/2024.csv             |   9 +
 .../Results/Gas/Capacity/2026.csv             |   7 +
 .../Results/Gas/Capacity/2028.csv             |   5 +
 .../Results/Gas/Capacity/2030.csv             |  15 +
 .../Results/Gas/Capacity/2032.csv             |  15 +
 .../Results/Gas/Capacity/2034.csv             |  15 +
 .../Results/Gas/Capacity/2036.csv             |  13 +
 .../Results/Gas/Capacity/2038.csv             |  11 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/MCACapacity.csv                   | 255 +++++++
 .../Results/MCAPrices.csv                     | 705 ++++++++++++++++++
 .../Results/Power/Capacity/2020.csv           |  28 +
 .../Results/Power/Capacity/2022.csv           |  49 ++
 .../Results/Power/Capacity/2024.csv           |  69 ++
 .../Results/Power/Capacity/2026.csv           |  86 +++
 .../Results/Power/Capacity/2028.csv           | 105 +++
 .../Results/Power/Capacity/2030.csv           | 137 ++++
 .../Results/Power/Capacity/2032.csv           | 173 +++++
 .../Results/Power/Capacity/2034.csv           | 211 ++++++
 .../Results/Power/Capacity/2036.csv           | 238 ++++++
 .../Results/Power/Capacity/2038.csv           | 263 +++++++
 .../Results/Power/Capacity/2040.csv           | 311 ++++++++
 .../Results/Residential/Capacity/2020.csv     |  15 +
 .../Results/Residential/Capacity/2022.csv     |  41 +
 .../Results/Residential/Capacity/2024.csv     |  71 ++
 .../Results/Residential/Capacity/2026.csv     |  83 +++
 .../Results/Residential/Capacity/2028.csv     |  93 +++
 .../Results/Residential/Capacity/2030.csv     | 101 +++
 .../Results/Residential/Capacity/2032.csv     |  93 +++
 .../Results/Residential/Capacity/2034.csv     |  85 +++
 .../Results/Residential/Capacity/2036.csv     |  81 ++
 .../Results/Residential/Capacity/2038.csv     |  81 ++
 .../Results/Residential/Capacity/2040.csv     |  81 ++
 .../Results/Residential/Supply/2020.csv       | 161 ++++
 .../Results/Residential/Supply/2022.csv       | 289 +++++++
 .../Results/Residential/Supply/2024.csv       | 417 +++++++++++
 .../Results/Residential/Supply/2026.csv       | 481 ++++++++++++
 .../Results/Residential/Supply/2028.csv       | 545 ++++++++++++++
 .../Results/Residential/Supply/2030.csv       | 577 ++++++++++++++
 .../Results/Residential/Supply/2032.csv       | 513 +++++++++++++
 .../Results/Residential/Supply/2034.csv       | 385 ++++++++++
 .../Results/Residential/Supply/2036.csv       | 321 ++++++++
 .../Results/Residential/Supply/2038.csv       | 321 ++++++++
 .../Results/Residential/Supply/2040.csv       | 321 ++++++++
 .../Results/Gas/Capacity/2020.csv             |   7 +
 .../Results/Gas/Capacity/2025.csv             |  17 +
 .../Results/Gas/Capacity/2030.csv             |  29 +
 .../Results/Gas/Capacity/2035.csv             |  25 +
 .../Results/Gas/Capacity/2040.csv             |  21 +
 .../Results/Gas/Capacity/2045.csv             |  17 +
 .../Results/Gas/Capacity/2050.csv             |  17 +
 .../Results/MCACapacity.csv                   | 148 ++++
 .../1-exogenous-demand/Results/MCAPrices.csv  | 561 ++++++++++++++
 .../Results/Power/Capacity/2020.csv           |  23 +
 .../Results/Power/Capacity/2025.csv           |  35 +
 .../Results/Power/Capacity/2030.csv           |  54 ++
 .../Results/Power/Capacity/2035.csv           |  67 ++
 .../Results/Power/Capacity/2040.csv           |  79 ++
 .../Results/Power/Capacity/2045.csv           | 109 +++
 .../Results/Power/Capacity/2050.csv           | 105 +++
 .../Results/Residential/Capacity/2020.csv     |  21 +
 .../Results/Residential/Capacity/2025.csv     |  49 ++
 .../Results/Residential/Capacity/2030.csv     |  57 ++
 .../Results/Residential/Capacity/2035.csv     |  65 ++
 .../Results/Residential/Capacity/2040.csv     |  57 ++
 .../Results/Residential/Capacity/2045.csv     |  49 ++
 .../Results/Residential/Capacity/2050.csv     |  41 +
 .../Results/Residential/Supply/2020.csv       | 321 ++++++++
 .../Results/Residential/Supply/2025.csv       | 449 +++++++++++
 .../Results/Residential/Supply/2030.csv       | 513 +++++++++++++
 .../Results/Residential/Supply/2035.csv       | 513 +++++++++++++
 .../Results/Residential/Supply/2040.csv       | 513 +++++++++++++
 .../Results/Residential/Supply/2045.csv       | 385 ++++++++++
 .../Results/Residential/Supply/2050.csv       | 257 +++++++
 .../input/BaseYearExport.csv                  |  40 +
 .../input/BaseYearImport.csv                  |  40 +
 .../input/GlobalCommodities.csv               |   8 +
 .../1-exogenous-demand/input/Projections.csv  |  40 +
 .../1-exogenous-demand/settings.toml          | 150 ++++
 .../1-exogenous-demand/technodata/Agents.csv  |   5 +
 .../technodata/gas/CommIn.csv                 |   4 +
 .../technodata/gas/CommOut.csv                |   4 +
 .../technodata/gas/ExistingCapacity.csv       |   3 +
 .../technodata/gas/Technodata.csv             |   4 +
 .../technodata/power/CommIn.csv               |  14 +
 .../technodata/power/CommOut.csv              |  14 +
 .../technodata/power/ExistingCapacity.csv     |   7 +
 .../technodata/power/Technodata.csv           |  14 +
 .../preset/Residential2020Consumption.csv     |  17 +
 .../preset/Residential2050Consumption.csv     |  17 +
 .../technodata/residential/CommIn.csv         |  10 +
 .../technodata/residential/CommOut.csv        |  10 +
 .../residential/ExistingCapacity.csv          |   9 +
 .../technodata/residential/Technodata.csv     |  10 +
 .../Results/Gas/Capacity/2020.csv             |   4 +
 .../Results/Gas/Capacity/2025.csv             |   3 +
 .../Results/Gas/Capacity/2030.csv             |   7 +
 .../Results/Gas/Capacity/2035.csv             |   6 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   4 +
 .../Results/Gas/Capacity/2050.csv             |   4 +
 .../1-correlation/Results/MCACapacity.csv     |  48 ++
 .../1-correlation/Results/MCAPrices.csv       | 169 +++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 +
 .../Results/Power/Capacity/2045.csv           |  41 +
 .../Results/Power/Capacity/2050.csv           |  41 +
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  17 +
 .../Results/Residential/Capacity/2050.csv     |  15 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  49 ++
 .../Results/Residential/Supply/2050.csv       |  49 ++
 .../Results/Gas/Capacity/2020.csv             |   9 +
 .../Results/Gas/Capacity/2025.csv             |   8 +
 .../Results/Gas/Capacity/2030.csv             |  14 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/Gas/Capacity/2045.csv             |   9 +
 .../Results/Gas/Capacity/2050.csv             |   9 +
 .../1-min-constraint/Results/MCACapacity.csv  |  51 ++
 .../Results/MCAMetric_Consumption.csv         | 229 ++++++
 .../Results/MCAMetric_Supply.csv              | 325 ++++++++
 .../1-min-constraint/Results/MCAPrices.csv    | 169 +++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 +
 .../Results/Power/Capacity/2045.csv           |  41 +
 .../Results/Power/Capacity/2050.csv           |  41 +
 .../Results/Power/Supply/2020.csv             |  29 +
 .../Results/Power/Supply/2025.csv             |  29 +
 .../Results/Power/Supply/2030.csv             |  31 +
 .../Results/Power/Supply/2035.csv             |  43 ++
 .../Results/Power/Supply/2040.csv             |  55 ++
 .../Results/Power/Supply/2045.csv             |  61 ++
 .../Results/Power/Supply/2050.csv             |  61 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 +
 .../Results/Residential/Supply/2050.csv       |  25 +
 .../Results/Gas/Capacity/2020.csv             |   9 +
 .../Results/Gas/Capacity/2025.csv             |   8 +
 .../Results/Gas/Capacity/2030.csv             |  14 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/Gas/Capacity/2045.csv             |   9 +
 .../Results/Gas/Capacity/2050.csv             |   9 +
 .../2-max-constraint/Results/MCACapacity.csv  |  51 ++
 .../Results/MCAMetric_Consumption.csv         | 229 ++++++
 .../Results/MCAMetric_Supply.csv              | 325 ++++++++
 .../2-max-constraint/Results/MCAPrices.csv    | 169 +++++
 .../Results/Power/Capacity/2020.csv           |   9 +
 .../Results/Power/Capacity/2025.csv           |  15 +
 .../Results/Power/Capacity/2030.csv           |  21 +
 .../Results/Power/Capacity/2035.csv           |  28 +
 .../Results/Power/Capacity/2040.csv           |  35 +
 .../Results/Power/Capacity/2045.csv           |  41 +
 .../Results/Power/Capacity/2050.csv           |  41 +
 .../Results/Power/Supply/2020.csv             |  29 +
 .../Results/Power/Supply/2025.csv             |  29 +
 .../Results/Power/Supply/2030.csv             |  31 +
 .../Results/Power/Supply/2035.csv             |  43 ++
 .../Results/Power/Supply/2040.csv             |  55 ++
 .../Results/Power/Supply/2045.csv             |  61 ++
 .../Results/Power/Supply/2050.csv             |  61 ++
 .../Results/Residential/Capacity/2020.csv     |   6 +
 .../Results/Residential/Capacity/2025.csv     |  13 +
 .../Results/Residential/Capacity/2030.csv     |  15 +
 .../Results/Residential/Capacity/2035.csv     |  17 +
 .../Results/Residential/Capacity/2040.csv     |  15 +
 .../Results/Residential/Capacity/2045.csv     |  13 +
 .../Results/Residential/Capacity/2050.csv     |  11 +
 .../Results/Residential/Supply/2020.csv       |  31 +
 .../Results/Residential/Supply/2025.csv       |  43 ++
 .../Results/Residential/Supply/2030.csv       |  49 ++
 .../Results/Residential/Supply/2035.csv       |  49 ++
 .../Results/Residential/Supply/2040.csv       |  49 ++
 .../Results/Residential/Supply/2045.csv       |  37 +
 .../Results/Residential/Supply/2050.csv       |  25 +
 428 files changed, 26927 insertions(+)
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommIn.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommIn.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommIn.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommIn.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv
 create mode 100644 docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv

diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
new file mode 100644
index 00000000..f307ea6d
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -0,0 +1,63 @@
+,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
+0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
+0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
+2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
+7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
+2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
+12,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
+25,A1,6.75000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
+2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
+2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
+6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
+7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
+0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
+11,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
+12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
+31,A1,6.75000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
+0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
+1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
+2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
+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
+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
+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
+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
+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
new file mode 100644
index 00000000..3cbf732a
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
@@ -0,0 +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,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
new file mode 100644
index 00000000..33284fc1
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
@@ -0,0 +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,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
new file mode 100644
index 00000000..c303e3a9
--- /dev/null
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
+"('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.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.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.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.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.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.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.59490000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,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,0.89320000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,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.59490000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,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,0.89320000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,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,1.79150000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,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.19200000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,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.62940000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,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,0.94490000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,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.62940000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,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,0.94490000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,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,1.89420000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,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.26080000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,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/Gas/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
new file mode 100644
index 00000000..d1ee882b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,4 @@
+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/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d42ba410
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+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/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
new file mode 100644
index 00000000..7a15b255
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..a9824260
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..99b61abf
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..78a6035a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..0db6bc51
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2055,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..fa454d8e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
@@ -0,0 +1,53 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
+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,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.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,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
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
new file mode 100644
index 00000000..176ae31f
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.44430000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.09860000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.15550000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.32640000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.21250000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.14130000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31630000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.21200000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.47810000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14130000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31630000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21200000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.47810000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.42400000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.97770000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.28270000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64220000000,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
new file mode 100644
index 00000000..e62bab81
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
@@ -0,0 +1,15 @@
+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/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..849d1bde
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2025,R1,windturbine,2020,6.75000000000
+3,2030,R1,windturbine,2020,6.75000000000
+3,2035,R1,windturbine,2020,6.75000000000
+3,2040,R1,windturbine,2020,6.75000000000
+3,2045,R1,windturbine,2020,6.75000000000
+3,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
new file mode 100644
index 00000000..9194a38e
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
@@ -0,0 +1,26 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2030,R1,windturbine,2020,6.75000000000
+4,2035,R1,windturbine,2020,6.75000000000
+4,2040,R1,windturbine,2020,6.75000000000
+4,2045,R1,windturbine,2020,6.75000000000
+4,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
new file mode 100644
index 00000000..f8d94413
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
@@ -0,0 +1,32 @@
+asset,year,region,technology,installed,capacity
+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,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2040,R1,solarPV,2035,9.19000000000
+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,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/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..69825810
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
@@ -0,0 +1,38 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2020,10.00000000000
+1,2045,R1,solarPV,2020,10.00000000000
+1,2049,R1,solarPV,2020,10.00000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2040,R1,solarPV,2035,9.19000000000
+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,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/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..324548ca
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
@@ -0,0 +1,53 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,solarPV,2020,10.00000000000
+0,2049,R1,solarPV,2020,10.00000000000
+1,2045,R1,solarPV,2025,9.15000000000
+1,2049,R1,solarPV,2025,9.15000000000
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2035,9.19000000000
+3,2049,R1,solarPV,2035,9.19000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2045,R1,windturbine,2020,6.75000000000
+6,2049,R1,windturbine,2020,6.75000000000
+7,2050,R1,windturbine,2045,6.75000000000
+7,2054,R1,windturbine,2045,6.75000000000
+7,2055,R1,windturbine,2045,6.75000000000
+7,2059,R1,windturbine,2045,6.75000000000
+7,2060,R1,windturbine,2045,6.75000000000
+7,2064,R1,windturbine,2045,6.75000000000
+7,2065,R1,windturbine,2045,6.75000000000
+7,2069,R1,windturbine,2045,6.75000000000
+7,2070,R1,windturbine,2045,6.75000000000
+7,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
new file mode 100644
index 00000000..debc1352
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
@@ -0,0 +1,51 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2050,9.15000000000
+6,2059,R1,solarPV,2050,9.15000000000
+6,2060,R1,solarPV,2050,9.15000000000
+6,2064,R1,solarPV,2050,9.15000000000
+6,2065,R1,solarPV,2050,9.15000000000
+6,2069,R1,solarPV,2050,9.15000000000
+6,2070,R1,solarPV,2050,9.15000000000
+6,2074,R1,solarPV,2050,9.15000000000
+6,2075,R1,solarPV,2050,9.15000000000
+6,2079,R1,solarPV,2050,9.15000000000
+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/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..42f4be20
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000..7b8c4061
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000..bfe116d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000..82873caa
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..741ea3c6
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c802f340
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c7be86b2
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 00000000..8c187153
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 00000000..d1ee882b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,4 @@
+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/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d42ba410
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+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/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
new file mode 100644
index 00000000..7a15b255
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..a9824260
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..99b61abf
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..78a6035a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..0db6bc51
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2055,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..0599eab8
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
@@ -0,0 +1,53 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
+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
+solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.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
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
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
new file mode 100644
index 00000000..e7cafa95
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.63800000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68290000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63800000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68290000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81760000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.72780000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.14500000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.19820000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.14500000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.19820000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.35790000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04310000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.25140000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69410000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.35010000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.40980000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.35010000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.40980000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.58870000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48980000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.46940000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05720000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.11330000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.17760000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62930000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.11330000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.17760000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62930000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.37050000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30750000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.24190000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85430000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.32310000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.39070000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.32310000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.39070000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.59380000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.11150000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.45840000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65840000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.15170000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31700000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22750000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.47950000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15170000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31700000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22750000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.47950000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45500000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98340000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64480000000,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
new file mode 100644
index 00000000..32dbf0a5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
@@ -0,0 +1,15 @@
+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/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..80fe0b8b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2025,R1,windturbine,2020,10.00000000000
+3,2030,R1,windturbine,2020,10.00000000000
+3,2035,R1,windturbine,2020,10.00000000000
+3,2040,R1,windturbine,2020,10.00000000000
+3,2045,R1,windturbine,2020,10.00000000000
+3,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
new file mode 100644
index 00000000..5113153a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
@@ -0,0 +1,26 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2030,R1,windturbine,2020,10.00000000000
+4,2035,R1,windturbine,2020,10.00000000000
+4,2040,R1,windturbine,2020,10.00000000000
+4,2045,R1,windturbine,2020,10.00000000000
+4,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
new file mode 100644
index 00000000..c76581d4
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
@@ -0,0 +1,32 @@
+asset,year,region,technology,installed,capacity
+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,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2040,R1,solarPV,2035,9.19000000000
+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,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/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..1bc59d24
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
@@ -0,0 +1,38 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2020,6.75000000000
+1,2045,R1,solarPV,2020,6.75000000000
+1,2049,R1,solarPV,2020,6.75000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2040,R1,solarPV,2035,9.19000000000
+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,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/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..a6d9e492
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
@@ -0,0 +1,53 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,solarPV,2020,6.75000000000
+0,2049,R1,solarPV,2020,6.75000000000
+1,2045,R1,solarPV,2025,9.15000000000
+1,2049,R1,solarPV,2025,9.15000000000
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2035,9.19000000000
+3,2049,R1,solarPV,2035,9.19000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,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,2050,R1,windturbine,2045,6.75000000000
+7,2054,R1,windturbine,2045,6.75000000000
+7,2055,R1,windturbine,2045,6.75000000000
+7,2059,R1,windturbine,2045,6.75000000000
+7,2060,R1,windturbine,2045,6.75000000000
+7,2064,R1,windturbine,2045,6.75000000000
+7,2065,R1,windturbine,2045,6.75000000000
+7,2069,R1,windturbine,2045,6.75000000000
+7,2070,R1,windturbine,2045,6.75000000000
+7,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
new file mode 100644
index 00000000..debc1352
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
@@ -0,0 +1,51 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2050,9.15000000000
+6,2059,R1,solarPV,2050,9.15000000000
+6,2060,R1,solarPV,2050,9.15000000000
+6,2064,R1,solarPV,2050,9.15000000000
+6,2065,R1,solarPV,2050,9.15000000000
+6,2069,R1,solarPV,2050,9.15000000000
+6,2070,R1,solarPV,2050,9.15000000000
+6,2074,R1,solarPV,2050,9.15000000000
+6,2075,R1,solarPV,2050,9.15000000000
+6,2079,R1,solarPV,2050,9.15000000000
+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/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..42f4be20
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000..7b8c4061
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000..bfe116d0
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000..82873caa
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..741ea3c6
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c802f340
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c7be86b2
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 00000000..8c187153
--- /dev/null
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
@@ -0,0 +1,25 @@
+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-single-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
new file mode 100644
index 00000000..d1ee882b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,4 @@
+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-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d42ba410
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+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-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..7a15b255
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..a9824260
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
new file mode 100644
index 00000000..99b61abf
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..78a6035a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..0db6bc51
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2055,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
new file mode 100644
index 00000000..8ccabec8
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -0,0 +1,93 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,9.50000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A1,power,retrofit,2025,4.18750000000
+gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A2,power,retrofit,2025,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,2.05000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,3.45000000000
+gasboiler,R1,R1,A2,residential,retrofit,2030,2.05000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,9.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,3.45000000000
+solarPV,R1,R1,A1,power,retrofit,2030,8.76250000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2030,8.76250000000
+windturbine,R1,R1,A2,power,retrofit,2030,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,2.05000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,3.45000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,12.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2035,2.05000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,3.45000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,12.50000000000
+solarPV,R1,R1,A1,power,retrofit,2035,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2035,1.50000000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2035,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2035,1.50000000000
+windturbine,R1,R1,A2,power,retrofit,2035,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,2.64220000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,0.45500000000
+heatpump,R1,R1,A1,residential,retrofit,2040,12.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,8.04500000000
+gasboiler,R1,R1,A2,residential,retrofit,2040,0.45500000000
+heatpump,R1,R1,A2,residential,retrofit,2040,12.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,8.04500000000
+solarPV,R1,R1,A1,power,retrofit,2040,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2040,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2040,3.79750000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2040,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2040,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2040,3.79750000000
+windturbine,R1,R1,A2,power,retrofit,2040,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,2.64220000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,0.45500000000
+heatpump,R1,R1,A1,residential,retrofit,2045,8.04500000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2045,0.45500000000
+heatpump,R1,R1,A2,residential,retrofit,2045,8.04500000000
+heatpump,R1,R1,A2,residential,retrofit,2045,15.50000000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2045,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2045,3.79750000000
+solarPV,R1,R1,A1,power,retrofit,2045,3.79750000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2045,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2045,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.79750000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.79750000000
+windturbine,R1,R1,A2,power,retrofit,2045,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,2.64220000000
+heatpump,R1,R1,A1,residential,retrofit,2050,15.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,11.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,15.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,11.50000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.76250000000
+solarPV,R1,R1,A1,power,retrofit,2050,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A1,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.14250000000
+solarPV,R1,R1,A2,power,retrofit,2050,8.76250000000
+solarPV,R1,R1,A2,power,retrofit,2050,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.79750000000
+solarPV,R1,R1,A2,power,retrofit,2050,9.14250000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.64220000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,2.64220000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
new file mode 100644
index 00000000..3677d535
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.68030000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.74640000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.68030000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.74640000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94460000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.81250000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.17830000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34670000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.24820000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52070000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.17830000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34670000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.24820000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52070000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.45790000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04570000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.31810000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69520000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.37650000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62780000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.44940000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84300000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.37650000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62780000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.44940000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84300000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.66800000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.49410000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.52220000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05910000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.13430000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40580000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.20910000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.63060000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.13430000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40580000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.20910000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.63060000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.43350000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.31280000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.28390000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85670000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.33950000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21120000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.41540000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43530000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.33950000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21120000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.41540000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43530000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.64300000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.11710000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.49130000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.66090000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.15180000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31760000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22770000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.48100000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15180000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31760000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22770000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.48100000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45530000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98930000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30350000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64740000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
new file mode 100644
index 00000000..b3996630
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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,8.37500000000
+1,2030,R1,windturbine,2020,8.37500000000
+1,2035,R1,windturbine,2020,8.37500000000
+1,2040,R1,windturbine,2020,8.37500000000
+1,2045,R1,windturbine,2020,8.37500000000
+1,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..a7007923
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,17.52500000000
+1,2035,R1,solarPV,2025,17.52500000000
+1,2040,R1,solarPV,2025,17.52500000000
+1,2045,R1,solarPV,2025,17.52500000000
+1,2049,R1,solarPV,2025,17.52500000000
+1,2050,R1,solarPV,2025,17.52500000000
+1,2054,R1,solarPV,2025,17.52500000000
+2,2025,R1,windturbine,2020,8.37500000000
+2,2030,R1,windturbine,2020,8.37500000000
+2,2035,R1,windturbine,2020,8.37500000000
+2,2040,R1,windturbine,2020,8.37500000000
+2,2045,R1,windturbine,2020,8.37500000000
+2,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..c0487536
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+1,2030,R1,solarPV,2025,17.52500000000
+1,2035,R1,solarPV,2025,17.52500000000
+1,2040,R1,solarPV,2025,17.52500000000
+1,2045,R1,solarPV,2025,17.52500000000
+1,2049,R1,solarPV,2025,17.52500000000
+1,2050,R1,solarPV,2025,17.52500000000
+1,2054,R1,solarPV,2025,17.52500000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2049,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2054,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2030,R1,windturbine,2020,8.37500000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..81d09e1c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
@@ -0,0 +1,28 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,solarPV,2025,17.52500000000
+0,2040,R1,solarPV,2025,17.52500000000
+0,2045,R1,solarPV,2025,17.52500000000
+0,2049,R1,solarPV,2025,17.52500000000
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2035,R1,solarPV,2030,3.00000000000
+1,2040,R1,solarPV,2030,3.00000000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2035,7.59500000000
+2,2045,R1,solarPV,2035,7.59500000000
+2,2049,R1,solarPV,2035,7.59500000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..8d652a35
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
@@ -0,0 +1,35 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,solarPV,2025,17.52500000000
+0,2045,R1,solarPV,2025,17.52500000000
+0,2049,R1,solarPV,2025,17.52500000000
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2040,R1,solarPV,2030,3.00000000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2035,7.59500000000
+2,2045,R1,solarPV,2035,7.59500000000
+2,2049,R1,solarPV,2035,7.59500000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2045,R1,solarPV,2040,7.59500000000
+3,2049,R1,solarPV,2040,7.59500000000
+3,2050,R1,solarPV,2040,7.59500000000
+3,2054,R1,solarPV,2040,7.59500000000
+3,2055,R1,solarPV,2040,7.59500000000
+3,2059,R1,solarPV,2040,7.59500000000
+3,2060,R1,solarPV,2040,7.59500000000
+3,2064,R1,solarPV,2040,7.59500000000
+3,2065,R1,solarPV,2040,7.59500000000
+3,2069,R1,solarPV,2040,7.59500000000
+4,2040,R1,windturbine,2020,8.37500000000
+4,2045,R1,windturbine,2020,8.37500000000
+4,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..2b37067f
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,solarPV,2025,17.52500000000
+0,2049,R1,solarPV,2025,17.52500000000
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2035,7.59500000000
+2,2049,R1,solarPV,2035,7.59500000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2045,R1,solarPV,2040,7.59500000000
+3,2049,R1,solarPV,2040,7.59500000000
+3,2050,R1,solarPV,2040,7.59500000000
+3,2054,R1,solarPV,2040,7.59500000000
+3,2055,R1,solarPV,2040,7.59500000000
+3,2059,R1,solarPV,2040,7.59500000000
+3,2060,R1,solarPV,2040,7.59500000000
+3,2064,R1,solarPV,2040,7.59500000000
+3,2065,R1,solarPV,2040,7.59500000000
+3,2069,R1,solarPV,2040,7.59500000000
+4,2050,R1,solarPV,2045,18.28500000000
+4,2054,R1,solarPV,2045,18.28500000000
+4,2055,R1,solarPV,2045,18.28500000000
+4,2059,R1,solarPV,2045,18.28500000000
+4,2060,R1,solarPV,2045,18.28500000000
+4,2064,R1,solarPV,2045,18.28500000000
+4,2065,R1,solarPV,2045,18.28500000000
+4,2069,R1,solarPV,2045,18.28500000000
+4,2070,R1,solarPV,2045,18.28500000000
+4,2074,R1,solarPV,2045,18.28500000000
+5,2045,R1,windturbine,2020,8.37500000000
+5,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..9484ef7e
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+0,2050,R1,solarPV,2025,17.52500000000
+0,2054,R1,solarPV,2025,17.52500000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2035,7.59500000000
+2,2054,R1,solarPV,2035,7.59500000000
+2,2055,R1,solarPV,2035,7.59500000000
+2,2059,R1,solarPV,2035,7.59500000000
+2,2060,R1,solarPV,2035,7.59500000000
+2,2064,R1,solarPV,2035,7.59500000000
+3,2050,R1,solarPV,2040,7.59500000000
+3,2054,R1,solarPV,2040,7.59500000000
+3,2055,R1,solarPV,2040,7.59500000000
+3,2059,R1,solarPV,2040,7.59500000000
+3,2060,R1,solarPV,2040,7.59500000000
+3,2064,R1,solarPV,2040,7.59500000000
+3,2065,R1,solarPV,2040,7.59500000000
+3,2069,R1,solarPV,2040,7.59500000000
+4,2050,R1,solarPV,2045,18.28500000000
+4,2054,R1,solarPV,2045,18.28500000000
+4,2055,R1,solarPV,2045,18.28500000000
+4,2059,R1,solarPV,2045,18.28500000000
+4,2060,R1,solarPV,2045,18.28500000000
+4,2064,R1,solarPV,2045,18.28500000000
+4,2065,R1,solarPV,2045,18.28500000000
+4,2069,R1,solarPV,2045,18.28500000000
+4,2070,R1,solarPV,2045,18.28500000000
+4,2074,R1,solarPV,2045,18.28500000000
+5,2055,R1,solarPV,2050,17.52500000000
+5,2059,R1,solarPV,2050,17.52500000000
+5,2060,R1,solarPV,2050,17.52500000000
+5,2064,R1,solarPV,2050,17.52500000000
+5,2065,R1,solarPV,2050,17.52500000000
+5,2069,R1,solarPV,2050,17.52500000000
+5,2070,R1,solarPV,2050,17.52500000000
+5,2074,R1,solarPV,2050,17.52500000000
+5,2075,R1,solarPV,2050,17.52500000000
+5,2079,R1,solarPV,2050,17.52500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..42f4be20
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,11 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
new file mode 100644
index 00000000..7b8c4061
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..bfe116d0
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
new file mode 100644
index 00000000..82873caa
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..741ea3c6
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
new file mode 100644
index 00000000..c802f340
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..c7be86b2
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+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/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..8c187153
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
@@ -0,0 +1,25 @@
+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-single-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv
new file mode 100644
index 00000000..38c886d3
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearExport.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
+R1,Exports,2010,0,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv
new file mode 100644
index 00000000..9c9cc695
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/BaseYearImport.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
+R1,Imports,2010,0,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv
new file mode 100644
index 00000000..9691db73
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/GlobalCommodities.csv
@@ -0,0 +1,7 @@
+Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
+Electricity,Energy,electricity,0.0,1,PJ
+Gas,Energy,gas,56.1,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv
new file mode 100644
index 00000000..6a013889
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/input/Projections.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
new file mode 100644
index 00000000..704d93ac
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -0,0 +1,148 @@
+# Global settings - most REQUIRED
+
+time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+regions = ["R1"]
+interest_rate = 0.1
+interpolation_mode = 'Active'
+log_level = 'info'
+excluded_commodities = ["wind", "solar"]
+# Convergence parameters
+equilibrium_variable = 'demand'
+maximum_iterations = 1
+tolerance = 0.1
+tolerance_unmet_demand = -0.1
+
+[[outputs]]
+quantity = "prices"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+
+[[outputs]]
+quantity = "capacity"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
+[carbon_budget_control]
+budget = []
+
+[global_input_files]
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
+
+[sectors.residential]
+type = 'default'
+priority = 1
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
+[[sectors.residential.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.power]
+type = 'default'
+priority = 2
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.power.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.gas]
+type = 'default'
+priority = 3
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.gas.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.residential_presets]
+type = 'presets'
+priority = 0
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
new file mode 100644
index 00000000..13701454
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
@@ -0,0 +1,5 @@
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
+Agent3,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
+Agent4,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommIn.csv
new file mode 100644
index 00000000..60af1f4a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommIn.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
new file mode 100644
index 00000000..97520cdf
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/ExistingCapacity.csv
new file mode 100644
index 00000000..6862d5bb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/ExistingCapacity.csv
@@ -0,0 +1,2 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
new file mode 100644
index 00000000..05f7c836
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv
new file mode 100644
index 00000000..7fe44c8a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommIn.csv
@@ -0,0 +1,8 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1,0
+windturbine,R1,2040,fixed,0,0,0,0,1,0
+solarPV,R1,2020,fixed,0,0,0,0,0,1
+solarPV,R1,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
new file mode 100644
index 00000000..0960c997
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
@@ -0,0 +1,8 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
+windturbine,R1,2020,fixed,1,0,0,0,0,0
+windturbine,R1,2040,fixed,1,0,0,0,0,0
+solarPV,R1,2020,fixed,1,0,0,0,0,0
+solarPV,R1,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv
new file mode 100644
index 00000000..56b7b1fc
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/ExistingCapacity.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
+windturbine,R1,PJ/y,0,0,0,0,0,0,0
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
new file mode 100644
index 00000000..d54a909f
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
@@ -0,0 +1,8 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv
new file mode 100644
index 00000000..82245400
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2020Consumption.csv
@@ -0,0 +1,7 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv
new file mode 100644
index 00000000..16a138cf
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/preset/Residential2050Consumption.csv
@@ -0,0 +1,7 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommIn.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommIn.csv
new file mode 100644
index 00000000..f72ef315
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommIn.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,1.16,0,0,0
+heatpump,R1,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
new file mode 100644
index 00000000..f32c59a0
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,0,1,64.71,0
+heatpump,R1,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/ExistingCapacity.csv
new file mode 100644
index 00000000..f1520a30
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/ExistingCapacity.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasboiler,R1,PJ/y,10,5,0,0,0,0,0
+heatpump,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
new file mode 100644
index 00000000..e1a43e99
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv
new file mode 100644
index 00000000..d1ee882b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,4 @@
+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-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d42ba410
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+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-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..c80c1939
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,23.20780000000
+1,2040,R1,gassupply1,2030,23.20780000000
+1,2045,R1,gassupply1,2030,23.20780000000
+1,2050,R1,gassupply1,2030,23.20780000000
+1,2069,R1,gassupply1,2030,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..f8fd7fdc
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,23.20780000000
+1,2040,R1,gassupply1,2030,23.20780000000
+1,2045,R1,gassupply1,2030,23.20780000000
+1,2050,R1,gassupply1,2030,23.20780000000
+1,2069,R1,gassupply1,2030,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
new file mode 100644
index 00000000..5635a4c6
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,23.20780000000
+1,2045,R1,gassupply1,2030,23.20780000000
+1,2050,R1,gassupply1,2030,23.20780000000
+1,2069,R1,gassupply1,2030,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..0b1878a2
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,23.20780000000
+1,2050,R1,gassupply1,2030,23.20780000000
+1,2069,R1,gassupply1,2030,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..2015c16c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,23.20780000000
+1,2055,R1,gassupply1,2030,23.20780000000
+1,2069,R1,gassupply1,2030,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
new file mode 100644
index 00000000..6d7e2601
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -0,0 +1,65 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A1,power,retrofit,2025,5.17550000000
+gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
+windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,7.41230000000
+windturbine,R1,R1,A1,power,retrofit,2030,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2030,20.00000000000
+windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,14.40000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,7.41230000000
+windturbine,R1,R1,A1,power,retrofit,2035,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2035,20.00000000000
+windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,22.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,3.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,14.40000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,7.41230000000
+windturbine,R1,R1,A1,power,retrofit,2040,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2040,20.00000000000
+windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,22.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,3.72000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,20.28000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,7.41230000000
+solarPV,R1,R1,A1,power,retrofit,2045,0.99310000000
+windturbine,R1,R1,A1,power,retrofit,2045,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2045,20.00000000000
+solarPV,R1,R1,A2,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,22.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,3.72000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,20.28000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,7.41230000000
+solarPV,R1,R1,A1,power,retrofit,2050,0.99310000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.98730000000
+solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
+solarPV,R1,R1,A2,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,22.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
new file mode 100644
index 00000000..cd286e91
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.64170000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.18750000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68850000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.28130000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.64170000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.18750000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68850000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.28130000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.82890000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.56250000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.73530000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.37500000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72970000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09740000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72970000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09740000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.21160000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46690000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.60290000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.90760000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.60290000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.90760000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.83460000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.21440000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.50280000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.75780000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50280000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.75780000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.53720000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,1.01520000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16890000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.42500000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25330000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.64130000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16890000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.42500000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25330000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.64130000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50660000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.30590000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33770000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.86020000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16550000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.36520000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24830000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.55190000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16550000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.36520000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24830000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.55190000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49650000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.12850000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33100000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.74140000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
new file mode 100644
index 00000000..5a4a9175
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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,15.17550000000
+1,2030,R1,windturbine,2020,15.17550000000
+1,2035,R1,windturbine,2020,15.17550000000
+1,2040,R1,windturbine,2020,15.17550000000
+1,2045,R1,windturbine,2020,15.17550000000
+1,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..d45cd142
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,27.41230000000
+1,2035,R1,solarPV,2025,27.41230000000
+1,2040,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2025,27.41230000000
+1,2049,R1,solarPV,2025,27.41230000000
+1,2050,R1,solarPV,2025,27.41230000000
+1,2054,R1,solarPV,2025,27.41230000000
+2,2025,R1,windturbine,2020,15.17550000000
+2,2030,R1,windturbine,2020,15.17550000000
+2,2035,R1,windturbine,2020,15.17550000000
+2,2040,R1,windturbine,2020,15.17550000000
+2,2045,R1,windturbine,2020,15.17550000000
+2,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..b1be23b1
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+1,2030,R1,solarPV,2025,27.41230000000
+1,2035,R1,solarPV,2025,27.41230000000
+1,2040,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2025,27.41230000000
+1,2049,R1,solarPV,2025,27.41230000000
+1,2050,R1,solarPV,2025,27.41230000000
+1,2054,R1,solarPV,2025,27.41230000000
+2,2030,R1,windturbine,2020,15.17550000000
+2,2035,R1,windturbine,2020,15.17550000000
+2,2040,R1,windturbine,2020,15.17550000000
+2,2045,R1,windturbine,2020,15.17550000000
+2,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..e653f27a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,solarPV,2025,27.41230000000
+1,2040,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2025,27.41230000000
+1,2049,R1,solarPV,2025,27.41230000000
+1,2050,R1,solarPV,2025,27.41230000000
+1,2054,R1,solarPV,2025,27.41230000000
+2,2035,R1,windturbine,2020,15.17550000000
+2,2040,R1,windturbine,2020,15.17550000000
+2,2045,R1,windturbine,2020,15.17550000000
+2,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..c79dc3c1
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2025,27.41230000000
+1,2049,R1,solarPV,2025,27.41230000000
+1,2050,R1,solarPV,2025,27.41230000000
+1,2054,R1,solarPV,2025,27.41230000000
+2,2045,R1,solarPV,2040,10.99310000000
+2,2049,R1,solarPV,2040,10.99310000000
+2,2050,R1,solarPV,2040,10.99310000000
+2,2054,R1,solarPV,2040,10.99310000000
+2,2055,R1,solarPV,2040,10.99310000000
+2,2069,R1,solarPV,2040,10.99310000000
+3,2040,R1,windturbine,2020,15.17550000000
+3,2045,R1,windturbine,2020,15.17550000000
+3,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..280cff3b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -0,0 +1,19 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,solarPV,2025,27.41230000000
+0,2049,R1,solarPV,2025,27.41230000000
+0,2050,R1,solarPV,2025,27.41230000000
+0,2054,R1,solarPV,2025,27.41230000000
+1,2045,R1,solarPV,2040,10.99310000000
+1,2049,R1,solarPV,2040,10.99310000000
+1,2050,R1,solarPV,2040,10.99310000000
+1,2054,R1,solarPV,2040,10.99310000000
+1,2055,R1,solarPV,2040,10.99310000000
+1,2069,R1,solarPV,2040,10.99310000000
+2,2050,R1,solarPV,2045,26.98730000000
+2,2054,R1,solarPV,2045,26.98730000000
+2,2055,R1,solarPV,2045,26.98730000000
+2,2069,R1,solarPV,2045,26.98730000000
+2,2070,R1,solarPV,2045,26.98730000000
+2,2074,R1,solarPV,2045,26.98730000000
+3,2045,R1,windturbine,2020,15.17550000000
+3,2049,R1,windturbine,2020,15.17550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..7393f070
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -0,0 +1,19 @@
+asset,year,region,technology,installed,capacity
+0,2050,R1,solarPV,2025,27.41230000000
+0,2054,R1,solarPV,2025,27.41230000000
+1,2050,R1,solarPV,2040,10.99310000000
+1,2054,R1,solarPV,2040,10.99310000000
+1,2055,R1,solarPV,2040,10.99310000000
+1,2069,R1,solarPV,2040,10.99310000000
+2,2050,R1,solarPV,2045,26.98730000000
+2,2054,R1,solarPV,2045,26.98730000000
+2,2055,R1,solarPV,2045,26.98730000000
+2,2069,R1,solarPV,2045,26.98730000000
+2,2070,R1,solarPV,2045,26.98730000000
+2,2074,R1,solarPV,2045,26.98730000000
+3,2055,R1,solarPV,2050,17.07570000000
+3,2069,R1,solarPV,2050,17.07570000000
+3,2070,R1,solarPV,2050,17.07570000000
+3,2074,R1,solarPV,2050,17.07570000000
+3,2075,R1,solarPV,2050,17.07570000000
+3,2079,R1,solarPV,2050,17.07570000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..1d1cd64d
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,109.50000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..41f56aa7
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,109.50000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..e29079aa
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,9 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2030,3.60000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
+2,2035,R1,heatpump,2030,114.40000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..b03b48fc
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2030,3.60000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+2,2035,R1,heatpump,2030,114.40000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..9da5588c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+1,2045,R1,gasboiler,2040,3.72000000000
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
+3,2045,R1,heatpump,2040,120.28000000000
+3,2050,R1,heatpump,2040,120.28000000000
+3,2054,R1,heatpump,2040,120.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..95824543
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gasboiler,2040,3.72000000000
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+3,2045,R1,heatpump,2040,120.28000000000
+3,2050,R1,heatpump,2040,120.28000000000
+3,2054,R1,heatpump,2040,120.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..6ff2e689
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,9 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+2,2055,R1,gasboiler,2050,2.66400000000
+2,2064,R1,gasboiler,2050,2.66400000000
+4,2050,R1,heatpump,2040,120.28000000000
+4,2054,R1,heatpump,2040,120.28000000000
+5,2055,R1,heatpump,2050,74.33600000000
+5,2064,R1,heatpump,2050,74.33600000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
new file mode 100644
index 00000000..ed498021
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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.05820000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
+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.76770000000
+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.08730000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
+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.65150000000
+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.05820000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
+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.76770000000
+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.08730000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
+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.65150000000
+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.17470000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
+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,11.30310000000
+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.11640000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
+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,7.53540000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..6123143a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -0,0 +1,25 @@
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05820000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
+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.76770000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08730000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
+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.65150000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05820000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
+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.76770000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08730000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
+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.65150000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.17470000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
+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,11.30310000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.11640000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
+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,7.53540000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
new file mode 100644
index 00000000..f0ac673b
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -0,0 +1,25 @@
+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.06100000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
+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.09150000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
+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.06100000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
+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.09150000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
+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.18310000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
+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.12200000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..f7d82b38
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -0,0 +1,37 @@
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.06100000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.09150000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.06100000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.09150000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.18310000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.12200000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
new file mode 100644
index 00000000..cb472ae2
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -0,0 +1,37 @@
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..2bc6526c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,2.91000000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..0be0b395
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -0,0 +1,37 @@
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
+0,heat,2050,4,R1,all-year,all-week,night,heatpump,2040,2.91000000000
+0,heat,2055,2,R1,all-year,all-week,night,gasboiler,2050,0.10380000000
+0,heat,2055,5,R1,all-year,all-week,night,heatpump,2050,2.89620000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
+0,CO2f,2055,2,R1,all-year,all-week,night,gasboiler,2050,6.71640000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
+1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
+1,heat,2055,2,R1,all-year,all-week,morning,gasboiler,2050,0.15570000000
+1,heat,2055,5,R1,all-year,all-week,morning,heatpump,2050,4.34430000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
+1,CO2f,2055,2,R1,all-year,all-week,morning,gasboiler,2050,10.07460000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
+2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
+2,heat,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,0.10380000000
+2,heat,2055,5,R1,all-year,all-week,afternoon,heatpump,2050,2.89620000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
+2,CO2f,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,6.71640000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
+3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
+3,heat,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,0.15570000000
+3,heat,2055,5,R1,all-year,all-week,early-peak,heatpump,2050,4.34430000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
+3,CO2f,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,10.07460000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
+4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
+4,heat,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,0.31140000000
+4,heat,2055,5,R1,all-year,all-week,late-peak,heatpump,2050,8.68860000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
+4,CO2f,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,20.14920000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
+5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
+5,heat,2055,2,R1,all-year,all-week,evening,gasboiler,2050,0.20760000000
+5,heat,2055,5,R1,all-year,all-week,evening,heatpump,2050,5.79240000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
+5,CO2f,2055,2,R1,all-year,all-week,evening,gasboiler,2050,13.43280000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv
new file mode 100644
index 00000000..38c886d3
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearExport.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
+R1,Exports,2010,0,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv
new file mode 100644
index 00000000..9c9cc695
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/BaseYearImport.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ
+R1,Imports,2010,0,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv
new file mode 100644
index 00000000..9691db73
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/GlobalCommodities.csv
@@ -0,0 +1,7 @@
+Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
+Electricity,Energy,electricity,0.0,1,PJ
+Gas,Energy,gas,56.1,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv
new file mode 100644
index 00000000..6a013889
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/input/Projections.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
new file mode 100644
index 00000000..704d93ac
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -0,0 +1,148 @@
+# Global settings - most REQUIRED
+
+time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+regions = ["R1"]
+interest_rate = 0.1
+interpolation_mode = 'Active'
+log_level = 'info'
+excluded_commodities = ["wind", "solar"]
+# Convergence parameters
+equilibrium_variable = 'demand'
+maximum_iterations = 1
+tolerance = 0.1
+tolerance_unmet_demand = -0.1
+
+[[outputs]]
+quantity = "prices"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+
+[[outputs]]
+quantity = "capacity"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
+[carbon_budget_control]
+budget = []
+
+[global_input_files]
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
+
+[sectors.residential]
+type = 'default'
+priority = 1
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
+[[sectors.residential.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.power]
+type = 'default'
+priority = 2
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.power.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.gas]
+type = 'default'
+priority = 3
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.gas.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.residential_presets]
+type = 'presets'
+priority = 0
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
new file mode 100644
index 00000000..dd05673c
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
@@ -0,0 +1,5 @@
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
+Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,New
+Agent2,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
+Agent3,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,New
+Agent4,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,Retrofit
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommIn.csv
new file mode 100644
index 00000000..60af1f4a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommIn.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
new file mode 100644
index 00000000..97520cdf
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/ExistingCapacity.csv
new file mode 100644
index 00000000..6862d5bb
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/ExistingCapacity.csv
@@ -0,0 +1,2 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
new file mode 100644
index 00000000..05f7c836
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv
new file mode 100644
index 00000000..7fe44c8a
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommIn.csv
@@ -0,0 +1,8 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1,0
+windturbine,R1,2040,fixed,0,0,0,0,1,0
+solarPV,R1,2020,fixed,0,0,0,0,0,1
+solarPV,R1,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
new file mode 100644
index 00000000..0960c997
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
@@ -0,0 +1,8 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
+windturbine,R1,2020,fixed,1,0,0,0,0,0
+windturbine,R1,2040,fixed,1,0,0,0,0,0
+solarPV,R1,2020,fixed,1,0,0,0,0,0
+solarPV,R1,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv
new file mode 100644
index 00000000..56b7b1fc
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/ExistingCapacity.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
+windturbine,R1,PJ/y,0,0,0,0,0,0,0
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
new file mode 100644
index 00000000..d54a909f
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
@@ -0,0 +1,8 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv
new file mode 100644
index 00000000..82245400
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2020Consumption.csv
@@ -0,0 +1,7 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,1.0,0,0,0
+R1,gasboiler,2,0,0,1.5,0,0,0
+R1,gasboiler,3,0,0,1.0,0,0,0
+R1,gasboiler,4,0,0,1.5,0,0,0
+R1,gasboiler,5,0,0,3.0,0,0,0
+R1,gasboiler,6,0,0,2.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv
new file mode 100644
index 00000000..16a138cf
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/preset/Residential2050Consumption.csv
@@ -0,0 +1,7 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar
+R1,gasboiler,1,0,0,3.0,0,0,0
+R1,gasboiler,2,0,0,4.5,0,0,0
+R1,gasboiler,3,0,0,3.0,0,0,0
+R1,gasboiler,4,0,0,4.5,0,0,0
+R1,gasboiler,5,0,0,9.0,0,0,0
+R1,gasboiler,6,0,0,6.0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommIn.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommIn.csv
new file mode 100644
index 00000000..f72ef315
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommIn.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,1.16,0,0,0
+heatpump,R1,2020,fixed,0.4,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
new file mode 100644
index 00000000..f32c59a0
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,0,1,64.71,0
+heatpump,R1,2020,fixed,0,0,1,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/ExistingCapacity.csv
new file mode 100644
index 00000000..f1520a30
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/ExistingCapacity.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasboiler,R1,PJ/y,10,5,0,0,0,0,0
+heatpump,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
new file mode 100644
index 00000000..382dc9b9
--- /dev/null
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
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
new file mode 100644
index 00000000..1d028468
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,7 @@
+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/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..61de5105
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+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
new file mode 100644
index 00000000..6eec02b8
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2035,R2,gassupply1,2030,5.28440000000
+3,2040,R2,gassupply1,2030,5.28440000000
+3,2045,R2,gassupply1,2030,5.28440000000
+3,2050,R2,gassupply1,2030,5.28440000000
+3,2069,R2,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..b8a0488c
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,5.28440000000
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
+3,2035,R2,gassupply1,2030,5.28440000000
+3,2040,R2,gassupply1,2030,5.28440000000
+3,2045,R2,gassupply1,2030,5.28440000000
+3,2050,R2,gassupply1,2030,5.28440000000
+3,2069,R2,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..e2f5d86b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,9 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,5.28440000000
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
+3,2040,R2,gassupply1,2030,5.28440000000
+3,2045,R2,gassupply1,2030,5.28440000000
+3,2050,R2,gassupply1,2030,5.28440000000
+3,2069,R2,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..ffdd5451
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,5.28440000000
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
+3,2045,R2,gassupply1,2030,5.28440000000
+3,2050,R2,gassupply1,2030,5.28440000000
+3,2069,R2,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..073f8874
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,5.28440000000
+1,2055,R1,gassupply1,2030,5.28440000000
+1,2069,R1,gassupply1,2030,5.28440000000
+3,2050,R2,gassupply1,2030,5.28440000000
+3,2055,R2,gassupply1,2030,5.28440000000
+3,2069,R2,gassupply1,2030,5.28440000000
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
new file mode 100644
index 00000000..a372abac
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
@@ -0,0 +1,100 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
+solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,9.15000000000
+windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,9.15000000000
+solarPV,R2,R2,A1,power,retrofit,2035,6.00000000000
+windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,5.28440000000
+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
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,9.15000000000
+solarPV,R2,R2,A1,power,retrofit,2040,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,9.19000000000
+windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,5.28440000000
+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
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
+heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.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
+solarPV,R2,R2,A1,power,retrofit,2045,9.15000000000
+solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2045,9.19000000000
+solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
+windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,5.28440000000
+heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.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
+solarPV,R2,R2,A1,power,retrofit,2050,9.15000000000
+solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,9.19000000000
+solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
+solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
+windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,5.28440000000
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
new file mode 100644
index 00000000..e867244a
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
@@ -0,0 +1,337 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.21470000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68190000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.68190000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R2,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68190000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.68190000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81580000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.81580000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.72660000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.72660000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.14400000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.14400000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.34640000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.19680000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.19680000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.52010000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.14400000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,14.14400000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R2,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.19680000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.19680000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.52010000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.35510000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.35510000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.04300000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,65.04300000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.24960000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.24960000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69410000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.69410000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.34900000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.34900000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.62730000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.40810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.40810000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.84190000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.34900000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,11.34900000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R2,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,51.62730000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.40810000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.40810000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.84190000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.58540000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.58540000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.48970000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.48970000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.46720000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.46720000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.05720000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,52.05720000000,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,9.11210000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,9.11210000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,41.40520000000,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,9.17580000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,9.17580000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.62920000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,41.62920000000,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,9.11210000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,9.11210000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R2,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,41.40520000000,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,9.17580000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.17580000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.62920000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.62920000000,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,9.36700000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.36700000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.30740000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,42.30740000000,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,9.23960000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,9.23960000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.85430000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,41.85430000000,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,7.32190000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,7.32190000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,33.21060000000,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,7.38900000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,7.38900000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,33.43380000000,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,7.32190000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,7.32190000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R2,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,33.21060000000,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,7.38900000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,7.38900000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.43380000000,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,7.59030000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.59030000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.11130000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,34.11130000000,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,7.45610000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,7.45610000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.65830000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,33.65830000000,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.15170000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.15170000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.31690000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.31690000000,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.22750000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.22750000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.47940000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.47940000000,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.15170000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.15170000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R2,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.31690000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.31690000000,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.22750000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.22750000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.47940000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.47940000000,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,0.45500000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.45500000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98300000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.98300000000,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,0.30330000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.30330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.64460000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.64460000000,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
new file mode 100644
index 00000000..7cbcccfb
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
@@ -0,0 +1,23 @@
+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/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..9e44d4d6
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -0,0 +1,35 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,6.75000000000
+2,2030,solarPV,R1,2020,6.75000000000
+2,2035,solarPV,R1,2020,6.75000000000
+2,2040,solarPV,R1,2020,6.75000000000
+2,2045,solarPV,R1,2020,6.75000000000
+2,2049,solarPV,R1,2020,6.75000000000
+3,2030,solarPV,R1,2025,9.15000000000
+3,2035,solarPV,R1,2025,9.15000000000
+3,2040,solarPV,R1,2025,9.15000000000
+3,2045,solarPV,R1,2025,9.15000000000
+3,2049,solarPV,R1,2025,9.15000000000
+3,2050,solarPV,R1,2025,9.15000000000
+3,2054,solarPV,R1,2025,9.15000000000
+4,2030,solarPV,R2,2025,9.15000000000
+4,2035,solarPV,R2,2025,9.15000000000
+4,2040,solarPV,R2,2025,9.15000000000
+4,2045,solarPV,R2,2025,9.15000000000
+4,2049,solarPV,R2,2025,9.15000000000
+4,2050,solarPV,R2,2025,9.15000000000
+4,2054,solarPV,R2,2025,9.15000000000
+5,2025,windturbine,R1,2020,10.00000000000
+5,2030,windturbine,R1,2020,10.00000000000
+5,2035,windturbine,R1,2020,10.00000000000
+5,2040,windturbine,R1,2020,10.00000000000
+5,2045,windturbine,R1,2020,10.00000000000
+5,2049,windturbine,R1,2020,10.00000000000
+6,2025,windturbine,R2,2020,16.75000000000
+6,2030,windturbine,R2,2020,16.75000000000
+6,2035,windturbine,R2,2020,16.75000000000
+6,2040,windturbine,R2,2020,16.75000000000
+6,2045,windturbine,R2,2020,16.75000000000
+6,2049,windturbine,R2,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
new file mode 100644
index 00000000..6a77ba27
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
@@ -0,0 +1,46 @@
+asset,year,region,technology,installed,capacity
+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,2030,R1,solarPV,2025,9.15000000000
+2,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2030,R1,windturbine,2020,10.00000000000
+4,2035,R1,windturbine,2020,10.00000000000
+4,2040,R1,windturbine,2020,10.00000000000
+4,2045,R1,windturbine,2020,10.00000000000
+4,2049,R1,windturbine,2020,10.00000000000
+6,2030,R2,solarPV,2025,9.15000000000
+6,2035,R2,solarPV,2025,9.15000000000
+6,2040,R2,solarPV,2025,9.15000000000
+6,2045,R2,solarPV,2025,9.15000000000
+6,2049,R2,solarPV,2025,9.15000000000
+6,2050,R2,solarPV,2025,9.15000000000
+6,2054,R2,solarPV,2025,9.15000000000
+7,2035,R2,solarPV,2030,6.00000000000
+7,2040,R2,solarPV,2030,6.00000000000
+7,2045,R2,solarPV,2030,6.00000000000
+7,2049,R2,solarPV,2030,6.00000000000
+7,2050,R2,solarPV,2030,6.00000000000
+7,2054,R2,solarPV,2030,6.00000000000
+7,2055,R2,solarPV,2030,6.00000000000
+7,2059,R2,solarPV,2030,6.00000000000
+8,2030,R2,windturbine,2020,16.75000000000
+8,2035,R2,windturbine,2020,16.75000000000
+8,2040,R2,windturbine,2020,16.75000000000
+8,2045,R2,windturbine,2020,16.75000000000
+8,2049,R2,windturbine,2020,16.75000000000
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
new file mode 100644
index 00000000..66e4f6ec
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
@@ -0,0 +1,59 @@
+asset,year,region,technology,installed,capacity
+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,2035,R1,solarPV,2025,9.15000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2040,R1,solarPV,2035,9.19000000000
+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,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,2035,R2,solarPV,2025,9.15000000000
+7,2040,R2,solarPV,2025,9.15000000000
+7,2045,R2,solarPV,2025,9.15000000000
+7,2049,R2,solarPV,2025,9.15000000000
+7,2050,R2,solarPV,2025,9.15000000000
+7,2054,R2,solarPV,2025,9.15000000000
+8,2035,R2,solarPV,2030,6.00000000000
+8,2040,R2,solarPV,2030,6.00000000000
+8,2045,R2,solarPV,2030,6.00000000000
+8,2049,R2,solarPV,2030,6.00000000000
+8,2050,R2,solarPV,2030,6.00000000000
+8,2054,R2,solarPV,2030,6.00000000000
+8,2055,R2,solarPV,2030,6.00000000000
+8,2059,R2,solarPV,2030,6.00000000000
+9,2040,R2,solarPV,2035,9.19000000000
+9,2045,R2,solarPV,2035,9.19000000000
+9,2049,R2,solarPV,2035,9.19000000000
+9,2050,R2,solarPV,2035,9.19000000000
+9,2054,R2,solarPV,2035,9.19000000000
+9,2055,R2,solarPV,2035,9.19000000000
+9,2059,R2,solarPV,2035,9.19000000000
+9,2060,R2,solarPV,2035,9.19000000000
+9,2064,R2,solarPV,2035,9.19000000000
+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
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
new file mode 100644
index 00000000..9cd94dc7
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
@@ -0,0 +1,72 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2020,6.75000000000
+1,2045,R1,solarPV,2020,6.75000000000
+1,2049,R1,solarPV,2020,6.75000000000
+2,2040,R1,solarPV,2025,9.15000000000
+2,2045,R1,solarPV,2025,9.15000000000
+2,2049,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2025,9.15000000000
+2,2054,R1,solarPV,2025,9.15000000000
+3,2040,R1,solarPV,2030,6.00000000000
+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,2040,R1,solarPV,2035,9.19000000000
+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,2040,R1,windturbine,2020,10.00000000000
+6,2045,R1,windturbine,2020,10.00000000000
+6,2049,R1,windturbine,2020,10.00000000000
+8,2040,R2,solarPV,2025,9.15000000000
+8,2045,R2,solarPV,2025,9.15000000000
+8,2049,R2,solarPV,2025,9.15000000000
+8,2050,R2,solarPV,2025,9.15000000000
+8,2054,R2,solarPV,2025,9.15000000000
+9,2040,R2,solarPV,2030,6.00000000000
+9,2045,R2,solarPV,2030,6.00000000000
+9,2049,R2,solarPV,2030,6.00000000000
+9,2050,R2,solarPV,2030,6.00000000000
+9,2054,R2,solarPV,2030,6.00000000000
+9,2055,R2,solarPV,2030,6.00000000000
+9,2059,R2,solarPV,2030,6.00000000000
+10,2040,R2,solarPV,2035,9.19000000000
+10,2045,R2,solarPV,2035,9.19000000000
+10,2049,R2,solarPV,2035,9.19000000000
+10,2050,R2,solarPV,2035,9.19000000000
+10,2054,R2,solarPV,2035,9.19000000000
+10,2055,R2,solarPV,2035,9.19000000000
+10,2059,R2,solarPV,2035,9.19000000000
+10,2060,R2,solarPV,2035,9.19000000000
+10,2064,R2,solarPV,2035,9.19000000000
+11,2045,R2,solarPV,2040,6.00000000000
+11,2049,R2,solarPV,2040,6.00000000000
+11,2050,R2,solarPV,2040,6.00000000000
+11,2054,R2,solarPV,2040,6.00000000000
+11,2055,R2,solarPV,2040,6.00000000000
+11,2059,R2,solarPV,2040,6.00000000000
+11,2060,R2,solarPV,2040,6.00000000000
+11,2064,R2,solarPV,2040,6.00000000000
+11,2065,R2,solarPV,2040,6.00000000000
+11,2069,R2,solarPV,2040,6.00000000000
+12,2040,R2,windturbine,2020,16.75000000000
+12,2045,R2,windturbine,2020,16.75000000000
+12,2049,R2,windturbine,2020,16.75000000000
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
new file mode 100644
index 00000000..d67966d3
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
@@ -0,0 +1,103 @@
+asset,year,technology,region,installed,capacity
+0,2045,solarPV,R1,2020,6.75000000000
+0,2049,solarPV,R1,2020,6.75000000000
+1,2045,solarPV,R1,2025,9.15000000000
+1,2049,solarPV,R1,2025,9.15000000000
+1,2050,solarPV,R1,2025,9.15000000000
+1,2054,solarPV,R1,2025,9.15000000000
+2,2045,solarPV,R1,2030,6.00000000000
+2,2049,solarPV,R1,2030,6.00000000000
+2,2050,solarPV,R1,2030,6.00000000000
+2,2054,solarPV,R1,2030,6.00000000000
+2,2055,solarPV,R1,2030,6.00000000000
+2,2059,solarPV,R1,2030,6.00000000000
+3,2045,solarPV,R1,2035,9.19000000000
+3,2049,solarPV,R1,2035,9.19000000000
+3,2050,solarPV,R1,2035,9.19000000000
+3,2054,solarPV,R1,2035,9.19000000000
+3,2055,solarPV,R1,2035,9.19000000000
+3,2059,solarPV,R1,2035,9.19000000000
+3,2060,solarPV,R1,2035,9.19000000000
+3,2064,solarPV,R1,2035,9.19000000000
+4,2045,solarPV,R1,2040,6.00000000000
+4,2049,solarPV,R1,2040,6.00000000000
+4,2050,solarPV,R1,2040,6.00000000000
+4,2054,solarPV,R1,2040,6.00000000000
+4,2055,solarPV,R1,2040,6.00000000000
+4,2059,solarPV,R1,2040,6.00000000000
+4,2060,solarPV,R1,2040,6.00000000000
+4,2064,solarPV,R1,2040,6.00000000000
+4,2065,solarPV,R1,2040,6.00000000000
+4,2069,solarPV,R1,2040,6.00000000000
+5,2050,solarPV,R1,2045,16.91000000000
+5,2054,solarPV,R1,2045,16.91000000000
+5,2055,solarPV,R1,2045,16.91000000000
+5,2059,solarPV,R1,2045,16.91000000000
+5,2060,solarPV,R1,2045,16.91000000000
+5,2064,solarPV,R1,2045,16.91000000000
+5,2065,solarPV,R1,2045,16.91000000000
+5,2069,solarPV,R1,2045,16.91000000000
+5,2070,solarPV,R1,2045,16.91000000000
+5,2074,solarPV,R1,2045,16.91000000000
+6,2045,solarPV,R2,2025,9.15000000000
+6,2049,solarPV,R2,2025,9.15000000000
+6,2050,solarPV,R2,2025,9.15000000000
+6,2054,solarPV,R2,2025,9.15000000000
+7,2045,solarPV,R2,2030,6.00000000000
+7,2049,solarPV,R2,2030,6.00000000000
+7,2050,solarPV,R2,2030,6.00000000000
+7,2054,solarPV,R2,2030,6.00000000000
+7,2055,solarPV,R2,2030,6.00000000000
+7,2059,solarPV,R2,2030,6.00000000000
+8,2045,solarPV,R2,2035,9.19000000000
+8,2049,solarPV,R2,2035,9.19000000000
+8,2050,solarPV,R2,2035,9.19000000000
+8,2054,solarPV,R2,2035,9.19000000000
+8,2055,solarPV,R2,2035,9.19000000000
+8,2059,solarPV,R2,2035,9.19000000000
+8,2060,solarPV,R2,2035,9.19000000000
+8,2064,solarPV,R2,2035,9.19000000000
+9,2045,solarPV,R2,2040,6.00000000000
+9,2049,solarPV,R2,2040,6.00000000000
+9,2050,solarPV,R2,2040,6.00000000000
+9,2054,solarPV,R2,2040,6.00000000000
+9,2055,solarPV,R2,2040,6.00000000000
+9,2059,solarPV,R2,2040,6.00000000000
+9,2060,solarPV,R2,2040,6.00000000000
+9,2064,solarPV,R2,2040,6.00000000000
+9,2065,solarPV,R2,2040,6.00000000000
+9,2069,solarPV,R2,2040,6.00000000000
+10,2050,solarPV,R2,2045,16.91000000000
+10,2054,solarPV,R2,2045,16.91000000000
+10,2055,solarPV,R2,2045,16.91000000000
+10,2059,solarPV,R2,2045,16.91000000000
+10,2060,solarPV,R2,2045,16.91000000000
+10,2064,solarPV,R2,2045,16.91000000000
+10,2065,solarPV,R2,2045,16.91000000000
+10,2069,solarPV,R2,2045,16.91000000000
+10,2070,solarPV,R2,2045,16.91000000000
+10,2074,solarPV,R2,2045,16.91000000000
+11,2045,windturbine,R1,2020,10.00000000000
+11,2049,windturbine,R1,2020,10.00000000000
+12,2050,windturbine,R1,2045,6.75000000000
+12,2054,windturbine,R1,2045,6.75000000000
+12,2055,windturbine,R1,2045,6.75000000000
+12,2059,windturbine,R1,2045,6.75000000000
+12,2060,windturbine,R1,2045,6.75000000000
+12,2064,windturbine,R1,2045,6.75000000000
+12,2065,windturbine,R1,2045,6.75000000000
+12,2069,windturbine,R1,2045,6.75000000000
+12,2070,windturbine,R1,2045,6.75000000000
+12,2074,windturbine,R1,2045,6.75000000000
+13,2045,windturbine,R2,2020,16.75000000000
+13,2049,windturbine,R2,2020,16.75000000000
+14,2050,windturbine,R2,2045,6.75000000000
+14,2054,windturbine,R2,2045,6.75000000000
+14,2055,windturbine,R2,2045,6.75000000000
+14,2059,windturbine,R2,2045,6.75000000000
+14,2060,windturbine,R2,2045,6.75000000000
+14,2064,windturbine,R2,2045,6.75000000000
+14,2065,windturbine,R2,2045,6.75000000000
+14,2069,windturbine,R2,2045,6.75000000000
+14,2070,windturbine,R2,2045,6.75000000000
+14,2074,windturbine,R2,2045,6.75000000000
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
new file mode 100644
index 00000000..2310d125
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
@@ -0,0 +1,101 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,solarPV,2025,9.15000000000
+1,2054,R1,solarPV,2025,9.15000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2054,R1,solarPV,2030,6.00000000000
+2,2055,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2050,R1,solarPV,2035,9.19000000000
+3,2054,R1,solarPV,2035,9.19000000000
+3,2055,R1,solarPV,2035,9.19000000000
+3,2059,R1,solarPV,2035,9.19000000000
+3,2060,R1,solarPV,2035,9.19000000000
+3,2064,R1,solarPV,2035,9.19000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
+5,2070,R1,solarPV,2045,16.91000000000
+5,2074,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2050,9.15000000000
+6,2059,R1,solarPV,2050,9.15000000000
+6,2060,R1,solarPV,2050,9.15000000000
+6,2064,R1,solarPV,2050,9.15000000000
+6,2065,R1,solarPV,2050,9.15000000000
+6,2069,R1,solarPV,2050,9.15000000000
+6,2070,R1,solarPV,2050,9.15000000000
+6,2074,R1,solarPV,2050,9.15000000000
+6,2075,R1,solarPV,2050,9.15000000000
+6,2079,R1,solarPV,2050,9.15000000000
+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
+9,2050,R2,solarPV,2025,9.15000000000
+9,2054,R2,solarPV,2025,9.15000000000
+10,2050,R2,solarPV,2030,6.00000000000
+10,2054,R2,solarPV,2030,6.00000000000
+10,2055,R2,solarPV,2030,6.00000000000
+10,2059,R2,solarPV,2030,6.00000000000
+11,2050,R2,solarPV,2035,9.19000000000
+11,2054,R2,solarPV,2035,9.19000000000
+11,2055,R2,solarPV,2035,9.19000000000
+11,2059,R2,solarPV,2035,9.19000000000
+11,2060,R2,solarPV,2035,9.19000000000
+11,2064,R2,solarPV,2035,9.19000000000
+12,2050,R2,solarPV,2040,6.00000000000
+12,2054,R2,solarPV,2040,6.00000000000
+12,2055,R2,solarPV,2040,6.00000000000
+12,2059,R2,solarPV,2040,6.00000000000
+12,2060,R2,solarPV,2040,6.00000000000
+12,2064,R2,solarPV,2040,6.00000000000
+12,2065,R2,solarPV,2040,6.00000000000
+12,2069,R2,solarPV,2040,6.00000000000
+13,2050,R2,solarPV,2045,16.91000000000
+13,2054,R2,solarPV,2045,16.91000000000
+13,2055,R2,solarPV,2045,16.91000000000
+13,2059,R2,solarPV,2045,16.91000000000
+13,2060,R2,solarPV,2045,16.91000000000
+13,2064,R2,solarPV,2045,16.91000000000
+13,2065,R2,solarPV,2045,16.91000000000
+13,2069,R2,solarPV,2045,16.91000000000
+13,2070,R2,solarPV,2045,16.91000000000
+13,2074,R2,solarPV,2045,16.91000000000
+14,2055,R2,solarPV,2050,9.15000000000
+14,2059,R2,solarPV,2050,9.15000000000
+14,2060,R2,solarPV,2050,9.15000000000
+14,2064,R2,solarPV,2050,9.15000000000
+14,2065,R2,solarPV,2050,9.15000000000
+14,2069,R2,solarPV,2050,9.15000000000
+14,2070,R2,solarPV,2050,9.15000000000
+14,2074,R2,solarPV,2050,9.15000000000
+14,2075,R2,solarPV,2050,9.15000000000
+14,2079,R2,solarPV,2050,9.15000000000
+16,2050,R2,windturbine,2045,6.75000000000
+16,2054,R2,windturbine,2045,6.75000000000
+16,2055,R2,windturbine,2045,6.75000000000
+16,2059,R2,windturbine,2045,6.75000000000
+16,2060,R2,windturbine,2045,6.75000000000
+16,2064,R2,windturbine,2045,6.75000000000
+16,2065,R2,windturbine,2045,6.75000000000
+16,2069,R2,windturbine,2045,6.75000000000
+16,2070,R2,windturbine,2045,6.75000000000
+16,2074,R2,windturbine,2045,6.75000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..06bad92b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,11 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2025,heatpump,R1,2020,19.00000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2025,heatpump,R2,2020,19.00000000000
+3,2030,heatpump,R2,2020,19.00000000000
+3,2034,heatpump,R2,2020,19.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..34d42206
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,4.10000000000
+1,2034,gasboiler,R1,2025,4.10000000000
+1,2035,gasboiler,R1,2025,4.10000000000
+1,2039,gasboiler,R1,2025,4.10000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,4.10000000000
+3,2034,gasboiler,R2,2025,4.10000000000
+3,2035,gasboiler,R2,2025,4.10000000000
+3,2039,gasboiler,R2,2025,4.10000000000
+4,2025,heatpump,R1,2020,19.00000000000
+4,2030,heatpump,R1,2020,19.00000000000
+4,2034,heatpump,R1,2020,19.00000000000
+5,2030,heatpump,R1,2025,6.90000000000
+5,2034,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2025,6.90000000000
+5,2039,heatpump,R1,2025,6.90000000000
+6,2025,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2020,19.00000000000
+6,2034,heatpump,R2,2020,19.00000000000
+7,2030,heatpump,R2,2025,6.90000000000
+7,2034,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..559a80d8
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,4.10000000000
+0,2034,gasboiler,R1,2025,4.10000000000
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2030,gasboiler,R2,2025,4.10000000000
+1,2034,gasboiler,R2,2025,4.10000000000
+1,2035,gasboiler,R2,2025,4.10000000000
+1,2039,gasboiler,R2,2025,4.10000000000
+2,2030,heatpump,R1,2020,19.00000000000
+2,2034,heatpump,R1,2020,19.00000000000
+3,2030,heatpump,R1,2025,6.90000000000
+3,2034,heatpump,R1,2025,6.90000000000
+3,2035,heatpump,R1,2025,6.90000000000
+3,2039,heatpump,R1,2025,6.90000000000
+4,2035,heatpump,R1,2030,25.00000000000
+4,2039,heatpump,R1,2030,25.00000000000
+4,2040,heatpump,R1,2030,25.00000000000
+4,2044,heatpump,R1,2030,25.00000000000
+5,2030,heatpump,R2,2020,19.00000000000
+5,2034,heatpump,R2,2020,19.00000000000
+6,2030,heatpump,R2,2025,6.90000000000
+6,2034,heatpump,R2,2025,6.90000000000
+6,2035,heatpump,R2,2025,6.90000000000
+6,2039,heatpump,R2,2025,6.90000000000
+7,2035,heatpump,R2,2030,25.00000000000
+7,2039,heatpump,R2,2030,25.00000000000
+7,2040,heatpump,R2,2030,25.00000000000
+7,2044,heatpump,R2,2030,25.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..fa9e8bca
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,4.10000000000
+0,2039,gasboiler,R1,2025,4.10000000000
+1,2040,gasboiler,R1,2035,0.91000000000
+1,2044,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R1,2035,0.91000000000
+1,2049,gasboiler,R1,2035,0.91000000000
+2,2035,gasboiler,R2,2025,4.10000000000
+2,2039,gasboiler,R2,2025,4.10000000000
+3,2040,gasboiler,R2,2035,0.91000000000
+3,2044,gasboiler,R2,2035,0.91000000000
+3,2045,gasboiler,R2,2035,0.91000000000
+3,2049,gasboiler,R2,2035,0.91000000000
+4,2035,heatpump,R1,2025,6.90000000000
+4,2039,heatpump,R1,2025,6.90000000000
+5,2035,heatpump,R1,2030,25.00000000000
+5,2039,heatpump,R1,2030,25.00000000000
+5,2040,heatpump,R1,2030,25.00000000000
+5,2044,heatpump,R1,2030,25.00000000000
+6,2040,heatpump,R1,2035,16.09000000000
+6,2044,heatpump,R1,2035,16.09000000000
+6,2045,heatpump,R1,2035,16.09000000000
+6,2049,heatpump,R1,2035,16.09000000000
+7,2035,heatpump,R2,2025,6.90000000000
+7,2039,heatpump,R2,2025,6.90000000000
+8,2035,heatpump,R2,2030,25.00000000000
+8,2039,heatpump,R2,2030,25.00000000000
+8,2040,heatpump,R2,2030,25.00000000000
+8,2044,heatpump,R2,2030,25.00000000000
+9,2040,heatpump,R2,2035,16.09000000000
+9,2044,heatpump,R2,2035,16.09000000000
+9,2045,heatpump,R2,2035,16.09000000000
+9,2049,heatpump,R2,2035,16.09000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..eb1a544b
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2040,gasboiler,R1,2035,0.91000000000
+0,2044,gasboiler,R1,2035,0.91000000000
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2040,gasboiler,R2,2035,0.91000000000
+1,2044,gasboiler,R2,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2040,heatpump,R1,2030,25.00000000000
+2,2044,heatpump,R1,2030,25.00000000000
+3,2040,heatpump,R1,2035,16.09000000000
+3,2044,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2035,16.09000000000
+3,2049,heatpump,R1,2035,16.09000000000
+4,2045,heatpump,R1,2040,31.00000000000
+4,2049,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2040,31.00000000000
+4,2054,heatpump,R1,2040,31.00000000000
+5,2040,heatpump,R2,2030,25.00000000000
+5,2044,heatpump,R2,2030,25.00000000000
+6,2040,heatpump,R2,2035,16.09000000000
+6,2044,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2035,16.09000000000
+6,2049,heatpump,R2,2035,16.09000000000
+7,2045,heatpump,R2,2040,31.00000000000
+7,2049,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2040,31.00000000000
+7,2054,heatpump,R2,2040,31.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..0b5fe3de
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.91000000000
+0,2049,gasboiler,R1,2035,0.91000000000
+1,2045,gasboiler,R2,2035,0.91000000000
+1,2049,gasboiler,R2,2035,0.91000000000
+2,2045,heatpump,R1,2035,16.09000000000
+2,2049,heatpump,R1,2035,16.09000000000
+3,2045,heatpump,R1,2040,31.00000000000
+3,2049,heatpump,R1,2040,31.00000000000
+3,2050,heatpump,R1,2040,31.00000000000
+3,2054,heatpump,R1,2040,31.00000000000
+4,2050,heatpump,R1,2045,23.00000000000
+4,2054,heatpump,R1,2045,23.00000000000
+4,2055,heatpump,R1,2045,23.00000000000
+4,2059,heatpump,R1,2045,23.00000000000
+5,2045,heatpump,R2,2035,16.09000000000
+5,2049,heatpump,R2,2035,16.09000000000
+6,2045,heatpump,R2,2040,31.00000000000
+6,2049,heatpump,R2,2040,31.00000000000
+6,2050,heatpump,R2,2040,31.00000000000
+6,2054,heatpump,R2,2040,31.00000000000
+7,2050,heatpump,R2,2045,23.00000000000
+7,2054,heatpump,R2,2045,23.00000000000
+7,2055,heatpump,R2,2045,23.00000000000
+7,2059,heatpump,R2,2045,23.00000000000
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
new file mode 100644
index 00000000..2910cd50
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 00000000..84bd25f2
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
@@ -0,0 +1,121 @@
+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
new file mode 100644
index 00000000..266a52a2
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
@@ -0,0 +1,169 @@
+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
new file mode 100644
index 00000000..993fd437
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
@@ -0,0 +1,193 @@
+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
new file mode 100644
index 00000000..953fbe67
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
@@ -0,0 +1,193 @@
+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
new file mode 100644
index 00000000..af3cd108
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
@@ -0,0 +1,193 @@
+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
new file mode 100644
index 00000000..9d3de5da
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
@@ -0,0 +1,145 @@
+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
new file mode 100644
index 00000000..95e99a1c
--- /dev/null
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
@@ -0,0 +1,97 @@
+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
new file mode 100644
index 00000000..1d028468
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000..61de5105
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+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/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..f5023ba4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,4.97510000000
+1,2040,R1,gassupply1,2030,4.97510000000
+1,2045,R1,gassupply1,2030,4.97510000000
+1,2050,R1,gassupply1,2030,4.97510000000
+1,2069,R1,gassupply1,2030,4.97510000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2035,R2,gassupply1,2030,4.97510000000
+3,2040,R2,gassupply1,2030,4.97510000000
+3,2045,R2,gassupply1,2030,4.97510000000
+3,2050,R2,gassupply1,2030,4.97510000000
+3,2069,R2,gassupply1,2030,4.97510000000
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
new file mode 100644
index 00000000..88c78592
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,4.97510000000
+1,2040,R1,gassupply1,2030,4.97510000000
+1,2045,R1,gassupply1,2030,4.97510000000
+1,2050,R1,gassupply1,2030,4.97510000000
+1,2069,R1,gassupply1,2030,4.97510000000
+3,2035,R2,gassupply1,2030,4.97510000000
+3,2040,R2,gassupply1,2030,4.97510000000
+3,2045,R2,gassupply1,2030,4.97510000000
+3,2050,R2,gassupply1,2030,4.97510000000
+3,2069,R2,gassupply1,2030,4.97510000000
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
new file mode 100644
index 00000000..c1e08854
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,9 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,4.97510000000
+1,2045,R1,gassupply1,2030,4.97510000000
+1,2050,R1,gassupply1,2030,4.97510000000
+1,2069,R1,gassupply1,2030,4.97510000000
+3,2040,R2,gassupply1,2030,4.97510000000
+3,2045,R2,gassupply1,2030,4.97510000000
+3,2050,R2,gassupply1,2030,4.97510000000
+3,2069,R2,gassupply1,2030,4.97510000000
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
new file mode 100644
index 00000000..188cb244
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,4.97510000000
+1,2050,R1,gassupply1,2030,4.97510000000
+1,2069,R1,gassupply1,2030,4.97510000000
+3,2045,R2,gassupply1,2030,4.97510000000
+3,2050,R2,gassupply1,2030,4.97510000000
+3,2069,R2,gassupply1,2030,4.97510000000
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
new file mode 100644
index 00000000..2f46218c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,7 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,4.97510000000
+1,2055,R1,gassupply1,2030,4.97510000000
+1,2069,R1,gassupply1,2030,4.97510000000
+3,2050,R2,gassupply1,2030,4.97510000000
+3,2055,R2,gassupply1,2030,4.97510000000
+3,2069,R2,gassupply1,2030,4.97510000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
new file mode 100644
index 00000000..b913b4c0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -0,0 +1,100 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.40000000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.40000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,5.15000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.86000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.74000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,3.86000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.74000000000
+solarPV,R1,R1,A1,power,retrofit,2030,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2030,8.99000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,8.99000000000
+windturbine,R2,R2,A1,power,retrofit,2030,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.86000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.74000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,3.86000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.74000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2035,8.99000000000
+solarPV,R1,R1,A1,power,retrofit,2035,5.60000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2035,8.99000000000
+solarPV,R2,R2,A1,power,retrofit,2035,5.60000000000
+windturbine,R2,R2,A1,power,retrofit,2035,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,4.97510000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,0.88600000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,15.31400000000
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.88600000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,15.31400000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2040,8.99000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2040,8.57400000000
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2040,8.99000000000
+solarPV,R2,R2,A1,power,retrofit,2040,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2040,8.57400000000
+windturbine,R2,R2,A1,power,retrofit,2040,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,4.97510000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,0.88600000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.31400000000
+heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.88600000000
+heatpump,R2,R2,A1,residential,retrofit,2045,15.31400000000
+heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.15000000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.99000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2045,8.57400000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
+windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R2,R2,A1,power,retrofit,2045,8.99000000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2045,8.57400000000
+solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
+windturbine,R2,R2,A1,power,retrofit,2045,15.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,4.97510000000
+heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.99000000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.57400000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
+solarPV,R1,R1,A1,power,retrofit,2050,16.48600000000
+windturbine,R1,R1,A1,power,retrofit,2050,5.15000000000
+solarPV,R2,R2,A1,power,retrofit,2050,8.99000000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2050,8.57400000000
+solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
+solarPV,R2,R2,A1,power,retrofit,2050,16.48600000000
+windturbine,R2,R2,A1,power,retrofit,2050,5.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.97510000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,4.97510000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
new file mode 100644
index 00000000..3f147241
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -0,0 +1,449 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.61060000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.61060000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.61060000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.61060000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63730000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73540000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73540000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.67300000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.67300000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.67300000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.10690000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.10690000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.25000000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.25000000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.13620000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.13620000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.35740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.35740000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.10690000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.10690000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.25000000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.25000000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.13620000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.13620000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35740000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.24370000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.24370000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.75200000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.75200000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.17530000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.17530000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.50070000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.50070000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,14.17530000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,14.17530000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.50070000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.50070000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.17530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.17530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.50070000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.50070000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.30380000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.30380000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.50760000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.50760000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.33510000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.33510000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.63980000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.63980000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.30380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.30380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.33510000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.33510000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.63980000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.63980000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44970000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44970000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.12650000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.12650000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.37680000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.37680000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.81640000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.81640000000,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', 'early-morning')",electricity,R1,11.37680000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.37680000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.81640000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.81640000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.37680000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.37680000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81640000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81640000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.06080000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,9.06080000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.27980000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,41.27980000000,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,9.09350000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,9.09350000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.41740000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,41.41740000000,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', 'mid-afternoon')",electricity,R1,9.06080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.06080000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27980000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27980000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.09350000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.09350000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41740000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41740000000,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,9.21310000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.21310000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.92480000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.92480000000,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,9.13700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,9.13700000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.60130000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,41.60130000000,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', 'early-morning')",electricity,R1,9.13700000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,9.13700000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.60130000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.60130000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.13700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.13700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60130000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60130000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.26610000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,7.26610000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.08530000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,33.08530000000,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,7.29970000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,7.29970000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.22200000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,33.22200000000,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', 'mid-afternoon')",electricity,R1,7.26610000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,7.26610000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.08530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.08530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.29970000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,7.29970000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.22200000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.22200000000,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,7.42280000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.42280000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.72690000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.72690000000,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,7.34440000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,7.34440000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.40490000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,33.40490000000,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', 'early-morning')",electricity,R1,7.34440000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,7.34440000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.40490000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.40490000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,7.34440000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,7.34440000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.40490000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.40490000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08190000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08190000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.22280000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.22280000000,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.11700000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.11700000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.31960000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.31960000000,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', 'mid-afternoon')",electricity,R1,0.08190000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08190000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.22280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.22280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11700000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11700000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31960000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.31960000000,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,0.24570000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24570000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.68180000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.68180000000,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,0.16380000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16380000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.45000000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.45000000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16380000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.45000000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.45000000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.45000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.45000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
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
new file mode 100644
index 00000000..4f665949
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
@@ -0,0 +1,23 @@
+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.15000000000
+1,2030,R1,solarPV,2020,5.15000000000
+1,2035,R1,solarPV,2020,5.15000000000
+1,2040,R1,solarPV,2020,5.15000000000
+1,2045,R1,solarPV,2020,5.15000000000
+1,2049,R1,solarPV,2020,5.15000000000
+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.15000000000
+4,2030,R2,windturbine,2020,15.15000000000
+4,2035,R2,windturbine,2020,15.15000000000
+4,2040,R2,windturbine,2020,15.15000000000
+4,2045,R2,windturbine,2020,15.15000000000
+4,2049,R2,windturbine,2020,15.15000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..91056903
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -0,0 +1,35 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,5.15000000000
+2,2030,solarPV,R1,2020,5.15000000000
+2,2035,solarPV,R1,2020,5.15000000000
+2,2040,solarPV,R1,2020,5.15000000000
+2,2045,solarPV,R1,2020,5.15000000000
+2,2049,solarPV,R1,2020,5.15000000000
+3,2030,solarPV,R1,2025,8.99000000000
+3,2035,solarPV,R1,2025,8.99000000000
+3,2040,solarPV,R1,2025,8.99000000000
+3,2045,solarPV,R1,2025,8.99000000000
+3,2049,solarPV,R1,2025,8.99000000000
+3,2050,solarPV,R1,2025,8.99000000000
+3,2054,solarPV,R1,2025,8.99000000000
+4,2030,solarPV,R2,2025,8.99000000000
+4,2035,solarPV,R2,2025,8.99000000000
+4,2040,solarPV,R2,2025,8.99000000000
+4,2045,solarPV,R2,2025,8.99000000000
+4,2049,solarPV,R2,2025,8.99000000000
+4,2050,solarPV,R2,2025,8.99000000000
+4,2054,solarPV,R2,2025,8.99000000000
+5,2025,windturbine,R1,2020,10.00000000000
+5,2030,windturbine,R1,2020,10.00000000000
+5,2035,windturbine,R1,2020,10.00000000000
+5,2040,windturbine,R1,2020,10.00000000000
+5,2045,windturbine,R1,2020,10.00000000000
+5,2049,windturbine,R1,2020,10.00000000000
+6,2025,windturbine,R2,2020,15.15000000000
+6,2030,windturbine,R2,2020,15.15000000000
+6,2035,windturbine,R2,2020,15.15000000000
+6,2040,windturbine,R2,2020,15.15000000000
+6,2045,windturbine,R2,2020,15.15000000000
+6,2049,windturbine,R2,2020,15.15000000000
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
new file mode 100644
index 00000000..05ff0931
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
@@ -0,0 +1,46 @@
+asset,year,region,technology,installed,capacity
+1,2030,R1,solarPV,2020,5.15000000000
+1,2035,R1,solarPV,2020,5.15000000000
+1,2040,R1,solarPV,2020,5.15000000000
+1,2045,R1,solarPV,2020,5.15000000000
+1,2049,R1,solarPV,2020,5.15000000000
+2,2030,R1,solarPV,2025,8.99000000000
+2,2035,R1,solarPV,2025,8.99000000000
+2,2040,R1,solarPV,2025,8.99000000000
+2,2045,R1,solarPV,2025,8.99000000000
+2,2049,R1,solarPV,2025,8.99000000000
+2,2050,R1,solarPV,2025,8.99000000000
+2,2054,R1,solarPV,2025,8.99000000000
+3,2035,R1,solarPV,2030,5.60000000000
+3,2040,R1,solarPV,2030,5.60000000000
+3,2045,R1,solarPV,2030,5.60000000000
+3,2049,R1,solarPV,2030,5.60000000000
+3,2050,R1,solarPV,2030,5.60000000000
+3,2054,R1,solarPV,2030,5.60000000000
+3,2055,R1,solarPV,2030,5.60000000000
+3,2059,R1,solarPV,2030,5.60000000000
+4,2030,R1,windturbine,2020,10.00000000000
+4,2035,R1,windturbine,2020,10.00000000000
+4,2040,R1,windturbine,2020,10.00000000000
+4,2045,R1,windturbine,2020,10.00000000000
+4,2049,R1,windturbine,2020,10.00000000000
+6,2030,R2,solarPV,2025,8.99000000000
+6,2035,R2,solarPV,2025,8.99000000000
+6,2040,R2,solarPV,2025,8.99000000000
+6,2045,R2,solarPV,2025,8.99000000000
+6,2049,R2,solarPV,2025,8.99000000000
+6,2050,R2,solarPV,2025,8.99000000000
+6,2054,R2,solarPV,2025,8.99000000000
+7,2035,R2,solarPV,2030,5.60000000000
+7,2040,R2,solarPV,2030,5.60000000000
+7,2045,R2,solarPV,2030,5.60000000000
+7,2049,R2,solarPV,2030,5.60000000000
+7,2050,R2,solarPV,2030,5.60000000000
+7,2054,R2,solarPV,2030,5.60000000000
+7,2055,R2,solarPV,2030,5.60000000000
+7,2059,R2,solarPV,2030,5.60000000000
+8,2030,R2,windturbine,2020,15.15000000000
+8,2035,R2,windturbine,2020,15.15000000000
+8,2040,R2,windturbine,2020,15.15000000000
+8,2045,R2,windturbine,2020,15.15000000000
+8,2049,R2,windturbine,2020,15.15000000000
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
new file mode 100644
index 00000000..d428db04
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
@@ -0,0 +1,59 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,solarPV,2020,5.15000000000
+1,2040,R1,solarPV,2020,5.15000000000
+1,2045,R1,solarPV,2020,5.15000000000
+1,2049,R1,solarPV,2020,5.15000000000
+2,2035,R1,solarPV,2025,8.99000000000
+2,2040,R1,solarPV,2025,8.99000000000
+2,2045,R1,solarPV,2025,8.99000000000
+2,2049,R1,solarPV,2025,8.99000000000
+2,2050,R1,solarPV,2025,8.99000000000
+2,2054,R1,solarPV,2025,8.99000000000
+3,2035,R1,solarPV,2030,5.60000000000
+3,2040,R1,solarPV,2030,5.60000000000
+3,2045,R1,solarPV,2030,5.60000000000
+3,2049,R1,solarPV,2030,5.60000000000
+3,2050,R1,solarPV,2030,5.60000000000
+3,2054,R1,solarPV,2030,5.60000000000
+3,2055,R1,solarPV,2030,5.60000000000
+3,2059,R1,solarPV,2030,5.60000000000
+4,2040,R1,solarPV,2035,8.57400000000
+4,2045,R1,solarPV,2035,8.57400000000
+4,2049,R1,solarPV,2035,8.57400000000
+4,2050,R1,solarPV,2035,8.57400000000
+4,2054,R1,solarPV,2035,8.57400000000
+4,2055,R1,solarPV,2035,8.57400000000
+4,2059,R1,solarPV,2035,8.57400000000
+4,2060,R1,solarPV,2035,8.57400000000
+4,2064,R1,solarPV,2035,8.57400000000
+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,2035,R2,solarPV,2025,8.99000000000
+7,2040,R2,solarPV,2025,8.99000000000
+7,2045,R2,solarPV,2025,8.99000000000
+7,2049,R2,solarPV,2025,8.99000000000
+7,2050,R2,solarPV,2025,8.99000000000
+7,2054,R2,solarPV,2025,8.99000000000
+8,2035,R2,solarPV,2030,5.60000000000
+8,2040,R2,solarPV,2030,5.60000000000
+8,2045,R2,solarPV,2030,5.60000000000
+8,2049,R2,solarPV,2030,5.60000000000
+8,2050,R2,solarPV,2030,5.60000000000
+8,2054,R2,solarPV,2030,5.60000000000
+8,2055,R2,solarPV,2030,5.60000000000
+8,2059,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2035,8.57400000000
+9,2045,R2,solarPV,2035,8.57400000000
+9,2049,R2,solarPV,2035,8.57400000000
+9,2050,R2,solarPV,2035,8.57400000000
+9,2054,R2,solarPV,2035,8.57400000000
+9,2055,R2,solarPV,2035,8.57400000000
+9,2059,R2,solarPV,2035,8.57400000000
+9,2060,R2,solarPV,2035,8.57400000000
+9,2064,R2,solarPV,2035,8.57400000000
+10,2035,R2,windturbine,2020,15.15000000000
+10,2040,R2,windturbine,2020,15.15000000000
+10,2045,R2,windturbine,2020,15.15000000000
+10,2049,R2,windturbine,2020,15.15000000000
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
new file mode 100644
index 00000000..8c9e6af8
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
@@ -0,0 +1,72 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2020,5.15000000000
+1,2045,R1,solarPV,2020,5.15000000000
+1,2049,R1,solarPV,2020,5.15000000000
+2,2040,R1,solarPV,2025,8.99000000000
+2,2045,R1,solarPV,2025,8.99000000000
+2,2049,R1,solarPV,2025,8.99000000000
+2,2050,R1,solarPV,2025,8.99000000000
+2,2054,R1,solarPV,2025,8.99000000000
+3,2040,R1,solarPV,2030,5.60000000000
+3,2045,R1,solarPV,2030,5.60000000000
+3,2049,R1,solarPV,2030,5.60000000000
+3,2050,R1,solarPV,2030,5.60000000000
+3,2054,R1,solarPV,2030,5.60000000000
+3,2055,R1,solarPV,2030,5.60000000000
+3,2059,R1,solarPV,2030,5.60000000000
+4,2040,R1,solarPV,2035,8.57400000000
+4,2045,R1,solarPV,2035,8.57400000000
+4,2049,R1,solarPV,2035,8.57400000000
+4,2050,R1,solarPV,2035,8.57400000000
+4,2054,R1,solarPV,2035,8.57400000000
+4,2055,R1,solarPV,2035,8.57400000000
+4,2059,R1,solarPV,2035,8.57400000000
+4,2060,R1,solarPV,2035,8.57400000000
+4,2064,R1,solarPV,2035,8.57400000000
+5,2045,R1,solarPV,2040,5.60000000000
+5,2049,R1,solarPV,2040,5.60000000000
+5,2050,R1,solarPV,2040,5.60000000000
+5,2054,R1,solarPV,2040,5.60000000000
+5,2055,R1,solarPV,2040,5.60000000000
+5,2059,R1,solarPV,2040,5.60000000000
+5,2060,R1,solarPV,2040,5.60000000000
+5,2064,R1,solarPV,2040,5.60000000000
+5,2065,R1,solarPV,2040,5.60000000000
+5,2069,R1,solarPV,2040,5.60000000000
+6,2040,R1,windturbine,2020,10.00000000000
+6,2045,R1,windturbine,2020,10.00000000000
+6,2049,R1,windturbine,2020,10.00000000000
+8,2040,R2,solarPV,2025,8.99000000000
+8,2045,R2,solarPV,2025,8.99000000000
+8,2049,R2,solarPV,2025,8.99000000000
+8,2050,R2,solarPV,2025,8.99000000000
+8,2054,R2,solarPV,2025,8.99000000000
+9,2040,R2,solarPV,2030,5.60000000000
+9,2045,R2,solarPV,2030,5.60000000000
+9,2049,R2,solarPV,2030,5.60000000000
+9,2050,R2,solarPV,2030,5.60000000000
+9,2054,R2,solarPV,2030,5.60000000000
+9,2055,R2,solarPV,2030,5.60000000000
+9,2059,R2,solarPV,2030,5.60000000000
+10,2040,R2,solarPV,2035,8.57400000000
+10,2045,R2,solarPV,2035,8.57400000000
+10,2049,R2,solarPV,2035,8.57400000000
+10,2050,R2,solarPV,2035,8.57400000000
+10,2054,R2,solarPV,2035,8.57400000000
+10,2055,R2,solarPV,2035,8.57400000000
+10,2059,R2,solarPV,2035,8.57400000000
+10,2060,R2,solarPV,2035,8.57400000000
+10,2064,R2,solarPV,2035,8.57400000000
+11,2045,R2,solarPV,2040,5.60000000000
+11,2049,R2,solarPV,2040,5.60000000000
+11,2050,R2,solarPV,2040,5.60000000000
+11,2054,R2,solarPV,2040,5.60000000000
+11,2055,R2,solarPV,2040,5.60000000000
+11,2059,R2,solarPV,2040,5.60000000000
+11,2060,R2,solarPV,2040,5.60000000000
+11,2064,R2,solarPV,2040,5.60000000000
+11,2065,R2,solarPV,2040,5.60000000000
+11,2069,R2,solarPV,2040,5.60000000000
+12,2040,R2,windturbine,2020,15.15000000000
+12,2045,R2,windturbine,2020,15.15000000000
+12,2049,R2,windturbine,2020,15.15000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..4e320235
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -0,0 +1,103 @@
+asset,year,technology,region,installed,capacity
+0,2045,solarPV,R1,2020,5.15000000000
+0,2049,solarPV,R1,2020,5.15000000000
+1,2045,solarPV,R1,2025,8.99000000000
+1,2049,solarPV,R1,2025,8.99000000000
+1,2050,solarPV,R1,2025,8.99000000000
+1,2054,solarPV,R1,2025,8.99000000000
+2,2045,solarPV,R1,2030,5.60000000000
+2,2049,solarPV,R1,2030,5.60000000000
+2,2050,solarPV,R1,2030,5.60000000000
+2,2054,solarPV,R1,2030,5.60000000000
+2,2055,solarPV,R1,2030,5.60000000000
+2,2059,solarPV,R1,2030,5.60000000000
+3,2045,solarPV,R1,2035,8.57400000000
+3,2049,solarPV,R1,2035,8.57400000000
+3,2050,solarPV,R1,2035,8.57400000000
+3,2054,solarPV,R1,2035,8.57400000000
+3,2055,solarPV,R1,2035,8.57400000000
+3,2059,solarPV,R1,2035,8.57400000000
+3,2060,solarPV,R1,2035,8.57400000000
+3,2064,solarPV,R1,2035,8.57400000000
+4,2045,solarPV,R1,2040,5.60000000000
+4,2049,solarPV,R1,2040,5.60000000000
+4,2050,solarPV,R1,2040,5.60000000000
+4,2054,solarPV,R1,2040,5.60000000000
+4,2055,solarPV,R1,2040,5.60000000000
+4,2059,solarPV,R1,2040,5.60000000000
+4,2060,solarPV,R1,2040,5.60000000000
+4,2064,solarPV,R1,2040,5.60000000000
+4,2065,solarPV,R1,2040,5.60000000000
+4,2069,solarPV,R1,2040,5.60000000000
+5,2050,solarPV,R1,2045,16.48600000000
+5,2054,solarPV,R1,2045,16.48600000000
+5,2055,solarPV,R1,2045,16.48600000000
+5,2059,solarPV,R1,2045,16.48600000000
+5,2060,solarPV,R1,2045,16.48600000000
+5,2064,solarPV,R1,2045,16.48600000000
+5,2065,solarPV,R1,2045,16.48600000000
+5,2069,solarPV,R1,2045,16.48600000000
+5,2070,solarPV,R1,2045,16.48600000000
+5,2074,solarPV,R1,2045,16.48600000000
+6,2045,solarPV,R2,2025,8.99000000000
+6,2049,solarPV,R2,2025,8.99000000000
+6,2050,solarPV,R2,2025,8.99000000000
+6,2054,solarPV,R2,2025,8.99000000000
+7,2045,solarPV,R2,2030,5.60000000000
+7,2049,solarPV,R2,2030,5.60000000000
+7,2050,solarPV,R2,2030,5.60000000000
+7,2054,solarPV,R2,2030,5.60000000000
+7,2055,solarPV,R2,2030,5.60000000000
+7,2059,solarPV,R2,2030,5.60000000000
+8,2045,solarPV,R2,2035,8.57400000000
+8,2049,solarPV,R2,2035,8.57400000000
+8,2050,solarPV,R2,2035,8.57400000000
+8,2054,solarPV,R2,2035,8.57400000000
+8,2055,solarPV,R2,2035,8.57400000000
+8,2059,solarPV,R2,2035,8.57400000000
+8,2060,solarPV,R2,2035,8.57400000000
+8,2064,solarPV,R2,2035,8.57400000000
+9,2045,solarPV,R2,2040,5.60000000000
+9,2049,solarPV,R2,2040,5.60000000000
+9,2050,solarPV,R2,2040,5.60000000000
+9,2054,solarPV,R2,2040,5.60000000000
+9,2055,solarPV,R2,2040,5.60000000000
+9,2059,solarPV,R2,2040,5.60000000000
+9,2060,solarPV,R2,2040,5.60000000000
+9,2064,solarPV,R2,2040,5.60000000000
+9,2065,solarPV,R2,2040,5.60000000000
+9,2069,solarPV,R2,2040,5.60000000000
+10,2050,solarPV,R2,2045,16.48600000000
+10,2054,solarPV,R2,2045,16.48600000000
+10,2055,solarPV,R2,2045,16.48600000000
+10,2059,solarPV,R2,2045,16.48600000000
+10,2060,solarPV,R2,2045,16.48600000000
+10,2064,solarPV,R2,2045,16.48600000000
+10,2065,solarPV,R2,2045,16.48600000000
+10,2069,solarPV,R2,2045,16.48600000000
+10,2070,solarPV,R2,2045,16.48600000000
+10,2074,solarPV,R2,2045,16.48600000000
+11,2045,windturbine,R1,2020,10.00000000000
+11,2049,windturbine,R1,2020,10.00000000000
+12,2050,windturbine,R1,2045,5.15000000000
+12,2054,windturbine,R1,2045,5.15000000000
+12,2055,windturbine,R1,2045,5.15000000000
+12,2059,windturbine,R1,2045,5.15000000000
+12,2060,windturbine,R1,2045,5.15000000000
+12,2064,windturbine,R1,2045,5.15000000000
+12,2065,windturbine,R1,2045,5.15000000000
+12,2069,windturbine,R1,2045,5.15000000000
+12,2070,windturbine,R1,2045,5.15000000000
+12,2074,windturbine,R1,2045,5.15000000000
+13,2045,windturbine,R2,2020,15.15000000000
+13,2049,windturbine,R2,2020,15.15000000000
+14,2050,windturbine,R2,2045,5.15000000000
+14,2054,windturbine,R2,2045,5.15000000000
+14,2055,windturbine,R2,2045,5.15000000000
+14,2059,windturbine,R2,2045,5.15000000000
+14,2060,windturbine,R2,2045,5.15000000000
+14,2064,windturbine,R2,2045,5.15000000000
+14,2065,windturbine,R2,2045,5.15000000000
+14,2069,windturbine,R2,2045,5.15000000000
+14,2070,windturbine,R2,2045,5.15000000000
+14,2074,windturbine,R2,2045,5.15000000000
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
new file mode 100644
index 00000000..64819cd1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
@@ -0,0 +1,101 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,solarPV,2025,8.99000000000
+1,2054,R1,solarPV,2025,8.99000000000
+2,2050,R1,solarPV,2030,5.60000000000
+2,2054,R1,solarPV,2030,5.60000000000
+2,2055,R1,solarPV,2030,5.60000000000
+2,2059,R1,solarPV,2030,5.60000000000
+3,2050,R1,solarPV,2035,8.57400000000
+3,2054,R1,solarPV,2035,8.57400000000
+3,2055,R1,solarPV,2035,8.57400000000
+3,2059,R1,solarPV,2035,8.57400000000
+3,2060,R1,solarPV,2035,8.57400000000
+3,2064,R1,solarPV,2035,8.57400000000
+4,2050,R1,solarPV,2040,5.60000000000
+4,2054,R1,solarPV,2040,5.60000000000
+4,2055,R1,solarPV,2040,5.60000000000
+4,2059,R1,solarPV,2040,5.60000000000
+4,2060,R1,solarPV,2040,5.60000000000
+4,2064,R1,solarPV,2040,5.60000000000
+4,2065,R1,solarPV,2040,5.60000000000
+4,2069,R1,solarPV,2040,5.60000000000
+5,2050,R1,solarPV,2045,16.48600000000
+5,2054,R1,solarPV,2045,16.48600000000
+5,2055,R1,solarPV,2045,16.48600000000
+5,2059,R1,solarPV,2045,16.48600000000
+5,2060,R1,solarPV,2045,16.48600000000
+5,2064,R1,solarPV,2045,16.48600000000
+5,2065,R1,solarPV,2045,16.48600000000
+5,2069,R1,solarPV,2045,16.48600000000
+5,2070,R1,solarPV,2045,16.48600000000
+5,2074,R1,solarPV,2045,16.48600000000
+6,2055,R1,solarPV,2050,8.99000000000
+6,2059,R1,solarPV,2050,8.99000000000
+6,2060,R1,solarPV,2050,8.99000000000
+6,2064,R1,solarPV,2050,8.99000000000
+6,2065,R1,solarPV,2050,8.99000000000
+6,2069,R1,solarPV,2050,8.99000000000
+6,2070,R1,solarPV,2050,8.99000000000
+6,2074,R1,solarPV,2050,8.99000000000
+6,2075,R1,solarPV,2050,8.99000000000
+6,2079,R1,solarPV,2050,8.99000000000
+8,2050,R1,windturbine,2045,5.15000000000
+8,2054,R1,windturbine,2045,5.15000000000
+8,2055,R1,windturbine,2045,5.15000000000
+8,2059,R1,windturbine,2045,5.15000000000
+8,2060,R1,windturbine,2045,5.15000000000
+8,2064,R1,windturbine,2045,5.15000000000
+8,2065,R1,windturbine,2045,5.15000000000
+8,2069,R1,windturbine,2045,5.15000000000
+8,2070,R1,windturbine,2045,5.15000000000
+8,2074,R1,windturbine,2045,5.15000000000
+9,2050,R2,solarPV,2025,8.99000000000
+9,2054,R2,solarPV,2025,8.99000000000
+10,2050,R2,solarPV,2030,5.60000000000
+10,2054,R2,solarPV,2030,5.60000000000
+10,2055,R2,solarPV,2030,5.60000000000
+10,2059,R2,solarPV,2030,5.60000000000
+11,2050,R2,solarPV,2035,8.57400000000
+11,2054,R2,solarPV,2035,8.57400000000
+11,2055,R2,solarPV,2035,8.57400000000
+11,2059,R2,solarPV,2035,8.57400000000
+11,2060,R2,solarPV,2035,8.57400000000
+11,2064,R2,solarPV,2035,8.57400000000
+12,2050,R2,solarPV,2040,5.60000000000
+12,2054,R2,solarPV,2040,5.60000000000
+12,2055,R2,solarPV,2040,5.60000000000
+12,2059,R2,solarPV,2040,5.60000000000
+12,2060,R2,solarPV,2040,5.60000000000
+12,2064,R2,solarPV,2040,5.60000000000
+12,2065,R2,solarPV,2040,5.60000000000
+12,2069,R2,solarPV,2040,5.60000000000
+13,2050,R2,solarPV,2045,16.48600000000
+13,2054,R2,solarPV,2045,16.48600000000
+13,2055,R2,solarPV,2045,16.48600000000
+13,2059,R2,solarPV,2045,16.48600000000
+13,2060,R2,solarPV,2045,16.48600000000
+13,2064,R2,solarPV,2045,16.48600000000
+13,2065,R2,solarPV,2045,16.48600000000
+13,2069,R2,solarPV,2045,16.48600000000
+13,2070,R2,solarPV,2045,16.48600000000
+13,2074,R2,solarPV,2045,16.48600000000
+14,2055,R2,solarPV,2050,8.99000000000
+14,2059,R2,solarPV,2050,8.99000000000
+14,2060,R2,solarPV,2050,8.99000000000
+14,2064,R2,solarPV,2050,8.99000000000
+14,2065,R2,solarPV,2050,8.99000000000
+14,2069,R2,solarPV,2050,8.99000000000
+14,2070,R2,solarPV,2050,8.99000000000
+14,2074,R2,solarPV,2050,8.99000000000
+14,2075,R2,solarPV,2050,8.99000000000
+14,2079,R2,solarPV,2050,8.99000000000
+16,2050,R2,windturbine,2045,5.15000000000
+16,2054,R2,windturbine,2045,5.15000000000
+16,2055,R2,windturbine,2045,5.15000000000
+16,2059,R2,windturbine,2045,5.15000000000
+16,2060,R2,windturbine,2045,5.15000000000
+16,2064,R2,windturbine,2045,5.15000000000
+16,2065,R2,windturbine,2045,5.15000000000
+16,2069,R2,windturbine,2045,5.15000000000
+16,2070,R2,windturbine,2045,5.15000000000
+16,2074,R2,windturbine,2045,5.15000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..26535f2c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,11 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2025,heatpump,R1,2020,17.40000000000
+2,2030,heatpump,R1,2020,17.40000000000
+2,2034,heatpump,R1,2020,17.40000000000
+3,2025,heatpump,R2,2020,17.40000000000
+3,2030,heatpump,R2,2020,17.40000000000
+3,2034,heatpump,R2,2020,17.40000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..a6720c51
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2030,gasboiler,R1,2025,3.86000000000
+1,2034,gasboiler,R1,2025,3.86000000000
+1,2035,gasboiler,R1,2025,3.86000000000
+1,2039,gasboiler,R1,2025,3.86000000000
+2,2025,gasboiler,R2,2020,5.00000000000
+3,2030,gasboiler,R2,2025,3.86000000000
+3,2034,gasboiler,R2,2025,3.86000000000
+3,2035,gasboiler,R2,2025,3.86000000000
+3,2039,gasboiler,R2,2025,3.86000000000
+4,2025,heatpump,R1,2020,17.40000000000
+4,2030,heatpump,R1,2020,17.40000000000
+4,2034,heatpump,R1,2020,17.40000000000
+5,2030,heatpump,R1,2025,6.74000000000
+5,2034,heatpump,R1,2025,6.74000000000
+5,2035,heatpump,R1,2025,6.74000000000
+5,2039,heatpump,R1,2025,6.74000000000
+6,2025,heatpump,R2,2020,17.40000000000
+6,2030,heatpump,R2,2020,17.40000000000
+6,2034,heatpump,R2,2020,17.40000000000
+7,2030,heatpump,R2,2025,6.74000000000
+7,2034,heatpump,R2,2025,6.74000000000
+7,2035,heatpump,R2,2025,6.74000000000
+7,2039,heatpump,R2,2025,6.74000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..f6556372
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2025,3.86000000000
+0,2034,gasboiler,R1,2025,3.86000000000
+0,2035,gasboiler,R1,2025,3.86000000000
+0,2039,gasboiler,R1,2025,3.86000000000
+1,2030,gasboiler,R2,2025,3.86000000000
+1,2034,gasboiler,R2,2025,3.86000000000
+1,2035,gasboiler,R2,2025,3.86000000000
+1,2039,gasboiler,R2,2025,3.86000000000
+2,2030,heatpump,R1,2020,17.40000000000
+2,2034,heatpump,R1,2020,17.40000000000
+3,2030,heatpump,R1,2025,6.74000000000
+3,2034,heatpump,R1,2025,6.74000000000
+3,2035,heatpump,R1,2025,6.74000000000
+3,2039,heatpump,R1,2025,6.74000000000
+4,2035,heatpump,R1,2030,23.00000000000
+4,2039,heatpump,R1,2030,23.00000000000
+4,2040,heatpump,R1,2030,23.00000000000
+4,2044,heatpump,R1,2030,23.00000000000
+5,2030,heatpump,R2,2020,17.40000000000
+5,2034,heatpump,R2,2020,17.40000000000
+6,2030,heatpump,R2,2025,6.74000000000
+6,2034,heatpump,R2,2025,6.74000000000
+6,2035,heatpump,R2,2025,6.74000000000
+6,2039,heatpump,R2,2025,6.74000000000
+7,2035,heatpump,R2,2030,23.00000000000
+7,2039,heatpump,R2,2030,23.00000000000
+7,2040,heatpump,R2,2030,23.00000000000
+7,2044,heatpump,R2,2030,23.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..a3ca6aa5
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,33 @@
+asset,year,technology,region,installed,capacity
+0,2035,gasboiler,R1,2025,3.86000000000
+0,2039,gasboiler,R1,2025,3.86000000000
+1,2040,gasboiler,R1,2035,0.88600000000
+1,2044,gasboiler,R1,2035,0.88600000000
+1,2045,gasboiler,R1,2035,0.88600000000
+1,2049,gasboiler,R1,2035,0.88600000000
+2,2035,gasboiler,R2,2025,3.86000000000
+2,2039,gasboiler,R2,2025,3.86000000000
+3,2040,gasboiler,R2,2035,0.88600000000
+3,2044,gasboiler,R2,2035,0.88600000000
+3,2045,gasboiler,R2,2035,0.88600000000
+3,2049,gasboiler,R2,2035,0.88600000000
+4,2035,heatpump,R1,2025,6.74000000000
+4,2039,heatpump,R1,2025,6.74000000000
+5,2035,heatpump,R1,2030,23.00000000000
+5,2039,heatpump,R1,2030,23.00000000000
+5,2040,heatpump,R1,2030,23.00000000000
+5,2044,heatpump,R1,2030,23.00000000000
+6,2040,heatpump,R1,2035,15.31400000000
+6,2044,heatpump,R1,2035,15.31400000000
+6,2045,heatpump,R1,2035,15.31400000000
+6,2049,heatpump,R1,2035,15.31400000000
+7,2035,heatpump,R2,2025,6.74000000000
+7,2039,heatpump,R2,2025,6.74000000000
+8,2035,heatpump,R2,2030,23.00000000000
+8,2039,heatpump,R2,2030,23.00000000000
+8,2040,heatpump,R2,2030,23.00000000000
+8,2044,heatpump,R2,2030,23.00000000000
+9,2040,heatpump,R2,2035,15.31400000000
+9,2044,heatpump,R2,2035,15.31400000000
+9,2045,heatpump,R2,2035,15.31400000000
+9,2049,heatpump,R2,2035,15.31400000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..7285c2c7
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,29 @@
+asset,year,technology,region,installed,capacity
+0,2040,gasboiler,R1,2035,0.88600000000
+0,2044,gasboiler,R1,2035,0.88600000000
+0,2045,gasboiler,R1,2035,0.88600000000
+0,2049,gasboiler,R1,2035,0.88600000000
+1,2040,gasboiler,R2,2035,0.88600000000
+1,2044,gasboiler,R2,2035,0.88600000000
+1,2045,gasboiler,R2,2035,0.88600000000
+1,2049,gasboiler,R2,2035,0.88600000000
+2,2040,heatpump,R1,2030,23.00000000000
+2,2044,heatpump,R1,2030,23.00000000000
+3,2040,heatpump,R1,2035,15.31400000000
+3,2044,heatpump,R1,2035,15.31400000000
+3,2045,heatpump,R1,2035,15.31400000000
+3,2049,heatpump,R1,2035,15.31400000000
+4,2045,heatpump,R1,2040,28.60000000000
+4,2049,heatpump,R1,2040,28.60000000000
+4,2050,heatpump,R1,2040,28.60000000000
+4,2054,heatpump,R1,2040,28.60000000000
+5,2040,heatpump,R2,2030,23.00000000000
+5,2044,heatpump,R2,2030,23.00000000000
+6,2040,heatpump,R2,2035,15.31400000000
+6,2044,heatpump,R2,2035,15.31400000000
+6,2045,heatpump,R2,2035,15.31400000000
+6,2049,heatpump,R2,2035,15.31400000000
+7,2045,heatpump,R2,2040,28.60000000000
+7,2049,heatpump,R2,2040,28.60000000000
+7,2050,heatpump,R2,2040,28.60000000000
+7,2054,heatpump,R2,2040,28.60000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..a54ec89d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,25 @@
+asset,year,technology,region,installed,capacity
+0,2045,gasboiler,R1,2035,0.88600000000
+0,2049,gasboiler,R1,2035,0.88600000000
+1,2045,gasboiler,R2,2035,0.88600000000
+1,2049,gasboiler,R2,2035,0.88600000000
+2,2045,heatpump,R1,2035,15.31400000000
+2,2049,heatpump,R1,2035,15.31400000000
+3,2045,heatpump,R1,2040,28.60000000000
+3,2049,heatpump,R1,2040,28.60000000000
+3,2050,heatpump,R1,2040,28.60000000000
+3,2054,heatpump,R1,2040,28.60000000000
+4,2050,heatpump,R1,2045,21.80000000000
+4,2054,heatpump,R1,2045,21.80000000000
+4,2055,heatpump,R1,2045,21.80000000000
+4,2059,heatpump,R1,2045,21.80000000000
+5,2045,heatpump,R2,2035,15.31400000000
+5,2049,heatpump,R2,2035,15.31400000000
+6,2045,heatpump,R2,2040,28.60000000000
+6,2049,heatpump,R2,2040,28.60000000000
+6,2050,heatpump,R2,2040,28.60000000000
+6,2054,heatpump,R2,2040,28.60000000000
+7,2050,heatpump,R2,2045,21.80000000000
+7,2054,heatpump,R2,2045,21.80000000000
+7,2055,heatpump,R2,2045,21.80000000000
+7,2059,heatpump,R2,2045,21.80000000000
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
new file mode 100644
index 00000000..168dffb1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,28.60000000000
+2,2054,R1,heatpump,2040,28.60000000000
+3,2050,R1,heatpump,2045,21.80000000000
+3,2054,R1,heatpump,2045,21.80000000000
+3,2055,R1,heatpump,2045,21.80000000000
+3,2059,R1,heatpump,2045,21.80000000000
+4,2055,R1,heatpump,2050,28.60000000000
+4,2059,R1,heatpump,2050,28.60000000000
+4,2060,R1,heatpump,2050,28.60000000000
+4,2064,R1,heatpump,2050,28.60000000000
+7,2050,R2,heatpump,2040,28.60000000000
+7,2054,R2,heatpump,2040,28.60000000000
+8,2050,R2,heatpump,2045,21.80000000000
+8,2054,R2,heatpump,2045,21.80000000000
+8,2055,R2,heatpump,2045,21.80000000000
+8,2059,R2,heatpump,2045,21.80000000000
+9,2055,R2,heatpump,2050,28.60000000000
+9,2059,R2,heatpump,2050,28.60000000000
+9,2060,R2,heatpump,2050,28.60000000000
+9,2064,R2,heatpump,2050,28.60000000000
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
new file mode 100644
index 00000000..a1549a0d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
@@ -0,0 +1,161 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,1,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,2,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,1,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,2,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36250000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2025,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2025,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,2,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,2,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2025,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2025,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+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.08750000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+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.08750000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+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,67.94550000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+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.70000000000
+5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,2,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,2,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2025,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2025,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2025,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2025,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
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
new file mode 100644
index 00000000..4368f7a7
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
@@ -0,0 +1,225 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,3,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,3,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2025,0.14040000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2030,3,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2030,3,all-year,all-week,night,gasboiler,2025,5.20380000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,3,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,3,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2030,3,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2030,3,all-year,all-week,morning,gasboiler,2025,7.43390000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+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.08750000000
+4,heat,R1,2025,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+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.08750000000
+4,heat,R2,2025,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+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,15.61130000000
+4,CO2f,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+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,15.61130000000
+4,CO2f,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,3,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,3,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2030,3,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2030,3,all-year,all-week,evening,gasboiler,2025,10.40750000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2030,3,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2030,3,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
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
new file mode 100644
index 00000000..cad6285c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
@@ -0,0 +1,257 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,1,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,4,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,1,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,4,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.47920000000
+0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2035,1,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2035,1,all-year,all-week,night,gasboiler,2025,5.20380000000
+1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2035,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2035,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
+2,heat,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,4,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,4,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,CO2f,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2035,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2035,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
+6,heat,R1,2030,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,4,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2030,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,4,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,CO2f,R1,2030,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2030,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+7,heat,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,4,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,4,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,CO2f,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
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
new file mode 100644
index 00000000..e8c3b6a6
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
@@ -0,0 +1,257 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,2,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,4,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,5,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,3,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,2,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,4,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,5,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,3,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.31900000000
+0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2035,2,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2040,3,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2035,2,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2040,3,all-year,all-week,night,gasboiler,2035,1.19440000000
+1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,2,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,5,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,3,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,2,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,5,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,3,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2035,2,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2040,3,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2035,2,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2040,3,all-year,all-week,morning,gasboiler,2035,1.70630000000
+2,heat,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,4,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,4,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,CO2f,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2035,2,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2040,3,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2035,2,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2040,3,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2035,2,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2040,3,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2035,2,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2040,3,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,2,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,5,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,3,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,2,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,5,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,3,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2035,2,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2040,3,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2035,2,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2040,3,all-year,all-week,evening,gasboiler,2035,2.38890000000
+6,heat,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,2,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,4,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,2,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,4,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,CO2f,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2035,2,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2040,3,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2035,2,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2040,3,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+7,heat,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,4,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,4,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,CO2f,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
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
new file mode 100644
index 00000000..f15e4ba1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
@@ -0,0 +1,257 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,0,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,2,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,3,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2045,6,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,7,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2040,0,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,2,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,3,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2045,6,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,7,all-year,all-week,night,heatpump,2040,0.59580000000
+0,CO2f,R1,2040,0,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2040,0,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+1,heat,R1,2040,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,7,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2040,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,7,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,CO2f,R1,2040,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2040,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+2,heat,R1,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2045,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2045,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,CO2f,R1,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+3,heat,R1,2040,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2040,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,CO2f,R1,2040,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2040,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+4,heat,R1,2040,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2040,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,CO2f,R1,2040,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2040,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+5,heat,R1,2040,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,7,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2040,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,7,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,CO2f,R1,2040,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2040,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+6,heat,R1,2040,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2045,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2040,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2045,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,CO2f,R1,2040,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2040,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+7,heat,R1,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2045,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2045,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,CO2f,R1,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
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
new file mode 100644
index 00000000..2d256b2f
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
@@ -0,0 +1,193 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,2,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,3,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,6,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,3,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,4,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,7,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,2,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,3,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,6,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,3,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,4,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,7,all-year,all-week,night,heatpump,2045,0.45420000000
+0,CO2f,R1,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
+1,heat,R1,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,2,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,3,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,4,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,2,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,3,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,4,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,CO2f,R1,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
+2,heat,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,2,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,4,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,2,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,4,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,CO2f,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+3,heat,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,2,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,4,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,2,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,4,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,CO2f,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+4,heat,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,2,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,4,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,2,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,4,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,CO2f,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+5,heat,R1,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,2,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,3,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,4,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,2,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,3,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,4,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,CO2f,R1,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
+6,heat,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,2,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,4,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,2,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,4,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,CO2f,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+7,heat,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,2,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,4,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,2,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,4,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,CO2f,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
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
new file mode 100644
index 00000000..e9a2f7a0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
@@ -0,0 +1,129 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,2,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,3,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2055,3,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2055,4,all-year,all-week,night,heatpump,2050,0.59580000000
+0,heat,R1,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
+0,heat,R2,2050,2,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,3,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2055,3,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2055,4,all-year,all-week,night,heatpump,2050,0.59580000000
+0,heat,R2,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
+1,heat,R1,2050,2,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,3,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2055,3,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2055,4,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,heat,R1,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,heat,R2,2050,2,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,3,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2055,3,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2055,4,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,heat,R2,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
+2,heat,R1,2050,2,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2055,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2055,4,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,heat,R1,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,heat,R2,2050,2,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2055,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2055,4,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,heat,R2,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+3,heat,R1,2050,2,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2055,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2055,4,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,heat,R1,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,heat,R2,2050,2,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2055,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2055,4,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,heat,R2,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+4,heat,R1,2050,2,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2055,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2055,4,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,heat,R1,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,heat,R2,2050,2,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2055,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2055,4,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,heat,R2,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+5,heat,R1,2050,2,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,3,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2055,3,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2055,4,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,heat,R1,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,heat,R2,2050,2,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,3,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2055,3,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2055,4,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,heat,R2,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
+6,heat,R1,2050,2,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2055,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2055,4,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,heat,R1,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,heat,R2,2050,2,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2055,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2055,4,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,heat,R2,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+7,heat,R1,2050,2,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2055,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2055,4,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,heat,R1,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,heat,R2,2050,2,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2055,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2055,4,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,heat,R2,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
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
new file mode 100644
index 00000000..e8d6cefe
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..2c4700cb
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
@@ -0,0 +1,9 @@
+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/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
new file mode 100644
index 00000000..18a470c4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
@@ -0,0 +1,9 @@
+asset,year,region,technology,installed,capacity
+0,2024,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2026,R1,gassupply1,2020,7.50000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2024,R2,gassupply1,2020,15.00000000000
+1,2025,R2,gassupply1,2020,15.00000000000
+1,2026,R2,gassupply1,2020,7.50000000000
+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
new file mode 100644
index 00000000..45bf7def
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
@@ -0,0 +1,7 @@
+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,R2,gassupply1,2020,7.50000000000
+1,2028,R2,gassupply1,2020,7.50000000000
+1,2030,R2,gassupply1,2020,7.50000000000
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
new file mode 100644
index 00000000..b30eb999
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
@@ -0,0 +1,5 @@
+asset,year,region,technology,installed,capacity
+0,2028,R1,gassupply1,2020,7.50000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2028,R2,gassupply1,2020,7.50000000000
+1,2030,R2,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..9cb8445b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2032,R1,gassupply1,2030,4.72790000000
+1,2035,R1,gassupply1,2030,4.72790000000
+1,2040,R1,gassupply1,2030,4.72790000000
+1,2045,R1,gassupply1,2030,4.72790000000
+1,2050,R1,gassupply1,2030,4.72790000000
+1,2066,R1,gassupply1,2030,4.72790000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2032,R2,gassupply1,2030,4.72790000000
+3,2035,R2,gassupply1,2030,4.72790000000
+3,2040,R2,gassupply1,2030,4.72790000000
+3,2045,R2,gassupply1,2030,4.72790000000
+3,2050,R2,gassupply1,2030,4.72790000000
+3,2066,R2,gassupply1,2030,4.72790000000
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
new file mode 100644
index 00000000..869e621d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+1,2032,R1,gassupply1,2030,4.72790000000
+1,2034,R1,gassupply1,2030,4.72790000000
+1,2035,R1,gassupply1,2030,4.72790000000
+1,2040,R1,gassupply1,2030,4.72790000000
+1,2045,R1,gassupply1,2030,4.72790000000
+1,2050,R1,gassupply1,2030,4.72790000000
+1,2066,R1,gassupply1,2030,4.72790000000
+3,2032,R2,gassupply1,2030,4.72790000000
+3,2034,R2,gassupply1,2030,4.72790000000
+3,2035,R2,gassupply1,2030,4.72790000000
+3,2040,R2,gassupply1,2030,4.72790000000
+3,2045,R2,gassupply1,2030,4.72790000000
+3,2050,R2,gassupply1,2030,4.72790000000
+3,2066,R2,gassupply1,2030,4.72790000000
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
new file mode 100644
index 00000000..1d874c3d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+1,2034,R1,gassupply1,2030,4.72790000000
+1,2035,R1,gassupply1,2030,4.72790000000
+1,2036,R1,gassupply1,2030,4.72790000000
+1,2040,R1,gassupply1,2030,4.72790000000
+1,2045,R1,gassupply1,2030,4.72790000000
+1,2050,R1,gassupply1,2030,4.72790000000
+1,2066,R1,gassupply1,2030,4.72790000000
+3,2034,R2,gassupply1,2030,4.72790000000
+3,2035,R2,gassupply1,2030,4.72790000000
+3,2036,R2,gassupply1,2030,4.72790000000
+3,2040,R2,gassupply1,2030,4.72790000000
+3,2045,R2,gassupply1,2030,4.72790000000
+3,2050,R2,gassupply1,2030,4.72790000000
+3,2066,R2,gassupply1,2030,4.72790000000
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
new file mode 100644
index 00000000..a9e5c62d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+1,2036,R1,gassupply1,2030,4.72790000000
+1,2038,R1,gassupply1,2030,4.72790000000
+1,2040,R1,gassupply1,2030,4.72790000000
+1,2045,R1,gassupply1,2030,4.72790000000
+1,2050,R1,gassupply1,2030,4.72790000000
+1,2066,R1,gassupply1,2030,4.72790000000
+3,2036,R2,gassupply1,2030,4.72790000000
+3,2038,R2,gassupply1,2030,4.72790000000
+3,2040,R2,gassupply1,2030,4.72790000000
+3,2045,R2,gassupply1,2030,4.72790000000
+3,2050,R2,gassupply1,2030,4.72790000000
+3,2066,R2,gassupply1,2030,4.72790000000
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
new file mode 100644
index 00000000..729ce412
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+1,2038,R1,gassupply1,2030,4.72790000000
+1,2040,R1,gassupply1,2030,4.72790000000
+1,2045,R1,gassupply1,2030,4.72790000000
+1,2050,R1,gassupply1,2030,4.72790000000
+1,2066,R1,gassupply1,2030,4.72790000000
+3,2038,R2,gassupply1,2030,4.72790000000
+3,2040,R2,gassupply1,2030,4.72790000000
+3,2045,R2,gassupply1,2030,4.72790000000
+3,2050,R2,gassupply1,2030,4.72790000000
+3,2066,R2,gassupply1,2030,4.72790000000
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
new file mode 100644
index 00000000..30a5fa0b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,11 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,4.72790000000
+1,2042,R1,gassupply1,2030,4.72790000000
+1,2045,R1,gassupply1,2030,4.72790000000
+1,2050,R1,gassupply1,2030,4.72790000000
+1,2066,R1,gassupply1,2030,4.72790000000
+3,2040,R2,gassupply1,2030,4.72790000000
+3,2042,R2,gassupply1,2030,4.72790000000
+3,2045,R2,gassupply1,2030,4.72790000000
+3,2050,R2,gassupply1,2030,4.72790000000
+3,2066,R2,gassupply1,2030,4.72790000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
new file mode 100644
index 00000000..71d791e1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -0,0 +1,255 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2022,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2022,14.04000000000
+gasboiler,R2,R2,A1,residential,retrofit,2022,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2022,14.04000000000
+gasCCGT,R1,R1,A1,power,retrofit,2022,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2022,3.79000000000
+windturbine,R1,R1,A1,power,retrofit,2022,8.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2022,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2022,11.79000000000
+gassupply1,R1,R1,A1,gas,retrofit,2022,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2022,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2024,5.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2024,0.55520000000
+heatpump,R1,R1,A1,residential,retrofit,2024,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2024,1.68480000000
+gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2024,0.55520000000
+heatpump,R2,R2,A1,residential,retrofit,2024,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2024,1.68480000000
+gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2024,3.79000000000
+windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2024,1.68480000000
+gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2024,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2024,1.68480000000
+gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2026,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2026,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2026,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2026,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2026,4.12700000000
+gasboiler,R2,R2,A1,residential,retrofit,2026,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2026,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2026,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2026,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2026,4.12700000000
+solarPV,R1,R1,A1,power,retrofit,2026,3.79000000000
+windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2026,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2026,6.37700000000
+windturbine,R2,R2,A1,power,retrofit,2026,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2026,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2026,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2028,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2028,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2028,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2028,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2028,4.12700000000
+heatpump,R1,R1,A1,residential,retrofit,2028,2.24000000000
+gasboiler,R2,R2,A1,residential,retrofit,2028,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2028,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2028,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2028,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2028,4.12700000000
+heatpump,R2,R2,A1,residential,retrofit,2028,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2028,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2028,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2028,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2028,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2028,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2028,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2028,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2028,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2030,14.04000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2030,4.12700000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2030,14.04000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2030,4.12700000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2030,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2030,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2030,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2030,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2030,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2032,0.55520000000
+gasboiler,R1,R1,A1,residential,retrofit,2032,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2032,1.68480000000
+heatpump,R1,R1,A1,residential,retrofit,2032,4.12700000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2032,16.28000000000
+gasboiler,R2,R2,A1,residential,retrofit,2032,0.55520000000
+gasboiler,R2,R2,A1,residential,retrofit,2032,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2032,1.68480000000
+heatpump,R2,R2,A1,residential,retrofit,2032,4.12700000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2032,16.28000000000
+solarPV,R1,R1,A1,power,retrofit,2032,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2032,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2032,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2032,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2032,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2032,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2032,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2032,4.72790000000
+gasboiler,R1,R1,A1,residential,retrofit,2034,3.11300000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.12700000000
+heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2034,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2034,4.48000000000
+gasboiler,R2,R2,A1,residential,retrofit,2034,3.11300000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.12700000000
+heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2034,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2034,4.48000000000
+solarPV,R1,R1,A1,power,retrofit,2034,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2034,2.79520000000
+windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2034,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2034,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2034,2.79520000000
+windturbine,R2,R2,A1,power,retrofit,2034,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2034,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2034,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2034,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2034,4.72790000000
+heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2036,9.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2036,9.48000000000
+solarPV,R1,R1,A1,power,retrofit,2036,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2036,2.79520000000
+solarPV,R1,R1,A1,power,retrofit,2036,5.35300000000
+windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2036,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2036,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2036,2.79520000000
+solarPV,R2,R2,A1,power,retrofit,2036,5.35300000000
+windturbine,R2,R2,A1,power,retrofit,2036,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2036,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2036,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2036,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2036,4.72790000000
+heatpump,R1,R1,A1,residential,retrofit,2038,2.24000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,9.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,2.24000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,9.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2038,4.48000000000
+solarPV,R1,R1,A1,power,retrofit,2038,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.79520000000
+solarPV,R1,R1,A1,power,retrofit,2038,5.35300000000
+solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2038,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2038,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.79520000000
+solarPV,R2,R2,A1,power,retrofit,2038,5.35300000000
+solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2038,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2038,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2038,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2038,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2038,4.72790000000
+heatpump,R1,R1,A1,residential,retrofit,2040,16.28000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,9.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,16.28000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,9.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
+solarPV,R1,R1,A1,power,retrofit,2040,3.79000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.79520000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.35300000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
+windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,1.68480000000
+windturbine,R1,R1,A1,power,retrofit,2040,6.37700000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.79520000000
+solarPV,R2,R2,A1,power,retrofit,2040,5.35300000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
+windturbine,R2,R2,A1,power,retrofit,2040,11.79000000000
+windturbine,R2,R2,A1,power,retrofit,2040,1.68480000000
+windturbine,R2,R2,A1,power,retrofit,2040,6.37700000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.72790000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,4.72790000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
new file mode 100644
index 00000000..4c4f6643
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -0,0 +1,705 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,16.44530000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,16.44530000000,2022
+"('all-year', 'all-week', 'night')",gas,R1,6.03250000000,2022
+"('all-year', 'all-week', 'night')",gas,R2,6.03250000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,80.14650000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,80.14650000000,2022
+"('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,16.47360000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,16.47360000000,2022
+"('all-year', 'all-week', 'morning')",gas,R1,6.03470000000,2022
+"('all-year', 'all-week', 'morning')",gas,R2,6.03470000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,80.20930000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,80.20930000000,2022
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.44530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.44530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.03250000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.03250000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.14650000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.14650000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.47360000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,16.47360000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.03470000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.03470000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.20930000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.20930000000,2022
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57740000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,16.57740000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.04270000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.04270000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.43950000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.43950000000,2022
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,16.51140000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'evening')",gas,R1,6.03760000000,2022
+"('all-year', 'all-week', 'evening')",gas,R2,6.03760000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,80.29300000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,80.29300000000,2022
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,16.51140000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.03760000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.03760000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.29300000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.29300000000,2022
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.51140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.03760000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.03760000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.29300000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.29300000000,2022
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,13.21480000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,13.21480000000,2024
+"('all-year', 'all-week', 'night')",gas,R1,4.83110000000,2024
+"('all-year', 'all-week', 'night')",gas,R2,4.83110000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,64.24340000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,64.24340000000,2024
+"('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,13.26250000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,13.26250000000,2024
+"('all-year', 'all-week', 'morning')",gas,R1,4.83510000000,2024
+"('all-year', 'all-week', 'morning')",gas,R2,4.83510000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,64.34790000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,64.34790000000,2024
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21480000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21480000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83110000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83110000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26250000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26250000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.83510000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.83510000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.34790000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.34790000000,2024
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.43760000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.43760000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.84950000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.84950000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.73210000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.73210000000,2024
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,13.32620000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,13.32620000000,2024
+"('all-year', 'all-week', 'evening')",gas,R1,4.84030000000,2024
+"('all-year', 'all-week', 'evening')",gas,R2,4.84030000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,64.48750000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,64.48750000000,2024
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.32620000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.32620000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.84030000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.84030000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.48750000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.48750000000,2024
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.32620000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.32620000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84030000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84030000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48750000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48750000000,2024
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,10.59000000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,10.59000000000,2026
+"('all-year', 'all-week', 'night')",gas,R1,3.87000000000,2026
+"('all-year', 'all-week', 'night')",gas,R2,3.87000000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,51.49270000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,51.49270000000,2026
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,10.63600000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,10.63600000000,2026
+"('all-year', 'all-week', 'morning')",gas,R1,3.87530000000,2026
+"('all-year', 'all-week', 'morning')",gas,R2,3.87530000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,51.61860000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,51.61860000000,2026
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.59000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.59000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.87000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.87000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.49270000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.49270000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63600000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63600000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.87530000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.87530000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.61860000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.61860000000,2026
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.80470000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,10.80470000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.89490000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.89490000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.08290000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.08290000000,2026
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,10.69740000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,10.69740000000,2026
+"('all-year', 'all-week', 'evening')",gas,R1,3.88250000000,2026
+"('all-year', 'all-week', 'evening')",gas,R2,3.88250000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,51.78700000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,51.78700000000,2026
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,10.69740000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,10.69740000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.88250000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.88250000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.78700000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.78700000000,2026
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.69740000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.69740000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88250000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88250000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.78700000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.78700000000,2026
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,8.49030000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,8.49030000000,2028
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2028
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,41.27710000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,41.27710000000,2028
+"('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,8.53490000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,8.53490000000,2028
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2028
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,41.41380000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,41.41380000000,2028
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.49030000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.49030000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27710000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27710000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53490000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53490000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41380000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41380000000,2028
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.69850000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.69850000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.91860000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.91860000000,2028
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,8.59440000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,8.59440000000,2028
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2028
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,41.59660000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,41.59660000000,2028
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.59440000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.59440000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.59660000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.59660000000,2028
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.59440000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.59440000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.59660000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.59660000000,2028
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,6.81040000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,6.81040000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,2.48600000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,2.48600000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,33.09270000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,33.09270000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,6.85390000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,6.85390000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,2.49340000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,2.49340000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,33.23280000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,33.23280000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.81040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.81040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.48600000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.48600000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.09270000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.09270000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85390000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85390000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.49340000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.49340000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.23280000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.23280000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.01340000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.01340000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.52040000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.52040000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.75120000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.75120000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,6.91190000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,6.91190000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,2.50320000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,2.50320000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,33.42050000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,33.42050000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,6.91190000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,6.91190000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.50320000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.50320000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.42050000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.42050000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.91190000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.91190000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.50320000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.50320000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.42050000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.42050000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,5.46650000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,5.46650000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,1.99390000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,1.99390000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,26.53660000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,26.53660000000,2032
+"('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,5.50900000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,5.50900000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,2.00200000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,2.00200000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,26.67580000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,26.67580000000,2032
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46650000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46650000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.99390000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.99390000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.53660000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.53660000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.50900000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,5.50900000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.00200000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.00200000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.67580000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,26.67580000000,2032
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.66510000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,5.66510000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.03160000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.03160000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.19160000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,27.19160000000,2032
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,5.56580000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,5.56580000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,2.01280000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,2.01280000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,26.86230000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,26.86230000000,2032
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56580000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56580000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.01280000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.01280000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,26.86230000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,26.86230000000,2032
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56580000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56580000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.01280000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.01280000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.86230000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.86230000000,2032
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,4.39120000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,4.39120000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,21.28170000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,21.28170000000,2034
+"('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,4.43300000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,4.43300000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,21.41580000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,21.41580000000,2034
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.39120000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.39120000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.28170000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.28170000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43300000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43300000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,21.41580000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,21.41580000000,2034
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58610000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58610000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,21.91370000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,21.91370000000,2034
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,4.48870000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,4.48870000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,21.59570000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,21.59570000000,2034
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48870000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48870000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,21.59570000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,21.59570000000,2034
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48870000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48870000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.59570000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.59570000000,2034
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,0.08880000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.08880000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.13980000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.13980000000,2036
+"('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12690000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12690000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.20140000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.20140000000,2036
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08880000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08880000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13980000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13980000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12690000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12690000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20140000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.20140000000,2036
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26650000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26650000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43620000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43620000000,2036
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17770000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17770000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.28520000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.28520000000,2036
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17770000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17770000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.28520000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.28520000000,2036
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17770000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17770000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28520000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28520000000,2036
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.08830000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.08830000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2038
+"('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12610000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12610000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,2038
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08830000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08830000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12610000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12610000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,2038
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26480000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26480000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06210000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06210000000,2038
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17650000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17650000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2038
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17650000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17650000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2038
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17650000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17650000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2038
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.08760000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08760000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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.12520000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12520000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,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', 'mid-afternoon')",electricity,R1,0.08760000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08760000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12520000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12520000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,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,0.26290000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26290000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06200000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06200000000,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,0.17520000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17520000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03620000000,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', 'early-morning')",electricity,R1,0.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17520000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03620000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03620000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03620000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03620000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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
new file mode 100644
index 00000000..19625311
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
@@ -0,0 +1,28 @@
+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,3.79000000000
+1,2025,R1,solarPV,2020,3.79000000000
+1,2030,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+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,11.79000000000
+4,2025,R2,windturbine,2020,11.79000000000
+4,2030,R2,windturbine,2020,11.79000000000
+4,2035,R2,windturbine,2020,11.79000000000
+4,2040,R2,windturbine,2020,11.79000000000
+4,2045,R2,windturbine,2020,11.79000000000
+4,2046,R2,windturbine,2020,11.79000000000
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
new file mode 100644
index 00000000..ec721811
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
@@ -0,0 +1,49 @@
+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,2022,R1,solarPV,2020,3.79000000000
+1,2024,R1,solarPV,2020,3.79000000000
+1,2025,R1,solarPV,2020,3.79000000000
+1,2030,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2022,R1,windturbine,2020,8.00000000000
+2,2024,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,2024,R1,windturbine,2022,1.68480000000
+3,2025,R1,windturbine,2022,1.68480000000
+3,2030,R1,windturbine,2022,1.68480000000
+3,2035,R1,windturbine,2022,1.68480000000
+3,2040,R1,windturbine,2022,1.68480000000
+3,2045,R1,windturbine,2022,1.68480000000
+3,2046,R1,windturbine,2022,1.68480000000
+3,2047,R1,windturbine,2022,1.68480000000
+3,2048,R1,windturbine,2022,1.68480000000
+4,2022,R2,gasCCGT,2020,1.00000000000
+4,2024,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+5,2022,R2,windturbine,2020,11.79000000000
+5,2024,R2,windturbine,2020,11.79000000000
+5,2025,R2,windturbine,2020,11.79000000000
+5,2030,R2,windturbine,2020,11.79000000000
+5,2035,R2,windturbine,2020,11.79000000000
+5,2040,R2,windturbine,2020,11.79000000000
+5,2045,R2,windturbine,2020,11.79000000000
+5,2046,R2,windturbine,2020,11.79000000000
+6,2024,R2,windturbine,2022,1.68480000000
+6,2025,R2,windturbine,2022,1.68480000000
+6,2030,R2,windturbine,2022,1.68480000000
+6,2035,R2,windturbine,2022,1.68480000000
+6,2040,R2,windturbine,2022,1.68480000000
+6,2045,R2,windturbine,2022,1.68480000000
+6,2046,R2,windturbine,2022,1.68480000000
+6,2047,R2,windturbine,2022,1.68480000000
+6,2048,R2,windturbine,2022,1.68480000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
new file mode 100644
index 00000000..418c25a1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -0,0 +1,69 @@
+asset,year,technology,region,installed,capacity
+0,2024,gasCCGT,R1,2020,1.00000000000
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2024,gasCCGT,R2,2020,1.00000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2024,solarPV,R1,2020,3.79000000000
+2,2025,solarPV,R1,2020,3.79000000000
+2,2026,solarPV,R1,2020,3.79000000000
+2,2030,solarPV,R1,2020,3.79000000000
+2,2035,solarPV,R1,2020,3.79000000000
+2,2040,solarPV,R1,2020,3.79000000000
+2,2045,solarPV,R1,2020,3.79000000000
+2,2046,solarPV,R1,2020,3.79000000000
+3,2024,windturbine,R1,2020,8.00000000000
+3,2025,windturbine,R1,2020,8.00000000000
+3,2026,windturbine,R1,2020,8.00000000000
+3,2030,windturbine,R1,2020,8.00000000000
+3,2035,windturbine,R1,2020,8.00000000000
+3,2040,windturbine,R1,2020,8.00000000000
+3,2045,windturbine,R1,2020,8.00000000000
+3,2046,windturbine,R1,2020,8.00000000000
+4,2024,windturbine,R1,2022,1.68480000000
+4,2025,windturbine,R1,2022,1.68480000000
+4,2026,windturbine,R1,2022,1.68480000000
+4,2030,windturbine,R1,2022,1.68480000000
+4,2035,windturbine,R1,2022,1.68480000000
+4,2040,windturbine,R1,2022,1.68480000000
+4,2045,windturbine,R1,2022,1.68480000000
+4,2046,windturbine,R1,2022,1.68480000000
+4,2047,windturbine,R1,2022,1.68480000000
+4,2048,windturbine,R1,2022,1.68480000000
+5,2026,windturbine,R1,2024,6.37700000000
+5,2030,windturbine,R1,2024,6.37700000000
+5,2035,windturbine,R1,2024,6.37700000000
+5,2040,windturbine,R1,2024,6.37700000000
+5,2045,windturbine,R1,2024,6.37700000000
+5,2046,windturbine,R1,2024,6.37700000000
+5,2047,windturbine,R1,2024,6.37700000000
+5,2048,windturbine,R1,2024,6.37700000000
+5,2049,windturbine,R1,2024,6.37700000000
+5,2050,windturbine,R1,2024,6.37700000000
+6,2024,windturbine,R2,2020,11.79000000000
+6,2025,windturbine,R2,2020,11.79000000000
+6,2026,windturbine,R2,2020,11.79000000000
+6,2030,windturbine,R2,2020,11.79000000000
+6,2035,windturbine,R2,2020,11.79000000000
+6,2040,windturbine,R2,2020,11.79000000000
+6,2045,windturbine,R2,2020,11.79000000000
+6,2046,windturbine,R2,2020,11.79000000000
+7,2024,windturbine,R2,2022,1.68480000000
+7,2025,windturbine,R2,2022,1.68480000000
+7,2026,windturbine,R2,2022,1.68480000000
+7,2030,windturbine,R2,2022,1.68480000000
+7,2035,windturbine,R2,2022,1.68480000000
+7,2040,windturbine,R2,2022,1.68480000000
+7,2045,windturbine,R2,2022,1.68480000000
+7,2046,windturbine,R2,2022,1.68480000000
+7,2047,windturbine,R2,2022,1.68480000000
+7,2048,windturbine,R2,2022,1.68480000000
+8,2026,windturbine,R2,2024,6.37700000000
+8,2030,windturbine,R2,2024,6.37700000000
+8,2035,windturbine,R2,2024,6.37700000000
+8,2040,windturbine,R2,2024,6.37700000000
+8,2045,windturbine,R2,2024,6.37700000000
+8,2046,windturbine,R2,2024,6.37700000000
+8,2047,windturbine,R2,2024,6.37700000000
+8,2048,windturbine,R2,2024,6.37700000000
+8,2049,windturbine,R2,2024,6.37700000000
+8,2050,windturbine,R2,2024,6.37700000000
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
new file mode 100644
index 00000000..0d001f3a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
@@ -0,0 +1,86 @@
+asset,year,region,technology,installed,capacity
+1,2026,R1,solarPV,2020,3.79000000000
+1,2028,R1,solarPV,2020,3.79000000000
+1,2030,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2028,R1,solarPV,2026,2.24000000000
+2,2030,R1,solarPV,2026,2.24000000000
+2,2035,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2026,R1,windturbine,2020,8.00000000000
+3,2028,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,2026,R1,windturbine,2022,1.68480000000
+4,2028,R1,windturbine,2022,1.68480000000
+4,2030,R1,windturbine,2022,1.68480000000
+4,2035,R1,windturbine,2022,1.68480000000
+4,2040,R1,windturbine,2022,1.68480000000
+4,2045,R1,windturbine,2022,1.68480000000
+4,2046,R1,windturbine,2022,1.68480000000
+4,2047,R1,windturbine,2022,1.68480000000
+4,2048,R1,windturbine,2022,1.68480000000
+5,2026,R1,windturbine,2024,6.37700000000
+5,2028,R1,windturbine,2024,6.37700000000
+5,2030,R1,windturbine,2024,6.37700000000
+5,2035,R1,windturbine,2024,6.37700000000
+5,2040,R1,windturbine,2024,6.37700000000
+5,2045,R1,windturbine,2024,6.37700000000
+5,2046,R1,windturbine,2024,6.37700000000
+5,2047,R1,windturbine,2024,6.37700000000
+5,2048,R1,windturbine,2024,6.37700000000
+5,2049,R1,windturbine,2024,6.37700000000
+5,2050,R1,windturbine,2024,6.37700000000
+7,2028,R2,solarPV,2026,2.24000000000
+7,2030,R2,solarPV,2026,2.24000000000
+7,2035,R2,solarPV,2026,2.24000000000
+7,2040,R2,solarPV,2026,2.24000000000
+7,2045,R2,solarPV,2026,2.24000000000
+7,2046,R2,solarPV,2026,2.24000000000
+7,2047,R2,solarPV,2026,2.24000000000
+7,2048,R2,solarPV,2026,2.24000000000
+7,2049,R2,solarPV,2026,2.24000000000
+7,2050,R2,solarPV,2026,2.24000000000
+7,2051,R2,solarPV,2026,2.24000000000
+7,2052,R2,solarPV,2026,2.24000000000
+8,2026,R2,windturbine,2020,11.79000000000
+8,2028,R2,windturbine,2020,11.79000000000
+8,2030,R2,windturbine,2020,11.79000000000
+8,2035,R2,windturbine,2020,11.79000000000
+8,2040,R2,windturbine,2020,11.79000000000
+8,2045,R2,windturbine,2020,11.79000000000
+8,2046,R2,windturbine,2020,11.79000000000
+9,2026,R2,windturbine,2022,1.68480000000
+9,2028,R2,windturbine,2022,1.68480000000
+9,2030,R2,windturbine,2022,1.68480000000
+9,2035,R2,windturbine,2022,1.68480000000
+9,2040,R2,windturbine,2022,1.68480000000
+9,2045,R2,windturbine,2022,1.68480000000
+9,2046,R2,windturbine,2022,1.68480000000
+9,2047,R2,windturbine,2022,1.68480000000
+9,2048,R2,windturbine,2022,1.68480000000
+10,2026,R2,windturbine,2024,6.37700000000
+10,2028,R2,windturbine,2024,6.37700000000
+10,2030,R2,windturbine,2024,6.37700000000
+10,2035,R2,windturbine,2024,6.37700000000
+10,2040,R2,windturbine,2024,6.37700000000
+10,2045,R2,windturbine,2024,6.37700000000
+10,2046,R2,windturbine,2024,6.37700000000
+10,2047,R2,windturbine,2024,6.37700000000
+10,2048,R2,windturbine,2024,6.37700000000
+10,2049,R2,windturbine,2024,6.37700000000
+10,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..9bf0ba7e
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
@@ -0,0 +1,105 @@
+asset,year,region,technology,installed,capacity
+1,2028,R1,solarPV,2020,3.79000000000
+1,2030,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2028,R1,solarPV,2026,2.24000000000
+2,2030,R1,solarPV,2026,2.24000000000
+2,2035,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2030,R1,solarPV,2028,2.24000000000
+3,2035,R1,solarPV,2028,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2028,R1,windturbine,2020,8.00000000000
+4,2030,R1,windturbine,2020,8.00000000000
+4,2035,R1,windturbine,2020,8.00000000000
+4,2040,R1,windturbine,2020,8.00000000000
+4,2045,R1,windturbine,2020,8.00000000000
+4,2046,R1,windturbine,2020,8.00000000000
+5,2028,R1,windturbine,2022,1.68480000000
+5,2030,R1,windturbine,2022,1.68480000000
+5,2035,R1,windturbine,2022,1.68480000000
+5,2040,R1,windturbine,2022,1.68480000000
+5,2045,R1,windturbine,2022,1.68480000000
+5,2046,R1,windturbine,2022,1.68480000000
+5,2047,R1,windturbine,2022,1.68480000000
+5,2048,R1,windturbine,2022,1.68480000000
+6,2028,R1,windturbine,2024,6.37700000000
+6,2030,R1,windturbine,2024,6.37700000000
+6,2035,R1,windturbine,2024,6.37700000000
+6,2040,R1,windturbine,2024,6.37700000000
+6,2045,R1,windturbine,2024,6.37700000000
+6,2046,R1,windturbine,2024,6.37700000000
+6,2047,R1,windturbine,2024,6.37700000000
+6,2048,R1,windturbine,2024,6.37700000000
+6,2049,R1,windturbine,2024,6.37700000000
+6,2050,R1,windturbine,2024,6.37700000000
+8,2028,R2,solarPV,2026,2.24000000000
+8,2030,R2,solarPV,2026,2.24000000000
+8,2035,R2,solarPV,2026,2.24000000000
+8,2040,R2,solarPV,2026,2.24000000000
+8,2045,R2,solarPV,2026,2.24000000000
+8,2046,R2,solarPV,2026,2.24000000000
+8,2047,R2,solarPV,2026,2.24000000000
+8,2048,R2,solarPV,2026,2.24000000000
+8,2049,R2,solarPV,2026,2.24000000000
+8,2050,R2,solarPV,2026,2.24000000000
+8,2051,R2,solarPV,2026,2.24000000000
+8,2052,R2,solarPV,2026,2.24000000000
+9,2030,R2,solarPV,2028,2.24000000000
+9,2035,R2,solarPV,2028,2.24000000000
+9,2040,R2,solarPV,2028,2.24000000000
+9,2045,R2,solarPV,2028,2.24000000000
+9,2046,R2,solarPV,2028,2.24000000000
+9,2047,R2,solarPV,2028,2.24000000000
+9,2048,R2,solarPV,2028,2.24000000000
+9,2049,R2,solarPV,2028,2.24000000000
+9,2050,R2,solarPV,2028,2.24000000000
+9,2051,R2,solarPV,2028,2.24000000000
+9,2052,R2,solarPV,2028,2.24000000000
+9,2053,R2,solarPV,2028,2.24000000000
+9,2054,R2,solarPV,2028,2.24000000000
+10,2028,R2,windturbine,2020,11.79000000000
+10,2030,R2,windturbine,2020,11.79000000000
+10,2035,R2,windturbine,2020,11.79000000000
+10,2040,R2,windturbine,2020,11.79000000000
+10,2045,R2,windturbine,2020,11.79000000000
+10,2046,R2,windturbine,2020,11.79000000000
+11,2028,R2,windturbine,2022,1.68480000000
+11,2030,R2,windturbine,2022,1.68480000000
+11,2035,R2,windturbine,2022,1.68480000000
+11,2040,R2,windturbine,2022,1.68480000000
+11,2045,R2,windturbine,2022,1.68480000000
+11,2046,R2,windturbine,2022,1.68480000000
+11,2047,R2,windturbine,2022,1.68480000000
+11,2048,R2,windturbine,2022,1.68480000000
+12,2028,R2,windturbine,2024,6.37700000000
+12,2030,R2,windturbine,2024,6.37700000000
+12,2035,R2,windturbine,2024,6.37700000000
+12,2040,R2,windturbine,2024,6.37700000000
+12,2045,R2,windturbine,2024,6.37700000000
+12,2046,R2,windturbine,2024,6.37700000000
+12,2047,R2,windturbine,2024,6.37700000000
+12,2048,R2,windturbine,2024,6.37700000000
+12,2049,R2,windturbine,2024,6.37700000000
+12,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..9bb3e7b7
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
@@ -0,0 +1,137 @@
+asset,year,region,technology,installed,capacity
+1,2030,R1,solarPV,2020,3.79000000000
+1,2032,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2030,R1,solarPV,2026,2.24000000000
+2,2032,R1,solarPV,2026,2.24000000000
+2,2035,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2030,R1,solarPV,2028,2.24000000000
+3,2032,R1,solarPV,2028,2.24000000000
+3,2035,R1,solarPV,2028,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2032,R1,solarPV,2030,2.24000000000
+4,2035,R1,solarPV,2030,2.24000000000
+4,2040,R1,solarPV,2030,2.24000000000
+4,2045,R1,solarPV,2030,2.24000000000
+4,2046,R1,solarPV,2030,2.24000000000
+4,2047,R1,solarPV,2030,2.24000000000
+4,2048,R1,solarPV,2030,2.24000000000
+4,2049,R1,solarPV,2030,2.24000000000
+4,2050,R1,solarPV,2030,2.24000000000
+4,2051,R1,solarPV,2030,2.24000000000
+4,2052,R1,solarPV,2030,2.24000000000
+4,2053,R1,solarPV,2030,2.24000000000
+4,2054,R1,solarPV,2030,2.24000000000
+4,2055,R1,solarPV,2030,2.24000000000
+4,2056,R1,solarPV,2030,2.24000000000
+5,2030,R1,windturbine,2020,8.00000000000
+5,2032,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,2030,R1,windturbine,2022,1.68480000000
+6,2032,R1,windturbine,2022,1.68480000000
+6,2035,R1,windturbine,2022,1.68480000000
+6,2040,R1,windturbine,2022,1.68480000000
+6,2045,R1,windturbine,2022,1.68480000000
+6,2046,R1,windturbine,2022,1.68480000000
+6,2047,R1,windturbine,2022,1.68480000000
+6,2048,R1,windturbine,2022,1.68480000000
+7,2030,R1,windturbine,2024,6.37700000000
+7,2032,R1,windturbine,2024,6.37700000000
+7,2035,R1,windturbine,2024,6.37700000000
+7,2040,R1,windturbine,2024,6.37700000000
+7,2045,R1,windturbine,2024,6.37700000000
+7,2046,R1,windturbine,2024,6.37700000000
+7,2047,R1,windturbine,2024,6.37700000000
+7,2048,R1,windturbine,2024,6.37700000000
+7,2049,R1,windturbine,2024,6.37700000000
+7,2050,R1,windturbine,2024,6.37700000000
+9,2030,R2,solarPV,2026,2.24000000000
+9,2032,R2,solarPV,2026,2.24000000000
+9,2035,R2,solarPV,2026,2.24000000000
+9,2040,R2,solarPV,2026,2.24000000000
+9,2045,R2,solarPV,2026,2.24000000000
+9,2046,R2,solarPV,2026,2.24000000000
+9,2047,R2,solarPV,2026,2.24000000000
+9,2048,R2,solarPV,2026,2.24000000000
+9,2049,R2,solarPV,2026,2.24000000000
+9,2050,R2,solarPV,2026,2.24000000000
+9,2051,R2,solarPV,2026,2.24000000000
+9,2052,R2,solarPV,2026,2.24000000000
+10,2030,R2,solarPV,2028,2.24000000000
+10,2032,R2,solarPV,2028,2.24000000000
+10,2035,R2,solarPV,2028,2.24000000000
+10,2040,R2,solarPV,2028,2.24000000000
+10,2045,R2,solarPV,2028,2.24000000000
+10,2046,R2,solarPV,2028,2.24000000000
+10,2047,R2,solarPV,2028,2.24000000000
+10,2048,R2,solarPV,2028,2.24000000000
+10,2049,R2,solarPV,2028,2.24000000000
+10,2050,R2,solarPV,2028,2.24000000000
+10,2051,R2,solarPV,2028,2.24000000000
+10,2052,R2,solarPV,2028,2.24000000000
+10,2053,R2,solarPV,2028,2.24000000000
+10,2054,R2,solarPV,2028,2.24000000000
+11,2032,R2,solarPV,2030,2.24000000000
+11,2035,R2,solarPV,2030,2.24000000000
+11,2040,R2,solarPV,2030,2.24000000000
+11,2045,R2,solarPV,2030,2.24000000000
+11,2046,R2,solarPV,2030,2.24000000000
+11,2047,R2,solarPV,2030,2.24000000000
+11,2048,R2,solarPV,2030,2.24000000000
+11,2049,R2,solarPV,2030,2.24000000000
+11,2050,R2,solarPV,2030,2.24000000000
+11,2051,R2,solarPV,2030,2.24000000000
+11,2052,R2,solarPV,2030,2.24000000000
+11,2053,R2,solarPV,2030,2.24000000000
+11,2054,R2,solarPV,2030,2.24000000000
+11,2055,R2,solarPV,2030,2.24000000000
+11,2056,R2,solarPV,2030,2.24000000000
+12,2030,R2,windturbine,2020,11.79000000000
+12,2032,R2,windturbine,2020,11.79000000000
+12,2035,R2,windturbine,2020,11.79000000000
+12,2040,R2,windturbine,2020,11.79000000000
+12,2045,R2,windturbine,2020,11.79000000000
+12,2046,R2,windturbine,2020,11.79000000000
+13,2030,R2,windturbine,2022,1.68480000000
+13,2032,R2,windturbine,2022,1.68480000000
+13,2035,R2,windturbine,2022,1.68480000000
+13,2040,R2,windturbine,2022,1.68480000000
+13,2045,R2,windturbine,2022,1.68480000000
+13,2046,R2,windturbine,2022,1.68480000000
+13,2047,R2,windturbine,2022,1.68480000000
+13,2048,R2,windturbine,2022,1.68480000000
+14,2030,R2,windturbine,2024,6.37700000000
+14,2032,R2,windturbine,2024,6.37700000000
+14,2035,R2,windturbine,2024,6.37700000000
+14,2040,R2,windturbine,2024,6.37700000000
+14,2045,R2,windturbine,2024,6.37700000000
+14,2046,R2,windturbine,2024,6.37700000000
+14,2047,R2,windturbine,2024,6.37700000000
+14,2048,R2,windturbine,2024,6.37700000000
+14,2049,R2,windturbine,2024,6.37700000000
+14,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..a0b82be0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
@@ -0,0 +1,173 @@
+asset,year,region,technology,installed,capacity
+1,2032,R1,solarPV,2020,3.79000000000
+1,2034,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2032,R1,solarPV,2026,2.24000000000
+2,2034,R1,solarPV,2026,2.24000000000
+2,2035,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2032,R1,solarPV,2028,2.24000000000
+3,2034,R1,solarPV,2028,2.24000000000
+3,2035,R1,solarPV,2028,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2032,R1,solarPV,2030,2.24000000000
+4,2034,R1,solarPV,2030,2.24000000000
+4,2035,R1,solarPV,2030,2.24000000000
+4,2040,R1,solarPV,2030,2.24000000000
+4,2045,R1,solarPV,2030,2.24000000000
+4,2046,R1,solarPV,2030,2.24000000000
+4,2047,R1,solarPV,2030,2.24000000000
+4,2048,R1,solarPV,2030,2.24000000000
+4,2049,R1,solarPV,2030,2.24000000000
+4,2050,R1,solarPV,2030,2.24000000000
+4,2051,R1,solarPV,2030,2.24000000000
+4,2052,R1,solarPV,2030,2.24000000000
+4,2053,R1,solarPV,2030,2.24000000000
+4,2054,R1,solarPV,2030,2.24000000000
+4,2055,R1,solarPV,2030,2.24000000000
+4,2056,R1,solarPV,2030,2.24000000000
+5,2034,R1,solarPV,2032,2.79520000000
+5,2035,R1,solarPV,2032,2.79520000000
+5,2040,R1,solarPV,2032,2.79520000000
+5,2045,R1,solarPV,2032,2.79520000000
+5,2046,R1,solarPV,2032,2.79520000000
+5,2047,R1,solarPV,2032,2.79520000000
+5,2048,R1,solarPV,2032,2.79520000000
+5,2049,R1,solarPV,2032,2.79520000000
+5,2050,R1,solarPV,2032,2.79520000000
+5,2051,R1,solarPV,2032,2.79520000000
+5,2052,R1,solarPV,2032,2.79520000000
+5,2053,R1,solarPV,2032,2.79520000000
+5,2054,R1,solarPV,2032,2.79520000000
+5,2055,R1,solarPV,2032,2.79520000000
+5,2056,R1,solarPV,2032,2.79520000000
+5,2057,R1,solarPV,2032,2.79520000000
+5,2058,R1,solarPV,2032,2.79520000000
+6,2032,R1,windturbine,2020,8.00000000000
+6,2034,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,2032,R1,windturbine,2022,1.68480000000
+7,2034,R1,windturbine,2022,1.68480000000
+7,2035,R1,windturbine,2022,1.68480000000
+7,2040,R1,windturbine,2022,1.68480000000
+7,2045,R1,windturbine,2022,1.68480000000
+7,2046,R1,windturbine,2022,1.68480000000
+7,2047,R1,windturbine,2022,1.68480000000
+7,2048,R1,windturbine,2022,1.68480000000
+8,2032,R1,windturbine,2024,6.37700000000
+8,2034,R1,windturbine,2024,6.37700000000
+8,2035,R1,windturbine,2024,6.37700000000
+8,2040,R1,windturbine,2024,6.37700000000
+8,2045,R1,windturbine,2024,6.37700000000
+8,2046,R1,windturbine,2024,6.37700000000
+8,2047,R1,windturbine,2024,6.37700000000
+8,2048,R1,windturbine,2024,6.37700000000
+8,2049,R1,windturbine,2024,6.37700000000
+8,2050,R1,windturbine,2024,6.37700000000
+10,2032,R2,solarPV,2026,2.24000000000
+10,2034,R2,solarPV,2026,2.24000000000
+10,2035,R2,solarPV,2026,2.24000000000
+10,2040,R2,solarPV,2026,2.24000000000
+10,2045,R2,solarPV,2026,2.24000000000
+10,2046,R2,solarPV,2026,2.24000000000
+10,2047,R2,solarPV,2026,2.24000000000
+10,2048,R2,solarPV,2026,2.24000000000
+10,2049,R2,solarPV,2026,2.24000000000
+10,2050,R2,solarPV,2026,2.24000000000
+10,2051,R2,solarPV,2026,2.24000000000
+10,2052,R2,solarPV,2026,2.24000000000
+11,2032,R2,solarPV,2028,2.24000000000
+11,2034,R2,solarPV,2028,2.24000000000
+11,2035,R2,solarPV,2028,2.24000000000
+11,2040,R2,solarPV,2028,2.24000000000
+11,2045,R2,solarPV,2028,2.24000000000
+11,2046,R2,solarPV,2028,2.24000000000
+11,2047,R2,solarPV,2028,2.24000000000
+11,2048,R2,solarPV,2028,2.24000000000
+11,2049,R2,solarPV,2028,2.24000000000
+11,2050,R2,solarPV,2028,2.24000000000
+11,2051,R2,solarPV,2028,2.24000000000
+11,2052,R2,solarPV,2028,2.24000000000
+11,2053,R2,solarPV,2028,2.24000000000
+11,2054,R2,solarPV,2028,2.24000000000
+12,2032,R2,solarPV,2030,2.24000000000
+12,2034,R2,solarPV,2030,2.24000000000
+12,2035,R2,solarPV,2030,2.24000000000
+12,2040,R2,solarPV,2030,2.24000000000
+12,2045,R2,solarPV,2030,2.24000000000
+12,2046,R2,solarPV,2030,2.24000000000
+12,2047,R2,solarPV,2030,2.24000000000
+12,2048,R2,solarPV,2030,2.24000000000
+12,2049,R2,solarPV,2030,2.24000000000
+12,2050,R2,solarPV,2030,2.24000000000
+12,2051,R2,solarPV,2030,2.24000000000
+12,2052,R2,solarPV,2030,2.24000000000
+12,2053,R2,solarPV,2030,2.24000000000
+12,2054,R2,solarPV,2030,2.24000000000
+12,2055,R2,solarPV,2030,2.24000000000
+12,2056,R2,solarPV,2030,2.24000000000
+13,2034,R2,solarPV,2032,2.79520000000
+13,2035,R2,solarPV,2032,2.79520000000
+13,2040,R2,solarPV,2032,2.79520000000
+13,2045,R2,solarPV,2032,2.79520000000
+13,2046,R2,solarPV,2032,2.79520000000
+13,2047,R2,solarPV,2032,2.79520000000
+13,2048,R2,solarPV,2032,2.79520000000
+13,2049,R2,solarPV,2032,2.79520000000
+13,2050,R2,solarPV,2032,2.79520000000
+13,2051,R2,solarPV,2032,2.79520000000
+13,2052,R2,solarPV,2032,2.79520000000
+13,2053,R2,solarPV,2032,2.79520000000
+13,2054,R2,solarPV,2032,2.79520000000
+13,2055,R2,solarPV,2032,2.79520000000
+13,2056,R2,solarPV,2032,2.79520000000
+13,2057,R2,solarPV,2032,2.79520000000
+13,2058,R2,solarPV,2032,2.79520000000
+14,2032,R2,windturbine,2020,11.79000000000
+14,2034,R2,windturbine,2020,11.79000000000
+14,2035,R2,windturbine,2020,11.79000000000
+14,2040,R2,windturbine,2020,11.79000000000
+14,2045,R2,windturbine,2020,11.79000000000
+14,2046,R2,windturbine,2020,11.79000000000
+15,2032,R2,windturbine,2022,1.68480000000
+15,2034,R2,windturbine,2022,1.68480000000
+15,2035,R2,windturbine,2022,1.68480000000
+15,2040,R2,windturbine,2022,1.68480000000
+15,2045,R2,windturbine,2022,1.68480000000
+15,2046,R2,windturbine,2022,1.68480000000
+15,2047,R2,windturbine,2022,1.68480000000
+15,2048,R2,windturbine,2022,1.68480000000
+16,2032,R2,windturbine,2024,6.37700000000
+16,2034,R2,windturbine,2024,6.37700000000
+16,2035,R2,windturbine,2024,6.37700000000
+16,2040,R2,windturbine,2024,6.37700000000
+16,2045,R2,windturbine,2024,6.37700000000
+16,2046,R2,windturbine,2024,6.37700000000
+16,2047,R2,windturbine,2024,6.37700000000
+16,2048,R2,windturbine,2024,6.37700000000
+16,2049,R2,windturbine,2024,6.37700000000
+16,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..95d93dc5
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
@@ -0,0 +1,211 @@
+asset,year,region,technology,installed,capacity
+1,2034,R1,solarPV,2020,3.79000000000
+1,2035,R1,solarPV,2020,3.79000000000
+1,2036,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2034,R1,solarPV,2026,2.24000000000
+2,2035,R1,solarPV,2026,2.24000000000
+2,2036,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2034,R1,solarPV,2028,2.24000000000
+3,2035,R1,solarPV,2028,2.24000000000
+3,2036,R1,solarPV,2028,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2034,R1,solarPV,2030,2.24000000000
+4,2035,R1,solarPV,2030,2.24000000000
+4,2036,R1,solarPV,2030,2.24000000000
+4,2040,R1,solarPV,2030,2.24000000000
+4,2045,R1,solarPV,2030,2.24000000000
+4,2046,R1,solarPV,2030,2.24000000000
+4,2047,R1,solarPV,2030,2.24000000000
+4,2048,R1,solarPV,2030,2.24000000000
+4,2049,R1,solarPV,2030,2.24000000000
+4,2050,R1,solarPV,2030,2.24000000000
+4,2051,R1,solarPV,2030,2.24000000000
+4,2052,R1,solarPV,2030,2.24000000000
+4,2053,R1,solarPV,2030,2.24000000000
+4,2054,R1,solarPV,2030,2.24000000000
+4,2055,R1,solarPV,2030,2.24000000000
+4,2056,R1,solarPV,2030,2.24000000000
+5,2034,R1,solarPV,2032,2.79520000000
+5,2035,R1,solarPV,2032,2.79520000000
+5,2036,R1,solarPV,2032,2.79520000000
+5,2040,R1,solarPV,2032,2.79520000000
+5,2045,R1,solarPV,2032,2.79520000000
+5,2046,R1,solarPV,2032,2.79520000000
+5,2047,R1,solarPV,2032,2.79520000000
+5,2048,R1,solarPV,2032,2.79520000000
+5,2049,R1,solarPV,2032,2.79520000000
+5,2050,R1,solarPV,2032,2.79520000000
+5,2051,R1,solarPV,2032,2.79520000000
+5,2052,R1,solarPV,2032,2.79520000000
+5,2053,R1,solarPV,2032,2.79520000000
+5,2054,R1,solarPV,2032,2.79520000000
+5,2055,R1,solarPV,2032,2.79520000000
+5,2056,R1,solarPV,2032,2.79520000000
+5,2057,R1,solarPV,2032,2.79520000000
+5,2058,R1,solarPV,2032,2.79520000000
+6,2036,R1,solarPV,2034,5.35300000000
+6,2040,R1,solarPV,2034,5.35300000000
+6,2045,R1,solarPV,2034,5.35300000000
+6,2046,R1,solarPV,2034,5.35300000000
+6,2047,R1,solarPV,2034,5.35300000000
+6,2048,R1,solarPV,2034,5.35300000000
+6,2049,R1,solarPV,2034,5.35300000000
+6,2050,R1,solarPV,2034,5.35300000000
+6,2051,R1,solarPV,2034,5.35300000000
+6,2052,R1,solarPV,2034,5.35300000000
+6,2053,R1,solarPV,2034,5.35300000000
+6,2054,R1,solarPV,2034,5.35300000000
+6,2055,R1,solarPV,2034,5.35300000000
+6,2056,R1,solarPV,2034,5.35300000000
+6,2057,R1,solarPV,2034,5.35300000000
+6,2058,R1,solarPV,2034,5.35300000000
+6,2059,R1,solarPV,2034,5.35300000000
+6,2060,R1,solarPV,2034,5.35300000000
+7,2034,R1,windturbine,2020,8.00000000000
+7,2035,R1,windturbine,2020,8.00000000000
+7,2036,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,2034,R1,windturbine,2022,1.68480000000
+8,2035,R1,windturbine,2022,1.68480000000
+8,2036,R1,windturbine,2022,1.68480000000
+8,2040,R1,windturbine,2022,1.68480000000
+8,2045,R1,windturbine,2022,1.68480000000
+8,2046,R1,windturbine,2022,1.68480000000
+8,2047,R1,windturbine,2022,1.68480000000
+8,2048,R1,windturbine,2022,1.68480000000
+9,2034,R1,windturbine,2024,6.37700000000
+9,2035,R1,windturbine,2024,6.37700000000
+9,2036,R1,windturbine,2024,6.37700000000
+9,2040,R1,windturbine,2024,6.37700000000
+9,2045,R1,windturbine,2024,6.37700000000
+9,2046,R1,windturbine,2024,6.37700000000
+9,2047,R1,windturbine,2024,6.37700000000
+9,2048,R1,windturbine,2024,6.37700000000
+9,2049,R1,windturbine,2024,6.37700000000
+9,2050,R1,windturbine,2024,6.37700000000
+11,2034,R2,solarPV,2026,2.24000000000
+11,2035,R2,solarPV,2026,2.24000000000
+11,2036,R2,solarPV,2026,2.24000000000
+11,2040,R2,solarPV,2026,2.24000000000
+11,2045,R2,solarPV,2026,2.24000000000
+11,2046,R2,solarPV,2026,2.24000000000
+11,2047,R2,solarPV,2026,2.24000000000
+11,2048,R2,solarPV,2026,2.24000000000
+11,2049,R2,solarPV,2026,2.24000000000
+11,2050,R2,solarPV,2026,2.24000000000
+11,2051,R2,solarPV,2026,2.24000000000
+11,2052,R2,solarPV,2026,2.24000000000
+12,2034,R2,solarPV,2028,2.24000000000
+12,2035,R2,solarPV,2028,2.24000000000
+12,2036,R2,solarPV,2028,2.24000000000
+12,2040,R2,solarPV,2028,2.24000000000
+12,2045,R2,solarPV,2028,2.24000000000
+12,2046,R2,solarPV,2028,2.24000000000
+12,2047,R2,solarPV,2028,2.24000000000
+12,2048,R2,solarPV,2028,2.24000000000
+12,2049,R2,solarPV,2028,2.24000000000
+12,2050,R2,solarPV,2028,2.24000000000
+12,2051,R2,solarPV,2028,2.24000000000
+12,2052,R2,solarPV,2028,2.24000000000
+12,2053,R2,solarPV,2028,2.24000000000
+12,2054,R2,solarPV,2028,2.24000000000
+13,2034,R2,solarPV,2030,2.24000000000
+13,2035,R2,solarPV,2030,2.24000000000
+13,2036,R2,solarPV,2030,2.24000000000
+13,2040,R2,solarPV,2030,2.24000000000
+13,2045,R2,solarPV,2030,2.24000000000
+13,2046,R2,solarPV,2030,2.24000000000
+13,2047,R2,solarPV,2030,2.24000000000
+13,2048,R2,solarPV,2030,2.24000000000
+13,2049,R2,solarPV,2030,2.24000000000
+13,2050,R2,solarPV,2030,2.24000000000
+13,2051,R2,solarPV,2030,2.24000000000
+13,2052,R2,solarPV,2030,2.24000000000
+13,2053,R2,solarPV,2030,2.24000000000
+13,2054,R2,solarPV,2030,2.24000000000
+13,2055,R2,solarPV,2030,2.24000000000
+13,2056,R2,solarPV,2030,2.24000000000
+14,2034,R2,solarPV,2032,2.79520000000
+14,2035,R2,solarPV,2032,2.79520000000
+14,2036,R2,solarPV,2032,2.79520000000
+14,2040,R2,solarPV,2032,2.79520000000
+14,2045,R2,solarPV,2032,2.79520000000
+14,2046,R2,solarPV,2032,2.79520000000
+14,2047,R2,solarPV,2032,2.79520000000
+14,2048,R2,solarPV,2032,2.79520000000
+14,2049,R2,solarPV,2032,2.79520000000
+14,2050,R2,solarPV,2032,2.79520000000
+14,2051,R2,solarPV,2032,2.79520000000
+14,2052,R2,solarPV,2032,2.79520000000
+14,2053,R2,solarPV,2032,2.79520000000
+14,2054,R2,solarPV,2032,2.79520000000
+14,2055,R2,solarPV,2032,2.79520000000
+14,2056,R2,solarPV,2032,2.79520000000
+14,2057,R2,solarPV,2032,2.79520000000
+14,2058,R2,solarPV,2032,2.79520000000
+15,2036,R2,solarPV,2034,5.35300000000
+15,2040,R2,solarPV,2034,5.35300000000
+15,2045,R2,solarPV,2034,5.35300000000
+15,2046,R2,solarPV,2034,5.35300000000
+15,2047,R2,solarPV,2034,5.35300000000
+15,2048,R2,solarPV,2034,5.35300000000
+15,2049,R2,solarPV,2034,5.35300000000
+15,2050,R2,solarPV,2034,5.35300000000
+15,2051,R2,solarPV,2034,5.35300000000
+15,2052,R2,solarPV,2034,5.35300000000
+15,2053,R2,solarPV,2034,5.35300000000
+15,2054,R2,solarPV,2034,5.35300000000
+15,2055,R2,solarPV,2034,5.35300000000
+15,2056,R2,solarPV,2034,5.35300000000
+15,2057,R2,solarPV,2034,5.35300000000
+15,2058,R2,solarPV,2034,5.35300000000
+15,2059,R2,solarPV,2034,5.35300000000
+15,2060,R2,solarPV,2034,5.35300000000
+16,2034,R2,windturbine,2020,11.79000000000
+16,2035,R2,windturbine,2020,11.79000000000
+16,2036,R2,windturbine,2020,11.79000000000
+16,2040,R2,windturbine,2020,11.79000000000
+16,2045,R2,windturbine,2020,11.79000000000
+16,2046,R2,windturbine,2020,11.79000000000
+17,2034,R2,windturbine,2022,1.68480000000
+17,2035,R2,windturbine,2022,1.68480000000
+17,2036,R2,windturbine,2022,1.68480000000
+17,2040,R2,windturbine,2022,1.68480000000
+17,2045,R2,windturbine,2022,1.68480000000
+17,2046,R2,windturbine,2022,1.68480000000
+17,2047,R2,windturbine,2022,1.68480000000
+17,2048,R2,windturbine,2022,1.68480000000
+18,2034,R2,windturbine,2024,6.37700000000
+18,2035,R2,windturbine,2024,6.37700000000
+18,2036,R2,windturbine,2024,6.37700000000
+18,2040,R2,windturbine,2024,6.37700000000
+18,2045,R2,windturbine,2024,6.37700000000
+18,2046,R2,windturbine,2024,6.37700000000
+18,2047,R2,windturbine,2024,6.37700000000
+18,2048,R2,windturbine,2024,6.37700000000
+18,2049,R2,windturbine,2024,6.37700000000
+18,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..4e17e614
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
@@ -0,0 +1,238 @@
+asset,year,region,technology,installed,capacity
+1,2036,R1,solarPV,2020,3.79000000000
+1,2038,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2036,R1,solarPV,2026,2.24000000000
+2,2038,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2036,R1,solarPV,2028,2.24000000000
+3,2038,R1,solarPV,2028,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2036,R1,solarPV,2030,2.24000000000
+4,2038,R1,solarPV,2030,2.24000000000
+4,2040,R1,solarPV,2030,2.24000000000
+4,2045,R1,solarPV,2030,2.24000000000
+4,2046,R1,solarPV,2030,2.24000000000
+4,2047,R1,solarPV,2030,2.24000000000
+4,2048,R1,solarPV,2030,2.24000000000
+4,2049,R1,solarPV,2030,2.24000000000
+4,2050,R1,solarPV,2030,2.24000000000
+4,2051,R1,solarPV,2030,2.24000000000
+4,2052,R1,solarPV,2030,2.24000000000
+4,2053,R1,solarPV,2030,2.24000000000
+4,2054,R1,solarPV,2030,2.24000000000
+4,2055,R1,solarPV,2030,2.24000000000
+4,2056,R1,solarPV,2030,2.24000000000
+5,2036,R1,solarPV,2032,2.79520000000
+5,2038,R1,solarPV,2032,2.79520000000
+5,2040,R1,solarPV,2032,2.79520000000
+5,2045,R1,solarPV,2032,2.79520000000
+5,2046,R1,solarPV,2032,2.79520000000
+5,2047,R1,solarPV,2032,2.79520000000
+5,2048,R1,solarPV,2032,2.79520000000
+5,2049,R1,solarPV,2032,2.79520000000
+5,2050,R1,solarPV,2032,2.79520000000
+5,2051,R1,solarPV,2032,2.79520000000
+5,2052,R1,solarPV,2032,2.79520000000
+5,2053,R1,solarPV,2032,2.79520000000
+5,2054,R1,solarPV,2032,2.79520000000
+5,2055,R1,solarPV,2032,2.79520000000
+5,2056,R1,solarPV,2032,2.79520000000
+5,2057,R1,solarPV,2032,2.79520000000
+5,2058,R1,solarPV,2032,2.79520000000
+6,2036,R1,solarPV,2034,5.35300000000
+6,2038,R1,solarPV,2034,5.35300000000
+6,2040,R1,solarPV,2034,5.35300000000
+6,2045,R1,solarPV,2034,5.35300000000
+6,2046,R1,solarPV,2034,5.35300000000
+6,2047,R1,solarPV,2034,5.35300000000
+6,2048,R1,solarPV,2034,5.35300000000
+6,2049,R1,solarPV,2034,5.35300000000
+6,2050,R1,solarPV,2034,5.35300000000
+6,2051,R1,solarPV,2034,5.35300000000
+6,2052,R1,solarPV,2034,5.35300000000
+6,2053,R1,solarPV,2034,5.35300000000
+6,2054,R1,solarPV,2034,5.35300000000
+6,2055,R1,solarPV,2034,5.35300000000
+6,2056,R1,solarPV,2034,5.35300000000
+6,2057,R1,solarPV,2034,5.35300000000
+6,2058,R1,solarPV,2034,5.35300000000
+6,2059,R1,solarPV,2034,5.35300000000
+6,2060,R1,solarPV,2034,5.35300000000
+7,2038,R1,solarPV,2036,2.24000000000
+7,2040,R1,solarPV,2036,2.24000000000
+7,2045,R1,solarPV,2036,2.24000000000
+7,2046,R1,solarPV,2036,2.24000000000
+7,2047,R1,solarPV,2036,2.24000000000
+7,2048,R1,solarPV,2036,2.24000000000
+7,2049,R1,solarPV,2036,2.24000000000
+7,2050,R1,solarPV,2036,2.24000000000
+7,2051,R1,solarPV,2036,2.24000000000
+7,2052,R1,solarPV,2036,2.24000000000
+7,2053,R1,solarPV,2036,2.24000000000
+7,2054,R1,solarPV,2036,2.24000000000
+7,2055,R1,solarPV,2036,2.24000000000
+7,2056,R1,solarPV,2036,2.24000000000
+7,2057,R1,solarPV,2036,2.24000000000
+7,2058,R1,solarPV,2036,2.24000000000
+7,2059,R1,solarPV,2036,2.24000000000
+7,2060,R1,solarPV,2036,2.24000000000
+7,2061,R1,solarPV,2036,2.24000000000
+7,2062,R1,solarPV,2036,2.24000000000
+8,2036,R1,windturbine,2020,8.00000000000
+8,2038,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,2036,R1,windturbine,2022,1.68480000000
+9,2038,R1,windturbine,2022,1.68480000000
+9,2040,R1,windturbine,2022,1.68480000000
+9,2045,R1,windturbine,2022,1.68480000000
+9,2046,R1,windturbine,2022,1.68480000000
+9,2047,R1,windturbine,2022,1.68480000000
+9,2048,R1,windturbine,2022,1.68480000000
+10,2036,R1,windturbine,2024,6.37700000000
+10,2038,R1,windturbine,2024,6.37700000000
+10,2040,R1,windturbine,2024,6.37700000000
+10,2045,R1,windturbine,2024,6.37700000000
+10,2046,R1,windturbine,2024,6.37700000000
+10,2047,R1,windturbine,2024,6.37700000000
+10,2048,R1,windturbine,2024,6.37700000000
+10,2049,R1,windturbine,2024,6.37700000000
+10,2050,R1,windturbine,2024,6.37700000000
+12,2036,R2,solarPV,2026,2.24000000000
+12,2038,R2,solarPV,2026,2.24000000000
+12,2040,R2,solarPV,2026,2.24000000000
+12,2045,R2,solarPV,2026,2.24000000000
+12,2046,R2,solarPV,2026,2.24000000000
+12,2047,R2,solarPV,2026,2.24000000000
+12,2048,R2,solarPV,2026,2.24000000000
+12,2049,R2,solarPV,2026,2.24000000000
+12,2050,R2,solarPV,2026,2.24000000000
+12,2051,R2,solarPV,2026,2.24000000000
+12,2052,R2,solarPV,2026,2.24000000000
+13,2036,R2,solarPV,2028,2.24000000000
+13,2038,R2,solarPV,2028,2.24000000000
+13,2040,R2,solarPV,2028,2.24000000000
+13,2045,R2,solarPV,2028,2.24000000000
+13,2046,R2,solarPV,2028,2.24000000000
+13,2047,R2,solarPV,2028,2.24000000000
+13,2048,R2,solarPV,2028,2.24000000000
+13,2049,R2,solarPV,2028,2.24000000000
+13,2050,R2,solarPV,2028,2.24000000000
+13,2051,R2,solarPV,2028,2.24000000000
+13,2052,R2,solarPV,2028,2.24000000000
+13,2053,R2,solarPV,2028,2.24000000000
+13,2054,R2,solarPV,2028,2.24000000000
+14,2036,R2,solarPV,2030,2.24000000000
+14,2038,R2,solarPV,2030,2.24000000000
+14,2040,R2,solarPV,2030,2.24000000000
+14,2045,R2,solarPV,2030,2.24000000000
+14,2046,R2,solarPV,2030,2.24000000000
+14,2047,R2,solarPV,2030,2.24000000000
+14,2048,R2,solarPV,2030,2.24000000000
+14,2049,R2,solarPV,2030,2.24000000000
+14,2050,R2,solarPV,2030,2.24000000000
+14,2051,R2,solarPV,2030,2.24000000000
+14,2052,R2,solarPV,2030,2.24000000000
+14,2053,R2,solarPV,2030,2.24000000000
+14,2054,R2,solarPV,2030,2.24000000000
+14,2055,R2,solarPV,2030,2.24000000000
+14,2056,R2,solarPV,2030,2.24000000000
+15,2036,R2,solarPV,2032,2.79520000000
+15,2038,R2,solarPV,2032,2.79520000000
+15,2040,R2,solarPV,2032,2.79520000000
+15,2045,R2,solarPV,2032,2.79520000000
+15,2046,R2,solarPV,2032,2.79520000000
+15,2047,R2,solarPV,2032,2.79520000000
+15,2048,R2,solarPV,2032,2.79520000000
+15,2049,R2,solarPV,2032,2.79520000000
+15,2050,R2,solarPV,2032,2.79520000000
+15,2051,R2,solarPV,2032,2.79520000000
+15,2052,R2,solarPV,2032,2.79520000000
+15,2053,R2,solarPV,2032,2.79520000000
+15,2054,R2,solarPV,2032,2.79520000000
+15,2055,R2,solarPV,2032,2.79520000000
+15,2056,R2,solarPV,2032,2.79520000000
+15,2057,R2,solarPV,2032,2.79520000000
+15,2058,R2,solarPV,2032,2.79520000000
+16,2036,R2,solarPV,2034,5.35300000000
+16,2038,R2,solarPV,2034,5.35300000000
+16,2040,R2,solarPV,2034,5.35300000000
+16,2045,R2,solarPV,2034,5.35300000000
+16,2046,R2,solarPV,2034,5.35300000000
+16,2047,R2,solarPV,2034,5.35300000000
+16,2048,R2,solarPV,2034,5.35300000000
+16,2049,R2,solarPV,2034,5.35300000000
+16,2050,R2,solarPV,2034,5.35300000000
+16,2051,R2,solarPV,2034,5.35300000000
+16,2052,R2,solarPV,2034,5.35300000000
+16,2053,R2,solarPV,2034,5.35300000000
+16,2054,R2,solarPV,2034,5.35300000000
+16,2055,R2,solarPV,2034,5.35300000000
+16,2056,R2,solarPV,2034,5.35300000000
+16,2057,R2,solarPV,2034,5.35300000000
+16,2058,R2,solarPV,2034,5.35300000000
+16,2059,R2,solarPV,2034,5.35300000000
+16,2060,R2,solarPV,2034,5.35300000000
+17,2038,R2,solarPV,2036,2.24000000000
+17,2040,R2,solarPV,2036,2.24000000000
+17,2045,R2,solarPV,2036,2.24000000000
+17,2046,R2,solarPV,2036,2.24000000000
+17,2047,R2,solarPV,2036,2.24000000000
+17,2048,R2,solarPV,2036,2.24000000000
+17,2049,R2,solarPV,2036,2.24000000000
+17,2050,R2,solarPV,2036,2.24000000000
+17,2051,R2,solarPV,2036,2.24000000000
+17,2052,R2,solarPV,2036,2.24000000000
+17,2053,R2,solarPV,2036,2.24000000000
+17,2054,R2,solarPV,2036,2.24000000000
+17,2055,R2,solarPV,2036,2.24000000000
+17,2056,R2,solarPV,2036,2.24000000000
+17,2057,R2,solarPV,2036,2.24000000000
+17,2058,R2,solarPV,2036,2.24000000000
+17,2059,R2,solarPV,2036,2.24000000000
+17,2060,R2,solarPV,2036,2.24000000000
+17,2061,R2,solarPV,2036,2.24000000000
+17,2062,R2,solarPV,2036,2.24000000000
+18,2036,R2,windturbine,2020,11.79000000000
+18,2038,R2,windturbine,2020,11.79000000000
+18,2040,R2,windturbine,2020,11.79000000000
+18,2045,R2,windturbine,2020,11.79000000000
+18,2046,R2,windturbine,2020,11.79000000000
+19,2036,R2,windturbine,2022,1.68480000000
+19,2038,R2,windturbine,2022,1.68480000000
+19,2040,R2,windturbine,2022,1.68480000000
+19,2045,R2,windturbine,2022,1.68480000000
+19,2046,R2,windturbine,2022,1.68480000000
+19,2047,R2,windturbine,2022,1.68480000000
+19,2048,R2,windturbine,2022,1.68480000000
+20,2036,R2,windturbine,2024,6.37700000000
+20,2038,R2,windturbine,2024,6.37700000000
+20,2040,R2,windturbine,2024,6.37700000000
+20,2045,R2,windturbine,2024,6.37700000000
+20,2046,R2,windturbine,2024,6.37700000000
+20,2047,R2,windturbine,2024,6.37700000000
+20,2048,R2,windturbine,2024,6.37700000000
+20,2049,R2,windturbine,2024,6.37700000000
+20,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..2ead67ed
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
@@ -0,0 +1,263 @@
+asset,year,region,technology,installed,capacity
+1,2038,R1,solarPV,2020,3.79000000000
+1,2040,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2038,R1,solarPV,2026,2.24000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2038,R1,solarPV,2028,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2038,R1,solarPV,2030,2.24000000000
+4,2040,R1,solarPV,2030,2.24000000000
+4,2045,R1,solarPV,2030,2.24000000000
+4,2046,R1,solarPV,2030,2.24000000000
+4,2047,R1,solarPV,2030,2.24000000000
+4,2048,R1,solarPV,2030,2.24000000000
+4,2049,R1,solarPV,2030,2.24000000000
+4,2050,R1,solarPV,2030,2.24000000000
+4,2051,R1,solarPV,2030,2.24000000000
+4,2052,R1,solarPV,2030,2.24000000000
+4,2053,R1,solarPV,2030,2.24000000000
+4,2054,R1,solarPV,2030,2.24000000000
+4,2055,R1,solarPV,2030,2.24000000000
+4,2056,R1,solarPV,2030,2.24000000000
+5,2038,R1,solarPV,2032,2.79520000000
+5,2040,R1,solarPV,2032,2.79520000000
+5,2045,R1,solarPV,2032,2.79520000000
+5,2046,R1,solarPV,2032,2.79520000000
+5,2047,R1,solarPV,2032,2.79520000000
+5,2048,R1,solarPV,2032,2.79520000000
+5,2049,R1,solarPV,2032,2.79520000000
+5,2050,R1,solarPV,2032,2.79520000000
+5,2051,R1,solarPV,2032,2.79520000000
+5,2052,R1,solarPV,2032,2.79520000000
+5,2053,R1,solarPV,2032,2.79520000000
+5,2054,R1,solarPV,2032,2.79520000000
+5,2055,R1,solarPV,2032,2.79520000000
+5,2056,R1,solarPV,2032,2.79520000000
+5,2057,R1,solarPV,2032,2.79520000000
+5,2058,R1,solarPV,2032,2.79520000000
+6,2038,R1,solarPV,2034,5.35300000000
+6,2040,R1,solarPV,2034,5.35300000000
+6,2045,R1,solarPV,2034,5.35300000000
+6,2046,R1,solarPV,2034,5.35300000000
+6,2047,R1,solarPV,2034,5.35300000000
+6,2048,R1,solarPV,2034,5.35300000000
+6,2049,R1,solarPV,2034,5.35300000000
+6,2050,R1,solarPV,2034,5.35300000000
+6,2051,R1,solarPV,2034,5.35300000000
+6,2052,R1,solarPV,2034,5.35300000000
+6,2053,R1,solarPV,2034,5.35300000000
+6,2054,R1,solarPV,2034,5.35300000000
+6,2055,R1,solarPV,2034,5.35300000000
+6,2056,R1,solarPV,2034,5.35300000000
+6,2057,R1,solarPV,2034,5.35300000000
+6,2058,R1,solarPV,2034,5.35300000000
+6,2059,R1,solarPV,2034,5.35300000000
+6,2060,R1,solarPV,2034,5.35300000000
+7,2038,R1,solarPV,2036,2.24000000000
+7,2040,R1,solarPV,2036,2.24000000000
+7,2045,R1,solarPV,2036,2.24000000000
+7,2046,R1,solarPV,2036,2.24000000000
+7,2047,R1,solarPV,2036,2.24000000000
+7,2048,R1,solarPV,2036,2.24000000000
+7,2049,R1,solarPV,2036,2.24000000000
+7,2050,R1,solarPV,2036,2.24000000000
+7,2051,R1,solarPV,2036,2.24000000000
+7,2052,R1,solarPV,2036,2.24000000000
+7,2053,R1,solarPV,2036,2.24000000000
+7,2054,R1,solarPV,2036,2.24000000000
+7,2055,R1,solarPV,2036,2.24000000000
+7,2056,R1,solarPV,2036,2.24000000000
+7,2057,R1,solarPV,2036,2.24000000000
+7,2058,R1,solarPV,2036,2.24000000000
+7,2059,R1,solarPV,2036,2.24000000000
+7,2060,R1,solarPV,2036,2.24000000000
+7,2061,R1,solarPV,2036,2.24000000000
+7,2062,R1,solarPV,2036,2.24000000000
+8,2040,R1,solarPV,2038,2.24000000000
+8,2045,R1,solarPV,2038,2.24000000000
+8,2046,R1,solarPV,2038,2.24000000000
+8,2047,R1,solarPV,2038,2.24000000000
+8,2048,R1,solarPV,2038,2.24000000000
+8,2049,R1,solarPV,2038,2.24000000000
+8,2050,R1,solarPV,2038,2.24000000000
+8,2051,R1,solarPV,2038,2.24000000000
+8,2052,R1,solarPV,2038,2.24000000000
+8,2053,R1,solarPV,2038,2.24000000000
+8,2054,R1,solarPV,2038,2.24000000000
+8,2055,R1,solarPV,2038,2.24000000000
+8,2056,R1,solarPV,2038,2.24000000000
+8,2057,R1,solarPV,2038,2.24000000000
+8,2058,R1,solarPV,2038,2.24000000000
+8,2059,R1,solarPV,2038,2.24000000000
+8,2060,R1,solarPV,2038,2.24000000000
+8,2061,R1,solarPV,2038,2.24000000000
+8,2062,R1,solarPV,2038,2.24000000000
+8,2063,R1,solarPV,2038,2.24000000000
+8,2064,R1,solarPV,2038,2.24000000000
+9,2038,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,2038,R1,windturbine,2022,1.68480000000
+10,2040,R1,windturbine,2022,1.68480000000
+10,2045,R1,windturbine,2022,1.68480000000
+10,2046,R1,windturbine,2022,1.68480000000
+10,2047,R1,windturbine,2022,1.68480000000
+10,2048,R1,windturbine,2022,1.68480000000
+11,2038,R1,windturbine,2024,6.37700000000
+11,2040,R1,windturbine,2024,6.37700000000
+11,2045,R1,windturbine,2024,6.37700000000
+11,2046,R1,windturbine,2024,6.37700000000
+11,2047,R1,windturbine,2024,6.37700000000
+11,2048,R1,windturbine,2024,6.37700000000
+11,2049,R1,windturbine,2024,6.37700000000
+11,2050,R1,windturbine,2024,6.37700000000
+13,2038,R2,solarPV,2026,2.24000000000
+13,2040,R2,solarPV,2026,2.24000000000
+13,2045,R2,solarPV,2026,2.24000000000
+13,2046,R2,solarPV,2026,2.24000000000
+13,2047,R2,solarPV,2026,2.24000000000
+13,2048,R2,solarPV,2026,2.24000000000
+13,2049,R2,solarPV,2026,2.24000000000
+13,2050,R2,solarPV,2026,2.24000000000
+13,2051,R2,solarPV,2026,2.24000000000
+13,2052,R2,solarPV,2026,2.24000000000
+14,2038,R2,solarPV,2028,2.24000000000
+14,2040,R2,solarPV,2028,2.24000000000
+14,2045,R2,solarPV,2028,2.24000000000
+14,2046,R2,solarPV,2028,2.24000000000
+14,2047,R2,solarPV,2028,2.24000000000
+14,2048,R2,solarPV,2028,2.24000000000
+14,2049,R2,solarPV,2028,2.24000000000
+14,2050,R2,solarPV,2028,2.24000000000
+14,2051,R2,solarPV,2028,2.24000000000
+14,2052,R2,solarPV,2028,2.24000000000
+14,2053,R2,solarPV,2028,2.24000000000
+14,2054,R2,solarPV,2028,2.24000000000
+15,2038,R2,solarPV,2030,2.24000000000
+15,2040,R2,solarPV,2030,2.24000000000
+15,2045,R2,solarPV,2030,2.24000000000
+15,2046,R2,solarPV,2030,2.24000000000
+15,2047,R2,solarPV,2030,2.24000000000
+15,2048,R2,solarPV,2030,2.24000000000
+15,2049,R2,solarPV,2030,2.24000000000
+15,2050,R2,solarPV,2030,2.24000000000
+15,2051,R2,solarPV,2030,2.24000000000
+15,2052,R2,solarPV,2030,2.24000000000
+15,2053,R2,solarPV,2030,2.24000000000
+15,2054,R2,solarPV,2030,2.24000000000
+15,2055,R2,solarPV,2030,2.24000000000
+15,2056,R2,solarPV,2030,2.24000000000
+16,2038,R2,solarPV,2032,2.79520000000
+16,2040,R2,solarPV,2032,2.79520000000
+16,2045,R2,solarPV,2032,2.79520000000
+16,2046,R2,solarPV,2032,2.79520000000
+16,2047,R2,solarPV,2032,2.79520000000
+16,2048,R2,solarPV,2032,2.79520000000
+16,2049,R2,solarPV,2032,2.79520000000
+16,2050,R2,solarPV,2032,2.79520000000
+16,2051,R2,solarPV,2032,2.79520000000
+16,2052,R2,solarPV,2032,2.79520000000
+16,2053,R2,solarPV,2032,2.79520000000
+16,2054,R2,solarPV,2032,2.79520000000
+16,2055,R2,solarPV,2032,2.79520000000
+16,2056,R2,solarPV,2032,2.79520000000
+16,2057,R2,solarPV,2032,2.79520000000
+16,2058,R2,solarPV,2032,2.79520000000
+17,2038,R2,solarPV,2034,5.35300000000
+17,2040,R2,solarPV,2034,5.35300000000
+17,2045,R2,solarPV,2034,5.35300000000
+17,2046,R2,solarPV,2034,5.35300000000
+17,2047,R2,solarPV,2034,5.35300000000
+17,2048,R2,solarPV,2034,5.35300000000
+17,2049,R2,solarPV,2034,5.35300000000
+17,2050,R2,solarPV,2034,5.35300000000
+17,2051,R2,solarPV,2034,5.35300000000
+17,2052,R2,solarPV,2034,5.35300000000
+17,2053,R2,solarPV,2034,5.35300000000
+17,2054,R2,solarPV,2034,5.35300000000
+17,2055,R2,solarPV,2034,5.35300000000
+17,2056,R2,solarPV,2034,5.35300000000
+17,2057,R2,solarPV,2034,5.35300000000
+17,2058,R2,solarPV,2034,5.35300000000
+17,2059,R2,solarPV,2034,5.35300000000
+17,2060,R2,solarPV,2034,5.35300000000
+18,2038,R2,solarPV,2036,2.24000000000
+18,2040,R2,solarPV,2036,2.24000000000
+18,2045,R2,solarPV,2036,2.24000000000
+18,2046,R2,solarPV,2036,2.24000000000
+18,2047,R2,solarPV,2036,2.24000000000
+18,2048,R2,solarPV,2036,2.24000000000
+18,2049,R2,solarPV,2036,2.24000000000
+18,2050,R2,solarPV,2036,2.24000000000
+18,2051,R2,solarPV,2036,2.24000000000
+18,2052,R2,solarPV,2036,2.24000000000
+18,2053,R2,solarPV,2036,2.24000000000
+18,2054,R2,solarPV,2036,2.24000000000
+18,2055,R2,solarPV,2036,2.24000000000
+18,2056,R2,solarPV,2036,2.24000000000
+18,2057,R2,solarPV,2036,2.24000000000
+18,2058,R2,solarPV,2036,2.24000000000
+18,2059,R2,solarPV,2036,2.24000000000
+18,2060,R2,solarPV,2036,2.24000000000
+18,2061,R2,solarPV,2036,2.24000000000
+18,2062,R2,solarPV,2036,2.24000000000
+19,2040,R2,solarPV,2038,2.24000000000
+19,2045,R2,solarPV,2038,2.24000000000
+19,2046,R2,solarPV,2038,2.24000000000
+19,2047,R2,solarPV,2038,2.24000000000
+19,2048,R2,solarPV,2038,2.24000000000
+19,2049,R2,solarPV,2038,2.24000000000
+19,2050,R2,solarPV,2038,2.24000000000
+19,2051,R2,solarPV,2038,2.24000000000
+19,2052,R2,solarPV,2038,2.24000000000
+19,2053,R2,solarPV,2038,2.24000000000
+19,2054,R2,solarPV,2038,2.24000000000
+19,2055,R2,solarPV,2038,2.24000000000
+19,2056,R2,solarPV,2038,2.24000000000
+19,2057,R2,solarPV,2038,2.24000000000
+19,2058,R2,solarPV,2038,2.24000000000
+19,2059,R2,solarPV,2038,2.24000000000
+19,2060,R2,solarPV,2038,2.24000000000
+19,2061,R2,solarPV,2038,2.24000000000
+19,2062,R2,solarPV,2038,2.24000000000
+19,2063,R2,solarPV,2038,2.24000000000
+19,2064,R2,solarPV,2038,2.24000000000
+20,2038,R2,windturbine,2020,11.79000000000
+20,2040,R2,windturbine,2020,11.79000000000
+20,2045,R2,windturbine,2020,11.79000000000
+20,2046,R2,windturbine,2020,11.79000000000
+21,2038,R2,windturbine,2022,1.68480000000
+21,2040,R2,windturbine,2022,1.68480000000
+21,2045,R2,windturbine,2022,1.68480000000
+21,2046,R2,windturbine,2022,1.68480000000
+21,2047,R2,windturbine,2022,1.68480000000
+21,2048,R2,windturbine,2022,1.68480000000
+22,2038,R2,windturbine,2024,6.37700000000
+22,2040,R2,windturbine,2024,6.37700000000
+22,2045,R2,windturbine,2024,6.37700000000
+22,2046,R2,windturbine,2024,6.37700000000
+22,2047,R2,windturbine,2024,6.37700000000
+22,2048,R2,windturbine,2024,6.37700000000
+22,2049,R2,windturbine,2024,6.37700000000
+22,2050,R2,windturbine,2024,6.37700000000
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
new file mode 100644
index 00000000..7162d267
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
@@ -0,0 +1,311 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2020,3.79000000000
+1,2042,R1,solarPV,2020,3.79000000000
+1,2045,R1,solarPV,2020,3.79000000000
+1,2046,R1,solarPV,2020,3.79000000000
+2,2040,R1,solarPV,2026,2.24000000000
+2,2042,R1,solarPV,2026,2.24000000000
+2,2045,R1,solarPV,2026,2.24000000000
+2,2046,R1,solarPV,2026,2.24000000000
+2,2047,R1,solarPV,2026,2.24000000000
+2,2048,R1,solarPV,2026,2.24000000000
+2,2049,R1,solarPV,2026,2.24000000000
+2,2050,R1,solarPV,2026,2.24000000000
+2,2051,R1,solarPV,2026,2.24000000000
+2,2052,R1,solarPV,2026,2.24000000000
+3,2040,R1,solarPV,2028,2.24000000000
+3,2042,R1,solarPV,2028,2.24000000000
+3,2045,R1,solarPV,2028,2.24000000000
+3,2046,R1,solarPV,2028,2.24000000000
+3,2047,R1,solarPV,2028,2.24000000000
+3,2048,R1,solarPV,2028,2.24000000000
+3,2049,R1,solarPV,2028,2.24000000000
+3,2050,R1,solarPV,2028,2.24000000000
+3,2051,R1,solarPV,2028,2.24000000000
+3,2052,R1,solarPV,2028,2.24000000000
+3,2053,R1,solarPV,2028,2.24000000000
+3,2054,R1,solarPV,2028,2.24000000000
+4,2040,R1,solarPV,2030,2.24000000000
+4,2042,R1,solarPV,2030,2.24000000000
+4,2045,R1,solarPV,2030,2.24000000000
+4,2046,R1,solarPV,2030,2.24000000000
+4,2047,R1,solarPV,2030,2.24000000000
+4,2048,R1,solarPV,2030,2.24000000000
+4,2049,R1,solarPV,2030,2.24000000000
+4,2050,R1,solarPV,2030,2.24000000000
+4,2051,R1,solarPV,2030,2.24000000000
+4,2052,R1,solarPV,2030,2.24000000000
+4,2053,R1,solarPV,2030,2.24000000000
+4,2054,R1,solarPV,2030,2.24000000000
+4,2055,R1,solarPV,2030,2.24000000000
+4,2056,R1,solarPV,2030,2.24000000000
+5,2040,R1,solarPV,2032,2.79520000000
+5,2042,R1,solarPV,2032,2.79520000000
+5,2045,R1,solarPV,2032,2.79520000000
+5,2046,R1,solarPV,2032,2.79520000000
+5,2047,R1,solarPV,2032,2.79520000000
+5,2048,R1,solarPV,2032,2.79520000000
+5,2049,R1,solarPV,2032,2.79520000000
+5,2050,R1,solarPV,2032,2.79520000000
+5,2051,R1,solarPV,2032,2.79520000000
+5,2052,R1,solarPV,2032,2.79520000000
+5,2053,R1,solarPV,2032,2.79520000000
+5,2054,R1,solarPV,2032,2.79520000000
+5,2055,R1,solarPV,2032,2.79520000000
+5,2056,R1,solarPV,2032,2.79520000000
+5,2057,R1,solarPV,2032,2.79520000000
+5,2058,R1,solarPV,2032,2.79520000000
+6,2040,R1,solarPV,2034,5.35300000000
+6,2042,R1,solarPV,2034,5.35300000000
+6,2045,R1,solarPV,2034,5.35300000000
+6,2046,R1,solarPV,2034,5.35300000000
+6,2047,R1,solarPV,2034,5.35300000000
+6,2048,R1,solarPV,2034,5.35300000000
+6,2049,R1,solarPV,2034,5.35300000000
+6,2050,R1,solarPV,2034,5.35300000000
+6,2051,R1,solarPV,2034,5.35300000000
+6,2052,R1,solarPV,2034,5.35300000000
+6,2053,R1,solarPV,2034,5.35300000000
+6,2054,R1,solarPV,2034,5.35300000000
+6,2055,R1,solarPV,2034,5.35300000000
+6,2056,R1,solarPV,2034,5.35300000000
+6,2057,R1,solarPV,2034,5.35300000000
+6,2058,R1,solarPV,2034,5.35300000000
+6,2059,R1,solarPV,2034,5.35300000000
+6,2060,R1,solarPV,2034,5.35300000000
+7,2040,R1,solarPV,2036,2.24000000000
+7,2042,R1,solarPV,2036,2.24000000000
+7,2045,R1,solarPV,2036,2.24000000000
+7,2046,R1,solarPV,2036,2.24000000000
+7,2047,R1,solarPV,2036,2.24000000000
+7,2048,R1,solarPV,2036,2.24000000000
+7,2049,R1,solarPV,2036,2.24000000000
+7,2050,R1,solarPV,2036,2.24000000000
+7,2051,R1,solarPV,2036,2.24000000000
+7,2052,R1,solarPV,2036,2.24000000000
+7,2053,R1,solarPV,2036,2.24000000000
+7,2054,R1,solarPV,2036,2.24000000000
+7,2055,R1,solarPV,2036,2.24000000000
+7,2056,R1,solarPV,2036,2.24000000000
+7,2057,R1,solarPV,2036,2.24000000000
+7,2058,R1,solarPV,2036,2.24000000000
+7,2059,R1,solarPV,2036,2.24000000000
+7,2060,R1,solarPV,2036,2.24000000000
+7,2061,R1,solarPV,2036,2.24000000000
+7,2062,R1,solarPV,2036,2.24000000000
+8,2040,R1,solarPV,2038,2.24000000000
+8,2042,R1,solarPV,2038,2.24000000000
+8,2045,R1,solarPV,2038,2.24000000000
+8,2046,R1,solarPV,2038,2.24000000000
+8,2047,R1,solarPV,2038,2.24000000000
+8,2048,R1,solarPV,2038,2.24000000000
+8,2049,R1,solarPV,2038,2.24000000000
+8,2050,R1,solarPV,2038,2.24000000000
+8,2051,R1,solarPV,2038,2.24000000000
+8,2052,R1,solarPV,2038,2.24000000000
+8,2053,R1,solarPV,2038,2.24000000000
+8,2054,R1,solarPV,2038,2.24000000000
+8,2055,R1,solarPV,2038,2.24000000000
+8,2056,R1,solarPV,2038,2.24000000000
+8,2057,R1,solarPV,2038,2.24000000000
+8,2058,R1,solarPV,2038,2.24000000000
+8,2059,R1,solarPV,2038,2.24000000000
+8,2060,R1,solarPV,2038,2.24000000000
+8,2061,R1,solarPV,2038,2.24000000000
+8,2062,R1,solarPV,2038,2.24000000000
+8,2063,R1,solarPV,2038,2.24000000000
+8,2064,R1,solarPV,2038,2.24000000000
+9,2042,R1,solarPV,2040,2.24000000000
+9,2045,R1,solarPV,2040,2.24000000000
+9,2046,R1,solarPV,2040,2.24000000000
+9,2047,R1,solarPV,2040,2.24000000000
+9,2048,R1,solarPV,2040,2.24000000000
+9,2049,R1,solarPV,2040,2.24000000000
+9,2050,R1,solarPV,2040,2.24000000000
+9,2051,R1,solarPV,2040,2.24000000000
+9,2052,R1,solarPV,2040,2.24000000000
+9,2053,R1,solarPV,2040,2.24000000000
+9,2054,R1,solarPV,2040,2.24000000000
+9,2055,R1,solarPV,2040,2.24000000000
+9,2056,R1,solarPV,2040,2.24000000000
+9,2057,R1,solarPV,2040,2.24000000000
+9,2058,R1,solarPV,2040,2.24000000000
+9,2059,R1,solarPV,2040,2.24000000000
+9,2060,R1,solarPV,2040,2.24000000000
+9,2061,R1,solarPV,2040,2.24000000000
+9,2062,R1,solarPV,2040,2.24000000000
+9,2063,R1,solarPV,2040,2.24000000000
+9,2064,R1,solarPV,2040,2.24000000000
+9,2065,R1,solarPV,2040,2.24000000000
+9,2066,R1,solarPV,2040,2.24000000000
+10,2040,R1,windturbine,2020,8.00000000000
+10,2042,R1,windturbine,2020,8.00000000000
+10,2045,R1,windturbine,2020,8.00000000000
+10,2046,R1,windturbine,2020,8.00000000000
+11,2040,R1,windturbine,2022,1.68480000000
+11,2042,R1,windturbine,2022,1.68480000000
+11,2045,R1,windturbine,2022,1.68480000000
+11,2046,R1,windturbine,2022,1.68480000000
+11,2047,R1,windturbine,2022,1.68480000000
+11,2048,R1,windturbine,2022,1.68480000000
+12,2040,R1,windturbine,2024,6.37700000000
+12,2042,R1,windturbine,2024,6.37700000000
+12,2045,R1,windturbine,2024,6.37700000000
+12,2046,R1,windturbine,2024,6.37700000000
+12,2047,R1,windturbine,2024,6.37700000000
+12,2048,R1,windturbine,2024,6.37700000000
+12,2049,R1,windturbine,2024,6.37700000000
+12,2050,R1,windturbine,2024,6.37700000000
+14,2040,R2,solarPV,2026,2.24000000000
+14,2042,R2,solarPV,2026,2.24000000000
+14,2045,R2,solarPV,2026,2.24000000000
+14,2046,R2,solarPV,2026,2.24000000000
+14,2047,R2,solarPV,2026,2.24000000000
+14,2048,R2,solarPV,2026,2.24000000000
+14,2049,R2,solarPV,2026,2.24000000000
+14,2050,R2,solarPV,2026,2.24000000000
+14,2051,R2,solarPV,2026,2.24000000000
+14,2052,R2,solarPV,2026,2.24000000000
+15,2040,R2,solarPV,2028,2.24000000000
+15,2042,R2,solarPV,2028,2.24000000000
+15,2045,R2,solarPV,2028,2.24000000000
+15,2046,R2,solarPV,2028,2.24000000000
+15,2047,R2,solarPV,2028,2.24000000000
+15,2048,R2,solarPV,2028,2.24000000000
+15,2049,R2,solarPV,2028,2.24000000000
+15,2050,R2,solarPV,2028,2.24000000000
+15,2051,R2,solarPV,2028,2.24000000000
+15,2052,R2,solarPV,2028,2.24000000000
+15,2053,R2,solarPV,2028,2.24000000000
+15,2054,R2,solarPV,2028,2.24000000000
+16,2040,R2,solarPV,2030,2.24000000000
+16,2042,R2,solarPV,2030,2.24000000000
+16,2045,R2,solarPV,2030,2.24000000000
+16,2046,R2,solarPV,2030,2.24000000000
+16,2047,R2,solarPV,2030,2.24000000000
+16,2048,R2,solarPV,2030,2.24000000000
+16,2049,R2,solarPV,2030,2.24000000000
+16,2050,R2,solarPV,2030,2.24000000000
+16,2051,R2,solarPV,2030,2.24000000000
+16,2052,R2,solarPV,2030,2.24000000000
+16,2053,R2,solarPV,2030,2.24000000000
+16,2054,R2,solarPV,2030,2.24000000000
+16,2055,R2,solarPV,2030,2.24000000000
+16,2056,R2,solarPV,2030,2.24000000000
+17,2040,R2,solarPV,2032,2.79520000000
+17,2042,R2,solarPV,2032,2.79520000000
+17,2045,R2,solarPV,2032,2.79520000000
+17,2046,R2,solarPV,2032,2.79520000000
+17,2047,R2,solarPV,2032,2.79520000000
+17,2048,R2,solarPV,2032,2.79520000000
+17,2049,R2,solarPV,2032,2.79520000000
+17,2050,R2,solarPV,2032,2.79520000000
+17,2051,R2,solarPV,2032,2.79520000000
+17,2052,R2,solarPV,2032,2.79520000000
+17,2053,R2,solarPV,2032,2.79520000000
+17,2054,R2,solarPV,2032,2.79520000000
+17,2055,R2,solarPV,2032,2.79520000000
+17,2056,R2,solarPV,2032,2.79520000000
+17,2057,R2,solarPV,2032,2.79520000000
+17,2058,R2,solarPV,2032,2.79520000000
+18,2040,R2,solarPV,2034,5.35300000000
+18,2042,R2,solarPV,2034,5.35300000000
+18,2045,R2,solarPV,2034,5.35300000000
+18,2046,R2,solarPV,2034,5.35300000000
+18,2047,R2,solarPV,2034,5.35300000000
+18,2048,R2,solarPV,2034,5.35300000000
+18,2049,R2,solarPV,2034,5.35300000000
+18,2050,R2,solarPV,2034,5.35300000000
+18,2051,R2,solarPV,2034,5.35300000000
+18,2052,R2,solarPV,2034,5.35300000000
+18,2053,R2,solarPV,2034,5.35300000000
+18,2054,R2,solarPV,2034,5.35300000000
+18,2055,R2,solarPV,2034,5.35300000000
+18,2056,R2,solarPV,2034,5.35300000000
+18,2057,R2,solarPV,2034,5.35300000000
+18,2058,R2,solarPV,2034,5.35300000000
+18,2059,R2,solarPV,2034,5.35300000000
+18,2060,R2,solarPV,2034,5.35300000000
+19,2040,R2,solarPV,2036,2.24000000000
+19,2042,R2,solarPV,2036,2.24000000000
+19,2045,R2,solarPV,2036,2.24000000000
+19,2046,R2,solarPV,2036,2.24000000000
+19,2047,R2,solarPV,2036,2.24000000000
+19,2048,R2,solarPV,2036,2.24000000000
+19,2049,R2,solarPV,2036,2.24000000000
+19,2050,R2,solarPV,2036,2.24000000000
+19,2051,R2,solarPV,2036,2.24000000000
+19,2052,R2,solarPV,2036,2.24000000000
+19,2053,R2,solarPV,2036,2.24000000000
+19,2054,R2,solarPV,2036,2.24000000000
+19,2055,R2,solarPV,2036,2.24000000000
+19,2056,R2,solarPV,2036,2.24000000000
+19,2057,R2,solarPV,2036,2.24000000000
+19,2058,R2,solarPV,2036,2.24000000000
+19,2059,R2,solarPV,2036,2.24000000000
+19,2060,R2,solarPV,2036,2.24000000000
+19,2061,R2,solarPV,2036,2.24000000000
+19,2062,R2,solarPV,2036,2.24000000000
+20,2040,R2,solarPV,2038,2.24000000000
+20,2042,R2,solarPV,2038,2.24000000000
+20,2045,R2,solarPV,2038,2.24000000000
+20,2046,R2,solarPV,2038,2.24000000000
+20,2047,R2,solarPV,2038,2.24000000000
+20,2048,R2,solarPV,2038,2.24000000000
+20,2049,R2,solarPV,2038,2.24000000000
+20,2050,R2,solarPV,2038,2.24000000000
+20,2051,R2,solarPV,2038,2.24000000000
+20,2052,R2,solarPV,2038,2.24000000000
+20,2053,R2,solarPV,2038,2.24000000000
+20,2054,R2,solarPV,2038,2.24000000000
+20,2055,R2,solarPV,2038,2.24000000000
+20,2056,R2,solarPV,2038,2.24000000000
+20,2057,R2,solarPV,2038,2.24000000000
+20,2058,R2,solarPV,2038,2.24000000000
+20,2059,R2,solarPV,2038,2.24000000000
+20,2060,R2,solarPV,2038,2.24000000000
+20,2061,R2,solarPV,2038,2.24000000000
+20,2062,R2,solarPV,2038,2.24000000000
+20,2063,R2,solarPV,2038,2.24000000000
+20,2064,R2,solarPV,2038,2.24000000000
+21,2042,R2,solarPV,2040,2.24000000000
+21,2045,R2,solarPV,2040,2.24000000000
+21,2046,R2,solarPV,2040,2.24000000000
+21,2047,R2,solarPV,2040,2.24000000000
+21,2048,R2,solarPV,2040,2.24000000000
+21,2049,R2,solarPV,2040,2.24000000000
+21,2050,R2,solarPV,2040,2.24000000000
+21,2051,R2,solarPV,2040,2.24000000000
+21,2052,R2,solarPV,2040,2.24000000000
+21,2053,R2,solarPV,2040,2.24000000000
+21,2054,R2,solarPV,2040,2.24000000000
+21,2055,R2,solarPV,2040,2.24000000000
+21,2056,R2,solarPV,2040,2.24000000000
+21,2057,R2,solarPV,2040,2.24000000000
+21,2058,R2,solarPV,2040,2.24000000000
+21,2059,R2,solarPV,2040,2.24000000000
+21,2060,R2,solarPV,2040,2.24000000000
+21,2061,R2,solarPV,2040,2.24000000000
+21,2062,R2,solarPV,2040,2.24000000000
+21,2063,R2,solarPV,2040,2.24000000000
+21,2064,R2,solarPV,2040,2.24000000000
+21,2065,R2,solarPV,2040,2.24000000000
+21,2066,R2,solarPV,2040,2.24000000000
+22,2040,R2,windturbine,2020,11.79000000000
+22,2042,R2,windturbine,2020,11.79000000000
+22,2045,R2,windturbine,2020,11.79000000000
+22,2046,R2,windturbine,2020,11.79000000000
+23,2040,R2,windturbine,2022,1.68480000000
+23,2042,R2,windturbine,2022,1.68480000000
+23,2045,R2,windturbine,2022,1.68480000000
+23,2046,R2,windturbine,2022,1.68480000000
+23,2047,R2,windturbine,2022,1.68480000000
+23,2048,R2,windturbine,2022,1.68480000000
+24,2040,R2,windturbine,2024,6.37700000000
+24,2042,R2,windturbine,2024,6.37700000000
+24,2045,R2,windturbine,2024,6.37700000000
+24,2046,R2,windturbine,2024,6.37700000000
+24,2047,R2,windturbine,2024,6.37700000000
+24,2048,R2,windturbine,2024,6.37700000000
+24,2049,R2,windturbine,2024,6.37700000000
+24,2050,R2,windturbine,2024,6.37700000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..151ff0b4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,15 @@
+asset,year,technology,region,installed,capacity
+0,2020,gasboiler,R1,2020,10.00000000000
+0,2022,gasboiler,R1,2020,5.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2020,gasboiler,R2,2020,10.00000000000
+1,2022,gasboiler,R2,2020,5.00000000000
+1,2025,gasboiler,R2,2020,5.00000000000
+2,2022,heatpump,R1,2020,14.04000000000
+2,2025,heatpump,R1,2020,14.04000000000
+2,2030,heatpump,R1,2020,14.04000000000
+2,2031,heatpump,R1,2020,14.04000000000
+3,2022,heatpump,R2,2020,14.04000000000
+3,2025,heatpump,R2,2020,14.04000000000
+3,2030,heatpump,R2,2020,14.04000000000
+3,2031,heatpump,R2,2020,14.04000000000
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
new file mode 100644
index 00000000..b902f224
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
@@ -0,0 +1,41 @@
+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,2024,R1,gasboiler,2022,0.55520000000
+1,2025,R1,gasboiler,2022,0.55520000000
+1,2030,R1,gasboiler,2022,0.55520000000
+1,2031,R1,gasboiler,2022,0.55520000000
+1,2032,R1,gasboiler,2022,0.55520000000
+1,2033,R1,gasboiler,2022,0.55520000000
+2,2022,R1,heatpump,2020,14.04000000000
+2,2024,R1,heatpump,2020,14.04000000000
+2,2025,R1,heatpump,2020,14.04000000000
+2,2030,R1,heatpump,2020,14.04000000000
+2,2031,R1,heatpump,2020,14.04000000000
+3,2024,R1,heatpump,2022,1.68480000000
+3,2025,R1,heatpump,2022,1.68480000000
+3,2030,R1,heatpump,2022,1.68480000000
+3,2031,R1,heatpump,2022,1.68480000000
+3,2032,R1,heatpump,2022,1.68480000000
+3,2033,R1,heatpump,2022,1.68480000000
+4,2022,R2,gasboiler,2020,5.00000000000
+4,2024,R2,gasboiler,2020,5.00000000000
+4,2025,R2,gasboiler,2020,5.00000000000
+5,2024,R2,gasboiler,2022,0.55520000000
+5,2025,R2,gasboiler,2022,0.55520000000
+5,2030,R2,gasboiler,2022,0.55520000000
+5,2031,R2,gasboiler,2022,0.55520000000
+5,2032,R2,gasboiler,2022,0.55520000000
+5,2033,R2,gasboiler,2022,0.55520000000
+6,2022,R2,heatpump,2020,14.04000000000
+6,2024,R2,heatpump,2020,14.04000000000
+6,2025,R2,heatpump,2020,14.04000000000
+6,2030,R2,heatpump,2020,14.04000000000
+6,2031,R2,heatpump,2020,14.04000000000
+7,2024,R2,heatpump,2022,1.68480000000
+7,2025,R2,heatpump,2022,1.68480000000
+7,2030,R2,heatpump,2022,1.68480000000
+7,2031,R2,heatpump,2022,1.68480000000
+7,2032,R2,heatpump,2022,1.68480000000
+7,2033,R2,heatpump,2022,1.68480000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
new file mode 100644
index 00000000..5ae5a58f
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
@@ -0,0 +1,71 @@
+asset,year,technology,region,installed,capacity
+0,2024,gasboiler,R1,2020,5.00000000000
+0,2025,gasboiler,R1,2020,5.00000000000
+1,2024,gasboiler,R1,2022,0.55520000000
+1,2025,gasboiler,R1,2022,0.55520000000
+1,2026,gasboiler,R1,2022,0.55520000000
+1,2030,gasboiler,R1,2022,0.55520000000
+1,2031,gasboiler,R1,2022,0.55520000000
+1,2032,gasboiler,R1,2022,0.55520000000
+1,2033,gasboiler,R1,2022,0.55520000000
+2,2026,gasboiler,R1,2024,3.11300000000
+2,2030,gasboiler,R1,2024,3.11300000000
+2,2031,gasboiler,R1,2024,3.11300000000
+2,2032,gasboiler,R1,2024,3.11300000000
+2,2033,gasboiler,R1,2024,3.11300000000
+2,2034,gasboiler,R1,2024,3.11300000000
+2,2035,gasboiler,R1,2024,3.11300000000
+3,2024,gasboiler,R2,2020,5.00000000000
+3,2025,gasboiler,R2,2020,5.00000000000
+4,2024,gasboiler,R2,2022,0.55520000000
+4,2025,gasboiler,R2,2022,0.55520000000
+4,2026,gasboiler,R2,2022,0.55520000000
+4,2030,gasboiler,R2,2022,0.55520000000
+4,2031,gasboiler,R2,2022,0.55520000000
+4,2032,gasboiler,R2,2022,0.55520000000
+4,2033,gasboiler,R2,2022,0.55520000000
+5,2026,gasboiler,R2,2024,3.11300000000
+5,2030,gasboiler,R2,2024,3.11300000000
+5,2031,gasboiler,R2,2024,3.11300000000
+5,2032,gasboiler,R2,2024,3.11300000000
+5,2033,gasboiler,R2,2024,3.11300000000
+5,2034,gasboiler,R2,2024,3.11300000000
+5,2035,gasboiler,R2,2024,3.11300000000
+6,2024,heatpump,R1,2020,14.04000000000
+6,2025,heatpump,R1,2020,14.04000000000
+6,2026,heatpump,R1,2020,14.04000000000
+6,2030,heatpump,R1,2020,14.04000000000
+6,2031,heatpump,R1,2020,14.04000000000
+7,2024,heatpump,R1,2022,1.68480000000
+7,2025,heatpump,R1,2022,1.68480000000
+7,2026,heatpump,R1,2022,1.68480000000
+7,2030,heatpump,R1,2022,1.68480000000
+7,2031,heatpump,R1,2022,1.68480000000
+7,2032,heatpump,R1,2022,1.68480000000
+7,2033,heatpump,R1,2022,1.68480000000
+8,2026,heatpump,R1,2024,4.12700000000
+8,2030,heatpump,R1,2024,4.12700000000
+8,2031,heatpump,R1,2024,4.12700000000
+8,2032,heatpump,R1,2024,4.12700000000
+8,2033,heatpump,R1,2024,4.12700000000
+8,2034,heatpump,R1,2024,4.12700000000
+8,2035,heatpump,R1,2024,4.12700000000
+9,2024,heatpump,R2,2020,14.04000000000
+9,2025,heatpump,R2,2020,14.04000000000
+9,2026,heatpump,R2,2020,14.04000000000
+9,2030,heatpump,R2,2020,14.04000000000
+9,2031,heatpump,R2,2020,14.04000000000
+10,2024,heatpump,R2,2022,1.68480000000
+10,2025,heatpump,R2,2022,1.68480000000
+10,2026,heatpump,R2,2022,1.68480000000
+10,2030,heatpump,R2,2022,1.68480000000
+10,2031,heatpump,R2,2022,1.68480000000
+10,2032,heatpump,R2,2022,1.68480000000
+10,2033,heatpump,R2,2022,1.68480000000
+11,2026,heatpump,R2,2024,4.12700000000
+11,2030,heatpump,R2,2024,4.12700000000
+11,2031,heatpump,R2,2024,4.12700000000
+11,2032,heatpump,R2,2024,4.12700000000
+11,2033,heatpump,R2,2024,4.12700000000
+11,2034,heatpump,R2,2024,4.12700000000
+11,2035,heatpump,R2,2024,4.12700000000
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
new file mode 100644
index 00000000..77042209
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
@@ -0,0 +1,83 @@
+asset,year,region,technology,installed,capacity
+1,2026,R1,gasboiler,2022,0.55520000000
+1,2028,R1,gasboiler,2022,0.55520000000
+1,2030,R1,gasboiler,2022,0.55520000000
+1,2031,R1,gasboiler,2022,0.55520000000
+1,2032,R1,gasboiler,2022,0.55520000000
+1,2033,R1,gasboiler,2022,0.55520000000
+2,2026,R1,gasboiler,2024,3.11300000000
+2,2028,R1,gasboiler,2024,3.11300000000
+2,2030,R1,gasboiler,2024,3.11300000000
+2,2031,R1,gasboiler,2024,3.11300000000
+2,2032,R1,gasboiler,2024,3.11300000000
+2,2033,R1,gasboiler,2024,3.11300000000
+2,2034,R1,gasboiler,2024,3.11300000000
+2,2035,R1,gasboiler,2024,3.11300000000
+3,2026,R1,heatpump,2020,14.04000000000
+3,2028,R1,heatpump,2020,14.04000000000
+3,2030,R1,heatpump,2020,14.04000000000
+3,2031,R1,heatpump,2020,14.04000000000
+4,2026,R1,heatpump,2022,1.68480000000
+4,2028,R1,heatpump,2022,1.68480000000
+4,2030,R1,heatpump,2022,1.68480000000
+4,2031,R1,heatpump,2022,1.68480000000
+4,2032,R1,heatpump,2022,1.68480000000
+4,2033,R1,heatpump,2022,1.68480000000
+5,2026,R1,heatpump,2024,4.12700000000
+5,2028,R1,heatpump,2024,4.12700000000
+5,2030,R1,heatpump,2024,4.12700000000
+5,2031,R1,heatpump,2024,4.12700000000
+5,2032,R1,heatpump,2024,4.12700000000
+5,2033,R1,heatpump,2024,4.12700000000
+5,2034,R1,heatpump,2024,4.12700000000
+5,2035,R1,heatpump,2024,4.12700000000
+6,2028,R1,heatpump,2026,2.24000000000
+6,2030,R1,heatpump,2026,2.24000000000
+6,2031,R1,heatpump,2026,2.24000000000
+6,2032,R1,heatpump,2026,2.24000000000
+6,2033,R1,heatpump,2026,2.24000000000
+6,2034,R1,heatpump,2026,2.24000000000
+6,2035,R1,heatpump,2026,2.24000000000
+6,2036,R1,heatpump,2026,2.24000000000
+6,2037,R1,heatpump,2026,2.24000000000
+8,2026,R2,gasboiler,2022,0.55520000000
+8,2028,R2,gasboiler,2022,0.55520000000
+8,2030,R2,gasboiler,2022,0.55520000000
+8,2031,R2,gasboiler,2022,0.55520000000
+8,2032,R2,gasboiler,2022,0.55520000000
+8,2033,R2,gasboiler,2022,0.55520000000
+9,2026,R2,gasboiler,2024,3.11300000000
+9,2028,R2,gasboiler,2024,3.11300000000
+9,2030,R2,gasboiler,2024,3.11300000000
+9,2031,R2,gasboiler,2024,3.11300000000
+9,2032,R2,gasboiler,2024,3.11300000000
+9,2033,R2,gasboiler,2024,3.11300000000
+9,2034,R2,gasboiler,2024,3.11300000000
+9,2035,R2,gasboiler,2024,3.11300000000
+10,2026,R2,heatpump,2020,14.04000000000
+10,2028,R2,heatpump,2020,14.04000000000
+10,2030,R2,heatpump,2020,14.04000000000
+10,2031,R2,heatpump,2020,14.04000000000
+11,2026,R2,heatpump,2022,1.68480000000
+11,2028,R2,heatpump,2022,1.68480000000
+11,2030,R2,heatpump,2022,1.68480000000
+11,2031,R2,heatpump,2022,1.68480000000
+11,2032,R2,heatpump,2022,1.68480000000
+11,2033,R2,heatpump,2022,1.68480000000
+12,2026,R2,heatpump,2024,4.12700000000
+12,2028,R2,heatpump,2024,4.12700000000
+12,2030,R2,heatpump,2024,4.12700000000
+12,2031,R2,heatpump,2024,4.12700000000
+12,2032,R2,heatpump,2024,4.12700000000
+12,2033,R2,heatpump,2024,4.12700000000
+12,2034,R2,heatpump,2024,4.12700000000
+12,2035,R2,heatpump,2024,4.12700000000
+13,2028,R2,heatpump,2026,2.24000000000
+13,2030,R2,heatpump,2026,2.24000000000
+13,2031,R2,heatpump,2026,2.24000000000
+13,2032,R2,heatpump,2026,2.24000000000
+13,2033,R2,heatpump,2026,2.24000000000
+13,2034,R2,heatpump,2026,2.24000000000
+13,2035,R2,heatpump,2026,2.24000000000
+13,2036,R2,heatpump,2026,2.24000000000
+13,2037,R2,heatpump,2026,2.24000000000
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
new file mode 100644
index 00000000..137ec1db
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
@@ -0,0 +1,93 @@
+asset,year,region,technology,installed,capacity
+1,2028,R1,gasboiler,2022,0.55520000000
+1,2030,R1,gasboiler,2022,0.55520000000
+1,2031,R1,gasboiler,2022,0.55520000000
+1,2032,R1,gasboiler,2022,0.55520000000
+1,2033,R1,gasboiler,2022,0.55520000000
+2,2028,R1,gasboiler,2024,3.11300000000
+2,2030,R1,gasboiler,2024,3.11300000000
+2,2031,R1,gasboiler,2024,3.11300000000
+2,2032,R1,gasboiler,2024,3.11300000000
+2,2033,R1,gasboiler,2024,3.11300000000
+2,2034,R1,gasboiler,2024,3.11300000000
+2,2035,R1,gasboiler,2024,3.11300000000
+3,2028,R1,heatpump,2020,14.04000000000
+3,2030,R1,heatpump,2020,14.04000000000
+3,2031,R1,heatpump,2020,14.04000000000
+4,2028,R1,heatpump,2022,1.68480000000
+4,2030,R1,heatpump,2022,1.68480000000
+4,2031,R1,heatpump,2022,1.68480000000
+4,2032,R1,heatpump,2022,1.68480000000
+4,2033,R1,heatpump,2022,1.68480000000
+5,2028,R1,heatpump,2024,4.12700000000
+5,2030,R1,heatpump,2024,4.12700000000
+5,2031,R1,heatpump,2024,4.12700000000
+5,2032,R1,heatpump,2024,4.12700000000
+5,2033,R1,heatpump,2024,4.12700000000
+5,2034,R1,heatpump,2024,4.12700000000
+5,2035,R1,heatpump,2024,4.12700000000
+6,2028,R1,heatpump,2026,2.24000000000
+6,2030,R1,heatpump,2026,2.24000000000
+6,2031,R1,heatpump,2026,2.24000000000
+6,2032,R1,heatpump,2026,2.24000000000
+6,2033,R1,heatpump,2026,2.24000000000
+6,2034,R1,heatpump,2026,2.24000000000
+6,2035,R1,heatpump,2026,2.24000000000
+6,2036,R1,heatpump,2026,2.24000000000
+6,2037,R1,heatpump,2026,2.24000000000
+7,2030,R1,heatpump,2028,2.24000000000
+7,2031,R1,heatpump,2028,2.24000000000
+7,2032,R1,heatpump,2028,2.24000000000
+7,2033,R1,heatpump,2028,2.24000000000
+7,2034,R1,heatpump,2028,2.24000000000
+7,2035,R1,heatpump,2028,2.24000000000
+7,2036,R1,heatpump,2028,2.24000000000
+7,2037,R1,heatpump,2028,2.24000000000
+7,2038,R1,heatpump,2028,2.24000000000
+7,2039,R1,heatpump,2028,2.24000000000
+9,2028,R2,gasboiler,2022,0.55520000000
+9,2030,R2,gasboiler,2022,0.55520000000
+9,2031,R2,gasboiler,2022,0.55520000000
+9,2032,R2,gasboiler,2022,0.55520000000
+9,2033,R2,gasboiler,2022,0.55520000000
+10,2028,R2,gasboiler,2024,3.11300000000
+10,2030,R2,gasboiler,2024,3.11300000000
+10,2031,R2,gasboiler,2024,3.11300000000
+10,2032,R2,gasboiler,2024,3.11300000000
+10,2033,R2,gasboiler,2024,3.11300000000
+10,2034,R2,gasboiler,2024,3.11300000000
+10,2035,R2,gasboiler,2024,3.11300000000
+11,2028,R2,heatpump,2020,14.04000000000
+11,2030,R2,heatpump,2020,14.04000000000
+11,2031,R2,heatpump,2020,14.04000000000
+12,2028,R2,heatpump,2022,1.68480000000
+12,2030,R2,heatpump,2022,1.68480000000
+12,2031,R2,heatpump,2022,1.68480000000
+12,2032,R2,heatpump,2022,1.68480000000
+12,2033,R2,heatpump,2022,1.68480000000
+13,2028,R2,heatpump,2024,4.12700000000
+13,2030,R2,heatpump,2024,4.12700000000
+13,2031,R2,heatpump,2024,4.12700000000
+13,2032,R2,heatpump,2024,4.12700000000
+13,2033,R2,heatpump,2024,4.12700000000
+13,2034,R2,heatpump,2024,4.12700000000
+13,2035,R2,heatpump,2024,4.12700000000
+14,2028,R2,heatpump,2026,2.24000000000
+14,2030,R2,heatpump,2026,2.24000000000
+14,2031,R2,heatpump,2026,2.24000000000
+14,2032,R2,heatpump,2026,2.24000000000
+14,2033,R2,heatpump,2026,2.24000000000
+14,2034,R2,heatpump,2026,2.24000000000
+14,2035,R2,heatpump,2026,2.24000000000
+14,2036,R2,heatpump,2026,2.24000000000
+14,2037,R2,heatpump,2026,2.24000000000
+15,2030,R2,heatpump,2028,2.24000000000
+15,2031,R2,heatpump,2028,2.24000000000
+15,2032,R2,heatpump,2028,2.24000000000
+15,2033,R2,heatpump,2028,2.24000000000
+15,2034,R2,heatpump,2028,2.24000000000
+15,2035,R2,heatpump,2028,2.24000000000
+15,2036,R2,heatpump,2028,2.24000000000
+15,2037,R2,heatpump,2028,2.24000000000
+15,2038,R2,heatpump,2028,2.24000000000
+15,2039,R2,heatpump,2028,2.24000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..f015a71b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,101 @@
+asset,year,technology,region,installed,capacity
+0,2030,gasboiler,R1,2022,0.55520000000
+0,2031,gasboiler,R1,2022,0.55520000000
+0,2032,gasboiler,R1,2022,0.55520000000
+0,2033,gasboiler,R1,2022,0.55520000000
+1,2030,gasboiler,R1,2024,3.11300000000
+1,2031,gasboiler,R1,2024,3.11300000000
+1,2032,gasboiler,R1,2024,3.11300000000
+1,2033,gasboiler,R1,2024,3.11300000000
+1,2034,gasboiler,R1,2024,3.11300000000
+1,2035,gasboiler,R1,2024,3.11300000000
+2,2030,gasboiler,R2,2022,0.55520000000
+2,2031,gasboiler,R2,2022,0.55520000000
+2,2032,gasboiler,R2,2022,0.55520000000
+2,2033,gasboiler,R2,2022,0.55520000000
+3,2030,gasboiler,R2,2024,3.11300000000
+3,2031,gasboiler,R2,2024,3.11300000000
+3,2032,gasboiler,R2,2024,3.11300000000
+3,2033,gasboiler,R2,2024,3.11300000000
+3,2034,gasboiler,R2,2024,3.11300000000
+3,2035,gasboiler,R2,2024,3.11300000000
+4,2030,heatpump,R1,2020,14.04000000000
+4,2031,heatpump,R1,2020,14.04000000000
+5,2030,heatpump,R1,2022,1.68480000000
+5,2031,heatpump,R1,2022,1.68480000000
+5,2032,heatpump,R1,2022,1.68480000000
+5,2033,heatpump,R1,2022,1.68480000000
+6,2030,heatpump,R1,2024,4.12700000000
+6,2031,heatpump,R1,2024,4.12700000000
+6,2032,heatpump,R1,2024,4.12700000000
+6,2033,heatpump,R1,2024,4.12700000000
+6,2034,heatpump,R1,2024,4.12700000000
+6,2035,heatpump,R1,2024,4.12700000000
+7,2030,heatpump,R1,2026,2.24000000000
+7,2031,heatpump,R1,2026,2.24000000000
+7,2032,heatpump,R1,2026,2.24000000000
+7,2033,heatpump,R1,2026,2.24000000000
+7,2034,heatpump,R1,2026,2.24000000000
+7,2035,heatpump,R1,2026,2.24000000000
+7,2036,heatpump,R1,2026,2.24000000000
+7,2037,heatpump,R1,2026,2.24000000000
+8,2030,heatpump,R1,2028,2.24000000000
+8,2031,heatpump,R1,2028,2.24000000000
+8,2032,heatpump,R1,2028,2.24000000000
+8,2033,heatpump,R1,2028,2.24000000000
+8,2034,heatpump,R1,2028,2.24000000000
+8,2035,heatpump,R1,2028,2.24000000000
+8,2036,heatpump,R1,2028,2.24000000000
+8,2037,heatpump,R1,2028,2.24000000000
+8,2038,heatpump,R1,2028,2.24000000000
+8,2039,heatpump,R1,2028,2.24000000000
+9,2032,heatpump,R1,2030,16.28000000000
+9,2033,heatpump,R1,2030,16.28000000000
+9,2034,heatpump,R1,2030,16.28000000000
+9,2035,heatpump,R1,2030,16.28000000000
+9,2036,heatpump,R1,2030,16.28000000000
+9,2037,heatpump,R1,2030,16.28000000000
+9,2038,heatpump,R1,2030,16.28000000000
+9,2039,heatpump,R1,2030,16.28000000000
+9,2040,heatpump,R1,2030,16.28000000000
+9,2041,heatpump,R1,2030,16.28000000000
+10,2030,heatpump,R2,2020,14.04000000000
+10,2031,heatpump,R2,2020,14.04000000000
+11,2030,heatpump,R2,2022,1.68480000000
+11,2031,heatpump,R2,2022,1.68480000000
+11,2032,heatpump,R2,2022,1.68480000000
+11,2033,heatpump,R2,2022,1.68480000000
+12,2030,heatpump,R2,2024,4.12700000000
+12,2031,heatpump,R2,2024,4.12700000000
+12,2032,heatpump,R2,2024,4.12700000000
+12,2033,heatpump,R2,2024,4.12700000000
+12,2034,heatpump,R2,2024,4.12700000000
+12,2035,heatpump,R2,2024,4.12700000000
+13,2030,heatpump,R2,2026,2.24000000000
+13,2031,heatpump,R2,2026,2.24000000000
+13,2032,heatpump,R2,2026,2.24000000000
+13,2033,heatpump,R2,2026,2.24000000000
+13,2034,heatpump,R2,2026,2.24000000000
+13,2035,heatpump,R2,2026,2.24000000000
+13,2036,heatpump,R2,2026,2.24000000000
+13,2037,heatpump,R2,2026,2.24000000000
+14,2030,heatpump,R2,2028,2.24000000000
+14,2031,heatpump,R2,2028,2.24000000000
+14,2032,heatpump,R2,2028,2.24000000000
+14,2033,heatpump,R2,2028,2.24000000000
+14,2034,heatpump,R2,2028,2.24000000000
+14,2035,heatpump,R2,2028,2.24000000000
+14,2036,heatpump,R2,2028,2.24000000000
+14,2037,heatpump,R2,2028,2.24000000000
+14,2038,heatpump,R2,2028,2.24000000000
+14,2039,heatpump,R2,2028,2.24000000000
+15,2032,heatpump,R2,2030,16.28000000000
+15,2033,heatpump,R2,2030,16.28000000000
+15,2034,heatpump,R2,2030,16.28000000000
+15,2035,heatpump,R2,2030,16.28000000000
+15,2036,heatpump,R2,2030,16.28000000000
+15,2037,heatpump,R2,2030,16.28000000000
+15,2038,heatpump,R2,2030,16.28000000000
+15,2039,heatpump,R2,2030,16.28000000000
+15,2040,heatpump,R2,2030,16.28000000000
+15,2041,heatpump,R2,2030,16.28000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
new file mode 100644
index 00000000..82582b38
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
@@ -0,0 +1,93 @@
+asset,year,technology,region,installed,capacity
+0,2032,gasboiler,R1,2022,0.55520000000
+0,2033,gasboiler,R1,2022,0.55520000000
+1,2032,gasboiler,R1,2024,3.11300000000
+1,2033,gasboiler,R1,2024,3.11300000000
+1,2034,gasboiler,R1,2024,3.11300000000
+1,2035,gasboiler,R1,2024,3.11300000000
+2,2032,gasboiler,R2,2022,0.55520000000
+2,2033,gasboiler,R2,2022,0.55520000000
+3,2032,gasboiler,R2,2024,3.11300000000
+3,2033,gasboiler,R2,2024,3.11300000000
+3,2034,gasboiler,R2,2024,3.11300000000
+3,2035,gasboiler,R2,2024,3.11300000000
+4,2032,heatpump,R1,2022,1.68480000000
+4,2033,heatpump,R1,2022,1.68480000000
+5,2032,heatpump,R1,2024,4.12700000000
+5,2033,heatpump,R1,2024,4.12700000000
+5,2034,heatpump,R1,2024,4.12700000000
+5,2035,heatpump,R1,2024,4.12700000000
+6,2032,heatpump,R1,2026,2.24000000000
+6,2033,heatpump,R1,2026,2.24000000000
+6,2034,heatpump,R1,2026,2.24000000000
+6,2035,heatpump,R1,2026,2.24000000000
+6,2036,heatpump,R1,2026,2.24000000000
+6,2037,heatpump,R1,2026,2.24000000000
+7,2032,heatpump,R1,2028,2.24000000000
+7,2033,heatpump,R1,2028,2.24000000000
+7,2034,heatpump,R1,2028,2.24000000000
+7,2035,heatpump,R1,2028,2.24000000000
+7,2036,heatpump,R1,2028,2.24000000000
+7,2037,heatpump,R1,2028,2.24000000000
+7,2038,heatpump,R1,2028,2.24000000000
+7,2039,heatpump,R1,2028,2.24000000000
+8,2032,heatpump,R1,2030,16.28000000000
+8,2033,heatpump,R1,2030,16.28000000000
+8,2034,heatpump,R1,2030,16.28000000000
+8,2035,heatpump,R1,2030,16.28000000000
+8,2036,heatpump,R1,2030,16.28000000000
+8,2037,heatpump,R1,2030,16.28000000000
+8,2038,heatpump,R1,2030,16.28000000000
+8,2039,heatpump,R1,2030,16.28000000000
+8,2040,heatpump,R1,2030,16.28000000000
+8,2041,heatpump,R1,2030,16.28000000000
+9,2034,heatpump,R1,2032,4.48000000000
+9,2035,heatpump,R1,2032,4.48000000000
+9,2036,heatpump,R1,2032,4.48000000000
+9,2037,heatpump,R1,2032,4.48000000000
+9,2038,heatpump,R1,2032,4.48000000000
+9,2039,heatpump,R1,2032,4.48000000000
+9,2040,heatpump,R1,2032,4.48000000000
+9,2041,heatpump,R1,2032,4.48000000000
+9,2042,heatpump,R1,2032,4.48000000000
+9,2043,heatpump,R1,2032,4.48000000000
+10,2032,heatpump,R2,2022,1.68480000000
+10,2033,heatpump,R2,2022,1.68480000000
+11,2032,heatpump,R2,2024,4.12700000000
+11,2033,heatpump,R2,2024,4.12700000000
+11,2034,heatpump,R2,2024,4.12700000000
+11,2035,heatpump,R2,2024,4.12700000000
+12,2032,heatpump,R2,2026,2.24000000000
+12,2033,heatpump,R2,2026,2.24000000000
+12,2034,heatpump,R2,2026,2.24000000000
+12,2035,heatpump,R2,2026,2.24000000000
+12,2036,heatpump,R2,2026,2.24000000000
+12,2037,heatpump,R2,2026,2.24000000000
+13,2032,heatpump,R2,2028,2.24000000000
+13,2033,heatpump,R2,2028,2.24000000000
+13,2034,heatpump,R2,2028,2.24000000000
+13,2035,heatpump,R2,2028,2.24000000000
+13,2036,heatpump,R2,2028,2.24000000000
+13,2037,heatpump,R2,2028,2.24000000000
+13,2038,heatpump,R2,2028,2.24000000000
+13,2039,heatpump,R2,2028,2.24000000000
+14,2032,heatpump,R2,2030,16.28000000000
+14,2033,heatpump,R2,2030,16.28000000000
+14,2034,heatpump,R2,2030,16.28000000000
+14,2035,heatpump,R2,2030,16.28000000000
+14,2036,heatpump,R2,2030,16.28000000000
+14,2037,heatpump,R2,2030,16.28000000000
+14,2038,heatpump,R2,2030,16.28000000000
+14,2039,heatpump,R2,2030,16.28000000000
+14,2040,heatpump,R2,2030,16.28000000000
+14,2041,heatpump,R2,2030,16.28000000000
+15,2034,heatpump,R2,2032,4.48000000000
+15,2035,heatpump,R2,2032,4.48000000000
+15,2036,heatpump,R2,2032,4.48000000000
+15,2037,heatpump,R2,2032,4.48000000000
+15,2038,heatpump,R2,2032,4.48000000000
+15,2039,heatpump,R2,2032,4.48000000000
+15,2040,heatpump,R2,2032,4.48000000000
+15,2041,heatpump,R2,2032,4.48000000000
+15,2042,heatpump,R2,2032,4.48000000000
+15,2043,heatpump,R2,2032,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
new file mode 100644
index 00000000..d7027c5b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
@@ -0,0 +1,85 @@
+asset,year,technology,region,installed,capacity
+0,2034,gasboiler,R1,2024,3.11300000000
+0,2035,gasboiler,R1,2024,3.11300000000
+1,2034,gasboiler,R2,2024,3.11300000000
+1,2035,gasboiler,R2,2024,3.11300000000
+2,2034,heatpump,R1,2024,4.12700000000
+2,2035,heatpump,R1,2024,4.12700000000
+3,2034,heatpump,R1,2026,2.24000000000
+3,2035,heatpump,R1,2026,2.24000000000
+3,2036,heatpump,R1,2026,2.24000000000
+3,2037,heatpump,R1,2026,2.24000000000
+4,2034,heatpump,R1,2028,2.24000000000
+4,2035,heatpump,R1,2028,2.24000000000
+4,2036,heatpump,R1,2028,2.24000000000
+4,2037,heatpump,R1,2028,2.24000000000
+4,2038,heatpump,R1,2028,2.24000000000
+4,2039,heatpump,R1,2028,2.24000000000
+5,2034,heatpump,R1,2030,16.28000000000
+5,2035,heatpump,R1,2030,16.28000000000
+5,2036,heatpump,R1,2030,16.28000000000
+5,2037,heatpump,R1,2030,16.28000000000
+5,2038,heatpump,R1,2030,16.28000000000
+5,2039,heatpump,R1,2030,16.28000000000
+5,2040,heatpump,R1,2030,16.28000000000
+5,2041,heatpump,R1,2030,16.28000000000
+6,2034,heatpump,R1,2032,4.48000000000
+6,2035,heatpump,R1,2032,4.48000000000
+6,2036,heatpump,R1,2032,4.48000000000
+6,2037,heatpump,R1,2032,4.48000000000
+6,2038,heatpump,R1,2032,4.48000000000
+6,2039,heatpump,R1,2032,4.48000000000
+6,2040,heatpump,R1,2032,4.48000000000
+6,2041,heatpump,R1,2032,4.48000000000
+6,2042,heatpump,R1,2032,4.48000000000
+6,2043,heatpump,R1,2032,4.48000000000
+7,2036,heatpump,R1,2034,9.48000000000
+7,2037,heatpump,R1,2034,9.48000000000
+7,2038,heatpump,R1,2034,9.48000000000
+7,2039,heatpump,R1,2034,9.48000000000
+7,2040,heatpump,R1,2034,9.48000000000
+7,2041,heatpump,R1,2034,9.48000000000
+7,2042,heatpump,R1,2034,9.48000000000
+7,2043,heatpump,R1,2034,9.48000000000
+7,2044,heatpump,R1,2034,9.48000000000
+7,2045,heatpump,R1,2034,9.48000000000
+8,2034,heatpump,R2,2024,4.12700000000
+8,2035,heatpump,R2,2024,4.12700000000
+9,2034,heatpump,R2,2026,2.24000000000
+9,2035,heatpump,R2,2026,2.24000000000
+9,2036,heatpump,R2,2026,2.24000000000
+9,2037,heatpump,R2,2026,2.24000000000
+10,2034,heatpump,R2,2028,2.24000000000
+10,2035,heatpump,R2,2028,2.24000000000
+10,2036,heatpump,R2,2028,2.24000000000
+10,2037,heatpump,R2,2028,2.24000000000
+10,2038,heatpump,R2,2028,2.24000000000
+10,2039,heatpump,R2,2028,2.24000000000
+11,2034,heatpump,R2,2030,16.28000000000
+11,2035,heatpump,R2,2030,16.28000000000
+11,2036,heatpump,R2,2030,16.28000000000
+11,2037,heatpump,R2,2030,16.28000000000
+11,2038,heatpump,R2,2030,16.28000000000
+11,2039,heatpump,R2,2030,16.28000000000
+11,2040,heatpump,R2,2030,16.28000000000
+11,2041,heatpump,R2,2030,16.28000000000
+12,2034,heatpump,R2,2032,4.48000000000
+12,2035,heatpump,R2,2032,4.48000000000
+12,2036,heatpump,R2,2032,4.48000000000
+12,2037,heatpump,R2,2032,4.48000000000
+12,2038,heatpump,R2,2032,4.48000000000
+12,2039,heatpump,R2,2032,4.48000000000
+12,2040,heatpump,R2,2032,4.48000000000
+12,2041,heatpump,R2,2032,4.48000000000
+12,2042,heatpump,R2,2032,4.48000000000
+12,2043,heatpump,R2,2032,4.48000000000
+13,2036,heatpump,R2,2034,9.48000000000
+13,2037,heatpump,R2,2034,9.48000000000
+13,2038,heatpump,R2,2034,9.48000000000
+13,2039,heatpump,R2,2034,9.48000000000
+13,2040,heatpump,R2,2034,9.48000000000
+13,2041,heatpump,R2,2034,9.48000000000
+13,2042,heatpump,R2,2034,9.48000000000
+13,2043,heatpump,R2,2034,9.48000000000
+13,2044,heatpump,R2,2034,9.48000000000
+13,2045,heatpump,R2,2034,9.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
new file mode 100644
index 00000000..81417240
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2036,heatpump,R1,2026,2.24000000000
+0,2037,heatpump,R1,2026,2.24000000000
+1,2036,heatpump,R1,2028,2.24000000000
+1,2037,heatpump,R1,2028,2.24000000000
+1,2038,heatpump,R1,2028,2.24000000000
+1,2039,heatpump,R1,2028,2.24000000000
+2,2036,heatpump,R1,2030,16.28000000000
+2,2037,heatpump,R1,2030,16.28000000000
+2,2038,heatpump,R1,2030,16.28000000000
+2,2039,heatpump,R1,2030,16.28000000000
+2,2040,heatpump,R1,2030,16.28000000000
+2,2041,heatpump,R1,2030,16.28000000000
+3,2036,heatpump,R1,2032,4.48000000000
+3,2037,heatpump,R1,2032,4.48000000000
+3,2038,heatpump,R1,2032,4.48000000000
+3,2039,heatpump,R1,2032,4.48000000000
+3,2040,heatpump,R1,2032,4.48000000000
+3,2041,heatpump,R1,2032,4.48000000000
+3,2042,heatpump,R1,2032,4.48000000000
+3,2043,heatpump,R1,2032,4.48000000000
+4,2036,heatpump,R1,2034,9.48000000000
+4,2037,heatpump,R1,2034,9.48000000000
+4,2038,heatpump,R1,2034,9.48000000000
+4,2039,heatpump,R1,2034,9.48000000000
+4,2040,heatpump,R1,2034,9.48000000000
+4,2041,heatpump,R1,2034,9.48000000000
+4,2042,heatpump,R1,2034,9.48000000000
+4,2043,heatpump,R1,2034,9.48000000000
+4,2044,heatpump,R1,2034,9.48000000000
+4,2045,heatpump,R1,2034,9.48000000000
+5,2038,heatpump,R1,2036,4.48000000000
+5,2039,heatpump,R1,2036,4.48000000000
+5,2040,heatpump,R1,2036,4.48000000000
+5,2041,heatpump,R1,2036,4.48000000000
+5,2042,heatpump,R1,2036,4.48000000000
+5,2043,heatpump,R1,2036,4.48000000000
+5,2044,heatpump,R1,2036,4.48000000000
+5,2045,heatpump,R1,2036,4.48000000000
+5,2046,heatpump,R1,2036,4.48000000000
+5,2047,heatpump,R1,2036,4.48000000000
+6,2036,heatpump,R2,2026,2.24000000000
+6,2037,heatpump,R2,2026,2.24000000000
+7,2036,heatpump,R2,2028,2.24000000000
+7,2037,heatpump,R2,2028,2.24000000000
+7,2038,heatpump,R2,2028,2.24000000000
+7,2039,heatpump,R2,2028,2.24000000000
+8,2036,heatpump,R2,2030,16.28000000000
+8,2037,heatpump,R2,2030,16.28000000000
+8,2038,heatpump,R2,2030,16.28000000000
+8,2039,heatpump,R2,2030,16.28000000000
+8,2040,heatpump,R2,2030,16.28000000000
+8,2041,heatpump,R2,2030,16.28000000000
+9,2036,heatpump,R2,2032,4.48000000000
+9,2037,heatpump,R2,2032,4.48000000000
+9,2038,heatpump,R2,2032,4.48000000000
+9,2039,heatpump,R2,2032,4.48000000000
+9,2040,heatpump,R2,2032,4.48000000000
+9,2041,heatpump,R2,2032,4.48000000000
+9,2042,heatpump,R2,2032,4.48000000000
+9,2043,heatpump,R2,2032,4.48000000000
+10,2036,heatpump,R2,2034,9.48000000000
+10,2037,heatpump,R2,2034,9.48000000000
+10,2038,heatpump,R2,2034,9.48000000000
+10,2039,heatpump,R2,2034,9.48000000000
+10,2040,heatpump,R2,2034,9.48000000000
+10,2041,heatpump,R2,2034,9.48000000000
+10,2042,heatpump,R2,2034,9.48000000000
+10,2043,heatpump,R2,2034,9.48000000000
+10,2044,heatpump,R2,2034,9.48000000000
+10,2045,heatpump,R2,2034,9.48000000000
+11,2038,heatpump,R2,2036,4.48000000000
+11,2039,heatpump,R2,2036,4.48000000000
+11,2040,heatpump,R2,2036,4.48000000000
+11,2041,heatpump,R2,2036,4.48000000000
+11,2042,heatpump,R2,2036,4.48000000000
+11,2043,heatpump,R2,2036,4.48000000000
+11,2044,heatpump,R2,2036,4.48000000000
+11,2045,heatpump,R2,2036,4.48000000000
+11,2046,heatpump,R2,2036,4.48000000000
+11,2047,heatpump,R2,2036,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
new file mode 100644
index 00000000..39a4f21d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2038,heatpump,R1,2028,2.24000000000
+0,2039,heatpump,R1,2028,2.24000000000
+1,2038,heatpump,R1,2030,16.28000000000
+1,2039,heatpump,R1,2030,16.28000000000
+1,2040,heatpump,R1,2030,16.28000000000
+1,2041,heatpump,R1,2030,16.28000000000
+2,2038,heatpump,R1,2032,4.48000000000
+2,2039,heatpump,R1,2032,4.48000000000
+2,2040,heatpump,R1,2032,4.48000000000
+2,2041,heatpump,R1,2032,4.48000000000
+2,2042,heatpump,R1,2032,4.48000000000
+2,2043,heatpump,R1,2032,4.48000000000
+3,2038,heatpump,R1,2034,9.48000000000
+3,2039,heatpump,R1,2034,9.48000000000
+3,2040,heatpump,R1,2034,9.48000000000
+3,2041,heatpump,R1,2034,9.48000000000
+3,2042,heatpump,R1,2034,9.48000000000
+3,2043,heatpump,R1,2034,9.48000000000
+3,2044,heatpump,R1,2034,9.48000000000
+3,2045,heatpump,R1,2034,9.48000000000
+4,2038,heatpump,R1,2036,4.48000000000
+4,2039,heatpump,R1,2036,4.48000000000
+4,2040,heatpump,R1,2036,4.48000000000
+4,2041,heatpump,R1,2036,4.48000000000
+4,2042,heatpump,R1,2036,4.48000000000
+4,2043,heatpump,R1,2036,4.48000000000
+4,2044,heatpump,R1,2036,4.48000000000
+4,2045,heatpump,R1,2036,4.48000000000
+4,2046,heatpump,R1,2036,4.48000000000
+4,2047,heatpump,R1,2036,4.48000000000
+5,2040,heatpump,R1,2038,4.48000000000
+5,2041,heatpump,R1,2038,4.48000000000
+5,2042,heatpump,R1,2038,4.48000000000
+5,2043,heatpump,R1,2038,4.48000000000
+5,2044,heatpump,R1,2038,4.48000000000
+5,2045,heatpump,R1,2038,4.48000000000
+5,2046,heatpump,R1,2038,4.48000000000
+5,2047,heatpump,R1,2038,4.48000000000
+5,2048,heatpump,R1,2038,4.48000000000
+5,2049,heatpump,R1,2038,4.48000000000
+6,2038,heatpump,R2,2028,2.24000000000
+6,2039,heatpump,R2,2028,2.24000000000
+7,2038,heatpump,R2,2030,16.28000000000
+7,2039,heatpump,R2,2030,16.28000000000
+7,2040,heatpump,R2,2030,16.28000000000
+7,2041,heatpump,R2,2030,16.28000000000
+8,2038,heatpump,R2,2032,4.48000000000
+8,2039,heatpump,R2,2032,4.48000000000
+8,2040,heatpump,R2,2032,4.48000000000
+8,2041,heatpump,R2,2032,4.48000000000
+8,2042,heatpump,R2,2032,4.48000000000
+8,2043,heatpump,R2,2032,4.48000000000
+9,2038,heatpump,R2,2034,9.48000000000
+9,2039,heatpump,R2,2034,9.48000000000
+9,2040,heatpump,R2,2034,9.48000000000
+9,2041,heatpump,R2,2034,9.48000000000
+9,2042,heatpump,R2,2034,9.48000000000
+9,2043,heatpump,R2,2034,9.48000000000
+9,2044,heatpump,R2,2034,9.48000000000
+9,2045,heatpump,R2,2034,9.48000000000
+10,2038,heatpump,R2,2036,4.48000000000
+10,2039,heatpump,R2,2036,4.48000000000
+10,2040,heatpump,R2,2036,4.48000000000
+10,2041,heatpump,R2,2036,4.48000000000
+10,2042,heatpump,R2,2036,4.48000000000
+10,2043,heatpump,R2,2036,4.48000000000
+10,2044,heatpump,R2,2036,4.48000000000
+10,2045,heatpump,R2,2036,4.48000000000
+10,2046,heatpump,R2,2036,4.48000000000
+10,2047,heatpump,R2,2036,4.48000000000
+11,2040,heatpump,R2,2038,4.48000000000
+11,2041,heatpump,R2,2038,4.48000000000
+11,2042,heatpump,R2,2038,4.48000000000
+11,2043,heatpump,R2,2038,4.48000000000
+11,2044,heatpump,R2,2038,4.48000000000
+11,2045,heatpump,R2,2038,4.48000000000
+11,2046,heatpump,R2,2038,4.48000000000
+11,2047,heatpump,R2,2038,4.48000000000
+11,2048,heatpump,R2,2038,4.48000000000
+11,2049,heatpump,R2,2038,4.48000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..a0b1670c
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,81 @@
+asset,year,technology,region,installed,capacity
+0,2040,heatpump,R1,2030,16.28000000000
+0,2041,heatpump,R1,2030,16.28000000000
+1,2040,heatpump,R1,2032,4.48000000000
+1,2041,heatpump,R1,2032,4.48000000000
+1,2042,heatpump,R1,2032,4.48000000000
+1,2043,heatpump,R1,2032,4.48000000000
+2,2040,heatpump,R1,2034,9.48000000000
+2,2041,heatpump,R1,2034,9.48000000000
+2,2042,heatpump,R1,2034,9.48000000000
+2,2043,heatpump,R1,2034,9.48000000000
+2,2044,heatpump,R1,2034,9.48000000000
+2,2045,heatpump,R1,2034,9.48000000000
+3,2040,heatpump,R1,2036,4.48000000000
+3,2041,heatpump,R1,2036,4.48000000000
+3,2042,heatpump,R1,2036,4.48000000000
+3,2043,heatpump,R1,2036,4.48000000000
+3,2044,heatpump,R1,2036,4.48000000000
+3,2045,heatpump,R1,2036,4.48000000000
+3,2046,heatpump,R1,2036,4.48000000000
+3,2047,heatpump,R1,2036,4.48000000000
+4,2040,heatpump,R1,2038,4.48000000000
+4,2041,heatpump,R1,2038,4.48000000000
+4,2042,heatpump,R1,2038,4.48000000000
+4,2043,heatpump,R1,2038,4.48000000000
+4,2044,heatpump,R1,2038,4.48000000000
+4,2045,heatpump,R1,2038,4.48000000000
+4,2046,heatpump,R1,2038,4.48000000000
+4,2047,heatpump,R1,2038,4.48000000000
+4,2048,heatpump,R1,2038,4.48000000000
+4,2049,heatpump,R1,2038,4.48000000000
+5,2042,heatpump,R1,2040,18.52000000000
+5,2043,heatpump,R1,2040,18.52000000000
+5,2044,heatpump,R1,2040,18.52000000000
+5,2045,heatpump,R1,2040,18.52000000000
+5,2046,heatpump,R1,2040,18.52000000000
+5,2047,heatpump,R1,2040,18.52000000000
+5,2048,heatpump,R1,2040,18.52000000000
+5,2049,heatpump,R1,2040,18.52000000000
+5,2050,heatpump,R1,2040,18.52000000000
+5,2051,heatpump,R1,2040,18.52000000000
+6,2040,heatpump,R2,2030,16.28000000000
+6,2041,heatpump,R2,2030,16.28000000000
+7,2040,heatpump,R2,2032,4.48000000000
+7,2041,heatpump,R2,2032,4.48000000000
+7,2042,heatpump,R2,2032,4.48000000000
+7,2043,heatpump,R2,2032,4.48000000000
+8,2040,heatpump,R2,2034,9.48000000000
+8,2041,heatpump,R2,2034,9.48000000000
+8,2042,heatpump,R2,2034,9.48000000000
+8,2043,heatpump,R2,2034,9.48000000000
+8,2044,heatpump,R2,2034,9.48000000000
+8,2045,heatpump,R2,2034,9.48000000000
+9,2040,heatpump,R2,2036,4.48000000000
+9,2041,heatpump,R2,2036,4.48000000000
+9,2042,heatpump,R2,2036,4.48000000000
+9,2043,heatpump,R2,2036,4.48000000000
+9,2044,heatpump,R2,2036,4.48000000000
+9,2045,heatpump,R2,2036,4.48000000000
+9,2046,heatpump,R2,2036,4.48000000000
+9,2047,heatpump,R2,2036,4.48000000000
+10,2040,heatpump,R2,2038,4.48000000000
+10,2041,heatpump,R2,2038,4.48000000000
+10,2042,heatpump,R2,2038,4.48000000000
+10,2043,heatpump,R2,2038,4.48000000000
+10,2044,heatpump,R2,2038,4.48000000000
+10,2045,heatpump,R2,2038,4.48000000000
+10,2046,heatpump,R2,2038,4.48000000000
+10,2047,heatpump,R2,2038,4.48000000000
+10,2048,heatpump,R2,2038,4.48000000000
+10,2049,heatpump,R2,2038,4.48000000000
+11,2042,heatpump,R2,2040,18.52000000000
+11,2043,heatpump,R2,2040,18.52000000000
+11,2044,heatpump,R2,2040,18.52000000000
+11,2045,heatpump,R2,2040,18.52000000000
+11,2046,heatpump,R2,2040,18.52000000000
+11,2047,heatpump,R2,2040,18.52000000000
+11,2048,heatpump,R2,2040,18.52000000000
+11,2049,heatpump,R2,2040,18.52000000000
+11,2050,heatpump,R2,2040,18.52000000000
+11,2051,heatpump,R2,2040,18.52000000000
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
new file mode 100644
index 00000000..1c61b1cb
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
@@ -0,0 +1,161 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2022,1,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2022,1,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2022,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2022,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2022,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2022,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2022,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2022,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2022,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2022,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+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.87750000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+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.87750000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+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,67.94550000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+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.70000000000
+5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2022,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2022,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2022,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2022,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2022,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2022,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
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
new file mode 100644
index 00000000..c849a2cd
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
@@ -0,0 +1,289 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2022,4,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2022,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2024,2,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2024,3,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2024,5,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2022,4,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2022,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2024,2,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2024,3,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2024,5,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2022,4,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2024,5,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2022,4,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2024,5,all-year,all-week,night,gasboiler,2022,0.74850000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2022,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2022,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2024,3,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2024,5,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2022,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2022,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2024,3,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2024,5,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2022,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2024,5,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2022,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2024,5,all-year,all-week,morning,gasboiler,2022,1.06930000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2022,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2024,3,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2022,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2024,3,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2022,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2022,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2024,3,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2022,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2022,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2024,3,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2022,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2024,5,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2022,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2024,5,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2022,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2022,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2022,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+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,gasboiler,2022,0.03470000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2024,3,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2022,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2022,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2022,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+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,gasboiler,2022,0.03470000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2024,3,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2022,4,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,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2024,5,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2022,4,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,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2024,5,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2022,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2022,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2024,3,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2024,5,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2022,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2022,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2024,3,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2024,5,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2022,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2024,5,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2022,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2024,5,all-year,all-week,evening,gasboiler,2022,1.49700000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2022,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2022,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2024,3,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2022,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2022,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2024,3,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2022,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2024,5,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2022,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2024,5,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2022,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2024,3,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2022,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2024,3,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
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
new file mode 100644
index 00000000..7a4fe71a
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
@@ -0,0 +1,417 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2024,9,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2024,10,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2026,4,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2026,5,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2026,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2026,7,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2026,8,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2026,9,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2026,10,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2026,11,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2024,9,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2024,10,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2026,4,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2026,5,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2026,6,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2026,7,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2026,8,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2026,9,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2026,10,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2026,11,all-year,all-week,night,heatpump,2024,0.08600000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2026,4,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2026,5,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2026,4,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2026,5,all-year,all-week,night,gasboiler,2024,4.19670000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2024,9,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2024,10,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2026,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2026,5,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2026,9,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2026,10,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2026,11,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2024,9,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2024,10,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2026,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2026,5,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2026,9,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2026,10,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2026,11,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2026,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2026,5,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2026,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2026,5,all-year,all-week,morning,gasboiler,2024,5.99540000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2024,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2024,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2026,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2026,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2026,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2024,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2024,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2026,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2026,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2026,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2024,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2024,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2026,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2026,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2026,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2026,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2024,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2024,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2026,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2026,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2026,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2026,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2026,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2026,5,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2026,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2026,5,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+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,gasboiler,2022,0.03470000000
+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,gasboiler,2022,0.03470000000
+4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2024,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2024,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2026,4,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2026,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2026,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2026,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+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,gasboiler,2022,0.03470000000
+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,gasboiler,2022,0.03470000000
+4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2024,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2024,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2026,4,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2026,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2026,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2026,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2024,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2026,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2026,5,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2024,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2026,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2026,5,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2024,9,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2024,10,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2026,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2026,5,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2026,9,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2026,10,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2026,11,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2024,9,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2024,10,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2026,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2026,5,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2026,9,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2026,10,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2026,11,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2026,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2026,5,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2026,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2026,5,all-year,all-week,evening,gasboiler,2024,8.39350000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2024,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2024,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2026,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2026,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2026,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2026,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2024,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2024,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2026,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2026,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2026,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2026,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2026,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2026,5,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2026,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2026,5,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2024,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2024,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2026,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2026,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2026,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2024,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2024,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2026,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2026,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2026,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
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
new file mode 100644
index 00000000..20f1bc58
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
@@ -0,0 +1,481 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2026,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2026,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2026,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2026,8,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2026,9,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2026,10,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2026,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2026,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2028,8,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2028,9,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2028,10,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2028,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2028,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2028,13,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2026,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2026,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2026,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2026,8,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2026,9,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2026,10,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2026,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2026,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2028,8,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2028,9,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2028,10,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2028,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2028,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2028,13,all-year,all-week,night,heatpump,2026,0.04670000000
+0,CO2f,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2026,8,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2026,9,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2028,8,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2028,9,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2026,8,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2026,9,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2028,8,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2028,9,all-year,all-week,night,gasboiler,2024,4.19670000000
+1,heat,R1,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2026,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2026,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2026,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2026,10,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2026,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2026,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2028,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2028,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2028,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2028,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2028,13,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2026,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2026,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2026,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2026,10,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2026,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2026,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2028,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2028,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2028,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2028,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2028,13,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,CO2f,R1,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2026,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2026,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2028,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2028,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2026,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2026,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2028,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2028,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2026,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2026,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2026,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2026,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2028,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2028,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2028,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2026,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2026,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2026,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2026,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2028,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2028,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2028,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,CO2f,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2026,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2026,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2026,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2026,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2026,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2026,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2028,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2028,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2028,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2026,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2026,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2026,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2026,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2026,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2026,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2028,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2028,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2028,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,CO2f,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2026,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2026,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2028,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2028,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2026,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2026,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2028,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2028,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2026,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2026,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2026,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2026,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2026,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2026,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2028,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2028,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2028,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2026,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2026,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2026,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2026,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2026,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2026,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2028,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2028,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2028,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,CO2f,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2026,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2026,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2028,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2028,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2026,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2026,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2028,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2028,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+5,heat,R1,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2026,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2026,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2026,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2026,10,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2026,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2026,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2028,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2028,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2028,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2028,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2028,13,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2026,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2026,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2026,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2026,10,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2026,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2026,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2028,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2028,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2028,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2028,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2028,13,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,CO2f,R1,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2026,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2026,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2028,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2028,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2026,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2026,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2028,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2028,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2026,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2026,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2026,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2026,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2026,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2026,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2028,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2028,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2028,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2026,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2026,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2026,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2026,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2026,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2026,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2028,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2028,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2028,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,CO2f,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2026,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2026,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2028,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2028,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2026,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2026,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2028,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2028,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2026,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2026,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2026,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2026,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2028,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2028,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2028,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2026,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2026,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2026,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2026,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2028,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2028,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2028,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,CO2f,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
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
new file mode 100644
index 00000000..e9e10881
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
@@ -0,0 +1,545 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2028,9,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2028,10,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2028,11,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2028,12,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2028,13,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2028,14,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2030,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2030,10,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2030,15,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2028,9,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2028,10,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2028,11,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2028,12,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2028,13,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2028,14,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2030,2,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2030,10,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2030,15,all-year,all-week,night,heatpump,2028,0.04670000000
+0,CO2f,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2028,9,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2028,10,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2030,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2030,10,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2028,9,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2028,10,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2030,2,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2030,10,all-year,all-week,night,gasboiler,2024,4.19670000000
+1,heat,R1,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2028,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2028,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2028,11,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2028,12,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2028,13,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2028,14,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2030,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2030,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2030,15,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2028,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2028,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2028,11,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2028,12,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2028,13,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2028,14,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2030,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2030,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2030,15,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,CO2f,R1,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2028,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2028,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2030,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2030,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2028,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2028,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2030,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2030,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2028,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2028,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2028,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2028,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2030,15,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2028,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2028,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2028,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2028,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2030,15,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,CO2f,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2028,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2028,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2028,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2028,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2028,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2030,15,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2028,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2028,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2028,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2028,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2028,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2030,15,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,CO2f,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2028,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2028,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2030,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2030,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2028,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2028,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2030,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2030,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2028,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2028,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2028,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2028,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2028,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2030,15,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2028,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2028,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2028,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2028,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2028,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2030,15,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,CO2f,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2028,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2028,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2030,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2030,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2028,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2028,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2030,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2030,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+5,heat,R1,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2028,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2028,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2028,11,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2028,12,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2028,13,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2028,14,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2030,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2030,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2030,15,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2028,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2028,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2028,11,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2028,12,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2028,13,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2028,14,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2030,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2030,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2030,15,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,CO2f,R1,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2028,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2028,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2030,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2030,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2028,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2028,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2030,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2030,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2028,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2028,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2028,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2028,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2028,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2030,15,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2028,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2028,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2028,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2028,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2028,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2030,15,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,CO2f,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2028,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2028,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2030,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2030,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2028,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2028,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2030,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2030,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2028,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2028,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2028,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2028,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2030,15,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2028,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2028,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2028,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2028,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2030,15,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,CO2f,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
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
new file mode 100644
index 00000000..00b9a70d
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
@@ -0,0 +1,577 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2030,2,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2030,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2030,8,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2032,7,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2032,8,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2032,9,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2032,14,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2032,15,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2030,2,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2030,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2030,8,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2032,7,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2032,8,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2032,9,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2032,14,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2032,15,all-year,all-week,night,heatpump,2030,0.33920000000
+0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2030,2,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2030,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2030,2,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2030,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2030,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2030,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2032,7,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2032,8,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2032,15,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2030,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2030,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2032,7,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2032,8,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2032,15,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2030,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2030,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2030,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2030,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+2,heat,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2032,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2032,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2032,15,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2032,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2032,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2032,15,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,CO2f,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2032,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2032,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2032,15,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2032,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2032,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2032,15,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2030,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2030,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2030,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2030,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2032,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2032,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2032,15,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2032,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2032,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2032,15,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2030,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2030,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2030,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2030,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2030,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2030,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2032,7,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2032,8,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2032,15,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2030,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2030,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2032,7,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2032,8,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2032,15,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2030,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2030,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2030,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2030,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+6,heat,R1,2030,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2032,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2032,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2032,15,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2030,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2032,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2032,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2032,15,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,CO2f,R1,2030,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2030,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2030,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2030,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2030,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2030,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+7,heat,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2032,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2032,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2032,15,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2032,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2032,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2032,15,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,CO2f,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
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
new file mode 100644
index 00000000..00d32926
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
@@ -0,0 +1,513 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R1,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2032,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2032,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2032,14,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2034,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2034,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2034,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2034,9,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2034,11,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2034,13,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2034,14,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2034,15,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
+0,heat,R2,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2032,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2032,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2022,0.03510000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2032,14,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2034,3,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2034,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2034,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2034,9,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2034,11,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2034,13,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2034,14,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2034,15,all-year,all-week,night,heatpump,2032,0.09330000000
+0,CO2f,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R1,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2034,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
+0,CO2f,R2,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2034,3,all-year,all-week,night,gasboiler,2024,4.19670000000
+1,heat,R1,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R1,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2032,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2032,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2034,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2034,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2034,9,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
+1,heat,R2,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2032,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2032,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2022,0.05010000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2034,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2034,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2034,9,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,CO2f,R1,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R1,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2034,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
+1,CO2f,R2,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2034,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
+2,heat,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2032,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2032,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2034,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2034,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2032,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2032,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2034,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2034,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,CO2f,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
+2,CO2f,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+3,heat,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2032,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2032,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2034,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2034,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2032,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2032,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2034,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2034,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,CO2f,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2034,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
+3,CO2f,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2034,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+4,heat,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2032,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2032,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2034,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2034,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2032,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2032,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2034,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2034,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,CO2f,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2034,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
+4,CO2f,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2034,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+5,heat,R1,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R1,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2032,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2032,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2034,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2034,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2034,9,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
+5,heat,R2,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2032,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2032,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2022,0.07020000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2034,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2034,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2034,9,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,CO2f,R1,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R1,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2034,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
+5,CO2f,R2,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2034,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
+6,heat,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2032,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2032,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2034,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2034,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2032,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2032,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2034,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2034,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,CO2f,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2034,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
+6,CO2f,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2034,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+7,heat,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2032,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2032,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2034,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2034,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2032,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2032,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2034,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2034,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,CO2f,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+7,CO2f,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
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
new file mode 100644
index 00000000..b88b7e2b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
@@ -0,0 +1,385 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2034,0,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R1,2034,2,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2034,8,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R1,2034,9,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2034,10,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2034,11,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2036,3,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2036,5,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2036,9,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2036,10,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2036,11,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2036,12,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2036,13,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2034,0,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
+0,heat,R2,2034,2,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2034,8,all-year,all-week,night,heatpump,2024,0.08600000000
+0,heat,R2,2034,9,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2034,10,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2034,11,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2036,3,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2036,5,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2036,9,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2036,10,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2036,11,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2036,12,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2036,13,all-year,all-week,night,heatpump,2034,0.19750000000
+0,CO2f,R1,2034,0,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R1,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2034,0,all-year,all-week,night,gasboiler,2024,4.19670000000
+0,CO2f,R2,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
+1,heat,R1,2034,0,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R1,2034,2,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2034,8,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R1,2034,9,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2034,10,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2036,3,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2036,9,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2036,10,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2036,11,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2036,12,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2034,0,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
+1,heat,R2,2034,2,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2034,8,all-year,all-week,morning,heatpump,2024,0.12280000000
+1,heat,R2,2034,9,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2034,10,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2036,3,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2036,9,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2036,10,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2036,11,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2036,12,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,CO2f,R1,2034,0,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R1,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2034,0,all-year,all-week,morning,gasboiler,2024,5.99540000000
+1,CO2f,R2,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
+2,heat,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R1,2034,2,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2034,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R1,2034,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2034,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2036,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2036,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2036,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2036,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2036,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
+2,heat,R2,2034,2,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2034,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
+2,heat,R2,2034,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2034,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2036,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2036,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2036,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2036,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2036,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,CO2f,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+2,CO2f,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
+3,heat,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R1,2034,2,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2034,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R1,2034,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2034,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2036,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2036,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2036,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2036,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2036,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
+3,heat,R2,2034,2,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2034,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
+3,heat,R2,2034,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2034,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2036,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2036,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2036,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2036,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2036,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,CO2f,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+3,CO2f,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
+4,heat,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R1,2034,2,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2034,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R1,2034,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2034,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2036,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2036,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2036,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2036,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2036,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
+4,heat,R2,2034,2,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2034,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
+4,heat,R2,2034,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2034,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2036,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2036,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2036,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2036,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2036,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,CO2f,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+4,CO2f,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
+5,heat,R1,2034,0,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R1,2034,2,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2034,8,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R1,2034,9,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2034,10,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2036,3,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2036,9,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2036,10,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2036,11,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2036,12,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2034,0,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
+5,heat,R2,2034,2,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2034,8,all-year,all-week,evening,heatpump,2024,0.17200000000
+5,heat,R2,2034,9,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2034,10,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2036,3,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2036,9,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2036,10,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2036,11,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2036,12,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,CO2f,R1,2034,0,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R1,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2034,0,all-year,all-week,evening,gasboiler,2024,8.39350000000
+5,CO2f,R2,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
+6,heat,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R1,2034,2,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2034,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R1,2034,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2034,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2036,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2036,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2036,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2036,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2036,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
+6,heat,R2,2034,2,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2034,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
+6,heat,R2,2034,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2034,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2036,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2036,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2036,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2036,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2036,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,CO2f,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+6,CO2f,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
+7,heat,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R1,2034,2,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2034,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R1,2034,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2034,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2036,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2036,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2036,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2036,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2036,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
+7,heat,R2,2034,2,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2034,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
+7,heat,R2,2034,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2034,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2036,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2036,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2036,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2036,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2036,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,CO2f,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+7,CO2f,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
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
new file mode 100644
index 00000000..0d4b3ed0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
@@ -0,0 +1,321 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2036,0,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2036,1,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2036,2,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2036,3,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2036,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2036,9,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2036,10,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2038,1,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2038,2,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2038,3,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2038,4,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2038,5,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2038,10,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2038,11,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2036,0,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2036,1,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2036,2,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2036,3,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2026,0.04670000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2036,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2036,9,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2036,10,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2038,1,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2038,2,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2038,3,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2038,4,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2038,5,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2038,10,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2038,11,all-year,all-week,night,heatpump,2036,0.09330000000
+1,heat,R1,2036,0,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2036,1,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2036,2,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2036,3,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2036,9,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2036,10,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2038,1,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2038,2,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2038,3,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2038,4,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2038,10,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2038,11,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2036,0,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2036,1,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2036,2,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2036,3,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2026,0.06670000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2036,9,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2036,10,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2038,1,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2038,2,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2038,3,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2038,4,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2038,10,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2038,11,all-year,all-week,morning,heatpump,2036,0.13330000000
+2,heat,R1,2036,0,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2036,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2036,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2036,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2036,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2036,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2038,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2038,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2038,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2038,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2038,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2038,11,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2036,0,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2036,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2036,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2036,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2036,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2036,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2038,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2038,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2038,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2038,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2038,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2038,11,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+3,heat,R1,2036,0,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2036,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2036,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2036,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2036,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2036,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2038,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2038,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2038,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2038,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2038,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2038,11,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2036,0,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2036,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2036,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2036,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2036,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2036,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2038,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2038,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2038,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2038,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2038,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2038,11,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+4,heat,R1,2036,0,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2036,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2036,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2036,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2036,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2036,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2038,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2038,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2038,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2038,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2038,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2038,11,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2036,0,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2036,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2036,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2036,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2036,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2036,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2038,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2038,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2038,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2038,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2038,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2038,11,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+5,heat,R1,2036,0,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2036,1,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2036,2,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2036,3,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2036,9,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2036,10,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2038,1,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2038,2,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2038,3,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2038,4,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2038,10,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2038,11,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2036,0,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2036,1,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2036,2,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2036,3,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2026,0.09330000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2036,9,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2036,10,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2038,1,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2038,2,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2038,3,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2038,4,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2038,10,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2038,11,all-year,all-week,evening,heatpump,2036,0.18670000000
+6,heat,R1,2036,0,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2036,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2036,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2036,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2036,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2036,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2038,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2038,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2038,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2038,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2038,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2038,11,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2036,0,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2036,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2036,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2036,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2036,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2036,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2038,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2038,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2038,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2038,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2038,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2038,11,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+7,heat,R1,2036,0,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2036,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2036,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2036,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2036,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2036,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2038,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2038,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2038,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2038,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2038,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2038,11,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2036,0,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2036,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2036,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2036,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2036,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2036,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2038,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2038,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2038,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2038,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2038,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2038,11,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
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
new file mode 100644
index 00000000..29c854c0
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
@@ -0,0 +1,321 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2038,0,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2038,1,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2038,2,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2038,3,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2038,4,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2038,6,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2038,10,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2040,1,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2040,2,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2040,5,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2040,11,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R2,2038,0,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2038,1,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2038,2,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2038,3,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2038,4,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2038,6,all-year,all-week,night,heatpump,2028,0.04670000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2038,10,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2040,1,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2040,2,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2040,5,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2040,11,all-year,all-week,night,heatpump,2038,0.09330000000
+1,heat,R1,2038,0,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2038,1,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2038,2,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2038,3,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2038,4,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2038,10,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2040,11,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R2,2038,0,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2038,1,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2038,2,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2038,3,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2038,4,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2028,0.06670000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2038,10,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2040,11,all-year,all-week,morning,heatpump,2038,0.13330000000
+2,heat,R1,2038,0,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2038,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2038,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2038,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2038,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2038,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2040,11,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R2,2038,0,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2038,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2038,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2038,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2038,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2038,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2040,11,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+3,heat,R1,2038,0,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2038,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2038,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2038,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2038,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2038,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2040,11,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R2,2038,0,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2038,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2038,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2038,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2038,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2028,0.06670000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2038,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2040,11,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+4,heat,R1,2038,0,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2038,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2038,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2038,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2038,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2038,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2040,11,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R2,2038,0,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2038,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2038,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2038,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2038,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2028,0.14000000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2038,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2040,11,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+5,heat,R1,2038,0,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2038,1,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2038,2,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2038,3,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2038,4,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2038,10,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2040,11,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R2,2038,0,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2038,1,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2038,2,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2038,3,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2038,4,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2028,0.09330000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2038,10,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2040,11,all-year,all-week,evening,heatpump,2038,0.18670000000
+6,heat,R1,2038,0,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2038,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2038,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2038,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2038,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2038,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2040,11,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R2,2038,0,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2038,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2038,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2038,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2038,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2028,0.09330000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2038,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2040,11,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+7,heat,R1,2038,0,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2038,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2038,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2038,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2038,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2038,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2040,11,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R2,2038,0,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2038,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2038,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2038,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2038,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2038,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2040,11,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
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
new file mode 100644
index 00000000..209e7d31
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
@@ -0,0 +1,321 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,0,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2040,1,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2040,2,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R1,2042,1,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2042,2,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2042,3,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2042,4,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R1,2042,5,all-year,all-week,night,heatpump,2040,0.38580000000
+0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.38580000000
+0,heat,R2,2040,0,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2040,1,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2040,2,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.33920000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R2,2042,1,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2042,2,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2042,3,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2042,4,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R2,2042,5,all-year,all-week,night,heatpump,2040,0.38580000000
+0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.09330000000
+0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.19750000000
+0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.09330000000
+0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.09330000000
+0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.38580000000
+1,heat,R1,2040,0,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R1,2042,1,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2042,2,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2042,3,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2042,4,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R1,2042,5,all-year,all-week,morning,heatpump,2040,0.55120000000
+1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.55120000000
+1,heat,R2,2040,0,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.48450000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R2,2042,1,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2042,2,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2042,3,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2042,4,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R2,2042,5,all-year,all-week,morning,heatpump,2040,0.55120000000
+1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.13330000000
+1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.28210000000
+1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.13330000000
+1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.13330000000
+1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.55120000000
+2,heat,R1,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R1,2042,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2042,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2042,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2042,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R1,2042,5,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
+2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
+2,heat,R2,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R2,2042,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2042,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2042,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2042,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R2,2042,5,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
+2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
+2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
+2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
+2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
+2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
+3,heat,R1,2040,0,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R1,2042,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2042,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2042,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2042,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R1,2042,5,all-year,all-week,early-peak,heatpump,2040,0.55120000000
+3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.55120000000
+3,heat,R2,2040,0,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.48450000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R2,2042,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2042,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2042,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2042,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R2,2042,5,all-year,all-week,early-peak,heatpump,2040,0.55120000000
+3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
+3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
+3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
+3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
+3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.55120000000
+4,heat,R1,2040,0,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R1,2042,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2042,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2042,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2042,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R1,2042,5,all-year,all-week,late-peak,heatpump,2040,1.15750000000
+4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,1.15750000000
+4,heat,R2,2040,0,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,1.01750000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R2,2042,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2042,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2042,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2042,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R2,2042,5,all-year,all-week,late-peak,heatpump,2040,1.15750000000
+4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
+4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
+4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
+4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
+4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,1.15750000000
+5,heat,R1,2040,0,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R1,2042,1,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2042,2,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2042,3,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2042,4,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R1,2042,5,all-year,all-week,evening,heatpump,2040,0.77170000000
+5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.77170000000
+5,heat,R2,2040,0,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.67830000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R2,2042,1,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2042,2,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2042,3,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2042,4,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R2,2042,5,all-year,all-week,evening,heatpump,2040,0.77170000000
+5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.18670000000
+5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.39500000000
+5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.18670000000
+5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.18670000000
+5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.77170000000
+6,heat,R1,2040,0,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R1,2042,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2042,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2042,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2042,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R1,2042,5,all-year,all-week,early-morning,heatpump,2040,0.77170000000
+6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.77170000000
+6,heat,R2,2040,0,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.67830000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R2,2042,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2042,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2042,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2042,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R2,2042,5,all-year,all-week,early-morning,heatpump,2040,0.77170000000
+6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
+6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
+6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
+6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
+6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.77170000000
+7,heat,R1,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R1,2042,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2042,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2042,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2042,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R1,2042,5,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
+7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
+7,heat,R2,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R2,2042,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2042,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2042,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2042,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R2,2042,5,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
+7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
+7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
+7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
new file mode 100644
index 00000000..1d028468
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,7 @@
+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-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..761a97db
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,17 @@
+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.45020000000
+1,2035,R1,gassupply1,2025,2.45020000000
+1,2040,R1,gassupply1,2025,2.45020000000
+1,2045,R1,gassupply1,2025,2.45020000000
+1,2050,R1,gassupply1,2025,2.45020000000
+1,2064,R1,gassupply1,2025,2.45020000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,2.45020000000
+3,2035,R2,gassupply1,2025,2.45020000000
+3,2040,R2,gassupply1,2025,2.45020000000
+3,2045,R2,gassupply1,2025,2.45020000000
+3,2050,R2,gassupply1,2025,2.45020000000
+3,2064,R2,gassupply1,2025,2.45020000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..0bc4ab85
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,29 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.45020000000
+1,2035,R1,gassupply1,2025,2.45020000000
+1,2040,R1,gassupply1,2025,2.45020000000
+1,2045,R1,gassupply1,2025,2.45020000000
+1,2050,R1,gassupply1,2025,2.45020000000
+1,2064,R1,gassupply1,2025,2.45020000000
+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.45020000000
+4,2035,R2,gassupply1,2025,2.45020000000
+4,2040,R2,gassupply1,2025,2.45020000000
+4,2045,R2,gassupply1,2025,2.45020000000
+4,2050,R2,gassupply1,2025,2.45020000000
+4,2064,R2,gassupply1,2025,2.45020000000
+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-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..0a21bfb3
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,25 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,2.45020000000
+1,2040,R1,gassupply1,2025,2.45020000000
+1,2045,R1,gassupply1,2025,2.45020000000
+1,2050,R1,gassupply1,2025,2.45020000000
+1,2064,R1,gassupply1,2025,2.45020000000
+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.45020000000
+4,2040,R2,gassupply1,2025,2.45020000000
+4,2045,R2,gassupply1,2025,2.45020000000
+4,2050,R2,gassupply1,2025,2.45020000000
+4,2064,R2,gassupply1,2025,2.45020000000
+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-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
new file mode 100644
index 00000000..8214f482
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,2.45020000000
+1,2045,R1,gassupply1,2025,2.45020000000
+1,2050,R1,gassupply1,2025,2.45020000000
+1,2064,R1,gassupply1,2025,2.45020000000
+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.45020000000
+4,2045,R2,gassupply1,2025,2.45020000000
+4,2050,R2,gassupply1,2025,2.45020000000
+4,2064,R2,gassupply1,2025,2.45020000000
+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-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..0157b9b8
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,2.45020000000
+1,2050,R1,gassupply1,2025,2.45020000000
+1,2064,R1,gassupply1,2025,2.45020000000
+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.45020000000
+4,2050,R2,gassupply1,2025,2.45020000000
+4,2064,R2,gassupply1,2025,2.45020000000
+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-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..3f41a855
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,2.45020000000
+1,2055,R1,gassupply1,2025,2.45020000000
+1,2064,R1,gassupply1,2025,2.45020000000
+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.45020000000
+4,2055,R2,gassupply1,2025,2.45020000000
+4,2064,R2,gassupply1,2025,2.45020000000
+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-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
new file mode 100644
index 00000000..5943301c
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -0,0 +1,148 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gas_stove,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gas_stove,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
+electric_stove,R1,R1,A1,residential,retrofit,2025,17.40000000000
+gas_stove,R1,R1,A1,residential,retrofit,2025,5.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,17.40000000000
+electric_stove,R2,R2,A1,residential,retrofit,2025,17.40000000000
+gas_stove,R2,R2,A1,residential,retrofit,2025,5.00000000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2025,17.40000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+solarPV,R1,R1,A1,power,retrofit,2025,12.55000000000
+windturbine,R1,R1,A1,power,retrofit,2025,20.00000000000
+gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
+windturbine,R2,R2,A1,power,retrofit,2025,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,17.40000000000
+electric_stove,R1,R1,A1,residential,retrofit,2030,6.74000000000
+gas_stove,R1,R1,A1,residential,retrofit,2030,3.86000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.86000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.74000000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,17.40000000000
+electric_stove,R2,R2,A1,residential,retrofit,2030,6.74000000000
+gas_stove,R2,R2,A1,residential,retrofit,2030,3.86000000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,3.86000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
+heatpump,R2,R2,A1,residential,retrofit,2030,6.74000000000
+solarPV,R1,R1,A1,power,retrofit,2030,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2030,15.73000000000
+windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
+solarPV,R2,R2,A1,power,retrofit,2030,15.73000000000
+windturbine,R2,R2,A1,power,retrofit,2030,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2030,2.45020000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,6.74000000000
+electric_stove,R1,R1,A1,residential,retrofit,2035,23.00000000000
+gas_stove,R1,R1,A1,residential,retrofit,2035,3.86000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.86000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.74000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,6.74000000000
+electric_stove,R2,R2,A1,residential,retrofit,2035,23.00000000000
+gas_stove,R2,R2,A1,residential,retrofit,2035,3.86000000000
+gasboiler,R2,R2,A1,residential,retrofit,2035,3.86000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,6.74000000000
+heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2035,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2035,20.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2035,15.73000000000
+solarPV,R2,R2,A1,power,retrofit,2035,11.20000000000
+windturbine,R2,R2,A1,power,retrofit,2035,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,23.00000000000
+electric_stove,R1,R1,A1,residential,retrofit,2040,15.31400000000
+gas_stove,R1,R1,A1,residential,retrofit,2040,0.88600000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,0.88600000000
+heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,15.31400000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,23.00000000000
+electric_stove,R2,R2,A1,residential,retrofit,2040,15.31400000000
+gas_stove,R2,R2,A1,residential,retrofit,2040,0.88600000000
+gasboiler,R2,R2,A1,residential,retrofit,2040,0.88600000000
+heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
+heatpump,R2,R2,A1,residential,retrofit,2040,15.31400000000
+solarPV,R1,R1,A1,power,retrofit,2040,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2040,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2040,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,5.94800000000
+windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2040,15.73000000000
+solarPV,R2,R2,A1,power,retrofit,2040,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2040,17.14800000000
+windturbine,R2,R2,A1,power,retrofit,2040,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,15.31400000000
+electric_stove,R1,R1,A1,residential,retrofit,2045,28.60000000000
+gas_stove,R1,R1,A1,residential,retrofit,2045,0.88600000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,0.88600000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.31400000000
+heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,15.31400000000
+electric_stove,R2,R2,A1,residential,retrofit,2045,28.60000000000
+gas_stove,R2,R2,A1,residential,retrofit,2045,0.88600000000
+gasboiler,R2,R2,A1,residential,retrofit,2045,0.88600000000
+heatpump,R2,R2,A1,residential,retrofit,2045,15.31400000000
+heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
+solarPV,R1,R1,A1,power,retrofit,2045,12.55000000000
+solarPV,R1,R1,A1,power,retrofit,2045,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2045,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,5.94800000000
+solarPV,R1,R1,A1,power,retrofit,2045,11.20000000000
+windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,2.40000000000
+solarPV,R2,R2,A1,power,retrofit,2045,15.73000000000
+solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2045,17.14800000000
+solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
+windturbine,R2,R2,A1,power,retrofit,2045,32.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
+electric_stove,R1,R1,A1,residential,retrofit,2050,28.60000000000
+electric_stove,R1,R1,A1,residential,retrofit,2050,21.80000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
+electric_stove,R2,R2,A1,residential,retrofit,2050,28.60000000000
+electric_stove,R2,R2,A1,residential,retrofit,2050,21.80000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
+heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
+solarPV,R1,R1,A1,power,retrofit,2050,15.73000000000
+solarPV,R1,R1,A1,power,retrofit,2050,20.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,5.94800000000
+solarPV,R1,R1,A1,power,retrofit,2050,11.20000000000
+solarPV,R1,R1,A1,power,retrofit,2050,32.97200000000
+windturbine,R1,R1,A1,power,retrofit,2050,2.40000000000
+windturbine,R1,R1,A1,power,retrofit,2050,12.55000000000
+solarPV,R2,R2,A1,power,retrofit,2050,15.73000000000
+solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2050,17.14800000000
+solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
+solarPV,R2,R2,A1,power,retrofit,2050,32.97200000000
+windturbine,R2,R2,A1,power,retrofit,2050,12.55000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.45020000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,2.45020000000
+gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
new file mode 100644
index 00000000..ec72ee70
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -0,0 +1,561 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'early-morning')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-morning')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.58860000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.58860000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,80.15030000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,80.15030000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.60590000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.60590000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,80.21470000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,80.21470000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58860000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58860000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.15030000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.15030000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60590000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60590000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,80.21470000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,80.21470000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66940000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66940000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,80.45080000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,80.45080000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.62900000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,80.30060000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,80.30060000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62900000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,80.30060000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,80.30060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62900000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.30060000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.30060000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.08930000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,14.08930000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.24990000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,64.24990000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,64.24080000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,64.24080000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.11110000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,14.11110000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.35710000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,64.35710000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,64.34410000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,64.34410000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.08930000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.08930000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24990000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24990000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.24080000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.24080000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.35710000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.35710000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,64.34410000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,64.34410000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.19100000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.19100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.75100000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.75100000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,64.72360000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,64.72360000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.14020000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,14.14020000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.50020000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,64.50020000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,64.48200000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,64.48200000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,14.14020000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,14.14020000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.50020000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.50020000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,64.48200000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,64.48200000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.14020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.14020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.50020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.50020000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.48200000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.48200000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.28970000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,11.28970000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.50740000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,51.50740000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,51.49480000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,51.49480000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.31490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,11.31490000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.63940000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,51.63940000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,51.62150000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,51.62150000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28970000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28970000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50740000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50740000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.49480000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.49480000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31490000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.63940000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.63940000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,51.62150000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,51.62150000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40740000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40740000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.12490000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.12490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,52.08720000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,52.08720000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.34850000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,11.34850000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.81570000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,51.81570000000,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', 'evening')",cook,R1,51.79060000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,51.79060000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34850000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34850000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.81570000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.81570000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,51.79060000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,51.79060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34850000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34850000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81570000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81570000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.79060000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.79060000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.04960000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,9.04960000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.27950000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,41.27950000000,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', 'night')",cook,R1,41.26820000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,41.26820000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.07750000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,9.07750000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.41690000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,41.41690000000,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', 'morning')",cook,R1,41.40070000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,41.40070000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,9.04960000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.04960000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.33550000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27950000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27950000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,41.26820000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,41.26820000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.07750000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.07750000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.34200000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41690000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41690000000,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', 'early-peak')",cook,R1,41.40070000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,41.40070000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.17960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.17960000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.36570000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.92280000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.92280000000,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', 'late-peak')",cook,R1,41.88870000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,41.88870000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.11460000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,9.11460000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.60050000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,41.60050000000,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', 'evening')",cook,R1,41.57770000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,41.57770000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,9.11460000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,9.11460000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.60050000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.60050000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,41.57770000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,41.57770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.11460000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.11460000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.35060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60050000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60050000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,41.57770000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,41.57770000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.25720000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,7.25720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.08510000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,33.08510000000,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', 'night')",cook,R1,33.07450000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,33.07450000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.28700000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,7.28700000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.22150000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,33.22150000000,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', 'morning')",cook,R1,33.20640000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,33.20640000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,7.25720000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,7.25720000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.08510000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.08510000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,33.07450000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,33.07450000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.28700000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,7.28700000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.22150000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,33.22150000000,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', 'early-peak')",cook,R1,33.20640000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,33.20640000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.39620000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,7.39620000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,33.72470000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,33.72470000000,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', 'late-peak')",cook,R1,33.69300000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,33.69300000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.32670000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,7.32670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.40400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,33.40400000000,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', 'evening')",cook,R1,33.38280000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,33.38280000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,7.32670000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,7.32670000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,33.40400000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,33.40400000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,33.38280000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,33.38280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,7.32670000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,7.32670000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.40400000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.40400000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,33.38280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,33.38280000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08220000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.08220000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.22250000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.22250000000,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', 'night')",cook,R1,0.22250000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.22250000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.11740000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.11740000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.31910000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.31910000000,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', 'morning')",cook,R1,0.31910000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.31910000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08220000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08220000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.22250000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.22250000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.22250000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.22250000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11740000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11740000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31910000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.31910000000,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', 'early-peak')",cook,R1,0.31910000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.31910000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24660000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24660000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.67950000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.67950000000,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', 'late-peak')",cook,R1,0.67950000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.67950000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.16440000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.16440000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.44900000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.44900000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.44900000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16440000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16440000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16440000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16440000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.44900000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
new file mode 100644
index 00000000..30878bb6
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
@@ -0,0 +1,23 @@
+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,12.55000000000
+1,2030,R1,solarPV,2020,12.55000000000
+1,2035,R1,solarPV,2020,12.55000000000
+1,2040,R1,solarPV,2020,12.55000000000
+1,2045,R1,solarPV,2020,12.55000000000
+1,2049,R1,solarPV,2020,12.55000000000
+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,windturbine,2020,32.55000000000
+4,2030,R2,windturbine,2020,32.55000000000
+4,2035,R2,windturbine,2020,32.55000000000
+4,2040,R2,windturbine,2020,32.55000000000
+4,2045,R2,windturbine,2020,32.55000000000
+4,2049,R2,windturbine,2020,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..75731cdd
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -0,0 +1,35 @@
+asset,year,technology,region,installed,capacity
+0,2025,gasCCGT,R1,2020,1.00000000000
+1,2025,gasCCGT,R2,2020,1.00000000000
+2,2025,solarPV,R1,2020,12.55000000000
+2,2030,solarPV,R1,2020,12.55000000000
+2,2035,solarPV,R1,2020,12.55000000000
+2,2040,solarPV,R1,2020,12.55000000000
+2,2045,solarPV,R1,2020,12.55000000000
+2,2049,solarPV,R1,2020,12.55000000000
+3,2030,solarPV,R1,2025,15.73000000000
+3,2035,solarPV,R1,2025,15.73000000000
+3,2040,solarPV,R1,2025,15.73000000000
+3,2045,solarPV,R1,2025,15.73000000000
+3,2049,solarPV,R1,2025,15.73000000000
+3,2050,solarPV,R1,2025,15.73000000000
+3,2054,solarPV,R1,2025,15.73000000000
+4,2030,solarPV,R2,2025,15.73000000000
+4,2035,solarPV,R2,2025,15.73000000000
+4,2040,solarPV,R2,2025,15.73000000000
+4,2045,solarPV,R2,2025,15.73000000000
+4,2049,solarPV,R2,2025,15.73000000000
+4,2050,solarPV,R2,2025,15.73000000000
+4,2054,solarPV,R2,2025,15.73000000000
+5,2025,windturbine,R1,2020,20.00000000000
+5,2030,windturbine,R1,2020,20.00000000000
+5,2035,windturbine,R1,2020,20.00000000000
+5,2040,windturbine,R1,2020,20.00000000000
+5,2045,windturbine,R1,2020,20.00000000000
+5,2049,windturbine,R1,2020,20.00000000000
+6,2025,windturbine,R2,2020,32.55000000000
+6,2030,windturbine,R2,2020,32.55000000000
+6,2035,windturbine,R2,2020,32.55000000000
+6,2040,windturbine,R2,2020,32.55000000000
+6,2045,windturbine,R2,2020,32.55000000000
+6,2049,windturbine,R2,2020,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..05da3236
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -0,0 +1,54 @@
+asset,year,region,technology,installed,capacity
+1,2030,R1,solarPV,2020,12.55000000000
+1,2035,R1,solarPV,2020,12.55000000000
+1,2040,R1,solarPV,2020,12.55000000000
+1,2045,R1,solarPV,2020,12.55000000000
+1,2049,R1,solarPV,2020,12.55000000000
+2,2030,R1,solarPV,2025,15.73000000000
+2,2035,R1,solarPV,2025,15.73000000000
+2,2040,R1,solarPV,2025,15.73000000000
+2,2045,R1,solarPV,2025,15.73000000000
+2,2049,R1,solarPV,2025,15.73000000000
+2,2050,R1,solarPV,2025,15.73000000000
+2,2054,R1,solarPV,2025,15.73000000000
+3,2035,R1,solarPV,2030,20.00000000000
+3,2040,R1,solarPV,2030,20.00000000000
+3,2045,R1,solarPV,2030,20.00000000000
+3,2049,R1,solarPV,2030,20.00000000000
+3,2050,R1,solarPV,2030,20.00000000000
+3,2054,R1,solarPV,2030,20.00000000000
+3,2055,R1,solarPV,2030,20.00000000000
+3,2059,R1,solarPV,2030,20.00000000000
+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,2035,R1,windturbine,2030,2.40000000000
+5,2040,R1,windturbine,2030,2.40000000000
+5,2045,R1,windturbine,2030,2.40000000000
+5,2049,R1,windturbine,2030,2.40000000000
+5,2050,R1,windturbine,2030,2.40000000000
+5,2054,R1,windturbine,2030,2.40000000000
+5,2055,R1,windturbine,2030,2.40000000000
+5,2059,R1,windturbine,2030,2.40000000000
+7,2030,R2,solarPV,2025,15.73000000000
+7,2035,R2,solarPV,2025,15.73000000000
+7,2040,R2,solarPV,2025,15.73000000000
+7,2045,R2,solarPV,2025,15.73000000000
+7,2049,R2,solarPV,2025,15.73000000000
+7,2050,R2,solarPV,2025,15.73000000000
+7,2054,R2,solarPV,2025,15.73000000000
+8,2035,R2,solarPV,2030,11.20000000000
+8,2040,R2,solarPV,2030,11.20000000000
+8,2045,R2,solarPV,2030,11.20000000000
+8,2049,R2,solarPV,2030,11.20000000000
+8,2050,R2,solarPV,2030,11.20000000000
+8,2054,R2,solarPV,2030,11.20000000000
+8,2055,R2,solarPV,2030,11.20000000000
+8,2059,R2,solarPV,2030,11.20000000000
+9,2030,R2,windturbine,2020,32.55000000000
+9,2035,R2,windturbine,2020,32.55000000000
+9,2040,R2,windturbine,2020,32.55000000000
+9,2045,R2,windturbine,2020,32.55000000000
+9,2049,R2,windturbine,2020,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..708e8cdb
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -0,0 +1,67 @@
+asset,year,region,technology,installed,capacity
+1,2035,R1,solarPV,2020,12.55000000000
+1,2040,R1,solarPV,2020,12.55000000000
+1,2045,R1,solarPV,2020,12.55000000000
+1,2049,R1,solarPV,2020,12.55000000000
+2,2035,R1,solarPV,2025,15.73000000000
+2,2040,R1,solarPV,2025,15.73000000000
+2,2045,R1,solarPV,2025,15.73000000000
+2,2049,R1,solarPV,2025,15.73000000000
+2,2050,R1,solarPV,2025,15.73000000000
+2,2054,R1,solarPV,2025,15.73000000000
+3,2035,R1,solarPV,2030,20.00000000000
+3,2040,R1,solarPV,2030,20.00000000000
+3,2045,R1,solarPV,2030,20.00000000000
+3,2049,R1,solarPV,2030,20.00000000000
+3,2050,R1,solarPV,2030,20.00000000000
+3,2054,R1,solarPV,2030,20.00000000000
+3,2055,R1,solarPV,2030,20.00000000000
+3,2059,R1,solarPV,2030,20.00000000000
+4,2040,R1,solarPV,2035,5.94800000000
+4,2045,R1,solarPV,2035,5.94800000000
+4,2049,R1,solarPV,2035,5.94800000000
+4,2050,R1,solarPV,2035,5.94800000000
+4,2054,R1,solarPV,2035,5.94800000000
+4,2055,R1,solarPV,2035,5.94800000000
+4,2059,R1,solarPV,2035,5.94800000000
+4,2060,R1,solarPV,2035,5.94800000000
+4,2064,R1,solarPV,2035,5.94800000000
+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,2030,2.40000000000
+6,2040,R1,windturbine,2030,2.40000000000
+6,2045,R1,windturbine,2030,2.40000000000
+6,2049,R1,windturbine,2030,2.40000000000
+6,2050,R1,windturbine,2030,2.40000000000
+6,2054,R1,windturbine,2030,2.40000000000
+6,2055,R1,windturbine,2030,2.40000000000
+6,2059,R1,windturbine,2030,2.40000000000
+8,2035,R2,solarPV,2025,15.73000000000
+8,2040,R2,solarPV,2025,15.73000000000
+8,2045,R2,solarPV,2025,15.73000000000
+8,2049,R2,solarPV,2025,15.73000000000
+8,2050,R2,solarPV,2025,15.73000000000
+8,2054,R2,solarPV,2025,15.73000000000
+9,2035,R2,solarPV,2030,11.20000000000
+9,2040,R2,solarPV,2030,11.20000000000
+9,2045,R2,solarPV,2030,11.20000000000
+9,2049,R2,solarPV,2030,11.20000000000
+9,2050,R2,solarPV,2030,11.20000000000
+9,2054,R2,solarPV,2030,11.20000000000
+9,2055,R2,solarPV,2030,11.20000000000
+9,2059,R2,solarPV,2030,11.20000000000
+10,2040,R2,solarPV,2035,17.14800000000
+10,2045,R2,solarPV,2035,17.14800000000
+10,2049,R2,solarPV,2035,17.14800000000
+10,2050,R2,solarPV,2035,17.14800000000
+10,2054,R2,solarPV,2035,17.14800000000
+10,2055,R2,solarPV,2035,17.14800000000
+10,2059,R2,solarPV,2035,17.14800000000
+10,2060,R2,solarPV,2035,17.14800000000
+10,2064,R2,solarPV,2035,17.14800000000
+11,2035,R2,windturbine,2020,32.55000000000
+11,2040,R2,windturbine,2020,32.55000000000
+11,2045,R2,windturbine,2020,32.55000000000
+11,2049,R2,windturbine,2020,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..3f94b227
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -0,0 +1,79 @@
+asset,year,region,technology,installed,capacity
+1,2040,R1,solarPV,2020,12.55000000000
+1,2045,R1,solarPV,2020,12.55000000000
+1,2049,R1,solarPV,2020,12.55000000000
+2,2040,R1,solarPV,2025,15.73000000000
+2,2045,R1,solarPV,2025,15.73000000000
+2,2049,R1,solarPV,2025,15.73000000000
+2,2050,R1,solarPV,2025,15.73000000000
+2,2054,R1,solarPV,2025,15.73000000000
+3,2040,R1,solarPV,2030,20.00000000000
+3,2045,R1,solarPV,2030,20.00000000000
+3,2049,R1,solarPV,2030,20.00000000000
+3,2050,R1,solarPV,2030,20.00000000000
+3,2054,R1,solarPV,2030,20.00000000000
+3,2055,R1,solarPV,2030,20.00000000000
+3,2059,R1,solarPV,2030,20.00000000000
+4,2040,R1,solarPV,2035,5.94800000000
+4,2045,R1,solarPV,2035,5.94800000000
+4,2049,R1,solarPV,2035,5.94800000000
+4,2050,R1,solarPV,2035,5.94800000000
+4,2054,R1,solarPV,2035,5.94800000000
+4,2055,R1,solarPV,2035,5.94800000000
+4,2059,R1,solarPV,2035,5.94800000000
+4,2060,R1,solarPV,2035,5.94800000000
+4,2064,R1,solarPV,2035,5.94800000000
+5,2045,R1,solarPV,2040,11.20000000000
+5,2049,R1,solarPV,2040,11.20000000000
+5,2050,R1,solarPV,2040,11.20000000000
+5,2054,R1,solarPV,2040,11.20000000000
+5,2055,R1,solarPV,2040,11.20000000000
+5,2059,R1,solarPV,2040,11.20000000000
+5,2060,R1,solarPV,2040,11.20000000000
+5,2064,R1,solarPV,2040,11.20000000000
+5,2065,R1,solarPV,2040,11.20000000000
+5,2069,R1,solarPV,2040,11.20000000000
+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,2030,2.40000000000
+7,2045,R1,windturbine,2030,2.40000000000
+7,2049,R1,windturbine,2030,2.40000000000
+7,2050,R1,windturbine,2030,2.40000000000
+7,2054,R1,windturbine,2030,2.40000000000
+7,2055,R1,windturbine,2030,2.40000000000
+7,2059,R1,windturbine,2030,2.40000000000
+9,2040,R2,solarPV,2025,15.73000000000
+9,2045,R2,solarPV,2025,15.73000000000
+9,2049,R2,solarPV,2025,15.73000000000
+9,2050,R2,solarPV,2025,15.73000000000
+9,2054,R2,solarPV,2025,15.73000000000
+10,2040,R2,solarPV,2030,11.20000000000
+10,2045,R2,solarPV,2030,11.20000000000
+10,2049,R2,solarPV,2030,11.20000000000
+10,2050,R2,solarPV,2030,11.20000000000
+10,2054,R2,solarPV,2030,11.20000000000
+10,2055,R2,solarPV,2030,11.20000000000
+10,2059,R2,solarPV,2030,11.20000000000
+11,2040,R2,solarPV,2035,17.14800000000
+11,2045,R2,solarPV,2035,17.14800000000
+11,2049,R2,solarPV,2035,17.14800000000
+11,2050,R2,solarPV,2035,17.14800000000
+11,2054,R2,solarPV,2035,17.14800000000
+11,2055,R2,solarPV,2035,17.14800000000
+11,2059,R2,solarPV,2035,17.14800000000
+11,2060,R2,solarPV,2035,17.14800000000
+11,2064,R2,solarPV,2035,17.14800000000
+12,2045,R2,solarPV,2040,11.20000000000
+12,2049,R2,solarPV,2040,11.20000000000
+12,2050,R2,solarPV,2040,11.20000000000
+12,2054,R2,solarPV,2040,11.20000000000
+12,2055,R2,solarPV,2040,11.20000000000
+12,2059,R2,solarPV,2040,11.20000000000
+12,2060,R2,solarPV,2040,11.20000000000
+12,2064,R2,solarPV,2040,11.20000000000
+12,2065,R2,solarPV,2040,11.20000000000
+12,2069,R2,solarPV,2040,11.20000000000
+13,2040,R2,windturbine,2020,32.55000000000
+13,2045,R2,windturbine,2020,32.55000000000
+13,2049,R2,windturbine,2020,32.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..bec5d675
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -0,0 +1,109 @@
+asset,year,technology,region,installed,capacity
+0,2045,solarPV,R1,2020,12.55000000000
+0,2049,solarPV,R1,2020,12.55000000000
+1,2045,solarPV,R1,2025,15.73000000000
+1,2049,solarPV,R1,2025,15.73000000000
+1,2050,solarPV,R1,2025,15.73000000000
+1,2054,solarPV,R1,2025,15.73000000000
+2,2045,solarPV,R1,2030,20.00000000000
+2,2049,solarPV,R1,2030,20.00000000000
+2,2050,solarPV,R1,2030,20.00000000000
+2,2054,solarPV,R1,2030,20.00000000000
+2,2055,solarPV,R1,2030,20.00000000000
+2,2059,solarPV,R1,2030,20.00000000000
+3,2045,solarPV,R1,2035,5.94800000000
+3,2049,solarPV,R1,2035,5.94800000000
+3,2050,solarPV,R1,2035,5.94800000000
+3,2054,solarPV,R1,2035,5.94800000000
+3,2055,solarPV,R1,2035,5.94800000000
+3,2059,solarPV,R1,2035,5.94800000000
+3,2060,solarPV,R1,2035,5.94800000000
+3,2064,solarPV,R1,2035,5.94800000000
+4,2045,solarPV,R1,2040,11.20000000000
+4,2049,solarPV,R1,2040,11.20000000000
+4,2050,solarPV,R1,2040,11.20000000000
+4,2054,solarPV,R1,2040,11.20000000000
+4,2055,solarPV,R1,2040,11.20000000000
+4,2059,solarPV,R1,2040,11.20000000000
+4,2060,solarPV,R1,2040,11.20000000000
+4,2064,solarPV,R1,2040,11.20000000000
+4,2065,solarPV,R1,2040,11.20000000000
+4,2069,solarPV,R1,2040,11.20000000000
+5,2050,solarPV,R1,2045,32.97200000000
+5,2054,solarPV,R1,2045,32.97200000000
+5,2055,solarPV,R1,2045,32.97200000000
+5,2059,solarPV,R1,2045,32.97200000000
+5,2060,solarPV,R1,2045,32.97200000000
+5,2064,solarPV,R1,2045,32.97200000000
+5,2065,solarPV,R1,2045,32.97200000000
+5,2069,solarPV,R1,2045,32.97200000000
+5,2070,solarPV,R1,2045,32.97200000000
+5,2074,solarPV,R1,2045,32.97200000000
+6,2045,solarPV,R2,2025,15.73000000000
+6,2049,solarPV,R2,2025,15.73000000000
+6,2050,solarPV,R2,2025,15.73000000000
+6,2054,solarPV,R2,2025,15.73000000000
+7,2045,solarPV,R2,2030,11.20000000000
+7,2049,solarPV,R2,2030,11.20000000000
+7,2050,solarPV,R2,2030,11.20000000000
+7,2054,solarPV,R2,2030,11.20000000000
+7,2055,solarPV,R2,2030,11.20000000000
+7,2059,solarPV,R2,2030,11.20000000000
+8,2045,solarPV,R2,2035,17.14800000000
+8,2049,solarPV,R2,2035,17.14800000000
+8,2050,solarPV,R2,2035,17.14800000000
+8,2054,solarPV,R2,2035,17.14800000000
+8,2055,solarPV,R2,2035,17.14800000000
+8,2059,solarPV,R2,2035,17.14800000000
+8,2060,solarPV,R2,2035,17.14800000000
+8,2064,solarPV,R2,2035,17.14800000000
+9,2045,solarPV,R2,2040,11.20000000000
+9,2049,solarPV,R2,2040,11.20000000000
+9,2050,solarPV,R2,2040,11.20000000000
+9,2054,solarPV,R2,2040,11.20000000000
+9,2055,solarPV,R2,2040,11.20000000000
+9,2059,solarPV,R2,2040,11.20000000000
+9,2060,solarPV,R2,2040,11.20000000000
+9,2064,solarPV,R2,2040,11.20000000000
+9,2065,solarPV,R2,2040,11.20000000000
+9,2069,solarPV,R2,2040,11.20000000000
+10,2050,solarPV,R2,2045,32.97200000000
+10,2054,solarPV,R2,2045,32.97200000000
+10,2055,solarPV,R2,2045,32.97200000000
+10,2059,solarPV,R2,2045,32.97200000000
+10,2060,solarPV,R2,2045,32.97200000000
+10,2064,solarPV,R2,2045,32.97200000000
+10,2065,solarPV,R2,2045,32.97200000000
+10,2069,solarPV,R2,2045,32.97200000000
+10,2070,solarPV,R2,2045,32.97200000000
+10,2074,solarPV,R2,2045,32.97200000000
+11,2045,windturbine,R1,2020,20.00000000000
+11,2049,windturbine,R1,2020,20.00000000000
+12,2045,windturbine,R1,2030,2.40000000000
+12,2049,windturbine,R1,2030,2.40000000000
+12,2050,windturbine,R1,2030,2.40000000000
+12,2054,windturbine,R1,2030,2.40000000000
+12,2055,windturbine,R1,2030,2.40000000000
+12,2059,windturbine,R1,2030,2.40000000000
+13,2050,windturbine,R1,2045,12.55000000000
+13,2054,windturbine,R1,2045,12.55000000000
+13,2055,windturbine,R1,2045,12.55000000000
+13,2059,windturbine,R1,2045,12.55000000000
+13,2060,windturbine,R1,2045,12.55000000000
+13,2064,windturbine,R1,2045,12.55000000000
+13,2065,windturbine,R1,2045,12.55000000000
+13,2069,windturbine,R1,2045,12.55000000000
+13,2070,windturbine,R1,2045,12.55000000000
+13,2074,windturbine,R1,2045,12.55000000000
+14,2045,windturbine,R2,2020,32.55000000000
+14,2049,windturbine,R2,2020,32.55000000000
+15,2050,windturbine,R2,2045,12.55000000000
+15,2054,windturbine,R2,2045,12.55000000000
+15,2055,windturbine,R2,2045,12.55000000000
+15,2059,windturbine,R2,2045,12.55000000000
+15,2060,windturbine,R2,2045,12.55000000000
+15,2064,windturbine,R2,2045,12.55000000000
+15,2065,windturbine,R2,2045,12.55000000000
+15,2069,windturbine,R2,2045,12.55000000000
+15,2070,windturbine,R2,2045,12.55000000000
+15,2074,windturbine,R2,2045,12.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..bb82fdc3
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -0,0 +1,105 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,solarPV,2025,15.73000000000
+1,2054,R1,solarPV,2025,15.73000000000
+2,2050,R1,solarPV,2030,20.00000000000
+2,2054,R1,solarPV,2030,20.00000000000
+2,2055,R1,solarPV,2030,20.00000000000
+2,2059,R1,solarPV,2030,20.00000000000
+3,2050,R1,solarPV,2035,5.94800000000
+3,2054,R1,solarPV,2035,5.94800000000
+3,2055,R1,solarPV,2035,5.94800000000
+3,2059,R1,solarPV,2035,5.94800000000
+3,2060,R1,solarPV,2035,5.94800000000
+3,2064,R1,solarPV,2035,5.94800000000
+4,2050,R1,solarPV,2040,11.20000000000
+4,2054,R1,solarPV,2040,11.20000000000
+4,2055,R1,solarPV,2040,11.20000000000
+4,2059,R1,solarPV,2040,11.20000000000
+4,2060,R1,solarPV,2040,11.20000000000
+4,2064,R1,solarPV,2040,11.20000000000
+4,2065,R1,solarPV,2040,11.20000000000
+4,2069,R1,solarPV,2040,11.20000000000
+5,2050,R1,solarPV,2045,32.97200000000
+5,2054,R1,solarPV,2045,32.97200000000
+5,2055,R1,solarPV,2045,32.97200000000
+5,2059,R1,solarPV,2045,32.97200000000
+5,2060,R1,solarPV,2045,32.97200000000
+5,2064,R1,solarPV,2045,32.97200000000
+5,2065,R1,solarPV,2045,32.97200000000
+5,2069,R1,solarPV,2045,32.97200000000
+5,2070,R1,solarPV,2045,32.97200000000
+5,2074,R1,solarPV,2045,32.97200000000
+6,2055,R1,solarPV,2050,15.73000000000
+6,2059,R1,solarPV,2050,15.73000000000
+6,2060,R1,solarPV,2050,15.73000000000
+6,2064,R1,solarPV,2050,15.73000000000
+6,2065,R1,solarPV,2050,15.73000000000
+6,2069,R1,solarPV,2050,15.73000000000
+6,2070,R1,solarPV,2050,15.73000000000
+6,2074,R1,solarPV,2050,15.73000000000
+6,2075,R1,solarPV,2050,15.73000000000
+6,2079,R1,solarPV,2050,15.73000000000
+8,2050,R1,windturbine,2030,2.40000000000
+8,2054,R1,windturbine,2030,2.40000000000
+8,2055,R1,windturbine,2030,2.40000000000
+8,2059,R1,windturbine,2030,2.40000000000
+9,2050,R1,windturbine,2045,12.55000000000
+9,2054,R1,windturbine,2045,12.55000000000
+9,2055,R1,windturbine,2045,12.55000000000
+9,2059,R1,windturbine,2045,12.55000000000
+9,2060,R1,windturbine,2045,12.55000000000
+9,2064,R1,windturbine,2045,12.55000000000
+9,2065,R1,windturbine,2045,12.55000000000
+9,2069,R1,windturbine,2045,12.55000000000
+9,2070,R1,windturbine,2045,12.55000000000
+9,2074,R1,windturbine,2045,12.55000000000
+10,2050,R2,solarPV,2025,15.73000000000
+10,2054,R2,solarPV,2025,15.73000000000
+11,2050,R2,solarPV,2030,11.20000000000
+11,2054,R2,solarPV,2030,11.20000000000
+11,2055,R2,solarPV,2030,11.20000000000
+11,2059,R2,solarPV,2030,11.20000000000
+12,2050,R2,solarPV,2035,17.14800000000
+12,2054,R2,solarPV,2035,17.14800000000
+12,2055,R2,solarPV,2035,17.14800000000
+12,2059,R2,solarPV,2035,17.14800000000
+12,2060,R2,solarPV,2035,17.14800000000
+12,2064,R2,solarPV,2035,17.14800000000
+13,2050,R2,solarPV,2040,11.20000000000
+13,2054,R2,solarPV,2040,11.20000000000
+13,2055,R2,solarPV,2040,11.20000000000
+13,2059,R2,solarPV,2040,11.20000000000
+13,2060,R2,solarPV,2040,11.20000000000
+13,2064,R2,solarPV,2040,11.20000000000
+13,2065,R2,solarPV,2040,11.20000000000
+13,2069,R2,solarPV,2040,11.20000000000
+14,2050,R2,solarPV,2045,32.97200000000
+14,2054,R2,solarPV,2045,32.97200000000
+14,2055,R2,solarPV,2045,32.97200000000
+14,2059,R2,solarPV,2045,32.97200000000
+14,2060,R2,solarPV,2045,32.97200000000
+14,2064,R2,solarPV,2045,32.97200000000
+14,2065,R2,solarPV,2045,32.97200000000
+14,2069,R2,solarPV,2045,32.97200000000
+14,2070,R2,solarPV,2045,32.97200000000
+14,2074,R2,solarPV,2045,32.97200000000
+15,2055,R2,solarPV,2050,15.73000000000
+15,2059,R2,solarPV,2050,15.73000000000
+15,2060,R2,solarPV,2050,15.73000000000
+15,2064,R2,solarPV,2050,15.73000000000
+15,2065,R2,solarPV,2050,15.73000000000
+15,2069,R2,solarPV,2050,15.73000000000
+15,2070,R2,solarPV,2050,15.73000000000
+15,2074,R2,solarPV,2050,15.73000000000
+15,2075,R2,solarPV,2050,15.73000000000
+15,2079,R2,solarPV,2050,15.73000000000
+17,2050,R2,windturbine,2045,12.55000000000
+17,2054,R2,windturbine,2045,12.55000000000
+17,2055,R2,windturbine,2045,12.55000000000
+17,2059,R2,windturbine,2045,12.55000000000
+17,2060,R2,windturbine,2045,12.55000000000
+17,2064,R2,windturbine,2045,12.55000000000
+17,2065,R2,windturbine,2045,12.55000000000
+17,2069,R2,windturbine,2045,12.55000000000
+17,2070,R2,windturbine,2045,12.55000000000
+17,2074,R2,windturbine,2045,12.55000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..debb0db9
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,21 @@
+asset,year,technology,region,installed,capacity
+0,2025,electric_stove,R1,2020,17.40000000000
+0,2030,electric_stove,R1,2020,17.40000000000
+0,2034,electric_stove,R1,2020,17.40000000000
+1,2025,electric_stove,R2,2020,17.40000000000
+1,2030,electric_stove,R2,2020,17.40000000000
+1,2034,electric_stove,R2,2020,17.40000000000
+2,2020,gas_stove,R1,2020,10.00000000000
+2,2025,gas_stove,R1,2020,5.00000000000
+3,2020,gas_stove,R2,2020,10.00000000000
+3,2025,gas_stove,R2,2020,5.00000000000
+4,2020,gasboiler,R1,2020,10.00000000000
+4,2025,gasboiler,R1,2020,5.00000000000
+5,2020,gasboiler,R2,2020,10.00000000000
+5,2025,gasboiler,R2,2020,5.00000000000
+6,2025,heatpump,R1,2020,17.40000000000
+6,2030,heatpump,R1,2020,17.40000000000
+6,2034,heatpump,R1,2020,17.40000000000
+7,2025,heatpump,R2,2020,17.40000000000
+7,2030,heatpump,R2,2020,17.40000000000
+7,2034,heatpump,R2,2020,17.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..4eb9a0ef
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,49 @@
+asset,year,technology,region,installed,capacity
+0,2025,electric_stove,R1,2020,17.40000000000
+0,2030,electric_stove,R1,2020,17.40000000000
+0,2034,electric_stove,R1,2020,17.40000000000
+1,2030,electric_stove,R1,2025,6.74000000000
+1,2034,electric_stove,R1,2025,6.74000000000
+1,2035,electric_stove,R1,2025,6.74000000000
+1,2039,electric_stove,R1,2025,6.74000000000
+2,2025,electric_stove,R2,2020,17.40000000000
+2,2030,electric_stove,R2,2020,17.40000000000
+2,2034,electric_stove,R2,2020,17.40000000000
+3,2030,electric_stove,R2,2025,6.74000000000
+3,2034,electric_stove,R2,2025,6.74000000000
+3,2035,electric_stove,R2,2025,6.74000000000
+3,2039,electric_stove,R2,2025,6.74000000000
+4,2025,gas_stove,R1,2020,5.00000000000
+5,2030,gas_stove,R1,2025,3.86000000000
+5,2034,gas_stove,R1,2025,3.86000000000
+5,2035,gas_stove,R1,2025,3.86000000000
+5,2039,gas_stove,R1,2025,3.86000000000
+6,2025,gas_stove,R2,2020,5.00000000000
+7,2030,gas_stove,R2,2025,3.86000000000
+7,2034,gas_stove,R2,2025,3.86000000000
+7,2035,gas_stove,R2,2025,3.86000000000
+7,2039,gas_stove,R2,2025,3.86000000000
+8,2025,gasboiler,R1,2020,5.00000000000
+9,2030,gasboiler,R1,2025,3.86000000000
+9,2034,gasboiler,R1,2025,3.86000000000
+9,2035,gasboiler,R1,2025,3.86000000000
+9,2039,gasboiler,R1,2025,3.86000000000
+10,2025,gasboiler,R2,2020,5.00000000000
+11,2030,gasboiler,R2,2025,3.86000000000
+11,2034,gasboiler,R2,2025,3.86000000000
+11,2035,gasboiler,R2,2025,3.86000000000
+11,2039,gasboiler,R2,2025,3.86000000000
+12,2025,heatpump,R1,2020,17.40000000000
+12,2030,heatpump,R1,2020,17.40000000000
+12,2034,heatpump,R1,2020,17.40000000000
+13,2030,heatpump,R1,2025,6.74000000000
+13,2034,heatpump,R1,2025,6.74000000000
+13,2035,heatpump,R1,2025,6.74000000000
+13,2039,heatpump,R1,2025,6.74000000000
+14,2025,heatpump,R2,2020,17.40000000000
+14,2030,heatpump,R2,2020,17.40000000000
+14,2034,heatpump,R2,2020,17.40000000000
+15,2030,heatpump,R2,2025,6.74000000000
+15,2034,heatpump,R2,2025,6.74000000000
+15,2035,heatpump,R2,2025,6.74000000000
+15,2039,heatpump,R2,2025,6.74000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..55b4cfea
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,57 @@
+asset,year,technology,region,installed,capacity
+0,2030,electric_stove,R1,2020,17.40000000000
+0,2034,electric_stove,R1,2020,17.40000000000
+1,2030,electric_stove,R1,2025,6.74000000000
+1,2034,electric_stove,R1,2025,6.74000000000
+1,2035,electric_stove,R1,2025,6.74000000000
+1,2039,electric_stove,R1,2025,6.74000000000
+2,2035,electric_stove,R1,2030,23.00000000000
+2,2039,electric_stove,R1,2030,23.00000000000
+2,2040,electric_stove,R1,2030,23.00000000000
+2,2044,electric_stove,R1,2030,23.00000000000
+3,2030,electric_stove,R2,2020,17.40000000000
+3,2034,electric_stove,R2,2020,17.40000000000
+4,2030,electric_stove,R2,2025,6.74000000000
+4,2034,electric_stove,R2,2025,6.74000000000
+4,2035,electric_stove,R2,2025,6.74000000000
+4,2039,electric_stove,R2,2025,6.74000000000
+5,2035,electric_stove,R2,2030,23.00000000000
+5,2039,electric_stove,R2,2030,23.00000000000
+5,2040,electric_stove,R2,2030,23.00000000000
+5,2044,electric_stove,R2,2030,23.00000000000
+6,2030,gas_stove,R1,2025,3.86000000000
+6,2034,gas_stove,R1,2025,3.86000000000
+6,2035,gas_stove,R1,2025,3.86000000000
+6,2039,gas_stove,R1,2025,3.86000000000
+7,2030,gas_stove,R2,2025,3.86000000000
+7,2034,gas_stove,R2,2025,3.86000000000
+7,2035,gas_stove,R2,2025,3.86000000000
+7,2039,gas_stove,R2,2025,3.86000000000
+8,2030,gasboiler,R1,2025,3.86000000000
+8,2034,gasboiler,R1,2025,3.86000000000
+8,2035,gasboiler,R1,2025,3.86000000000
+8,2039,gasboiler,R1,2025,3.86000000000
+9,2030,gasboiler,R2,2025,3.86000000000
+9,2034,gasboiler,R2,2025,3.86000000000
+9,2035,gasboiler,R2,2025,3.86000000000
+9,2039,gasboiler,R2,2025,3.86000000000
+10,2030,heatpump,R1,2020,17.40000000000
+10,2034,heatpump,R1,2020,17.40000000000
+11,2030,heatpump,R1,2025,6.74000000000
+11,2034,heatpump,R1,2025,6.74000000000
+11,2035,heatpump,R1,2025,6.74000000000
+11,2039,heatpump,R1,2025,6.74000000000
+12,2035,heatpump,R1,2030,23.00000000000
+12,2039,heatpump,R1,2030,23.00000000000
+12,2040,heatpump,R1,2030,23.00000000000
+12,2044,heatpump,R1,2030,23.00000000000
+13,2030,heatpump,R2,2020,17.40000000000
+13,2034,heatpump,R2,2020,17.40000000000
+14,2030,heatpump,R2,2025,6.74000000000
+14,2034,heatpump,R2,2025,6.74000000000
+14,2035,heatpump,R2,2025,6.74000000000
+14,2039,heatpump,R2,2025,6.74000000000
+15,2035,heatpump,R2,2030,23.00000000000
+15,2039,heatpump,R2,2030,23.00000000000
+15,2040,heatpump,R2,2030,23.00000000000
+15,2044,heatpump,R2,2030,23.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..982d4e66
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,65 @@
+asset,year,technology,region,installed,capacity
+0,2035,electric_stove,R1,2025,6.74000000000
+0,2039,electric_stove,R1,2025,6.74000000000
+1,2035,electric_stove,R1,2030,23.00000000000
+1,2039,electric_stove,R1,2030,23.00000000000
+1,2040,electric_stove,R1,2030,23.00000000000
+1,2044,electric_stove,R1,2030,23.00000000000
+2,2040,electric_stove,R1,2035,15.31400000000
+2,2044,electric_stove,R1,2035,15.31400000000
+2,2045,electric_stove,R1,2035,15.31400000000
+2,2049,electric_stove,R1,2035,15.31400000000
+3,2035,electric_stove,R2,2025,6.74000000000
+3,2039,electric_stove,R2,2025,6.74000000000
+4,2035,electric_stove,R2,2030,23.00000000000
+4,2039,electric_stove,R2,2030,23.00000000000
+4,2040,electric_stove,R2,2030,23.00000000000
+4,2044,electric_stove,R2,2030,23.00000000000
+5,2040,electric_stove,R2,2035,15.31400000000
+5,2044,electric_stove,R2,2035,15.31400000000
+5,2045,electric_stove,R2,2035,15.31400000000
+5,2049,electric_stove,R2,2035,15.31400000000
+6,2035,gas_stove,R1,2025,3.86000000000
+6,2039,gas_stove,R1,2025,3.86000000000
+7,2040,gas_stove,R1,2035,0.88600000000
+7,2044,gas_stove,R1,2035,0.88600000000
+7,2045,gas_stove,R1,2035,0.88600000000
+7,2049,gas_stove,R1,2035,0.88600000000
+8,2035,gas_stove,R2,2025,3.86000000000
+8,2039,gas_stove,R2,2025,3.86000000000
+9,2040,gas_stove,R2,2035,0.88600000000
+9,2044,gas_stove,R2,2035,0.88600000000
+9,2045,gas_stove,R2,2035,0.88600000000
+9,2049,gas_stove,R2,2035,0.88600000000
+10,2035,gasboiler,R1,2025,3.86000000000
+10,2039,gasboiler,R1,2025,3.86000000000
+11,2040,gasboiler,R1,2035,0.88600000000
+11,2044,gasboiler,R1,2035,0.88600000000
+11,2045,gasboiler,R1,2035,0.88600000000
+11,2049,gasboiler,R1,2035,0.88600000000
+12,2035,gasboiler,R2,2025,3.86000000000
+12,2039,gasboiler,R2,2025,3.86000000000
+13,2040,gasboiler,R2,2035,0.88600000000
+13,2044,gasboiler,R2,2035,0.88600000000
+13,2045,gasboiler,R2,2035,0.88600000000
+13,2049,gasboiler,R2,2035,0.88600000000
+14,2035,heatpump,R1,2025,6.74000000000
+14,2039,heatpump,R1,2025,6.74000000000
+15,2035,heatpump,R1,2030,23.00000000000
+15,2039,heatpump,R1,2030,23.00000000000
+15,2040,heatpump,R1,2030,23.00000000000
+15,2044,heatpump,R1,2030,23.00000000000
+16,2040,heatpump,R1,2035,15.31400000000
+16,2044,heatpump,R1,2035,15.31400000000
+16,2045,heatpump,R1,2035,15.31400000000
+16,2049,heatpump,R1,2035,15.31400000000
+17,2035,heatpump,R2,2025,6.74000000000
+17,2039,heatpump,R2,2025,6.74000000000
+18,2035,heatpump,R2,2030,23.00000000000
+18,2039,heatpump,R2,2030,23.00000000000
+18,2040,heatpump,R2,2030,23.00000000000
+18,2044,heatpump,R2,2030,23.00000000000
+19,2040,heatpump,R2,2035,15.31400000000
+19,2044,heatpump,R2,2035,15.31400000000
+19,2045,heatpump,R2,2035,15.31400000000
+19,2049,heatpump,R2,2035,15.31400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..b3406b4c
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,57 @@
+asset,year,technology,region,installed,capacity
+0,2040,electric_stove,R1,2030,23.00000000000
+0,2044,electric_stove,R1,2030,23.00000000000
+1,2040,electric_stove,R1,2035,15.31400000000
+1,2044,electric_stove,R1,2035,15.31400000000
+1,2045,electric_stove,R1,2035,15.31400000000
+1,2049,electric_stove,R1,2035,15.31400000000
+2,2045,electric_stove,R1,2040,28.60000000000
+2,2049,electric_stove,R1,2040,28.60000000000
+2,2050,electric_stove,R1,2040,28.60000000000
+2,2054,electric_stove,R1,2040,28.60000000000
+3,2040,electric_stove,R2,2030,23.00000000000
+3,2044,electric_stove,R2,2030,23.00000000000
+4,2040,electric_stove,R2,2035,15.31400000000
+4,2044,electric_stove,R2,2035,15.31400000000
+4,2045,electric_stove,R2,2035,15.31400000000
+4,2049,electric_stove,R2,2035,15.31400000000
+5,2045,electric_stove,R2,2040,28.60000000000
+5,2049,electric_stove,R2,2040,28.60000000000
+5,2050,electric_stove,R2,2040,28.60000000000
+5,2054,electric_stove,R2,2040,28.60000000000
+6,2040,gas_stove,R1,2035,0.88600000000
+6,2044,gas_stove,R1,2035,0.88600000000
+6,2045,gas_stove,R1,2035,0.88600000000
+6,2049,gas_stove,R1,2035,0.88600000000
+7,2040,gas_stove,R2,2035,0.88600000000
+7,2044,gas_stove,R2,2035,0.88600000000
+7,2045,gas_stove,R2,2035,0.88600000000
+7,2049,gas_stove,R2,2035,0.88600000000
+8,2040,gasboiler,R1,2035,0.88600000000
+8,2044,gasboiler,R1,2035,0.88600000000
+8,2045,gasboiler,R1,2035,0.88600000000
+8,2049,gasboiler,R1,2035,0.88600000000
+9,2040,gasboiler,R2,2035,0.88600000000
+9,2044,gasboiler,R2,2035,0.88600000000
+9,2045,gasboiler,R2,2035,0.88600000000
+9,2049,gasboiler,R2,2035,0.88600000000
+10,2040,heatpump,R1,2030,23.00000000000
+10,2044,heatpump,R1,2030,23.00000000000
+11,2040,heatpump,R1,2035,15.31400000000
+11,2044,heatpump,R1,2035,15.31400000000
+11,2045,heatpump,R1,2035,15.31400000000
+11,2049,heatpump,R1,2035,15.31400000000
+12,2045,heatpump,R1,2040,28.60000000000
+12,2049,heatpump,R1,2040,28.60000000000
+12,2050,heatpump,R1,2040,28.60000000000
+12,2054,heatpump,R1,2040,28.60000000000
+13,2040,heatpump,R2,2030,23.00000000000
+13,2044,heatpump,R2,2030,23.00000000000
+14,2040,heatpump,R2,2035,15.31400000000
+14,2044,heatpump,R2,2035,15.31400000000
+14,2045,heatpump,R2,2035,15.31400000000
+14,2049,heatpump,R2,2035,15.31400000000
+15,2045,heatpump,R2,2040,28.60000000000
+15,2049,heatpump,R2,2040,28.60000000000
+15,2050,heatpump,R2,2040,28.60000000000
+15,2054,heatpump,R2,2040,28.60000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..7162fb9e
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,49 @@
+asset,year,technology,region,installed,capacity
+0,2045,electric_stove,R1,2035,15.31400000000
+0,2049,electric_stove,R1,2035,15.31400000000
+1,2045,electric_stove,R1,2040,28.60000000000
+1,2049,electric_stove,R1,2040,28.60000000000
+1,2050,electric_stove,R1,2040,28.60000000000
+1,2054,electric_stove,R1,2040,28.60000000000
+2,2050,electric_stove,R1,2045,21.80000000000
+2,2054,electric_stove,R1,2045,21.80000000000
+2,2055,electric_stove,R1,2045,21.80000000000
+2,2059,electric_stove,R1,2045,21.80000000000
+3,2045,electric_stove,R2,2035,15.31400000000
+3,2049,electric_stove,R2,2035,15.31400000000
+4,2045,electric_stove,R2,2040,28.60000000000
+4,2049,electric_stove,R2,2040,28.60000000000
+4,2050,electric_stove,R2,2040,28.60000000000
+4,2054,electric_stove,R2,2040,28.60000000000
+5,2050,electric_stove,R2,2045,21.80000000000
+5,2054,electric_stove,R2,2045,21.80000000000
+5,2055,electric_stove,R2,2045,21.80000000000
+5,2059,electric_stove,R2,2045,21.80000000000
+6,2045,gas_stove,R1,2035,0.88600000000
+6,2049,gas_stove,R1,2035,0.88600000000
+7,2045,gas_stove,R2,2035,0.88600000000
+7,2049,gas_stove,R2,2035,0.88600000000
+8,2045,gasboiler,R1,2035,0.88600000000
+8,2049,gasboiler,R1,2035,0.88600000000
+9,2045,gasboiler,R2,2035,0.88600000000
+9,2049,gasboiler,R2,2035,0.88600000000
+10,2045,heatpump,R1,2035,15.31400000000
+10,2049,heatpump,R1,2035,15.31400000000
+11,2045,heatpump,R1,2040,28.60000000000
+11,2049,heatpump,R1,2040,28.60000000000
+11,2050,heatpump,R1,2040,28.60000000000
+11,2054,heatpump,R1,2040,28.60000000000
+12,2050,heatpump,R1,2045,21.80000000000
+12,2054,heatpump,R1,2045,21.80000000000
+12,2055,heatpump,R1,2045,21.80000000000
+12,2059,heatpump,R1,2045,21.80000000000
+13,2045,heatpump,R2,2035,15.31400000000
+13,2049,heatpump,R2,2035,15.31400000000
+14,2045,heatpump,R2,2040,28.60000000000
+14,2049,heatpump,R2,2040,28.60000000000
+14,2050,heatpump,R2,2040,28.60000000000
+14,2054,heatpump,R2,2040,28.60000000000
+15,2050,heatpump,R2,2045,21.80000000000
+15,2054,heatpump,R2,2045,21.80000000000
+15,2055,heatpump,R2,2045,21.80000000000
+15,2059,heatpump,R2,2045,21.80000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..9dd0a6af
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+1,2050,R1,electric_stove,2040,28.60000000000
+1,2054,R1,electric_stove,2040,28.60000000000
+2,2050,R1,electric_stove,2045,21.80000000000
+2,2054,R1,electric_stove,2045,21.80000000000
+2,2055,R1,electric_stove,2045,21.80000000000
+2,2059,R1,electric_stove,2045,21.80000000000
+3,2055,R1,electric_stove,2050,28.60000000000
+3,2059,R1,electric_stove,2050,28.60000000000
+3,2060,R1,electric_stove,2050,28.60000000000
+3,2064,R1,electric_stove,2050,28.60000000000
+7,2050,R1,heatpump,2040,28.60000000000
+7,2054,R1,heatpump,2040,28.60000000000
+8,2050,R1,heatpump,2045,21.80000000000
+8,2054,R1,heatpump,2045,21.80000000000
+8,2055,R1,heatpump,2045,21.80000000000
+8,2059,R1,heatpump,2045,21.80000000000
+9,2055,R1,heatpump,2050,28.60000000000
+9,2059,R1,heatpump,2050,28.60000000000
+9,2060,R1,heatpump,2050,28.60000000000
+9,2064,R1,heatpump,2050,28.60000000000
+11,2050,R2,electric_stove,2040,28.60000000000
+11,2054,R2,electric_stove,2040,28.60000000000
+12,2050,R2,electric_stove,2045,21.80000000000
+12,2054,R2,electric_stove,2045,21.80000000000
+12,2055,R2,electric_stove,2045,21.80000000000
+12,2059,R2,electric_stove,2045,21.80000000000
+13,2055,R2,electric_stove,2050,28.60000000000
+13,2059,R2,electric_stove,2050,28.60000000000
+13,2060,R2,electric_stove,2050,28.60000000000
+13,2064,R2,electric_stove,2050,28.60000000000
+17,2050,R2,heatpump,2040,28.60000000000
+17,2054,R2,heatpump,2040,28.60000000000
+18,2050,R2,heatpump,2045,21.80000000000
+18,2054,R2,heatpump,2045,21.80000000000
+18,2055,R2,heatpump,2045,21.80000000000
+18,2059,R2,heatpump,2045,21.80000000000
+19,2055,R2,heatpump,2050,28.60000000000
+19,2059,R2,heatpump,2050,28.60000000000
+19,2060,R2,heatpump,2050,28.60000000000
+19,2064,R2,heatpump,2050,28.60000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
new file mode 100644
index 00000000..9f7f3f84
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
@@ -0,0 +1,321 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,4,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,5,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2025,4,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,5,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2020,4,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,5,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2025,4,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,5,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.36250000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R1,2020,3,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R1,2020,4,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,5,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R1,2025,4,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2025,5,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R2,2020,3,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R2,2020,4,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,5,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R2,2025,4,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2025,5,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,cook,R1,2020,2,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R1,2020,3,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2025,1,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R1,2025,3,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R2,2020,2,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R2,2020,3,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2025,1,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R2,2025,3,all-year,all-week,night,gas_stove,2020,0.10420000000
+1,heat,R1,2020,4,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,5,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2025,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,5,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2020,4,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,5,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2025,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,5,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R1,2020,3,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R1,2020,4,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,5,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R1,2025,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2025,5,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R2,2020,3,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R2,2020,4,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,5,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R2,2025,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2025,5,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,cook,R1,2020,2,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R1,2020,3,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2025,1,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R1,2025,3,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R2,2020,2,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R2,2020,3,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2025,1,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R2,2025,3,all-year,all-week,morning,gas_stove,2020,0.14880000000
+2,heat,R1,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R1,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R1,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R1,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R2,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R2,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R2,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,cook,R1,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R1,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2025,1,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R1,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R2,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R2,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2025,1,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R2,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+3,heat,R1,2020,4,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,5,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,5,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2020,4,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,5,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,5,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R1,2020,3,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R1,2020,4,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,5,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R1,2025,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2025,5,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R2,2020,3,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R2,2020,4,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,5,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R2,2025,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2025,5,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,cook,R1,2020,2,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R1,2020,3,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2025,1,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R1,2025,3,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R2,2020,2,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R2,2020,3,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2025,1,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R2,2025,3,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+4,heat,R1,2020,4,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,5,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+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.08750000000
+4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2020,4,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,5,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+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.08750000000
+4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,CO2f,R1,2020,2,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R1,2020,3,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R1,2020,4,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,5,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+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,52.50000000000
+4,CO2f,R2,2020,3,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R2,2020,4,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2020,5,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+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.05000000000
+4,cook,R1,2020,3,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R1,2025,1,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+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.05000000000
+4,cook,R2,2020,3,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R2,2025,1,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+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.70000000000
+5,heat,R1,2020,5,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2025,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,5,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2020,4,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,5,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2025,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,5,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R1,2020,3,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R1,2020,4,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,5,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R1,2025,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2025,5,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R2,2020,3,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R2,2020,4,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,5,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R2,2025,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2025,5,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,cook,R1,2020,2,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R1,2020,3,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2025,1,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R1,2025,3,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R2,2020,2,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R2,2020,3,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2025,1,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R2,2025,3,all-year,all-week,evening,gas_stove,2020,0.20830000000
+6,heat,R1,2020,4,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,5,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,5,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2020,4,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,5,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,5,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R1,2020,3,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R1,2020,4,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,5,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R1,2025,3,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R1,2025,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2025,5,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R2,2020,3,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R2,2020,4,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,5,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R2,2025,3,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R2,2025,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2025,5,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,cook,R1,2020,2,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R1,2020,3,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2025,1,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R1,2025,3,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R2,2020,2,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R2,2020,3,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2025,1,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R2,2025,3,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+7,heat,R1,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R1,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R1,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R1,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R2,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R2,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R2,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,cook,R1,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R1,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2025,1,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R1,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R2,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R2,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2025,1,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R2,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..07317d7a
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
@@ -0,0 +1,449 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,8,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,10,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R1,2025,12,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2025,14,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,11,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,15,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2025,8,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,10,all-year,all-week,night,gasboiler,2020,0.10420000000
+0,heat,R2,2025,12,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2025,14,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,11,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,15,all-year,all-week,night,heatpump,2025,0.14040000000
+0,CO2f,R1,2025,4,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R1,2025,6,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R1,2025,8,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2025,10,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2030,5,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2030,11,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2025,4,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R2,2025,6,all-year,all-week,night,gas_stove,2020,5.20830000000
+0,CO2f,R2,2025,8,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2025,10,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2030,5,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2030,11,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2025,2,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2025,4,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R1,2025,6,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2030,2,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2030,3,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2030,5,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R1,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2025,2,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2025,4,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R2,2025,6,all-year,all-week,night,gas_stove,2020,0.10420000000
+0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2030,2,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2030,3,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2030,5,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
+1,heat,R1,2025,8,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,10,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R1,2025,12,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2025,14,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,11,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,15,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2025,8,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,10,all-year,all-week,morning,gasboiler,2020,0.14880000000
+1,heat,R2,2025,12,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2025,14,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,11,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,15,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,CO2f,R1,2025,4,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R1,2025,6,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R1,2025,8,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2025,10,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2030,5,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2030,11,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2025,4,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R2,2025,6,all-year,all-week,morning,gas_stove,2020,7.44050000000
+1,CO2f,R2,2025,8,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2025,10,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2030,5,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2030,11,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2025,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2025,4,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R1,2025,6,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2030,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2030,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2030,5,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R1,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2025,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2025,4,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R2,2025,6,all-year,all-week,morning,gas_stove,2020,0.14880000000
+1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2030,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2030,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2030,5,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
+2,heat,R1,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R1,2025,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2025,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,15,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
+2,heat,R2,2025,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2025,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,15,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,CO2f,R1,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
+2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2025,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R1,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2030,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2030,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2025,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R2,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2030,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2030,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+3,heat,R1,2025,8,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,10,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R1,2025,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2025,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,15,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2025,8,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,10,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
+3,heat,R2,2025,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2025,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,15,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,CO2f,R1,2025,4,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R1,2025,6,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R1,2025,8,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2025,10,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2030,5,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2030,11,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2025,4,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R2,2025,6,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
+3,CO2f,R2,2025,8,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2025,10,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2030,5,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2030,11,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2025,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2025,4,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R1,2025,6,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2030,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2030,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2030,5,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2025,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2025,4,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R2,2025,6,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2030,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2030,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2030,5,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+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.08750000000
+4,heat,R1,2025,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,15,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+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.08750000000
+4,heat,R2,2025,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,15,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+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,12.06250000000
+4,CO2f,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2030,11,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+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,12.06250000000
+4,CO2f,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2030,11,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R1,2025,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+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,electric_stove,2020,1.08750000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2030,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R1,2030,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2030,5,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R2,2025,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+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,electric_stove,2020,1.08750000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2030,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R2,2030,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2030,5,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+5,heat,R1,2025,8,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,10,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R1,2025,12,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2025,14,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,11,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,15,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2025,8,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,10,all-year,all-week,evening,gasboiler,2020,0.20830000000
+5,heat,R2,2025,12,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2025,14,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,11,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,15,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,CO2f,R1,2025,4,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R1,2025,6,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R1,2025,8,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2025,10,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2030,5,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2030,11,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2025,4,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R2,2025,6,all-year,all-week,evening,gas_stove,2020,10.41670000000
+5,CO2f,R2,2025,8,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2025,10,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2030,5,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2030,11,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2025,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2025,4,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R1,2025,6,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2030,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2030,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2030,5,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R1,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2025,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2025,4,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R2,2025,6,all-year,all-week,evening,gas_stove,2020,0.20830000000
+5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2030,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2030,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2030,5,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
+6,heat,R1,2025,8,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,10,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R1,2025,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2025,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,15,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2025,8,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,10,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
+6,heat,R2,2025,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2025,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,15,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,CO2f,R1,2025,4,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R1,2025,6,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R1,2025,8,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2025,10,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2030,5,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2030,11,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2025,4,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R2,2025,6,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
+6,CO2f,R2,2025,8,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2025,10,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2030,5,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2030,11,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2025,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2025,4,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R1,2025,6,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2030,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2030,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2030,5,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2025,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2025,4,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R2,2025,6,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2030,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2030,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2030,5,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+7,heat,R1,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R1,2025,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2025,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,15,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
+7,heat,R2,2025,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2025,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,15,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,CO2f,R1,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
+7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2025,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R1,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2030,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2030,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2025,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R2,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2030,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2030,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
new file mode 100644
index 00000000..c5706d3f
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
@@ -0,0 +1,513 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,8,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,8,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,9,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,11,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,12,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2030,8,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,8,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,9,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,11,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,12,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
+0,CO2f,R1,2030,6,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2030,8,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2035,7,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2035,8,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2035,9,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2030,6,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2030,8,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2035,7,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2035,8,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2035,9,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2030,3,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R1,2030,4,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2030,6,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R1,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2035,4,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2035,5,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R1,2035,7,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2030,3,all-year,all-week,night,electric_stove,2020,0.36250000000
+0,cook,R2,2030,4,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2030,6,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2035,4,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2035,5,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2035,7,all-year,all-week,night,gas_stove,2025,0.08040000000
+1,heat,R1,2030,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,11,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,12,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2030,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,11,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,12,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,CO2f,R1,2030,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2030,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2035,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2035,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2035,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2030,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2030,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2035,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2035,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2035,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2030,3,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R1,2030,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2030,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R1,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2035,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2035,5,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R1,2035,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2030,3,all-year,all-week,morning,electric_stove,2020,0.51790000000
+1,cook,R2,2030,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2030,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2035,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2035,5,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2035,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,12,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,12,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,CO2f,R1,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2030,3,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R1,2030,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2035,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2035,5,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2030,3,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
+2,cook,R2,2030,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2035,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2035,5,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,12,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,12,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,CO2f,R1,2030,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2030,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2030,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2030,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2030,3,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R1,2030,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2030,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2035,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2035,5,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2030,3,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
+3,cook,R2,2030,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2030,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2035,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2035,5,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,12,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,12,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,CO2f,R1,2030,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2030,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2030,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2030,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2030,3,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R1,2030,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2030,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2035,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2035,5,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2030,3,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
+4,cook,R2,2030,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2030,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2035,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2035,5,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+5,heat,R1,2030,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,11,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,12,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2030,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,11,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,12,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,CO2f,R1,2030,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2030,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2035,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2035,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2035,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2030,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2030,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2035,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2035,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2035,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2030,3,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R1,2030,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2030,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R1,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2035,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2035,5,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R1,2035,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2030,3,all-year,all-week,evening,electric_stove,2020,0.72500000000
+5,cook,R2,2030,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2030,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2035,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2035,5,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2035,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,12,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,12,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,CO2f,R1,2030,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2030,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2030,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2030,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2030,3,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R1,2030,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2030,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2035,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2035,5,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2030,3,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
+6,cook,R2,2030,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2030,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2035,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2035,5,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,12,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,12,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,CO2f,R1,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2030,3,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R1,2030,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2035,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2035,5,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2030,3,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
+7,cook,R2,2030,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2035,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2035,5,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..f3803e1b
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
@@ -0,0 +1,513 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,10,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,12,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2035,17,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R1,2035,18,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,11,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,13,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,15,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,16,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2035,10,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,12,all-year,all-week,night,gasboiler,2025,0.08040000000
+0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2035,17,all-year,all-week,night,heatpump,2025,0.14040000000
+0,heat,R2,2035,18,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,11,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,13,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,15,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,16,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2035,0.31900000000
+0,CO2f,R1,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2035,8,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R1,2035,10,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2035,12,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2040,9,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2040,11,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2040,13,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2035,8,all-year,all-week,night,gas_stove,2025,4.02080000000
+0,CO2f,R2,2035,10,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2035,12,all-year,all-week,night,gasboiler,2025,5.20380000000
+0,CO2f,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2040,9,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2040,11,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2040,13,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,cook,R1,2035,0,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2035,3,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R1,2035,4,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R1,2035,8,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R1,2040,1,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2040,4,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2040,5,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R1,2040,9,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2035,0,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2035,3,all-year,all-week,night,electric_stove,2025,0.14040000000
+0,cook,R2,2035,4,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2035,8,all-year,all-week,night,gas_stove,2025,0.08040000000
+0,cook,R2,2040,1,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2040,4,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2040,5,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2040,9,all-year,all-week,night,gas_stove,2035,0.01850000000
+1,heat,R1,2035,10,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,12,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2035,17,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R1,2035,18,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,11,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,13,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,15,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,16,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2035,10,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,12,all-year,all-week,morning,gasboiler,2025,0.11490000000
+1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2035,17,all-year,all-week,morning,heatpump,2025,0.20060000000
+1,heat,R2,2035,18,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,11,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,13,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,15,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,16,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,CO2f,R1,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2035,8,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R1,2035,10,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2035,12,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R1,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2040,9,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2040,11,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2040,13,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2035,8,all-year,all-week,morning,gas_stove,2025,5.74400000000
+1,CO2f,R2,2035,10,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2035,12,all-year,all-week,morning,gasboiler,2025,7.43390000000
+1,CO2f,R2,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2040,9,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2040,11,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2040,13,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,cook,R1,2035,0,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2035,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R1,2035,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R1,2035,8,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R1,2040,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2040,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2040,5,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R1,2040,9,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2035,0,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2035,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
+1,cook,R2,2035,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2035,8,all-year,all-week,morning,gas_stove,2025,0.11490000000
+1,cook,R2,2040,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2040,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2040,5,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2040,9,all-year,all-week,morning,gas_stove,2035,0.02640000000
+2,heat,R1,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R1,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,16,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
+2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
+2,heat,R2,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,16,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,CO2f,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R1,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
+2,CO2f,R2,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
+2,CO2f,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,cook,R1,2035,0,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2035,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R1,2035,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R1,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R1,2040,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2040,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2040,5,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R1,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2035,0,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2035,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
+2,cook,R2,2035,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
+2,cook,R2,2040,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2040,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2040,5,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+3,heat,R1,2035,10,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,12,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2035,17,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R1,2035,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,11,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,13,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,16,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2035,10,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,12,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
+3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2035,17,all-year,all-week,early-peak,heatpump,2025,0.20060000000
+3,heat,R2,2035,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,11,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,13,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,16,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,CO2f,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2035,8,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R1,2035,10,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2035,12,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2040,9,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2040,11,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2040,13,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2035,8,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
+3,CO2f,R2,2035,10,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2035,12,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
+3,CO2f,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2040,9,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2040,11,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2040,13,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,cook,R1,2035,0,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2035,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R1,2035,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R1,2035,8,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R1,2040,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2040,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2040,5,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R1,2040,9,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2035,0,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2035,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
+3,cook,R2,2035,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2035,8,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
+3,cook,R2,2040,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2040,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2040,5,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2040,9,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+4,heat,R1,2035,10,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,12,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2035,17,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R1,2035,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,11,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,13,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,16,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2035,10,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,12,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
+4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2035,17,all-year,all-week,late-peak,heatpump,2025,0.42130000000
+4,heat,R2,2035,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,11,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,13,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,16,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,CO2f,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2035,8,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R1,2035,10,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2035,12,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2040,9,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2040,11,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2040,13,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2035,8,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
+4,CO2f,R2,2035,10,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2035,12,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
+4,CO2f,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2040,9,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2040,11,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2040,13,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,cook,R1,2035,0,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2035,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R1,2035,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R1,2035,8,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R1,2040,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2040,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2040,5,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R1,2040,9,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2035,0,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2035,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
+4,cook,R2,2035,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2035,8,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
+4,cook,R2,2040,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2040,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2040,5,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2040,9,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+5,heat,R1,2035,10,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,12,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2035,17,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R1,2035,18,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,11,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,13,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,15,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,16,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2035,10,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,12,all-year,all-week,evening,gasboiler,2025,0.16080000000
+5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2035,17,all-year,all-week,evening,heatpump,2025,0.28080000000
+5,heat,R2,2035,18,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,11,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,13,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,15,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,16,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,CO2f,R1,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2035,8,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R1,2035,10,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2035,12,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R1,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2040,9,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2040,11,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2040,13,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2035,8,all-year,all-week,evening,gas_stove,2025,8.04170000000
+5,CO2f,R2,2035,10,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2035,12,all-year,all-week,evening,gasboiler,2025,10.40750000000
+5,CO2f,R2,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2040,9,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2040,11,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2040,13,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,cook,R1,2035,0,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2035,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R1,2035,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R1,2035,8,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R1,2040,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2040,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2040,5,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R1,2040,9,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2035,0,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2035,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
+5,cook,R2,2035,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2035,8,all-year,all-week,evening,gas_stove,2025,0.16080000000
+5,cook,R2,2040,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2040,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2040,5,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2040,9,all-year,all-week,evening,gas_stove,2035,0.03690000000
+6,heat,R1,2035,10,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,12,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2035,17,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R1,2035,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,11,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,13,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,16,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2035,10,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,12,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
+6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2035,17,all-year,all-week,early-morning,heatpump,2025,0.28080000000
+6,heat,R2,2035,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,11,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,13,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,16,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,CO2f,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2035,8,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R1,2035,10,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2035,12,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2040,9,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2040,11,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2040,13,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2035,8,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
+6,CO2f,R2,2035,10,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2035,12,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
+6,CO2f,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2040,9,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2040,11,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2040,13,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,cook,R1,2035,0,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2035,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R1,2035,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R1,2035,8,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R1,2040,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2040,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2040,5,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R1,2040,9,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2035,0,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2035,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
+6,cook,R2,2035,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2035,8,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
+6,cook,R2,2040,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2040,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2040,5,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2040,9,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+7,heat,R1,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R1,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,16,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
+7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
+7,heat,R2,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,16,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,CO2f,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R1,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
+7,CO2f,R2,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+7,CO2f,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,cook,R1,2035,0,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2035,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R1,2035,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R1,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R1,2040,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2040,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2040,5,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R1,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2035,0,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2035,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
+7,cook,R2,2035,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+7,cook,R2,2040,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2040,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2040,5,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
new file mode 100644
index 00000000..9dec61f1
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
@@ -0,0 +1,513 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,8,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,9,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,11,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2040,13,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R1,2040,14,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2045,14,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,15,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2040,8,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,9,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,11,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2040,13,all-year,all-week,night,heatpump,2030,0.47920000000
+0,heat,R2,2040,14,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2045,14,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,15,all-year,all-week,night,heatpump,2040,0.59580000000
+0,CO2f,R1,2040,6,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2040,8,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2040,9,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2040,6,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2040,8,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2040,9,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,cook,R1,2040,0,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2040,1,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R1,2040,4,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2040,6,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R1,2045,1,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2045,2,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2045,5,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2040,0,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2040,1,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2030,0.47920000000
+0,cook,R2,2040,4,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2040,6,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2045,1,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2045,2,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2045,5,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+1,heat,R1,2040,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,11,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2040,13,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R1,2040,14,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2045,14,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,15,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2040,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,11,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2040,13,all-year,all-week,morning,heatpump,2030,0.68450000000
+1,heat,R2,2040,14,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2045,14,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,15,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,CO2f,R1,2040,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2040,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2040,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2040,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2040,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2040,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,cook,R1,2040,0,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2040,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R1,2040,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2040,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R1,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R1,2045,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2045,2,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2045,5,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R1,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2040,0,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2040,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2030,0.68450000000
+1,cook,R2,2040,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2040,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2045,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2045,2,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2045,5,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2040,13,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R1,2040,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2045,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,15,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2040,13,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
+2,heat,R2,2040,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2045,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,15,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,CO2f,R1,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,cook,R1,2040,0,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2040,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R1,2040,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R1,2045,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2045,2,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2045,5,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2040,0,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2040,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
+2,cook,R2,2040,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2045,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2045,2,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2045,5,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2040,13,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R1,2040,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2045,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,15,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2040,13,all-year,all-week,early-peak,heatpump,2030,0.68450000000
+3,heat,R2,2040,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2045,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,15,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,CO2f,R1,2040,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2040,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2040,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2040,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2040,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2040,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,cook,R1,2040,0,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2040,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R1,2040,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2040,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R1,2045,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2045,2,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2045,5,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2040,0,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2040,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
+3,cook,R2,2040,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2040,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2045,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2045,2,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2045,5,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2040,13,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R1,2040,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2045,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,15,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2040,13,all-year,all-week,late-peak,heatpump,2030,1.43750000000
+4,heat,R2,2040,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2045,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,15,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,CO2f,R1,2040,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2040,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2040,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2040,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2040,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2040,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,cook,R1,2040,0,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2040,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R1,2040,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2040,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R1,2045,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2045,2,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2045,5,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2040,0,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2040,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
+4,cook,R2,2040,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2040,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2045,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2045,2,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2045,5,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+5,heat,R1,2040,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,11,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2040,13,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R1,2040,14,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2045,14,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,15,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2040,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,11,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2040,13,all-year,all-week,evening,heatpump,2030,0.95830000000
+5,heat,R2,2040,14,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2045,14,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,15,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,CO2f,R1,2040,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2040,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2040,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2040,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2040,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2040,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,cook,R1,2040,0,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2040,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R1,2040,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2040,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R1,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R1,2045,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2045,2,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2045,5,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R1,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2040,0,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2040,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2030,0.95830000000
+5,cook,R2,2040,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2040,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2045,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2045,2,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2045,5,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2040,13,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R1,2040,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2045,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,15,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2040,13,all-year,all-week,early-morning,heatpump,2030,0.95830000000
+6,heat,R2,2040,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2045,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,15,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,CO2f,R1,2040,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2040,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2040,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2040,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2040,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2040,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,cook,R1,2040,0,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2040,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R1,2040,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2040,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R1,2045,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2045,2,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2045,5,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2040,0,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2040,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
+6,cook,R2,2040,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2040,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2045,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2045,2,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2045,5,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2040,13,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R1,2040,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2045,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,15,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2040,13,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
+7,heat,R2,2040,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2045,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,15,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,CO2f,R1,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,cook,R1,2040,0,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2040,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R1,2040,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R1,2045,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2045,2,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2045,5,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2040,0,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2040,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
+7,cook,R2,2040,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2045,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2045,2,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2045,5,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..1db158a9
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
@@ -0,0 +1,385 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2045,13,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R1,2045,14,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,11,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,15,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2045,13,all-year,all-week,night,heatpump,2035,0.31900000000
+0,heat,R2,2045,14,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,11,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,15,all-year,all-week,night,heatpump,2045,0.45420000000
+0,CO2f,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R1,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R1,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
+0,CO2f,R2,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,CO2f,R2,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
+0,cook,R1,2045,0,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2045,1,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R1,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R2,2045,0,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2045,1,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.31900000000
+0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
+0,cook,R2,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.45420000000
+1,heat,R1,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2045,13,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R1,2045,14,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,11,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,15,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2045,13,all-year,all-week,morning,heatpump,2035,0.45580000000
+1,heat,R2,2045,14,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,11,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,15,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,CO2f,R1,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R1,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R1,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
+1,CO2f,R2,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,CO2f,R2,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
+1,cook,R1,2045,0,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2045,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R1,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R1,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R2,2045,0,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2045,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.45580000000
+1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
+1,cook,R2,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.64880000000
+2,heat,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2045,13,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R1,2045,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,15,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2045,13,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
+2,heat,R2,2045,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,15,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,CO2f,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
+2,CO2f,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,CO2f,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
+2,cook,R1,2045,0,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2045,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R1,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R2,2045,0,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2045,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
+2,cook,R2,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+3,heat,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2045,13,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R1,2045,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,15,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2045,13,all-year,all-week,early-peak,heatpump,2035,0.45580000000
+3,heat,R2,2045,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,15,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,CO2f,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
+3,CO2f,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,CO2f,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
+3,cook,R1,2045,0,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2045,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R1,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R2,2045,0,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2045,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
+3,cook,R2,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+4,heat,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2045,13,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R1,2045,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,15,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2045,13,all-year,all-week,late-peak,heatpump,2035,0.95710000000
+4,heat,R2,2045,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,15,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,CO2f,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
+4,CO2f,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,CO2f,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
+4,cook,R1,2045,0,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2045,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R1,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R2,2045,0,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2045,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
+4,cook,R2,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+5,heat,R1,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2045,13,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R1,2045,14,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,11,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,15,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2045,13,all-year,all-week,evening,heatpump,2035,0.63810000000
+5,heat,R2,2045,14,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,11,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,15,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,CO2f,R1,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R1,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R1,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
+5,CO2f,R2,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,CO2f,R2,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
+5,cook,R1,2045,0,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2045,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R1,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R1,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R2,2045,0,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2045,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.63810000000
+5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
+5,cook,R2,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.90830000000
+6,heat,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2045,13,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R1,2045,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,15,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2045,13,all-year,all-week,early-morning,heatpump,2035,0.63810000000
+6,heat,R2,2045,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,15,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,CO2f,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
+6,CO2f,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,CO2f,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
+6,cook,R1,2045,0,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2045,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R1,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R2,2045,0,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2045,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
+6,cook,R2,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+7,heat,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2045,13,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R1,2045,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,15,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2045,13,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
+7,heat,R2,2045,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,15,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,CO2f,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
+7,CO2f,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,CO2f,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+7,cook,R1,2045,0,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2045,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R1,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R2,2045,0,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2045,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+7,cook,R2,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..650b56e5
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
@@ -0,0 +1,257 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2050,17,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R1,2050,18,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
+0,heat,R1,2055,18,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R1,2055,19,all-year,all-week,night,heatpump,2050,0.59580000000
+0,heat,R2,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2050,17,all-year,all-week,night,heatpump,2040,0.59580000000
+0,heat,R2,2050,18,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
+0,heat,R2,2055,18,all-year,all-week,night,heatpump,2045,0.45420000000
+0,heat,R2,2055,19,all-year,all-week,night,heatpump,2050,0.59580000000
+0,cook,R1,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R1,2050,11,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R1,2050,12,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R1,2055,2,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R1,2055,3,all-year,all-week,night,electric_stove,2050,0.59580000000
+0,cook,R1,2055,12,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R1,2055,13,all-year,all-week,night,electric_stove,2050,0.59580000000
+0,cook,R2,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R2,2050,11,all-year,all-week,night,electric_stove,2040,0.59580000000
+0,cook,R2,2050,12,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R2,2055,2,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R2,2055,3,all-year,all-week,night,electric_stove,2050,0.59580000000
+0,cook,R2,2055,12,all-year,all-week,night,electric_stove,2045,0.45420000000
+0,cook,R2,2055,13,all-year,all-week,night,electric_stove,2050,0.59580000000
+1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2050,17,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R1,2050,18,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,heat,R1,2055,18,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R1,2055,19,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2050,17,all-year,all-week,morning,heatpump,2040,0.85120000000
+1,heat,R2,2050,18,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,heat,R2,2055,18,all-year,all-week,morning,heatpump,2045,0.64880000000
+1,heat,R2,2055,19,all-year,all-week,morning,heatpump,2050,0.85120000000
+1,cook,R1,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R1,2050,11,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R1,2050,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R1,2055,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R1,2055,3,all-year,all-week,morning,electric_stove,2050,0.85120000000
+1,cook,R1,2055,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R1,2055,13,all-year,all-week,morning,electric_stove,2050,0.85120000000
+1,cook,R2,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R2,2050,11,all-year,all-week,morning,electric_stove,2040,0.85120000000
+1,cook,R2,2050,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R2,2055,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R2,2055,3,all-year,all-week,morning,electric_stove,2050,0.85120000000
+1,cook,R2,2055,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
+1,cook,R2,2055,13,all-year,all-week,morning,electric_stove,2050,0.85120000000
+2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2050,17,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R1,2050,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,heat,R1,2055,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R1,2055,19,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2050,17,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
+2,heat,R2,2050,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,heat,R2,2055,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
+2,heat,R2,2055,19,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
+2,cook,R1,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R1,2050,11,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R1,2050,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R1,2055,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R1,2055,3,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
+2,cook,R1,2055,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R1,2055,13,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
+2,cook,R2,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R2,2050,11,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
+2,cook,R2,2050,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R2,2055,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R2,2055,3,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
+2,cook,R2,2055,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
+2,cook,R2,2055,13,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
+3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2050,17,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R1,2050,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,heat,R1,2055,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R1,2055,19,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2050,17,all-year,all-week,early-peak,heatpump,2040,0.85120000000
+3,heat,R2,2050,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,heat,R2,2055,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
+3,heat,R2,2055,19,all-year,all-week,early-peak,heatpump,2050,0.85120000000
+3,cook,R1,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R1,2050,11,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R1,2050,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R1,2055,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R1,2055,3,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
+3,cook,R1,2055,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R1,2055,13,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
+3,cook,R2,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R2,2050,11,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
+3,cook,R2,2050,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R2,2055,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R2,2055,3,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
+3,cook,R2,2055,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
+3,cook,R2,2055,13,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
+4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2050,17,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R1,2050,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,heat,R1,2055,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R1,2055,19,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2050,17,all-year,all-week,late-peak,heatpump,2040,1.78750000000
+4,heat,R2,2050,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,heat,R2,2055,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
+4,heat,R2,2055,19,all-year,all-week,late-peak,heatpump,2050,1.78750000000
+4,cook,R1,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R1,2050,11,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R1,2050,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R1,2055,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R1,2055,3,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
+4,cook,R1,2055,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R1,2055,13,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
+4,cook,R2,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R2,2050,11,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
+4,cook,R2,2050,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R2,2055,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R2,2055,3,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
+4,cook,R2,2055,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
+4,cook,R2,2055,13,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
+5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2050,17,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R1,2050,18,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,heat,R1,2055,18,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R1,2055,19,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2050,17,all-year,all-week,evening,heatpump,2040,1.19170000000
+5,heat,R2,2050,18,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,heat,R2,2055,18,all-year,all-week,evening,heatpump,2045,0.90830000000
+5,heat,R2,2055,19,all-year,all-week,evening,heatpump,2050,1.19170000000
+5,cook,R1,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R1,2050,11,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R1,2050,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R1,2055,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R1,2055,3,all-year,all-week,evening,electric_stove,2050,1.19170000000
+5,cook,R1,2055,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R1,2055,13,all-year,all-week,evening,electric_stove,2050,1.19170000000
+5,cook,R2,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R2,2050,11,all-year,all-week,evening,electric_stove,2040,1.19170000000
+5,cook,R2,2050,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R2,2055,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R2,2055,3,all-year,all-week,evening,electric_stove,2050,1.19170000000
+5,cook,R2,2055,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
+5,cook,R2,2055,13,all-year,all-week,evening,electric_stove,2050,1.19170000000
+6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2050,17,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R1,2050,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,heat,R1,2055,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R1,2055,19,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2050,17,all-year,all-week,early-morning,heatpump,2040,1.19170000000
+6,heat,R2,2050,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,heat,R2,2055,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
+6,heat,R2,2055,19,all-year,all-week,early-morning,heatpump,2050,1.19170000000
+6,cook,R1,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R1,2050,11,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R1,2050,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R1,2055,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R1,2055,3,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
+6,cook,R1,2055,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R1,2055,13,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
+6,cook,R2,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R2,2050,11,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
+6,cook,R2,2050,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R2,2055,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R2,2055,3,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
+6,cook,R2,2055,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
+6,cook,R2,2055,13,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
+7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2050,17,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R1,2050,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,heat,R1,2055,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R1,2055,19,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2050,17,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
+7,heat,R2,2050,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,heat,R2,2055,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
+7,heat,R2,2055,19,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+7,cook,R1,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R1,2050,11,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R1,2050,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R1,2055,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R1,2055,3,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
+7,cook,R1,2055,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R1,2055,13,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
+7,cook,R2,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R2,2050,11,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
+7,cook,R2,2050,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R2,2055,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R2,2055,3,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
+7,cook,R2,2055,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+7,cook,R2,2055,13,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv
new file mode 100644
index 00000000..5524e835
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearExport.csv
@@ -0,0 +1,40 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ
+R1,Exports,2010,0,0,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0,0,0
+R2,Exports,2010,0,0,0,0,0,0,0
+R2,Exports,2015,0,0,0,0,0,0,0
+R2,Exports,2020,0,0,0,0,0,0,0
+R2,Exports,2025,0,0,0,0,0,0,0
+R2,Exports,2030,0,0,0,0,0,0,0
+R2,Exports,2035,0,0,0,0,0,0,0
+R2,Exports,2040,0,0,0,0,0,0,0
+R2,Exports,2045,0,0,0,0,0,0,0
+R2,Exports,2050,0,0,0,0,0,0,0
+R2,Exports,2055,0,0,0,0,0,0,0
+R2,Exports,2060,0,0,0,0,0,0,0
+R2,Exports,2065,0,0,0,0,0,0,0
+R2,Exports,2070,0,0,0,0,0,0,0
+R2,Exports,2075,0,0,0,0,0,0,0
+R2,Exports,2080,0,0,0,0,0,0,0
+R2,Exports,2085,0,0,0,0,0,0,0
+R2,Exports,2090,0,0,0,0,0,0,0
+R2,Exports,2095,0,0,0,0,0,0,0
+R2,Exports,2100,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv
new file mode 100644
index 00000000..a6d02500
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/BaseYearImport.csv
@@ -0,0 +1,40 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
+Unit,-,Year,PJ,PJ,PJ,kt,PJ,PJ,PJ
+R1,Imports,2010,0,0,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0,0,0
+R2,Imports,2010,0,0,0,0,0,0,0
+R2,Imports,2015,0,0,0,0,0,0,0
+R2,Imports,2020,0,0,0,0,0,0,0
+R2,Imports,2025,0,0,0,0,0,0,0
+R2,Imports,2030,0,0,0,0,0,0,0
+R2,Imports,2035,0,0,0,0,0,0,0
+R2,Imports,2040,0,0,0,0,0,0,0
+R2,Imports,2045,0,0,0,0,0,0,0
+R2,Imports,2050,0,0,0,0,0,0,0
+R2,Imports,2055,0,0,0,0,0,0,0
+R2,Imports,2060,0,0,0,0,0,0,0
+R2,Imports,2065,0,0,0,0,0,0,0
+R2,Imports,2070,0,0,0,0,0,0,0
+R2,Imports,2075,0,0,0,0,0,0,0
+R2,Imports,2080,0,0,0,0,0,0,0
+R2,Imports,2085,0,0,0,0,0,0,0
+R2,Imports,2090,0,0,0,0,0,0,0
+R2,Imports,2095,0,0,0,0,0,0,0
+R2,Imports,2100,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv
new file mode 100644
index 00000000..aea518c6
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/GlobalCommodities.csv
@@ -0,0 +1,8 @@
+Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
+Electricity,Energy,electricity,0.0,1,PJ
+Gas,Energy,gas,56.1,1,PJ
+Heat,Energy,heat,0.0,1,PJ
+Wind,Energy,wind,0.0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0.0,1,kt
+Solar,Energy,solar,0.0,1,PJ
+Cook,Energy,cook,0.0,1,PJ
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv
new file mode 100644
index 00000000..6a1f9a17
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/input/Projections.csv
@@ -0,0 +1,40 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind,solar,cook
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt,MUS$2010/kt,MUS$2010/PJ
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
+R2,CommodityPrice,2010,14.81481472,6.6759,100,0,0,0,100
+R2,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0,0,100
+R2,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0,0,100
+R2,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0,0,100
+R2,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0,0,100
+R2,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0,0,100
+R2,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0,0,100
+R2,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0,0,100
+R2,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0,0,100
+R2,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0,0,100
+R2,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0,0,100
+R2,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0,0,100
+R2,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0,0,100
+R2,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0,0,100
+R2,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0,0,100
+R2,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0,0,100
+R2,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0,0,100
+R2,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0,0,100
+R2,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0,0,100
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
new file mode 100644
index 00000000..c6b9c6df
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -0,0 +1,150 @@
+# Global settings - most REQUIRED
+
+time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+regions = ["R1", "R2"]
+interest_rate = 0.1
+interpolation_mode = 'Active'
+log_level = 'info'
+excluded_commodities = ["wind", "solar"]
+# Convergence parameters
+equilibrium_variable = 'demand'
+maximum_iterations = 1
+tolerance = 0.1
+tolerance_unmet_demand = -0.1
+
+[[outputs]]
+quantity = "prices"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+
+[[outputs]]
+quantity = "capacity"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
+[carbon_budget_control]
+budget = []
+
+[global_input_files]
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
+
+[sectors.residential]
+type = 'default'
+priority = 1
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
+[[sectors.residential.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.power]
+type = 'default'
+priority = 2
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.power.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.gas]
+type = 'default'
+priority = 3
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.gas.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.residential_presets]
+type = 'presets'
+priority = 0
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1095
+morning = 1095
+mid-afternoon = 1095
+early-peak = 1095
+late-peak = 1095
+evening = 1095
+early-morning = 1095
+late-afternoon = 1095
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
new file mode 100644
index 00000000..9acb05de
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
@@ -0,0 +1,5 @@
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
+Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
+Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv
new file mode 100644
index 00000000..0e85ade1
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommIn.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,0,0,0,0
+gassupply1,R2,2020,fixed,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
new file mode 100644
index 00000000..cc721c76
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,1,0,0,0
+gassupply1,R2,2020,fixed,0,1,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv
new file mode 100644
index 00000000..3cd9976f
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/ExistingCapacity.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
+gassupply1,R2,PJ/y,15,15,7.5,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
new file mode 100644
index 00000000..a10e7473
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv
new file mode 100644
index 00000000..7e636149
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommIn.csv
@@ -0,0 +1,14 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R1,2040,fixed,0,1.67,0,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1,0
+windturbine,R1,2040,fixed,0,0,0,0,1,0
+solarPV,R1,2020,fixed,0,0,0,0,0,1
+solarPV,R1,2040,fixed,0,0,0,0,0,1
+gasCCGT,R2,2020,fixed,0,1.67,0,0,0,0
+gasCCGT,R2,2040,fixed,0,1.67,0,0,0,0
+windturbine,R2,2020,fixed,0,0,0,0,1,0
+windturbine,R2,2040,fixed,0,0,0,0,1,0
+solarPV,R2,2020,fixed,0,0,0,0,0,1
+solarPV,R2,2040,fixed,0,0,0,0,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
new file mode 100644
index 00000000..b0b03543
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
@@ -0,0 +1,14 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
+windturbine,R1,2020,fixed,1,0,0,0,0,0
+windturbine,R1,2040,fixed,1,0,0,0,0,0
+solarPV,R1,2020,fixed,1,0,0,0,0,0
+solarPV,R1,2040,fixed,1,0,0,0,0,0
+gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
+gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
+windturbine,R2,2020,fixed,1,0,0,0,0,0
+windturbine,R2,2040,fixed,1,0,0,0,0,0
+solarPV,R2,2020,fixed,1,0,0,0,0,0
+solarPV,R2,2040,fixed,1,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv
new file mode 100644
index 00000000..073ccdd5
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/ExistingCapacity.csv
@@ -0,0 +1,7 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
+windturbine,R1,PJ/y,0,0,0,0,0,0,0
+solarPV,R1,PJ/y,0,0,0,0,0,0,0
+gasCCGT,R2,PJ/y,1,1,0,0,0,0,0
+windturbine,R2,PJ/y,0,0,0,0,0,0,0
+solarPV,R2,PJ/y,0,0,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
new file mode 100644
index 00000000..ea61a7fd
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
@@ -0,0 +1,14 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
new file mode 100644
index 00000000..289f431a
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2020Consumption.csv
@@ -0,0 +1,17 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
+R1,gasboiler,1,0,0,0.7,0,0,0,0.7
+R1,gasboiler,2,0,0,1.0,0,0,0,1.0
+R1,gasboiler,3,0,0,0.7,0,0,0,0.7
+R1,gasboiler,4,0,0,1.0,0,0,0,1.0
+R1,gasboiler,5,0,0,2.1,0,0,0,2.1
+R1,gasboiler,6,0,0,1.4,0,0,0,1.4
+R1,gasboiler,7,0,0,1.4,0,0,0,1.4
+R1,gasboiler,8,0,0,1.4,0,0,0,1.4
+R2,gasboiler,1,0,0,0.7,0,0,0,0.7
+R2,gasboiler,2,0,0,1.0,0,0,0,1.0
+R2,gasboiler,3,0,0,0.7,0,0,0,0.7
+R2,gasboiler,4,0,0,1.0,0,0,0,1.0
+R2,gasboiler,5,0,0,2.1,0,0,0,2.1
+R2,gasboiler,6,0,0,1.4,0,0,0,1.4
+R2,gasboiler,7,0,0,1.4,0,0,0,1.4
+R2,gasboiler,8,0,0,1.4,0,0,0,1.4
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
new file mode 100644
index 00000000..c02bc258
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv
@@ -0,0 +1,17 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind,solar,cook
+R1,gasboiler,1,0,0,2.1,0,0,0,2.1
+R1,gasboiler,2,0,0,3.0,0,0,0,3.0
+R1,gasboiler,3,0,0,2.1,0,0,0,2.1
+R1,gasboiler,4,0,0,3.0,0,0,0,3.0
+R1,gasboiler,5,0,0,6.3,0,0,0,6.3
+R1,gasboiler,6,0,0,4.2,0,0,0,4.2
+R1,gasboiler,7,0,0,4.2,0,0,0,4.2
+R1,gasboiler,8,0,0,4.2,0,0,0,4.2
+R2,gasboiler,1,0,0,2.1,0,0,0,2.1
+R2,gasboiler,2,0,0,3.0,0,0,0,3.0
+R2,gasboiler,3,0,0,2.1,0,0,0,2.1
+R2,gasboiler,4,0,0,3.0,0,0,0,3.0
+R2,gasboiler,5,0,0,6.3,0,0,0,6.3
+R2,gasboiler,6,0,0,4.2,0,0,0,4.2
+R2,gasboiler,7,0,0,4.2,0,0,0,4.2
+R2,gasboiler,8,0,0,4.2,0,0,0,4.2
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv
new file mode 100644
index 00000000..5653886c
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommIn.csv
@@ -0,0 +1,10 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,1.16,0,0,0,0
+heatpump,R1,2020,fixed,0.4,0,0,0,0,0
+gasboiler,R2,2020,fixed,0,1.16,0,0,0,0
+heatpump,R2,2020,fixed,0.4,0,0,0,0,0
+electric_stove,R1,2020,fixed,0.4,0,0,0,0,0
+electric_stove,R2,2020,fixed,0.4,0,0,0,0,0
+gas_stove,R1,2020,fixed,0,1.16,0,0,0,0
+gas_stove,R2,2020,fixed,0,1.16,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
new file mode 100644
index 00000000..e90d9dc1
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
@@ -0,0 +1,10 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,0,1,64.71,0,0
+heatpump,R1,2020,fixed,0,0,1,0,0,0
+gasboiler,R2,2020,fixed,0,0,1,64.71,0,0
+heatpump,R2,2020,fixed,0,0,1,0,0,0
+electric_stove,R1,2020,fixed,0,0,0,0,0,1
+electric_stove,R2,2020,fixed,0,0,0,0,0,1
+gas_stove,R1,2020,fixed,0,0,0,50,0,1
+gas_stove,R2,2020,fixed,0,0,0,50,0,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv
new file mode 100644
index 00000000..5ade79dc
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/ExistingCapacity.csv
@@ -0,0 +1,9 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasboiler,R1,PJ/y,10,5,0,0,0,0,0
+heatpump,R1,PJ/y,0,0,0,0,0,0,0
+gasboiler,R2,PJ/y,10,5,0,0,0,0,0
+heatpump,R2,PJ/y,0,0,0,0,0,0,0
+electric_stove,R1,PJ/y,0,0,0,0,0,0,0
+electric_stove,R2,PJ/y,0,0,0,0,0,0,0
+gas_stove,R1,PJ/y,10,5,0,0,0,0,0
+gas_stove,R2,PJ/y,10,5,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
new file mode 100644
index 00000000..53d32926
--- /dev/null
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
@@ -0,0 +1,10 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
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
new file mode 100644
index 00000000..d1ee882b
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000..d42ba410
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 00000000..85cb6585
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000..21b6abc4
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000..49c4e9fe
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 00000000..e9db3788
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000..6206749d
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,4 @@
+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/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
new file mode 100644
index 00000000..3848a821
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -0,0 +1,48 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,11.86320000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,9.61320000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,3.81370000000
+heatpump,R1,R1,A1,residential,retrofit,2030,11.86320000000
+heatpump,R1,R1,A1,residential,retrofit,2030,1.84700000000
+windturbine,R1,R1,A1,power,retrofit,2030,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.09700000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.81370000000
+heatpump,R1,R1,A1,residential,retrofit,2035,1.84700000000
+heatpump,R1,R1,A1,residential,retrofit,2035,12.35690000000
+windturbine,R1,R1,A1,power,retrofit,2035,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2035,0.49370000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,4.91540000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,2.39330000000
+heatpump,R1,R1,A1,residential,retrofit,2040,12.35690000000
+heatpump,R1,R1,A1,residential,retrofit,2040,3.75930000000
+windturbine,R1,R1,A1,power,retrofit,2040,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2040,0.49370000000
+windturbine,R1,R1,A1,power,retrofit,2040,1.91230000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,4.91540000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,2.39330000000
+heatpump,R1,R1,A1,residential,retrofit,2045,3.75930000000
+heatpump,R1,R1,A1,residential,retrofit,2045,12.67390000000
+windturbine,R1,R1,A1,power,retrofit,2045,9.61320000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2045,0.49370000000
+windturbine,R1,R1,A1,power,retrofit,2045,1.91230000000
+windturbine,R1,R1,A1,power,retrofit,2045,0.31700000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,4.91540000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,0.75000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,12.67390000000
+heatpump,R1,R1,A1,residential,retrofit,2050,5.71850000000
+windturbine,R1,R1,A1,power,retrofit,2050,4.09700000000
+windturbine,R1,R1,A1,power,retrofit,2050,0.49370000000
+windturbine,R1,R1,A1,power,retrofit,2050,1.91230000000
+windturbine,R1,R1,A1,power,retrofit,2050,0.31700000000
+windturbine,R1,R1,A1,power,retrofit,2050,11.57240000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
new file mode 100644
index 00000000..71735d05
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.66950000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.22830000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.73100000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.34410000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.66950000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.22830000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.73100000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.34410000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.91390000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.68820000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.79250000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.45990000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.16880000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.37370000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.23480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.56370000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.16880000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.37370000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.23480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.56370000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.43110000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23920000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.13110000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.30090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.75420000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.36820000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17340000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.67620000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.43790000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.91880000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.36820000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17340000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.67620000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.43790000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.91880000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.64500000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21970000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.64460000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.50760000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19670000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.16220000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.12780000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34820000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.48220000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.20030000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.74860000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.12780000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34820000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.48220000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.20030000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.74860000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.41600000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40410000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.54750000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.27290000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37630000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,42.01630000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.33540000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68790000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.32150000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.41030000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70400000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.60430000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.33540000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68790000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.32150000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.41030000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70400000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.60430000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.63290000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.45370000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.48520000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.72000000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.88860000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,5.90150000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.15980000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.74240000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,5.97830000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,27.01280000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,5.90150000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.15980000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.74240000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.97830000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,27.01280000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.20630000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.82690000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,6.05500000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.19490000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.28490000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..1043ca6b
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..6fa5726c
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+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
+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
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
new file mode 100644
index 00000000..31c131b7
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 00000000..9b1130de
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000..f5239465
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
@@ -0,0 +1,35 @@
+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/Power/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..a373151f
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,windturbine,2020,9.61320000000
+0,2049,R1,windturbine,2020,9.61320000000
+1,2045,R1,windturbine,2025,4.09700000000
+1,2049,R1,windturbine,2025,4.09700000000
+1,2050,R1,windturbine,2025,4.09700000000
+1,2054,R1,windturbine,2025,4.09700000000
+2,2045,R1,windturbine,2030,0.49370000000
+2,2049,R1,windturbine,2030,0.49370000000
+2,2050,R1,windturbine,2030,0.49370000000
+2,2054,R1,windturbine,2030,0.49370000000
+2,2055,R1,windturbine,2030,0.49370000000
+2,2059,R1,windturbine,2030,0.49370000000
+3,2045,R1,windturbine,2035,1.91230000000
+3,2049,R1,windturbine,2035,1.91230000000
+3,2050,R1,windturbine,2035,1.91230000000
+3,2054,R1,windturbine,2035,1.91230000000
+3,2055,R1,windturbine,2035,1.91230000000
+3,2059,R1,windturbine,2035,1.91230000000
+3,2060,R1,windturbine,2035,1.91230000000
+3,2064,R1,windturbine,2035,1.91230000000
+4,2045,R1,windturbine,2040,0.31700000000
+4,2049,R1,windturbine,2040,0.31700000000
+4,2050,R1,windturbine,2040,0.31700000000
+4,2054,R1,windturbine,2040,0.31700000000
+4,2055,R1,windturbine,2040,0.31700000000
+4,2059,R1,windturbine,2040,0.31700000000
+4,2060,R1,windturbine,2040,0.31700000000
+4,2064,R1,windturbine,2040,0.31700000000
+4,2065,R1,windturbine,2040,0.31700000000
+4,2069,R1,windturbine,2040,0.31700000000
+5,2050,R1,windturbine,2045,11.57240000000
+5,2054,R1,windturbine,2045,11.57240000000
+5,2055,R1,windturbine,2045,11.57240000000
+5,2059,R1,windturbine,2045,11.57240000000
+5,2060,R1,windturbine,2045,11.57240000000
+5,2064,R1,windturbine,2045,11.57240000000
+5,2065,R1,windturbine,2045,11.57240000000
+5,2069,R1,windturbine,2045,11.57240000000
+5,2070,R1,windturbine,2045,11.57240000000
+5,2074,R1,windturbine,2045,11.57240000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..0386e8f1
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+0,2050,R1,windturbine,2025,4.09700000000
+0,2054,R1,windturbine,2025,4.09700000000
+1,2050,R1,windturbine,2030,0.49370000000
+1,2054,R1,windturbine,2030,0.49370000000
+1,2055,R1,windturbine,2030,0.49370000000
+1,2059,R1,windturbine,2030,0.49370000000
+2,2050,R1,windturbine,2035,1.91230000000
+2,2054,R1,windturbine,2035,1.91230000000
+2,2055,R1,windturbine,2035,1.91230000000
+2,2059,R1,windturbine,2035,1.91230000000
+2,2060,R1,windturbine,2035,1.91230000000
+2,2064,R1,windturbine,2035,1.91230000000
+3,2050,R1,windturbine,2040,0.31700000000
+3,2054,R1,windturbine,2040,0.31700000000
+3,2055,R1,windturbine,2040,0.31700000000
+3,2059,R1,windturbine,2040,0.31700000000
+3,2060,R1,windturbine,2040,0.31700000000
+3,2064,R1,windturbine,2040,0.31700000000
+3,2065,R1,windturbine,2040,0.31700000000
+3,2069,R1,windturbine,2040,0.31700000000
+4,2050,R1,windturbine,2045,11.57240000000
+4,2054,R1,windturbine,2045,11.57240000000
+4,2055,R1,windturbine,2045,11.57240000000
+4,2059,R1,windturbine,2045,11.57240000000
+4,2060,R1,windturbine,2045,11.57240000000
+4,2064,R1,windturbine,2045,11.57240000000
+4,2065,R1,windturbine,2045,11.57240000000
+4,2069,R1,windturbine,2045,11.57240000000
+4,2070,R1,windturbine,2045,11.57240000000
+4,2074,R1,windturbine,2045,11.57240000000
+5,2055,R1,windturbine,2050,4.22490000000
+5,2059,R1,windturbine,2050,4.22490000000
+5,2060,R1,windturbine,2050,4.22490000000
+5,2064,R1,windturbine,2050,4.22490000000
+5,2065,R1,windturbine,2050,4.22490000000
+5,2069,R1,windturbine,2050,4.22490000000
+5,2070,R1,windturbine,2050,4.22490000000
+5,2074,R1,windturbine,2050,4.22490000000
+5,2075,R1,windturbine,2050,4.22490000000
+5,2079,R1,windturbine,2050,4.22490000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..3c4e421e
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,11.86320000000
+1,2030,R1,heatpump,2020,11.86320000000
+1,2034,R1,heatpump,2020,11.86320000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..c10983de
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,3.81370000000
+1,2034,R1,gasboiler,2025,3.81370000000
+1,2035,R1,gasboiler,2025,3.81370000000
+1,2039,R1,gasboiler,2025,3.81370000000
+2,2025,R1,heatpump,2020,11.86320000000
+2,2030,R1,heatpump,2020,11.86320000000
+2,2034,R1,heatpump,2020,11.86320000000
+3,2030,R1,heatpump,2025,1.84700000000
+3,2034,R1,heatpump,2025,1.84700000000
+3,2035,R1,heatpump,2025,1.84700000000
+3,2039,R1,heatpump,2025,1.84700000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..fc1265ec
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,3.81370000000
+0,2034,R1,gasboiler,2025,3.81370000000
+0,2035,R1,gasboiler,2025,3.81370000000
+0,2039,R1,gasboiler,2025,3.81370000000
+1,2030,R1,heatpump,2020,11.86320000000
+1,2034,R1,heatpump,2020,11.86320000000
+2,2030,R1,heatpump,2025,1.84700000000
+2,2034,R1,heatpump,2025,1.84700000000
+2,2035,R1,heatpump,2025,1.84700000000
+2,2039,R1,heatpump,2025,1.84700000000
+3,2035,R1,heatpump,2030,12.35690000000
+3,2039,R1,heatpump,2030,12.35690000000
+3,2040,R1,heatpump,2030,12.35690000000
+3,2044,R1,heatpump,2030,12.35690000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..5a7273fe
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,3.81370000000
+0,2039,R1,gasboiler,2025,3.81370000000
+1,2040,R1,gasboiler,2035,2.39330000000
+1,2044,R1,gasboiler,2035,2.39330000000
+1,2045,R1,gasboiler,2035,2.39330000000
+1,2049,R1,gasboiler,2035,2.39330000000
+2,2035,R1,heatpump,2025,1.84700000000
+2,2039,R1,heatpump,2025,1.84700000000
+3,2035,R1,heatpump,2030,12.35690000000
+3,2039,R1,heatpump,2030,12.35690000000
+3,2040,R1,heatpump,2030,12.35690000000
+3,2044,R1,heatpump,2030,12.35690000000
+4,2040,R1,heatpump,2035,3.75930000000
+4,2044,R1,heatpump,2035,3.75930000000
+4,2045,R1,heatpump,2035,3.75930000000
+4,2049,R1,heatpump,2035,3.75930000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..31c274c8
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,2.39330000000
+0,2044,R1,gasboiler,2035,2.39330000000
+0,2045,R1,gasboiler,2035,2.39330000000
+0,2049,R1,gasboiler,2035,2.39330000000
+1,2040,R1,heatpump,2030,12.35690000000
+1,2044,R1,heatpump,2030,12.35690000000
+2,2040,R1,heatpump,2035,3.75930000000
+2,2044,R1,heatpump,2035,3.75930000000
+2,2045,R1,heatpump,2035,3.75930000000
+2,2049,R1,heatpump,2035,3.75930000000
+3,2045,R1,heatpump,2040,12.67390000000
+3,2049,R1,heatpump,2040,12.67390000000
+3,2050,R1,heatpump,2040,12.67390000000
+3,2054,R1,heatpump,2040,12.67390000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..388c7811
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,2.39330000000
+0,2049,R1,gasboiler,2035,2.39330000000
+1,2050,R1,gasboiler,2045,0.75000000000
+1,2054,R1,gasboiler,2045,0.75000000000
+1,2055,R1,gasboiler,2045,0.75000000000
+1,2059,R1,gasboiler,2045,0.75000000000
+2,2045,R1,heatpump,2035,3.75930000000
+2,2049,R1,heatpump,2035,3.75930000000
+3,2045,R1,heatpump,2040,12.67390000000
+3,2049,R1,heatpump,2040,12.67390000000
+3,2050,R1,heatpump,2040,12.67390000000
+3,2054,R1,heatpump,2040,12.67390000000
+4,2050,R1,heatpump,2045,5.71850000000
+4,2054,R1,heatpump,2045,5.71850000000
+4,2055,R1,heatpump,2045,5.71850000000
+4,2059,R1,heatpump,2045,5.71850000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..58b208c9
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasboiler,2045,0.75000000000
+0,2054,R1,gasboiler,2045,0.75000000000
+0,2055,R1,gasboiler,2045,0.75000000000
+0,2059,R1,gasboiler,2045,0.75000000000
+1,2050,R1,heatpump,2040,12.67390000000
+1,2054,R1,heatpump,2040,12.67390000000
+2,2050,R1,heatpump,2045,5.71850000000
+2,2054,R1,heatpump,2045,5.71850000000
+2,2055,R1,heatpump,2045,5.71850000000
+2,2059,R1,heatpump,2045,5.71850000000
+3,2055,R1,heatpump,2050,12.80180000000
+3,2059,R1,heatpump,2050,12.80180000000
+3,2060,R1,heatpump,2050,12.80180000000
+3,2064,R1,heatpump,2050,12.80180000000
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
new file mode 100644
index 00000000..75a7bdf1
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000..09ca76ed
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000..457bc6d0
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..bfad9bde
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..0ab204b7
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..28a974df
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..72c9b548
--- /dev/null
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..33bbbed3
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..9d035dfd
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..4cae2884
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 00000000..772418b7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000..70eb04b5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000..fdf6b01b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..ed1ed9d4
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,9 @@
+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/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
new file mode 100644
index 00000000..354aa418
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
@@ -0,0 +1,51 @@
+agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
+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,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.54330000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
+A1,1.68610000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
+A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
+A1,2.01780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
+A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
+A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
+A1,2.08150000000,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.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
+A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
+A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
+A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
+A1,2.37860000000,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/1-min-constraint/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
new file mode 100644
index 00000000..69eb3a4f
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
@@ -0,0 +1,229 @@
+agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
+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
new file mode 100644
index 00000000..e5a087bc
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
@@ -0,0 +1,325 @@
+agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
+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/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
new file mode 100644
index 00000000..065b72d2
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.22540000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..69c4d338
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..c6bfdc80
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
@@ -0,0 +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.54330000000
+2,2035,R1,windturbine,2025,1.54330000000
+2,2040,R1,windturbine,2025,1.54330000000
+2,2045,R1,windturbine,2025,1.54330000000
+2,2049,R1,windturbine,2025,1.54330000000
+2,2050,R1,windturbine,2025,1.54330000000
+2,2054,R1,windturbine,2025,1.54330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
new file mode 100644
index 00000000..fe65e893
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
@@ -0,0 +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.54330000000
+1,2035,R1,windturbine,2025,1.54330000000
+1,2040,R1,windturbine,2025,1.54330000000
+1,2045,R1,windturbine,2025,1.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2035,R1,windturbine,2030,1.68610000000
+2,2040,R1,windturbine,2030,1.68610000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..8280e4a7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
@@ -0,0 +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.54330000000
+1,2040,R1,windturbine,2025,1.54330000000
+1,2045,R1,windturbine,2025,1.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2035,R1,windturbine,2030,1.68610000000
+2,2040,R1,windturbine,2030,1.68610000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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,2040,R1,windturbine,2035,2.01780000000
+3,2045,R1,windturbine,2035,2.01780000000
+3,2049,R1,windturbine,2035,2.01780000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
new file mode 100644
index 00000000..74962932
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
@@ -0,0 +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.54330000000
+1,2045,R1,windturbine,2025,1.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2040,R1,windturbine,2030,1.68610000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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,2040,R1,windturbine,2035,2.01780000000
+3,2045,R1,windturbine,2035,2.01780000000
+3,2049,R1,windturbine,2035,2.01780000000
+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,2045,R1,windturbine,2040,2.08150000000
+4,2049,R1,windturbine,2040,2.08150000000
+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
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..bcd2871b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
@@ -0,0 +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.54330000000
+1,2049,R1,windturbine,2025,1.54330000000
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2045,R1,windturbine,2030,1.68610000000
+2,2049,R1,windturbine,2030,1.68610000000
+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,2045,R1,windturbine,2035,2.01780000000
+3,2049,R1,windturbine,2035,2.01780000000
+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,2045,R1,windturbine,2040,2.08150000000
+4,2049,R1,windturbine,2040,2.08150000000
+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
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
new file mode 100644
index 00000000..26c19754
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 00000000..aa3821f8
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
@@ -0,0 +1,29 @@
+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/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
new file mode 100644
index 00000000..75ad01fc
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
@@ -0,0 +1,29 @@
+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.23950000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33600000000
+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.35930000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50410000000
+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.23950000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33600000000
+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.35930000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50410000000
+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.71850000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00810000000
+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.47900000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.67210000000
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
new file mode 100644
index 00000000..18403933
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
@@ -0,0 +1,31 @@
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.23950000000
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.18010000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33600000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.25270000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.27610000000
+1,0,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.35930000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.27020000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50410000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.37910000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.41410000000
+2,0,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.23950000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.18010000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33600000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.25270000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.27610000000
+3,0,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.35930000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.27020000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50410000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.37910000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.41410000000
+4,0,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.71850000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.54030000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00810000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.75810000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.82820000000
+5,0,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.47900000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.36020000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.67210000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.50540000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.55220000000
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
new file mode 100644
index 00000000..131094ba
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
@@ -0,0 +1,43 @@
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.18010000000
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15820000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.25270000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.22200000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.27610000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.24260000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.29030000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.27020000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23740000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.37910000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.33300000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.41410000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36380000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.43540000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.18010000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15820000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.25270000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.22200000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.27610000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24260000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.29030000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.27020000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23740000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.37910000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.33300000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.41410000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36380000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.43540000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.54030000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.47470000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.75810000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.66610000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.82820000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72770000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.87080000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.36020000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31650000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.50540000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.44400000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.55220000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48510000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.58060000000
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
new file mode 100644
index 00000000..59f8c5cb
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
@@ -0,0 +1,55 @@
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15820000000
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13660000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.22200000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.19160000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.24260000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.20930000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.29030000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.25050000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.25840000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23740000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20490000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.33300000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28740000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36380000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31400000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.43540000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37580000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38760000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15820000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13660000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.22200000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19160000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24260000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20930000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.29030000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.25050000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25840000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23740000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20490000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.33300000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28740000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36380000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31400000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.43540000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37580000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38760000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.47470000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40970000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.66610000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57480000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72770000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62800000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.87080000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.75150000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77530000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31650000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.27310000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.44400000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38320000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48510000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41870000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.58060000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.50100000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51680000000
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
new file mode 100644
index 00000000..fc27169f
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
@@ -0,0 +1,61 @@
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13660000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.19160000000
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.19080000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.20930000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.20840000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.25050000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24940000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.25840000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.25730000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.29400000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20490000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28740000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28620000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31400000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31270000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37580000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37420000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38760000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38600000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.44110000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13660000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19160000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19080000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20930000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20840000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.25050000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24940000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25840000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25730000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.29400000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20490000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28740000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28620000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31400000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31270000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37580000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37420000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38760000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38600000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.44110000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40970000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57480000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57240000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62800000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62530000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.75150000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.74830000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77530000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77190000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.88210000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.27310000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38320000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38160000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41870000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41690000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.50100000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.49890000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51680000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51460000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.58810000000
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
new file mode 100644
index 00000000..8fd9db3e
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
@@ -0,0 +1,61 @@
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.19080000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.20840000000
+0,2,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.19450000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24940000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.23270000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.25730000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24010000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.29400000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.27440000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.25830000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28620000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31270000000
+1,2,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.29170000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37420000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.34910000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38600000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36010000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.44110000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.41150000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.38750000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19080000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20840000000
+2,2,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.19450000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24940000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23270000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25730000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24010000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.29400000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.27440000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.25830000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28620000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31270000000
+3,2,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.29170000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37420000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.34910000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38600000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36010000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.44110000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.41150000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.38750000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57240000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62530000000
+4,2,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.58350000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.74830000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.69820000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77190000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72030000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.88210000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.82310000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.77490000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38160000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41690000000
+5,2,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.38900000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.49890000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.46550000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51460000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48020000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.58810000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.54870000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.51660000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..42f4be20
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000..7b8c4061
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000..bfe116d0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000..82873caa
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..741ea3c6
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c802f340
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c7be86b2
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 00000000..8c187153
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 00000000..33bbbed3
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..9d035dfd
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..4cae2884
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 00000000..772418b7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000..70eb04b5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000..fdf6b01b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..ed1ed9d4
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..07d7b4ce
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
@@ -0,0 +1,51 @@
+agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
+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.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.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.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.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.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.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
new file mode 100644
index 00000000..203194bc
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
@@ -0,0 +1,229 @@
+agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
+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
new file mode 100644
index 00000000..d24d8c30
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
@@ -0,0 +1,325 @@
+agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
+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/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
new file mode 100644
index 00000000..ed4a4096
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.25950000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.36000000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.28330000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18620000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06730000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.11280000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07250000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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
new file mode 100644
index 00000000..f79ba32f
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..525499d5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+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
+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
new file mode 100644
index 00000000..98ef6ffe
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
@@ -0,0 +1,21 @@
+asset,year,region,technology,installed,capacity
+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
new file mode 100644
index 00000000..e9cb4c69
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
@@ -0,0 +1,28 @@
+asset,year,region,technology,installed,capacity
+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
new file mode 100644
index 00000000..4aa4b743
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
@@ -0,0 +1,35 @@
+asset,year,region,technology,installed,capacity
+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
new file mode 100644
index 00000000..16a516dc
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
@@ -0,0 +1,41 @@
+asset,year,region,technology,installed,capacity
+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
new file mode 100644
index 00000000..bc415559
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 00000000..aa3821f8
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000..e841617e
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000..0480fdee
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000..8d7d43bd
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000..cb0ec8b6
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 00000000..4b2628f7
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
@@ -0,0 +1,61 @@
+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
new file mode 100644
index 00000000..05f58095
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
@@ -0,0 +1,61 @@
+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/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
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
new file mode 100644
index 00000000..42f4be20
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000..7b8c4061
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000..bfe116d0
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 00000000..82873caa
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..741ea3c6
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c802f340
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 00000000..c7be86b2
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 00000000..8c187153
--- /dev/null
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
@@ -0,0 +1,25 @@
+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

From 239628f26e79452a0b1a18410af67f090e575a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 14 Jun 2024 06:51:37 +0100
Subject: [PATCH 230/419] WIP: Max capacity constraint

---
 src/muse/constraints.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 67701269..90c3dde5 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -500,6 +500,43 @@ def max_production(
     )
 
 
+@register_constraints
+def demand_limitting_capacity(
+    demand_: xr.DataArray,
+    assets: xr.Dataset,
+    search_space: xr.DataArray,
+    market: xr.Dataset,
+    technologies: xr.Dataset,
+    year: Optional[int] = None,
+) -> Constraint:
+    """Limits the maximum combined capacity to match the demand.
+
+    This is a somewhat more restrictive constraint than the max_production constraint or
+    the maximum capacity expansion. In this case, the combined new capacity of all
+    assets must be sufficient to meet the demand of the most demanding timeslice, and
+    no more.
+    """
+    # We start with the maximum production constraint and the demand constraint
+    capacity_constraint = max_production(
+        demand_, assets, search_space, market, technologies, year
+    )
+    demand_constraint = demand(
+        demand_, assets, search_space, market, technologies, year
+    )
+
+    # We need to find the most demanding timeslice and use as the demand constraint
+    b = demand_constraint.b.max("timeslice")
+
+    # Now we need to find the maximum capacity constraint (as the capacity here is
+    # negative)
+    capacity = capacity_constraint.capacity.max("timeslice")
+
+    return xr.Dataset(
+        dict(capacity=capacity, production=0, b=b),
+        attrs=dict(kind=ConstraintKind.UPPER_BOUND),
+    )
+
+
 @register_constraints
 def minimum_service(
     demand: xr.DataArray,

From 509f2894c8f42e2dda0b5c3332afb2c35e6a3f91 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 14 Jun 2024 14:10:43 +0100
Subject: [PATCH 231/419] Update tables

---
 .../technodata/power/Technodata.csv           |  4 +-
 .../3-add-region/generate_models.py           |  1 -
 .../technodata/power/Technodata.csv           |  4 +-
 .../technodata/power/Technodata.csv           | 24 +++----
 .../technodata/power/Technodata.csv           | 24 +++----
 docs/user-guide/add-region.ipynb              | 16 ++---
 docs/user-guide/addition-service-demand.ipynb | 69 +++++++------------
 .../min-max-timeslice-constraints.ipynb       |  2 +-
 docs/user-guide/modify-timing-data.ipynb      | 16 +++--
 9 files changed, 69 insertions(+), 91 deletions(-)

diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
index 3393c128..2e9d72c0 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
@@ -8,7 +8,7 @@ solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,
 solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
 gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 solarPV,R2,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
 solarPV,R2,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index f584cee5..13569688 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -29,7 +29,6 @@ def generate_model_1():
     df = pd.read_csv(technodata_file)
     mask = (df["RegionName"] == "R2") & (df["ProcessName"] == "windturbine")
     df.loc[mask, "MaxCapacityAddition"] = 5
-    df.loc[mask, "MaxCapacityGrowth"] = 0.5
     df.loc[mask, "TotalCapacityLimit"] = 100
     df.to_csv(technodata_file, index=False)
 
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
index 1a532f16..719ba660 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
@@ -8,7 +8,7 @@ solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,
 solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
 gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 solarPV,R2,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
 solarPV,R2,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index 5d8504bc..06fe0069 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
index ea61a7fd..dd788335 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2.0,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,1.0,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2.0,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index e5a5804f..243cc7eb 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -65,13 +65,13 @@
     "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gasCCGT|R1|2020|…|2|0.2|60|…|1|\n",
-    "|windturbine|R1|2020|…|2|0.2|60|…|1|\n",
-    "|solarPV|R1|2020|…|2|0.2|60|…|1|\n",
-    "|gasCCGT|R2|2020|…|2|0.2|60|…|1|\n",
-    "|windturbine|R2|2020|…|**5**|**0.5**|**100**|…|1|\n",
-    "|windturbine|R2|2040|…|**5**|**0.5**|**100**|…|1|\n",
-    "|solarPV|R2|2020|…|2|0.2|60|…|1|\n",
+    "|gasCCGT|R1|2020|…|2|1|60|…|1|\n",
+    "|windturbine|R1|2020|…|2|1|60|…|1|\n",
+    "|solarPV|R1|2020|…|2|1|60|…|1|\n",
+    "|gasCCGT|R2|2020|…|2|1|60|…|1|\n",
+    "|windturbine|R2|2020|…|**5**|1|**100**|…|1|\n",
+    "|windturbine|R2|2040|…|**5**|1|**100**|…|1|\n",
+    "|solarPV|R2|2020|…|2|1|60|…|1|\n",
     "|...|...|...|...|...|...|...|...|...|\n",
     "\n",
     "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. All of the edited input files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
@@ -165,7 +165,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/addition-service-demand.ipynb
index c861c6ec..8db8d149 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/addition-service-demand.ipynb
@@ -43,45 +43,22 @@
    "source": [
     "|RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|solar|**cook**|\n",
     "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|R1|gasboiler|1|0|0|0.714|0|0|0|**0.714**|\n",
-    "|R1|gasboiler|2|0|0|1.071|0|0|0|**1.071**|\n",
-    "|R1|gasboiler|3|0|0|0.714|0|0|0|**0.714**|\n",
-    "|R1|gasboiler|4|0|0|1.071|0|0|0|**1.071**|\n",
-    "|R1|gasboiler|5|0|0|2.143|0|0|0|**2.143**|\n",
-    "|R1|gasboiler|6|0|0|1.429|0|0|0|**1.429**|\n",
-    "|R1|gasboiler|7|0|0|1.429|0|0|0|**1.429**|\n",
-    "|R1|gasboiler|8|0|0|1.429|0|0|0|**1.429**|\n",
-    "|R2|gasboiler|1|0|0|0.714|0|0|0|**0.714**|\n",
-    "|R2|gasboiler|2|0|0|1.071|0|0|0|**1.071**|\n",
-    "|R2|gasboiler|3|0|0|0.714|0|0|0|**0.714**|\n",
-    "|R2|gasboiler|4|0|0|1.071|0|0|0|**1.071**|\n",
-    "|R2|gasboiler|5|0|0|2.143|0|0|0|**2.143**|\n",
-    "|R2|gasboiler|6|0|0|1.429|0|0|0|**1.429**|\n",
-    "|R2|gasboiler|7|0|0|1.429|0|0|0|**1.429**|\n",
-    "|R2|gasboiler|8|0|0|1.429|0|0|0|**1.429**|\n",
-    "\n",
-    "\n",
-    "<!-- ||RegionName|ProcessName|Timeslice|electricity|gas|heat|CO2f|wind|**cook**|\n",
-    "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|0|R1|gasboiler|1|0|0|1|0|0|**0**|\n",
-    "|...|...|...|...|...|...|...|...|...|**...**|\n",
-    "|15|R2|gasboiler|8|0|0|2|0|0|**0**|\n",
-    "|**16**|**R1**|**electric_stove**|**1**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**17**|**R1**|**electric_stove**|**2**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**18**|**R1**|**electric_stove**|**3**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**19**|**R1**|**electric_stove**|**4**|**0**|**0**|**0**|**0**|**0**|**1.5**|\n",
-    "|**20**|**R1**|**electric_stove**|**5**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**21**|**R1**|**electric_stove**|**6**|**0**|**0**|**0**|**0**|**0**|**3**|\n",
-    "|**22**|**R1**|**electric_stove**|**7**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**23**|**R1**|**electric_stove**|**8**|**0**|**0**|**0**|**0**|**0**|**3**|\n",
-    "|**24**|**R2**|**electric_stove**|**1**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**25**|**R2**|**electric_stove**|**2**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**26**|**R2**|**electric_stove**|**3**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
-    "|**27**|**R2**|**electric_stove**|**4**|**0**|**0**|**0**|**0**|**0**|**1.5**|\n",
-    "|**28**|**R2**|**electric_stove**|**5**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**29**|**R2**|**electric_stove**|**6**|**0**|**0**|**0**|**0**|**0**|**2**|\n",
-    "|**30**|**R2**|**electric_stove**|**7**|**0**|**0**|**0**|**0**|**0**|**2.5**|\n",
-    "|**31**|**R2**|**electric_stove**|**8**|**0**|**0**|**0**|**0**|**0**|**2**| -->\n"
+    "|R1|gasboiler|1|0|0|0.7|0|0|0|**0.7**|\n",
+    "|R1|gasboiler|2|0|0|1.0|0|0|0|**1.0**|\n",
+    "|R1|gasboiler|3|0|0|0.7|0|0|0|**0.7**|\n",
+    "|R1|gasboiler|4|0|0|1.0|0|0|0|**1.0**|\n",
+    "|R1|gasboiler|5|0|0|2.1|0|0|0|**2.1**|\n",
+    "|R1|gasboiler|6|0|0|1.4|0|0|0|**1.4**|\n",
+    "|R1|gasboiler|7|0|0|1.4|0|0|0|**1.4**|\n",
+    "|R1|gasboiler|8|0|0|1.4|0|0|0|**1.4**|\n",
+    "|R2|gasboiler|1|0|0|0.7|0|0|0|**0.7**|\n",
+    "|R2|gasboiler|2|0|0|1.0|0|0|0|**1.0**|\n",
+    "|R2|gasboiler|3|0|0|0.7|0|0|0|**0.7**|\n",
+    "|R2|gasboiler|4|0|0|1.0|0|0|0|**1.0**|\n",
+    "|R2|gasboiler|5|0|0|2.1|0|0|0|**2.1**|\n",
+    "|R2|gasboiler|6|0|0|1.4|0|0|0|**1.4**|\n",
+    "|R2|gasboiler|7|0|0|1.4|0|0|0|**1.4**|\n",
+    "|R2|gasboiler|8|0|0|1.4|0|0|0|**1.4**|\n"
    ]
   },
   {
@@ -206,12 +183,12 @@
     "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gasCCGT|R1|…|**4**|**0.4**|**120**|…|1|\n",
-    "|windturbine|R1|…|**4**|**0.4**|**120**|…|1|\n",
-    "|solarPV|R1|…|**4**|**0.4**|**120**|…|1|\n",
-    "|gasCCGT|R2|…|**4**|**0.4**|**120**|…|1|\n",
-    "|windturbine|R2|…|**10**|**0.4**|**200**|…|1|\n",
-    "|solarPV|R2|…|**4**|**0.4**|**120**|…|1|\n",
+    "|gasCCGT|R1|…|**4**|**2**|**120**|…|1|\n",
+    "|windturbine|R1|…|**4**|**2**|**120**|…|1|\n",
+    "|solarPV|R1|…|**4**|**2**|**120**|…|1|\n",
+    "|gasCCGT|R2|…|**4**|**2**|**120**|…|1|\n",
+    "|windturbine|R2|…|**10**|**2**|**200**|…|1|\n",
+    "|solarPV|R2|…|**4**|**2**|**120**|…|1|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
     "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). "
@@ -311,7 +288,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 8be9ea97..e2e24f46 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -228,7 +228,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 9715d11c..384697e3 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -25,6 +25,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+    "This tutorial will build directly on the model from the previous tutorial.\n",
+    "\n",
     "Timeslicing is the division of a single benchmark year into multiple different sections. For example, we could slice the benchmark year into different seasons, make a distinction between weekday and weekend or a distinction between morning and night. We do this as energy demand profiles can show a difference between these timeslices. eg. Electricity consumption is lower during the night than during the day.\n",
     "\n",
     "To achieve this, we have to modify the ```settings.toml``` file, as well as the files within the preset folder: ```Residential2020Consumption.csv``` and ```Residential2050Consumption.csv```. This is so that we can edit the demand for the residential sector for the new timeslices.\n",
@@ -183,12 +185,12 @@
     "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
     "|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gasCCGT|R1|…|**4**|**0.4**|**120**|…|1|\n",
-    "|windturbine|R1|…|**4**|**0.4**|**120**|…|1|\n",
-    "|solarPV|R1|…|**4**|**0.4**|**120**|…|1|\n",
-    "|gasCCGT|R2|…|**4**|**0.4**|**120**|…|1|\n",
-    "|windturbine|R2|…|**10**|**0.4**|**200**|…|1|\n",
-    "|solarPV|R2|…|**4**|**0.4**|**120**|…|1|\n",
+    "|gasCCGT|R1|…|**4**|**2**|**120**|…|1|\n",
+    "|windturbine|R1|…|**4**|**2**|**120**|…|1|\n",
+    "|solarPV|R1|…|**4**|**2**|**120**|…|1|\n",
+    "|gasCCGT|R2|…|**4**|**2**|**120**|…|1|\n",
+    "|windturbine|R2|…|**10**|**2**|**200**|…|1|\n",
+    "|solarPV|R2|…|**4**|**2**|**120**|…|1|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
     "We also modify the constraints defined in the `Technodata.csv` file for the residential sector (doubling `MaxCapacityAddition` and `TotalCapacityLimit`, and tripling  `MaxCapacityGrowth`), as shown below:\n",
@@ -276,7 +278,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

From 652621bb4501c2cb99ae118fae4a55281906a1e5 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 14 Jun 2024 14:12:45 +0100
Subject: [PATCH 232/419] Narrow plots to fit on page

---
 docs/running-muse-example.ipynb                  | 4 ++--
 docs/user-guide/add-gdp-correlation-demand.ipynb | 4 ++--
 docs/user-guide/add-solar.ipynb                  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index 5e1e1a2f..a510e148 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -204,7 +204,7 @@
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
-    "fig.set_size_inches(9, 2.5)\n",
+    "fig.set_size_inches(8, 2.5)\n",
     "fig.subplots_adjust(wspace=0.5)"
    ]
   },
@@ -243,7 +243,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 3fc86d9d..15798edd 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -153,7 +153,7 @@
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
-    "fig.set_size_inches(9, 2.5)\n",
+    "fig.set_size_inches(8, 2.5)\n",
     "fig.subplots_adjust(wspace=0.5)"
    ]
   },
@@ -190,7 +190,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 21699178..a2f515ed 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -356,7 +356,7 @@
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
-    "fig.set_size_inches(9, 2.5)\n",
+    "fig.set_size_inches(8, 2.5)\n",
     "fig.subplots_adjust(wspace=0.5)"
    ]
   },
@@ -455,7 +455,7 @@
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
-    "fig.set_size_inches(9, 2.5)\n",
+    "fig.set_size_inches(8, 2.5)\n",
     "fig.subplots_adjust(wspace=0.5)"
    ]
   },
@@ -506,7 +506,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

From c4861f4067deed0d2499d19412bcacce4005baf8 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 18 Jun 2024 12:25:58 +0100
Subject: [PATCH 233/419] Pin numpy to <2.0

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9023d306..c1b5d5f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
 ]
 dependencies = [
-    "numpy",
+    "numpy<2.0",
     "scipy",
     "pandas",
     "xarray",

From feff995e8c413b215317f2794a8a0838f491710a Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 18 Jun 2024 13:28:16 +0100
Subject: [PATCH 234/419] Apply suggested changes from Alex

---
 docs/advanced-guide/extending-muse.ipynb      |  2 +-
 docs/running-muse-example.ipynb               |  2 +-
 docs/user-guide/add-agent.ipynb               | 14 +++---
 .../add-gdp-correlation-demand.ipynb          | 12 ++---
 docs/user-guide/add-region.ipynb              | 16 +++----
 docs/user-guide/add-solar.ipynb               | 16 ++++---
 ....ipynb => additional-service-demand.ipynb} |  8 ++--
 docs/user-guide/index.rst                     |  2 +-
 .../min-max-timeslice-constraints.ipynb       | 20 ++++----
 docs/user-guide/modify-timing-data.ipynb      | 48 ++++++++++---------
 10 files changed, 73 insertions(+), 67 deletions(-)
 rename docs/user-guide/{addition-service-demand.ipynb => additional-service-demand.ipynb} (98%)

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 237e7898..897745af 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -669,7 +669,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index a510e148..2615eae1 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -200,7 +200,7 @@
     "    )\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
-    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 56a38884..89ad3598 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -61,7 +61,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will now save this file and run the new simulation model using the following command-line prompt:\n",
+    "We will now save this file and run the new simulation model using the following command:\n",
     "\n",
     "    python -m muse settings.toml\n",
     "\n",
@@ -120,7 +120,7 @@
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n",
     "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
@@ -155,7 +155,7 @@
     "\n",
     "We will then re-run the simulation. You may find that the simulation fails to complete due to insufficient capacity limits in the `residential` sector. In this case, try doubling `MaxCapacityGrowth` for `gasboiler` and `heatpump` in the `technodata/residential/Technodata.csv` file to 0.04 and running the simulation again.\n",
     "\n",
-    "Once the model has run to completion, we can visualise the results like before:"
+    "Once the model has run to completion, we can visualise the results as before:"
    ]
   },
   {
@@ -180,7 +180,7 @@
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n",
     "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
@@ -188,9 +188,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this scenario we can see two divergent strategies. Both agents invests heavily in `windturbine` early on, and relatively little in `gasCCGT`. The share of `solarPV` increases in later years as the price falls (as set in the previous tutorial), but this increase is more dramatic for agent `A2`.\n",
+    "In this scenario we can see two divergent strategies. Both agents invest heavily in `windturbine` early on, and relatively little in `gasCCGT`. The share of `solarPV` increases in later years as the price falls (as set in the previous tutorial), but this increase is more dramatic for agent `A2`.\n",
     "\n",
-    "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation based models.\n",
+    "From this small scenario, the difference between investment strategies between agents is evident. This is one of the key benefits of agent-based models when compared to optimisation-based models.\n",
     "\n",
     "Have a play around with the files to see if you can come up with different scenarios!"
    ]
@@ -231,7 +231,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index 15798edd..bf6b2583 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -30,15 +30,13 @@
    "source": [
     "For this work, we will use the `default` example from the MUSE repository, and will not build on the previous examples. This is done to simplify the model at this point.\n",
     "\n",
-    "To get the default model and be able to edit the files use:\n",
+    "You can copy the files for the default model in order to edit them like so:\n",
     "\n",
     "```bash\n",
     "python -m muse --model default --copy PATH/TO/COPY/THE/MODEL/TO\n",
     "```\n",
     "\n",
-    "Similarly to before, we must amend the `technodata/preset` folder for this. However, we no longer require the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files. These files set the exogenous service demand for the residential sector.\n",
-    "\n",
-    "We must replace these files, with the following files:\n",
+    "Similarly to before, we must amend the `technodata/preset` folder for this. As we are no longer explicitly specifying demand, we can delete the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files. Instead, we must replace these files with the following:\n",
     "\n",
     "- A macrodrivers file. This contains the drivers of the service demand that we want to model. For this example, these will include GDP based on purchasing power parity (GDP PPP) and the population that we expect from 2010 to 2110.\n",
     "\n",
@@ -76,7 +74,7 @@
     "\n",
     "In the second bottom section of the toml file, you will see the following section: \n",
     "\n",
-    "```\n",
+    "```toml\n",
     "[sectors.residential_presets]\n",
     "type = 'presets'\n",
     "priority = 0\n",
@@ -85,7 +83,7 @@
     "\n",
     "This enables us to run the model in exogenous mode, but now we would like to run the model from the files previously mentioned. This can be done by linking new variables to the new files, as follows:\n",
     "\n",
-    "```\n",
+    "```toml\n",
     "[sectors.residential_presets]\n",
     "type = 'presets'\n",
     "priority = 0\n",
@@ -149,7 +147,7 @@
     "    )\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
-    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 243cc7eb..f9e3025f 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -13,13 +13,13 @@
    "source": [
     "The next step is to add a region which we will call `R2`, however, this could equally be called `USA` or `India`. This requires us to undertake a similar process as before of modifying the input simulation data.\n",
     "\n",
-    "<!-- These regions do not have any energy trade.  -->\n",
-    "\n",
     "This tutorial will follow on from the model in tutorial 1 (including the price change in 2040, but before adding the second agent in tutorial 2). To begin, copy your files from tutorial 1 to a new location.\n",
     "\n",
     "To add a new region, we begin by modifying the ```settings.toml``` file. We just have to add our new region to the ```regions``` variable, in the 4th line of the file, like so:\n",
     "\n",
-    "    regions = [\"R1\", \"R2\"]\n",
+    "```toml\n",
+    "regions = [\"R1\", \"R2\"]\n",
+    "```\n",
     "\n",
     "The process to change the input files, however, takes a bit more time. To achieve this, there must be data for each of the sectors for the new region. This, therefore, requires the modification of every [input file](../inputs/index.rst).\n",
     "\n",
@@ -32,8 +32,6 @@
    "source": [
     "Effectively, for this example, we will copy and paste the results for each of the input files from region `R1`, and change the name of the region for the new rows to `R2`. \n",
     "\n",
-    "<!-- However, as we are increasing the demand by adding a region, as well as modifying the costs of technologies, it may be the case that a higher growth in technology is required. For example, there may be no possible solution to meet demand without increasing the ```windturbine``` maximum allowed limit. We will therefore increase the allowed limits for ```windturbine``` in region `R2`. -->\n",
-    "\n",
     "We have placed two examples as to how to edit the residential sector below. Again, the edited data are highlighted in **bold**, with the original data in normal text. \n",
     "\n",
     "For the sake of brevity, we have omitted the entries for 2040 for the `CommIn.csv` file, however, just make sure to copy and paste the values for 2020 to 2040 here. The full file can be seen [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv). \n",
@@ -58,7 +56,7 @@
     "|**gasboiler**|**R2**|**PJ/y**|**10**|**5**|**0**|**0**|**0**|**0**|**0**|\n",
     "|**heatpump**|**R2**|**PJ/y**|**0**|**0**|**0**|**0**|**0**|**0**|**0**|\n",
     "\n",
-    "We will follow a similar process in the ```/technodata/power/Technodata.csv``` file, copying the lines from `R1` to create `R2`. In this tutorial we will test the scenario where `windturbine` in `R2` has increase capacity limits compared to `R1`, which is highlighted below in bold. The rest of the elements are the same for `R1` as they are for `R2`.\n",
+    "We will follow a similar process in the ```/technodata/power/Technodata.csv``` file, copying the lines from `R1` to create `R2`. In this tutorial we will test the scenario where `windturbine` in `R2` has increased capacity limits compared to `R1`, which is highlighted below in bold. The rest of the elements are the same for `R1` as they are for `R2`.\n",
     "\n",
     "Again, we don't show the entries for 2040, apart from the edited windturbine row, for the sake of brevity.\n",
     "\n",
@@ -74,7 +72,9 @@
     "|solarPV|R2|2020|…|2|1|60|…|1|\n",
     "|...|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. All of the edited input files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
+    "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. You must also modify the `BaseYearExport.csv`, `BaseYearImport.csv` and `Projections.csv` files in the `input` folder in a similar way. In this example we won't include any trade between regions, so all values in `BaseYearExport.csv` and `BaseYearImport.csv` should be left as zero.\n",
+    "\n",
+    "All of the edited input files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
    ]
   },
   {
@@ -117,7 +117,7 @@
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n",
     "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index a2f515ed..36be5962 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -265,8 +265,10 @@
    "metadata": {},
    "source": [
     "Finally, we must make a small change to the `settings.toml` file. As `solar` is a renewable resource that isn't produced by any process defined in the model, we must add it to `excluded_commodities` in `settings.toml`, like so:\n",
-    "    \n",
-    "    excluded_commodities = [\"wind\", \"solar\"]\n",
+    "\n",
+    "```toml    \n",
+    "excluded_commodities = [\"wind\", \"solar\"]\n",
+    "```\n",
     "\n",
     "This will ensure MUSE excludes `solar` from its internal supply-fulfillment checks."
    ]
@@ -335,7 +337,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We will then visualise the results:"
+    "We will now visualise the results:"
    ]
   },
   {
@@ -352,7 +354,7 @@
     "    )\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
-    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
@@ -364,9 +366,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We can now see that there is solarPV in the power sector in addition to windturbine and gasCCGT, when compared to the example [here](../running-muse-example.ipynb)! That's great and means it worked! \n",
+    "We can now see that there is `solarPV` in the power sector in addition to `windturbine` and `gasCCGT`, when compared to the example [here](../running-muse-example.ipynb)! That's great and means it worked! \n",
     "\n",
-    "The difference in uptake of `solarPV` compared to `windturbine` is due to the fact that ```solarPV``` has a lower ```cap_par``` cost of 30, compared to the ```windturbine```. Meaning that ```solarPV``` outcompetes both ```windturbine``` and ```gasCCGT``` in the electricity market."
+    "The difference in uptake of `solarPV` compared to `windturbine` is due to the fact that `solarPV` has a lower `cap_par` cost of 30, compared to the `windturbine`. Meaning that `solarPV` outcompetes both `windturbine` and `gasCCGT` in the electricity market."
    ]
   },
   {
@@ -451,7 +453,7 @@
     "    )\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
-    "    ax.set_title(\"{} Sector:\".format(sector_name.capitalize()), fontsize=10)\n",
+    "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
     "    ax.legend(title=None, prop={\"size\": 8})\n",
     "    ax.tick_params(axis=\"both\", labelsize=8)\n",
     "\n",
diff --git a/docs/user-guide/addition-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb
similarity index 98%
rename from docs/user-guide/addition-service-demand.ipynb
rename to docs/user-guide/additional-service-demand.ipynb
index 8db8d149..3a0c1a0c 100644
--- a/docs/user-guide/addition-service-demand.ipynb
+++ b/docs/user-guide/additional-service-demand.ipynb
@@ -28,7 +28,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The model in this tutorial will build directly on the model from the previous tutorial (with the additional timeslices, but before modifying the time horizon)\n",
+    "The model in this tutorial will build directly on the model from the previous tutorial (with the additional timeslices, but before modifying the time horizon).\n",
     "\n",
     "Firstly, we must add the demand section. In this example, we will add a cooking preset demand. To achieve this, we will now edit the `Residential2020Consumption.csv` and `Residential2050Consumption.csv` files, found within the `technodata/preset/` directory.\n",
     "\n",
@@ -67,7 +67,7 @@
    "source": [
     "As can be seen, we only need to add a `cook` column in the file, as well as the demand level for each timeslice and each region. This can be seen through the addition of a positive number in the `cook` column.\n",
     "\n",
-    "The process is very similar for the `Residential2050Consumption.csv` file, again copying the values over from the `heat` column. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
+    "The process is very similar for the `Residential2050Consumption.csv` file: again we copy the values over from the `heat` column. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
    ]
   },
   {
@@ -146,7 +146,7 @@
     "\n",
     "For this example, we will add two competing technologies to service the cooking demand: `electric_stove` and `gas_stove` to the `Technodata.csv` file in `/technodata/residential/Technodata.csv`.\n",
     "\n",
-    "Again for the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `heatpump` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `gasboiler` from region `R1` for both `R1` and `R2`. \n",
+    "Again, in the interests of space, we have omitted the existing `gasboiler` and `heatpump` technologies. But we copy the `heatpump` row for `R1` and paste it for the new `electric_stove` for both `R1` and `R2`. For `gas_stove` we copy and paste the data for `gasboiler` from region `R1` for both `R1` and `R2`. \n",
     "\n",
     "An important modification, however, is specifying the end-use for these new technologies to be `cook` and not `heat`.\n",
     "\n",
@@ -246,7 +246,7 @@
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n",
     "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst
index d4d14de4..7dc6f125 100644
--- a/docs/user-guide/index.rst
+++ b/docs/user-guide/index.rst
@@ -16,7 +16,7 @@ We recommend following the tutorials step by step, as the files build on the pre
    add-agent
    add-region
    modify-timing-data
-   addition-service-demand
+   additional-service-demand
    add-gdp-correlation-demand
    min-max-timeslice-constraints
 
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index e2e24f46..6bd38654 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -24,7 +24,7 @@
     "\n",
     "In this tutorial we will be amending the `default_timeslice` example.\n",
     "\n",
-    "To get this model and be able to edit the files use:\n",
+    "Copy this model so you can edit the files:\n",
     "\n",
     "```bash\n",
     "python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n",
@@ -60,14 +60,16 @@
    "source": [
     "Looking at `settings.toml` file, you should see that the file has already been linked to the appropriate sector:\n",
     "\n",
-    "    [sectors.power]\n",
-    "    type = 'default'\n",
-    "    priority = 2\n",
-    "    dispatch_production = 'costed'\n",
-    "    technodata = '{path}/technodata/power/Technodata.csv'\n",
-    "    commodities_in = '{path}/technodata/power/CommIn.csv'\n",
-    "    commodities_out = '{path}/technodata/power/CommOut.csv'\n",
-    "    technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'\n",
+    "```toml\n",
+    "[sectors.power]\n",
+    "type = 'default'\n",
+    "priority = 2\n",
+    "dispatch_production = 'costed'\n",
+    "technodata = '{path}/technodata/power/Technodata.csv'\n",
+    "commodities_in = '{path}/technodata/power/CommIn.csv'\n",
+    "commodities_out = '{path}/technodata/power/CommOut.csv'\n",
+    "technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'\n",
+    "```\n",
     "    \n",
     "Notice the `technodata_timeslices` path in the bottom row of the code above."
    ]
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 384697e3..0d232111 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -35,15 +35,17 @@
     "\n",
     "An example of the changes is shown below:\n",
     "\n",
-    "    [timeslices.all-year.all-week]\n",
-    "    all-year.all-week.night = 1095\n",
-    "    all-year.all-week.morning = 1095\n",
-    "    all-year.all-week.mid-afternoon = 1095\n",
-    "    all-year.all-week.early-peak = 1095\n",
-    "    all-year.all-week.late-peak = 1095\n",
-    "    all-year.all-week.evening = 1095\n",
-    "    all-year.all-week.early-morning = 1095\n",
-    "    all-year.all-week.late-afternoon = 1095\n",
+    "```toml\n",
+    "[timeslices.all-year.all-week]\n",
+    "all-year.all-week.night = 1095\n",
+    "all-year.all-week.morning = 1095\n",
+    "all-year.all-week.mid-afternoon = 1095\n",
+    "all-year.all-week.early-peak = 1095\n",
+    "all-year.all-week.late-peak = 1095\n",
+    "all-year.all-week.evening = 1095\n",
+    "all-year.all-week.early-morning = 1095\n",
+    "all-year.all-week.late-afternoon = 1095\n",
+    "```\n",
     "    \n",
     "The number of timeslices within this should add up to 8760; the number of hours in a benchmark year. Whilst this is required, MUSE does not check and enforce this.\n",
     "    \n",
@@ -72,9 +74,7 @@
     "\n",
     "The `ProcessName` must be reported, but it is not binding on the results. It is just the way that the model reads the input data.\n",
     "\n",
-    "We do the same for the ```Residential2050Consumption.csv```, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file.\n",
-    " \n",
-    "<!-- As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service the demand for heat. Therefore, we relax the constraints for growth in ```windturbine``` in region `R2` in the ```technodata/power/Technodata.csv``` file, as well as the constraints for ```heatpump```, again in region `R2`. For the full power sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-power-technodata), and for the full residential sector ```Technodata.csv``` file click [here INSERT LINK HERE](github-residential-technodata). -->"
+    "We do the same for the ```Residential2050Consumption.csv```, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file."
    ]
   },
   {
@@ -126,7 +126,7 @@
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n",
     "    g.figure.subplots_adjust(top=0.8)"
    ]
   },
@@ -161,9 +161,11 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "    # Global settings - most REQUIRED\n",
-    "    time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]\n",
-    "    foresight = 2   # Has to be a multiple of the minimum separation between the benchmark years "
+    "```toml\n",
+    "# Global settings - most REQUIRED\n",
+    "time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]\n",
+    "foresight = 2   # Has to be a multiple of the minimum separation between the benchmark years \n",
+    "```"
    ]
   },
   {
@@ -174,11 +176,13 @@
     "\n",
     "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.retro_and_new` section should now look as follows:\n",
     "\n",
-    "    [sectors.power.subsectors.retro_and_new]\n",
-    "    agents = '{path}/technodata/Agents.csv'\n",
-    "    existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'\n",
-    "    lpsolver = \"scipy\"\n",
-    "    forecast = 2\n",
+    "```toml\n",
+    "[sectors.power.subsectors.retro_and_new]\n",
+    "agents = '{path}/technodata/Agents.csv'\n",
+    "existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'\n",
+    "lpsolver = \"scipy\"\n",
+    "forecast = 2\n",
+    "```\n",
     "\n",
     "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv``` (we will double `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
     "\n",
@@ -230,7 +234,7 @@
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
-    "    g.figure.suptitle(\"{} Sector:\".format(sector_name.capitalize()))\n",
+    "    g.figure.suptitle(f\"{sector_name.capitalize()} Sector:\")\n",
     "    g.figure.subplots_adjust(top=0.8)\n",
     "    g.set(ylim=(0, None))"
    ]

From cb3bd877e9211d16d274da696c6eaaf1117cbf85 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 18 Jun 2024 15:03:05 +0100
Subject: [PATCH 235/419] Increase rtol

---
 tests/test_fullsim_regression.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_fullsim_regression.py b/tests/test_fullsim_regression.py
index 8e285a5e..ddb9d725 100644
--- a/tests/test_fullsim_regression.py
+++ b/tests/test_fullsim_regression.py
@@ -28,7 +28,7 @@ def test_fullsim_regression(model, tmpdir, compare_dirs):
     compare_dirs(
         tmpdir / "Results",
         Path(__file__).parent / "example_outputs" / model.replace("-", "_"),
-        rtol=1e-5,
+        rtol=1e-4,
         atol=1e-7,
     )
 
@@ -70,6 +70,6 @@ def test_tutorial_regression(tutorial_path, tmpdir, compare_dirs):
     compare_dirs(
         tmpdir / "Results",
         expected,
-        rtol=1e-5,
+        rtol=1e-4,
         atol=1e-7,
     )

From e2479db23c7889a32fa3b428a9f3bcb2477efa8f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 18 Jun 2024 16:51:04 +0100
Subject: [PATCH 236/419] Make agent shares optional in add_agent

---
 src/muse/wizard.py | 48 +++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index e0b1d669..17e328d8 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -135,8 +135,8 @@ def add_agent(
     model_path: Path,
     agent_name: str,
     copy_from: str,
-    agentshare_new: str,
-    agentshare_retrofit: str,
+    agentshare_new: str | None = None,
+    agentshare_retrofit: str | None = None,
 ) -> None:
     """Add a new agent to the model by copying an existing one.
 
@@ -144,32 +144,40 @@ def add_agent(
         model_path: Path to the model folder.
         agent_name: Name of the new agent.
         copy_from: Name of the agent to copy from.
-        agentshare_new: Name of the new agent share for new agent.
-        agentshare_retrofit: Name of the retrofit agent share for new agent.
+        agentshare_new: Name of the 'new' agent share for new agent. If None, the new
+            agent will not have a 'new' share.
+        agentshare_retrofit: Name of the 'retrofit' agent share for new agent. If None,
+            the new agent will not have a 'retrofit' share.
     """
     agents_file = model_path / "technodata/Agents.csv"
     df = pd.read_csv(agents_file)
-    copy_from_new = df.loc[
-        (df["Name"] == copy_from) & (df["Type"] == "New"), "AgentShare"
-    ].values[0]
-    copy_from_retrofit = df.loc[
-        (df["Name"] == copy_from) & (df["Type"] == "Retrofit"), "AgentShare"
-    ].values[0]
-
-    new_rows = df[df["Name"] == copy_from].copy()
-    new_rows["Name"] = agent_name
-    new_rows.loc[new_rows["Type"] == "New", "AgentShare"] = agentshare_new
-    new_rows.loc[new_rows["Type"] == "Retrofit", "AgentShare"] = agentshare_retrofit
-    df = pd.concat([df, new_rows])
+
+    copy_to_shares = {"New": agentshare_new, "Retrofit": agentshare_retrofit}
+    copy_from_shares = {}
+    for share_type in ["New", "Retrofit"]:
+        filtered_df = df.loc[
+            (df["Name"] == copy_from) & (df["Type"] == share_type), "AgentShare"
+        ]
+        copy_from_shares[share_type] = (
+            filtered_df.iat[0] if not filtered_df.empty else None
+        )
+
+        if copy_to_shares[share_type] and copy_from_shares[share_type]:
+            rows = df[
+                (df["Name"] == copy_from)
+                & (df["AgentShare"] == copy_from_shares[share_type])
+            ].copy()
+            rows["Name"] = agent_name
+            rows["AgentShare"] = copy_to_shares[share_type]
+            df = pd.concat([df, rows])
     df.to_csv(agents_file, index=False)
 
     for sector in get_sectors(model_path):
         technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
         df = pd.read_csv(technodata_file)
-        if copy_from_retrofit in df.columns:
-            df[agentshare_retrofit] = df[copy_from_retrofit]
-        if copy_from_new in df.columns:
-            df[agentshare_new] = df[copy_from_new]
+        for share_type in ["New", "Retrofit"]:
+            if copy_to_shares[share_type] and copy_from_shares[share_type]:
+                df[copy_to_shares[share_type]] = df[copy_from_shares[share_type]]
         df.to_csv(technodata_file, index=False)
 
 

From 006a95737774fb7d44600dafc8c7f0649c76b29b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 18 Jun 2024 16:55:55 +0100
Subject: [PATCH 237/419] Modify input files for examples

---
 .../1-introduction/settings.toml              | 22 ++++-----------
 .../1-introduction/technodata/Agents.csv      |  1 -
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-scenario/settings.toml                  | 22 ++++-----------
 .../2-scenario/technodata/Agents.csv          |  1 -
 .../2-scenario/technodata/gas/Technodata.csv  |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../1-single-objective/settings.toml          | 22 ++++-----------
 .../1-single-objective/technodata/Agents.csv  |  4 +--
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-multiple-objective/settings.toml        | 22 ++++-----------
 .../technodata/Agents.csv                     |  4 +--
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-add-agent/generate_models.py            |  7 ++---
 .../3-add-region/1-new-region/settings.toml   | 22 ++++-----------
 .../1-new-region/technodata/Agents.csv        |  2 --
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../1-modify-timeslices/settings.toml         | 22 ++++-----------
 .../1-modify-timeslices/technodata/Agents.csv |  2 --
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../2-modify-time-framework/settings.toml     | 22 ++++-----------
 .../technodata/Agents.csv                     |  2 --
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           | 28 +++++++++----------
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../4-modify-timing-data/generate_models.py   | 10 +++----
 .../1-exogenous-demand/settings.toml          | 22 ++++-----------
 .../1-exogenous-demand/technodata/Agents.csv  |  2 --
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     | 20 ++++++-------
 .../1-correlation/settings.toml               | 22 ++++-----------
 .../1-correlation/technodata/Agents.csv       |  1 -
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../1-min-constraint/settings.toml            | 22 ++++-----------
 .../1-min-constraint/technodata/Agents.csv    |  1 -
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-max-constraint/settings.toml            | 22 ++++-----------
 .../2-max-constraint/technodata/Agents.csv    |  1 -
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 src/muse/data/example/default/settings.toml   | 22 ++++-----------
 .../example/default/technodata/Agents.csv     |  1 -
 .../default/technodata/gas/Technodata.csv     |  4 +--
 .../default/technodata/power/Technodata.csv   |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../example/default_timeslice/settings.toml   | 22 ++++-----------
 .../default_timeslice/technodata/Agents.csv   |  1 -
 .../technodata/gas/Technodata.csv             |  4 +--
 .../technodata/power/Technodata.csv           |  4 +--
 .../technodata/residential/Technodata.csv     |  8 +++---
 67 files changed, 215 insertions(+), 367 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 704d93ac..cee71eb4 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
index 25614cf7..79588000 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
index b1e77966..ef33b20d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
 solarPV,R1,2020,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
index 3ecb1c70..bf9cb952 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 704d93ac..cee71eb4 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
index 25614cf7..79588000 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
index ae7066eb..2a10ca96 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
index aa4eb867..1fb88f44 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 704d93ac..cee71eb4 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
index 13701454..1affc5cd 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
+Agent2,A2,R1,LCOE,,,1,,,True,,,all,singleObj,0.5,-1,inf,New
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
index 05f7c836..1b885848 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
index d54a909f..52b8ad04 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
index e1a43e99..1e504104 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 704d93ac..cee71eb4 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
index dd05673c..d5a5d0db 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,R1,LCOE,,,1.0,,,True,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,New
-Agent4,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,Retrofit
+Agent2,A2,R1,LCOE,EAC,,0.5,0.5,,True,True,,all,weighted_sum,0.5,-1,inf,New
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
index 05f7c836..1b885848 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
index d54a909f..52b8ad04 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
index 382dc9b9..962ff3ab 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.4,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.4,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index b734f63f..2fa029c2 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -26,8 +26,7 @@ def generate_model_1():
         model_path,
         agent_name="A2",
         copy_from="A1",
-        agentshare_new="Agent3",
-        agentshare_retrofit="Agent4",
+        agentshare_new="Agent2",
     )
 
     # Split population between the two agents
@@ -40,8 +39,8 @@ def generate_model_1():
     for sector in get_sectors(model_path):
         technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
         df = pd.read_csv(technodata_file)
+        df.loc[1:, "Agent1"] = 0.5
         df.loc[1:, "Agent2"] = 0.5
-        df.loc[1:, "Agent4"] = 0.5
         df.to_csv(technodata_file, index=False)
 
 
@@ -71,7 +70,7 @@ def generate_model_2():
     # Modify residential sector MaxCapacityGrowth
     technodata_file = model_path / "technodata/residential/Technodata.csv"
     df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityGrowth"] = 0.04
+    df.loc[1:, "MaxCapacityGrowth"] = 0.4
     df.to_csv(technodata_file, index=False)
 
 
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index d12df0db..dc7a348b 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
index 9acb05de..c3dad553 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
index a10e7473..53666a86 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
 gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
index 2e9d72c0..c82ea50a 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
index 889cba24..be0b70be 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index c6b9c6df..f2ae7a99 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
index 29f26c2e..c5f87c36 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
index b368d952..b2e0c38d 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
 gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
index 719ba660..8e151a9b 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
index 02d90fc2..4cf221ad 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index f3b4fe4b..6dfed239 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 2  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 forecast = 2
 
 [[sectors.power.outputs]]
@@ -104,10 +101,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -116,10 +109,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 forecast = 2
 
 [[sectors.gas.outputs]]
@@ -129,10 +123,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
index 29f26c2e..c5f87c36 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
index b368d952..b2e0c38d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
 gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index 06fe0069..afbceda1 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,fixed,40,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,fixed,30,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,15,3,300,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,15,3,300,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,fixed,40,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,fixed,30,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 8ba199f3..6dada431 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index 1c890b73..d7d58db1 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -86,20 +86,18 @@ def generate_model_2():
     for sector in get_sectors(model_path):
         modify_toml(
             settings_file,
-            lambda x: x["sectors"][sector]["subsectors"]["retro_and_new"].update(
-                {"forecast": 2}
-            ),
+            lambda x: x["sectors"][sector]["subsectors"]["all"].update({"forecast": 2}),
         )
 
     # Increase capacity limits in power sector
     technodata_file = model_path / "technodata/power/Technodata.csv"
     df = pd.read_csv(technodata_file)
     df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
-    df.loc[1:, "MaxCapacityAddition"] *= 2
+    df.loc[1:, "MaxCapacityAddition"] *= 3
     df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
-    df.loc[1:, "MaxCapacityGrowth"] *= 2
+    df.loc[1:, "MaxCapacityGrowth"] *= 3
     df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
-    df.loc[1:, "TotalCapacityLimit"] *= 2
+    df.loc[1:, "TotalCapacityLimit"] *= 3
     df.to_csv(technodata_file, index=False)
 
     # Increase capacity limits in residential sector
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index c6b9c6df..f2ae7a99 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
index 9acb05de..c3dad553 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
 Agent1,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R2,LCOE,,,1,,,True,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
index a10e7473..53666a86 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
 gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
index dd788335..430936d7 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
index 53d32926..af78c537 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
@@ -1,10 +1,10 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
-electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
-gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 91dc51e1..4f1952a5 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
index 25614cf7..79588000 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
index 9d767cfa..23c2dc9e 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
index aa4eb867..1fb88f44 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 585d142d..fff47e65 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -52,7 +52,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -63,7 +63,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -81,10 +81,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -94,10 +90,11 @@ technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -113,10 +110,6 @@ overwrite = true
 quantity.name = "supply"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -125,10 +118,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -137,10 +131,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
index 21c1ceea..c1dde43f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
index e87ff661..2e53d9a5 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv
index aa4eb867..1fb88f44 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 585d142d..fff47e65 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -52,7 +52,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -63,7 +63,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -81,10 +81,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -94,10 +90,11 @@ technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -113,10 +110,6 @@ overwrite = true
 quantity.name = "supply"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -125,10 +118,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -137,10 +131,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
index 21c1ceea..c1dde43f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
index e87ff661..2e53d9a5 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv
index aa4eb867..1fb88f44 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index a1d71a62..8070cb3d 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -79,10 +79,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -91,10 +87,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -103,10 +100,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -115,10 +108,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -127,10 +121,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/src/muse/data/example/default/technodata/Agents.csv b/src/muse/data/example/default/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/src/muse/data/example/default/technodata/Agents.csv
+++ b/src/muse/data/example/default/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/src/muse/data/example/default/technodata/gas/Technodata.csv b/src/muse/data/example/default/technodata/gas/Technodata.csv
index 25614cf7..79588000 100644
--- a/src/muse/data/example/default/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/default/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/default/technodata/power/Technodata.csv b/src/muse/data/example/default/technodata/power/Technodata.csv
index 9d767cfa..23c2dc9e 100644
--- a/src/muse/data/example/default/technodata/power/Technodata.csv
+++ b/src/muse/data/example/default/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/default/technodata/residential/Technodata.csv b/src/muse/data/example/default/technodata/residential/Technodata.csv
index aa4eb867..1fb88f44 100644
--- a/src/muse/data/example/default/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/default/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index 585d142d..fff47e65 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -52,7 +52,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -63,7 +63,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
@@ -81,10 +81,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -94,10 +90,11 @@ technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -113,10 +110,6 @@ overwrite = true
 quantity.name = "supply"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -125,10 +118,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -137,10 +131,6 @@ sink = 'csv'
 overwrite = true
 index = false
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/src/muse/data/example/default_timeslice/technodata/Agents.csv b/src/muse/data/example/default_timeslice/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/src/muse/data/example/default_timeslice/technodata/Agents.csv
+++ b/src/muse/data/example/default_timeslice/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
index 21c1ceea..c1dde43f 100644
--- a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
index e87ff661..2e53d9a5 100644
--- a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
 gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
 windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv
index aa4eb867..1fb88f44 100644
--- a/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1

From 1b4a0d5a443cb90d33c93697e5a882f6ffcdab22 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 17:02:46 +0000
Subject: [PATCH 238/419] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.7 → v0.4.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.7...v0.4.9)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8c6c885a..0d4ea329 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.4.9
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]

From 002b0af20511a54e2ebf8312f07752e45aee8baf Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 19 Jun 2024 10:53:44 +0100
Subject: [PATCH 239/419] Fix spelling: operative system => operating system

---
 .github/ISSUE_TEMPLATE/bug_report.md    | 2 +-
 .github/ISSUE_TEMPLATE/usage-support.md | 2 +-
 docs/installation/index.rst             | 4 ++--
 docs/installation/pipx-based.rst        | 6 +++---
 docs/installation/virtual-env-based.rst | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ab0814cf..ac99f365 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,7 +27,7 @@ If applicable, add screenshots to help explain your problem.
 
 Please, complete the following to better understand the system you are using to run MUSE.
 
-- Operative system (eg. Windows 10):
+- Operating system (eg. Windows 10):
 - MUSE version (eg. 1.0.1):
 - Installation method (eg. pipx, pip, development mode):
 - Python version (you can get this running `python --version`):
diff --git a/.github/ISSUE_TEMPLATE/usage-support.md b/.github/ISSUE_TEMPLATE/usage-support.md
index ebf70d5a..d4cc7f7c 100644
--- a/.github/ISSUE_TEMPLATE/usage-support.md
+++ b/.github/ISSUE_TEMPLATE/usage-support.md
@@ -19,7 +19,7 @@ assignees: ''
 
 Please, complete the following to better understand the system you are using to run MUSE.
 
-- Operative system (eg. Windows 10):
+- Operating system (eg. Windows 10):
 - MUSE version (eg. 1.0.1):
 - Installation method (eg. pipx, pip, development mode):
 - Python version (you can get this running `python --version`):
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 0efeb5e0..93436415 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -1,7 +1,7 @@
 Installing MUSE
 ===============
 
-There are several ways of installing MUSE depending on your level of proficiency, your operative system and, specially, what you want to do with it (only using it or also developing it). In this section, you will find appropriate instructions for all of these use cases.
+There are several ways of installing MUSE depending on your level of proficiency, your operating system and, specially, what you want to do with it (only using it or also developing it). In this section, you will find appropriate instructions for all of these use cases.
 
 The following table summarises the different options to help you decide on the best one for you:
 
@@ -20,7 +20,7 @@ The following table summarises the different options to help you decide on the b
 +-----------------------------+--------------------------+------------------------+-------------------------+-----------------------+
 | **Access to source code**   | No                       | No                     | No                      | Yes                   |
 +-----------------------------+--------------------------+------------------------+-------------------------+-----------------------+
-| **Operative system**        | Windows only             | Win, Linux, MacOS      | Win, Linux, MacOS       | Win, Linux, MacOS     |
+| **Operating system**        | Windows only             | Win, Linux, MacOS      | Win, Linux, MacOS       | Win, Linux, MacOS     |
 +-----------------------------+--------------------------+------------------------+-------------------------+-----------------------+
 
 The :ref:`standalone-muse` and :ref:`pipx-based` installation methods should be the preferred ones for most users who just want to use MUSE *as is* or using custom plugins that only need dependencies already used by MUSE (eg. ``pandas``).
diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 902bb5b6..27a63f27 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -35,7 +35,7 @@ In the following sections, we will guide you step by step in configuring your sy
 Launching a terminal
 ~~~~~~~~~~~~~~~~~~~~
 
-All operative systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let's just figure out how to launch it:
+All operating systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let's just figure out how to launch it:
 
 - **Linux**: Depending on the distribution, you might have a shortcut in your tasks bar already or it should be easily found in the menu. Look for ``Console`` or ``Terminal`` to lunch the application.
 - **MacOS**: Press ``Super key + Space`` to open the search box. There, type ``Terminal`` and press ``Enter``.
@@ -103,7 +103,7 @@ There are multiple ways of installing Python, as well as multiple distributions.
 Installing ``pyenv``
 ^^^^^^^^^^^^^^^^^^^^
 
-`pyenv <https://github.com/pyenv/pyenv>`_ (`pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ for Windows) is a tool that lets you install and manage different python versions. It is small, unobtrusive and self-contained, and it is available for the three operative systems. However, you might want to consider a more fully fledged Python distribution like Anaconda, specially if your work involved non-python packages or a lot of data science and machine learning tools. If that is the case, go to the :ref:`virtual-env-based` section.
+`pyenv <https://github.com/pyenv/pyenv>`_ (`pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ for Windows) is a tool that lets you install and manage different python versions. It is small, unobtrusive and self-contained, and it is available for the three operating systems. However, you might want to consider a more fully fledged Python distribution like Anaconda, specially if your work involved non-python packages or a lot of data science and machine learning tools. If that is the case, go to the :ref:`virtual-env-based` section.
 
 To install ``pyenv``, follow these steps:
 
@@ -199,7 +199,7 @@ Installing ``pipx``
 
 Next we need to install ``pipx``, a Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments. We could skip this step and install MUSE directly, but that will risk to have conflicting dependencies in the future if you install any other application, breaking your MUSE installation, and we do not want that to happen.
 
-The installation instructions for ``pipx`` can be found in the `official webpage <https://pypa.github.io/pipx/installation/>`_ specific for the three operative systems. The following instructions, however, should work for the three cases:
+The installation instructions for ``pipx`` can be found in the `official webpage <https://pypa.github.io/pipx/installation/>`_ specific for the three operating systems. The following instructions, however, should work for the three cases:
 
 .. code-block:: bash
 
diff --git a/docs/installation/virtual-env-based.rst b/docs/installation/virtual-env-based.rst
index f30b4f5d..d3a7e3a7 100644
--- a/docs/installation/virtual-env-based.rst
+++ b/docs/installation/virtual-env-based.rst
@@ -8,7 +8,7 @@ If the :ref:`pipx-based` does not work for you, you don't want to use ``pyenv``
 Installing Anaconda Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To install Anaconda, just go to the official `Anaconda webpage <https://www.anaconda.com/>`_ and download and install a version appropriate for your operative system. Do not worry about the Python version as ``conda`` will let you choose that when creating a virtual environment.
+To install Anaconda, just go to the official `Anaconda webpage <https://www.anaconda.com/>`_ and download and install a version appropriate for your operating system. Do not worry about the Python version as ``conda`` will let you choose that when creating a virtual environment.
 
 The installer should guide you step by step on the process of installing Anaconda and configuring your system to use it as your Python installation.
 
@@ -26,7 +26,7 @@ Using ``pipx`` ensures that each application it installs has its own virtual env
 Creating a ``conda`` virtual environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This option is available only if you installed Anaconda Python. Depending on the settings you used when installing Anaconda and your operative system, you might have ``conda`` available in your normal terminal or you might need to use the Anaconda Prompt.
+This option is available only if you installed Anaconda Python. Depending on the settings you used when installing Anaconda and your operating system, you might have ``conda`` available in your normal terminal or you might need to use the Anaconda Prompt.
 
 ``conda`` not only lets you create a virtual environment but also selecting which python version to use within, independently of the version of Anaconda Python installed, which means it can be an alternative to ``pyenv`` if it happens that you already have Anaconda installed in your system.
 

From 8c634cec892d2dad275d436ef20c2192bb4422ee Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 19 Jun 2024 14:58:17 +0100
Subject: [PATCH 240/419] Re-run example models

---
 .../technodata/residential/Technodata.csv     |  12 +-
 .../example/minimum_service/settings.toml     |   8 +-
 .../minimum_service/technodata/Agents.csv     |   1 -
 .../technodata/industry/Technodata.csv        |   4 +-
 .../data/example/multiple_agents/Agents.csv   |   4 +-
 .../residential/Technodata.csv                |   8 +-
 src/muse/examples.py                          |   2 +-
 .../default/Gas/Capacity/2025.csv             |   7 +-
 .../default/Gas/Capacity/2030.csv             |  20 +-
 .../default/Gas/Capacity/2035.csv             |  26 +-
 .../default/Gas/Capacity/2040.csv             |  24 +-
 .../default/Gas/Capacity/2045.csv             |  28 +-
 .../default/Gas/Capacity/2050.csv             |  28 +-
 tests/example_outputs/default/MCACapacity.csv | 113 ++--
 tests/example_outputs/default/MCAPrices.csv   | 120 ++--
 .../default/Power/Capacity/2020.csv           |  30 +-
 .../default/Power/Capacity/2025.csv           |  58 +-
 .../default/Power/Capacity/2030.csv           |  72 ++-
 .../default/Power/Capacity/2035.csv           |  87 +--
 .../default/Power/Capacity/2040.csv           | 103 ++--
 .../default/Power/Capacity/2045.csv           | 130 ++--
 .../default/Power/Capacity/2050.csv           | 140 +++--
 .../default/Residential/Capacity/2020.csv     |  10 +-
 .../default/Residential/Capacity/2025.csv     |  21 +-
 .../default/Residential/Capacity/2030.csv     |  27 +-
 .../default/Residential/Capacity/2035.csv     |  33 +-
 .../default/Residential/Capacity/2040.csv     |  35 +-
 .../default/Residential/Capacity/2045.csv     |  37 +-
 .../default/Residential/Capacity/2050.csv     |  39 +-
 .../default/Residential/Supply/2025.csv       |  48 +-
 .../default/Residential/Supply/2030.csv       |  72 +--
 .../default/Residential/Supply/2035.csv       |  72 +--
 .../default/Residential/Supply/2040.csv       |  72 +--
 .../default/Residential/Supply/2045.csv       |  60 +-
 .../default/Residential/Supply/2050.csv       |  48 +-
 .../default_timeslice/Gas/Capacity/2025.csv   |   1 +
 .../default_timeslice/Gas/Capacity/2030.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2035.csv   |  10 +-
 .../default_timeslice/Gas/Capacity/2040.csv   |  10 +-
 .../default_timeslice/Gas/Capacity/2045.csv   |  10 +-
 .../default_timeslice/Gas/Capacity/2050.csv   |  12 +-
 .../default_timeslice/MCACapacity.csv         |  92 ++-
 .../MCAMetric_Consumption.csv                 | 432 +++++++-------
 .../default_timeslice/MCAMetric_Supply.csv    | 558 ++++++++----------
 .../default_timeslice/MCAPrices.csv           | 120 ++--
 .../default_timeslice/Power/Capacity/2020.csv |  16 +-
 .../default_timeslice/Power/Capacity/2025.csv |  29 +-
 .../default_timeslice/Power/Capacity/2030.csv |  43 +-
 .../default_timeslice/Power/Capacity/2035.csv |  59 +-
 .../default_timeslice/Power/Capacity/2040.csv |  76 +--
 .../default_timeslice/Power/Capacity/2045.csv |  92 +--
 .../default_timeslice/Power/Capacity/2050.csv | 102 ++--
 .../default_timeslice/Power/Supply/2020.csv   |  12 +-
 .../default_timeslice/Power/Supply/2025.csv   |  36 +-
 .../default_timeslice/Power/Supply/2030.csv   |  60 +-
 .../default_timeslice/Power/Supply/2035.csv   |  84 +--
 .../default_timeslice/Power/Supply/2040.csv   | 108 ++--
 .../default_timeslice/Power/Supply/2045.csv   | 120 ++--
 .../default_timeslice/Power/Supply/2050.csv   | 120 ++--
 .../Residential/Capacity/2020.csv             |  10 +-
 .../Residential/Capacity/2025.csv             |  21 +-
 .../Residential/Capacity/2030.csv             |  27 +-
 .../Residential/Capacity/2035.csv             |  33 +-
 .../Residential/Capacity/2040.csv             |  35 +-
 .../Residential/Capacity/2045.csv             |  37 +-
 .../Residential/Capacity/2050.csv             |  39 +-
 .../Residential/Supply/2025.csv               |  48 +-
 .../Residential/Supply/2030.csv               |  72 +--
 .../Residential/Supply/2035.csv               |  72 +--
 .../Residential/Supply/2040.csv               |  72 +--
 .../Residential/Supply/2045.csv               |  60 +-
 .../Residential/Supply/2050.csv               |  48 +-
 .../medium/Gas/Capacity/2020.csv              |  14 +-
 .../medium/Gas/Capacity/2025.csv              |  31 +-
 .../medium/Gas/Capacity/2030.csv              |  30 +-
 .../medium/Gas/Capacity/2035.csv              |  38 +-
 .../medium/Gas/Capacity/2040.csv              |  48 +-
 .../medium/Gas/Capacity/2045.csv              |  54 +-
 .../medium/Gas/Capacity/2050.csv              |  56 +-
 tests/example_outputs/medium/MCACapacity.csv  | 139 +++--
 tests/example_outputs/medium/MCAPrices.csv    | 204 +++----
 .../medium/Power/Capacity/2020.csv            |  16 +-
 .../medium/Power/Capacity/2025.csv            |  29 +-
 .../medium/Power/Capacity/2030.csv            |  43 +-
 .../medium/Power/Capacity/2035.csv            |  59 +-
 .../medium/Power/Capacity/2040.csv            |  76 +--
 .../medium/Power/Capacity/2045.csv            |  92 +--
 .../medium/Power/Capacity/2050.csv            | 102 ++--
 .../medium/Residential/Capacity/2020.csv      |  18 +-
 .../medium/Residential/Capacity/2025.csv      |  40 +-
 .../medium/Residential/Capacity/2030.csv      |  53 +-
 .../medium/Residential/Capacity/2035.csv      |  63 +-
 .../medium/Residential/Capacity/2040.csv      |  69 ++-
 .../medium/Residential/Capacity/2045.csv      |  79 ++-
 .../medium/Residential/Capacity/2050.csv      |  85 ++-
 .../medium/Residential/Supply/2025.csv        |  36 +-
 .../medium/Residential/Supply/2030.csv        | 144 ++---
 .../medium/Residential/Supply/2035.csv        | 132 ++---
 .../medium/Residential/Supply/2040.csv        | 120 ++--
 .../medium/Residential/Supply/2045.csv        | 120 ++--
 .../medium/Residential/Supply/2050.csv        | 120 ++--
 .../Industry/Capacity/2015.csv                |  10 +
 .../Industry/Capacity/2020.csv                |  20 +
 .../Industry/Capacity/2025.csv                |  35 ++
 .../Industry/Capacity/2030.csv                |  55 ++
 .../Industry/Capacity/2035.csv                |  80 +++
 .../Industry/Capacity/2040.csv                | 110 ++++
 .../Industry/Capacity/2045.csv                | 130 ++++
 .../Industry/Capacity/2050.csv                | 150 +++++
 .../minimum_service/MCACapacity.csv           |  68 +--
 .../minimum_service/MCAMetric_Supply.csv      | 408 ++++++-------
 .../multiple_agents/Gas/Capacity/2025.csv     |   7 +-
 .../multiple_agents/Gas/Capacity/2030.csv     |  20 +-
 .../multiple_agents/Gas/Capacity/2035.csv     |  20 +-
 .../multiple_agents/Gas/Capacity/2040.csv     |  18 +-
 .../multiple_agents/Gas/Capacity/2045.csv     |  20 +-
 .../multiple_agents/Gas/Capacity/2050.csv     |  20 +-
 .../multiple_agents/MCACapacity.csv           | 140 +++--
 .../multiple_agents/MCAPrices.csv             | 120 ++--
 .../multiple_agents/Power/Capacity/2020.csv   |  30 +-
 .../multiple_agents/Power/Capacity/2025.csv   |  58 +-
 .../multiple_agents/Power/Capacity/2030.csv   |  72 ++-
 .../multiple_agents/Power/Capacity/2035.csv   |  87 +--
 .../multiple_agents/Power/Capacity/2040.csv   | 103 ++--
 .../multiple_agents/Power/Capacity/2045.csv   | 130 ++--
 .../multiple_agents/Power/Capacity/2050.csv   | 140 +++--
 .../Residential/Capacity/2025.csv             |  19 +-
 .../Residential/Capacity/2030.csv             |  15 +-
 .../Residential/Capacity/2035.csv             |  25 +-
 .../Residential/Capacity/2040.csv             |  35 +-
 .../Residential/Capacity/2045.csv             |  37 +-
 .../Residential/Capacity/2050.csv             |  39 +-
 .../Residential/Supply/2025.csv               |  48 +-
 .../Residential/Supply/2030.csv               |  48 +-
 .../Residential/Supply/2035.csv               |  48 +-
 .../Residential/Supply/2040.csv               |  72 +--
 .../Residential/Supply/2045.csv               |  60 +-
 .../Residential/Supply/2050.csv               |  48 +-
 138 files changed, 4858 insertions(+), 4181 deletions(-)

diff --git a/src/muse/data/example/medium/technodata/residential/Technodata.csv b/src/muse/data/example/medium/technodata/residential/Technodata.csv
index 8070b952..2268e94e 100644
--- a/src/muse/data/example/medium/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/medium/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-estove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+estove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 5a696a3c..4b80cb84 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/industry/Technodata.csv'
 commodities_in = '{path}/technodata/industry/CommIn.csv'
 commodities_out = '{path}/technodata/industry/CommOut.csv'
 
-[sectors.industry.subsectors.retro_and_new]
+[sectors.industry.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/industry/Existing.csv'
 lpsolver = "scipy"
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.industry.outputs]]
@@ -80,10 +80,6 @@ quantity.name = "supply"
 quantity.sum_over = "timeslice"
 quantity.drop = ["comm_usage", "units_prices"]
 
-[[sectors.industry.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.industry_presets]
 type = 'presets'
 priority = 0
diff --git a/src/muse/data/example/minimum_service/technodata/Agents.csv b/src/muse/data/example/minimum_service/technodata/Agents.csv
index 26315bf8..cf90980d 100644
--- a/src/muse/data/example/minimum_service/technodata/Agents.csv
+++ b/src/muse/data/example/minimum_service/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv b/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
index 1822d785..c9ab16a8 100644
--- a/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
+++ b/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent2,Type,Fuel,MinimumServiceFactor,Enduse
-Unit,-,Year,-,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,Retrofit,-,-,-,-
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent1,Type,Fuel,MinimumServiceFactor,Enduse
+Unit,-,Year,-,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,New,-,-,-,-
 procammonia_1,R1,2010,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.01,ammonia
 procammonia_1,R1,2050,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.9,ammonia
 procammonia_2,R1,2010,fixed,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia
diff --git a/src/muse/data/example/multiple_agents/Agents.csv b/src/muse/data/example/multiple_agents/Agents.csv
index a2fc3917..cb3d8174 100644
--- a/src/muse/data/example/multiple_agents/Agents.csv
+++ b/src/muse/data/example/multiple_agents/Agents.csv
@@ -1,5 +1,3 @@
 AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
 Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
-Agent3,A2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
-Agent4,A2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,Retrofit
+Agent2,A2,R1,LCOE,,,1,,,TRUE,,,all,singleObj,0.5,-1,inf,New
diff --git a/src/muse/data/example/multiple_agents/residential/Technodata.csv b/src/muse/data/example/multiple_agents/residential/Technodata.csv
index 9041d072..269dcdf2 100644
--- a/src/muse/data/example/multiple_agents/residential/Technodata.csv
+++ b/src/muse/data/example/multiple_agents/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New,New
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/src/muse/examples.py b/src/muse/examples.py
index 5db4e6c3..9bd3643f 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -313,7 +313,7 @@ def _copy_multiple_agents(path: Path):
     copytree(example_data_dir() / "default" / "input", path / "input")
     copytree(example_data_dir() / "default" / "technodata", path / "technodata")
     toml = load(example_data_dir() / "default" / "settings.toml")
-    toml["sectors"]["residential"]["subsectors"]["retro_and_new"]["agents"] = (
+    toml["sectors"]["residential"]["subsectors"]["all"]["agents"] = (
         "{path}/technodata/residential/Agents.csv"
     )
     with (path / "settings.toml").open("w") as fileobj:
diff --git a/tests/example_outputs/default/Gas/Capacity/2025.csv b/tests/example_outputs/default/Gas/Capacity/2025.csv
index d1fb99f5..d1ee882b 100644
--- a/tests/example_outputs/default/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2025.csv
@@ -1,9 +1,4 @@
 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,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 e84ef6dc..c7ef92d2 100644
--- a/tests/example_outputs/default/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2030.csv
@@ -1,15 +1,9 @@
 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,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
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2035.csv b/tests/example_outputs/default/Gas/Capacity/2035.csv
index ccf34c3d..b101c0bb 100644
--- a/tests/example_outputs/default/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2035.csv
@@ -1,13 +1,15 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
+2,2040,R1,gassupply1,2035,0.16290000000
+2,2045,R1,gassupply1,2035,0.16290000000
+2,2050,R1,gassupply1,2035,0.16290000000
+2,2069,R1,gassupply1,2035,0.16290000000
+2,2070,R1,gassupply1,2035,0.16290000000
+2,2074,R1,gassupply1,2035,0.16290000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2040.csv b/tests/example_outputs/default/Gas/Capacity/2040.csv
index 79fdfddb..b101c0bb 100644
--- a/tests/example_outputs/default/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2040.csv
@@ -1,11 +1,15 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
+2,2040,R1,gassupply1,2035,0.16290000000
+2,2045,R1,gassupply1,2035,0.16290000000
+2,2050,R1,gassupply1,2035,0.16290000000
+2,2069,R1,gassupply1,2035,0.16290000000
+2,2070,R1,gassupply1,2035,0.16290000000
+2,2074,R1,gassupply1,2035,0.16290000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2045.csv b/tests/example_outputs/default/Gas/Capacity/2045.csv
index b2ca194f..efe0a32e 100644
--- a/tests/example_outputs/default/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2045.csv
@@ -1,9 +1,21 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
+2,2040,R1,gassupply1,2035,0.16290000000
+2,2045,R1,gassupply1,2035,0.16290000000
+2,2050,R1,gassupply1,2035,0.16290000000
+2,2069,R1,gassupply1,2035,0.16290000000
+2,2070,R1,gassupply1,2035,0.16290000000
+2,2074,R1,gassupply1,2035,0.16290000000
+3,2050,R1,gassupply1,2045,3.46340000000
+3,2069,R1,gassupply1,2045,3.46340000000
+3,2070,R1,gassupply1,2045,3.46340000000
+3,2074,R1,gassupply1,2045,3.46340000000
+3,2075,R1,gassupply1,2045,3.46340000000
+3,2084,R1,gassupply1,2045,3.46340000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2050.csv b/tests/example_outputs/default/Gas/Capacity/2050.csv
index 4f3e3a18..efe0a32e 100644
--- a/tests/example_outputs/default/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2050.csv
@@ -1,9 +1,21 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
+2,2040,R1,gassupply1,2035,0.16290000000
+2,2045,R1,gassupply1,2035,0.16290000000
+2,2050,R1,gassupply1,2035,0.16290000000
+2,2069,R1,gassupply1,2035,0.16290000000
+2,2070,R1,gassupply1,2035,0.16290000000
+2,2074,R1,gassupply1,2035,0.16290000000
+3,2050,R1,gassupply1,2045,3.46340000000
+3,2069,R1,gassupply1,2045,3.46340000000
+3,2070,R1,gassupply1,2045,3.46340000000
+3,2074,R1,gassupply1,2045,3.46340000000
+3,2075,R1,gassupply1,2045,3.46340000000
+3,2084,R1,gassupply1,2045,3.46340000000
diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv
index f5198d91..8b42c2e7 100644
--- a/tests/example_outputs/default/MCACapacity.csv
+++ b/tests/example_outputs/default/MCACapacity.csv
@@ -1,57 +1,58 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-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
-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
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-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
-windturbine,R1,R1,A1,power,retrofit,2050,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,7.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.68000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.68000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.16290000000
+heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.68000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,0.16290000000
+heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.68000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.16290000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,3.46340000000
diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv
index d72a9e0c..216fdd12 100644
--- a/tests/example_outputs/default/MCAPrices.csv
+++ b/tests/example_outputs/default/MCAPrices.csv
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.40060000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.42450000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.31900000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.58170000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.61760000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.48000000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.40060000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.42450000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.31900000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.58170000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.61760000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.48000000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.12530000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.19710000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.05330000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.96920000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.76290000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.81070000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69860000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.64210000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.66880000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.70880000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.57540000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.88800000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.94800000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.76670000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.66880000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.70880000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.57540000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.88800000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.94800000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.76670000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.54600000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.66620000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.51430000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.35450000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.10730000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,12.18730000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.06810000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.96030000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.46950000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.53550000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.35880000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.71210000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.81110000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.56390000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.46950000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.53550000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.35880000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.71210000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.81110000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.56390000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.44080000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.63920000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.34960000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.20200000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.95490000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,10.08700000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.87300000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.77280000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.71450000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.79980000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.16810000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.97820000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,8.10620000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.37610000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.71450000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.79980000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.16810000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.97820000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.10620000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.37610000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.77020000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.02670000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.17030000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.03140000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.24200000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,8.41280000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.68450000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.58930000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.31290000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,6.49520000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.60170000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.59450000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,6.86820000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,26.80540000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.31290000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,6.49520000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.60170000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.59450000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.86820000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.80540000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.44070000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.98900000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.56120000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.45620000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.87640000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,7.24150000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.08910000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.01560000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default/Power/Capacity/2020.csv b/tests/example_outputs/default/Power/Capacity/2020.csv
index bdc2b6a7..089b2630 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2025,R1,windturbine,2020,10
+1,2030,R1,windturbine,2020,10
+1,2035,R1,windturbine,2020,10
+1,2040,R1,windturbine,2020,10
+1,2045,R1,windturbine,2020,10
+1,2049,R1,windturbine,2020,10
diff --git a/tests/example_outputs/default/Power/Capacity/2025.csv b/tests/example_outputs/default/Power/Capacity/2025.csv
index 55cc9842..3578c2db 100644
--- a/tests/example_outputs/default/Power/Capacity/2025.csv
+++ b/tests/example_outputs/default/Power/Capacity/2025.csv
@@ -1,24 +1,36 @@
 asset,year,region,technology,installed,capacity
-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,2054,R1,gasCCGT,2020,3.00000000000
-0,2055,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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
diff --git a/tests/example_outputs/default/Power/Capacity/2030.csv b/tests/example_outputs/default/Power/Capacity/2030.csv
index a6c53c55..ec5a6f8f 100644
--- a/tests/example_outputs/default/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default/Power/Capacity/2030.csv
@@ -1,30 +1,44 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
+4,2035,R1,windturbine,2030,7
+4,2040,R1,windturbine,2030,7
+4,2045,R1,windturbine,2030,7
+4,2049,R1,windturbine,2030,7
+4,2050,R1,windturbine,2030,7
+4,2054,R1,windturbine,2030,7
+4,2055,R1,windturbine,2030,7
+4,2059,R1,windturbine,2030,7
diff --git a/tests/example_outputs/default/Power/Capacity/2035.csv b/tests/example_outputs/default/Power/Capacity/2035.csv
index 60e997ea..16b99119 100644
--- a/tests/example_outputs/default/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default/Power/Capacity/2035.csv
@@ -1,36 +1,53 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
+4,2035,R1,windturbine,2030,7
+4,2040,R1,windturbine,2030,7
+4,2045,R1,windturbine,2030,7
+4,2049,R1,windturbine,2030,7
+4,2050,R1,windturbine,2030,7
+4,2054,R1,windturbine,2030,7
+4,2055,R1,windturbine,2030,7
+4,2059,R1,windturbine,2030,7
+5,2040,R1,windturbine,2035,5
+5,2045,R1,windturbine,2035,5
+5,2049,R1,windturbine,2035,5
+5,2050,R1,windturbine,2035,5
+5,2054,R1,windturbine,2035,5
+5,2055,R1,windturbine,2035,5
+5,2059,R1,windturbine,2035,5
+5,2060,R1,windturbine,2035,5
+5,2064,R1,windturbine,2035,5
diff --git a/tests/example_outputs/default/Power/Capacity/2040.csv b/tests/example_outputs/default/Power/Capacity/2040.csv
index 1cba828b..5dcc0efe 100644
--- a/tests/example_outputs/default/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default/Power/Capacity/2040.csv
@@ -1,42 +1,63 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
+4,2035,R1,windturbine,2030,7
+4,2040,R1,windturbine,2030,7
+4,2045,R1,windturbine,2030,7
+4,2049,R1,windturbine,2030,7
+4,2050,R1,windturbine,2030,7
+4,2054,R1,windturbine,2030,7
+4,2055,R1,windturbine,2030,7
+4,2059,R1,windturbine,2030,7
+5,2040,R1,windturbine,2035,5
+5,2045,R1,windturbine,2035,5
+5,2049,R1,windturbine,2035,5
+5,2050,R1,windturbine,2035,5
+5,2054,R1,windturbine,2035,5
+5,2055,R1,windturbine,2035,5
+5,2059,R1,windturbine,2035,5
+5,2060,R1,windturbine,2035,5
+5,2064,R1,windturbine,2035,5
+6,2045,R1,windturbine,2040,7
+6,2049,R1,windturbine,2040,7
+6,2050,R1,windturbine,2040,7
+6,2054,R1,windturbine,2040,7
+6,2055,R1,windturbine,2040,7
+6,2059,R1,windturbine,2040,7
+6,2060,R1,windturbine,2040,7
+6,2064,R1,windturbine,2040,7
+6,2065,R1,windturbine,2040,7
+6,2069,R1,windturbine,2040,7
diff --git a/tests/example_outputs/default/Power/Capacity/2045.csv b/tests/example_outputs/default/Power/Capacity/2045.csv
index 69e55cf6..1099e527 100644
--- a/tests/example_outputs/default/Power/Capacity/2045.csv
+++ b/tests/example_outputs/default/Power/Capacity/2045.csv
@@ -1,47 +1,85 @@
 asset,year,region,technology,installed,capacity
-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,2045,R1,windturbine,2020,10.00000000000
-1,2049,R1,windturbine,2020,10.00000000000
-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,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,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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2050,R1,gasCCGT,2045,2
+2,2054,R1,gasCCGT,2045,2
+2,2055,R1,gasCCGT,2045,2
+2,2059,R1,gasCCGT,2045,2
+2,2060,R1,gasCCGT,2045,2
+2,2064,R1,gasCCGT,2045,2
+2,2065,R1,gasCCGT,2045,2
+2,2069,R1,gasCCGT,2045,2
+2,2070,R1,gasCCGT,2045,2
+2,2074,R1,gasCCGT,2045,2
+2,2075,R1,gasCCGT,2045,2
+2,2084,R1,gasCCGT,2045,2
+3,2025,R1,windturbine,2020,10
+3,2030,R1,windturbine,2020,10
+3,2035,R1,windturbine,2020,10
+3,2040,R1,windturbine,2020,10
+3,2045,R1,windturbine,2020,10
+3,2049,R1,windturbine,2020,10
+4,2030,R1,windturbine,2025,10
+4,2035,R1,windturbine,2025,10
+4,2040,R1,windturbine,2025,10
+4,2045,R1,windturbine,2025,10
+4,2049,R1,windturbine,2025,10
+4,2050,R1,windturbine,2025,10
+4,2054,R1,windturbine,2025,10
+5,2035,R1,windturbine,2030,7
+5,2040,R1,windturbine,2030,7
+5,2045,R1,windturbine,2030,7
+5,2049,R1,windturbine,2030,7
+5,2050,R1,windturbine,2030,7
+5,2054,R1,windturbine,2030,7
+5,2055,R1,windturbine,2030,7
+5,2059,R1,windturbine,2030,7
+6,2040,R1,windturbine,2035,5
+6,2045,R1,windturbine,2035,5
+6,2049,R1,windturbine,2035,5
+6,2050,R1,windturbine,2035,5
+6,2054,R1,windturbine,2035,5
+6,2055,R1,windturbine,2035,5
+6,2059,R1,windturbine,2035,5
+6,2060,R1,windturbine,2035,5
+6,2064,R1,windturbine,2035,5
+7,2045,R1,windturbine,2040,7
+7,2049,R1,windturbine,2040,7
+7,2050,R1,windturbine,2040,7
+7,2054,R1,windturbine,2040,7
+7,2055,R1,windturbine,2040,7
+7,2059,R1,windturbine,2040,7
+7,2060,R1,windturbine,2040,7
+7,2064,R1,windturbine,2040,7
+7,2065,R1,windturbine,2040,7
+7,2069,R1,windturbine,2040,7
+8,2050,R1,windturbine,2045,10
+8,2054,R1,windturbine,2045,10
+8,2055,R1,windturbine,2045,10
+8,2059,R1,windturbine,2045,10
+8,2060,R1,windturbine,2045,10
+8,2064,R1,windturbine,2045,10
+8,2065,R1,windturbine,2045,10
+8,2069,R1,windturbine,2045,10
+8,2070,R1,windturbine,2045,10
+8,2074,R1,windturbine,2045,10
diff --git a/tests/example_outputs/default/Power/Capacity/2050.csv b/tests/example_outputs/default/Power/Capacity/2050.csv
index 13bd77c9..c1628364 100644
--- a/tests/example_outputs/default/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default/Power/Capacity/2050.csv
@@ -1,45 +1,97 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2050,R1,gasCCGT,2045,2
+2,2054,R1,gasCCGT,2045,2
+2,2055,R1,gasCCGT,2045,2
+2,2059,R1,gasCCGT,2045,2
+2,2060,R1,gasCCGT,2045,2
+2,2064,R1,gasCCGT,2045,2
+2,2065,R1,gasCCGT,2045,2
+2,2069,R1,gasCCGT,2045,2
+2,2070,R1,gasCCGT,2045,2
+2,2074,R1,gasCCGT,2045,2
+2,2075,R1,gasCCGT,2045,2
+2,2079,R1,gasCCGT,2045,2
+2,2080,R1,gasCCGT,2045,2
+2,2084,R1,gasCCGT,2045,2
+4,2025,R1,windturbine,2020,10
+4,2030,R1,windturbine,2020,10
+4,2035,R1,windturbine,2020,10
+4,2040,R1,windturbine,2020,10
+4,2045,R1,windturbine,2020,10
+4,2049,R1,windturbine,2020,10
+5,2030,R1,windturbine,2025,10
+5,2035,R1,windturbine,2025,10
+5,2040,R1,windturbine,2025,10
+5,2045,R1,windturbine,2025,10
+5,2049,R1,windturbine,2025,10
+5,2050,R1,windturbine,2025,10
+5,2054,R1,windturbine,2025,10
+6,2035,R1,windturbine,2030,7
+6,2040,R1,windturbine,2030,7
+6,2045,R1,windturbine,2030,7
+6,2049,R1,windturbine,2030,7
+6,2050,R1,windturbine,2030,7
+6,2054,R1,windturbine,2030,7
+6,2055,R1,windturbine,2030,7
+6,2059,R1,windturbine,2030,7
+7,2040,R1,windturbine,2035,5
+7,2045,R1,windturbine,2035,5
+7,2049,R1,windturbine,2035,5
+7,2050,R1,windturbine,2035,5
+7,2054,R1,windturbine,2035,5
+7,2055,R1,windturbine,2035,5
+7,2059,R1,windturbine,2035,5
+7,2060,R1,windturbine,2035,5
+7,2064,R1,windturbine,2035,5
+8,2045,R1,windturbine,2040,7
+8,2049,R1,windturbine,2040,7
+8,2050,R1,windturbine,2040,7
+8,2054,R1,windturbine,2040,7
+8,2055,R1,windturbine,2040,7
+8,2059,R1,windturbine,2040,7
+8,2060,R1,windturbine,2040,7
+8,2064,R1,windturbine,2040,7
+8,2065,R1,windturbine,2040,7
+8,2069,R1,windturbine,2040,7
+9,2050,R1,windturbine,2045,10
+9,2054,R1,windturbine,2045,10
+9,2055,R1,windturbine,2045,10
+9,2059,R1,windturbine,2045,10
+9,2060,R1,windturbine,2045,10
+9,2064,R1,windturbine,2045,10
+9,2065,R1,windturbine,2045,10
+9,2069,R1,windturbine,2045,10
+9,2070,R1,windturbine,2045,10
+9,2074,R1,windturbine,2045,10
+10,2055,R1,windturbine,2050,10
+10,2059,R1,windturbine,2050,10
+10,2060,R1,windturbine,2050,10
+10,2064,R1,windturbine,2050,10
+10,2065,R1,windturbine,2050,10
+10,2069,R1,windturbine,2050,10
+10,2070,R1,windturbine,2050,10
+10,2074,R1,windturbine,2050,10
+10,2075,R1,windturbine,2050,10
+10,2079,R1,windturbine,2050,10
diff --git a/tests/example_outputs/default/Residential/Capacity/2020.csv b/tests/example_outputs/default/Residential/Capacity/2020.csv
index bcdf148c..d6edd96c 100644
--- a/tests/example_outputs/default/Residential/Capacity/2020.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
diff --git a/tests/example_outputs/default/Residential/Capacity/2025.csv b/tests/example_outputs/default/Residential/Capacity/2025.csv
index 2eb0ec15..677048ec 100644
--- a/tests/example_outputs/default/Residential/Capacity/2025.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
diff --git a/tests/example_outputs/default/Residential/Capacity/2030.csv b/tests/example_outputs/default/Residential/Capacity/2030.csv
index 22334ba5..95b724d9 100644
--- a/tests/example_outputs/default/Residential/Capacity/2030.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
diff --git a/tests/example_outputs/default/Residential/Capacity/2035.csv b/tests/example_outputs/default/Residential/Capacity/2035.csv
index 452c6c8a..33e9c12a 100644
--- a/tests/example_outputs/default/Residential/Capacity/2035.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
diff --git a/tests/example_outputs/default/Residential/Capacity/2040.csv b/tests/example_outputs/default/Residential/Capacity/2040.csv
index e3ecc1d0..21be0313 100644
--- a/tests/example_outputs/default/Residential/Capacity/2040.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
diff --git a/tests/example_outputs/default/Residential/Capacity/2045.csv b/tests/example_outputs/default/Residential/Capacity/2045.csv
index 82b22d9b..d02c2c7f 100644
--- a/tests/example_outputs/default/Residential/Capacity/2045.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
diff --git a/tests/example_outputs/default/Residential/Capacity/2050.csv b/tests/example_outputs/default/Residential/Capacity/2050.csv
index 42f4be20..8c8e1206 100644
--- a/tests/example_outputs/default/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2050.csv
@@ -1,11 +1,30 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
diff --git a/tests/example_outputs/default/Residential/Supply/2025.csv b/tests/example_outputs/default/Residential/Supply/2025.csv
index bfe116d0..729d406d 100644
--- a/tests/example_outputs/default/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default/Residential/Supply/2025.csv
@@ -1,43 +1,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
 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 82873caa..afe86e12 100644
--- a/tests/example_outputs/default/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default/Residential/Supply/2030.csv
@@ -1,49 +1,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default/Residential/Supply/2035.csv b/tests/example_outputs/default/Residential/Supply/2035.csv
index 741ea3c6..83daf7f1 100644
--- a/tests/example_outputs/default/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default/Residential/Supply/2035.csv
@@ -1,49 +1,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default/Residential/Supply/2040.csv b/tests/example_outputs/default/Residential/Supply/2040.csv
index c802f340..7bda2463 100644
--- a/tests/example_outputs/default/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default/Residential/Supply/2040.csv
@@ -1,49 +1,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default/Residential/Supply/2045.csv b/tests/example_outputs/default/Residential/Supply/2045.csv
index c7be86b2..c535c679 100644
--- a/tests/example_outputs/default/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default/Residential/Supply/2045.csv
@@ -1,37 +1,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default/Residential/Supply/2050.csv b/tests/example_outputs/default/Residential/Supply/2050.csv
index 8c187153..9abfcded 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
index 5faecc71..c62b307b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
@@ -1,4 +1,5 @@
 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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
index 9b16b8ea..c62b307b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
@@ -1,14 +1,9 @@
 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
-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 b9161b88..c62b307b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
@@ -1,13 +1,9 @@
 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
-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 6e2627f0..c62b307b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
@@ -1,11 +1,9 @@
 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
-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 3d611266..c62b307b 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,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
-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 36035897..c62b307b 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,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,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/MCACapacity.csv b/tests/example_outputs/default_timeslice/MCACapacity.csv
index a048f4b8..bfe7b553 100644
--- a/tests/example_outputs/default_timeslice/MCACapacity.csv
+++ b/tests/example_outputs/default_timeslice/MCACapacity.csv
@@ -1,51 +1,43 @@
 agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-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,17.57780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2030
-A1,10.07780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
-A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2035
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
-A1,2.70670000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
-A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
-A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2040
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
-A1,2.70670000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
-A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
-A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
-A1,2.08150000000,R1,4,2040,R1,power,windturbine,retrofit,2045
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
-A1,2.70670000000,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.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
-A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
-A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
-A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
-A1,2.37860000000,R1,4,2045,R1,power,windturbine,retrofit,2050
-A1,2.57780000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
-A1,2.70670000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
+A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
+A1,17.57780000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
+A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
+A1,10.07780000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
+A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
+A1,2.57780000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
+A1,2.57780000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
+A1,2.57780000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
+A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
+A1,2.57780000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
index 69eb3a4f..62e18119 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
@@ -1,229 +1,205 @@
 agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-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
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,13,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,37,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,71,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,28,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,48,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,52,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,R1,108,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,47,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.20000000000,R1,95,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,107,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,115,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,112,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,136,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,35,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,39,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,43,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,63,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,67,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,79,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,83,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,87,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,91,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,127,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,131,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,135,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,139,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,44,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,76,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,100,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,104,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,128,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,132,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,156,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,160,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,47,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,51,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,79,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,91,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,95,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,99,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,103,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,107,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,119,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,147,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,151,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,155,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,159,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,163,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,24,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,56,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,116,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,120,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,148,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,R1,152,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,180,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,R1,184,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,27,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,47,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,51,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,55,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,59,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,119,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,123,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,139,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,143,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,147,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,151,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,155,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,171,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,175,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,179,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,183,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,187,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 0f6d4a88..bab36494 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
@@ -1,325 +1,235 @@
 agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-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
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,heat,R1,6,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,7,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,9,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,21,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,30,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,31,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,33,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,43,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,55,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,57,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,66,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,67,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,69,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.21111111111,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,19.35255555556,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.31666666667,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.31666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,29.02883333333,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.21111111111,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,19.35255555556,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.31666666667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.31666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,29.02883333333,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.63333333333,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.63333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,58.05766666667,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.42222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.27586206897,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.72413793103,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.18390804598,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,1.14942528736,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,17,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,18,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,65,2020.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,12,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,13,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,32,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,33,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,52,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,72,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,92,2025.00000000000,R1,residential,1.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,93,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2025.00000000000,R1,residential,1.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,113,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,21,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,22,2025.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,23,2030.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,41,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,42,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,43,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,62,2025.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2030.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,83,2030.00000000000,R1,power,1.20000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,103,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,15,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,16,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,39,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,63,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,64,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,87,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,111,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,135,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,136,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,26,2025.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,27,2030.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,28,2035.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2030.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,52,2035.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,73,2020.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2030.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,76,2035.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,97,2020.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,122,2025.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2030.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2035.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,46,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,47,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,75,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,102,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,103,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,130,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,131,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,158,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,159,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,29,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,30,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,31,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,32,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,57,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,58,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,59,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,85,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,86,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,87,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,88,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,89,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,113,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,114,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,115,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,116,2035.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,117,2040.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,142,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,143,2030.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,144,2035.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,145,2040.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,21,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,22,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,85,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,86,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,117,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,118,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,149,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,150,2045.00000000000,R1,residential,3.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,181,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,182,2045.00000000000,R1,residential,2.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2045.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,35,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,38,2045.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,68,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,69,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,70,2045.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2045.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,130,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,131,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,132,2035.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,133,2040.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,134,2045.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,162,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2030.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,164,2035.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2040.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,166,2045.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index bc678ebb..8d469cac 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,2.13520000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.13520000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.13520000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.13520000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.13520000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.03880000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.13520000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.23250000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.10950000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.34900000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.16420000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.23250000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10950000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34900000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16420000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.69870000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.32840000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.46550000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.21890000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.18540000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.27860000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18540000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27860000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56000000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.37210000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06650000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.09980000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06650000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09980000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.20010000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13320000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07170000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.10760000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07170000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10760000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21570000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14360000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2050
 "('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2050
 "('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2050
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2050
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2050
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2050
 "('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv
index 69c4d338..1cdc9617 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv
index c6bfdc80..cec6493c 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2025.csv
@@ -1,15 +1,16 @@
 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.54330000000
-2,2035,R1,windturbine,2025,1.54330000000
-2,2040,R1,windturbine,2025,1.54330000000
-2,2045,R1,windturbine,2025,1.54330000000
-2,2049,R1,windturbine,2025,1.54330000000
-2,2050,R1,windturbine,2025,1.54330000000
-2,2054,R1,windturbine,2025,1.54330000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv
index fe65e893..828f0a6c 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2030.csv
@@ -1,21 +1,24 @@
 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.54330000000
-1,2035,R1,windturbine,2025,1.54330000000
-1,2040,R1,windturbine,2025,1.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2035,R1,windturbine,2030,1.68610000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv
index 8280e4a7..29261651 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2035.csv
@@ -1,28 +1,33 @@
 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.54330000000
-1,2040,R1,windturbine,2025,1.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2035,R1,windturbine,2030,1.68610000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2040,R1,windturbine,2035,2.01780000000
-3,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv
index 74962932..0eef7b5d 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2040.csv
@@ -1,35 +1,43 @@
 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.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2040,R1,windturbine,2035,2.01780000000
-3,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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,2045,R1,windturbine,2040,2.08150000000
-4,2049,R1,windturbine,2040,2.08150000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv
index bcd2871b..e9d250de 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2045.csv
@@ -1,41 +1,53 @@
 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.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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,2045,R1,windturbine,2040,2.08150000000
-4,2049,R1,windturbine,2040,2.08150000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
+6,2050,R1,windturbine,2045,2
+6,2054,R1,windturbine,2045,2
+6,2055,R1,windturbine,2045,2
+6,2059,R1,windturbine,2045,2
+6,2060,R1,windturbine,2045,2
+6,2064,R1,windturbine,2045,2
+6,2065,R1,windturbine,2045,2
+6,2069,R1,windturbine,2045,2
+6,2070,R1,windturbine,2045,2
+6,2074,R1,windturbine,2045,2
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
index 26c19754..3105095e 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
@@ -1,41 +1,63 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
+6,2050,R1,windturbine,2045,2
+6,2054,R1,windturbine,2045,2
+6,2055,R1,windturbine,2045,2
+6,2059,R1,windturbine,2045,2
+6,2060,R1,windturbine,2045,2
+6,2064,R1,windturbine,2045,2
+6,2065,R1,windturbine,2045,2
+6,2069,R1,windturbine,2045,2
+6,2070,R1,windturbine,2045,2
+6,2074,R1,windturbine,2045,2
+7,2055,R1,windturbine,2050,2
+7,2059,R1,windturbine,2050,2
+7,2060,R1,windturbine,2050,2
+7,2064,R1,windturbine,2050,2
+7,2065,R1,windturbine,2050,2
+7,2069,R1,windturbine,2050,2
+7,2070,R1,windturbine,2050,2
+7,2074,R1,windturbine,2050,2
+7,2075,R1,windturbine,2050,2
+7,2079,R1,windturbine,2050,2
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
index 44dbdf95..6eacdc73 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
@@ -3,29 +3,29 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
 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
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
 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
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
 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
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
 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
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
 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
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
 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
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
index a4d417f5..3283ad74 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,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
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
 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
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
 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
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
 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
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
 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
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
 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
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
index 04fdc53e..82a474a7 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,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
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
index 6199673d..76dec2c1 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,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
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
index a51edca3..d663c1a8 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,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
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
index d8adfe54..156ac116 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,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
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
index 0f54b428..7e6a6761 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,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
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000
+0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,2.00000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000
+1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,2.00000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000
+2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,2.00000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000
+3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,2.00000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000
+4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,2.00000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000
+5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,2.00000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv
index bcdf148c..d6edd96c 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv
index 2eb0ec15..677048ec 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv
index 22334ba5..95b724d9 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv
index 452c6c8a..33e9c12a 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv
index e3ecc1d0..21be0313 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv
index 82b22d9b..d02c2c7f 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
index 42f4be20..8c8e1206 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
@@ -1,11 +1,30 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
index bfe116d0..729d406d 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
@@ -1,43 +1,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
 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 82873caa..afe86e12 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
@@ -1,49 +1,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
index 741ea3c6..83daf7f1 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
@@ -1,49 +1,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
index c802f340..7bda2463 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
@@ -1,49 +1,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
index c7be86b2..c535c679 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
@@ -1,37 +1,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
index 8c187153..9abfcded 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2020.csv b/tests/example_outputs/medium/Gas/Capacity/2020.csv
index ab0c1346..d41c9de1 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2020.csv
@@ -1,9 +1,9 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.33930000000
-0,2030,R1,gassupply1,2020,17.83930000000
-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
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2025.csv b/tests/example_outputs/medium/Gas/Capacity/2025.csv
index c21bcc6e..6a5d9a98 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2025.csv
@@ -1,16 +1,17 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gassupply1,2020,25.33930000000
-0,2030,R1,gassupply1,2020,17.83930000000
-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,2030,R1,gassupply1,2025,8.64650000000
-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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
+1,2030,R1,gassupply1,2025,7.48600000000
+1,2035,R1,gassupply1,2025,7.48600000000
+1,2040,R1,gassupply1,2025,7.48600000000
+1,2045,R1,gassupply1,2025,7.48600000000
+1,2050,R1,gassupply1,2025,7.48600000000
+1,2059,R1,gassupply1,2025,7.48600000000
+1,2060,R1,gassupply1,2025,7.48600000000
+1,2064,R1,gassupply1,2025,7.48600000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2030.csv b/tests/example_outputs/medium/Gas/Capacity/2030.csv
index 801e6976..3aab0e20 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2030.csv
@@ -1,18 +1,20 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,17.83930000000
-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,2030,R1,gassupply1,2025,8.64650000000
-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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
+1,2030,R1,gassupply1,2025,7.48600000000
+1,2035,R1,gassupply1,2025,7.48600000000
+1,2040,R1,gassupply1,2025,7.48600000000
+1,2045,R1,gassupply1,2025,7.48600000000
+1,2050,R1,gassupply1,2025,7.48600000000
+1,2059,R1,gassupply1,2025,7.48600000000
+1,2060,R1,gassupply1,2025,7.48600000000
+1,2064,R1,gassupply1,2025,7.48600000000
 2,2035,R1,gassupply1,2030,10.83330000000
 2,2040,R1,gassupply1,2030,10.83330000000
 2,2045,R1,gassupply1,2030,10.83330000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2035.csv b/tests/example_outputs/medium/Gas/Capacity/2035.csv
index 093329d2..3aab0e20 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2035.csv
@@ -1,16 +1,20 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
+1,2030,R1,gassupply1,2025,7.48600000000
+1,2035,R1,gassupply1,2025,7.48600000000
+1,2040,R1,gassupply1,2025,7.48600000000
+1,2045,R1,gassupply1,2025,7.48600000000
+1,2050,R1,gassupply1,2025,7.48600000000
+1,2059,R1,gassupply1,2025,7.48600000000
+1,2060,R1,gassupply1,2025,7.48600000000
+1,2064,R1,gassupply1,2025,7.48600000000
 2,2035,R1,gassupply1,2030,10.83330000000
 2,2040,R1,gassupply1,2030,10.83330000000
 2,2045,R1,gassupply1,2030,10.83330000000
@@ -20,13 +24,3 @@ asset,year,region,technology,installed,capacity
 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 fc101b3a..3aab0e20 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2040.csv
@@ -1,14 +1,21 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
+1,2030,R1,gassupply1,2025,7.48600000000
+1,2035,R1,gassupply1,2025,7.48600000000
+1,2040,R1,gassupply1,2025,7.48600000000
+1,2045,R1,gassupply1,2025,7.48600000000
+1,2050,R1,gassupply1,2025,7.48600000000
+1,2059,R1,gassupply1,2025,7.48600000000
+1,2060,R1,gassupply1,2025,7.48600000000
+1,2064,R1,gassupply1,2025,7.48600000000
+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
@@ -17,24 +24,3 @@ asset,year,region,technology,installed,capacity
 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 3af77c5c..47a6562c 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2045.csv
@@ -1,12 +1,22 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
+1,2030,R1,gassupply1,2025,7.48600000000
+1,2035,R1,gassupply1,2025,7.48600000000
+1,2040,R1,gassupply1,2025,7.48600000000
+1,2045,R1,gassupply1,2025,7.48600000000
+1,2050,R1,gassupply1,2025,7.48600000000
+1,2059,R1,gassupply1,2025,7.48600000000
+1,2060,R1,gassupply1,2025,7.48600000000
+1,2064,R1,gassupply1,2025,7.48600000000
+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
@@ -14,23 +24,11 @@ asset,year,region,technology,installed,capacity
 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
+3,2050,R1,gassupply1,2045,0.95610000000
+3,2059,R1,gassupply1,2045,0.95610000000
+3,2060,R1,gassupply1,2045,0.95610000000
+3,2064,R1,gassupply1,2045,0.95610000000
+3,2065,R1,gassupply1,2045,0.95610000000
+3,2069,R1,gassupply1,2045,0.95610000000
+3,2070,R1,gassupply1,2045,0.95610000000
+3,2084,R1,gassupply1,2045,0.95610000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2050.csv b/tests/example_outputs/medium/Gas/Capacity/2050.csv
index 26ecd19b..47a6562c 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2050.csv
@@ -1,36 +1,34 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,25.72460000000
+0,2030,R1,gassupply1,2020,18.22460000000
+0,2035,R1,gassupply1,2020,10.72460000000
+0,2040,R1,gassupply1,2020,10.72460000000
+0,2045,R1,gassupply1,2020,10.72460000000
+0,2050,R1,gassupply1,2020,10.72460000000
+0,2059,R1,gassupply1,2020,10.72460000000
+1,2030,R1,gassupply1,2025,7.48600000000
+1,2035,R1,gassupply1,2025,7.48600000000
+1,2040,R1,gassupply1,2025,7.48600000000
+1,2045,R1,gassupply1,2025,7.48600000000
+1,2050,R1,gassupply1,2025,7.48600000000
+1,2059,R1,gassupply1,2025,7.48600000000
+1,2060,R1,gassupply1,2025,7.48600000000
+1,2064,R1,gassupply1,2025,7.48600000000
+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,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
+3,2050,R1,gassupply1,2045,0.95610000000
+3,2059,R1,gassupply1,2045,0.95610000000
+3,2060,R1,gassupply1,2045,0.95610000000
+3,2064,R1,gassupply1,2045,0.95610000000
+3,2065,R1,gassupply1,2045,0.95610000000
+3,2069,R1,gassupply1,2045,0.95610000000
+3,2070,R1,gassupply1,2045,0.95610000000
+3,2084,R1,gassupply1,2045,0.95610000000
diff --git a/tests/example_outputs/medium/MCACapacity.csv b/tests/example_outputs/medium/MCACapacity.csv
index cbbc7aad..1b4f50fd 100644
--- a/tests/example_outputs/medium/MCACapacity.csv
+++ b/tests/example_outputs/medium/MCACapacity.csv
@@ -1,74 +1,67 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,8.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2025,12.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,4.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,1.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,25.33930000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,7.60000000000
-gasstove,R1,R1,A1,residential,retrofit,2030,4.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2030,11.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,4.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,3.40000000000
-windturbine,R1,R1,A1,power,retrofit,2030,1.75000000000
-windturbine,R1,R1,A1,power,retrofit,2030,5.65000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,17.83930000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,8.64650000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,7.60000000000
-gasstove,R1,R1,A1,residential,retrofit,2035,11.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2035,7.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,3.40000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,7.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,1.75000000000
-windturbine,R1,R1,A1,power,retrofit,2035,5.65000000000
-windturbine,R1,R1,A1,power,retrofit,2035,3.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,10.33930000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,8.64650000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,10.83330000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,6.56000000000
-gasstove,R1,R1,A1,residential,retrofit,2040,7.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2040,14.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,7.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,7.44000000000
-windturbine,R1,R1,A1,power,retrofit,2040,1.75000000000
-windturbine,R1,R1,A1,power,retrofit,2040,5.65000000000
-windturbine,R1,R1,A1,power,retrofit,2040,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,4.04000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,10.33930000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,8.64650000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,10.83330000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,1.98970000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,6.56000000000
-gasstove,R1,R1,A1,residential,retrofit,2045,14.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2045,10.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,7.44000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,1.75000000000
-windturbine,R1,R1,A1,power,retrofit,2045,5.65000000000
-windturbine,R1,R1,A1,power,retrofit,2045,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,4.04000000000
-windturbine,R1,R1,A1,power,retrofit,2045,3.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,10.33930000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,8.64650000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,10.83330000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,1.98970000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,6.66670000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,4.81600000000
-gasstove,R1,R1,A1,residential,retrofit,2050,10.00000000000
-gasstove,R1,R1,A1,residential,retrofit,2050,17.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,10.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,12.18400000000
-windturbine,R1,R1,A1,power,retrofit,2050,5.65000000000
-windturbine,R1,R1,A1,power,retrofit,2050,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,4.04000000000
-windturbine,R1,R1,A1,power,retrofit,2050,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.49400000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,10.33930000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,8.64650000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,10.83330000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,1.98970000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,6.66670000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,8.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2025,12.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,4.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,25.72460000000
+gasboiler,R1,R1,A1,residential,newcapa,2030,7.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2030,4.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2030,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,18.22460000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.48600000000
+gasboiler,R1,R1,A1,residential,newcapa,2035,7.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2035,11.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2035,7.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,10.72460000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.48600000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,10.83330000000
+gasstove,R1,R1,A1,residential,newcapa,2040,7.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2040,14.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,7.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,14.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,10.72460000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.48600000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,10.83330000000
+gasstove,R1,R1,A1,residential,newcapa,2045,14.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2045,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,14.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,10.72460000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.48600000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,10.83330000000
+gasstove,R1,R1,A1,residential,newcapa,2050,10.00000000000
+gasstove,R1,R1,A1,residential,newcapa,2050,17.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,17.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,10.72460000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.48600000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,10.83330000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.95610000000
diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv
index 795cd89a..98411f10 100644
--- a/tests/example_outputs/medium/MCAPrices.csv
+++ b/tests/example_outputs/medium/MCAPrices.csv
@@ -29,183 +29,183 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.84400000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.90460000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,80.29070000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",cook,R1,80.16690000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.99190000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,18.08280000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,80.43610000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",cook,R1,80.25040000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.84400000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.90460000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,80.29070000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'afternoon')",cook,R1,80.16690000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.99190000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.08280000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,80.43610000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",cook,R1,80.25040000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.43570000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.61740000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,80.87220000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",cook,R1,80.50080000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.13980000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,18.26100000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,80.58150000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",cook,R1,80.33390000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.30850000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.35700000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.48590000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.47780000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",cook,R1,64.26830000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.44350000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.51620000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.72980000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.71790000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",cook,R1,64.40250000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.30850000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.35700000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.48590000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.47780000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",cook,R1,64.26830000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.44350000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.51620000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.72980000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.71790000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",cook,R1,64.40250000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.84860000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.99390000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.46540000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.44320000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",cook,R1,64.80590000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.57850000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.67550000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.97440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.95890000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",cook,R1,64.53690000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.48020000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.51890000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.82700000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.81140000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",cook,R1,51.52350000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.60480000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.66300000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,52.14240000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,52.11940000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",cook,R1,51.68560000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.48020000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.51890000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.82700000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.81140000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",cook,R1,51.52350000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.60480000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.66300000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,52.14240000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,52.11940000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",cook,R1,51.68560000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.97880000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.09520000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,53.09570000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,53.05220000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",cook,R1,52.17350000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.72950000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.80700000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.45890000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.42880000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",cook,R1,51.84800000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.21750000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.66930000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.48480000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",cook,R1,41.30710000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.33390000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,42.02660000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.44140000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25000000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.73590000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",cook,R1,41.48130000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.21750000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.66930000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.66380000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.48480000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",cook,R1,41.30710000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.33390000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,42.02660000000,2040
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.44140000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25000000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.73590000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R1,41.48130000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.68310000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,43.10890000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.66380000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50000000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.52360000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R1,42.00640000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.45030000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,42.38560000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,1.33800000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.99270000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",cook,R1,41.65590000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.40730000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.53960000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.88740000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",cook,R1,33.11750000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.51710000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.92860000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25000000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",cook,R1,33.29310000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.40730000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.53960000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",cook,R1,33.11750000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.51710000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.92860000000,2045
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25000000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R1,33.29310000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.84650000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,35.10870000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50000000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13210000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R1,33.82380000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.62690000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,34.31980000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33330000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07480000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",cook,R1,33.46940000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,5.95920000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.99630000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'night')",cook,R1,26.55250000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.06370000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,27.39100000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25000000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",cook,R1,26.72280000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,5.95920000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.99630000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",cook,R1,26.55250000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.06370000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,27.39100000000,2050
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25000000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R1,26.72280000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.37720000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,28.59020000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13210000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R1,27.23860000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.16820000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.78820000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07480000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,26.89390000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2050
diff --git a/tests/example_outputs/medium/Power/Capacity/2020.csv b/tests/example_outputs/medium/Power/Capacity/2020.csv
index ca1b2bcc..1cdc9617 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
diff --git a/tests/example_outputs/medium/Power/Capacity/2025.csv b/tests/example_outputs/medium/Power/Capacity/2025.csv
index c294f38a..88f22d6e 100644
--- a/tests/example_outputs/medium/Power/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2025.csv
@@ -1,15 +1,16 @@
 asset,year,region,technology,installed,capacity
-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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,1
+2,2030,R1,windturbine,2020,1
+2,2035,R1,windturbine,2020,1
+2,2040,R1,windturbine,2020,1
+2,2045,R1,windturbine,2020,1
+2,2049,R1,windturbine,2020,1
+3,2030,R1,windturbine,2025,5
+3,2035,R1,windturbine,2025,5
+3,2040,R1,windturbine,2025,5
+3,2045,R1,windturbine,2025,5
+3,2049,R1,windturbine,2025,5
+3,2050,R1,windturbine,2025,5
+3,2054,R1,windturbine,2025,5
diff --git a/tests/example_outputs/medium/Power/Capacity/2030.csv b/tests/example_outputs/medium/Power/Capacity/2030.csv
index e06eb458..35026f11 100644
--- a/tests/example_outputs/medium/Power/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2030.csv
@@ -1,21 +1,24 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,1
+2,2030,R1,windturbine,2020,1
+2,2035,R1,windturbine,2020,1
+2,2040,R1,windturbine,2020,1
+2,2045,R1,windturbine,2020,1
+2,2049,R1,windturbine,2020,1
+3,2030,R1,windturbine,2025,5
+3,2035,R1,windturbine,2025,5
+3,2040,R1,windturbine,2025,5
+3,2045,R1,windturbine,2025,5
+3,2049,R1,windturbine,2025,5
+3,2050,R1,windturbine,2025,5
+3,2054,R1,windturbine,2025,5
+4,2035,R1,windturbine,2030,5
+4,2040,R1,windturbine,2030,5
+4,2045,R1,windturbine,2030,5
+4,2049,R1,windturbine,2030,5
+4,2050,R1,windturbine,2030,5
+4,2054,R1,windturbine,2030,5
+4,2055,R1,windturbine,2030,5
+4,2059,R1,windturbine,2030,5
diff --git a/tests/example_outputs/medium/Power/Capacity/2035.csv b/tests/example_outputs/medium/Power/Capacity/2035.csv
index 3e285fc4..85a4a7a7 100644
--- a/tests/example_outputs/medium/Power/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2035.csv
@@ -1,28 +1,33 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,1
+2,2030,R1,windturbine,2020,1
+2,2035,R1,windturbine,2020,1
+2,2040,R1,windturbine,2020,1
+2,2045,R1,windturbine,2020,1
+2,2049,R1,windturbine,2020,1
+3,2030,R1,windturbine,2025,5
+3,2035,R1,windturbine,2025,5
+3,2040,R1,windturbine,2025,5
+3,2045,R1,windturbine,2025,5
+3,2049,R1,windturbine,2025,5
+3,2050,R1,windturbine,2025,5
+3,2054,R1,windturbine,2025,5
+4,2035,R1,windturbine,2030,5
+4,2040,R1,windturbine,2030,5
+4,2045,R1,windturbine,2030,5
+4,2049,R1,windturbine,2030,5
+4,2050,R1,windturbine,2030,5
+4,2054,R1,windturbine,2030,5
+4,2055,R1,windturbine,2030,5
+4,2059,R1,windturbine,2030,5
+5,2040,R1,windturbine,2035,10
+5,2045,R1,windturbine,2035,10
+5,2049,R1,windturbine,2035,10
+5,2050,R1,windturbine,2035,10
+5,2054,R1,windturbine,2035,10
+5,2055,R1,windturbine,2035,10
+5,2059,R1,windturbine,2035,10
+5,2060,R1,windturbine,2035,10
+5,2064,R1,windturbine,2035,10
diff --git a/tests/example_outputs/medium/Power/Capacity/2040.csv b/tests/example_outputs/medium/Power/Capacity/2040.csv
index de0aa375..b0b0b653 100644
--- a/tests/example_outputs/medium/Power/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2040.csv
@@ -1,35 +1,43 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,1
+2,2030,R1,windturbine,2020,1
+2,2035,R1,windturbine,2020,1
+2,2040,R1,windturbine,2020,1
+2,2045,R1,windturbine,2020,1
+2,2049,R1,windturbine,2020,1
+3,2030,R1,windturbine,2025,5
+3,2035,R1,windturbine,2025,5
+3,2040,R1,windturbine,2025,5
+3,2045,R1,windturbine,2025,5
+3,2049,R1,windturbine,2025,5
+3,2050,R1,windturbine,2025,5
+3,2054,R1,windturbine,2025,5
+4,2035,R1,windturbine,2030,5
+4,2040,R1,windturbine,2030,5
+4,2045,R1,windturbine,2030,5
+4,2049,R1,windturbine,2030,5
+4,2050,R1,windturbine,2030,5
+4,2054,R1,windturbine,2030,5
+4,2055,R1,windturbine,2030,5
+4,2059,R1,windturbine,2030,5
+5,2040,R1,windturbine,2035,10
+5,2045,R1,windturbine,2035,10
+5,2049,R1,windturbine,2035,10
+5,2050,R1,windturbine,2035,10
+5,2054,R1,windturbine,2035,10
+5,2055,R1,windturbine,2035,10
+5,2059,R1,windturbine,2035,10
+5,2060,R1,windturbine,2035,10
+5,2064,R1,windturbine,2035,10
+6,2045,R1,windturbine,2040,3
+6,2049,R1,windturbine,2040,3
+6,2050,R1,windturbine,2040,3
+6,2054,R1,windturbine,2040,3
+6,2055,R1,windturbine,2040,3
+6,2059,R1,windturbine,2040,3
+6,2060,R1,windturbine,2040,3
+6,2064,R1,windturbine,2040,3
+6,2065,R1,windturbine,2040,3
+6,2069,R1,windturbine,2040,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2045.csv b/tests/example_outputs/medium/Power/Capacity/2045.csv
index aa7e3c60..2529222d 100644
--- a/tests/example_outputs/medium/Power/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2045.csv
@@ -1,41 +1,53 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,windturbine,2020,1.75000000000
-0,2049,R1,windturbine,2020,1.75000000000
-1,2045,R1,windturbine,2025,5.65000000000
-1,2049,R1,windturbine,2025,5.65000000000
-1,2050,R1,windturbine,2025,5.65000000000
-1,2054,R1,windturbine,2025,5.65000000000
-2,2045,R1,windturbine,2030,3.00000000000
-2,2049,R1,windturbine,2030,3.00000000000
-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,2045,R1,windturbine,2035,4.04000000000
-3,2049,R1,windturbine,2035,4.04000000000
-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,2045,R1,windturbine,2040,3.00000000000
-4,2049,R1,windturbine,2040,3.00000000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,1
+2,2030,R1,windturbine,2020,1
+2,2035,R1,windturbine,2020,1
+2,2040,R1,windturbine,2020,1
+2,2045,R1,windturbine,2020,1
+2,2049,R1,windturbine,2020,1
+3,2030,R1,windturbine,2025,5
+3,2035,R1,windturbine,2025,5
+3,2040,R1,windturbine,2025,5
+3,2045,R1,windturbine,2025,5
+3,2049,R1,windturbine,2025,5
+3,2050,R1,windturbine,2025,5
+3,2054,R1,windturbine,2025,5
+4,2035,R1,windturbine,2030,5
+4,2040,R1,windturbine,2030,5
+4,2045,R1,windturbine,2030,5
+4,2049,R1,windturbine,2030,5
+4,2050,R1,windturbine,2030,5
+4,2054,R1,windturbine,2030,5
+4,2055,R1,windturbine,2030,5
+4,2059,R1,windturbine,2030,5
+5,2040,R1,windturbine,2035,10
+5,2045,R1,windturbine,2035,10
+5,2049,R1,windturbine,2035,10
+5,2050,R1,windturbine,2035,10
+5,2054,R1,windturbine,2035,10
+5,2055,R1,windturbine,2035,10
+5,2059,R1,windturbine,2035,10
+5,2060,R1,windturbine,2035,10
+5,2064,R1,windturbine,2035,10
+6,2045,R1,windturbine,2040,3
+6,2049,R1,windturbine,2040,3
+6,2050,R1,windturbine,2040,3
+6,2054,R1,windturbine,2040,3
+6,2055,R1,windturbine,2040,3
+6,2059,R1,windturbine,2040,3
+6,2060,R1,windturbine,2040,3
+6,2064,R1,windturbine,2040,3
+6,2065,R1,windturbine,2040,3
+6,2069,R1,windturbine,2040,3
+7,2050,R1,windturbine,2045,4
+7,2054,R1,windturbine,2045,4
+7,2055,R1,windturbine,2045,4
+7,2059,R1,windturbine,2045,4
+7,2060,R1,windturbine,2045,4
+7,2064,R1,windturbine,2045,4
+7,2065,R1,windturbine,2045,4
+7,2069,R1,windturbine,2045,4
+7,2070,R1,windturbine,2045,4
+7,2074,R1,windturbine,2045,4
diff --git a/tests/example_outputs/medium/Power/Capacity/2050.csv b/tests/example_outputs/medium/Power/Capacity/2050.csv
index 2f4a74a6..a9845da7 100644
--- a/tests/example_outputs/medium/Power/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2050.csv
@@ -1,41 +1,63 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,1
+2,2030,R1,windturbine,2020,1
+2,2035,R1,windturbine,2020,1
+2,2040,R1,windturbine,2020,1
+2,2045,R1,windturbine,2020,1
+2,2049,R1,windturbine,2020,1
+3,2030,R1,windturbine,2025,5
+3,2035,R1,windturbine,2025,5
+3,2040,R1,windturbine,2025,5
+3,2045,R1,windturbine,2025,5
+3,2049,R1,windturbine,2025,5
+3,2050,R1,windturbine,2025,5
+3,2054,R1,windturbine,2025,5
+4,2035,R1,windturbine,2030,5
+4,2040,R1,windturbine,2030,5
+4,2045,R1,windturbine,2030,5
+4,2049,R1,windturbine,2030,5
+4,2050,R1,windturbine,2030,5
+4,2054,R1,windturbine,2030,5
+4,2055,R1,windturbine,2030,5
+4,2059,R1,windturbine,2030,5
+5,2040,R1,windturbine,2035,10
+5,2045,R1,windturbine,2035,10
+5,2049,R1,windturbine,2035,10
+5,2050,R1,windturbine,2035,10
+5,2054,R1,windturbine,2035,10
+5,2055,R1,windturbine,2035,10
+5,2059,R1,windturbine,2035,10
+5,2060,R1,windturbine,2035,10
+5,2064,R1,windturbine,2035,10
+6,2045,R1,windturbine,2040,3
+6,2049,R1,windturbine,2040,3
+6,2050,R1,windturbine,2040,3
+6,2054,R1,windturbine,2040,3
+6,2055,R1,windturbine,2040,3
+6,2059,R1,windturbine,2040,3
+6,2060,R1,windturbine,2040,3
+6,2064,R1,windturbine,2040,3
+6,2065,R1,windturbine,2040,3
+6,2069,R1,windturbine,2040,3
+7,2050,R1,windturbine,2045,4
+7,2054,R1,windturbine,2045,4
+7,2055,R1,windturbine,2045,4
+7,2059,R1,windturbine,2045,4
+7,2060,R1,windturbine,2045,4
+7,2064,R1,windturbine,2045,4
+7,2065,R1,windturbine,2045,4
+7,2069,R1,windturbine,2045,4
+7,2070,R1,windturbine,2045,4
+7,2074,R1,windturbine,2045,4
+8,2055,R1,windturbine,2050,5
+8,2059,R1,windturbine,2050,5
+8,2060,R1,windturbine,2050,5
+8,2064,R1,windturbine,2050,5
+8,2065,R1,windturbine,2050,5
+8,2069,R1,windturbine,2050,5
+8,2070,R1,windturbine,2050,5
+8,2074,R1,windturbine,2050,5
+8,2075,R1,windturbine,2050,5
+8,2079,R1,windturbine,2050,5
diff --git a/tests/example_outputs/medium/Residential/Capacity/2020.csv b/tests/example_outputs/medium/Residential/Capacity/2020.csv
index 04ee6cc5..3d4e71d7 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2020.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2020.csv
@@ -1,10 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,8.00000000000
-1,2020,R1,gasstove,2020,10.00000000000
-1,2025,R1,gasstove,2020,12.00000000000
-1,2030,R1,gasstove,2020,4.00000000000
-1,2034,R1,gasstove,2020,4.00000000000
-2,2025,R1,heatpump,2020,4.00000000000
-2,2030,R1,heatpump,2020,4.00000000000
-2,2034,R1,heatpump,2020,4.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2020,R1,gasstove,2020,10
+1,2025,R1,gasstove,2020,12
+1,2030,R1,gasstove,2020,4
+1,2034,R1,gasstove,2020,4
+2,2025,R1,heatpump,2020,4
+2,2030,R1,heatpump,2020,4
+2,2034,R1,heatpump,2020,4
diff --git a/tests/example_outputs/medium/Residential/Capacity/2025.csv b/tests/example_outputs/medium/Residential/Capacity/2025.csv
index bc5850c5..6334d8f9 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2025.csv
@@ -1,20 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,8.00000000000
-1,2030,R1,gasboiler,2025,7.60000000000
-1,2034,R1,gasboiler,2025,7.60000000000
-1,2035,R1,gasboiler,2025,7.60000000000
-1,2039,R1,gasboiler,2025,7.60000000000
-2,2025,R1,gasstove,2020,12.00000000000
-2,2030,R1,gasstove,2020,4.00000000000
-2,2034,R1,gasstove,2020,4.00000000000
-3,2030,R1,gasstove,2025,11.00000000000
-3,2034,R1,gasstove,2025,11.00000000000
-3,2035,R1,gasstove,2025,11.00000000000
-3,2039,R1,gasstove,2025,11.00000000000
-4,2025,R1,heatpump,2020,4.00000000000
-4,2030,R1,heatpump,2020,4.00000000000
-4,2034,R1,heatpump,2020,4.00000000000
-5,2030,R1,heatpump,2025,3.40000000000
-5,2034,R1,heatpump,2025,3.40000000000
-5,2035,R1,heatpump,2025,3.40000000000
-5,2039,R1,heatpump,2025,3.40000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2030,R1,gasboiler,2025,7
+1,2034,R1,gasboiler,2025,7
+1,2035,R1,gasboiler,2025,7
+1,2039,R1,gasboiler,2025,7
+2,2020,R1,gasstove,2020,10
+2,2025,R1,gasstove,2020,12
+2,2030,R1,gasstove,2020,4
+2,2034,R1,gasstove,2020,4
+3,2030,R1,gasstove,2025,11
+3,2034,R1,gasstove,2025,11
+3,2035,R1,gasstove,2025,11
+3,2039,R1,gasstove,2025,11
+4,2025,R1,heatpump,2020,4
+4,2030,R1,heatpump,2020,4
+4,2034,R1,heatpump,2020,4
+5,2030,R1,heatpump,2025,4
+5,2034,R1,heatpump,2025,4
+5,2035,R1,heatpump,2025,4
+5,2039,R1,heatpump,2025,4
diff --git a/tests/example_outputs/medium/Residential/Capacity/2030.csv b/tests/example_outputs/medium/Residential/Capacity/2030.csv
index afb96ec9..0469b790 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2030.csv
@@ -1,25 +1,30 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,7.60000000000
-0,2034,R1,gasboiler,2025,7.60000000000
-0,2035,R1,gasboiler,2025,7.60000000000
-0,2039,R1,gasboiler,2025,7.60000000000
-1,2030,R1,gasstove,2020,4.00000000000
-1,2034,R1,gasstove,2020,4.00000000000
-2,2030,R1,gasstove,2025,11.00000000000
-2,2034,R1,gasstove,2025,11.00000000000
-2,2035,R1,gasstove,2025,11.00000000000
-2,2039,R1,gasstove,2025,11.00000000000
-3,2035,R1,gasstove,2030,7.00000000000
-3,2039,R1,gasstove,2030,7.00000000000
-3,2040,R1,gasstove,2030,7.00000000000
-3,2044,R1,gasstove,2030,7.00000000000
-4,2030,R1,heatpump,2020,4.00000000000
-4,2034,R1,heatpump,2020,4.00000000000
-5,2030,R1,heatpump,2025,3.40000000000
-5,2034,R1,heatpump,2025,3.40000000000
-5,2035,R1,heatpump,2025,3.40000000000
-5,2039,R1,heatpump,2025,3.40000000000
-6,2035,R1,heatpump,2030,7.00000000000
-6,2039,R1,heatpump,2030,7.00000000000
-6,2040,R1,heatpump,2030,7.00000000000
-6,2044,R1,heatpump,2030,7.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2030,R1,gasboiler,2025,7
+1,2034,R1,gasboiler,2025,7
+1,2035,R1,gasboiler,2025,7
+1,2039,R1,gasboiler,2025,7
+2,2020,R1,gasstove,2020,10
+2,2025,R1,gasstove,2020,12
+2,2030,R1,gasstove,2020,4
+2,2034,R1,gasstove,2020,4
+3,2030,R1,gasstove,2025,11
+3,2034,R1,gasstove,2025,11
+3,2035,R1,gasstove,2025,11
+3,2039,R1,gasstove,2025,11
+4,2035,R1,gasstove,2030,7
+4,2039,R1,gasstove,2030,7
+4,2040,R1,gasstove,2030,7
+4,2044,R1,gasstove,2030,7
+5,2025,R1,heatpump,2020,4
+5,2030,R1,heatpump,2020,4
+5,2034,R1,heatpump,2020,4
+6,2030,R1,heatpump,2025,4
+6,2034,R1,heatpump,2025,4
+6,2035,R1,heatpump,2025,4
+6,2039,R1,heatpump,2025,4
+7,2035,R1,heatpump,2030,7
+7,2039,R1,heatpump,2030,7
+7,2040,R1,heatpump,2030,7
+7,2044,R1,heatpump,2030,7
diff --git a/tests/example_outputs/medium/Residential/Capacity/2035.csv b/tests/example_outputs/medium/Residential/Capacity/2035.csv
index bcb73872..199c6a7b 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2035.csv
@@ -1,27 +1,38 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,7.60000000000
-0,2039,R1,gasboiler,2025,7.60000000000
-1,2040,R1,gasboiler,2035,6.56000000000
-1,2044,R1,gasboiler,2035,6.56000000000
-1,2045,R1,gasboiler,2035,6.56000000000
-1,2049,R1,gasboiler,2035,6.56000000000
-2,2035,R1,gasstove,2025,11.00000000000
-2,2039,R1,gasstove,2025,11.00000000000
-3,2035,R1,gasstove,2030,7.00000000000
-3,2039,R1,gasstove,2030,7.00000000000
-3,2040,R1,gasstove,2030,7.00000000000
-3,2044,R1,gasstove,2030,7.00000000000
-4,2040,R1,gasstove,2035,14.00000000000
-4,2044,R1,gasstove,2035,14.00000000000
-4,2045,R1,gasstove,2035,14.00000000000
-4,2049,R1,gasstove,2035,14.00000000000
-5,2035,R1,heatpump,2025,3.40000000000
-5,2039,R1,heatpump,2025,3.40000000000
-6,2035,R1,heatpump,2030,7.00000000000
-6,2039,R1,heatpump,2030,7.00000000000
-6,2040,R1,heatpump,2030,7.00000000000
-6,2044,R1,heatpump,2030,7.00000000000
-7,2040,R1,heatpump,2035,7.44000000000
-7,2044,R1,heatpump,2035,7.44000000000
-7,2045,R1,heatpump,2035,7.44000000000
-7,2049,R1,heatpump,2035,7.44000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2030,R1,gasboiler,2025,7
+1,2034,R1,gasboiler,2025,7
+1,2035,R1,gasboiler,2025,7
+1,2039,R1,gasboiler,2025,7
+2,2020,R1,gasstove,2020,10
+2,2025,R1,gasstove,2020,12
+2,2030,R1,gasstove,2020,4
+2,2034,R1,gasstove,2020,4
+3,2030,R1,gasstove,2025,11
+3,2034,R1,gasstove,2025,11
+3,2035,R1,gasstove,2025,11
+3,2039,R1,gasstove,2025,11
+4,2035,R1,gasstove,2030,7
+4,2039,R1,gasstove,2030,7
+4,2040,R1,gasstove,2030,7
+4,2044,R1,gasstove,2030,7
+5,2040,R1,gasstove,2035,14
+5,2044,R1,gasstove,2035,14
+5,2045,R1,gasstove,2035,14
+5,2049,R1,gasstove,2035,14
+6,2025,R1,heatpump,2020,4
+6,2030,R1,heatpump,2020,4
+6,2034,R1,heatpump,2020,4
+7,2030,R1,heatpump,2025,4
+7,2034,R1,heatpump,2025,4
+7,2035,R1,heatpump,2025,4
+7,2039,R1,heatpump,2025,4
+8,2035,R1,heatpump,2030,7
+8,2039,R1,heatpump,2030,7
+8,2040,R1,heatpump,2030,7
+8,2044,R1,heatpump,2030,7
+9,2040,R1,heatpump,2035,14
+9,2044,R1,heatpump,2035,14
+9,2045,R1,heatpump,2035,14
+9,2049,R1,heatpump,2035,14
diff --git a/tests/example_outputs/medium/Residential/Capacity/2040.csv b/tests/example_outputs/medium/Residential/Capacity/2040.csv
index 986d17d7..0d25364c 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2040.csv
@@ -1,25 +1,46 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,6.56000000000
-0,2044,R1,gasboiler,2035,6.56000000000
-0,2045,R1,gasboiler,2035,6.56000000000
-0,2049,R1,gasboiler,2035,6.56000000000
-1,2040,R1,gasstove,2030,7.00000000000
-1,2044,R1,gasstove,2030,7.00000000000
-2,2040,R1,gasstove,2035,14.00000000000
-2,2044,R1,gasstove,2035,14.00000000000
-2,2045,R1,gasstove,2035,14.00000000000
-2,2049,R1,gasstove,2035,14.00000000000
-3,2045,R1,gasstove,2040,10.00000000000
-3,2049,R1,gasstove,2040,10.00000000000
-3,2050,R1,gasstove,2040,10.00000000000
-3,2054,R1,gasstove,2040,10.00000000000
-4,2040,R1,heatpump,2030,7.00000000000
-4,2044,R1,heatpump,2030,7.00000000000
-5,2040,R1,heatpump,2035,7.44000000000
-5,2044,R1,heatpump,2035,7.44000000000
-5,2045,R1,heatpump,2035,7.44000000000
-5,2049,R1,heatpump,2035,7.44000000000
-6,2045,R1,heatpump,2040,10.00000000000
-6,2049,R1,heatpump,2040,10.00000000000
-6,2050,R1,heatpump,2040,10.00000000000
-6,2054,R1,heatpump,2040,10.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2030,R1,gasboiler,2025,7
+1,2034,R1,gasboiler,2025,7
+1,2035,R1,gasboiler,2025,7
+1,2039,R1,gasboiler,2025,7
+2,2020,R1,gasstove,2020,10
+2,2025,R1,gasstove,2020,12
+2,2030,R1,gasstove,2020,4
+2,2034,R1,gasstove,2020,4
+3,2030,R1,gasstove,2025,11
+3,2034,R1,gasstove,2025,11
+3,2035,R1,gasstove,2025,11
+3,2039,R1,gasstove,2025,11
+4,2035,R1,gasstove,2030,7
+4,2039,R1,gasstove,2030,7
+4,2040,R1,gasstove,2030,7
+4,2044,R1,gasstove,2030,7
+5,2040,R1,gasstove,2035,14
+5,2044,R1,gasstove,2035,14
+5,2045,R1,gasstove,2035,14
+5,2049,R1,gasstove,2035,14
+6,2045,R1,gasstove,2040,10
+6,2049,R1,gasstove,2040,10
+6,2050,R1,gasstove,2040,10
+6,2054,R1,gasstove,2040,10
+7,2025,R1,heatpump,2020,4
+7,2030,R1,heatpump,2020,4
+7,2034,R1,heatpump,2020,4
+8,2030,R1,heatpump,2025,4
+8,2034,R1,heatpump,2025,4
+8,2035,R1,heatpump,2025,4
+8,2039,R1,heatpump,2025,4
+9,2035,R1,heatpump,2030,7
+9,2039,R1,heatpump,2030,7
+9,2040,R1,heatpump,2030,7
+9,2044,R1,heatpump,2030,7
+10,2040,R1,heatpump,2035,14
+10,2044,R1,heatpump,2035,14
+10,2045,R1,heatpump,2035,14
+10,2049,R1,heatpump,2035,14
+11,2045,R1,heatpump,2040,10
+11,2049,R1,heatpump,2040,10
+11,2050,R1,heatpump,2040,10
+11,2054,R1,heatpump,2040,10
diff --git a/tests/example_outputs/medium/Residential/Capacity/2045.csv b/tests/example_outputs/medium/Residential/Capacity/2045.csv
index d0261e66..7b6fe12d 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2045.csv
@@ -1,27 +1,54 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,6.56000000000
-0,2049,R1,gasboiler,2035,6.56000000000
-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
-2,2045,R1,gasstove,2035,14.00000000000
-2,2049,R1,gasstove,2035,14.00000000000
-3,2045,R1,gasstove,2040,10.00000000000
-3,2049,R1,gasstove,2040,10.00000000000
-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,2045,R1,heatpump,2035,7.44000000000
-5,2049,R1,heatpump,2035,7.44000000000
-6,2045,R1,heatpump,2040,10.00000000000
-6,2049,R1,heatpump,2040,10.00000000000
-6,2050,R1,heatpump,2040,10.00000000000
-6,2054,R1,heatpump,2040,10.00000000000
-7,2050,R1,heatpump,2045,12.18400000000
-7,2054,R1,heatpump,2045,12.18400000000
-7,2055,R1,heatpump,2045,12.18400000000
-7,2059,R1,heatpump,2045,12.18400000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2030,R1,gasboiler,2025,7
+1,2034,R1,gasboiler,2025,7
+1,2035,R1,gasboiler,2025,7
+1,2039,R1,gasboiler,2025,7
+2,2020,R1,gasstove,2020,10
+2,2025,R1,gasstove,2020,12
+2,2030,R1,gasstove,2020,4
+2,2034,R1,gasstove,2020,4
+3,2030,R1,gasstove,2025,11
+3,2034,R1,gasstove,2025,11
+3,2035,R1,gasstove,2025,11
+3,2039,R1,gasstove,2025,11
+4,2035,R1,gasstove,2030,7
+4,2039,R1,gasstove,2030,7
+4,2040,R1,gasstove,2030,7
+4,2044,R1,gasstove,2030,7
+5,2040,R1,gasstove,2035,14
+5,2044,R1,gasstove,2035,14
+5,2045,R1,gasstove,2035,14
+5,2049,R1,gasstove,2035,14
+6,2045,R1,gasstove,2040,10
+6,2049,R1,gasstove,2040,10
+6,2050,R1,gasstove,2040,10
+6,2054,R1,gasstove,2040,10
+7,2050,R1,gasstove,2045,17
+7,2054,R1,gasstove,2045,17
+7,2055,R1,gasstove,2045,17
+7,2059,R1,gasstove,2045,17
+8,2025,R1,heatpump,2020,4
+8,2030,R1,heatpump,2020,4
+8,2034,R1,heatpump,2020,4
+9,2030,R1,heatpump,2025,4
+9,2034,R1,heatpump,2025,4
+9,2035,R1,heatpump,2025,4
+9,2039,R1,heatpump,2025,4
+10,2035,R1,heatpump,2030,7
+10,2039,R1,heatpump,2030,7
+10,2040,R1,heatpump,2030,7
+10,2044,R1,heatpump,2030,7
+11,2040,R1,heatpump,2035,14
+11,2044,R1,heatpump,2035,14
+11,2045,R1,heatpump,2035,14
+11,2049,R1,heatpump,2035,14
+12,2045,R1,heatpump,2040,10
+12,2049,R1,heatpump,2040,10
+12,2050,R1,heatpump,2040,10
+12,2054,R1,heatpump,2040,10
+13,2050,R1,heatpump,2045,17
+13,2054,R1,heatpump,2045,17
+13,2055,R1,heatpump,2045,17
+13,2059,R1,heatpump,2045,17
diff --git a/tests/example_outputs/medium/Residential/Capacity/2050.csv b/tests/example_outputs/medium/Residential/Capacity/2050.csv
index c9363ce7..8d6ad08b 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2050.csv
@@ -1,25 +1,62 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,8
+1,2030,R1,gasboiler,2025,7
+1,2034,R1,gasboiler,2025,7
+1,2035,R1,gasboiler,2025,7
+1,2039,R1,gasboiler,2025,7
+2,2020,R1,gasstove,2020,10
+2,2025,R1,gasstove,2020,12
+2,2030,R1,gasstove,2020,4
+2,2034,R1,gasstove,2020,4
+3,2030,R1,gasstove,2025,11
+3,2034,R1,gasstove,2025,11
+3,2035,R1,gasstove,2025,11
+3,2039,R1,gasstove,2025,11
+4,2035,R1,gasstove,2030,7
+4,2039,R1,gasstove,2030,7
+4,2040,R1,gasstove,2030,7
+4,2044,R1,gasstove,2030,7
+5,2040,R1,gasstove,2035,14
+5,2044,R1,gasstove,2035,14
+5,2045,R1,gasstove,2035,14
+5,2049,R1,gasstove,2035,14
+6,2045,R1,gasstove,2040,10
+6,2049,R1,gasstove,2040,10
+6,2050,R1,gasstove,2040,10
+6,2054,R1,gasstove,2040,10
+7,2050,R1,gasstove,2045,17
+7,2054,R1,gasstove,2045,17
+7,2055,R1,gasstove,2045,17
+7,2059,R1,gasstove,2045,17
+8,2055,R1,gasstove,2050,10
+8,2059,R1,gasstove,2050,10
+8,2060,R1,gasstove,2050,10
+8,2064,R1,gasstove,2050,10
+9,2025,R1,heatpump,2020,4
+9,2030,R1,heatpump,2020,4
+9,2034,R1,heatpump,2020,4
+10,2030,R1,heatpump,2025,4
+10,2034,R1,heatpump,2025,4
+10,2035,R1,heatpump,2025,4
+10,2039,R1,heatpump,2025,4
+11,2035,R1,heatpump,2030,7
+11,2039,R1,heatpump,2030,7
+11,2040,R1,heatpump,2030,7
+11,2044,R1,heatpump,2030,7
+12,2040,R1,heatpump,2035,14
+12,2044,R1,heatpump,2035,14
+12,2045,R1,heatpump,2035,14
+12,2049,R1,heatpump,2035,14
+13,2045,R1,heatpump,2040,10
+13,2049,R1,heatpump,2040,10
+13,2050,R1,heatpump,2040,10
+13,2054,R1,heatpump,2040,10
+14,2050,R1,heatpump,2045,17
+14,2054,R1,heatpump,2045,17
+14,2055,R1,heatpump,2045,17
+14,2059,R1,heatpump,2045,17
+15,2055,R1,heatpump,2050,10
+15,2059,R1,heatpump,2050,10
+15,2060,R1,heatpump,2050,10
+15,2064,R1,heatpump,2050,10
diff --git a/tests/example_outputs/medium/Residential/Supply/2025.csv b/tests/example_outputs/medium/Residential/Supply/2025.csv
index c770030e..6c0a8f6b 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,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,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
 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,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
 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,2030,5,R1,all-year,all-week,night,heatpump,2025,0.22220000000
 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,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
 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,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
 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,2030,5,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
 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,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
 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,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
 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,2030,5,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
 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,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
 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,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
 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,2030,5,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
 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,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
 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,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
 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,2030,5,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
 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,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
 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,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
 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,2030,5,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2030.csv b/tests/example_outputs/medium/Residential/Supply/2030.csv
index cf2cde7e..434eea1a 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,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
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+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,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+0,heat,2030,5,R1,all-year,all-week,night,heatpump,2020,0.22220000000
+0,heat,2030,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
+0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+0,heat,2035,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
+0,heat,2035,7,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+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,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+1,heat,2030,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+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,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+2,heat,2030,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+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,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+3,heat,2030,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+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,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+4,heat,2030,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+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,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+5,heat,2030,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+5,heat,2035,7,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 962b162f..152438f8 100644
--- a/tests/example_outputs/medium/Residential/Supply/2035.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2035.csv
@@ -1,73 +1,61 @@
 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
+0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+0,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+0,heat,2035,7,R1,all-year,all-week,night,heatpump,2025,0.22220000000
+0,heat,2035,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,9,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,2035,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+2,heat,2035,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,2035,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+4,heat,2035,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+5,heat,2035,7,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+5,heat,2035,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2040.csv b/tests/example_outputs/medium/Residential/Supply/2040.csv
index 5fa835b2..a92754ee 100644
--- a/tests/example_outputs/medium/Residential/Supply/2040.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2040.csv
@@ -1,73 +1,49 @@
 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
+0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,heat,2040,9,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+0,heat,2045,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+0,heat,2045,11,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+1,heat,2045,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+2,heat,2045,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+3,heat,2045,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+4,heat,2045,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+5,heat,2045,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+5,heat,2045,11,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 e7610fcc..58e9df29 100644
--- a/tests/example_outputs/medium/Residential/Supply/2045.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2045.csv
@@ -1,73 +1,49 @@
 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
+0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,heat,2045,11,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+0,heat,2045,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,13,R1,all-year,all-week,night,heatpump,2045,0.94440000000
+1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+1,heat,2045,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+2,heat,2045,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+3,heat,2045,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+4,heat,2045,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,heat,2045,11,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+5,heat,2045,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2050.csv b/tests/example_outputs/medium/Residential/Supply/2050.csv
index 08447a87..ea9a8628 100644
--- a/tests/example_outputs/medium/Residential/Supply/2050.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2050.csv
@@ -1,73 +1,49 @@
 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
+0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,cook,2055,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,cook,2055,8,R1,all-year,all-week,night,gasstove,2050,0.55560000000
+0,heat,2050,13,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
+0,heat,2055,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
+0,heat,2055,15,R1,all-year,all-week,night,heatpump,2050,0.55560000000
+1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,cook,2055,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,cook,2055,8,R1,all-year,all-week,morning,gasstove,2050,0.83330000000
+1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+1,heat,2055,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+1,heat,2055,15,R1,all-year,all-week,morning,heatpump,2050,0.83330000000
+2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,cook,2055,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,cook,2055,8,R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
+2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+2,heat,2055,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+2,heat,2055,15,R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
+3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,cook,2055,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,cook,2055,8,R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
+3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+3,heat,2055,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+3,heat,2055,15,R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
+4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,cook,2055,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,cook,2055,8,R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
+4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+4,heat,2055,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+4,heat,2055,15,R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
+5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,cook,2055,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,cook,2055,8,R1,all-year,all-week,evening,gasstove,2050,1.11110000000
+5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+5,heat,2055,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+5,heat,2055,15,R1,all-year,all-week,evening,heatpump,2050,1.11110000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
index b19cd90a..9acfc815 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
@@ -1,4 +1,9 @@
 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
@@ -44,6 +49,11 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+2,2011,R1,procammonia_2,2010,25.13330000000
+2,2012,R1,procammonia_2,2010,24.26670000000
+2,2013,R1,procammonia_2,2010,23.40000000000
+2,2014,R1,procammonia_2,2010,22.53330000000
 2,2015,R1,procammonia_2,2010,24.35470000000
 2,2016,R1,procammonia_2,2010,23.48800000000
 2,2017,R1,procammonia_2,2010,22.62140000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv
index 2c867243..7c1a31e3 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2020.csv
@@ -1,4 +1,14 @@
 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
@@ -59,6 +69,16 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+3,2011,R1,procammonia_2,2010,25.13330000000
+3,2012,R1,procammonia_2,2010,24.26670000000
+3,2013,R1,procammonia_2,2010,23.40000000000
+3,2014,R1,procammonia_2,2010,22.53330000000
+3,2015,R1,procammonia_2,2010,24.35470000000
+3,2016,R1,procammonia_2,2010,23.48800000000
+3,2017,R1,procammonia_2,2010,22.62140000000
+3,2018,R1,procammonia_2,2010,21.75470000000
+3,2019,R1,procammonia_2,2010,20.88800000000
 3,2020,R1,procammonia_2,2010,20.02140000000
 3,2021,R1,procammonia_2,2010,19.15470000000
 3,2022,R1,procammonia_2,2010,18.28800000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv
index 1d5bc6c8..4202f67e 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2025.csv
@@ -1,4 +1,19 @@
 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
@@ -14,6 +29,11 @@ asset,year,region,technology,installed,capacity
 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
@@ -69,6 +89,21 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+4,2011,R1,procammonia_2,2010,25.13330000000
+4,2012,R1,procammonia_2,2010,24.26670000000
+4,2013,R1,procammonia_2,2010,23.40000000000
+4,2014,R1,procammonia_2,2010,22.53330000000
+4,2015,R1,procammonia_2,2010,24.35470000000
+4,2016,R1,procammonia_2,2010,23.48800000000
+4,2017,R1,procammonia_2,2010,22.62140000000
+4,2018,R1,procammonia_2,2010,21.75470000000
+4,2019,R1,procammonia_2,2010,20.88800000000
+4,2020,R1,procammonia_2,2010,20.02140000000
+4,2021,R1,procammonia_2,2010,19.15470000000
+4,2022,R1,procammonia_2,2010,18.28800000000
+4,2023,R1,procammonia_2,2010,17.42140000000
+4,2024,R1,procammonia_2,2010,16.55470000000
 4,2025,R1,procammonia_2,2010,15.68800000000
 4,2026,R1,procammonia_2,2010,14.82140000000
 4,2027,R1,procammonia_2,2010,13.95470000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
index 84f7fc0f..bf7527ea 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
@@ -1,4 +1,24 @@
 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
@@ -9,6 +29,16 @@ asset,year,region,technology,installed,capacity
 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
@@ -19,6 +49,11 @@ asset,year,region,technology,installed,capacity
 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,2025,R1,procammonia_1,2020,8.70630000000
+2,2026,R1,procammonia_1,2020,8.70630000000
+2,2027,R1,procammonia_1,2020,8.70630000000
+2,2028,R1,procammonia_1,2020,8.70630000000
+2,2029,R1,procammonia_1,2020,8.70630000000
 2,2030,R1,procammonia_1,2020,8.70630000000
 2,2031,R1,procammonia_1,2020,8.70630000000
 2,2032,R1,procammonia_1,2020,8.70630000000
@@ -71,6 +106,26 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+5,2011,R1,procammonia_2,2010,25.13330000000
+5,2012,R1,procammonia_2,2010,24.26670000000
+5,2013,R1,procammonia_2,2010,23.40000000000
+5,2014,R1,procammonia_2,2010,22.53330000000
+5,2015,R1,procammonia_2,2010,24.35470000000
+5,2016,R1,procammonia_2,2010,23.48800000000
+5,2017,R1,procammonia_2,2010,22.62140000000
+5,2018,R1,procammonia_2,2010,21.75470000000
+5,2019,R1,procammonia_2,2010,20.88800000000
+5,2020,R1,procammonia_2,2010,20.02140000000
+5,2021,R1,procammonia_2,2010,19.15470000000
+5,2022,R1,procammonia_2,2010,18.28800000000
+5,2023,R1,procammonia_2,2010,17.42140000000
+5,2024,R1,procammonia_2,2010,16.55470000000
+5,2025,R1,procammonia_2,2010,15.68800000000
+5,2026,R1,procammonia_2,2010,14.82140000000
+5,2027,R1,procammonia_2,2010,13.95470000000
+5,2028,R1,procammonia_2,2010,13.08800000000
+5,2029,R1,procammonia_2,2010,12.22140000000
 5,2030,R1,procammonia_2,2010,11.35470000000
 5,2031,R1,procammonia_2,2010,10.48800000000
 5,2032,R1,procammonia_2,2010,9.62140000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
index f9cb9656..42a9280d 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
@@ -1,14 +1,64 @@
 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,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,2025,R1,procammonia_1,2020,8.70630000000
+2,2026,R1,procammonia_1,2020,8.70630000000
+2,2027,R1,procammonia_1,2020,8.70630000000
+2,2028,R1,procammonia_1,2020,8.70630000000
+2,2029,R1,procammonia_1,2020,8.70630000000
+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
@@ -19,6 +69,11 @@ asset,year,region,technology,installed,capacity
 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
@@ -65,6 +120,31 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+6,2011,R1,procammonia_2,2010,25.13330000000
+6,2012,R1,procammonia_2,2010,24.26670000000
+6,2013,R1,procammonia_2,2010,23.40000000000
+6,2014,R1,procammonia_2,2010,22.53330000000
+6,2015,R1,procammonia_2,2010,24.35470000000
+6,2016,R1,procammonia_2,2010,23.48800000000
+6,2017,R1,procammonia_2,2010,22.62140000000
+6,2018,R1,procammonia_2,2010,21.75470000000
+6,2019,R1,procammonia_2,2010,20.88800000000
+6,2020,R1,procammonia_2,2010,20.02140000000
+6,2021,R1,procammonia_2,2010,19.15470000000
+6,2022,R1,procammonia_2,2010,18.28800000000
+6,2023,R1,procammonia_2,2010,17.42140000000
+6,2024,R1,procammonia_2,2010,16.55470000000
+6,2025,R1,procammonia_2,2010,15.68800000000
+6,2026,R1,procammonia_2,2010,14.82140000000
+6,2027,R1,procammonia_2,2010,13.95470000000
+6,2028,R1,procammonia_2,2010,13.08800000000
+6,2029,R1,procammonia_2,2010,12.22140000000
+6,2030,R1,procammonia_2,2010,11.35470000000
+6,2031,R1,procammonia_2,2010,10.48800000000
+6,2032,R1,procammonia_2,2010,9.62140000000
+6,2033,R1,procammonia_2,2010,8.75470000000
+6,2034,R1,procammonia_2,2010,7.88800000000
 6,2035,R1,procammonia_2,2010,4.33330000000
 6,2036,R1,procammonia_2,2010,3.46670000000
 6,2037,R1,procammonia_2,2010,2.60000000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
index 75d1da9f..bb9456bb 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
@@ -1,9 +1,84 @@
 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,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,2025,R1,procammonia_1,2020,8.70630000000
+2,2026,R1,procammonia_1,2020,8.70630000000
+2,2027,R1,procammonia_1,2020,8.70630000000
+2,2028,R1,procammonia_1,2020,8.70630000000
+2,2029,R1,procammonia_1,2020,8.70630000000
+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
@@ -14,6 +89,11 @@ asset,year,region,technology,installed,capacity
 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
@@ -51,3 +131,33 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+7,2011,R1,procammonia_2,2010,25.13330000000
+7,2012,R1,procammonia_2,2010,24.26670000000
+7,2013,R1,procammonia_2,2010,23.40000000000
+7,2014,R1,procammonia_2,2010,22.53330000000
+7,2015,R1,procammonia_2,2010,24.35470000000
+7,2016,R1,procammonia_2,2010,23.48800000000
+7,2017,R1,procammonia_2,2010,22.62140000000
+7,2018,R1,procammonia_2,2010,21.75470000000
+7,2019,R1,procammonia_2,2010,20.88800000000
+7,2020,R1,procammonia_2,2010,20.02140000000
+7,2021,R1,procammonia_2,2010,19.15470000000
+7,2022,R1,procammonia_2,2010,18.28800000000
+7,2023,R1,procammonia_2,2010,17.42140000000
+7,2024,R1,procammonia_2,2010,16.55470000000
+7,2025,R1,procammonia_2,2010,15.68800000000
+7,2026,R1,procammonia_2,2010,14.82140000000
+7,2027,R1,procammonia_2,2010,13.95470000000
+7,2028,R1,procammonia_2,2010,13.08800000000
+7,2029,R1,procammonia_2,2010,12.22140000000
+7,2030,R1,procammonia_2,2010,11.35470000000
+7,2031,R1,procammonia_2,2010,10.48800000000
+7,2032,R1,procammonia_2,2010,9.62140000000
+7,2033,R1,procammonia_2,2010,8.75470000000
+7,2034,R1,procammonia_2,2010,7.88800000000
+7,2035,R1,procammonia_2,2010,4.33330000000
+7,2036,R1,procammonia_2,2010,3.46670000000
+7,2037,R1,procammonia_2,2010,2.60000000000
+7,2038,R1,procammonia_2,2010,1.73330000000
+7,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
index 39bf2bb1..0111670d 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
@@ -1,9 +1,104 @@
 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,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,2025,R1,procammonia_1,2020,8.70630000000
+2,2026,R1,procammonia_1,2020,8.70630000000
+2,2027,R1,procammonia_1,2020,8.70630000000
+2,2028,R1,procammonia_1,2020,8.70630000000
+2,2029,R1,procammonia_1,2020,8.70630000000
+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
@@ -11,6 +106,11 @@ asset,year,region,technology,installed,capacity
 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
@@ -39,3 +139,33 @@ asset,year,region,technology,installed,capacity
 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,2010,R1,procammonia_2,2010,26.00000000000
+8,2011,R1,procammonia_2,2010,25.13330000000
+8,2012,R1,procammonia_2,2010,24.26670000000
+8,2013,R1,procammonia_2,2010,23.40000000000
+8,2014,R1,procammonia_2,2010,22.53330000000
+8,2015,R1,procammonia_2,2010,24.35470000000
+8,2016,R1,procammonia_2,2010,23.48800000000
+8,2017,R1,procammonia_2,2010,22.62140000000
+8,2018,R1,procammonia_2,2010,21.75470000000
+8,2019,R1,procammonia_2,2010,20.88800000000
+8,2020,R1,procammonia_2,2010,20.02140000000
+8,2021,R1,procammonia_2,2010,19.15470000000
+8,2022,R1,procammonia_2,2010,18.28800000000
+8,2023,R1,procammonia_2,2010,17.42140000000
+8,2024,R1,procammonia_2,2010,16.55470000000
+8,2025,R1,procammonia_2,2010,15.68800000000
+8,2026,R1,procammonia_2,2010,14.82140000000
+8,2027,R1,procammonia_2,2010,13.95470000000
+8,2028,R1,procammonia_2,2010,13.08800000000
+8,2029,R1,procammonia_2,2010,12.22140000000
+8,2030,R1,procammonia_2,2010,11.35470000000
+8,2031,R1,procammonia_2,2010,10.48800000000
+8,2032,R1,procammonia_2,2010,9.62140000000
+8,2033,R1,procammonia_2,2010,8.75470000000
+8,2034,R1,procammonia_2,2010,7.88800000000
+8,2035,R1,procammonia_2,2010,4.33330000000
+8,2036,R1,procammonia_2,2010,3.46670000000
+8,2037,R1,procammonia_2,2010,2.60000000000
+8,2038,R1,procammonia_2,2010,1.73330000000
+8,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
index 4944fcf3..f7944ec9 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
@@ -1,10 +1,130 @@
 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,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,2025,R1,procammonia_1,2020,8.70630000000
+2,2026,R1,procammonia_1,2020,8.70630000000
+2,2027,R1,procammonia_1,2020,8.70630000000
+2,2028,R1,procammonia_1,2020,8.70630000000
+2,2029,R1,procammonia_1,2020,8.70630000000
+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,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
@@ -27,3 +147,33 @@ asset,year,region,technology,installed,capacity
 8,2069,R1,procammonia_1,2050,18.79580000000
 8,2070,R1,procammonia_1,2050,18.79580000000
 8,2074,R1,procammonia_1,2050,18.79580000000
+9,2010,R1,procammonia_2,2010,26.00000000000
+9,2011,R1,procammonia_2,2010,25.13330000000
+9,2012,R1,procammonia_2,2010,24.26670000000
+9,2013,R1,procammonia_2,2010,23.40000000000
+9,2014,R1,procammonia_2,2010,22.53330000000
+9,2015,R1,procammonia_2,2010,24.35470000000
+9,2016,R1,procammonia_2,2010,23.48800000000
+9,2017,R1,procammonia_2,2010,22.62140000000
+9,2018,R1,procammonia_2,2010,21.75470000000
+9,2019,R1,procammonia_2,2010,20.88800000000
+9,2020,R1,procammonia_2,2010,20.02140000000
+9,2021,R1,procammonia_2,2010,19.15470000000
+9,2022,R1,procammonia_2,2010,18.28800000000
+9,2023,R1,procammonia_2,2010,17.42140000000
+9,2024,R1,procammonia_2,2010,16.55470000000
+9,2025,R1,procammonia_2,2010,15.68800000000
+9,2026,R1,procammonia_2,2010,14.82140000000
+9,2027,R1,procammonia_2,2010,13.95470000000
+9,2028,R1,procammonia_2,2010,13.08800000000
+9,2029,R1,procammonia_2,2010,12.22140000000
+9,2030,R1,procammonia_2,2010,11.35470000000
+9,2031,R1,procammonia_2,2010,10.48800000000
+9,2032,R1,procammonia_2,2010,9.62140000000
+9,2033,R1,procammonia_2,2010,8.75470000000
+9,2034,R1,procammonia_2,2010,7.88800000000
+9,2035,R1,procammonia_2,2010,4.33330000000
+9,2036,R1,procammonia_2,2010,3.46670000000
+9,2037,R1,procammonia_2,2010,2.60000000000
+9,2038,R1,procammonia_2,2010,1.73330000000
+9,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/MCACapacity.csv b/tests/example_outputs/minimum_service/MCACapacity.csv
index f97de4f2..96ee586b 100644
--- a/tests/example_outputs/minimum_service/MCACapacity.csv
+++ b/tests/example_outputs/minimum_service/MCACapacity.csv
@@ -1,35 +1,35 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-procammonia_1,R1,R1,A1,industry,retrofit,2010,26.00000000000
-procammonia_2,R1,R1,A1,industry,retrofit,2010,26.00000000000
-procammonia_1,R1,R1,A1,industry,retrofit,2015,29.90000000000
-procammonia_2,R1,R1,A1,industry,retrofit,2015,24.35470000000
-procammonia_1,R1,R1,A1,industry,retrofit,2020,25.56670000000
-procammonia_1,R1,R1,A1,industry,retrofit,2020,8.66670000000
-procammonia_2,R1,R1,A1,industry,retrofit,2020,20.02140000000
-procammonia_1,R1,R1,A1,industry,retrofit,2025,21.23330000000
-procammonia_1,R1,R1,A1,industry,retrofit,2025,8.66670000000
-procammonia_1,R1,R1,A1,industry,retrofit,2025,8.70630000000
-procammonia_2,R1,R1,A1,industry,retrofit,2025,15.68800000000
-procammonia_1,R1,R1,A1,industry,retrofit,2030,16.90000000000
-procammonia_1,R1,R1,A1,industry,retrofit,2030,8.66670000000
-procammonia_1,R1,R1,A1,industry,retrofit,2030,8.70630000000
-procammonia_1,R1,R1,A1,industry,retrofit,2030,8.70630000000
-procammonia_2,R1,R1,A1,industry,retrofit,2030,11.35470000000
-procammonia_1,R1,R1,A1,industry,retrofit,2035,4.33330000000
-procammonia_1,R1,R1,A1,industry,retrofit,2035,8.66670000000
-procammonia_1,R1,R1,A1,industry,retrofit,2035,8.70630000000
-procammonia_1,R1,R1,A1,industry,retrofit,2035,8.70630000000
-procammonia_1,R1,R1,A1,industry,retrofit,2035,18.79580000000
-procammonia_2,R1,R1,A1,industry,retrofit,2035,4.33330000000
-procammonia_1,R1,R1,A1,industry,retrofit,2040,8.70630000000
-procammonia_1,R1,R1,A1,industry,retrofit,2040,8.70630000000
-procammonia_1,R1,R1,A1,industry,retrofit,2040,18.79580000000
-procammonia_1,R1,R1,A1,industry,retrofit,2040,16.54120000000
-procammonia_1,R1,R1,A1,industry,retrofit,2045,8.70630000000
-procammonia_1,R1,R1,A1,industry,retrofit,2045,18.79580000000
-procammonia_1,R1,R1,A1,industry,retrofit,2045,16.54120000000
-procammonia_1,R1,R1,A1,industry,retrofit,2045,7.21970000000
-procammonia_1,R1,R1,A1,industry,retrofit,2050,18.79580000000
-procammonia_1,R1,R1,A1,industry,retrofit,2050,16.54120000000
-procammonia_1,R1,R1,A1,industry,retrofit,2050,7.21970000000
-procammonia_1,R1,R1,A1,industry,retrofit,2050,7.21970000000
+procammonia_1,R1,R1,A1,industry,newcapa,2010,26.00000000000
+procammonia_2,R1,R1,A1,industry,newcapa,2010,26.00000000000
+procammonia_1,R1,R1,A1,industry,newcapa,2015,29.90000000000
+procammonia_2,R1,R1,A1,industry,newcapa,2015,24.35470000000
+procammonia_1,R1,R1,A1,industry,newcapa,2020,25.56670000000
+procammonia_1,R1,R1,A1,industry,newcapa,2020,8.66670000000
+procammonia_2,R1,R1,A1,industry,newcapa,2020,20.02140000000
+procammonia_1,R1,R1,A1,industry,newcapa,2025,21.23330000000
+procammonia_1,R1,R1,A1,industry,newcapa,2025,8.66670000000
+procammonia_1,R1,R1,A1,industry,newcapa,2025,8.70630000000
+procammonia_2,R1,R1,A1,industry,newcapa,2025,15.68800000000
+procammonia_1,R1,R1,A1,industry,newcapa,2030,16.90000000000
+procammonia_1,R1,R1,A1,industry,newcapa,2030,8.66670000000
+procammonia_1,R1,R1,A1,industry,newcapa,2030,8.70630000000
+procammonia_1,R1,R1,A1,industry,newcapa,2030,8.70630000000
+procammonia_2,R1,R1,A1,industry,newcapa,2030,11.35470000000
+procammonia_1,R1,R1,A1,industry,newcapa,2035,4.33330000000
+procammonia_1,R1,R1,A1,industry,newcapa,2035,8.66670000000
+procammonia_1,R1,R1,A1,industry,newcapa,2035,8.70630000000
+procammonia_1,R1,R1,A1,industry,newcapa,2035,8.70630000000
+procammonia_1,R1,R1,A1,industry,newcapa,2035,18.79580000000
+procammonia_2,R1,R1,A1,industry,newcapa,2035,4.33330000000
+procammonia_1,R1,R1,A1,industry,newcapa,2040,8.70630000000
+procammonia_1,R1,R1,A1,industry,newcapa,2040,8.70630000000
+procammonia_1,R1,R1,A1,industry,newcapa,2040,18.79580000000
+procammonia_1,R1,R1,A1,industry,newcapa,2040,16.54120000000
+procammonia_1,R1,R1,A1,industry,newcapa,2045,8.70630000000
+procammonia_1,R1,R1,A1,industry,newcapa,2045,18.79580000000
+procammonia_1,R1,R1,A1,industry,newcapa,2045,16.54120000000
+procammonia_1,R1,R1,A1,industry,newcapa,2045,7.21970000000
+procammonia_1,R1,R1,A1,industry,newcapa,2050,18.79580000000
+procammonia_1,R1,R1,A1,industry,newcapa,2050,16.54120000000
+procammonia_1,R1,R1,A1,industry,newcapa,2050,7.21970000000
+procammonia_1,R1,R1,A1,industry,newcapa,2050,7.21970000000
diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
index 9cf2795a..ffa4c461 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,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
+0,A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2020.00000000000,R1,industry,9517.27318220130,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+1,A1,4.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,4,2025.00000000000,R1,industry,9517.27318876022,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+2,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,5,2030.00000000000,R1,industry,20546.69554806604,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+3,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2035.00000000000,R1,industry,18081.97813945043,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+4,A1,3.00000000000,newcapa,PRODUCT,ammonia,R1,11,2020.00000000000,R1,industry,2.39422578709,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+5,A1,4.00000000000,newcapa,PRODUCT,ammonia,R1,12,2025.00000000000,R1,industry,2.39422578874,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+6,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,13,2030.00000000000,R1,industry,5.16885744255,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+7,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,14,2035.00000000000,R1,industry,4.54881745162,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+8,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,43,2020.00000000000,R1,industry,9805.67539984377,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+9,A1,4.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2025.00000000000,R1,industry,9805.67540660143,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+10,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2030.00000000000,R1,industry,21169.32268588623,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+11,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,46,2035.00000000000,R1,industry,18629.91687094893,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+12,A1,3.00000000000,newcapa,PRODUCT,ammonia,R1,51,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+13,A1,4.00000000000,newcapa,PRODUCT,ammonia,R1,52,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+14,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,53,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+15,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,54,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+16,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,83,2020.00000000000,R1,industry,9517.27318220130,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+17,A1,4.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,84,2025.00000000000,R1,industry,9517.27318876022,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+18,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,85,2030.00000000000,R1,industry,20546.69554806604,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+19,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,86,2035.00000000000,R1,industry,18081.97813945043,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+20,A1,3.00000000000,newcapa,PRODUCT,ammonia,R1,91,2020.00000000000,R1,industry,2.39422578709,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+21,A1,4.00000000000,newcapa,PRODUCT,ammonia,R1,92,2025.00000000000,R1,industry,2.39422578874,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+22,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,93,2030.00000000000,R1,industry,5.16885744255,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+23,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,94,2035.00000000000,R1,industry,4.54881745162,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+0,A1,4.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,4,2025.00000000000,R1,industry,9440.27259691583,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+1,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,5,2030.00000000000,R1,industry,20380.46014783439,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+2,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2035.00000000000,R1,industry,17935.68381849941,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+3,A1,7.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,7,2040.00000000000,R1,industry,7828.40914377241,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+4,A1,4.00000000000,newcapa,PRODUCT,ammonia,R1,13,2025.00000000000,R1,industry,2.39422578879,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+5,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,14,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+6,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,15,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+7,A1,7.00000000000,newcapa,PRODUCT,ammonia,R1,16,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+8,A1,4.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,49,2025.00000000000,R1,industry,9726.34146328611,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+9,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2030.00000000000,R1,industry,20998.04984884583,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+10,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2035.00000000000,R1,industry,18479.18938837144,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+11,A1,7.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2040.00000000000,R1,industry,8065.63366311239,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+12,A1,4.00000000000,newcapa,PRODUCT,ammonia,R1,58,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+13,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,59,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+14,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,60,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+15,A1,7.00000000000,newcapa,PRODUCT,ammonia,R1,61,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+16,A1,4.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,94,2025.00000000000,R1,industry,9440.27259691583,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+17,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,95,2030.00000000000,R1,industry,20380.46014783439,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+18,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,96,2035.00000000000,R1,industry,17935.68381849941,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+19,A1,7.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,97,2040.00000000000,R1,industry,7828.40914377241,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+20,A1,4.00000000000,newcapa,PRODUCT,ammonia,R1,103,2025.00000000000,R1,industry,2.39422578879,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+21,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,104,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+22,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,105,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+23,A1,7.00000000000,newcapa,PRODUCT,ammonia,R1,106,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+0,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,5,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+1,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+2,A1,7.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,7,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+3,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,8,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+4,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,15,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+5,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,16,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+6,A1,7.00000000000,newcapa,PRODUCT,ammonia,R1,17,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+7,A1,8.00000000000,newcapa,PRODUCT,ammonia,R1,18,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+8,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,55,2030.00000000000,R1,industry,20826.77701180542,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+9,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,56,2035.00000000000,R1,industry,18328.46190579394,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+10,A1,7.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,57,2040.00000000000,R1,industry,7999.84546040052,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+11,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,58,2045.00000000000,R1,industry,7999.84546704883,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+12,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,65,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+13,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,66,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+14,A1,7.00000000000,newcapa,PRODUCT,ammonia,R1,67,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+15,A1,8.00000000000,newcapa,PRODUCT,ammonia,R1,68,2045.00000000000,R1,industry,2.04559221537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+16,A1,5.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,105,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+17,A1,6.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,106,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+18,A1,7.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,107,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+19,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,108,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+20,A1,5.00000000000,newcapa,PRODUCT,ammonia,R1,115,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+21,A1,6.00000000000,newcapa,PRODUCT,ammonia,R1,116,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+22,A1,7.00000000000,newcapa,PRODUCT,ammonia,R1,117,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+23,A1,8.00000000000,newcapa,PRODUCT,ammonia,R1,118,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/2025.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
index d1fb99f5..d1ee882b 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
@@ -1,9 +1,4 @@
 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,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 e84ef6dc..c7ef92d2 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
@@ -1,15 +1,9 @@
 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,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
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
index ccf34c3d..c7ef92d2 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
@@ -1,13 +1,9 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
index 79fdfddb..c7ef92d2 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
@@ -1,11 +1,9 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
index b2ca194f..c9a529f3 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
@@ -1,9 +1,13 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
+2,2050,R1,gassupply1,2045,3.62630000000
+2,2069,R1,gassupply1,2045,3.62630000000
+2,2070,R1,gassupply1,2045,3.62630000000
+2,2084,R1,gassupply1,2045,3.62630000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
index 4f3e3a18..c9a529f3 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
@@ -1,9 +1,13 @@
 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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,6.68000000000
+1,2040,R1,gassupply1,2030,6.68000000000
+1,2045,R1,gassupply1,2030,6.68000000000
+1,2050,R1,gassupply1,2030,6.68000000000
+1,2069,R1,gassupply1,2030,6.68000000000
+2,2050,R1,gassupply1,2045,3.62630000000
+2,2069,R1,gassupply1,2045,3.62630000000
+2,2070,R1,gassupply1,2045,3.62630000000
+2,2084,R1,gassupply1,2045,3.62630000000
diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv
index ae8cf352..36be371a 100644
--- a/tests/example_outputs/multiple_agents/MCACapacity.csv
+++ b/tests/example_outputs/multiple_agents/MCACapacity.csv
@@ -1,74 +1,68 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.05000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,3.45000000000
-gasboiler,R1,R1,A2,residential,retrofit,2030,2.05000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,3.45000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.05000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,3.45000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,12.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2035,2.05000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,3.45000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,0.45500000000
-heatpump,R1,R1,A1,residential,retrofit,2040,12.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,8.04500000000
-gasboiler,R1,R1,A2,residential,retrofit,2040,0.45500000000
-heatpump,R1,R1,A2,residential,retrofit,2040,12.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,8.04500000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-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.45500000000
-heatpump,R1,R1,A1,residential,retrofit,2045,8.04500000000
-heatpump,R1,R1,A1,residential,retrofit,2045,15.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2045,0.45500000000
-heatpump,R1,R1,A2,residential,retrofit,2045,8.04500000000
-heatpump,R1,R1,A2,residential,retrofit,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-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,15.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,11.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,15.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
+gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,7.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.68000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.68000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.68000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.68000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,3.62630000000
diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv
index d72a9e0c..9da3fbc1 100644
--- a/tests/example_outputs/multiple_agents/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/MCAPrices.csv
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.40060000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.42450000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.31900000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.58170000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.61760000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.48000000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.40060000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.42450000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.31900000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.58170000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.61760000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.48000000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.12530000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.19710000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.05330000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.96920000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.76290000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.81070000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69860000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.64210000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.66880000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.70880000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.57540000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.88800000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.94800000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.76670000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.66880000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.70880000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.57540000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.88800000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.94800000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.76670000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.54600000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.66620000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.51430000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.35450000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.10730000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,12.18730000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.06810000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,51.96030000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.46950000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,9.53230000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.35880000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.71210000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.80630000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.56390000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.46950000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.53230000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.35880000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.71210000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.80630000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.56390000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.44080000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.62950000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.34960000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.20200000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.95490000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,10.08050000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.87300000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.77280000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.71450000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.79720000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.16810000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.97820000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,8.10230000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.37600000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.71450000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.79720000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.16810000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.97820000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.10230000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.37600000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.77020000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.01900000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.17030000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.03120000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.24200000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,8.40760000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.68450000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.58920000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.31290000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,6.49310000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.60170000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.59450000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,6.86510000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,26.80530000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.31290000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,6.49310000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.60170000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.59450000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.86510000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.80530000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.44070000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.98280000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.56120000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.45580000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.87640000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,7.23730000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.08910000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.01550000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
index bdc2b6a7..089b2630 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2025,R1,windturbine,2020,10
+1,2030,R1,windturbine,2020,10
+1,2035,R1,windturbine,2020,10
+1,2040,R1,windturbine,2020,10
+1,2045,R1,windturbine,2020,10
+1,2049,R1,windturbine,2020,10
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
index 55cc9842..3578c2db 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
@@ -1,24 +1,36 @@
 asset,year,region,technology,installed,capacity
-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,2054,R1,gasCCGT,2020,3.00000000000
-0,2055,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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
index a6c53c55..ec5a6f8f 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
@@ -1,30 +1,44 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
+4,2035,R1,windturbine,2030,7
+4,2040,R1,windturbine,2030,7
+4,2045,R1,windturbine,2030,7
+4,2049,R1,windturbine,2030,7
+4,2050,R1,windturbine,2030,7
+4,2054,R1,windturbine,2030,7
+4,2055,R1,windturbine,2030,7
+4,2059,R1,windturbine,2030,7
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
index 60e997ea..8d9c15b2 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
@@ -1,36 +1,53 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
+4,2035,R1,windturbine,2030,7
+4,2040,R1,windturbine,2030,7
+4,2045,R1,windturbine,2030,7
+4,2049,R1,windturbine,2030,7
+4,2050,R1,windturbine,2030,7
+4,2054,R1,windturbine,2030,7
+4,2055,R1,windturbine,2030,7
+4,2059,R1,windturbine,2030,7
+5,2040,R1,windturbine,2035,6
+5,2045,R1,windturbine,2035,6
+5,2049,R1,windturbine,2035,6
+5,2050,R1,windturbine,2035,6
+5,2054,R1,windturbine,2035,6
+5,2055,R1,windturbine,2035,6
+5,2059,R1,windturbine,2035,6
+5,2060,R1,windturbine,2035,6
+5,2064,R1,windturbine,2035,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
index 1cba828b..0ba925e6 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
@@ -1,42 +1,63 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2025,R1,windturbine,2020,10
+2,2030,R1,windturbine,2020,10
+2,2035,R1,windturbine,2020,10
+2,2040,R1,windturbine,2020,10
+2,2045,R1,windturbine,2020,10
+2,2049,R1,windturbine,2020,10
+3,2030,R1,windturbine,2025,10
+3,2035,R1,windturbine,2025,10
+3,2040,R1,windturbine,2025,10
+3,2045,R1,windturbine,2025,10
+3,2049,R1,windturbine,2025,10
+3,2050,R1,windturbine,2025,10
+3,2054,R1,windturbine,2025,10
+4,2035,R1,windturbine,2030,7
+4,2040,R1,windturbine,2030,7
+4,2045,R1,windturbine,2030,7
+4,2049,R1,windturbine,2030,7
+4,2050,R1,windturbine,2030,7
+4,2054,R1,windturbine,2030,7
+4,2055,R1,windturbine,2030,7
+4,2059,R1,windturbine,2030,7
+5,2040,R1,windturbine,2035,6
+5,2045,R1,windturbine,2035,6
+5,2049,R1,windturbine,2035,6
+5,2050,R1,windturbine,2035,6
+5,2054,R1,windturbine,2035,6
+5,2055,R1,windturbine,2035,6
+5,2059,R1,windturbine,2035,6
+5,2060,R1,windturbine,2035,6
+5,2064,R1,windturbine,2035,6
+6,2045,R1,windturbine,2040,6
+6,2049,R1,windturbine,2040,6
+6,2050,R1,windturbine,2040,6
+6,2054,R1,windturbine,2040,6
+6,2055,R1,windturbine,2040,6
+6,2059,R1,windturbine,2040,6
+6,2060,R1,windturbine,2040,6
+6,2064,R1,windturbine,2040,6
+6,2065,R1,windturbine,2040,6
+6,2069,R1,windturbine,2040,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
index 69e55cf6..99ff9edf 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
@@ -1,47 +1,85 @@
 asset,year,region,technology,installed,capacity
-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,2045,R1,windturbine,2020,10.00000000000
-1,2049,R1,windturbine,2020,10.00000000000
-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,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,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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2050,R1,gasCCGT,2045,2
+2,2054,R1,gasCCGT,2045,2
+2,2055,R1,gasCCGT,2045,2
+2,2059,R1,gasCCGT,2045,2
+2,2060,R1,gasCCGT,2045,2
+2,2064,R1,gasCCGT,2045,2
+2,2065,R1,gasCCGT,2045,2
+2,2069,R1,gasCCGT,2045,2
+2,2070,R1,gasCCGT,2045,2
+2,2074,R1,gasCCGT,2045,2
+2,2075,R1,gasCCGT,2045,2
+2,2084,R1,gasCCGT,2045,2
+3,2025,R1,windturbine,2020,10
+3,2030,R1,windturbine,2020,10
+3,2035,R1,windturbine,2020,10
+3,2040,R1,windturbine,2020,10
+3,2045,R1,windturbine,2020,10
+3,2049,R1,windturbine,2020,10
+4,2030,R1,windturbine,2025,10
+4,2035,R1,windturbine,2025,10
+4,2040,R1,windturbine,2025,10
+4,2045,R1,windturbine,2025,10
+4,2049,R1,windturbine,2025,10
+4,2050,R1,windturbine,2025,10
+4,2054,R1,windturbine,2025,10
+5,2035,R1,windturbine,2030,7
+5,2040,R1,windturbine,2030,7
+5,2045,R1,windturbine,2030,7
+5,2049,R1,windturbine,2030,7
+5,2050,R1,windturbine,2030,7
+5,2054,R1,windturbine,2030,7
+5,2055,R1,windturbine,2030,7
+5,2059,R1,windturbine,2030,7
+6,2040,R1,windturbine,2035,6
+6,2045,R1,windturbine,2035,6
+6,2049,R1,windturbine,2035,6
+6,2050,R1,windturbine,2035,6
+6,2054,R1,windturbine,2035,6
+6,2055,R1,windturbine,2035,6
+6,2059,R1,windturbine,2035,6
+6,2060,R1,windturbine,2035,6
+6,2064,R1,windturbine,2035,6
+7,2045,R1,windturbine,2040,6
+7,2049,R1,windturbine,2040,6
+7,2050,R1,windturbine,2040,6
+7,2054,R1,windturbine,2040,6
+7,2055,R1,windturbine,2040,6
+7,2059,R1,windturbine,2040,6
+7,2060,R1,windturbine,2040,6
+7,2064,R1,windturbine,2040,6
+7,2065,R1,windturbine,2040,6
+7,2069,R1,windturbine,2040,6
+8,2050,R1,windturbine,2045,10
+8,2054,R1,windturbine,2045,10
+8,2055,R1,windturbine,2045,10
+8,2059,R1,windturbine,2045,10
+8,2060,R1,windturbine,2045,10
+8,2064,R1,windturbine,2045,10
+8,2065,R1,windturbine,2045,10
+8,2069,R1,windturbine,2045,10
+8,2070,R1,windturbine,2045,10
+8,2074,R1,windturbine,2045,10
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
index 13bd77c9..c4509cb0 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
@@ -1,45 +1,97 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,4
+0,2030,R1,gasCCGT,2020,3
+0,2035,R1,gasCCGT,2020,3
+0,2040,R1,gasCCGT,2020,3
+0,2045,R1,gasCCGT,2020,3
+0,2049,R1,gasCCGT,2020,3
+0,2050,R1,gasCCGT,2020,3
+0,2054,R1,gasCCGT,2020,3
+0,2055,R1,gasCCGT,2020,3
+0,2059,R1,gasCCGT,2020,3
+1,2030,R1,gasCCGT,2025,1
+1,2035,R1,gasCCGT,2025,1
+1,2040,R1,gasCCGT,2025,1
+1,2045,R1,gasCCGT,2025,1
+1,2049,R1,gasCCGT,2025,1
+1,2050,R1,gasCCGT,2025,1
+1,2054,R1,gasCCGT,2025,1
+1,2055,R1,gasCCGT,2025,1
+1,2059,R1,gasCCGT,2025,1
+1,2060,R1,gasCCGT,2025,1
+1,2064,R1,gasCCGT,2025,1
+2,2050,R1,gasCCGT,2045,2
+2,2054,R1,gasCCGT,2045,2
+2,2055,R1,gasCCGT,2045,2
+2,2059,R1,gasCCGT,2045,2
+2,2060,R1,gasCCGT,2045,2
+2,2064,R1,gasCCGT,2045,2
+2,2065,R1,gasCCGT,2045,2
+2,2069,R1,gasCCGT,2045,2
+2,2070,R1,gasCCGT,2045,2
+2,2074,R1,gasCCGT,2045,2
+2,2075,R1,gasCCGT,2045,2
+2,2079,R1,gasCCGT,2045,2
+2,2080,R1,gasCCGT,2045,2
+2,2084,R1,gasCCGT,2045,2
+4,2025,R1,windturbine,2020,10
+4,2030,R1,windturbine,2020,10
+4,2035,R1,windturbine,2020,10
+4,2040,R1,windturbine,2020,10
+4,2045,R1,windturbine,2020,10
+4,2049,R1,windturbine,2020,10
+5,2030,R1,windturbine,2025,10
+5,2035,R1,windturbine,2025,10
+5,2040,R1,windturbine,2025,10
+5,2045,R1,windturbine,2025,10
+5,2049,R1,windturbine,2025,10
+5,2050,R1,windturbine,2025,10
+5,2054,R1,windturbine,2025,10
+6,2035,R1,windturbine,2030,7
+6,2040,R1,windturbine,2030,7
+6,2045,R1,windturbine,2030,7
+6,2049,R1,windturbine,2030,7
+6,2050,R1,windturbine,2030,7
+6,2054,R1,windturbine,2030,7
+6,2055,R1,windturbine,2030,7
+6,2059,R1,windturbine,2030,7
+7,2040,R1,windturbine,2035,6
+7,2045,R1,windturbine,2035,6
+7,2049,R1,windturbine,2035,6
+7,2050,R1,windturbine,2035,6
+7,2054,R1,windturbine,2035,6
+7,2055,R1,windturbine,2035,6
+7,2059,R1,windturbine,2035,6
+7,2060,R1,windturbine,2035,6
+7,2064,R1,windturbine,2035,6
+8,2045,R1,windturbine,2040,6
+8,2049,R1,windturbine,2040,6
+8,2050,R1,windturbine,2040,6
+8,2054,R1,windturbine,2040,6
+8,2055,R1,windturbine,2040,6
+8,2059,R1,windturbine,2040,6
+8,2060,R1,windturbine,2040,6
+8,2064,R1,windturbine,2040,6
+8,2065,R1,windturbine,2040,6
+8,2069,R1,windturbine,2040,6
+9,2050,R1,windturbine,2045,10
+9,2054,R1,windturbine,2045,10
+9,2055,R1,windturbine,2045,10
+9,2059,R1,windturbine,2045,10
+9,2060,R1,windturbine,2045,10
+9,2064,R1,windturbine,2045,10
+9,2065,R1,windturbine,2045,10
+9,2069,R1,windturbine,2045,10
+9,2070,R1,windturbine,2045,10
+9,2074,R1,windturbine,2045,10
+10,2055,R1,windturbine,2050,10
+10,2059,R1,windturbine,2050,10
+10,2060,R1,windturbine,2050,10
+10,2064,R1,windturbine,2050,10
+10,2065,R1,windturbine,2050,10
+10,2069,R1,windturbine,2050,10
+10,2070,R1,windturbine,2050,10
+10,2074,R1,windturbine,2050,10
+10,2075,R1,windturbine,2050,10
+10,2079,R1,windturbine,2050,10
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv
index 2eb0ec15..9d7ceeff 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv
index 22334ba5..b636c62a 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2030.csv
@@ -1,14 +1,13 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
 1,2030,R1,heatpump,2020,19.00000000000
 1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
 3,2035,R1,heatpump,2030,25.00000000000
 3,2039,R1,heatpump,2030,25.00000000000
 3,2040,R1,heatpump,2030,25.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv
index 452c6c8a..e9ff1ceb 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
 3,2035,R1,heatpump,2030,25.00000000000
 3,2039,R1,heatpump,2030,25.00000000000
 3,2040,R1,heatpump,2030,25.00000000000
 3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv
index e3ecc1d0..2d54c0aa 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv
index 82b22d9b..5924d03b 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
+6,2050,R1,heatpump,2045,23.00000000000
+6,2054,R1,heatpump,2045,23.00000000000
+6,2055,R1,heatpump,2045,23.00000000000
+6,2059,R1,heatpump,2045,23.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
index 42f4be20..be30eaf2 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
@@ -1,11 +1,30 @@
 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
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
+6,2050,R1,heatpump,2045,23.00000000000
+6,2054,R1,heatpump,2045,23.00000000000
+6,2055,R1,heatpump,2045,23.00000000000
+6,2059,R1,heatpump,2045,23.00000000000
+7,2055,R1,heatpump,2050,31.00000000000
+7,2059,R1,heatpump,2050,31.00000000000
+7,2060,R1,heatpump,2050,31.00000000000
+7,2064,R1,heatpump,2050,31.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
index bfe116d0..b07adde6 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
@@ -1,43 +1,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+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.61110000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+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.91670000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+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.61110000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+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.91670000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+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.83330000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+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,1.22220000000
 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 82873caa..33951ce2 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
@@ -1,49 +1,25 @@
 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,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
 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,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
 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,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
 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,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
 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,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
 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,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
 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 741ea3c6..c606a299 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
@@ -1,49 +1,25 @@
 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,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
 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
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
 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
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
 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
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
 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
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
 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
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
 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
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
index c802f340..d66038bc 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
@@ -1,49 +1,25 @@
 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
+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.94440000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+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.41670000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+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.94440000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+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.41670000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+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.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+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.88890000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
index c7be86b2..2f0389d3 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
@@ -1,37 +1,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
index 8c187153..3b6658d8 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000

From c6e9c4950913e5504bdd1e40da40bb9d3acb205d Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 19 Jun 2024 15:01:04 +0100
Subject: [PATCH 241/419] Re-run tutorial models

---
 .../Results/Gas/Capacity/2025.csv             |   1 +
 .../Results/Gas/Capacity/2030.csv             |   7 +-
 .../Results/Gas/Capacity/2035.csv             |   8 +-
 .../Results/Gas/Capacity/2040.csv             |   7 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../1-introduction/Results/MCACapacity.csv    | 101 +-
 .../1-introduction/Results/MCAPrices.csv      | 192 ++--
 .../Results/Power/Capacity/2020.csv           |  28 +-
 .../Results/Power/Capacity/2025.csv           |  48 +-
 .../Results/Power/Capacity/2030.csv           |  61 +-
 .../Results/Power/Capacity/2035.csv           |  76 +-
 .../Results/Power/Capacity/2040.csv           |  92 +-
 .../Results/Power/Capacity/2045.csv           | 127 ++-
 .../Results/Power/Capacity/2050.csv           | 145 ++-
 .../Results/Residential/Capacity/2020.csv     |  10 +-
 .../Results/Residential/Capacity/2025.csv     |  21 +-
 .../Results/Residential/Capacity/2030.csv     |  27 +-
 .../Results/Residential/Capacity/2035.csv     |  33 +-
 .../Results/Residential/Capacity/2040.csv     |  35 +-
 .../Results/Residential/Capacity/2045.csv     |  37 +-
 .../Results/Residential/Capacity/2050.csv     |  39 +-
 .../Results/Residential/Supply/2025.csv       |  48 +-
 .../Results/Residential/Supply/2030.csv       |  72 +-
 .../Results/Residential/Supply/2035.csv       |  72 +-
 .../Results/Residential/Supply/2040.csv       |  72 +-
 .../Results/Residential/Supply/2045.csv       |  60 +-
 .../Results/Residential/Supply/2050.csv       |  48 +-
 .../2-scenario/Results/Gas/Capacity/2025.csv  |   1 +
 .../2-scenario/Results/Gas/Capacity/2030.csv  |   7 +-
 .../2-scenario/Results/Gas/Capacity/2035.csv  |   8 +-
 .../2-scenario/Results/Gas/Capacity/2040.csv  |   7 +-
 .../2-scenario/Results/Gas/Capacity/2045.csv  |   8 +-
 .../2-scenario/Results/Gas/Capacity/2050.csv  |   8 +-
 .../2-scenario/Results/MCACapacity.csv        | 104 +-
 .../2-scenario/Results/MCAPrices.csv          | 180 ++--
 .../Results/Power/Capacity/2025.csv           |  22 +-
 .../Results/Power/Capacity/2030.csv           |  25 +-
 .../Results/Power/Capacity/2035.csv           |  53 +-
 .../Results/Power/Capacity/2040.csv           |  71 +-
 .../Results/Power/Capacity/2045.csv           | 132 ++-
 .../Results/Power/Capacity/2050.csv           | 148 ++-
 .../Results/Residential/Capacity/2020.csv     |  10 +-
 .../Results/Residential/Capacity/2025.csv     |  21 +-
 .../Results/Residential/Capacity/2030.csv     |  27 +-
 .../Results/Residential/Capacity/2035.csv     |  33 +-
 .../Results/Residential/Capacity/2040.csv     |  35 +-
 .../Results/Residential/Capacity/2045.csv     |  37 +-
 .../Results/Residential/Capacity/2050.csv     |  39 +-
 .../Results/Residential/Supply/2025.csv       |  48 +-
 .../Results/Residential/Supply/2030.csv       |  72 +-
 .../Results/Residential/Supply/2035.csv       |  72 +-
 .../Results/Residential/Supply/2040.csv       |  72 +-
 .../Results/Residential/Supply/2045.csv       |  60 +-
 .../Results/Residential/Supply/2050.csv       |  48 +-
 .../Results/Gas/Capacity/2025.csv             |   1 +
 .../Results/Gas/Capacity/2030.csv             |   7 +-
 .../Results/Gas/Capacity/2035.csv             |   8 +-
 .../Results/Gas/Capacity/2040.csv             |   7 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   | 178 ++--
 .../1-single-objective/Results/MCAPrices.csv  | 180 ++--
 .../Results/Power/Capacity/2025.csv           |  22 +-
 .../Results/Power/Capacity/2030.csv           |  24 +-
 .../Results/Power/Capacity/2035.csv           |  66 +-
 .../Results/Power/Capacity/2040.csv           |  83 +-
 .../Results/Power/Capacity/2045.csv           |  99 +-
 .../Results/Power/Capacity/2050.csv           | 119 ++-
 .../Results/Residential/Capacity/2025.csv     |  19 +-
 .../Results/Residential/Capacity/2030.csv     |  15 +-
 .../Results/Residential/Capacity/2035.csv     |  25 +-
 .../Results/Residential/Capacity/2040.csv     |  35 +-
 .../Results/Residential/Capacity/2045.csv     |  37 +-
 .../Results/Residential/Capacity/2050.csv     |  39 +-
 .../Results/Residential/Supply/2025.csv       |  48 +-
 .../Results/Residential/Supply/2030.csv       |  48 +-
 .../Results/Residential/Supply/2035.csv       |  48 +-
 .../Results/Residential/Supply/2040.csv       |  72 +-
 .../Results/Residential/Supply/2045.csv       |  60 +-
 .../Results/Residential/Supply/2050.csv       |  48 +-
 .../Results/Gas/Capacity/2025.csv             |   1 +
 .../Results/Gas/Capacity/2030.csv             |   7 +-
 .../Results/Gas/Capacity/2035.csv             |   8 +-
 .../Results/Gas/Capacity/2040.csv             |   7 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   | 132 +--
 .../Results/MCAPrices.csv                     | 188 ++--
 .../Results/Power/Capacity/2020.csv           |  12 +-
 .../Results/Power/Capacity/2025.csv           |  27 +-
 .../Results/Power/Capacity/2030.csv           |  35 +-
 .../Results/Power/Capacity/2035.csv           |  42 +-
 .../Results/Power/Capacity/2040.csv           |  56 +-
 .../Results/Power/Capacity/2045.csv           |  80 +-
 .../Results/Power/Capacity/2050.csv           |  90 +-
 .../Results/Residential/Capacity/2020.csv     |   6 +-
 .../Results/Residential/Capacity/2025.csv     |   7 +-
 .../Results/Residential/Capacity/2030.csv     |  16 +-
 .../Results/Residential/Capacity/2035.csv     |  14 +-
 .../Results/Residential/Capacity/2040.csv     |  21 +-
 .../Results/Residential/Capacity/2045.csv     |  17 +-
 .../Results/Residential/Capacity/2050.csv     |  21 +-
 .../Results/Residential/Supply/2020.csv       |  36 +-
 .../Results/Residential/Supply/2025.csv       |  36 +-
 .../Results/Residential/Supply/2030.csv       |  24 +-
 .../Results/Residential/Supply/2035.csv       |  48 +-
 .../Results/Residential/Supply/2040.csv       |  48 +-
 .../Results/Residential/Supply/2045.csv       |  48 +-
 .../Results/Residential/Supply/2050.csv       |  48 +-
 .../Results/Gas/Capacity/2025.csv             |   2 +
 .../Results/Gas/Capacity/2030.csv             |  16 +-
 .../Results/Gas/Capacity/2035.csv             |  16 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  16 +-
 .../Results/Gas/Capacity/2050.csv             |  16 +-
 .../1-new-region/Results/MCACapacity.csv      | 196 ++--
 .../1-new-region/Results/MCAPrices.csv        | 360 +++----
 .../Results/Power/Capacity/2025.csv           |  86 +-
 .../Results/Power/Capacity/2030.csv           |  75 +-
 .../Results/Power/Capacity/2035.csv           | 119 ++-
 .../Results/Power/Capacity/2040.csv           | 154 +--
 .../Results/Power/Capacity/2045.csv           | 259 +++--
 .../Results/Power/Capacity/2050.csv           | 297 ++++--
 .../Results/Residential/Capacity/2020.csv     |  22 +-
 .../Results/Residential/Capacity/2025.csv     |  44 +-
 .../Results/Residential/Capacity/2030.csv     |  56 +-
 .../Results/Residential/Capacity/2035.csv     |  68 +-
 .../Results/Residential/Capacity/2040.csv     |  72 +-
 .../Results/Residential/Capacity/2045.csv     |  76 +-
 .../Results/Residential/Capacity/2050.csv     |  78 +-
 .../Results/Residential/Supply/2020.csv       | 120 +--
 .../Results/Residential/Supply/2025.csv       | 216 ++---
 .../Results/Residential/Supply/2030.csv       | 288 ++----
 .../Results/Residential/Supply/2035.csv       | 288 ++----
 .../Results/Residential/Supply/2040.csv       | 288 ++----
 .../Results/Residential/Supply/2045.csv       | 240 ++---
 .../Results/Residential/Supply/2050.csv       | 192 ++--
 .../Results/Gas/Capacity/2025.csv             |   2 +
 .../Results/Gas/Capacity/2030.csv             |  16 +-
 .../Results/Gas/Capacity/2035.csv             |  16 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  16 +-
 .../Results/Gas/Capacity/2050.csv             |  16 +-
 .../Results/MCACapacity.csv                   | 195 ++--
 .../1-modify-timeslices/Results/MCAPrices.csv | 544 +++++------
 .../Results/Power/Capacity/2020.csv           |  24 +-
 .../Results/Power/Capacity/2025.csv           |  86 +-
 .../Results/Power/Capacity/2030.csv           |  85 +-
 .../Results/Power/Capacity/2035.csv           | 118 ++-
 .../Results/Power/Capacity/2040.csv           | 135 ++-
 .../Results/Power/Capacity/2045.csv           | 260 +++--
 .../Results/Power/Capacity/2050.csv           | 298 ++++--
 .../Results/Residential/Capacity/2020.csv     |  22 +-
 .../Results/Residential/Capacity/2025.csv     |  44 +-
 .../Results/Residential/Capacity/2030.csv     |  56 +-
 .../Results/Residential/Capacity/2035.csv     |  68 +-
 .../Results/Residential/Capacity/2040.csv     |  72 +-
 .../Results/Residential/Capacity/2045.csv     |  76 +-
 .../Results/Residential/Capacity/2050.csv     |  78 +-
 .../Results/Residential/Supply/2020.csv       | 256 ++---
 .../Results/Residential/Supply/2025.csv       | 384 ++++----
 .../Results/Residential/Supply/2030.csv       | 384 +++-----
 .../Results/Residential/Supply/2035.csv       | 384 +++-----
 .../Results/Residential/Supply/2040.csv       | 384 +++-----
 .../Results/Residential/Supply/2045.csv       | 320 +++----
 .../Results/Residential/Supply/2050.csv       | 256 ++---
 .../Results/Gas/Capacity/2020.csv             |   2 -
 .../Results/Gas/Capacity/2022.csv             |   6 +-
 .../Results/Gas/Capacity/2024.csv             |   6 +-
 .../Results/Gas/Capacity/2026.csv             |   8 +-
 .../Results/Gas/Capacity/2028.csv             |   6 +-
 .../Results/Gas/Capacity/2030.csv             |  18 +-
 .../Results/Gas/Capacity/2032.csv             |  20 +-
 .../Results/Gas/Capacity/2034.csv             |  20 +-
 .../Results/Gas/Capacity/2036.csv             |  18 +-
 .../Results/Gas/Capacity/2038.csv             |  16 +-
 .../Results/Gas/Capacity/2040.csv             |  16 +-
 .../Results/MCACapacity.csv                   | 468 +++++----
 .../Results/MCAPrices.csv                     | 796 ++++++++--------
 .../Results/Power/Capacity/2020.csv           |  41 +-
 .../Results/Power/Capacity/2022.csv           |  84 +-
 .../Results/Power/Capacity/2024.csv           | 138 +--
 .../Results/Power/Capacity/2026.csv           | 185 ++--
 .../Results/Power/Capacity/2028.csv           | 230 +++--
 .../Results/Power/Capacity/2030.csv           | 302 +++---
 .../Results/Power/Capacity/2032.csv           | 384 ++++----
 .../Results/Power/Capacity/2034.csv           | 472 +++++----
 .../Results/Power/Capacity/2036.csv           | 555 ++++++-----
 .../Results/Power/Capacity/2038.csv           | 622 +++++++-----
 .../Results/Power/Capacity/2040.csv           | 736 ++++++++------
 .../Results/Residential/Capacity/2020.csv     |  30 +-
 .../Results/Residential/Capacity/2022.csv     |  70 +-
 .../Results/Residential/Capacity/2024.csv     | 122 +--
 .../Results/Residential/Capacity/2026.csv     | 158 ++-
 .../Results/Residential/Capacity/2028.csv     | 188 ++--
 .../Results/Residential/Capacity/2030.csv     | 218 +++--
 .../Results/Residential/Capacity/2032.csv     | 230 +++--
 .../Results/Residential/Capacity/2034.csv     | 242 +++--
 .../Results/Residential/Capacity/2036.csv     | 258 +++--
 .../Results/Residential/Capacity/2038.csv     | 278 ++++--
 .../Results/Residential/Capacity/2040.csv     | 298 ++++--
 .../Results/Residential/Supply/2020.csv       | 256 ++---
 .../Results/Residential/Supply/2022.csv       | 512 +++++-----
 .../Results/Residential/Supply/2024.csv       | 704 ++++++--------
 .../Results/Residential/Supply/2026.csv       | 832 +++++++---------
 .../Results/Residential/Supply/2028.csv       | 896 +++++++-----------
 .../Results/Residential/Supply/2030.csv       | 896 +++++++-----------
 .../Results/Residential/Supply/2032.csv       | 832 +++++++---------
 .../Results/Residential/Supply/2034.csv       | 704 +++++++-------
 .../Results/Residential/Supply/2036.csv       | 640 ++++++-------
 .../Results/Residential/Supply/2038.csv       | 640 ++++++-------
 .../Results/Residential/Supply/2040.csv       | 640 ++++++-------
 .../Results/Gas/Capacity/2025.csv             |  18 +-
 .../Results/Gas/Capacity/2030.csv             |  32 +-
 .../Results/Gas/Capacity/2035.csv             |  30 +-
 .../Results/Gas/Capacity/2040.csv             |  26 +-
 .../Results/Gas/Capacity/2045.csv             |  26 +-
 .../Results/Gas/Capacity/2050.csv             |  26 +-
 .../Results/MCACapacity.csv                   | 269 +++---
 .../1-exogenous-demand/Results/MCAPrices.csv  | 736 +++++++-------
 .../Results/Power/Capacity/2020.csv           |  24 +-
 .../Results/Power/Capacity/2025.csv           |  86 +-
 .../Results/Power/Capacity/2030.csv           |  93 +-
 .../Results/Power/Capacity/2035.csv           | 126 +--
 .../Results/Power/Capacity/2040.csv           | 122 ++-
 .../Results/Power/Capacity/2045.csv           | 266 +++---
 .../Results/Power/Capacity/2050.csv           | 302 ++++--
 .../Results/Residential/Capacity/2020.csv     |  42 +-
 .../Results/Residential/Capacity/2025.csv     |  86 +-
 .../Results/Residential/Capacity/2030.csv     | 110 ++-
 .../Results/Residential/Capacity/2035.csv     | 134 +--
 .../Results/Residential/Capacity/2040.csv     | 142 +--
 .../Results/Residential/Capacity/2045.csv     | 150 ++-
 .../Results/Residential/Capacity/2050.csv     | 156 ++-
 .../Results/Residential/Supply/2020.csv       | 640 ++++++-------
 .../Results/Residential/Supply/2025.csv       | 768 +++++++--------
 .../Results/Residential/Supply/2030.csv       | 768 +++++----------
 .../Results/Residential/Supply/2035.csv       | 768 +++++----------
 .../Results/Residential/Supply/2040.csv       | 768 +++++----------
 .../Results/Residential/Supply/2045.csv       | 640 +++++--------
 .../Results/Residential/Supply/2050.csv       | 512 +++++-----
 .../Results/Gas/Capacity/2025.csv             |   1 +
 .../Results/Gas/Capacity/2030.csv             |   7 +-
 .../Results/Gas/Capacity/2035.csv             |   8 +-
 .../Results/Gas/Capacity/2040.csv             |   7 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../1-correlation/Results/MCACapacity.csv     |  80 +-
 .../1-correlation/Results/MCAPrices.csv       | 204 ++--
 .../Results/Power/Capacity/2020.csv           |  16 +-
 .../Results/Power/Capacity/2025.csv           |  29 +-
 .../Results/Power/Capacity/2030.csv           |  43 +-
 .../Results/Power/Capacity/2035.csv           |  50 +-
 .../Results/Power/Capacity/2040.csv           |  57 +-
 .../Results/Power/Capacity/2045.csv           |  73 +-
 .../Results/Power/Capacity/2050.csv           |  83 +-
 .../Results/Residential/Capacity/2020.csv     |  10 +-
 .../Results/Residential/Capacity/2025.csv     |  21 +-
 .../Results/Residential/Capacity/2030.csv     |  27 +-
 .../Results/Residential/Capacity/2035.csv     |  33 +-
 .../Results/Residential/Capacity/2040.csv     |  35 +-
 .../Results/Residential/Capacity/2045.csv     |  41 +-
 .../Results/Residential/Capacity/2050.csv     |  43 +-
 .../Results/Residential/Supply/2020.csv       |  36 +-
 .../Results/Residential/Supply/2025.csv       |  72 +-
 .../Results/Residential/Supply/2030.csv       |  72 +-
 .../Results/Residential/Supply/2035.csv       |  72 +-
 .../Results/Residential/Supply/2040.csv       |  72 +-
 .../Results/Residential/Supply/2045.csv       |  72 +-
 .../Results/Residential/Supply/2050.csv       |  72 +-
 .../Results/Gas/Capacity/2025.csv             |   1 +
 .../Results/Gas/Capacity/2030.csv             |   9 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |  10 +-
 .../Results/Gas/Capacity/2045.csv             |  10 +-
 .../Results/Gas/Capacity/2050.csv             |  12 +-
 .../1-min-constraint/Results/MCACapacity.csv  |  92 +-
 .../Results/MCAMetric_Consumption.csv         | 432 ++++-----
 .../Results/MCAMetric_Supply.csv              | 558 +++++------
 .../1-min-constraint/Results/MCAPrices.csv    | 108 +--
 .../Results/Power/Capacity/2020.csv           |  16 +-
 .../Results/Power/Capacity/2025.csv           |  29 +-
 .../Results/Power/Capacity/2030.csv           |  43 +-
 .../Results/Power/Capacity/2035.csv           |  59 +-
 .../Results/Power/Capacity/2040.csv           |  76 +-
 .../Results/Power/Capacity/2045.csv           |  92 +-
 .../Results/Power/Capacity/2050.csv           | 102 +-
 .../Results/Power/Supply/2025.csv             |  24 +-
 .../Results/Power/Supply/2030.csv             |  60 +-
 .../Results/Power/Supply/2035.csv             |  84 +-
 .../Results/Power/Supply/2040.csv             | 108 +--
 .../Results/Power/Supply/2045.csv             | 120 +--
 .../Results/Power/Supply/2050.csv             | 120 +--
 .../Results/Residential/Capacity/2020.csv     |  10 +-
 .../Results/Residential/Capacity/2025.csv     |  21 +-
 .../Results/Residential/Capacity/2030.csv     |  27 +-
 .../Results/Residential/Capacity/2035.csv     |  33 +-
 .../Results/Residential/Capacity/2040.csv     |  35 +-
 .../Results/Residential/Capacity/2045.csv     |  37 +-
 .../Results/Residential/Capacity/2050.csv     |  39 +-
 .../Results/Residential/Supply/2025.csv       |  48 +-
 .../Results/Residential/Supply/2030.csv       |  72 +-
 .../Results/Residential/Supply/2035.csv       |  72 +-
 .../Results/Residential/Supply/2040.csv       |  72 +-
 .../Results/Residential/Supply/2045.csv       |  60 +-
 .../Results/Residential/Supply/2050.csv       |  48 +-
 .../Results/Gas/Capacity/2025.csv             |   1 +
 .../Results/Gas/Capacity/2030.csv             |   9 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |  10 +-
 .../Results/Gas/Capacity/2045.csv             |  10 +-
 .../Results/Gas/Capacity/2050.csv             |  12 +-
 .../2-max-constraint/Results/MCACapacity.csv  |  92 +-
 .../Results/MCAMetric_Consumption.csv         | 432 ++++-----
 .../Results/MCAMetric_Supply.csv              | 558 +++++------
 .../2-max-constraint/Results/MCAPrices.csv    | 108 +--
 .../Results/Power/Capacity/2020.csv           |  16 +-
 .../Results/Power/Capacity/2025.csv           |  29 +-
 .../Results/Power/Capacity/2030.csv           |  43 +-
 .../Results/Power/Capacity/2035.csv           |  59 +-
 .../Results/Power/Capacity/2040.csv           |  76 +-
 .../Results/Power/Capacity/2045.csv           |  92 +-
 .../Results/Power/Capacity/2050.csv           | 102 +-
 .../Results/Power/Supply/2025.csv             |  24 +-
 .../Results/Power/Supply/2030.csv             |  60 +-
 .../Results/Power/Supply/2035.csv             |  84 +-
 .../Results/Power/Supply/2040.csv             | 108 +--
 .../Results/Power/Supply/2045.csv             | 120 +--
 .../Results/Power/Supply/2050.csv             | 120 +--
 .../Results/Residential/Capacity/2020.csv     |  10 +-
 .../Results/Residential/Capacity/2025.csv     |  21 +-
 .../Results/Residential/Capacity/2030.csv     |  27 +-
 .../Results/Residential/Capacity/2035.csv     |  33 +-
 .../Results/Residential/Capacity/2040.csv     |  35 +-
 .../Results/Residential/Capacity/2045.csv     |  37 +-
 .../Results/Residential/Capacity/2050.csv     |  39 +-
 .../Results/Residential/Supply/2025.csv       |  48 +-
 .../Results/Residential/Supply/2030.csv       |  72 +-
 .../Results/Residential/Supply/2035.csv       |  72 +-
 .../Results/Residential/Supply/2040.csv       |  72 +-
 .../Results/Residential/Supply/2045.csv       |  60 +-
 .../Results/Residential/Supply/2050.csv       |  48 +-
 343 files changed, 20781 insertions(+), 22221 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
index d42ba410..d1ee882b 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,4 @@
 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 7a15b255..d1ee882b 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,7 +1,4 @@
 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,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
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 a9824260..d1ee882b 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,6 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
index 99b61abf..d1ee882b 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,5 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
index 78a6035a..d1ee882b 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,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
index 0db6bc51..d1ee882b 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,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2055,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
index fa454d8e..6120b752 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
@@ -1,53 +1,50 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
-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
-solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
-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,5.28440000000
-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
-solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.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,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
-heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.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
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+solarPV,R1,R1,A1,power,newcapa,2025,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,5.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,5.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,7.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
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 176ae31f..e5e04c44 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.63580000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.67970000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63370000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63580000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67650000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67970000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.80480000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81120000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.71930000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.72350000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.13600000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.14740000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72950000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.18480000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22100000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09690000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.13600000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14740000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72950000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.18480000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52000000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22100000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09690000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.33100000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.04280000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.44210000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.20950000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.23350000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69400000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.29470000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46600000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.33760000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.14580000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02990000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.39100000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.21860000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04930000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.33760000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.62720000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14580000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02990000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.39100000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84170000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21860000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04930000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.55110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.48900000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43730000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.12520000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.44430000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.05690000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.29150000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.07170000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.09860000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.14480000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02990000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.15550000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.21720000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04920000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.09860000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40500000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14480000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02990000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.15550000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.62890000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21720000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04920000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.32640000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.30600000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43430000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.12460000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.21250000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.85370000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.28950000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.07140000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.30720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.14370000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02980000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.36700000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.21560000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.04910000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.30720000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21030000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14370000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.36700000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.43330000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21560000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04910000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.54620000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.10920000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43120000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.12430000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.42670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.65740000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.28750000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07130000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.14130000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.31630000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.14550000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02980000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.21200000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.47810000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.21830000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04900000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14130000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.31630000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14550000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21200000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.47810000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21830000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04900000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.42400000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.97770000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43650000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.12390000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.28270000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.64220000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.29100000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07110000000,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 e62bab81..995294d2 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,solarPV,2020,10
+1,2030,R1,solarPV,2020,10
+1,2035,R1,solarPV,2020,10
+1,2040,R1,solarPV,2020,10
+1,2045,R1,solarPV,2020,10
+1,2049,R1,solarPV,2020,10
+2,2025,R1,windturbine,2020,6
+2,2030,R1,windturbine,2020,6
+2,2035,R1,windturbine,2020,6
+2,2040,R1,windturbine,2020,6
+2,2045,R1,windturbine,2020,6
+2,2049,R1,windturbine,2020,6
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
index 849d1bde..dcf2dd95 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -1,21 +1,29 @@
 asset,year,region,technology,installed,capacity
-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,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
-3,2025,R1,windturbine,2020,6.75000000000
-3,2030,R1,windturbine,2020,6.75000000000
-3,2035,R1,windturbine,2020,6.75000000000
-3,2040,R1,windturbine,2020,6.75000000000
-3,2045,R1,windturbine,2020,6.75000000000
-3,2049,R1,windturbine,2020,6.75000000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,solarPV,2020,10
+1,2030,R1,solarPV,2020,10
+1,2035,R1,solarPV,2020,10
+1,2040,R1,solarPV,2020,10
+1,2045,R1,solarPV,2020,10
+1,2049,R1,solarPV,2020,10
+2,2030,R1,solarPV,2025,10
+2,2035,R1,solarPV,2025,10
+2,2040,R1,solarPV,2025,10
+2,2045,R1,solarPV,2025,10
+2,2049,R1,solarPV,2025,10
+2,2050,R1,solarPV,2025,10
+2,2054,R1,solarPV,2025,10
+3,2025,R1,windturbine,2020,6
+3,2030,R1,windturbine,2020,6
+3,2035,R1,windturbine,2020,6
+3,2040,R1,windturbine,2020,6
+3,2045,R1,windturbine,2020,6
+3,2049,R1,windturbine,2020,6
+4,2030,R1,windturbine,2025,4
+4,2035,R1,windturbine,2025,4
+4,2040,R1,windturbine,2025,4
+4,2045,R1,windturbine,2025,4
+4,2049,R1,windturbine,2025,4
+4,2050,R1,windturbine,2025,4
+4,2054,R1,windturbine,2025,4
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 9194a38e..f768a64b 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,26 +1,37 @@
 asset,year,region,technology,installed,capacity
-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,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
-3,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-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,2030,R1,windturbine,2020,6.75000000000
-4,2035,R1,windturbine,2020,6.75000000000
-4,2040,R1,windturbine,2020,6.75000000000
-4,2045,R1,windturbine,2020,6.75000000000
-4,2049,R1,windturbine,2020,6.75000000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,solarPV,2020,10
+1,2030,R1,solarPV,2020,10
+1,2035,R1,solarPV,2020,10
+1,2040,R1,solarPV,2020,10
+1,2045,R1,solarPV,2020,10
+1,2049,R1,solarPV,2020,10
+2,2030,R1,solarPV,2025,10
+2,2035,R1,solarPV,2025,10
+2,2040,R1,solarPV,2025,10
+2,2045,R1,solarPV,2025,10
+2,2049,R1,solarPV,2025,10
+2,2050,R1,solarPV,2025,10
+2,2054,R1,solarPV,2025,10
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2054,R1,solarPV,2030,6
+3,2055,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2025,R1,windturbine,2020,6
+4,2030,R1,windturbine,2020,6
+4,2035,R1,windturbine,2020,6
+4,2040,R1,windturbine,2020,6
+4,2045,R1,windturbine,2020,6
+4,2049,R1,windturbine,2020,6
+5,2030,R1,windturbine,2025,4
+5,2035,R1,windturbine,2025,4
+5,2040,R1,windturbine,2025,4
+5,2045,R1,windturbine,2025,4
+5,2049,R1,windturbine,2025,4
+5,2050,R1,windturbine,2025,4
+5,2054,R1,windturbine,2025,4
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 f8d94413..bc0bf29e 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,32 +1,46 @@
 asset,year,region,technology,installed,capacity
-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,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
-3,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-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,2040,R1,solarPV,2035,9.19000000000
-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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,solarPV,2020,10
+1,2030,R1,solarPV,2020,10
+1,2035,R1,solarPV,2020,10
+1,2040,R1,solarPV,2020,10
+1,2045,R1,solarPV,2020,10
+1,2049,R1,solarPV,2020,10
+2,2030,R1,solarPV,2025,10
+2,2035,R1,solarPV,2025,10
+2,2040,R1,solarPV,2025,10
+2,2045,R1,solarPV,2025,10
+2,2049,R1,solarPV,2025,10
+2,2050,R1,solarPV,2025,10
+2,2054,R1,solarPV,2025,10
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2054,R1,solarPV,2030,6
+3,2055,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2040,R1,solarPV,2035,5
+4,2045,R1,solarPV,2035,5
+4,2049,R1,solarPV,2035,5
+4,2050,R1,solarPV,2035,5
+4,2054,R1,solarPV,2035,5
+4,2055,R1,solarPV,2035,5
+4,2059,R1,solarPV,2035,5
+4,2060,R1,solarPV,2035,5
+4,2064,R1,solarPV,2035,5
+5,2025,R1,windturbine,2020,6
+5,2030,R1,windturbine,2020,6
+5,2035,R1,windturbine,2020,6
+5,2040,R1,windturbine,2020,6
+5,2045,R1,windturbine,2020,6
+5,2049,R1,windturbine,2020,6
+6,2030,R1,windturbine,2025,4
+6,2035,R1,windturbine,2025,4
+6,2040,R1,windturbine,2025,4
+6,2045,R1,windturbine,2025,4
+6,2049,R1,windturbine,2025,4
+6,2050,R1,windturbine,2025,4
+6,2054,R1,windturbine,2025,4
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 69825810..bc242a85 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,38 +1,56 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,solarPV,2020,10.00000000000
-1,2045,R1,solarPV,2020,10.00000000000
-1,2049,R1,solarPV,2020,10.00000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
-3,2040,R1,solarPV,2030,6.00000000000
-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,2040,R1,solarPV,2035,9.19000000000
-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,2040,R1,windturbine,2020,6.75000000000
-6,2045,R1,windturbine,2020,6.75000000000
-6,2049,R1,windturbine,2020,6.75000000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,solarPV,2020,10
+1,2030,R1,solarPV,2020,10
+1,2035,R1,solarPV,2020,10
+1,2040,R1,solarPV,2020,10
+1,2045,R1,solarPV,2020,10
+1,2049,R1,solarPV,2020,10
+2,2030,R1,solarPV,2025,10
+2,2035,R1,solarPV,2025,10
+2,2040,R1,solarPV,2025,10
+2,2045,R1,solarPV,2025,10
+2,2049,R1,solarPV,2025,10
+2,2050,R1,solarPV,2025,10
+2,2054,R1,solarPV,2025,10
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2054,R1,solarPV,2030,6
+3,2055,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2040,R1,solarPV,2035,5
+4,2045,R1,solarPV,2035,5
+4,2049,R1,solarPV,2035,5
+4,2050,R1,solarPV,2035,5
+4,2054,R1,solarPV,2035,5
+4,2055,R1,solarPV,2035,5
+4,2059,R1,solarPV,2035,5
+4,2060,R1,solarPV,2035,5
+4,2064,R1,solarPV,2035,5
+5,2045,R1,solarPV,2040,7
+5,2049,R1,solarPV,2040,7
+5,2050,R1,solarPV,2040,7
+5,2054,R1,solarPV,2040,7
+5,2055,R1,solarPV,2040,7
+5,2059,R1,solarPV,2040,7
+5,2060,R1,solarPV,2040,7
+5,2064,R1,solarPV,2040,7
+5,2065,R1,solarPV,2040,7
+5,2069,R1,solarPV,2040,7
+6,2025,R1,windturbine,2020,6
+6,2030,R1,windturbine,2020,6
+6,2035,R1,windturbine,2020,6
+6,2040,R1,windturbine,2020,6
+6,2045,R1,windturbine,2020,6
+6,2049,R1,windturbine,2020,6
+7,2030,R1,windturbine,2025,4
+7,2035,R1,windturbine,2025,4
+7,2040,R1,windturbine,2025,4
+7,2045,R1,windturbine,2025,4
+7,2049,R1,windturbine,2025,4
+7,2050,R1,windturbine,2025,4
+7,2054,R1,windturbine,2025,4
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 324548ca..5fc9f4fa 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
@@ -1,53 +1,76 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2020,10.00000000000
-0,2049,R1,solarPV,2020,10.00000000000
-1,2045,R1,solarPV,2025,9.15000000000
-1,2049,R1,solarPV,2025,9.15000000000
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2035,9.19000000000
-3,2049,R1,solarPV,2035,9.19000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
-5,2070,R1,solarPV,2045,16.91000000000
-5,2074,R1,solarPV,2045,16.91000000000
-6,2045,R1,windturbine,2020,6.75000000000
-6,2049,R1,windturbine,2020,6.75000000000
-7,2050,R1,windturbine,2045,6.75000000000
-7,2054,R1,windturbine,2045,6.75000000000
-7,2055,R1,windturbine,2045,6.75000000000
-7,2059,R1,windturbine,2045,6.75000000000
-7,2060,R1,windturbine,2045,6.75000000000
-7,2064,R1,windturbine,2045,6.75000000000
-7,2065,R1,windturbine,2045,6.75000000000
-7,2069,R1,windturbine,2045,6.75000000000
-7,2070,R1,windturbine,2045,6.75000000000
-7,2074,R1,windturbine,2045,6.75000000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,solarPV,2020,10
+2,2030,R1,solarPV,2020,10
+2,2035,R1,solarPV,2020,10
+2,2040,R1,solarPV,2020,10
+2,2045,R1,solarPV,2020,10
+2,2049,R1,solarPV,2020,10
+3,2030,R1,solarPV,2025,10
+3,2035,R1,solarPV,2025,10
+3,2040,R1,solarPV,2025,10
+3,2045,R1,solarPV,2025,10
+3,2049,R1,solarPV,2025,10
+3,2050,R1,solarPV,2025,10
+3,2054,R1,solarPV,2025,10
+4,2035,R1,solarPV,2030,6
+4,2040,R1,solarPV,2030,6
+4,2045,R1,solarPV,2030,6
+4,2049,R1,solarPV,2030,6
+4,2050,R1,solarPV,2030,6
+4,2054,R1,solarPV,2030,6
+4,2055,R1,solarPV,2030,6
+4,2059,R1,solarPV,2030,6
+5,2040,R1,solarPV,2035,5
+5,2045,R1,solarPV,2035,5
+5,2049,R1,solarPV,2035,5
+5,2050,R1,solarPV,2035,5
+5,2054,R1,solarPV,2035,5
+5,2055,R1,solarPV,2035,5
+5,2059,R1,solarPV,2035,5
+5,2060,R1,solarPV,2035,5
+5,2064,R1,solarPV,2035,5
+6,2045,R1,solarPV,2040,7
+6,2049,R1,solarPV,2040,7
+6,2050,R1,solarPV,2040,7
+6,2054,R1,solarPV,2040,7
+6,2055,R1,solarPV,2040,7
+6,2059,R1,solarPV,2040,7
+6,2060,R1,solarPV,2040,7
+6,2064,R1,solarPV,2040,7
+6,2065,R1,solarPV,2040,7
+6,2069,R1,solarPV,2040,7
+7,2050,R1,solarPV,2045,10
+7,2054,R1,solarPV,2045,10
+7,2055,R1,solarPV,2045,10
+7,2059,R1,solarPV,2045,10
+7,2060,R1,solarPV,2045,10
+7,2064,R1,solarPV,2045,10
+7,2065,R1,solarPV,2045,10
+7,2069,R1,solarPV,2045,10
+7,2070,R1,solarPV,2045,10
+7,2074,R1,solarPV,2045,10
+8,2025,R1,windturbine,2020,6
+8,2030,R1,windturbine,2020,6
+8,2035,R1,windturbine,2020,6
+8,2040,R1,windturbine,2020,6
+8,2045,R1,windturbine,2020,6
+8,2049,R1,windturbine,2020,6
+9,2030,R1,windturbine,2025,4
+9,2035,R1,windturbine,2025,4
+9,2040,R1,windturbine,2025,4
+9,2045,R1,windturbine,2025,4
+9,2049,R1,windturbine,2025,4
+9,2050,R1,windturbine,2025,4
+9,2054,R1,windturbine,2025,4
+10,2050,R1,windturbine,2045,10
+10,2054,R1,windturbine,2045,10
+10,2055,R1,windturbine,2045,10
+10,2059,R1,windturbine,2045,10
+10,2060,R1,windturbine,2045,10
+10,2064,R1,windturbine,2045,10
+10,2065,R1,windturbine,2045,10
+10,2069,R1,windturbine,2045,10
+10,2070,R1,windturbine,2045,10
+10,2074,R1,windturbine,2045,10
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 debc1352..3d219672 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,51 +1,96 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
-5,2070,R1,solarPV,2045,16.91000000000
-5,2074,R1,solarPV,2045,16.91000000000
-6,2055,R1,solarPV,2050,9.15000000000
-6,2059,R1,solarPV,2050,9.15000000000
-6,2060,R1,solarPV,2050,9.15000000000
-6,2064,R1,solarPV,2050,9.15000000000
-6,2065,R1,solarPV,2050,9.15000000000
-6,2069,R1,solarPV,2050,9.15000000000
-6,2070,R1,solarPV,2050,9.15000000000
-6,2074,R1,solarPV,2050,9.15000000000
-6,2075,R1,solarPV,2050,9.15000000000
-6,2079,R1,solarPV,2050,9.15000000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,solarPV,2020,10
+2,2030,R1,solarPV,2020,10
+2,2035,R1,solarPV,2020,10
+2,2040,R1,solarPV,2020,10
+2,2045,R1,solarPV,2020,10
+2,2049,R1,solarPV,2020,10
+3,2030,R1,solarPV,2025,10
+3,2035,R1,solarPV,2025,10
+3,2040,R1,solarPV,2025,10
+3,2045,R1,solarPV,2025,10
+3,2049,R1,solarPV,2025,10
+3,2050,R1,solarPV,2025,10
+3,2054,R1,solarPV,2025,10
+4,2035,R1,solarPV,2030,6
+4,2040,R1,solarPV,2030,6
+4,2045,R1,solarPV,2030,6
+4,2049,R1,solarPV,2030,6
+4,2050,R1,solarPV,2030,6
+4,2054,R1,solarPV,2030,6
+4,2055,R1,solarPV,2030,6
+4,2059,R1,solarPV,2030,6
+5,2040,R1,solarPV,2035,5
+5,2045,R1,solarPV,2035,5
+5,2049,R1,solarPV,2035,5
+5,2050,R1,solarPV,2035,5
+5,2054,R1,solarPV,2035,5
+5,2055,R1,solarPV,2035,5
+5,2059,R1,solarPV,2035,5
+5,2060,R1,solarPV,2035,5
+5,2064,R1,solarPV,2035,5
+6,2045,R1,solarPV,2040,7
+6,2049,R1,solarPV,2040,7
+6,2050,R1,solarPV,2040,7
+6,2054,R1,solarPV,2040,7
+6,2055,R1,solarPV,2040,7
+6,2059,R1,solarPV,2040,7
+6,2060,R1,solarPV,2040,7
+6,2064,R1,solarPV,2040,7
+6,2065,R1,solarPV,2040,7
+6,2069,R1,solarPV,2040,7
+7,2050,R1,solarPV,2045,10
+7,2054,R1,solarPV,2045,10
+7,2055,R1,solarPV,2045,10
+7,2059,R1,solarPV,2045,10
+7,2060,R1,solarPV,2045,10
+7,2064,R1,solarPV,2045,10
+7,2065,R1,solarPV,2045,10
+7,2069,R1,solarPV,2045,10
+7,2070,R1,solarPV,2045,10
+7,2074,R1,solarPV,2045,10
+8,2055,R1,solarPV,2050,10
+8,2059,R1,solarPV,2050,10
+8,2060,R1,solarPV,2050,10
+8,2064,R1,solarPV,2050,10
+8,2065,R1,solarPV,2050,10
+8,2069,R1,solarPV,2050,10
+8,2070,R1,solarPV,2050,10
+8,2074,R1,solarPV,2050,10
+8,2075,R1,solarPV,2050,10
+8,2079,R1,solarPV,2050,10
+9,2025,R1,windturbine,2020,6
+9,2030,R1,windturbine,2020,6
+9,2035,R1,windturbine,2020,6
+9,2040,R1,windturbine,2020,6
+9,2045,R1,windturbine,2020,6
+9,2049,R1,windturbine,2020,6
+10,2030,R1,windturbine,2025,4
+10,2035,R1,windturbine,2025,4
+10,2040,R1,windturbine,2025,4
+10,2045,R1,windturbine,2025,4
+10,2049,R1,windturbine,2025,4
+10,2050,R1,windturbine,2025,4
+10,2054,R1,windturbine,2025,4
+11,2050,R1,windturbine,2045,10
+11,2054,R1,windturbine,2045,10
+11,2055,R1,windturbine,2045,10
+11,2059,R1,windturbine,2045,10
+11,2060,R1,windturbine,2045,10
+11,2064,R1,windturbine,2045,10
+11,2065,R1,windturbine,2045,10
+11,2069,R1,windturbine,2045,10
+11,2070,R1,windturbine,2045,10
+11,2074,R1,windturbine,2045,10
+12,2055,R1,windturbine,2050,6
+12,2059,R1,windturbine,2050,6
+12,2060,R1,windturbine,2050,6
+12,2064,R1,windturbine,2050,6
+12,2065,R1,windturbine,2050,6
+12,2069,R1,windturbine,2050,6
+12,2070,R1,windturbine,2050,6
+12,2074,R1,windturbine,2050,6
+12,2075,R1,windturbine,2050,6
+12,2079,R1,windturbine,2050,6
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
index bcdf148c..d6edd96c 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
index 2eb0ec15..677048ec 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
index 22334ba5..95b724d9 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
index 452c6c8a..33e9c12a 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
index e3ecc1d0..21be0313 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
index 82b22d9b..d02c2c7f 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
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 42f4be20..8c8e1206 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,30 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
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 bfe116d0..729d406d 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,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
 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 82873caa..afe86e12 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,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 741ea3c6..83daf7f1 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,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 c802f340..7bda2463 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,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c7be86b2..c535c679 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,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 8c187153..9abfcded 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
index d42ba410..d1ee882b 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,4 @@
 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 7a15b255..d1ee882b 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,7 +1,4 @@
 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,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
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 a9824260..d1ee882b 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,6 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
index 99b61abf..d1ee882b 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,5 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
index 78a6035a..c7b71d96 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,4 +1,6 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,2.04110000000
+1,2084,R1,gassupply1,2045,2.04110000000
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 0db6bc51..c7b71d96 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,4 +1,6 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2055,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,2.04110000000
+1,2084,R1,gassupply1,2045,2.04110000000
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 0599eab8..e5f59108 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
@@ -1,53 +1,53 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
-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
-solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
-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
-solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.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
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
-heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.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
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+solarPV,R1,R1,A1,power,newcapa,2025,6.75000000000
+windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,3.25000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,3.25000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.04110000000
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 e7cafa95..9ab212b2 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
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.14500000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.17230000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72960000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.19820000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25850000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.14500000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17230000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72960000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.19820000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52010000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25850000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.35790000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.04310000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51690000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.21030000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.25140000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34460000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46630000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.35010000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.17040000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.40980000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.05160000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.35010000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.62730000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17040000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.40980000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84190000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05160000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.58870000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.48980000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13420000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.46940000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.05720000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34070000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.07570000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.11330000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16580000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.17760000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.62930000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24870000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05140000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.11330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40520000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16580000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.17760000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.62930000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24870000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05140000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.37050000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.30750000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49740000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13350000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.24190000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.85430000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33160000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.07540000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.32310000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16580000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.39070000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24870000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.32310000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21060000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16580000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.39070000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.43380000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24870000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.59380000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.11150000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49740000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13180000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.45840000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.65840000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33160000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07460000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.15170000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.31700000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.21480000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.22750000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.47950000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.32220000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15170000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.31700000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.21480000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22750000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.47950000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.32220000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45500000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.98340000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.64440000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13180000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.30330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.64480000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.42960000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07460000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
index 80fe0b8b..43008c47 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -1,4 +1,5 @@
 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
@@ -6,16 +7,23 @@ asset,year,region,technology,installed,capacity
 1,2040,R1,solarPV,2020,6.75000000000
 1,2045,R1,solarPV,2020,6.75000000000
 1,2049,R1,solarPV,2020,6.75000000000
-2,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2025,R1,windturbine,2020,10.00000000000
 3,2030,R1,windturbine,2020,10.00000000000
 3,2035,R1,windturbine,2020,10.00000000000
 3,2040,R1,windturbine,2020,10.00000000000
 3,2045,R1,windturbine,2020,10.00000000000
 3,2049,R1,windturbine,2020,10.00000000000
+4,2030,R1,windturbine,2025,3.25000000000
+4,2035,R1,windturbine,2025,3.25000000000
+4,2040,R1,windturbine,2025,3.25000000000
+4,2045,R1,windturbine,2025,3.25000000000
+4,2049,R1,windturbine,2025,3.25000000000
+4,2050,R1,windturbine,2025,3.25000000000
+4,2054,R1,windturbine,2025,3.25000000000
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 5113153a..187ccbc8 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,16 +1,19 @@
 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,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2030,6.00000000000
@@ -19,8 +22,16 @@ 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,2025,R1,windturbine,2020,10.00000000000
 4,2030,R1,windturbine,2020,10.00000000000
 4,2035,R1,windturbine,2020,10.00000000000
 4,2040,R1,windturbine,2020,10.00000000000
 4,2045,R1,windturbine,2020,10.00000000000
 4,2049,R1,windturbine,2020,10.00000000000
+5,2030,R1,windturbine,2025,3.25000000000
+5,2035,R1,windturbine,2025,3.25000000000
+5,2040,R1,windturbine,2025,3.25000000000
+5,2045,R1,windturbine,2025,3.25000000000
+5,2049,R1,windturbine,2025,3.25000000000
+5,2050,R1,windturbine,2025,3.25000000000
+5,2054,R1,windturbine,2025,3.25000000000
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 c76581d4..16821f81 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,14 +1,19 @@
 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,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2030,6.00000000000
@@ -17,16 +22,34 @@ 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,2040,R1,solarPV,2035,9.19000000000
-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
+4,2040,R1,solarPV,2035,10.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,2025,R1,windturbine,2020,10.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
+6,2030,R1,windturbine,2025,3.25000000000
+6,2035,R1,windturbine,2025,3.25000000000
+6,2040,R1,windturbine,2025,3.25000000000
+6,2045,R1,windturbine,2025,3.25000000000
+6,2049,R1,windturbine,2025,3.25000000000
+6,2050,R1,windturbine,2025,3.25000000000
+6,2054,R1,windturbine,2025,3.25000000000
+7,2040,R1,windturbine,2035,2.00000000000
+7,2045,R1,windturbine,2035,2.00000000000
+7,2049,R1,windturbine,2035,2.00000000000
+7,2050,R1,windturbine,2035,2.00000000000
+7,2054,R1,windturbine,2035,2.00000000000
+7,2055,R1,windturbine,2035,2.00000000000
+7,2059,R1,windturbine,2035,2.00000000000
+7,2060,R1,windturbine,2035,2.00000000000
+7,2064,R1,windturbine,2035,2.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 1bc59d24..16821f81 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,12 +1,20 @@
 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,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2030,6.00000000000
 3,2049,R1,solarPV,2030,6.00000000000
@@ -14,25 +22,34 @@ 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,2040,R1,solarPV,2035,9.19000000000
-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,2040,R1,windturbine,2020,10.00000000000
-6,2045,R1,windturbine,2020,10.00000000000
-6,2049,R1,windturbine,2020,10.00000000000
+4,2040,R1,solarPV,2035,10.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,2025,R1,windturbine,2020,10.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
+6,2030,R1,windturbine,2025,3.25000000000
+6,2035,R1,windturbine,2025,3.25000000000
+6,2040,R1,windturbine,2025,3.25000000000
+6,2045,R1,windturbine,2025,3.25000000000
+6,2049,R1,windturbine,2025,3.25000000000
+6,2050,R1,windturbine,2025,3.25000000000
+6,2054,R1,windturbine,2025,3.25000000000
+7,2040,R1,windturbine,2035,2.00000000000
+7,2045,R1,windturbine,2035,2.00000000000
+7,2049,R1,windturbine,2035,2.00000000000
+7,2050,R1,windturbine,2035,2.00000000000
+7,2054,R1,windturbine,2035,2.00000000000
+7,2055,R1,windturbine,2035,2.00000000000
+7,2059,R1,windturbine,2035,2.00000000000
+7,2060,R1,windturbine,2035,2.00000000000
+7,2064,R1,windturbine,2035,2.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 a6d9e492..5715052f 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
@@ -1,53 +1,81 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2020,6.75000000000
-0,2049,R1,solarPV,2020,6.75000000000
-1,2045,R1,solarPV,2025,9.15000000000
-1,2049,R1,solarPV,2025,9.15000000000
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2030,6.00000000000
-2,2049,R1,solarPV,2030,6.00000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2035,9.19000000000
-3,2049,R1,solarPV,2035,9.19000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
-5,2070,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,2050,R1,windturbine,2045,6.75000000000
-7,2054,R1,windturbine,2045,6.75000000000
-7,2055,R1,windturbine,2045,6.75000000000
-7,2059,R1,windturbine,2045,6.75000000000
-7,2060,R1,windturbine,2045,6.75000000000
-7,2064,R1,windturbine,2045,6.75000000000
-7,2065,R1,windturbine,2045,6.75000000000
-7,2069,R1,windturbine,2045,6.75000000000
-7,2070,R1,windturbine,2045,6.75000000000
-7,2074,R1,windturbine,2045,6.75000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,1.22220000000
+1,2054,R1,gasCCGT,2045,1.22220000000
+1,2055,R1,gasCCGT,2045,1.22220000000
+1,2059,R1,gasCCGT,2045,1.22220000000
+1,2060,R1,gasCCGT,2045,1.22220000000
+1,2064,R1,gasCCGT,2045,1.22220000000
+1,2065,R1,gasCCGT,2045,1.22220000000
+1,2074,R1,gasCCGT,2045,1.22220000000
+1,2075,R1,gasCCGT,2045,1.22220000000
+1,2084,R1,gasCCGT,2045,1.22220000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+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,10.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
+6,2050,R1,solarPV,2045,10.00000000000
+6,2054,R1,solarPV,2045,10.00000000000
+6,2055,R1,solarPV,2045,10.00000000000
+6,2059,R1,solarPV,2045,10.00000000000
+6,2060,R1,solarPV,2045,10.00000000000
+6,2064,R1,solarPV,2045,10.00000000000
+6,2065,R1,solarPV,2045,10.00000000000
+6,2074,R1,solarPV,2045,10.00000000000
+7,2025,R1,windturbine,2020,10.00000000000
+7,2030,R1,windturbine,2020,10.00000000000
+7,2035,R1,windturbine,2020,10.00000000000
+7,2040,R1,windturbine,2020,10.00000000000
+7,2045,R1,windturbine,2020,10.00000000000
+7,2049,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2025,3.25000000000
+8,2035,R1,windturbine,2025,3.25000000000
+8,2040,R1,windturbine,2025,3.25000000000
+8,2045,R1,windturbine,2025,3.25000000000
+8,2049,R1,windturbine,2025,3.25000000000
+8,2050,R1,windturbine,2025,3.25000000000
+8,2054,R1,windturbine,2025,3.25000000000
+9,2040,R1,windturbine,2035,2.00000000000
+9,2045,R1,windturbine,2035,2.00000000000
+9,2049,R1,windturbine,2035,2.00000000000
+9,2050,R1,windturbine,2035,2.00000000000
+9,2054,R1,windturbine,2035,2.00000000000
+9,2055,R1,windturbine,2035,2.00000000000
+9,2059,R1,windturbine,2035,2.00000000000
+9,2060,R1,windturbine,2035,2.00000000000
+9,2064,R1,windturbine,2035,2.00000000000
+10,2050,R1,windturbine,2045,10.00000000000
+10,2054,R1,windturbine,2045,10.00000000000
+10,2055,R1,windturbine,2045,10.00000000000
+10,2059,R1,windturbine,2045,10.00000000000
+10,2060,R1,windturbine,2045,10.00000000000
+10,2064,R1,windturbine,2045,10.00000000000
+10,2065,R1,windturbine,2045,10.00000000000
+10,2074,R1,windturbine,2045,10.00000000000
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 debc1352..fd158a69 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,51 +1,99 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
-5,2070,R1,solarPV,2045,16.91000000000
-5,2074,R1,solarPV,2045,16.91000000000
-6,2055,R1,solarPV,2050,9.15000000000
-6,2059,R1,solarPV,2050,9.15000000000
-6,2060,R1,solarPV,2050,9.15000000000
-6,2064,R1,solarPV,2050,9.15000000000
-6,2065,R1,solarPV,2050,9.15000000000
-6,2069,R1,solarPV,2050,9.15000000000
-6,2070,R1,solarPV,2050,9.15000000000
-6,2074,R1,solarPV,2050,9.15000000000
-6,2075,R1,solarPV,2050,9.15000000000
-6,2079,R1,solarPV,2050,9.15000000000
-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
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,1.22220000000
+1,2054,R1,gasCCGT,2045,1.22220000000
+1,2055,R1,gasCCGT,2045,1.22220000000
+1,2059,R1,gasCCGT,2045,1.22220000000
+1,2060,R1,gasCCGT,2045,1.22220000000
+1,2064,R1,gasCCGT,2045,1.22220000000
+1,2065,R1,gasCCGT,2045,1.22220000000
+1,2074,R1,gasCCGT,2045,1.22220000000
+1,2075,R1,gasCCGT,2045,1.22220000000
+1,2079,R1,gasCCGT,2045,1.22220000000
+1,2080,R1,gasCCGT,2045,1.22220000000
+1,2084,R1,gasCCGT,2045,1.22220000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+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,10.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
+6,2050,R1,solarPV,2045,10.00000000000
+6,2054,R1,solarPV,2045,10.00000000000
+6,2055,R1,solarPV,2045,10.00000000000
+6,2059,R1,solarPV,2045,10.00000000000
+6,2060,R1,solarPV,2045,10.00000000000
+6,2064,R1,solarPV,2045,10.00000000000
+6,2065,R1,solarPV,2045,10.00000000000
+6,2074,R1,solarPV,2045,10.00000000000
+7,2055,R1,solarPV,2050,10.00000000000
+7,2059,R1,solarPV,2050,10.00000000000
+7,2060,R1,solarPV,2050,10.00000000000
+7,2064,R1,solarPV,2050,10.00000000000
+7,2065,R1,solarPV,2050,10.00000000000
+7,2074,R1,solarPV,2050,10.00000000000
+7,2075,R1,solarPV,2050,10.00000000000
+7,2079,R1,solarPV,2050,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2030,R1,windturbine,2025,3.25000000000
+9,2035,R1,windturbine,2025,3.25000000000
+9,2040,R1,windturbine,2025,3.25000000000
+9,2045,R1,windturbine,2025,3.25000000000
+9,2049,R1,windturbine,2025,3.25000000000
+9,2050,R1,windturbine,2025,3.25000000000
+9,2054,R1,windturbine,2025,3.25000000000
+10,2040,R1,windturbine,2035,2.00000000000
+10,2045,R1,windturbine,2035,2.00000000000
+10,2049,R1,windturbine,2035,2.00000000000
+10,2050,R1,windturbine,2035,2.00000000000
+10,2054,R1,windturbine,2035,2.00000000000
+10,2055,R1,windturbine,2035,2.00000000000
+10,2059,R1,windturbine,2035,2.00000000000
+10,2060,R1,windturbine,2035,2.00000000000
+10,2064,R1,windturbine,2035,2.00000000000
+11,2050,R1,windturbine,2045,10.00000000000
+11,2054,R1,windturbine,2045,10.00000000000
+11,2055,R1,windturbine,2045,10.00000000000
+11,2059,R1,windturbine,2045,10.00000000000
+11,2060,R1,windturbine,2045,10.00000000000
+11,2064,R1,windturbine,2045,10.00000000000
+11,2065,R1,windturbine,2045,10.00000000000
+11,2074,R1,windturbine,2045,10.00000000000
+12,2055,R1,windturbine,2050,3.25000000000
+12,2059,R1,windturbine,2050,3.25000000000
+12,2060,R1,windturbine,2050,3.25000000000
+12,2064,R1,windturbine,2050,3.25000000000
+12,2065,R1,windturbine,2050,3.25000000000
+12,2074,R1,windturbine,2050,3.25000000000
+12,2075,R1,windturbine,2050,3.25000000000
+12,2079,R1,windturbine,2050,3.25000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
index bcdf148c..d6edd96c 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
index 2eb0ec15..677048ec 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
index 22334ba5..95b724d9 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
index 452c6c8a..33e9c12a 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
index e3ecc1d0..21be0313 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
index 82b22d9b..d02c2c7f 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
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 42f4be20..8c8e1206 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,30 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
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 bfe116d0..729d406d 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,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
 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 82873caa..afe86e12 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,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 741ea3c6..83daf7f1 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,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 c802f340..7bda2463 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,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c7be86b2..c535c679 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,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 8c187153..9abfcded 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
index d42ba410..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,4 @@
 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-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
index 7a15b255..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,4 @@
 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,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
index a9824260..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
index 99b61abf..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
index 78a6035a..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
index 0db6bc51..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2055,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
+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-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
index 8ccabec8..810e6d0f 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -1,93 +1,87 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A1,power,retrofit,2025,4.18750000000
-gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A2,power,retrofit,2025,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,2.05000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,3.45000000000
-gasboiler,R1,R1,A2,residential,retrofit,2030,2.05000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,3.45000000000
-solarPV,R1,R1,A1,power,retrofit,2030,8.76250000000
-windturbine,R1,R1,A1,power,retrofit,2030,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2030,8.76250000000
-windturbine,R1,R1,A2,power,retrofit,2030,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,2.05000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,3.45000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,12.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2035,2.05000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,3.45000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,12.50000000000
-solarPV,R1,R1,A1,power,retrofit,2035,8.76250000000
-solarPV,R1,R1,A1,power,retrofit,2035,1.50000000000
-windturbine,R1,R1,A1,power,retrofit,2035,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2035,8.76250000000
-solarPV,R1,R1,A2,power,retrofit,2035,1.50000000000
-windturbine,R1,R1,A2,power,retrofit,2035,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.64220000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,2.64220000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,0.45500000000
-heatpump,R1,R1,A1,residential,retrofit,2040,12.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,8.04500000000
-gasboiler,R1,R1,A2,residential,retrofit,2040,0.45500000000
-heatpump,R1,R1,A2,residential,retrofit,2040,12.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,8.04500000000
-solarPV,R1,R1,A1,power,retrofit,2040,8.76250000000
-solarPV,R1,R1,A1,power,retrofit,2040,1.50000000000
-solarPV,R1,R1,A1,power,retrofit,2040,3.79750000000
-windturbine,R1,R1,A1,power,retrofit,2040,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2040,8.76250000000
-solarPV,R1,R1,A2,power,retrofit,2040,1.50000000000
-solarPV,R1,R1,A2,power,retrofit,2040,3.79750000000
-windturbine,R1,R1,A2,power,retrofit,2040,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.64220000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,2.64220000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,0.45500000000
-heatpump,R1,R1,A1,residential,retrofit,2045,8.04500000000
-heatpump,R1,R1,A1,residential,retrofit,2045,15.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2045,0.45500000000
-heatpump,R1,R1,A2,residential,retrofit,2045,8.04500000000
-heatpump,R1,R1,A2,residential,retrofit,2045,15.50000000000
-solarPV,R1,R1,A1,power,retrofit,2045,8.76250000000
-solarPV,R1,R1,A1,power,retrofit,2045,1.50000000000
-solarPV,R1,R1,A1,power,retrofit,2045,3.79750000000
-solarPV,R1,R1,A1,power,retrofit,2045,3.79750000000
-windturbine,R1,R1,A1,power,retrofit,2045,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2045,8.76250000000
-solarPV,R1,R1,A2,power,retrofit,2045,1.50000000000
-solarPV,R1,R1,A2,power,retrofit,2045,3.79750000000
-solarPV,R1,R1,A2,power,retrofit,2045,3.79750000000
-windturbine,R1,R1,A2,power,retrofit,2045,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.64220000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,2.64220000000
-heatpump,R1,R1,A1,residential,retrofit,2050,15.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,11.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,15.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,11.50000000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.76250000000
-solarPV,R1,R1,A1,power,retrofit,2050,1.50000000000
-solarPV,R1,R1,A1,power,retrofit,2050,3.79750000000
-solarPV,R1,R1,A1,power,retrofit,2050,3.79750000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.14250000000
-solarPV,R1,R1,A2,power,retrofit,2050,8.76250000000
-solarPV,R1,R1,A2,power,retrofit,2050,1.50000000000
-solarPV,R1,R1,A2,power,retrofit,2050,3.79750000000
-solarPV,R1,R1,A2,power,retrofit,2050,3.79750000000
-solarPV,R1,R1,A2,power,retrofit,2050,9.14250000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.64220000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,2.64220000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,newcapa,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
+gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
+windturbine,R1,R1,A1,power,newcapa,2025,4.18750000000
+gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
+windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
+solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
+windturbine,R1,R1,A1,power,newcapa,2030,0.81250000000
+solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2030,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
+solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
+windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
+windturbine,R1,R1,A1,power,newcapa,2035,0.81250000000
+solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
+windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2035,0.81250000000
+heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
+solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
+windturbine,R1,R1,A1,power,newcapa,2040,0.81250000000
+solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
+solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
+windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2040,0.81250000000
+heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
+solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
+windturbine,R1,R1,A1,power,newcapa,2045,0.81250000000
+solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
+solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
+windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2045,0.81250000000
+heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
+solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
+windturbine,R1,R1,A1,power,newcapa,2050,0.81250000000
+solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
+windturbine,R1,R1,A2,power,newcapa,2050,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index 3677d535..0566010d 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -47,123 +47,123 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.17830000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34670000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.17030000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.73130000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.24820000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52070000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25550000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.10090000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.17830000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34670000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17030000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.73130000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.24820000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52070000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25550000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.10090000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.45790000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.04570000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51090000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.22550000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.31810000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69520000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34060000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.47310000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.37650000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.62780000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.16940000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.44940000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84300000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25420000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.05140000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.37650000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.62780000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16940000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.44940000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84300000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25420000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05140000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.66800000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.49410000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50830000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13350000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.52220000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.05910000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33890000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.07540000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.13430000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40580000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16630000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.20910000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.63060000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24950000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.13430000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40580000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16630000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.20910000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.63060000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24950000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.43350000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.31280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49900000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13310000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.28390000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.85670000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33260000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.07520000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.33950000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21120000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16250000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.41540000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.43530000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24380000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.33950000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21120000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16250000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.41540000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.43530000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24380000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.64300000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.11710000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.48750000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13200000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.49130000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.66090000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.32500000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07470000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.15180000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.31760000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.15390000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.22770000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.48100000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.23080000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05070000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15180000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.31760000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15390000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22770000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.48100000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.23080000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05070000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45530000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.98930000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.46160000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13070000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.30350000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.64740000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30780000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07410000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
index a7007923..df8fb83e 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
@@ -1,15 +1,23 @@
 asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.52500000000
-1,2035,R1,solarPV,2025,17.52500000000
-1,2040,R1,solarPV,2025,17.52500000000
-1,2045,R1,solarPV,2025,17.52500000000
-1,2049,R1,solarPV,2025,17.52500000000
-1,2050,R1,solarPV,2025,17.52500000000
-1,2054,R1,solarPV,2025,17.52500000000
+1,2030,R1,solarPV,2025,20.00000000000
+1,2035,R1,solarPV,2025,20.00000000000
+1,2040,R1,solarPV,2025,20.00000000000
+1,2045,R1,solarPV,2025,20.00000000000
+1,2049,R1,solarPV,2025,20.00000000000
+1,2050,R1,solarPV,2025,20.00000000000
+1,2054,R1,solarPV,2025,20.00000000000
 2,2025,R1,windturbine,2020,8.37500000000
 2,2030,R1,windturbine,2020,8.37500000000
 2,2035,R1,windturbine,2020,8.37500000000
 2,2040,R1,windturbine,2020,8.37500000000
 2,2045,R1,windturbine,2020,8.37500000000
 2,2049,R1,windturbine,2020,8.37500000000
+3,2030,R1,windturbine,2025,1.62500000000
+3,2035,R1,windturbine,2025,1.62500000000
+3,2040,R1,windturbine,2025,1.62500000000
+3,2045,R1,windturbine,2025,1.62500000000
+3,2049,R1,windturbine,2025,1.62500000000
+3,2050,R1,windturbine,2025,1.62500000000
+3,2054,R1,windturbine,2025,1.62500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
index c0487536..3293995f 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
@@ -1,11 +1,13 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2025,17.52500000000
-1,2035,R1,solarPV,2025,17.52500000000
-1,2040,R1,solarPV,2025,17.52500000000
-1,2045,R1,solarPV,2025,17.52500000000
-1,2049,R1,solarPV,2025,17.52500000000
-1,2050,R1,solarPV,2025,17.52500000000
-1,2054,R1,solarPV,2025,17.52500000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,20.00000000000
+1,2035,R1,solarPV,2025,20.00000000000
+1,2040,R1,solarPV,2025,20.00000000000
+1,2045,R1,solarPV,2025,20.00000000000
+1,2049,R1,solarPV,2025,20.00000000000
+1,2050,R1,solarPV,2025,20.00000000000
+1,2054,R1,solarPV,2025,20.00000000000
 2,2035,R1,solarPV,2030,3.00000000000
 2,2040,R1,solarPV,2030,3.00000000000
 2,2045,R1,solarPV,2030,3.00000000000
@@ -14,8 +16,16 @@ asset,year,region,technology,installed,capacity
 2,2054,R1,solarPV,2030,3.00000000000
 2,2055,R1,solarPV,2030,3.00000000000
 2,2059,R1,solarPV,2030,3.00000000000
+3,2025,R1,windturbine,2020,8.37500000000
 3,2030,R1,windturbine,2020,8.37500000000
 3,2035,R1,windturbine,2020,8.37500000000
 3,2040,R1,windturbine,2020,8.37500000000
 3,2045,R1,windturbine,2020,8.37500000000
 3,2049,R1,windturbine,2020,8.37500000000
+4,2030,R1,windturbine,2025,1.62500000000
+4,2035,R1,windturbine,2025,1.62500000000
+4,2040,R1,windturbine,2025,1.62500000000
+4,2045,R1,windturbine,2025,1.62500000000
+4,2049,R1,windturbine,2025,1.62500000000
+4,2050,R1,windturbine,2025,1.62500000000
+4,2054,R1,windturbine,2025,1.62500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
index 81d09e1c..9edca4be 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
@@ -1,28 +1,40 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,solarPV,2025,17.52500000000
-0,2040,R1,solarPV,2025,17.52500000000
-0,2045,R1,solarPV,2025,17.52500000000
-0,2049,R1,solarPV,2025,17.52500000000
-0,2050,R1,solarPV,2025,17.52500000000
-0,2054,R1,solarPV,2025,17.52500000000
-1,2035,R1,solarPV,2030,3.00000000000
-1,2040,R1,solarPV,2030,3.00000000000
-1,2045,R1,solarPV,2030,3.00000000000
-1,2049,R1,solarPV,2030,3.00000000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2035,7.59500000000
-2,2045,R1,solarPV,2035,7.59500000000
-2,2049,R1,solarPV,2035,7.59500000000
-2,2050,R1,solarPV,2035,7.59500000000
-2,2054,R1,solarPV,2035,7.59500000000
-2,2055,R1,solarPV,2035,7.59500000000
-2,2059,R1,solarPV,2035,7.59500000000
-2,2060,R1,solarPV,2035,7.59500000000
-2,2064,R1,solarPV,2035,7.59500000000
-3,2035,R1,windturbine,2020,8.37500000000
-3,2040,R1,windturbine,2020,8.37500000000
-3,2045,R1,windturbine,2020,8.37500000000
-3,2049,R1,windturbine,2020,8.37500000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,20.00000000000
+1,2035,R1,solarPV,2025,20.00000000000
+1,2040,R1,solarPV,2025,20.00000000000
+1,2045,R1,solarPV,2025,20.00000000000
+1,2049,R1,solarPV,2025,20.00000000000
+1,2050,R1,solarPV,2025,20.00000000000
+1,2054,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2049,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2054,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2054,R1,solarPV,2035,6.00000000000
+3,2055,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2025,R1,windturbine,2020,8.37500000000
+4,2030,R1,windturbine,2020,8.37500000000
+4,2035,R1,windturbine,2020,8.37500000000
+4,2040,R1,windturbine,2020,8.37500000000
+4,2045,R1,windturbine,2020,8.37500000000
+4,2049,R1,windturbine,2020,8.37500000000
+5,2030,R1,windturbine,2025,1.62500000000
+5,2035,R1,windturbine,2025,1.62500000000
+5,2040,R1,windturbine,2025,1.62500000000
+5,2045,R1,windturbine,2025,1.62500000000
+5,2049,R1,windturbine,2025,1.62500000000
+5,2050,R1,windturbine,2025,1.62500000000
+5,2054,R1,windturbine,2025,1.62500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
index 8d652a35..433bfa74 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
@@ -1,35 +1,50 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,solarPV,2025,17.52500000000
-0,2045,R1,solarPV,2025,17.52500000000
-0,2049,R1,solarPV,2025,17.52500000000
-0,2050,R1,solarPV,2025,17.52500000000
-0,2054,R1,solarPV,2025,17.52500000000
-1,2040,R1,solarPV,2030,3.00000000000
-1,2045,R1,solarPV,2030,3.00000000000
-1,2049,R1,solarPV,2030,3.00000000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2035,7.59500000000
-2,2045,R1,solarPV,2035,7.59500000000
-2,2049,R1,solarPV,2035,7.59500000000
-2,2050,R1,solarPV,2035,7.59500000000
-2,2054,R1,solarPV,2035,7.59500000000
-2,2055,R1,solarPV,2035,7.59500000000
-2,2059,R1,solarPV,2035,7.59500000000
-2,2060,R1,solarPV,2035,7.59500000000
-2,2064,R1,solarPV,2035,7.59500000000
-3,2045,R1,solarPV,2040,7.59500000000
-3,2049,R1,solarPV,2040,7.59500000000
-3,2050,R1,solarPV,2040,7.59500000000
-3,2054,R1,solarPV,2040,7.59500000000
-3,2055,R1,solarPV,2040,7.59500000000
-3,2059,R1,solarPV,2040,7.59500000000
-3,2060,R1,solarPV,2040,7.59500000000
-3,2064,R1,solarPV,2040,7.59500000000
-3,2065,R1,solarPV,2040,7.59500000000
-3,2069,R1,solarPV,2040,7.59500000000
-4,2040,R1,windturbine,2020,8.37500000000
-4,2045,R1,windturbine,2020,8.37500000000
-4,2049,R1,windturbine,2020,8.37500000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,20.00000000000
+1,2035,R1,solarPV,2025,20.00000000000
+1,2040,R1,solarPV,2025,20.00000000000
+1,2045,R1,solarPV,2025,20.00000000000
+1,2049,R1,solarPV,2025,20.00000000000
+1,2050,R1,solarPV,2025,20.00000000000
+1,2054,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2049,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2054,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2054,R1,solarPV,2035,6.00000000000
+3,2055,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2025,R1,windturbine,2020,8.37500000000
+5,2030,R1,windturbine,2020,8.37500000000
+5,2035,R1,windturbine,2020,8.37500000000
+5,2040,R1,windturbine,2020,8.37500000000
+5,2045,R1,windturbine,2020,8.37500000000
+5,2049,R1,windturbine,2020,8.37500000000
+6,2030,R1,windturbine,2025,1.62500000000
+6,2035,R1,windturbine,2025,1.62500000000
+6,2040,R1,windturbine,2025,1.62500000000
+6,2045,R1,windturbine,2025,1.62500000000
+6,2049,R1,windturbine,2025,1.62500000000
+6,2050,R1,windturbine,2025,1.62500000000
+6,2054,R1,windturbine,2025,1.62500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
index 2b37067f..b24e69bf 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
@@ -1,41 +1,60 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2025,17.52500000000
-0,2049,R1,solarPV,2025,17.52500000000
-0,2050,R1,solarPV,2025,17.52500000000
-0,2054,R1,solarPV,2025,17.52500000000
-1,2045,R1,solarPV,2030,3.00000000000
-1,2049,R1,solarPV,2030,3.00000000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2035,7.59500000000
-2,2049,R1,solarPV,2035,7.59500000000
-2,2050,R1,solarPV,2035,7.59500000000
-2,2054,R1,solarPV,2035,7.59500000000
-2,2055,R1,solarPV,2035,7.59500000000
-2,2059,R1,solarPV,2035,7.59500000000
-2,2060,R1,solarPV,2035,7.59500000000
-2,2064,R1,solarPV,2035,7.59500000000
-3,2045,R1,solarPV,2040,7.59500000000
-3,2049,R1,solarPV,2040,7.59500000000
-3,2050,R1,solarPV,2040,7.59500000000
-3,2054,R1,solarPV,2040,7.59500000000
-3,2055,R1,solarPV,2040,7.59500000000
-3,2059,R1,solarPV,2040,7.59500000000
-3,2060,R1,solarPV,2040,7.59500000000
-3,2064,R1,solarPV,2040,7.59500000000
-3,2065,R1,solarPV,2040,7.59500000000
-3,2069,R1,solarPV,2040,7.59500000000
-4,2050,R1,solarPV,2045,18.28500000000
-4,2054,R1,solarPV,2045,18.28500000000
-4,2055,R1,solarPV,2045,18.28500000000
-4,2059,R1,solarPV,2045,18.28500000000
-4,2060,R1,solarPV,2045,18.28500000000
-4,2064,R1,solarPV,2045,18.28500000000
-4,2065,R1,solarPV,2045,18.28500000000
-4,2069,R1,solarPV,2045,18.28500000000
-4,2070,R1,solarPV,2045,18.28500000000
-4,2074,R1,solarPV,2045,18.28500000000
-5,2045,R1,windturbine,2020,8.37500000000
-5,2049,R1,windturbine,2020,8.37500000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,20.00000000000
+1,2035,R1,solarPV,2025,20.00000000000
+1,2040,R1,solarPV,2025,20.00000000000
+1,2045,R1,solarPV,2025,20.00000000000
+1,2049,R1,solarPV,2025,20.00000000000
+1,2050,R1,solarPV,2025,20.00000000000
+1,2054,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2049,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2054,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2054,R1,solarPV,2035,6.00000000000
+3,2055,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,17.37500000000
+5,2054,R1,solarPV,2045,17.37500000000
+5,2055,R1,solarPV,2045,17.37500000000
+5,2059,R1,solarPV,2045,17.37500000000
+5,2060,R1,solarPV,2045,17.37500000000
+5,2064,R1,solarPV,2045,17.37500000000
+5,2065,R1,solarPV,2045,17.37500000000
+5,2069,R1,solarPV,2045,17.37500000000
+5,2070,R1,solarPV,2045,17.37500000000
+5,2074,R1,solarPV,2045,17.37500000000
+6,2025,R1,windturbine,2020,8.37500000000
+6,2030,R1,windturbine,2020,8.37500000000
+6,2035,R1,windturbine,2020,8.37500000000
+6,2040,R1,windturbine,2020,8.37500000000
+6,2045,R1,windturbine,2020,8.37500000000
+6,2049,R1,windturbine,2020,8.37500000000
+7,2030,R1,windturbine,2025,1.62500000000
+7,2035,R1,windturbine,2025,1.62500000000
+7,2040,R1,windturbine,2025,1.62500000000
+7,2045,R1,windturbine,2025,1.62500000000
+7,2049,R1,windturbine,2025,1.62500000000
+7,2050,R1,windturbine,2025,1.62500000000
+7,2054,R1,windturbine,2025,1.62500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
index 9484ef7e..fae9c947 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
@@ -1,41 +1,80 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,solarPV,2025,17.52500000000
-0,2054,R1,solarPV,2025,17.52500000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2035,7.59500000000
-2,2054,R1,solarPV,2035,7.59500000000
-2,2055,R1,solarPV,2035,7.59500000000
-2,2059,R1,solarPV,2035,7.59500000000
-2,2060,R1,solarPV,2035,7.59500000000
-2,2064,R1,solarPV,2035,7.59500000000
-3,2050,R1,solarPV,2040,7.59500000000
-3,2054,R1,solarPV,2040,7.59500000000
-3,2055,R1,solarPV,2040,7.59500000000
-3,2059,R1,solarPV,2040,7.59500000000
-3,2060,R1,solarPV,2040,7.59500000000
-3,2064,R1,solarPV,2040,7.59500000000
-3,2065,R1,solarPV,2040,7.59500000000
-3,2069,R1,solarPV,2040,7.59500000000
-4,2050,R1,solarPV,2045,18.28500000000
-4,2054,R1,solarPV,2045,18.28500000000
-4,2055,R1,solarPV,2045,18.28500000000
-4,2059,R1,solarPV,2045,18.28500000000
-4,2060,R1,solarPV,2045,18.28500000000
-4,2064,R1,solarPV,2045,18.28500000000
-4,2065,R1,solarPV,2045,18.28500000000
-4,2069,R1,solarPV,2045,18.28500000000
-4,2070,R1,solarPV,2045,18.28500000000
-4,2074,R1,solarPV,2045,18.28500000000
-5,2055,R1,solarPV,2050,17.52500000000
-5,2059,R1,solarPV,2050,17.52500000000
-5,2060,R1,solarPV,2050,17.52500000000
-5,2064,R1,solarPV,2050,17.52500000000
-5,2065,R1,solarPV,2050,17.52500000000
-5,2069,R1,solarPV,2050,17.52500000000
-5,2070,R1,solarPV,2050,17.52500000000
-5,2074,R1,solarPV,2050,17.52500000000
-5,2075,R1,solarPV,2050,17.52500000000
-5,2079,R1,solarPV,2050,17.52500000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,20.00000000000
+1,2035,R1,solarPV,2025,20.00000000000
+1,2040,R1,solarPV,2025,20.00000000000
+1,2045,R1,solarPV,2025,20.00000000000
+1,2049,R1,solarPV,2025,20.00000000000
+1,2050,R1,solarPV,2025,20.00000000000
+1,2054,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2049,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2054,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2054,R1,solarPV,2035,6.00000000000
+3,2055,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,17.37500000000
+5,2054,R1,solarPV,2045,17.37500000000
+5,2055,R1,solarPV,2045,17.37500000000
+5,2059,R1,solarPV,2045,17.37500000000
+5,2060,R1,solarPV,2045,17.37500000000
+5,2064,R1,solarPV,2045,17.37500000000
+5,2065,R1,solarPV,2045,17.37500000000
+5,2069,R1,solarPV,2045,17.37500000000
+5,2070,R1,solarPV,2045,17.37500000000
+5,2074,R1,solarPV,2045,17.37500000000
+6,2055,R1,solarPV,2050,20.00000000000
+6,2059,R1,solarPV,2050,20.00000000000
+6,2060,R1,solarPV,2050,20.00000000000
+6,2064,R1,solarPV,2050,20.00000000000
+6,2065,R1,solarPV,2050,20.00000000000
+6,2069,R1,solarPV,2050,20.00000000000
+6,2070,R1,solarPV,2050,20.00000000000
+6,2074,R1,solarPV,2050,20.00000000000
+6,2075,R1,solarPV,2050,20.00000000000
+6,2079,R1,solarPV,2050,20.00000000000
+7,2025,R1,windturbine,2020,8.37500000000
+7,2030,R1,windturbine,2020,8.37500000000
+7,2035,R1,windturbine,2020,8.37500000000
+7,2040,R1,windturbine,2020,8.37500000000
+7,2045,R1,windturbine,2020,8.37500000000
+7,2049,R1,windturbine,2020,8.37500000000
+8,2030,R1,windturbine,2025,1.62500000000
+8,2035,R1,windturbine,2025,1.62500000000
+8,2040,R1,windturbine,2025,1.62500000000
+8,2045,R1,windturbine,2025,1.62500000000
+8,2049,R1,windturbine,2025,1.62500000000
+8,2050,R1,windturbine,2025,1.62500000000
+8,2054,R1,windturbine,2025,1.62500000000
+9,2055,R1,windturbine,2050,1.62500000000
+9,2059,R1,windturbine,2050,1.62500000000
+9,2060,R1,windturbine,2050,1.62500000000
+9,2064,R1,windturbine,2050,1.62500000000
+9,2065,R1,windturbine,2050,1.62500000000
+9,2069,R1,windturbine,2050,1.62500000000
+9,2070,R1,windturbine,2050,1.62500000000
+9,2074,R1,windturbine,2050,1.62500000000
+9,2075,R1,windturbine,2050,1.62500000000
+9,2079,R1,windturbine,2050,1.62500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
index 2eb0ec15..9d7ceeff 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
index 22334ba5..b636c62a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2030.csv
@@ -1,14 +1,13 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
 1,2030,R1,heatpump,2020,19.00000000000
 1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
 3,2035,R1,heatpump,2030,25.00000000000
 3,2039,R1,heatpump,2030,25.00000000000
 3,2040,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
index 452c6c8a..e9ff1ceb 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
 3,2035,R1,heatpump,2030,25.00000000000
 3,2039,R1,heatpump,2030,25.00000000000
 3,2040,R1,heatpump,2030,25.00000000000
 3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
index e3ecc1d0..2d54c0aa 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
index 82b22d9b..5924d03b 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
+6,2050,R1,heatpump,2045,23.00000000000
+6,2054,R1,heatpump,2045,23.00000000000
+6,2055,R1,heatpump,2045,23.00000000000
+6,2059,R1,heatpump,2045,23.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
index 42f4be20..be30eaf2 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Capacity/2050.csv
@@ -1,11 +1,30 @@
 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
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
+6,2050,R1,heatpump,2045,23.00000000000
+6,2054,R1,heatpump,2045,23.00000000000
+6,2055,R1,heatpump,2045,23.00000000000
+6,2059,R1,heatpump,2045,23.00000000000
+7,2055,R1,heatpump,2050,31.00000000000
+7,2059,R1,heatpump,2050,31.00000000000
+7,2060,R1,heatpump,2050,31.00000000000
+7,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
index bfe116d0..b07adde6 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
@@ -1,43 +1,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+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.61110000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+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.91670000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+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.61110000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+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.91670000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+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.83330000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+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,1.22220000000
 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/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
index 82873caa..33951ce2 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
@@ -1,49 +1,25 @@
 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,2030,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
 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,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
 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,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
 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,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
 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,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
 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,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
 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/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
index 741ea3c6..c606a299 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
@@ -1,49 +1,25 @@
 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,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
 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
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
 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
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
 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
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
 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
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
 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
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
 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
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
index c802f340..d66038bc 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
@@ -1,49 +1,25 @@
 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
+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.94440000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+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.41670000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+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.94440000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+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.41670000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+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.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+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.88890000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
index c7be86b2..2f0389d3 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
@@ -1,37 +1,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
index 8c187153..3b6658d8 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
 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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
index d42ba410..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,4 @@
 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-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index c80c1939..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,4 @@
 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,2035,R1,gassupply1,2030,23.20780000000
-1,2040,R1,gassupply1,2030,23.20780000000
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index f8fd7fdc..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,23.20780000000
-1,2040,R1,gassupply1,2030,23.20780000000
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+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-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index 5635a4c6..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,23.20780000000
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+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-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index 0b1878a2..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+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-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index 2015c16c..d1ee882b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2055,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+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-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 6d7e2601..097a1311 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -1,65 +1,69 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,retrofit,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,retrofit,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A1,power,retrofit,2025,5.17550000000
-gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,7.41230000000
-windturbine,R1,R1,A1,power,retrofit,2030,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2030,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,3.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,14.40000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,7.41230000000
-windturbine,R1,R1,A1,power,retrofit,2035,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2035,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,3.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,14.40000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,7.41230000000
-windturbine,R1,R1,A1,power,retrofit,2040,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2040,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,3.72000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,20.28000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,7.41230000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.99310000000
-windturbine,R1,R1,A1,power,retrofit,2045,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2045,20.00000000000
-solarPV,R1,R1,A2,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,3.72000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,20.28000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,7.41230000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.99310000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.98730000000
-solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,10.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,22.50000000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
+gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,0.50000000000
+gasCCGT,R1,R1,A2,power,newcapa,2020,0.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,7.50000000000
+gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
+gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2025,50.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
+windturbine,R1,R1,A1,power,newcapa,2025,4.97240000000
+gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
+windturbine,R1,R1,A2,power,newcapa,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
+gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,50.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,7.51380000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.97240000000
+solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A2,power,newcapa,2030,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,18.00000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,50.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,7.51380000000
+solarPV,R1,R1,A1,power,newcapa,2035,0.87850000000
+windturbine,R1,R1,A1,power,newcapa,2035,4.97240000000
+solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2035,0.87850000000
+windturbine,R1,R1,A2,power,newcapa,2035,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,18.00000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,50.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,7.51380000000
+solarPV,R1,R1,A1,power,newcapa,2040,0.87850000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.37850000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.97240000000
+solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2040,0.87850000000
+solarPV,R1,R1,A2,power,newcapa,2040,2.37850000000
+windturbine,R1,R1,A2,power,newcapa,2040,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,24.00000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,50.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,7.51380000000
+solarPV,R1,R1,A1,power,newcapa,2045,0.87850000000
+solarPV,R1,R1,A1,power,newcapa,2045,2.37850000000
+solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,4.97240000000
+solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2045,0.87850000000
+solarPV,R1,R1,A2,power,newcapa,2045,2.37850000000
+solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
+windturbine,R1,R1,A2,power,newcapa,2045,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,24.00000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,50.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,7.51380000000
+solarPV,R1,R1,A1,power,newcapa,2050,0.87850000000
+solarPV,R1,R1,A1,power,newcapa,2050,2.37850000000
+solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,1.98620000000
+solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,0.87850000000
+solarPV,R1,R1,A2,power,newcapa,2050,2.37850000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A2,power,newcapa,2050,1.98620000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index cd286e91..72175508 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.64170000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.64250000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.18750000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.19310000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.68850000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.68960000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.28130000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.28970000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.64170000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.64250000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.18750000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.19310000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68850000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68960000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.28130000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.28970000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.82890000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.83110000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.56250000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.57930000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.73530000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.73680000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.37500000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.38620000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
 "('all-year', 'all-week', 'night')",heat,R1,0.72970000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09750000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.72970000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09750000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.21160000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.21190000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46690000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.60290000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.16920000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.90760000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25370000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.60290000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16920000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.90760000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25370000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.83460000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50750000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13320000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.21440000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33830000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.07520000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.50280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.75780000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.75780000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.53720000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13300000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,1.01520000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33340000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.07520000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16890000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.42500000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16290000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25330000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.64130000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24430000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16890000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.42500000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16290000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25330000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.64130000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24430000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50660000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.30590000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.48860000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33770000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.86020000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.32570000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07480000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.16550000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.36520000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.15280000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24830000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.55190000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22910000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05070000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16550000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.36520000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15280000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24830000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.55190000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22910000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05070000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49650000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.12850000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45830000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13080000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33100000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.74140000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30550000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07420000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
index 5a4a9175..3e93f592 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
 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,15.17550000000
-1,2030,R1,windturbine,2020,15.17550000000
-1,2035,R1,windturbine,2020,15.17550000000
-1,2040,R1,windturbine,2020,15.17550000000
-1,2045,R1,windturbine,2020,15.17550000000
-1,2049,R1,windturbine,2020,15.17550000000
+1,2025,R1,windturbine,2020,14.97240000000
+1,2030,R1,windturbine,2020,14.97240000000
+1,2035,R1,windturbine,2020,14.97240000000
+1,2040,R1,windturbine,2020,14.97240000000
+1,2045,R1,windturbine,2020,14.97240000000
+1,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index d45cd142..0b03efcc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,15 +1,16 @@
 asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,27.41230000000
-1,2035,R1,solarPV,2025,27.41230000000
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2025,R1,windturbine,2020,15.17550000000
-2,2030,R1,windturbine,2020,15.17550000000
-2,2035,R1,windturbine,2020,15.17550000000
-2,2040,R1,windturbine,2020,15.17550000000
-2,2045,R1,windturbine,2020,15.17550000000
-2,2049,R1,windturbine,2020,15.17550000000
+1,2030,R1,solarPV,2025,17.51380000000
+1,2035,R1,solarPV,2025,17.51380000000
+1,2040,R1,solarPV,2025,17.51380000000
+1,2045,R1,solarPV,2025,17.51380000000
+1,2049,R1,solarPV,2025,17.51380000000
+1,2050,R1,solarPV,2025,17.51380000000
+1,2054,R1,solarPV,2025,17.51380000000
+2,2025,R1,windturbine,2020,14.97240000000
+2,2030,R1,windturbine,2020,14.97240000000
+2,2035,R1,windturbine,2020,14.97240000000
+2,2040,R1,windturbine,2020,14.97240000000
+2,2045,R1,windturbine,2020,14.97240000000
+2,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index b1be23b1..aefd7581 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,13 +1,24 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2025,27.41230000000
-1,2035,R1,solarPV,2025,27.41230000000
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2030,R1,windturbine,2020,15.17550000000
-2,2035,R1,windturbine,2020,15.17550000000
-2,2040,R1,windturbine,2020,15.17550000000
-2,2045,R1,windturbine,2020,15.17550000000
-2,2049,R1,windturbine,2020,15.17550000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,17.51380000000
+1,2035,R1,solarPV,2025,17.51380000000
+1,2040,R1,solarPV,2025,17.51380000000
+1,2045,R1,solarPV,2025,17.51380000000
+1,2049,R1,solarPV,2025,17.51380000000
+1,2050,R1,solarPV,2025,17.51380000000
+1,2054,R1,solarPV,2025,17.51380000000
+2,2035,R1,solarPV,2030,1.75690000000
+2,2040,R1,solarPV,2030,1.75690000000
+2,2045,R1,solarPV,2030,1.75690000000
+2,2049,R1,solarPV,2030,1.75690000000
+2,2050,R1,solarPV,2030,1.75690000000
+2,2054,R1,solarPV,2030,1.75690000000
+2,2055,R1,solarPV,2030,1.75690000000
+2,2059,R1,solarPV,2030,1.75690000000
+3,2025,R1,windturbine,2020,14.97240000000
+3,2030,R1,windturbine,2020,14.97240000000
+3,2035,R1,windturbine,2020,14.97240000000
+3,2040,R1,windturbine,2020,14.97240000000
+3,2045,R1,windturbine,2020,14.97240000000
+3,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index e653f27a..804dca49 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,11 +1,33 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,solarPV,2025,27.41230000000
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2035,R1,windturbine,2020,15.17550000000
-2,2040,R1,windturbine,2020,15.17550000000
-2,2045,R1,windturbine,2020,15.17550000000
-2,2049,R1,windturbine,2020,15.17550000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,17.51380000000
+1,2035,R1,solarPV,2025,17.51380000000
+1,2040,R1,solarPV,2025,17.51380000000
+1,2045,R1,solarPV,2025,17.51380000000
+1,2049,R1,solarPV,2025,17.51380000000
+1,2050,R1,solarPV,2025,17.51380000000
+1,2054,R1,solarPV,2025,17.51380000000
+2,2035,R1,solarPV,2030,1.75690000000
+2,2040,R1,solarPV,2030,1.75690000000
+2,2045,R1,solarPV,2030,1.75690000000
+2,2049,R1,solarPV,2030,1.75690000000
+2,2050,R1,solarPV,2030,1.75690000000
+2,2054,R1,solarPV,2030,1.75690000000
+2,2055,R1,solarPV,2030,1.75690000000
+2,2059,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2035,4.75690000000
+3,2045,R1,solarPV,2035,4.75690000000
+3,2049,R1,solarPV,2035,4.75690000000
+3,2050,R1,solarPV,2035,4.75690000000
+3,2054,R1,solarPV,2035,4.75690000000
+3,2055,R1,solarPV,2035,4.75690000000
+3,2059,R1,solarPV,2035,4.75690000000
+3,2060,R1,solarPV,2035,4.75690000000
+3,2064,R1,solarPV,2035,4.75690000000
+4,2025,R1,windturbine,2020,14.97240000000
+4,2030,R1,windturbine,2020,14.97240000000
+4,2035,R1,windturbine,2020,14.97240000000
+4,2040,R1,windturbine,2020,14.97240000000
+4,2045,R1,windturbine,2020,14.97240000000
+4,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index c79dc3c1..b4a84d56 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,15 +1,43 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2045,R1,solarPV,2040,10.99310000000
-2,2049,R1,solarPV,2040,10.99310000000
-2,2050,R1,solarPV,2040,10.99310000000
-2,2054,R1,solarPV,2040,10.99310000000
-2,2055,R1,solarPV,2040,10.99310000000
-2,2069,R1,solarPV,2040,10.99310000000
-3,2040,R1,windturbine,2020,15.17550000000
-3,2045,R1,windturbine,2020,15.17550000000
-3,2049,R1,windturbine,2020,15.17550000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,17.51380000000
+1,2035,R1,solarPV,2025,17.51380000000
+1,2040,R1,solarPV,2025,17.51380000000
+1,2045,R1,solarPV,2025,17.51380000000
+1,2049,R1,solarPV,2025,17.51380000000
+1,2050,R1,solarPV,2025,17.51380000000
+1,2054,R1,solarPV,2025,17.51380000000
+2,2035,R1,solarPV,2030,1.75690000000
+2,2040,R1,solarPV,2030,1.75690000000
+2,2045,R1,solarPV,2030,1.75690000000
+2,2049,R1,solarPV,2030,1.75690000000
+2,2050,R1,solarPV,2030,1.75690000000
+2,2054,R1,solarPV,2030,1.75690000000
+2,2055,R1,solarPV,2030,1.75690000000
+2,2059,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2035,4.75690000000
+3,2045,R1,solarPV,2035,4.75690000000
+3,2049,R1,solarPV,2035,4.75690000000
+3,2050,R1,solarPV,2035,4.75690000000
+3,2054,R1,solarPV,2035,4.75690000000
+3,2055,R1,solarPV,2035,4.75690000000
+3,2059,R1,solarPV,2035,4.75690000000
+3,2060,R1,solarPV,2035,4.75690000000
+3,2064,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2025,R1,windturbine,2020,14.97240000000
+5,2030,R1,windturbine,2020,14.97240000000
+5,2035,R1,windturbine,2020,14.97240000000
+5,2040,R1,windturbine,2020,14.97240000000
+5,2045,R1,windturbine,2020,14.97240000000
+5,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index 280cff3b..a0f164dc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,19 +1,63 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2025,27.41230000000
-0,2049,R1,solarPV,2025,27.41230000000
-0,2050,R1,solarPV,2025,27.41230000000
-0,2054,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2040,10.99310000000
-1,2049,R1,solarPV,2040,10.99310000000
-1,2050,R1,solarPV,2040,10.99310000000
-1,2054,R1,solarPV,2040,10.99310000000
-1,2055,R1,solarPV,2040,10.99310000000
-1,2069,R1,solarPV,2040,10.99310000000
-2,2050,R1,solarPV,2045,26.98730000000
-2,2054,R1,solarPV,2045,26.98730000000
-2,2055,R1,solarPV,2045,26.98730000000
-2,2069,R1,solarPV,2045,26.98730000000
-2,2070,R1,solarPV,2045,26.98730000000
-2,2074,R1,solarPV,2045,26.98730000000
-3,2045,R1,windturbine,2020,15.17550000000
-3,2049,R1,windturbine,2020,15.17550000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,17.51380000000
+1,2035,R1,solarPV,2025,17.51380000000
+1,2040,R1,solarPV,2025,17.51380000000
+1,2045,R1,solarPV,2025,17.51380000000
+1,2049,R1,solarPV,2025,17.51380000000
+1,2050,R1,solarPV,2025,17.51380000000
+1,2054,R1,solarPV,2025,17.51380000000
+2,2035,R1,solarPV,2030,1.75690000000
+2,2040,R1,solarPV,2030,1.75690000000
+2,2045,R1,solarPV,2030,1.75690000000
+2,2049,R1,solarPV,2030,1.75690000000
+2,2050,R1,solarPV,2030,1.75690000000
+2,2054,R1,solarPV,2030,1.75690000000
+2,2055,R1,solarPV,2030,1.75690000000
+2,2059,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2035,4.75690000000
+3,2045,R1,solarPV,2035,4.75690000000
+3,2049,R1,solarPV,2035,4.75690000000
+3,2050,R1,solarPV,2035,4.75690000000
+3,2054,R1,solarPV,2035,4.75690000000
+3,2055,R1,solarPV,2035,4.75690000000
+3,2059,R1,solarPV,2035,4.75690000000
+3,2060,R1,solarPV,2035,4.75690000000
+3,2064,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,20.00000000000
+5,2054,R1,solarPV,2045,20.00000000000
+5,2055,R1,solarPV,2045,20.00000000000
+5,2059,R1,solarPV,2045,20.00000000000
+5,2060,R1,solarPV,2045,20.00000000000
+5,2064,R1,solarPV,2045,20.00000000000
+5,2065,R1,solarPV,2045,20.00000000000
+5,2069,R1,solarPV,2045,20.00000000000
+5,2070,R1,solarPV,2045,20.00000000000
+5,2074,R1,solarPV,2045,20.00000000000
+6,2025,R1,windturbine,2020,14.97240000000
+6,2030,R1,windturbine,2020,14.97240000000
+6,2035,R1,windturbine,2020,14.97240000000
+6,2040,R1,windturbine,2020,14.97240000000
+6,2045,R1,windturbine,2020,14.97240000000
+6,2049,R1,windturbine,2020,14.97240000000
+7,2050,R1,windturbine,2045,3.97240000000
+7,2054,R1,windturbine,2045,3.97240000000
+7,2055,R1,windturbine,2045,3.97240000000
+7,2059,R1,windturbine,2045,3.97240000000
+7,2060,R1,windturbine,2045,3.97240000000
+7,2064,R1,windturbine,2045,3.97240000000
+7,2065,R1,windturbine,2045,3.97240000000
+7,2069,R1,windturbine,2045,3.97240000000
+7,2070,R1,windturbine,2045,3.97240000000
+7,2074,R1,windturbine,2045,3.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index 7393f070..6abe9bf8 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,19 +1,73 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,solarPV,2025,27.41230000000
-0,2054,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2040,10.99310000000
-1,2054,R1,solarPV,2040,10.99310000000
-1,2055,R1,solarPV,2040,10.99310000000
-1,2069,R1,solarPV,2040,10.99310000000
-2,2050,R1,solarPV,2045,26.98730000000
-2,2054,R1,solarPV,2045,26.98730000000
-2,2055,R1,solarPV,2045,26.98730000000
-2,2069,R1,solarPV,2045,26.98730000000
-2,2070,R1,solarPV,2045,26.98730000000
-2,2074,R1,solarPV,2045,26.98730000000
-3,2055,R1,solarPV,2050,17.07570000000
-3,2069,R1,solarPV,2050,17.07570000000
-3,2070,R1,solarPV,2050,17.07570000000
-3,2074,R1,solarPV,2050,17.07570000000
-3,2075,R1,solarPV,2050,17.07570000000
-3,2079,R1,solarPV,2050,17.07570000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,solarPV,2025,17.51380000000
+1,2035,R1,solarPV,2025,17.51380000000
+1,2040,R1,solarPV,2025,17.51380000000
+1,2045,R1,solarPV,2025,17.51380000000
+1,2049,R1,solarPV,2025,17.51380000000
+1,2050,R1,solarPV,2025,17.51380000000
+1,2054,R1,solarPV,2025,17.51380000000
+2,2035,R1,solarPV,2030,1.75690000000
+2,2040,R1,solarPV,2030,1.75690000000
+2,2045,R1,solarPV,2030,1.75690000000
+2,2049,R1,solarPV,2030,1.75690000000
+2,2050,R1,solarPV,2030,1.75690000000
+2,2054,R1,solarPV,2030,1.75690000000
+2,2055,R1,solarPV,2030,1.75690000000
+2,2059,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2035,4.75690000000
+3,2045,R1,solarPV,2035,4.75690000000
+3,2049,R1,solarPV,2035,4.75690000000
+3,2050,R1,solarPV,2035,4.75690000000
+3,2054,R1,solarPV,2035,4.75690000000
+3,2055,R1,solarPV,2035,4.75690000000
+3,2059,R1,solarPV,2035,4.75690000000
+3,2060,R1,solarPV,2035,4.75690000000
+3,2064,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2054,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,20.00000000000
+5,2054,R1,solarPV,2045,20.00000000000
+5,2055,R1,solarPV,2045,20.00000000000
+5,2059,R1,solarPV,2045,20.00000000000
+5,2060,R1,solarPV,2045,20.00000000000
+5,2064,R1,solarPV,2045,20.00000000000
+5,2065,R1,solarPV,2045,20.00000000000
+5,2069,R1,solarPV,2045,20.00000000000
+5,2070,R1,solarPV,2045,20.00000000000
+5,2074,R1,solarPV,2045,20.00000000000
+6,2055,R1,solarPV,2050,18.75690000000
+6,2059,R1,solarPV,2050,18.75690000000
+6,2060,R1,solarPV,2050,18.75690000000
+6,2064,R1,solarPV,2050,18.75690000000
+6,2065,R1,solarPV,2050,18.75690000000
+6,2069,R1,solarPV,2050,18.75690000000
+6,2070,R1,solarPV,2050,18.75690000000
+6,2074,R1,solarPV,2050,18.75690000000
+6,2075,R1,solarPV,2050,18.75690000000
+6,2079,R1,solarPV,2050,18.75690000000
+7,2025,R1,windturbine,2020,14.97240000000
+7,2030,R1,windturbine,2020,14.97240000000
+7,2035,R1,windturbine,2020,14.97240000000
+7,2040,R1,windturbine,2020,14.97240000000
+7,2045,R1,windturbine,2020,14.97240000000
+7,2049,R1,windturbine,2020,14.97240000000
+8,2050,R1,windturbine,2045,3.97240000000
+8,2054,R1,windturbine,2045,3.97240000000
+8,2055,R1,windturbine,2045,3.97240000000
+8,2059,R1,windturbine,2045,3.97240000000
+8,2060,R1,windturbine,2045,3.97240000000
+8,2064,R1,windturbine,2045,3.97240000000
+8,2065,R1,windturbine,2045,3.97240000000
+8,2069,R1,windturbine,2045,3.97240000000
+8,2070,R1,windturbine,2045,3.97240000000
+8,2074,R1,windturbine,2045,3.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
index 1d1cd64d..6ced4e3e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,109.50000000000
-1,2030,R1,heatpump,2020,109.50000000000
-1,2034,R1,heatpump,2020,109.50000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
index 41f56aa7..6ced4e3e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -1,5 +1,6 @@
 asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,109.50000000000
-1,2030,R1,heatpump,2020,109.50000000000
-1,2034,R1,heatpump,2020,109.50000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
index e29079aa..8c62e15f 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -1,9 +1,9 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2030,3.60000000000
-0,2040,R1,gasboiler,2030,3.60000000000
-0,2044,R1,gasboiler,2030,3.60000000000
-1,2030,R1,heatpump,2020,109.50000000000
-1,2034,R1,heatpump,2020,109.50000000000
-2,2035,R1,heatpump,2030,114.40000000000
-2,2040,R1,heatpump,2030,114.40000000000
-2,2044,R1,heatpump,2030,114.40000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
+2,2035,R1,heatpump,2030,68.00000000000
+2,2040,R1,heatpump,2030,68.00000000000
+2,2044,R1,heatpump,2030,68.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
index b03b48fc..8c62e15f 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -1,7 +1,9 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2030,3.60000000000
-0,2040,R1,gasboiler,2030,3.60000000000
-0,2044,R1,gasboiler,2030,3.60000000000
-2,2035,R1,heatpump,2030,114.40000000000
-2,2040,R1,heatpump,2030,114.40000000000
-2,2044,R1,heatpump,2030,114.40000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
+2,2035,R1,heatpump,2030,68.00000000000
+2,2040,R1,heatpump,2030,68.00000000000
+2,2044,R1,heatpump,2030,68.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
index 9da5588c..fdaab67a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -1,11 +1,12 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,3.60000000000
-0,2044,R1,gasboiler,2030,3.60000000000
-1,2045,R1,gasboiler,2040,3.72000000000
-1,2050,R1,gasboiler,2040,3.72000000000
-1,2054,R1,gasboiler,2040,3.72000000000
-2,2040,R1,heatpump,2030,114.40000000000
-2,2044,R1,heatpump,2030,114.40000000000
-3,2045,R1,heatpump,2040,120.28000000000
-3,2050,R1,heatpump,2040,120.28000000000
-3,2054,R1,heatpump,2040,120.28000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
+2,2035,R1,heatpump,2030,68.00000000000
+2,2040,R1,heatpump,2030,68.00000000000
+2,2044,R1,heatpump,2030,68.00000000000
+3,2045,R1,heatpump,2040,74.00000000000
+3,2050,R1,heatpump,2040,74.00000000000
+3,2054,R1,heatpump,2040,74.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
index 95824543..fdaab67a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -1,7 +1,12 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gasboiler,2040,3.72000000000
-1,2050,R1,gasboiler,2040,3.72000000000
-1,2054,R1,gasboiler,2040,3.72000000000
-3,2045,R1,heatpump,2040,120.28000000000
-3,2050,R1,heatpump,2040,120.28000000000
-3,2054,R1,heatpump,2040,120.28000000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
+2,2035,R1,heatpump,2030,68.00000000000
+2,2040,R1,heatpump,2030,68.00000000000
+2,2044,R1,heatpump,2030,68.00000000000
+3,2045,R1,heatpump,2040,74.00000000000
+3,2050,R1,heatpump,2040,74.00000000000
+3,2054,R1,heatpump,2040,74.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
index 6ff2e689..40fee66e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -1,9 +1,14 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gasboiler,2040,3.72000000000
-1,2054,R1,gasboiler,2040,3.72000000000
-2,2055,R1,gasboiler,2050,2.66400000000
-2,2064,R1,gasboiler,2050,2.66400000000
-4,2050,R1,heatpump,2040,120.28000000000
-4,2054,R1,heatpump,2040,120.28000000000
-5,2055,R1,heatpump,2050,74.33600000000
-5,2064,R1,heatpump,2050,74.33600000000
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,59.50000000000
+1,2030,R1,heatpump,2020,59.50000000000
+1,2034,R1,heatpump,2020,59.50000000000
+2,2035,R1,heatpump,2030,68.00000000000
+2,2040,R1,heatpump,2030,68.00000000000
+2,2044,R1,heatpump,2030,68.00000000000
+3,2045,R1,heatpump,2040,74.00000000000
+3,2050,R1,heatpump,2040,74.00000000000
+3,2054,R1,heatpump,2040,74.00000000000
+4,2055,R1,heatpump,2050,77.00000000000
+4,2064,R1,heatpump,2050,77.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index ed498021..54de8901 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
 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.05820000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.10340000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.23000000000
 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.76770000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,6.68840000000
 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.08730000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.15500000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.84500000000
 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.65150000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,10.03260000000
 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.05820000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.10340000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.23000000000
 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.76770000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,6.68840000000
 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.08730000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.15500000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.84500000000
 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.65150000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,10.03260000000
 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.17470000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.31010000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.68990000000
 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,11.30310000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,20.06510000000
 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.11640000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.20670000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.45990000000
 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,7.53540000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,13.37670000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index 6123143a..1cc95438 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,25 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05820000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.10340000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.23000000000
 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.76770000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08730000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,6.68840000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.15500000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.84500000000
 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.65150000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05820000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,10.03260000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.10340000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.23000000000
 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.76770000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08730000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,6.68840000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.15500000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.84500000000
 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.65150000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.17470000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,10.03260000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.31010000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.68990000000
 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,11.30310000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.11640000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,20.06510000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.20670000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.45990000000
 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,7.53540000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,13.37670000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index f0ac673b..33c6a1bf 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,13 @@
 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.06100000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,2.00000000000
 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.09150000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,3.00000000000
 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.06100000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,2.00000000000
 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.09150000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,3.00000000000
 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.18310000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,6.00000000000
 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.12200000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,4.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index f7d82b38..870af7b7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,37 +1,13 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.06100000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
-0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
-0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
-1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.09150000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
-1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
-1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
-2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.06100000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
-2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
-2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
-3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.09150000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
-3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
-3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
-4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.18310000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
-4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
-4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
-5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.12200000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
-5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
-5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,2.00000000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.33330000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,3.00000000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.50000000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,2.00000000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.33330000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,3.00000000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.50000000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,6.00000000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,7.00000000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,4.00000000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.66670000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index cb472ae2..ee789ddb 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,37 +1,13 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
-0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
-0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
-0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
-1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
-1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
-1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
-1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
-2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
-2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
-2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
-3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
-3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
-3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
-4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
-4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
-4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
-5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
-5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
-5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
-5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.33330000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.66670000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.50000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,4.00000000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.33330000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.66670000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.50000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,4.00000000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,7.00000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,8.00000000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.66670000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.33330000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index 2bc6526c..4148e836 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,37 +1,13 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
-0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
-0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,2.91000000000
-0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
-0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
-1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
-1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
-1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
-1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
-1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
-2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
-2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
-2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
-2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
-3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
-3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
-3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
-3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
-4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
-4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
-4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
-4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
-5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
-5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
-5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
-5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
-5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.66670000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,3.00000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,4.00000000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.50000000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.66670000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,3.00000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,4.00000000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.50000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,8.00000000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,9.00000000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.33330000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,6.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 0be0b395..19c87e9b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,37 +1,13 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
-0,heat,2050,4,R1,all-year,all-week,night,heatpump,2040,2.91000000000
-0,heat,2055,2,R1,all-year,all-week,night,gasboiler,2050,0.10380000000
-0,heat,2055,5,R1,all-year,all-week,night,heatpump,2050,2.89620000000
-0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
-0,CO2f,2055,2,R1,all-year,all-week,night,gasboiler,2050,6.71640000000
-1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
-1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
-1,heat,2055,2,R1,all-year,all-week,morning,gasboiler,2050,0.15570000000
-1,heat,2055,5,R1,all-year,all-week,morning,heatpump,2050,4.34430000000
-1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
-1,CO2f,2055,2,R1,all-year,all-week,morning,gasboiler,2050,10.07460000000
-2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
-2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
-2,heat,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,0.10380000000
-2,heat,2055,5,R1,all-year,all-week,afternoon,heatpump,2050,2.89620000000
-2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
-2,CO2f,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,6.71640000000
-3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
-3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
-3,heat,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,0.15570000000
-3,heat,2055,5,R1,all-year,all-week,early-peak,heatpump,2050,4.34430000000
-3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
-3,CO2f,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,10.07460000000
-4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
-4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
-4,heat,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,0.31140000000
-4,heat,2055,5,R1,all-year,all-week,late-peak,heatpump,2050,8.68860000000
-4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
-4,CO2f,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,20.14920000000
-5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
-5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
-5,heat,2055,2,R1,all-year,all-week,evening,gasboiler,2050,0.20760000000
-5,heat,2055,5,R1,all-year,all-week,evening,heatpump,2050,5.79240000000
-5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
-5,CO2f,2055,2,R1,all-year,all-week,evening,gasboiler,2050,13.43280000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,3.00000000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,3.00000000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.50000000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,4.50000000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,3.00000000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,3.00000000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.50000000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,4.50000000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,9.00000000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,9.00000000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,6.00000000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,6.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
index 61de5105..1d028468 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -1,5 +1,7 @@
 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 6eec02b8..1d028468 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,13 +1,7 @@
 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,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2035,R2,gassupply1,2030,5.28440000000
-3,2040,R2,gassupply1,2030,5.28440000000
-3,2045,R2,gassupply1,2030,5.28440000000
-3,2050,R2,gassupply1,2030,5.28440000000
-3,2069,R2,gassupply1,2030,5.28440000000
+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/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
index b8a0488c..1d028468 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,11 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,5.28440000000
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
-3,2035,R2,gassupply1,2030,5.28440000000
-3,2040,R2,gassupply1,2030,5.28440000000
-3,2045,R2,gassupply1,2030,5.28440000000
-3,2050,R2,gassupply1,2030,5.28440000000
-3,2069,R2,gassupply1,2030,5.28440000000
+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/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
index e2f5d86b..1d028468 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,9 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,5.28440000000
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
-3,2040,R2,gassupply1,2030,5.28440000000
-3,2045,R2,gassupply1,2030,5.28440000000
-3,2050,R2,gassupply1,2030,5.28440000000
-3,2069,R2,gassupply1,2030,5.28440000000
+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/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
index ffdd5451..389309d7 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,7 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,5.28440000000
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
-3,2045,R2,gassupply1,2030,5.28440000000
-3,2050,R2,gassupply1,2030,5.28440000000
-3,2069,R2,gassupply1,2030,5.28440000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,1.02060000000
+1,2084,R1,gassupply1,2045,1.02060000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2050,R2,gassupply1,2045,1.02060000000
+3,2084,R2,gassupply1,2045,1.02060000000
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 073f8874..389309d7 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,7 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,5.28440000000
-1,2055,R1,gassupply1,2030,5.28440000000
-1,2069,R1,gassupply1,2030,5.28440000000
-3,2050,R2,gassupply1,2030,5.28440000000
-3,2055,R2,gassupply1,2030,5.28440000000
-3,2069,R2,gassupply1,2030,5.28440000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,1.02060000000
+1,2084,R1,gassupply1,2045,1.02060000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2050,R2,gassupply1,2045,1.02060000000
+3,2084,R2,gassupply1,2045,1.02060000000
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 a372abac..fc7b10ad 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
@@ -1,100 +1,98 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,6.75000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,4.10000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,19.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,6.90000000000
-solarPV,R1,R1,A1,power,retrofit,2030,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2030,9.15000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,9.15000000000
-windturbine,R2,R2,A1,power,retrofit,2030,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,4.10000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,6.90000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,25.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2035,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,9.15000000000
-solarPV,R2,R2,A1,power,retrofit,2035,6.00000000000
-windturbine,R2,R2,A1,power,retrofit,2035,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,5.28440000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,5.28440000000
-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
-gasboiler,R2,R2,A1,residential,retrofit,2040,0.91000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,25.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.09000000000
-solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,9.15000000000
-solarPV,R2,R2,A1,power,retrofit,2040,6.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,9.19000000000
-windturbine,R2,R2,A1,power,retrofit,2040,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,5.28440000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,5.28440000000
-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
-gasboiler,R2,R2,A1,residential,retrofit,2045,0.91000000000
-heatpump,R2,R2,A1,residential,retrofit,2045,16.09000000000
-heatpump,R2,R2,A1,residential,retrofit,2045,31.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
-solarPV,R1,R1,A1,power,retrofit,2045,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2045,6.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
-solarPV,R2,R2,A1,power,retrofit,2045,9.15000000000
-solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,9.19000000000
-solarPV,R2,R2,A1,power,retrofit,2045,6.00000000000
-windturbine,R2,R2,A1,power,retrofit,2045,16.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,5.28440000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,5.28440000000
-heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,31.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,23.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.15000000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.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
-solarPV,R2,R2,A1,power,retrofit,2050,9.15000000000
-solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
-solarPV,R2,R2,A1,power,retrofit,2050,9.19000000000
-solarPV,R2,R2,A1,power,retrofit,2050,6.00000000000
-solarPV,R2,R2,A1,power,retrofit,2050,16.91000000000
-windturbine,R2,R2,A1,power,retrofit,2050,6.75000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,5.28440000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,5.28440000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+solarPV,R1,R1,A1,power,newcapa,2025,6.75000000000
+windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
+windturbine,R2,R2,A1,power,newcapa,2025,16.75000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,19.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,3.25000000000
+solarPV,R2,R2,A1,power,newcapa,2030,10.00000000000
+windturbine,R2,R2,A1,power,newcapa,2030,16.75000000000
+windturbine,R2,R2,A1,power,newcapa,2030,3.25000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2035,10.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2035,26.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,3.25000000000
+solarPV,R2,R2,A1,power,newcapa,2035,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2035,6.00000000000
+windturbine,R2,R2,A1,power,newcapa,2035,16.75000000000
+windturbine,R2,R2,A1,power,newcapa,2035,3.25000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,26.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,16.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
+solarPV,R2,R2,A1,power,newcapa,2040,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
+solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
+windturbine,R2,R2,A1,power,newcapa,2040,16.75000000000
+windturbine,R2,R2,A1,power,newcapa,2040,3.25000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2045,16.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2045,32.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
+solarPV,R2,R2,A1,power,newcapa,2045,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
+solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
+solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
+windturbine,R2,R2,A1,power,newcapa,2045,16.75000000000
+windturbine,R2,R2,A1,power,newcapa,2045,3.25000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2050,32.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
+windturbine,R2,R2,A1,power,newcapa,2050,3.25000000000
+windturbine,R2,R2,A1,power,newcapa,2050,12.75000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.02060000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,1.02060000000
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 e867244a..60eaccd4 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
@@ -95,243 +95,243 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.14400000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,14.14400000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34640000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.34640000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.17040000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.17040000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72950000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.72950000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.19680000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,14.19680000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52010000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.52010000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25560000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.25560000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09700000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,1.09700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.14400000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,14.14400000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34640000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,64.34640000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17040000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.17040000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72950000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.72950000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.19680000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,14.19680000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52010000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.52010000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25560000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.25560000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09700000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.09700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.35510000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.35510000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.04300000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,65.04300000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51120000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.51120000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.21000000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.21000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.24960000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,14.24960000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69410000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.69410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34080000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.34080000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.46620000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,1.46620000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.34900000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,11.34900000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.62730000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.62730000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.16880000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.16880000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.03090000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.40810000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,11.40810000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84190000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.84190000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25320000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.25320000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.05140000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.05140000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.34900000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,11.34900000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.62730000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,51.62730000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16880000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.16880000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.03090000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.40810000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.40810000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84190000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.84190000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25320000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.25320000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05140000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05140000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.58540000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.58540000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.48970000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.48970000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50630000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.50630000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13350000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.46720000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,11.46720000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.05720000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,52.05720000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33750000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.33750000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.07540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.07540000000,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,9.11210000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,9.11210000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40520000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,41.40520000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16520000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.16520000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.03080000000,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,9.17580000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,9.17580000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.62920000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,41.62920000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24790000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.24790000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.05130000000,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,9.11210000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,9.11210000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R2,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40520000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,41.40520000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16520000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.16520000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.03080000000,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,9.17580000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,9.17580000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.62920000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.62920000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24790000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.24790000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05130000000,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,9.36700000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,9.36700000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.30740000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,42.30740000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49570000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.49570000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13290000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13290000000,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,9.23960000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,9.23960000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.85430000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,41.85430000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33050000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.33050000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.07510000000,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,7.32190000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,7.32190000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21060000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,33.21060000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16350000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.16350000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,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,7.38900000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,7.38900000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.43380000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,33.43380000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24530000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.24530000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05090000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.05090000000,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,7.32190000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,7.32190000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R2,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21060000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,33.21060000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16350000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.16350000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.03070000000,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,7.38900000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,7.38900000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.43380000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,33.43380000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24530000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.24530000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05090000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05090000000,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,7.59030000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,7.59030000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.11130000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,34.11130000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49060000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.49060000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13160000000,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,7.45610000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,7.45610000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.65830000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,33.65830000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.32700000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.32700000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07450000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.07450000000,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.15170000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.15170000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.31690000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.31690000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.18750000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.18750000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,5.20510000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.03060000000,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.22750000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.22750000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.47940000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.47940000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.28130000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.28130000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,5.21360000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.05090000000,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.15170000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.15170000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R2,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.31690000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.31690000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.18750000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.18750000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R2,5.20510000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.03060000000,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.22750000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.22750000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.47940000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.47940000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.28130000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.28130000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.21360000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05090000000,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,0.45500000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.45500000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.98300000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.98300000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.56260000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.56260000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.23910000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13150000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.13150000000,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,0.30330000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.30330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.64460000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.64460000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.37510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.37510000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,5.22210000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07450000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.07450000000,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/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
index 9e44d4d6..53a1613f 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -1,35 +1,51 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2025,gasCCGT,R2,2020,1.00000000000
-2,2025,solarPV,R1,2020,6.75000000000
-2,2030,solarPV,R1,2020,6.75000000000
-2,2035,solarPV,R1,2020,6.75000000000
-2,2040,solarPV,R1,2020,6.75000000000
-2,2045,solarPV,R1,2020,6.75000000000
-2,2049,solarPV,R1,2020,6.75000000000
-3,2030,solarPV,R1,2025,9.15000000000
-3,2035,solarPV,R1,2025,9.15000000000
-3,2040,solarPV,R1,2025,9.15000000000
-3,2045,solarPV,R1,2025,9.15000000000
-3,2049,solarPV,R1,2025,9.15000000000
-3,2050,solarPV,R1,2025,9.15000000000
-3,2054,solarPV,R1,2025,9.15000000000
-4,2030,solarPV,R2,2025,9.15000000000
-4,2035,solarPV,R2,2025,9.15000000000
-4,2040,solarPV,R2,2025,9.15000000000
-4,2045,solarPV,R2,2025,9.15000000000
-4,2049,solarPV,R2,2025,9.15000000000
-4,2050,solarPV,R2,2025,9.15000000000
-4,2054,solarPV,R2,2025,9.15000000000
-5,2025,windturbine,R1,2020,10.00000000000
-5,2030,windturbine,R1,2020,10.00000000000
-5,2035,windturbine,R1,2020,10.00000000000
-5,2040,windturbine,R1,2020,10.00000000000
-5,2045,windturbine,R1,2020,10.00000000000
-5,2049,windturbine,R1,2020,10.00000000000
-6,2025,windturbine,R2,2020,16.75000000000
-6,2030,windturbine,R2,2020,16.75000000000
-6,2035,windturbine,R2,2020,16.75000000000
-6,2040,windturbine,R2,2020,16.75000000000
-6,2045,windturbine,R2,2020,16.75000000000
-6,2049,windturbine,R2,2020,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,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2025,R1,windturbine,2020,10.00000000000
+3,2030,R1,windturbine,2020,10.00000000000
+3,2035,R1,windturbine,2020,10.00000000000
+3,2040,R1,windturbine,2020,10.00000000000
+3,2045,R1,windturbine,2020,10.00000000000
+3,2049,R1,windturbine,2020,10.00000000000
+4,2030,R1,windturbine,2025,3.25000000000
+4,2035,R1,windturbine,2025,3.25000000000
+4,2040,R1,windturbine,2025,3.25000000000
+4,2045,R1,windturbine,2025,3.25000000000
+4,2049,R1,windturbine,2025,3.25000000000
+4,2050,R1,windturbine,2025,3.25000000000
+4,2054,R1,windturbine,2025,3.25000000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2030,R2,solarPV,2025,10.00000000000
+6,2035,R2,solarPV,2025,10.00000000000
+6,2040,R2,solarPV,2025,10.00000000000
+6,2045,R2,solarPV,2025,10.00000000000
+6,2049,R2,solarPV,2025,10.00000000000
+6,2050,R2,solarPV,2025,10.00000000000
+6,2054,R2,solarPV,2025,10.00000000000
+7,2025,R2,windturbine,2020,16.75000000000
+7,2030,R2,windturbine,2020,16.75000000000
+7,2035,R2,windturbine,2020,16.75000000000
+7,2040,R2,windturbine,2020,16.75000000000
+7,2045,R2,windturbine,2020,16.75000000000
+7,2049,R2,windturbine,2020,16.75000000000
+8,2030,R2,windturbine,2025,3.25000000000
+8,2035,R2,windturbine,2025,3.25000000000
+8,2040,R2,windturbine,2025,3.25000000000
+8,2045,R2,windturbine,2025,3.25000000000
+8,2049,R2,windturbine,2025,3.25000000000
+8,2050,R2,windturbine,2025,3.25000000000
+8,2054,R2,windturbine,2025,3.25000000000
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 6a77ba27..ca50d052 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,16 +1,19 @@
 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,2030,R1,solarPV,2025,9.15000000000
-2,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2030,6.00000000000
@@ -19,28 +22,46 @@ 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,2025,R1,windturbine,2020,10.00000000000
 4,2030,R1,windturbine,2020,10.00000000000
 4,2035,R1,windturbine,2020,10.00000000000
 4,2040,R1,windturbine,2020,10.00000000000
 4,2045,R1,windturbine,2020,10.00000000000
 4,2049,R1,windturbine,2020,10.00000000000
-6,2030,R2,solarPV,2025,9.15000000000
-6,2035,R2,solarPV,2025,9.15000000000
-6,2040,R2,solarPV,2025,9.15000000000
-6,2045,R2,solarPV,2025,9.15000000000
-6,2049,R2,solarPV,2025,9.15000000000
-6,2050,R2,solarPV,2025,9.15000000000
-6,2054,R2,solarPV,2025,9.15000000000
-7,2035,R2,solarPV,2030,6.00000000000
-7,2040,R2,solarPV,2030,6.00000000000
-7,2045,R2,solarPV,2030,6.00000000000
-7,2049,R2,solarPV,2030,6.00000000000
-7,2050,R2,solarPV,2030,6.00000000000
-7,2054,R2,solarPV,2030,6.00000000000
-7,2055,R2,solarPV,2030,6.00000000000
-7,2059,R2,solarPV,2030,6.00000000000
-8,2030,R2,windturbine,2020,16.75000000000
-8,2035,R2,windturbine,2020,16.75000000000
-8,2040,R2,windturbine,2020,16.75000000000
-8,2045,R2,windturbine,2020,16.75000000000
-8,2049,R2,windturbine,2020,16.75000000000
+5,2030,R1,windturbine,2025,3.25000000000
+5,2035,R1,windturbine,2025,3.25000000000
+5,2040,R1,windturbine,2025,3.25000000000
+5,2045,R1,windturbine,2025,3.25000000000
+5,2049,R1,windturbine,2025,3.25000000000
+5,2050,R1,windturbine,2025,3.25000000000
+5,2054,R1,windturbine,2025,3.25000000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,solarPV,2025,10.00000000000
+7,2035,R2,solarPV,2025,10.00000000000
+7,2040,R2,solarPV,2025,10.00000000000
+7,2045,R2,solarPV,2025,10.00000000000
+7,2049,R2,solarPV,2025,10.00000000000
+7,2050,R2,solarPV,2025,10.00000000000
+7,2054,R2,solarPV,2025,10.00000000000
+8,2035,R2,solarPV,2030,6.00000000000
+8,2040,R2,solarPV,2030,6.00000000000
+8,2045,R2,solarPV,2030,6.00000000000
+8,2049,R2,solarPV,2030,6.00000000000
+8,2050,R2,solarPV,2030,6.00000000000
+8,2054,R2,solarPV,2030,6.00000000000
+8,2055,R2,solarPV,2030,6.00000000000
+8,2059,R2,solarPV,2030,6.00000000000
+9,2025,R2,windturbine,2020,16.75000000000
+9,2030,R2,windturbine,2020,16.75000000000
+9,2035,R2,windturbine,2020,16.75000000000
+9,2040,R2,windturbine,2020,16.75000000000
+9,2045,R2,windturbine,2020,16.75000000000
+9,2049,R2,windturbine,2020,16.75000000000
+10,2030,R2,windturbine,2025,3.25000000000
+10,2035,R2,windturbine,2025,3.25000000000
+10,2040,R2,windturbine,2025,3.25000000000
+10,2045,R2,windturbine,2025,3.25000000000
+10,2049,R2,windturbine,2025,3.25000000000
+10,2050,R2,windturbine,2025,3.25000000000
+10,2054,R2,windturbine,2025,3.25000000000
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 66e4f6ec..4795755b 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,14 +1,19 @@
 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,2035,R1,solarPV,2025,9.15000000000
-2,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2030,6.00000000000
@@ -17,43 +22,73 @@ 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,2040,R1,solarPV,2035,9.19000000000
-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
+4,2040,R1,solarPV,2035,10.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,2025,R1,windturbine,2020,10.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,2035,R2,solarPV,2025,9.15000000000
-7,2040,R2,solarPV,2025,9.15000000000
-7,2045,R2,solarPV,2025,9.15000000000
-7,2049,R2,solarPV,2025,9.15000000000
-7,2050,R2,solarPV,2025,9.15000000000
-7,2054,R2,solarPV,2025,9.15000000000
-8,2035,R2,solarPV,2030,6.00000000000
-8,2040,R2,solarPV,2030,6.00000000000
-8,2045,R2,solarPV,2030,6.00000000000
-8,2049,R2,solarPV,2030,6.00000000000
-8,2050,R2,solarPV,2030,6.00000000000
-8,2054,R2,solarPV,2030,6.00000000000
-8,2055,R2,solarPV,2030,6.00000000000
-8,2059,R2,solarPV,2030,6.00000000000
-9,2040,R2,solarPV,2035,9.19000000000
-9,2045,R2,solarPV,2035,9.19000000000
-9,2049,R2,solarPV,2035,9.19000000000
-9,2050,R2,solarPV,2035,9.19000000000
-9,2054,R2,solarPV,2035,9.19000000000
-9,2055,R2,solarPV,2035,9.19000000000
-9,2059,R2,solarPV,2035,9.19000000000
-9,2060,R2,solarPV,2035,9.19000000000
-9,2064,R2,solarPV,2035,9.19000000000
-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
+6,2030,R1,windturbine,2025,3.25000000000
+6,2035,R1,windturbine,2025,3.25000000000
+6,2040,R1,windturbine,2025,3.25000000000
+6,2045,R1,windturbine,2025,3.25000000000
+6,2049,R1,windturbine,2025,3.25000000000
+6,2050,R1,windturbine,2025,3.25000000000
+6,2054,R1,windturbine,2025,3.25000000000
+7,2040,R1,windturbine,2035,2.00000000000
+7,2045,R1,windturbine,2035,2.00000000000
+7,2049,R1,windturbine,2035,2.00000000000
+7,2050,R1,windturbine,2035,2.00000000000
+7,2054,R1,windturbine,2035,2.00000000000
+7,2055,R1,windturbine,2035,2.00000000000
+7,2059,R1,windturbine,2035,2.00000000000
+7,2060,R1,windturbine,2035,2.00000000000
+7,2064,R1,windturbine,2035,2.00000000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,1.00000000000
+9,2030,R2,solarPV,2025,10.00000000000
+9,2035,R2,solarPV,2025,10.00000000000
+9,2040,R2,solarPV,2025,10.00000000000
+9,2045,R2,solarPV,2025,10.00000000000
+9,2049,R2,solarPV,2025,10.00000000000
+9,2050,R2,solarPV,2025,10.00000000000
+9,2054,R2,solarPV,2025,10.00000000000
+10,2035,R2,solarPV,2030,6.00000000000
+10,2040,R2,solarPV,2030,6.00000000000
+10,2045,R2,solarPV,2030,6.00000000000
+10,2049,R2,solarPV,2030,6.00000000000
+10,2050,R2,solarPV,2030,6.00000000000
+10,2054,R2,solarPV,2030,6.00000000000
+10,2055,R2,solarPV,2030,6.00000000000
+10,2059,R2,solarPV,2030,6.00000000000
+11,2040,R2,solarPV,2035,6.00000000000
+11,2045,R2,solarPV,2035,6.00000000000
+11,2049,R2,solarPV,2035,6.00000000000
+11,2050,R2,solarPV,2035,6.00000000000
+11,2054,R2,solarPV,2035,6.00000000000
+11,2055,R2,solarPV,2035,6.00000000000
+11,2059,R2,solarPV,2035,6.00000000000
+11,2060,R2,solarPV,2035,6.00000000000
+11,2064,R2,solarPV,2035,6.00000000000
+12,2025,R2,windturbine,2020,16.75000000000
+12,2030,R2,windturbine,2020,16.75000000000
+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,2030,R2,windturbine,2025,3.25000000000
+13,2035,R2,windturbine,2025,3.25000000000
+13,2040,R2,windturbine,2025,3.25000000000
+13,2045,R2,windturbine,2025,3.25000000000
+13,2049,R2,windturbine,2025,3.25000000000
+13,2050,R2,windturbine,2025,3.25000000000
+13,2054,R2,windturbine,2025,3.25000000000
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 9cd94dc7..617904f7 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,12 +1,20 @@
 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,2040,R1,solarPV,2025,9.15000000000
-2,2045,R1,solarPV,2025,9.15000000000
-2,2049,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2025,9.15000000000
-2,2054,R1,solarPV,2025,9.15000000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 3,2045,R1,solarPV,2030,6.00000000000
 3,2049,R1,solarPV,2030,6.00000000000
@@ -14,59 +22,83 @@ 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,2040,R1,solarPV,2035,9.19000000000
-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,2040,R1,windturbine,2020,10.00000000000
-6,2045,R1,windturbine,2020,10.00000000000
-6,2049,R1,windturbine,2020,10.00000000000
-8,2040,R2,solarPV,2025,9.15000000000
-8,2045,R2,solarPV,2025,9.15000000000
-8,2049,R2,solarPV,2025,9.15000000000
-8,2050,R2,solarPV,2025,9.15000000000
-8,2054,R2,solarPV,2025,9.15000000000
-9,2040,R2,solarPV,2030,6.00000000000
-9,2045,R2,solarPV,2030,6.00000000000
-9,2049,R2,solarPV,2030,6.00000000000
-9,2050,R2,solarPV,2030,6.00000000000
-9,2054,R2,solarPV,2030,6.00000000000
-9,2055,R2,solarPV,2030,6.00000000000
-9,2059,R2,solarPV,2030,6.00000000000
-10,2040,R2,solarPV,2035,9.19000000000
-10,2045,R2,solarPV,2035,9.19000000000
-10,2049,R2,solarPV,2035,9.19000000000
-10,2050,R2,solarPV,2035,9.19000000000
-10,2054,R2,solarPV,2035,9.19000000000
-10,2055,R2,solarPV,2035,9.19000000000
-10,2059,R2,solarPV,2035,9.19000000000
-10,2060,R2,solarPV,2035,9.19000000000
-10,2064,R2,solarPV,2035,9.19000000000
-11,2045,R2,solarPV,2040,6.00000000000
-11,2049,R2,solarPV,2040,6.00000000000
-11,2050,R2,solarPV,2040,6.00000000000
-11,2054,R2,solarPV,2040,6.00000000000
-11,2055,R2,solarPV,2040,6.00000000000
-11,2059,R2,solarPV,2040,6.00000000000
-11,2060,R2,solarPV,2040,6.00000000000
-11,2064,R2,solarPV,2040,6.00000000000
-11,2065,R2,solarPV,2040,6.00000000000
-11,2069,R2,solarPV,2040,6.00000000000
-12,2040,R2,windturbine,2020,16.75000000000
-12,2045,R2,windturbine,2020,16.75000000000
-12,2049,R2,windturbine,2020,16.75000000000
+4,2040,R1,solarPV,2035,10.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,2025,R1,windturbine,2020,10.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
+6,2030,R1,windturbine,2025,3.25000000000
+6,2035,R1,windturbine,2025,3.25000000000
+6,2040,R1,windturbine,2025,3.25000000000
+6,2045,R1,windturbine,2025,3.25000000000
+6,2049,R1,windturbine,2025,3.25000000000
+6,2050,R1,windturbine,2025,3.25000000000
+6,2054,R1,windturbine,2025,3.25000000000
+7,2040,R1,windturbine,2035,2.00000000000
+7,2045,R1,windturbine,2035,2.00000000000
+7,2049,R1,windturbine,2035,2.00000000000
+7,2050,R1,windturbine,2035,2.00000000000
+7,2054,R1,windturbine,2035,2.00000000000
+7,2055,R1,windturbine,2035,2.00000000000
+7,2059,R1,windturbine,2035,2.00000000000
+7,2060,R1,windturbine,2035,2.00000000000
+7,2064,R1,windturbine,2035,2.00000000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,1.00000000000
+9,2030,R2,solarPV,2025,10.00000000000
+9,2035,R2,solarPV,2025,10.00000000000
+9,2040,R2,solarPV,2025,10.00000000000
+9,2045,R2,solarPV,2025,10.00000000000
+9,2049,R2,solarPV,2025,10.00000000000
+9,2050,R2,solarPV,2025,10.00000000000
+9,2054,R2,solarPV,2025,10.00000000000
+10,2035,R2,solarPV,2030,6.00000000000
+10,2040,R2,solarPV,2030,6.00000000000
+10,2045,R2,solarPV,2030,6.00000000000
+10,2049,R2,solarPV,2030,6.00000000000
+10,2050,R2,solarPV,2030,6.00000000000
+10,2054,R2,solarPV,2030,6.00000000000
+10,2055,R2,solarPV,2030,6.00000000000
+10,2059,R2,solarPV,2030,6.00000000000
+11,2040,R2,solarPV,2035,6.00000000000
+11,2045,R2,solarPV,2035,6.00000000000
+11,2049,R2,solarPV,2035,6.00000000000
+11,2050,R2,solarPV,2035,6.00000000000
+11,2054,R2,solarPV,2035,6.00000000000
+11,2055,R2,solarPV,2035,6.00000000000
+11,2059,R2,solarPV,2035,6.00000000000
+11,2060,R2,solarPV,2035,6.00000000000
+11,2064,R2,solarPV,2035,6.00000000000
+12,2045,R2,solarPV,2040,6.00000000000
+12,2049,R2,solarPV,2040,6.00000000000
+12,2050,R2,solarPV,2040,6.00000000000
+12,2054,R2,solarPV,2040,6.00000000000
+12,2055,R2,solarPV,2040,6.00000000000
+12,2059,R2,solarPV,2040,6.00000000000
+12,2060,R2,solarPV,2040,6.00000000000
+12,2064,R2,solarPV,2040,6.00000000000
+12,2065,R2,solarPV,2040,6.00000000000
+12,2069,R2,solarPV,2040,6.00000000000
+13,2025,R2,windturbine,2020,16.75000000000
+13,2030,R2,windturbine,2020,16.75000000000
+13,2035,R2,windturbine,2020,16.75000000000
+13,2040,R2,windturbine,2020,16.75000000000
+13,2045,R2,windturbine,2020,16.75000000000
+13,2049,R2,windturbine,2020,16.75000000000
+14,2030,R2,windturbine,2025,3.25000000000
+14,2035,R2,windturbine,2025,3.25000000000
+14,2040,R2,windturbine,2025,3.25000000000
+14,2045,R2,windturbine,2025,3.25000000000
+14,2049,R2,windturbine,2025,3.25000000000
+14,2050,R2,windturbine,2025,3.25000000000
+14,2054,R2,windturbine,2025,3.25000000000
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 d67966d3..2f14e092 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
@@ -1,103 +1,156 @@
-asset,year,technology,region,installed,capacity
-0,2045,solarPV,R1,2020,6.75000000000
-0,2049,solarPV,R1,2020,6.75000000000
-1,2045,solarPV,R1,2025,9.15000000000
-1,2049,solarPV,R1,2025,9.15000000000
-1,2050,solarPV,R1,2025,9.15000000000
-1,2054,solarPV,R1,2025,9.15000000000
-2,2045,solarPV,R1,2030,6.00000000000
-2,2049,solarPV,R1,2030,6.00000000000
-2,2050,solarPV,R1,2030,6.00000000000
-2,2054,solarPV,R1,2030,6.00000000000
-2,2055,solarPV,R1,2030,6.00000000000
-2,2059,solarPV,R1,2030,6.00000000000
-3,2045,solarPV,R1,2035,9.19000000000
-3,2049,solarPV,R1,2035,9.19000000000
-3,2050,solarPV,R1,2035,9.19000000000
-3,2054,solarPV,R1,2035,9.19000000000
-3,2055,solarPV,R1,2035,9.19000000000
-3,2059,solarPV,R1,2035,9.19000000000
-3,2060,solarPV,R1,2035,9.19000000000
-3,2064,solarPV,R1,2035,9.19000000000
-4,2045,solarPV,R1,2040,6.00000000000
-4,2049,solarPV,R1,2040,6.00000000000
-4,2050,solarPV,R1,2040,6.00000000000
-4,2054,solarPV,R1,2040,6.00000000000
-4,2055,solarPV,R1,2040,6.00000000000
-4,2059,solarPV,R1,2040,6.00000000000
-4,2060,solarPV,R1,2040,6.00000000000
-4,2064,solarPV,R1,2040,6.00000000000
-4,2065,solarPV,R1,2040,6.00000000000
-4,2069,solarPV,R1,2040,6.00000000000
-5,2050,solarPV,R1,2045,16.91000000000
-5,2054,solarPV,R1,2045,16.91000000000
-5,2055,solarPV,R1,2045,16.91000000000
-5,2059,solarPV,R1,2045,16.91000000000
-5,2060,solarPV,R1,2045,16.91000000000
-5,2064,solarPV,R1,2045,16.91000000000
-5,2065,solarPV,R1,2045,16.91000000000
-5,2069,solarPV,R1,2045,16.91000000000
-5,2070,solarPV,R1,2045,16.91000000000
-5,2074,solarPV,R1,2045,16.91000000000
-6,2045,solarPV,R2,2025,9.15000000000
-6,2049,solarPV,R2,2025,9.15000000000
-6,2050,solarPV,R2,2025,9.15000000000
-6,2054,solarPV,R2,2025,9.15000000000
-7,2045,solarPV,R2,2030,6.00000000000
-7,2049,solarPV,R2,2030,6.00000000000
-7,2050,solarPV,R2,2030,6.00000000000
-7,2054,solarPV,R2,2030,6.00000000000
-7,2055,solarPV,R2,2030,6.00000000000
-7,2059,solarPV,R2,2030,6.00000000000
-8,2045,solarPV,R2,2035,9.19000000000
-8,2049,solarPV,R2,2035,9.19000000000
-8,2050,solarPV,R2,2035,9.19000000000
-8,2054,solarPV,R2,2035,9.19000000000
-8,2055,solarPV,R2,2035,9.19000000000
-8,2059,solarPV,R2,2035,9.19000000000
-8,2060,solarPV,R2,2035,9.19000000000
-8,2064,solarPV,R2,2035,9.19000000000
-9,2045,solarPV,R2,2040,6.00000000000
-9,2049,solarPV,R2,2040,6.00000000000
-9,2050,solarPV,R2,2040,6.00000000000
-9,2054,solarPV,R2,2040,6.00000000000
-9,2055,solarPV,R2,2040,6.00000000000
-9,2059,solarPV,R2,2040,6.00000000000
-9,2060,solarPV,R2,2040,6.00000000000
-9,2064,solarPV,R2,2040,6.00000000000
-9,2065,solarPV,R2,2040,6.00000000000
-9,2069,solarPV,R2,2040,6.00000000000
-10,2050,solarPV,R2,2045,16.91000000000
-10,2054,solarPV,R2,2045,16.91000000000
-10,2055,solarPV,R2,2045,16.91000000000
-10,2059,solarPV,R2,2045,16.91000000000
-10,2060,solarPV,R2,2045,16.91000000000
-10,2064,solarPV,R2,2045,16.91000000000
-10,2065,solarPV,R2,2045,16.91000000000
-10,2069,solarPV,R2,2045,16.91000000000
-10,2070,solarPV,R2,2045,16.91000000000
-10,2074,solarPV,R2,2045,16.91000000000
-11,2045,windturbine,R1,2020,10.00000000000
-11,2049,windturbine,R1,2020,10.00000000000
-12,2050,windturbine,R1,2045,6.75000000000
-12,2054,windturbine,R1,2045,6.75000000000
-12,2055,windturbine,R1,2045,6.75000000000
-12,2059,windturbine,R1,2045,6.75000000000
-12,2060,windturbine,R1,2045,6.75000000000
-12,2064,windturbine,R1,2045,6.75000000000
-12,2065,windturbine,R1,2045,6.75000000000
-12,2069,windturbine,R1,2045,6.75000000000
-12,2070,windturbine,R1,2045,6.75000000000
-12,2074,windturbine,R1,2045,6.75000000000
-13,2045,windturbine,R2,2020,16.75000000000
-13,2049,windturbine,R2,2020,16.75000000000
-14,2050,windturbine,R2,2045,6.75000000000
-14,2054,windturbine,R2,2045,6.75000000000
-14,2055,windturbine,R2,2045,6.75000000000
-14,2059,windturbine,R2,2045,6.75000000000
-14,2060,windturbine,R2,2045,6.75000000000
-14,2064,windturbine,R2,2045,6.75000000000
-14,2065,windturbine,R2,2045,6.75000000000
-14,2069,windturbine,R2,2045,6.75000000000
-14,2070,windturbine,R2,2045,6.75000000000
-14,2074,windturbine,R2,2045,6.75000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,1.22220000000
+1,2054,R1,gasCCGT,2045,1.22220000000
+1,2055,R1,gasCCGT,2045,1.22220000000
+1,2059,R1,gasCCGT,2045,1.22220000000
+1,2060,R1,gasCCGT,2045,1.22220000000
+1,2064,R1,gasCCGT,2045,1.22220000000
+1,2065,R1,gasCCGT,2045,1.22220000000
+1,2069,R1,gasCCGT,2045,1.22220000000
+1,2070,R1,gasCCGT,2045,1.22220000000
+1,2074,R1,gasCCGT,2045,1.22220000000
+1,2075,R1,gasCCGT,2045,1.22220000000
+1,2084,R1,gasCCGT,2045,1.22220000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+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,10.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
+6,2050,R1,solarPV,2045,10.00000000000
+6,2054,R1,solarPV,2045,10.00000000000
+6,2055,R1,solarPV,2045,10.00000000000
+6,2059,R1,solarPV,2045,10.00000000000
+6,2060,R1,solarPV,2045,10.00000000000
+6,2064,R1,solarPV,2045,10.00000000000
+6,2065,R1,solarPV,2045,10.00000000000
+6,2069,R1,solarPV,2045,10.00000000000
+6,2070,R1,solarPV,2045,10.00000000000
+6,2074,R1,solarPV,2045,10.00000000000
+7,2025,R1,windturbine,2020,10.00000000000
+7,2030,R1,windturbine,2020,10.00000000000
+7,2035,R1,windturbine,2020,10.00000000000
+7,2040,R1,windturbine,2020,10.00000000000
+7,2045,R1,windturbine,2020,10.00000000000
+7,2049,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2025,3.25000000000
+8,2035,R1,windturbine,2025,3.25000000000
+8,2040,R1,windturbine,2025,3.25000000000
+8,2045,R1,windturbine,2025,3.25000000000
+8,2049,R1,windturbine,2025,3.25000000000
+8,2050,R1,windturbine,2025,3.25000000000
+8,2054,R1,windturbine,2025,3.25000000000
+9,2040,R1,windturbine,2035,2.00000000000
+9,2045,R1,windturbine,2035,2.00000000000
+9,2049,R1,windturbine,2035,2.00000000000
+9,2050,R1,windturbine,2035,2.00000000000
+9,2054,R1,windturbine,2035,2.00000000000
+9,2055,R1,windturbine,2035,2.00000000000
+9,2059,R1,windturbine,2035,2.00000000000
+9,2060,R1,windturbine,2035,2.00000000000
+9,2064,R1,windturbine,2035,2.00000000000
+10,2050,R1,windturbine,2045,10.00000000000
+10,2054,R1,windturbine,2045,10.00000000000
+10,2055,R1,windturbine,2045,10.00000000000
+10,2059,R1,windturbine,2045,10.00000000000
+10,2060,R1,windturbine,2045,10.00000000000
+10,2064,R1,windturbine,2045,10.00000000000
+10,2065,R1,windturbine,2045,10.00000000000
+10,2069,R1,windturbine,2045,10.00000000000
+10,2070,R1,windturbine,2045,10.00000000000
+10,2074,R1,windturbine,2045,10.00000000000
+11,2020,R2,gasCCGT,2020,1.00000000000
+11,2025,R2,gasCCGT,2020,1.00000000000
+12,2030,R2,solarPV,2025,10.00000000000
+12,2035,R2,solarPV,2025,10.00000000000
+12,2040,R2,solarPV,2025,10.00000000000
+12,2045,R2,solarPV,2025,10.00000000000
+12,2049,R2,solarPV,2025,10.00000000000
+12,2050,R2,solarPV,2025,10.00000000000
+12,2054,R2,solarPV,2025,10.00000000000
+13,2035,R2,solarPV,2030,6.00000000000
+13,2040,R2,solarPV,2030,6.00000000000
+13,2045,R2,solarPV,2030,6.00000000000
+13,2049,R2,solarPV,2030,6.00000000000
+13,2050,R2,solarPV,2030,6.00000000000
+13,2054,R2,solarPV,2030,6.00000000000
+13,2055,R2,solarPV,2030,6.00000000000
+13,2059,R2,solarPV,2030,6.00000000000
+14,2040,R2,solarPV,2035,6.00000000000
+14,2045,R2,solarPV,2035,6.00000000000
+14,2049,R2,solarPV,2035,6.00000000000
+14,2050,R2,solarPV,2035,6.00000000000
+14,2054,R2,solarPV,2035,6.00000000000
+14,2055,R2,solarPV,2035,6.00000000000
+14,2059,R2,solarPV,2035,6.00000000000
+14,2060,R2,solarPV,2035,6.00000000000
+14,2064,R2,solarPV,2035,6.00000000000
+15,2045,R2,solarPV,2040,6.00000000000
+15,2049,R2,solarPV,2040,6.00000000000
+15,2050,R2,solarPV,2040,6.00000000000
+15,2054,R2,solarPV,2040,6.00000000000
+15,2055,R2,solarPV,2040,6.00000000000
+15,2059,R2,solarPV,2040,6.00000000000
+15,2060,R2,solarPV,2040,6.00000000000
+15,2064,R2,solarPV,2040,6.00000000000
+15,2065,R2,solarPV,2040,6.00000000000
+15,2069,R2,solarPV,2040,6.00000000000
+16,2050,R2,solarPV,2045,10.00000000000
+16,2054,R2,solarPV,2045,10.00000000000
+16,2055,R2,solarPV,2045,10.00000000000
+16,2059,R2,solarPV,2045,10.00000000000
+16,2060,R2,solarPV,2045,10.00000000000
+16,2064,R2,solarPV,2045,10.00000000000
+16,2065,R2,solarPV,2045,10.00000000000
+16,2069,R2,solarPV,2045,10.00000000000
+16,2070,R2,solarPV,2045,10.00000000000
+16,2074,R2,solarPV,2045,10.00000000000
+17,2025,R2,windturbine,2020,16.75000000000
+17,2030,R2,windturbine,2020,16.75000000000
+17,2035,R2,windturbine,2020,16.75000000000
+17,2040,R2,windturbine,2020,16.75000000000
+17,2045,R2,windturbine,2020,16.75000000000
+17,2049,R2,windturbine,2020,16.75000000000
+18,2030,R2,windturbine,2025,3.25000000000
+18,2035,R2,windturbine,2025,3.25000000000
+18,2040,R2,windturbine,2025,3.25000000000
+18,2045,R2,windturbine,2025,3.25000000000
+18,2049,R2,windturbine,2025,3.25000000000
+18,2050,R2,windturbine,2025,3.25000000000
+18,2054,R2,windturbine,2025,3.25000000000
+19,2050,R2,windturbine,2045,12.75000000000
+19,2054,R2,windturbine,2045,12.75000000000
+19,2055,R2,windturbine,2045,12.75000000000
+19,2059,R2,windturbine,2045,12.75000000000
+19,2060,R2,windturbine,2045,12.75000000000
+19,2064,R2,windturbine,2045,12.75000000000
+19,2065,R2,windturbine,2045,12.75000000000
+19,2069,R2,windturbine,2045,12.75000000000
+19,2070,R2,windturbine,2045,12.75000000000
+19,2074,R2,windturbine,2045,12.75000000000
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 2310d125..ccaf6bbf 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,101 +1,198 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,solarPV,2025,9.15000000000
-1,2054,R1,solarPV,2025,9.15000000000
-2,2050,R1,solarPV,2030,6.00000000000
-2,2054,R1,solarPV,2030,6.00000000000
-2,2055,R1,solarPV,2030,6.00000000000
-2,2059,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2035,9.19000000000
-3,2054,R1,solarPV,2035,9.19000000000
-3,2055,R1,solarPV,2035,9.19000000000
-3,2059,R1,solarPV,2035,9.19000000000
-3,2060,R1,solarPV,2035,9.19000000000
-3,2064,R1,solarPV,2035,9.19000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.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,2069,R1,solarPV,2045,16.91000000000
-5,2070,R1,solarPV,2045,16.91000000000
-5,2074,R1,solarPV,2045,16.91000000000
-6,2055,R1,solarPV,2050,9.15000000000
-6,2059,R1,solarPV,2050,9.15000000000
-6,2060,R1,solarPV,2050,9.15000000000
-6,2064,R1,solarPV,2050,9.15000000000
-6,2065,R1,solarPV,2050,9.15000000000
-6,2069,R1,solarPV,2050,9.15000000000
-6,2070,R1,solarPV,2050,9.15000000000
-6,2074,R1,solarPV,2050,9.15000000000
-6,2075,R1,solarPV,2050,9.15000000000
-6,2079,R1,solarPV,2050,9.15000000000
-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
-9,2050,R2,solarPV,2025,9.15000000000
-9,2054,R2,solarPV,2025,9.15000000000
-10,2050,R2,solarPV,2030,6.00000000000
-10,2054,R2,solarPV,2030,6.00000000000
-10,2055,R2,solarPV,2030,6.00000000000
-10,2059,R2,solarPV,2030,6.00000000000
-11,2050,R2,solarPV,2035,9.19000000000
-11,2054,R2,solarPV,2035,9.19000000000
-11,2055,R2,solarPV,2035,9.19000000000
-11,2059,R2,solarPV,2035,9.19000000000
-11,2060,R2,solarPV,2035,9.19000000000
-11,2064,R2,solarPV,2035,9.19000000000
-12,2050,R2,solarPV,2040,6.00000000000
-12,2054,R2,solarPV,2040,6.00000000000
-12,2055,R2,solarPV,2040,6.00000000000
-12,2059,R2,solarPV,2040,6.00000000000
-12,2060,R2,solarPV,2040,6.00000000000
-12,2064,R2,solarPV,2040,6.00000000000
-12,2065,R2,solarPV,2040,6.00000000000
-12,2069,R2,solarPV,2040,6.00000000000
-13,2050,R2,solarPV,2045,16.91000000000
-13,2054,R2,solarPV,2045,16.91000000000
-13,2055,R2,solarPV,2045,16.91000000000
-13,2059,R2,solarPV,2045,16.91000000000
-13,2060,R2,solarPV,2045,16.91000000000
-13,2064,R2,solarPV,2045,16.91000000000
-13,2065,R2,solarPV,2045,16.91000000000
-13,2069,R2,solarPV,2045,16.91000000000
-13,2070,R2,solarPV,2045,16.91000000000
-13,2074,R2,solarPV,2045,16.91000000000
-14,2055,R2,solarPV,2050,9.15000000000
-14,2059,R2,solarPV,2050,9.15000000000
-14,2060,R2,solarPV,2050,9.15000000000
-14,2064,R2,solarPV,2050,9.15000000000
-14,2065,R2,solarPV,2050,9.15000000000
-14,2069,R2,solarPV,2050,9.15000000000
-14,2070,R2,solarPV,2050,9.15000000000
-14,2074,R2,solarPV,2050,9.15000000000
-14,2075,R2,solarPV,2050,9.15000000000
-14,2079,R2,solarPV,2050,9.15000000000
-16,2050,R2,windturbine,2045,6.75000000000
-16,2054,R2,windturbine,2045,6.75000000000
-16,2055,R2,windturbine,2045,6.75000000000
-16,2059,R2,windturbine,2045,6.75000000000
-16,2060,R2,windturbine,2045,6.75000000000
-16,2064,R2,windturbine,2045,6.75000000000
-16,2065,R2,windturbine,2045,6.75000000000
-16,2069,R2,windturbine,2045,6.75000000000
-16,2070,R2,windturbine,2045,6.75000000000
-16,2074,R2,windturbine,2045,6.75000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,1.22220000000
+1,2054,R1,gasCCGT,2045,1.22220000000
+1,2055,R1,gasCCGT,2045,1.22220000000
+1,2059,R1,gasCCGT,2045,1.22220000000
+1,2060,R1,gasCCGT,2045,1.22220000000
+1,2064,R1,gasCCGT,2045,1.22220000000
+1,2065,R1,gasCCGT,2045,1.22220000000
+1,2069,R1,gasCCGT,2045,1.22220000000
+1,2070,R1,gasCCGT,2045,1.22220000000
+1,2074,R1,gasCCGT,2045,1.22220000000
+1,2075,R1,gasCCGT,2045,1.22220000000
+1,2079,R1,gasCCGT,2045,1.22220000000
+1,2080,R1,gasCCGT,2045,1.22220000000
+1,2084,R1,gasCCGT,2045,1.22220000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+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,10.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
+6,2050,R1,solarPV,2045,10.00000000000
+6,2054,R1,solarPV,2045,10.00000000000
+6,2055,R1,solarPV,2045,10.00000000000
+6,2059,R1,solarPV,2045,10.00000000000
+6,2060,R1,solarPV,2045,10.00000000000
+6,2064,R1,solarPV,2045,10.00000000000
+6,2065,R1,solarPV,2045,10.00000000000
+6,2069,R1,solarPV,2045,10.00000000000
+6,2070,R1,solarPV,2045,10.00000000000
+6,2074,R1,solarPV,2045,10.00000000000
+7,2055,R1,solarPV,2050,10.00000000000
+7,2059,R1,solarPV,2050,10.00000000000
+7,2060,R1,solarPV,2050,10.00000000000
+7,2064,R1,solarPV,2050,10.00000000000
+7,2065,R1,solarPV,2050,10.00000000000
+7,2069,R1,solarPV,2050,10.00000000000
+7,2070,R1,solarPV,2050,10.00000000000
+7,2074,R1,solarPV,2050,10.00000000000
+7,2075,R1,solarPV,2050,10.00000000000
+7,2079,R1,solarPV,2050,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2030,R1,windturbine,2025,3.25000000000
+9,2035,R1,windturbine,2025,3.25000000000
+9,2040,R1,windturbine,2025,3.25000000000
+9,2045,R1,windturbine,2025,3.25000000000
+9,2049,R1,windturbine,2025,3.25000000000
+9,2050,R1,windturbine,2025,3.25000000000
+9,2054,R1,windturbine,2025,3.25000000000
+10,2040,R1,windturbine,2035,2.00000000000
+10,2045,R1,windturbine,2035,2.00000000000
+10,2049,R1,windturbine,2035,2.00000000000
+10,2050,R1,windturbine,2035,2.00000000000
+10,2054,R1,windturbine,2035,2.00000000000
+10,2055,R1,windturbine,2035,2.00000000000
+10,2059,R1,windturbine,2035,2.00000000000
+10,2060,R1,windturbine,2035,2.00000000000
+10,2064,R1,windturbine,2035,2.00000000000
+11,2050,R1,windturbine,2045,10.00000000000
+11,2054,R1,windturbine,2045,10.00000000000
+11,2055,R1,windturbine,2045,10.00000000000
+11,2059,R1,windturbine,2045,10.00000000000
+11,2060,R1,windturbine,2045,10.00000000000
+11,2064,R1,windturbine,2045,10.00000000000
+11,2065,R1,windturbine,2045,10.00000000000
+11,2069,R1,windturbine,2045,10.00000000000
+11,2070,R1,windturbine,2045,10.00000000000
+11,2074,R1,windturbine,2045,10.00000000000
+12,2055,R1,windturbine,2050,3.25000000000
+12,2059,R1,windturbine,2050,3.25000000000
+12,2060,R1,windturbine,2050,3.25000000000
+12,2064,R1,windturbine,2050,3.25000000000
+12,2065,R1,windturbine,2050,3.25000000000
+12,2069,R1,windturbine,2050,3.25000000000
+12,2070,R1,windturbine,2050,3.25000000000
+12,2074,R1,windturbine,2050,3.25000000000
+12,2075,R1,windturbine,2050,3.25000000000
+12,2079,R1,windturbine,2050,3.25000000000
+13,2020,R2,gasCCGT,2020,1.00000000000
+13,2025,R2,gasCCGT,2020,1.00000000000
+14,2030,R2,solarPV,2025,10.00000000000
+14,2035,R2,solarPV,2025,10.00000000000
+14,2040,R2,solarPV,2025,10.00000000000
+14,2045,R2,solarPV,2025,10.00000000000
+14,2049,R2,solarPV,2025,10.00000000000
+14,2050,R2,solarPV,2025,10.00000000000
+14,2054,R2,solarPV,2025,10.00000000000
+15,2035,R2,solarPV,2030,6.00000000000
+15,2040,R2,solarPV,2030,6.00000000000
+15,2045,R2,solarPV,2030,6.00000000000
+15,2049,R2,solarPV,2030,6.00000000000
+15,2050,R2,solarPV,2030,6.00000000000
+15,2054,R2,solarPV,2030,6.00000000000
+15,2055,R2,solarPV,2030,6.00000000000
+15,2059,R2,solarPV,2030,6.00000000000
+16,2040,R2,solarPV,2035,6.00000000000
+16,2045,R2,solarPV,2035,6.00000000000
+16,2049,R2,solarPV,2035,6.00000000000
+16,2050,R2,solarPV,2035,6.00000000000
+16,2054,R2,solarPV,2035,6.00000000000
+16,2055,R2,solarPV,2035,6.00000000000
+16,2059,R2,solarPV,2035,6.00000000000
+16,2060,R2,solarPV,2035,6.00000000000
+16,2064,R2,solarPV,2035,6.00000000000
+17,2045,R2,solarPV,2040,6.00000000000
+17,2049,R2,solarPV,2040,6.00000000000
+17,2050,R2,solarPV,2040,6.00000000000
+17,2054,R2,solarPV,2040,6.00000000000
+17,2055,R2,solarPV,2040,6.00000000000
+17,2059,R2,solarPV,2040,6.00000000000
+17,2060,R2,solarPV,2040,6.00000000000
+17,2064,R2,solarPV,2040,6.00000000000
+17,2065,R2,solarPV,2040,6.00000000000
+17,2069,R2,solarPV,2040,6.00000000000
+18,2050,R2,solarPV,2045,10.00000000000
+18,2054,R2,solarPV,2045,10.00000000000
+18,2055,R2,solarPV,2045,10.00000000000
+18,2059,R2,solarPV,2045,10.00000000000
+18,2060,R2,solarPV,2045,10.00000000000
+18,2064,R2,solarPV,2045,10.00000000000
+18,2065,R2,solarPV,2045,10.00000000000
+18,2069,R2,solarPV,2045,10.00000000000
+18,2070,R2,solarPV,2045,10.00000000000
+18,2074,R2,solarPV,2045,10.00000000000
+19,2055,R2,solarPV,2050,10.00000000000
+19,2059,R2,solarPV,2050,10.00000000000
+19,2060,R2,solarPV,2050,10.00000000000
+19,2064,R2,solarPV,2050,10.00000000000
+19,2065,R2,solarPV,2050,10.00000000000
+19,2069,R2,solarPV,2050,10.00000000000
+19,2070,R2,solarPV,2050,10.00000000000
+19,2074,R2,solarPV,2050,10.00000000000
+19,2075,R2,solarPV,2050,10.00000000000
+19,2079,R2,solarPV,2050,10.00000000000
+20,2025,R2,windturbine,2020,16.75000000000
+20,2030,R2,windturbine,2020,16.75000000000
+20,2035,R2,windturbine,2020,16.75000000000
+20,2040,R2,windturbine,2020,16.75000000000
+20,2045,R2,windturbine,2020,16.75000000000
+20,2049,R2,windturbine,2020,16.75000000000
+21,2030,R2,windturbine,2025,3.25000000000
+21,2035,R2,windturbine,2025,3.25000000000
+21,2040,R2,windturbine,2025,3.25000000000
+21,2045,R2,windturbine,2025,3.25000000000
+21,2049,R2,windturbine,2025,3.25000000000
+21,2050,R2,windturbine,2025,3.25000000000
+21,2054,R2,windturbine,2025,3.25000000000
+22,2050,R2,windturbine,2045,12.75000000000
+22,2054,R2,windturbine,2045,12.75000000000
+22,2055,R2,windturbine,2045,12.75000000000
+22,2059,R2,windturbine,2045,12.75000000000
+22,2060,R2,windturbine,2045,12.75000000000
+22,2064,R2,windturbine,2045,12.75000000000
+22,2065,R2,windturbine,2045,12.75000000000
+22,2069,R2,windturbine,2045,12.75000000000
+22,2070,R2,windturbine,2045,12.75000000000
+22,2074,R2,windturbine,2045,12.75000000000
+23,2055,R2,windturbine,2050,3.25000000000
+23,2059,R2,windturbine,2050,3.25000000000
+23,2060,R2,windturbine,2050,3.25000000000
+23,2064,R2,windturbine,2050,3.25000000000
+23,2065,R2,windturbine,2050,3.25000000000
+23,2069,R2,windturbine,2050,3.25000000000
+23,2070,R2,windturbine,2050,3.25000000000
+23,2074,R2,windturbine,2050,3.25000000000
+23,2075,R2,windturbine,2050,3.25000000000
+23,2079,R2,windturbine,2050,3.25000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
index 06bad92b..65f38fdb 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2020.csv
@@ -1,11 +1,11 @@
-asset,year,technology,region,installed,capacity
-0,2020,gasboiler,R1,2020,10.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2020,gasboiler,R2,2020,10.00000000000
-1,2025,gasboiler,R2,2020,5.00000000000
-2,2025,heatpump,R1,2020,19.00000000000
-2,2030,heatpump,R1,2020,19.00000000000
-2,2034,heatpump,R1,2020,19.00000000000
-3,2025,heatpump,R2,2020,19.00000000000
-3,2030,heatpump,R2,2020,19.00000000000
-3,2034,heatpump,R2,2020,19.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2020,R2,gasboiler,2020,10
+2,2025,R2,gasboiler,2020,5
+3,2025,R2,heatpump,2020,19
+3,2030,R2,heatpump,2020,19
+3,2034,R2,heatpump,2020,19
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
index 34d42206..570b873b 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2025.csv
@@ -1,25 +1,19 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,4.10000000000
-1,2034,gasboiler,R1,2025,4.10000000000
-1,2035,gasboiler,R1,2025,4.10000000000
-1,2039,gasboiler,R1,2025,4.10000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,4.10000000000
-3,2034,gasboiler,R2,2025,4.10000000000
-3,2035,gasboiler,R2,2025,4.10000000000
-3,2039,gasboiler,R2,2025,4.10000000000
-4,2025,heatpump,R1,2020,19.00000000000
-4,2030,heatpump,R1,2020,19.00000000000
-4,2034,heatpump,R1,2020,19.00000000000
-5,2030,heatpump,R1,2025,6.90000000000
-5,2034,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2025,6.90000000000
-5,2039,heatpump,R1,2025,6.90000000000
-6,2025,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2020,19.00000000000
-6,2034,heatpump,R2,2020,19.00000000000
-7,2030,heatpump,R2,2025,6.90000000000
-7,2034,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2020,R2,gasboiler,2020,10
+3,2025,R2,gasboiler,2020,5
+4,2025,R2,heatpump,2020,19
+4,2030,R2,heatpump,2020,19
+4,2034,R2,heatpump,2020,19
+5,2030,R2,heatpump,2025,10
+5,2034,R2,heatpump,2025,10
+5,2035,R2,heatpump,2025,10
+5,2039,R2,heatpump,2025,10
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
index 559a80d8..30f35eb4 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2030.csv
@@ -1,29 +1,27 @@
-asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,4.10000000000
-0,2034,gasboiler,R1,2025,4.10000000000
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2030,gasboiler,R2,2025,4.10000000000
-1,2034,gasboiler,R2,2025,4.10000000000
-1,2035,gasboiler,R2,2025,4.10000000000
-1,2039,gasboiler,R2,2025,4.10000000000
-2,2030,heatpump,R1,2020,19.00000000000
-2,2034,heatpump,R1,2020,19.00000000000
-3,2030,heatpump,R1,2025,6.90000000000
-3,2034,heatpump,R1,2025,6.90000000000
-3,2035,heatpump,R1,2025,6.90000000000
-3,2039,heatpump,R1,2025,6.90000000000
-4,2035,heatpump,R1,2030,25.00000000000
-4,2039,heatpump,R1,2030,25.00000000000
-4,2040,heatpump,R1,2030,25.00000000000
-4,2044,heatpump,R1,2030,25.00000000000
-5,2030,heatpump,R2,2020,19.00000000000
-5,2034,heatpump,R2,2020,19.00000000000
-6,2030,heatpump,R2,2025,6.90000000000
-6,2034,heatpump,R2,2025,6.90000000000
-6,2035,heatpump,R2,2025,6.90000000000
-6,2039,heatpump,R2,2025,6.90000000000
-7,2035,heatpump,R2,2030,25.00000000000
-7,2039,heatpump,R2,2030,25.00000000000
-7,2040,heatpump,R2,2030,25.00000000000
-7,2044,heatpump,R2,2030,25.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2020,R2,gasboiler,2020,10
+4,2025,R2,gasboiler,2020,5
+5,2025,R2,heatpump,2020,19
+5,2030,R2,heatpump,2020,19
+5,2034,R2,heatpump,2020,19
+6,2030,R2,heatpump,2025,10
+6,2034,R2,heatpump,2025,10
+6,2035,R2,heatpump,2025,10
+6,2039,R2,heatpump,2025,10
+7,2035,R2,heatpump,2030,26
+7,2039,R2,heatpump,2030,26
+7,2040,R2,heatpump,2030,26
+7,2044,R2,heatpump,2030,26
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
index fa9e8bca..88b92f80 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2035.csv
@@ -1,33 +1,35 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,4.10000000000
-0,2039,gasboiler,R1,2025,4.10000000000
-1,2040,gasboiler,R1,2035,0.91000000000
-1,2044,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R1,2035,0.91000000000
-1,2049,gasboiler,R1,2035,0.91000000000
-2,2035,gasboiler,R2,2025,4.10000000000
-2,2039,gasboiler,R2,2025,4.10000000000
-3,2040,gasboiler,R2,2035,0.91000000000
-3,2044,gasboiler,R2,2035,0.91000000000
-3,2045,gasboiler,R2,2035,0.91000000000
-3,2049,gasboiler,R2,2035,0.91000000000
-4,2035,heatpump,R1,2025,6.90000000000
-4,2039,heatpump,R1,2025,6.90000000000
-5,2035,heatpump,R1,2030,25.00000000000
-5,2039,heatpump,R1,2030,25.00000000000
-5,2040,heatpump,R1,2030,25.00000000000
-5,2044,heatpump,R1,2030,25.00000000000
-6,2040,heatpump,R1,2035,16.09000000000
-6,2044,heatpump,R1,2035,16.09000000000
-6,2045,heatpump,R1,2035,16.09000000000
-6,2049,heatpump,R1,2035,16.09000000000
-7,2035,heatpump,R2,2025,6.90000000000
-7,2039,heatpump,R2,2025,6.90000000000
-8,2035,heatpump,R2,2030,25.00000000000
-8,2039,heatpump,R2,2030,25.00000000000
-8,2040,heatpump,R2,2030,25.00000000000
-8,2044,heatpump,R2,2030,25.00000000000
-9,2040,heatpump,R2,2035,16.09000000000
-9,2044,heatpump,R2,2035,16.09000000000
-9,2045,heatpump,R2,2035,16.09000000000
-9,2049,heatpump,R2,2035,16.09000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2020,R2,gasboiler,2020,10
+5,2025,R2,gasboiler,2020,5
+6,2025,R2,heatpump,2020,19
+6,2030,R2,heatpump,2020,19
+6,2034,R2,heatpump,2020,19
+7,2030,R2,heatpump,2025,10
+7,2034,R2,heatpump,2025,10
+7,2035,R2,heatpump,2025,10
+7,2039,R2,heatpump,2025,10
+8,2035,R2,heatpump,2030,26
+8,2039,R2,heatpump,2030,26
+8,2040,R2,heatpump,2030,26
+8,2044,R2,heatpump,2030,26
+9,2040,R2,heatpump,2035,16
+9,2044,R2,heatpump,2035,16
+9,2045,R2,heatpump,2035,16
+9,2049,R2,heatpump,2035,16
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
index eb1a544b..937e4600 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2040.csv
@@ -1,29 +1,43 @@
-asset,year,technology,region,installed,capacity
-0,2040,gasboiler,R1,2035,0.91000000000
-0,2044,gasboiler,R1,2035,0.91000000000
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2040,gasboiler,R2,2035,0.91000000000
-1,2044,gasboiler,R2,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2040,heatpump,R1,2030,25.00000000000
-2,2044,heatpump,R1,2030,25.00000000000
-3,2040,heatpump,R1,2035,16.09000000000
-3,2044,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2035,16.09000000000
-3,2049,heatpump,R1,2035,16.09000000000
-4,2045,heatpump,R1,2040,31.00000000000
-4,2049,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2040,31.00000000000
-4,2054,heatpump,R1,2040,31.00000000000
-5,2040,heatpump,R2,2030,25.00000000000
-5,2044,heatpump,R2,2030,25.00000000000
-6,2040,heatpump,R2,2035,16.09000000000
-6,2044,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2035,16.09000000000
-6,2049,heatpump,R2,2035,16.09000000000
-7,2045,heatpump,R2,2040,31.00000000000
-7,2049,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2040,31.00000000000
-7,2054,heatpump,R2,2040,31.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2020,R2,gasboiler,2020,10
+6,2025,R2,gasboiler,2020,5
+7,2025,R2,heatpump,2020,19
+7,2030,R2,heatpump,2020,19
+7,2034,R2,heatpump,2020,19
+8,2030,R2,heatpump,2025,10
+8,2034,R2,heatpump,2025,10
+8,2035,R2,heatpump,2025,10
+8,2039,R2,heatpump,2025,10
+9,2035,R2,heatpump,2030,26
+9,2039,R2,heatpump,2030,26
+9,2040,R2,heatpump,2030,26
+9,2044,R2,heatpump,2030,26
+10,2040,R2,heatpump,2035,16
+10,2044,R2,heatpump,2035,16
+10,2045,R2,heatpump,2035,16
+10,2049,R2,heatpump,2035,16
+11,2045,R2,heatpump,2040,32
+11,2049,R2,heatpump,2040,32
+11,2050,R2,heatpump,2040,32
+11,2054,R2,heatpump,2040,32
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
index 0b5fe3de..b12e02b2 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2045.csv
@@ -1,25 +1,51 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasboiler,R1,2035,0.91000000000
-0,2049,gasboiler,R1,2035,0.91000000000
-1,2045,gasboiler,R2,2035,0.91000000000
-1,2049,gasboiler,R2,2035,0.91000000000
-2,2045,heatpump,R1,2035,16.09000000000
-2,2049,heatpump,R1,2035,16.09000000000
-3,2045,heatpump,R1,2040,31.00000000000
-3,2049,heatpump,R1,2040,31.00000000000
-3,2050,heatpump,R1,2040,31.00000000000
-3,2054,heatpump,R1,2040,31.00000000000
-4,2050,heatpump,R1,2045,23.00000000000
-4,2054,heatpump,R1,2045,23.00000000000
-4,2055,heatpump,R1,2045,23.00000000000
-4,2059,heatpump,R1,2045,23.00000000000
-5,2045,heatpump,R2,2035,16.09000000000
-5,2049,heatpump,R2,2035,16.09000000000
-6,2045,heatpump,R2,2040,31.00000000000
-6,2049,heatpump,R2,2040,31.00000000000
-6,2050,heatpump,R2,2040,31.00000000000
-6,2054,heatpump,R2,2040,31.00000000000
-7,2050,heatpump,R2,2045,23.00000000000
-7,2054,heatpump,R2,2045,23.00000000000
-7,2055,heatpump,R2,2045,23.00000000000
-7,2059,heatpump,R2,2045,23.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2020,R2,gasboiler,2020,10
+7,2025,R2,gasboiler,2020,5
+8,2025,R2,heatpump,2020,19
+8,2030,R2,heatpump,2020,19
+8,2034,R2,heatpump,2020,19
+9,2030,R2,heatpump,2025,10
+9,2034,R2,heatpump,2025,10
+9,2035,R2,heatpump,2025,10
+9,2039,R2,heatpump,2025,10
+10,2035,R2,heatpump,2030,26
+10,2039,R2,heatpump,2030,26
+10,2040,R2,heatpump,2030,26
+10,2044,R2,heatpump,2030,26
+11,2040,R2,heatpump,2035,16
+11,2044,R2,heatpump,2035,16
+11,2045,R2,heatpump,2035,16
+11,2049,R2,heatpump,2035,16
+12,2045,R2,heatpump,2040,32
+12,2049,R2,heatpump,2040,32
+12,2050,R2,heatpump,2040,32
+12,2054,R2,heatpump,2040,32
+13,2050,R2,heatpump,2045,22
+13,2054,R2,heatpump,2045,22
+13,2055,R2,heatpump,2045,22
+13,2059,R2,heatpump,2045,22
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 2910cd50..59b8c0a4 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,59 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
+8,2020,R2,gasboiler,2020,10
+8,2025,R2,gasboiler,2020,5
+9,2025,R2,heatpump,2020,19
+9,2030,R2,heatpump,2020,19
+9,2034,R2,heatpump,2020,19
+10,2030,R2,heatpump,2025,10
+10,2034,R2,heatpump,2025,10
+10,2035,R2,heatpump,2025,10
+10,2039,R2,heatpump,2025,10
+11,2035,R2,heatpump,2030,26
+11,2039,R2,heatpump,2030,26
+11,2040,R2,heatpump,2030,26
+11,2044,R2,heatpump,2030,26
+12,2040,R2,heatpump,2035,16
+12,2044,R2,heatpump,2035,16
+12,2045,R2,heatpump,2035,16
+12,2049,R2,heatpump,2035,16
+13,2045,R2,heatpump,2040,32
+13,2049,R2,heatpump,2040,32
+13,2050,R2,heatpump,2040,32
+13,2054,R2,heatpump,2040,32
+14,2050,R2,heatpump,2045,22
+14,2054,R2,heatpump,2045,22
+14,2055,R2,heatpump,2045,22
+14,2059,R2,heatpump,2045,22
+15,2055,R2,heatpump,2050,32
+15,2059,R2,heatpump,2050,32
+15,2060,R2,heatpump,2050,32
+15,2064,R2,heatpump,2050,32
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 84bd25f2..597d50b7 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,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,2020,2,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,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
 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,2020,2,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,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
 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,2020,2,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,R1,2025,2,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,2020,2,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
+0,CO2f,R2,2025,2,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,2020,2,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,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
 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,2020,2,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,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
 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,2020,2,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,R1,2025,2,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,2020,2,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
+1,CO2f,R2,2025,2,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,2020,2,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,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
 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,2020,2,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,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
 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,2020,2,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,R1,2025,2,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,2020,2,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
+2,CO2f,R2,2025,2,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,2020,2,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,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
 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,2020,2,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,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
 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,2020,2,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,R1,2025,2,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,2020,2,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
+3,CO2f,R2,2025,2,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,2020,2,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,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
 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,2020,2,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,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
 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,2020,2,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,R1,2025,2,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,2020,2,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
+4,CO2f,R2,2025,2,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,2020,2,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,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
 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,2020,2,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,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
 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,2020,2,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,R1,2025,2,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,2020,2,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
+5,CO2f,R2,2025,2,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 266a52a2..8a6b5683 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,121 @@
 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,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2025,3,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,R1,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
 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,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2025,3,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,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
 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,R1,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
 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
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
 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,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2025,3,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,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
 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,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2025,3,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,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
 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,R1,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
 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
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
 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,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2025,3,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,R1,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
 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,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2025,3,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,heat,R2,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
 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,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
 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
+2,CO2f,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
 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,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2025,3,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,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
 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,1,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2025,3,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,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
 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,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
 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
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
 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,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2025,3,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,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
 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,1,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2025,3,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,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
 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,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
 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
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
 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,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2025,3,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,R1,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
 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,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2025,3,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,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
 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,R1,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
 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
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
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 993fd437..190d0953 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,97 @@
 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
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
+2,heat,R1,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
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 953fbe67..f7f70781 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,97 @@
 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
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
+2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
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 af3cd108..7b22f170 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,97 @@
 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
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
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 9d3de5da..383d0d54 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,97 @@
 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
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
+2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
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 95e99a1c..803ba258 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,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
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
+2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R1,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R2,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
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 61de5105..1d028468 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,5 +1,7 @@
 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/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
index f5023ba4..1d028468 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,13 +1,7 @@
 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,2035,R1,gassupply1,2030,4.97510000000
-1,2040,R1,gassupply1,2030,4.97510000000
-1,2045,R1,gassupply1,2030,4.97510000000
-1,2050,R1,gassupply1,2030,4.97510000000
-1,2069,R1,gassupply1,2030,4.97510000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2035,R2,gassupply1,2030,4.97510000000
-3,2040,R2,gassupply1,2030,4.97510000000
-3,2045,R2,gassupply1,2030,4.97510000000
-3,2050,R2,gassupply1,2030,4.97510000000
-3,2069,R2,gassupply1,2030,4.97510000000
+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/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
index 88c78592..1d028468 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,11 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,4.97510000000
-1,2040,R1,gassupply1,2030,4.97510000000
-1,2045,R1,gassupply1,2030,4.97510000000
-1,2050,R1,gassupply1,2030,4.97510000000
-1,2069,R1,gassupply1,2030,4.97510000000
-3,2035,R2,gassupply1,2030,4.97510000000
-3,2040,R2,gassupply1,2030,4.97510000000
-3,2045,R2,gassupply1,2030,4.97510000000
-3,2050,R2,gassupply1,2030,4.97510000000
-3,2069,R2,gassupply1,2030,4.97510000000
+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/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
index c1e08854..1d028468 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,9 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,4.97510000000
-1,2045,R1,gassupply1,2030,4.97510000000
-1,2050,R1,gassupply1,2030,4.97510000000
-1,2069,R1,gassupply1,2030,4.97510000000
-3,2040,R2,gassupply1,2030,4.97510000000
-3,2045,R2,gassupply1,2030,4.97510000000
-3,2050,R2,gassupply1,2030,4.97510000000
-3,2069,R2,gassupply1,2030,4.97510000000
+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/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
index 188cb244..3e3b0384 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,7 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,4.97510000000
-1,2050,R1,gassupply1,2030,4.97510000000
-1,2069,R1,gassupply1,2030,4.97510000000
-3,2045,R2,gassupply1,2030,4.97510000000
-3,2050,R2,gassupply1,2030,4.97510000000
-3,2069,R2,gassupply1,2030,4.97510000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,0.24460000000
+1,2084,R1,gassupply1,2045,0.24460000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2050,R2,gassupply1,2045,0.24460000000
+3,2084,R2,gassupply1,2045,0.24460000000
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 2f46218c..3e3b0384 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,7 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,4.97510000000
-1,2055,R1,gassupply1,2030,4.97510000000
-1,2069,R1,gassupply1,2030,4.97510000000
-3,2050,R2,gassupply1,2030,4.97510000000
-3,2055,R2,gassupply1,2030,4.97510000000
-3,2069,R2,gassupply1,2030,4.97510000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,0.24460000000
+1,2084,R1,gassupply1,2045,0.24460000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2050,R2,gassupply1,2045,0.24460000000
+3,2084,R2,gassupply1,2045,0.24460000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index b913b4c0..f24ac169 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -1,100 +1,97 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,17.40000000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,17.40000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,5.15000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,3.86000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.74000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,3.86000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,6.74000000000
-solarPV,R1,R1,A1,power,retrofit,2030,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2030,8.99000000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,8.99000000000
-windturbine,R2,R2,A1,power,retrofit,2030,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,3.86000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.74000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,3.86000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,6.74000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2035,8.99000000000
-solarPV,R1,R1,A1,power,retrofit,2035,5.60000000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2035,8.99000000000
-solarPV,R2,R2,A1,power,retrofit,2035,5.60000000000
-windturbine,R2,R2,A1,power,retrofit,2035,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,4.97510000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,4.97510000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,0.88600000000
-heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,15.31400000000
-gasboiler,R2,R2,A1,residential,retrofit,2040,0.88600000000
-heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,15.31400000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2040,8.99000000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2040,8.57400000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2040,8.99000000000
-solarPV,R2,R2,A1,power,retrofit,2040,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2040,8.57400000000
-windturbine,R2,R2,A1,power,retrofit,2040,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,4.97510000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,4.97510000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,0.88600000000
-heatpump,R1,R1,A1,residential,retrofit,2045,15.31400000000
-heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
-gasboiler,R2,R2,A1,residential,retrofit,2045,0.88600000000
-heatpump,R2,R2,A1,residential,retrofit,2045,15.31400000000
-heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.15000000000
-solarPV,R1,R1,A1,power,retrofit,2045,8.99000000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2045,8.57400000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.60000000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-solarPV,R2,R2,A1,power,retrofit,2045,8.99000000000
-solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2045,8.57400000000
-solarPV,R2,R2,A1,power,retrofit,2045,5.60000000000
-windturbine,R2,R2,A1,power,retrofit,2045,15.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,4.97510000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,4.97510000000
-heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.99000000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.57400000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.60000000000
-solarPV,R1,R1,A1,power,retrofit,2050,16.48600000000
-windturbine,R1,R1,A1,power,retrofit,2050,5.15000000000
-solarPV,R2,R2,A1,power,retrofit,2050,8.99000000000
-solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2050,8.57400000000
-solarPV,R2,R2,A1,power,retrofit,2050,5.60000000000
-solarPV,R2,R2,A1,power,retrofit,2050,16.48600000000
-windturbine,R2,R2,A1,power,retrofit,2050,5.15000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,4.97510000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,4.97510000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+solarPV,R1,R1,A1,power,newcapa,2025,5.05910000000
+windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
+windturbine,R2,R2,A1,power,newcapa,2025,15.05910000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,5.05910000000
+solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,2.94090000000
+solarPV,R2,R2,A1,power,newcapa,2030,10.00000000000
+windturbine,R2,R2,A1,power,newcapa,2030,15.05910000000
+windturbine,R2,R2,A1,power,newcapa,2030,2.94090000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,5.05910000000
+solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,5.60000000000
+windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,2.94090000000
+solarPV,R2,R2,A1,power,newcapa,2035,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2035,5.60000000000
+windturbine,R2,R2,A1,power,newcapa,2035,15.05910000000
+windturbine,R2,R2,A1,power,newcapa,2035,2.94090000000
+heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.05910000000
+solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
+windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,2.94090000000
+solarPV,R2,R2,A1,power,newcapa,2040,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
+solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
+windturbine,R2,R2,A1,power,newcapa,2040,15.05910000000
+windturbine,R2,R2,A1,power,newcapa,2040,2.94090000000
+heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,5.05910000000
+solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
+solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
+solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
+windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,2.94090000000
+solarPV,R2,R2,A1,power,newcapa,2045,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
+solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
+solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
+windturbine,R2,R2,A1,power,newcapa,2045,15.05910000000
+windturbine,R2,R2,A1,power,newcapa,2045,2.94090000000
+heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,0.29290000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
+solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
+solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
+solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,2.94090000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
+solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
+solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
+solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
+windturbine,R2,R2,A1,power,newcapa,2050,2.94090000000
+windturbine,R2,R2,A1,power,newcapa,2050,10.65910000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.24460000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,0.24460000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 3f147241..f6ed71a7 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,387 +63,387 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.61060000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.61060000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.61080000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.61080000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.15600000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15650000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15650000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.63730000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.63770000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.63770000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.22280000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.22350000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.22350000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.61060000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.61060000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.61080000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.61080000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15600000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15650000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15650000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63730000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63730000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63770000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63770000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.22280000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.22350000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.22350000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73540000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73540000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73610000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73610000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.46790000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46940000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46940000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.67300000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.67350000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.67350000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.31190000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.31290000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.31290000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.67300000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.67350000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.67350000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.31190000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.31290000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.31290000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.67300000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.67300000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.67350000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.67350000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31190000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31290000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31290000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.10690000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,14.10690000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.25000000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.25000000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.09210000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.09210000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.52140000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.52140000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.13620000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,14.13620000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.35740000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.35740000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13160000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13160000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.74590000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.74590000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.10690000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.10690000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.25000000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.25000000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09210000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09210000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.52140000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.52140000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.13620000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,14.13620000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.35740000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.35740000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13160000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13160000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.74590000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.74590000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.24370000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.24370000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.75200000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.75200000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27630000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27630000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.57500000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,1.57500000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.17530000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,14.17530000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.50070000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.50070000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18420000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18420000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.04640000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,1.04640000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,14.17530000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,14.17530000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.50070000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.50070000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18420000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18420000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.04640000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.04640000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.17530000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.17530000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.50070000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.50070000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.04640000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.04640000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.30380000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,11.30380000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.50760000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.50760000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.09120000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.09120000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.33510000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,11.33510000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.63980000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.63980000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13030000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13030000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.30380000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.30380000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50760000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09120000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09120000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.33510000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.33510000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.63980000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.63980000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13030000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13030000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.44970000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.44970000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.12650000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.12650000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27370000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27370000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06300000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06300000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.37680000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,11.37680000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.81640000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,51.81640000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18250000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18250000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.03670000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.03670000000,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', 'early-morning')",electricity,R1,11.37680000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,11.37680000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.81640000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.81640000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18250000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18250000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03670000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03670000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.37680000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.37680000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81640000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81640000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18250000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18250000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03670000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.06080000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,9.06080000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.33550000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,3.33550000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.27980000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,41.27980000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08970000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08970000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,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,9.09350000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,9.09350000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.34200000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,3.34200000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.41740000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,41.41740000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12820000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12820000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,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', 'mid-afternoon')",electricity,R1,9.06080000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.06080000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.33550000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.33550000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27980000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27980000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08970000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08970000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.09350000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,9.09350000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.34200000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.34200000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.41740000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.41740000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12820000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12820000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,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,9.21310000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,9.21310000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.36570000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.36570000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,41.92480000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,41.92480000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26920000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26920000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06280000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06280000000,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,9.13700000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,9.13700000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.35060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,3.35060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.60130000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,41.60130000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17950000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17950000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03660000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03660000000,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', 'early-morning')",electricity,R1,9.13700000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,9.13700000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.35060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.35060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,41.60130000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,41.60130000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17950000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17950000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03660000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03660000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.13700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.13700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.35060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.35060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60130000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60130000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17950000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17950000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03660000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.26610000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,7.26610000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.08530000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,33.08530000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.08780000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.08780000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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,7.29970000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,7.29970000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.22200000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,33.22200000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12550000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12550000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,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', 'mid-afternoon')",electricity,R1,7.26610000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,7.26610000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.08530000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.08530000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08780000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08780000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.29970000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,7.29970000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.22200000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,33.22200000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12550000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12550000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,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,7.42280000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,7.42280000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,33.72690000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,33.72690000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26350000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26350000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06240000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06240000000,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,7.34440000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,7.34440000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.40490000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,33.40490000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17570000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17570000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,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', 'early-morning')",electricity,R1,7.34440000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,7.34440000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,33.40490000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,33.40490000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17570000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17570000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,7.34440000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,7.34440000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.40490000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.40490000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17570000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17570000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.08190000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.08190000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.22280000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.22280000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.09190000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.09190000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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.11700000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.11700000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.31960000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.31960000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13130000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13130000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,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', 'mid-afternoon')",electricity,R1,0.08190000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08190000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.22280000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.22280000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09190000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09190000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11700000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11700000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31960000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.31960000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13130000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13130000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,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,0.24570000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24570000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.68180000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.68180000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27560000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27560000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06230000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06230000000,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,0.16380000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.16380000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.45000000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.45000000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18380000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18380000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16380000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16380000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.45000000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.45000000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18380000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18380000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.45000000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.45000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18380000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
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 4f665949..a537a955 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,12 +1,12 @@
 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.15000000000
-1,2030,R1,solarPV,2020,5.15000000000
-1,2035,R1,solarPV,2020,5.15000000000
-1,2040,R1,solarPV,2020,5.15000000000
-1,2045,R1,solarPV,2020,5.15000000000
-1,2049,R1,solarPV,2020,5.15000000000
+1,2025,R1,solarPV,2020,5.05910000000
+1,2030,R1,solarPV,2020,5.05910000000
+1,2035,R1,solarPV,2020,5.05910000000
+1,2040,R1,solarPV,2020,5.05910000000
+1,2045,R1,solarPV,2020,5.05910000000
+1,2049,R1,solarPV,2020,5.05910000000
 2,2025,R1,windturbine,2020,10.00000000000
 2,2030,R1,windturbine,2020,10.00000000000
 2,2035,R1,windturbine,2020,10.00000000000
@@ -15,9 +15,9 @@ asset,year,region,technology,installed,capacity
 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.15000000000
-4,2030,R2,windturbine,2020,15.15000000000
-4,2035,R2,windturbine,2020,15.15000000000
-4,2040,R2,windturbine,2020,15.15000000000
-4,2045,R2,windturbine,2020,15.15000000000
-4,2049,R2,windturbine,2020,15.15000000000
+4,2025,R2,windturbine,2020,15.05910000000
+4,2030,R2,windturbine,2020,15.05910000000
+4,2035,R2,windturbine,2020,15.05910000000
+4,2040,R2,windturbine,2020,15.05910000000
+4,2045,R2,windturbine,2020,15.05910000000
+4,2049,R2,windturbine,2020,15.05910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index 91056903..f1b12cf3 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -1,35 +1,51 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2025,gasCCGT,R2,2020,1.00000000000
-2,2025,solarPV,R1,2020,5.15000000000
-2,2030,solarPV,R1,2020,5.15000000000
-2,2035,solarPV,R1,2020,5.15000000000
-2,2040,solarPV,R1,2020,5.15000000000
-2,2045,solarPV,R1,2020,5.15000000000
-2,2049,solarPV,R1,2020,5.15000000000
-3,2030,solarPV,R1,2025,8.99000000000
-3,2035,solarPV,R1,2025,8.99000000000
-3,2040,solarPV,R1,2025,8.99000000000
-3,2045,solarPV,R1,2025,8.99000000000
-3,2049,solarPV,R1,2025,8.99000000000
-3,2050,solarPV,R1,2025,8.99000000000
-3,2054,solarPV,R1,2025,8.99000000000
-4,2030,solarPV,R2,2025,8.99000000000
-4,2035,solarPV,R2,2025,8.99000000000
-4,2040,solarPV,R2,2025,8.99000000000
-4,2045,solarPV,R2,2025,8.99000000000
-4,2049,solarPV,R2,2025,8.99000000000
-4,2050,solarPV,R2,2025,8.99000000000
-4,2054,solarPV,R2,2025,8.99000000000
-5,2025,windturbine,R1,2020,10.00000000000
-5,2030,windturbine,R1,2020,10.00000000000
-5,2035,windturbine,R1,2020,10.00000000000
-5,2040,windturbine,R1,2020,10.00000000000
-5,2045,windturbine,R1,2020,10.00000000000
-5,2049,windturbine,R1,2020,10.00000000000
-6,2025,windturbine,R2,2020,15.15000000000
-6,2030,windturbine,R2,2020,15.15000000000
-6,2035,windturbine,R2,2020,15.15000000000
-6,2040,windturbine,R2,2020,15.15000000000
-6,2045,windturbine,R2,2020,15.15000000000
-6,2049,windturbine,R2,2020,15.15000000000
+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.05910000000
+1,2030,R1,solarPV,2020,5.05910000000
+1,2035,R1,solarPV,2020,5.05910000000
+1,2040,R1,solarPV,2020,5.05910000000
+1,2045,R1,solarPV,2020,5.05910000000
+1,2049,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2025,R1,windturbine,2020,10.00000000000
+3,2030,R1,windturbine,2020,10.00000000000
+3,2035,R1,windturbine,2020,10.00000000000
+3,2040,R1,windturbine,2020,10.00000000000
+3,2045,R1,windturbine,2020,10.00000000000
+3,2049,R1,windturbine,2020,10.00000000000
+4,2030,R1,windturbine,2025,2.94090000000
+4,2035,R1,windturbine,2025,2.94090000000
+4,2040,R1,windturbine,2025,2.94090000000
+4,2045,R1,windturbine,2025,2.94090000000
+4,2049,R1,windturbine,2025,2.94090000000
+4,2050,R1,windturbine,2025,2.94090000000
+4,2054,R1,windturbine,2025,2.94090000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2030,R2,solarPV,2025,10.00000000000
+6,2035,R2,solarPV,2025,10.00000000000
+6,2040,R2,solarPV,2025,10.00000000000
+6,2045,R2,solarPV,2025,10.00000000000
+6,2049,R2,solarPV,2025,10.00000000000
+6,2050,R2,solarPV,2025,10.00000000000
+6,2054,R2,solarPV,2025,10.00000000000
+7,2025,R2,windturbine,2020,15.05910000000
+7,2030,R2,windturbine,2020,15.05910000000
+7,2035,R2,windturbine,2020,15.05910000000
+7,2040,R2,windturbine,2020,15.05910000000
+7,2045,R2,windturbine,2020,15.05910000000
+7,2049,R2,windturbine,2020,15.05910000000
+8,2030,R2,windturbine,2025,2.94090000000
+8,2035,R2,windturbine,2025,2.94090000000
+8,2040,R2,windturbine,2025,2.94090000000
+8,2045,R2,windturbine,2025,2.94090000000
+8,2049,R2,windturbine,2025,2.94090000000
+8,2050,R2,windturbine,2025,2.94090000000
+8,2054,R2,windturbine,2025,2.94090000000
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 05ff0931..efe97cc6 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,16 +1,19 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2020,5.15000000000
-1,2035,R1,solarPV,2020,5.15000000000
-1,2040,R1,solarPV,2020,5.15000000000
-1,2045,R1,solarPV,2020,5.15000000000
-1,2049,R1,solarPV,2020,5.15000000000
-2,2030,R1,solarPV,2025,8.99000000000
-2,2035,R1,solarPV,2025,8.99000000000
-2,2040,R1,solarPV,2025,8.99000000000
-2,2045,R1,solarPV,2025,8.99000000000
-2,2049,R1,solarPV,2025,8.99000000000
-2,2050,R1,solarPV,2025,8.99000000000
-2,2054,R1,solarPV,2025,8.99000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,5.05910000000
+1,2030,R1,solarPV,2020,5.05910000000
+1,2035,R1,solarPV,2020,5.05910000000
+1,2040,R1,solarPV,2020,5.05910000000
+1,2045,R1,solarPV,2020,5.05910000000
+1,2049,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2035,R1,solarPV,2030,5.60000000000
 3,2040,R1,solarPV,2030,5.60000000000
 3,2045,R1,solarPV,2030,5.60000000000
@@ -19,28 +22,46 @@ asset,year,region,technology,installed,capacity
 3,2054,R1,solarPV,2030,5.60000000000
 3,2055,R1,solarPV,2030,5.60000000000
 3,2059,R1,solarPV,2030,5.60000000000
+4,2025,R1,windturbine,2020,10.00000000000
 4,2030,R1,windturbine,2020,10.00000000000
 4,2035,R1,windturbine,2020,10.00000000000
 4,2040,R1,windturbine,2020,10.00000000000
 4,2045,R1,windturbine,2020,10.00000000000
 4,2049,R1,windturbine,2020,10.00000000000
-6,2030,R2,solarPV,2025,8.99000000000
-6,2035,R2,solarPV,2025,8.99000000000
-6,2040,R2,solarPV,2025,8.99000000000
-6,2045,R2,solarPV,2025,8.99000000000
-6,2049,R2,solarPV,2025,8.99000000000
-6,2050,R2,solarPV,2025,8.99000000000
-6,2054,R2,solarPV,2025,8.99000000000
-7,2035,R2,solarPV,2030,5.60000000000
-7,2040,R2,solarPV,2030,5.60000000000
-7,2045,R2,solarPV,2030,5.60000000000
-7,2049,R2,solarPV,2030,5.60000000000
-7,2050,R2,solarPV,2030,5.60000000000
-7,2054,R2,solarPV,2030,5.60000000000
-7,2055,R2,solarPV,2030,5.60000000000
-7,2059,R2,solarPV,2030,5.60000000000
-8,2030,R2,windturbine,2020,15.15000000000
-8,2035,R2,windturbine,2020,15.15000000000
-8,2040,R2,windturbine,2020,15.15000000000
-8,2045,R2,windturbine,2020,15.15000000000
-8,2049,R2,windturbine,2020,15.15000000000
+5,2030,R1,windturbine,2025,2.94090000000
+5,2035,R1,windturbine,2025,2.94090000000
+5,2040,R1,windturbine,2025,2.94090000000
+5,2045,R1,windturbine,2025,2.94090000000
+5,2049,R1,windturbine,2025,2.94090000000
+5,2050,R1,windturbine,2025,2.94090000000
+5,2054,R1,windturbine,2025,2.94090000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,solarPV,2025,10.00000000000
+7,2035,R2,solarPV,2025,10.00000000000
+7,2040,R2,solarPV,2025,10.00000000000
+7,2045,R2,solarPV,2025,10.00000000000
+7,2049,R2,solarPV,2025,10.00000000000
+7,2050,R2,solarPV,2025,10.00000000000
+7,2054,R2,solarPV,2025,10.00000000000
+8,2035,R2,solarPV,2030,5.60000000000
+8,2040,R2,solarPV,2030,5.60000000000
+8,2045,R2,solarPV,2030,5.60000000000
+8,2049,R2,solarPV,2030,5.60000000000
+8,2050,R2,solarPV,2030,5.60000000000
+8,2054,R2,solarPV,2030,5.60000000000
+8,2055,R2,solarPV,2030,5.60000000000
+8,2059,R2,solarPV,2030,5.60000000000
+9,2025,R2,windturbine,2020,15.05910000000
+9,2030,R2,windturbine,2020,15.05910000000
+9,2035,R2,windturbine,2020,15.05910000000
+9,2040,R2,windturbine,2020,15.05910000000
+9,2045,R2,windturbine,2020,15.05910000000
+9,2049,R2,windturbine,2020,15.05910000000
+10,2030,R2,windturbine,2025,2.94090000000
+10,2035,R2,windturbine,2025,2.94090000000
+10,2040,R2,windturbine,2025,2.94090000000
+10,2045,R2,windturbine,2025,2.94090000000
+10,2049,R2,windturbine,2025,2.94090000000
+10,2050,R2,windturbine,2025,2.94090000000
+10,2054,R2,windturbine,2025,2.94090000000
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 d428db04..51fd698a 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,14 +1,19 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,solarPV,2020,5.15000000000
-1,2040,R1,solarPV,2020,5.15000000000
-1,2045,R1,solarPV,2020,5.15000000000
-1,2049,R1,solarPV,2020,5.15000000000
-2,2035,R1,solarPV,2025,8.99000000000
-2,2040,R1,solarPV,2025,8.99000000000
-2,2045,R1,solarPV,2025,8.99000000000
-2,2049,R1,solarPV,2025,8.99000000000
-2,2050,R1,solarPV,2025,8.99000000000
-2,2054,R1,solarPV,2025,8.99000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,5.05910000000
+1,2030,R1,solarPV,2020,5.05910000000
+1,2035,R1,solarPV,2020,5.05910000000
+1,2040,R1,solarPV,2020,5.05910000000
+1,2045,R1,solarPV,2020,5.05910000000
+1,2049,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
 3,2035,R1,solarPV,2030,5.60000000000
 3,2040,R1,solarPV,2030,5.60000000000
 3,2045,R1,solarPV,2030,5.60000000000
@@ -17,43 +22,64 @@ asset,year,region,technology,installed,capacity
 3,2054,R1,solarPV,2030,5.60000000000
 3,2055,R1,solarPV,2030,5.60000000000
 3,2059,R1,solarPV,2030,5.60000000000
-4,2040,R1,solarPV,2035,8.57400000000
-4,2045,R1,solarPV,2035,8.57400000000
-4,2049,R1,solarPV,2035,8.57400000000
-4,2050,R1,solarPV,2035,8.57400000000
-4,2054,R1,solarPV,2035,8.57400000000
-4,2055,R1,solarPV,2035,8.57400000000
-4,2059,R1,solarPV,2035,8.57400000000
-4,2060,R1,solarPV,2035,8.57400000000
-4,2064,R1,solarPV,2035,8.57400000000
+4,2040,R1,solarPV,2035,5.60000000000
+4,2045,R1,solarPV,2035,5.60000000000
+4,2049,R1,solarPV,2035,5.60000000000
+4,2050,R1,solarPV,2035,5.60000000000
+4,2054,R1,solarPV,2035,5.60000000000
+4,2055,R1,solarPV,2035,5.60000000000
+4,2059,R1,solarPV,2035,5.60000000000
+4,2060,R1,solarPV,2035,5.60000000000
+4,2064,R1,solarPV,2035,5.60000000000
+5,2025,R1,windturbine,2020,10.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,2035,R2,solarPV,2025,8.99000000000
-7,2040,R2,solarPV,2025,8.99000000000
-7,2045,R2,solarPV,2025,8.99000000000
-7,2049,R2,solarPV,2025,8.99000000000
-7,2050,R2,solarPV,2025,8.99000000000
-7,2054,R2,solarPV,2025,8.99000000000
-8,2035,R2,solarPV,2030,5.60000000000
-8,2040,R2,solarPV,2030,5.60000000000
-8,2045,R2,solarPV,2030,5.60000000000
-8,2049,R2,solarPV,2030,5.60000000000
-8,2050,R2,solarPV,2030,5.60000000000
-8,2054,R2,solarPV,2030,5.60000000000
-8,2055,R2,solarPV,2030,5.60000000000
-8,2059,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2035,8.57400000000
-9,2045,R2,solarPV,2035,8.57400000000
-9,2049,R2,solarPV,2035,8.57400000000
-9,2050,R2,solarPV,2035,8.57400000000
-9,2054,R2,solarPV,2035,8.57400000000
-9,2055,R2,solarPV,2035,8.57400000000
-9,2059,R2,solarPV,2035,8.57400000000
-9,2060,R2,solarPV,2035,8.57400000000
-9,2064,R2,solarPV,2035,8.57400000000
-10,2035,R2,windturbine,2020,15.15000000000
-10,2040,R2,windturbine,2020,15.15000000000
-10,2045,R2,windturbine,2020,15.15000000000
-10,2049,R2,windturbine,2020,15.15000000000
+6,2030,R1,windturbine,2025,2.94090000000
+6,2035,R1,windturbine,2025,2.94090000000
+6,2040,R1,windturbine,2025,2.94090000000
+6,2045,R1,windturbine,2025,2.94090000000
+6,2049,R1,windturbine,2025,2.94090000000
+6,2050,R1,windturbine,2025,2.94090000000
+6,2054,R1,windturbine,2025,2.94090000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+8,2030,R2,solarPV,2025,10.00000000000
+8,2035,R2,solarPV,2025,10.00000000000
+8,2040,R2,solarPV,2025,10.00000000000
+8,2045,R2,solarPV,2025,10.00000000000
+8,2049,R2,solarPV,2025,10.00000000000
+8,2050,R2,solarPV,2025,10.00000000000
+8,2054,R2,solarPV,2025,10.00000000000
+9,2035,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2030,5.60000000000
+9,2045,R2,solarPV,2030,5.60000000000
+9,2049,R2,solarPV,2030,5.60000000000
+9,2050,R2,solarPV,2030,5.60000000000
+9,2054,R2,solarPV,2030,5.60000000000
+9,2055,R2,solarPV,2030,5.60000000000
+9,2059,R2,solarPV,2030,5.60000000000
+10,2040,R2,solarPV,2035,5.60000000000
+10,2045,R2,solarPV,2035,5.60000000000
+10,2049,R2,solarPV,2035,5.60000000000
+10,2050,R2,solarPV,2035,5.60000000000
+10,2054,R2,solarPV,2035,5.60000000000
+10,2055,R2,solarPV,2035,5.60000000000
+10,2059,R2,solarPV,2035,5.60000000000
+10,2060,R2,solarPV,2035,5.60000000000
+10,2064,R2,solarPV,2035,5.60000000000
+11,2025,R2,windturbine,2020,15.05910000000
+11,2030,R2,windturbine,2020,15.05910000000
+11,2035,R2,windturbine,2020,15.05910000000
+11,2040,R2,windturbine,2020,15.05910000000
+11,2045,R2,windturbine,2020,15.05910000000
+11,2049,R2,windturbine,2020,15.05910000000
+12,2030,R2,windturbine,2025,2.94090000000
+12,2035,R2,windturbine,2025,2.94090000000
+12,2040,R2,windturbine,2025,2.94090000000
+12,2045,R2,windturbine,2025,2.94090000000
+12,2049,R2,windturbine,2025,2.94090000000
+12,2050,R2,windturbine,2025,2.94090000000
+12,2054,R2,windturbine,2025,2.94090000000
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 8c9e6af8..5ef44e97 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,12 +1,20 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,solarPV,2020,5.15000000000
-1,2045,R1,solarPV,2020,5.15000000000
-1,2049,R1,solarPV,2020,5.15000000000
-2,2040,R1,solarPV,2025,8.99000000000
-2,2045,R1,solarPV,2025,8.99000000000
-2,2049,R1,solarPV,2025,8.99000000000
-2,2050,R1,solarPV,2025,8.99000000000
-2,2054,R1,solarPV,2025,8.99000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,5.05910000000
+1,2030,R1,solarPV,2020,5.05910000000
+1,2035,R1,solarPV,2020,5.05910000000
+1,2040,R1,solarPV,2020,5.05910000000
+1,2045,R1,solarPV,2020,5.05910000000
+1,2049,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,5.60000000000
 3,2040,R1,solarPV,2030,5.60000000000
 3,2045,R1,solarPV,2030,5.60000000000
 3,2049,R1,solarPV,2030,5.60000000000
@@ -14,15 +22,15 @@ asset,year,region,technology,installed,capacity
 3,2054,R1,solarPV,2030,5.60000000000
 3,2055,R1,solarPV,2030,5.60000000000
 3,2059,R1,solarPV,2030,5.60000000000
-4,2040,R1,solarPV,2035,8.57400000000
-4,2045,R1,solarPV,2035,8.57400000000
-4,2049,R1,solarPV,2035,8.57400000000
-4,2050,R1,solarPV,2035,8.57400000000
-4,2054,R1,solarPV,2035,8.57400000000
-4,2055,R1,solarPV,2035,8.57400000000
-4,2059,R1,solarPV,2035,8.57400000000
-4,2060,R1,solarPV,2035,8.57400000000
-4,2064,R1,solarPV,2035,8.57400000000
+4,2040,R1,solarPV,2035,5.60000000000
+4,2045,R1,solarPV,2035,5.60000000000
+4,2049,R1,solarPV,2035,5.60000000000
+4,2050,R1,solarPV,2035,5.60000000000
+4,2054,R1,solarPV,2035,5.60000000000
+4,2055,R1,solarPV,2035,5.60000000000
+4,2059,R1,solarPV,2035,5.60000000000
+4,2060,R1,solarPV,2035,5.60000000000
+4,2064,R1,solarPV,2035,5.60000000000
 5,2045,R1,solarPV,2040,5.60000000000
 5,2049,R1,solarPV,2040,5.60000000000
 5,2050,R1,solarPV,2040,5.60000000000
@@ -33,40 +41,65 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,solarPV,2040,5.60000000000
 5,2065,R1,solarPV,2040,5.60000000000
 5,2069,R1,solarPV,2040,5.60000000000
+6,2025,R1,windturbine,2020,10.00000000000
+6,2030,R1,windturbine,2020,10.00000000000
+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,2040,R2,solarPV,2025,8.99000000000
-8,2045,R2,solarPV,2025,8.99000000000
-8,2049,R2,solarPV,2025,8.99000000000
-8,2050,R2,solarPV,2025,8.99000000000
-8,2054,R2,solarPV,2025,8.99000000000
-9,2040,R2,solarPV,2030,5.60000000000
-9,2045,R2,solarPV,2030,5.60000000000
-9,2049,R2,solarPV,2030,5.60000000000
-9,2050,R2,solarPV,2030,5.60000000000
-9,2054,R2,solarPV,2030,5.60000000000
-9,2055,R2,solarPV,2030,5.60000000000
-9,2059,R2,solarPV,2030,5.60000000000
-10,2040,R2,solarPV,2035,8.57400000000
-10,2045,R2,solarPV,2035,8.57400000000
-10,2049,R2,solarPV,2035,8.57400000000
-10,2050,R2,solarPV,2035,8.57400000000
-10,2054,R2,solarPV,2035,8.57400000000
-10,2055,R2,solarPV,2035,8.57400000000
-10,2059,R2,solarPV,2035,8.57400000000
-10,2060,R2,solarPV,2035,8.57400000000
-10,2064,R2,solarPV,2035,8.57400000000
-11,2045,R2,solarPV,2040,5.60000000000
-11,2049,R2,solarPV,2040,5.60000000000
-11,2050,R2,solarPV,2040,5.60000000000
-11,2054,R2,solarPV,2040,5.60000000000
-11,2055,R2,solarPV,2040,5.60000000000
-11,2059,R2,solarPV,2040,5.60000000000
-11,2060,R2,solarPV,2040,5.60000000000
-11,2064,R2,solarPV,2040,5.60000000000
-11,2065,R2,solarPV,2040,5.60000000000
-11,2069,R2,solarPV,2040,5.60000000000
-12,2040,R2,windturbine,2020,15.15000000000
-12,2045,R2,windturbine,2020,15.15000000000
-12,2049,R2,windturbine,2020,15.15000000000
+7,2030,R1,windturbine,2025,2.94090000000
+7,2035,R1,windturbine,2025,2.94090000000
+7,2040,R1,windturbine,2025,2.94090000000
+7,2045,R1,windturbine,2025,2.94090000000
+7,2049,R1,windturbine,2025,2.94090000000
+7,2050,R1,windturbine,2025,2.94090000000
+7,2054,R1,windturbine,2025,2.94090000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,1.00000000000
+9,2030,R2,solarPV,2025,10.00000000000
+9,2035,R2,solarPV,2025,10.00000000000
+9,2040,R2,solarPV,2025,10.00000000000
+9,2045,R2,solarPV,2025,10.00000000000
+9,2049,R2,solarPV,2025,10.00000000000
+9,2050,R2,solarPV,2025,10.00000000000
+9,2054,R2,solarPV,2025,10.00000000000
+10,2035,R2,solarPV,2030,5.60000000000
+10,2040,R2,solarPV,2030,5.60000000000
+10,2045,R2,solarPV,2030,5.60000000000
+10,2049,R2,solarPV,2030,5.60000000000
+10,2050,R2,solarPV,2030,5.60000000000
+10,2054,R2,solarPV,2030,5.60000000000
+10,2055,R2,solarPV,2030,5.60000000000
+10,2059,R2,solarPV,2030,5.60000000000
+11,2040,R2,solarPV,2035,5.60000000000
+11,2045,R2,solarPV,2035,5.60000000000
+11,2049,R2,solarPV,2035,5.60000000000
+11,2050,R2,solarPV,2035,5.60000000000
+11,2054,R2,solarPV,2035,5.60000000000
+11,2055,R2,solarPV,2035,5.60000000000
+11,2059,R2,solarPV,2035,5.60000000000
+11,2060,R2,solarPV,2035,5.60000000000
+11,2064,R2,solarPV,2035,5.60000000000
+12,2045,R2,solarPV,2040,5.60000000000
+12,2049,R2,solarPV,2040,5.60000000000
+12,2050,R2,solarPV,2040,5.60000000000
+12,2054,R2,solarPV,2040,5.60000000000
+12,2055,R2,solarPV,2040,5.60000000000
+12,2059,R2,solarPV,2040,5.60000000000
+12,2060,R2,solarPV,2040,5.60000000000
+12,2064,R2,solarPV,2040,5.60000000000
+12,2065,R2,solarPV,2040,5.60000000000
+12,2069,R2,solarPV,2040,5.60000000000
+13,2025,R2,windturbine,2020,15.05910000000
+13,2030,R2,windturbine,2020,15.05910000000
+13,2035,R2,windturbine,2020,15.05910000000
+13,2040,R2,windturbine,2020,15.05910000000
+13,2045,R2,windturbine,2020,15.05910000000
+13,2049,R2,windturbine,2020,15.05910000000
+14,2030,R2,windturbine,2025,2.94090000000
+14,2035,R2,windturbine,2025,2.94090000000
+14,2040,R2,windturbine,2025,2.94090000000
+14,2045,R2,windturbine,2025,2.94090000000
+14,2049,R2,windturbine,2025,2.94090000000
+14,2050,R2,windturbine,2025,2.94090000000
+14,2054,R2,windturbine,2025,2.94090000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index 4e320235..9e38d0b1 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,103 +1,157 @@
-asset,year,technology,region,installed,capacity
-0,2045,solarPV,R1,2020,5.15000000000
-0,2049,solarPV,R1,2020,5.15000000000
-1,2045,solarPV,R1,2025,8.99000000000
-1,2049,solarPV,R1,2025,8.99000000000
-1,2050,solarPV,R1,2025,8.99000000000
-1,2054,solarPV,R1,2025,8.99000000000
-2,2045,solarPV,R1,2030,5.60000000000
-2,2049,solarPV,R1,2030,5.60000000000
-2,2050,solarPV,R1,2030,5.60000000000
-2,2054,solarPV,R1,2030,5.60000000000
-2,2055,solarPV,R1,2030,5.60000000000
-2,2059,solarPV,R1,2030,5.60000000000
-3,2045,solarPV,R1,2035,8.57400000000
-3,2049,solarPV,R1,2035,8.57400000000
-3,2050,solarPV,R1,2035,8.57400000000
-3,2054,solarPV,R1,2035,8.57400000000
-3,2055,solarPV,R1,2035,8.57400000000
-3,2059,solarPV,R1,2035,8.57400000000
-3,2060,solarPV,R1,2035,8.57400000000
-3,2064,solarPV,R1,2035,8.57400000000
-4,2045,solarPV,R1,2040,5.60000000000
-4,2049,solarPV,R1,2040,5.60000000000
-4,2050,solarPV,R1,2040,5.60000000000
-4,2054,solarPV,R1,2040,5.60000000000
-4,2055,solarPV,R1,2040,5.60000000000
-4,2059,solarPV,R1,2040,5.60000000000
-4,2060,solarPV,R1,2040,5.60000000000
-4,2064,solarPV,R1,2040,5.60000000000
-4,2065,solarPV,R1,2040,5.60000000000
-4,2069,solarPV,R1,2040,5.60000000000
-5,2050,solarPV,R1,2045,16.48600000000
-5,2054,solarPV,R1,2045,16.48600000000
-5,2055,solarPV,R1,2045,16.48600000000
-5,2059,solarPV,R1,2045,16.48600000000
-5,2060,solarPV,R1,2045,16.48600000000
-5,2064,solarPV,R1,2045,16.48600000000
-5,2065,solarPV,R1,2045,16.48600000000
-5,2069,solarPV,R1,2045,16.48600000000
-5,2070,solarPV,R1,2045,16.48600000000
-5,2074,solarPV,R1,2045,16.48600000000
-6,2045,solarPV,R2,2025,8.99000000000
-6,2049,solarPV,R2,2025,8.99000000000
-6,2050,solarPV,R2,2025,8.99000000000
-6,2054,solarPV,R2,2025,8.99000000000
-7,2045,solarPV,R2,2030,5.60000000000
-7,2049,solarPV,R2,2030,5.60000000000
-7,2050,solarPV,R2,2030,5.60000000000
-7,2054,solarPV,R2,2030,5.60000000000
-7,2055,solarPV,R2,2030,5.60000000000
-7,2059,solarPV,R2,2030,5.60000000000
-8,2045,solarPV,R2,2035,8.57400000000
-8,2049,solarPV,R2,2035,8.57400000000
-8,2050,solarPV,R2,2035,8.57400000000
-8,2054,solarPV,R2,2035,8.57400000000
-8,2055,solarPV,R2,2035,8.57400000000
-8,2059,solarPV,R2,2035,8.57400000000
-8,2060,solarPV,R2,2035,8.57400000000
-8,2064,solarPV,R2,2035,8.57400000000
-9,2045,solarPV,R2,2040,5.60000000000
-9,2049,solarPV,R2,2040,5.60000000000
-9,2050,solarPV,R2,2040,5.60000000000
-9,2054,solarPV,R2,2040,5.60000000000
-9,2055,solarPV,R2,2040,5.60000000000
-9,2059,solarPV,R2,2040,5.60000000000
-9,2060,solarPV,R2,2040,5.60000000000
-9,2064,solarPV,R2,2040,5.60000000000
-9,2065,solarPV,R2,2040,5.60000000000
-9,2069,solarPV,R2,2040,5.60000000000
-10,2050,solarPV,R2,2045,16.48600000000
-10,2054,solarPV,R2,2045,16.48600000000
-10,2055,solarPV,R2,2045,16.48600000000
-10,2059,solarPV,R2,2045,16.48600000000
-10,2060,solarPV,R2,2045,16.48600000000
-10,2064,solarPV,R2,2045,16.48600000000
-10,2065,solarPV,R2,2045,16.48600000000
-10,2069,solarPV,R2,2045,16.48600000000
-10,2070,solarPV,R2,2045,16.48600000000
-10,2074,solarPV,R2,2045,16.48600000000
-11,2045,windturbine,R1,2020,10.00000000000
-11,2049,windturbine,R1,2020,10.00000000000
-12,2050,windturbine,R1,2045,5.15000000000
-12,2054,windturbine,R1,2045,5.15000000000
-12,2055,windturbine,R1,2045,5.15000000000
-12,2059,windturbine,R1,2045,5.15000000000
-12,2060,windturbine,R1,2045,5.15000000000
-12,2064,windturbine,R1,2045,5.15000000000
-12,2065,windturbine,R1,2045,5.15000000000
-12,2069,windturbine,R1,2045,5.15000000000
-12,2070,windturbine,R1,2045,5.15000000000
-12,2074,windturbine,R1,2045,5.15000000000
-13,2045,windturbine,R2,2020,15.15000000000
-13,2049,windturbine,R2,2020,15.15000000000
-14,2050,windturbine,R2,2045,5.15000000000
-14,2054,windturbine,R2,2045,5.15000000000
-14,2055,windturbine,R2,2045,5.15000000000
-14,2059,windturbine,R2,2045,5.15000000000
-14,2060,windturbine,R2,2045,5.15000000000
-14,2064,windturbine,R2,2045,5.15000000000
-14,2065,windturbine,R2,2045,5.15000000000
-14,2069,windturbine,R2,2045,5.15000000000
-14,2070,windturbine,R2,2045,5.15000000000
-14,2074,windturbine,R2,2045,5.15000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,0.29290000000
+1,2054,R1,gasCCGT,2045,0.29290000000
+1,2055,R1,gasCCGT,2045,0.29290000000
+1,2059,R1,gasCCGT,2045,0.29290000000
+1,2060,R1,gasCCGT,2045,0.29290000000
+1,2064,R1,gasCCGT,2045,0.29290000000
+1,2065,R1,gasCCGT,2045,0.29290000000
+1,2069,R1,gasCCGT,2045,0.29290000000
+1,2070,R1,gasCCGT,2045,0.29290000000
+1,2074,R1,gasCCGT,2045,0.29290000000
+1,2075,R1,gasCCGT,2045,0.29290000000
+1,2084,R1,gasCCGT,2045,0.29290000000
+2,2025,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2020,5.05910000000
+2,2035,R1,solarPV,2020,5.05910000000
+2,2040,R1,solarPV,2020,5.05910000000
+2,2045,R1,solarPV,2020,5.05910000000
+2,2049,R1,solarPV,2020,5.05910000000
+3,2030,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+4,2035,R1,solarPV,2030,5.60000000000
+4,2040,R1,solarPV,2030,5.60000000000
+4,2045,R1,solarPV,2030,5.60000000000
+4,2049,R1,solarPV,2030,5.60000000000
+4,2050,R1,solarPV,2030,5.60000000000
+4,2054,R1,solarPV,2030,5.60000000000
+4,2055,R1,solarPV,2030,5.60000000000
+4,2059,R1,solarPV,2030,5.60000000000
+5,2040,R1,solarPV,2035,5.60000000000
+5,2045,R1,solarPV,2035,5.60000000000
+5,2049,R1,solarPV,2035,5.60000000000
+5,2050,R1,solarPV,2035,5.60000000000
+5,2054,R1,solarPV,2035,5.60000000000
+5,2055,R1,solarPV,2035,5.60000000000
+5,2059,R1,solarPV,2035,5.60000000000
+5,2060,R1,solarPV,2035,5.60000000000
+5,2064,R1,solarPV,2035,5.60000000000
+6,2045,R1,solarPV,2040,5.60000000000
+6,2049,R1,solarPV,2040,5.60000000000
+6,2050,R1,solarPV,2040,5.60000000000
+6,2054,R1,solarPV,2040,5.60000000000
+6,2055,R1,solarPV,2040,5.60000000000
+6,2059,R1,solarPV,2040,5.60000000000
+6,2060,R1,solarPV,2040,5.60000000000
+6,2064,R1,solarPV,2040,5.60000000000
+6,2065,R1,solarPV,2040,5.60000000000
+6,2069,R1,solarPV,2040,5.60000000000
+7,2050,R1,solarPV,2045,10.00000000000
+7,2054,R1,solarPV,2045,10.00000000000
+7,2055,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2030,R1,windturbine,2025,2.94090000000
+9,2035,R1,windturbine,2025,2.94090000000
+9,2040,R1,windturbine,2025,2.94090000000
+9,2045,R1,windturbine,2025,2.94090000000
+9,2049,R1,windturbine,2025,2.94090000000
+9,2050,R1,windturbine,2025,2.94090000000
+9,2054,R1,windturbine,2025,2.94090000000
+10,2050,R1,windturbine,2045,10.00000000000
+10,2054,R1,windturbine,2045,10.00000000000
+10,2055,R1,windturbine,2045,10.00000000000
+10,2059,R1,windturbine,2045,10.00000000000
+10,2060,R1,windturbine,2045,10.00000000000
+10,2064,R1,windturbine,2045,10.00000000000
+10,2065,R1,windturbine,2045,10.00000000000
+10,2069,R1,windturbine,2045,10.00000000000
+10,2070,R1,windturbine,2045,10.00000000000
+10,2074,R1,windturbine,2045,10.00000000000
+11,2020,R2,gasCCGT,2020,1.00000000000
+11,2025,R2,gasCCGT,2020,1.00000000000
+12,2030,R2,solarPV,2025,10.00000000000
+12,2035,R2,solarPV,2025,10.00000000000
+12,2040,R2,solarPV,2025,10.00000000000
+12,2045,R2,solarPV,2025,10.00000000000
+12,2049,R2,solarPV,2025,10.00000000000
+12,2050,R2,solarPV,2025,10.00000000000
+12,2054,R2,solarPV,2025,10.00000000000
+13,2035,R2,solarPV,2030,5.60000000000
+13,2040,R2,solarPV,2030,5.60000000000
+13,2045,R2,solarPV,2030,5.60000000000
+13,2049,R2,solarPV,2030,5.60000000000
+13,2050,R2,solarPV,2030,5.60000000000
+13,2054,R2,solarPV,2030,5.60000000000
+13,2055,R2,solarPV,2030,5.60000000000
+13,2059,R2,solarPV,2030,5.60000000000
+14,2040,R2,solarPV,2035,5.60000000000
+14,2045,R2,solarPV,2035,5.60000000000
+14,2049,R2,solarPV,2035,5.60000000000
+14,2050,R2,solarPV,2035,5.60000000000
+14,2054,R2,solarPV,2035,5.60000000000
+14,2055,R2,solarPV,2035,5.60000000000
+14,2059,R2,solarPV,2035,5.60000000000
+14,2060,R2,solarPV,2035,5.60000000000
+14,2064,R2,solarPV,2035,5.60000000000
+15,2045,R2,solarPV,2040,5.60000000000
+15,2049,R2,solarPV,2040,5.60000000000
+15,2050,R2,solarPV,2040,5.60000000000
+15,2054,R2,solarPV,2040,5.60000000000
+15,2055,R2,solarPV,2040,5.60000000000
+15,2059,R2,solarPV,2040,5.60000000000
+15,2060,R2,solarPV,2040,5.60000000000
+15,2064,R2,solarPV,2040,5.60000000000
+15,2065,R2,solarPV,2040,5.60000000000
+15,2069,R2,solarPV,2040,5.60000000000
+16,2050,R2,solarPV,2045,10.00000000000
+16,2054,R2,solarPV,2045,10.00000000000
+16,2055,R2,solarPV,2045,10.00000000000
+16,2059,R2,solarPV,2045,10.00000000000
+16,2060,R2,solarPV,2045,10.00000000000
+16,2064,R2,solarPV,2045,10.00000000000
+16,2065,R2,solarPV,2045,10.00000000000
+16,2069,R2,solarPV,2045,10.00000000000
+16,2070,R2,solarPV,2045,10.00000000000
+16,2074,R2,solarPV,2045,10.00000000000
+17,2025,R2,windturbine,2020,15.05910000000
+17,2030,R2,windturbine,2020,15.05910000000
+17,2035,R2,windturbine,2020,15.05910000000
+17,2040,R2,windturbine,2020,15.05910000000
+17,2045,R2,windturbine,2020,15.05910000000
+17,2049,R2,windturbine,2020,15.05910000000
+18,2030,R2,windturbine,2025,2.94090000000
+18,2035,R2,windturbine,2025,2.94090000000
+18,2040,R2,windturbine,2025,2.94090000000
+18,2045,R2,windturbine,2025,2.94090000000
+18,2049,R2,windturbine,2025,2.94090000000
+18,2050,R2,windturbine,2025,2.94090000000
+18,2054,R2,windturbine,2025,2.94090000000
+19,2050,R2,windturbine,2045,10.65910000000
+19,2054,R2,windturbine,2045,10.65910000000
+19,2055,R2,windturbine,2045,10.65910000000
+19,2059,R2,windturbine,2045,10.65910000000
+19,2060,R2,windturbine,2045,10.65910000000
+19,2064,R2,windturbine,2045,10.65910000000
+19,2065,R2,windturbine,2045,10.65910000000
+19,2069,R2,windturbine,2045,10.65910000000
+19,2070,R2,windturbine,2045,10.65910000000
+19,2074,R2,windturbine,2045,10.65910000000
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 64819cd1..b8290871 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,101 +1,199 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,solarPV,2025,8.99000000000
-1,2054,R1,solarPV,2025,8.99000000000
-2,2050,R1,solarPV,2030,5.60000000000
-2,2054,R1,solarPV,2030,5.60000000000
-2,2055,R1,solarPV,2030,5.60000000000
-2,2059,R1,solarPV,2030,5.60000000000
-3,2050,R1,solarPV,2035,8.57400000000
-3,2054,R1,solarPV,2035,8.57400000000
-3,2055,R1,solarPV,2035,8.57400000000
-3,2059,R1,solarPV,2035,8.57400000000
-3,2060,R1,solarPV,2035,8.57400000000
-3,2064,R1,solarPV,2035,8.57400000000
-4,2050,R1,solarPV,2040,5.60000000000
-4,2054,R1,solarPV,2040,5.60000000000
-4,2055,R1,solarPV,2040,5.60000000000
-4,2059,R1,solarPV,2040,5.60000000000
-4,2060,R1,solarPV,2040,5.60000000000
-4,2064,R1,solarPV,2040,5.60000000000
-4,2065,R1,solarPV,2040,5.60000000000
-4,2069,R1,solarPV,2040,5.60000000000
-5,2050,R1,solarPV,2045,16.48600000000
-5,2054,R1,solarPV,2045,16.48600000000
-5,2055,R1,solarPV,2045,16.48600000000
-5,2059,R1,solarPV,2045,16.48600000000
-5,2060,R1,solarPV,2045,16.48600000000
-5,2064,R1,solarPV,2045,16.48600000000
-5,2065,R1,solarPV,2045,16.48600000000
-5,2069,R1,solarPV,2045,16.48600000000
-5,2070,R1,solarPV,2045,16.48600000000
-5,2074,R1,solarPV,2045,16.48600000000
-6,2055,R1,solarPV,2050,8.99000000000
-6,2059,R1,solarPV,2050,8.99000000000
-6,2060,R1,solarPV,2050,8.99000000000
-6,2064,R1,solarPV,2050,8.99000000000
-6,2065,R1,solarPV,2050,8.99000000000
-6,2069,R1,solarPV,2050,8.99000000000
-6,2070,R1,solarPV,2050,8.99000000000
-6,2074,R1,solarPV,2050,8.99000000000
-6,2075,R1,solarPV,2050,8.99000000000
-6,2079,R1,solarPV,2050,8.99000000000
-8,2050,R1,windturbine,2045,5.15000000000
-8,2054,R1,windturbine,2045,5.15000000000
-8,2055,R1,windturbine,2045,5.15000000000
-8,2059,R1,windturbine,2045,5.15000000000
-8,2060,R1,windturbine,2045,5.15000000000
-8,2064,R1,windturbine,2045,5.15000000000
-8,2065,R1,windturbine,2045,5.15000000000
-8,2069,R1,windturbine,2045,5.15000000000
-8,2070,R1,windturbine,2045,5.15000000000
-8,2074,R1,windturbine,2045,5.15000000000
-9,2050,R2,solarPV,2025,8.99000000000
-9,2054,R2,solarPV,2025,8.99000000000
-10,2050,R2,solarPV,2030,5.60000000000
-10,2054,R2,solarPV,2030,5.60000000000
-10,2055,R2,solarPV,2030,5.60000000000
-10,2059,R2,solarPV,2030,5.60000000000
-11,2050,R2,solarPV,2035,8.57400000000
-11,2054,R2,solarPV,2035,8.57400000000
-11,2055,R2,solarPV,2035,8.57400000000
-11,2059,R2,solarPV,2035,8.57400000000
-11,2060,R2,solarPV,2035,8.57400000000
-11,2064,R2,solarPV,2035,8.57400000000
-12,2050,R2,solarPV,2040,5.60000000000
-12,2054,R2,solarPV,2040,5.60000000000
-12,2055,R2,solarPV,2040,5.60000000000
-12,2059,R2,solarPV,2040,5.60000000000
-12,2060,R2,solarPV,2040,5.60000000000
-12,2064,R2,solarPV,2040,5.60000000000
-12,2065,R2,solarPV,2040,5.60000000000
-12,2069,R2,solarPV,2040,5.60000000000
-13,2050,R2,solarPV,2045,16.48600000000
-13,2054,R2,solarPV,2045,16.48600000000
-13,2055,R2,solarPV,2045,16.48600000000
-13,2059,R2,solarPV,2045,16.48600000000
-13,2060,R2,solarPV,2045,16.48600000000
-13,2064,R2,solarPV,2045,16.48600000000
-13,2065,R2,solarPV,2045,16.48600000000
-13,2069,R2,solarPV,2045,16.48600000000
-13,2070,R2,solarPV,2045,16.48600000000
-13,2074,R2,solarPV,2045,16.48600000000
-14,2055,R2,solarPV,2050,8.99000000000
-14,2059,R2,solarPV,2050,8.99000000000
-14,2060,R2,solarPV,2050,8.99000000000
-14,2064,R2,solarPV,2050,8.99000000000
-14,2065,R2,solarPV,2050,8.99000000000
-14,2069,R2,solarPV,2050,8.99000000000
-14,2070,R2,solarPV,2050,8.99000000000
-14,2074,R2,solarPV,2050,8.99000000000
-14,2075,R2,solarPV,2050,8.99000000000
-14,2079,R2,solarPV,2050,8.99000000000
-16,2050,R2,windturbine,2045,5.15000000000
-16,2054,R2,windturbine,2045,5.15000000000
-16,2055,R2,windturbine,2045,5.15000000000
-16,2059,R2,windturbine,2045,5.15000000000
-16,2060,R2,windturbine,2045,5.15000000000
-16,2064,R2,windturbine,2045,5.15000000000
-16,2065,R2,windturbine,2045,5.15000000000
-16,2069,R2,windturbine,2045,5.15000000000
-16,2070,R2,windturbine,2045,5.15000000000
-16,2074,R2,windturbine,2045,5.15000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,0.29290000000
+1,2054,R1,gasCCGT,2045,0.29290000000
+1,2055,R1,gasCCGT,2045,0.29290000000
+1,2059,R1,gasCCGT,2045,0.29290000000
+1,2060,R1,gasCCGT,2045,0.29290000000
+1,2064,R1,gasCCGT,2045,0.29290000000
+1,2065,R1,gasCCGT,2045,0.29290000000
+1,2069,R1,gasCCGT,2045,0.29290000000
+1,2070,R1,gasCCGT,2045,0.29290000000
+1,2074,R1,gasCCGT,2045,0.29290000000
+1,2075,R1,gasCCGT,2045,0.29290000000
+1,2079,R1,gasCCGT,2045,0.29290000000
+1,2080,R1,gasCCGT,2045,0.29290000000
+1,2084,R1,gasCCGT,2045,0.29290000000
+2,2025,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2020,5.05910000000
+2,2035,R1,solarPV,2020,5.05910000000
+2,2040,R1,solarPV,2020,5.05910000000
+2,2045,R1,solarPV,2020,5.05910000000
+2,2049,R1,solarPV,2020,5.05910000000
+3,2030,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+4,2035,R1,solarPV,2030,5.60000000000
+4,2040,R1,solarPV,2030,5.60000000000
+4,2045,R1,solarPV,2030,5.60000000000
+4,2049,R1,solarPV,2030,5.60000000000
+4,2050,R1,solarPV,2030,5.60000000000
+4,2054,R1,solarPV,2030,5.60000000000
+4,2055,R1,solarPV,2030,5.60000000000
+4,2059,R1,solarPV,2030,5.60000000000
+5,2040,R1,solarPV,2035,5.60000000000
+5,2045,R1,solarPV,2035,5.60000000000
+5,2049,R1,solarPV,2035,5.60000000000
+5,2050,R1,solarPV,2035,5.60000000000
+5,2054,R1,solarPV,2035,5.60000000000
+5,2055,R1,solarPV,2035,5.60000000000
+5,2059,R1,solarPV,2035,5.60000000000
+5,2060,R1,solarPV,2035,5.60000000000
+5,2064,R1,solarPV,2035,5.60000000000
+6,2045,R1,solarPV,2040,5.60000000000
+6,2049,R1,solarPV,2040,5.60000000000
+6,2050,R1,solarPV,2040,5.60000000000
+6,2054,R1,solarPV,2040,5.60000000000
+6,2055,R1,solarPV,2040,5.60000000000
+6,2059,R1,solarPV,2040,5.60000000000
+6,2060,R1,solarPV,2040,5.60000000000
+6,2064,R1,solarPV,2040,5.60000000000
+6,2065,R1,solarPV,2040,5.60000000000
+6,2069,R1,solarPV,2040,5.60000000000
+7,2050,R1,solarPV,2045,10.00000000000
+7,2054,R1,solarPV,2045,10.00000000000
+7,2055,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
+8,2055,R1,solarPV,2050,10.00000000000
+8,2059,R1,solarPV,2050,10.00000000000
+8,2060,R1,solarPV,2050,10.00000000000
+8,2064,R1,solarPV,2050,10.00000000000
+8,2065,R1,solarPV,2050,10.00000000000
+8,2069,R1,solarPV,2050,10.00000000000
+8,2070,R1,solarPV,2050,10.00000000000
+8,2074,R1,solarPV,2050,10.00000000000
+8,2075,R1,solarPV,2050,10.00000000000
+8,2079,R1,solarPV,2050,10.00000000000
+9,2025,R1,windturbine,2020,10.00000000000
+9,2030,R1,windturbine,2020,10.00000000000
+9,2035,R1,windturbine,2020,10.00000000000
+9,2040,R1,windturbine,2020,10.00000000000
+9,2045,R1,windturbine,2020,10.00000000000
+9,2049,R1,windturbine,2020,10.00000000000
+10,2030,R1,windturbine,2025,2.94090000000
+10,2035,R1,windturbine,2025,2.94090000000
+10,2040,R1,windturbine,2025,2.94090000000
+10,2045,R1,windturbine,2025,2.94090000000
+10,2049,R1,windturbine,2025,2.94090000000
+10,2050,R1,windturbine,2025,2.94090000000
+10,2054,R1,windturbine,2025,2.94090000000
+11,2050,R1,windturbine,2045,10.00000000000
+11,2054,R1,windturbine,2045,10.00000000000
+11,2055,R1,windturbine,2045,10.00000000000
+11,2059,R1,windturbine,2045,10.00000000000
+11,2060,R1,windturbine,2045,10.00000000000
+11,2064,R1,windturbine,2045,10.00000000000
+11,2065,R1,windturbine,2045,10.00000000000
+11,2069,R1,windturbine,2045,10.00000000000
+11,2070,R1,windturbine,2045,10.00000000000
+11,2074,R1,windturbine,2045,10.00000000000
+12,2055,R1,windturbine,2050,2.94090000000
+12,2059,R1,windturbine,2050,2.94090000000
+12,2060,R1,windturbine,2050,2.94090000000
+12,2064,R1,windturbine,2050,2.94090000000
+12,2065,R1,windturbine,2050,2.94090000000
+12,2069,R1,windturbine,2050,2.94090000000
+12,2070,R1,windturbine,2050,2.94090000000
+12,2074,R1,windturbine,2050,2.94090000000
+12,2075,R1,windturbine,2050,2.94090000000
+12,2079,R1,windturbine,2050,2.94090000000
+13,2020,R2,gasCCGT,2020,1.00000000000
+13,2025,R2,gasCCGT,2020,1.00000000000
+14,2030,R2,solarPV,2025,10.00000000000
+14,2035,R2,solarPV,2025,10.00000000000
+14,2040,R2,solarPV,2025,10.00000000000
+14,2045,R2,solarPV,2025,10.00000000000
+14,2049,R2,solarPV,2025,10.00000000000
+14,2050,R2,solarPV,2025,10.00000000000
+14,2054,R2,solarPV,2025,10.00000000000
+15,2035,R2,solarPV,2030,5.60000000000
+15,2040,R2,solarPV,2030,5.60000000000
+15,2045,R2,solarPV,2030,5.60000000000
+15,2049,R2,solarPV,2030,5.60000000000
+15,2050,R2,solarPV,2030,5.60000000000
+15,2054,R2,solarPV,2030,5.60000000000
+15,2055,R2,solarPV,2030,5.60000000000
+15,2059,R2,solarPV,2030,5.60000000000
+16,2040,R2,solarPV,2035,5.60000000000
+16,2045,R2,solarPV,2035,5.60000000000
+16,2049,R2,solarPV,2035,5.60000000000
+16,2050,R2,solarPV,2035,5.60000000000
+16,2054,R2,solarPV,2035,5.60000000000
+16,2055,R2,solarPV,2035,5.60000000000
+16,2059,R2,solarPV,2035,5.60000000000
+16,2060,R2,solarPV,2035,5.60000000000
+16,2064,R2,solarPV,2035,5.60000000000
+17,2045,R2,solarPV,2040,5.60000000000
+17,2049,R2,solarPV,2040,5.60000000000
+17,2050,R2,solarPV,2040,5.60000000000
+17,2054,R2,solarPV,2040,5.60000000000
+17,2055,R2,solarPV,2040,5.60000000000
+17,2059,R2,solarPV,2040,5.60000000000
+17,2060,R2,solarPV,2040,5.60000000000
+17,2064,R2,solarPV,2040,5.60000000000
+17,2065,R2,solarPV,2040,5.60000000000
+17,2069,R2,solarPV,2040,5.60000000000
+18,2050,R2,solarPV,2045,10.00000000000
+18,2054,R2,solarPV,2045,10.00000000000
+18,2055,R2,solarPV,2045,10.00000000000
+18,2059,R2,solarPV,2045,10.00000000000
+18,2060,R2,solarPV,2045,10.00000000000
+18,2064,R2,solarPV,2045,10.00000000000
+18,2065,R2,solarPV,2045,10.00000000000
+18,2069,R2,solarPV,2045,10.00000000000
+18,2070,R2,solarPV,2045,10.00000000000
+18,2074,R2,solarPV,2045,10.00000000000
+19,2055,R2,solarPV,2050,10.00000000000
+19,2059,R2,solarPV,2050,10.00000000000
+19,2060,R2,solarPV,2050,10.00000000000
+19,2064,R2,solarPV,2050,10.00000000000
+19,2065,R2,solarPV,2050,10.00000000000
+19,2069,R2,solarPV,2050,10.00000000000
+19,2070,R2,solarPV,2050,10.00000000000
+19,2074,R2,solarPV,2050,10.00000000000
+19,2075,R2,solarPV,2050,10.00000000000
+19,2079,R2,solarPV,2050,10.00000000000
+20,2025,R2,windturbine,2020,15.05910000000
+20,2030,R2,windturbine,2020,15.05910000000
+20,2035,R2,windturbine,2020,15.05910000000
+20,2040,R2,windturbine,2020,15.05910000000
+20,2045,R2,windturbine,2020,15.05910000000
+20,2049,R2,windturbine,2020,15.05910000000
+21,2030,R2,windturbine,2025,2.94090000000
+21,2035,R2,windturbine,2025,2.94090000000
+21,2040,R2,windturbine,2025,2.94090000000
+21,2045,R2,windturbine,2025,2.94090000000
+21,2049,R2,windturbine,2025,2.94090000000
+21,2050,R2,windturbine,2025,2.94090000000
+21,2054,R2,windturbine,2025,2.94090000000
+22,2050,R2,windturbine,2045,10.65910000000
+22,2054,R2,windturbine,2045,10.65910000000
+22,2055,R2,windturbine,2045,10.65910000000
+22,2059,R2,windturbine,2045,10.65910000000
+22,2060,R2,windturbine,2045,10.65910000000
+22,2064,R2,windturbine,2045,10.65910000000
+22,2065,R2,windturbine,2045,10.65910000000
+22,2069,R2,windturbine,2045,10.65910000000
+22,2070,R2,windturbine,2045,10.65910000000
+22,2074,R2,windturbine,2045,10.65910000000
+23,2055,R2,windturbine,2050,2.94090000000
+23,2059,R2,windturbine,2050,2.94090000000
+23,2060,R2,windturbine,2050,2.94090000000
+23,2064,R2,windturbine,2050,2.94090000000
+23,2065,R2,windturbine,2050,2.94090000000
+23,2069,R2,windturbine,2050,2.94090000000
+23,2070,R2,windturbine,2050,2.94090000000
+23,2074,R2,windturbine,2050,2.94090000000
+23,2075,R2,windturbine,2050,2.94090000000
+23,2079,R2,windturbine,2050,2.94090000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
index 26535f2c..ab90205f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2020.csv
@@ -1,11 +1,11 @@
-asset,year,technology,region,installed,capacity
-0,2020,gasboiler,R1,2020,10.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2020,gasboiler,R2,2020,10.00000000000
-1,2025,gasboiler,R2,2020,5.00000000000
-2,2025,heatpump,R1,2020,17.40000000000
-2,2030,heatpump,R1,2020,17.40000000000
-2,2034,heatpump,R1,2020,17.40000000000
-3,2025,heatpump,R2,2020,17.40000000000
-3,2030,heatpump,R2,2020,17.40000000000
-3,2034,heatpump,R2,2020,17.40000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2020,R2,gasboiler,2020,10
+2,2025,R2,gasboiler,2020,5
+3,2025,R2,heatpump,2020,17
+3,2030,R2,heatpump,2020,17
+3,2034,R2,heatpump,2020,17
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
index a6720c51..b3afecf7 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2025.csv
@@ -1,25 +1,19 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2030,gasboiler,R1,2025,3.86000000000
-1,2034,gasboiler,R1,2025,3.86000000000
-1,2035,gasboiler,R1,2025,3.86000000000
-1,2039,gasboiler,R1,2025,3.86000000000
-2,2025,gasboiler,R2,2020,5.00000000000
-3,2030,gasboiler,R2,2025,3.86000000000
-3,2034,gasboiler,R2,2025,3.86000000000
-3,2035,gasboiler,R2,2025,3.86000000000
-3,2039,gasboiler,R2,2025,3.86000000000
-4,2025,heatpump,R1,2020,17.40000000000
-4,2030,heatpump,R1,2020,17.40000000000
-4,2034,heatpump,R1,2020,17.40000000000
-5,2030,heatpump,R1,2025,6.74000000000
-5,2034,heatpump,R1,2025,6.74000000000
-5,2035,heatpump,R1,2025,6.74000000000
-5,2039,heatpump,R1,2025,6.74000000000
-6,2025,heatpump,R2,2020,17.40000000000
-6,2030,heatpump,R2,2020,17.40000000000
-6,2034,heatpump,R2,2020,17.40000000000
-7,2030,heatpump,R2,2025,6.74000000000
-7,2034,heatpump,R2,2025,6.74000000000
-7,2035,heatpump,R2,2025,6.74000000000
-7,2039,heatpump,R2,2025,6.74000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2030,R1,heatpump,2025,11
+2,2034,R1,heatpump,2025,11
+2,2035,R1,heatpump,2025,11
+2,2039,R1,heatpump,2025,11
+3,2020,R2,gasboiler,2020,10
+3,2025,R2,gasboiler,2020,5
+4,2025,R2,heatpump,2020,17
+4,2030,R2,heatpump,2020,17
+4,2034,R2,heatpump,2020,17
+5,2030,R2,heatpump,2025,11
+5,2034,R2,heatpump,2025,11
+5,2035,R2,heatpump,2025,11
+5,2039,R2,heatpump,2025,11
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
index f6556372..76959a84 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2030.csv
@@ -1,29 +1,27 @@
-asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2025,3.86000000000
-0,2034,gasboiler,R1,2025,3.86000000000
-0,2035,gasboiler,R1,2025,3.86000000000
-0,2039,gasboiler,R1,2025,3.86000000000
-1,2030,gasboiler,R2,2025,3.86000000000
-1,2034,gasboiler,R2,2025,3.86000000000
-1,2035,gasboiler,R2,2025,3.86000000000
-1,2039,gasboiler,R2,2025,3.86000000000
-2,2030,heatpump,R1,2020,17.40000000000
-2,2034,heatpump,R1,2020,17.40000000000
-3,2030,heatpump,R1,2025,6.74000000000
-3,2034,heatpump,R1,2025,6.74000000000
-3,2035,heatpump,R1,2025,6.74000000000
-3,2039,heatpump,R1,2025,6.74000000000
-4,2035,heatpump,R1,2030,23.00000000000
-4,2039,heatpump,R1,2030,23.00000000000
-4,2040,heatpump,R1,2030,23.00000000000
-4,2044,heatpump,R1,2030,23.00000000000
-5,2030,heatpump,R2,2020,17.40000000000
-5,2034,heatpump,R2,2020,17.40000000000
-6,2030,heatpump,R2,2025,6.74000000000
-6,2034,heatpump,R2,2025,6.74000000000
-6,2035,heatpump,R2,2025,6.74000000000
-6,2039,heatpump,R2,2025,6.74000000000
-7,2035,heatpump,R2,2030,23.00000000000
-7,2039,heatpump,R2,2030,23.00000000000
-7,2040,heatpump,R2,2030,23.00000000000
-7,2044,heatpump,R2,2030,23.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2030,R1,heatpump,2025,11
+2,2034,R1,heatpump,2025,11
+2,2035,R1,heatpump,2025,11
+2,2039,R1,heatpump,2025,11
+3,2035,R1,heatpump,2030,22
+3,2039,R1,heatpump,2030,22
+3,2040,R1,heatpump,2030,22
+3,2044,R1,heatpump,2030,22
+4,2020,R2,gasboiler,2020,10
+4,2025,R2,gasboiler,2020,5
+5,2025,R2,heatpump,2020,17
+5,2030,R2,heatpump,2020,17
+5,2034,R2,heatpump,2020,17
+6,2030,R2,heatpump,2025,11
+6,2034,R2,heatpump,2025,11
+6,2035,R2,heatpump,2025,11
+6,2039,R2,heatpump,2025,11
+7,2035,R2,heatpump,2030,22
+7,2039,R2,heatpump,2030,22
+7,2040,R2,heatpump,2030,22
+7,2044,R2,heatpump,2030,22
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
index a3ca6aa5..7e402859 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2035.csv
@@ -1,33 +1,35 @@
-asset,year,technology,region,installed,capacity
-0,2035,gasboiler,R1,2025,3.86000000000
-0,2039,gasboiler,R1,2025,3.86000000000
-1,2040,gasboiler,R1,2035,0.88600000000
-1,2044,gasboiler,R1,2035,0.88600000000
-1,2045,gasboiler,R1,2035,0.88600000000
-1,2049,gasboiler,R1,2035,0.88600000000
-2,2035,gasboiler,R2,2025,3.86000000000
-2,2039,gasboiler,R2,2025,3.86000000000
-3,2040,gasboiler,R2,2035,0.88600000000
-3,2044,gasboiler,R2,2035,0.88600000000
-3,2045,gasboiler,R2,2035,0.88600000000
-3,2049,gasboiler,R2,2035,0.88600000000
-4,2035,heatpump,R1,2025,6.74000000000
-4,2039,heatpump,R1,2025,6.74000000000
-5,2035,heatpump,R1,2030,23.00000000000
-5,2039,heatpump,R1,2030,23.00000000000
-5,2040,heatpump,R1,2030,23.00000000000
-5,2044,heatpump,R1,2030,23.00000000000
-6,2040,heatpump,R1,2035,15.31400000000
-6,2044,heatpump,R1,2035,15.31400000000
-6,2045,heatpump,R1,2035,15.31400000000
-6,2049,heatpump,R1,2035,15.31400000000
-7,2035,heatpump,R2,2025,6.74000000000
-7,2039,heatpump,R2,2025,6.74000000000
-8,2035,heatpump,R2,2030,23.00000000000
-8,2039,heatpump,R2,2030,23.00000000000
-8,2040,heatpump,R2,2030,23.00000000000
-8,2044,heatpump,R2,2030,23.00000000000
-9,2040,heatpump,R2,2035,15.31400000000
-9,2044,heatpump,R2,2035,15.31400000000
-9,2045,heatpump,R2,2035,15.31400000000
-9,2049,heatpump,R2,2035,15.31400000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2030,R1,heatpump,2025,11
+2,2034,R1,heatpump,2025,11
+2,2035,R1,heatpump,2025,11
+2,2039,R1,heatpump,2025,11
+3,2035,R1,heatpump,2030,22
+3,2039,R1,heatpump,2030,22
+3,2040,R1,heatpump,2030,22
+3,2044,R1,heatpump,2030,22
+4,2040,R1,heatpump,2035,17
+4,2044,R1,heatpump,2035,17
+4,2045,R1,heatpump,2035,17
+4,2049,R1,heatpump,2035,17
+5,2020,R2,gasboiler,2020,10
+5,2025,R2,gasboiler,2020,5
+6,2025,R2,heatpump,2020,17
+6,2030,R2,heatpump,2020,17
+6,2034,R2,heatpump,2020,17
+7,2030,R2,heatpump,2025,11
+7,2034,R2,heatpump,2025,11
+7,2035,R2,heatpump,2025,11
+7,2039,R2,heatpump,2025,11
+8,2035,R2,heatpump,2030,22
+8,2039,R2,heatpump,2030,22
+8,2040,R2,heatpump,2030,22
+8,2044,R2,heatpump,2030,22
+9,2040,R2,heatpump,2035,17
+9,2044,R2,heatpump,2035,17
+9,2045,R2,heatpump,2035,17
+9,2049,R2,heatpump,2035,17
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
index 7285c2c7..55b961b2 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2040.csv
@@ -1,29 +1,43 @@
-asset,year,technology,region,installed,capacity
-0,2040,gasboiler,R1,2035,0.88600000000
-0,2044,gasboiler,R1,2035,0.88600000000
-0,2045,gasboiler,R1,2035,0.88600000000
-0,2049,gasboiler,R1,2035,0.88600000000
-1,2040,gasboiler,R2,2035,0.88600000000
-1,2044,gasboiler,R2,2035,0.88600000000
-1,2045,gasboiler,R2,2035,0.88600000000
-1,2049,gasboiler,R2,2035,0.88600000000
-2,2040,heatpump,R1,2030,23.00000000000
-2,2044,heatpump,R1,2030,23.00000000000
-3,2040,heatpump,R1,2035,15.31400000000
-3,2044,heatpump,R1,2035,15.31400000000
-3,2045,heatpump,R1,2035,15.31400000000
-3,2049,heatpump,R1,2035,15.31400000000
-4,2045,heatpump,R1,2040,28.60000000000
-4,2049,heatpump,R1,2040,28.60000000000
-4,2050,heatpump,R1,2040,28.60000000000
-4,2054,heatpump,R1,2040,28.60000000000
-5,2040,heatpump,R2,2030,23.00000000000
-5,2044,heatpump,R2,2030,23.00000000000
-6,2040,heatpump,R2,2035,15.31400000000
-6,2044,heatpump,R2,2035,15.31400000000
-6,2045,heatpump,R2,2035,15.31400000000
-6,2049,heatpump,R2,2035,15.31400000000
-7,2045,heatpump,R2,2040,28.60000000000
-7,2049,heatpump,R2,2040,28.60000000000
-7,2050,heatpump,R2,2040,28.60000000000
-7,2054,heatpump,R2,2040,28.60000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2030,R1,heatpump,2025,11
+2,2034,R1,heatpump,2025,11
+2,2035,R1,heatpump,2025,11
+2,2039,R1,heatpump,2025,11
+3,2035,R1,heatpump,2030,22
+3,2039,R1,heatpump,2030,22
+3,2040,R1,heatpump,2030,22
+3,2044,R1,heatpump,2030,22
+4,2040,R1,heatpump,2035,17
+4,2044,R1,heatpump,2035,17
+4,2045,R1,heatpump,2035,17
+4,2049,R1,heatpump,2035,17
+5,2045,R1,heatpump,2040,27
+5,2049,R1,heatpump,2040,27
+5,2050,R1,heatpump,2040,27
+5,2054,R1,heatpump,2040,27
+6,2020,R2,gasboiler,2020,10
+6,2025,R2,gasboiler,2020,5
+7,2025,R2,heatpump,2020,17
+7,2030,R2,heatpump,2020,17
+7,2034,R2,heatpump,2020,17
+8,2030,R2,heatpump,2025,11
+8,2034,R2,heatpump,2025,11
+8,2035,R2,heatpump,2025,11
+8,2039,R2,heatpump,2025,11
+9,2035,R2,heatpump,2030,22
+9,2039,R2,heatpump,2030,22
+9,2040,R2,heatpump,2030,22
+9,2044,R2,heatpump,2030,22
+10,2040,R2,heatpump,2035,17
+10,2044,R2,heatpump,2035,17
+10,2045,R2,heatpump,2035,17
+10,2049,R2,heatpump,2035,17
+11,2045,R2,heatpump,2040,27
+11,2049,R2,heatpump,2040,27
+11,2050,R2,heatpump,2040,27
+11,2054,R2,heatpump,2040,27
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
index a54ec89d..ae848c12 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2045.csv
@@ -1,25 +1,51 @@
-asset,year,technology,region,installed,capacity
-0,2045,gasboiler,R1,2035,0.88600000000
-0,2049,gasboiler,R1,2035,0.88600000000
-1,2045,gasboiler,R2,2035,0.88600000000
-1,2049,gasboiler,R2,2035,0.88600000000
-2,2045,heatpump,R1,2035,15.31400000000
-2,2049,heatpump,R1,2035,15.31400000000
-3,2045,heatpump,R1,2040,28.60000000000
-3,2049,heatpump,R1,2040,28.60000000000
-3,2050,heatpump,R1,2040,28.60000000000
-3,2054,heatpump,R1,2040,28.60000000000
-4,2050,heatpump,R1,2045,21.80000000000
-4,2054,heatpump,R1,2045,21.80000000000
-4,2055,heatpump,R1,2045,21.80000000000
-4,2059,heatpump,R1,2045,21.80000000000
-5,2045,heatpump,R2,2035,15.31400000000
-5,2049,heatpump,R2,2035,15.31400000000
-6,2045,heatpump,R2,2040,28.60000000000
-6,2049,heatpump,R2,2040,28.60000000000
-6,2050,heatpump,R2,2040,28.60000000000
-6,2054,heatpump,R2,2040,28.60000000000
-7,2050,heatpump,R2,2045,21.80000000000
-7,2054,heatpump,R2,2045,21.80000000000
-7,2055,heatpump,R2,2045,21.80000000000
-7,2059,heatpump,R2,2045,21.80000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2030,R1,heatpump,2025,11
+2,2034,R1,heatpump,2025,11
+2,2035,R1,heatpump,2025,11
+2,2039,R1,heatpump,2025,11
+3,2035,R1,heatpump,2030,22
+3,2039,R1,heatpump,2030,22
+3,2040,R1,heatpump,2030,22
+3,2044,R1,heatpump,2030,22
+4,2040,R1,heatpump,2035,17
+4,2044,R1,heatpump,2035,17
+4,2045,R1,heatpump,2035,17
+4,2049,R1,heatpump,2035,17
+5,2045,R1,heatpump,2040,27
+5,2049,R1,heatpump,2040,27
+5,2050,R1,heatpump,2040,27
+5,2054,R1,heatpump,2040,27
+6,2050,R1,heatpump,2045,23
+6,2054,R1,heatpump,2045,23
+6,2055,R1,heatpump,2045,23
+6,2059,R1,heatpump,2045,23
+7,2020,R2,gasboiler,2020,10
+7,2025,R2,gasboiler,2020,5
+8,2025,R2,heatpump,2020,17
+8,2030,R2,heatpump,2020,17
+8,2034,R2,heatpump,2020,17
+9,2030,R2,heatpump,2025,11
+9,2034,R2,heatpump,2025,11
+9,2035,R2,heatpump,2025,11
+9,2039,R2,heatpump,2025,11
+10,2035,R2,heatpump,2030,22
+10,2039,R2,heatpump,2030,22
+10,2040,R2,heatpump,2030,22
+10,2044,R2,heatpump,2030,22
+11,2040,R2,heatpump,2035,17
+11,2044,R2,heatpump,2035,17
+11,2045,R2,heatpump,2035,17
+11,2049,R2,heatpump,2035,17
+12,2045,R2,heatpump,2040,27
+12,2049,R2,heatpump,2040,27
+12,2050,R2,heatpump,2040,27
+12,2054,R2,heatpump,2040,27
+13,2050,R2,heatpump,2045,23
+13,2054,R2,heatpump,2045,23
+13,2055,R2,heatpump,2045,23
+13,2059,R2,heatpump,2045,23
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 168dffb1..5fafee94 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,59 @@
 asset,year,region,technology,installed,capacity
-2,2050,R1,heatpump,2040,28.60000000000
-2,2054,R1,heatpump,2040,28.60000000000
-3,2050,R1,heatpump,2045,21.80000000000
-3,2054,R1,heatpump,2045,21.80000000000
-3,2055,R1,heatpump,2045,21.80000000000
-3,2059,R1,heatpump,2045,21.80000000000
-4,2055,R1,heatpump,2050,28.60000000000
-4,2059,R1,heatpump,2050,28.60000000000
-4,2060,R1,heatpump,2050,28.60000000000
-4,2064,R1,heatpump,2050,28.60000000000
-7,2050,R2,heatpump,2040,28.60000000000
-7,2054,R2,heatpump,2040,28.60000000000
-8,2050,R2,heatpump,2045,21.80000000000
-8,2054,R2,heatpump,2045,21.80000000000
-8,2055,R2,heatpump,2045,21.80000000000
-8,2059,R2,heatpump,2045,21.80000000000
-9,2055,R2,heatpump,2050,28.60000000000
-9,2059,R2,heatpump,2050,28.60000000000
-9,2060,R2,heatpump,2050,28.60000000000
-9,2064,R2,heatpump,2050,28.60000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,17
+1,2030,R1,heatpump,2020,17
+1,2034,R1,heatpump,2020,17
+2,2030,R1,heatpump,2025,11
+2,2034,R1,heatpump,2025,11
+2,2035,R1,heatpump,2025,11
+2,2039,R1,heatpump,2025,11
+3,2035,R1,heatpump,2030,22
+3,2039,R1,heatpump,2030,22
+3,2040,R1,heatpump,2030,22
+3,2044,R1,heatpump,2030,22
+4,2040,R1,heatpump,2035,17
+4,2044,R1,heatpump,2035,17
+4,2045,R1,heatpump,2035,17
+4,2049,R1,heatpump,2035,17
+5,2045,R1,heatpump,2040,27
+5,2049,R1,heatpump,2040,27
+5,2050,R1,heatpump,2040,27
+5,2054,R1,heatpump,2040,27
+6,2050,R1,heatpump,2045,23
+6,2054,R1,heatpump,2045,23
+6,2055,R1,heatpump,2045,23
+6,2059,R1,heatpump,2045,23
+7,2055,R1,heatpump,2050,27
+7,2059,R1,heatpump,2050,27
+7,2060,R1,heatpump,2050,27
+7,2064,R1,heatpump,2050,27
+8,2020,R2,gasboiler,2020,10
+8,2025,R2,gasboiler,2020,5
+9,2025,R2,heatpump,2020,17
+9,2030,R2,heatpump,2020,17
+9,2034,R2,heatpump,2020,17
+10,2030,R2,heatpump,2025,11
+10,2034,R2,heatpump,2025,11
+10,2035,R2,heatpump,2025,11
+10,2039,R2,heatpump,2025,11
+11,2035,R2,heatpump,2030,22
+11,2039,R2,heatpump,2030,22
+11,2040,R2,heatpump,2030,22
+11,2044,R2,heatpump,2030,22
+12,2040,R2,heatpump,2035,17
+12,2044,R2,heatpump,2035,17
+12,2045,R2,heatpump,2035,17
+12,2049,R2,heatpump,2035,17
+13,2045,R2,heatpump,2040,27
+13,2049,R2,heatpump,2040,27
+13,2050,R2,heatpump,2040,27
+13,2054,R2,heatpump,2040,27
+14,2050,R2,heatpump,2045,23
+14,2054,R2,heatpump,2045,23
+14,2055,R2,heatpump,2045,23
+14,2059,R2,heatpump,2045,23
+15,2055,R2,heatpump,2050,27
+15,2059,R2,heatpump,2050,27
+15,2060,R2,heatpump,2050,27
+15,2064,R2,heatpump,2050,27
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 a1549a0d..3d4d9c15 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,month,day,hour,technology,installed,supply
 0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,1,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,2,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
 0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,1,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,2,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36250000000
+0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
 0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2025,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
 0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2025,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
 1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,2,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
 1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,2,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51790000000
+1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
 1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2025,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
 1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2025,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
 2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
 2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
+2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
 2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
 2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
 3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
 3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51790000000
+3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
 3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
 3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
 4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-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.08750000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
 4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-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.08750000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08750000000
+4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
 4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-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,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
 4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-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
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
 5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,2,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
 5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,2,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72500000000
+5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
 5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2025,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
 5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2025,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
 6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
 6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72500000000
+6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
 6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2025,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
 6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2025,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
 7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
 7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
+7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
 7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
 7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
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 4368f7a7..fa946f65 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,161 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,3,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,7,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,3,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,7,all-year,all-week,night,heatpump,2025,0.14040000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2030,3,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2030,3,all-year,all-week,night,gasboiler,2025,5.20380000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,3,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,3,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2030,3,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2030,3,all-year,all-week,morning,gasboiler,2025,7.43390000000
-2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-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.08750000000
-4,heat,R1,2025,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-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.08750000000
-4,heat,R2,2025,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-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,15.61130000000
-4,CO2f,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-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,15.61130000000
-4,CO2f,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,3,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,3,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2030,3,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2030,3,all-year,all-week,evening,gasboiler,2025,10.40750000000
-6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2030,3,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2030,3,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
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 cad6285c..c3a18f30 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,129 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,3,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,1,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,4,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,3,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,1,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,4,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.47920000000
-0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2035,1,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2035,1,all-year,all-week,night,gasboiler,2025,5.20380000000
-1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,1,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2035,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2035,1,all-year,all-week,morning,gasboiler,2025,7.43390000000
-2,heat,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,4,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,4,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,CO2f,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,1,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2035,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2035,1,all-year,all-week,evening,gasboiler,2025,10.40750000000
-6,heat,R1,2030,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,4,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2030,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,4,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,CO2f,R1,2030,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2030,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-7,heat,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,4,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,4,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,CO2f,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
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 e8c3b6a6..a1ad7b71 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,257 +1,129 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,2,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,4,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,5,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,3,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,2,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,4,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,5,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,3,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.31900000000
-0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2035,2,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2040,3,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2035,2,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2040,3,all-year,all-week,night,gasboiler,2035,1.19440000000
-1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,2,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,5,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,3,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,2,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,5,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,3,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2035,2,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2040,3,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2035,2,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2040,3,all-year,all-week,morning,gasboiler,2035,1.70630000000
-2,heat,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,4,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,4,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,CO2f,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2035,2,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2040,3,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2035,2,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2040,3,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2035,2,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2040,3,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2035,2,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2040,3,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2035,2,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2040,3,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,2,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,5,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,3,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,2,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,5,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,3,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2035,2,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2040,3,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2035,2,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2040,3,all-year,all-week,evening,gasboiler,2035,2.38890000000
-6,heat,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,2,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,4,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,2,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,4,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,CO2f,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2035,2,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2040,3,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2035,2,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2040,3,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-7,heat,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,4,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,4,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,CO2f,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2035,2,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2040,3,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
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 f15e4ba1..d8cce15a 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,257 +1,129 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,0,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,2,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,3,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2045,6,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,7,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2040,0,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,2,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2040,5,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,3,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2045,6,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,7,all-year,all-week,night,heatpump,2040,0.59580000000
-0,CO2f,R1,2040,0,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2040,0,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2040,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-1,heat,R1,2040,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,7,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2040,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,7,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,CO2f,R1,2040,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2040,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2040,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-2,heat,R1,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2045,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,3,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2045,6,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,CO2f,R1,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2040,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2040,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-3,heat,R1,2040,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2040,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,CO2f,R1,2040,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2040,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-4,heat,R1,2040,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2040,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,CO2f,R1,2040,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2040,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-5,heat,R1,2040,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,7,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2040,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,7,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,CO2f,R1,2040,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2040,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2040,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-6,heat,R1,2040,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2045,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2040,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,3,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2045,6,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,CO2f,R1,2040,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2040,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2040,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-7,heat,R1,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2045,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,3,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2045,6,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,CO2f,R1,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2040,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2040,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
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 2d256b2f..498d5e24 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,193 +1,129 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,2,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,3,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,6,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,3,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,4,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,7,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2045,0,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,1,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,2,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,3,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,6,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,3,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,4,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,7,all-year,all-week,night,heatpump,2045,0.45420000000
-0,CO2f,R1,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,0,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,1,all-year,all-week,night,gasboiler,2035,1.19440000000
-1,heat,R1,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,2,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,3,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,4,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2045,0,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,1,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,2,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,3,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,4,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,CO2f,R1,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,0,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,1,all-year,all-week,morning,gasboiler,2035,1.70630000000
-2,heat,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,2,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,4,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,2,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,3,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,4,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,CO2f,R1,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,0,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,1,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-3,heat,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,2,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,4,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,2,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,3,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,4,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,CO2f,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-4,heat,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,2,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,4,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,2,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,3,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,4,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,CO2f,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-5,heat,R1,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,2,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,3,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,4,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2045,0,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,1,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,2,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,3,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,4,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,CO2f,R1,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,0,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,1,all-year,all-week,evening,gasboiler,2035,2.38890000000
-6,heat,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,2,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,4,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,2,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,3,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,4,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,CO2f,R1,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,0,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,1,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-7,heat,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,2,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,4,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,2,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,3,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,4,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,CO2f,R1,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,0,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,1,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
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 e9a2f7a0..fe854b70 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,month,day,hour,technology,installed,supply
-0,heat,R1,2050,2,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,3,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2055,3,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2055,4,all-year,all-week,night,heatpump,2050,0.59580000000
-0,heat,R1,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
-0,heat,R2,2050,2,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,3,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2055,3,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2055,4,all-year,all-week,night,heatpump,2050,0.59580000000
-0,heat,R2,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
-1,heat,R1,2050,2,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,3,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2055,3,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2055,4,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,heat,R1,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,heat,R2,2050,2,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,3,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2055,3,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2055,4,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,heat,R2,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
-2,heat,R1,2050,2,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2055,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2055,4,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,heat,R1,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,heat,R2,2050,2,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2055,3,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2055,4,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,heat,R2,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-3,heat,R1,2050,2,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2055,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2055,4,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,heat,R1,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,heat,R2,2050,2,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2055,3,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2055,4,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,heat,R2,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-4,heat,R1,2050,2,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2055,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2055,4,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,heat,R1,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,heat,R2,2050,2,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2055,3,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2055,4,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,heat,R2,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-5,heat,R1,2050,2,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,3,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2055,3,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2055,4,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,heat,R1,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,heat,R2,2050,2,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,3,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2055,3,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2055,4,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,heat,R2,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
-6,heat,R1,2050,2,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2055,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2055,4,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,heat,R1,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,heat,R2,2050,2,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2055,3,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2055,4,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,heat,R2,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-7,heat,R1,2050,2,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2055,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2055,4,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,heat,R1,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,heat,R2,2050,2,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2055,3,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2055,4,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,heat,R2,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
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 e8d6cefe..1d028468 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,7 @@
 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 2c4700cb..1d028468 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,7 @@
 asset,year,region,technology,installed,capacity
-0,2022,R1,gassupply1,2020,15.00000000000
-0,2024,R1,gassupply1,2020,15.00000000000
+0,2020,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,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/2-modify-time-framework/Results/Gas/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
index 18a470c4..1d028468 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
@@ -1,9 +1,7 @@
 asset,year,region,technology,installed,capacity
-0,2024,R1,gassupply1,2020,15.00000000000
+0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
-0,2026,R1,gassupply1,2020,7.50000000000
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2024,R2,gassupply1,2020,15.00000000000
+1,2020,R2,gassupply1,2020,15.00000000000
 1,2025,R2,gassupply1,2020,15.00000000000
-1,2026,R2,gassupply1,2020,7.50000000000
 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 45bf7def..1d028468 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,7 +1,7 @@
 asset,year,region,technology,installed,capacity
-0,2026,R1,gassupply1,2020,7.50000000000
-0,2028,R1,gassupply1,2020,7.50000000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2026,R2,gassupply1,2020,7.50000000000
-1,2028,R2,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/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 b30eb999..1d028468 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,5 +1,7 @@
 asset,year,region,technology,installed,capacity
-0,2028,R1,gassupply1,2020,7.50000000000
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2028,R2,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/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index 9cb8445b..1d028468 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,15 +1,7 @@
 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,2032,R1,gassupply1,2030,4.72790000000
-1,2035,R1,gassupply1,2030,4.72790000000
-1,2040,R1,gassupply1,2030,4.72790000000
-1,2045,R1,gassupply1,2030,4.72790000000
-1,2050,R1,gassupply1,2030,4.72790000000
-1,2066,R1,gassupply1,2030,4.72790000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2032,R2,gassupply1,2030,4.72790000000
-3,2035,R2,gassupply1,2030,4.72790000000
-3,2040,R2,gassupply1,2030,4.72790000000
-3,2045,R2,gassupply1,2030,4.72790000000
-3,2050,R2,gassupply1,2030,4.72790000000
-3,2066,R2,gassupply1,2030,4.72790000000
+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/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 869e621d..1d028468 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,15 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2032,R1,gassupply1,2030,4.72790000000
-1,2034,R1,gassupply1,2030,4.72790000000
-1,2035,R1,gassupply1,2030,4.72790000000
-1,2040,R1,gassupply1,2030,4.72790000000
-1,2045,R1,gassupply1,2030,4.72790000000
-1,2050,R1,gassupply1,2030,4.72790000000
-1,2066,R1,gassupply1,2030,4.72790000000
-3,2032,R2,gassupply1,2030,4.72790000000
-3,2034,R2,gassupply1,2030,4.72790000000
-3,2035,R2,gassupply1,2030,4.72790000000
-3,2040,R2,gassupply1,2030,4.72790000000
-3,2045,R2,gassupply1,2030,4.72790000000
-3,2050,R2,gassupply1,2030,4.72790000000
-3,2066,R2,gassupply1,2030,4.72790000000
+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/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 1d874c3d..1d028468 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,15 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2034,R1,gassupply1,2030,4.72790000000
-1,2035,R1,gassupply1,2030,4.72790000000
-1,2036,R1,gassupply1,2030,4.72790000000
-1,2040,R1,gassupply1,2030,4.72790000000
-1,2045,R1,gassupply1,2030,4.72790000000
-1,2050,R1,gassupply1,2030,4.72790000000
-1,2066,R1,gassupply1,2030,4.72790000000
-3,2034,R2,gassupply1,2030,4.72790000000
-3,2035,R2,gassupply1,2030,4.72790000000
-3,2036,R2,gassupply1,2030,4.72790000000
-3,2040,R2,gassupply1,2030,4.72790000000
-3,2045,R2,gassupply1,2030,4.72790000000
-3,2050,R2,gassupply1,2030,4.72790000000
-3,2066,R2,gassupply1,2030,4.72790000000
+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/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 a9e5c62d..1d028468 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,13 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2036,R1,gassupply1,2030,4.72790000000
-1,2038,R1,gassupply1,2030,4.72790000000
-1,2040,R1,gassupply1,2030,4.72790000000
-1,2045,R1,gassupply1,2030,4.72790000000
-1,2050,R1,gassupply1,2030,4.72790000000
-1,2066,R1,gassupply1,2030,4.72790000000
-3,2036,R2,gassupply1,2030,4.72790000000
-3,2038,R2,gassupply1,2030,4.72790000000
-3,2040,R2,gassupply1,2030,4.72790000000
-3,2045,R2,gassupply1,2030,4.72790000000
-3,2050,R2,gassupply1,2030,4.72790000000
-3,2066,R2,gassupply1,2030,4.72790000000
+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/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 729ce412..1d028468 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,11 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2038,R1,gassupply1,2030,4.72790000000
-1,2040,R1,gassupply1,2030,4.72790000000
-1,2045,R1,gassupply1,2030,4.72790000000
-1,2050,R1,gassupply1,2030,4.72790000000
-1,2066,R1,gassupply1,2030,4.72790000000
-3,2038,R2,gassupply1,2030,4.72790000000
-3,2040,R2,gassupply1,2030,4.72790000000
-3,2045,R2,gassupply1,2030,4.72790000000
-3,2050,R2,gassupply1,2030,4.72790000000
-3,2066,R2,gassupply1,2030,4.72790000000
+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/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 30a5fa0b..1d028468 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,11 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,4.72790000000
-1,2042,R1,gassupply1,2030,4.72790000000
-1,2045,R1,gassupply1,2030,4.72790000000
-1,2050,R1,gassupply1,2030,4.72790000000
-1,2066,R1,gassupply1,2030,4.72790000000
-3,2040,R2,gassupply1,2030,4.72790000000
-3,2042,R2,gassupply1,2030,4.72790000000
-3,2045,R2,gassupply1,2030,4.72790000000
-3,2050,R2,gassupply1,2030,4.72790000000
-3,2066,R2,gassupply1,2030,4.72790000000
+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/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 71d791e1..b53c61be 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -1,255 +1,215 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2022,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2022,14.04000000000
-gasboiler,R2,R2,A1,residential,retrofit,2022,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2022,14.04000000000
-gasCCGT,R1,R1,A1,power,retrofit,2022,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2022,3.79000000000
-windturbine,R1,R1,A1,power,retrofit,2022,8.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2022,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2022,11.79000000000
-gassupply1,R1,R1,A1,gas,retrofit,2022,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2022,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2024,5.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2024,0.55520000000
-heatpump,R1,R1,A1,residential,retrofit,2024,14.04000000000
-heatpump,R1,R1,A1,residential,retrofit,2024,1.68480000000
-gasboiler,R2,R2,A1,residential,retrofit,2024,5.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2024,0.55520000000
-heatpump,R2,R2,A1,residential,retrofit,2024,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2024,1.68480000000
-gasCCGT,R1,R1,A1,power,retrofit,2024,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2024,3.79000000000
-windturbine,R1,R1,A1,power,retrofit,2024,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2024,1.68480000000
-gasCCGT,R2,R2,A1,power,retrofit,2024,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2024,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2024,1.68480000000
-gassupply1,R1,R1,A1,gas,retrofit,2024,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2024,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2026,0.55520000000
-gasboiler,R1,R1,A1,residential,retrofit,2026,3.11300000000
-heatpump,R1,R1,A1,residential,retrofit,2026,14.04000000000
-heatpump,R1,R1,A1,residential,retrofit,2026,1.68480000000
-heatpump,R1,R1,A1,residential,retrofit,2026,4.12700000000
-gasboiler,R2,R2,A1,residential,retrofit,2026,0.55520000000
-gasboiler,R2,R2,A1,residential,retrofit,2026,3.11300000000
-heatpump,R2,R2,A1,residential,retrofit,2026,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2026,1.68480000000
-heatpump,R2,R2,A1,residential,retrofit,2026,4.12700000000
-solarPV,R1,R1,A1,power,retrofit,2026,3.79000000000
-windturbine,R1,R1,A1,power,retrofit,2026,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2026,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2026,6.37700000000
-windturbine,R2,R2,A1,power,retrofit,2026,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2026,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2026,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2026,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2026,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2028,0.55520000000
-gasboiler,R1,R1,A1,residential,retrofit,2028,3.11300000000
-heatpump,R1,R1,A1,residential,retrofit,2028,14.04000000000
-heatpump,R1,R1,A1,residential,retrofit,2028,1.68480000000
-heatpump,R1,R1,A1,residential,retrofit,2028,4.12700000000
-heatpump,R1,R1,A1,residential,retrofit,2028,2.24000000000
-gasboiler,R2,R2,A1,residential,retrofit,2028,0.55520000000
-gasboiler,R2,R2,A1,residential,retrofit,2028,3.11300000000
-heatpump,R2,R2,A1,residential,retrofit,2028,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2028,1.68480000000
-heatpump,R2,R2,A1,residential,retrofit,2028,4.12700000000
-heatpump,R2,R2,A1,residential,retrofit,2028,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2028,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2028,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2028,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2028,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2028,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2028,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2028,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2028,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2028,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2028,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2028,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,0.55520000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,3.11300000000
-heatpump,R1,R1,A1,residential,retrofit,2030,14.04000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,1.68480000000
-heatpump,R1,R1,A1,residential,retrofit,2030,4.12700000000
-heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,2.24000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,0.55520000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,3.11300000000
-heatpump,R2,R2,A1,residential,retrofit,2030,14.04000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,1.68480000000
-heatpump,R2,R2,A1,residential,retrofit,2030,4.12700000000
-heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2030,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2030,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2030,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2030,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2030,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2030,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2030,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2030,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2032,0.55520000000
-gasboiler,R1,R1,A1,residential,retrofit,2032,3.11300000000
-heatpump,R1,R1,A1,residential,retrofit,2032,1.68480000000
-heatpump,R1,R1,A1,residential,retrofit,2032,4.12700000000
-heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2032,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2032,16.28000000000
-gasboiler,R2,R2,A1,residential,retrofit,2032,0.55520000000
-gasboiler,R2,R2,A1,residential,retrofit,2032,3.11300000000
-heatpump,R2,R2,A1,residential,retrofit,2032,1.68480000000
-heatpump,R2,R2,A1,residential,retrofit,2032,4.12700000000
-heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2032,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2032,16.28000000000
-solarPV,R1,R1,A1,power,retrofit,2032,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2032,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2032,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2032,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2032,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2032,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2032,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2032,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2032,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2032,4.72790000000
-gassupply1,R2,R2,A1,gas,retrofit,2032,4.72790000000
-gasboiler,R1,R1,A1,residential,retrofit,2034,3.11300000000
-heatpump,R1,R1,A1,residential,retrofit,2034,4.12700000000
-heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2034,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2034,16.28000000000
-heatpump,R1,R1,A1,residential,retrofit,2034,4.48000000000
-gasboiler,R2,R2,A1,residential,retrofit,2034,3.11300000000
-heatpump,R2,R2,A1,residential,retrofit,2034,4.12700000000
-heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2034,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2034,16.28000000000
-heatpump,R2,R2,A1,residential,retrofit,2034,4.48000000000
-solarPV,R1,R1,A1,power,retrofit,2034,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2034,2.79520000000
-windturbine,R1,R1,A1,power,retrofit,2034,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2034,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2034,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2034,2.79520000000
-windturbine,R2,R2,A1,power,retrofit,2034,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2034,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2034,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2034,4.72790000000
-gassupply1,R2,R2,A1,gas,retrofit,2034,4.72790000000
-heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2036,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2036,16.28000000000
-heatpump,R1,R1,A1,residential,retrofit,2036,4.48000000000
-heatpump,R1,R1,A1,residential,retrofit,2036,9.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2036,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2036,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2036,16.28000000000
-heatpump,R2,R2,A1,residential,retrofit,2036,4.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2036,9.48000000000
-solarPV,R1,R1,A1,power,retrofit,2036,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2036,2.79520000000
-solarPV,R1,R1,A1,power,retrofit,2036,5.35300000000
-windturbine,R1,R1,A1,power,retrofit,2036,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2036,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2036,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2036,2.79520000000
-solarPV,R2,R2,A1,power,retrofit,2036,5.35300000000
-windturbine,R2,R2,A1,power,retrofit,2036,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2036,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2036,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2036,4.72790000000
-gassupply1,R2,R2,A1,gas,retrofit,2036,4.72790000000
-heatpump,R1,R1,A1,residential,retrofit,2038,2.24000000000
-heatpump,R1,R1,A1,residential,retrofit,2038,16.28000000000
-heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
-heatpump,R1,R1,A1,residential,retrofit,2038,9.48000000000
-heatpump,R1,R1,A1,residential,retrofit,2038,4.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2038,2.24000000000
-heatpump,R2,R2,A1,residential,retrofit,2038,16.28000000000
-heatpump,R2,R2,A1,residential,retrofit,2038,4.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2038,9.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2038,4.48000000000
-solarPV,R1,R1,A1,power,retrofit,2038,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.79520000000
-solarPV,R1,R1,A1,power,retrofit,2038,5.35300000000
-solarPV,R1,R1,A1,power,retrofit,2038,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2038,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2038,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2038,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.79520000000
-solarPV,R2,R2,A1,power,retrofit,2038,5.35300000000
-solarPV,R2,R2,A1,power,retrofit,2038,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2038,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2038,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2038,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2038,4.72790000000
-gassupply1,R2,R2,A1,gas,retrofit,2038,4.72790000000
-heatpump,R1,R1,A1,residential,retrofit,2040,16.28000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,9.48000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,4.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,16.28000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,9.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,4.48000000000
-solarPV,R1,R1,A1,power,retrofit,2040,3.79000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.79520000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.35300000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-solarPV,R1,R1,A1,power,retrofit,2040,2.24000000000
-windturbine,R1,R1,A1,power,retrofit,2040,8.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,1.68480000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.37700000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.79520000000
-solarPV,R2,R2,A1,power,retrofit,2040,5.35300000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
-solarPV,R2,R2,A1,power,retrofit,2040,2.24000000000
-windturbine,R2,R2,A1,power,retrofit,2040,11.79000000000
-windturbine,R2,R2,A1,power,retrofit,2040,1.68480000000
-windturbine,R2,R2,A1,power,retrofit,2040,6.37700000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,4.72790000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,4.72790000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2022,8.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2022,11.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2022,8.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2022,11.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2022,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2022,8.77320000000
+gasCCGT,R2,R2,A1,power,newcapa,2022,1.00000000000
+windturbine,R2,R2,A1,power,newcapa,2022,8.77320000000
+gasboiler,R1,R1,A1,residential,newcapa,2024,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2024,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2024,4.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2024,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2024,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2024,4.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2024,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2024,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2024,4.17680000000
+gasCCGT,R2,R2,A1,power,newcapa,2024,1.00000000000
+windturbine,R2,R2,A1,power,newcapa,2024,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2024,4.17680000000
+gasboiler,R1,R1,A1,residential,newcapa,2026,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2026,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2026,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2026,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2026,0.80000000000
+windturbine,R1,R1,A1,power,newcapa,2026,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2026,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2026,4.67960000000
+gasCCGT,R2,R2,A1,power,newcapa,2026,0.80000000000
+windturbine,R2,R2,A1,power,newcapa,2026,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2026,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2026,4.67960000000
+gasboiler,R1,R1,A1,residential,newcapa,2028,2.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2028,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2028,2.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2028,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2028,0.40000000000
+solarPV,R1,R1,A1,power,newcapa,2028,5.16960000000
+windturbine,R1,R1,A1,power,newcapa,2028,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2028,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2028,4.67960000000
+gasCCGT,R2,R2,A1,power,newcapa,2028,0.40000000000
+solarPV,R2,R2,A1,power,newcapa,2028,5.16960000000
+windturbine,R2,R2,A1,power,newcapa,2028,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2028,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2028,4.67960000000
+heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,5.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,5.16960000000
+solarPV,R1,R1,A1,power,newcapa,2030,5.20080000000
+windturbine,R1,R1,A1,power,newcapa,2030,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.67960000000
+solarPV,R2,R2,A1,power,newcapa,2030,5.16960000000
+solarPV,R2,R2,A1,power,newcapa,2030,5.20080000000
+windturbine,R2,R2,A1,power,newcapa,2030,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2030,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2030,4.67960000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2032,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2032,13.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2032,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2032,13.00000000000
+solarPV,R1,R1,A1,power,newcapa,2032,5.16960000000
+solarPV,R1,R1,A1,power,newcapa,2032,5.20080000000
+solarPV,R1,R1,A1,power,newcapa,2032,2.24000000000
+windturbine,R1,R1,A1,power,newcapa,2032,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2032,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2032,4.67960000000
+solarPV,R2,R2,A1,power,newcapa,2032,5.16960000000
+solarPV,R2,R2,A1,power,newcapa,2032,5.20080000000
+solarPV,R2,R2,A1,power,newcapa,2032,2.24000000000
+windturbine,R2,R2,A1,power,newcapa,2032,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2032,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2032,4.67960000000
+heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2034,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2034,13.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2034,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2034,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2034,13.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2034,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2034,5.16960000000
+solarPV,R1,R1,A1,power,newcapa,2034,5.20080000000
+solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
+windturbine,R1,R1,A1,power,newcapa,2034,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2034,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2034,4.67960000000
+solarPV,R2,R2,A1,power,newcapa,2034,5.16960000000
+solarPV,R2,R2,A1,power,newcapa,2034,5.20080000000
+solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
+windturbine,R2,R2,A1,power,newcapa,2034,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2034,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2034,4.67960000000
+heatpump,R1,R1,A1,residential,newcapa,2036,4.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2036,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2036,13.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2036,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2036,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2036,4.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2036,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2036,13.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2036,5.16960000000
+solarPV,R1,R1,A1,power,newcapa,2036,5.20080000000
+solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
+windturbine,R1,R1,A1,power,newcapa,2036,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2036,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2036,4.67960000000
+solarPV,R2,R2,A1,power,newcapa,2036,5.16960000000
+solarPV,R2,R2,A1,power,newcapa,2036,5.20080000000
+solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
+windturbine,R2,R2,A1,power,newcapa,2036,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2036,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2036,4.67960000000
+heatpump,R1,R1,A1,residential,newcapa,2038,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2038,13.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2038,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2038,13.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2038,5.16960000000
+solarPV,R1,R1,A1,power,newcapa,2038,5.20080000000
+solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
+windturbine,R1,R1,A1,power,newcapa,2038,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2038,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2038,4.67960000000
+solarPV,R2,R2,A1,power,newcapa,2038,5.16960000000
+solarPV,R2,R2,A1,power,newcapa,2038,5.20080000000
+solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
+windturbine,R2,R2,A1,power,newcapa,2038,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2038,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2038,4.67960000000
+heatpump,R1,R1,A1,residential,newcapa,2040,13.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,8.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,13.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,8.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.16960000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.20080000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+windturbine,R1,R1,A1,power,newcapa,2040,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.17680000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.67960000000
+solarPV,R2,R2,A1,power,newcapa,2040,5.16960000000
+solarPV,R2,R2,A1,power,newcapa,2040,5.20080000000
+solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
+solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
+windturbine,R2,R2,A1,power,newcapa,2040,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2040,4.17680000000
+windturbine,R2,R2,A1,power,newcapa,2040,4.67960000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 4c4f6643..2d31bfb4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,16.44530000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,16.44530000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,16.45810000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,16.45810000000,2022
 "('all-year', 'all-week', 'night')",gas,R1,6.03250000000,2022
 "('all-year', 'all-week', 'night')",gas,R2,6.03250000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,80.14650000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,80.14650000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,80.16200000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,80.16200000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,16.47360000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,16.47360000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,16.49190000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,16.49190000000,2022
 "('all-year', 'all-week', 'morning')",gas,R1,6.03470000000,2022
 "('all-year', 'all-week', 'morning')",gas,R2,6.03470000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,80.20930000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,80.20930000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,80.23150000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,80.23150000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.44530000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.44530000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.45810000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.45810000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.03250000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.03250000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.14650000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.14650000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.16200000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.16200000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.47360000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,16.47360000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.49190000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,16.49190000000,2022
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.03470000000,2022
 "('all-year', 'all-week', 'early-peak')",gas,R2,6.03470000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.20930000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.20930000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.23150000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.23150000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57740000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,16.57740000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.61590000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,16.61590000000,2022
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.04270000000,2022
 "('all-year', 'all-week', 'late-peak')",gas,R2,6.04270000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.43950000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.43950000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.48610000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.48610000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,16.51140000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,16.53700000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,16.53700000000,2022
 "('all-year', 'all-week', 'evening')",gas,R1,6.03760000000,2022
 "('all-year', 'all-week', 'evening')",gas,R2,6.03760000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,80.29300000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,80.29300000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,80.32400000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,80.32400000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,16.51140000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,16.53700000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,16.53700000000,2022
 "('all-year', 'all-week', 'early-morning')",gas,R1,6.03760000000,2022
 "('all-year', 'all-week', 'early-morning')",gas,R2,6.03760000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.29300000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.29300000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.32400000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.32400000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.51140000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.51140000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.53700000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.53700000000,2022
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,6.03760000000,2022
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,6.03760000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.29300000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.29300000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.32400000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.32400000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,13.21480000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,13.21480000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,13.22620000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,13.22620000000,2024
 "('all-year', 'all-week', 'night')",gas,R1,4.83110000000,2024
 "('all-year', 'all-week', 'night')",gas,R2,4.83110000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,64.24340000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,64.24340000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,64.25860000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,64.25860000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,13.26250000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,13.26250000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,13.27880000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,13.27880000000,2024
 "('all-year', 'all-week', 'morning')",gas,R1,4.83510000000,2024
 "('all-year', 'all-week', 'morning')",gas,R2,4.83510000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,64.34790000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,64.34790000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,64.36960000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,64.36960000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.21480000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.21480000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.22620000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.22620000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83110000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24340000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24340000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.25860000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.25860000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.26250000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.26250000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.27880000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.27880000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.83510000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R2,4.83510000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.34790000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.34790000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.36960000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,64.36960000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.43760000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.43760000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.47190000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.47190000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.84950000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R2,4.84950000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.73210000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.73210000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,64.77790000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,64.77790000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,13.32620000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,13.32620000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,13.34900000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,13.34900000000,2024
 "('all-year', 'all-week', 'evening')",gas,R1,4.84030000000,2024
 "('all-year', 'all-week', 'evening')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,64.48750000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,64.48750000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,64.51790000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,64.51790000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,13.32620000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,13.32620000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.34900000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.34900000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R1,4.84030000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.48750000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.48750000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,64.51790000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,64.51790000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.32620000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.32620000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.34900000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.34900000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84030000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.48750000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.48750000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.51790000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.51790000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,10.59000000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,10.59000000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,10.62420000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,10.62420000000,2026
 "('all-year', 'all-week', 'night')",gas,R1,3.87000000000,2026
 "('all-year', 'all-week', 'night')",gas,R2,3.87000000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,51.49270000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,51.49270000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,51.50710000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,51.50710000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,10.63600000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,10.63600000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,10.68490000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,10.68490000000,2026
 "('all-year', 'all-week', 'morning')",gas,R1,3.87530000000,2026
 "('all-year', 'all-week', 'morning')",gas,R2,3.87530000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,51.61860000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,51.61860000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,51.63920000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,51.63920000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.59000000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.59000000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.62420000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.62420000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.87000000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.87000000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.49270000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.49270000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50710000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50710000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.63600000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,10.63600000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.68490000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,10.68490000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.87530000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R2,3.87530000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.61860000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.61860000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.63920000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,51.63920000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.80470000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,10.80470000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.90740000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,10.90740000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.89490000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R2,3.89490000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.08290000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.08290000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.12660000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,52.12660000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,10.69740000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,10.69740000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,10.76570000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,10.76570000000,2026
 "('all-year', 'all-week', 'evening')",gas,R1,3.88250000000,2026
 "('all-year', 'all-week', 'evening')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,51.78700000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,51.78700000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,51.81590000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,51.81590000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,10.69740000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,10.69740000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,10.76570000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,10.76570000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R1,3.88250000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.78700000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.78700000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,51.81590000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,51.81590000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.69740000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.69740000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.76570000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.76570000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88250000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.78700000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.78700000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81590000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81590000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,8.49030000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,8.49030000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,8.52770000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,8.52770000000,2028
 "('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2028
 "('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,41.27710000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,41.27710000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,41.28040000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,41.28040000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,8.53490000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,8.53490000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,8.58830000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,8.58830000000,2028
 "('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2028
 "('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,41.41380000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,41.41380000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,41.41860000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,41.41860000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.49030000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.49030000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.52770000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.52770000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27710000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27710000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.28040000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.28040000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.53490000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,8.53490000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.58830000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.58830000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.41380000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.41380000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.41860000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,41.41860000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.69850000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,8.69850000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.81090000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.81090000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,41.91860000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,41.91860000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,41.93000000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,41.93000000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,8.59440000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,8.59440000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,8.66920000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,8.66920000000,2028
 "('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2028
 "('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,41.59660000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,41.59660000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,41.60370000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,41.60370000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,8.59440000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,8.59440000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.66920000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.66920000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,41.59660000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,41.59660000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,41.60370000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,41.60370000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.59440000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.59440000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.66920000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.66920000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.59660000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.59660000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60370000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60370000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,6.81040000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,6.81040000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,2.48600000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,2.48600000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,33.09270000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,33.09270000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.09040000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.09040000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.25920000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.25920000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,6.85390000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,6.85390000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,2.49340000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,2.49340000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,33.23280000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,33.23280000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12910000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12910000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.37280000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.37280000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.81040000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.81040000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.48600000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.48600000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.09270000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.09270000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09040000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.25920000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.25920000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.85390000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,6.85390000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.49340000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.49340000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.23280000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,33.23280000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12910000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12910000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.37280000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.37280000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.01340000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,7.01340000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.52040000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.52040000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,33.75120000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,33.75120000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27110000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27110000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.80210000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.80210000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,6.91190000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,6.91190000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,2.50320000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,2.50320000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,33.42050000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,33.42050000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18080000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18080000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.52650000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.52650000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,6.91190000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,6.91190000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.50320000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.50320000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,33.42050000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,33.42050000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18080000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18080000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.52650000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.52650000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.91190000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.91190000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.50320000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.50320000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.42050000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.42050000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18080000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18080000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.52650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.52650000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,5.46650000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,5.46650000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,1.99390000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,1.99390000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,26.53660000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,26.53660000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,0.09010000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,0.09010000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,5.50900000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,5.50900000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,2.00200000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,2.00200000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,26.67580000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,26.67580000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12880000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12880000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,5.46650000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,5.46650000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.99390000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.99390000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,26.53660000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,26.53660000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09010000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09010000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.50900000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,5.50900000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.00200000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.00200000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.67580000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,26.67580000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12880000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12880000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.66510000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,5.66510000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.03160000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.03160000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.19160000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,27.19160000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27040000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27040000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06250000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06250000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,5.56580000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,5.56580000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,2.01280000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,2.01280000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,26.86230000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,26.86230000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18030000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18030000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,0.03650000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,0.03650000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,5.56580000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,5.56580000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.01280000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.01280000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,26.86230000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,26.86230000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18030000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18030000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03650000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03650000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,5.56580000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,5.56580000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.01280000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.01280000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,26.86230000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,26.86230000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18030000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18030000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03650000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03650000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,4.39120000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,4.39120000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,21.28170000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,21.28170000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,0.08970000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,0.08970000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,4.43300000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,4.43300000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,21.41580000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,21.41580000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12820000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12820000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,4.39120000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,4.39120000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,21.28170000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,21.28170000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08970000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08970000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,4.43300000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,4.43300000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,21.41580000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,21.41580000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12820000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12820000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.58610000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.58610000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,21.91370000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,21.91370000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26920000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26920000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06250000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06250000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,4.48870000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,4.48870000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,21.59570000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,21.59570000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17950000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17950000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,4.48870000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,4.48870000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,21.59570000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,21.59570000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17950000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17950000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,4.48870000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,4.48870000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,21.59570000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,21.59570000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17950000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17950000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.08880000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.08880000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.13980000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.13980000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.08920000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.08920000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12690000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12690000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.20140000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.20140000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12750000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12750000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08880000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08880000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13980000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13980000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08920000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08920000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12690000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12690000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20140000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.20140000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12750000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12750000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26650000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43620000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43620000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26770000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26770000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06240000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06240000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17770000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17770000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.28520000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.28520000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17850000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17850000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17770000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17770000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.28520000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.28520000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17850000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17850000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17770000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17770000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.28520000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.28520000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17850000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17850000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.08830000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.08830000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,0.08860000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,0.08860000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2038
 "('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2038
 "('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12610000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12610000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12660000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12660000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08830000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08830000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08860000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08860000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12610000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12610000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12660000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12660000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26480000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26480000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06210000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06210000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26590000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26590000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06220000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06220000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17650000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17650000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17730000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17730000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2038
 "('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2038
 "('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17650000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17650000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17730000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17730000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2038
 "('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2038
 "('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17650000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17650000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17730000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17730000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2038
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2038
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.08760000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08760000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,1.60020000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,1.60020000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08800000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08800000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2040
 "('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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.12520000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12520000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,1.60890000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,1.60890000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12570000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12570000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2040
 "('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,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', 'mid-afternoon')",electricity,R1,0.08760000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08760000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,1.60020000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,1.60020000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08800000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08800000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12520000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12520000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,1.60890000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,1.60890000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12570000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12570000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,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,0.26290000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26290000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,1.64060000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,1.64060000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06200000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06200000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26390000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26390000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06210000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06210000000,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,0.17520000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17520000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,1.62040000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,1.62040000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.03620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.03620000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17600000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17600000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,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', 'early-morning')",electricity,R1,0.17520000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17520000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,1.62040000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,1.62040000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03620000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03620000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17600000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17600000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17520000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17520000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,1.62040000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,1.62040000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03620000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03620000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17600000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17600000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 19625311..a483cb37 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
@@ -2,27 +2,20 @@ 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,3.79000000000
-1,2025,R1,solarPV,2020,3.79000000000
-1,2030,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-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,11.79000000000
-4,2025,R2,windturbine,2020,11.79000000000
-4,2030,R2,windturbine,2020,11.79000000000
-4,2035,R2,windturbine,2020,11.79000000000
-4,2040,R2,windturbine,2020,11.79000000000
-4,2045,R2,windturbine,2020,11.79000000000
-4,2046,R2,windturbine,2020,11.79000000000
+1,2022,R1,windturbine,2020,8.77320000000
+1,2025,R1,windturbine,2020,8.77320000000
+1,2030,R1,windturbine,2020,8.77320000000
+1,2035,R1,windturbine,2020,8.77320000000
+1,2040,R1,windturbine,2020,8.77320000000
+1,2045,R1,windturbine,2020,8.77320000000
+1,2046,R1,windturbine,2020,8.77320000000
+2,2020,R2,gasCCGT,2020,1.00000000000
+2,2022,R2,gasCCGT,2020,1.00000000000
+2,2025,R2,gasCCGT,2020,1.00000000000
+3,2022,R2,windturbine,2020,8.77320000000
+3,2025,R2,windturbine,2020,8.77320000000
+3,2030,R2,windturbine,2020,8.77320000000
+3,2035,R2,windturbine,2020,8.77320000000
+3,2040,R2,windturbine,2020,8.77320000000
+3,2045,R2,windturbine,2020,8.77320000000
+3,2046,R2,windturbine,2020,8.77320000000
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 ec721811..bcffc0cb 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,49 +1,43 @@
 asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
 0,2022,R1,gasCCGT,2020,1.00000000000
 0,2024,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2022,R1,solarPV,2020,3.79000000000
-1,2024,R1,solarPV,2020,3.79000000000
-1,2025,R1,solarPV,2020,3.79000000000
-1,2030,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2022,R1,windturbine,2020,8.00000000000
-2,2024,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,2024,R1,windturbine,2022,1.68480000000
-3,2025,R1,windturbine,2022,1.68480000000
-3,2030,R1,windturbine,2022,1.68480000000
-3,2035,R1,windturbine,2022,1.68480000000
-3,2040,R1,windturbine,2022,1.68480000000
-3,2045,R1,windturbine,2022,1.68480000000
-3,2046,R1,windturbine,2022,1.68480000000
-3,2047,R1,windturbine,2022,1.68480000000
-3,2048,R1,windturbine,2022,1.68480000000
-4,2022,R2,gasCCGT,2020,1.00000000000
-4,2024,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
-5,2022,R2,windturbine,2020,11.79000000000
-5,2024,R2,windturbine,2020,11.79000000000
-5,2025,R2,windturbine,2020,11.79000000000
-5,2030,R2,windturbine,2020,11.79000000000
-5,2035,R2,windturbine,2020,11.79000000000
-5,2040,R2,windturbine,2020,11.79000000000
-5,2045,R2,windturbine,2020,11.79000000000
-5,2046,R2,windturbine,2020,11.79000000000
-6,2024,R2,windturbine,2022,1.68480000000
-6,2025,R2,windturbine,2022,1.68480000000
-6,2030,R2,windturbine,2022,1.68480000000
-6,2035,R2,windturbine,2022,1.68480000000
-6,2040,R2,windturbine,2022,1.68480000000
-6,2045,R2,windturbine,2022,1.68480000000
-6,2046,R2,windturbine,2022,1.68480000000
-6,2047,R2,windturbine,2022,1.68480000000
-6,2048,R2,windturbine,2022,1.68480000000
+1,2022,R1,windturbine,2020,8.77320000000
+1,2024,R1,windturbine,2020,8.77320000000
+1,2025,R1,windturbine,2020,8.77320000000
+1,2030,R1,windturbine,2020,8.77320000000
+1,2035,R1,windturbine,2020,8.77320000000
+1,2040,R1,windturbine,2020,8.77320000000
+1,2045,R1,windturbine,2020,8.77320000000
+1,2046,R1,windturbine,2020,8.77320000000
+2,2024,R1,windturbine,2022,4.17680000000
+2,2025,R1,windturbine,2022,4.17680000000
+2,2030,R1,windturbine,2022,4.17680000000
+2,2035,R1,windturbine,2022,4.17680000000
+2,2040,R1,windturbine,2022,4.17680000000
+2,2045,R1,windturbine,2022,4.17680000000
+2,2046,R1,windturbine,2022,4.17680000000
+2,2047,R1,windturbine,2022,4.17680000000
+2,2048,R1,windturbine,2022,4.17680000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2022,R2,gasCCGT,2020,1.00000000000
+3,2024,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,1.00000000000
+4,2022,R2,windturbine,2020,8.77320000000
+4,2024,R2,windturbine,2020,8.77320000000
+4,2025,R2,windturbine,2020,8.77320000000
+4,2030,R2,windturbine,2020,8.77320000000
+4,2035,R2,windturbine,2020,8.77320000000
+4,2040,R2,windturbine,2020,8.77320000000
+4,2045,R2,windturbine,2020,8.77320000000
+4,2046,R2,windturbine,2020,8.77320000000
+5,2024,R2,windturbine,2022,4.17680000000
+5,2025,R2,windturbine,2022,4.17680000000
+5,2030,R2,windturbine,2022,4.17680000000
+5,2035,R2,windturbine,2022,4.17680000000
+5,2040,R2,windturbine,2022,4.17680000000
+5,2045,R2,windturbine,2022,4.17680000000
+5,2046,R2,windturbine,2022,4.17680000000
+5,2047,R2,windturbine,2022,4.17680000000
+5,2048,R2,windturbine,2022,4.17680000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index 418c25a1..76d90fa8 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -1,69 +1,69 @@
-asset,year,technology,region,installed,capacity
-0,2024,gasCCGT,R1,2020,1.00000000000
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2024,gasCCGT,R2,2020,1.00000000000
-1,2025,gasCCGT,R2,2020,1.00000000000
-2,2024,solarPV,R1,2020,3.79000000000
-2,2025,solarPV,R1,2020,3.79000000000
-2,2026,solarPV,R1,2020,3.79000000000
-2,2030,solarPV,R1,2020,3.79000000000
-2,2035,solarPV,R1,2020,3.79000000000
-2,2040,solarPV,R1,2020,3.79000000000
-2,2045,solarPV,R1,2020,3.79000000000
-2,2046,solarPV,R1,2020,3.79000000000
-3,2024,windturbine,R1,2020,8.00000000000
-3,2025,windturbine,R1,2020,8.00000000000
-3,2026,windturbine,R1,2020,8.00000000000
-3,2030,windturbine,R1,2020,8.00000000000
-3,2035,windturbine,R1,2020,8.00000000000
-3,2040,windturbine,R1,2020,8.00000000000
-3,2045,windturbine,R1,2020,8.00000000000
-3,2046,windturbine,R1,2020,8.00000000000
-4,2024,windturbine,R1,2022,1.68480000000
-4,2025,windturbine,R1,2022,1.68480000000
-4,2026,windturbine,R1,2022,1.68480000000
-4,2030,windturbine,R1,2022,1.68480000000
-4,2035,windturbine,R1,2022,1.68480000000
-4,2040,windturbine,R1,2022,1.68480000000
-4,2045,windturbine,R1,2022,1.68480000000
-4,2046,windturbine,R1,2022,1.68480000000
-4,2047,windturbine,R1,2022,1.68480000000
-4,2048,windturbine,R1,2022,1.68480000000
-5,2026,windturbine,R1,2024,6.37700000000
-5,2030,windturbine,R1,2024,6.37700000000
-5,2035,windturbine,R1,2024,6.37700000000
-5,2040,windturbine,R1,2024,6.37700000000
-5,2045,windturbine,R1,2024,6.37700000000
-5,2046,windturbine,R1,2024,6.37700000000
-5,2047,windturbine,R1,2024,6.37700000000
-5,2048,windturbine,R1,2024,6.37700000000
-5,2049,windturbine,R1,2024,6.37700000000
-5,2050,windturbine,R1,2024,6.37700000000
-6,2024,windturbine,R2,2020,11.79000000000
-6,2025,windturbine,R2,2020,11.79000000000
-6,2026,windturbine,R2,2020,11.79000000000
-6,2030,windturbine,R2,2020,11.79000000000
-6,2035,windturbine,R2,2020,11.79000000000
-6,2040,windturbine,R2,2020,11.79000000000
-6,2045,windturbine,R2,2020,11.79000000000
-6,2046,windturbine,R2,2020,11.79000000000
-7,2024,windturbine,R2,2022,1.68480000000
-7,2025,windturbine,R2,2022,1.68480000000
-7,2026,windturbine,R2,2022,1.68480000000
-7,2030,windturbine,R2,2022,1.68480000000
-7,2035,windturbine,R2,2022,1.68480000000
-7,2040,windturbine,R2,2022,1.68480000000
-7,2045,windturbine,R2,2022,1.68480000000
-7,2046,windturbine,R2,2022,1.68480000000
-7,2047,windturbine,R2,2022,1.68480000000
-7,2048,windturbine,R2,2022,1.68480000000
-8,2026,windturbine,R2,2024,6.37700000000
-8,2030,windturbine,R2,2024,6.37700000000
-8,2035,windturbine,R2,2024,6.37700000000
-8,2040,windturbine,R2,2024,6.37700000000
-8,2045,windturbine,R2,2024,6.37700000000
-8,2046,windturbine,R2,2024,6.37700000000
-8,2047,windturbine,R2,2024,6.37700000000
-8,2048,windturbine,R2,2024,6.37700000000
-8,2049,windturbine,R2,2024,6.37700000000
-8,2050,windturbine,R2,2024,6.37700000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+1,2022,R1,windturbine,2020,8.77320000000
+1,2024,R1,windturbine,2020,8.77320000000
+1,2025,R1,windturbine,2020,8.77320000000
+1,2026,R1,windturbine,2020,8.77320000000
+1,2030,R1,windturbine,2020,8.77320000000
+1,2035,R1,windturbine,2020,8.77320000000
+1,2040,R1,windturbine,2020,8.77320000000
+1,2045,R1,windturbine,2020,8.77320000000
+1,2046,R1,windturbine,2020,8.77320000000
+2,2024,R1,windturbine,2022,4.17680000000
+2,2025,R1,windturbine,2022,4.17680000000
+2,2026,R1,windturbine,2022,4.17680000000
+2,2030,R1,windturbine,2022,4.17680000000
+2,2035,R1,windturbine,2022,4.17680000000
+2,2040,R1,windturbine,2022,4.17680000000
+2,2045,R1,windturbine,2022,4.17680000000
+2,2046,R1,windturbine,2022,4.17680000000
+2,2047,R1,windturbine,2022,4.17680000000
+2,2048,R1,windturbine,2022,4.17680000000
+3,2026,R1,windturbine,2024,4.67960000000
+3,2030,R1,windturbine,2024,4.67960000000
+3,2035,R1,windturbine,2024,4.67960000000
+3,2040,R1,windturbine,2024,4.67960000000
+3,2045,R1,windturbine,2024,4.67960000000
+3,2046,R1,windturbine,2024,4.67960000000
+3,2047,R1,windturbine,2024,4.67960000000
+3,2048,R1,windturbine,2024,4.67960000000
+3,2049,R1,windturbine,2024,4.67960000000
+3,2050,R1,windturbine,2024,4.67960000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2022,R2,gasCCGT,2020,1.00000000000
+4,2024,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+4,2026,R2,gasCCGT,2020,0.80000000000
+5,2022,R2,windturbine,2020,8.77320000000
+5,2024,R2,windturbine,2020,8.77320000000
+5,2025,R2,windturbine,2020,8.77320000000
+5,2026,R2,windturbine,2020,8.77320000000
+5,2030,R2,windturbine,2020,8.77320000000
+5,2035,R2,windturbine,2020,8.77320000000
+5,2040,R2,windturbine,2020,8.77320000000
+5,2045,R2,windturbine,2020,8.77320000000
+5,2046,R2,windturbine,2020,8.77320000000
+6,2024,R2,windturbine,2022,4.17680000000
+6,2025,R2,windturbine,2022,4.17680000000
+6,2026,R2,windturbine,2022,4.17680000000
+6,2030,R2,windturbine,2022,4.17680000000
+6,2035,R2,windturbine,2022,4.17680000000
+6,2040,R2,windturbine,2022,4.17680000000
+6,2045,R2,windturbine,2022,4.17680000000
+6,2046,R2,windturbine,2022,4.17680000000
+6,2047,R2,windturbine,2022,4.17680000000
+6,2048,R2,windturbine,2022,4.17680000000
+7,2026,R2,windturbine,2024,4.67960000000
+7,2030,R2,windturbine,2024,4.67960000000
+7,2035,R2,windturbine,2024,4.67960000000
+7,2040,R2,windturbine,2024,4.67960000000
+7,2045,R2,windturbine,2024,4.67960000000
+7,2046,R2,windturbine,2024,4.67960000000
+7,2047,R2,windturbine,2024,4.67960000000
+7,2048,R2,windturbine,2024,4.67960000000
+7,2049,R2,windturbine,2024,4.67960000000
+7,2050,R2,windturbine,2024,4.67960000000
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 0d001f3a..5b3b3357 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,86 +1,101 @@
 asset,year,region,technology,installed,capacity
-1,2026,R1,solarPV,2020,3.79000000000
-1,2028,R1,solarPV,2020,3.79000000000
-1,2030,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2028,R1,solarPV,2026,2.24000000000
-2,2030,R1,solarPV,2026,2.24000000000
-2,2035,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2026,R1,windturbine,2020,8.00000000000
-3,2028,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,2026,R1,windturbine,2022,1.68480000000
-4,2028,R1,windturbine,2022,1.68480000000
-4,2030,R1,windturbine,2022,1.68480000000
-4,2035,R1,windturbine,2022,1.68480000000
-4,2040,R1,windturbine,2022,1.68480000000
-4,2045,R1,windturbine,2022,1.68480000000
-4,2046,R1,windturbine,2022,1.68480000000
-4,2047,R1,windturbine,2022,1.68480000000
-4,2048,R1,windturbine,2022,1.68480000000
-5,2026,R1,windturbine,2024,6.37700000000
-5,2028,R1,windturbine,2024,6.37700000000
-5,2030,R1,windturbine,2024,6.37700000000
-5,2035,R1,windturbine,2024,6.37700000000
-5,2040,R1,windturbine,2024,6.37700000000
-5,2045,R1,windturbine,2024,6.37700000000
-5,2046,R1,windturbine,2024,6.37700000000
-5,2047,R1,windturbine,2024,6.37700000000
-5,2048,R1,windturbine,2024,6.37700000000
-5,2049,R1,windturbine,2024,6.37700000000
-5,2050,R1,windturbine,2024,6.37700000000
-7,2028,R2,solarPV,2026,2.24000000000
-7,2030,R2,solarPV,2026,2.24000000000
-7,2035,R2,solarPV,2026,2.24000000000
-7,2040,R2,solarPV,2026,2.24000000000
-7,2045,R2,solarPV,2026,2.24000000000
-7,2046,R2,solarPV,2026,2.24000000000
-7,2047,R2,solarPV,2026,2.24000000000
-7,2048,R2,solarPV,2026,2.24000000000
-7,2049,R2,solarPV,2026,2.24000000000
-7,2050,R2,solarPV,2026,2.24000000000
-7,2051,R2,solarPV,2026,2.24000000000
-7,2052,R2,solarPV,2026,2.24000000000
-8,2026,R2,windturbine,2020,11.79000000000
-8,2028,R2,windturbine,2020,11.79000000000
-8,2030,R2,windturbine,2020,11.79000000000
-8,2035,R2,windturbine,2020,11.79000000000
-8,2040,R2,windturbine,2020,11.79000000000
-8,2045,R2,windturbine,2020,11.79000000000
-8,2046,R2,windturbine,2020,11.79000000000
-9,2026,R2,windturbine,2022,1.68480000000
-9,2028,R2,windturbine,2022,1.68480000000
-9,2030,R2,windturbine,2022,1.68480000000
-9,2035,R2,windturbine,2022,1.68480000000
-9,2040,R2,windturbine,2022,1.68480000000
-9,2045,R2,windturbine,2022,1.68480000000
-9,2046,R2,windturbine,2022,1.68480000000
-9,2047,R2,windturbine,2022,1.68480000000
-9,2048,R2,windturbine,2022,1.68480000000
-10,2026,R2,windturbine,2024,6.37700000000
-10,2028,R2,windturbine,2024,6.37700000000
-10,2030,R2,windturbine,2024,6.37700000000
-10,2035,R2,windturbine,2024,6.37700000000
-10,2040,R2,windturbine,2024,6.37700000000
-10,2045,R2,windturbine,2024,6.37700000000
-10,2046,R2,windturbine,2024,6.37700000000
-10,2047,R2,windturbine,2024,6.37700000000
-10,2048,R2,windturbine,2024,6.37700000000
-10,2049,R2,windturbine,2024,6.37700000000
-10,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2022,R1,windturbine,2020,8.77320000000
+2,2024,R1,windturbine,2020,8.77320000000
+2,2025,R1,windturbine,2020,8.77320000000
+2,2026,R1,windturbine,2020,8.77320000000
+2,2028,R1,windturbine,2020,8.77320000000
+2,2030,R1,windturbine,2020,8.77320000000
+2,2035,R1,windturbine,2020,8.77320000000
+2,2040,R1,windturbine,2020,8.77320000000
+2,2045,R1,windturbine,2020,8.77320000000
+2,2046,R1,windturbine,2020,8.77320000000
+3,2024,R1,windturbine,2022,4.17680000000
+3,2025,R1,windturbine,2022,4.17680000000
+3,2026,R1,windturbine,2022,4.17680000000
+3,2028,R1,windturbine,2022,4.17680000000
+3,2030,R1,windturbine,2022,4.17680000000
+3,2035,R1,windturbine,2022,4.17680000000
+3,2040,R1,windturbine,2022,4.17680000000
+3,2045,R1,windturbine,2022,4.17680000000
+3,2046,R1,windturbine,2022,4.17680000000
+3,2047,R1,windturbine,2022,4.17680000000
+3,2048,R1,windturbine,2022,4.17680000000
+4,2026,R1,windturbine,2024,4.67960000000
+4,2028,R1,windturbine,2024,4.67960000000
+4,2030,R1,windturbine,2024,4.67960000000
+4,2035,R1,windturbine,2024,4.67960000000
+4,2040,R1,windturbine,2024,4.67960000000
+4,2045,R1,windturbine,2024,4.67960000000
+4,2046,R1,windturbine,2024,4.67960000000
+4,2047,R1,windturbine,2024,4.67960000000
+4,2048,R1,windturbine,2024,4.67960000000
+4,2049,R1,windturbine,2024,4.67960000000
+4,2050,R1,windturbine,2024,4.67960000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2022,R2,gasCCGT,2020,1.00000000000
+5,2024,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+5,2026,R2,gasCCGT,2020,0.80000000000
+5,2028,R2,gasCCGT,2020,0.40000000000
+6,2028,R2,solarPV,2026,5.16960000000
+6,2030,R2,solarPV,2026,5.16960000000
+6,2035,R2,solarPV,2026,5.16960000000
+6,2040,R2,solarPV,2026,5.16960000000
+6,2045,R2,solarPV,2026,5.16960000000
+6,2046,R2,solarPV,2026,5.16960000000
+6,2047,R2,solarPV,2026,5.16960000000
+6,2048,R2,solarPV,2026,5.16960000000
+6,2049,R2,solarPV,2026,5.16960000000
+6,2050,R2,solarPV,2026,5.16960000000
+6,2051,R2,solarPV,2026,5.16960000000
+6,2052,R2,solarPV,2026,5.16960000000
+7,2022,R2,windturbine,2020,8.77320000000
+7,2024,R2,windturbine,2020,8.77320000000
+7,2025,R2,windturbine,2020,8.77320000000
+7,2026,R2,windturbine,2020,8.77320000000
+7,2028,R2,windturbine,2020,8.77320000000
+7,2030,R2,windturbine,2020,8.77320000000
+7,2035,R2,windturbine,2020,8.77320000000
+7,2040,R2,windturbine,2020,8.77320000000
+7,2045,R2,windturbine,2020,8.77320000000
+7,2046,R2,windturbine,2020,8.77320000000
+8,2024,R2,windturbine,2022,4.17680000000
+8,2025,R2,windturbine,2022,4.17680000000
+8,2026,R2,windturbine,2022,4.17680000000
+8,2028,R2,windturbine,2022,4.17680000000
+8,2030,R2,windturbine,2022,4.17680000000
+8,2035,R2,windturbine,2022,4.17680000000
+8,2040,R2,windturbine,2022,4.17680000000
+8,2045,R2,windturbine,2022,4.17680000000
+8,2046,R2,windturbine,2022,4.17680000000
+8,2047,R2,windturbine,2022,4.17680000000
+8,2048,R2,windturbine,2022,4.17680000000
+9,2026,R2,windturbine,2024,4.67960000000
+9,2028,R2,windturbine,2024,4.67960000000
+9,2030,R2,windturbine,2024,4.67960000000
+9,2035,R2,windturbine,2024,4.67960000000
+9,2040,R2,windturbine,2024,4.67960000000
+9,2045,R2,windturbine,2024,4.67960000000
+9,2046,R2,windturbine,2024,4.67960000000
+9,2047,R2,windturbine,2024,4.67960000000
+9,2048,R2,windturbine,2024,4.67960000000
+9,2049,R2,windturbine,2024,4.67960000000
+9,2050,R2,windturbine,2024,4.67960000000
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 9bf0ba7e..136a7e23 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,105 +1,127 @@
 asset,year,region,technology,installed,capacity
-1,2028,R1,solarPV,2020,3.79000000000
-1,2030,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2028,R1,solarPV,2026,2.24000000000
-2,2030,R1,solarPV,2026,2.24000000000
-2,2035,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2030,R1,solarPV,2028,2.24000000000
-3,2035,R1,solarPV,2028,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2028,R1,windturbine,2020,8.00000000000
-4,2030,R1,windturbine,2020,8.00000000000
-4,2035,R1,windturbine,2020,8.00000000000
-4,2040,R1,windturbine,2020,8.00000000000
-4,2045,R1,windturbine,2020,8.00000000000
-4,2046,R1,windturbine,2020,8.00000000000
-5,2028,R1,windturbine,2022,1.68480000000
-5,2030,R1,windturbine,2022,1.68480000000
-5,2035,R1,windturbine,2022,1.68480000000
-5,2040,R1,windturbine,2022,1.68480000000
-5,2045,R1,windturbine,2022,1.68480000000
-5,2046,R1,windturbine,2022,1.68480000000
-5,2047,R1,windturbine,2022,1.68480000000
-5,2048,R1,windturbine,2022,1.68480000000
-6,2028,R1,windturbine,2024,6.37700000000
-6,2030,R1,windturbine,2024,6.37700000000
-6,2035,R1,windturbine,2024,6.37700000000
-6,2040,R1,windturbine,2024,6.37700000000
-6,2045,R1,windturbine,2024,6.37700000000
-6,2046,R1,windturbine,2024,6.37700000000
-6,2047,R1,windturbine,2024,6.37700000000
-6,2048,R1,windturbine,2024,6.37700000000
-6,2049,R1,windturbine,2024,6.37700000000
-6,2050,R1,windturbine,2024,6.37700000000
-8,2028,R2,solarPV,2026,2.24000000000
-8,2030,R2,solarPV,2026,2.24000000000
-8,2035,R2,solarPV,2026,2.24000000000
-8,2040,R2,solarPV,2026,2.24000000000
-8,2045,R2,solarPV,2026,2.24000000000
-8,2046,R2,solarPV,2026,2.24000000000
-8,2047,R2,solarPV,2026,2.24000000000
-8,2048,R2,solarPV,2026,2.24000000000
-8,2049,R2,solarPV,2026,2.24000000000
-8,2050,R2,solarPV,2026,2.24000000000
-8,2051,R2,solarPV,2026,2.24000000000
-8,2052,R2,solarPV,2026,2.24000000000
-9,2030,R2,solarPV,2028,2.24000000000
-9,2035,R2,solarPV,2028,2.24000000000
-9,2040,R2,solarPV,2028,2.24000000000
-9,2045,R2,solarPV,2028,2.24000000000
-9,2046,R2,solarPV,2028,2.24000000000
-9,2047,R2,solarPV,2028,2.24000000000
-9,2048,R2,solarPV,2028,2.24000000000
-9,2049,R2,solarPV,2028,2.24000000000
-9,2050,R2,solarPV,2028,2.24000000000
-9,2051,R2,solarPV,2028,2.24000000000
-9,2052,R2,solarPV,2028,2.24000000000
-9,2053,R2,solarPV,2028,2.24000000000
-9,2054,R2,solarPV,2028,2.24000000000
-10,2028,R2,windturbine,2020,11.79000000000
-10,2030,R2,windturbine,2020,11.79000000000
-10,2035,R2,windturbine,2020,11.79000000000
-10,2040,R2,windturbine,2020,11.79000000000
-10,2045,R2,windturbine,2020,11.79000000000
-10,2046,R2,windturbine,2020,11.79000000000
-11,2028,R2,windturbine,2022,1.68480000000
-11,2030,R2,windturbine,2022,1.68480000000
-11,2035,R2,windturbine,2022,1.68480000000
-11,2040,R2,windturbine,2022,1.68480000000
-11,2045,R2,windturbine,2022,1.68480000000
-11,2046,R2,windturbine,2022,1.68480000000
-11,2047,R2,windturbine,2022,1.68480000000
-11,2048,R2,windturbine,2022,1.68480000000
-12,2028,R2,windturbine,2024,6.37700000000
-12,2030,R2,windturbine,2024,6.37700000000
-12,2035,R2,windturbine,2024,6.37700000000
-12,2040,R2,windturbine,2024,6.37700000000
-12,2045,R2,windturbine,2024,6.37700000000
-12,2046,R2,windturbine,2024,6.37700000000
-12,2047,R2,windturbine,2024,6.37700000000
-12,2048,R2,windturbine,2024,6.37700000000
-12,2049,R2,windturbine,2024,6.37700000000
-12,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2022,R1,windturbine,2020,8.77320000000
+3,2024,R1,windturbine,2020,8.77320000000
+3,2025,R1,windturbine,2020,8.77320000000
+3,2026,R1,windturbine,2020,8.77320000000
+3,2028,R1,windturbine,2020,8.77320000000
+3,2030,R1,windturbine,2020,8.77320000000
+3,2035,R1,windturbine,2020,8.77320000000
+3,2040,R1,windturbine,2020,8.77320000000
+3,2045,R1,windturbine,2020,8.77320000000
+3,2046,R1,windturbine,2020,8.77320000000
+4,2024,R1,windturbine,2022,4.17680000000
+4,2025,R1,windturbine,2022,4.17680000000
+4,2026,R1,windturbine,2022,4.17680000000
+4,2028,R1,windturbine,2022,4.17680000000
+4,2030,R1,windturbine,2022,4.17680000000
+4,2035,R1,windturbine,2022,4.17680000000
+4,2040,R1,windturbine,2022,4.17680000000
+4,2045,R1,windturbine,2022,4.17680000000
+4,2046,R1,windturbine,2022,4.17680000000
+4,2047,R1,windturbine,2022,4.17680000000
+4,2048,R1,windturbine,2022,4.17680000000
+5,2026,R1,windturbine,2024,4.67960000000
+5,2028,R1,windturbine,2024,4.67960000000
+5,2030,R1,windturbine,2024,4.67960000000
+5,2035,R1,windturbine,2024,4.67960000000
+5,2040,R1,windturbine,2024,4.67960000000
+5,2045,R1,windturbine,2024,4.67960000000
+5,2046,R1,windturbine,2024,4.67960000000
+5,2047,R1,windturbine,2024,4.67960000000
+5,2048,R1,windturbine,2024,4.67960000000
+5,2049,R1,windturbine,2024,4.67960000000
+5,2050,R1,windturbine,2024,4.67960000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2022,R2,gasCCGT,2020,1.00000000000
+6,2024,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+6,2026,R2,gasCCGT,2020,0.80000000000
+6,2028,R2,gasCCGT,2020,0.40000000000
+7,2028,R2,solarPV,2026,5.16960000000
+7,2030,R2,solarPV,2026,5.16960000000
+7,2035,R2,solarPV,2026,5.16960000000
+7,2040,R2,solarPV,2026,5.16960000000
+7,2045,R2,solarPV,2026,5.16960000000
+7,2046,R2,solarPV,2026,5.16960000000
+7,2047,R2,solarPV,2026,5.16960000000
+7,2048,R2,solarPV,2026,5.16960000000
+7,2049,R2,solarPV,2026,5.16960000000
+7,2050,R2,solarPV,2026,5.16960000000
+7,2051,R2,solarPV,2026,5.16960000000
+7,2052,R2,solarPV,2026,5.16960000000
+8,2030,R2,solarPV,2028,5.20080000000
+8,2035,R2,solarPV,2028,5.20080000000
+8,2040,R2,solarPV,2028,5.20080000000
+8,2045,R2,solarPV,2028,5.20080000000
+8,2046,R2,solarPV,2028,5.20080000000
+8,2047,R2,solarPV,2028,5.20080000000
+8,2048,R2,solarPV,2028,5.20080000000
+8,2049,R2,solarPV,2028,5.20080000000
+8,2050,R2,solarPV,2028,5.20080000000
+8,2051,R2,solarPV,2028,5.20080000000
+8,2052,R2,solarPV,2028,5.20080000000
+8,2053,R2,solarPV,2028,5.20080000000
+8,2054,R2,solarPV,2028,5.20080000000
+9,2022,R2,windturbine,2020,8.77320000000
+9,2024,R2,windturbine,2020,8.77320000000
+9,2025,R2,windturbine,2020,8.77320000000
+9,2026,R2,windturbine,2020,8.77320000000
+9,2028,R2,windturbine,2020,8.77320000000
+9,2030,R2,windturbine,2020,8.77320000000
+9,2035,R2,windturbine,2020,8.77320000000
+9,2040,R2,windturbine,2020,8.77320000000
+9,2045,R2,windturbine,2020,8.77320000000
+9,2046,R2,windturbine,2020,8.77320000000
+10,2024,R2,windturbine,2022,4.17680000000
+10,2025,R2,windturbine,2022,4.17680000000
+10,2026,R2,windturbine,2022,4.17680000000
+10,2028,R2,windturbine,2022,4.17680000000
+10,2030,R2,windturbine,2022,4.17680000000
+10,2035,R2,windturbine,2022,4.17680000000
+10,2040,R2,windturbine,2022,4.17680000000
+10,2045,R2,windturbine,2022,4.17680000000
+10,2046,R2,windturbine,2022,4.17680000000
+10,2047,R2,windturbine,2022,4.17680000000
+10,2048,R2,windturbine,2022,4.17680000000
+11,2026,R2,windturbine,2024,4.67960000000
+11,2028,R2,windturbine,2024,4.67960000000
+11,2030,R2,windturbine,2024,4.67960000000
+11,2035,R2,windturbine,2024,4.67960000000
+11,2040,R2,windturbine,2024,4.67960000000
+11,2045,R2,windturbine,2024,4.67960000000
+11,2046,R2,windturbine,2024,4.67960000000
+11,2047,R2,windturbine,2024,4.67960000000
+11,2048,R2,windturbine,2024,4.67960000000
+11,2049,R2,windturbine,2024,4.67960000000
+11,2050,R2,windturbine,2024,4.67960000000
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 9bb3e7b7..50b2b0c1 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,137 +1,167 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2020,3.79000000000
-1,2032,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2030,R1,solarPV,2026,2.24000000000
-2,2032,R1,solarPV,2026,2.24000000000
-2,2035,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2030,R1,solarPV,2028,2.24000000000
-3,2032,R1,solarPV,2028,2.24000000000
-3,2035,R1,solarPV,2028,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2032,R1,solarPV,2030,2.24000000000
-4,2035,R1,solarPV,2030,2.24000000000
-4,2040,R1,solarPV,2030,2.24000000000
-4,2045,R1,solarPV,2030,2.24000000000
-4,2046,R1,solarPV,2030,2.24000000000
-4,2047,R1,solarPV,2030,2.24000000000
-4,2048,R1,solarPV,2030,2.24000000000
-4,2049,R1,solarPV,2030,2.24000000000
-4,2050,R1,solarPV,2030,2.24000000000
-4,2051,R1,solarPV,2030,2.24000000000
-4,2052,R1,solarPV,2030,2.24000000000
-4,2053,R1,solarPV,2030,2.24000000000
-4,2054,R1,solarPV,2030,2.24000000000
-4,2055,R1,solarPV,2030,2.24000000000
-4,2056,R1,solarPV,2030,2.24000000000
-5,2030,R1,windturbine,2020,8.00000000000
-5,2032,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,2030,R1,windturbine,2022,1.68480000000
-6,2032,R1,windturbine,2022,1.68480000000
-6,2035,R1,windturbine,2022,1.68480000000
-6,2040,R1,windturbine,2022,1.68480000000
-6,2045,R1,windturbine,2022,1.68480000000
-6,2046,R1,windturbine,2022,1.68480000000
-6,2047,R1,windturbine,2022,1.68480000000
-6,2048,R1,windturbine,2022,1.68480000000
-7,2030,R1,windturbine,2024,6.37700000000
-7,2032,R1,windturbine,2024,6.37700000000
-7,2035,R1,windturbine,2024,6.37700000000
-7,2040,R1,windturbine,2024,6.37700000000
-7,2045,R1,windturbine,2024,6.37700000000
-7,2046,R1,windturbine,2024,6.37700000000
-7,2047,R1,windturbine,2024,6.37700000000
-7,2048,R1,windturbine,2024,6.37700000000
-7,2049,R1,windturbine,2024,6.37700000000
-7,2050,R1,windturbine,2024,6.37700000000
-9,2030,R2,solarPV,2026,2.24000000000
-9,2032,R2,solarPV,2026,2.24000000000
-9,2035,R2,solarPV,2026,2.24000000000
-9,2040,R2,solarPV,2026,2.24000000000
-9,2045,R2,solarPV,2026,2.24000000000
-9,2046,R2,solarPV,2026,2.24000000000
-9,2047,R2,solarPV,2026,2.24000000000
-9,2048,R2,solarPV,2026,2.24000000000
-9,2049,R2,solarPV,2026,2.24000000000
-9,2050,R2,solarPV,2026,2.24000000000
-9,2051,R2,solarPV,2026,2.24000000000
-9,2052,R2,solarPV,2026,2.24000000000
-10,2030,R2,solarPV,2028,2.24000000000
-10,2032,R2,solarPV,2028,2.24000000000
-10,2035,R2,solarPV,2028,2.24000000000
-10,2040,R2,solarPV,2028,2.24000000000
-10,2045,R2,solarPV,2028,2.24000000000
-10,2046,R2,solarPV,2028,2.24000000000
-10,2047,R2,solarPV,2028,2.24000000000
-10,2048,R2,solarPV,2028,2.24000000000
-10,2049,R2,solarPV,2028,2.24000000000
-10,2050,R2,solarPV,2028,2.24000000000
-10,2051,R2,solarPV,2028,2.24000000000
-10,2052,R2,solarPV,2028,2.24000000000
-10,2053,R2,solarPV,2028,2.24000000000
-10,2054,R2,solarPV,2028,2.24000000000
-11,2032,R2,solarPV,2030,2.24000000000
-11,2035,R2,solarPV,2030,2.24000000000
-11,2040,R2,solarPV,2030,2.24000000000
-11,2045,R2,solarPV,2030,2.24000000000
-11,2046,R2,solarPV,2030,2.24000000000
-11,2047,R2,solarPV,2030,2.24000000000
-11,2048,R2,solarPV,2030,2.24000000000
-11,2049,R2,solarPV,2030,2.24000000000
-11,2050,R2,solarPV,2030,2.24000000000
-11,2051,R2,solarPV,2030,2.24000000000
-11,2052,R2,solarPV,2030,2.24000000000
-11,2053,R2,solarPV,2030,2.24000000000
-11,2054,R2,solarPV,2030,2.24000000000
-11,2055,R2,solarPV,2030,2.24000000000
-11,2056,R2,solarPV,2030,2.24000000000
-12,2030,R2,windturbine,2020,11.79000000000
-12,2032,R2,windturbine,2020,11.79000000000
-12,2035,R2,windturbine,2020,11.79000000000
-12,2040,R2,windturbine,2020,11.79000000000
-12,2045,R2,windturbine,2020,11.79000000000
-12,2046,R2,windturbine,2020,11.79000000000
-13,2030,R2,windturbine,2022,1.68480000000
-13,2032,R2,windturbine,2022,1.68480000000
-13,2035,R2,windturbine,2022,1.68480000000
-13,2040,R2,windturbine,2022,1.68480000000
-13,2045,R2,windturbine,2022,1.68480000000
-13,2046,R2,windturbine,2022,1.68480000000
-13,2047,R2,windturbine,2022,1.68480000000
-13,2048,R2,windturbine,2022,1.68480000000
-14,2030,R2,windturbine,2024,6.37700000000
-14,2032,R2,windturbine,2024,6.37700000000
-14,2035,R2,windturbine,2024,6.37700000000
-14,2040,R2,windturbine,2024,6.37700000000
-14,2045,R2,windturbine,2024,6.37700000000
-14,2046,R2,windturbine,2024,6.37700000000
-14,2047,R2,windturbine,2024,6.37700000000
-14,2048,R2,windturbine,2024,6.37700000000
-14,2049,R2,windturbine,2024,6.37700000000
-14,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2032,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2032,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2032,R1,solarPV,2030,2.24000000000
+3,2035,R1,solarPV,2030,2.24000000000
+3,2040,R1,solarPV,2030,2.24000000000
+3,2045,R1,solarPV,2030,2.24000000000
+3,2046,R1,solarPV,2030,2.24000000000
+3,2047,R1,solarPV,2030,2.24000000000
+3,2048,R1,solarPV,2030,2.24000000000
+3,2049,R1,solarPV,2030,2.24000000000
+3,2050,R1,solarPV,2030,2.24000000000
+3,2051,R1,solarPV,2030,2.24000000000
+3,2052,R1,solarPV,2030,2.24000000000
+3,2053,R1,solarPV,2030,2.24000000000
+3,2054,R1,solarPV,2030,2.24000000000
+3,2055,R1,solarPV,2030,2.24000000000
+3,2056,R1,solarPV,2030,2.24000000000
+4,2022,R1,windturbine,2020,8.77320000000
+4,2024,R1,windturbine,2020,8.77320000000
+4,2025,R1,windturbine,2020,8.77320000000
+4,2026,R1,windturbine,2020,8.77320000000
+4,2028,R1,windturbine,2020,8.77320000000
+4,2030,R1,windturbine,2020,8.77320000000
+4,2032,R1,windturbine,2020,8.77320000000
+4,2035,R1,windturbine,2020,8.77320000000
+4,2040,R1,windturbine,2020,8.77320000000
+4,2045,R1,windturbine,2020,8.77320000000
+4,2046,R1,windturbine,2020,8.77320000000
+5,2024,R1,windturbine,2022,4.17680000000
+5,2025,R1,windturbine,2022,4.17680000000
+5,2026,R1,windturbine,2022,4.17680000000
+5,2028,R1,windturbine,2022,4.17680000000
+5,2030,R1,windturbine,2022,4.17680000000
+5,2032,R1,windturbine,2022,4.17680000000
+5,2035,R1,windturbine,2022,4.17680000000
+5,2040,R1,windturbine,2022,4.17680000000
+5,2045,R1,windturbine,2022,4.17680000000
+5,2046,R1,windturbine,2022,4.17680000000
+5,2047,R1,windturbine,2022,4.17680000000
+5,2048,R1,windturbine,2022,4.17680000000
+6,2026,R1,windturbine,2024,4.67960000000
+6,2028,R1,windturbine,2024,4.67960000000
+6,2030,R1,windturbine,2024,4.67960000000
+6,2032,R1,windturbine,2024,4.67960000000
+6,2035,R1,windturbine,2024,4.67960000000
+6,2040,R1,windturbine,2024,4.67960000000
+6,2045,R1,windturbine,2024,4.67960000000
+6,2046,R1,windturbine,2024,4.67960000000
+6,2047,R1,windturbine,2024,4.67960000000
+6,2048,R1,windturbine,2024,4.67960000000
+6,2049,R1,windturbine,2024,4.67960000000
+6,2050,R1,windturbine,2024,4.67960000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2022,R2,gasCCGT,2020,1.00000000000
+7,2024,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+7,2026,R2,gasCCGT,2020,0.80000000000
+7,2028,R2,gasCCGT,2020,0.40000000000
+8,2028,R2,solarPV,2026,5.16960000000
+8,2030,R2,solarPV,2026,5.16960000000
+8,2032,R2,solarPV,2026,5.16960000000
+8,2035,R2,solarPV,2026,5.16960000000
+8,2040,R2,solarPV,2026,5.16960000000
+8,2045,R2,solarPV,2026,5.16960000000
+8,2046,R2,solarPV,2026,5.16960000000
+8,2047,R2,solarPV,2026,5.16960000000
+8,2048,R2,solarPV,2026,5.16960000000
+8,2049,R2,solarPV,2026,5.16960000000
+8,2050,R2,solarPV,2026,5.16960000000
+8,2051,R2,solarPV,2026,5.16960000000
+8,2052,R2,solarPV,2026,5.16960000000
+9,2030,R2,solarPV,2028,5.20080000000
+9,2032,R2,solarPV,2028,5.20080000000
+9,2035,R2,solarPV,2028,5.20080000000
+9,2040,R2,solarPV,2028,5.20080000000
+9,2045,R2,solarPV,2028,5.20080000000
+9,2046,R2,solarPV,2028,5.20080000000
+9,2047,R2,solarPV,2028,5.20080000000
+9,2048,R2,solarPV,2028,5.20080000000
+9,2049,R2,solarPV,2028,5.20080000000
+9,2050,R2,solarPV,2028,5.20080000000
+9,2051,R2,solarPV,2028,5.20080000000
+9,2052,R2,solarPV,2028,5.20080000000
+9,2053,R2,solarPV,2028,5.20080000000
+9,2054,R2,solarPV,2028,5.20080000000
+10,2032,R2,solarPV,2030,2.24000000000
+10,2035,R2,solarPV,2030,2.24000000000
+10,2040,R2,solarPV,2030,2.24000000000
+10,2045,R2,solarPV,2030,2.24000000000
+10,2046,R2,solarPV,2030,2.24000000000
+10,2047,R2,solarPV,2030,2.24000000000
+10,2048,R2,solarPV,2030,2.24000000000
+10,2049,R2,solarPV,2030,2.24000000000
+10,2050,R2,solarPV,2030,2.24000000000
+10,2051,R2,solarPV,2030,2.24000000000
+10,2052,R2,solarPV,2030,2.24000000000
+10,2053,R2,solarPV,2030,2.24000000000
+10,2054,R2,solarPV,2030,2.24000000000
+10,2055,R2,solarPV,2030,2.24000000000
+10,2056,R2,solarPV,2030,2.24000000000
+11,2022,R2,windturbine,2020,8.77320000000
+11,2024,R2,windturbine,2020,8.77320000000
+11,2025,R2,windturbine,2020,8.77320000000
+11,2026,R2,windturbine,2020,8.77320000000
+11,2028,R2,windturbine,2020,8.77320000000
+11,2030,R2,windturbine,2020,8.77320000000
+11,2032,R2,windturbine,2020,8.77320000000
+11,2035,R2,windturbine,2020,8.77320000000
+11,2040,R2,windturbine,2020,8.77320000000
+11,2045,R2,windturbine,2020,8.77320000000
+11,2046,R2,windturbine,2020,8.77320000000
+12,2024,R2,windturbine,2022,4.17680000000
+12,2025,R2,windturbine,2022,4.17680000000
+12,2026,R2,windturbine,2022,4.17680000000
+12,2028,R2,windturbine,2022,4.17680000000
+12,2030,R2,windturbine,2022,4.17680000000
+12,2032,R2,windturbine,2022,4.17680000000
+12,2035,R2,windturbine,2022,4.17680000000
+12,2040,R2,windturbine,2022,4.17680000000
+12,2045,R2,windturbine,2022,4.17680000000
+12,2046,R2,windturbine,2022,4.17680000000
+12,2047,R2,windturbine,2022,4.17680000000
+12,2048,R2,windturbine,2022,4.17680000000
+13,2026,R2,windturbine,2024,4.67960000000
+13,2028,R2,windturbine,2024,4.67960000000
+13,2030,R2,windturbine,2024,4.67960000000
+13,2032,R2,windturbine,2024,4.67960000000
+13,2035,R2,windturbine,2024,4.67960000000
+13,2040,R2,windturbine,2024,4.67960000000
+13,2045,R2,windturbine,2024,4.67960000000
+13,2046,R2,windturbine,2024,4.67960000000
+13,2047,R2,windturbine,2024,4.67960000000
+13,2048,R2,windturbine,2024,4.67960000000
+13,2049,R2,windturbine,2024,4.67960000000
+13,2050,R2,windturbine,2024,4.67960000000
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 a0b82be0..6c00c460 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,173 +1,213 @@
 asset,year,region,technology,installed,capacity
-1,2032,R1,solarPV,2020,3.79000000000
-1,2034,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2032,R1,solarPV,2026,2.24000000000
-2,2034,R1,solarPV,2026,2.24000000000
-2,2035,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2032,R1,solarPV,2028,2.24000000000
-3,2034,R1,solarPV,2028,2.24000000000
-3,2035,R1,solarPV,2028,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2032,R1,solarPV,2030,2.24000000000
-4,2034,R1,solarPV,2030,2.24000000000
-4,2035,R1,solarPV,2030,2.24000000000
-4,2040,R1,solarPV,2030,2.24000000000
-4,2045,R1,solarPV,2030,2.24000000000
-4,2046,R1,solarPV,2030,2.24000000000
-4,2047,R1,solarPV,2030,2.24000000000
-4,2048,R1,solarPV,2030,2.24000000000
-4,2049,R1,solarPV,2030,2.24000000000
-4,2050,R1,solarPV,2030,2.24000000000
-4,2051,R1,solarPV,2030,2.24000000000
-4,2052,R1,solarPV,2030,2.24000000000
-4,2053,R1,solarPV,2030,2.24000000000
-4,2054,R1,solarPV,2030,2.24000000000
-4,2055,R1,solarPV,2030,2.24000000000
-4,2056,R1,solarPV,2030,2.24000000000
-5,2034,R1,solarPV,2032,2.79520000000
-5,2035,R1,solarPV,2032,2.79520000000
-5,2040,R1,solarPV,2032,2.79520000000
-5,2045,R1,solarPV,2032,2.79520000000
-5,2046,R1,solarPV,2032,2.79520000000
-5,2047,R1,solarPV,2032,2.79520000000
-5,2048,R1,solarPV,2032,2.79520000000
-5,2049,R1,solarPV,2032,2.79520000000
-5,2050,R1,solarPV,2032,2.79520000000
-5,2051,R1,solarPV,2032,2.79520000000
-5,2052,R1,solarPV,2032,2.79520000000
-5,2053,R1,solarPV,2032,2.79520000000
-5,2054,R1,solarPV,2032,2.79520000000
-5,2055,R1,solarPV,2032,2.79520000000
-5,2056,R1,solarPV,2032,2.79520000000
-5,2057,R1,solarPV,2032,2.79520000000
-5,2058,R1,solarPV,2032,2.79520000000
-6,2032,R1,windturbine,2020,8.00000000000
-6,2034,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,2032,R1,windturbine,2022,1.68480000000
-7,2034,R1,windturbine,2022,1.68480000000
-7,2035,R1,windturbine,2022,1.68480000000
-7,2040,R1,windturbine,2022,1.68480000000
-7,2045,R1,windturbine,2022,1.68480000000
-7,2046,R1,windturbine,2022,1.68480000000
-7,2047,R1,windturbine,2022,1.68480000000
-7,2048,R1,windturbine,2022,1.68480000000
-8,2032,R1,windturbine,2024,6.37700000000
-8,2034,R1,windturbine,2024,6.37700000000
-8,2035,R1,windturbine,2024,6.37700000000
-8,2040,R1,windturbine,2024,6.37700000000
-8,2045,R1,windturbine,2024,6.37700000000
-8,2046,R1,windturbine,2024,6.37700000000
-8,2047,R1,windturbine,2024,6.37700000000
-8,2048,R1,windturbine,2024,6.37700000000
-8,2049,R1,windturbine,2024,6.37700000000
-8,2050,R1,windturbine,2024,6.37700000000
-10,2032,R2,solarPV,2026,2.24000000000
-10,2034,R2,solarPV,2026,2.24000000000
-10,2035,R2,solarPV,2026,2.24000000000
-10,2040,R2,solarPV,2026,2.24000000000
-10,2045,R2,solarPV,2026,2.24000000000
-10,2046,R2,solarPV,2026,2.24000000000
-10,2047,R2,solarPV,2026,2.24000000000
-10,2048,R2,solarPV,2026,2.24000000000
-10,2049,R2,solarPV,2026,2.24000000000
-10,2050,R2,solarPV,2026,2.24000000000
-10,2051,R2,solarPV,2026,2.24000000000
-10,2052,R2,solarPV,2026,2.24000000000
-11,2032,R2,solarPV,2028,2.24000000000
-11,2034,R2,solarPV,2028,2.24000000000
-11,2035,R2,solarPV,2028,2.24000000000
-11,2040,R2,solarPV,2028,2.24000000000
-11,2045,R2,solarPV,2028,2.24000000000
-11,2046,R2,solarPV,2028,2.24000000000
-11,2047,R2,solarPV,2028,2.24000000000
-11,2048,R2,solarPV,2028,2.24000000000
-11,2049,R2,solarPV,2028,2.24000000000
-11,2050,R2,solarPV,2028,2.24000000000
-11,2051,R2,solarPV,2028,2.24000000000
-11,2052,R2,solarPV,2028,2.24000000000
-11,2053,R2,solarPV,2028,2.24000000000
-11,2054,R2,solarPV,2028,2.24000000000
-12,2032,R2,solarPV,2030,2.24000000000
-12,2034,R2,solarPV,2030,2.24000000000
-12,2035,R2,solarPV,2030,2.24000000000
-12,2040,R2,solarPV,2030,2.24000000000
-12,2045,R2,solarPV,2030,2.24000000000
-12,2046,R2,solarPV,2030,2.24000000000
-12,2047,R2,solarPV,2030,2.24000000000
-12,2048,R2,solarPV,2030,2.24000000000
-12,2049,R2,solarPV,2030,2.24000000000
-12,2050,R2,solarPV,2030,2.24000000000
-12,2051,R2,solarPV,2030,2.24000000000
-12,2052,R2,solarPV,2030,2.24000000000
-12,2053,R2,solarPV,2030,2.24000000000
-12,2054,R2,solarPV,2030,2.24000000000
-12,2055,R2,solarPV,2030,2.24000000000
-12,2056,R2,solarPV,2030,2.24000000000
-13,2034,R2,solarPV,2032,2.79520000000
-13,2035,R2,solarPV,2032,2.79520000000
-13,2040,R2,solarPV,2032,2.79520000000
-13,2045,R2,solarPV,2032,2.79520000000
-13,2046,R2,solarPV,2032,2.79520000000
-13,2047,R2,solarPV,2032,2.79520000000
-13,2048,R2,solarPV,2032,2.79520000000
-13,2049,R2,solarPV,2032,2.79520000000
-13,2050,R2,solarPV,2032,2.79520000000
-13,2051,R2,solarPV,2032,2.79520000000
-13,2052,R2,solarPV,2032,2.79520000000
-13,2053,R2,solarPV,2032,2.79520000000
-13,2054,R2,solarPV,2032,2.79520000000
-13,2055,R2,solarPV,2032,2.79520000000
-13,2056,R2,solarPV,2032,2.79520000000
-13,2057,R2,solarPV,2032,2.79520000000
-13,2058,R2,solarPV,2032,2.79520000000
-14,2032,R2,windturbine,2020,11.79000000000
-14,2034,R2,windturbine,2020,11.79000000000
-14,2035,R2,windturbine,2020,11.79000000000
-14,2040,R2,windturbine,2020,11.79000000000
-14,2045,R2,windturbine,2020,11.79000000000
-14,2046,R2,windturbine,2020,11.79000000000
-15,2032,R2,windturbine,2022,1.68480000000
-15,2034,R2,windturbine,2022,1.68480000000
-15,2035,R2,windturbine,2022,1.68480000000
-15,2040,R2,windturbine,2022,1.68480000000
-15,2045,R2,windturbine,2022,1.68480000000
-15,2046,R2,windturbine,2022,1.68480000000
-15,2047,R2,windturbine,2022,1.68480000000
-15,2048,R2,windturbine,2022,1.68480000000
-16,2032,R2,windturbine,2024,6.37700000000
-16,2034,R2,windturbine,2024,6.37700000000
-16,2035,R2,windturbine,2024,6.37700000000
-16,2040,R2,windturbine,2024,6.37700000000
-16,2045,R2,windturbine,2024,6.37700000000
-16,2046,R2,windturbine,2024,6.37700000000
-16,2047,R2,windturbine,2024,6.37700000000
-16,2048,R2,windturbine,2024,6.37700000000
-16,2049,R2,windturbine,2024,6.37700000000
-16,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2032,R1,solarPV,2026,5.16960000000
+1,2034,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2032,R1,solarPV,2028,5.20080000000
+2,2034,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2032,R1,solarPV,2030,2.24000000000
+3,2034,R1,solarPV,2030,2.24000000000
+3,2035,R1,solarPV,2030,2.24000000000
+3,2040,R1,solarPV,2030,2.24000000000
+3,2045,R1,solarPV,2030,2.24000000000
+3,2046,R1,solarPV,2030,2.24000000000
+3,2047,R1,solarPV,2030,2.24000000000
+3,2048,R1,solarPV,2030,2.24000000000
+3,2049,R1,solarPV,2030,2.24000000000
+3,2050,R1,solarPV,2030,2.24000000000
+3,2051,R1,solarPV,2030,2.24000000000
+3,2052,R1,solarPV,2030,2.24000000000
+3,2053,R1,solarPV,2030,2.24000000000
+3,2054,R1,solarPV,2030,2.24000000000
+3,2055,R1,solarPV,2030,2.24000000000
+3,2056,R1,solarPV,2030,2.24000000000
+4,2034,R1,solarPV,2032,2.24000000000
+4,2035,R1,solarPV,2032,2.24000000000
+4,2040,R1,solarPV,2032,2.24000000000
+4,2045,R1,solarPV,2032,2.24000000000
+4,2046,R1,solarPV,2032,2.24000000000
+4,2047,R1,solarPV,2032,2.24000000000
+4,2048,R1,solarPV,2032,2.24000000000
+4,2049,R1,solarPV,2032,2.24000000000
+4,2050,R1,solarPV,2032,2.24000000000
+4,2051,R1,solarPV,2032,2.24000000000
+4,2052,R1,solarPV,2032,2.24000000000
+4,2053,R1,solarPV,2032,2.24000000000
+4,2054,R1,solarPV,2032,2.24000000000
+4,2055,R1,solarPV,2032,2.24000000000
+4,2056,R1,solarPV,2032,2.24000000000
+4,2057,R1,solarPV,2032,2.24000000000
+4,2058,R1,solarPV,2032,2.24000000000
+5,2022,R1,windturbine,2020,8.77320000000
+5,2024,R1,windturbine,2020,8.77320000000
+5,2025,R1,windturbine,2020,8.77320000000
+5,2026,R1,windturbine,2020,8.77320000000
+5,2028,R1,windturbine,2020,8.77320000000
+5,2030,R1,windturbine,2020,8.77320000000
+5,2032,R1,windturbine,2020,8.77320000000
+5,2034,R1,windturbine,2020,8.77320000000
+5,2035,R1,windturbine,2020,8.77320000000
+5,2040,R1,windturbine,2020,8.77320000000
+5,2045,R1,windturbine,2020,8.77320000000
+5,2046,R1,windturbine,2020,8.77320000000
+6,2024,R1,windturbine,2022,4.17680000000
+6,2025,R1,windturbine,2022,4.17680000000
+6,2026,R1,windturbine,2022,4.17680000000
+6,2028,R1,windturbine,2022,4.17680000000
+6,2030,R1,windturbine,2022,4.17680000000
+6,2032,R1,windturbine,2022,4.17680000000
+6,2034,R1,windturbine,2022,4.17680000000
+6,2035,R1,windturbine,2022,4.17680000000
+6,2040,R1,windturbine,2022,4.17680000000
+6,2045,R1,windturbine,2022,4.17680000000
+6,2046,R1,windturbine,2022,4.17680000000
+6,2047,R1,windturbine,2022,4.17680000000
+6,2048,R1,windturbine,2022,4.17680000000
+7,2026,R1,windturbine,2024,4.67960000000
+7,2028,R1,windturbine,2024,4.67960000000
+7,2030,R1,windturbine,2024,4.67960000000
+7,2032,R1,windturbine,2024,4.67960000000
+7,2034,R1,windturbine,2024,4.67960000000
+7,2035,R1,windturbine,2024,4.67960000000
+7,2040,R1,windturbine,2024,4.67960000000
+7,2045,R1,windturbine,2024,4.67960000000
+7,2046,R1,windturbine,2024,4.67960000000
+7,2047,R1,windturbine,2024,4.67960000000
+7,2048,R1,windturbine,2024,4.67960000000
+7,2049,R1,windturbine,2024,4.67960000000
+7,2050,R1,windturbine,2024,4.67960000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2022,R2,gasCCGT,2020,1.00000000000
+8,2024,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,1.00000000000
+8,2026,R2,gasCCGT,2020,0.80000000000
+8,2028,R2,gasCCGT,2020,0.40000000000
+9,2028,R2,solarPV,2026,5.16960000000
+9,2030,R2,solarPV,2026,5.16960000000
+9,2032,R2,solarPV,2026,5.16960000000
+9,2034,R2,solarPV,2026,5.16960000000
+9,2035,R2,solarPV,2026,5.16960000000
+9,2040,R2,solarPV,2026,5.16960000000
+9,2045,R2,solarPV,2026,5.16960000000
+9,2046,R2,solarPV,2026,5.16960000000
+9,2047,R2,solarPV,2026,5.16960000000
+9,2048,R2,solarPV,2026,5.16960000000
+9,2049,R2,solarPV,2026,5.16960000000
+9,2050,R2,solarPV,2026,5.16960000000
+9,2051,R2,solarPV,2026,5.16960000000
+9,2052,R2,solarPV,2026,5.16960000000
+10,2030,R2,solarPV,2028,5.20080000000
+10,2032,R2,solarPV,2028,5.20080000000
+10,2034,R2,solarPV,2028,5.20080000000
+10,2035,R2,solarPV,2028,5.20080000000
+10,2040,R2,solarPV,2028,5.20080000000
+10,2045,R2,solarPV,2028,5.20080000000
+10,2046,R2,solarPV,2028,5.20080000000
+10,2047,R2,solarPV,2028,5.20080000000
+10,2048,R2,solarPV,2028,5.20080000000
+10,2049,R2,solarPV,2028,5.20080000000
+10,2050,R2,solarPV,2028,5.20080000000
+10,2051,R2,solarPV,2028,5.20080000000
+10,2052,R2,solarPV,2028,5.20080000000
+10,2053,R2,solarPV,2028,5.20080000000
+10,2054,R2,solarPV,2028,5.20080000000
+11,2032,R2,solarPV,2030,2.24000000000
+11,2034,R2,solarPV,2030,2.24000000000
+11,2035,R2,solarPV,2030,2.24000000000
+11,2040,R2,solarPV,2030,2.24000000000
+11,2045,R2,solarPV,2030,2.24000000000
+11,2046,R2,solarPV,2030,2.24000000000
+11,2047,R2,solarPV,2030,2.24000000000
+11,2048,R2,solarPV,2030,2.24000000000
+11,2049,R2,solarPV,2030,2.24000000000
+11,2050,R2,solarPV,2030,2.24000000000
+11,2051,R2,solarPV,2030,2.24000000000
+11,2052,R2,solarPV,2030,2.24000000000
+11,2053,R2,solarPV,2030,2.24000000000
+11,2054,R2,solarPV,2030,2.24000000000
+11,2055,R2,solarPV,2030,2.24000000000
+11,2056,R2,solarPV,2030,2.24000000000
+12,2034,R2,solarPV,2032,2.24000000000
+12,2035,R2,solarPV,2032,2.24000000000
+12,2040,R2,solarPV,2032,2.24000000000
+12,2045,R2,solarPV,2032,2.24000000000
+12,2046,R2,solarPV,2032,2.24000000000
+12,2047,R2,solarPV,2032,2.24000000000
+12,2048,R2,solarPV,2032,2.24000000000
+12,2049,R2,solarPV,2032,2.24000000000
+12,2050,R2,solarPV,2032,2.24000000000
+12,2051,R2,solarPV,2032,2.24000000000
+12,2052,R2,solarPV,2032,2.24000000000
+12,2053,R2,solarPV,2032,2.24000000000
+12,2054,R2,solarPV,2032,2.24000000000
+12,2055,R2,solarPV,2032,2.24000000000
+12,2056,R2,solarPV,2032,2.24000000000
+12,2057,R2,solarPV,2032,2.24000000000
+12,2058,R2,solarPV,2032,2.24000000000
+13,2022,R2,windturbine,2020,8.77320000000
+13,2024,R2,windturbine,2020,8.77320000000
+13,2025,R2,windturbine,2020,8.77320000000
+13,2026,R2,windturbine,2020,8.77320000000
+13,2028,R2,windturbine,2020,8.77320000000
+13,2030,R2,windturbine,2020,8.77320000000
+13,2032,R2,windturbine,2020,8.77320000000
+13,2034,R2,windturbine,2020,8.77320000000
+13,2035,R2,windturbine,2020,8.77320000000
+13,2040,R2,windturbine,2020,8.77320000000
+13,2045,R2,windturbine,2020,8.77320000000
+13,2046,R2,windturbine,2020,8.77320000000
+14,2024,R2,windturbine,2022,4.17680000000
+14,2025,R2,windturbine,2022,4.17680000000
+14,2026,R2,windturbine,2022,4.17680000000
+14,2028,R2,windturbine,2022,4.17680000000
+14,2030,R2,windturbine,2022,4.17680000000
+14,2032,R2,windturbine,2022,4.17680000000
+14,2034,R2,windturbine,2022,4.17680000000
+14,2035,R2,windturbine,2022,4.17680000000
+14,2040,R2,windturbine,2022,4.17680000000
+14,2045,R2,windturbine,2022,4.17680000000
+14,2046,R2,windturbine,2022,4.17680000000
+14,2047,R2,windturbine,2022,4.17680000000
+14,2048,R2,windturbine,2022,4.17680000000
+15,2026,R2,windturbine,2024,4.67960000000
+15,2028,R2,windturbine,2024,4.67960000000
+15,2030,R2,windturbine,2024,4.67960000000
+15,2032,R2,windturbine,2024,4.67960000000
+15,2034,R2,windturbine,2024,4.67960000000
+15,2035,R2,windturbine,2024,4.67960000000
+15,2040,R2,windturbine,2024,4.67960000000
+15,2045,R2,windturbine,2024,4.67960000000
+15,2046,R2,windturbine,2024,4.67960000000
+15,2047,R2,windturbine,2024,4.67960000000
+15,2048,R2,windturbine,2024,4.67960000000
+15,2049,R2,windturbine,2024,4.67960000000
+15,2050,R2,windturbine,2024,4.67960000000
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 95d93dc5..ee8a6ac5 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,211 +1,263 @@
 asset,year,region,technology,installed,capacity
-1,2034,R1,solarPV,2020,3.79000000000
-1,2035,R1,solarPV,2020,3.79000000000
-1,2036,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2034,R1,solarPV,2026,2.24000000000
-2,2035,R1,solarPV,2026,2.24000000000
-2,2036,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2034,R1,solarPV,2028,2.24000000000
-3,2035,R1,solarPV,2028,2.24000000000
-3,2036,R1,solarPV,2028,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2034,R1,solarPV,2030,2.24000000000
-4,2035,R1,solarPV,2030,2.24000000000
-4,2036,R1,solarPV,2030,2.24000000000
-4,2040,R1,solarPV,2030,2.24000000000
-4,2045,R1,solarPV,2030,2.24000000000
-4,2046,R1,solarPV,2030,2.24000000000
-4,2047,R1,solarPV,2030,2.24000000000
-4,2048,R1,solarPV,2030,2.24000000000
-4,2049,R1,solarPV,2030,2.24000000000
-4,2050,R1,solarPV,2030,2.24000000000
-4,2051,R1,solarPV,2030,2.24000000000
-4,2052,R1,solarPV,2030,2.24000000000
-4,2053,R1,solarPV,2030,2.24000000000
-4,2054,R1,solarPV,2030,2.24000000000
-4,2055,R1,solarPV,2030,2.24000000000
-4,2056,R1,solarPV,2030,2.24000000000
-5,2034,R1,solarPV,2032,2.79520000000
-5,2035,R1,solarPV,2032,2.79520000000
-5,2036,R1,solarPV,2032,2.79520000000
-5,2040,R1,solarPV,2032,2.79520000000
-5,2045,R1,solarPV,2032,2.79520000000
-5,2046,R1,solarPV,2032,2.79520000000
-5,2047,R1,solarPV,2032,2.79520000000
-5,2048,R1,solarPV,2032,2.79520000000
-5,2049,R1,solarPV,2032,2.79520000000
-5,2050,R1,solarPV,2032,2.79520000000
-5,2051,R1,solarPV,2032,2.79520000000
-5,2052,R1,solarPV,2032,2.79520000000
-5,2053,R1,solarPV,2032,2.79520000000
-5,2054,R1,solarPV,2032,2.79520000000
-5,2055,R1,solarPV,2032,2.79520000000
-5,2056,R1,solarPV,2032,2.79520000000
-5,2057,R1,solarPV,2032,2.79520000000
-5,2058,R1,solarPV,2032,2.79520000000
-6,2036,R1,solarPV,2034,5.35300000000
-6,2040,R1,solarPV,2034,5.35300000000
-6,2045,R1,solarPV,2034,5.35300000000
-6,2046,R1,solarPV,2034,5.35300000000
-6,2047,R1,solarPV,2034,5.35300000000
-6,2048,R1,solarPV,2034,5.35300000000
-6,2049,R1,solarPV,2034,5.35300000000
-6,2050,R1,solarPV,2034,5.35300000000
-6,2051,R1,solarPV,2034,5.35300000000
-6,2052,R1,solarPV,2034,5.35300000000
-6,2053,R1,solarPV,2034,5.35300000000
-6,2054,R1,solarPV,2034,5.35300000000
-6,2055,R1,solarPV,2034,5.35300000000
-6,2056,R1,solarPV,2034,5.35300000000
-6,2057,R1,solarPV,2034,5.35300000000
-6,2058,R1,solarPV,2034,5.35300000000
-6,2059,R1,solarPV,2034,5.35300000000
-6,2060,R1,solarPV,2034,5.35300000000
-7,2034,R1,windturbine,2020,8.00000000000
-7,2035,R1,windturbine,2020,8.00000000000
-7,2036,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,2034,R1,windturbine,2022,1.68480000000
-8,2035,R1,windturbine,2022,1.68480000000
-8,2036,R1,windturbine,2022,1.68480000000
-8,2040,R1,windturbine,2022,1.68480000000
-8,2045,R1,windturbine,2022,1.68480000000
-8,2046,R1,windturbine,2022,1.68480000000
-8,2047,R1,windturbine,2022,1.68480000000
-8,2048,R1,windturbine,2022,1.68480000000
-9,2034,R1,windturbine,2024,6.37700000000
-9,2035,R1,windturbine,2024,6.37700000000
-9,2036,R1,windturbine,2024,6.37700000000
-9,2040,R1,windturbine,2024,6.37700000000
-9,2045,R1,windturbine,2024,6.37700000000
-9,2046,R1,windturbine,2024,6.37700000000
-9,2047,R1,windturbine,2024,6.37700000000
-9,2048,R1,windturbine,2024,6.37700000000
-9,2049,R1,windturbine,2024,6.37700000000
-9,2050,R1,windturbine,2024,6.37700000000
-11,2034,R2,solarPV,2026,2.24000000000
-11,2035,R2,solarPV,2026,2.24000000000
-11,2036,R2,solarPV,2026,2.24000000000
-11,2040,R2,solarPV,2026,2.24000000000
-11,2045,R2,solarPV,2026,2.24000000000
-11,2046,R2,solarPV,2026,2.24000000000
-11,2047,R2,solarPV,2026,2.24000000000
-11,2048,R2,solarPV,2026,2.24000000000
-11,2049,R2,solarPV,2026,2.24000000000
-11,2050,R2,solarPV,2026,2.24000000000
-11,2051,R2,solarPV,2026,2.24000000000
-11,2052,R2,solarPV,2026,2.24000000000
-12,2034,R2,solarPV,2028,2.24000000000
-12,2035,R2,solarPV,2028,2.24000000000
-12,2036,R2,solarPV,2028,2.24000000000
-12,2040,R2,solarPV,2028,2.24000000000
-12,2045,R2,solarPV,2028,2.24000000000
-12,2046,R2,solarPV,2028,2.24000000000
-12,2047,R2,solarPV,2028,2.24000000000
-12,2048,R2,solarPV,2028,2.24000000000
-12,2049,R2,solarPV,2028,2.24000000000
-12,2050,R2,solarPV,2028,2.24000000000
-12,2051,R2,solarPV,2028,2.24000000000
-12,2052,R2,solarPV,2028,2.24000000000
-12,2053,R2,solarPV,2028,2.24000000000
-12,2054,R2,solarPV,2028,2.24000000000
-13,2034,R2,solarPV,2030,2.24000000000
-13,2035,R2,solarPV,2030,2.24000000000
-13,2036,R2,solarPV,2030,2.24000000000
-13,2040,R2,solarPV,2030,2.24000000000
-13,2045,R2,solarPV,2030,2.24000000000
-13,2046,R2,solarPV,2030,2.24000000000
-13,2047,R2,solarPV,2030,2.24000000000
-13,2048,R2,solarPV,2030,2.24000000000
-13,2049,R2,solarPV,2030,2.24000000000
-13,2050,R2,solarPV,2030,2.24000000000
-13,2051,R2,solarPV,2030,2.24000000000
-13,2052,R2,solarPV,2030,2.24000000000
-13,2053,R2,solarPV,2030,2.24000000000
-13,2054,R2,solarPV,2030,2.24000000000
-13,2055,R2,solarPV,2030,2.24000000000
-13,2056,R2,solarPV,2030,2.24000000000
-14,2034,R2,solarPV,2032,2.79520000000
-14,2035,R2,solarPV,2032,2.79520000000
-14,2036,R2,solarPV,2032,2.79520000000
-14,2040,R2,solarPV,2032,2.79520000000
-14,2045,R2,solarPV,2032,2.79520000000
-14,2046,R2,solarPV,2032,2.79520000000
-14,2047,R2,solarPV,2032,2.79520000000
-14,2048,R2,solarPV,2032,2.79520000000
-14,2049,R2,solarPV,2032,2.79520000000
-14,2050,R2,solarPV,2032,2.79520000000
-14,2051,R2,solarPV,2032,2.79520000000
-14,2052,R2,solarPV,2032,2.79520000000
-14,2053,R2,solarPV,2032,2.79520000000
-14,2054,R2,solarPV,2032,2.79520000000
-14,2055,R2,solarPV,2032,2.79520000000
-14,2056,R2,solarPV,2032,2.79520000000
-14,2057,R2,solarPV,2032,2.79520000000
-14,2058,R2,solarPV,2032,2.79520000000
-15,2036,R2,solarPV,2034,5.35300000000
-15,2040,R2,solarPV,2034,5.35300000000
-15,2045,R2,solarPV,2034,5.35300000000
-15,2046,R2,solarPV,2034,5.35300000000
-15,2047,R2,solarPV,2034,5.35300000000
-15,2048,R2,solarPV,2034,5.35300000000
-15,2049,R2,solarPV,2034,5.35300000000
-15,2050,R2,solarPV,2034,5.35300000000
-15,2051,R2,solarPV,2034,5.35300000000
-15,2052,R2,solarPV,2034,5.35300000000
-15,2053,R2,solarPV,2034,5.35300000000
-15,2054,R2,solarPV,2034,5.35300000000
-15,2055,R2,solarPV,2034,5.35300000000
-15,2056,R2,solarPV,2034,5.35300000000
-15,2057,R2,solarPV,2034,5.35300000000
-15,2058,R2,solarPV,2034,5.35300000000
-15,2059,R2,solarPV,2034,5.35300000000
-15,2060,R2,solarPV,2034,5.35300000000
-16,2034,R2,windturbine,2020,11.79000000000
-16,2035,R2,windturbine,2020,11.79000000000
-16,2036,R2,windturbine,2020,11.79000000000
-16,2040,R2,windturbine,2020,11.79000000000
-16,2045,R2,windturbine,2020,11.79000000000
-16,2046,R2,windturbine,2020,11.79000000000
-17,2034,R2,windturbine,2022,1.68480000000
-17,2035,R2,windturbine,2022,1.68480000000
-17,2036,R2,windturbine,2022,1.68480000000
-17,2040,R2,windturbine,2022,1.68480000000
-17,2045,R2,windturbine,2022,1.68480000000
-17,2046,R2,windturbine,2022,1.68480000000
-17,2047,R2,windturbine,2022,1.68480000000
-17,2048,R2,windturbine,2022,1.68480000000
-18,2034,R2,windturbine,2024,6.37700000000
-18,2035,R2,windturbine,2024,6.37700000000
-18,2036,R2,windturbine,2024,6.37700000000
-18,2040,R2,windturbine,2024,6.37700000000
-18,2045,R2,windturbine,2024,6.37700000000
-18,2046,R2,windturbine,2024,6.37700000000
-18,2047,R2,windturbine,2024,6.37700000000
-18,2048,R2,windturbine,2024,6.37700000000
-18,2049,R2,windturbine,2024,6.37700000000
-18,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2032,R1,solarPV,2026,5.16960000000
+1,2034,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2036,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2032,R1,solarPV,2028,5.20080000000
+2,2034,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2036,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2032,R1,solarPV,2030,2.24000000000
+3,2034,R1,solarPV,2030,2.24000000000
+3,2035,R1,solarPV,2030,2.24000000000
+3,2036,R1,solarPV,2030,2.24000000000
+3,2040,R1,solarPV,2030,2.24000000000
+3,2045,R1,solarPV,2030,2.24000000000
+3,2046,R1,solarPV,2030,2.24000000000
+3,2047,R1,solarPV,2030,2.24000000000
+3,2048,R1,solarPV,2030,2.24000000000
+3,2049,R1,solarPV,2030,2.24000000000
+3,2050,R1,solarPV,2030,2.24000000000
+3,2051,R1,solarPV,2030,2.24000000000
+3,2052,R1,solarPV,2030,2.24000000000
+3,2053,R1,solarPV,2030,2.24000000000
+3,2054,R1,solarPV,2030,2.24000000000
+3,2055,R1,solarPV,2030,2.24000000000
+3,2056,R1,solarPV,2030,2.24000000000
+4,2034,R1,solarPV,2032,2.24000000000
+4,2035,R1,solarPV,2032,2.24000000000
+4,2036,R1,solarPV,2032,2.24000000000
+4,2040,R1,solarPV,2032,2.24000000000
+4,2045,R1,solarPV,2032,2.24000000000
+4,2046,R1,solarPV,2032,2.24000000000
+4,2047,R1,solarPV,2032,2.24000000000
+4,2048,R1,solarPV,2032,2.24000000000
+4,2049,R1,solarPV,2032,2.24000000000
+4,2050,R1,solarPV,2032,2.24000000000
+4,2051,R1,solarPV,2032,2.24000000000
+4,2052,R1,solarPV,2032,2.24000000000
+4,2053,R1,solarPV,2032,2.24000000000
+4,2054,R1,solarPV,2032,2.24000000000
+4,2055,R1,solarPV,2032,2.24000000000
+4,2056,R1,solarPV,2032,2.24000000000
+4,2057,R1,solarPV,2032,2.24000000000
+4,2058,R1,solarPV,2032,2.24000000000
+5,2036,R1,solarPV,2034,2.24000000000
+5,2040,R1,solarPV,2034,2.24000000000
+5,2045,R1,solarPV,2034,2.24000000000
+5,2046,R1,solarPV,2034,2.24000000000
+5,2047,R1,solarPV,2034,2.24000000000
+5,2048,R1,solarPV,2034,2.24000000000
+5,2049,R1,solarPV,2034,2.24000000000
+5,2050,R1,solarPV,2034,2.24000000000
+5,2051,R1,solarPV,2034,2.24000000000
+5,2052,R1,solarPV,2034,2.24000000000
+5,2053,R1,solarPV,2034,2.24000000000
+5,2054,R1,solarPV,2034,2.24000000000
+5,2055,R1,solarPV,2034,2.24000000000
+5,2056,R1,solarPV,2034,2.24000000000
+5,2057,R1,solarPV,2034,2.24000000000
+5,2058,R1,solarPV,2034,2.24000000000
+5,2059,R1,solarPV,2034,2.24000000000
+5,2060,R1,solarPV,2034,2.24000000000
+6,2022,R1,windturbine,2020,8.77320000000
+6,2024,R1,windturbine,2020,8.77320000000
+6,2025,R1,windturbine,2020,8.77320000000
+6,2026,R1,windturbine,2020,8.77320000000
+6,2028,R1,windturbine,2020,8.77320000000
+6,2030,R1,windturbine,2020,8.77320000000
+6,2032,R1,windturbine,2020,8.77320000000
+6,2034,R1,windturbine,2020,8.77320000000
+6,2035,R1,windturbine,2020,8.77320000000
+6,2036,R1,windturbine,2020,8.77320000000
+6,2040,R1,windturbine,2020,8.77320000000
+6,2045,R1,windturbine,2020,8.77320000000
+6,2046,R1,windturbine,2020,8.77320000000
+7,2024,R1,windturbine,2022,4.17680000000
+7,2025,R1,windturbine,2022,4.17680000000
+7,2026,R1,windturbine,2022,4.17680000000
+7,2028,R1,windturbine,2022,4.17680000000
+7,2030,R1,windturbine,2022,4.17680000000
+7,2032,R1,windturbine,2022,4.17680000000
+7,2034,R1,windturbine,2022,4.17680000000
+7,2035,R1,windturbine,2022,4.17680000000
+7,2036,R1,windturbine,2022,4.17680000000
+7,2040,R1,windturbine,2022,4.17680000000
+7,2045,R1,windturbine,2022,4.17680000000
+7,2046,R1,windturbine,2022,4.17680000000
+7,2047,R1,windturbine,2022,4.17680000000
+7,2048,R1,windturbine,2022,4.17680000000
+8,2026,R1,windturbine,2024,4.67960000000
+8,2028,R1,windturbine,2024,4.67960000000
+8,2030,R1,windturbine,2024,4.67960000000
+8,2032,R1,windturbine,2024,4.67960000000
+8,2034,R1,windturbine,2024,4.67960000000
+8,2035,R1,windturbine,2024,4.67960000000
+8,2036,R1,windturbine,2024,4.67960000000
+8,2040,R1,windturbine,2024,4.67960000000
+8,2045,R1,windturbine,2024,4.67960000000
+8,2046,R1,windturbine,2024,4.67960000000
+8,2047,R1,windturbine,2024,4.67960000000
+8,2048,R1,windturbine,2024,4.67960000000
+8,2049,R1,windturbine,2024,4.67960000000
+8,2050,R1,windturbine,2024,4.67960000000
+9,2020,R2,gasCCGT,2020,1.00000000000
+9,2022,R2,gasCCGT,2020,1.00000000000
+9,2024,R2,gasCCGT,2020,1.00000000000
+9,2025,R2,gasCCGT,2020,1.00000000000
+9,2026,R2,gasCCGT,2020,0.80000000000
+9,2028,R2,gasCCGT,2020,0.40000000000
+10,2028,R2,solarPV,2026,5.16960000000
+10,2030,R2,solarPV,2026,5.16960000000
+10,2032,R2,solarPV,2026,5.16960000000
+10,2034,R2,solarPV,2026,5.16960000000
+10,2035,R2,solarPV,2026,5.16960000000
+10,2036,R2,solarPV,2026,5.16960000000
+10,2040,R2,solarPV,2026,5.16960000000
+10,2045,R2,solarPV,2026,5.16960000000
+10,2046,R2,solarPV,2026,5.16960000000
+10,2047,R2,solarPV,2026,5.16960000000
+10,2048,R2,solarPV,2026,5.16960000000
+10,2049,R2,solarPV,2026,5.16960000000
+10,2050,R2,solarPV,2026,5.16960000000
+10,2051,R2,solarPV,2026,5.16960000000
+10,2052,R2,solarPV,2026,5.16960000000
+11,2030,R2,solarPV,2028,5.20080000000
+11,2032,R2,solarPV,2028,5.20080000000
+11,2034,R2,solarPV,2028,5.20080000000
+11,2035,R2,solarPV,2028,5.20080000000
+11,2036,R2,solarPV,2028,5.20080000000
+11,2040,R2,solarPV,2028,5.20080000000
+11,2045,R2,solarPV,2028,5.20080000000
+11,2046,R2,solarPV,2028,5.20080000000
+11,2047,R2,solarPV,2028,5.20080000000
+11,2048,R2,solarPV,2028,5.20080000000
+11,2049,R2,solarPV,2028,5.20080000000
+11,2050,R2,solarPV,2028,5.20080000000
+11,2051,R2,solarPV,2028,5.20080000000
+11,2052,R2,solarPV,2028,5.20080000000
+11,2053,R2,solarPV,2028,5.20080000000
+11,2054,R2,solarPV,2028,5.20080000000
+12,2032,R2,solarPV,2030,2.24000000000
+12,2034,R2,solarPV,2030,2.24000000000
+12,2035,R2,solarPV,2030,2.24000000000
+12,2036,R2,solarPV,2030,2.24000000000
+12,2040,R2,solarPV,2030,2.24000000000
+12,2045,R2,solarPV,2030,2.24000000000
+12,2046,R2,solarPV,2030,2.24000000000
+12,2047,R2,solarPV,2030,2.24000000000
+12,2048,R2,solarPV,2030,2.24000000000
+12,2049,R2,solarPV,2030,2.24000000000
+12,2050,R2,solarPV,2030,2.24000000000
+12,2051,R2,solarPV,2030,2.24000000000
+12,2052,R2,solarPV,2030,2.24000000000
+12,2053,R2,solarPV,2030,2.24000000000
+12,2054,R2,solarPV,2030,2.24000000000
+12,2055,R2,solarPV,2030,2.24000000000
+12,2056,R2,solarPV,2030,2.24000000000
+13,2034,R2,solarPV,2032,2.24000000000
+13,2035,R2,solarPV,2032,2.24000000000
+13,2036,R2,solarPV,2032,2.24000000000
+13,2040,R2,solarPV,2032,2.24000000000
+13,2045,R2,solarPV,2032,2.24000000000
+13,2046,R2,solarPV,2032,2.24000000000
+13,2047,R2,solarPV,2032,2.24000000000
+13,2048,R2,solarPV,2032,2.24000000000
+13,2049,R2,solarPV,2032,2.24000000000
+13,2050,R2,solarPV,2032,2.24000000000
+13,2051,R2,solarPV,2032,2.24000000000
+13,2052,R2,solarPV,2032,2.24000000000
+13,2053,R2,solarPV,2032,2.24000000000
+13,2054,R2,solarPV,2032,2.24000000000
+13,2055,R2,solarPV,2032,2.24000000000
+13,2056,R2,solarPV,2032,2.24000000000
+13,2057,R2,solarPV,2032,2.24000000000
+13,2058,R2,solarPV,2032,2.24000000000
+14,2036,R2,solarPV,2034,2.24000000000
+14,2040,R2,solarPV,2034,2.24000000000
+14,2045,R2,solarPV,2034,2.24000000000
+14,2046,R2,solarPV,2034,2.24000000000
+14,2047,R2,solarPV,2034,2.24000000000
+14,2048,R2,solarPV,2034,2.24000000000
+14,2049,R2,solarPV,2034,2.24000000000
+14,2050,R2,solarPV,2034,2.24000000000
+14,2051,R2,solarPV,2034,2.24000000000
+14,2052,R2,solarPV,2034,2.24000000000
+14,2053,R2,solarPV,2034,2.24000000000
+14,2054,R2,solarPV,2034,2.24000000000
+14,2055,R2,solarPV,2034,2.24000000000
+14,2056,R2,solarPV,2034,2.24000000000
+14,2057,R2,solarPV,2034,2.24000000000
+14,2058,R2,solarPV,2034,2.24000000000
+14,2059,R2,solarPV,2034,2.24000000000
+14,2060,R2,solarPV,2034,2.24000000000
+15,2022,R2,windturbine,2020,8.77320000000
+15,2024,R2,windturbine,2020,8.77320000000
+15,2025,R2,windturbine,2020,8.77320000000
+15,2026,R2,windturbine,2020,8.77320000000
+15,2028,R2,windturbine,2020,8.77320000000
+15,2030,R2,windturbine,2020,8.77320000000
+15,2032,R2,windturbine,2020,8.77320000000
+15,2034,R2,windturbine,2020,8.77320000000
+15,2035,R2,windturbine,2020,8.77320000000
+15,2036,R2,windturbine,2020,8.77320000000
+15,2040,R2,windturbine,2020,8.77320000000
+15,2045,R2,windturbine,2020,8.77320000000
+15,2046,R2,windturbine,2020,8.77320000000
+16,2024,R2,windturbine,2022,4.17680000000
+16,2025,R2,windturbine,2022,4.17680000000
+16,2026,R2,windturbine,2022,4.17680000000
+16,2028,R2,windturbine,2022,4.17680000000
+16,2030,R2,windturbine,2022,4.17680000000
+16,2032,R2,windturbine,2022,4.17680000000
+16,2034,R2,windturbine,2022,4.17680000000
+16,2035,R2,windturbine,2022,4.17680000000
+16,2036,R2,windturbine,2022,4.17680000000
+16,2040,R2,windturbine,2022,4.17680000000
+16,2045,R2,windturbine,2022,4.17680000000
+16,2046,R2,windturbine,2022,4.17680000000
+16,2047,R2,windturbine,2022,4.17680000000
+16,2048,R2,windturbine,2022,4.17680000000
+17,2026,R2,windturbine,2024,4.67960000000
+17,2028,R2,windturbine,2024,4.67960000000
+17,2030,R2,windturbine,2024,4.67960000000
+17,2032,R2,windturbine,2024,4.67960000000
+17,2034,R2,windturbine,2024,4.67960000000
+17,2035,R2,windturbine,2024,4.67960000000
+17,2036,R2,windturbine,2024,4.67960000000
+17,2040,R2,windturbine,2024,4.67960000000
+17,2045,R2,windturbine,2024,4.67960000000
+17,2046,R2,windturbine,2024,4.67960000000
+17,2047,R2,windturbine,2024,4.67960000000
+17,2048,R2,windturbine,2024,4.67960000000
+17,2049,R2,windturbine,2024,4.67960000000
+17,2050,R2,windturbine,2024,4.67960000000
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 4e17e614..74f10214 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,238 +1,319 @@
 asset,year,region,technology,installed,capacity
-1,2036,R1,solarPV,2020,3.79000000000
-1,2038,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2036,R1,solarPV,2026,2.24000000000
-2,2038,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2036,R1,solarPV,2028,2.24000000000
-3,2038,R1,solarPV,2028,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2036,R1,solarPV,2030,2.24000000000
-4,2038,R1,solarPV,2030,2.24000000000
-4,2040,R1,solarPV,2030,2.24000000000
-4,2045,R1,solarPV,2030,2.24000000000
-4,2046,R1,solarPV,2030,2.24000000000
-4,2047,R1,solarPV,2030,2.24000000000
-4,2048,R1,solarPV,2030,2.24000000000
-4,2049,R1,solarPV,2030,2.24000000000
-4,2050,R1,solarPV,2030,2.24000000000
-4,2051,R1,solarPV,2030,2.24000000000
-4,2052,R1,solarPV,2030,2.24000000000
-4,2053,R1,solarPV,2030,2.24000000000
-4,2054,R1,solarPV,2030,2.24000000000
-4,2055,R1,solarPV,2030,2.24000000000
-4,2056,R1,solarPV,2030,2.24000000000
-5,2036,R1,solarPV,2032,2.79520000000
-5,2038,R1,solarPV,2032,2.79520000000
-5,2040,R1,solarPV,2032,2.79520000000
-5,2045,R1,solarPV,2032,2.79520000000
-5,2046,R1,solarPV,2032,2.79520000000
-5,2047,R1,solarPV,2032,2.79520000000
-5,2048,R1,solarPV,2032,2.79520000000
-5,2049,R1,solarPV,2032,2.79520000000
-5,2050,R1,solarPV,2032,2.79520000000
-5,2051,R1,solarPV,2032,2.79520000000
-5,2052,R1,solarPV,2032,2.79520000000
-5,2053,R1,solarPV,2032,2.79520000000
-5,2054,R1,solarPV,2032,2.79520000000
-5,2055,R1,solarPV,2032,2.79520000000
-5,2056,R1,solarPV,2032,2.79520000000
-5,2057,R1,solarPV,2032,2.79520000000
-5,2058,R1,solarPV,2032,2.79520000000
-6,2036,R1,solarPV,2034,5.35300000000
-6,2038,R1,solarPV,2034,5.35300000000
-6,2040,R1,solarPV,2034,5.35300000000
-6,2045,R1,solarPV,2034,5.35300000000
-6,2046,R1,solarPV,2034,5.35300000000
-6,2047,R1,solarPV,2034,5.35300000000
-6,2048,R1,solarPV,2034,5.35300000000
-6,2049,R1,solarPV,2034,5.35300000000
-6,2050,R1,solarPV,2034,5.35300000000
-6,2051,R1,solarPV,2034,5.35300000000
-6,2052,R1,solarPV,2034,5.35300000000
-6,2053,R1,solarPV,2034,5.35300000000
-6,2054,R1,solarPV,2034,5.35300000000
-6,2055,R1,solarPV,2034,5.35300000000
-6,2056,R1,solarPV,2034,5.35300000000
-6,2057,R1,solarPV,2034,5.35300000000
-6,2058,R1,solarPV,2034,5.35300000000
-6,2059,R1,solarPV,2034,5.35300000000
-6,2060,R1,solarPV,2034,5.35300000000
-7,2038,R1,solarPV,2036,2.24000000000
-7,2040,R1,solarPV,2036,2.24000000000
-7,2045,R1,solarPV,2036,2.24000000000
-7,2046,R1,solarPV,2036,2.24000000000
-7,2047,R1,solarPV,2036,2.24000000000
-7,2048,R1,solarPV,2036,2.24000000000
-7,2049,R1,solarPV,2036,2.24000000000
-7,2050,R1,solarPV,2036,2.24000000000
-7,2051,R1,solarPV,2036,2.24000000000
-7,2052,R1,solarPV,2036,2.24000000000
-7,2053,R1,solarPV,2036,2.24000000000
-7,2054,R1,solarPV,2036,2.24000000000
-7,2055,R1,solarPV,2036,2.24000000000
-7,2056,R1,solarPV,2036,2.24000000000
-7,2057,R1,solarPV,2036,2.24000000000
-7,2058,R1,solarPV,2036,2.24000000000
-7,2059,R1,solarPV,2036,2.24000000000
-7,2060,R1,solarPV,2036,2.24000000000
-7,2061,R1,solarPV,2036,2.24000000000
-7,2062,R1,solarPV,2036,2.24000000000
-8,2036,R1,windturbine,2020,8.00000000000
-8,2038,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,2036,R1,windturbine,2022,1.68480000000
-9,2038,R1,windturbine,2022,1.68480000000
-9,2040,R1,windturbine,2022,1.68480000000
-9,2045,R1,windturbine,2022,1.68480000000
-9,2046,R1,windturbine,2022,1.68480000000
-9,2047,R1,windturbine,2022,1.68480000000
-9,2048,R1,windturbine,2022,1.68480000000
-10,2036,R1,windturbine,2024,6.37700000000
-10,2038,R1,windturbine,2024,6.37700000000
-10,2040,R1,windturbine,2024,6.37700000000
-10,2045,R1,windturbine,2024,6.37700000000
-10,2046,R1,windturbine,2024,6.37700000000
-10,2047,R1,windturbine,2024,6.37700000000
-10,2048,R1,windturbine,2024,6.37700000000
-10,2049,R1,windturbine,2024,6.37700000000
-10,2050,R1,windturbine,2024,6.37700000000
-12,2036,R2,solarPV,2026,2.24000000000
-12,2038,R2,solarPV,2026,2.24000000000
-12,2040,R2,solarPV,2026,2.24000000000
-12,2045,R2,solarPV,2026,2.24000000000
-12,2046,R2,solarPV,2026,2.24000000000
-12,2047,R2,solarPV,2026,2.24000000000
-12,2048,R2,solarPV,2026,2.24000000000
-12,2049,R2,solarPV,2026,2.24000000000
-12,2050,R2,solarPV,2026,2.24000000000
-12,2051,R2,solarPV,2026,2.24000000000
-12,2052,R2,solarPV,2026,2.24000000000
-13,2036,R2,solarPV,2028,2.24000000000
-13,2038,R2,solarPV,2028,2.24000000000
-13,2040,R2,solarPV,2028,2.24000000000
-13,2045,R2,solarPV,2028,2.24000000000
-13,2046,R2,solarPV,2028,2.24000000000
-13,2047,R2,solarPV,2028,2.24000000000
-13,2048,R2,solarPV,2028,2.24000000000
-13,2049,R2,solarPV,2028,2.24000000000
-13,2050,R2,solarPV,2028,2.24000000000
-13,2051,R2,solarPV,2028,2.24000000000
-13,2052,R2,solarPV,2028,2.24000000000
-13,2053,R2,solarPV,2028,2.24000000000
-13,2054,R2,solarPV,2028,2.24000000000
-14,2036,R2,solarPV,2030,2.24000000000
-14,2038,R2,solarPV,2030,2.24000000000
-14,2040,R2,solarPV,2030,2.24000000000
-14,2045,R2,solarPV,2030,2.24000000000
-14,2046,R2,solarPV,2030,2.24000000000
-14,2047,R2,solarPV,2030,2.24000000000
-14,2048,R2,solarPV,2030,2.24000000000
-14,2049,R2,solarPV,2030,2.24000000000
-14,2050,R2,solarPV,2030,2.24000000000
-14,2051,R2,solarPV,2030,2.24000000000
-14,2052,R2,solarPV,2030,2.24000000000
-14,2053,R2,solarPV,2030,2.24000000000
-14,2054,R2,solarPV,2030,2.24000000000
-14,2055,R2,solarPV,2030,2.24000000000
-14,2056,R2,solarPV,2030,2.24000000000
-15,2036,R2,solarPV,2032,2.79520000000
-15,2038,R2,solarPV,2032,2.79520000000
-15,2040,R2,solarPV,2032,2.79520000000
-15,2045,R2,solarPV,2032,2.79520000000
-15,2046,R2,solarPV,2032,2.79520000000
-15,2047,R2,solarPV,2032,2.79520000000
-15,2048,R2,solarPV,2032,2.79520000000
-15,2049,R2,solarPV,2032,2.79520000000
-15,2050,R2,solarPV,2032,2.79520000000
-15,2051,R2,solarPV,2032,2.79520000000
-15,2052,R2,solarPV,2032,2.79520000000
-15,2053,R2,solarPV,2032,2.79520000000
-15,2054,R2,solarPV,2032,2.79520000000
-15,2055,R2,solarPV,2032,2.79520000000
-15,2056,R2,solarPV,2032,2.79520000000
-15,2057,R2,solarPV,2032,2.79520000000
-15,2058,R2,solarPV,2032,2.79520000000
-16,2036,R2,solarPV,2034,5.35300000000
-16,2038,R2,solarPV,2034,5.35300000000
-16,2040,R2,solarPV,2034,5.35300000000
-16,2045,R2,solarPV,2034,5.35300000000
-16,2046,R2,solarPV,2034,5.35300000000
-16,2047,R2,solarPV,2034,5.35300000000
-16,2048,R2,solarPV,2034,5.35300000000
-16,2049,R2,solarPV,2034,5.35300000000
-16,2050,R2,solarPV,2034,5.35300000000
-16,2051,R2,solarPV,2034,5.35300000000
-16,2052,R2,solarPV,2034,5.35300000000
-16,2053,R2,solarPV,2034,5.35300000000
-16,2054,R2,solarPV,2034,5.35300000000
-16,2055,R2,solarPV,2034,5.35300000000
-16,2056,R2,solarPV,2034,5.35300000000
-16,2057,R2,solarPV,2034,5.35300000000
-16,2058,R2,solarPV,2034,5.35300000000
-16,2059,R2,solarPV,2034,5.35300000000
-16,2060,R2,solarPV,2034,5.35300000000
-17,2038,R2,solarPV,2036,2.24000000000
-17,2040,R2,solarPV,2036,2.24000000000
-17,2045,R2,solarPV,2036,2.24000000000
-17,2046,R2,solarPV,2036,2.24000000000
-17,2047,R2,solarPV,2036,2.24000000000
-17,2048,R2,solarPV,2036,2.24000000000
-17,2049,R2,solarPV,2036,2.24000000000
-17,2050,R2,solarPV,2036,2.24000000000
-17,2051,R2,solarPV,2036,2.24000000000
-17,2052,R2,solarPV,2036,2.24000000000
-17,2053,R2,solarPV,2036,2.24000000000
-17,2054,R2,solarPV,2036,2.24000000000
-17,2055,R2,solarPV,2036,2.24000000000
-17,2056,R2,solarPV,2036,2.24000000000
-17,2057,R2,solarPV,2036,2.24000000000
-17,2058,R2,solarPV,2036,2.24000000000
-17,2059,R2,solarPV,2036,2.24000000000
-17,2060,R2,solarPV,2036,2.24000000000
-17,2061,R2,solarPV,2036,2.24000000000
-17,2062,R2,solarPV,2036,2.24000000000
-18,2036,R2,windturbine,2020,11.79000000000
-18,2038,R2,windturbine,2020,11.79000000000
-18,2040,R2,windturbine,2020,11.79000000000
-18,2045,R2,windturbine,2020,11.79000000000
-18,2046,R2,windturbine,2020,11.79000000000
-19,2036,R2,windturbine,2022,1.68480000000
-19,2038,R2,windturbine,2022,1.68480000000
-19,2040,R2,windturbine,2022,1.68480000000
-19,2045,R2,windturbine,2022,1.68480000000
-19,2046,R2,windturbine,2022,1.68480000000
-19,2047,R2,windturbine,2022,1.68480000000
-19,2048,R2,windturbine,2022,1.68480000000
-20,2036,R2,windturbine,2024,6.37700000000
-20,2038,R2,windturbine,2024,6.37700000000
-20,2040,R2,windturbine,2024,6.37700000000
-20,2045,R2,windturbine,2024,6.37700000000
-20,2046,R2,windturbine,2024,6.37700000000
-20,2047,R2,windturbine,2024,6.37700000000
-20,2048,R2,windturbine,2024,6.37700000000
-20,2049,R2,windturbine,2024,6.37700000000
-20,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2032,R1,solarPV,2026,5.16960000000
+1,2034,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2036,R1,solarPV,2026,5.16960000000
+1,2038,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2032,R1,solarPV,2028,5.20080000000
+2,2034,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2036,R1,solarPV,2028,5.20080000000
+2,2038,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2032,R1,solarPV,2030,2.24000000000
+3,2034,R1,solarPV,2030,2.24000000000
+3,2035,R1,solarPV,2030,2.24000000000
+3,2036,R1,solarPV,2030,2.24000000000
+3,2038,R1,solarPV,2030,2.24000000000
+3,2040,R1,solarPV,2030,2.24000000000
+3,2045,R1,solarPV,2030,2.24000000000
+3,2046,R1,solarPV,2030,2.24000000000
+3,2047,R1,solarPV,2030,2.24000000000
+3,2048,R1,solarPV,2030,2.24000000000
+3,2049,R1,solarPV,2030,2.24000000000
+3,2050,R1,solarPV,2030,2.24000000000
+3,2051,R1,solarPV,2030,2.24000000000
+3,2052,R1,solarPV,2030,2.24000000000
+3,2053,R1,solarPV,2030,2.24000000000
+3,2054,R1,solarPV,2030,2.24000000000
+3,2055,R1,solarPV,2030,2.24000000000
+3,2056,R1,solarPV,2030,2.24000000000
+4,2034,R1,solarPV,2032,2.24000000000
+4,2035,R1,solarPV,2032,2.24000000000
+4,2036,R1,solarPV,2032,2.24000000000
+4,2038,R1,solarPV,2032,2.24000000000
+4,2040,R1,solarPV,2032,2.24000000000
+4,2045,R1,solarPV,2032,2.24000000000
+4,2046,R1,solarPV,2032,2.24000000000
+4,2047,R1,solarPV,2032,2.24000000000
+4,2048,R1,solarPV,2032,2.24000000000
+4,2049,R1,solarPV,2032,2.24000000000
+4,2050,R1,solarPV,2032,2.24000000000
+4,2051,R1,solarPV,2032,2.24000000000
+4,2052,R1,solarPV,2032,2.24000000000
+4,2053,R1,solarPV,2032,2.24000000000
+4,2054,R1,solarPV,2032,2.24000000000
+4,2055,R1,solarPV,2032,2.24000000000
+4,2056,R1,solarPV,2032,2.24000000000
+4,2057,R1,solarPV,2032,2.24000000000
+4,2058,R1,solarPV,2032,2.24000000000
+5,2036,R1,solarPV,2034,2.24000000000
+5,2038,R1,solarPV,2034,2.24000000000
+5,2040,R1,solarPV,2034,2.24000000000
+5,2045,R1,solarPV,2034,2.24000000000
+5,2046,R1,solarPV,2034,2.24000000000
+5,2047,R1,solarPV,2034,2.24000000000
+5,2048,R1,solarPV,2034,2.24000000000
+5,2049,R1,solarPV,2034,2.24000000000
+5,2050,R1,solarPV,2034,2.24000000000
+5,2051,R1,solarPV,2034,2.24000000000
+5,2052,R1,solarPV,2034,2.24000000000
+5,2053,R1,solarPV,2034,2.24000000000
+5,2054,R1,solarPV,2034,2.24000000000
+5,2055,R1,solarPV,2034,2.24000000000
+5,2056,R1,solarPV,2034,2.24000000000
+5,2057,R1,solarPV,2034,2.24000000000
+5,2058,R1,solarPV,2034,2.24000000000
+5,2059,R1,solarPV,2034,2.24000000000
+5,2060,R1,solarPV,2034,2.24000000000
+6,2038,R1,solarPV,2036,2.24000000000
+6,2040,R1,solarPV,2036,2.24000000000
+6,2045,R1,solarPV,2036,2.24000000000
+6,2046,R1,solarPV,2036,2.24000000000
+6,2047,R1,solarPV,2036,2.24000000000
+6,2048,R1,solarPV,2036,2.24000000000
+6,2049,R1,solarPV,2036,2.24000000000
+6,2050,R1,solarPV,2036,2.24000000000
+6,2051,R1,solarPV,2036,2.24000000000
+6,2052,R1,solarPV,2036,2.24000000000
+6,2053,R1,solarPV,2036,2.24000000000
+6,2054,R1,solarPV,2036,2.24000000000
+6,2055,R1,solarPV,2036,2.24000000000
+6,2056,R1,solarPV,2036,2.24000000000
+6,2057,R1,solarPV,2036,2.24000000000
+6,2058,R1,solarPV,2036,2.24000000000
+6,2059,R1,solarPV,2036,2.24000000000
+6,2060,R1,solarPV,2036,2.24000000000
+6,2061,R1,solarPV,2036,2.24000000000
+6,2062,R1,solarPV,2036,2.24000000000
+7,2022,R1,windturbine,2020,8.77320000000
+7,2024,R1,windturbine,2020,8.77320000000
+7,2025,R1,windturbine,2020,8.77320000000
+7,2026,R1,windturbine,2020,8.77320000000
+7,2028,R1,windturbine,2020,8.77320000000
+7,2030,R1,windturbine,2020,8.77320000000
+7,2032,R1,windturbine,2020,8.77320000000
+7,2034,R1,windturbine,2020,8.77320000000
+7,2035,R1,windturbine,2020,8.77320000000
+7,2036,R1,windturbine,2020,8.77320000000
+7,2038,R1,windturbine,2020,8.77320000000
+7,2040,R1,windturbine,2020,8.77320000000
+7,2045,R1,windturbine,2020,8.77320000000
+7,2046,R1,windturbine,2020,8.77320000000
+8,2024,R1,windturbine,2022,4.17680000000
+8,2025,R1,windturbine,2022,4.17680000000
+8,2026,R1,windturbine,2022,4.17680000000
+8,2028,R1,windturbine,2022,4.17680000000
+8,2030,R1,windturbine,2022,4.17680000000
+8,2032,R1,windturbine,2022,4.17680000000
+8,2034,R1,windturbine,2022,4.17680000000
+8,2035,R1,windturbine,2022,4.17680000000
+8,2036,R1,windturbine,2022,4.17680000000
+8,2038,R1,windturbine,2022,4.17680000000
+8,2040,R1,windturbine,2022,4.17680000000
+8,2045,R1,windturbine,2022,4.17680000000
+8,2046,R1,windturbine,2022,4.17680000000
+8,2047,R1,windturbine,2022,4.17680000000
+8,2048,R1,windturbine,2022,4.17680000000
+9,2026,R1,windturbine,2024,4.67960000000
+9,2028,R1,windturbine,2024,4.67960000000
+9,2030,R1,windturbine,2024,4.67960000000
+9,2032,R1,windturbine,2024,4.67960000000
+9,2034,R1,windturbine,2024,4.67960000000
+9,2035,R1,windturbine,2024,4.67960000000
+9,2036,R1,windturbine,2024,4.67960000000
+9,2038,R1,windturbine,2024,4.67960000000
+9,2040,R1,windturbine,2024,4.67960000000
+9,2045,R1,windturbine,2024,4.67960000000
+9,2046,R1,windturbine,2024,4.67960000000
+9,2047,R1,windturbine,2024,4.67960000000
+9,2048,R1,windturbine,2024,4.67960000000
+9,2049,R1,windturbine,2024,4.67960000000
+9,2050,R1,windturbine,2024,4.67960000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2022,R2,gasCCGT,2020,1.00000000000
+10,2024,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+10,2026,R2,gasCCGT,2020,0.80000000000
+10,2028,R2,gasCCGT,2020,0.40000000000
+11,2028,R2,solarPV,2026,5.16960000000
+11,2030,R2,solarPV,2026,5.16960000000
+11,2032,R2,solarPV,2026,5.16960000000
+11,2034,R2,solarPV,2026,5.16960000000
+11,2035,R2,solarPV,2026,5.16960000000
+11,2036,R2,solarPV,2026,5.16960000000
+11,2038,R2,solarPV,2026,5.16960000000
+11,2040,R2,solarPV,2026,5.16960000000
+11,2045,R2,solarPV,2026,5.16960000000
+11,2046,R2,solarPV,2026,5.16960000000
+11,2047,R2,solarPV,2026,5.16960000000
+11,2048,R2,solarPV,2026,5.16960000000
+11,2049,R2,solarPV,2026,5.16960000000
+11,2050,R2,solarPV,2026,5.16960000000
+11,2051,R2,solarPV,2026,5.16960000000
+11,2052,R2,solarPV,2026,5.16960000000
+12,2030,R2,solarPV,2028,5.20080000000
+12,2032,R2,solarPV,2028,5.20080000000
+12,2034,R2,solarPV,2028,5.20080000000
+12,2035,R2,solarPV,2028,5.20080000000
+12,2036,R2,solarPV,2028,5.20080000000
+12,2038,R2,solarPV,2028,5.20080000000
+12,2040,R2,solarPV,2028,5.20080000000
+12,2045,R2,solarPV,2028,5.20080000000
+12,2046,R2,solarPV,2028,5.20080000000
+12,2047,R2,solarPV,2028,5.20080000000
+12,2048,R2,solarPV,2028,5.20080000000
+12,2049,R2,solarPV,2028,5.20080000000
+12,2050,R2,solarPV,2028,5.20080000000
+12,2051,R2,solarPV,2028,5.20080000000
+12,2052,R2,solarPV,2028,5.20080000000
+12,2053,R2,solarPV,2028,5.20080000000
+12,2054,R2,solarPV,2028,5.20080000000
+13,2032,R2,solarPV,2030,2.24000000000
+13,2034,R2,solarPV,2030,2.24000000000
+13,2035,R2,solarPV,2030,2.24000000000
+13,2036,R2,solarPV,2030,2.24000000000
+13,2038,R2,solarPV,2030,2.24000000000
+13,2040,R2,solarPV,2030,2.24000000000
+13,2045,R2,solarPV,2030,2.24000000000
+13,2046,R2,solarPV,2030,2.24000000000
+13,2047,R2,solarPV,2030,2.24000000000
+13,2048,R2,solarPV,2030,2.24000000000
+13,2049,R2,solarPV,2030,2.24000000000
+13,2050,R2,solarPV,2030,2.24000000000
+13,2051,R2,solarPV,2030,2.24000000000
+13,2052,R2,solarPV,2030,2.24000000000
+13,2053,R2,solarPV,2030,2.24000000000
+13,2054,R2,solarPV,2030,2.24000000000
+13,2055,R2,solarPV,2030,2.24000000000
+13,2056,R2,solarPV,2030,2.24000000000
+14,2034,R2,solarPV,2032,2.24000000000
+14,2035,R2,solarPV,2032,2.24000000000
+14,2036,R2,solarPV,2032,2.24000000000
+14,2038,R2,solarPV,2032,2.24000000000
+14,2040,R2,solarPV,2032,2.24000000000
+14,2045,R2,solarPV,2032,2.24000000000
+14,2046,R2,solarPV,2032,2.24000000000
+14,2047,R2,solarPV,2032,2.24000000000
+14,2048,R2,solarPV,2032,2.24000000000
+14,2049,R2,solarPV,2032,2.24000000000
+14,2050,R2,solarPV,2032,2.24000000000
+14,2051,R2,solarPV,2032,2.24000000000
+14,2052,R2,solarPV,2032,2.24000000000
+14,2053,R2,solarPV,2032,2.24000000000
+14,2054,R2,solarPV,2032,2.24000000000
+14,2055,R2,solarPV,2032,2.24000000000
+14,2056,R2,solarPV,2032,2.24000000000
+14,2057,R2,solarPV,2032,2.24000000000
+14,2058,R2,solarPV,2032,2.24000000000
+15,2036,R2,solarPV,2034,2.24000000000
+15,2038,R2,solarPV,2034,2.24000000000
+15,2040,R2,solarPV,2034,2.24000000000
+15,2045,R2,solarPV,2034,2.24000000000
+15,2046,R2,solarPV,2034,2.24000000000
+15,2047,R2,solarPV,2034,2.24000000000
+15,2048,R2,solarPV,2034,2.24000000000
+15,2049,R2,solarPV,2034,2.24000000000
+15,2050,R2,solarPV,2034,2.24000000000
+15,2051,R2,solarPV,2034,2.24000000000
+15,2052,R2,solarPV,2034,2.24000000000
+15,2053,R2,solarPV,2034,2.24000000000
+15,2054,R2,solarPV,2034,2.24000000000
+15,2055,R2,solarPV,2034,2.24000000000
+15,2056,R2,solarPV,2034,2.24000000000
+15,2057,R2,solarPV,2034,2.24000000000
+15,2058,R2,solarPV,2034,2.24000000000
+15,2059,R2,solarPV,2034,2.24000000000
+15,2060,R2,solarPV,2034,2.24000000000
+16,2038,R2,solarPV,2036,2.24000000000
+16,2040,R2,solarPV,2036,2.24000000000
+16,2045,R2,solarPV,2036,2.24000000000
+16,2046,R2,solarPV,2036,2.24000000000
+16,2047,R2,solarPV,2036,2.24000000000
+16,2048,R2,solarPV,2036,2.24000000000
+16,2049,R2,solarPV,2036,2.24000000000
+16,2050,R2,solarPV,2036,2.24000000000
+16,2051,R2,solarPV,2036,2.24000000000
+16,2052,R2,solarPV,2036,2.24000000000
+16,2053,R2,solarPV,2036,2.24000000000
+16,2054,R2,solarPV,2036,2.24000000000
+16,2055,R2,solarPV,2036,2.24000000000
+16,2056,R2,solarPV,2036,2.24000000000
+16,2057,R2,solarPV,2036,2.24000000000
+16,2058,R2,solarPV,2036,2.24000000000
+16,2059,R2,solarPV,2036,2.24000000000
+16,2060,R2,solarPV,2036,2.24000000000
+16,2061,R2,solarPV,2036,2.24000000000
+16,2062,R2,solarPV,2036,2.24000000000
+17,2022,R2,windturbine,2020,8.77320000000
+17,2024,R2,windturbine,2020,8.77320000000
+17,2025,R2,windturbine,2020,8.77320000000
+17,2026,R2,windturbine,2020,8.77320000000
+17,2028,R2,windturbine,2020,8.77320000000
+17,2030,R2,windturbine,2020,8.77320000000
+17,2032,R2,windturbine,2020,8.77320000000
+17,2034,R2,windturbine,2020,8.77320000000
+17,2035,R2,windturbine,2020,8.77320000000
+17,2036,R2,windturbine,2020,8.77320000000
+17,2038,R2,windturbine,2020,8.77320000000
+17,2040,R2,windturbine,2020,8.77320000000
+17,2045,R2,windturbine,2020,8.77320000000
+17,2046,R2,windturbine,2020,8.77320000000
+18,2024,R2,windturbine,2022,4.17680000000
+18,2025,R2,windturbine,2022,4.17680000000
+18,2026,R2,windturbine,2022,4.17680000000
+18,2028,R2,windturbine,2022,4.17680000000
+18,2030,R2,windturbine,2022,4.17680000000
+18,2032,R2,windturbine,2022,4.17680000000
+18,2034,R2,windturbine,2022,4.17680000000
+18,2035,R2,windturbine,2022,4.17680000000
+18,2036,R2,windturbine,2022,4.17680000000
+18,2038,R2,windturbine,2022,4.17680000000
+18,2040,R2,windturbine,2022,4.17680000000
+18,2045,R2,windturbine,2022,4.17680000000
+18,2046,R2,windturbine,2022,4.17680000000
+18,2047,R2,windturbine,2022,4.17680000000
+18,2048,R2,windturbine,2022,4.17680000000
+19,2026,R2,windturbine,2024,4.67960000000
+19,2028,R2,windturbine,2024,4.67960000000
+19,2030,R2,windturbine,2024,4.67960000000
+19,2032,R2,windturbine,2024,4.67960000000
+19,2034,R2,windturbine,2024,4.67960000000
+19,2035,R2,windturbine,2024,4.67960000000
+19,2036,R2,windturbine,2024,4.67960000000
+19,2038,R2,windturbine,2024,4.67960000000
+19,2040,R2,windturbine,2024,4.67960000000
+19,2045,R2,windturbine,2024,4.67960000000
+19,2046,R2,windturbine,2024,4.67960000000
+19,2047,R2,windturbine,2024,4.67960000000
+19,2048,R2,windturbine,2024,4.67960000000
+19,2049,R2,windturbine,2024,4.67960000000
+19,2050,R2,windturbine,2024,4.67960000000
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 2ead67ed..d70c254e 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,263 +1,361 @@
 asset,year,region,technology,installed,capacity
-1,2038,R1,solarPV,2020,3.79000000000
-1,2040,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2038,R1,solarPV,2026,2.24000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2038,R1,solarPV,2028,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2038,R1,solarPV,2030,2.24000000000
-4,2040,R1,solarPV,2030,2.24000000000
-4,2045,R1,solarPV,2030,2.24000000000
-4,2046,R1,solarPV,2030,2.24000000000
-4,2047,R1,solarPV,2030,2.24000000000
-4,2048,R1,solarPV,2030,2.24000000000
-4,2049,R1,solarPV,2030,2.24000000000
-4,2050,R1,solarPV,2030,2.24000000000
-4,2051,R1,solarPV,2030,2.24000000000
-4,2052,R1,solarPV,2030,2.24000000000
-4,2053,R1,solarPV,2030,2.24000000000
-4,2054,R1,solarPV,2030,2.24000000000
-4,2055,R1,solarPV,2030,2.24000000000
-4,2056,R1,solarPV,2030,2.24000000000
-5,2038,R1,solarPV,2032,2.79520000000
-5,2040,R1,solarPV,2032,2.79520000000
-5,2045,R1,solarPV,2032,2.79520000000
-5,2046,R1,solarPV,2032,2.79520000000
-5,2047,R1,solarPV,2032,2.79520000000
-5,2048,R1,solarPV,2032,2.79520000000
-5,2049,R1,solarPV,2032,2.79520000000
-5,2050,R1,solarPV,2032,2.79520000000
-5,2051,R1,solarPV,2032,2.79520000000
-5,2052,R1,solarPV,2032,2.79520000000
-5,2053,R1,solarPV,2032,2.79520000000
-5,2054,R1,solarPV,2032,2.79520000000
-5,2055,R1,solarPV,2032,2.79520000000
-5,2056,R1,solarPV,2032,2.79520000000
-5,2057,R1,solarPV,2032,2.79520000000
-5,2058,R1,solarPV,2032,2.79520000000
-6,2038,R1,solarPV,2034,5.35300000000
-6,2040,R1,solarPV,2034,5.35300000000
-6,2045,R1,solarPV,2034,5.35300000000
-6,2046,R1,solarPV,2034,5.35300000000
-6,2047,R1,solarPV,2034,5.35300000000
-6,2048,R1,solarPV,2034,5.35300000000
-6,2049,R1,solarPV,2034,5.35300000000
-6,2050,R1,solarPV,2034,5.35300000000
-6,2051,R1,solarPV,2034,5.35300000000
-6,2052,R1,solarPV,2034,5.35300000000
-6,2053,R1,solarPV,2034,5.35300000000
-6,2054,R1,solarPV,2034,5.35300000000
-6,2055,R1,solarPV,2034,5.35300000000
-6,2056,R1,solarPV,2034,5.35300000000
-6,2057,R1,solarPV,2034,5.35300000000
-6,2058,R1,solarPV,2034,5.35300000000
-6,2059,R1,solarPV,2034,5.35300000000
-6,2060,R1,solarPV,2034,5.35300000000
-7,2038,R1,solarPV,2036,2.24000000000
-7,2040,R1,solarPV,2036,2.24000000000
-7,2045,R1,solarPV,2036,2.24000000000
-7,2046,R1,solarPV,2036,2.24000000000
-7,2047,R1,solarPV,2036,2.24000000000
-7,2048,R1,solarPV,2036,2.24000000000
-7,2049,R1,solarPV,2036,2.24000000000
-7,2050,R1,solarPV,2036,2.24000000000
-7,2051,R1,solarPV,2036,2.24000000000
-7,2052,R1,solarPV,2036,2.24000000000
-7,2053,R1,solarPV,2036,2.24000000000
-7,2054,R1,solarPV,2036,2.24000000000
-7,2055,R1,solarPV,2036,2.24000000000
-7,2056,R1,solarPV,2036,2.24000000000
-7,2057,R1,solarPV,2036,2.24000000000
-7,2058,R1,solarPV,2036,2.24000000000
-7,2059,R1,solarPV,2036,2.24000000000
-7,2060,R1,solarPV,2036,2.24000000000
-7,2061,R1,solarPV,2036,2.24000000000
-7,2062,R1,solarPV,2036,2.24000000000
-8,2040,R1,solarPV,2038,2.24000000000
-8,2045,R1,solarPV,2038,2.24000000000
-8,2046,R1,solarPV,2038,2.24000000000
-8,2047,R1,solarPV,2038,2.24000000000
-8,2048,R1,solarPV,2038,2.24000000000
-8,2049,R1,solarPV,2038,2.24000000000
-8,2050,R1,solarPV,2038,2.24000000000
-8,2051,R1,solarPV,2038,2.24000000000
-8,2052,R1,solarPV,2038,2.24000000000
-8,2053,R1,solarPV,2038,2.24000000000
-8,2054,R1,solarPV,2038,2.24000000000
-8,2055,R1,solarPV,2038,2.24000000000
-8,2056,R1,solarPV,2038,2.24000000000
-8,2057,R1,solarPV,2038,2.24000000000
-8,2058,R1,solarPV,2038,2.24000000000
-8,2059,R1,solarPV,2038,2.24000000000
-8,2060,R1,solarPV,2038,2.24000000000
-8,2061,R1,solarPV,2038,2.24000000000
-8,2062,R1,solarPV,2038,2.24000000000
-8,2063,R1,solarPV,2038,2.24000000000
-8,2064,R1,solarPV,2038,2.24000000000
-9,2038,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,2038,R1,windturbine,2022,1.68480000000
-10,2040,R1,windturbine,2022,1.68480000000
-10,2045,R1,windturbine,2022,1.68480000000
-10,2046,R1,windturbine,2022,1.68480000000
-10,2047,R1,windturbine,2022,1.68480000000
-10,2048,R1,windturbine,2022,1.68480000000
-11,2038,R1,windturbine,2024,6.37700000000
-11,2040,R1,windturbine,2024,6.37700000000
-11,2045,R1,windturbine,2024,6.37700000000
-11,2046,R1,windturbine,2024,6.37700000000
-11,2047,R1,windturbine,2024,6.37700000000
-11,2048,R1,windturbine,2024,6.37700000000
-11,2049,R1,windturbine,2024,6.37700000000
-11,2050,R1,windturbine,2024,6.37700000000
-13,2038,R2,solarPV,2026,2.24000000000
-13,2040,R2,solarPV,2026,2.24000000000
-13,2045,R2,solarPV,2026,2.24000000000
-13,2046,R2,solarPV,2026,2.24000000000
-13,2047,R2,solarPV,2026,2.24000000000
-13,2048,R2,solarPV,2026,2.24000000000
-13,2049,R2,solarPV,2026,2.24000000000
-13,2050,R2,solarPV,2026,2.24000000000
-13,2051,R2,solarPV,2026,2.24000000000
-13,2052,R2,solarPV,2026,2.24000000000
-14,2038,R2,solarPV,2028,2.24000000000
-14,2040,R2,solarPV,2028,2.24000000000
-14,2045,R2,solarPV,2028,2.24000000000
-14,2046,R2,solarPV,2028,2.24000000000
-14,2047,R2,solarPV,2028,2.24000000000
-14,2048,R2,solarPV,2028,2.24000000000
-14,2049,R2,solarPV,2028,2.24000000000
-14,2050,R2,solarPV,2028,2.24000000000
-14,2051,R2,solarPV,2028,2.24000000000
-14,2052,R2,solarPV,2028,2.24000000000
-14,2053,R2,solarPV,2028,2.24000000000
-14,2054,R2,solarPV,2028,2.24000000000
-15,2038,R2,solarPV,2030,2.24000000000
-15,2040,R2,solarPV,2030,2.24000000000
-15,2045,R2,solarPV,2030,2.24000000000
-15,2046,R2,solarPV,2030,2.24000000000
-15,2047,R2,solarPV,2030,2.24000000000
-15,2048,R2,solarPV,2030,2.24000000000
-15,2049,R2,solarPV,2030,2.24000000000
-15,2050,R2,solarPV,2030,2.24000000000
-15,2051,R2,solarPV,2030,2.24000000000
-15,2052,R2,solarPV,2030,2.24000000000
-15,2053,R2,solarPV,2030,2.24000000000
-15,2054,R2,solarPV,2030,2.24000000000
-15,2055,R2,solarPV,2030,2.24000000000
-15,2056,R2,solarPV,2030,2.24000000000
-16,2038,R2,solarPV,2032,2.79520000000
-16,2040,R2,solarPV,2032,2.79520000000
-16,2045,R2,solarPV,2032,2.79520000000
-16,2046,R2,solarPV,2032,2.79520000000
-16,2047,R2,solarPV,2032,2.79520000000
-16,2048,R2,solarPV,2032,2.79520000000
-16,2049,R2,solarPV,2032,2.79520000000
-16,2050,R2,solarPV,2032,2.79520000000
-16,2051,R2,solarPV,2032,2.79520000000
-16,2052,R2,solarPV,2032,2.79520000000
-16,2053,R2,solarPV,2032,2.79520000000
-16,2054,R2,solarPV,2032,2.79520000000
-16,2055,R2,solarPV,2032,2.79520000000
-16,2056,R2,solarPV,2032,2.79520000000
-16,2057,R2,solarPV,2032,2.79520000000
-16,2058,R2,solarPV,2032,2.79520000000
-17,2038,R2,solarPV,2034,5.35300000000
-17,2040,R2,solarPV,2034,5.35300000000
-17,2045,R2,solarPV,2034,5.35300000000
-17,2046,R2,solarPV,2034,5.35300000000
-17,2047,R2,solarPV,2034,5.35300000000
-17,2048,R2,solarPV,2034,5.35300000000
-17,2049,R2,solarPV,2034,5.35300000000
-17,2050,R2,solarPV,2034,5.35300000000
-17,2051,R2,solarPV,2034,5.35300000000
-17,2052,R2,solarPV,2034,5.35300000000
-17,2053,R2,solarPV,2034,5.35300000000
-17,2054,R2,solarPV,2034,5.35300000000
-17,2055,R2,solarPV,2034,5.35300000000
-17,2056,R2,solarPV,2034,5.35300000000
-17,2057,R2,solarPV,2034,5.35300000000
-17,2058,R2,solarPV,2034,5.35300000000
-17,2059,R2,solarPV,2034,5.35300000000
-17,2060,R2,solarPV,2034,5.35300000000
-18,2038,R2,solarPV,2036,2.24000000000
-18,2040,R2,solarPV,2036,2.24000000000
-18,2045,R2,solarPV,2036,2.24000000000
-18,2046,R2,solarPV,2036,2.24000000000
-18,2047,R2,solarPV,2036,2.24000000000
-18,2048,R2,solarPV,2036,2.24000000000
-18,2049,R2,solarPV,2036,2.24000000000
-18,2050,R2,solarPV,2036,2.24000000000
-18,2051,R2,solarPV,2036,2.24000000000
-18,2052,R2,solarPV,2036,2.24000000000
-18,2053,R2,solarPV,2036,2.24000000000
-18,2054,R2,solarPV,2036,2.24000000000
-18,2055,R2,solarPV,2036,2.24000000000
-18,2056,R2,solarPV,2036,2.24000000000
-18,2057,R2,solarPV,2036,2.24000000000
-18,2058,R2,solarPV,2036,2.24000000000
-18,2059,R2,solarPV,2036,2.24000000000
-18,2060,R2,solarPV,2036,2.24000000000
-18,2061,R2,solarPV,2036,2.24000000000
-18,2062,R2,solarPV,2036,2.24000000000
-19,2040,R2,solarPV,2038,2.24000000000
-19,2045,R2,solarPV,2038,2.24000000000
-19,2046,R2,solarPV,2038,2.24000000000
-19,2047,R2,solarPV,2038,2.24000000000
-19,2048,R2,solarPV,2038,2.24000000000
-19,2049,R2,solarPV,2038,2.24000000000
-19,2050,R2,solarPV,2038,2.24000000000
-19,2051,R2,solarPV,2038,2.24000000000
-19,2052,R2,solarPV,2038,2.24000000000
-19,2053,R2,solarPV,2038,2.24000000000
-19,2054,R2,solarPV,2038,2.24000000000
-19,2055,R2,solarPV,2038,2.24000000000
-19,2056,R2,solarPV,2038,2.24000000000
-19,2057,R2,solarPV,2038,2.24000000000
-19,2058,R2,solarPV,2038,2.24000000000
-19,2059,R2,solarPV,2038,2.24000000000
-19,2060,R2,solarPV,2038,2.24000000000
-19,2061,R2,solarPV,2038,2.24000000000
-19,2062,R2,solarPV,2038,2.24000000000
-19,2063,R2,solarPV,2038,2.24000000000
-19,2064,R2,solarPV,2038,2.24000000000
-20,2038,R2,windturbine,2020,11.79000000000
-20,2040,R2,windturbine,2020,11.79000000000
-20,2045,R2,windturbine,2020,11.79000000000
-20,2046,R2,windturbine,2020,11.79000000000
-21,2038,R2,windturbine,2022,1.68480000000
-21,2040,R2,windturbine,2022,1.68480000000
-21,2045,R2,windturbine,2022,1.68480000000
-21,2046,R2,windturbine,2022,1.68480000000
-21,2047,R2,windturbine,2022,1.68480000000
-21,2048,R2,windturbine,2022,1.68480000000
-22,2038,R2,windturbine,2024,6.37700000000
-22,2040,R2,windturbine,2024,6.37700000000
-22,2045,R2,windturbine,2024,6.37700000000
-22,2046,R2,windturbine,2024,6.37700000000
-22,2047,R2,windturbine,2024,6.37700000000
-22,2048,R2,windturbine,2024,6.37700000000
-22,2049,R2,windturbine,2024,6.37700000000
-22,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2032,R1,solarPV,2026,5.16960000000
+1,2034,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2036,R1,solarPV,2026,5.16960000000
+1,2038,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2032,R1,solarPV,2028,5.20080000000
+2,2034,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2036,R1,solarPV,2028,5.20080000000
+2,2038,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2032,R1,solarPV,2030,2.24000000000
+3,2034,R1,solarPV,2030,2.24000000000
+3,2035,R1,solarPV,2030,2.24000000000
+3,2036,R1,solarPV,2030,2.24000000000
+3,2038,R1,solarPV,2030,2.24000000000
+3,2040,R1,solarPV,2030,2.24000000000
+3,2045,R1,solarPV,2030,2.24000000000
+3,2046,R1,solarPV,2030,2.24000000000
+3,2047,R1,solarPV,2030,2.24000000000
+3,2048,R1,solarPV,2030,2.24000000000
+3,2049,R1,solarPV,2030,2.24000000000
+3,2050,R1,solarPV,2030,2.24000000000
+3,2051,R1,solarPV,2030,2.24000000000
+3,2052,R1,solarPV,2030,2.24000000000
+3,2053,R1,solarPV,2030,2.24000000000
+3,2054,R1,solarPV,2030,2.24000000000
+3,2055,R1,solarPV,2030,2.24000000000
+3,2056,R1,solarPV,2030,2.24000000000
+4,2034,R1,solarPV,2032,2.24000000000
+4,2035,R1,solarPV,2032,2.24000000000
+4,2036,R1,solarPV,2032,2.24000000000
+4,2038,R1,solarPV,2032,2.24000000000
+4,2040,R1,solarPV,2032,2.24000000000
+4,2045,R1,solarPV,2032,2.24000000000
+4,2046,R1,solarPV,2032,2.24000000000
+4,2047,R1,solarPV,2032,2.24000000000
+4,2048,R1,solarPV,2032,2.24000000000
+4,2049,R1,solarPV,2032,2.24000000000
+4,2050,R1,solarPV,2032,2.24000000000
+4,2051,R1,solarPV,2032,2.24000000000
+4,2052,R1,solarPV,2032,2.24000000000
+4,2053,R1,solarPV,2032,2.24000000000
+4,2054,R1,solarPV,2032,2.24000000000
+4,2055,R1,solarPV,2032,2.24000000000
+4,2056,R1,solarPV,2032,2.24000000000
+4,2057,R1,solarPV,2032,2.24000000000
+4,2058,R1,solarPV,2032,2.24000000000
+5,2036,R1,solarPV,2034,2.24000000000
+5,2038,R1,solarPV,2034,2.24000000000
+5,2040,R1,solarPV,2034,2.24000000000
+5,2045,R1,solarPV,2034,2.24000000000
+5,2046,R1,solarPV,2034,2.24000000000
+5,2047,R1,solarPV,2034,2.24000000000
+5,2048,R1,solarPV,2034,2.24000000000
+5,2049,R1,solarPV,2034,2.24000000000
+5,2050,R1,solarPV,2034,2.24000000000
+5,2051,R1,solarPV,2034,2.24000000000
+5,2052,R1,solarPV,2034,2.24000000000
+5,2053,R1,solarPV,2034,2.24000000000
+5,2054,R1,solarPV,2034,2.24000000000
+5,2055,R1,solarPV,2034,2.24000000000
+5,2056,R1,solarPV,2034,2.24000000000
+5,2057,R1,solarPV,2034,2.24000000000
+5,2058,R1,solarPV,2034,2.24000000000
+5,2059,R1,solarPV,2034,2.24000000000
+5,2060,R1,solarPV,2034,2.24000000000
+6,2038,R1,solarPV,2036,2.24000000000
+6,2040,R1,solarPV,2036,2.24000000000
+6,2045,R1,solarPV,2036,2.24000000000
+6,2046,R1,solarPV,2036,2.24000000000
+6,2047,R1,solarPV,2036,2.24000000000
+6,2048,R1,solarPV,2036,2.24000000000
+6,2049,R1,solarPV,2036,2.24000000000
+6,2050,R1,solarPV,2036,2.24000000000
+6,2051,R1,solarPV,2036,2.24000000000
+6,2052,R1,solarPV,2036,2.24000000000
+6,2053,R1,solarPV,2036,2.24000000000
+6,2054,R1,solarPV,2036,2.24000000000
+6,2055,R1,solarPV,2036,2.24000000000
+6,2056,R1,solarPV,2036,2.24000000000
+6,2057,R1,solarPV,2036,2.24000000000
+6,2058,R1,solarPV,2036,2.24000000000
+6,2059,R1,solarPV,2036,2.24000000000
+6,2060,R1,solarPV,2036,2.24000000000
+6,2061,R1,solarPV,2036,2.24000000000
+6,2062,R1,solarPV,2036,2.24000000000
+7,2040,R1,solarPV,2038,2.24000000000
+7,2045,R1,solarPV,2038,2.24000000000
+7,2046,R1,solarPV,2038,2.24000000000
+7,2047,R1,solarPV,2038,2.24000000000
+7,2048,R1,solarPV,2038,2.24000000000
+7,2049,R1,solarPV,2038,2.24000000000
+7,2050,R1,solarPV,2038,2.24000000000
+7,2051,R1,solarPV,2038,2.24000000000
+7,2052,R1,solarPV,2038,2.24000000000
+7,2053,R1,solarPV,2038,2.24000000000
+7,2054,R1,solarPV,2038,2.24000000000
+7,2055,R1,solarPV,2038,2.24000000000
+7,2056,R1,solarPV,2038,2.24000000000
+7,2057,R1,solarPV,2038,2.24000000000
+7,2058,R1,solarPV,2038,2.24000000000
+7,2059,R1,solarPV,2038,2.24000000000
+7,2060,R1,solarPV,2038,2.24000000000
+7,2061,R1,solarPV,2038,2.24000000000
+7,2062,R1,solarPV,2038,2.24000000000
+7,2063,R1,solarPV,2038,2.24000000000
+7,2064,R1,solarPV,2038,2.24000000000
+8,2022,R1,windturbine,2020,8.77320000000
+8,2024,R1,windturbine,2020,8.77320000000
+8,2025,R1,windturbine,2020,8.77320000000
+8,2026,R1,windturbine,2020,8.77320000000
+8,2028,R1,windturbine,2020,8.77320000000
+8,2030,R1,windturbine,2020,8.77320000000
+8,2032,R1,windturbine,2020,8.77320000000
+8,2034,R1,windturbine,2020,8.77320000000
+8,2035,R1,windturbine,2020,8.77320000000
+8,2036,R1,windturbine,2020,8.77320000000
+8,2038,R1,windturbine,2020,8.77320000000
+8,2040,R1,windturbine,2020,8.77320000000
+8,2045,R1,windturbine,2020,8.77320000000
+8,2046,R1,windturbine,2020,8.77320000000
+9,2024,R1,windturbine,2022,4.17680000000
+9,2025,R1,windturbine,2022,4.17680000000
+9,2026,R1,windturbine,2022,4.17680000000
+9,2028,R1,windturbine,2022,4.17680000000
+9,2030,R1,windturbine,2022,4.17680000000
+9,2032,R1,windturbine,2022,4.17680000000
+9,2034,R1,windturbine,2022,4.17680000000
+9,2035,R1,windturbine,2022,4.17680000000
+9,2036,R1,windturbine,2022,4.17680000000
+9,2038,R1,windturbine,2022,4.17680000000
+9,2040,R1,windturbine,2022,4.17680000000
+9,2045,R1,windturbine,2022,4.17680000000
+9,2046,R1,windturbine,2022,4.17680000000
+9,2047,R1,windturbine,2022,4.17680000000
+9,2048,R1,windturbine,2022,4.17680000000
+10,2026,R1,windturbine,2024,4.67960000000
+10,2028,R1,windturbine,2024,4.67960000000
+10,2030,R1,windturbine,2024,4.67960000000
+10,2032,R1,windturbine,2024,4.67960000000
+10,2034,R1,windturbine,2024,4.67960000000
+10,2035,R1,windturbine,2024,4.67960000000
+10,2036,R1,windturbine,2024,4.67960000000
+10,2038,R1,windturbine,2024,4.67960000000
+10,2040,R1,windturbine,2024,4.67960000000
+10,2045,R1,windturbine,2024,4.67960000000
+10,2046,R1,windturbine,2024,4.67960000000
+10,2047,R1,windturbine,2024,4.67960000000
+10,2048,R1,windturbine,2024,4.67960000000
+10,2049,R1,windturbine,2024,4.67960000000
+10,2050,R1,windturbine,2024,4.67960000000
+11,2020,R2,gasCCGT,2020,1.00000000000
+11,2022,R2,gasCCGT,2020,1.00000000000
+11,2024,R2,gasCCGT,2020,1.00000000000
+11,2025,R2,gasCCGT,2020,1.00000000000
+11,2026,R2,gasCCGT,2020,0.80000000000
+11,2028,R2,gasCCGT,2020,0.40000000000
+12,2028,R2,solarPV,2026,5.16960000000
+12,2030,R2,solarPV,2026,5.16960000000
+12,2032,R2,solarPV,2026,5.16960000000
+12,2034,R2,solarPV,2026,5.16960000000
+12,2035,R2,solarPV,2026,5.16960000000
+12,2036,R2,solarPV,2026,5.16960000000
+12,2038,R2,solarPV,2026,5.16960000000
+12,2040,R2,solarPV,2026,5.16960000000
+12,2045,R2,solarPV,2026,5.16960000000
+12,2046,R2,solarPV,2026,5.16960000000
+12,2047,R2,solarPV,2026,5.16960000000
+12,2048,R2,solarPV,2026,5.16960000000
+12,2049,R2,solarPV,2026,5.16960000000
+12,2050,R2,solarPV,2026,5.16960000000
+12,2051,R2,solarPV,2026,5.16960000000
+12,2052,R2,solarPV,2026,5.16960000000
+13,2030,R2,solarPV,2028,5.20080000000
+13,2032,R2,solarPV,2028,5.20080000000
+13,2034,R2,solarPV,2028,5.20080000000
+13,2035,R2,solarPV,2028,5.20080000000
+13,2036,R2,solarPV,2028,5.20080000000
+13,2038,R2,solarPV,2028,5.20080000000
+13,2040,R2,solarPV,2028,5.20080000000
+13,2045,R2,solarPV,2028,5.20080000000
+13,2046,R2,solarPV,2028,5.20080000000
+13,2047,R2,solarPV,2028,5.20080000000
+13,2048,R2,solarPV,2028,5.20080000000
+13,2049,R2,solarPV,2028,5.20080000000
+13,2050,R2,solarPV,2028,5.20080000000
+13,2051,R2,solarPV,2028,5.20080000000
+13,2052,R2,solarPV,2028,5.20080000000
+13,2053,R2,solarPV,2028,5.20080000000
+13,2054,R2,solarPV,2028,5.20080000000
+14,2032,R2,solarPV,2030,2.24000000000
+14,2034,R2,solarPV,2030,2.24000000000
+14,2035,R2,solarPV,2030,2.24000000000
+14,2036,R2,solarPV,2030,2.24000000000
+14,2038,R2,solarPV,2030,2.24000000000
+14,2040,R2,solarPV,2030,2.24000000000
+14,2045,R2,solarPV,2030,2.24000000000
+14,2046,R2,solarPV,2030,2.24000000000
+14,2047,R2,solarPV,2030,2.24000000000
+14,2048,R2,solarPV,2030,2.24000000000
+14,2049,R2,solarPV,2030,2.24000000000
+14,2050,R2,solarPV,2030,2.24000000000
+14,2051,R2,solarPV,2030,2.24000000000
+14,2052,R2,solarPV,2030,2.24000000000
+14,2053,R2,solarPV,2030,2.24000000000
+14,2054,R2,solarPV,2030,2.24000000000
+14,2055,R2,solarPV,2030,2.24000000000
+14,2056,R2,solarPV,2030,2.24000000000
+15,2034,R2,solarPV,2032,2.24000000000
+15,2035,R2,solarPV,2032,2.24000000000
+15,2036,R2,solarPV,2032,2.24000000000
+15,2038,R2,solarPV,2032,2.24000000000
+15,2040,R2,solarPV,2032,2.24000000000
+15,2045,R2,solarPV,2032,2.24000000000
+15,2046,R2,solarPV,2032,2.24000000000
+15,2047,R2,solarPV,2032,2.24000000000
+15,2048,R2,solarPV,2032,2.24000000000
+15,2049,R2,solarPV,2032,2.24000000000
+15,2050,R2,solarPV,2032,2.24000000000
+15,2051,R2,solarPV,2032,2.24000000000
+15,2052,R2,solarPV,2032,2.24000000000
+15,2053,R2,solarPV,2032,2.24000000000
+15,2054,R2,solarPV,2032,2.24000000000
+15,2055,R2,solarPV,2032,2.24000000000
+15,2056,R2,solarPV,2032,2.24000000000
+15,2057,R2,solarPV,2032,2.24000000000
+15,2058,R2,solarPV,2032,2.24000000000
+16,2036,R2,solarPV,2034,2.24000000000
+16,2038,R2,solarPV,2034,2.24000000000
+16,2040,R2,solarPV,2034,2.24000000000
+16,2045,R2,solarPV,2034,2.24000000000
+16,2046,R2,solarPV,2034,2.24000000000
+16,2047,R2,solarPV,2034,2.24000000000
+16,2048,R2,solarPV,2034,2.24000000000
+16,2049,R2,solarPV,2034,2.24000000000
+16,2050,R2,solarPV,2034,2.24000000000
+16,2051,R2,solarPV,2034,2.24000000000
+16,2052,R2,solarPV,2034,2.24000000000
+16,2053,R2,solarPV,2034,2.24000000000
+16,2054,R2,solarPV,2034,2.24000000000
+16,2055,R2,solarPV,2034,2.24000000000
+16,2056,R2,solarPV,2034,2.24000000000
+16,2057,R2,solarPV,2034,2.24000000000
+16,2058,R2,solarPV,2034,2.24000000000
+16,2059,R2,solarPV,2034,2.24000000000
+16,2060,R2,solarPV,2034,2.24000000000
+17,2038,R2,solarPV,2036,2.24000000000
+17,2040,R2,solarPV,2036,2.24000000000
+17,2045,R2,solarPV,2036,2.24000000000
+17,2046,R2,solarPV,2036,2.24000000000
+17,2047,R2,solarPV,2036,2.24000000000
+17,2048,R2,solarPV,2036,2.24000000000
+17,2049,R2,solarPV,2036,2.24000000000
+17,2050,R2,solarPV,2036,2.24000000000
+17,2051,R2,solarPV,2036,2.24000000000
+17,2052,R2,solarPV,2036,2.24000000000
+17,2053,R2,solarPV,2036,2.24000000000
+17,2054,R2,solarPV,2036,2.24000000000
+17,2055,R2,solarPV,2036,2.24000000000
+17,2056,R2,solarPV,2036,2.24000000000
+17,2057,R2,solarPV,2036,2.24000000000
+17,2058,R2,solarPV,2036,2.24000000000
+17,2059,R2,solarPV,2036,2.24000000000
+17,2060,R2,solarPV,2036,2.24000000000
+17,2061,R2,solarPV,2036,2.24000000000
+17,2062,R2,solarPV,2036,2.24000000000
+18,2040,R2,solarPV,2038,2.24000000000
+18,2045,R2,solarPV,2038,2.24000000000
+18,2046,R2,solarPV,2038,2.24000000000
+18,2047,R2,solarPV,2038,2.24000000000
+18,2048,R2,solarPV,2038,2.24000000000
+18,2049,R2,solarPV,2038,2.24000000000
+18,2050,R2,solarPV,2038,2.24000000000
+18,2051,R2,solarPV,2038,2.24000000000
+18,2052,R2,solarPV,2038,2.24000000000
+18,2053,R2,solarPV,2038,2.24000000000
+18,2054,R2,solarPV,2038,2.24000000000
+18,2055,R2,solarPV,2038,2.24000000000
+18,2056,R2,solarPV,2038,2.24000000000
+18,2057,R2,solarPV,2038,2.24000000000
+18,2058,R2,solarPV,2038,2.24000000000
+18,2059,R2,solarPV,2038,2.24000000000
+18,2060,R2,solarPV,2038,2.24000000000
+18,2061,R2,solarPV,2038,2.24000000000
+18,2062,R2,solarPV,2038,2.24000000000
+18,2063,R2,solarPV,2038,2.24000000000
+18,2064,R2,solarPV,2038,2.24000000000
+19,2022,R2,windturbine,2020,8.77320000000
+19,2024,R2,windturbine,2020,8.77320000000
+19,2025,R2,windturbine,2020,8.77320000000
+19,2026,R2,windturbine,2020,8.77320000000
+19,2028,R2,windturbine,2020,8.77320000000
+19,2030,R2,windturbine,2020,8.77320000000
+19,2032,R2,windturbine,2020,8.77320000000
+19,2034,R2,windturbine,2020,8.77320000000
+19,2035,R2,windturbine,2020,8.77320000000
+19,2036,R2,windturbine,2020,8.77320000000
+19,2038,R2,windturbine,2020,8.77320000000
+19,2040,R2,windturbine,2020,8.77320000000
+19,2045,R2,windturbine,2020,8.77320000000
+19,2046,R2,windturbine,2020,8.77320000000
+20,2024,R2,windturbine,2022,4.17680000000
+20,2025,R2,windturbine,2022,4.17680000000
+20,2026,R2,windturbine,2022,4.17680000000
+20,2028,R2,windturbine,2022,4.17680000000
+20,2030,R2,windturbine,2022,4.17680000000
+20,2032,R2,windturbine,2022,4.17680000000
+20,2034,R2,windturbine,2022,4.17680000000
+20,2035,R2,windturbine,2022,4.17680000000
+20,2036,R2,windturbine,2022,4.17680000000
+20,2038,R2,windturbine,2022,4.17680000000
+20,2040,R2,windturbine,2022,4.17680000000
+20,2045,R2,windturbine,2022,4.17680000000
+20,2046,R2,windturbine,2022,4.17680000000
+20,2047,R2,windturbine,2022,4.17680000000
+20,2048,R2,windturbine,2022,4.17680000000
+21,2026,R2,windturbine,2024,4.67960000000
+21,2028,R2,windturbine,2024,4.67960000000
+21,2030,R2,windturbine,2024,4.67960000000
+21,2032,R2,windturbine,2024,4.67960000000
+21,2034,R2,windturbine,2024,4.67960000000
+21,2035,R2,windturbine,2024,4.67960000000
+21,2036,R2,windturbine,2024,4.67960000000
+21,2038,R2,windturbine,2024,4.67960000000
+21,2040,R2,windturbine,2024,4.67960000000
+21,2045,R2,windturbine,2024,4.67960000000
+21,2046,R2,windturbine,2024,4.67960000000
+21,2047,R2,windturbine,2024,4.67960000000
+21,2048,R2,windturbine,2024,4.67960000000
+21,2049,R2,windturbine,2024,4.67960000000
+21,2050,R2,windturbine,2024,4.67960000000
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 7162d267..48651a6e 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,311 +1,427 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,solarPV,2020,3.79000000000
-1,2042,R1,solarPV,2020,3.79000000000
-1,2045,R1,solarPV,2020,3.79000000000
-1,2046,R1,solarPV,2020,3.79000000000
-2,2040,R1,solarPV,2026,2.24000000000
-2,2042,R1,solarPV,2026,2.24000000000
-2,2045,R1,solarPV,2026,2.24000000000
-2,2046,R1,solarPV,2026,2.24000000000
-2,2047,R1,solarPV,2026,2.24000000000
-2,2048,R1,solarPV,2026,2.24000000000
-2,2049,R1,solarPV,2026,2.24000000000
-2,2050,R1,solarPV,2026,2.24000000000
-2,2051,R1,solarPV,2026,2.24000000000
-2,2052,R1,solarPV,2026,2.24000000000
-3,2040,R1,solarPV,2028,2.24000000000
-3,2042,R1,solarPV,2028,2.24000000000
-3,2045,R1,solarPV,2028,2.24000000000
-3,2046,R1,solarPV,2028,2.24000000000
-3,2047,R1,solarPV,2028,2.24000000000
-3,2048,R1,solarPV,2028,2.24000000000
-3,2049,R1,solarPV,2028,2.24000000000
-3,2050,R1,solarPV,2028,2.24000000000
-3,2051,R1,solarPV,2028,2.24000000000
-3,2052,R1,solarPV,2028,2.24000000000
-3,2053,R1,solarPV,2028,2.24000000000
-3,2054,R1,solarPV,2028,2.24000000000
-4,2040,R1,solarPV,2030,2.24000000000
-4,2042,R1,solarPV,2030,2.24000000000
-4,2045,R1,solarPV,2030,2.24000000000
-4,2046,R1,solarPV,2030,2.24000000000
-4,2047,R1,solarPV,2030,2.24000000000
-4,2048,R1,solarPV,2030,2.24000000000
-4,2049,R1,solarPV,2030,2.24000000000
-4,2050,R1,solarPV,2030,2.24000000000
-4,2051,R1,solarPV,2030,2.24000000000
-4,2052,R1,solarPV,2030,2.24000000000
-4,2053,R1,solarPV,2030,2.24000000000
-4,2054,R1,solarPV,2030,2.24000000000
-4,2055,R1,solarPV,2030,2.24000000000
-4,2056,R1,solarPV,2030,2.24000000000
-5,2040,R1,solarPV,2032,2.79520000000
-5,2042,R1,solarPV,2032,2.79520000000
-5,2045,R1,solarPV,2032,2.79520000000
-5,2046,R1,solarPV,2032,2.79520000000
-5,2047,R1,solarPV,2032,2.79520000000
-5,2048,R1,solarPV,2032,2.79520000000
-5,2049,R1,solarPV,2032,2.79520000000
-5,2050,R1,solarPV,2032,2.79520000000
-5,2051,R1,solarPV,2032,2.79520000000
-5,2052,R1,solarPV,2032,2.79520000000
-5,2053,R1,solarPV,2032,2.79520000000
-5,2054,R1,solarPV,2032,2.79520000000
-5,2055,R1,solarPV,2032,2.79520000000
-5,2056,R1,solarPV,2032,2.79520000000
-5,2057,R1,solarPV,2032,2.79520000000
-5,2058,R1,solarPV,2032,2.79520000000
-6,2040,R1,solarPV,2034,5.35300000000
-6,2042,R1,solarPV,2034,5.35300000000
-6,2045,R1,solarPV,2034,5.35300000000
-6,2046,R1,solarPV,2034,5.35300000000
-6,2047,R1,solarPV,2034,5.35300000000
-6,2048,R1,solarPV,2034,5.35300000000
-6,2049,R1,solarPV,2034,5.35300000000
-6,2050,R1,solarPV,2034,5.35300000000
-6,2051,R1,solarPV,2034,5.35300000000
-6,2052,R1,solarPV,2034,5.35300000000
-6,2053,R1,solarPV,2034,5.35300000000
-6,2054,R1,solarPV,2034,5.35300000000
-6,2055,R1,solarPV,2034,5.35300000000
-6,2056,R1,solarPV,2034,5.35300000000
-6,2057,R1,solarPV,2034,5.35300000000
-6,2058,R1,solarPV,2034,5.35300000000
-6,2059,R1,solarPV,2034,5.35300000000
-6,2060,R1,solarPV,2034,5.35300000000
-7,2040,R1,solarPV,2036,2.24000000000
-7,2042,R1,solarPV,2036,2.24000000000
-7,2045,R1,solarPV,2036,2.24000000000
-7,2046,R1,solarPV,2036,2.24000000000
-7,2047,R1,solarPV,2036,2.24000000000
-7,2048,R1,solarPV,2036,2.24000000000
-7,2049,R1,solarPV,2036,2.24000000000
-7,2050,R1,solarPV,2036,2.24000000000
-7,2051,R1,solarPV,2036,2.24000000000
-7,2052,R1,solarPV,2036,2.24000000000
-7,2053,R1,solarPV,2036,2.24000000000
-7,2054,R1,solarPV,2036,2.24000000000
-7,2055,R1,solarPV,2036,2.24000000000
-7,2056,R1,solarPV,2036,2.24000000000
-7,2057,R1,solarPV,2036,2.24000000000
-7,2058,R1,solarPV,2036,2.24000000000
-7,2059,R1,solarPV,2036,2.24000000000
-7,2060,R1,solarPV,2036,2.24000000000
-7,2061,R1,solarPV,2036,2.24000000000
-7,2062,R1,solarPV,2036,2.24000000000
-8,2040,R1,solarPV,2038,2.24000000000
-8,2042,R1,solarPV,2038,2.24000000000
-8,2045,R1,solarPV,2038,2.24000000000
-8,2046,R1,solarPV,2038,2.24000000000
-8,2047,R1,solarPV,2038,2.24000000000
-8,2048,R1,solarPV,2038,2.24000000000
-8,2049,R1,solarPV,2038,2.24000000000
-8,2050,R1,solarPV,2038,2.24000000000
-8,2051,R1,solarPV,2038,2.24000000000
-8,2052,R1,solarPV,2038,2.24000000000
-8,2053,R1,solarPV,2038,2.24000000000
-8,2054,R1,solarPV,2038,2.24000000000
-8,2055,R1,solarPV,2038,2.24000000000
-8,2056,R1,solarPV,2038,2.24000000000
-8,2057,R1,solarPV,2038,2.24000000000
-8,2058,R1,solarPV,2038,2.24000000000
-8,2059,R1,solarPV,2038,2.24000000000
-8,2060,R1,solarPV,2038,2.24000000000
-8,2061,R1,solarPV,2038,2.24000000000
-8,2062,R1,solarPV,2038,2.24000000000
-8,2063,R1,solarPV,2038,2.24000000000
-8,2064,R1,solarPV,2038,2.24000000000
-9,2042,R1,solarPV,2040,2.24000000000
-9,2045,R1,solarPV,2040,2.24000000000
-9,2046,R1,solarPV,2040,2.24000000000
-9,2047,R1,solarPV,2040,2.24000000000
-9,2048,R1,solarPV,2040,2.24000000000
-9,2049,R1,solarPV,2040,2.24000000000
-9,2050,R1,solarPV,2040,2.24000000000
-9,2051,R1,solarPV,2040,2.24000000000
-9,2052,R1,solarPV,2040,2.24000000000
-9,2053,R1,solarPV,2040,2.24000000000
-9,2054,R1,solarPV,2040,2.24000000000
-9,2055,R1,solarPV,2040,2.24000000000
-9,2056,R1,solarPV,2040,2.24000000000
-9,2057,R1,solarPV,2040,2.24000000000
-9,2058,R1,solarPV,2040,2.24000000000
-9,2059,R1,solarPV,2040,2.24000000000
-9,2060,R1,solarPV,2040,2.24000000000
-9,2061,R1,solarPV,2040,2.24000000000
-9,2062,R1,solarPV,2040,2.24000000000
-9,2063,R1,solarPV,2040,2.24000000000
-9,2064,R1,solarPV,2040,2.24000000000
-9,2065,R1,solarPV,2040,2.24000000000
-9,2066,R1,solarPV,2040,2.24000000000
-10,2040,R1,windturbine,2020,8.00000000000
-10,2042,R1,windturbine,2020,8.00000000000
-10,2045,R1,windturbine,2020,8.00000000000
-10,2046,R1,windturbine,2020,8.00000000000
-11,2040,R1,windturbine,2022,1.68480000000
-11,2042,R1,windturbine,2022,1.68480000000
-11,2045,R1,windturbine,2022,1.68480000000
-11,2046,R1,windturbine,2022,1.68480000000
-11,2047,R1,windturbine,2022,1.68480000000
-11,2048,R1,windturbine,2022,1.68480000000
-12,2040,R1,windturbine,2024,6.37700000000
-12,2042,R1,windturbine,2024,6.37700000000
-12,2045,R1,windturbine,2024,6.37700000000
-12,2046,R1,windturbine,2024,6.37700000000
-12,2047,R1,windturbine,2024,6.37700000000
-12,2048,R1,windturbine,2024,6.37700000000
-12,2049,R1,windturbine,2024,6.37700000000
-12,2050,R1,windturbine,2024,6.37700000000
-14,2040,R2,solarPV,2026,2.24000000000
-14,2042,R2,solarPV,2026,2.24000000000
-14,2045,R2,solarPV,2026,2.24000000000
-14,2046,R2,solarPV,2026,2.24000000000
-14,2047,R2,solarPV,2026,2.24000000000
-14,2048,R2,solarPV,2026,2.24000000000
-14,2049,R2,solarPV,2026,2.24000000000
-14,2050,R2,solarPV,2026,2.24000000000
-14,2051,R2,solarPV,2026,2.24000000000
-14,2052,R2,solarPV,2026,2.24000000000
-15,2040,R2,solarPV,2028,2.24000000000
-15,2042,R2,solarPV,2028,2.24000000000
-15,2045,R2,solarPV,2028,2.24000000000
-15,2046,R2,solarPV,2028,2.24000000000
-15,2047,R2,solarPV,2028,2.24000000000
-15,2048,R2,solarPV,2028,2.24000000000
-15,2049,R2,solarPV,2028,2.24000000000
-15,2050,R2,solarPV,2028,2.24000000000
-15,2051,R2,solarPV,2028,2.24000000000
-15,2052,R2,solarPV,2028,2.24000000000
-15,2053,R2,solarPV,2028,2.24000000000
-15,2054,R2,solarPV,2028,2.24000000000
-16,2040,R2,solarPV,2030,2.24000000000
-16,2042,R2,solarPV,2030,2.24000000000
-16,2045,R2,solarPV,2030,2.24000000000
-16,2046,R2,solarPV,2030,2.24000000000
-16,2047,R2,solarPV,2030,2.24000000000
-16,2048,R2,solarPV,2030,2.24000000000
-16,2049,R2,solarPV,2030,2.24000000000
-16,2050,R2,solarPV,2030,2.24000000000
-16,2051,R2,solarPV,2030,2.24000000000
-16,2052,R2,solarPV,2030,2.24000000000
-16,2053,R2,solarPV,2030,2.24000000000
-16,2054,R2,solarPV,2030,2.24000000000
-16,2055,R2,solarPV,2030,2.24000000000
-16,2056,R2,solarPV,2030,2.24000000000
-17,2040,R2,solarPV,2032,2.79520000000
-17,2042,R2,solarPV,2032,2.79520000000
-17,2045,R2,solarPV,2032,2.79520000000
-17,2046,R2,solarPV,2032,2.79520000000
-17,2047,R2,solarPV,2032,2.79520000000
-17,2048,R2,solarPV,2032,2.79520000000
-17,2049,R2,solarPV,2032,2.79520000000
-17,2050,R2,solarPV,2032,2.79520000000
-17,2051,R2,solarPV,2032,2.79520000000
-17,2052,R2,solarPV,2032,2.79520000000
-17,2053,R2,solarPV,2032,2.79520000000
-17,2054,R2,solarPV,2032,2.79520000000
-17,2055,R2,solarPV,2032,2.79520000000
-17,2056,R2,solarPV,2032,2.79520000000
-17,2057,R2,solarPV,2032,2.79520000000
-17,2058,R2,solarPV,2032,2.79520000000
-18,2040,R2,solarPV,2034,5.35300000000
-18,2042,R2,solarPV,2034,5.35300000000
-18,2045,R2,solarPV,2034,5.35300000000
-18,2046,R2,solarPV,2034,5.35300000000
-18,2047,R2,solarPV,2034,5.35300000000
-18,2048,R2,solarPV,2034,5.35300000000
-18,2049,R2,solarPV,2034,5.35300000000
-18,2050,R2,solarPV,2034,5.35300000000
-18,2051,R2,solarPV,2034,5.35300000000
-18,2052,R2,solarPV,2034,5.35300000000
-18,2053,R2,solarPV,2034,5.35300000000
-18,2054,R2,solarPV,2034,5.35300000000
-18,2055,R2,solarPV,2034,5.35300000000
-18,2056,R2,solarPV,2034,5.35300000000
-18,2057,R2,solarPV,2034,5.35300000000
-18,2058,R2,solarPV,2034,5.35300000000
-18,2059,R2,solarPV,2034,5.35300000000
-18,2060,R2,solarPV,2034,5.35300000000
-19,2040,R2,solarPV,2036,2.24000000000
-19,2042,R2,solarPV,2036,2.24000000000
-19,2045,R2,solarPV,2036,2.24000000000
-19,2046,R2,solarPV,2036,2.24000000000
-19,2047,R2,solarPV,2036,2.24000000000
-19,2048,R2,solarPV,2036,2.24000000000
-19,2049,R2,solarPV,2036,2.24000000000
-19,2050,R2,solarPV,2036,2.24000000000
-19,2051,R2,solarPV,2036,2.24000000000
-19,2052,R2,solarPV,2036,2.24000000000
-19,2053,R2,solarPV,2036,2.24000000000
-19,2054,R2,solarPV,2036,2.24000000000
-19,2055,R2,solarPV,2036,2.24000000000
-19,2056,R2,solarPV,2036,2.24000000000
-19,2057,R2,solarPV,2036,2.24000000000
-19,2058,R2,solarPV,2036,2.24000000000
-19,2059,R2,solarPV,2036,2.24000000000
-19,2060,R2,solarPV,2036,2.24000000000
-19,2061,R2,solarPV,2036,2.24000000000
-19,2062,R2,solarPV,2036,2.24000000000
-20,2040,R2,solarPV,2038,2.24000000000
-20,2042,R2,solarPV,2038,2.24000000000
-20,2045,R2,solarPV,2038,2.24000000000
-20,2046,R2,solarPV,2038,2.24000000000
-20,2047,R2,solarPV,2038,2.24000000000
-20,2048,R2,solarPV,2038,2.24000000000
-20,2049,R2,solarPV,2038,2.24000000000
-20,2050,R2,solarPV,2038,2.24000000000
-20,2051,R2,solarPV,2038,2.24000000000
-20,2052,R2,solarPV,2038,2.24000000000
-20,2053,R2,solarPV,2038,2.24000000000
-20,2054,R2,solarPV,2038,2.24000000000
-20,2055,R2,solarPV,2038,2.24000000000
-20,2056,R2,solarPV,2038,2.24000000000
-20,2057,R2,solarPV,2038,2.24000000000
-20,2058,R2,solarPV,2038,2.24000000000
-20,2059,R2,solarPV,2038,2.24000000000
-20,2060,R2,solarPV,2038,2.24000000000
-20,2061,R2,solarPV,2038,2.24000000000
-20,2062,R2,solarPV,2038,2.24000000000
-20,2063,R2,solarPV,2038,2.24000000000
-20,2064,R2,solarPV,2038,2.24000000000
-21,2042,R2,solarPV,2040,2.24000000000
-21,2045,R2,solarPV,2040,2.24000000000
-21,2046,R2,solarPV,2040,2.24000000000
-21,2047,R2,solarPV,2040,2.24000000000
-21,2048,R2,solarPV,2040,2.24000000000
-21,2049,R2,solarPV,2040,2.24000000000
-21,2050,R2,solarPV,2040,2.24000000000
-21,2051,R2,solarPV,2040,2.24000000000
-21,2052,R2,solarPV,2040,2.24000000000
-21,2053,R2,solarPV,2040,2.24000000000
-21,2054,R2,solarPV,2040,2.24000000000
-21,2055,R2,solarPV,2040,2.24000000000
-21,2056,R2,solarPV,2040,2.24000000000
-21,2057,R2,solarPV,2040,2.24000000000
-21,2058,R2,solarPV,2040,2.24000000000
-21,2059,R2,solarPV,2040,2.24000000000
-21,2060,R2,solarPV,2040,2.24000000000
-21,2061,R2,solarPV,2040,2.24000000000
-21,2062,R2,solarPV,2040,2.24000000000
-21,2063,R2,solarPV,2040,2.24000000000
-21,2064,R2,solarPV,2040,2.24000000000
-21,2065,R2,solarPV,2040,2.24000000000
-21,2066,R2,solarPV,2040,2.24000000000
-22,2040,R2,windturbine,2020,11.79000000000
-22,2042,R2,windturbine,2020,11.79000000000
-22,2045,R2,windturbine,2020,11.79000000000
-22,2046,R2,windturbine,2020,11.79000000000
-23,2040,R2,windturbine,2022,1.68480000000
-23,2042,R2,windturbine,2022,1.68480000000
-23,2045,R2,windturbine,2022,1.68480000000
-23,2046,R2,windturbine,2022,1.68480000000
-23,2047,R2,windturbine,2022,1.68480000000
-23,2048,R2,windturbine,2022,1.68480000000
-24,2040,R2,windturbine,2024,6.37700000000
-24,2042,R2,windturbine,2024,6.37700000000
-24,2045,R2,windturbine,2024,6.37700000000
-24,2046,R2,windturbine,2024,6.37700000000
-24,2047,R2,windturbine,2024,6.37700000000
-24,2048,R2,windturbine,2024,6.37700000000
-24,2049,R2,windturbine,2024,6.37700000000
-24,2050,R2,windturbine,2024,6.37700000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+0,2026,R1,gasCCGT,2020,0.80000000000
+0,2028,R1,gasCCGT,2020,0.40000000000
+1,2028,R1,solarPV,2026,5.16960000000
+1,2030,R1,solarPV,2026,5.16960000000
+1,2032,R1,solarPV,2026,5.16960000000
+1,2034,R1,solarPV,2026,5.16960000000
+1,2035,R1,solarPV,2026,5.16960000000
+1,2036,R1,solarPV,2026,5.16960000000
+1,2038,R1,solarPV,2026,5.16960000000
+1,2040,R1,solarPV,2026,5.16960000000
+1,2042,R1,solarPV,2026,5.16960000000
+1,2045,R1,solarPV,2026,5.16960000000
+1,2046,R1,solarPV,2026,5.16960000000
+1,2047,R1,solarPV,2026,5.16960000000
+1,2048,R1,solarPV,2026,5.16960000000
+1,2049,R1,solarPV,2026,5.16960000000
+1,2050,R1,solarPV,2026,5.16960000000
+1,2051,R1,solarPV,2026,5.16960000000
+1,2052,R1,solarPV,2026,5.16960000000
+2,2030,R1,solarPV,2028,5.20080000000
+2,2032,R1,solarPV,2028,5.20080000000
+2,2034,R1,solarPV,2028,5.20080000000
+2,2035,R1,solarPV,2028,5.20080000000
+2,2036,R1,solarPV,2028,5.20080000000
+2,2038,R1,solarPV,2028,5.20080000000
+2,2040,R1,solarPV,2028,5.20080000000
+2,2042,R1,solarPV,2028,5.20080000000
+2,2045,R1,solarPV,2028,5.20080000000
+2,2046,R1,solarPV,2028,5.20080000000
+2,2047,R1,solarPV,2028,5.20080000000
+2,2048,R1,solarPV,2028,5.20080000000
+2,2049,R1,solarPV,2028,5.20080000000
+2,2050,R1,solarPV,2028,5.20080000000
+2,2051,R1,solarPV,2028,5.20080000000
+2,2052,R1,solarPV,2028,5.20080000000
+2,2053,R1,solarPV,2028,5.20080000000
+2,2054,R1,solarPV,2028,5.20080000000
+3,2032,R1,solarPV,2030,2.24000000000
+3,2034,R1,solarPV,2030,2.24000000000
+3,2035,R1,solarPV,2030,2.24000000000
+3,2036,R1,solarPV,2030,2.24000000000
+3,2038,R1,solarPV,2030,2.24000000000
+3,2040,R1,solarPV,2030,2.24000000000
+3,2042,R1,solarPV,2030,2.24000000000
+3,2045,R1,solarPV,2030,2.24000000000
+3,2046,R1,solarPV,2030,2.24000000000
+3,2047,R1,solarPV,2030,2.24000000000
+3,2048,R1,solarPV,2030,2.24000000000
+3,2049,R1,solarPV,2030,2.24000000000
+3,2050,R1,solarPV,2030,2.24000000000
+3,2051,R1,solarPV,2030,2.24000000000
+3,2052,R1,solarPV,2030,2.24000000000
+3,2053,R1,solarPV,2030,2.24000000000
+3,2054,R1,solarPV,2030,2.24000000000
+3,2055,R1,solarPV,2030,2.24000000000
+3,2056,R1,solarPV,2030,2.24000000000
+4,2034,R1,solarPV,2032,2.24000000000
+4,2035,R1,solarPV,2032,2.24000000000
+4,2036,R1,solarPV,2032,2.24000000000
+4,2038,R1,solarPV,2032,2.24000000000
+4,2040,R1,solarPV,2032,2.24000000000
+4,2042,R1,solarPV,2032,2.24000000000
+4,2045,R1,solarPV,2032,2.24000000000
+4,2046,R1,solarPV,2032,2.24000000000
+4,2047,R1,solarPV,2032,2.24000000000
+4,2048,R1,solarPV,2032,2.24000000000
+4,2049,R1,solarPV,2032,2.24000000000
+4,2050,R1,solarPV,2032,2.24000000000
+4,2051,R1,solarPV,2032,2.24000000000
+4,2052,R1,solarPV,2032,2.24000000000
+4,2053,R1,solarPV,2032,2.24000000000
+4,2054,R1,solarPV,2032,2.24000000000
+4,2055,R1,solarPV,2032,2.24000000000
+4,2056,R1,solarPV,2032,2.24000000000
+4,2057,R1,solarPV,2032,2.24000000000
+4,2058,R1,solarPV,2032,2.24000000000
+5,2036,R1,solarPV,2034,2.24000000000
+5,2038,R1,solarPV,2034,2.24000000000
+5,2040,R1,solarPV,2034,2.24000000000
+5,2042,R1,solarPV,2034,2.24000000000
+5,2045,R1,solarPV,2034,2.24000000000
+5,2046,R1,solarPV,2034,2.24000000000
+5,2047,R1,solarPV,2034,2.24000000000
+5,2048,R1,solarPV,2034,2.24000000000
+5,2049,R1,solarPV,2034,2.24000000000
+5,2050,R1,solarPV,2034,2.24000000000
+5,2051,R1,solarPV,2034,2.24000000000
+5,2052,R1,solarPV,2034,2.24000000000
+5,2053,R1,solarPV,2034,2.24000000000
+5,2054,R1,solarPV,2034,2.24000000000
+5,2055,R1,solarPV,2034,2.24000000000
+5,2056,R1,solarPV,2034,2.24000000000
+5,2057,R1,solarPV,2034,2.24000000000
+5,2058,R1,solarPV,2034,2.24000000000
+5,2059,R1,solarPV,2034,2.24000000000
+5,2060,R1,solarPV,2034,2.24000000000
+6,2038,R1,solarPV,2036,2.24000000000
+6,2040,R1,solarPV,2036,2.24000000000
+6,2042,R1,solarPV,2036,2.24000000000
+6,2045,R1,solarPV,2036,2.24000000000
+6,2046,R1,solarPV,2036,2.24000000000
+6,2047,R1,solarPV,2036,2.24000000000
+6,2048,R1,solarPV,2036,2.24000000000
+6,2049,R1,solarPV,2036,2.24000000000
+6,2050,R1,solarPV,2036,2.24000000000
+6,2051,R1,solarPV,2036,2.24000000000
+6,2052,R1,solarPV,2036,2.24000000000
+6,2053,R1,solarPV,2036,2.24000000000
+6,2054,R1,solarPV,2036,2.24000000000
+6,2055,R1,solarPV,2036,2.24000000000
+6,2056,R1,solarPV,2036,2.24000000000
+6,2057,R1,solarPV,2036,2.24000000000
+6,2058,R1,solarPV,2036,2.24000000000
+6,2059,R1,solarPV,2036,2.24000000000
+6,2060,R1,solarPV,2036,2.24000000000
+6,2061,R1,solarPV,2036,2.24000000000
+6,2062,R1,solarPV,2036,2.24000000000
+7,2040,R1,solarPV,2038,2.24000000000
+7,2042,R1,solarPV,2038,2.24000000000
+7,2045,R1,solarPV,2038,2.24000000000
+7,2046,R1,solarPV,2038,2.24000000000
+7,2047,R1,solarPV,2038,2.24000000000
+7,2048,R1,solarPV,2038,2.24000000000
+7,2049,R1,solarPV,2038,2.24000000000
+7,2050,R1,solarPV,2038,2.24000000000
+7,2051,R1,solarPV,2038,2.24000000000
+7,2052,R1,solarPV,2038,2.24000000000
+7,2053,R1,solarPV,2038,2.24000000000
+7,2054,R1,solarPV,2038,2.24000000000
+7,2055,R1,solarPV,2038,2.24000000000
+7,2056,R1,solarPV,2038,2.24000000000
+7,2057,R1,solarPV,2038,2.24000000000
+7,2058,R1,solarPV,2038,2.24000000000
+7,2059,R1,solarPV,2038,2.24000000000
+7,2060,R1,solarPV,2038,2.24000000000
+7,2061,R1,solarPV,2038,2.24000000000
+7,2062,R1,solarPV,2038,2.24000000000
+7,2063,R1,solarPV,2038,2.24000000000
+7,2064,R1,solarPV,2038,2.24000000000
+8,2042,R1,solarPV,2040,2.24000000000
+8,2045,R1,solarPV,2040,2.24000000000
+8,2046,R1,solarPV,2040,2.24000000000
+8,2047,R1,solarPV,2040,2.24000000000
+8,2048,R1,solarPV,2040,2.24000000000
+8,2049,R1,solarPV,2040,2.24000000000
+8,2050,R1,solarPV,2040,2.24000000000
+8,2051,R1,solarPV,2040,2.24000000000
+8,2052,R1,solarPV,2040,2.24000000000
+8,2053,R1,solarPV,2040,2.24000000000
+8,2054,R1,solarPV,2040,2.24000000000
+8,2055,R1,solarPV,2040,2.24000000000
+8,2056,R1,solarPV,2040,2.24000000000
+8,2057,R1,solarPV,2040,2.24000000000
+8,2058,R1,solarPV,2040,2.24000000000
+8,2059,R1,solarPV,2040,2.24000000000
+8,2060,R1,solarPV,2040,2.24000000000
+8,2061,R1,solarPV,2040,2.24000000000
+8,2062,R1,solarPV,2040,2.24000000000
+8,2063,R1,solarPV,2040,2.24000000000
+8,2064,R1,solarPV,2040,2.24000000000
+8,2065,R1,solarPV,2040,2.24000000000
+8,2066,R1,solarPV,2040,2.24000000000
+9,2022,R1,windturbine,2020,8.77320000000
+9,2024,R1,windturbine,2020,8.77320000000
+9,2025,R1,windturbine,2020,8.77320000000
+9,2026,R1,windturbine,2020,8.77320000000
+9,2028,R1,windturbine,2020,8.77320000000
+9,2030,R1,windturbine,2020,8.77320000000
+9,2032,R1,windturbine,2020,8.77320000000
+9,2034,R1,windturbine,2020,8.77320000000
+9,2035,R1,windturbine,2020,8.77320000000
+9,2036,R1,windturbine,2020,8.77320000000
+9,2038,R1,windturbine,2020,8.77320000000
+9,2040,R1,windturbine,2020,8.77320000000
+9,2042,R1,windturbine,2020,8.77320000000
+9,2045,R1,windturbine,2020,8.77320000000
+9,2046,R1,windturbine,2020,8.77320000000
+10,2024,R1,windturbine,2022,4.17680000000
+10,2025,R1,windturbine,2022,4.17680000000
+10,2026,R1,windturbine,2022,4.17680000000
+10,2028,R1,windturbine,2022,4.17680000000
+10,2030,R1,windturbine,2022,4.17680000000
+10,2032,R1,windturbine,2022,4.17680000000
+10,2034,R1,windturbine,2022,4.17680000000
+10,2035,R1,windturbine,2022,4.17680000000
+10,2036,R1,windturbine,2022,4.17680000000
+10,2038,R1,windturbine,2022,4.17680000000
+10,2040,R1,windturbine,2022,4.17680000000
+10,2042,R1,windturbine,2022,4.17680000000
+10,2045,R1,windturbine,2022,4.17680000000
+10,2046,R1,windturbine,2022,4.17680000000
+10,2047,R1,windturbine,2022,4.17680000000
+10,2048,R1,windturbine,2022,4.17680000000
+11,2026,R1,windturbine,2024,4.67960000000
+11,2028,R1,windturbine,2024,4.67960000000
+11,2030,R1,windturbine,2024,4.67960000000
+11,2032,R1,windturbine,2024,4.67960000000
+11,2034,R1,windturbine,2024,4.67960000000
+11,2035,R1,windturbine,2024,4.67960000000
+11,2036,R1,windturbine,2024,4.67960000000
+11,2038,R1,windturbine,2024,4.67960000000
+11,2040,R1,windturbine,2024,4.67960000000
+11,2042,R1,windturbine,2024,4.67960000000
+11,2045,R1,windturbine,2024,4.67960000000
+11,2046,R1,windturbine,2024,4.67960000000
+11,2047,R1,windturbine,2024,4.67960000000
+11,2048,R1,windturbine,2024,4.67960000000
+11,2049,R1,windturbine,2024,4.67960000000
+11,2050,R1,windturbine,2024,4.67960000000
+12,2020,R2,gasCCGT,2020,1.00000000000
+12,2022,R2,gasCCGT,2020,1.00000000000
+12,2024,R2,gasCCGT,2020,1.00000000000
+12,2025,R2,gasCCGT,2020,1.00000000000
+12,2026,R2,gasCCGT,2020,0.80000000000
+12,2028,R2,gasCCGT,2020,0.40000000000
+13,2028,R2,solarPV,2026,5.16960000000
+13,2030,R2,solarPV,2026,5.16960000000
+13,2032,R2,solarPV,2026,5.16960000000
+13,2034,R2,solarPV,2026,5.16960000000
+13,2035,R2,solarPV,2026,5.16960000000
+13,2036,R2,solarPV,2026,5.16960000000
+13,2038,R2,solarPV,2026,5.16960000000
+13,2040,R2,solarPV,2026,5.16960000000
+13,2042,R2,solarPV,2026,5.16960000000
+13,2045,R2,solarPV,2026,5.16960000000
+13,2046,R2,solarPV,2026,5.16960000000
+13,2047,R2,solarPV,2026,5.16960000000
+13,2048,R2,solarPV,2026,5.16960000000
+13,2049,R2,solarPV,2026,5.16960000000
+13,2050,R2,solarPV,2026,5.16960000000
+13,2051,R2,solarPV,2026,5.16960000000
+13,2052,R2,solarPV,2026,5.16960000000
+14,2030,R2,solarPV,2028,5.20080000000
+14,2032,R2,solarPV,2028,5.20080000000
+14,2034,R2,solarPV,2028,5.20080000000
+14,2035,R2,solarPV,2028,5.20080000000
+14,2036,R2,solarPV,2028,5.20080000000
+14,2038,R2,solarPV,2028,5.20080000000
+14,2040,R2,solarPV,2028,5.20080000000
+14,2042,R2,solarPV,2028,5.20080000000
+14,2045,R2,solarPV,2028,5.20080000000
+14,2046,R2,solarPV,2028,5.20080000000
+14,2047,R2,solarPV,2028,5.20080000000
+14,2048,R2,solarPV,2028,5.20080000000
+14,2049,R2,solarPV,2028,5.20080000000
+14,2050,R2,solarPV,2028,5.20080000000
+14,2051,R2,solarPV,2028,5.20080000000
+14,2052,R2,solarPV,2028,5.20080000000
+14,2053,R2,solarPV,2028,5.20080000000
+14,2054,R2,solarPV,2028,5.20080000000
+15,2032,R2,solarPV,2030,2.24000000000
+15,2034,R2,solarPV,2030,2.24000000000
+15,2035,R2,solarPV,2030,2.24000000000
+15,2036,R2,solarPV,2030,2.24000000000
+15,2038,R2,solarPV,2030,2.24000000000
+15,2040,R2,solarPV,2030,2.24000000000
+15,2042,R2,solarPV,2030,2.24000000000
+15,2045,R2,solarPV,2030,2.24000000000
+15,2046,R2,solarPV,2030,2.24000000000
+15,2047,R2,solarPV,2030,2.24000000000
+15,2048,R2,solarPV,2030,2.24000000000
+15,2049,R2,solarPV,2030,2.24000000000
+15,2050,R2,solarPV,2030,2.24000000000
+15,2051,R2,solarPV,2030,2.24000000000
+15,2052,R2,solarPV,2030,2.24000000000
+15,2053,R2,solarPV,2030,2.24000000000
+15,2054,R2,solarPV,2030,2.24000000000
+15,2055,R2,solarPV,2030,2.24000000000
+15,2056,R2,solarPV,2030,2.24000000000
+16,2034,R2,solarPV,2032,2.24000000000
+16,2035,R2,solarPV,2032,2.24000000000
+16,2036,R2,solarPV,2032,2.24000000000
+16,2038,R2,solarPV,2032,2.24000000000
+16,2040,R2,solarPV,2032,2.24000000000
+16,2042,R2,solarPV,2032,2.24000000000
+16,2045,R2,solarPV,2032,2.24000000000
+16,2046,R2,solarPV,2032,2.24000000000
+16,2047,R2,solarPV,2032,2.24000000000
+16,2048,R2,solarPV,2032,2.24000000000
+16,2049,R2,solarPV,2032,2.24000000000
+16,2050,R2,solarPV,2032,2.24000000000
+16,2051,R2,solarPV,2032,2.24000000000
+16,2052,R2,solarPV,2032,2.24000000000
+16,2053,R2,solarPV,2032,2.24000000000
+16,2054,R2,solarPV,2032,2.24000000000
+16,2055,R2,solarPV,2032,2.24000000000
+16,2056,R2,solarPV,2032,2.24000000000
+16,2057,R2,solarPV,2032,2.24000000000
+16,2058,R2,solarPV,2032,2.24000000000
+17,2036,R2,solarPV,2034,2.24000000000
+17,2038,R2,solarPV,2034,2.24000000000
+17,2040,R2,solarPV,2034,2.24000000000
+17,2042,R2,solarPV,2034,2.24000000000
+17,2045,R2,solarPV,2034,2.24000000000
+17,2046,R2,solarPV,2034,2.24000000000
+17,2047,R2,solarPV,2034,2.24000000000
+17,2048,R2,solarPV,2034,2.24000000000
+17,2049,R2,solarPV,2034,2.24000000000
+17,2050,R2,solarPV,2034,2.24000000000
+17,2051,R2,solarPV,2034,2.24000000000
+17,2052,R2,solarPV,2034,2.24000000000
+17,2053,R2,solarPV,2034,2.24000000000
+17,2054,R2,solarPV,2034,2.24000000000
+17,2055,R2,solarPV,2034,2.24000000000
+17,2056,R2,solarPV,2034,2.24000000000
+17,2057,R2,solarPV,2034,2.24000000000
+17,2058,R2,solarPV,2034,2.24000000000
+17,2059,R2,solarPV,2034,2.24000000000
+17,2060,R2,solarPV,2034,2.24000000000
+18,2038,R2,solarPV,2036,2.24000000000
+18,2040,R2,solarPV,2036,2.24000000000
+18,2042,R2,solarPV,2036,2.24000000000
+18,2045,R2,solarPV,2036,2.24000000000
+18,2046,R2,solarPV,2036,2.24000000000
+18,2047,R2,solarPV,2036,2.24000000000
+18,2048,R2,solarPV,2036,2.24000000000
+18,2049,R2,solarPV,2036,2.24000000000
+18,2050,R2,solarPV,2036,2.24000000000
+18,2051,R2,solarPV,2036,2.24000000000
+18,2052,R2,solarPV,2036,2.24000000000
+18,2053,R2,solarPV,2036,2.24000000000
+18,2054,R2,solarPV,2036,2.24000000000
+18,2055,R2,solarPV,2036,2.24000000000
+18,2056,R2,solarPV,2036,2.24000000000
+18,2057,R2,solarPV,2036,2.24000000000
+18,2058,R2,solarPV,2036,2.24000000000
+18,2059,R2,solarPV,2036,2.24000000000
+18,2060,R2,solarPV,2036,2.24000000000
+18,2061,R2,solarPV,2036,2.24000000000
+18,2062,R2,solarPV,2036,2.24000000000
+19,2040,R2,solarPV,2038,2.24000000000
+19,2042,R2,solarPV,2038,2.24000000000
+19,2045,R2,solarPV,2038,2.24000000000
+19,2046,R2,solarPV,2038,2.24000000000
+19,2047,R2,solarPV,2038,2.24000000000
+19,2048,R2,solarPV,2038,2.24000000000
+19,2049,R2,solarPV,2038,2.24000000000
+19,2050,R2,solarPV,2038,2.24000000000
+19,2051,R2,solarPV,2038,2.24000000000
+19,2052,R2,solarPV,2038,2.24000000000
+19,2053,R2,solarPV,2038,2.24000000000
+19,2054,R2,solarPV,2038,2.24000000000
+19,2055,R2,solarPV,2038,2.24000000000
+19,2056,R2,solarPV,2038,2.24000000000
+19,2057,R2,solarPV,2038,2.24000000000
+19,2058,R2,solarPV,2038,2.24000000000
+19,2059,R2,solarPV,2038,2.24000000000
+19,2060,R2,solarPV,2038,2.24000000000
+19,2061,R2,solarPV,2038,2.24000000000
+19,2062,R2,solarPV,2038,2.24000000000
+19,2063,R2,solarPV,2038,2.24000000000
+19,2064,R2,solarPV,2038,2.24000000000
+20,2042,R2,solarPV,2040,2.24000000000
+20,2045,R2,solarPV,2040,2.24000000000
+20,2046,R2,solarPV,2040,2.24000000000
+20,2047,R2,solarPV,2040,2.24000000000
+20,2048,R2,solarPV,2040,2.24000000000
+20,2049,R2,solarPV,2040,2.24000000000
+20,2050,R2,solarPV,2040,2.24000000000
+20,2051,R2,solarPV,2040,2.24000000000
+20,2052,R2,solarPV,2040,2.24000000000
+20,2053,R2,solarPV,2040,2.24000000000
+20,2054,R2,solarPV,2040,2.24000000000
+20,2055,R2,solarPV,2040,2.24000000000
+20,2056,R2,solarPV,2040,2.24000000000
+20,2057,R2,solarPV,2040,2.24000000000
+20,2058,R2,solarPV,2040,2.24000000000
+20,2059,R2,solarPV,2040,2.24000000000
+20,2060,R2,solarPV,2040,2.24000000000
+20,2061,R2,solarPV,2040,2.24000000000
+20,2062,R2,solarPV,2040,2.24000000000
+20,2063,R2,solarPV,2040,2.24000000000
+20,2064,R2,solarPV,2040,2.24000000000
+20,2065,R2,solarPV,2040,2.24000000000
+20,2066,R2,solarPV,2040,2.24000000000
+21,2022,R2,windturbine,2020,8.77320000000
+21,2024,R2,windturbine,2020,8.77320000000
+21,2025,R2,windturbine,2020,8.77320000000
+21,2026,R2,windturbine,2020,8.77320000000
+21,2028,R2,windturbine,2020,8.77320000000
+21,2030,R2,windturbine,2020,8.77320000000
+21,2032,R2,windturbine,2020,8.77320000000
+21,2034,R2,windturbine,2020,8.77320000000
+21,2035,R2,windturbine,2020,8.77320000000
+21,2036,R2,windturbine,2020,8.77320000000
+21,2038,R2,windturbine,2020,8.77320000000
+21,2040,R2,windturbine,2020,8.77320000000
+21,2042,R2,windturbine,2020,8.77320000000
+21,2045,R2,windturbine,2020,8.77320000000
+21,2046,R2,windturbine,2020,8.77320000000
+22,2024,R2,windturbine,2022,4.17680000000
+22,2025,R2,windturbine,2022,4.17680000000
+22,2026,R2,windturbine,2022,4.17680000000
+22,2028,R2,windturbine,2022,4.17680000000
+22,2030,R2,windturbine,2022,4.17680000000
+22,2032,R2,windturbine,2022,4.17680000000
+22,2034,R2,windturbine,2022,4.17680000000
+22,2035,R2,windturbine,2022,4.17680000000
+22,2036,R2,windturbine,2022,4.17680000000
+22,2038,R2,windturbine,2022,4.17680000000
+22,2040,R2,windturbine,2022,4.17680000000
+22,2042,R2,windturbine,2022,4.17680000000
+22,2045,R2,windturbine,2022,4.17680000000
+22,2046,R2,windturbine,2022,4.17680000000
+22,2047,R2,windturbine,2022,4.17680000000
+22,2048,R2,windturbine,2022,4.17680000000
+23,2026,R2,windturbine,2024,4.67960000000
+23,2028,R2,windturbine,2024,4.67960000000
+23,2030,R2,windturbine,2024,4.67960000000
+23,2032,R2,windturbine,2024,4.67960000000
+23,2034,R2,windturbine,2024,4.67960000000
+23,2035,R2,windturbine,2024,4.67960000000
+23,2036,R2,windturbine,2024,4.67960000000
+23,2038,R2,windturbine,2024,4.67960000000
+23,2040,R2,windturbine,2024,4.67960000000
+23,2042,R2,windturbine,2024,4.67960000000
+23,2045,R2,windturbine,2024,4.67960000000
+23,2046,R2,windturbine,2024,4.67960000000
+23,2047,R2,windturbine,2024,4.67960000000
+23,2048,R2,windturbine,2024,4.67960000000
+23,2049,R2,windturbine,2024,4.67960000000
+23,2050,R2,windturbine,2024,4.67960000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
index 151ff0b4..40efdf7b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2020.csv
@@ -1,15 +1,15 @@
-asset,year,technology,region,installed,capacity
-0,2020,gasboiler,R1,2020,10.00000000000
-0,2022,gasboiler,R1,2020,5.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2020,gasboiler,R2,2020,10.00000000000
-1,2022,gasboiler,R2,2020,5.00000000000
-1,2025,gasboiler,R2,2020,5.00000000000
-2,2022,heatpump,R1,2020,14.04000000000
-2,2025,heatpump,R1,2020,14.04000000000
-2,2030,heatpump,R1,2020,14.04000000000
-2,2031,heatpump,R1,2020,14.04000000000
-3,2022,heatpump,R2,2020,14.04000000000
-3,2025,heatpump,R2,2020,14.04000000000
-3,2030,heatpump,R2,2020,14.04000000000
-3,2031,heatpump,R2,2020,14.04000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2025,R1,gasboiler,2020,5
+1,2022,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2020,R2,gasboiler,2020,10
+2,2022,R2,gasboiler,2020,8
+2,2025,R2,gasboiler,2020,5
+3,2022,R2,heatpump,2020,11
+3,2025,R2,heatpump,2020,11
+3,2030,R2,heatpump,2020,11
+3,2031,R2,heatpump,2020,11
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 b902f224..57a5410f 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,41 +1,31 @@
 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,2024,R1,gasboiler,2022,0.55520000000
-1,2025,R1,gasboiler,2022,0.55520000000
-1,2030,R1,gasboiler,2022,0.55520000000
-1,2031,R1,gasboiler,2022,0.55520000000
-1,2032,R1,gasboiler,2022,0.55520000000
-1,2033,R1,gasboiler,2022,0.55520000000
-2,2022,R1,heatpump,2020,14.04000000000
-2,2024,R1,heatpump,2020,14.04000000000
-2,2025,R1,heatpump,2020,14.04000000000
-2,2030,R1,heatpump,2020,14.04000000000
-2,2031,R1,heatpump,2020,14.04000000000
-3,2024,R1,heatpump,2022,1.68480000000
-3,2025,R1,heatpump,2022,1.68480000000
-3,2030,R1,heatpump,2022,1.68480000000
-3,2031,R1,heatpump,2022,1.68480000000
-3,2032,R1,heatpump,2022,1.68480000000
-3,2033,R1,heatpump,2022,1.68480000000
-4,2022,R2,gasboiler,2020,5.00000000000
-4,2024,R2,gasboiler,2020,5.00000000000
-4,2025,R2,gasboiler,2020,5.00000000000
-5,2024,R2,gasboiler,2022,0.55520000000
-5,2025,R2,gasboiler,2022,0.55520000000
-5,2030,R2,gasboiler,2022,0.55520000000
-5,2031,R2,gasboiler,2022,0.55520000000
-5,2032,R2,gasboiler,2022,0.55520000000
-5,2033,R2,gasboiler,2022,0.55520000000
-6,2022,R2,heatpump,2020,14.04000000000
-6,2024,R2,heatpump,2020,14.04000000000
-6,2025,R2,heatpump,2020,14.04000000000
-6,2030,R2,heatpump,2020,14.04000000000
-6,2031,R2,heatpump,2020,14.04000000000
-7,2024,R2,heatpump,2022,1.68480000000
-7,2025,R2,heatpump,2022,1.68480000000
-7,2030,R2,heatpump,2022,1.68480000000
-7,2031,R2,heatpump,2022,1.68480000000
-7,2032,R2,heatpump,2022,1.68480000000
-7,2033,R2,heatpump,2022,1.68480000000
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2020,R2,gasboiler,2020,10
+3,2022,R2,gasboiler,2020,8
+3,2024,R2,gasboiler,2020,6
+3,2025,R2,gasboiler,2020,5
+4,2022,R2,heatpump,2020,11
+4,2024,R2,heatpump,2020,11
+4,2025,R2,heatpump,2020,11
+4,2030,R2,heatpump,2020,11
+4,2031,R2,heatpump,2020,11
+5,2024,R2,heatpump,2022,4
+5,2025,R2,heatpump,2022,4
+5,2030,R2,heatpump,2022,4
+5,2031,R2,heatpump,2022,4
+5,2032,R2,heatpump,2022,4
+5,2033,R2,heatpump,2022,4
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
index 5ae5a58f..f676b68f 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2024.csv
@@ -1,71 +1,51 @@
-asset,year,technology,region,installed,capacity
-0,2024,gasboiler,R1,2020,5.00000000000
-0,2025,gasboiler,R1,2020,5.00000000000
-1,2024,gasboiler,R1,2022,0.55520000000
-1,2025,gasboiler,R1,2022,0.55520000000
-1,2026,gasboiler,R1,2022,0.55520000000
-1,2030,gasboiler,R1,2022,0.55520000000
-1,2031,gasboiler,R1,2022,0.55520000000
-1,2032,gasboiler,R1,2022,0.55520000000
-1,2033,gasboiler,R1,2022,0.55520000000
-2,2026,gasboiler,R1,2024,3.11300000000
-2,2030,gasboiler,R1,2024,3.11300000000
-2,2031,gasboiler,R1,2024,3.11300000000
-2,2032,gasboiler,R1,2024,3.11300000000
-2,2033,gasboiler,R1,2024,3.11300000000
-2,2034,gasboiler,R1,2024,3.11300000000
-2,2035,gasboiler,R1,2024,3.11300000000
-3,2024,gasboiler,R2,2020,5.00000000000
-3,2025,gasboiler,R2,2020,5.00000000000
-4,2024,gasboiler,R2,2022,0.55520000000
-4,2025,gasboiler,R2,2022,0.55520000000
-4,2026,gasboiler,R2,2022,0.55520000000
-4,2030,gasboiler,R2,2022,0.55520000000
-4,2031,gasboiler,R2,2022,0.55520000000
-4,2032,gasboiler,R2,2022,0.55520000000
-4,2033,gasboiler,R2,2022,0.55520000000
-5,2026,gasboiler,R2,2024,3.11300000000
-5,2030,gasboiler,R2,2024,3.11300000000
-5,2031,gasboiler,R2,2024,3.11300000000
-5,2032,gasboiler,R2,2024,3.11300000000
-5,2033,gasboiler,R2,2024,3.11300000000
-5,2034,gasboiler,R2,2024,3.11300000000
-5,2035,gasboiler,R2,2024,3.11300000000
-6,2024,heatpump,R1,2020,14.04000000000
-6,2025,heatpump,R1,2020,14.04000000000
-6,2026,heatpump,R1,2020,14.04000000000
-6,2030,heatpump,R1,2020,14.04000000000
-6,2031,heatpump,R1,2020,14.04000000000
-7,2024,heatpump,R1,2022,1.68480000000
-7,2025,heatpump,R1,2022,1.68480000000
-7,2026,heatpump,R1,2022,1.68480000000
-7,2030,heatpump,R1,2022,1.68480000000
-7,2031,heatpump,R1,2022,1.68480000000
-7,2032,heatpump,R1,2022,1.68480000000
-7,2033,heatpump,R1,2022,1.68480000000
-8,2026,heatpump,R1,2024,4.12700000000
-8,2030,heatpump,R1,2024,4.12700000000
-8,2031,heatpump,R1,2024,4.12700000000
-8,2032,heatpump,R1,2024,4.12700000000
-8,2033,heatpump,R1,2024,4.12700000000
-8,2034,heatpump,R1,2024,4.12700000000
-8,2035,heatpump,R1,2024,4.12700000000
-9,2024,heatpump,R2,2020,14.04000000000
-9,2025,heatpump,R2,2020,14.04000000000
-9,2026,heatpump,R2,2020,14.04000000000
-9,2030,heatpump,R2,2020,14.04000000000
-9,2031,heatpump,R2,2020,14.04000000000
-10,2024,heatpump,R2,2022,1.68480000000
-10,2025,heatpump,R2,2022,1.68480000000
-10,2026,heatpump,R2,2022,1.68480000000
-10,2030,heatpump,R2,2022,1.68480000000
-10,2031,heatpump,R2,2022,1.68480000000
-10,2032,heatpump,R2,2022,1.68480000000
-10,2033,heatpump,R2,2022,1.68480000000
-11,2026,heatpump,R2,2024,4.12700000000
-11,2030,heatpump,R2,2024,4.12700000000
-11,2031,heatpump,R2,2024,4.12700000000
-11,2032,heatpump,R2,2024,4.12700000000
-11,2033,heatpump,R2,2024,4.12700000000
-11,2034,heatpump,R2,2024,4.12700000000
-11,2035,heatpump,R2,2024,4.12700000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2020,R2,gasboiler,2020,10
+4,2022,R2,gasboiler,2020,8
+4,2024,R2,gasboiler,2020,6
+4,2025,R2,gasboiler,2020,5
+4,2026,R2,gasboiler,2020,4
+5,2022,R2,heatpump,2020,11
+5,2024,R2,heatpump,2020,11
+5,2025,R2,heatpump,2020,11
+5,2026,R2,heatpump,2020,11
+5,2030,R2,heatpump,2020,11
+5,2031,R2,heatpump,2020,11
+6,2024,R2,heatpump,2022,4
+6,2025,R2,heatpump,2022,4
+6,2026,R2,heatpump,2022,4
+6,2030,R2,heatpump,2022,4
+6,2031,R2,heatpump,2022,4
+6,2032,R2,heatpump,2022,4
+6,2033,R2,heatpump,2022,4
+7,2026,R2,heatpump,2024,4
+7,2030,R2,heatpump,2024,4
+7,2031,R2,heatpump,2024,4
+7,2032,R2,heatpump,2024,4
+7,2033,R2,heatpump,2024,4
+7,2034,R2,heatpump,2024,4
+7,2035,R2,heatpump,2024,4
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 77042209..e4033d1c 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,83 +1,77 @@
 asset,year,region,technology,installed,capacity
-1,2026,R1,gasboiler,2022,0.55520000000
-1,2028,R1,gasboiler,2022,0.55520000000
-1,2030,R1,gasboiler,2022,0.55520000000
-1,2031,R1,gasboiler,2022,0.55520000000
-1,2032,R1,gasboiler,2022,0.55520000000
-1,2033,R1,gasboiler,2022,0.55520000000
-2,2026,R1,gasboiler,2024,3.11300000000
-2,2028,R1,gasboiler,2024,3.11300000000
-2,2030,R1,gasboiler,2024,3.11300000000
-2,2031,R1,gasboiler,2024,3.11300000000
-2,2032,R1,gasboiler,2024,3.11300000000
-2,2033,R1,gasboiler,2024,3.11300000000
-2,2034,R1,gasboiler,2024,3.11300000000
-2,2035,R1,gasboiler,2024,3.11300000000
-3,2026,R1,heatpump,2020,14.04000000000
-3,2028,R1,heatpump,2020,14.04000000000
-3,2030,R1,heatpump,2020,14.04000000000
-3,2031,R1,heatpump,2020,14.04000000000
-4,2026,R1,heatpump,2022,1.68480000000
-4,2028,R1,heatpump,2022,1.68480000000
-4,2030,R1,heatpump,2022,1.68480000000
-4,2031,R1,heatpump,2022,1.68480000000
-4,2032,R1,heatpump,2022,1.68480000000
-4,2033,R1,heatpump,2022,1.68480000000
-5,2026,R1,heatpump,2024,4.12700000000
-5,2028,R1,heatpump,2024,4.12700000000
-5,2030,R1,heatpump,2024,4.12700000000
-5,2031,R1,heatpump,2024,4.12700000000
-5,2032,R1,heatpump,2024,4.12700000000
-5,2033,R1,heatpump,2024,4.12700000000
-5,2034,R1,heatpump,2024,4.12700000000
-5,2035,R1,heatpump,2024,4.12700000000
-6,2028,R1,heatpump,2026,2.24000000000
-6,2030,R1,heatpump,2026,2.24000000000
-6,2031,R1,heatpump,2026,2.24000000000
-6,2032,R1,heatpump,2026,2.24000000000
-6,2033,R1,heatpump,2026,2.24000000000
-6,2034,R1,heatpump,2026,2.24000000000
-6,2035,R1,heatpump,2026,2.24000000000
-6,2036,R1,heatpump,2026,2.24000000000
-6,2037,R1,heatpump,2026,2.24000000000
-8,2026,R2,gasboiler,2022,0.55520000000
-8,2028,R2,gasboiler,2022,0.55520000000
-8,2030,R2,gasboiler,2022,0.55520000000
-8,2031,R2,gasboiler,2022,0.55520000000
-8,2032,R2,gasboiler,2022,0.55520000000
-8,2033,R2,gasboiler,2022,0.55520000000
-9,2026,R2,gasboiler,2024,3.11300000000
-9,2028,R2,gasboiler,2024,3.11300000000
-9,2030,R2,gasboiler,2024,3.11300000000
-9,2031,R2,gasboiler,2024,3.11300000000
-9,2032,R2,gasboiler,2024,3.11300000000
-9,2033,R2,gasboiler,2024,3.11300000000
-9,2034,R2,gasboiler,2024,3.11300000000
-9,2035,R2,gasboiler,2024,3.11300000000
-10,2026,R2,heatpump,2020,14.04000000000
-10,2028,R2,heatpump,2020,14.04000000000
-10,2030,R2,heatpump,2020,14.04000000000
-10,2031,R2,heatpump,2020,14.04000000000
-11,2026,R2,heatpump,2022,1.68480000000
-11,2028,R2,heatpump,2022,1.68480000000
-11,2030,R2,heatpump,2022,1.68480000000
-11,2031,R2,heatpump,2022,1.68480000000
-11,2032,R2,heatpump,2022,1.68480000000
-11,2033,R2,heatpump,2022,1.68480000000
-12,2026,R2,heatpump,2024,4.12700000000
-12,2028,R2,heatpump,2024,4.12700000000
-12,2030,R2,heatpump,2024,4.12700000000
-12,2031,R2,heatpump,2024,4.12700000000
-12,2032,R2,heatpump,2024,4.12700000000
-12,2033,R2,heatpump,2024,4.12700000000
-12,2034,R2,heatpump,2024,4.12700000000
-12,2035,R2,heatpump,2024,4.12700000000
-13,2028,R2,heatpump,2026,2.24000000000
-13,2030,R2,heatpump,2026,2.24000000000
-13,2031,R2,heatpump,2026,2.24000000000
-13,2032,R2,heatpump,2026,2.24000000000
-13,2033,R2,heatpump,2026,2.24000000000
-13,2034,R2,heatpump,2026,2.24000000000
-13,2035,R2,heatpump,2026,2.24000000000
-13,2036,R2,heatpump,2026,2.24000000000
-13,2037,R2,heatpump,2026,2.24000000000
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2020,R2,gasboiler,2020,10
+5,2022,R2,gasboiler,2020,8
+5,2024,R2,gasboiler,2020,6
+5,2025,R2,gasboiler,2020,5
+5,2026,R2,gasboiler,2020,4
+5,2028,R2,gasboiler,2020,2
+6,2022,R2,heatpump,2020,11
+6,2024,R2,heatpump,2020,11
+6,2025,R2,heatpump,2020,11
+6,2026,R2,heatpump,2020,11
+6,2028,R2,heatpump,2020,11
+6,2030,R2,heatpump,2020,11
+6,2031,R2,heatpump,2020,11
+7,2024,R2,heatpump,2022,4
+7,2025,R2,heatpump,2022,4
+7,2026,R2,heatpump,2022,4
+7,2028,R2,heatpump,2022,4
+7,2030,R2,heatpump,2022,4
+7,2031,R2,heatpump,2022,4
+7,2032,R2,heatpump,2022,4
+7,2033,R2,heatpump,2022,4
+8,2026,R2,heatpump,2024,4
+8,2028,R2,heatpump,2024,4
+8,2030,R2,heatpump,2024,4
+8,2031,R2,heatpump,2024,4
+8,2032,R2,heatpump,2024,4
+8,2033,R2,heatpump,2024,4
+8,2034,R2,heatpump,2024,4
+8,2035,R2,heatpump,2024,4
+9,2028,R2,heatpump,2026,4
+9,2030,R2,heatpump,2026,4
+9,2031,R2,heatpump,2026,4
+9,2032,R2,heatpump,2026,4
+9,2033,R2,heatpump,2026,4
+9,2034,R2,heatpump,2026,4
+9,2035,R2,heatpump,2026,4
+9,2036,R2,heatpump,2026,4
+9,2037,R2,heatpump,2026,4
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 137ec1db..7327d219 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,93 +1,97 @@
 asset,year,region,technology,installed,capacity
-1,2028,R1,gasboiler,2022,0.55520000000
-1,2030,R1,gasboiler,2022,0.55520000000
-1,2031,R1,gasboiler,2022,0.55520000000
-1,2032,R1,gasboiler,2022,0.55520000000
-1,2033,R1,gasboiler,2022,0.55520000000
-2,2028,R1,gasboiler,2024,3.11300000000
-2,2030,R1,gasboiler,2024,3.11300000000
-2,2031,R1,gasboiler,2024,3.11300000000
-2,2032,R1,gasboiler,2024,3.11300000000
-2,2033,R1,gasboiler,2024,3.11300000000
-2,2034,R1,gasboiler,2024,3.11300000000
-2,2035,R1,gasboiler,2024,3.11300000000
-3,2028,R1,heatpump,2020,14.04000000000
-3,2030,R1,heatpump,2020,14.04000000000
-3,2031,R1,heatpump,2020,14.04000000000
-4,2028,R1,heatpump,2022,1.68480000000
-4,2030,R1,heatpump,2022,1.68480000000
-4,2031,R1,heatpump,2022,1.68480000000
-4,2032,R1,heatpump,2022,1.68480000000
-4,2033,R1,heatpump,2022,1.68480000000
-5,2028,R1,heatpump,2024,4.12700000000
-5,2030,R1,heatpump,2024,4.12700000000
-5,2031,R1,heatpump,2024,4.12700000000
-5,2032,R1,heatpump,2024,4.12700000000
-5,2033,R1,heatpump,2024,4.12700000000
-5,2034,R1,heatpump,2024,4.12700000000
-5,2035,R1,heatpump,2024,4.12700000000
-6,2028,R1,heatpump,2026,2.24000000000
-6,2030,R1,heatpump,2026,2.24000000000
-6,2031,R1,heatpump,2026,2.24000000000
-6,2032,R1,heatpump,2026,2.24000000000
-6,2033,R1,heatpump,2026,2.24000000000
-6,2034,R1,heatpump,2026,2.24000000000
-6,2035,R1,heatpump,2026,2.24000000000
-6,2036,R1,heatpump,2026,2.24000000000
-6,2037,R1,heatpump,2026,2.24000000000
-7,2030,R1,heatpump,2028,2.24000000000
-7,2031,R1,heatpump,2028,2.24000000000
-7,2032,R1,heatpump,2028,2.24000000000
-7,2033,R1,heatpump,2028,2.24000000000
-7,2034,R1,heatpump,2028,2.24000000000
-7,2035,R1,heatpump,2028,2.24000000000
-7,2036,R1,heatpump,2028,2.24000000000
-7,2037,R1,heatpump,2028,2.24000000000
-7,2038,R1,heatpump,2028,2.24000000000
-7,2039,R1,heatpump,2028,2.24000000000
-9,2028,R2,gasboiler,2022,0.55520000000
-9,2030,R2,gasboiler,2022,0.55520000000
-9,2031,R2,gasboiler,2022,0.55520000000
-9,2032,R2,gasboiler,2022,0.55520000000
-9,2033,R2,gasboiler,2022,0.55520000000
-10,2028,R2,gasboiler,2024,3.11300000000
-10,2030,R2,gasboiler,2024,3.11300000000
-10,2031,R2,gasboiler,2024,3.11300000000
-10,2032,R2,gasboiler,2024,3.11300000000
-10,2033,R2,gasboiler,2024,3.11300000000
-10,2034,R2,gasboiler,2024,3.11300000000
-10,2035,R2,gasboiler,2024,3.11300000000
-11,2028,R2,heatpump,2020,14.04000000000
-11,2030,R2,heatpump,2020,14.04000000000
-11,2031,R2,heatpump,2020,14.04000000000
-12,2028,R2,heatpump,2022,1.68480000000
-12,2030,R2,heatpump,2022,1.68480000000
-12,2031,R2,heatpump,2022,1.68480000000
-12,2032,R2,heatpump,2022,1.68480000000
-12,2033,R2,heatpump,2022,1.68480000000
-13,2028,R2,heatpump,2024,4.12700000000
-13,2030,R2,heatpump,2024,4.12700000000
-13,2031,R2,heatpump,2024,4.12700000000
-13,2032,R2,heatpump,2024,4.12700000000
-13,2033,R2,heatpump,2024,4.12700000000
-13,2034,R2,heatpump,2024,4.12700000000
-13,2035,R2,heatpump,2024,4.12700000000
-14,2028,R2,heatpump,2026,2.24000000000
-14,2030,R2,heatpump,2026,2.24000000000
-14,2031,R2,heatpump,2026,2.24000000000
-14,2032,R2,heatpump,2026,2.24000000000
-14,2033,R2,heatpump,2026,2.24000000000
-14,2034,R2,heatpump,2026,2.24000000000
-14,2035,R2,heatpump,2026,2.24000000000
-14,2036,R2,heatpump,2026,2.24000000000
-14,2037,R2,heatpump,2026,2.24000000000
-15,2030,R2,heatpump,2028,2.24000000000
-15,2031,R2,heatpump,2028,2.24000000000
-15,2032,R2,heatpump,2028,2.24000000000
-15,2033,R2,heatpump,2028,2.24000000000
-15,2034,R2,heatpump,2028,2.24000000000
-15,2035,R2,heatpump,2028,2.24000000000
-15,2036,R2,heatpump,2028,2.24000000000
-15,2037,R2,heatpump,2028,2.24000000000
-15,2038,R2,heatpump,2028,2.24000000000
-15,2039,R2,heatpump,2028,2.24000000000
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2020,R2,gasboiler,2020,10
+6,2022,R2,gasboiler,2020,8
+6,2024,R2,gasboiler,2020,6
+6,2025,R2,gasboiler,2020,5
+6,2026,R2,gasboiler,2020,4
+6,2028,R2,gasboiler,2020,2
+7,2022,R2,heatpump,2020,11
+7,2024,R2,heatpump,2020,11
+7,2025,R2,heatpump,2020,11
+7,2026,R2,heatpump,2020,11
+7,2028,R2,heatpump,2020,11
+7,2030,R2,heatpump,2020,11
+7,2031,R2,heatpump,2020,11
+8,2024,R2,heatpump,2022,4
+8,2025,R2,heatpump,2022,4
+8,2026,R2,heatpump,2022,4
+8,2028,R2,heatpump,2022,4
+8,2030,R2,heatpump,2022,4
+8,2031,R2,heatpump,2022,4
+8,2032,R2,heatpump,2022,4
+8,2033,R2,heatpump,2022,4
+9,2026,R2,heatpump,2024,4
+9,2028,R2,heatpump,2024,4
+9,2030,R2,heatpump,2024,4
+9,2031,R2,heatpump,2024,4
+9,2032,R2,heatpump,2024,4
+9,2033,R2,heatpump,2024,4
+9,2034,R2,heatpump,2024,4
+9,2035,R2,heatpump,2024,4
+10,2028,R2,heatpump,2026,4
+10,2030,R2,heatpump,2026,4
+10,2031,R2,heatpump,2026,4
+10,2032,R2,heatpump,2026,4
+10,2033,R2,heatpump,2026,4
+10,2034,R2,heatpump,2026,4
+10,2035,R2,heatpump,2026,4
+10,2036,R2,heatpump,2026,4
+10,2037,R2,heatpump,2026,4
+11,2030,R2,heatpump,2028,5
+11,2031,R2,heatpump,2028,5
+11,2032,R2,heatpump,2028,5
+11,2033,R2,heatpump,2028,5
+11,2034,R2,heatpump,2028,5
+11,2035,R2,heatpump,2028,5
+11,2036,R2,heatpump,2028,5
+11,2037,R2,heatpump,2028,5
+11,2038,R2,heatpump,2028,5
+11,2039,R2,heatpump,2028,5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
index f015a71b..9accbd46 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2030.csv
@@ -1,101 +1,117 @@
-asset,year,technology,region,installed,capacity
-0,2030,gasboiler,R1,2022,0.55520000000
-0,2031,gasboiler,R1,2022,0.55520000000
-0,2032,gasboiler,R1,2022,0.55520000000
-0,2033,gasboiler,R1,2022,0.55520000000
-1,2030,gasboiler,R1,2024,3.11300000000
-1,2031,gasboiler,R1,2024,3.11300000000
-1,2032,gasboiler,R1,2024,3.11300000000
-1,2033,gasboiler,R1,2024,3.11300000000
-1,2034,gasboiler,R1,2024,3.11300000000
-1,2035,gasboiler,R1,2024,3.11300000000
-2,2030,gasboiler,R2,2022,0.55520000000
-2,2031,gasboiler,R2,2022,0.55520000000
-2,2032,gasboiler,R2,2022,0.55520000000
-2,2033,gasboiler,R2,2022,0.55520000000
-3,2030,gasboiler,R2,2024,3.11300000000
-3,2031,gasboiler,R2,2024,3.11300000000
-3,2032,gasboiler,R2,2024,3.11300000000
-3,2033,gasboiler,R2,2024,3.11300000000
-3,2034,gasboiler,R2,2024,3.11300000000
-3,2035,gasboiler,R2,2024,3.11300000000
-4,2030,heatpump,R1,2020,14.04000000000
-4,2031,heatpump,R1,2020,14.04000000000
-5,2030,heatpump,R1,2022,1.68480000000
-5,2031,heatpump,R1,2022,1.68480000000
-5,2032,heatpump,R1,2022,1.68480000000
-5,2033,heatpump,R1,2022,1.68480000000
-6,2030,heatpump,R1,2024,4.12700000000
-6,2031,heatpump,R1,2024,4.12700000000
-6,2032,heatpump,R1,2024,4.12700000000
-6,2033,heatpump,R1,2024,4.12700000000
-6,2034,heatpump,R1,2024,4.12700000000
-6,2035,heatpump,R1,2024,4.12700000000
-7,2030,heatpump,R1,2026,2.24000000000
-7,2031,heatpump,R1,2026,2.24000000000
-7,2032,heatpump,R1,2026,2.24000000000
-7,2033,heatpump,R1,2026,2.24000000000
-7,2034,heatpump,R1,2026,2.24000000000
-7,2035,heatpump,R1,2026,2.24000000000
-7,2036,heatpump,R1,2026,2.24000000000
-7,2037,heatpump,R1,2026,2.24000000000
-8,2030,heatpump,R1,2028,2.24000000000
-8,2031,heatpump,R1,2028,2.24000000000
-8,2032,heatpump,R1,2028,2.24000000000
-8,2033,heatpump,R1,2028,2.24000000000
-8,2034,heatpump,R1,2028,2.24000000000
-8,2035,heatpump,R1,2028,2.24000000000
-8,2036,heatpump,R1,2028,2.24000000000
-8,2037,heatpump,R1,2028,2.24000000000
-8,2038,heatpump,R1,2028,2.24000000000
-8,2039,heatpump,R1,2028,2.24000000000
-9,2032,heatpump,R1,2030,16.28000000000
-9,2033,heatpump,R1,2030,16.28000000000
-9,2034,heatpump,R1,2030,16.28000000000
-9,2035,heatpump,R1,2030,16.28000000000
-9,2036,heatpump,R1,2030,16.28000000000
-9,2037,heatpump,R1,2030,16.28000000000
-9,2038,heatpump,R1,2030,16.28000000000
-9,2039,heatpump,R1,2030,16.28000000000
-9,2040,heatpump,R1,2030,16.28000000000
-9,2041,heatpump,R1,2030,16.28000000000
-10,2030,heatpump,R2,2020,14.04000000000
-10,2031,heatpump,R2,2020,14.04000000000
-11,2030,heatpump,R2,2022,1.68480000000
-11,2031,heatpump,R2,2022,1.68480000000
-11,2032,heatpump,R2,2022,1.68480000000
-11,2033,heatpump,R2,2022,1.68480000000
-12,2030,heatpump,R2,2024,4.12700000000
-12,2031,heatpump,R2,2024,4.12700000000
-12,2032,heatpump,R2,2024,4.12700000000
-12,2033,heatpump,R2,2024,4.12700000000
-12,2034,heatpump,R2,2024,4.12700000000
-12,2035,heatpump,R2,2024,4.12700000000
-13,2030,heatpump,R2,2026,2.24000000000
-13,2031,heatpump,R2,2026,2.24000000000
-13,2032,heatpump,R2,2026,2.24000000000
-13,2033,heatpump,R2,2026,2.24000000000
-13,2034,heatpump,R2,2026,2.24000000000
-13,2035,heatpump,R2,2026,2.24000000000
-13,2036,heatpump,R2,2026,2.24000000000
-13,2037,heatpump,R2,2026,2.24000000000
-14,2030,heatpump,R2,2028,2.24000000000
-14,2031,heatpump,R2,2028,2.24000000000
-14,2032,heatpump,R2,2028,2.24000000000
-14,2033,heatpump,R2,2028,2.24000000000
-14,2034,heatpump,R2,2028,2.24000000000
-14,2035,heatpump,R2,2028,2.24000000000
-14,2036,heatpump,R2,2028,2.24000000000
-14,2037,heatpump,R2,2028,2.24000000000
-14,2038,heatpump,R2,2028,2.24000000000
-14,2039,heatpump,R2,2028,2.24000000000
-15,2032,heatpump,R2,2030,16.28000000000
-15,2033,heatpump,R2,2030,16.28000000000
-15,2034,heatpump,R2,2030,16.28000000000
-15,2035,heatpump,R2,2030,16.28000000000
-15,2036,heatpump,R2,2030,16.28000000000
-15,2037,heatpump,R2,2030,16.28000000000
-15,2038,heatpump,R2,2030,16.28000000000
-15,2039,heatpump,R2,2030,16.28000000000
-15,2040,heatpump,R2,2030,16.28000000000
-15,2041,heatpump,R2,2030,16.28000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2032,R1,heatpump,2030,13
+6,2033,R1,heatpump,2030,13
+6,2034,R1,heatpump,2030,13
+6,2035,R1,heatpump,2030,13
+6,2036,R1,heatpump,2030,13
+6,2037,R1,heatpump,2030,13
+6,2038,R1,heatpump,2030,13
+6,2039,R1,heatpump,2030,13
+6,2040,R1,heatpump,2030,13
+6,2041,R1,heatpump,2030,13
+7,2020,R2,gasboiler,2020,10
+7,2022,R2,gasboiler,2020,8
+7,2024,R2,gasboiler,2020,6
+7,2025,R2,gasboiler,2020,5
+7,2026,R2,gasboiler,2020,4
+7,2028,R2,gasboiler,2020,2
+8,2022,R2,heatpump,2020,11
+8,2024,R2,heatpump,2020,11
+8,2025,R2,heatpump,2020,11
+8,2026,R2,heatpump,2020,11
+8,2028,R2,heatpump,2020,11
+8,2030,R2,heatpump,2020,11
+8,2031,R2,heatpump,2020,11
+9,2024,R2,heatpump,2022,4
+9,2025,R2,heatpump,2022,4
+9,2026,R2,heatpump,2022,4
+9,2028,R2,heatpump,2022,4
+9,2030,R2,heatpump,2022,4
+9,2031,R2,heatpump,2022,4
+9,2032,R2,heatpump,2022,4
+9,2033,R2,heatpump,2022,4
+10,2026,R2,heatpump,2024,4
+10,2028,R2,heatpump,2024,4
+10,2030,R2,heatpump,2024,4
+10,2031,R2,heatpump,2024,4
+10,2032,R2,heatpump,2024,4
+10,2033,R2,heatpump,2024,4
+10,2034,R2,heatpump,2024,4
+10,2035,R2,heatpump,2024,4
+11,2028,R2,heatpump,2026,4
+11,2030,R2,heatpump,2026,4
+11,2031,R2,heatpump,2026,4
+11,2032,R2,heatpump,2026,4
+11,2033,R2,heatpump,2026,4
+11,2034,R2,heatpump,2026,4
+11,2035,R2,heatpump,2026,4
+11,2036,R2,heatpump,2026,4
+11,2037,R2,heatpump,2026,4
+12,2030,R2,heatpump,2028,5
+12,2031,R2,heatpump,2028,5
+12,2032,R2,heatpump,2028,5
+12,2033,R2,heatpump,2028,5
+12,2034,R2,heatpump,2028,5
+12,2035,R2,heatpump,2028,5
+12,2036,R2,heatpump,2028,5
+12,2037,R2,heatpump,2028,5
+12,2038,R2,heatpump,2028,5
+12,2039,R2,heatpump,2028,5
+13,2032,R2,heatpump,2030,13
+13,2033,R2,heatpump,2030,13
+13,2034,R2,heatpump,2030,13
+13,2035,R2,heatpump,2030,13
+13,2036,R2,heatpump,2030,13
+13,2037,R2,heatpump,2030,13
+13,2038,R2,heatpump,2030,13
+13,2039,R2,heatpump,2030,13
+13,2040,R2,heatpump,2030,13
+13,2041,R2,heatpump,2030,13
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
index 82582b38..eb37b41d 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2032.csv
@@ -1,93 +1,137 @@
-asset,year,technology,region,installed,capacity
-0,2032,gasboiler,R1,2022,0.55520000000
-0,2033,gasboiler,R1,2022,0.55520000000
-1,2032,gasboiler,R1,2024,3.11300000000
-1,2033,gasboiler,R1,2024,3.11300000000
-1,2034,gasboiler,R1,2024,3.11300000000
-1,2035,gasboiler,R1,2024,3.11300000000
-2,2032,gasboiler,R2,2022,0.55520000000
-2,2033,gasboiler,R2,2022,0.55520000000
-3,2032,gasboiler,R2,2024,3.11300000000
-3,2033,gasboiler,R2,2024,3.11300000000
-3,2034,gasboiler,R2,2024,3.11300000000
-3,2035,gasboiler,R2,2024,3.11300000000
-4,2032,heatpump,R1,2022,1.68480000000
-4,2033,heatpump,R1,2022,1.68480000000
-5,2032,heatpump,R1,2024,4.12700000000
-5,2033,heatpump,R1,2024,4.12700000000
-5,2034,heatpump,R1,2024,4.12700000000
-5,2035,heatpump,R1,2024,4.12700000000
-6,2032,heatpump,R1,2026,2.24000000000
-6,2033,heatpump,R1,2026,2.24000000000
-6,2034,heatpump,R1,2026,2.24000000000
-6,2035,heatpump,R1,2026,2.24000000000
-6,2036,heatpump,R1,2026,2.24000000000
-6,2037,heatpump,R1,2026,2.24000000000
-7,2032,heatpump,R1,2028,2.24000000000
-7,2033,heatpump,R1,2028,2.24000000000
-7,2034,heatpump,R1,2028,2.24000000000
-7,2035,heatpump,R1,2028,2.24000000000
-7,2036,heatpump,R1,2028,2.24000000000
-7,2037,heatpump,R1,2028,2.24000000000
-7,2038,heatpump,R1,2028,2.24000000000
-7,2039,heatpump,R1,2028,2.24000000000
-8,2032,heatpump,R1,2030,16.28000000000
-8,2033,heatpump,R1,2030,16.28000000000
-8,2034,heatpump,R1,2030,16.28000000000
-8,2035,heatpump,R1,2030,16.28000000000
-8,2036,heatpump,R1,2030,16.28000000000
-8,2037,heatpump,R1,2030,16.28000000000
-8,2038,heatpump,R1,2030,16.28000000000
-8,2039,heatpump,R1,2030,16.28000000000
-8,2040,heatpump,R1,2030,16.28000000000
-8,2041,heatpump,R1,2030,16.28000000000
-9,2034,heatpump,R1,2032,4.48000000000
-9,2035,heatpump,R1,2032,4.48000000000
-9,2036,heatpump,R1,2032,4.48000000000
-9,2037,heatpump,R1,2032,4.48000000000
-9,2038,heatpump,R1,2032,4.48000000000
-9,2039,heatpump,R1,2032,4.48000000000
-9,2040,heatpump,R1,2032,4.48000000000
-9,2041,heatpump,R1,2032,4.48000000000
-9,2042,heatpump,R1,2032,4.48000000000
-9,2043,heatpump,R1,2032,4.48000000000
-10,2032,heatpump,R2,2022,1.68480000000
-10,2033,heatpump,R2,2022,1.68480000000
-11,2032,heatpump,R2,2024,4.12700000000
-11,2033,heatpump,R2,2024,4.12700000000
-11,2034,heatpump,R2,2024,4.12700000000
-11,2035,heatpump,R2,2024,4.12700000000
-12,2032,heatpump,R2,2026,2.24000000000
-12,2033,heatpump,R2,2026,2.24000000000
-12,2034,heatpump,R2,2026,2.24000000000
-12,2035,heatpump,R2,2026,2.24000000000
-12,2036,heatpump,R2,2026,2.24000000000
-12,2037,heatpump,R2,2026,2.24000000000
-13,2032,heatpump,R2,2028,2.24000000000
-13,2033,heatpump,R2,2028,2.24000000000
-13,2034,heatpump,R2,2028,2.24000000000
-13,2035,heatpump,R2,2028,2.24000000000
-13,2036,heatpump,R2,2028,2.24000000000
-13,2037,heatpump,R2,2028,2.24000000000
-13,2038,heatpump,R2,2028,2.24000000000
-13,2039,heatpump,R2,2028,2.24000000000
-14,2032,heatpump,R2,2030,16.28000000000
-14,2033,heatpump,R2,2030,16.28000000000
-14,2034,heatpump,R2,2030,16.28000000000
-14,2035,heatpump,R2,2030,16.28000000000
-14,2036,heatpump,R2,2030,16.28000000000
-14,2037,heatpump,R2,2030,16.28000000000
-14,2038,heatpump,R2,2030,16.28000000000
-14,2039,heatpump,R2,2030,16.28000000000
-14,2040,heatpump,R2,2030,16.28000000000
-14,2041,heatpump,R2,2030,16.28000000000
-15,2034,heatpump,R2,2032,4.48000000000
-15,2035,heatpump,R2,2032,4.48000000000
-15,2036,heatpump,R2,2032,4.48000000000
-15,2037,heatpump,R2,2032,4.48000000000
-15,2038,heatpump,R2,2032,4.48000000000
-15,2039,heatpump,R2,2032,4.48000000000
-15,2040,heatpump,R2,2032,4.48000000000
-15,2041,heatpump,R2,2032,4.48000000000
-15,2042,heatpump,R2,2032,4.48000000000
-15,2043,heatpump,R2,2032,4.48000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2032,R1,heatpump,2030,13
+6,2033,R1,heatpump,2030,13
+6,2034,R1,heatpump,2030,13
+6,2035,R1,heatpump,2030,13
+6,2036,R1,heatpump,2030,13
+6,2037,R1,heatpump,2030,13
+6,2038,R1,heatpump,2030,13
+6,2039,R1,heatpump,2030,13
+6,2040,R1,heatpump,2030,13
+6,2041,R1,heatpump,2030,13
+7,2034,R1,heatpump,2032,6
+7,2035,R1,heatpump,2032,6
+7,2036,R1,heatpump,2032,6
+7,2037,R1,heatpump,2032,6
+7,2038,R1,heatpump,2032,6
+7,2039,R1,heatpump,2032,6
+7,2040,R1,heatpump,2032,6
+7,2041,R1,heatpump,2032,6
+7,2042,R1,heatpump,2032,6
+7,2043,R1,heatpump,2032,6
+8,2020,R2,gasboiler,2020,10
+8,2022,R2,gasboiler,2020,8
+8,2024,R2,gasboiler,2020,6
+8,2025,R2,gasboiler,2020,5
+8,2026,R2,gasboiler,2020,4
+8,2028,R2,gasboiler,2020,2
+9,2022,R2,heatpump,2020,11
+9,2024,R2,heatpump,2020,11
+9,2025,R2,heatpump,2020,11
+9,2026,R2,heatpump,2020,11
+9,2028,R2,heatpump,2020,11
+9,2030,R2,heatpump,2020,11
+9,2031,R2,heatpump,2020,11
+10,2024,R2,heatpump,2022,4
+10,2025,R2,heatpump,2022,4
+10,2026,R2,heatpump,2022,4
+10,2028,R2,heatpump,2022,4
+10,2030,R2,heatpump,2022,4
+10,2031,R2,heatpump,2022,4
+10,2032,R2,heatpump,2022,4
+10,2033,R2,heatpump,2022,4
+11,2026,R2,heatpump,2024,4
+11,2028,R2,heatpump,2024,4
+11,2030,R2,heatpump,2024,4
+11,2031,R2,heatpump,2024,4
+11,2032,R2,heatpump,2024,4
+11,2033,R2,heatpump,2024,4
+11,2034,R2,heatpump,2024,4
+11,2035,R2,heatpump,2024,4
+12,2028,R2,heatpump,2026,4
+12,2030,R2,heatpump,2026,4
+12,2031,R2,heatpump,2026,4
+12,2032,R2,heatpump,2026,4
+12,2033,R2,heatpump,2026,4
+12,2034,R2,heatpump,2026,4
+12,2035,R2,heatpump,2026,4
+12,2036,R2,heatpump,2026,4
+12,2037,R2,heatpump,2026,4
+13,2030,R2,heatpump,2028,5
+13,2031,R2,heatpump,2028,5
+13,2032,R2,heatpump,2028,5
+13,2033,R2,heatpump,2028,5
+13,2034,R2,heatpump,2028,5
+13,2035,R2,heatpump,2028,5
+13,2036,R2,heatpump,2028,5
+13,2037,R2,heatpump,2028,5
+13,2038,R2,heatpump,2028,5
+13,2039,R2,heatpump,2028,5
+14,2032,R2,heatpump,2030,13
+14,2033,R2,heatpump,2030,13
+14,2034,R2,heatpump,2030,13
+14,2035,R2,heatpump,2030,13
+14,2036,R2,heatpump,2030,13
+14,2037,R2,heatpump,2030,13
+14,2038,R2,heatpump,2030,13
+14,2039,R2,heatpump,2030,13
+14,2040,R2,heatpump,2030,13
+14,2041,R2,heatpump,2030,13
+15,2034,R2,heatpump,2032,6
+15,2035,R2,heatpump,2032,6
+15,2036,R2,heatpump,2032,6
+15,2037,R2,heatpump,2032,6
+15,2038,R2,heatpump,2032,6
+15,2039,R2,heatpump,2032,6
+15,2040,R2,heatpump,2032,6
+15,2041,R2,heatpump,2032,6
+15,2042,R2,heatpump,2032,6
+15,2043,R2,heatpump,2032,6
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
index d7027c5b..4254a6b6 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2034.csv
@@ -1,85 +1,157 @@
-asset,year,technology,region,installed,capacity
-0,2034,gasboiler,R1,2024,3.11300000000
-0,2035,gasboiler,R1,2024,3.11300000000
-1,2034,gasboiler,R2,2024,3.11300000000
-1,2035,gasboiler,R2,2024,3.11300000000
-2,2034,heatpump,R1,2024,4.12700000000
-2,2035,heatpump,R1,2024,4.12700000000
-3,2034,heatpump,R1,2026,2.24000000000
-3,2035,heatpump,R1,2026,2.24000000000
-3,2036,heatpump,R1,2026,2.24000000000
-3,2037,heatpump,R1,2026,2.24000000000
-4,2034,heatpump,R1,2028,2.24000000000
-4,2035,heatpump,R1,2028,2.24000000000
-4,2036,heatpump,R1,2028,2.24000000000
-4,2037,heatpump,R1,2028,2.24000000000
-4,2038,heatpump,R1,2028,2.24000000000
-4,2039,heatpump,R1,2028,2.24000000000
-5,2034,heatpump,R1,2030,16.28000000000
-5,2035,heatpump,R1,2030,16.28000000000
-5,2036,heatpump,R1,2030,16.28000000000
-5,2037,heatpump,R1,2030,16.28000000000
-5,2038,heatpump,R1,2030,16.28000000000
-5,2039,heatpump,R1,2030,16.28000000000
-5,2040,heatpump,R1,2030,16.28000000000
-5,2041,heatpump,R1,2030,16.28000000000
-6,2034,heatpump,R1,2032,4.48000000000
-6,2035,heatpump,R1,2032,4.48000000000
-6,2036,heatpump,R1,2032,4.48000000000
-6,2037,heatpump,R1,2032,4.48000000000
-6,2038,heatpump,R1,2032,4.48000000000
-6,2039,heatpump,R1,2032,4.48000000000
-6,2040,heatpump,R1,2032,4.48000000000
-6,2041,heatpump,R1,2032,4.48000000000
-6,2042,heatpump,R1,2032,4.48000000000
-6,2043,heatpump,R1,2032,4.48000000000
-7,2036,heatpump,R1,2034,9.48000000000
-7,2037,heatpump,R1,2034,9.48000000000
-7,2038,heatpump,R1,2034,9.48000000000
-7,2039,heatpump,R1,2034,9.48000000000
-7,2040,heatpump,R1,2034,9.48000000000
-7,2041,heatpump,R1,2034,9.48000000000
-7,2042,heatpump,R1,2034,9.48000000000
-7,2043,heatpump,R1,2034,9.48000000000
-7,2044,heatpump,R1,2034,9.48000000000
-7,2045,heatpump,R1,2034,9.48000000000
-8,2034,heatpump,R2,2024,4.12700000000
-8,2035,heatpump,R2,2024,4.12700000000
-9,2034,heatpump,R2,2026,2.24000000000
-9,2035,heatpump,R2,2026,2.24000000000
-9,2036,heatpump,R2,2026,2.24000000000
-9,2037,heatpump,R2,2026,2.24000000000
-10,2034,heatpump,R2,2028,2.24000000000
-10,2035,heatpump,R2,2028,2.24000000000
-10,2036,heatpump,R2,2028,2.24000000000
-10,2037,heatpump,R2,2028,2.24000000000
-10,2038,heatpump,R2,2028,2.24000000000
-10,2039,heatpump,R2,2028,2.24000000000
-11,2034,heatpump,R2,2030,16.28000000000
-11,2035,heatpump,R2,2030,16.28000000000
-11,2036,heatpump,R2,2030,16.28000000000
-11,2037,heatpump,R2,2030,16.28000000000
-11,2038,heatpump,R2,2030,16.28000000000
-11,2039,heatpump,R2,2030,16.28000000000
-11,2040,heatpump,R2,2030,16.28000000000
-11,2041,heatpump,R2,2030,16.28000000000
-12,2034,heatpump,R2,2032,4.48000000000
-12,2035,heatpump,R2,2032,4.48000000000
-12,2036,heatpump,R2,2032,4.48000000000
-12,2037,heatpump,R2,2032,4.48000000000
-12,2038,heatpump,R2,2032,4.48000000000
-12,2039,heatpump,R2,2032,4.48000000000
-12,2040,heatpump,R2,2032,4.48000000000
-12,2041,heatpump,R2,2032,4.48000000000
-12,2042,heatpump,R2,2032,4.48000000000
-12,2043,heatpump,R2,2032,4.48000000000
-13,2036,heatpump,R2,2034,9.48000000000
-13,2037,heatpump,R2,2034,9.48000000000
-13,2038,heatpump,R2,2034,9.48000000000
-13,2039,heatpump,R2,2034,9.48000000000
-13,2040,heatpump,R2,2034,9.48000000000
-13,2041,heatpump,R2,2034,9.48000000000
-13,2042,heatpump,R2,2034,9.48000000000
-13,2043,heatpump,R2,2034,9.48000000000
-13,2044,heatpump,R2,2034,9.48000000000
-13,2045,heatpump,R2,2034,9.48000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2032,R1,heatpump,2030,13
+6,2033,R1,heatpump,2030,13
+6,2034,R1,heatpump,2030,13
+6,2035,R1,heatpump,2030,13
+6,2036,R1,heatpump,2030,13
+6,2037,R1,heatpump,2030,13
+6,2038,R1,heatpump,2030,13
+6,2039,R1,heatpump,2030,13
+6,2040,R1,heatpump,2030,13
+6,2041,R1,heatpump,2030,13
+7,2034,R1,heatpump,2032,6
+7,2035,R1,heatpump,2032,6
+7,2036,R1,heatpump,2032,6
+7,2037,R1,heatpump,2032,6
+7,2038,R1,heatpump,2032,6
+7,2039,R1,heatpump,2032,6
+7,2040,R1,heatpump,2032,6
+7,2041,R1,heatpump,2032,6
+7,2042,R1,heatpump,2032,6
+7,2043,R1,heatpump,2032,6
+8,2036,R1,heatpump,2034,6
+8,2037,R1,heatpump,2034,6
+8,2038,R1,heatpump,2034,6
+8,2039,R1,heatpump,2034,6
+8,2040,R1,heatpump,2034,6
+8,2041,R1,heatpump,2034,6
+8,2042,R1,heatpump,2034,6
+8,2043,R1,heatpump,2034,6
+8,2044,R1,heatpump,2034,6
+8,2045,R1,heatpump,2034,6
+9,2020,R2,gasboiler,2020,10
+9,2022,R2,gasboiler,2020,8
+9,2024,R2,gasboiler,2020,6
+9,2025,R2,gasboiler,2020,5
+9,2026,R2,gasboiler,2020,4
+9,2028,R2,gasboiler,2020,2
+10,2022,R2,heatpump,2020,11
+10,2024,R2,heatpump,2020,11
+10,2025,R2,heatpump,2020,11
+10,2026,R2,heatpump,2020,11
+10,2028,R2,heatpump,2020,11
+10,2030,R2,heatpump,2020,11
+10,2031,R2,heatpump,2020,11
+11,2024,R2,heatpump,2022,4
+11,2025,R2,heatpump,2022,4
+11,2026,R2,heatpump,2022,4
+11,2028,R2,heatpump,2022,4
+11,2030,R2,heatpump,2022,4
+11,2031,R2,heatpump,2022,4
+11,2032,R2,heatpump,2022,4
+11,2033,R2,heatpump,2022,4
+12,2026,R2,heatpump,2024,4
+12,2028,R2,heatpump,2024,4
+12,2030,R2,heatpump,2024,4
+12,2031,R2,heatpump,2024,4
+12,2032,R2,heatpump,2024,4
+12,2033,R2,heatpump,2024,4
+12,2034,R2,heatpump,2024,4
+12,2035,R2,heatpump,2024,4
+13,2028,R2,heatpump,2026,4
+13,2030,R2,heatpump,2026,4
+13,2031,R2,heatpump,2026,4
+13,2032,R2,heatpump,2026,4
+13,2033,R2,heatpump,2026,4
+13,2034,R2,heatpump,2026,4
+13,2035,R2,heatpump,2026,4
+13,2036,R2,heatpump,2026,4
+13,2037,R2,heatpump,2026,4
+14,2030,R2,heatpump,2028,5
+14,2031,R2,heatpump,2028,5
+14,2032,R2,heatpump,2028,5
+14,2033,R2,heatpump,2028,5
+14,2034,R2,heatpump,2028,5
+14,2035,R2,heatpump,2028,5
+14,2036,R2,heatpump,2028,5
+14,2037,R2,heatpump,2028,5
+14,2038,R2,heatpump,2028,5
+14,2039,R2,heatpump,2028,5
+15,2032,R2,heatpump,2030,13
+15,2033,R2,heatpump,2030,13
+15,2034,R2,heatpump,2030,13
+15,2035,R2,heatpump,2030,13
+15,2036,R2,heatpump,2030,13
+15,2037,R2,heatpump,2030,13
+15,2038,R2,heatpump,2030,13
+15,2039,R2,heatpump,2030,13
+15,2040,R2,heatpump,2030,13
+15,2041,R2,heatpump,2030,13
+16,2034,R2,heatpump,2032,6
+16,2035,R2,heatpump,2032,6
+16,2036,R2,heatpump,2032,6
+16,2037,R2,heatpump,2032,6
+16,2038,R2,heatpump,2032,6
+16,2039,R2,heatpump,2032,6
+16,2040,R2,heatpump,2032,6
+16,2041,R2,heatpump,2032,6
+16,2042,R2,heatpump,2032,6
+16,2043,R2,heatpump,2032,6
+17,2036,R2,heatpump,2034,6
+17,2037,R2,heatpump,2034,6
+17,2038,R2,heatpump,2034,6
+17,2039,R2,heatpump,2034,6
+17,2040,R2,heatpump,2034,6
+17,2041,R2,heatpump,2034,6
+17,2042,R2,heatpump,2034,6
+17,2043,R2,heatpump,2034,6
+17,2044,R2,heatpump,2034,6
+17,2045,R2,heatpump,2034,6
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
index 81417240..9b139849 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2036.csv
@@ -1,81 +1,177 @@
-asset,year,technology,region,installed,capacity
-0,2036,heatpump,R1,2026,2.24000000000
-0,2037,heatpump,R1,2026,2.24000000000
-1,2036,heatpump,R1,2028,2.24000000000
-1,2037,heatpump,R1,2028,2.24000000000
-1,2038,heatpump,R1,2028,2.24000000000
-1,2039,heatpump,R1,2028,2.24000000000
-2,2036,heatpump,R1,2030,16.28000000000
-2,2037,heatpump,R1,2030,16.28000000000
-2,2038,heatpump,R1,2030,16.28000000000
-2,2039,heatpump,R1,2030,16.28000000000
-2,2040,heatpump,R1,2030,16.28000000000
-2,2041,heatpump,R1,2030,16.28000000000
-3,2036,heatpump,R1,2032,4.48000000000
-3,2037,heatpump,R1,2032,4.48000000000
-3,2038,heatpump,R1,2032,4.48000000000
-3,2039,heatpump,R1,2032,4.48000000000
-3,2040,heatpump,R1,2032,4.48000000000
-3,2041,heatpump,R1,2032,4.48000000000
-3,2042,heatpump,R1,2032,4.48000000000
-3,2043,heatpump,R1,2032,4.48000000000
-4,2036,heatpump,R1,2034,9.48000000000
-4,2037,heatpump,R1,2034,9.48000000000
-4,2038,heatpump,R1,2034,9.48000000000
-4,2039,heatpump,R1,2034,9.48000000000
-4,2040,heatpump,R1,2034,9.48000000000
-4,2041,heatpump,R1,2034,9.48000000000
-4,2042,heatpump,R1,2034,9.48000000000
-4,2043,heatpump,R1,2034,9.48000000000
-4,2044,heatpump,R1,2034,9.48000000000
-4,2045,heatpump,R1,2034,9.48000000000
-5,2038,heatpump,R1,2036,4.48000000000
-5,2039,heatpump,R1,2036,4.48000000000
-5,2040,heatpump,R1,2036,4.48000000000
-5,2041,heatpump,R1,2036,4.48000000000
-5,2042,heatpump,R1,2036,4.48000000000
-5,2043,heatpump,R1,2036,4.48000000000
-5,2044,heatpump,R1,2036,4.48000000000
-5,2045,heatpump,R1,2036,4.48000000000
-5,2046,heatpump,R1,2036,4.48000000000
-5,2047,heatpump,R1,2036,4.48000000000
-6,2036,heatpump,R2,2026,2.24000000000
-6,2037,heatpump,R2,2026,2.24000000000
-7,2036,heatpump,R2,2028,2.24000000000
-7,2037,heatpump,R2,2028,2.24000000000
-7,2038,heatpump,R2,2028,2.24000000000
-7,2039,heatpump,R2,2028,2.24000000000
-8,2036,heatpump,R2,2030,16.28000000000
-8,2037,heatpump,R2,2030,16.28000000000
-8,2038,heatpump,R2,2030,16.28000000000
-8,2039,heatpump,R2,2030,16.28000000000
-8,2040,heatpump,R2,2030,16.28000000000
-8,2041,heatpump,R2,2030,16.28000000000
-9,2036,heatpump,R2,2032,4.48000000000
-9,2037,heatpump,R2,2032,4.48000000000
-9,2038,heatpump,R2,2032,4.48000000000
-9,2039,heatpump,R2,2032,4.48000000000
-9,2040,heatpump,R2,2032,4.48000000000
-9,2041,heatpump,R2,2032,4.48000000000
-9,2042,heatpump,R2,2032,4.48000000000
-9,2043,heatpump,R2,2032,4.48000000000
-10,2036,heatpump,R2,2034,9.48000000000
-10,2037,heatpump,R2,2034,9.48000000000
-10,2038,heatpump,R2,2034,9.48000000000
-10,2039,heatpump,R2,2034,9.48000000000
-10,2040,heatpump,R2,2034,9.48000000000
-10,2041,heatpump,R2,2034,9.48000000000
-10,2042,heatpump,R2,2034,9.48000000000
-10,2043,heatpump,R2,2034,9.48000000000
-10,2044,heatpump,R2,2034,9.48000000000
-10,2045,heatpump,R2,2034,9.48000000000
-11,2038,heatpump,R2,2036,4.48000000000
-11,2039,heatpump,R2,2036,4.48000000000
-11,2040,heatpump,R2,2036,4.48000000000
-11,2041,heatpump,R2,2036,4.48000000000
-11,2042,heatpump,R2,2036,4.48000000000
-11,2043,heatpump,R2,2036,4.48000000000
-11,2044,heatpump,R2,2036,4.48000000000
-11,2045,heatpump,R2,2036,4.48000000000
-11,2046,heatpump,R2,2036,4.48000000000
-11,2047,heatpump,R2,2036,4.48000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2032,R1,heatpump,2030,13
+6,2033,R1,heatpump,2030,13
+6,2034,R1,heatpump,2030,13
+6,2035,R1,heatpump,2030,13
+6,2036,R1,heatpump,2030,13
+6,2037,R1,heatpump,2030,13
+6,2038,R1,heatpump,2030,13
+6,2039,R1,heatpump,2030,13
+6,2040,R1,heatpump,2030,13
+6,2041,R1,heatpump,2030,13
+7,2034,R1,heatpump,2032,6
+7,2035,R1,heatpump,2032,6
+7,2036,R1,heatpump,2032,6
+7,2037,R1,heatpump,2032,6
+7,2038,R1,heatpump,2032,6
+7,2039,R1,heatpump,2032,6
+7,2040,R1,heatpump,2032,6
+7,2041,R1,heatpump,2032,6
+7,2042,R1,heatpump,2032,6
+7,2043,R1,heatpump,2032,6
+8,2036,R1,heatpump,2034,6
+8,2037,R1,heatpump,2034,6
+8,2038,R1,heatpump,2034,6
+8,2039,R1,heatpump,2034,6
+8,2040,R1,heatpump,2034,6
+8,2041,R1,heatpump,2034,6
+8,2042,R1,heatpump,2034,6
+8,2043,R1,heatpump,2034,6
+8,2044,R1,heatpump,2034,6
+8,2045,R1,heatpump,2034,6
+9,2038,R1,heatpump,2036,6
+9,2039,R1,heatpump,2036,6
+9,2040,R1,heatpump,2036,6
+9,2041,R1,heatpump,2036,6
+9,2042,R1,heatpump,2036,6
+9,2043,R1,heatpump,2036,6
+9,2044,R1,heatpump,2036,6
+9,2045,R1,heatpump,2036,6
+9,2046,R1,heatpump,2036,6
+9,2047,R1,heatpump,2036,6
+10,2020,R2,gasboiler,2020,10
+10,2022,R2,gasboiler,2020,8
+10,2024,R2,gasboiler,2020,6
+10,2025,R2,gasboiler,2020,5
+10,2026,R2,gasboiler,2020,4
+10,2028,R2,gasboiler,2020,2
+11,2022,R2,heatpump,2020,11
+11,2024,R2,heatpump,2020,11
+11,2025,R2,heatpump,2020,11
+11,2026,R2,heatpump,2020,11
+11,2028,R2,heatpump,2020,11
+11,2030,R2,heatpump,2020,11
+11,2031,R2,heatpump,2020,11
+12,2024,R2,heatpump,2022,4
+12,2025,R2,heatpump,2022,4
+12,2026,R2,heatpump,2022,4
+12,2028,R2,heatpump,2022,4
+12,2030,R2,heatpump,2022,4
+12,2031,R2,heatpump,2022,4
+12,2032,R2,heatpump,2022,4
+12,2033,R2,heatpump,2022,4
+13,2026,R2,heatpump,2024,4
+13,2028,R2,heatpump,2024,4
+13,2030,R2,heatpump,2024,4
+13,2031,R2,heatpump,2024,4
+13,2032,R2,heatpump,2024,4
+13,2033,R2,heatpump,2024,4
+13,2034,R2,heatpump,2024,4
+13,2035,R2,heatpump,2024,4
+14,2028,R2,heatpump,2026,4
+14,2030,R2,heatpump,2026,4
+14,2031,R2,heatpump,2026,4
+14,2032,R2,heatpump,2026,4
+14,2033,R2,heatpump,2026,4
+14,2034,R2,heatpump,2026,4
+14,2035,R2,heatpump,2026,4
+14,2036,R2,heatpump,2026,4
+14,2037,R2,heatpump,2026,4
+15,2030,R2,heatpump,2028,5
+15,2031,R2,heatpump,2028,5
+15,2032,R2,heatpump,2028,5
+15,2033,R2,heatpump,2028,5
+15,2034,R2,heatpump,2028,5
+15,2035,R2,heatpump,2028,5
+15,2036,R2,heatpump,2028,5
+15,2037,R2,heatpump,2028,5
+15,2038,R2,heatpump,2028,5
+15,2039,R2,heatpump,2028,5
+16,2032,R2,heatpump,2030,13
+16,2033,R2,heatpump,2030,13
+16,2034,R2,heatpump,2030,13
+16,2035,R2,heatpump,2030,13
+16,2036,R2,heatpump,2030,13
+16,2037,R2,heatpump,2030,13
+16,2038,R2,heatpump,2030,13
+16,2039,R2,heatpump,2030,13
+16,2040,R2,heatpump,2030,13
+16,2041,R2,heatpump,2030,13
+17,2034,R2,heatpump,2032,6
+17,2035,R2,heatpump,2032,6
+17,2036,R2,heatpump,2032,6
+17,2037,R2,heatpump,2032,6
+17,2038,R2,heatpump,2032,6
+17,2039,R2,heatpump,2032,6
+17,2040,R2,heatpump,2032,6
+17,2041,R2,heatpump,2032,6
+17,2042,R2,heatpump,2032,6
+17,2043,R2,heatpump,2032,6
+18,2036,R2,heatpump,2034,6
+18,2037,R2,heatpump,2034,6
+18,2038,R2,heatpump,2034,6
+18,2039,R2,heatpump,2034,6
+18,2040,R2,heatpump,2034,6
+18,2041,R2,heatpump,2034,6
+18,2042,R2,heatpump,2034,6
+18,2043,R2,heatpump,2034,6
+18,2044,R2,heatpump,2034,6
+18,2045,R2,heatpump,2034,6
+19,2038,R2,heatpump,2036,6
+19,2039,R2,heatpump,2036,6
+19,2040,R2,heatpump,2036,6
+19,2041,R2,heatpump,2036,6
+19,2042,R2,heatpump,2036,6
+19,2043,R2,heatpump,2036,6
+19,2044,R2,heatpump,2036,6
+19,2045,R2,heatpump,2036,6
+19,2046,R2,heatpump,2036,6
+19,2047,R2,heatpump,2036,6
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
index 39a4f21d..b50c0bee 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2038.csv
@@ -1,81 +1,197 @@
-asset,year,technology,region,installed,capacity
-0,2038,heatpump,R1,2028,2.24000000000
-0,2039,heatpump,R1,2028,2.24000000000
-1,2038,heatpump,R1,2030,16.28000000000
-1,2039,heatpump,R1,2030,16.28000000000
-1,2040,heatpump,R1,2030,16.28000000000
-1,2041,heatpump,R1,2030,16.28000000000
-2,2038,heatpump,R1,2032,4.48000000000
-2,2039,heatpump,R1,2032,4.48000000000
-2,2040,heatpump,R1,2032,4.48000000000
-2,2041,heatpump,R1,2032,4.48000000000
-2,2042,heatpump,R1,2032,4.48000000000
-2,2043,heatpump,R1,2032,4.48000000000
-3,2038,heatpump,R1,2034,9.48000000000
-3,2039,heatpump,R1,2034,9.48000000000
-3,2040,heatpump,R1,2034,9.48000000000
-3,2041,heatpump,R1,2034,9.48000000000
-3,2042,heatpump,R1,2034,9.48000000000
-3,2043,heatpump,R1,2034,9.48000000000
-3,2044,heatpump,R1,2034,9.48000000000
-3,2045,heatpump,R1,2034,9.48000000000
-4,2038,heatpump,R1,2036,4.48000000000
-4,2039,heatpump,R1,2036,4.48000000000
-4,2040,heatpump,R1,2036,4.48000000000
-4,2041,heatpump,R1,2036,4.48000000000
-4,2042,heatpump,R1,2036,4.48000000000
-4,2043,heatpump,R1,2036,4.48000000000
-4,2044,heatpump,R1,2036,4.48000000000
-4,2045,heatpump,R1,2036,4.48000000000
-4,2046,heatpump,R1,2036,4.48000000000
-4,2047,heatpump,R1,2036,4.48000000000
-5,2040,heatpump,R1,2038,4.48000000000
-5,2041,heatpump,R1,2038,4.48000000000
-5,2042,heatpump,R1,2038,4.48000000000
-5,2043,heatpump,R1,2038,4.48000000000
-5,2044,heatpump,R1,2038,4.48000000000
-5,2045,heatpump,R1,2038,4.48000000000
-5,2046,heatpump,R1,2038,4.48000000000
-5,2047,heatpump,R1,2038,4.48000000000
-5,2048,heatpump,R1,2038,4.48000000000
-5,2049,heatpump,R1,2038,4.48000000000
-6,2038,heatpump,R2,2028,2.24000000000
-6,2039,heatpump,R2,2028,2.24000000000
-7,2038,heatpump,R2,2030,16.28000000000
-7,2039,heatpump,R2,2030,16.28000000000
-7,2040,heatpump,R2,2030,16.28000000000
-7,2041,heatpump,R2,2030,16.28000000000
-8,2038,heatpump,R2,2032,4.48000000000
-8,2039,heatpump,R2,2032,4.48000000000
-8,2040,heatpump,R2,2032,4.48000000000
-8,2041,heatpump,R2,2032,4.48000000000
-8,2042,heatpump,R2,2032,4.48000000000
-8,2043,heatpump,R2,2032,4.48000000000
-9,2038,heatpump,R2,2034,9.48000000000
-9,2039,heatpump,R2,2034,9.48000000000
-9,2040,heatpump,R2,2034,9.48000000000
-9,2041,heatpump,R2,2034,9.48000000000
-9,2042,heatpump,R2,2034,9.48000000000
-9,2043,heatpump,R2,2034,9.48000000000
-9,2044,heatpump,R2,2034,9.48000000000
-9,2045,heatpump,R2,2034,9.48000000000
-10,2038,heatpump,R2,2036,4.48000000000
-10,2039,heatpump,R2,2036,4.48000000000
-10,2040,heatpump,R2,2036,4.48000000000
-10,2041,heatpump,R2,2036,4.48000000000
-10,2042,heatpump,R2,2036,4.48000000000
-10,2043,heatpump,R2,2036,4.48000000000
-10,2044,heatpump,R2,2036,4.48000000000
-10,2045,heatpump,R2,2036,4.48000000000
-10,2046,heatpump,R2,2036,4.48000000000
-10,2047,heatpump,R2,2036,4.48000000000
-11,2040,heatpump,R2,2038,4.48000000000
-11,2041,heatpump,R2,2038,4.48000000000
-11,2042,heatpump,R2,2038,4.48000000000
-11,2043,heatpump,R2,2038,4.48000000000
-11,2044,heatpump,R2,2038,4.48000000000
-11,2045,heatpump,R2,2038,4.48000000000
-11,2046,heatpump,R2,2038,4.48000000000
-11,2047,heatpump,R2,2038,4.48000000000
-11,2048,heatpump,R2,2038,4.48000000000
-11,2049,heatpump,R2,2038,4.48000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2032,R1,heatpump,2030,13
+6,2033,R1,heatpump,2030,13
+6,2034,R1,heatpump,2030,13
+6,2035,R1,heatpump,2030,13
+6,2036,R1,heatpump,2030,13
+6,2037,R1,heatpump,2030,13
+6,2038,R1,heatpump,2030,13
+6,2039,R1,heatpump,2030,13
+6,2040,R1,heatpump,2030,13
+6,2041,R1,heatpump,2030,13
+7,2034,R1,heatpump,2032,6
+7,2035,R1,heatpump,2032,6
+7,2036,R1,heatpump,2032,6
+7,2037,R1,heatpump,2032,6
+7,2038,R1,heatpump,2032,6
+7,2039,R1,heatpump,2032,6
+7,2040,R1,heatpump,2032,6
+7,2041,R1,heatpump,2032,6
+7,2042,R1,heatpump,2032,6
+7,2043,R1,heatpump,2032,6
+8,2036,R1,heatpump,2034,6
+8,2037,R1,heatpump,2034,6
+8,2038,R1,heatpump,2034,6
+8,2039,R1,heatpump,2034,6
+8,2040,R1,heatpump,2034,6
+8,2041,R1,heatpump,2034,6
+8,2042,R1,heatpump,2034,6
+8,2043,R1,heatpump,2034,6
+8,2044,R1,heatpump,2034,6
+8,2045,R1,heatpump,2034,6
+9,2038,R1,heatpump,2036,6
+9,2039,R1,heatpump,2036,6
+9,2040,R1,heatpump,2036,6
+9,2041,R1,heatpump,2036,6
+9,2042,R1,heatpump,2036,6
+9,2043,R1,heatpump,2036,6
+9,2044,R1,heatpump,2036,6
+9,2045,R1,heatpump,2036,6
+9,2046,R1,heatpump,2036,6
+9,2047,R1,heatpump,2036,6
+10,2040,R1,heatpump,2038,8
+10,2041,R1,heatpump,2038,8
+10,2042,R1,heatpump,2038,8
+10,2043,R1,heatpump,2038,8
+10,2044,R1,heatpump,2038,8
+10,2045,R1,heatpump,2038,8
+10,2046,R1,heatpump,2038,8
+10,2047,R1,heatpump,2038,8
+10,2048,R1,heatpump,2038,8
+10,2049,R1,heatpump,2038,8
+11,2020,R2,gasboiler,2020,10
+11,2022,R2,gasboiler,2020,8
+11,2024,R2,gasboiler,2020,6
+11,2025,R2,gasboiler,2020,5
+11,2026,R2,gasboiler,2020,4
+11,2028,R2,gasboiler,2020,2
+12,2022,R2,heatpump,2020,11
+12,2024,R2,heatpump,2020,11
+12,2025,R2,heatpump,2020,11
+12,2026,R2,heatpump,2020,11
+12,2028,R2,heatpump,2020,11
+12,2030,R2,heatpump,2020,11
+12,2031,R2,heatpump,2020,11
+13,2024,R2,heatpump,2022,4
+13,2025,R2,heatpump,2022,4
+13,2026,R2,heatpump,2022,4
+13,2028,R2,heatpump,2022,4
+13,2030,R2,heatpump,2022,4
+13,2031,R2,heatpump,2022,4
+13,2032,R2,heatpump,2022,4
+13,2033,R2,heatpump,2022,4
+14,2026,R2,heatpump,2024,4
+14,2028,R2,heatpump,2024,4
+14,2030,R2,heatpump,2024,4
+14,2031,R2,heatpump,2024,4
+14,2032,R2,heatpump,2024,4
+14,2033,R2,heatpump,2024,4
+14,2034,R2,heatpump,2024,4
+14,2035,R2,heatpump,2024,4
+15,2028,R2,heatpump,2026,4
+15,2030,R2,heatpump,2026,4
+15,2031,R2,heatpump,2026,4
+15,2032,R2,heatpump,2026,4
+15,2033,R2,heatpump,2026,4
+15,2034,R2,heatpump,2026,4
+15,2035,R2,heatpump,2026,4
+15,2036,R2,heatpump,2026,4
+15,2037,R2,heatpump,2026,4
+16,2030,R2,heatpump,2028,5
+16,2031,R2,heatpump,2028,5
+16,2032,R2,heatpump,2028,5
+16,2033,R2,heatpump,2028,5
+16,2034,R2,heatpump,2028,5
+16,2035,R2,heatpump,2028,5
+16,2036,R2,heatpump,2028,5
+16,2037,R2,heatpump,2028,5
+16,2038,R2,heatpump,2028,5
+16,2039,R2,heatpump,2028,5
+17,2032,R2,heatpump,2030,13
+17,2033,R2,heatpump,2030,13
+17,2034,R2,heatpump,2030,13
+17,2035,R2,heatpump,2030,13
+17,2036,R2,heatpump,2030,13
+17,2037,R2,heatpump,2030,13
+17,2038,R2,heatpump,2030,13
+17,2039,R2,heatpump,2030,13
+17,2040,R2,heatpump,2030,13
+17,2041,R2,heatpump,2030,13
+18,2034,R2,heatpump,2032,6
+18,2035,R2,heatpump,2032,6
+18,2036,R2,heatpump,2032,6
+18,2037,R2,heatpump,2032,6
+18,2038,R2,heatpump,2032,6
+18,2039,R2,heatpump,2032,6
+18,2040,R2,heatpump,2032,6
+18,2041,R2,heatpump,2032,6
+18,2042,R2,heatpump,2032,6
+18,2043,R2,heatpump,2032,6
+19,2036,R2,heatpump,2034,6
+19,2037,R2,heatpump,2034,6
+19,2038,R2,heatpump,2034,6
+19,2039,R2,heatpump,2034,6
+19,2040,R2,heatpump,2034,6
+19,2041,R2,heatpump,2034,6
+19,2042,R2,heatpump,2034,6
+19,2043,R2,heatpump,2034,6
+19,2044,R2,heatpump,2034,6
+19,2045,R2,heatpump,2034,6
+20,2038,R2,heatpump,2036,6
+20,2039,R2,heatpump,2036,6
+20,2040,R2,heatpump,2036,6
+20,2041,R2,heatpump,2036,6
+20,2042,R2,heatpump,2036,6
+20,2043,R2,heatpump,2036,6
+20,2044,R2,heatpump,2036,6
+20,2045,R2,heatpump,2036,6
+20,2046,R2,heatpump,2036,6
+20,2047,R2,heatpump,2036,6
+21,2040,R2,heatpump,2038,8
+21,2041,R2,heatpump,2038,8
+21,2042,R2,heatpump,2038,8
+21,2043,R2,heatpump,2038,8
+21,2044,R2,heatpump,2038,8
+21,2045,R2,heatpump,2038,8
+21,2046,R2,heatpump,2038,8
+21,2047,R2,heatpump,2038,8
+21,2048,R2,heatpump,2038,8
+21,2049,R2,heatpump,2038,8
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
index a0b1670c..836f4a67 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2040.csv
@@ -1,81 +1,217 @@
-asset,year,technology,region,installed,capacity
-0,2040,heatpump,R1,2030,16.28000000000
-0,2041,heatpump,R1,2030,16.28000000000
-1,2040,heatpump,R1,2032,4.48000000000
-1,2041,heatpump,R1,2032,4.48000000000
-1,2042,heatpump,R1,2032,4.48000000000
-1,2043,heatpump,R1,2032,4.48000000000
-2,2040,heatpump,R1,2034,9.48000000000
-2,2041,heatpump,R1,2034,9.48000000000
-2,2042,heatpump,R1,2034,9.48000000000
-2,2043,heatpump,R1,2034,9.48000000000
-2,2044,heatpump,R1,2034,9.48000000000
-2,2045,heatpump,R1,2034,9.48000000000
-3,2040,heatpump,R1,2036,4.48000000000
-3,2041,heatpump,R1,2036,4.48000000000
-3,2042,heatpump,R1,2036,4.48000000000
-3,2043,heatpump,R1,2036,4.48000000000
-3,2044,heatpump,R1,2036,4.48000000000
-3,2045,heatpump,R1,2036,4.48000000000
-3,2046,heatpump,R1,2036,4.48000000000
-3,2047,heatpump,R1,2036,4.48000000000
-4,2040,heatpump,R1,2038,4.48000000000
-4,2041,heatpump,R1,2038,4.48000000000
-4,2042,heatpump,R1,2038,4.48000000000
-4,2043,heatpump,R1,2038,4.48000000000
-4,2044,heatpump,R1,2038,4.48000000000
-4,2045,heatpump,R1,2038,4.48000000000
-4,2046,heatpump,R1,2038,4.48000000000
-4,2047,heatpump,R1,2038,4.48000000000
-4,2048,heatpump,R1,2038,4.48000000000
-4,2049,heatpump,R1,2038,4.48000000000
-5,2042,heatpump,R1,2040,18.52000000000
-5,2043,heatpump,R1,2040,18.52000000000
-5,2044,heatpump,R1,2040,18.52000000000
-5,2045,heatpump,R1,2040,18.52000000000
-5,2046,heatpump,R1,2040,18.52000000000
-5,2047,heatpump,R1,2040,18.52000000000
-5,2048,heatpump,R1,2040,18.52000000000
-5,2049,heatpump,R1,2040,18.52000000000
-5,2050,heatpump,R1,2040,18.52000000000
-5,2051,heatpump,R1,2040,18.52000000000
-6,2040,heatpump,R2,2030,16.28000000000
-6,2041,heatpump,R2,2030,16.28000000000
-7,2040,heatpump,R2,2032,4.48000000000
-7,2041,heatpump,R2,2032,4.48000000000
-7,2042,heatpump,R2,2032,4.48000000000
-7,2043,heatpump,R2,2032,4.48000000000
-8,2040,heatpump,R2,2034,9.48000000000
-8,2041,heatpump,R2,2034,9.48000000000
-8,2042,heatpump,R2,2034,9.48000000000
-8,2043,heatpump,R2,2034,9.48000000000
-8,2044,heatpump,R2,2034,9.48000000000
-8,2045,heatpump,R2,2034,9.48000000000
-9,2040,heatpump,R2,2036,4.48000000000
-9,2041,heatpump,R2,2036,4.48000000000
-9,2042,heatpump,R2,2036,4.48000000000
-9,2043,heatpump,R2,2036,4.48000000000
-9,2044,heatpump,R2,2036,4.48000000000
-9,2045,heatpump,R2,2036,4.48000000000
-9,2046,heatpump,R2,2036,4.48000000000
-9,2047,heatpump,R2,2036,4.48000000000
-10,2040,heatpump,R2,2038,4.48000000000
-10,2041,heatpump,R2,2038,4.48000000000
-10,2042,heatpump,R2,2038,4.48000000000
-10,2043,heatpump,R2,2038,4.48000000000
-10,2044,heatpump,R2,2038,4.48000000000
-10,2045,heatpump,R2,2038,4.48000000000
-10,2046,heatpump,R2,2038,4.48000000000
-10,2047,heatpump,R2,2038,4.48000000000
-10,2048,heatpump,R2,2038,4.48000000000
-10,2049,heatpump,R2,2038,4.48000000000
-11,2042,heatpump,R2,2040,18.52000000000
-11,2043,heatpump,R2,2040,18.52000000000
-11,2044,heatpump,R2,2040,18.52000000000
-11,2045,heatpump,R2,2040,18.52000000000
-11,2046,heatpump,R2,2040,18.52000000000
-11,2047,heatpump,R2,2040,18.52000000000
-11,2048,heatpump,R2,2040,18.52000000000
-11,2049,heatpump,R2,2040,18.52000000000
-11,2050,heatpump,R2,2040,18.52000000000
-11,2051,heatpump,R2,2040,18.52000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2022,R1,gasboiler,2020,8
+0,2024,R1,gasboiler,2020,6
+0,2025,R1,gasboiler,2020,5
+0,2026,R1,gasboiler,2020,4
+0,2028,R1,gasboiler,2020,2
+1,2022,R1,heatpump,2020,11
+1,2024,R1,heatpump,2020,11
+1,2025,R1,heatpump,2020,11
+1,2026,R1,heatpump,2020,11
+1,2028,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2031,R1,heatpump,2020,11
+2,2024,R1,heatpump,2022,4
+2,2025,R1,heatpump,2022,4
+2,2026,R1,heatpump,2022,4
+2,2028,R1,heatpump,2022,4
+2,2030,R1,heatpump,2022,4
+2,2031,R1,heatpump,2022,4
+2,2032,R1,heatpump,2022,4
+2,2033,R1,heatpump,2022,4
+3,2026,R1,heatpump,2024,4
+3,2028,R1,heatpump,2024,4
+3,2030,R1,heatpump,2024,4
+3,2031,R1,heatpump,2024,4
+3,2032,R1,heatpump,2024,4
+3,2033,R1,heatpump,2024,4
+3,2034,R1,heatpump,2024,4
+3,2035,R1,heatpump,2024,4
+4,2028,R1,heatpump,2026,4
+4,2030,R1,heatpump,2026,4
+4,2031,R1,heatpump,2026,4
+4,2032,R1,heatpump,2026,4
+4,2033,R1,heatpump,2026,4
+4,2034,R1,heatpump,2026,4
+4,2035,R1,heatpump,2026,4
+4,2036,R1,heatpump,2026,4
+4,2037,R1,heatpump,2026,4
+5,2030,R1,heatpump,2028,5
+5,2031,R1,heatpump,2028,5
+5,2032,R1,heatpump,2028,5
+5,2033,R1,heatpump,2028,5
+5,2034,R1,heatpump,2028,5
+5,2035,R1,heatpump,2028,5
+5,2036,R1,heatpump,2028,5
+5,2037,R1,heatpump,2028,5
+5,2038,R1,heatpump,2028,5
+5,2039,R1,heatpump,2028,5
+6,2032,R1,heatpump,2030,13
+6,2033,R1,heatpump,2030,13
+6,2034,R1,heatpump,2030,13
+6,2035,R1,heatpump,2030,13
+6,2036,R1,heatpump,2030,13
+6,2037,R1,heatpump,2030,13
+6,2038,R1,heatpump,2030,13
+6,2039,R1,heatpump,2030,13
+6,2040,R1,heatpump,2030,13
+6,2041,R1,heatpump,2030,13
+7,2034,R1,heatpump,2032,6
+7,2035,R1,heatpump,2032,6
+7,2036,R1,heatpump,2032,6
+7,2037,R1,heatpump,2032,6
+7,2038,R1,heatpump,2032,6
+7,2039,R1,heatpump,2032,6
+7,2040,R1,heatpump,2032,6
+7,2041,R1,heatpump,2032,6
+7,2042,R1,heatpump,2032,6
+7,2043,R1,heatpump,2032,6
+8,2036,R1,heatpump,2034,6
+8,2037,R1,heatpump,2034,6
+8,2038,R1,heatpump,2034,6
+8,2039,R1,heatpump,2034,6
+8,2040,R1,heatpump,2034,6
+8,2041,R1,heatpump,2034,6
+8,2042,R1,heatpump,2034,6
+8,2043,R1,heatpump,2034,6
+8,2044,R1,heatpump,2034,6
+8,2045,R1,heatpump,2034,6
+9,2038,R1,heatpump,2036,6
+9,2039,R1,heatpump,2036,6
+9,2040,R1,heatpump,2036,6
+9,2041,R1,heatpump,2036,6
+9,2042,R1,heatpump,2036,6
+9,2043,R1,heatpump,2036,6
+9,2044,R1,heatpump,2036,6
+9,2045,R1,heatpump,2036,6
+9,2046,R1,heatpump,2036,6
+9,2047,R1,heatpump,2036,6
+10,2040,R1,heatpump,2038,8
+10,2041,R1,heatpump,2038,8
+10,2042,R1,heatpump,2038,8
+10,2043,R1,heatpump,2038,8
+10,2044,R1,heatpump,2038,8
+10,2045,R1,heatpump,2038,8
+10,2046,R1,heatpump,2038,8
+10,2047,R1,heatpump,2038,8
+10,2048,R1,heatpump,2038,8
+10,2049,R1,heatpump,2038,8
+11,2042,R1,heatpump,2040,15
+11,2043,R1,heatpump,2040,15
+11,2044,R1,heatpump,2040,15
+11,2045,R1,heatpump,2040,15
+11,2046,R1,heatpump,2040,15
+11,2047,R1,heatpump,2040,15
+11,2048,R1,heatpump,2040,15
+11,2049,R1,heatpump,2040,15
+11,2050,R1,heatpump,2040,15
+11,2051,R1,heatpump,2040,15
+12,2020,R2,gasboiler,2020,10
+12,2022,R2,gasboiler,2020,8
+12,2024,R2,gasboiler,2020,6
+12,2025,R2,gasboiler,2020,5
+12,2026,R2,gasboiler,2020,4
+12,2028,R2,gasboiler,2020,2
+13,2022,R2,heatpump,2020,11
+13,2024,R2,heatpump,2020,11
+13,2025,R2,heatpump,2020,11
+13,2026,R2,heatpump,2020,11
+13,2028,R2,heatpump,2020,11
+13,2030,R2,heatpump,2020,11
+13,2031,R2,heatpump,2020,11
+14,2024,R2,heatpump,2022,4
+14,2025,R2,heatpump,2022,4
+14,2026,R2,heatpump,2022,4
+14,2028,R2,heatpump,2022,4
+14,2030,R2,heatpump,2022,4
+14,2031,R2,heatpump,2022,4
+14,2032,R2,heatpump,2022,4
+14,2033,R2,heatpump,2022,4
+15,2026,R2,heatpump,2024,4
+15,2028,R2,heatpump,2024,4
+15,2030,R2,heatpump,2024,4
+15,2031,R2,heatpump,2024,4
+15,2032,R2,heatpump,2024,4
+15,2033,R2,heatpump,2024,4
+15,2034,R2,heatpump,2024,4
+15,2035,R2,heatpump,2024,4
+16,2028,R2,heatpump,2026,4
+16,2030,R2,heatpump,2026,4
+16,2031,R2,heatpump,2026,4
+16,2032,R2,heatpump,2026,4
+16,2033,R2,heatpump,2026,4
+16,2034,R2,heatpump,2026,4
+16,2035,R2,heatpump,2026,4
+16,2036,R2,heatpump,2026,4
+16,2037,R2,heatpump,2026,4
+17,2030,R2,heatpump,2028,5
+17,2031,R2,heatpump,2028,5
+17,2032,R2,heatpump,2028,5
+17,2033,R2,heatpump,2028,5
+17,2034,R2,heatpump,2028,5
+17,2035,R2,heatpump,2028,5
+17,2036,R2,heatpump,2028,5
+17,2037,R2,heatpump,2028,5
+17,2038,R2,heatpump,2028,5
+17,2039,R2,heatpump,2028,5
+18,2032,R2,heatpump,2030,13
+18,2033,R2,heatpump,2030,13
+18,2034,R2,heatpump,2030,13
+18,2035,R2,heatpump,2030,13
+18,2036,R2,heatpump,2030,13
+18,2037,R2,heatpump,2030,13
+18,2038,R2,heatpump,2030,13
+18,2039,R2,heatpump,2030,13
+18,2040,R2,heatpump,2030,13
+18,2041,R2,heatpump,2030,13
+19,2034,R2,heatpump,2032,6
+19,2035,R2,heatpump,2032,6
+19,2036,R2,heatpump,2032,6
+19,2037,R2,heatpump,2032,6
+19,2038,R2,heatpump,2032,6
+19,2039,R2,heatpump,2032,6
+19,2040,R2,heatpump,2032,6
+19,2041,R2,heatpump,2032,6
+19,2042,R2,heatpump,2032,6
+19,2043,R2,heatpump,2032,6
+20,2036,R2,heatpump,2034,6
+20,2037,R2,heatpump,2034,6
+20,2038,R2,heatpump,2034,6
+20,2039,R2,heatpump,2034,6
+20,2040,R2,heatpump,2034,6
+20,2041,R2,heatpump,2034,6
+20,2042,R2,heatpump,2034,6
+20,2043,R2,heatpump,2034,6
+20,2044,R2,heatpump,2034,6
+20,2045,R2,heatpump,2034,6
+21,2038,R2,heatpump,2036,6
+21,2039,R2,heatpump,2036,6
+21,2040,R2,heatpump,2036,6
+21,2041,R2,heatpump,2036,6
+21,2042,R2,heatpump,2036,6
+21,2043,R2,heatpump,2036,6
+21,2044,R2,heatpump,2036,6
+21,2045,R2,heatpump,2036,6
+21,2046,R2,heatpump,2036,6
+21,2047,R2,heatpump,2036,6
+22,2040,R2,heatpump,2038,8
+22,2041,R2,heatpump,2038,8
+22,2042,R2,heatpump,2038,8
+22,2043,R2,heatpump,2038,8
+22,2044,R2,heatpump,2038,8
+22,2045,R2,heatpump,2038,8
+22,2046,R2,heatpump,2038,8
+22,2047,R2,heatpump,2038,8
+22,2048,R2,heatpump,2038,8
+22,2049,R2,heatpump,2038,8
+23,2042,R2,heatpump,2040,15
+23,2043,R2,heatpump,2040,15
+23,2044,R2,heatpump,2040,15
+23,2045,R2,heatpump,2040,15
+23,2046,R2,heatpump,2040,15
+23,2047,R2,heatpump,2040,15
+23,2048,R2,heatpump,2040,15
+23,2049,R2,heatpump,2040,15
+23,2050,R2,heatpump,2040,15
+23,2051,R2,heatpump,2040,15
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 1c61b1cb..4db35e5d 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,month,day,hour,technology,installed,supply
 0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2022,1,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R1,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
 0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2022,1,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.29250000000
+0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
 0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2022,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R1,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
 0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2022,1,all-year,all-week,night,gasboiler,2020,6.74060000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
 1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2022,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R1,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
 1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2022,1,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.41790000000
+1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
 1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2022,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R1,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
 1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2022,1,all-year,all-week,morning,gasboiler,2020,9.62950000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
 2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
 2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
+2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
 2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
 2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
 3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2022,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
 3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2022,1,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
+3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
 3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2022,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
 3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2022,1,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
 4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-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.87750000000
-4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
 4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-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.87750000000
-4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
+4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
 4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-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,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
 4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-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
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
 5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2022,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R1,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
 5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2022,1,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.58500000000
+5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
 5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2022,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R1,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
 5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2022,1,all-year,all-week,evening,gasboiler,2020,13.48120000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
 6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2022,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
 6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2022,1,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
+6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
 6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2022,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
 6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2022,1,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
 7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
 7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
+7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
 7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
 7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
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 c849a2cd..32b8dacd 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,289 +1,225 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2022,4,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2022,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2024,2,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2024,3,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2024,5,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2022,2,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2022,4,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2022,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2024,2,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2024,3,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2024,5,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
-0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2022,4,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2024,5,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2022,4,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2024,5,all-year,all-week,night,gasboiler,2022,0.74850000000
-1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2022,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2022,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2024,3,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2024,5,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2022,2,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2022,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2022,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2024,3,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2024,5,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2022,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2024,5,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2022,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2024,5,all-year,all-week,morning,gasboiler,2022,1.06930000000
-2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2022,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2024,3,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2022,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2024,3,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2022,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2024,5,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2022,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2022,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2024,3,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2024,5,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2022,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2022,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2022,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2024,3,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2024,5,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2022,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2024,5,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2022,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2024,5,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
-4,heat,R1,2022,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2022,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
-4,heat,R1,2022,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-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,gasboiler,2022,0.03470000000
-4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2024,3,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
-4,heat,R1,2024,5,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
-4,heat,R2,2022,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2022,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
-4,heat,R2,2022,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-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,gasboiler,2022,0.03470000000
-4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2024,3,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
-4,heat,R2,2024,5,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R1,2022,4,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,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R1,2024,5,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R2,2022,4,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,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R2,2024,5,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2022,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2022,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2024,3,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2024,5,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2022,2,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2022,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2022,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2024,3,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2024,5,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2022,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2024,5,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2022,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2024,5,all-year,all-week,evening,gasboiler,2022,1.49700000000
-6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2022,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2022,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2024,3,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2024,5,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2022,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2022,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2022,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2024,3,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2024,5,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2022,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2024,5,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2022,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2024,5,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2022,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2024,3,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2022,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2024,3,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2022,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2024,5,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R1,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R1,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R1,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R1,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R1,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R1,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
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 7a4fe71a..58246c6a 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,417 +1,289 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2024,9,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2024,10,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2026,4,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2026,5,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2026,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2026,7,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2026,8,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2026,9,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2026,10,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2026,11,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2024,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2024,7,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2024,9,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2024,10,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2026,4,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2026,5,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2026,6,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2026,7,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2026,8,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2026,9,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2026,10,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2026,11,all-year,all-week,night,heatpump,2024,0.08600000000
-0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2026,4,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2026,5,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2024,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2026,4,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2026,5,all-year,all-week,night,gasboiler,2024,4.19670000000
-1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2024,9,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2024,10,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2026,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2026,5,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2026,9,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2026,10,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2026,11,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2024,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2024,7,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2024,9,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2024,10,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2026,4,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2026,5,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2026,9,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2026,10,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2026,11,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2026,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2026,5,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2024,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2026,4,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2026,5,all-year,all-week,morning,gasboiler,2024,5.99540000000
-2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2024,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2024,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2026,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2026,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2026,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2024,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2024,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2024,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2026,9,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2026,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2026,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2024,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2024,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2024,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2026,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2026,5,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2026,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2026,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2026,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2024,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2024,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2024,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2026,4,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2026,5,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2026,9,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2026,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2026,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2026,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2026,5,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2024,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2026,4,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2026,5,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-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,gasboiler,2022,0.03470000000
-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,gasboiler,2022,0.03470000000
-4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2024,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2024,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2026,4,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2026,5,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2026,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2026,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2026,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-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,gasboiler,2022,0.03470000000
-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,gasboiler,2022,0.03470000000
-4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2024,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2024,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2024,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2026,4,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2026,5,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2026,9,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2026,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2026,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R1,2024,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2026,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2026,5,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R2,2024,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
-4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2026,4,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2026,5,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2024,9,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2024,10,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2026,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2026,5,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2026,9,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2026,10,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2026,11,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2024,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2024,7,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2024,9,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2024,10,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2026,4,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2026,5,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2026,9,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2026,10,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2026,11,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2026,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2026,5,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2024,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2026,4,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2026,5,all-year,all-week,evening,gasboiler,2024,8.39350000000
-6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2024,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2024,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2026,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2026,5,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2026,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2026,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2026,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2024,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2024,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2024,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2026,4,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2026,5,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2026,9,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2026,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2026,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2026,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2026,5,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2024,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2026,4,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2026,5,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2024,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2024,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2026,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2026,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2026,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2024,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2024,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2024,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2026,9,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2026,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2026,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2024,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R1,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R1,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R1,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R1,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R1,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R1,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
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 20f1bc58..d85ab2ec 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,481 +1,353 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2026,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2026,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2026,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2026,8,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2026,9,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2026,10,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2026,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2026,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2028,8,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2028,9,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2028,10,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2028,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2028,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2028,13,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2026,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2026,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2026,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2026,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2026,8,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2026,9,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2026,10,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2026,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2026,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2028,8,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2028,9,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2028,10,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2028,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2028,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2028,13,all-year,all-week,night,heatpump,2026,0.04670000000
-0,CO2f,R1,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2026,8,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2026,9,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2028,8,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2028,9,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2026,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2026,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2026,8,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2026,9,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2028,8,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2028,9,all-year,all-week,night,gasboiler,2024,4.19670000000
-1,heat,R1,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2026,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2026,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2026,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2026,10,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2026,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2026,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2028,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2028,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2028,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2028,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2028,13,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2026,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2026,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2026,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2026,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2026,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2026,10,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2026,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2026,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2028,8,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2028,9,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2028,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2028,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2028,13,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,CO2f,R1,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2026,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2026,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2028,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2028,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2026,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2026,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2026,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2026,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2028,8,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2028,9,all-year,all-week,morning,gasboiler,2024,5.99540000000
-2,heat,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2026,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2026,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2026,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2026,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2028,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2028,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2028,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2026,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2026,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2026,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2026,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2028,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2028,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2028,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,CO2f,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2026,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2026,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2026,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2028,8,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-3,heat,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2026,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2026,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2026,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2026,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2026,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2026,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2028,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2028,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2028,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2028,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2028,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2026,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2026,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2026,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2026,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2026,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2026,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2028,8,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2028,9,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2028,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2028,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2028,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,CO2f,R1,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2026,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2026,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2028,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2028,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2026,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2026,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2026,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2026,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2028,8,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2028,9,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-4,heat,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2026,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2026,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2026,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2026,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2026,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2026,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2028,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2028,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2028,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2028,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2028,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2026,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2026,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2026,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2026,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2026,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2026,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2028,8,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2028,9,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2028,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2028,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2028,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,CO2f,R1,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2026,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2026,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2028,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2028,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2026,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2026,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2026,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2026,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2028,8,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2028,9,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-5,heat,R1,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2026,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2026,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2026,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2026,10,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2026,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2026,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2028,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2028,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2028,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2028,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2028,13,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2026,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2026,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2026,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2026,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2026,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2026,10,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2026,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2026,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2028,8,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2028,9,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2028,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2028,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2028,13,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,CO2f,R1,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2026,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2026,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2028,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2028,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2026,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2026,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2026,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2026,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2028,8,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2028,9,all-year,all-week,evening,gasboiler,2024,8.39350000000
-6,heat,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2026,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2026,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2026,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2026,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2026,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2026,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2028,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2028,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2028,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2028,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2028,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2026,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2026,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2026,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2026,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2026,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2026,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2028,8,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2028,9,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2028,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2028,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2028,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,CO2f,R1,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2026,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2026,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2028,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2028,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2026,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2026,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2026,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2026,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2028,8,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2028,9,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-7,heat,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2026,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2026,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2026,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2026,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2028,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2028,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2028,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2026,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2026,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2026,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2026,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2028,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2028,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2028,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,CO2f,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2026,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2026,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2026,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2028,8,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R1,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R1,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
+0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R1,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R1,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
+1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R1,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R1,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R1,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R1,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
+2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R1,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R1,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R1,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R1,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
+6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
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 e9e10881..0c2864a0 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,545 +1,353 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2028,9,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2028,10,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2028,11,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2028,12,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2028,13,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2028,14,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2030,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2030,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2030,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2030,10,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2030,12,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2030,13,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2030,14,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2030,15,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2028,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2028,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2028,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2028,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2028,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2028,9,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2028,10,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2028,11,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2028,12,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2028,13,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2028,14,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2030,2,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2030,3,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2030,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2030,10,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2030,12,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2030,13,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2030,14,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2030,15,all-year,all-week,night,heatpump,2028,0.04670000000
-0,CO2f,R1,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2028,9,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2028,10,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2030,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2030,10,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2028,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2028,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2028,9,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2028,10,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2030,2,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2030,10,all-year,all-week,night,gasboiler,2024,4.19670000000
-1,heat,R1,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2028,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2028,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2028,11,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2028,12,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2028,13,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2028,14,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2030,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2030,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2030,15,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2028,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2028,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2028,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2028,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2028,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2028,11,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2028,12,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2028,13,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2028,14,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2030,2,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2030,10,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2030,15,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,CO2f,R1,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2028,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2028,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2030,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2030,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2028,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2028,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2028,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2028,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2030,2,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2030,10,all-year,all-week,morning,gasboiler,2024,5.99540000000
-2,heat,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2028,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2028,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2028,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2028,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2030,15,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2028,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2028,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2028,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2028,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2028,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2030,15,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,CO2f,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2028,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2028,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2028,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2030,10,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-3,heat,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2028,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2028,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2028,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2028,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2028,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2028,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2030,15,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2028,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2028,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2028,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2028,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2028,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2028,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2028,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2030,15,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,CO2f,R1,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2028,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2028,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2030,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2030,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2028,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2028,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2028,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2028,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2030,2,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2030,10,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-4,heat,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2028,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2028,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2028,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2028,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2028,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2028,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2030,15,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2028,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2028,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2028,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2028,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2028,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2028,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2028,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2030,15,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,CO2f,R1,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2028,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2028,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2030,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2030,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2028,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2028,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2028,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2028,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2030,2,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2030,10,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-5,heat,R1,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2028,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2028,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2028,11,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2028,12,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2028,13,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2028,14,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2030,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2030,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2030,15,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2028,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2028,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2028,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2028,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2028,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2028,11,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2028,12,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2028,13,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2028,14,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2030,2,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2030,10,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2030,15,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,CO2f,R1,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2028,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2028,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2030,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2030,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2028,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2028,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2028,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2028,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2030,2,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2030,10,all-year,all-week,evening,gasboiler,2024,8.39350000000
-6,heat,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2028,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2028,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2028,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2028,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2028,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2028,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2030,15,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2028,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2028,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2028,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2028,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2028,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2028,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2028,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2030,15,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,CO2f,R1,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2028,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2028,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2030,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2030,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2028,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2028,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2028,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2028,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2030,2,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2030,10,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-7,heat,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2028,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2028,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2028,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2028,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2030,15,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2028,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2028,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2028,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2028,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2028,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2030,15,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,CO2f,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2028,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2028,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2028,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2030,10,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R1,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
+0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R1,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
+1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R1,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R1,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
+2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R1,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R1,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
+6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
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 00b9a70d..765376d6 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,577 +1,321 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2030,2,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2030,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2030,7,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2030,8,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2030,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2030,13,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2030,14,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2032,5,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2032,6,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2032,7,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2032,8,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2032,9,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2032,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2032,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2032,13,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2032,14,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2032,15,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2030,2,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2030,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2030,7,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2030,8,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.29250000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2030,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2030,13,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2030,14,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2032,5,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2032,6,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2032,7,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2032,8,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2032,9,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2032,11,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2032,12,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2032,13,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2032,14,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2032,15,all-year,all-week,night,heatpump,2030,0.33920000000
-0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2030,2,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2030,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2030,2,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2030,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2030,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2030,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2032,7,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2032,8,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2032,15,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2030,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2030,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.41790000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2032,7,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2032,8,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2032,15,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2030,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2030,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2030,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2030,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-2,heat,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2032,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2032,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2032,15,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.29250000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2032,7,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2032,8,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2032,15,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,CO2f,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2030,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2032,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2032,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2032,15,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.41790000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2032,7,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2032,8,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2032,15,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2030,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2030,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2030,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2030,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2032,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2032,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2032,15,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,0.87750000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2032,7,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2032,8,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2032,15,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2030,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2030,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2030,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2030,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2030,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2030,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2032,7,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2032,8,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2032,15,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2030,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2030,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.58500000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2032,7,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2032,8,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2032,15,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2030,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2030,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2030,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2030,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-6,heat,R1,2030,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2032,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2032,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2032,15,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2030,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.58500000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2032,7,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2032,8,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2032,15,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,CO2f,R1,2030,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2030,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2030,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2030,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2030,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2030,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-7,heat,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2032,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2032,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2032,15,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.58500000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2032,7,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2032,8,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2032,15,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,CO2f,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2030,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R1,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R1,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
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 00d32926..6ef5e128 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,513 +1,321 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R1,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2032,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2032,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2032,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2032,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2032,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2032,10,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R1,2032,11,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2032,12,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2032,13,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2032,14,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2034,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2034,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2034,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2034,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2034,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2034,9,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2034,11,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2034,12,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2034,13,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2034,14,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2034,15,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2032,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.01160000000
-0,heat,R2,2032,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2032,4,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2032,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2032,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2032,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2032,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2032,10,all-year,all-week,night,heatpump,2022,0.03510000000
-0,heat,R2,2032,11,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2032,12,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2032,13,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2032,14,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2034,3,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2034,5,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2034,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2034,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2034,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2034,9,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2034,11,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2034,12,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2034,13,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2034,14,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2034,15,all-year,all-week,night,heatpump,2032,0.09330000000
-0,CO2f,R1,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R1,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2034,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2032,0,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2032,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2032,2,all-year,all-week,night,gasboiler,2022,0.74850000000
-0,CO2f,R2,2032,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2034,3,all-year,all-week,night,gasboiler,2024,4.19670000000
-1,heat,R1,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R1,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2032,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2032,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2034,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2034,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2034,9,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2032,0,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2032,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2032,2,all-year,all-week,morning,gasboiler,2022,0.01650000000
-1,heat,R2,2032,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2032,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2032,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2022,0.05010000000
-1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2034,3,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2034,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2034,9,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,CO2f,R1,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R1,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2034,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2032,0,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2032,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2032,2,all-year,all-week,morning,gasboiler,2022,1.06930000000
-1,CO2f,R2,2032,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2034,3,all-year,all-week,morning,gasboiler,2024,5.99540000000
-2,heat,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2032,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2032,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2034,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2034,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.01160000000
-2,heat,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2032,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2032,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.03510000000
-2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2034,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2034,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,CO2f,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R1,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2032,2,all-year,all-week,mid-afternoon,gasboiler,2022,0.74850000000
-2,CO2f,R2,2032,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2034,3,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-3,heat,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2032,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2032,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2034,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2034,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2034,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,0.01650000000
-3,heat,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2032,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2032,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2022,0.05010000000
-3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2034,3,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2034,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2034,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,CO2f,R1,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R1,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2034,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2032,0,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2032,2,all-year,all-week,early-peak,gasboiler,2022,1.06930000000
-3,CO2f,R2,2032,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2034,3,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-4,heat,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2032,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2032,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2034,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2034,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2034,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,0.03470000000
-4,heat,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2032,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2032,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2022,0.10530000000
-4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2034,3,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2034,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2034,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,CO2f,R1,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R1,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2034,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2032,0,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2032,2,all-year,all-week,late-peak,gasboiler,2022,2.24540000000
-4,CO2f,R2,2032,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2034,3,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-5,heat,R1,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R1,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2032,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2032,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2034,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2034,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2034,9,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2032,0,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2032,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2032,2,all-year,all-week,evening,gasboiler,2022,0.02310000000
-5,heat,R2,2032,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2032,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2032,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2022,0.07020000000
-5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2034,3,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2034,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2034,9,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,CO2f,R1,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R1,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2034,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2032,0,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2032,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2032,2,all-year,all-week,evening,gasboiler,2022,1.49700000000
-5,CO2f,R2,2032,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2034,3,all-year,all-week,evening,gasboiler,2024,8.39350000000
-6,heat,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2032,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2032,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2034,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2034,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2034,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,0.02310000000
-6,heat,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2032,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2032,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2022,0.07020000000
-6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2034,3,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2034,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2034,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,CO2f,R1,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R1,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2034,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2032,0,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2032,2,all-year,all-week,early-morning,gasboiler,2022,1.49700000000
-6,CO2f,R2,2032,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2034,3,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-7,heat,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2032,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2032,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2034,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2034,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,0.02310000000
-7,heat,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2032,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2032,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.07020000000
-7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2034,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2034,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,CO2f,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R1,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2032,2,all-year,all-week,late-afternoon,gasboiler,2022,1.49700000000
-7,CO2f,R2,2032,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2034,3,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R1,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
+1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
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 b88b7e2b..da5d538d 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,321 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2034,0,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R1,2034,2,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2034,3,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2034,4,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2034,5,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2034,6,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2034,8,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R1,2034,9,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2034,10,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2034,11,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2034,12,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2036,3,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2036,4,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2036,5,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2036,6,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2036,7,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2036,9,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2036,10,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2036,11,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2036,12,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2036,13,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2034,0,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2034,1,all-year,all-week,night,gasboiler,2024,0.06490000000
-0,heat,R2,2034,2,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2034,3,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2034,4,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2034,5,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2034,6,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2034,8,all-year,all-week,night,heatpump,2024,0.08600000000
-0,heat,R2,2034,9,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2034,10,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2034,11,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2034,12,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2036,3,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2036,4,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2036,5,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2036,6,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2036,7,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2036,9,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2036,10,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2036,11,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2036,12,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2036,13,all-year,all-week,night,heatpump,2034,0.19750000000
-0,CO2f,R1,2034,0,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R1,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2034,0,all-year,all-week,night,gasboiler,2024,4.19670000000
-0,CO2f,R2,2034,1,all-year,all-week,night,gasboiler,2024,4.19670000000
-1,heat,R1,2034,0,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R1,2034,2,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2034,8,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R1,2034,9,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2034,10,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2036,3,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2036,9,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2036,10,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2036,11,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2036,12,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2034,0,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2034,1,all-year,all-week,morning,gasboiler,2024,0.09260000000
-1,heat,R2,2034,2,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2034,8,all-year,all-week,morning,heatpump,2024,0.12280000000
-1,heat,R2,2034,9,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2034,10,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2036,3,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2036,9,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2036,10,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2036,11,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2036,12,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,CO2f,R1,2034,0,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R1,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2034,0,all-year,all-week,morning,gasboiler,2024,5.99540000000
-1,CO2f,R2,2034,1,all-year,all-week,morning,gasboiler,2024,5.99540000000
-2,heat,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R1,2034,2,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2034,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R1,2034,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2034,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2036,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2036,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2036,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2036,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2036,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.06490000000
-2,heat,R2,2034,2,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2034,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08600000000
-2,heat,R2,2034,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2034,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2036,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2036,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2036,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2036,11,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2036,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,CO2f,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-2,CO2f,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,4.19670000000
-3,heat,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R1,2034,2,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2034,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R1,2034,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2034,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2036,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2036,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2036,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2036,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2036,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.09260000000
-3,heat,R2,2034,2,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2034,8,all-year,all-week,early-peak,heatpump,2024,0.12280000000
-3,heat,R2,2034,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2034,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2036,3,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2036,9,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2036,10,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2036,11,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2036,12,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,CO2f,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-3,CO2f,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,5.99540000000
-4,heat,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R1,2034,2,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2034,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R1,2034,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2034,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2036,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2036,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2036,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2036,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2036,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.19460000000
-4,heat,R2,2034,2,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2034,8,all-year,all-week,late-peak,heatpump,2024,0.25790000000
-4,heat,R2,2034,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2034,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2036,3,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2036,9,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2036,10,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2036,11,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2036,12,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,CO2f,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-4,CO2f,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,12.59020000000
-5,heat,R1,2034,0,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R1,2034,2,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2034,8,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R1,2034,9,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2034,10,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2036,3,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2036,9,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2036,10,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2036,11,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2036,12,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2034,0,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2034,1,all-year,all-week,evening,gasboiler,2024,0.12970000000
-5,heat,R2,2034,2,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2034,8,all-year,all-week,evening,heatpump,2024,0.17200000000
-5,heat,R2,2034,9,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2034,10,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2036,3,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2036,9,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2036,10,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2036,11,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2036,12,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,CO2f,R1,2034,0,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R1,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2034,0,all-year,all-week,evening,gasboiler,2024,8.39350000000
-5,CO2f,R2,2034,1,all-year,all-week,evening,gasboiler,2024,8.39350000000
-6,heat,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R1,2034,2,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2034,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R1,2034,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2034,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2036,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2036,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2036,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2036,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2036,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.12970000000
-6,heat,R2,2034,2,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2034,8,all-year,all-week,early-morning,heatpump,2024,0.17200000000
-6,heat,R2,2034,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2034,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2036,3,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2036,9,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2036,10,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2036,11,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2036,12,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,CO2f,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-6,CO2f,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,8.39350000000
-7,heat,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R1,2034,2,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2034,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R1,2034,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2034,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2036,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2036,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2036,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2036,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2036,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.12970000000
-7,heat,R2,2034,2,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2034,8,all-year,all-week,late-afternoon,heatpump,2024,0.17200000000
-7,heat,R2,2034,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2034,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2036,3,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2036,9,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2036,10,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2036,11,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2036,12,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,CO2f,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
-7,CO2f,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,8.39350000000
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R1,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
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 0d4b3ed0..e0448c28 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,month,day,hour,technology,installed,supply
-0,heat,R1,2036,0,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2036,1,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2036,2,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2036,3,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2036,4,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2036,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R1,2036,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2036,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2036,9,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2036,10,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2038,1,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2038,2,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2038,3,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2038,4,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2038,5,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2038,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2038,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2038,9,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2038,10,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2038,11,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2036,0,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2036,1,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2036,2,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2036,3,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2036,4,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2036,6,all-year,all-week,night,heatpump,2026,0.04670000000
-0,heat,R2,2036,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2036,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2036,9,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2036,10,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2038,1,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2038,2,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2038,3,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2038,4,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2038,5,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2038,7,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2038,8,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2038,9,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2038,10,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2038,11,all-year,all-week,night,heatpump,2036,0.09330000000
-1,heat,R1,2036,0,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2036,1,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2036,2,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2036,3,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2036,9,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2036,10,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2038,1,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2038,2,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2038,3,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2038,4,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2038,10,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2038,11,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2036,0,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2036,1,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2036,2,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2036,3,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2026,0.06670000000
-1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2036,9,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2036,10,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2038,1,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2038,2,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2038,3,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2038,4,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2038,10,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2038,11,all-year,all-week,morning,heatpump,2036,0.13330000000
-2,heat,R1,2036,0,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2036,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2036,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2036,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2036,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2036,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2038,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2038,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2038,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2038,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2038,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2038,11,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2036,0,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2036,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2036,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2036,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04670000000
-2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2036,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2036,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2038,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2038,2,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2038,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2038,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2038,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2038,11,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-3,heat,R1,2036,0,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2036,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2036,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2036,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2036,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2036,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2038,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2038,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2038,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2038,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2038,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2038,11,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2036,0,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2036,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2036,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2036,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2026,0.06670000000
-3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2036,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2036,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2038,1,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2038,2,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2038,3,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2038,4,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2038,10,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2038,11,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-4,heat,R1,2036,0,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2036,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2036,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2036,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2036,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2036,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2038,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2038,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2038,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2038,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2038,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2038,11,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2036,0,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2036,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2036,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2036,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2026,0.14000000000
-4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2036,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2036,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2038,1,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2038,2,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2038,3,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2038,4,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2038,10,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2038,11,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-5,heat,R1,2036,0,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2036,1,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2036,2,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2036,3,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2036,9,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2036,10,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2038,1,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2038,2,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2038,3,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2038,4,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2038,10,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2038,11,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2036,0,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2036,1,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2036,2,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2036,3,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2026,0.09330000000
-5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2036,9,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2036,10,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2038,1,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2038,2,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2038,3,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2038,4,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2038,10,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2038,11,all-year,all-week,evening,heatpump,2036,0.18670000000
-6,heat,R1,2036,0,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2036,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2036,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2036,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2036,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2036,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2038,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2038,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2038,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2038,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2038,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2038,11,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2036,0,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2036,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2036,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2036,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2026,0.09330000000
-6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2036,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2036,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2038,1,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2038,2,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2038,3,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2038,4,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2038,10,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2038,11,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-7,heat,R1,2036,0,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2036,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2036,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2036,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2036,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2036,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2038,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2038,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2038,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2038,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2038,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2038,11,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2036,0,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2036,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2036,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2036,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2026,0.09330000000
-7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2036,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2036,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2038,1,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2038,2,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2038,3,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2038,4,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2038,10,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2038,11,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R1,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R1,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R1,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R1,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R1,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R1,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R1,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R1,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R1,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
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 29c854c0..f78f5302 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,month,day,hour,technology,installed,supply
-0,heat,R1,2038,0,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2038,1,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2038,2,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2038,3,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2038,4,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2038,6,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R1,2038,7,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2038,8,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2038,9,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2038,10,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2040,1,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2040,2,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2040,5,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R1,2040,7,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2040,11,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R2,2038,0,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2038,1,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2038,2,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2038,3,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2038,4,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2038,6,all-year,all-week,night,heatpump,2028,0.04670000000
-0,heat,R2,2038,7,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2038,8,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2038,9,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2038,10,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2040,1,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2040,2,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2040,5,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R2,2040,7,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2040,11,all-year,all-week,night,heatpump,2038,0.09330000000
-1,heat,R1,2038,0,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2038,1,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2038,2,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2038,3,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2038,4,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2038,10,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2040,11,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R2,2038,0,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2038,1,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2038,2,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2038,3,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2038,4,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2028,0.06670000000
-1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2038,10,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2040,11,all-year,all-week,morning,heatpump,2038,0.13330000000
-2,heat,R1,2038,0,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2038,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2038,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2038,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2038,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2038,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2040,11,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R2,2038,0,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2038,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2038,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2038,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2038,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04670000000
-2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2038,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2040,11,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-3,heat,R1,2038,0,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2038,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2038,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2038,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2038,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2038,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2040,11,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R2,2038,0,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2038,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2038,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2038,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2038,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2028,0.06670000000
-3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2038,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2040,11,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-4,heat,R1,2038,0,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2038,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2038,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2038,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2038,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2038,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2040,11,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R2,2038,0,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2038,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2038,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2038,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2038,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2028,0.14000000000
-4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2038,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2040,11,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-5,heat,R1,2038,0,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2038,1,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2038,2,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2038,3,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2038,4,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2038,10,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2040,11,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R2,2038,0,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2038,1,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2038,2,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2038,3,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2038,4,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2028,0.09330000000
-5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2038,10,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2040,11,all-year,all-week,evening,heatpump,2038,0.18670000000
-6,heat,R1,2038,0,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2038,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2038,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2038,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2038,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2038,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2040,11,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R2,2038,0,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2038,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2038,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2038,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2038,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2028,0.09330000000
-6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2038,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2040,11,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-7,heat,R1,2038,0,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2038,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2038,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2038,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2038,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2038,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2040,11,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R2,2038,0,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2038,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2038,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2038,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2038,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2028,0.09330000000
-7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2038,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2040,11,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
+0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R1,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R1,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
+1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R1,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
+2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R1,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R1,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R1,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R1,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
+6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R1,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R1,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
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 209e7d31..a196c0ff 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,month,day,hour,technology,installed,supply
-0,heat,R1,2040,0,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2040,1,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2040,2,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R1,2042,1,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2042,2,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2042,3,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2042,4,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R1,2042,5,all-year,all-week,night,heatpump,2040,0.38580000000
-0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.38580000000
-0,heat,R2,2040,0,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2040,1,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2040,2,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.33920000000
-0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R2,2042,1,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2042,2,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2042,3,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2042,4,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R2,2042,5,all-year,all-week,night,heatpump,2040,0.38580000000
-0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.09330000000
-0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.19750000000
-0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.09330000000
-0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.09330000000
-0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.38580000000
-1,heat,R1,2040,0,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R1,2042,1,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2042,2,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2042,3,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2042,4,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R1,2042,5,all-year,all-week,morning,heatpump,2040,0.55120000000
-1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.55120000000
-1,heat,R2,2040,0,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.48450000000
-1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R2,2042,1,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2042,2,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2042,3,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2042,4,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R2,2042,5,all-year,all-week,morning,heatpump,2040,0.55120000000
-1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.13330000000
-1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.28210000000
-1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.13330000000
-1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.13330000000
-1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.55120000000
-2,heat,R1,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R1,2042,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2042,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2042,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2042,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R1,2042,5,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
-2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
-2,heat,R2,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.33920000000
-2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R2,2042,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2042,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2042,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2042,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R2,2042,5,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
-2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09330000000
-2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19750000000
-2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09330000000
-2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09330000000
-2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.38580000000
-3,heat,R1,2040,0,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R1,2042,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2042,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2042,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2042,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R1,2042,5,all-year,all-week,early-peak,heatpump,2040,0.55120000000
-3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.55120000000
-3,heat,R2,2040,0,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.48450000000
-3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R2,2042,1,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2042,2,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2042,3,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2042,4,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R2,2042,5,all-year,all-week,early-peak,heatpump,2040,0.55120000000
-3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.13330000000
-3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.28210000000
-3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.13330000000
-3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.13330000000
-3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.55120000000
-4,heat,R1,2040,0,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R1,2042,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2042,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2042,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2042,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R1,2042,5,all-year,all-week,late-peak,heatpump,2040,1.15750000000
-4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,1.15750000000
-4,heat,R2,2040,0,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,1.01750000000
-4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R2,2042,1,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2042,2,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2042,3,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2042,4,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R2,2042,5,all-year,all-week,late-peak,heatpump,2040,1.15750000000
-4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.28000000000
-4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.59250000000
-4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.28000000000
-4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.28000000000
-4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,1.15750000000
-5,heat,R1,2040,0,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R1,2042,1,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2042,2,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2042,3,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2042,4,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R1,2042,5,all-year,all-week,evening,heatpump,2040,0.77170000000
-5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.77170000000
-5,heat,R2,2040,0,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.67830000000
-5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R2,2042,1,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2042,2,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2042,3,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2042,4,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R2,2042,5,all-year,all-week,evening,heatpump,2040,0.77170000000
-5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.18670000000
-5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.39500000000
-5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.18670000000
-5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.18670000000
-5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.77170000000
-6,heat,R1,2040,0,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R1,2042,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2042,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2042,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2042,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R1,2042,5,all-year,all-week,early-morning,heatpump,2040,0.77170000000
-6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.77170000000
-6,heat,R2,2040,0,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.67830000000
-6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R2,2042,1,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2042,2,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2042,3,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2042,4,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R2,2042,5,all-year,all-week,early-morning,heatpump,2040,0.77170000000
-6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.18670000000
-6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.39500000000
-6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.18670000000
-6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.18670000000
-6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.77170000000
-7,heat,R1,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R1,2042,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2042,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2042,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2042,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R1,2042,5,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
-7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
-7,heat,R2,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.67830000000
-7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R2,2042,1,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2042,2,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2042,3,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2042,4,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R2,2042,5,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
-7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.18670000000
-7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.39500000000
-7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.18670000000
-7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.18670000000
-7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.77170000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
+0,heat,R1,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R1,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R1,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R1,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R1,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
+0,heat,R2,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R2,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R2,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R2,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R2,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
+1,heat,R1,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R1,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R1,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R1,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R1,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
+1,heat,R2,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R2,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R2,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R2,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R2,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+2,heat,R1,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R1,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R1,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R1,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R1,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+2,heat,R2,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R2,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R2,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R2,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R2,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+3,heat,R1,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R1,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R1,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R1,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R1,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+3,heat,R2,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R2,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R2,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R2,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R2,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+4,heat,R1,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R1,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R1,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R1,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R1,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+4,heat,R2,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R2,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R2,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R2,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R2,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
+5,heat,R1,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R1,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R1,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R1,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R1,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
+5,heat,R2,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R2,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R2,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R2,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R2,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+6,heat,R1,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R1,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R1,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R1,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R1,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+6,heat,R2,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R2,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R2,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R2,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R2,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+7,heat,R1,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R1,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R1,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R1,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R1,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+7,heat,R2,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R2,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R2,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R2,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R2,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
index 761a97db..1d028468 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
@@ -1,17 +1,7 @@
 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,2030,R1,gassupply1,2025,2.45020000000
-1,2035,R1,gassupply1,2025,2.45020000000
-1,2040,R1,gassupply1,2025,2.45020000000
-1,2045,R1,gassupply1,2025,2.45020000000
-1,2050,R1,gassupply1,2025,2.45020000000
-1,2064,R1,gassupply1,2025,2.45020000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2030,R2,gassupply1,2025,2.45020000000
-3,2035,R2,gassupply1,2025,2.45020000000
-3,2040,R2,gassupply1,2025,2.45020000000
-3,2045,R2,gassupply1,2025,2.45020000000
-3,2050,R2,gassupply1,2025,2.45020000000
-3,2064,R2,gassupply1,2025,2.45020000000
+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-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index 0bc4ab85..1d028468 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -1,29 +1,7 @@
 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,2030,R1,gassupply1,2025,2.45020000000
-1,2035,R1,gassupply1,2025,2.45020000000
-1,2040,R1,gassupply1,2025,2.45020000000
-1,2045,R1,gassupply1,2025,2.45020000000
-1,2050,R1,gassupply1,2025,2.45020000000
-1,2064,R1,gassupply1,2025,2.45020000000
-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.45020000000
-4,2035,R2,gassupply1,2025,2.45020000000
-4,2040,R2,gassupply1,2025,2.45020000000
-4,2045,R2,gassupply1,2025,2.45020000000
-4,2050,R2,gassupply1,2025,2.45020000000
-4,2064,R2,gassupply1,2025,2.45020000000
-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
+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-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index 0a21bfb3..1d028468 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -1,25 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2025,2.45020000000
-1,2040,R1,gassupply1,2025,2.45020000000
-1,2045,R1,gassupply1,2025,2.45020000000
-1,2050,R1,gassupply1,2025,2.45020000000
-1,2064,R1,gassupply1,2025,2.45020000000
-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.45020000000
-4,2040,R2,gassupply1,2025,2.45020000000
-4,2045,R2,gassupply1,2025,2.45020000000
-4,2050,R2,gassupply1,2025,2.45020000000
-4,2064,R2,gassupply1,2025,2.45020000000
-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
+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-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index 8214f482..1d028468 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -1,21 +1,7 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2025,2.45020000000
-1,2045,R1,gassupply1,2025,2.45020000000
-1,2050,R1,gassupply1,2025,2.45020000000
-1,2064,R1,gassupply1,2025,2.45020000000
-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.45020000000
-4,2045,R2,gassupply1,2025,2.45020000000
-4,2050,R2,gassupply1,2025,2.45020000000
-4,2064,R2,gassupply1,2025,2.45020000000
-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
+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-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index 0157b9b8..32cbc24e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -1,17 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2025,2.45020000000
-1,2050,R1,gassupply1,2025,2.45020000000
-1,2064,R1,gassupply1,2025,2.45020000000
-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.45020000000
-4,2050,R2,gassupply1,2025,2.45020000000
-4,2064,R2,gassupply1,2025,2.45020000000
-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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,1.32420000000
+1,2084,R1,gassupply1,2045,1.32420000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2050,R2,gassupply1,2045,1.32420000000
+3,2084,R2,gassupply1,2045,1.32420000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 3f41a855..32cbc24e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -1,17 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2025,2.45020000000
-1,2055,R1,gassupply1,2025,2.45020000000
-1,2064,R1,gassupply1,2025,2.45020000000
-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.45020000000
-4,2055,R2,gassupply1,2025,2.45020000000
-4,2064,R2,gassupply1,2025,2.45020000000
-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
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2050,R1,gassupply1,2045,1.32420000000
+1,2084,R1,gassupply1,2045,1.32420000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2050,R2,gassupply1,2045,1.32420000000
+3,2084,R2,gassupply1,2045,1.32420000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 5943301c..383297dd 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -1,148 +1,123 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gas_stove,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gas_stove,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2020,15.00000000000
-electric_stove,R1,R1,A1,residential,retrofit,2025,17.40000000000
-gas_stove,R1,R1,A1,residential,retrofit,2025,5.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,17.40000000000
-electric_stove,R2,R2,A1,residential,retrofit,2025,17.40000000000
-gas_stove,R2,R2,A1,residential,retrofit,2025,5.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,5.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2025,17.40000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-solarPV,R1,R1,A1,power,retrofit,2025,12.55000000000
-windturbine,R1,R1,A1,power,retrofit,2025,20.00000000000
-gasCCGT,R2,R2,A1,power,retrofit,2025,1.00000000000
-windturbine,R2,R2,A1,power,retrofit,2025,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,retrofit,2025,15.00000000000
-electric_stove,R1,R1,A1,residential,retrofit,2030,17.40000000000
-electric_stove,R1,R1,A1,residential,retrofit,2030,6.74000000000
-gas_stove,R1,R1,A1,residential,retrofit,2030,3.86000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,3.86000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,17.40000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.74000000000
-electric_stove,R2,R2,A1,residential,retrofit,2030,17.40000000000
-electric_stove,R2,R2,A1,residential,retrofit,2030,6.74000000000
-gas_stove,R2,R2,A1,residential,retrofit,2030,3.86000000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,3.86000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,17.40000000000
-heatpump,R2,R2,A1,residential,retrofit,2030,6.74000000000
-solarPV,R1,R1,A1,power,retrofit,2030,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2030,15.73000000000
-windturbine,R1,R1,A1,power,retrofit,2030,20.00000000000
-solarPV,R2,R2,A1,power,retrofit,2030,15.73000000000
-windturbine,R2,R2,A1,power,retrofit,2030,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.45020000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2030,2.45020000000
-electric_stove,R1,R1,A1,residential,retrofit,2035,6.74000000000
-electric_stove,R1,R1,A1,residential,retrofit,2035,23.00000000000
-gas_stove,R1,R1,A1,residential,retrofit,2035,3.86000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,3.86000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.74000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,23.00000000000
-electric_stove,R2,R2,A1,residential,retrofit,2035,6.74000000000
-electric_stove,R2,R2,A1,residential,retrofit,2035,23.00000000000
-gas_stove,R2,R2,A1,residential,retrofit,2035,3.86000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,3.86000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,6.74000000000
-heatpump,R2,R2,A1,residential,retrofit,2035,23.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2035,15.73000000000
-solarPV,R1,R1,A1,power,retrofit,2035,20.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,20.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,2.40000000000
-solarPV,R2,R2,A1,power,retrofit,2035,15.73000000000
-solarPV,R2,R2,A1,power,retrofit,2035,11.20000000000
-windturbine,R2,R2,A1,power,retrofit,2035,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.45020000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,2.45020000000
-gassupply1,R2,R2,A1,gas,retrofit,2035,7.50000000000
-electric_stove,R1,R1,A1,residential,retrofit,2040,23.00000000000
-electric_stove,R1,R1,A1,residential,retrofit,2040,15.31400000000
-gas_stove,R1,R1,A1,residential,retrofit,2040,0.88600000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,0.88600000000
-heatpump,R1,R1,A1,residential,retrofit,2040,23.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,15.31400000000
-electric_stove,R2,R2,A1,residential,retrofit,2040,23.00000000000
-electric_stove,R2,R2,A1,residential,retrofit,2040,15.31400000000
-gas_stove,R2,R2,A1,residential,retrofit,2040,0.88600000000
-gasboiler,R2,R2,A1,residential,retrofit,2040,0.88600000000
-heatpump,R2,R2,A1,residential,retrofit,2040,23.00000000000
-heatpump,R2,R2,A1,residential,retrofit,2040,15.31400000000
-solarPV,R1,R1,A1,power,retrofit,2040,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2040,15.73000000000
-solarPV,R1,R1,A1,power,retrofit,2040,20.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,5.94800000000
-windturbine,R1,R1,A1,power,retrofit,2040,20.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,2.40000000000
-solarPV,R2,R2,A1,power,retrofit,2040,15.73000000000
-solarPV,R2,R2,A1,power,retrofit,2040,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2040,17.14800000000
-windturbine,R2,R2,A1,power,retrofit,2040,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.45020000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,2.45020000000
-gassupply1,R2,R2,A1,gas,retrofit,2040,7.50000000000
-electric_stove,R1,R1,A1,residential,retrofit,2045,15.31400000000
-electric_stove,R1,R1,A1,residential,retrofit,2045,28.60000000000
-gas_stove,R1,R1,A1,residential,retrofit,2045,0.88600000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,0.88600000000
-heatpump,R1,R1,A1,residential,retrofit,2045,15.31400000000
-heatpump,R1,R1,A1,residential,retrofit,2045,28.60000000000
-electric_stove,R2,R2,A1,residential,retrofit,2045,15.31400000000
-electric_stove,R2,R2,A1,residential,retrofit,2045,28.60000000000
-gas_stove,R2,R2,A1,residential,retrofit,2045,0.88600000000
-gasboiler,R2,R2,A1,residential,retrofit,2045,0.88600000000
-heatpump,R2,R2,A1,residential,retrofit,2045,15.31400000000
-heatpump,R2,R2,A1,residential,retrofit,2045,28.60000000000
-solarPV,R1,R1,A1,power,retrofit,2045,12.55000000000
-solarPV,R1,R1,A1,power,retrofit,2045,15.73000000000
-solarPV,R1,R1,A1,power,retrofit,2045,20.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,5.94800000000
-solarPV,R1,R1,A1,power,retrofit,2045,11.20000000000
-windturbine,R1,R1,A1,power,retrofit,2045,20.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,2.40000000000
-solarPV,R2,R2,A1,power,retrofit,2045,15.73000000000
-solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2045,17.14800000000
-solarPV,R2,R2,A1,power,retrofit,2045,11.20000000000
-windturbine,R2,R2,A1,power,retrofit,2045,32.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.45020000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,2.45020000000
-gassupply1,R2,R2,A1,gas,retrofit,2045,7.50000000000
-electric_stove,R1,R1,A1,residential,retrofit,2050,28.60000000000
-electric_stove,R1,R1,A1,residential,retrofit,2050,21.80000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,28.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,21.80000000000
-electric_stove,R2,R2,A1,residential,retrofit,2050,28.60000000000
-electric_stove,R2,R2,A1,residential,retrofit,2050,21.80000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,28.60000000000
-heatpump,R2,R2,A1,residential,retrofit,2050,21.80000000000
-solarPV,R1,R1,A1,power,retrofit,2050,15.73000000000
-solarPV,R1,R1,A1,power,retrofit,2050,20.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,5.94800000000
-solarPV,R1,R1,A1,power,retrofit,2050,11.20000000000
-solarPV,R1,R1,A1,power,retrofit,2050,32.97200000000
-windturbine,R1,R1,A1,power,retrofit,2050,2.40000000000
-windturbine,R1,R1,A1,power,retrofit,2050,12.55000000000
-solarPV,R2,R2,A1,power,retrofit,2050,15.73000000000
-solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2050,17.14800000000
-solarPV,R2,R2,A1,power,retrofit,2050,11.20000000000
-solarPV,R2,R2,A1,power,retrofit,2050,32.97200000000
-windturbine,R2,R2,A1,power,retrofit,2050,12.55000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.45020000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,2.45020000000
-gassupply1,R2,R2,A1,gas,retrofit,2050,7.50000000000
+gas_stove,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gas_stove,R2,R2,A1,residential,newcapa,2020,10.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2025,17.00000000000
+gas_stove,R1,R1,A1,residential,newcapa,2025,5.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2025,17.00000000000
+gas_stove,R2,R2,A1,residential,newcapa,2025,5.00000000000
+gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+solarPV,R1,R1,A1,power,newcapa,2025,12.36820000000
+windturbine,R1,R1,A1,power,newcapa,2025,20.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
+windturbine,R2,R2,A1,power,newcapa,2025,32.36820000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2030,17.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2030,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2030,17.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2030,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,12.36820000000
+solarPV,R1,R1,A1,power,newcapa,2030,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,3.63180000000
+solarPV,R2,R2,A1,power,newcapa,2030,20.00000000000
+windturbine,R2,R2,A1,power,newcapa,2030,32.36820000000
+windturbine,R2,R2,A1,power,newcapa,2030,3.63180000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+electric_stove,R1,R1,A1,residential,newcapa,2035,11.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2035,22.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2035,11.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2035,22.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,12.36820000000
+solarPV,R1,R1,A1,power,newcapa,2035,20.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,11.20000000000
+windturbine,R1,R1,A1,power,newcapa,2035,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,3.63180000000
+solarPV,R2,R2,A1,power,newcapa,2035,20.00000000000
+solarPV,R2,R2,A1,power,newcapa,2035,11.20000000000
+windturbine,R2,R2,A1,power,newcapa,2035,32.36820000000
+windturbine,R2,R2,A1,power,newcapa,2035,3.63180000000
+electric_stove,R1,R1,A1,residential,newcapa,2040,22.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2040,17.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2040,22.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2040,17.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,12.36820000000
+solarPV,R1,R1,A1,power,newcapa,2040,20.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
+windturbine,R1,R1,A1,power,newcapa,2040,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,3.63180000000
+solarPV,R2,R2,A1,power,newcapa,2040,20.00000000000
+solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
+windturbine,R2,R2,A1,power,newcapa,2040,32.36820000000
+windturbine,R2,R2,A1,power,newcapa,2040,3.63180000000
+electric_stove,R1,R1,A1,residential,newcapa,2045,17.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2045,27.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2045,17.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2045,27.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,12.36820000000
+solarPV,R1,R1,A1,power,newcapa,2045,20.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
+windturbine,R1,R1,A1,power,newcapa,2045,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,3.63180000000
+solarPV,R2,R2,A1,power,newcapa,2045,20.00000000000
+solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
+windturbine,R2,R2,A1,power,newcapa,2045,32.36820000000
+windturbine,R2,R2,A1,power,newcapa,2045,3.63180000000
+electric_stove,R1,R1,A1,residential,newcapa,2050,27.00000000000
+electric_stove,R1,R1,A1,residential,newcapa,2050,23.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2050,27.00000000000
+electric_stove,R2,R2,A1,residential,newcapa,2050,23.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
+heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.58590000000
+solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,3.63180000000
+windturbine,R1,R1,A1,power,newcapa,2050,20.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
+solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
+windturbine,R2,R2,A1,power,newcapa,2050,3.63180000000
+windturbine,R2,R2,A1,power,newcapa,2050,23.56820000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.32420000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,1.32420000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index ec72ee70..91c33273 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,483 +79,483 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.58860000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.58860000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.58870000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,17.58870000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.15600000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.15650000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,80.15650000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,80.15030000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,80.15030000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.60590000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.60590000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,80.15070000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,80.15070000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.60610000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,17.60610000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.22280000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.22350000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,80.22350000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,80.21470000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,80.21470000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58860000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58860000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,80.21520000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,80.21520000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58870000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58870000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15600000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15600000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15650000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15650000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.15030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.15030000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60590000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60590000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.15070000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.15070000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60610000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60610000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.22280000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.22280000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.22350000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,80.22350000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,80.21470000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,80.21470000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66940000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66940000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,80.21520000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,80.21520000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66980000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66980000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.46790000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.46790000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.46940000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,80.46940000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,80.45080000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,80.45080000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.62900000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,80.45200000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,80.45200000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.62920000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,17.62920000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.31190000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.31290000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,80.31290000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,80.30060000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,80.30060000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62900000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,80.30130000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,80.30130000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62920000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62920000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.31190000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,80.31290000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,80.31290000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,80.30060000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,80.30060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62900000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62900000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,80.30130000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,80.30130000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62920000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62920000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31190000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31190000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31290000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31290000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.30060000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.30060000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.08930000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,14.08930000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.24990000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,64.24990000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.30130000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.30130000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.09230000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.09230000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.52070000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.52070000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,64.24080000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,64.24080000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.11110000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,14.11110000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.35710000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,64.35710000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.52070000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,0.52070000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13180000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13180000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.74460000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.74460000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,64.34410000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,64.34410000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,14.08930000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,14.08930000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.24990000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.24990000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.74460000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,0.74460000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09230000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09230000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.52070000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.52070000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,64.24080000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,64.24080000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.11110000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,14.11110000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.35710000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.35710000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.52070000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.52070000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13180000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13180000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.74460000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.74460000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,64.34410000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,64.34410000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.19100000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.19100000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.75100000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.75100000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.74460000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.74460000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27680000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27680000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.56920000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,1.56920000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,64.72360000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,64.72360000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.14020000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,14.14020000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.50020000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,64.50020000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,1.56920000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,1.56920000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18460000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18460000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.04380000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,1.04380000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,64.48200000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,64.48200000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,14.14020000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,14.14020000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.50020000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.50020000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,1.04380000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,1.04380000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18460000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18460000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.04380000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.04380000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,64.48200000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,64.48200000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,14.14020000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,14.14020000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.50020000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.50020000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,1.04380000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,1.04380000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18460000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18460000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.04380000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.04380000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,64.48200000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,64.48200000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.28970000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,11.28970000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.16300000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.50740000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,51.50740000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.04380000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.04380000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.09140000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.09140000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,51.49480000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,51.49480000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.31490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,11.31490000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.16830000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.63940000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,51.63940000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.01570000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,0.01570000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.13060000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.13060000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,51.62150000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,51.62150000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.28970000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.28970000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.16300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.16300000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50740000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50740000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.02400000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,0.02400000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09140000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09140000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,51.49480000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,51.49480000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.31490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.31490000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.16830000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.16830000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.63940000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.63940000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01570000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01570000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13060000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13060000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,51.62150000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,51.62150000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.40740000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.40740000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.18790000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.18790000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.12490000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.12490000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02400000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02400000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27420000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27420000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06300000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06300000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,52.08720000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,52.08720000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.34850000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,11.34850000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.17540000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.81570000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,51.81570000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06300000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06300000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.18280000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,0.18280000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.03670000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.03670000000,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', 'evening')",cook,R1,51.79060000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,51.79060000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,11.34850000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,11.34850000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.17540000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.81570000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.81570000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.03670000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,0.03670000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18280000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18280000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03670000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03670000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,51.79060000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,51.79060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.34850000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.34850000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.17540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.17540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81570000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81570000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03670000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18280000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18280000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03670000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,51.79060000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,51.79060000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.04960000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,9.04960000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.33550000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,3.33550000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.27950000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,41.27950000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03670000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.08990000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.08990000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,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', 'night')",cook,R1,41.26820000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,41.26820000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.07750000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,9.07750000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.34200000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,3.34200000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.41690000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,41.41690000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.01570000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.01570000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12840000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12840000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,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', 'morning')",cook,R1,41.40070000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,41.40070000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,9.04960000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.04960000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.33550000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.33550000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.27950000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.27950000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.02400000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.02400000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08990000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08990000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,41.26820000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,41.26820000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.07750000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,9.07750000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.34200000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.34200000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.41690000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.41690000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01570000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01570000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12840000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12840000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,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', 'early-peak')",cook,R1,41.40070000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,41.40070000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.17960000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,9.17960000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.36570000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.36570000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,41.92280000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,41.92280000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02400000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02400000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26960000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06280000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06280000000,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', 'late-peak')",cook,R1,41.88870000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,41.88870000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.11460000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,9.11460000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.35060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,3.35060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.60050000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,41.60050000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06280000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17970000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17970000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.03660000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.03660000000,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', 'evening')",cook,R1,41.57770000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,41.57770000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,9.11460000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,9.11460000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.35060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.35060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,41.60050000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,41.60050000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.03660000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.03660000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17970000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17970000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03660000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03660000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,41.57770000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,41.57770000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.11460000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.11460000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.35060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.35060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60050000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60050000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03660000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17970000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17970000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03660000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,41.57770000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,41.57770000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.25720000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,7.25720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.08510000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,33.08510000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03660000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.08800000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.08800000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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', 'night')",cook,R1,33.07450000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,33.07450000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.28700000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,7.28700000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.22150000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,33.22150000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.01560000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.01560000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.12560000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.12560000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,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', 'morning')",cook,R1,33.20640000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,33.20640000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,7.25720000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,7.25720000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,33.08510000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,33.08510000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.02390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08800000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08800000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,33.07450000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,33.07450000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.28700000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,7.28700000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.22150000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,33.22150000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01560000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12560000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12560000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,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', 'early-peak')",cook,R1,33.20640000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,33.20640000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.39620000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,7.39620000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,33.72470000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,33.72470000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26390000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06240000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06240000000,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', 'late-peak')",cook,R1,33.69300000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,33.69300000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.32670000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,7.32670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.40400000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,33.40400000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06240000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06240000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.17590000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,0.17590000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,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', 'evening')",cook,R1,33.38280000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,33.38280000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,7.32670000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,7.32670000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,33.40400000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,33.40400000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.03640000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.03640000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17590000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17590000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,33.38280000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,33.38280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,7.32670000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,7.32670000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,33.40400000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,33.40400000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03640000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03640000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17590000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,33.38280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,33.38280000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.08220000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.08220000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.67350000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,2.67350000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.22250000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.22250000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03640000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03640000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.10000000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,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', 'night')",cook,R1,0.22250000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.22250000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11740000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.11740000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.68090000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,2.68090000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.31910000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.31910000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.01560000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.01560000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.14290000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.14290000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,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', 'morning')",cook,R1,0.31910000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.31910000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08220000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08220000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,2.67350000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,2.67350000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.22250000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.22250000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.02390000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.02390000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.10000000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.22250000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.22250000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11740000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.11740000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.68090000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,2.68090000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31910000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.31910000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01560000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.14290000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.14290000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,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', 'early-peak')",cook,R1,0.31910000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.31910000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.24660000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.24660000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.70790000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,2.70790000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.67950000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.67950000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.02390000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.02390000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.30000000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.30000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.06230000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.06230000000,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', 'late-peak')",cook,R1,0.67950000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.67950000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.16440000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.16440000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.69070000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,2.69070000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.44900000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.44900000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.06230000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.06230000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,0.20000000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.44900000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.44900000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.16440000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.16440000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,2.69070000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,2.69070000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.44900000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.44900000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.03640000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.03640000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.20000000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.44900000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.44900000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.16440000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.16440000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,2.69070000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,2.69070000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.44900000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.44900000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.03640000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.03640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.20000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.44900000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.44900000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03640000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
index 30878bb6..09406e26 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
@@ -1,12 +1,12 @@
 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,12.55000000000
-1,2030,R1,solarPV,2020,12.55000000000
-1,2035,R1,solarPV,2020,12.55000000000
-1,2040,R1,solarPV,2020,12.55000000000
-1,2045,R1,solarPV,2020,12.55000000000
-1,2049,R1,solarPV,2020,12.55000000000
+1,2025,R1,solarPV,2020,12.36820000000
+1,2030,R1,solarPV,2020,12.36820000000
+1,2035,R1,solarPV,2020,12.36820000000
+1,2040,R1,solarPV,2020,12.36820000000
+1,2045,R1,solarPV,2020,12.36820000000
+1,2049,R1,solarPV,2020,12.36820000000
 2,2025,R1,windturbine,2020,20.00000000000
 2,2030,R1,windturbine,2020,20.00000000000
 2,2035,R1,windturbine,2020,20.00000000000
@@ -15,9 +15,9 @@ asset,year,region,technology,installed,capacity
 2,2049,R1,windturbine,2020,20.00000000000
 3,2020,R2,gasCCGT,2020,1.00000000000
 3,2025,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,windturbine,2020,32.55000000000
-4,2030,R2,windturbine,2020,32.55000000000
-4,2035,R2,windturbine,2020,32.55000000000
-4,2040,R2,windturbine,2020,32.55000000000
-4,2045,R2,windturbine,2020,32.55000000000
-4,2049,R2,windturbine,2020,32.55000000000
+4,2025,R2,windturbine,2020,32.36820000000
+4,2030,R2,windturbine,2020,32.36820000000
+4,2035,R2,windturbine,2020,32.36820000000
+4,2040,R2,windturbine,2020,32.36820000000
+4,2045,R2,windturbine,2020,32.36820000000
+4,2049,R2,windturbine,2020,32.36820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 75731cdd..cbe32778 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -1,35 +1,51 @@
-asset,year,technology,region,installed,capacity
-0,2025,gasCCGT,R1,2020,1.00000000000
-1,2025,gasCCGT,R2,2020,1.00000000000
-2,2025,solarPV,R1,2020,12.55000000000
-2,2030,solarPV,R1,2020,12.55000000000
-2,2035,solarPV,R1,2020,12.55000000000
-2,2040,solarPV,R1,2020,12.55000000000
-2,2045,solarPV,R1,2020,12.55000000000
-2,2049,solarPV,R1,2020,12.55000000000
-3,2030,solarPV,R1,2025,15.73000000000
-3,2035,solarPV,R1,2025,15.73000000000
-3,2040,solarPV,R1,2025,15.73000000000
-3,2045,solarPV,R1,2025,15.73000000000
-3,2049,solarPV,R1,2025,15.73000000000
-3,2050,solarPV,R1,2025,15.73000000000
-3,2054,solarPV,R1,2025,15.73000000000
-4,2030,solarPV,R2,2025,15.73000000000
-4,2035,solarPV,R2,2025,15.73000000000
-4,2040,solarPV,R2,2025,15.73000000000
-4,2045,solarPV,R2,2025,15.73000000000
-4,2049,solarPV,R2,2025,15.73000000000
-4,2050,solarPV,R2,2025,15.73000000000
-4,2054,solarPV,R2,2025,15.73000000000
-5,2025,windturbine,R1,2020,20.00000000000
-5,2030,windturbine,R1,2020,20.00000000000
-5,2035,windturbine,R1,2020,20.00000000000
-5,2040,windturbine,R1,2020,20.00000000000
-5,2045,windturbine,R1,2020,20.00000000000
-5,2049,windturbine,R1,2020,20.00000000000
-6,2025,windturbine,R2,2020,32.55000000000
-6,2030,windturbine,R2,2020,32.55000000000
-6,2035,windturbine,R2,2020,32.55000000000
-6,2040,windturbine,R2,2020,32.55000000000
-6,2045,windturbine,R2,2020,32.55000000000
-6,2049,windturbine,R2,2020,32.55000000000
+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,12.36820000000
+1,2030,R1,solarPV,2020,12.36820000000
+1,2035,R1,solarPV,2020,12.36820000000
+1,2040,R1,solarPV,2020,12.36820000000
+1,2045,R1,solarPV,2020,12.36820000000
+1,2049,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2025,20.00000000000
+2,2040,R1,solarPV,2025,20.00000000000
+2,2045,R1,solarPV,2025,20.00000000000
+2,2049,R1,solarPV,2025,20.00000000000
+2,2050,R1,solarPV,2025,20.00000000000
+2,2054,R1,solarPV,2025,20.00000000000
+3,2025,R1,windturbine,2020,20.00000000000
+3,2030,R1,windturbine,2020,20.00000000000
+3,2035,R1,windturbine,2020,20.00000000000
+3,2040,R1,windturbine,2020,20.00000000000
+3,2045,R1,windturbine,2020,20.00000000000
+3,2049,R1,windturbine,2020,20.00000000000
+4,2030,R1,windturbine,2025,3.63180000000
+4,2035,R1,windturbine,2025,3.63180000000
+4,2040,R1,windturbine,2025,3.63180000000
+4,2045,R1,windturbine,2025,3.63180000000
+4,2049,R1,windturbine,2025,3.63180000000
+4,2050,R1,windturbine,2025,3.63180000000
+4,2054,R1,windturbine,2025,3.63180000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2030,R2,solarPV,2025,20.00000000000
+6,2035,R2,solarPV,2025,20.00000000000
+6,2040,R2,solarPV,2025,20.00000000000
+6,2045,R2,solarPV,2025,20.00000000000
+6,2049,R2,solarPV,2025,20.00000000000
+6,2050,R2,solarPV,2025,20.00000000000
+6,2054,R2,solarPV,2025,20.00000000000
+7,2025,R2,windturbine,2020,32.36820000000
+7,2030,R2,windturbine,2020,32.36820000000
+7,2035,R2,windturbine,2020,32.36820000000
+7,2040,R2,windturbine,2020,32.36820000000
+7,2045,R2,windturbine,2020,32.36820000000
+7,2049,R2,windturbine,2020,32.36820000000
+8,2030,R2,windturbine,2025,3.63180000000
+8,2035,R2,windturbine,2025,3.63180000000
+8,2040,R2,windturbine,2025,3.63180000000
+8,2045,R2,windturbine,2025,3.63180000000
+8,2049,R2,windturbine,2025,3.63180000000
+8,2050,R2,windturbine,2025,3.63180000000
+8,2054,R2,windturbine,2025,3.63180000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index 05da3236..9095af81 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -1,44 +1,49 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2020,12.55000000000
-1,2035,R1,solarPV,2020,12.55000000000
-1,2040,R1,solarPV,2020,12.55000000000
-1,2045,R1,solarPV,2020,12.55000000000
-1,2049,R1,solarPV,2020,12.55000000000
-2,2030,R1,solarPV,2025,15.73000000000
-2,2035,R1,solarPV,2025,15.73000000000
-2,2040,R1,solarPV,2025,15.73000000000
-2,2045,R1,solarPV,2025,15.73000000000
-2,2049,R1,solarPV,2025,15.73000000000
-2,2050,R1,solarPV,2025,15.73000000000
-2,2054,R1,solarPV,2025,15.73000000000
-3,2035,R1,solarPV,2030,20.00000000000
-3,2040,R1,solarPV,2030,20.00000000000
-3,2045,R1,solarPV,2030,20.00000000000
-3,2049,R1,solarPV,2030,20.00000000000
-3,2050,R1,solarPV,2030,20.00000000000
-3,2054,R1,solarPV,2030,20.00000000000
-3,2055,R1,solarPV,2030,20.00000000000
-3,2059,R1,solarPV,2030,20.00000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,12.36820000000
+1,2030,R1,solarPV,2020,12.36820000000
+1,2035,R1,solarPV,2020,12.36820000000
+1,2040,R1,solarPV,2020,12.36820000000
+1,2045,R1,solarPV,2020,12.36820000000
+1,2049,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2025,20.00000000000
+2,2040,R1,solarPV,2025,20.00000000000
+2,2045,R1,solarPV,2025,20.00000000000
+2,2049,R1,solarPV,2025,20.00000000000
+2,2050,R1,solarPV,2025,20.00000000000
+2,2054,R1,solarPV,2025,20.00000000000
+3,2035,R1,solarPV,2030,11.20000000000
+3,2040,R1,solarPV,2030,11.20000000000
+3,2045,R1,solarPV,2030,11.20000000000
+3,2049,R1,solarPV,2030,11.20000000000
+3,2050,R1,solarPV,2030,11.20000000000
+3,2054,R1,solarPV,2030,11.20000000000
+3,2055,R1,solarPV,2030,11.20000000000
+3,2059,R1,solarPV,2030,11.20000000000
+4,2025,R1,windturbine,2020,20.00000000000
 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,2035,R1,windturbine,2030,2.40000000000
-5,2040,R1,windturbine,2030,2.40000000000
-5,2045,R1,windturbine,2030,2.40000000000
-5,2049,R1,windturbine,2030,2.40000000000
-5,2050,R1,windturbine,2030,2.40000000000
-5,2054,R1,windturbine,2030,2.40000000000
-5,2055,R1,windturbine,2030,2.40000000000
-5,2059,R1,windturbine,2030,2.40000000000
-7,2030,R2,solarPV,2025,15.73000000000
-7,2035,R2,solarPV,2025,15.73000000000
-7,2040,R2,solarPV,2025,15.73000000000
-7,2045,R2,solarPV,2025,15.73000000000
-7,2049,R2,solarPV,2025,15.73000000000
-7,2050,R2,solarPV,2025,15.73000000000
-7,2054,R2,solarPV,2025,15.73000000000
+5,2030,R1,windturbine,2025,3.63180000000
+5,2035,R1,windturbine,2025,3.63180000000
+5,2040,R1,windturbine,2025,3.63180000000
+5,2045,R1,windturbine,2025,3.63180000000
+5,2049,R1,windturbine,2025,3.63180000000
+5,2050,R1,windturbine,2025,3.63180000000
+5,2054,R1,windturbine,2025,3.63180000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,solarPV,2025,20.00000000000
+7,2035,R2,solarPV,2025,20.00000000000
+7,2040,R2,solarPV,2025,20.00000000000
+7,2045,R2,solarPV,2025,20.00000000000
+7,2049,R2,solarPV,2025,20.00000000000
+7,2050,R2,solarPV,2025,20.00000000000
+7,2054,R2,solarPV,2025,20.00000000000
 8,2035,R2,solarPV,2030,11.20000000000
 8,2040,R2,solarPV,2030,11.20000000000
 8,2045,R2,solarPV,2030,11.20000000000
@@ -47,8 +52,16 @@ asset,year,region,technology,installed,capacity
 8,2054,R2,solarPV,2030,11.20000000000
 8,2055,R2,solarPV,2030,11.20000000000
 8,2059,R2,solarPV,2030,11.20000000000
-9,2030,R2,windturbine,2020,32.55000000000
-9,2035,R2,windturbine,2020,32.55000000000
-9,2040,R2,windturbine,2020,32.55000000000
-9,2045,R2,windturbine,2020,32.55000000000
-9,2049,R2,windturbine,2020,32.55000000000
+9,2025,R2,windturbine,2020,32.36820000000
+9,2030,R2,windturbine,2020,32.36820000000
+9,2035,R2,windturbine,2020,32.36820000000
+9,2040,R2,windturbine,2020,32.36820000000
+9,2045,R2,windturbine,2020,32.36820000000
+9,2049,R2,windturbine,2020,32.36820000000
+10,2030,R2,windturbine,2025,3.63180000000
+10,2035,R2,windturbine,2025,3.63180000000
+10,2040,R2,windturbine,2025,3.63180000000
+10,2045,R2,windturbine,2025,3.63180000000
+10,2049,R2,windturbine,2025,3.63180000000
+10,2050,R2,windturbine,2025,3.63180000000
+10,2054,R2,windturbine,2025,3.63180000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index 708e8cdb..b8099837 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -1,49 +1,58 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,solarPV,2020,12.55000000000
-1,2040,R1,solarPV,2020,12.55000000000
-1,2045,R1,solarPV,2020,12.55000000000
-1,2049,R1,solarPV,2020,12.55000000000
-2,2035,R1,solarPV,2025,15.73000000000
-2,2040,R1,solarPV,2025,15.73000000000
-2,2045,R1,solarPV,2025,15.73000000000
-2,2049,R1,solarPV,2025,15.73000000000
-2,2050,R1,solarPV,2025,15.73000000000
-2,2054,R1,solarPV,2025,15.73000000000
-3,2035,R1,solarPV,2030,20.00000000000
-3,2040,R1,solarPV,2030,20.00000000000
-3,2045,R1,solarPV,2030,20.00000000000
-3,2049,R1,solarPV,2030,20.00000000000
-3,2050,R1,solarPV,2030,20.00000000000
-3,2054,R1,solarPV,2030,20.00000000000
-3,2055,R1,solarPV,2030,20.00000000000
-3,2059,R1,solarPV,2030,20.00000000000
-4,2040,R1,solarPV,2035,5.94800000000
-4,2045,R1,solarPV,2035,5.94800000000
-4,2049,R1,solarPV,2035,5.94800000000
-4,2050,R1,solarPV,2035,5.94800000000
-4,2054,R1,solarPV,2035,5.94800000000
-4,2055,R1,solarPV,2035,5.94800000000
-4,2059,R1,solarPV,2035,5.94800000000
-4,2060,R1,solarPV,2035,5.94800000000
-4,2064,R1,solarPV,2035,5.94800000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,12.36820000000
+1,2030,R1,solarPV,2020,12.36820000000
+1,2035,R1,solarPV,2020,12.36820000000
+1,2040,R1,solarPV,2020,12.36820000000
+1,2045,R1,solarPV,2020,12.36820000000
+1,2049,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2025,20.00000000000
+2,2040,R1,solarPV,2025,20.00000000000
+2,2045,R1,solarPV,2025,20.00000000000
+2,2049,R1,solarPV,2025,20.00000000000
+2,2050,R1,solarPV,2025,20.00000000000
+2,2054,R1,solarPV,2025,20.00000000000
+3,2035,R1,solarPV,2030,11.20000000000
+3,2040,R1,solarPV,2030,11.20000000000
+3,2045,R1,solarPV,2030,11.20000000000
+3,2049,R1,solarPV,2030,11.20000000000
+3,2050,R1,solarPV,2030,11.20000000000
+3,2054,R1,solarPV,2030,11.20000000000
+3,2055,R1,solarPV,2030,11.20000000000
+3,2059,R1,solarPV,2030,11.20000000000
+4,2040,R1,solarPV,2035,11.20000000000
+4,2045,R1,solarPV,2035,11.20000000000
+4,2049,R1,solarPV,2035,11.20000000000
+4,2050,R1,solarPV,2035,11.20000000000
+4,2054,R1,solarPV,2035,11.20000000000
+4,2055,R1,solarPV,2035,11.20000000000
+4,2059,R1,solarPV,2035,11.20000000000
+4,2060,R1,solarPV,2035,11.20000000000
+4,2064,R1,solarPV,2035,11.20000000000
+5,2025,R1,windturbine,2020,20.00000000000
+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
-6,2035,R1,windturbine,2030,2.40000000000
-6,2040,R1,windturbine,2030,2.40000000000
-6,2045,R1,windturbine,2030,2.40000000000
-6,2049,R1,windturbine,2030,2.40000000000
-6,2050,R1,windturbine,2030,2.40000000000
-6,2054,R1,windturbine,2030,2.40000000000
-6,2055,R1,windturbine,2030,2.40000000000
-6,2059,R1,windturbine,2030,2.40000000000
-8,2035,R2,solarPV,2025,15.73000000000
-8,2040,R2,solarPV,2025,15.73000000000
-8,2045,R2,solarPV,2025,15.73000000000
-8,2049,R2,solarPV,2025,15.73000000000
-8,2050,R2,solarPV,2025,15.73000000000
-8,2054,R2,solarPV,2025,15.73000000000
+6,2030,R1,windturbine,2025,3.63180000000
+6,2035,R1,windturbine,2025,3.63180000000
+6,2040,R1,windturbine,2025,3.63180000000
+6,2045,R1,windturbine,2025,3.63180000000
+6,2049,R1,windturbine,2025,3.63180000000
+6,2050,R1,windturbine,2025,3.63180000000
+6,2054,R1,windturbine,2025,3.63180000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+8,2030,R2,solarPV,2025,20.00000000000
+8,2035,R2,solarPV,2025,20.00000000000
+8,2040,R2,solarPV,2025,20.00000000000
+8,2045,R2,solarPV,2025,20.00000000000
+8,2049,R2,solarPV,2025,20.00000000000
+8,2050,R2,solarPV,2025,20.00000000000
+8,2054,R2,solarPV,2025,20.00000000000
 9,2035,R2,solarPV,2030,11.20000000000
 9,2040,R2,solarPV,2030,11.20000000000
 9,2045,R2,solarPV,2030,11.20000000000
@@ -52,16 +61,25 @@ asset,year,region,technology,installed,capacity
 9,2054,R2,solarPV,2030,11.20000000000
 9,2055,R2,solarPV,2030,11.20000000000
 9,2059,R2,solarPV,2030,11.20000000000
-10,2040,R2,solarPV,2035,17.14800000000
-10,2045,R2,solarPV,2035,17.14800000000
-10,2049,R2,solarPV,2035,17.14800000000
-10,2050,R2,solarPV,2035,17.14800000000
-10,2054,R2,solarPV,2035,17.14800000000
-10,2055,R2,solarPV,2035,17.14800000000
-10,2059,R2,solarPV,2035,17.14800000000
-10,2060,R2,solarPV,2035,17.14800000000
-10,2064,R2,solarPV,2035,17.14800000000
-11,2035,R2,windturbine,2020,32.55000000000
-11,2040,R2,windturbine,2020,32.55000000000
-11,2045,R2,windturbine,2020,32.55000000000
-11,2049,R2,windturbine,2020,32.55000000000
+10,2040,R2,solarPV,2035,11.20000000000
+10,2045,R2,solarPV,2035,11.20000000000
+10,2049,R2,solarPV,2035,11.20000000000
+10,2050,R2,solarPV,2035,11.20000000000
+10,2054,R2,solarPV,2035,11.20000000000
+10,2055,R2,solarPV,2035,11.20000000000
+10,2059,R2,solarPV,2035,11.20000000000
+10,2060,R2,solarPV,2035,11.20000000000
+10,2064,R2,solarPV,2035,11.20000000000
+11,2025,R2,windturbine,2020,32.36820000000
+11,2030,R2,windturbine,2020,32.36820000000
+11,2035,R2,windturbine,2020,32.36820000000
+11,2040,R2,windturbine,2020,32.36820000000
+11,2045,R2,windturbine,2020,32.36820000000
+11,2049,R2,windturbine,2020,32.36820000000
+12,2030,R2,windturbine,2025,3.63180000000
+12,2035,R2,windturbine,2025,3.63180000000
+12,2040,R2,windturbine,2025,3.63180000000
+12,2045,R2,windturbine,2025,3.63180000000
+12,2049,R2,windturbine,2025,3.63180000000
+12,2050,R2,windturbine,2025,3.63180000000
+12,2054,R2,windturbine,2025,3.63180000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index 3f94b227..308c7ffa 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -1,28 +1,36 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,solarPV,2020,12.55000000000
-1,2045,R1,solarPV,2020,12.55000000000
-1,2049,R1,solarPV,2020,12.55000000000
-2,2040,R1,solarPV,2025,15.73000000000
-2,2045,R1,solarPV,2025,15.73000000000
-2,2049,R1,solarPV,2025,15.73000000000
-2,2050,R1,solarPV,2025,15.73000000000
-2,2054,R1,solarPV,2025,15.73000000000
-3,2040,R1,solarPV,2030,20.00000000000
-3,2045,R1,solarPV,2030,20.00000000000
-3,2049,R1,solarPV,2030,20.00000000000
-3,2050,R1,solarPV,2030,20.00000000000
-3,2054,R1,solarPV,2030,20.00000000000
-3,2055,R1,solarPV,2030,20.00000000000
-3,2059,R1,solarPV,2030,20.00000000000
-4,2040,R1,solarPV,2035,5.94800000000
-4,2045,R1,solarPV,2035,5.94800000000
-4,2049,R1,solarPV,2035,5.94800000000
-4,2050,R1,solarPV,2035,5.94800000000
-4,2054,R1,solarPV,2035,5.94800000000
-4,2055,R1,solarPV,2035,5.94800000000
-4,2059,R1,solarPV,2035,5.94800000000
-4,2060,R1,solarPV,2035,5.94800000000
-4,2064,R1,solarPV,2035,5.94800000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,12.36820000000
+1,2030,R1,solarPV,2020,12.36820000000
+1,2035,R1,solarPV,2020,12.36820000000
+1,2040,R1,solarPV,2020,12.36820000000
+1,2045,R1,solarPV,2020,12.36820000000
+1,2049,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2025,20.00000000000
+2,2035,R1,solarPV,2025,20.00000000000
+2,2040,R1,solarPV,2025,20.00000000000
+2,2045,R1,solarPV,2025,20.00000000000
+2,2049,R1,solarPV,2025,20.00000000000
+2,2050,R1,solarPV,2025,20.00000000000
+2,2054,R1,solarPV,2025,20.00000000000
+3,2035,R1,solarPV,2030,11.20000000000
+3,2040,R1,solarPV,2030,11.20000000000
+3,2045,R1,solarPV,2030,11.20000000000
+3,2049,R1,solarPV,2030,11.20000000000
+3,2050,R1,solarPV,2030,11.20000000000
+3,2054,R1,solarPV,2030,11.20000000000
+3,2055,R1,solarPV,2030,11.20000000000
+3,2059,R1,solarPV,2030,11.20000000000
+4,2040,R1,solarPV,2035,11.20000000000
+4,2045,R1,solarPV,2035,11.20000000000
+4,2049,R1,solarPV,2035,11.20000000000
+4,2050,R1,solarPV,2035,11.20000000000
+4,2054,R1,solarPV,2035,11.20000000000
+4,2055,R1,solarPV,2035,11.20000000000
+4,2059,R1,solarPV,2035,11.20000000000
+4,2060,R1,solarPV,2035,11.20000000000
+4,2064,R1,solarPV,2035,11.20000000000
 5,2045,R1,solarPV,2040,11.20000000000
 5,2049,R1,solarPV,2040,11.20000000000
 5,2050,R1,solarPV,2040,11.20000000000
@@ -33,21 +41,29 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,solarPV,2040,11.20000000000
 5,2065,R1,solarPV,2040,11.20000000000
 5,2069,R1,solarPV,2040,11.20000000000
+6,2025,R1,windturbine,2020,20.00000000000
+6,2030,R1,windturbine,2020,20.00000000000
+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
-7,2040,R1,windturbine,2030,2.40000000000
-7,2045,R1,windturbine,2030,2.40000000000
-7,2049,R1,windturbine,2030,2.40000000000
-7,2050,R1,windturbine,2030,2.40000000000
-7,2054,R1,windturbine,2030,2.40000000000
-7,2055,R1,windturbine,2030,2.40000000000
-7,2059,R1,windturbine,2030,2.40000000000
-9,2040,R2,solarPV,2025,15.73000000000
-9,2045,R2,solarPV,2025,15.73000000000
-9,2049,R2,solarPV,2025,15.73000000000
-9,2050,R2,solarPV,2025,15.73000000000
-9,2054,R2,solarPV,2025,15.73000000000
+7,2030,R1,windturbine,2025,3.63180000000
+7,2035,R1,windturbine,2025,3.63180000000
+7,2040,R1,windturbine,2025,3.63180000000
+7,2045,R1,windturbine,2025,3.63180000000
+7,2049,R1,windturbine,2025,3.63180000000
+7,2050,R1,windturbine,2025,3.63180000000
+7,2054,R1,windturbine,2025,3.63180000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,1.00000000000
+9,2030,R2,solarPV,2025,20.00000000000
+9,2035,R2,solarPV,2025,20.00000000000
+9,2040,R2,solarPV,2025,20.00000000000
+9,2045,R2,solarPV,2025,20.00000000000
+9,2049,R2,solarPV,2025,20.00000000000
+9,2050,R2,solarPV,2025,20.00000000000
+9,2054,R2,solarPV,2025,20.00000000000
+10,2035,R2,solarPV,2030,11.20000000000
 10,2040,R2,solarPV,2030,11.20000000000
 10,2045,R2,solarPV,2030,11.20000000000
 10,2049,R2,solarPV,2030,11.20000000000
@@ -55,15 +71,15 @@ asset,year,region,technology,installed,capacity
 10,2054,R2,solarPV,2030,11.20000000000
 10,2055,R2,solarPV,2030,11.20000000000
 10,2059,R2,solarPV,2030,11.20000000000
-11,2040,R2,solarPV,2035,17.14800000000
-11,2045,R2,solarPV,2035,17.14800000000
-11,2049,R2,solarPV,2035,17.14800000000
-11,2050,R2,solarPV,2035,17.14800000000
-11,2054,R2,solarPV,2035,17.14800000000
-11,2055,R2,solarPV,2035,17.14800000000
-11,2059,R2,solarPV,2035,17.14800000000
-11,2060,R2,solarPV,2035,17.14800000000
-11,2064,R2,solarPV,2035,17.14800000000
+11,2040,R2,solarPV,2035,11.20000000000
+11,2045,R2,solarPV,2035,11.20000000000
+11,2049,R2,solarPV,2035,11.20000000000
+11,2050,R2,solarPV,2035,11.20000000000
+11,2054,R2,solarPV,2035,11.20000000000
+11,2055,R2,solarPV,2035,11.20000000000
+11,2059,R2,solarPV,2035,11.20000000000
+11,2060,R2,solarPV,2035,11.20000000000
+11,2064,R2,solarPV,2035,11.20000000000
 12,2045,R2,solarPV,2040,11.20000000000
 12,2049,R2,solarPV,2040,11.20000000000
 12,2050,R2,solarPV,2040,11.20000000000
@@ -74,6 +90,16 @@ asset,year,region,technology,installed,capacity
 12,2064,R2,solarPV,2040,11.20000000000
 12,2065,R2,solarPV,2040,11.20000000000
 12,2069,R2,solarPV,2040,11.20000000000
-13,2040,R2,windturbine,2020,32.55000000000
-13,2045,R2,windturbine,2020,32.55000000000
-13,2049,R2,windturbine,2020,32.55000000000
+13,2025,R2,windturbine,2020,32.36820000000
+13,2030,R2,windturbine,2020,32.36820000000
+13,2035,R2,windturbine,2020,32.36820000000
+13,2040,R2,windturbine,2020,32.36820000000
+13,2045,R2,windturbine,2020,32.36820000000
+13,2049,R2,windturbine,2020,32.36820000000
+14,2030,R2,windturbine,2025,3.63180000000
+14,2035,R2,windturbine,2025,3.63180000000
+14,2040,R2,windturbine,2025,3.63180000000
+14,2045,R2,windturbine,2025,3.63180000000
+14,2049,R2,windturbine,2025,3.63180000000
+14,2050,R2,windturbine,2025,3.63180000000
+14,2054,R2,windturbine,2025,3.63180000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index bec5d675..a0ea61ec 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,109 +1,157 @@
-asset,year,technology,region,installed,capacity
-0,2045,solarPV,R1,2020,12.55000000000
-0,2049,solarPV,R1,2020,12.55000000000
-1,2045,solarPV,R1,2025,15.73000000000
-1,2049,solarPV,R1,2025,15.73000000000
-1,2050,solarPV,R1,2025,15.73000000000
-1,2054,solarPV,R1,2025,15.73000000000
-2,2045,solarPV,R1,2030,20.00000000000
-2,2049,solarPV,R1,2030,20.00000000000
-2,2050,solarPV,R1,2030,20.00000000000
-2,2054,solarPV,R1,2030,20.00000000000
-2,2055,solarPV,R1,2030,20.00000000000
-2,2059,solarPV,R1,2030,20.00000000000
-3,2045,solarPV,R1,2035,5.94800000000
-3,2049,solarPV,R1,2035,5.94800000000
-3,2050,solarPV,R1,2035,5.94800000000
-3,2054,solarPV,R1,2035,5.94800000000
-3,2055,solarPV,R1,2035,5.94800000000
-3,2059,solarPV,R1,2035,5.94800000000
-3,2060,solarPV,R1,2035,5.94800000000
-3,2064,solarPV,R1,2035,5.94800000000
-4,2045,solarPV,R1,2040,11.20000000000
-4,2049,solarPV,R1,2040,11.20000000000
-4,2050,solarPV,R1,2040,11.20000000000
-4,2054,solarPV,R1,2040,11.20000000000
-4,2055,solarPV,R1,2040,11.20000000000
-4,2059,solarPV,R1,2040,11.20000000000
-4,2060,solarPV,R1,2040,11.20000000000
-4,2064,solarPV,R1,2040,11.20000000000
-4,2065,solarPV,R1,2040,11.20000000000
-4,2069,solarPV,R1,2040,11.20000000000
-5,2050,solarPV,R1,2045,32.97200000000
-5,2054,solarPV,R1,2045,32.97200000000
-5,2055,solarPV,R1,2045,32.97200000000
-5,2059,solarPV,R1,2045,32.97200000000
-5,2060,solarPV,R1,2045,32.97200000000
-5,2064,solarPV,R1,2045,32.97200000000
-5,2065,solarPV,R1,2045,32.97200000000
-5,2069,solarPV,R1,2045,32.97200000000
-5,2070,solarPV,R1,2045,32.97200000000
-5,2074,solarPV,R1,2045,32.97200000000
-6,2045,solarPV,R2,2025,15.73000000000
-6,2049,solarPV,R2,2025,15.73000000000
-6,2050,solarPV,R2,2025,15.73000000000
-6,2054,solarPV,R2,2025,15.73000000000
-7,2045,solarPV,R2,2030,11.20000000000
-7,2049,solarPV,R2,2030,11.20000000000
-7,2050,solarPV,R2,2030,11.20000000000
-7,2054,solarPV,R2,2030,11.20000000000
-7,2055,solarPV,R2,2030,11.20000000000
-7,2059,solarPV,R2,2030,11.20000000000
-8,2045,solarPV,R2,2035,17.14800000000
-8,2049,solarPV,R2,2035,17.14800000000
-8,2050,solarPV,R2,2035,17.14800000000
-8,2054,solarPV,R2,2035,17.14800000000
-8,2055,solarPV,R2,2035,17.14800000000
-8,2059,solarPV,R2,2035,17.14800000000
-8,2060,solarPV,R2,2035,17.14800000000
-8,2064,solarPV,R2,2035,17.14800000000
-9,2045,solarPV,R2,2040,11.20000000000
-9,2049,solarPV,R2,2040,11.20000000000
-9,2050,solarPV,R2,2040,11.20000000000
-9,2054,solarPV,R2,2040,11.20000000000
-9,2055,solarPV,R2,2040,11.20000000000
-9,2059,solarPV,R2,2040,11.20000000000
-9,2060,solarPV,R2,2040,11.20000000000
-9,2064,solarPV,R2,2040,11.20000000000
-9,2065,solarPV,R2,2040,11.20000000000
-9,2069,solarPV,R2,2040,11.20000000000
-10,2050,solarPV,R2,2045,32.97200000000
-10,2054,solarPV,R2,2045,32.97200000000
-10,2055,solarPV,R2,2045,32.97200000000
-10,2059,solarPV,R2,2045,32.97200000000
-10,2060,solarPV,R2,2045,32.97200000000
-10,2064,solarPV,R2,2045,32.97200000000
-10,2065,solarPV,R2,2045,32.97200000000
-10,2069,solarPV,R2,2045,32.97200000000
-10,2070,solarPV,R2,2045,32.97200000000
-10,2074,solarPV,R2,2045,32.97200000000
-11,2045,windturbine,R1,2020,20.00000000000
-11,2049,windturbine,R1,2020,20.00000000000
-12,2045,windturbine,R1,2030,2.40000000000
-12,2049,windturbine,R1,2030,2.40000000000
-12,2050,windturbine,R1,2030,2.40000000000
-12,2054,windturbine,R1,2030,2.40000000000
-12,2055,windturbine,R1,2030,2.40000000000
-12,2059,windturbine,R1,2030,2.40000000000
-13,2050,windturbine,R1,2045,12.55000000000
-13,2054,windturbine,R1,2045,12.55000000000
-13,2055,windturbine,R1,2045,12.55000000000
-13,2059,windturbine,R1,2045,12.55000000000
-13,2060,windturbine,R1,2045,12.55000000000
-13,2064,windturbine,R1,2045,12.55000000000
-13,2065,windturbine,R1,2045,12.55000000000
-13,2069,windturbine,R1,2045,12.55000000000
-13,2070,windturbine,R1,2045,12.55000000000
-13,2074,windturbine,R1,2045,12.55000000000
-14,2045,windturbine,R2,2020,32.55000000000
-14,2049,windturbine,R2,2020,32.55000000000
-15,2050,windturbine,R2,2045,12.55000000000
-15,2054,windturbine,R2,2045,12.55000000000
-15,2055,windturbine,R2,2045,12.55000000000
-15,2059,windturbine,R2,2045,12.55000000000
-15,2060,windturbine,R2,2045,12.55000000000
-15,2064,windturbine,R2,2045,12.55000000000
-15,2065,windturbine,R2,2045,12.55000000000
-15,2069,windturbine,R2,2045,12.55000000000
-15,2070,windturbine,R2,2045,12.55000000000
-15,2074,windturbine,R2,2045,12.55000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,1.58590000000
+1,2054,R1,gasCCGT,2045,1.58590000000
+1,2055,R1,gasCCGT,2045,1.58590000000
+1,2059,R1,gasCCGT,2045,1.58590000000
+1,2060,R1,gasCCGT,2045,1.58590000000
+1,2064,R1,gasCCGT,2045,1.58590000000
+1,2065,R1,gasCCGT,2045,1.58590000000
+1,2069,R1,gasCCGT,2045,1.58590000000
+1,2070,R1,gasCCGT,2045,1.58590000000
+1,2074,R1,gasCCGT,2045,1.58590000000
+1,2075,R1,gasCCGT,2045,1.58590000000
+1,2084,R1,gasCCGT,2045,1.58590000000
+2,2025,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2020,12.36820000000
+2,2035,R1,solarPV,2020,12.36820000000
+2,2040,R1,solarPV,2020,12.36820000000
+2,2045,R1,solarPV,2020,12.36820000000
+2,2049,R1,solarPV,2020,12.36820000000
+3,2030,R1,solarPV,2025,20.00000000000
+3,2035,R1,solarPV,2025,20.00000000000
+3,2040,R1,solarPV,2025,20.00000000000
+3,2045,R1,solarPV,2025,20.00000000000
+3,2049,R1,solarPV,2025,20.00000000000
+3,2050,R1,solarPV,2025,20.00000000000
+3,2054,R1,solarPV,2025,20.00000000000
+4,2035,R1,solarPV,2030,11.20000000000
+4,2040,R1,solarPV,2030,11.20000000000
+4,2045,R1,solarPV,2030,11.20000000000
+4,2049,R1,solarPV,2030,11.20000000000
+4,2050,R1,solarPV,2030,11.20000000000
+4,2054,R1,solarPV,2030,11.20000000000
+4,2055,R1,solarPV,2030,11.20000000000
+4,2059,R1,solarPV,2030,11.20000000000
+5,2040,R1,solarPV,2035,11.20000000000
+5,2045,R1,solarPV,2035,11.20000000000
+5,2049,R1,solarPV,2035,11.20000000000
+5,2050,R1,solarPV,2035,11.20000000000
+5,2054,R1,solarPV,2035,11.20000000000
+5,2055,R1,solarPV,2035,11.20000000000
+5,2059,R1,solarPV,2035,11.20000000000
+5,2060,R1,solarPV,2035,11.20000000000
+5,2064,R1,solarPV,2035,11.20000000000
+6,2045,R1,solarPV,2040,11.20000000000
+6,2049,R1,solarPV,2040,11.20000000000
+6,2050,R1,solarPV,2040,11.20000000000
+6,2054,R1,solarPV,2040,11.20000000000
+6,2055,R1,solarPV,2040,11.20000000000
+6,2059,R1,solarPV,2040,11.20000000000
+6,2060,R1,solarPV,2040,11.20000000000
+6,2064,R1,solarPV,2040,11.20000000000
+6,2065,R1,solarPV,2040,11.20000000000
+6,2069,R1,solarPV,2040,11.20000000000
+7,2050,R1,solarPV,2045,20.00000000000
+7,2054,R1,solarPV,2045,20.00000000000
+7,2055,R1,solarPV,2045,20.00000000000
+7,2059,R1,solarPV,2045,20.00000000000
+7,2060,R1,solarPV,2045,20.00000000000
+7,2064,R1,solarPV,2045,20.00000000000
+7,2065,R1,solarPV,2045,20.00000000000
+7,2069,R1,solarPV,2045,20.00000000000
+7,2070,R1,solarPV,2045,20.00000000000
+7,2074,R1,solarPV,2045,20.00000000000
+8,2025,R1,windturbine,2020,20.00000000000
+8,2030,R1,windturbine,2020,20.00000000000
+8,2035,R1,windturbine,2020,20.00000000000
+8,2040,R1,windturbine,2020,20.00000000000
+8,2045,R1,windturbine,2020,20.00000000000
+8,2049,R1,windturbine,2020,20.00000000000
+9,2030,R1,windturbine,2025,3.63180000000
+9,2035,R1,windturbine,2025,3.63180000000
+9,2040,R1,windturbine,2025,3.63180000000
+9,2045,R1,windturbine,2025,3.63180000000
+9,2049,R1,windturbine,2025,3.63180000000
+9,2050,R1,windturbine,2025,3.63180000000
+9,2054,R1,windturbine,2025,3.63180000000
+10,2050,R1,windturbine,2045,20.00000000000
+10,2054,R1,windturbine,2045,20.00000000000
+10,2055,R1,windturbine,2045,20.00000000000
+10,2059,R1,windturbine,2045,20.00000000000
+10,2060,R1,windturbine,2045,20.00000000000
+10,2064,R1,windturbine,2045,20.00000000000
+10,2065,R1,windturbine,2045,20.00000000000
+10,2069,R1,windturbine,2045,20.00000000000
+10,2070,R1,windturbine,2045,20.00000000000
+10,2074,R1,windturbine,2045,20.00000000000
+11,2020,R2,gasCCGT,2020,1.00000000000
+11,2025,R2,gasCCGT,2020,1.00000000000
+12,2030,R2,solarPV,2025,20.00000000000
+12,2035,R2,solarPV,2025,20.00000000000
+12,2040,R2,solarPV,2025,20.00000000000
+12,2045,R2,solarPV,2025,20.00000000000
+12,2049,R2,solarPV,2025,20.00000000000
+12,2050,R2,solarPV,2025,20.00000000000
+12,2054,R2,solarPV,2025,20.00000000000
+13,2035,R2,solarPV,2030,11.20000000000
+13,2040,R2,solarPV,2030,11.20000000000
+13,2045,R2,solarPV,2030,11.20000000000
+13,2049,R2,solarPV,2030,11.20000000000
+13,2050,R2,solarPV,2030,11.20000000000
+13,2054,R2,solarPV,2030,11.20000000000
+13,2055,R2,solarPV,2030,11.20000000000
+13,2059,R2,solarPV,2030,11.20000000000
+14,2040,R2,solarPV,2035,11.20000000000
+14,2045,R2,solarPV,2035,11.20000000000
+14,2049,R2,solarPV,2035,11.20000000000
+14,2050,R2,solarPV,2035,11.20000000000
+14,2054,R2,solarPV,2035,11.20000000000
+14,2055,R2,solarPV,2035,11.20000000000
+14,2059,R2,solarPV,2035,11.20000000000
+14,2060,R2,solarPV,2035,11.20000000000
+14,2064,R2,solarPV,2035,11.20000000000
+15,2045,R2,solarPV,2040,11.20000000000
+15,2049,R2,solarPV,2040,11.20000000000
+15,2050,R2,solarPV,2040,11.20000000000
+15,2054,R2,solarPV,2040,11.20000000000
+15,2055,R2,solarPV,2040,11.20000000000
+15,2059,R2,solarPV,2040,11.20000000000
+15,2060,R2,solarPV,2040,11.20000000000
+15,2064,R2,solarPV,2040,11.20000000000
+15,2065,R2,solarPV,2040,11.20000000000
+15,2069,R2,solarPV,2040,11.20000000000
+16,2050,R2,solarPV,2045,20.00000000000
+16,2054,R2,solarPV,2045,20.00000000000
+16,2055,R2,solarPV,2045,20.00000000000
+16,2059,R2,solarPV,2045,20.00000000000
+16,2060,R2,solarPV,2045,20.00000000000
+16,2064,R2,solarPV,2045,20.00000000000
+16,2065,R2,solarPV,2045,20.00000000000
+16,2069,R2,solarPV,2045,20.00000000000
+16,2070,R2,solarPV,2045,20.00000000000
+16,2074,R2,solarPV,2045,20.00000000000
+17,2025,R2,windturbine,2020,32.36820000000
+17,2030,R2,windturbine,2020,32.36820000000
+17,2035,R2,windturbine,2020,32.36820000000
+17,2040,R2,windturbine,2020,32.36820000000
+17,2045,R2,windturbine,2020,32.36820000000
+17,2049,R2,windturbine,2020,32.36820000000
+18,2030,R2,windturbine,2025,3.63180000000
+18,2035,R2,windturbine,2025,3.63180000000
+18,2040,R2,windturbine,2025,3.63180000000
+18,2045,R2,windturbine,2025,3.63180000000
+18,2049,R2,windturbine,2025,3.63180000000
+18,2050,R2,windturbine,2025,3.63180000000
+18,2054,R2,windturbine,2025,3.63180000000
+19,2050,R2,windturbine,2045,23.56820000000
+19,2054,R2,windturbine,2045,23.56820000000
+19,2055,R2,windturbine,2045,23.56820000000
+19,2059,R2,windturbine,2045,23.56820000000
+19,2060,R2,windturbine,2045,23.56820000000
+19,2064,R2,windturbine,2045,23.56820000000
+19,2065,R2,windturbine,2045,23.56820000000
+19,2069,R2,windturbine,2045,23.56820000000
+19,2070,R2,windturbine,2045,23.56820000000
+19,2074,R2,windturbine,2045,23.56820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index bb82fdc3..44f9f68b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,105 +1,199 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,solarPV,2025,15.73000000000
-1,2054,R1,solarPV,2025,15.73000000000
-2,2050,R1,solarPV,2030,20.00000000000
-2,2054,R1,solarPV,2030,20.00000000000
-2,2055,R1,solarPV,2030,20.00000000000
-2,2059,R1,solarPV,2030,20.00000000000
-3,2050,R1,solarPV,2035,5.94800000000
-3,2054,R1,solarPV,2035,5.94800000000
-3,2055,R1,solarPV,2035,5.94800000000
-3,2059,R1,solarPV,2035,5.94800000000
-3,2060,R1,solarPV,2035,5.94800000000
-3,2064,R1,solarPV,2035,5.94800000000
-4,2050,R1,solarPV,2040,11.20000000000
-4,2054,R1,solarPV,2040,11.20000000000
-4,2055,R1,solarPV,2040,11.20000000000
-4,2059,R1,solarPV,2040,11.20000000000
-4,2060,R1,solarPV,2040,11.20000000000
-4,2064,R1,solarPV,2040,11.20000000000
-4,2065,R1,solarPV,2040,11.20000000000
-4,2069,R1,solarPV,2040,11.20000000000
-5,2050,R1,solarPV,2045,32.97200000000
-5,2054,R1,solarPV,2045,32.97200000000
-5,2055,R1,solarPV,2045,32.97200000000
-5,2059,R1,solarPV,2045,32.97200000000
-5,2060,R1,solarPV,2045,32.97200000000
-5,2064,R1,solarPV,2045,32.97200000000
-5,2065,R1,solarPV,2045,32.97200000000
-5,2069,R1,solarPV,2045,32.97200000000
-5,2070,R1,solarPV,2045,32.97200000000
-5,2074,R1,solarPV,2045,32.97200000000
-6,2055,R1,solarPV,2050,15.73000000000
-6,2059,R1,solarPV,2050,15.73000000000
-6,2060,R1,solarPV,2050,15.73000000000
-6,2064,R1,solarPV,2050,15.73000000000
-6,2065,R1,solarPV,2050,15.73000000000
-6,2069,R1,solarPV,2050,15.73000000000
-6,2070,R1,solarPV,2050,15.73000000000
-6,2074,R1,solarPV,2050,15.73000000000
-6,2075,R1,solarPV,2050,15.73000000000
-6,2079,R1,solarPV,2050,15.73000000000
-8,2050,R1,windturbine,2030,2.40000000000
-8,2054,R1,windturbine,2030,2.40000000000
-8,2055,R1,windturbine,2030,2.40000000000
-8,2059,R1,windturbine,2030,2.40000000000
-9,2050,R1,windturbine,2045,12.55000000000
-9,2054,R1,windturbine,2045,12.55000000000
-9,2055,R1,windturbine,2045,12.55000000000
-9,2059,R1,windturbine,2045,12.55000000000
-9,2060,R1,windturbine,2045,12.55000000000
-9,2064,R1,windturbine,2045,12.55000000000
-9,2065,R1,windturbine,2045,12.55000000000
-9,2069,R1,windturbine,2045,12.55000000000
-9,2070,R1,windturbine,2045,12.55000000000
-9,2074,R1,windturbine,2045,12.55000000000
-10,2050,R2,solarPV,2025,15.73000000000
-10,2054,R2,solarPV,2025,15.73000000000
-11,2050,R2,solarPV,2030,11.20000000000
-11,2054,R2,solarPV,2030,11.20000000000
-11,2055,R2,solarPV,2030,11.20000000000
-11,2059,R2,solarPV,2030,11.20000000000
-12,2050,R2,solarPV,2035,17.14800000000
-12,2054,R2,solarPV,2035,17.14800000000
-12,2055,R2,solarPV,2035,17.14800000000
-12,2059,R2,solarPV,2035,17.14800000000
-12,2060,R2,solarPV,2035,17.14800000000
-12,2064,R2,solarPV,2035,17.14800000000
-13,2050,R2,solarPV,2040,11.20000000000
-13,2054,R2,solarPV,2040,11.20000000000
-13,2055,R2,solarPV,2040,11.20000000000
-13,2059,R2,solarPV,2040,11.20000000000
-13,2060,R2,solarPV,2040,11.20000000000
-13,2064,R2,solarPV,2040,11.20000000000
-13,2065,R2,solarPV,2040,11.20000000000
-13,2069,R2,solarPV,2040,11.20000000000
-14,2050,R2,solarPV,2045,32.97200000000
-14,2054,R2,solarPV,2045,32.97200000000
-14,2055,R2,solarPV,2045,32.97200000000
-14,2059,R2,solarPV,2045,32.97200000000
-14,2060,R2,solarPV,2045,32.97200000000
-14,2064,R2,solarPV,2045,32.97200000000
-14,2065,R2,solarPV,2045,32.97200000000
-14,2069,R2,solarPV,2045,32.97200000000
-14,2070,R2,solarPV,2045,32.97200000000
-14,2074,R2,solarPV,2045,32.97200000000
-15,2055,R2,solarPV,2050,15.73000000000
-15,2059,R2,solarPV,2050,15.73000000000
-15,2060,R2,solarPV,2050,15.73000000000
-15,2064,R2,solarPV,2050,15.73000000000
-15,2065,R2,solarPV,2050,15.73000000000
-15,2069,R2,solarPV,2050,15.73000000000
-15,2070,R2,solarPV,2050,15.73000000000
-15,2074,R2,solarPV,2050,15.73000000000
-15,2075,R2,solarPV,2050,15.73000000000
-15,2079,R2,solarPV,2050,15.73000000000
-17,2050,R2,windturbine,2045,12.55000000000
-17,2054,R2,windturbine,2045,12.55000000000
-17,2055,R2,windturbine,2045,12.55000000000
-17,2059,R2,windturbine,2045,12.55000000000
-17,2060,R2,windturbine,2045,12.55000000000
-17,2064,R2,windturbine,2045,12.55000000000
-17,2065,R2,windturbine,2045,12.55000000000
-17,2069,R2,windturbine,2045,12.55000000000
-17,2070,R2,windturbine,2045,12.55000000000
-17,2074,R2,windturbine,2045,12.55000000000
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2050,R1,gasCCGT,2045,1.58590000000
+1,2054,R1,gasCCGT,2045,1.58590000000
+1,2055,R1,gasCCGT,2045,1.58590000000
+1,2059,R1,gasCCGT,2045,1.58590000000
+1,2060,R1,gasCCGT,2045,1.58590000000
+1,2064,R1,gasCCGT,2045,1.58590000000
+1,2065,R1,gasCCGT,2045,1.58590000000
+1,2069,R1,gasCCGT,2045,1.58590000000
+1,2070,R1,gasCCGT,2045,1.58590000000
+1,2074,R1,gasCCGT,2045,1.58590000000
+1,2075,R1,gasCCGT,2045,1.58590000000
+1,2079,R1,gasCCGT,2045,1.58590000000
+1,2080,R1,gasCCGT,2045,1.58590000000
+1,2084,R1,gasCCGT,2045,1.58590000000
+2,2025,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2020,12.36820000000
+2,2035,R1,solarPV,2020,12.36820000000
+2,2040,R1,solarPV,2020,12.36820000000
+2,2045,R1,solarPV,2020,12.36820000000
+2,2049,R1,solarPV,2020,12.36820000000
+3,2030,R1,solarPV,2025,20.00000000000
+3,2035,R1,solarPV,2025,20.00000000000
+3,2040,R1,solarPV,2025,20.00000000000
+3,2045,R1,solarPV,2025,20.00000000000
+3,2049,R1,solarPV,2025,20.00000000000
+3,2050,R1,solarPV,2025,20.00000000000
+3,2054,R1,solarPV,2025,20.00000000000
+4,2035,R1,solarPV,2030,11.20000000000
+4,2040,R1,solarPV,2030,11.20000000000
+4,2045,R1,solarPV,2030,11.20000000000
+4,2049,R1,solarPV,2030,11.20000000000
+4,2050,R1,solarPV,2030,11.20000000000
+4,2054,R1,solarPV,2030,11.20000000000
+4,2055,R1,solarPV,2030,11.20000000000
+4,2059,R1,solarPV,2030,11.20000000000
+5,2040,R1,solarPV,2035,11.20000000000
+5,2045,R1,solarPV,2035,11.20000000000
+5,2049,R1,solarPV,2035,11.20000000000
+5,2050,R1,solarPV,2035,11.20000000000
+5,2054,R1,solarPV,2035,11.20000000000
+5,2055,R1,solarPV,2035,11.20000000000
+5,2059,R1,solarPV,2035,11.20000000000
+5,2060,R1,solarPV,2035,11.20000000000
+5,2064,R1,solarPV,2035,11.20000000000
+6,2045,R1,solarPV,2040,11.20000000000
+6,2049,R1,solarPV,2040,11.20000000000
+6,2050,R1,solarPV,2040,11.20000000000
+6,2054,R1,solarPV,2040,11.20000000000
+6,2055,R1,solarPV,2040,11.20000000000
+6,2059,R1,solarPV,2040,11.20000000000
+6,2060,R1,solarPV,2040,11.20000000000
+6,2064,R1,solarPV,2040,11.20000000000
+6,2065,R1,solarPV,2040,11.20000000000
+6,2069,R1,solarPV,2040,11.20000000000
+7,2050,R1,solarPV,2045,20.00000000000
+7,2054,R1,solarPV,2045,20.00000000000
+7,2055,R1,solarPV,2045,20.00000000000
+7,2059,R1,solarPV,2045,20.00000000000
+7,2060,R1,solarPV,2045,20.00000000000
+7,2064,R1,solarPV,2045,20.00000000000
+7,2065,R1,solarPV,2045,20.00000000000
+7,2069,R1,solarPV,2045,20.00000000000
+7,2070,R1,solarPV,2045,20.00000000000
+7,2074,R1,solarPV,2045,20.00000000000
+8,2055,R1,solarPV,2050,20.00000000000
+8,2059,R1,solarPV,2050,20.00000000000
+8,2060,R1,solarPV,2050,20.00000000000
+8,2064,R1,solarPV,2050,20.00000000000
+8,2065,R1,solarPV,2050,20.00000000000
+8,2069,R1,solarPV,2050,20.00000000000
+8,2070,R1,solarPV,2050,20.00000000000
+8,2074,R1,solarPV,2050,20.00000000000
+8,2075,R1,solarPV,2050,20.00000000000
+8,2079,R1,solarPV,2050,20.00000000000
+9,2025,R1,windturbine,2020,20.00000000000
+9,2030,R1,windturbine,2020,20.00000000000
+9,2035,R1,windturbine,2020,20.00000000000
+9,2040,R1,windturbine,2020,20.00000000000
+9,2045,R1,windturbine,2020,20.00000000000
+9,2049,R1,windturbine,2020,20.00000000000
+10,2030,R1,windturbine,2025,3.63180000000
+10,2035,R1,windturbine,2025,3.63180000000
+10,2040,R1,windturbine,2025,3.63180000000
+10,2045,R1,windturbine,2025,3.63180000000
+10,2049,R1,windturbine,2025,3.63180000000
+10,2050,R1,windturbine,2025,3.63180000000
+10,2054,R1,windturbine,2025,3.63180000000
+11,2050,R1,windturbine,2045,20.00000000000
+11,2054,R1,windturbine,2045,20.00000000000
+11,2055,R1,windturbine,2045,20.00000000000
+11,2059,R1,windturbine,2045,20.00000000000
+11,2060,R1,windturbine,2045,20.00000000000
+11,2064,R1,windturbine,2045,20.00000000000
+11,2065,R1,windturbine,2045,20.00000000000
+11,2069,R1,windturbine,2045,20.00000000000
+11,2070,R1,windturbine,2045,20.00000000000
+11,2074,R1,windturbine,2045,20.00000000000
+12,2055,R1,windturbine,2050,3.63180000000
+12,2059,R1,windturbine,2050,3.63180000000
+12,2060,R1,windturbine,2050,3.63180000000
+12,2064,R1,windturbine,2050,3.63180000000
+12,2065,R1,windturbine,2050,3.63180000000
+12,2069,R1,windturbine,2050,3.63180000000
+12,2070,R1,windturbine,2050,3.63180000000
+12,2074,R1,windturbine,2050,3.63180000000
+12,2075,R1,windturbine,2050,3.63180000000
+12,2079,R1,windturbine,2050,3.63180000000
+13,2020,R2,gasCCGT,2020,1.00000000000
+13,2025,R2,gasCCGT,2020,1.00000000000
+14,2030,R2,solarPV,2025,20.00000000000
+14,2035,R2,solarPV,2025,20.00000000000
+14,2040,R2,solarPV,2025,20.00000000000
+14,2045,R2,solarPV,2025,20.00000000000
+14,2049,R2,solarPV,2025,20.00000000000
+14,2050,R2,solarPV,2025,20.00000000000
+14,2054,R2,solarPV,2025,20.00000000000
+15,2035,R2,solarPV,2030,11.20000000000
+15,2040,R2,solarPV,2030,11.20000000000
+15,2045,R2,solarPV,2030,11.20000000000
+15,2049,R2,solarPV,2030,11.20000000000
+15,2050,R2,solarPV,2030,11.20000000000
+15,2054,R2,solarPV,2030,11.20000000000
+15,2055,R2,solarPV,2030,11.20000000000
+15,2059,R2,solarPV,2030,11.20000000000
+16,2040,R2,solarPV,2035,11.20000000000
+16,2045,R2,solarPV,2035,11.20000000000
+16,2049,R2,solarPV,2035,11.20000000000
+16,2050,R2,solarPV,2035,11.20000000000
+16,2054,R2,solarPV,2035,11.20000000000
+16,2055,R2,solarPV,2035,11.20000000000
+16,2059,R2,solarPV,2035,11.20000000000
+16,2060,R2,solarPV,2035,11.20000000000
+16,2064,R2,solarPV,2035,11.20000000000
+17,2045,R2,solarPV,2040,11.20000000000
+17,2049,R2,solarPV,2040,11.20000000000
+17,2050,R2,solarPV,2040,11.20000000000
+17,2054,R2,solarPV,2040,11.20000000000
+17,2055,R2,solarPV,2040,11.20000000000
+17,2059,R2,solarPV,2040,11.20000000000
+17,2060,R2,solarPV,2040,11.20000000000
+17,2064,R2,solarPV,2040,11.20000000000
+17,2065,R2,solarPV,2040,11.20000000000
+17,2069,R2,solarPV,2040,11.20000000000
+18,2050,R2,solarPV,2045,20.00000000000
+18,2054,R2,solarPV,2045,20.00000000000
+18,2055,R2,solarPV,2045,20.00000000000
+18,2059,R2,solarPV,2045,20.00000000000
+18,2060,R2,solarPV,2045,20.00000000000
+18,2064,R2,solarPV,2045,20.00000000000
+18,2065,R2,solarPV,2045,20.00000000000
+18,2069,R2,solarPV,2045,20.00000000000
+18,2070,R2,solarPV,2045,20.00000000000
+18,2074,R2,solarPV,2045,20.00000000000
+19,2055,R2,solarPV,2050,20.00000000000
+19,2059,R2,solarPV,2050,20.00000000000
+19,2060,R2,solarPV,2050,20.00000000000
+19,2064,R2,solarPV,2050,20.00000000000
+19,2065,R2,solarPV,2050,20.00000000000
+19,2069,R2,solarPV,2050,20.00000000000
+19,2070,R2,solarPV,2050,20.00000000000
+19,2074,R2,solarPV,2050,20.00000000000
+19,2075,R2,solarPV,2050,20.00000000000
+19,2079,R2,solarPV,2050,20.00000000000
+20,2025,R2,windturbine,2020,32.36820000000
+20,2030,R2,windturbine,2020,32.36820000000
+20,2035,R2,windturbine,2020,32.36820000000
+20,2040,R2,windturbine,2020,32.36820000000
+20,2045,R2,windturbine,2020,32.36820000000
+20,2049,R2,windturbine,2020,32.36820000000
+21,2030,R2,windturbine,2025,3.63180000000
+21,2035,R2,windturbine,2025,3.63180000000
+21,2040,R2,windturbine,2025,3.63180000000
+21,2045,R2,windturbine,2025,3.63180000000
+21,2049,R2,windturbine,2025,3.63180000000
+21,2050,R2,windturbine,2025,3.63180000000
+21,2054,R2,windturbine,2025,3.63180000000
+22,2050,R2,windturbine,2045,23.56820000000
+22,2054,R2,windturbine,2045,23.56820000000
+22,2055,R2,windturbine,2045,23.56820000000
+22,2059,R2,windturbine,2045,23.56820000000
+22,2060,R2,windturbine,2045,23.56820000000
+22,2064,R2,windturbine,2045,23.56820000000
+22,2065,R2,windturbine,2045,23.56820000000
+22,2069,R2,windturbine,2045,23.56820000000
+22,2070,R2,windturbine,2045,23.56820000000
+22,2074,R2,windturbine,2045,23.56820000000
+23,2055,R2,windturbine,2050,3.63180000000
+23,2059,R2,windturbine,2050,3.63180000000
+23,2060,R2,windturbine,2050,3.63180000000
+23,2064,R2,windturbine,2050,3.63180000000
+23,2065,R2,windturbine,2050,3.63180000000
+23,2069,R2,windturbine,2050,3.63180000000
+23,2070,R2,windturbine,2050,3.63180000000
+23,2074,R2,windturbine,2050,3.63180000000
+23,2075,R2,windturbine,2050,3.63180000000
+23,2079,R2,windturbine,2050,3.63180000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
index debb0db9..ddb9c79e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2020.csv
@@ -1,21 +1,21 @@
-asset,year,technology,region,installed,capacity
-0,2025,electric_stove,R1,2020,17.40000000000
-0,2030,electric_stove,R1,2020,17.40000000000
-0,2034,electric_stove,R1,2020,17.40000000000
-1,2025,electric_stove,R2,2020,17.40000000000
-1,2030,electric_stove,R2,2020,17.40000000000
-1,2034,electric_stove,R2,2020,17.40000000000
-2,2020,gas_stove,R1,2020,10.00000000000
-2,2025,gas_stove,R1,2020,5.00000000000
-3,2020,gas_stove,R2,2020,10.00000000000
-3,2025,gas_stove,R2,2020,5.00000000000
-4,2020,gasboiler,R1,2020,10.00000000000
-4,2025,gasboiler,R1,2020,5.00000000000
-5,2020,gasboiler,R2,2020,10.00000000000
-5,2025,gasboiler,R2,2020,5.00000000000
-6,2025,heatpump,R1,2020,17.40000000000
-6,2030,heatpump,R1,2020,17.40000000000
-6,2034,heatpump,R1,2020,17.40000000000
-7,2025,heatpump,R2,2020,17.40000000000
-7,2030,heatpump,R2,2020,17.40000000000
-7,2034,heatpump,R2,2020,17.40000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2020,R1,gas_stove,2020,10
+1,2025,R1,gas_stove,2020,5
+2,2020,R1,gasboiler,2020,10
+2,2025,R1,gasboiler,2020,5
+3,2025,R1,heatpump,2020,17
+3,2030,R1,heatpump,2020,17
+3,2034,R1,heatpump,2020,17
+4,2025,R2,electric_stove,2020,17
+4,2030,R2,electric_stove,2020,17
+4,2034,R2,electric_stove,2020,17
+5,2020,R2,gas_stove,2020,10
+5,2025,R2,gas_stove,2020,5
+6,2020,R2,gasboiler,2020,10
+6,2025,R2,gasboiler,2020,5
+7,2025,R2,heatpump,2020,17
+7,2030,R2,heatpump,2020,17
+7,2034,R2,heatpump,2020,17
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
index 4eb9a0ef..8dc7a852 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2025.csv
@@ -1,49 +1,37 @@
-asset,year,technology,region,installed,capacity
-0,2025,electric_stove,R1,2020,17.40000000000
-0,2030,electric_stove,R1,2020,17.40000000000
-0,2034,electric_stove,R1,2020,17.40000000000
-1,2030,electric_stove,R1,2025,6.74000000000
-1,2034,electric_stove,R1,2025,6.74000000000
-1,2035,electric_stove,R1,2025,6.74000000000
-1,2039,electric_stove,R1,2025,6.74000000000
-2,2025,electric_stove,R2,2020,17.40000000000
-2,2030,electric_stove,R2,2020,17.40000000000
-2,2034,electric_stove,R2,2020,17.40000000000
-3,2030,electric_stove,R2,2025,6.74000000000
-3,2034,electric_stove,R2,2025,6.74000000000
-3,2035,electric_stove,R2,2025,6.74000000000
-3,2039,electric_stove,R2,2025,6.74000000000
-4,2025,gas_stove,R1,2020,5.00000000000
-5,2030,gas_stove,R1,2025,3.86000000000
-5,2034,gas_stove,R1,2025,3.86000000000
-5,2035,gas_stove,R1,2025,3.86000000000
-5,2039,gas_stove,R1,2025,3.86000000000
-6,2025,gas_stove,R2,2020,5.00000000000
-7,2030,gas_stove,R2,2025,3.86000000000
-7,2034,gas_stove,R2,2025,3.86000000000
-7,2035,gas_stove,R2,2025,3.86000000000
-7,2039,gas_stove,R2,2025,3.86000000000
-8,2025,gasboiler,R1,2020,5.00000000000
-9,2030,gasboiler,R1,2025,3.86000000000
-9,2034,gasboiler,R1,2025,3.86000000000
-9,2035,gasboiler,R1,2025,3.86000000000
-9,2039,gasboiler,R1,2025,3.86000000000
-10,2025,gasboiler,R2,2020,5.00000000000
-11,2030,gasboiler,R2,2025,3.86000000000
-11,2034,gasboiler,R2,2025,3.86000000000
-11,2035,gasboiler,R2,2025,3.86000000000
-11,2039,gasboiler,R2,2025,3.86000000000
-12,2025,heatpump,R1,2020,17.40000000000
-12,2030,heatpump,R1,2020,17.40000000000
-12,2034,heatpump,R1,2020,17.40000000000
-13,2030,heatpump,R1,2025,6.74000000000
-13,2034,heatpump,R1,2025,6.74000000000
-13,2035,heatpump,R1,2025,6.74000000000
-13,2039,heatpump,R1,2025,6.74000000000
-14,2025,heatpump,R2,2020,17.40000000000
-14,2030,heatpump,R2,2020,17.40000000000
-14,2034,heatpump,R2,2020,17.40000000000
-15,2030,heatpump,R2,2025,6.74000000000
-15,2034,heatpump,R2,2025,6.74000000000
-15,2035,heatpump,R2,2025,6.74000000000
-15,2039,heatpump,R2,2025,6.74000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2030,R1,electric_stove,2025,11
+1,2034,R1,electric_stove,2025,11
+1,2035,R1,electric_stove,2025,11
+1,2039,R1,electric_stove,2025,11
+2,2020,R1,gas_stove,2020,10
+2,2025,R1,gas_stove,2020,5
+3,2020,R1,gasboiler,2020,10
+3,2025,R1,gasboiler,2020,5
+4,2025,R1,heatpump,2020,17
+4,2030,R1,heatpump,2020,17
+4,2034,R1,heatpump,2020,17
+5,2030,R1,heatpump,2025,11
+5,2034,R1,heatpump,2025,11
+5,2035,R1,heatpump,2025,11
+5,2039,R1,heatpump,2025,11
+6,2025,R2,electric_stove,2020,17
+6,2030,R2,electric_stove,2020,17
+6,2034,R2,electric_stove,2020,17
+7,2030,R2,electric_stove,2025,11
+7,2034,R2,electric_stove,2025,11
+7,2035,R2,electric_stove,2025,11
+7,2039,R2,electric_stove,2025,11
+8,2020,R2,gas_stove,2020,10
+8,2025,R2,gas_stove,2020,5
+9,2020,R2,gasboiler,2020,10
+9,2025,R2,gasboiler,2020,5
+10,2025,R2,heatpump,2020,17
+10,2030,R2,heatpump,2020,17
+10,2034,R2,heatpump,2020,17
+11,2030,R2,heatpump,2025,11
+11,2034,R2,heatpump,2025,11
+11,2035,R2,heatpump,2025,11
+11,2039,R2,heatpump,2025,11
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
index 55b4cfea..051cbc4a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2030.csv
@@ -1,57 +1,53 @@
-asset,year,technology,region,installed,capacity
-0,2030,electric_stove,R1,2020,17.40000000000
-0,2034,electric_stove,R1,2020,17.40000000000
-1,2030,electric_stove,R1,2025,6.74000000000
-1,2034,electric_stove,R1,2025,6.74000000000
-1,2035,electric_stove,R1,2025,6.74000000000
-1,2039,electric_stove,R1,2025,6.74000000000
-2,2035,electric_stove,R1,2030,23.00000000000
-2,2039,electric_stove,R1,2030,23.00000000000
-2,2040,electric_stove,R1,2030,23.00000000000
-2,2044,electric_stove,R1,2030,23.00000000000
-3,2030,electric_stove,R2,2020,17.40000000000
-3,2034,electric_stove,R2,2020,17.40000000000
-4,2030,electric_stove,R2,2025,6.74000000000
-4,2034,electric_stove,R2,2025,6.74000000000
-4,2035,electric_stove,R2,2025,6.74000000000
-4,2039,electric_stove,R2,2025,6.74000000000
-5,2035,electric_stove,R2,2030,23.00000000000
-5,2039,electric_stove,R2,2030,23.00000000000
-5,2040,electric_stove,R2,2030,23.00000000000
-5,2044,electric_stove,R2,2030,23.00000000000
-6,2030,gas_stove,R1,2025,3.86000000000
-6,2034,gas_stove,R1,2025,3.86000000000
-6,2035,gas_stove,R1,2025,3.86000000000
-6,2039,gas_stove,R1,2025,3.86000000000
-7,2030,gas_stove,R2,2025,3.86000000000
-7,2034,gas_stove,R2,2025,3.86000000000
-7,2035,gas_stove,R2,2025,3.86000000000
-7,2039,gas_stove,R2,2025,3.86000000000
-8,2030,gasboiler,R1,2025,3.86000000000
-8,2034,gasboiler,R1,2025,3.86000000000
-8,2035,gasboiler,R1,2025,3.86000000000
-8,2039,gasboiler,R1,2025,3.86000000000
-9,2030,gasboiler,R2,2025,3.86000000000
-9,2034,gasboiler,R2,2025,3.86000000000
-9,2035,gasboiler,R2,2025,3.86000000000
-9,2039,gasboiler,R2,2025,3.86000000000
-10,2030,heatpump,R1,2020,17.40000000000
-10,2034,heatpump,R1,2020,17.40000000000
-11,2030,heatpump,R1,2025,6.74000000000
-11,2034,heatpump,R1,2025,6.74000000000
-11,2035,heatpump,R1,2025,6.74000000000
-11,2039,heatpump,R1,2025,6.74000000000
-12,2035,heatpump,R1,2030,23.00000000000
-12,2039,heatpump,R1,2030,23.00000000000
-12,2040,heatpump,R1,2030,23.00000000000
-12,2044,heatpump,R1,2030,23.00000000000
-13,2030,heatpump,R2,2020,17.40000000000
-13,2034,heatpump,R2,2020,17.40000000000
-14,2030,heatpump,R2,2025,6.74000000000
-14,2034,heatpump,R2,2025,6.74000000000
-14,2035,heatpump,R2,2025,6.74000000000
-14,2039,heatpump,R2,2025,6.74000000000
-15,2035,heatpump,R2,2030,23.00000000000
-15,2039,heatpump,R2,2030,23.00000000000
-15,2040,heatpump,R2,2030,23.00000000000
-15,2044,heatpump,R2,2030,23.00000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2030,R1,electric_stove,2025,11
+1,2034,R1,electric_stove,2025,11
+1,2035,R1,electric_stove,2025,11
+1,2039,R1,electric_stove,2025,11
+2,2035,R1,electric_stove,2030,22
+2,2039,R1,electric_stove,2030,22
+2,2040,R1,electric_stove,2030,22
+2,2044,R1,electric_stove,2030,22
+3,2020,R1,gas_stove,2020,10
+3,2025,R1,gas_stove,2020,5
+4,2020,R1,gasboiler,2020,10
+4,2025,R1,gasboiler,2020,5
+5,2025,R1,heatpump,2020,17
+5,2030,R1,heatpump,2020,17
+5,2034,R1,heatpump,2020,17
+6,2030,R1,heatpump,2025,11
+6,2034,R1,heatpump,2025,11
+6,2035,R1,heatpump,2025,11
+6,2039,R1,heatpump,2025,11
+7,2035,R1,heatpump,2030,22
+7,2039,R1,heatpump,2030,22
+7,2040,R1,heatpump,2030,22
+7,2044,R1,heatpump,2030,22
+8,2025,R2,electric_stove,2020,17
+8,2030,R2,electric_stove,2020,17
+8,2034,R2,electric_stove,2020,17
+9,2030,R2,electric_stove,2025,11
+9,2034,R2,electric_stove,2025,11
+9,2035,R2,electric_stove,2025,11
+9,2039,R2,electric_stove,2025,11
+10,2035,R2,electric_stove,2030,22
+10,2039,R2,electric_stove,2030,22
+10,2040,R2,electric_stove,2030,22
+10,2044,R2,electric_stove,2030,22
+11,2020,R2,gas_stove,2020,10
+11,2025,R2,gas_stove,2020,5
+12,2020,R2,gasboiler,2020,10
+12,2025,R2,gasboiler,2020,5
+13,2025,R2,heatpump,2020,17
+13,2030,R2,heatpump,2020,17
+13,2034,R2,heatpump,2020,17
+14,2030,R2,heatpump,2025,11
+14,2034,R2,heatpump,2025,11
+14,2035,R2,heatpump,2025,11
+14,2039,R2,heatpump,2025,11
+15,2035,R2,heatpump,2030,22
+15,2039,R2,heatpump,2030,22
+15,2040,R2,heatpump,2030,22
+15,2044,R2,heatpump,2030,22
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
index 982d4e66..e923c806 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2035.csv
@@ -1,65 +1,69 @@
-asset,year,technology,region,installed,capacity
-0,2035,electric_stove,R1,2025,6.74000000000
-0,2039,electric_stove,R1,2025,6.74000000000
-1,2035,electric_stove,R1,2030,23.00000000000
-1,2039,electric_stove,R1,2030,23.00000000000
-1,2040,electric_stove,R1,2030,23.00000000000
-1,2044,electric_stove,R1,2030,23.00000000000
-2,2040,electric_stove,R1,2035,15.31400000000
-2,2044,electric_stove,R1,2035,15.31400000000
-2,2045,electric_stove,R1,2035,15.31400000000
-2,2049,electric_stove,R1,2035,15.31400000000
-3,2035,electric_stove,R2,2025,6.74000000000
-3,2039,electric_stove,R2,2025,6.74000000000
-4,2035,electric_stove,R2,2030,23.00000000000
-4,2039,electric_stove,R2,2030,23.00000000000
-4,2040,electric_stove,R2,2030,23.00000000000
-4,2044,electric_stove,R2,2030,23.00000000000
-5,2040,electric_stove,R2,2035,15.31400000000
-5,2044,electric_stove,R2,2035,15.31400000000
-5,2045,electric_stove,R2,2035,15.31400000000
-5,2049,electric_stove,R2,2035,15.31400000000
-6,2035,gas_stove,R1,2025,3.86000000000
-6,2039,gas_stove,R1,2025,3.86000000000
-7,2040,gas_stove,R1,2035,0.88600000000
-7,2044,gas_stove,R1,2035,0.88600000000
-7,2045,gas_stove,R1,2035,0.88600000000
-7,2049,gas_stove,R1,2035,0.88600000000
-8,2035,gas_stove,R2,2025,3.86000000000
-8,2039,gas_stove,R2,2025,3.86000000000
-9,2040,gas_stove,R2,2035,0.88600000000
-9,2044,gas_stove,R2,2035,0.88600000000
-9,2045,gas_stove,R2,2035,0.88600000000
-9,2049,gas_stove,R2,2035,0.88600000000
-10,2035,gasboiler,R1,2025,3.86000000000
-10,2039,gasboiler,R1,2025,3.86000000000
-11,2040,gasboiler,R1,2035,0.88600000000
-11,2044,gasboiler,R1,2035,0.88600000000
-11,2045,gasboiler,R1,2035,0.88600000000
-11,2049,gasboiler,R1,2035,0.88600000000
-12,2035,gasboiler,R2,2025,3.86000000000
-12,2039,gasboiler,R2,2025,3.86000000000
-13,2040,gasboiler,R2,2035,0.88600000000
-13,2044,gasboiler,R2,2035,0.88600000000
-13,2045,gasboiler,R2,2035,0.88600000000
-13,2049,gasboiler,R2,2035,0.88600000000
-14,2035,heatpump,R1,2025,6.74000000000
-14,2039,heatpump,R1,2025,6.74000000000
-15,2035,heatpump,R1,2030,23.00000000000
-15,2039,heatpump,R1,2030,23.00000000000
-15,2040,heatpump,R1,2030,23.00000000000
-15,2044,heatpump,R1,2030,23.00000000000
-16,2040,heatpump,R1,2035,15.31400000000
-16,2044,heatpump,R1,2035,15.31400000000
-16,2045,heatpump,R1,2035,15.31400000000
-16,2049,heatpump,R1,2035,15.31400000000
-17,2035,heatpump,R2,2025,6.74000000000
-17,2039,heatpump,R2,2025,6.74000000000
-18,2035,heatpump,R2,2030,23.00000000000
-18,2039,heatpump,R2,2030,23.00000000000
-18,2040,heatpump,R2,2030,23.00000000000
-18,2044,heatpump,R2,2030,23.00000000000
-19,2040,heatpump,R2,2035,15.31400000000
-19,2044,heatpump,R2,2035,15.31400000000
-19,2045,heatpump,R2,2035,15.31400000000
-19,2049,heatpump,R2,2035,15.31400000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2030,R1,electric_stove,2025,11
+1,2034,R1,electric_stove,2025,11
+1,2035,R1,electric_stove,2025,11
+1,2039,R1,electric_stove,2025,11
+2,2035,R1,electric_stove,2030,22
+2,2039,R1,electric_stove,2030,22
+2,2040,R1,electric_stove,2030,22
+2,2044,R1,electric_stove,2030,22
+3,2040,R1,electric_stove,2035,17
+3,2044,R1,electric_stove,2035,17
+3,2045,R1,electric_stove,2035,17
+3,2049,R1,electric_stove,2035,17
+4,2020,R1,gas_stove,2020,10
+4,2025,R1,gas_stove,2020,5
+5,2020,R1,gasboiler,2020,10
+5,2025,R1,gasboiler,2020,5
+6,2025,R1,heatpump,2020,17
+6,2030,R1,heatpump,2020,17
+6,2034,R1,heatpump,2020,17
+7,2030,R1,heatpump,2025,11
+7,2034,R1,heatpump,2025,11
+7,2035,R1,heatpump,2025,11
+7,2039,R1,heatpump,2025,11
+8,2035,R1,heatpump,2030,22
+8,2039,R1,heatpump,2030,22
+8,2040,R1,heatpump,2030,22
+8,2044,R1,heatpump,2030,22
+9,2040,R1,heatpump,2035,17
+9,2044,R1,heatpump,2035,17
+9,2045,R1,heatpump,2035,17
+9,2049,R1,heatpump,2035,17
+10,2025,R2,electric_stove,2020,17
+10,2030,R2,electric_stove,2020,17
+10,2034,R2,electric_stove,2020,17
+11,2030,R2,electric_stove,2025,11
+11,2034,R2,electric_stove,2025,11
+11,2035,R2,electric_stove,2025,11
+11,2039,R2,electric_stove,2025,11
+12,2035,R2,electric_stove,2030,22
+12,2039,R2,electric_stove,2030,22
+12,2040,R2,electric_stove,2030,22
+12,2044,R2,electric_stove,2030,22
+13,2040,R2,electric_stove,2035,17
+13,2044,R2,electric_stove,2035,17
+13,2045,R2,electric_stove,2035,17
+13,2049,R2,electric_stove,2035,17
+14,2020,R2,gas_stove,2020,10
+14,2025,R2,gas_stove,2020,5
+15,2020,R2,gasboiler,2020,10
+15,2025,R2,gasboiler,2020,5
+16,2025,R2,heatpump,2020,17
+16,2030,R2,heatpump,2020,17
+16,2034,R2,heatpump,2020,17
+17,2030,R2,heatpump,2025,11
+17,2034,R2,heatpump,2025,11
+17,2035,R2,heatpump,2025,11
+17,2039,R2,heatpump,2025,11
+18,2035,R2,heatpump,2030,22
+18,2039,R2,heatpump,2030,22
+18,2040,R2,heatpump,2030,22
+18,2044,R2,heatpump,2030,22
+19,2040,R2,heatpump,2035,17
+19,2044,R2,heatpump,2035,17
+19,2045,R2,heatpump,2035,17
+19,2049,R2,heatpump,2035,17
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
index b3406b4c..29654ee0 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2040.csv
@@ -1,57 +1,85 @@
-asset,year,technology,region,installed,capacity
-0,2040,electric_stove,R1,2030,23.00000000000
-0,2044,electric_stove,R1,2030,23.00000000000
-1,2040,electric_stove,R1,2035,15.31400000000
-1,2044,electric_stove,R1,2035,15.31400000000
-1,2045,electric_stove,R1,2035,15.31400000000
-1,2049,electric_stove,R1,2035,15.31400000000
-2,2045,electric_stove,R1,2040,28.60000000000
-2,2049,electric_stove,R1,2040,28.60000000000
-2,2050,electric_stove,R1,2040,28.60000000000
-2,2054,electric_stove,R1,2040,28.60000000000
-3,2040,electric_stove,R2,2030,23.00000000000
-3,2044,electric_stove,R2,2030,23.00000000000
-4,2040,electric_stove,R2,2035,15.31400000000
-4,2044,electric_stove,R2,2035,15.31400000000
-4,2045,electric_stove,R2,2035,15.31400000000
-4,2049,electric_stove,R2,2035,15.31400000000
-5,2045,electric_stove,R2,2040,28.60000000000
-5,2049,electric_stove,R2,2040,28.60000000000
-5,2050,electric_stove,R2,2040,28.60000000000
-5,2054,electric_stove,R2,2040,28.60000000000
-6,2040,gas_stove,R1,2035,0.88600000000
-6,2044,gas_stove,R1,2035,0.88600000000
-6,2045,gas_stove,R1,2035,0.88600000000
-6,2049,gas_stove,R1,2035,0.88600000000
-7,2040,gas_stove,R2,2035,0.88600000000
-7,2044,gas_stove,R2,2035,0.88600000000
-7,2045,gas_stove,R2,2035,0.88600000000
-7,2049,gas_stove,R2,2035,0.88600000000
-8,2040,gasboiler,R1,2035,0.88600000000
-8,2044,gasboiler,R1,2035,0.88600000000
-8,2045,gasboiler,R1,2035,0.88600000000
-8,2049,gasboiler,R1,2035,0.88600000000
-9,2040,gasboiler,R2,2035,0.88600000000
-9,2044,gasboiler,R2,2035,0.88600000000
-9,2045,gasboiler,R2,2035,0.88600000000
-9,2049,gasboiler,R2,2035,0.88600000000
-10,2040,heatpump,R1,2030,23.00000000000
-10,2044,heatpump,R1,2030,23.00000000000
-11,2040,heatpump,R1,2035,15.31400000000
-11,2044,heatpump,R1,2035,15.31400000000
-11,2045,heatpump,R1,2035,15.31400000000
-11,2049,heatpump,R1,2035,15.31400000000
-12,2045,heatpump,R1,2040,28.60000000000
-12,2049,heatpump,R1,2040,28.60000000000
-12,2050,heatpump,R1,2040,28.60000000000
-12,2054,heatpump,R1,2040,28.60000000000
-13,2040,heatpump,R2,2030,23.00000000000
-13,2044,heatpump,R2,2030,23.00000000000
-14,2040,heatpump,R2,2035,15.31400000000
-14,2044,heatpump,R2,2035,15.31400000000
-14,2045,heatpump,R2,2035,15.31400000000
-14,2049,heatpump,R2,2035,15.31400000000
-15,2045,heatpump,R2,2040,28.60000000000
-15,2049,heatpump,R2,2040,28.60000000000
-15,2050,heatpump,R2,2040,28.60000000000
-15,2054,heatpump,R2,2040,28.60000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2030,R1,electric_stove,2025,11
+1,2034,R1,electric_stove,2025,11
+1,2035,R1,electric_stove,2025,11
+1,2039,R1,electric_stove,2025,11
+2,2035,R1,electric_stove,2030,22
+2,2039,R1,electric_stove,2030,22
+2,2040,R1,electric_stove,2030,22
+2,2044,R1,electric_stove,2030,22
+3,2040,R1,electric_stove,2035,17
+3,2044,R1,electric_stove,2035,17
+3,2045,R1,electric_stove,2035,17
+3,2049,R1,electric_stove,2035,17
+4,2045,R1,electric_stove,2040,27
+4,2049,R1,electric_stove,2040,27
+4,2050,R1,electric_stove,2040,27
+4,2054,R1,electric_stove,2040,27
+5,2020,R1,gas_stove,2020,10
+5,2025,R1,gas_stove,2020,5
+6,2020,R1,gasboiler,2020,10
+6,2025,R1,gasboiler,2020,5
+7,2025,R1,heatpump,2020,17
+7,2030,R1,heatpump,2020,17
+7,2034,R1,heatpump,2020,17
+8,2030,R1,heatpump,2025,11
+8,2034,R1,heatpump,2025,11
+8,2035,R1,heatpump,2025,11
+8,2039,R1,heatpump,2025,11
+9,2035,R1,heatpump,2030,22
+9,2039,R1,heatpump,2030,22
+9,2040,R1,heatpump,2030,22
+9,2044,R1,heatpump,2030,22
+10,2040,R1,heatpump,2035,17
+10,2044,R1,heatpump,2035,17
+10,2045,R1,heatpump,2035,17
+10,2049,R1,heatpump,2035,17
+11,2045,R1,heatpump,2040,27
+11,2049,R1,heatpump,2040,27
+11,2050,R1,heatpump,2040,27
+11,2054,R1,heatpump,2040,27
+12,2025,R2,electric_stove,2020,17
+12,2030,R2,electric_stove,2020,17
+12,2034,R2,electric_stove,2020,17
+13,2030,R2,electric_stove,2025,11
+13,2034,R2,electric_stove,2025,11
+13,2035,R2,electric_stove,2025,11
+13,2039,R2,electric_stove,2025,11
+14,2035,R2,electric_stove,2030,22
+14,2039,R2,electric_stove,2030,22
+14,2040,R2,electric_stove,2030,22
+14,2044,R2,electric_stove,2030,22
+15,2040,R2,electric_stove,2035,17
+15,2044,R2,electric_stove,2035,17
+15,2045,R2,electric_stove,2035,17
+15,2049,R2,electric_stove,2035,17
+16,2045,R2,electric_stove,2040,27
+16,2049,R2,electric_stove,2040,27
+16,2050,R2,electric_stove,2040,27
+16,2054,R2,electric_stove,2040,27
+17,2020,R2,gas_stove,2020,10
+17,2025,R2,gas_stove,2020,5
+18,2020,R2,gasboiler,2020,10
+18,2025,R2,gasboiler,2020,5
+19,2025,R2,heatpump,2020,17
+19,2030,R2,heatpump,2020,17
+19,2034,R2,heatpump,2020,17
+20,2030,R2,heatpump,2025,11
+20,2034,R2,heatpump,2025,11
+20,2035,R2,heatpump,2025,11
+20,2039,R2,heatpump,2025,11
+21,2035,R2,heatpump,2030,22
+21,2039,R2,heatpump,2030,22
+21,2040,R2,heatpump,2030,22
+21,2044,R2,heatpump,2030,22
+22,2040,R2,heatpump,2035,17
+22,2044,R2,heatpump,2035,17
+22,2045,R2,heatpump,2035,17
+22,2049,R2,heatpump,2035,17
+23,2045,R2,heatpump,2040,27
+23,2049,R2,heatpump,2040,27
+23,2050,R2,heatpump,2040,27
+23,2054,R2,heatpump,2040,27
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
index 7162fb9e..7d9e0034 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2045.csv
@@ -1,49 +1,101 @@
-asset,year,technology,region,installed,capacity
-0,2045,electric_stove,R1,2035,15.31400000000
-0,2049,electric_stove,R1,2035,15.31400000000
-1,2045,electric_stove,R1,2040,28.60000000000
-1,2049,electric_stove,R1,2040,28.60000000000
-1,2050,electric_stove,R1,2040,28.60000000000
-1,2054,electric_stove,R1,2040,28.60000000000
-2,2050,electric_stove,R1,2045,21.80000000000
-2,2054,electric_stove,R1,2045,21.80000000000
-2,2055,electric_stove,R1,2045,21.80000000000
-2,2059,electric_stove,R1,2045,21.80000000000
-3,2045,electric_stove,R2,2035,15.31400000000
-3,2049,electric_stove,R2,2035,15.31400000000
-4,2045,electric_stove,R2,2040,28.60000000000
-4,2049,electric_stove,R2,2040,28.60000000000
-4,2050,electric_stove,R2,2040,28.60000000000
-4,2054,electric_stove,R2,2040,28.60000000000
-5,2050,electric_stove,R2,2045,21.80000000000
-5,2054,electric_stove,R2,2045,21.80000000000
-5,2055,electric_stove,R2,2045,21.80000000000
-5,2059,electric_stove,R2,2045,21.80000000000
-6,2045,gas_stove,R1,2035,0.88600000000
-6,2049,gas_stove,R1,2035,0.88600000000
-7,2045,gas_stove,R2,2035,0.88600000000
-7,2049,gas_stove,R2,2035,0.88600000000
-8,2045,gasboiler,R1,2035,0.88600000000
-8,2049,gasboiler,R1,2035,0.88600000000
-9,2045,gasboiler,R2,2035,0.88600000000
-9,2049,gasboiler,R2,2035,0.88600000000
-10,2045,heatpump,R1,2035,15.31400000000
-10,2049,heatpump,R1,2035,15.31400000000
-11,2045,heatpump,R1,2040,28.60000000000
-11,2049,heatpump,R1,2040,28.60000000000
-11,2050,heatpump,R1,2040,28.60000000000
-11,2054,heatpump,R1,2040,28.60000000000
-12,2050,heatpump,R1,2045,21.80000000000
-12,2054,heatpump,R1,2045,21.80000000000
-12,2055,heatpump,R1,2045,21.80000000000
-12,2059,heatpump,R1,2045,21.80000000000
-13,2045,heatpump,R2,2035,15.31400000000
-13,2049,heatpump,R2,2035,15.31400000000
-14,2045,heatpump,R2,2040,28.60000000000
-14,2049,heatpump,R2,2040,28.60000000000
-14,2050,heatpump,R2,2040,28.60000000000
-14,2054,heatpump,R2,2040,28.60000000000
-15,2050,heatpump,R2,2045,21.80000000000
-15,2054,heatpump,R2,2045,21.80000000000
-15,2055,heatpump,R2,2045,21.80000000000
-15,2059,heatpump,R2,2045,21.80000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2030,R1,electric_stove,2025,11
+1,2034,R1,electric_stove,2025,11
+1,2035,R1,electric_stove,2025,11
+1,2039,R1,electric_stove,2025,11
+2,2035,R1,electric_stove,2030,22
+2,2039,R1,electric_stove,2030,22
+2,2040,R1,electric_stove,2030,22
+2,2044,R1,electric_stove,2030,22
+3,2040,R1,electric_stove,2035,17
+3,2044,R1,electric_stove,2035,17
+3,2045,R1,electric_stove,2035,17
+3,2049,R1,electric_stove,2035,17
+4,2045,R1,electric_stove,2040,27
+4,2049,R1,electric_stove,2040,27
+4,2050,R1,electric_stove,2040,27
+4,2054,R1,electric_stove,2040,27
+5,2050,R1,electric_stove,2045,23
+5,2054,R1,electric_stove,2045,23
+5,2055,R1,electric_stove,2045,23
+5,2059,R1,electric_stove,2045,23
+6,2020,R1,gas_stove,2020,10
+6,2025,R1,gas_stove,2020,5
+7,2020,R1,gasboiler,2020,10
+7,2025,R1,gasboiler,2020,5
+8,2025,R1,heatpump,2020,17
+8,2030,R1,heatpump,2020,17
+8,2034,R1,heatpump,2020,17
+9,2030,R1,heatpump,2025,11
+9,2034,R1,heatpump,2025,11
+9,2035,R1,heatpump,2025,11
+9,2039,R1,heatpump,2025,11
+10,2035,R1,heatpump,2030,22
+10,2039,R1,heatpump,2030,22
+10,2040,R1,heatpump,2030,22
+10,2044,R1,heatpump,2030,22
+11,2040,R1,heatpump,2035,17
+11,2044,R1,heatpump,2035,17
+11,2045,R1,heatpump,2035,17
+11,2049,R1,heatpump,2035,17
+12,2045,R1,heatpump,2040,27
+12,2049,R1,heatpump,2040,27
+12,2050,R1,heatpump,2040,27
+12,2054,R1,heatpump,2040,27
+13,2050,R1,heatpump,2045,23
+13,2054,R1,heatpump,2045,23
+13,2055,R1,heatpump,2045,23
+13,2059,R1,heatpump,2045,23
+14,2025,R2,electric_stove,2020,17
+14,2030,R2,electric_stove,2020,17
+14,2034,R2,electric_stove,2020,17
+15,2030,R2,electric_stove,2025,11
+15,2034,R2,electric_stove,2025,11
+15,2035,R2,electric_stove,2025,11
+15,2039,R2,electric_stove,2025,11
+16,2035,R2,electric_stove,2030,22
+16,2039,R2,electric_stove,2030,22
+16,2040,R2,electric_stove,2030,22
+16,2044,R2,electric_stove,2030,22
+17,2040,R2,electric_stove,2035,17
+17,2044,R2,electric_stove,2035,17
+17,2045,R2,electric_stove,2035,17
+17,2049,R2,electric_stove,2035,17
+18,2045,R2,electric_stove,2040,27
+18,2049,R2,electric_stove,2040,27
+18,2050,R2,electric_stove,2040,27
+18,2054,R2,electric_stove,2040,27
+19,2050,R2,electric_stove,2045,23
+19,2054,R2,electric_stove,2045,23
+19,2055,R2,electric_stove,2045,23
+19,2059,R2,electric_stove,2045,23
+20,2020,R2,gas_stove,2020,10
+20,2025,R2,gas_stove,2020,5
+21,2020,R2,gasboiler,2020,10
+21,2025,R2,gasboiler,2020,5
+22,2025,R2,heatpump,2020,17
+22,2030,R2,heatpump,2020,17
+22,2034,R2,heatpump,2020,17
+23,2030,R2,heatpump,2025,11
+23,2034,R2,heatpump,2025,11
+23,2035,R2,heatpump,2025,11
+23,2039,R2,heatpump,2025,11
+24,2035,R2,heatpump,2030,22
+24,2039,R2,heatpump,2030,22
+24,2040,R2,heatpump,2030,22
+24,2044,R2,heatpump,2030,22
+25,2040,R2,heatpump,2035,17
+25,2044,R2,heatpump,2035,17
+25,2045,R2,heatpump,2035,17
+25,2049,R2,heatpump,2035,17
+26,2045,R2,heatpump,2040,27
+26,2049,R2,heatpump,2040,27
+26,2050,R2,heatpump,2040,27
+26,2054,R2,heatpump,2040,27
+27,2050,R2,heatpump,2045,23
+27,2054,R2,heatpump,2045,23
+27,2055,R2,heatpump,2045,23
+27,2059,R2,heatpump,2045,23
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
index 9dd0a6af..aa739431 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Capacity/2050.csv
@@ -1,41 +1,117 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,electric_stove,2040,28.60000000000
-1,2054,R1,electric_stove,2040,28.60000000000
-2,2050,R1,electric_stove,2045,21.80000000000
-2,2054,R1,electric_stove,2045,21.80000000000
-2,2055,R1,electric_stove,2045,21.80000000000
-2,2059,R1,electric_stove,2045,21.80000000000
-3,2055,R1,electric_stove,2050,28.60000000000
-3,2059,R1,electric_stove,2050,28.60000000000
-3,2060,R1,electric_stove,2050,28.60000000000
-3,2064,R1,electric_stove,2050,28.60000000000
-7,2050,R1,heatpump,2040,28.60000000000
-7,2054,R1,heatpump,2040,28.60000000000
-8,2050,R1,heatpump,2045,21.80000000000
-8,2054,R1,heatpump,2045,21.80000000000
-8,2055,R1,heatpump,2045,21.80000000000
-8,2059,R1,heatpump,2045,21.80000000000
-9,2055,R1,heatpump,2050,28.60000000000
-9,2059,R1,heatpump,2050,28.60000000000
-9,2060,R1,heatpump,2050,28.60000000000
-9,2064,R1,heatpump,2050,28.60000000000
-11,2050,R2,electric_stove,2040,28.60000000000
-11,2054,R2,electric_stove,2040,28.60000000000
-12,2050,R2,electric_stove,2045,21.80000000000
-12,2054,R2,electric_stove,2045,21.80000000000
-12,2055,R2,electric_stove,2045,21.80000000000
-12,2059,R2,electric_stove,2045,21.80000000000
-13,2055,R2,electric_stove,2050,28.60000000000
-13,2059,R2,electric_stove,2050,28.60000000000
-13,2060,R2,electric_stove,2050,28.60000000000
-13,2064,R2,electric_stove,2050,28.60000000000
-17,2050,R2,heatpump,2040,28.60000000000
-17,2054,R2,heatpump,2040,28.60000000000
-18,2050,R2,heatpump,2045,21.80000000000
-18,2054,R2,heatpump,2045,21.80000000000
-18,2055,R2,heatpump,2045,21.80000000000
-18,2059,R2,heatpump,2045,21.80000000000
-19,2055,R2,heatpump,2050,28.60000000000
-19,2059,R2,heatpump,2050,28.60000000000
-19,2060,R2,heatpump,2050,28.60000000000
-19,2064,R2,heatpump,2050,28.60000000000
+0,2025,R1,electric_stove,2020,17
+0,2030,R1,electric_stove,2020,17
+0,2034,R1,electric_stove,2020,17
+1,2030,R1,electric_stove,2025,11
+1,2034,R1,electric_stove,2025,11
+1,2035,R1,electric_stove,2025,11
+1,2039,R1,electric_stove,2025,11
+2,2035,R1,electric_stove,2030,22
+2,2039,R1,electric_stove,2030,22
+2,2040,R1,electric_stove,2030,22
+2,2044,R1,electric_stove,2030,22
+3,2040,R1,electric_stove,2035,17
+3,2044,R1,electric_stove,2035,17
+3,2045,R1,electric_stove,2035,17
+3,2049,R1,electric_stove,2035,17
+4,2045,R1,electric_stove,2040,27
+4,2049,R1,electric_stove,2040,27
+4,2050,R1,electric_stove,2040,27
+4,2054,R1,electric_stove,2040,27
+5,2050,R1,electric_stove,2045,23
+5,2054,R1,electric_stove,2045,23
+5,2055,R1,electric_stove,2045,23
+5,2059,R1,electric_stove,2045,23
+6,2055,R1,electric_stove,2050,27
+6,2059,R1,electric_stove,2050,27
+6,2060,R1,electric_stove,2050,27
+6,2064,R1,electric_stove,2050,27
+7,2020,R1,gas_stove,2020,10
+7,2025,R1,gas_stove,2020,5
+8,2020,R1,gasboiler,2020,10
+8,2025,R1,gasboiler,2020,5
+9,2025,R1,heatpump,2020,17
+9,2030,R1,heatpump,2020,17
+9,2034,R1,heatpump,2020,17
+10,2030,R1,heatpump,2025,11
+10,2034,R1,heatpump,2025,11
+10,2035,R1,heatpump,2025,11
+10,2039,R1,heatpump,2025,11
+11,2035,R1,heatpump,2030,22
+11,2039,R1,heatpump,2030,22
+11,2040,R1,heatpump,2030,22
+11,2044,R1,heatpump,2030,22
+12,2040,R1,heatpump,2035,17
+12,2044,R1,heatpump,2035,17
+12,2045,R1,heatpump,2035,17
+12,2049,R1,heatpump,2035,17
+13,2045,R1,heatpump,2040,27
+13,2049,R1,heatpump,2040,27
+13,2050,R1,heatpump,2040,27
+13,2054,R1,heatpump,2040,27
+14,2050,R1,heatpump,2045,23
+14,2054,R1,heatpump,2045,23
+14,2055,R1,heatpump,2045,23
+14,2059,R1,heatpump,2045,23
+15,2055,R1,heatpump,2050,27
+15,2059,R1,heatpump,2050,27
+15,2060,R1,heatpump,2050,27
+15,2064,R1,heatpump,2050,27
+16,2025,R2,electric_stove,2020,17
+16,2030,R2,electric_stove,2020,17
+16,2034,R2,electric_stove,2020,17
+17,2030,R2,electric_stove,2025,11
+17,2034,R2,electric_stove,2025,11
+17,2035,R2,electric_stove,2025,11
+17,2039,R2,electric_stove,2025,11
+18,2035,R2,electric_stove,2030,22
+18,2039,R2,electric_stove,2030,22
+18,2040,R2,electric_stove,2030,22
+18,2044,R2,electric_stove,2030,22
+19,2040,R2,electric_stove,2035,17
+19,2044,R2,electric_stove,2035,17
+19,2045,R2,electric_stove,2035,17
+19,2049,R2,electric_stove,2035,17
+20,2045,R2,electric_stove,2040,27
+20,2049,R2,electric_stove,2040,27
+20,2050,R2,electric_stove,2040,27
+20,2054,R2,electric_stove,2040,27
+21,2050,R2,electric_stove,2045,23
+21,2054,R2,electric_stove,2045,23
+21,2055,R2,electric_stove,2045,23
+21,2059,R2,electric_stove,2045,23
+22,2055,R2,electric_stove,2050,27
+22,2059,R2,electric_stove,2050,27
+22,2060,R2,electric_stove,2050,27
+22,2064,R2,electric_stove,2050,27
+23,2020,R2,gas_stove,2020,10
+23,2025,R2,gas_stove,2020,5
+24,2020,R2,gasboiler,2020,10
+24,2025,R2,gasboiler,2020,5
+25,2025,R2,heatpump,2020,17
+25,2030,R2,heatpump,2020,17
+25,2034,R2,heatpump,2020,17
+26,2030,R2,heatpump,2025,11
+26,2034,R2,heatpump,2025,11
+26,2035,R2,heatpump,2025,11
+26,2039,R2,heatpump,2025,11
+27,2035,R2,heatpump,2030,22
+27,2039,R2,heatpump,2030,22
+27,2040,R2,heatpump,2030,22
+27,2044,R2,heatpump,2030,22
+28,2040,R2,heatpump,2035,17
+28,2044,R2,heatpump,2035,17
+28,2045,R2,heatpump,2035,17
+28,2049,R2,heatpump,2035,17
+29,2045,R2,heatpump,2040,27
+29,2049,R2,heatpump,2040,27
+29,2050,R2,heatpump,2040,27
+29,2054,R2,heatpump,2040,27
+30,2050,R2,heatpump,2045,23
+30,2054,R2,heatpump,2045,23
+30,2055,R2,heatpump,2045,23
+30,2059,R2,heatpump,2045,23
+31,2055,R2,heatpump,2050,27
+31,2059,R2,heatpump,2050,27
+31,2060,R2,heatpump,2050,27
+31,2064,R2,heatpump,2050,27
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
index 9f7f3f84..429eef7e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
@@ -1,321 +1,321 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2020,4,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,5,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2025,4,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,5,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2020,4,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,5,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2025,4,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,5,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.36250000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R1,2020,3,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R1,2020,4,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,5,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R1,2025,4,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2025,5,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R2,2020,3,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R2,2020,4,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,5,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R2,2025,4,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2025,5,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,cook,R1,2020,2,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R1,2020,3,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2025,1,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R1,2025,3,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R2,2020,2,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R2,2020,3,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2025,1,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R2,2025,3,all-year,all-week,night,gas_stove,2020,0.10420000000
-1,heat,R1,2020,4,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,5,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2025,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,5,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2020,4,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,5,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2025,4,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,5,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R1,2020,3,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R1,2020,4,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,5,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R1,2025,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2025,5,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R2,2020,3,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R2,2020,4,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,5,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R2,2025,4,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2025,5,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,cook,R1,2020,2,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R1,2020,3,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2025,1,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R1,2025,3,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R2,2020,2,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R2,2020,3,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2025,1,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R2,2025,3,all-year,all-week,morning,gas_stove,2020,0.14880000000
-2,heat,R1,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R1,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R1,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R1,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R2,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R2,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R2,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,cook,R1,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R1,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2025,1,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R1,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R2,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R2,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2025,1,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R2,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-3,heat,R1,2020,4,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,5,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,5,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2020,4,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,5,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,5,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R1,2020,3,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R1,2020,4,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,5,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R1,2025,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2025,5,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R2,2020,3,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R2,2020,4,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,5,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R2,2025,4,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2025,5,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,cook,R1,2020,2,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R1,2020,3,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2025,1,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R1,2025,3,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R2,2020,2,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R2,2020,3,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2025,1,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R2,2025,3,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-4,heat,R1,2020,4,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,5,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-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.08750000000
-4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2020,4,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,5,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-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.08750000000
-4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R1,2020,3,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R1,2020,4,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,5,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-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,52.50000000000
-4,CO2f,R2,2020,3,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R2,2020,4,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,5,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-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.05000000000
-4,cook,R1,2020,3,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R1,2025,1,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-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.05000000000
-4,cook,R2,2020,3,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R2,2025,1,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-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.70000000000
-5,heat,R1,2020,5,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2025,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,5,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2020,4,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,5,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2025,4,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,5,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R1,2020,3,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R1,2020,4,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,5,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R1,2025,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2025,5,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R2,2020,3,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R2,2020,4,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,5,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R2,2025,4,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2025,5,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,cook,R1,2020,2,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R1,2020,3,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2025,1,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R1,2025,3,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R2,2020,2,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R2,2020,3,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2025,1,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R2,2025,3,all-year,all-week,evening,gas_stove,2020,0.20830000000
-6,heat,R1,2020,4,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,5,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2025,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,5,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2020,4,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,5,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2025,4,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,5,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,6,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R1,2020,3,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R1,2020,4,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,5,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R1,2025,3,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R1,2025,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2025,5,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R2,2020,3,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R2,2020,4,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,5,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R2,2025,3,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R2,2025,4,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2025,5,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,cook,R1,2020,2,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R1,2020,3,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2025,1,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R1,2025,3,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R2,2020,2,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R2,2020,3,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2025,1,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R2,2025,3,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-7,heat,R1,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R1,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R1,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R1,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R2,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R2,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R2,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,cook,R1,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R1,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2025,1,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R1,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R2,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R2,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2025,1,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R2,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
+0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R1,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R2,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,cook,R1,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R1,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R1,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R2,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
+1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R1,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R2,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,cook,R1,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R1,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R1,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R2,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
+2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,cook,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R1,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,cook,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R1,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,cook,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R1,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R1,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R2,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,cook,R1,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R1,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R1,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R2,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
+6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,CO2f,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,cook,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R1,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,cook,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R1,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
index 07317d7a..c58d9cfa 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
@@ -1,449 +1,321 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,8,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,10,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R1,2025,12,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2025,14,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,11,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,12,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,13,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2030,14,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,15,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2025,8,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,10,all-year,all-week,night,gasboiler,2020,0.10420000000
-0,heat,R2,2025,12,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2025,14,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,11,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,12,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,13,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2030,14,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,15,all-year,all-week,night,heatpump,2025,0.14040000000
-0,CO2f,R1,2025,4,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R1,2025,6,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R1,2025,8,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2025,10,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R1,2030,5,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2030,11,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2025,4,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R2,2025,6,all-year,all-week,night,gas_stove,2020,5.20830000000
-0,CO2f,R2,2025,8,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2025,10,all-year,all-week,night,gasboiler,2020,6.74060000000
-0,CO2f,R2,2030,5,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2030,11,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2025,2,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2025,4,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R1,2025,6,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2030,2,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2030,3,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2030,5,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R1,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2025,2,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2025,4,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R2,2025,6,all-year,all-week,night,gas_stove,2020,0.10420000000
-0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2030,2,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2030,3,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2030,5,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
-1,heat,R1,2025,8,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,10,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R1,2025,12,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2025,14,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,11,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,15,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2025,8,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,10,all-year,all-week,morning,gasboiler,2020,0.14880000000
-1,heat,R2,2025,12,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2025,14,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,11,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,15,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,CO2f,R1,2025,4,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R1,2025,6,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R1,2025,8,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2025,10,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R1,2030,5,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2030,11,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2025,4,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R2,2025,6,all-year,all-week,morning,gas_stove,2020,7.44050000000
-1,CO2f,R2,2025,8,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2025,10,all-year,all-week,morning,gasboiler,2020,9.62950000000
-1,CO2f,R2,2030,5,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2030,11,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2025,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2025,4,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R1,2025,6,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2030,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2030,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2030,5,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R1,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2025,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2025,4,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R2,2025,6,all-year,all-week,morning,gas_stove,2020,0.14880000000
-1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2030,2,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2030,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2030,5,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
-2,heat,R1,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R1,2025,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2025,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,15,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,0.10420000000
-2,heat,R2,2025,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2025,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,15,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,CO2f,R1,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R1,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,5.20830000000
-2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,6.74060000000
-2,CO2f,R2,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2025,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R1,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2030,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2030,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2025,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R2,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,0.10420000000
-2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2030,2,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2030,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-3,heat,R1,2025,8,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,10,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R1,2025,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2025,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,15,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2025,8,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,10,all-year,all-week,early-peak,gasboiler,2020,0.14880000000
-3,heat,R2,2025,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2025,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,15,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,CO2f,R1,2025,4,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R1,2025,6,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R1,2025,8,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2025,10,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R1,2030,5,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2030,11,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2025,4,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R2,2025,6,all-year,all-week,early-peak,gas_stove,2020,7.44050000000
-3,CO2f,R2,2025,8,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2025,10,all-year,all-week,early-peak,gasboiler,2020,9.62950000000
-3,CO2f,R2,2030,5,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2030,11,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2025,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2025,4,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R1,2025,6,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2030,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2030,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2030,5,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2025,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2025,4,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R2,2025,6,all-year,all-week,early-peak,gas_stove,2020,0.14880000000
-3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2030,2,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2030,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2030,5,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-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.08750000000
-4,heat,R1,2025,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,15,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-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.08750000000
-4,heat,R2,2025,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,15,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-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,12.06250000000
-4,CO2f,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2030,11,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-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,12.06250000000
-4,CO2f,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2030,11,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R1,2025,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-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,electric_stove,2020,1.08750000000
-4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2030,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R1,2030,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2030,5,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R2,2025,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-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,electric_stove,2020,1.08750000000
-4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2030,2,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R2,2030,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2030,5,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-5,heat,R1,2025,8,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,10,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R1,2025,12,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2025,14,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,11,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,15,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2025,8,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,10,all-year,all-week,evening,gasboiler,2020,0.20830000000
-5,heat,R2,2025,12,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2025,14,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,11,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,15,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,CO2f,R1,2025,4,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R1,2025,6,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R1,2025,8,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2025,10,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R1,2030,5,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2030,11,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2025,4,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R2,2025,6,all-year,all-week,evening,gas_stove,2020,10.41670000000
-5,CO2f,R2,2025,8,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2025,10,all-year,all-week,evening,gasboiler,2020,13.48120000000
-5,CO2f,R2,2030,5,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2030,11,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2025,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2025,4,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R1,2025,6,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2030,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2030,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2030,5,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R1,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2025,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2025,4,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R2,2025,6,all-year,all-week,evening,gas_stove,2020,0.20830000000
-5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2030,2,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2030,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2030,5,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
-6,heat,R1,2025,8,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,10,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R1,2025,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2025,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,15,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2025,8,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,10,all-year,all-week,early-morning,gasboiler,2020,0.20830000000
-6,heat,R2,2025,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2025,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,15,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,CO2f,R1,2025,4,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R1,2025,6,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R1,2025,8,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2025,10,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R1,2030,5,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2030,11,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2025,4,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R2,2025,6,all-year,all-week,early-morning,gas_stove,2020,10.41670000000
-6,CO2f,R2,2025,8,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2025,10,all-year,all-week,early-morning,gasboiler,2020,13.48120000000
-6,CO2f,R2,2030,5,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2030,11,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2025,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2025,4,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R1,2025,6,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2030,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2030,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2030,5,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2025,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2025,4,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R2,2025,6,all-year,all-week,early-morning,gas_stove,2020,0.20830000000
-6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2030,2,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2030,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2030,5,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-7,heat,R1,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R1,2025,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2025,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,15,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,0.20830000000
-7,heat,R2,2025,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2025,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,15,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,CO2f,R1,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R1,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,10.41670000000
-7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,13.48120000000
-7,CO2f,R2,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2025,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R1,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2030,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2030,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2025,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R2,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,0.20830000000
-7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2030,2,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2030,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R1,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R1,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
+1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R1,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R1,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R1,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R1,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R1,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R1,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R1,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R1,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R1,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R1,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R1,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R1,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R1,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R1,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
index c5706d3f..06e46f15 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
@@ -1,513 +1,257 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,8,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,8,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,9,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,11,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,12,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2030,8,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.36250000000
-0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,8,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,9,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,11,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,12,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
-0,CO2f,R1,2030,6,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2030,8,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2035,7,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2035,8,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2035,9,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2030,6,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2030,7,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2030,8,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2035,7,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2035,8,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2035,9,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2030,3,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R1,2030,4,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2030,6,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R1,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2035,4,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2035,5,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R1,2035,7,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2030,3,all-year,all-week,night,electric_stove,2020,0.36250000000
-0,cook,R2,2030,4,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2030,6,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2030,7,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2035,4,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2035,5,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2035,7,all-year,all-week,night,gas_stove,2025,0.08040000000
-1,heat,R1,2030,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,11,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,12,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2030,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.51790000000
-1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,8,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,9,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,11,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,12,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,CO2f,R1,2030,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2030,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2035,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2035,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2035,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2030,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2030,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2030,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2035,7,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2035,8,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2035,9,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2030,3,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R1,2030,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2030,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R1,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2035,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2035,5,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R1,2035,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2030,3,all-year,all-week,morning,electric_stove,2020,0.51790000000
-1,cook,R2,2030,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2030,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2030,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2035,4,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2035,5,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2035,7,all-year,all-week,morning,gas_stove,2025,0.11490000000
-2,heat,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,12,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.36250000000
-2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,11,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,12,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,CO2f,R1,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2030,3,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R1,2030,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2035,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2035,5,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2030,3,all-year,all-week,mid-afternoon,electric_stove,2020,0.36250000000
-2,cook,R2,2030,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2035,4,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2035,5,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-3,heat,R1,2030,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,12,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2030,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.51790000000
-3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,11,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,12,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,CO2f,R1,2030,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2030,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2030,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2030,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2030,3,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R1,2030,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2030,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2035,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2035,5,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2030,3,all-year,all-week,early-peak,electric_stove,2020,0.51790000000
-3,cook,R2,2030,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2030,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2035,4,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2035,5,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-4,heat,R1,2030,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,12,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2030,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.08750000000
-4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,11,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,12,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,CO2f,R1,2030,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2030,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2030,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2030,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2030,3,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R1,2030,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2030,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2035,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2035,5,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2030,3,all-year,all-week,late-peak,electric_stove,2020,1.08750000000
-4,cook,R2,2030,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2030,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2035,4,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2035,5,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-5,heat,R1,2030,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,11,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,12,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2030,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.72500000000
-5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,8,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,9,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,11,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,12,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,CO2f,R1,2030,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2030,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2035,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2035,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2035,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2030,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2030,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2030,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2035,7,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2035,8,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2035,9,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2030,3,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R1,2030,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2030,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R1,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2035,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2035,5,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R1,2035,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2030,3,all-year,all-week,evening,electric_stove,2020,0.72500000000
-5,cook,R2,2030,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2030,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2030,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2035,4,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2035,5,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2035,7,all-year,all-week,evening,gas_stove,2025,0.16080000000
-6,heat,R1,2030,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,12,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2030,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.72500000000
-6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,11,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,12,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,CO2f,R1,2030,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2030,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2030,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2030,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2030,3,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R1,2030,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2030,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2035,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2035,5,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2030,3,all-year,all-week,early-morning,electric_stove,2020,0.72500000000
-6,cook,R2,2030,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2030,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2035,4,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2035,5,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-7,heat,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,12,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.72500000000
-7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,11,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,12,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,CO2f,R1,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2030,3,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R1,2030,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2035,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2035,5,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2030,3,all-year,all-week,late-afternoon,electric_stove,2020,0.72500000000
-7,cook,R2,2030,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2035,4,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2035,5,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
+0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R1,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R1,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R1,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R1,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R1,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R1,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R1,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R1,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R1,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R1,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R1,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R1,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R1,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R1,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R1,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R1,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
index f3803e1b..777ad44d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
@@ -1,513 +1,257 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,10,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,12,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2035,17,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R1,2035,18,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,11,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,13,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,15,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,16,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2035,10,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,12,all-year,all-week,night,gasboiler,2025,0.08040000000
-0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2035,17,all-year,all-week,night,heatpump,2025,0.14040000000
-0,heat,R2,2035,18,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,11,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,13,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,15,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,16,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2035,0.31900000000
-0,CO2f,R1,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2035,8,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R1,2035,10,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2035,12,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2040,9,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2040,11,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2040,13,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2035,6,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2035,8,all-year,all-week,night,gas_stove,2025,4.02080000000
-0,CO2f,R2,2035,10,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2035,12,all-year,all-week,night,gasboiler,2025,5.20380000000
-0,CO2f,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2040,9,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2040,11,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2040,13,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,cook,R1,2035,0,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2035,3,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R1,2035,4,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R1,2035,8,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R1,2040,1,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2040,4,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2040,5,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R1,2040,9,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2035,0,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2035,3,all-year,all-week,night,electric_stove,2025,0.14040000000
-0,cook,R2,2035,4,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2035,6,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2035,8,all-year,all-week,night,gas_stove,2025,0.08040000000
-0,cook,R2,2040,1,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2040,4,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2040,5,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2040,9,all-year,all-week,night,gas_stove,2035,0.01850000000
-1,heat,R1,2035,10,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,12,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2035,17,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R1,2035,18,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,11,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,13,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,15,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,16,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2035,10,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,12,all-year,all-week,morning,gasboiler,2025,0.11490000000
-1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2035,17,all-year,all-week,morning,heatpump,2025,0.20060000000
-1,heat,R2,2035,18,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,11,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,13,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,15,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,16,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,CO2f,R1,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2035,8,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R1,2035,10,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2035,12,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R1,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2040,9,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2040,11,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2040,13,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2035,6,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2035,8,all-year,all-week,morning,gas_stove,2025,5.74400000000
-1,CO2f,R2,2035,10,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2035,12,all-year,all-week,morning,gasboiler,2025,7.43390000000
-1,CO2f,R2,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2040,9,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2040,11,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2040,13,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,cook,R1,2035,0,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2035,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R1,2035,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R1,2035,8,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R1,2040,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2040,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2040,5,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R1,2040,9,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2035,0,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2035,3,all-year,all-week,morning,electric_stove,2025,0.20060000000
-1,cook,R2,2035,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2035,6,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2035,8,all-year,all-week,morning,gas_stove,2025,0.11490000000
-1,cook,R2,2040,1,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2040,4,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2040,5,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2040,9,all-year,all-week,morning,gas_stove,2035,0.02640000000
-2,heat,R1,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R1,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,16,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,0.08040000000
-2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.14040000000
-2,heat,R2,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,15,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,16,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,CO2f,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R1,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,4.02080000000
-2,CO2f,R2,2035,10,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2035,12,all-year,all-week,mid-afternoon,gasboiler,2025,5.20380000000
-2,CO2f,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2040,11,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2040,13,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,cook,R1,2035,0,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2035,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R1,2035,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R1,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R1,2040,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2040,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2040,5,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R1,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2035,0,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2035,3,all-year,all-week,mid-afternoon,electric_stove,2025,0.14040000000
-2,cook,R2,2035,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2035,8,all-year,all-week,mid-afternoon,gas_stove,2025,0.08040000000
-2,cook,R2,2040,1,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2040,4,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2040,5,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2040,9,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-3,heat,R1,2035,10,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,12,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2035,17,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R1,2035,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,11,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,13,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,16,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2035,10,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,12,all-year,all-week,early-peak,gasboiler,2025,0.11490000000
-3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2035,17,all-year,all-week,early-peak,heatpump,2025,0.20060000000
-3,heat,R2,2035,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,11,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,13,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,15,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,16,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,CO2f,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2035,8,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R1,2035,10,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2035,12,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2040,9,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2040,11,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2040,13,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2035,8,all-year,all-week,early-peak,gas_stove,2025,5.74400000000
-3,CO2f,R2,2035,10,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2035,12,all-year,all-week,early-peak,gasboiler,2025,7.43390000000
-3,CO2f,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2040,9,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2040,11,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2040,13,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,cook,R1,2035,0,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2035,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R1,2035,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R1,2035,8,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R1,2040,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2040,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2040,5,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R1,2040,9,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2035,0,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2035,3,all-year,all-week,early-peak,electric_stove,2025,0.20060000000
-3,cook,R2,2035,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2035,8,all-year,all-week,early-peak,gas_stove,2025,0.11490000000
-3,cook,R2,2040,1,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2040,4,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2040,5,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2040,9,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-4,heat,R1,2035,10,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,12,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2035,17,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R1,2035,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,11,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,13,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,16,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2035,10,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,12,all-year,all-week,late-peak,gasboiler,2025,0.24120000000
-4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2035,17,all-year,all-week,late-peak,heatpump,2025,0.42130000000
-4,heat,R2,2035,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,11,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,13,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,15,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,16,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,CO2f,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2035,8,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R1,2035,10,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2035,12,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2040,9,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2040,11,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2040,13,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2035,8,all-year,all-week,late-peak,gas_stove,2025,12.06250000000
-4,CO2f,R2,2035,10,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2035,12,all-year,all-week,late-peak,gasboiler,2025,15.61130000000
-4,CO2f,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2040,9,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2040,11,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2040,13,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,cook,R1,2035,0,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2035,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R1,2035,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R1,2035,8,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R1,2040,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2040,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2040,5,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R1,2040,9,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2035,0,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2035,3,all-year,all-week,late-peak,electric_stove,2025,0.42130000000
-4,cook,R2,2035,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2035,8,all-year,all-week,late-peak,gas_stove,2025,0.24120000000
-4,cook,R2,2040,1,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2040,4,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2040,5,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2040,9,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-5,heat,R1,2035,10,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,12,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2035,17,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R1,2035,18,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,11,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,13,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,15,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,16,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2035,10,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,12,all-year,all-week,evening,gasboiler,2025,0.16080000000
-5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2035,17,all-year,all-week,evening,heatpump,2025,0.28080000000
-5,heat,R2,2035,18,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,11,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,13,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,15,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,16,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,CO2f,R1,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2035,8,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R1,2035,10,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2035,12,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R1,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2040,9,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2040,11,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2040,13,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2035,6,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2035,8,all-year,all-week,evening,gas_stove,2025,8.04170000000
-5,CO2f,R2,2035,10,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2035,12,all-year,all-week,evening,gasboiler,2025,10.40750000000
-5,CO2f,R2,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2040,9,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2040,11,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2040,13,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,cook,R1,2035,0,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2035,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R1,2035,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R1,2035,8,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R1,2040,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2040,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2040,5,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R1,2040,9,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2035,0,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2035,3,all-year,all-week,evening,electric_stove,2025,0.28080000000
-5,cook,R2,2035,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2035,6,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2035,8,all-year,all-week,evening,gas_stove,2025,0.16080000000
-5,cook,R2,2040,1,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2040,4,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2040,5,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2040,9,all-year,all-week,evening,gas_stove,2035,0.03690000000
-6,heat,R1,2035,10,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,12,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2035,17,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R1,2035,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,11,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,13,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,16,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2035,10,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,12,all-year,all-week,early-morning,gasboiler,2025,0.16080000000
-6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2035,17,all-year,all-week,early-morning,heatpump,2025,0.28080000000
-6,heat,R2,2035,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,11,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,13,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,15,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,16,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,CO2f,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2035,8,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R1,2035,10,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2035,12,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2040,9,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2040,11,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2040,13,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2035,8,all-year,all-week,early-morning,gas_stove,2025,8.04170000000
-6,CO2f,R2,2035,10,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2035,12,all-year,all-week,early-morning,gasboiler,2025,10.40750000000
-6,CO2f,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2040,9,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2040,11,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2040,13,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,cook,R1,2035,0,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2035,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R1,2035,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R1,2035,8,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R1,2040,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2040,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2040,5,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R1,2040,9,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2035,0,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2035,3,all-year,all-week,early-morning,electric_stove,2025,0.28080000000
-6,cook,R2,2035,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2035,8,all-year,all-week,early-morning,gas_stove,2025,0.16080000000
-6,cook,R2,2040,1,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2040,4,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2040,5,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2040,9,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-7,heat,R1,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R1,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,16,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,0.16080000000
-7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.28080000000
-7,heat,R2,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,15,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,16,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,CO2f,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R1,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,8.04170000000
-7,CO2f,R2,2035,10,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2035,12,all-year,all-week,late-afternoon,gasboiler,2025,10.40750000000
-7,CO2f,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2040,11,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2040,13,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,cook,R1,2035,0,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2035,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R1,2035,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R1,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R1,2040,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2040,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2040,5,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R1,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2035,0,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2035,3,all-year,all-week,late-afternoon,electric_stove,2025,0.28080000000
-7,cook,R2,2035,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2035,8,all-year,all-week,late-afternoon,gas_stove,2025,0.16080000000
-7,cook,R2,2040,1,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2040,4,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2040,5,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2040,9,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
+0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R1,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R1,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R1,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R1,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R1,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R1,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R1,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R1,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R1,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R1,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R1,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R1,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R1,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R1,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R1,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R1,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
index 9dec61f1..65c91ff4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
@@ -1,513 +1,257 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,8,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,9,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,11,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2040,13,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R1,2040,14,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2045,14,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,15,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2040,8,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,9,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,11,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2040,13,all-year,all-week,night,heatpump,2030,0.47920000000
-0,heat,R2,2040,14,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2045,14,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,15,all-year,all-week,night,heatpump,2040,0.59580000000
-0,CO2f,R1,2040,6,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2040,8,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2040,9,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2040,6,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2040,8,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2040,9,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,cook,R1,2040,0,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2040,1,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R1,2040,4,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2040,6,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R1,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R1,2045,1,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2045,2,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2045,5,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2040,0,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2040,1,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2030,0.47920000000
-0,cook,R2,2040,4,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2040,6,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2040,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2045,1,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2045,2,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2045,5,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-1,heat,R1,2040,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,11,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2040,13,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R1,2040,14,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2045,14,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,15,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2040,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,11,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2040,13,all-year,all-week,morning,heatpump,2030,0.68450000000
-1,heat,R2,2040,14,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2045,14,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,15,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,CO2f,R1,2040,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2040,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2040,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2040,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2040,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2040,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2040,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,cook,R1,2040,0,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2040,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R1,2040,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2040,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R1,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R1,2045,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2045,2,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2045,5,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R1,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2040,0,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2040,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2030,0.68450000000
-1,cook,R2,2040,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2040,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2040,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2045,1,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2045,2,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2045,5,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2040,13,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R1,2040,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2045,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,15,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2040,13,all-year,all-week,mid-afternoon,heatpump,2030,0.47920000000
-2,heat,R2,2040,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2045,14,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,15,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,CO2f,R1,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2040,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2040,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,cook,R1,2040,0,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2040,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R1,2040,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R1,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R1,2045,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2045,2,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2045,5,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2040,0,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2040,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2030,0.47920000000
-2,cook,R2,2040,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2040,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2040,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2045,1,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2045,2,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2045,5,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2040,13,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R1,2040,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2045,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,15,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2040,13,all-year,all-week,early-peak,heatpump,2030,0.68450000000
-3,heat,R2,2040,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2045,14,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,15,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,CO2f,R1,2040,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2040,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2040,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2040,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2040,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2040,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,cook,R1,2040,0,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2040,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R1,2040,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2040,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R1,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R1,2045,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2045,2,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2045,5,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2040,0,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2040,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2030,0.68450000000
-3,cook,R2,2040,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2040,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2040,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2045,1,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2045,2,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2045,5,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2040,13,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R1,2040,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2045,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,15,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2040,13,all-year,all-week,late-peak,heatpump,2030,1.43750000000
-4,heat,R2,2040,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2045,14,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,15,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,CO2f,R1,2040,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2040,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2040,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2040,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2040,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2040,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,cook,R1,2040,0,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2040,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R1,2040,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2040,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R1,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R1,2045,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2045,2,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2045,5,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2040,0,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2040,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2030,1.43750000000
-4,cook,R2,2040,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2040,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2040,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2045,1,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2045,2,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2045,5,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-5,heat,R1,2040,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,11,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2040,13,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R1,2040,14,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2045,14,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,15,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2040,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,11,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2040,13,all-year,all-week,evening,heatpump,2030,0.95830000000
-5,heat,R2,2040,14,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2045,14,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,15,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,CO2f,R1,2040,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2040,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2040,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2040,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2040,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2040,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2040,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,cook,R1,2040,0,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2040,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R1,2040,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2040,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R1,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R1,2045,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2045,2,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2045,5,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R1,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2040,0,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2040,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2030,0.95830000000
-5,cook,R2,2040,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2040,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2040,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2045,1,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2045,2,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2045,5,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2040,13,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R1,2040,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2045,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,15,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2040,13,all-year,all-week,early-morning,heatpump,2030,0.95830000000
-6,heat,R2,2040,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2045,14,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,15,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,CO2f,R1,2040,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2040,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2040,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2040,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2040,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2040,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,cook,R1,2040,0,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2040,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R1,2040,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2040,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R1,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R1,2045,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2045,2,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2045,5,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2040,0,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2040,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2030,0.95830000000
-6,cook,R2,2040,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2040,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2040,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2045,1,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2045,2,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2045,5,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2040,13,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R1,2040,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2045,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,15,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2040,13,all-year,all-week,late-afternoon,heatpump,2030,0.95830000000
-7,heat,R2,2040,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2045,14,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,15,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,CO2f,R1,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2040,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2040,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,cook,R1,2040,0,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2040,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R1,2040,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R1,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R1,2045,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2045,2,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2045,5,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2040,0,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2040,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2030,0.95830000000
-7,cook,R2,2040,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2040,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2040,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2045,1,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2045,2,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2045,5,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
+0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R1,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R1,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R1,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R1,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R1,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R1,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R1,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R1,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R1,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R1,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R1,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R1,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R1,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R1,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R1,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R1,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
index 1db158a9..870f9f86 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
@@ -1,385 +1,257 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2045,13,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R1,2045,14,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,11,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,15,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2045,8,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,9,all-year,all-week,night,gasboiler,2035,0.01850000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2045,13,all-year,all-week,night,heatpump,2035,0.31900000000
-0,heat,R2,2045,14,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,11,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,15,all-year,all-week,night,heatpump,2045,0.45420000000
-0,CO2f,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R1,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R1,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.92290000000
-0,CO2f,R2,2045,8,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,CO2f,R2,2045,9,all-year,all-week,night,gasboiler,2035,1.19440000000
-0,cook,R1,2045,0,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2045,1,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R1,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R1,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R2,2045,0,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2045,1,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.31900000000
-0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2045,6,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2045,7,all-year,all-week,night,gas_stove,2035,0.01850000000
-0,cook,R2,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.45420000000
-1,heat,R1,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2045,13,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R1,2045,14,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,11,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,15,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2045,8,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,9,all-year,all-week,morning,gasboiler,2035,0.02640000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2045,13,all-year,all-week,morning,heatpump,2035,0.45580000000
-1,heat,R2,2045,14,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,11,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,15,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,CO2f,R1,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R1,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R1,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,6,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2045,7,all-year,all-week,morning,gas_stove,2035,1.31850000000
-1,CO2f,R2,2045,8,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,CO2f,R2,2045,9,all-year,all-week,morning,gasboiler,2035,1.70630000000
-1,cook,R1,2045,0,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2045,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R1,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R1,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R2,2045,0,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2045,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.45580000000
-1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2045,6,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2045,7,all-year,all-week,morning,gas_stove,2035,0.02640000000
-1,cook,R2,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.64880000000
-2,heat,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2045,13,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R1,2045,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,15,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,0.01850000000
-2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2045,13,all-year,all-week,mid-afternoon,heatpump,2035,0.31900000000
-2,heat,R2,2045,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,11,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,15,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,CO2f,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R1,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R1,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.92290000000
-2,CO2f,R2,2045,8,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,CO2f,R2,2045,9,all-year,all-week,mid-afternoon,gasboiler,2035,1.19440000000
-2,cook,R1,2045,0,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2045,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R1,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R1,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R2,2045,0,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2045,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.31900000000
-2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2045,6,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2045,7,all-year,all-week,mid-afternoon,gas_stove,2035,0.01850000000
-2,cook,R2,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-3,heat,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2045,13,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R1,2045,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,15,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,0.02640000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2045,13,all-year,all-week,early-peak,heatpump,2035,0.45580000000
-3,heat,R2,2045,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,11,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,15,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,CO2f,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R1,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R1,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,1.31850000000
-3,CO2f,R2,2045,8,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,CO2f,R2,2045,9,all-year,all-week,early-peak,gasboiler,2035,1.70630000000
-3,cook,R1,2045,0,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2045,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R1,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R1,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R2,2045,0,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2045,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.45580000000
-3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2045,6,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2045,7,all-year,all-week,early-peak,gas_stove,2035,0.02640000000
-3,cook,R2,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-4,heat,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2045,13,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R1,2045,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,15,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,0.05540000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2045,13,all-year,all-week,late-peak,heatpump,2035,0.95710000000
-4,heat,R2,2045,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,11,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,15,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,CO2f,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R1,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R1,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,2.76870000000
-4,CO2f,R2,2045,8,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,CO2f,R2,2045,9,all-year,all-week,late-peak,gasboiler,2035,3.58330000000
-4,cook,R1,2045,0,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2045,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R1,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R1,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R2,2045,0,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2045,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,0.95710000000
-4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2045,6,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2045,7,all-year,all-week,late-peak,gas_stove,2035,0.05540000000
-4,cook,R2,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-5,heat,R1,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2045,13,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R1,2045,14,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,11,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,15,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2045,8,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,9,all-year,all-week,evening,gasboiler,2035,0.03690000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2045,13,all-year,all-week,evening,heatpump,2035,0.63810000000
-5,heat,R2,2045,14,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,11,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,15,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,CO2f,R1,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R1,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R1,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,6,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2045,7,all-year,all-week,evening,gas_stove,2035,1.84580000000
-5,CO2f,R2,2045,8,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,CO2f,R2,2045,9,all-year,all-week,evening,gasboiler,2035,2.38890000000
-5,cook,R1,2045,0,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2045,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R1,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R1,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R2,2045,0,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2045,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.63810000000
-5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2045,6,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2045,7,all-year,all-week,evening,gas_stove,2035,0.03690000000
-5,cook,R2,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.90830000000
-6,heat,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2045,13,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R1,2045,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,15,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,0.03690000000
-6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2045,13,all-year,all-week,early-morning,heatpump,2035,0.63810000000
-6,heat,R2,2045,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,11,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,15,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,CO2f,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R1,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R1,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,1.84580000000
-6,CO2f,R2,2045,8,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,CO2f,R2,2045,9,all-year,all-week,early-morning,gasboiler,2035,2.38890000000
-6,cook,R1,2045,0,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2045,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R1,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R1,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R2,2045,0,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2045,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.63810000000
-6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2045,6,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2045,7,all-year,all-week,early-morning,gas_stove,2035,0.03690000000
-6,cook,R2,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-7,heat,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2045,13,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R1,2045,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,15,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,0.03690000000
-7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2045,13,all-year,all-week,late-afternoon,heatpump,2035,0.63810000000
-7,heat,R2,2045,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,11,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,15,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,CO2f,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R1,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R1,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,1.84580000000
-7,CO2f,R2,2045,8,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,CO2f,R2,2045,9,all-year,all-week,late-afternoon,gasboiler,2035,2.38890000000
-7,cook,R1,2045,0,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2045,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R1,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R1,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R2,2045,0,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2045,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.63810000000
-7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2045,6,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2045,7,all-year,all-week,late-afternoon,gas_stove,2035,0.03690000000
-7,cook,R2,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
+0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R1,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R1,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R1,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R1,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R1,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R1,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R1,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R1,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
index 650b56e5..ab377708 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
@@ -1,257 +1,257 @@
 timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2050,17,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R1,2050,18,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
-0,heat,R1,2055,18,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R1,2055,19,all-year,all-week,night,heatpump,2050,0.59580000000
-0,heat,R2,2050,7,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2050,17,all-year,all-week,night,heatpump,2040,0.59580000000
-0,heat,R2,2050,18,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2055,8,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2055,9,all-year,all-week,night,heatpump,2050,0.59580000000
-0,heat,R2,2055,18,all-year,all-week,night,heatpump,2045,0.45420000000
-0,heat,R2,2055,19,all-year,all-week,night,heatpump,2050,0.59580000000
-0,cook,R1,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R1,2050,11,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R1,2050,12,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R1,2055,2,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R1,2055,3,all-year,all-week,night,electric_stove,2050,0.59580000000
-0,cook,R1,2055,12,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R1,2055,13,all-year,all-week,night,electric_stove,2050,0.59580000000
-0,cook,R2,2050,1,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2050,2,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R2,2050,11,all-year,all-week,night,electric_stove,2040,0.59580000000
-0,cook,R2,2050,12,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R2,2055,2,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R2,2055,3,all-year,all-week,night,electric_stove,2050,0.59580000000
-0,cook,R2,2055,12,all-year,all-week,night,electric_stove,2045,0.45420000000
-0,cook,R2,2055,13,all-year,all-week,night,electric_stove,2050,0.59580000000
-1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2050,17,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R1,2050,18,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,heat,R1,2055,18,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R1,2055,19,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2050,17,all-year,all-week,morning,heatpump,2040,0.85120000000
-1,heat,R2,2050,18,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2055,8,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2055,9,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,heat,R2,2055,18,all-year,all-week,morning,heatpump,2045,0.64880000000
-1,heat,R2,2055,19,all-year,all-week,morning,heatpump,2050,0.85120000000
-1,cook,R1,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R1,2050,11,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R1,2050,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R1,2055,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R1,2055,3,all-year,all-week,morning,electric_stove,2050,0.85120000000
-1,cook,R1,2055,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R1,2055,13,all-year,all-week,morning,electric_stove,2050,0.85120000000
-1,cook,R2,2050,1,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2050,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R2,2050,11,all-year,all-week,morning,electric_stove,2040,0.85120000000
-1,cook,R2,2050,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R2,2055,2,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R2,2055,3,all-year,all-week,morning,electric_stove,2050,0.85120000000
-1,cook,R2,2055,12,all-year,all-week,morning,electric_stove,2045,0.64880000000
-1,cook,R2,2055,13,all-year,all-week,morning,electric_stove,2050,0.85120000000
-2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2050,17,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R1,2050,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,heat,R1,2055,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R1,2055,19,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2050,17,all-year,all-week,mid-afternoon,heatpump,2040,0.59580000000
-2,heat,R2,2050,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2055,8,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2055,9,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,heat,R2,2055,18,all-year,all-week,mid-afternoon,heatpump,2045,0.45420000000
-2,heat,R2,2055,19,all-year,all-week,mid-afternoon,heatpump,2050,0.59580000000
-2,cook,R1,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R1,2050,11,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R1,2050,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R1,2055,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R1,2055,3,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
-2,cook,R1,2055,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R1,2055,13,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
-2,cook,R2,2050,1,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2050,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R2,2050,11,all-year,all-week,mid-afternoon,electric_stove,2040,0.59580000000
-2,cook,R2,2050,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R2,2055,2,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R2,2055,3,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
-2,cook,R2,2055,12,all-year,all-week,mid-afternoon,electric_stove,2045,0.45420000000
-2,cook,R2,2055,13,all-year,all-week,mid-afternoon,electric_stove,2050,0.59580000000
-3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2050,17,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R1,2050,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,heat,R1,2055,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R1,2055,19,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2050,17,all-year,all-week,early-peak,heatpump,2040,0.85120000000
-3,heat,R2,2050,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2055,8,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2055,9,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,heat,R2,2055,18,all-year,all-week,early-peak,heatpump,2045,0.64880000000
-3,heat,R2,2055,19,all-year,all-week,early-peak,heatpump,2050,0.85120000000
-3,cook,R1,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R1,2050,11,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R1,2050,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R1,2055,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R1,2055,3,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
-3,cook,R1,2055,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R1,2055,13,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
-3,cook,R2,2050,1,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2050,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R2,2050,11,all-year,all-week,early-peak,electric_stove,2040,0.85120000000
-3,cook,R2,2050,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R2,2055,2,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R2,2055,3,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
-3,cook,R2,2055,12,all-year,all-week,early-peak,electric_stove,2045,0.64880000000
-3,cook,R2,2055,13,all-year,all-week,early-peak,electric_stove,2050,0.85120000000
-4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2050,17,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R1,2050,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,heat,R1,2055,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R1,2055,19,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2050,17,all-year,all-week,late-peak,heatpump,2040,1.78750000000
-4,heat,R2,2050,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2055,8,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2055,9,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,heat,R2,2055,18,all-year,all-week,late-peak,heatpump,2045,1.36250000000
-4,heat,R2,2055,19,all-year,all-week,late-peak,heatpump,2050,1.78750000000
-4,cook,R1,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R1,2050,11,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R1,2050,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R1,2055,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R1,2055,3,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
-4,cook,R1,2055,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R1,2055,13,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
-4,cook,R2,2050,1,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2050,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R2,2050,11,all-year,all-week,late-peak,electric_stove,2040,1.78750000000
-4,cook,R2,2050,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R2,2055,2,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R2,2055,3,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
-4,cook,R2,2055,12,all-year,all-week,late-peak,electric_stove,2045,1.36250000000
-4,cook,R2,2055,13,all-year,all-week,late-peak,electric_stove,2050,1.78750000000
-5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2050,17,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R1,2050,18,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,heat,R1,2055,18,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R1,2055,19,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2050,17,all-year,all-week,evening,heatpump,2040,1.19170000000
-5,heat,R2,2050,18,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2055,8,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2055,9,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,heat,R2,2055,18,all-year,all-week,evening,heatpump,2045,0.90830000000
-5,heat,R2,2055,19,all-year,all-week,evening,heatpump,2050,1.19170000000
-5,cook,R1,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R1,2050,11,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R1,2050,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R1,2055,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R1,2055,3,all-year,all-week,evening,electric_stove,2050,1.19170000000
-5,cook,R1,2055,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R1,2055,13,all-year,all-week,evening,electric_stove,2050,1.19170000000
-5,cook,R2,2050,1,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2050,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R2,2050,11,all-year,all-week,evening,electric_stove,2040,1.19170000000
-5,cook,R2,2050,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R2,2055,2,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R2,2055,3,all-year,all-week,evening,electric_stove,2050,1.19170000000
-5,cook,R2,2055,12,all-year,all-week,evening,electric_stove,2045,0.90830000000
-5,cook,R2,2055,13,all-year,all-week,evening,electric_stove,2050,1.19170000000
-6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2050,17,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R1,2050,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,heat,R1,2055,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R1,2055,19,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2050,17,all-year,all-week,early-morning,heatpump,2040,1.19170000000
-6,heat,R2,2050,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2055,8,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2055,9,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,heat,R2,2055,18,all-year,all-week,early-morning,heatpump,2045,0.90830000000
-6,heat,R2,2055,19,all-year,all-week,early-morning,heatpump,2050,1.19170000000
-6,cook,R1,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R1,2050,11,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R1,2050,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R1,2055,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R1,2055,3,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
-6,cook,R1,2055,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R1,2055,13,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
-6,cook,R2,2050,1,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2050,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R2,2050,11,all-year,all-week,early-morning,electric_stove,2040,1.19170000000
-6,cook,R2,2050,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R2,2055,2,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R2,2055,3,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
-6,cook,R2,2055,12,all-year,all-week,early-morning,electric_stove,2045,0.90830000000
-6,cook,R2,2055,13,all-year,all-week,early-morning,electric_stove,2050,1.19170000000
-7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2050,17,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R1,2050,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,heat,R1,2055,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R1,2055,19,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2050,17,all-year,all-week,late-afternoon,heatpump,2040,1.19170000000
-7,heat,R2,2050,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2055,8,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2055,9,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,heat,R2,2055,18,all-year,all-week,late-afternoon,heatpump,2045,0.90830000000
-7,heat,R2,2055,19,all-year,all-week,late-afternoon,heatpump,2050,1.19170000000
-7,cook,R1,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R1,2050,11,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R1,2050,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R1,2055,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R1,2055,3,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
-7,cook,R1,2055,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R1,2055,13,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
-7,cook,R2,2050,1,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2050,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R2,2050,11,all-year,all-week,late-afternoon,electric_stove,2040,1.19170000000
-7,cook,R2,2050,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R2,2055,2,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R2,2055,3,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
-7,cook,R2,2055,12,all-year,all-week,late-afternoon,electric_stove,2045,0.90830000000
-7,cook,R2,2055,13,all-year,all-week,late-afternoon,electric_stove,2050,1.19170000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R1,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
+0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
+0,cook,R1,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
+0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
+0,cook,R2,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R1,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
+1,cook,R1,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
+1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
+1,cook,R2,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R1,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+2,cook,R1,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+2,cook,R2,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R1,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+3,cook,R1,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+3,cook,R2,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R1,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+4,cook,R1,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+4,cook,R2,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R1,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
+5,cook,R1,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
+5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
+5,cook,R2,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R1,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+6,cook,R1,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+6,cook,R2,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R1,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+7,cook,R1,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+7,cook,R2,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
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 d42ba410..d1ee882b 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,4 @@
 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/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
index 85cb6585..d1ee882b 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,4 @@
 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,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 21b6abc4..d1ee882b 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,4 @@
 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
+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/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
index 49c4e9fe..d1ee882b 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,4 @@
 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
+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/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
index e9db3788..d1ee882b 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,technology,installed,capacity
-1,2045,R1,gassupply1,2030,4.91540000000
-1,2050,R1,gassupply1,2030,4.91540000000
-1,2069,R1,gassupply1,2030,4.91540000000
+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/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
index 6206749d..d1ee882b 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,technology,installed,capacity
-1,2050,R1,gassupply1,2030,4.91540000000
-1,2055,R1,gassupply1,2030,4.91540000000
-1,2069,R1,gassupply1,2030,4.91540000000
+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/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
index 3848a821..407fd307 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -1,48 +1,34 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,11.86320000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,9.61320000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,3.81370000000
-heatpump,R1,R1,A1,residential,retrofit,2030,11.86320000000
-heatpump,R1,R1,A1,residential,retrofit,2030,1.84700000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.61320000000
-windturbine,R1,R1,A1,power,retrofit,2030,4.09700000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,3.81370000000
-heatpump,R1,R1,A1,residential,retrofit,2035,1.84700000000
-heatpump,R1,R1,A1,residential,retrofit,2035,12.35690000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.61320000000
-windturbine,R1,R1,A1,power,retrofit,2035,4.09700000000
-windturbine,R1,R1,A1,power,retrofit,2035,0.49370000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,4.91540000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,2.39330000000
-heatpump,R1,R1,A1,residential,retrofit,2040,12.35690000000
-heatpump,R1,R1,A1,residential,retrofit,2040,3.75930000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.61320000000
-windturbine,R1,R1,A1,power,retrofit,2040,4.09700000000
-windturbine,R1,R1,A1,power,retrofit,2040,0.49370000000
-windturbine,R1,R1,A1,power,retrofit,2040,1.91230000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,4.91540000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,2.39330000000
-heatpump,R1,R1,A1,residential,retrofit,2045,3.75930000000
-heatpump,R1,R1,A1,residential,retrofit,2045,12.67390000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.61320000000
-windturbine,R1,R1,A1,power,retrofit,2045,4.09700000000
-windturbine,R1,R1,A1,power,retrofit,2045,0.49370000000
-windturbine,R1,R1,A1,power,retrofit,2045,1.91230000000
-windturbine,R1,R1,A1,power,retrofit,2045,0.31700000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,4.91540000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,0.75000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,12.67390000000
-heatpump,R1,R1,A1,residential,retrofit,2050,5.71850000000
-windturbine,R1,R1,A1,power,retrofit,2050,4.09700000000
-windturbine,R1,R1,A1,power,retrofit,2050,0.49370000000
-windturbine,R1,R1,A1,power,retrofit,2050,1.91230000000
-windturbine,R1,R1,A1,power,retrofit,2050,0.31700000000
-windturbine,R1,R1,A1,power,retrofit,2050,11.57240000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,4.91540000000
+gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2025,11.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,9.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,9.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,8.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,12.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,9.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,1.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,12.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,9.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,1.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,6.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,12.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,9.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,12.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
index 71735d05..c0c943ac 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.66950000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.67430000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.22830000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.23100000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.73100000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.73820000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.34410000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.34810000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.66950000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.67430000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.22830000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.23100000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.73100000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.73820000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.34410000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.34810000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.91390000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.92830000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.68820000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.69610000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.79250000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.80220000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.45990000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.46520000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.16880000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.37370000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.72790000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.23480000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.56370000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.10090000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.16880000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.37370000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.72790000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.23480000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.56370000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.10090000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.43110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23920000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.13110000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.22460000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.30090000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.75420000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.47640000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.36820000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17340000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.67620000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.43790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.91880000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.36820000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17340000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.67620000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.43790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.91880000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.64500000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21970000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.64460000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.50760000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19670000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.16220000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.12780000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34820000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.48220000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.20030000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.74860000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.12780000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34820000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.48220000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.20030000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.74860000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.41600000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40410000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.54750000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.27290000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37630000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,42.01630000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.33540000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68790000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.32150000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.41030000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70400000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.60430000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.33540000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68790000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.32150000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.41030000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70400000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.60430000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.63290000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.45370000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.48520000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.72000000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.88860000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,5.90150000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15980000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.74240000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,5.97830000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,27.01280000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,5.90150000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15980000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.74240000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.97830000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,27.01280000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.20630000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.82690000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.05500000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19490000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.28490000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 1043ca6b..98fba282 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,9
+1,2030,R1,windturbine,2020,9
+1,2035,R1,windturbine,2020,9
+1,2040,R1,windturbine,2020,9
+1,2045,R1,windturbine,2020,9
+1,2049,R1,windturbine,2020,9
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
index 6fa5726c..645c3d6c 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
@@ -1,15 +1,16 @@
 asset,year,region,technology,installed,capacity
-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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,9
+1,2030,R1,windturbine,2020,9
+1,2035,R1,windturbine,2020,9
+1,2040,R1,windturbine,2020,9
+1,2045,R1,windturbine,2020,9
+1,2049,R1,windturbine,2020,9
+2,2030,R1,windturbine,2025,8
+2,2035,R1,windturbine,2025,8
+2,2040,R1,windturbine,2025,8
+2,2045,R1,windturbine,2025,8
+2,2049,R1,windturbine,2025,8
+2,2050,R1,windturbine,2025,8
+2,2054,R1,windturbine,2025,8
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 31c131b7..3b8f4eac 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,24 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,9
+1,2030,R1,windturbine,2020,9
+1,2035,R1,windturbine,2020,9
+1,2040,R1,windturbine,2020,9
+1,2045,R1,windturbine,2020,9
+1,2049,R1,windturbine,2020,9
+2,2030,R1,windturbine,2025,8
+2,2035,R1,windturbine,2025,8
+2,2040,R1,windturbine,2025,8
+2,2045,R1,windturbine,2025,8
+2,2049,R1,windturbine,2025,8
+2,2050,R1,windturbine,2025,8
+2,2054,R1,windturbine,2025,8
+3,2035,R1,windturbine,2030,1
+3,2040,R1,windturbine,2030,1
+3,2045,R1,windturbine,2030,1
+3,2049,R1,windturbine,2030,1
+3,2050,R1,windturbine,2030,1
+3,2054,R1,windturbine,2030,1
+3,2055,R1,windturbine,2030,1
+3,2059,R1,windturbine,2030,1
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 9b1130de..3b8f4eac 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,24 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,9
+1,2030,R1,windturbine,2020,9
+1,2035,R1,windturbine,2020,9
+1,2040,R1,windturbine,2020,9
+1,2045,R1,windturbine,2020,9
+1,2049,R1,windturbine,2020,9
+2,2030,R1,windturbine,2025,8
+2,2035,R1,windturbine,2025,8
+2,2040,R1,windturbine,2025,8
+2,2045,R1,windturbine,2025,8
+2,2049,R1,windturbine,2025,8
+2,2050,R1,windturbine,2025,8
+2,2054,R1,windturbine,2025,8
+3,2035,R1,windturbine,2030,1
+3,2040,R1,windturbine,2030,1
+3,2045,R1,windturbine,2030,1
+3,2049,R1,windturbine,2030,1
+3,2050,R1,windturbine,2030,1
+3,2054,R1,windturbine,2030,1
+3,2055,R1,windturbine,2030,1
+3,2059,R1,windturbine,2030,1
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 f5239465..3b8f4eac 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,24 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,9
+1,2030,R1,windturbine,2020,9
+1,2035,R1,windturbine,2020,9
+1,2040,R1,windturbine,2020,9
+1,2045,R1,windturbine,2020,9
+1,2049,R1,windturbine,2020,9
+2,2030,R1,windturbine,2025,8
+2,2035,R1,windturbine,2025,8
+2,2040,R1,windturbine,2025,8
+2,2045,R1,windturbine,2025,8
+2,2049,R1,windturbine,2025,8
+2,2050,R1,windturbine,2025,8
+2,2054,R1,windturbine,2025,8
+3,2035,R1,windturbine,2030,1
+3,2040,R1,windturbine,2030,1
+3,2045,R1,windturbine,2030,1
+3,2049,R1,windturbine,2030,1
+3,2050,R1,windturbine,2030,1
+3,2054,R1,windturbine,2030,1
+3,2055,R1,windturbine,2030,1
+3,2059,R1,windturbine,2030,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
index a373151f..f9864862 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
@@ -1,41 +1,34 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,windturbine,2020,9.61320000000
-0,2049,R1,windturbine,2020,9.61320000000
-1,2045,R1,windturbine,2025,4.09700000000
-1,2049,R1,windturbine,2025,4.09700000000
-1,2050,R1,windturbine,2025,4.09700000000
-1,2054,R1,windturbine,2025,4.09700000000
-2,2045,R1,windturbine,2030,0.49370000000
-2,2049,R1,windturbine,2030,0.49370000000
-2,2050,R1,windturbine,2030,0.49370000000
-2,2054,R1,windturbine,2030,0.49370000000
-2,2055,R1,windturbine,2030,0.49370000000
-2,2059,R1,windturbine,2030,0.49370000000
-3,2045,R1,windturbine,2035,1.91230000000
-3,2049,R1,windturbine,2035,1.91230000000
-3,2050,R1,windturbine,2035,1.91230000000
-3,2054,R1,windturbine,2035,1.91230000000
-3,2055,R1,windturbine,2035,1.91230000000
-3,2059,R1,windturbine,2035,1.91230000000
-3,2060,R1,windturbine,2035,1.91230000000
-3,2064,R1,windturbine,2035,1.91230000000
-4,2045,R1,windturbine,2040,0.31700000000
-4,2049,R1,windturbine,2040,0.31700000000
-4,2050,R1,windturbine,2040,0.31700000000
-4,2054,R1,windturbine,2040,0.31700000000
-4,2055,R1,windturbine,2040,0.31700000000
-4,2059,R1,windturbine,2040,0.31700000000
-4,2060,R1,windturbine,2040,0.31700000000
-4,2064,R1,windturbine,2040,0.31700000000
-4,2065,R1,windturbine,2040,0.31700000000
-4,2069,R1,windturbine,2040,0.31700000000
-5,2050,R1,windturbine,2045,11.57240000000
-5,2054,R1,windturbine,2045,11.57240000000
-5,2055,R1,windturbine,2045,11.57240000000
-5,2059,R1,windturbine,2045,11.57240000000
-5,2060,R1,windturbine,2045,11.57240000000
-5,2064,R1,windturbine,2045,11.57240000000
-5,2065,R1,windturbine,2045,11.57240000000
-5,2069,R1,windturbine,2045,11.57240000000
-5,2070,R1,windturbine,2045,11.57240000000
-5,2074,R1,windturbine,2045,11.57240000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,9
+2,2030,R1,windturbine,2020,9
+2,2035,R1,windturbine,2020,9
+2,2040,R1,windturbine,2020,9
+2,2045,R1,windturbine,2020,9
+2,2049,R1,windturbine,2020,9
+3,2030,R1,windturbine,2025,8
+3,2035,R1,windturbine,2025,8
+3,2040,R1,windturbine,2025,8
+3,2045,R1,windturbine,2025,8
+3,2049,R1,windturbine,2025,8
+3,2050,R1,windturbine,2025,8
+3,2054,R1,windturbine,2025,8
+4,2035,R1,windturbine,2030,1
+4,2040,R1,windturbine,2030,1
+4,2045,R1,windturbine,2030,1
+4,2049,R1,windturbine,2030,1
+4,2050,R1,windturbine,2030,1
+4,2054,R1,windturbine,2030,1
+4,2055,R1,windturbine,2030,1
+4,2059,R1,windturbine,2030,1
+7,2050,R1,windturbine,2045,10
+7,2054,R1,windturbine,2045,10
+7,2055,R1,windturbine,2045,10
+7,2059,R1,windturbine,2045,10
+7,2060,R1,windturbine,2045,10
+7,2064,R1,windturbine,2045,10
+7,2065,R1,windturbine,2045,10
+7,2069,R1,windturbine,2045,10
+7,2070,R1,windturbine,2045,10
+7,2074,R1,windturbine,2045,10
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
index 0386e8f1..8f32f484 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
@@ -1,41 +1,44 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,windturbine,2025,4.09700000000
-0,2054,R1,windturbine,2025,4.09700000000
-1,2050,R1,windturbine,2030,0.49370000000
-1,2054,R1,windturbine,2030,0.49370000000
-1,2055,R1,windturbine,2030,0.49370000000
-1,2059,R1,windturbine,2030,0.49370000000
-2,2050,R1,windturbine,2035,1.91230000000
-2,2054,R1,windturbine,2035,1.91230000000
-2,2055,R1,windturbine,2035,1.91230000000
-2,2059,R1,windturbine,2035,1.91230000000
-2,2060,R1,windturbine,2035,1.91230000000
-2,2064,R1,windturbine,2035,1.91230000000
-3,2050,R1,windturbine,2040,0.31700000000
-3,2054,R1,windturbine,2040,0.31700000000
-3,2055,R1,windturbine,2040,0.31700000000
-3,2059,R1,windturbine,2040,0.31700000000
-3,2060,R1,windturbine,2040,0.31700000000
-3,2064,R1,windturbine,2040,0.31700000000
-3,2065,R1,windturbine,2040,0.31700000000
-3,2069,R1,windturbine,2040,0.31700000000
-4,2050,R1,windturbine,2045,11.57240000000
-4,2054,R1,windturbine,2045,11.57240000000
-4,2055,R1,windturbine,2045,11.57240000000
-4,2059,R1,windturbine,2045,11.57240000000
-4,2060,R1,windturbine,2045,11.57240000000
-4,2064,R1,windturbine,2045,11.57240000000
-4,2065,R1,windturbine,2045,11.57240000000
-4,2069,R1,windturbine,2045,11.57240000000
-4,2070,R1,windturbine,2045,11.57240000000
-4,2074,R1,windturbine,2045,11.57240000000
-5,2055,R1,windturbine,2050,4.22490000000
-5,2059,R1,windturbine,2050,4.22490000000
-5,2060,R1,windturbine,2050,4.22490000000
-5,2064,R1,windturbine,2050,4.22490000000
-5,2065,R1,windturbine,2050,4.22490000000
-5,2069,R1,windturbine,2050,4.22490000000
-5,2070,R1,windturbine,2050,4.22490000000
-5,2074,R1,windturbine,2050,4.22490000000
-5,2075,R1,windturbine,2050,4.22490000000
-5,2079,R1,windturbine,2050,4.22490000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+2,2025,R1,windturbine,2020,9
+2,2030,R1,windturbine,2020,9
+2,2035,R1,windturbine,2020,9
+2,2040,R1,windturbine,2020,9
+2,2045,R1,windturbine,2020,9
+2,2049,R1,windturbine,2020,9
+3,2030,R1,windturbine,2025,8
+3,2035,R1,windturbine,2025,8
+3,2040,R1,windturbine,2025,8
+3,2045,R1,windturbine,2025,8
+3,2049,R1,windturbine,2025,8
+3,2050,R1,windturbine,2025,8
+3,2054,R1,windturbine,2025,8
+4,2035,R1,windturbine,2030,1
+4,2040,R1,windturbine,2030,1
+4,2045,R1,windturbine,2030,1
+4,2049,R1,windturbine,2030,1
+4,2050,R1,windturbine,2030,1
+4,2054,R1,windturbine,2030,1
+4,2055,R1,windturbine,2030,1
+4,2059,R1,windturbine,2030,1
+7,2050,R1,windturbine,2045,10
+7,2054,R1,windturbine,2045,10
+7,2055,R1,windturbine,2045,10
+7,2059,R1,windturbine,2045,10
+7,2060,R1,windturbine,2045,10
+7,2064,R1,windturbine,2045,10
+7,2065,R1,windturbine,2045,10
+7,2069,R1,windturbine,2045,10
+7,2070,R1,windturbine,2045,10
+7,2074,R1,windturbine,2045,10
+8,2055,R1,windturbine,2050,8
+8,2059,R1,windturbine,2050,8
+8,2060,R1,windturbine,2050,8
+8,2064,R1,windturbine,2050,8
+8,2065,R1,windturbine,2050,8
+8,2069,R1,windturbine,2050,8
+8,2070,R1,windturbine,2050,8
+8,2074,R1,windturbine,2050,8
+8,2075,R1,windturbine,2050,8
+8,2079,R1,windturbine,2050,8
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
index 3c4e421e..618651d3 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,11.86320000000
-1,2030,R1,heatpump,2020,11.86320000000
-1,2034,R1,heatpump,2020,11.86320000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
index c10983de..6143c0a9 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,3.81370000000
-1,2034,R1,gasboiler,2025,3.81370000000
-1,2035,R1,gasboiler,2025,3.81370000000
-1,2039,R1,gasboiler,2025,3.81370000000
-2,2025,R1,heatpump,2020,11.86320000000
-2,2030,R1,heatpump,2020,11.86320000000
-2,2034,R1,heatpump,2020,11.86320000000
-3,2030,R1,heatpump,2025,1.84700000000
-3,2034,R1,heatpump,2025,1.84700000000
-3,2035,R1,heatpump,2025,1.84700000000
-3,2039,R1,heatpump,2025,1.84700000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
+2,2030,R1,heatpump,2025,6
+2,2034,R1,heatpump,2025,6
+2,2035,R1,heatpump,2025,6
+2,2039,R1,heatpump,2025,6
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
index fc1265ec..15a30e92 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,3.81370000000
-0,2034,R1,gasboiler,2025,3.81370000000
-0,2035,R1,gasboiler,2025,3.81370000000
-0,2039,R1,gasboiler,2025,3.81370000000
-1,2030,R1,heatpump,2020,11.86320000000
-1,2034,R1,heatpump,2020,11.86320000000
-2,2030,R1,heatpump,2025,1.84700000000
-2,2034,R1,heatpump,2025,1.84700000000
-2,2035,R1,heatpump,2025,1.84700000000
-2,2039,R1,heatpump,2025,1.84700000000
-3,2035,R1,heatpump,2030,12.35690000000
-3,2039,R1,heatpump,2030,12.35690000000
-3,2040,R1,heatpump,2030,12.35690000000
-3,2044,R1,heatpump,2030,12.35690000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
+2,2030,R1,heatpump,2025,6
+2,2034,R1,heatpump,2025,6
+2,2035,R1,heatpump,2025,6
+2,2039,R1,heatpump,2025,6
+3,2035,R1,heatpump,2030,12
+3,2039,R1,heatpump,2030,12
+3,2040,R1,heatpump,2030,12
+3,2044,R1,heatpump,2030,12
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
index 5a7273fe..e7fabd4e 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,3.81370000000
-0,2039,R1,gasboiler,2025,3.81370000000
-1,2040,R1,gasboiler,2035,2.39330000000
-1,2044,R1,gasboiler,2035,2.39330000000
-1,2045,R1,gasboiler,2035,2.39330000000
-1,2049,R1,gasboiler,2035,2.39330000000
-2,2035,R1,heatpump,2025,1.84700000000
-2,2039,R1,heatpump,2025,1.84700000000
-3,2035,R1,heatpump,2030,12.35690000000
-3,2039,R1,heatpump,2030,12.35690000000
-3,2040,R1,heatpump,2030,12.35690000000
-3,2044,R1,heatpump,2030,12.35690000000
-4,2040,R1,heatpump,2035,3.75930000000
-4,2044,R1,heatpump,2035,3.75930000000
-4,2045,R1,heatpump,2035,3.75930000000
-4,2049,R1,heatpump,2035,3.75930000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
+2,2030,R1,heatpump,2025,6
+2,2034,R1,heatpump,2025,6
+2,2035,R1,heatpump,2025,6
+2,2039,R1,heatpump,2025,6
+3,2035,R1,heatpump,2030,12
+3,2039,R1,heatpump,2030,12
+3,2040,R1,heatpump,2030,12
+3,2044,R1,heatpump,2030,12
+4,2040,R1,heatpump,2035,6
+4,2044,R1,heatpump,2035,6
+4,2045,R1,heatpump,2035,6
+4,2049,R1,heatpump,2035,6
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
index 31c274c8..634266c2 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,2.39330000000
-0,2044,R1,gasboiler,2035,2.39330000000
-0,2045,R1,gasboiler,2035,2.39330000000
-0,2049,R1,gasboiler,2035,2.39330000000
-1,2040,R1,heatpump,2030,12.35690000000
-1,2044,R1,heatpump,2030,12.35690000000
-2,2040,R1,heatpump,2035,3.75930000000
-2,2044,R1,heatpump,2035,3.75930000000
-2,2045,R1,heatpump,2035,3.75930000000
-2,2049,R1,heatpump,2035,3.75930000000
-3,2045,R1,heatpump,2040,12.67390000000
-3,2049,R1,heatpump,2040,12.67390000000
-3,2050,R1,heatpump,2040,12.67390000000
-3,2054,R1,heatpump,2040,12.67390000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
+2,2030,R1,heatpump,2025,6
+2,2034,R1,heatpump,2025,6
+2,2035,R1,heatpump,2025,6
+2,2039,R1,heatpump,2025,6
+3,2035,R1,heatpump,2030,12
+3,2039,R1,heatpump,2030,12
+3,2040,R1,heatpump,2030,12
+3,2044,R1,heatpump,2030,12
+4,2040,R1,heatpump,2035,6
+4,2044,R1,heatpump,2035,6
+4,2045,R1,heatpump,2035,6
+4,2049,R1,heatpump,2035,6
+5,2045,R1,heatpump,2040,12
+5,2049,R1,heatpump,2040,12
+5,2050,R1,heatpump,2040,12
+5,2054,R1,heatpump,2040,12
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
index 388c7811..819c5004 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2045.csv
@@ -1,17 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,2.39330000000
-0,2049,R1,gasboiler,2035,2.39330000000
-1,2050,R1,gasboiler,2045,0.75000000000
-1,2054,R1,gasboiler,2045,0.75000000000
-1,2055,R1,gasboiler,2045,0.75000000000
-1,2059,R1,gasboiler,2045,0.75000000000
-2,2045,R1,heatpump,2035,3.75930000000
-2,2049,R1,heatpump,2035,3.75930000000
-3,2045,R1,heatpump,2040,12.67390000000
-3,2049,R1,heatpump,2040,12.67390000000
-3,2050,R1,heatpump,2040,12.67390000000
-3,2054,R1,heatpump,2040,12.67390000000
-4,2050,R1,heatpump,2045,5.71850000000
-4,2054,R1,heatpump,2045,5.71850000000
-4,2055,R1,heatpump,2045,5.71850000000
-4,2059,R1,heatpump,2045,5.71850000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
+2,2030,R1,heatpump,2025,6
+2,2034,R1,heatpump,2025,6
+2,2035,R1,heatpump,2025,6
+2,2039,R1,heatpump,2025,6
+3,2035,R1,heatpump,2030,12
+3,2039,R1,heatpump,2030,12
+3,2040,R1,heatpump,2030,12
+3,2044,R1,heatpump,2030,12
+4,2040,R1,heatpump,2035,6
+4,2044,R1,heatpump,2035,6
+4,2045,R1,heatpump,2035,6
+4,2049,R1,heatpump,2035,6
+5,2045,R1,heatpump,2040,12
+5,2049,R1,heatpump,2040,12
+5,2050,R1,heatpump,2040,12
+5,2054,R1,heatpump,2040,12
+6,2050,R1,heatpump,2045,7
+6,2054,R1,heatpump,2045,7
+6,2055,R1,heatpump,2045,7
+6,2059,R1,heatpump,2045,7
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
index 58b208c9..0d6f253d 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Capacity/2050.csv
@@ -1,15 +1,30 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,gasboiler,2045,0.75000000000
-0,2054,R1,gasboiler,2045,0.75000000000
-0,2055,R1,gasboiler,2045,0.75000000000
-0,2059,R1,gasboiler,2045,0.75000000000
-1,2050,R1,heatpump,2040,12.67390000000
-1,2054,R1,heatpump,2040,12.67390000000
-2,2050,R1,heatpump,2045,5.71850000000
-2,2054,R1,heatpump,2045,5.71850000000
-2,2055,R1,heatpump,2045,5.71850000000
-2,2059,R1,heatpump,2045,5.71850000000
-3,2055,R1,heatpump,2050,12.80180000000
-3,2059,R1,heatpump,2050,12.80180000000
-3,2060,R1,heatpump,2050,12.80180000000
-3,2064,R1,heatpump,2050,12.80180000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,11
+1,2030,R1,heatpump,2020,11
+1,2034,R1,heatpump,2020,11
+2,2030,R1,heatpump,2025,6
+2,2034,R1,heatpump,2025,6
+2,2035,R1,heatpump,2025,6
+2,2039,R1,heatpump,2025,6
+3,2035,R1,heatpump,2030,12
+3,2039,R1,heatpump,2030,12
+3,2040,R1,heatpump,2030,12
+3,2044,R1,heatpump,2030,12
+4,2040,R1,heatpump,2035,6
+4,2044,R1,heatpump,2035,6
+4,2045,R1,heatpump,2035,6
+4,2049,R1,heatpump,2035,6
+5,2045,R1,heatpump,2040,12
+5,2049,R1,heatpump,2040,12
+5,2050,R1,heatpump,2040,12
+5,2054,R1,heatpump,2040,12
+6,2050,R1,heatpump,2045,7
+6,2054,R1,heatpump,2045,7
+6,2055,R1,heatpump,2045,7
+6,2059,R1,heatpump,2045,7
+7,2055,R1,heatpump,2050,12
+7,2059,R1,heatpump,2050,12
+7,2060,R1,heatpump,2050,12
+7,2064,R1,heatpump,2050,12
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 75a7bdf1..64722c81 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,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,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.29140000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
 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
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,18.85620000000
 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,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
 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
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
 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,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
 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
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
 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,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
 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
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
 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,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
 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
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
 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,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
 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
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
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 09ca76ed..0a3b0552 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,31 @@
 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
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.29140000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,18.85620000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
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 457bc6d0..c2562772 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,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
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 bfad9bde..7198819b 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,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
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 0ab204b7..4e6318ce 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,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
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 28a974df..07f99b3c 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,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
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 72c9b548..c4b1a75d 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,25 @@
 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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,0.39260000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,0.67300000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,0.59160000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,1.01420000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39260000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,0.67300000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,0.59160000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,1.01420000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,1.18330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,2.02850000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,0.79070000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,1.35550000000
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 9d035dfd..33bbbed3 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,4 +1,5 @@
 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
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 4cae2884..33bbbed3 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,9 @@
 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
-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 772418b7..33bbbed3 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,9 @@
 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
-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 70eb04b5..33bbbed3 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,9 @@
 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
-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 fdf6b01b..33bbbed3 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,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
-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 ed1ed9d4..33bbbed3 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,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,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/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
index 354aa418..b254f42d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
@@ -1,51 +1,43 @@
 agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-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,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.54330000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2035
-A1,1.68610000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2040
-A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2040
-A1,2.01780000000,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.54330000000,R1,1,2025,R1,power,windturbine,retrofit,2045
-A1,1.68610000000,R1,2,2030,R1,power,windturbine,retrofit,2045
-A1,2.01780000000,R1,3,2035,R1,power,windturbine,retrofit,2045
-A1,2.08150000000,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.54330000000,R1,0,2025,R1,power,windturbine,retrofit,2050
-A1,1.68610000000,R1,1,2030,R1,power,windturbine,retrofit,2050
-A1,2.01780000000,R1,2,2035,R1,power,windturbine,retrofit,2050
-A1,2.08150000000,R1,3,2040,R1,power,windturbine,retrofit,2050
-A1,2.37860000000,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
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
+A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
+A1,15.42960000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
+A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
+A1,7.92960000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
+A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
+A1,0.42960000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
+A1,0.42960000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
+A1,0.42960000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
+A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
+A1,0.42960000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
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 69eb3a4f..62e18119 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,205 @@
 agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-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
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,13,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,37,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,71,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,28,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,48,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,52,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,R1,108,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,47,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.20000000000,R1,95,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,107,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,115,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,112,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,136,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,35,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,39,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,43,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,63,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,67,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,79,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,R1,83,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,87,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,91,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,127,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,131,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,135,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,139,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,44,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,76,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,100,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,104,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,128,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,132,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,156,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,160,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,47,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,51,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,79,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,91,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,95,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,99,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,103,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,107,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,119,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,147,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,151,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,155,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,159,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,163,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,24,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,56,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,116,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,120,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,148,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,R1,152,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,180,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,R1,184,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,27,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,47,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,51,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,55,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,59,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,119,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,123,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,139,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,143,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,147,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,151,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,155,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,171,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,175,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,179,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,183,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,187,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 e5a087bc..76b679a1 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,235 @@
 agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-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
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,heat,R1,6,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,7,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,9,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,21,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,30,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,31,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,33,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,43,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,55,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,57,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,66,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,67,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,69,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.21111111111,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,19.35255555556,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.31666666667,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.31666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,29.02883333333,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.21111111111,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,19.35255555556,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.31666666667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.31666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,29.02883333333,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.63333333333,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.63333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,58.05766666667,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.42222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.27586206897,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.72413793103,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.18390804598,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,1.14942528736,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,17,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,18,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,65,2020.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,12,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,13,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,32,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,33,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,52,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,72,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,92,2025.00000000000,R1,residential,1.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,93,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2025.00000000000,R1,residential,1.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,113,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,21,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,22,2025.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,23,2030.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,41,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,42,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,43,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,62,2025.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2030.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,83,2030.00000000000,R1,power,1.20000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,103,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,15,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,16,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,39,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,63,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,64,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,87,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,111,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,135,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,136,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,26,2025.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,27,2030.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,28,2035.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.15555555556,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2030.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,52,2035.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,73,2020.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.23333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2030.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,76,2035.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,97,2020.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,122,2025.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2030.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2035.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,46,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,47,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,75,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,102,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,103,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,130,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,131,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,158,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,159,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,29,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,30,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,31,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,32,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,57,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,58,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,59,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,85,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,86,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,87,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,88,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,89,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,113,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,114,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,115,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,116,2035.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,117,2040.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,142,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,143,2030.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,144,2035.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,145,2040.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,21,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,22,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,85,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,86,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,117,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,118,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,149,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,150,2045.00000000000,R1,residential,3.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,181,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,182,2045.00000000000,R1,residential,2.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2045.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,35,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,38,2045.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,68,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,69,2040.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,70,2045.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2040.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2045.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,130,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,131,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,132,2035.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,133,2040.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,134,2045.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,162,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2030.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,164,2035.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2040.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,166,2045.00000000000,R1,power,0.53333333333,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/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index 065b72d2..3cae8f09 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -48,122 +48,122 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.06920000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.16960000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16960000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.60620000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2050
 "('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2050
 "('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2050
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2050
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2050
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2050
 "('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 69c4d338..1cdc9617 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
index c6bfdc80..cec6493c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2025.csv
@@ -1,15 +1,16 @@
 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.54330000000
-2,2035,R1,windturbine,2025,1.54330000000
-2,2040,R1,windturbine,2025,1.54330000000
-2,2045,R1,windturbine,2025,1.54330000000
-2,2049,R1,windturbine,2025,1.54330000000
-2,2050,R1,windturbine,2025,1.54330000000
-2,2054,R1,windturbine,2025,1.54330000000
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
index fe65e893..828f0a6c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2030.csv
@@ -1,21 +1,24 @@
 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.54330000000
-1,2035,R1,windturbine,2025,1.54330000000
-1,2040,R1,windturbine,2025,1.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2035,R1,windturbine,2030,1.68610000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
index 8280e4a7..29261651 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2035.csv
@@ -1,28 +1,33 @@
 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.54330000000
-1,2040,R1,windturbine,2025,1.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2035,R1,windturbine,2030,1.68610000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2040,R1,windturbine,2035,2.01780000000
-3,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
index 74962932..0eef7b5d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2040.csv
@@ -1,35 +1,43 @@
 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.54330000000
-1,2045,R1,windturbine,2025,1.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2040,R1,windturbine,2030,1.68610000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2040,R1,windturbine,2035,2.01780000000
-3,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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,2045,R1,windturbine,2040,2.08150000000
-4,2049,R1,windturbine,2040,2.08150000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
index bcd2871b..e9d250de 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2045.csv
@@ -1,41 +1,53 @@
 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.54330000000
-1,2049,R1,windturbine,2025,1.54330000000
-1,2050,R1,windturbine,2025,1.54330000000
-1,2054,R1,windturbine,2025,1.54330000000
-2,2045,R1,windturbine,2030,1.68610000000
-2,2049,R1,windturbine,2030,1.68610000000
-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,2045,R1,windturbine,2035,2.01780000000
-3,2049,R1,windturbine,2035,2.01780000000
-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,2045,R1,windturbine,2040,2.08150000000
-4,2049,R1,windturbine,2040,2.08150000000
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
+6,2050,R1,windturbine,2045,2
+6,2054,R1,windturbine,2045,2
+6,2055,R1,windturbine,2045,2
+6,2059,R1,windturbine,2045,2
+6,2060,R1,windturbine,2045,2
+6,2064,R1,windturbine,2045,2
+6,2065,R1,windturbine,2045,2
+6,2069,R1,windturbine,2045,2
+6,2070,R1,windturbine,2045,2
+6,2074,R1,windturbine,2045,2
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 26c19754..3105095e 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,63 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,1
+2,2035,R1,windturbine,2025,1
+2,2040,R1,windturbine,2025,1
+2,2045,R1,windturbine,2025,1
+2,2049,R1,windturbine,2025,1
+2,2050,R1,windturbine,2025,1
+2,2054,R1,windturbine,2025,1
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
+6,2050,R1,windturbine,2045,2
+6,2054,R1,windturbine,2045,2
+6,2055,R1,windturbine,2045,2
+6,2059,R1,windturbine,2045,2
+6,2060,R1,windturbine,2045,2
+6,2064,R1,windturbine,2045,2
+6,2065,R1,windturbine,2045,2
+6,2069,R1,windturbine,2045,2
+6,2070,R1,windturbine,2045,2
+6,2074,R1,windturbine,2045,2
+7,2055,R1,windturbine,2050,2
+7,2059,R1,windturbine,2050,2
+7,2060,R1,windturbine,2050,2
+7,2064,R1,windturbine,2050,2
+7,2065,R1,windturbine,2050,2
+7,2069,R1,windturbine,2050,2
+7,2070,R1,windturbine,2050,2
+7,2074,R1,windturbine,2050,2
+7,2075,R1,windturbine,2050,2
+7,2079,R1,windturbine,2050,2
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 75ad01fc..03bd216b 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
@@ -2,28 +2,28 @@ 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.23950000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33600000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
 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.35930000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50410000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
 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.23950000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33600000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
 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.35930000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50410000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
 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.71850000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00810000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
 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.47900000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.67210000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
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 18403933..4a52d7f1 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,month,day,hour,region,technology,installed,supply
-0,0,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.23950000000
-0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.18010000000
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33600000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.25270000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.27610000000
-1,0,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.35930000000
-1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.27020000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50410000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.37910000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.41410000000
-2,0,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.23950000000
-2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.18010000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33600000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.25270000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.27610000000
-3,0,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.35930000000
-3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.27020000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50410000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.37910000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.41410000000
-4,0,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.71850000000
-4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.54030000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00810000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.75810000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.82820000000
-5,0,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.47900000000
-5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.36020000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.67210000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.50540000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.55220000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
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 131094ba..def4be3b 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,month,day,hour,region,technology,installed,supply
-0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.18010000000
-0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15820000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.25270000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.22200000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.27610000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.24260000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.29030000000
-1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.27020000000
-1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23740000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.37910000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.33300000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.41410000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36380000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.43540000000
-2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.18010000000
-2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15820000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.25270000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.22200000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.27610000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24260000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.29030000000
-3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.27020000000
-3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23740000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.37910000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.33300000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.41410000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36380000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.43540000000
-4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.54030000000
-4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.47470000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.75810000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.66610000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.82820000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72770000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.87080000000
-5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.36020000000
-5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31650000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.50540000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.44400000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.55220000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48510000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.58060000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
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 59f8c5cb..f5d07646 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,month,day,hour,region,technology,installed,supply
-0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15820000000
-0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13660000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.22200000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.19160000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.24260000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.20930000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.29030000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.25050000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.25840000000
-1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23740000000
-1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20490000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.33300000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28740000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36380000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31400000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.43540000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37580000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38760000000
-2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15820000000
-2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13660000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.22200000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19160000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24260000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20930000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.29030000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.25050000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25840000000
-3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23740000000
-3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20490000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.33300000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28740000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36380000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31400000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.43540000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37580000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38760000000
-4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.47470000000
-4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40970000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.66610000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57480000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72770000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62800000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.87080000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.75150000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77530000000
-5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31650000000
-5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.27310000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.44400000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38320000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48510000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41870000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.58060000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.50100000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51680000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
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 fc27169f..dce17b90 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,month,day,hour,region,technology,installed,supply
-0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13660000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.19160000000
-0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.19080000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.20930000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.20840000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.25050000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24940000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.25840000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.25730000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.29400000000
-1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20490000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28740000000
-1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28620000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31400000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31270000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37580000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37420000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38760000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38600000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.44110000000
-2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13660000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19160000000
-2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19080000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20930000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20840000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.25050000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24940000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25840000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25730000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.29400000000
-3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20490000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28740000000
-3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28620000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31400000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31270000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37580000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37420000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38760000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38600000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.44110000000
-4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40970000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57480000000
-4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57240000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62800000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62530000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.75150000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.74830000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77530000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77190000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.88210000000
-5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.27310000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38320000000
-5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38160000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41870000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41690000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.50100000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.49890000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51680000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51460000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.58810000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
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 8fd9db3e..df173a2f 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,month,day,hour,region,technology,installed,supply
-0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.19080000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.20840000000
-0,2,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.19450000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24940000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.23270000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.25730000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24010000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.29400000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.27440000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.25830000000
-1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.28620000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.31270000000
-1,2,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.29170000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37420000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.34910000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.38600000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36010000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.44110000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.41150000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.38750000000
-2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.19080000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20840000000
-2,2,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.19450000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24940000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23270000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.25730000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24010000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.29400000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.27440000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.25830000000
-3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.28620000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.31270000000
-3,2,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.29170000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37420000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.34910000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.38600000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36010000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.44110000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.41150000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.38750000000
-4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.57240000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.62530000000
-4,2,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.58350000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.74830000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.69820000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.77190000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72030000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.88210000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.82310000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.77490000000
-5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.38160000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41690000000
-5,2,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.38900000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.49890000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.46550000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.51460000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48020000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.58810000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.54870000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.51660000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
index bcdf148c..d6edd96c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
index 2eb0ec15..677048ec 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
index 22334ba5..95b724d9 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
index 452c6c8a..33e9c12a 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
index e3ecc1d0..21be0313 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
index 82b22d9b..d02c2c7f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
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 42f4be20..8c8e1206 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,30 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
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 bfe116d0..729d406d 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,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
 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 82873caa..afe86e12 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,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 741ea3c6..83daf7f1 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,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 c802f340..7bda2463 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,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c7be86b2..c535c679 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,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 8c187153..9abfcded 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
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 9d035dfd..33bbbed3 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,4 +1,5 @@
 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
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 4cae2884..33bbbed3 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,9 @@
 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
-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 772418b7..33bbbed3 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,9 @@
 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
-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 70eb04b5..33bbbed3 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,9 @@
 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
-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 fdf6b01b..33bbbed3 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,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
-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 ed1ed9d4..33bbbed3 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,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,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 07d7b4ce..d3ebc278 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
@@ -1,51 +1,43 @@
 agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-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.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.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.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.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.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.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
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
+A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
+A1,15.42960000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
+A1,2.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
+A1,7.92960000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
+A1,0.42960000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
+A1,0.42960000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
+A1,0.42960000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
+A1,2.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
+A1,0.42960000000,R1,6,2020,R1,gas,gassupply1,newcapa,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 203194bc..1f41565b 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,205 @@
 agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-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
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,13,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,37,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.47007407407,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.14074074074,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.22222222222,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44444444444,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.22222222222,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44444444444,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,71,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.33333333333,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44444444444,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.88888888889,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,28,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,48,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,52,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,R1,108,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.16000000000,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.16000000000,R1,47,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.96000000000,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.96000000000,R1,95,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,107,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,115,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,112,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,136,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,35,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,39,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,43,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,63,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,67,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,79,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,83,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,87,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,91,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,127,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,131,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,135,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,139,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,44,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,76,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,100,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,104,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,128,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,132,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,156,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,160,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.11851851852,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,47,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,51,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.11851851852,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,79,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,R1,91,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,95,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,99,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,103,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,107,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,119,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,147,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,151,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,155,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,159,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,163,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,24,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,56,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,116,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,120,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,148,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,R1,152,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,180,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,R1,184,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,27,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,47,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,51,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,55,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,59,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,119,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,123,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,139,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,143,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,147,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,151,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,155,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,171,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,175,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,179,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,183,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,187,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 d24d8c30..4fc23b3b 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,235 @@
 agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-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
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,heat,R1,6,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,7,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,9,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,21,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,30,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,31,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,33,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,43,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,55,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,57,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,66,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,67,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,69,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.21111111111,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,19.35255555556,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.28148148148,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.14074074074,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,25.80340740741,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.31666666667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.31666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,29.02883333333,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.63333333333,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.63333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,58.05766666667,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.42222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.27586206897,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.72413793103,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.18390804598,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,1.14942528736,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,17,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,18,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,65,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,1.33333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.88888888889,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,12,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,13,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,32,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,33,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,52,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,72,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,92,2025.00000000000,R1,residential,1.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,93,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2025.00000000000,R1,residential,1.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,113,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.16000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,21,2020.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,22,2025.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,23,2030.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,41,2020.00000000000,R1,power,0.16000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,42,2025.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,43,2030.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,62,2025.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2030.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.96000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,83,2030.00000000000,R1,power,0.96000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2025.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,103,2030.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,15,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,16,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,39,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,63,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,64,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,87,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,111,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,135,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,136,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,26,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,27,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,28,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,52,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,73,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,76,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,97,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,122,2025.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2030.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2035.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,46,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,47,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,75,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,102,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,103,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,130,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,131,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,158,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,159,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.11851851852,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,29,2020.00000000000,R1,power,0.17777777778,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,30,2025.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,31,2030.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,32,2035.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2040.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,57,2020.00000000000,R1,power,0.11851851852,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,58,2025.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,59,2030.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2035.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2040.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,85,2020.00000000000,R1,power,0.17777777778,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,86,2025.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,87,2030.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,88,2035.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,89,2040.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,113,2020.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,114,2025.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,115,2030.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,116,2035.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,117,2040.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,142,2025.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,143,2030.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,144,2035.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,145,2040.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,21,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,22,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,85,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,86,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,117,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,118,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,149,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,150,2045.00000000000,R1,residential,3.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,181,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,182,2045.00000000000,R1,residential,2.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2045.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,35,2030.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2035.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2040.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,38,2045.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2030.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,68,2035.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,69,2040.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,70,2045.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2040.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2045.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,130,2025.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,131,2030.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,132,2035.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,133,2040.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,134,2045.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,162,2025.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2030.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,164,2035.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2040.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,166,2045.00000000000,R1,power,0.48000000000,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/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index ed4a4096..3187ea52 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -48,122 +48,122 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.06920000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.36000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.17160000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16960000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.60620000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.28330000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18620000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06730000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.11280000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07250000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2050
 "('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2050
 "('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2050
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2050
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2050
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2050
 "('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 f79ba32f..1cdc9617 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,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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
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 525499d5..76d5d485 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,16 @@
 asset,year,region,technology,installed,capacity
-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
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,2
+2,2035,R1,windturbine,2025,2
+2,2040,R1,windturbine,2025,2
+2,2045,R1,windturbine,2025,2
+2,2049,R1,windturbine,2025,2
+2,2050,R1,windturbine,2025,2
+2,2054,R1,windturbine,2025,2
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 98ef6ffe..d6618461 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,24 @@
 asset,year,region,technology,installed,capacity
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,2
+2,2035,R1,windturbine,2025,2
+2,2040,R1,windturbine,2025,2
+2,2045,R1,windturbine,2025,2
+2,2049,R1,windturbine,2025,2
+2,2050,R1,windturbine,2025,2
+2,2054,R1,windturbine,2025,2
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
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 e9cb4c69..b4e690fa 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,33 @@
 asset,year,region,technology,installed,capacity
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,2
+2,2035,R1,windturbine,2025,2
+2,2040,R1,windturbine,2025,2
+2,2045,R1,windturbine,2025,2
+2,2049,R1,windturbine,2025,2
+2,2050,R1,windturbine,2025,2
+2,2054,R1,windturbine,2025,2
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
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 4aa4b743..07f25ec0 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,43 @@
 asset,year,region,technology,installed,capacity
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,2
+2,2035,R1,windturbine,2025,2
+2,2040,R1,windturbine,2025,2
+2,2045,R1,windturbine,2025,2
+2,2049,R1,windturbine,2025,2
+2,2050,R1,windturbine,2025,2
+2,2054,R1,windturbine,2025,2
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
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 16a516dc..07e8e9f8 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,53 @@
 asset,year,region,technology,installed,capacity
-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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,2
+2,2035,R1,windturbine,2025,2
+2,2040,R1,windturbine,2025,2
+2,2045,R1,windturbine,2025,2
+2,2049,R1,windturbine,2025,2
+2,2050,R1,windturbine,2025,2
+2,2054,R1,windturbine,2025,2
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
+6,2050,R1,windturbine,2045,2
+6,2054,R1,windturbine,2045,2
+6,2055,R1,windturbine,2045,2
+6,2059,R1,windturbine,2045,2
+6,2060,R1,windturbine,2045,2
+6,2064,R1,windturbine,2045,2
+6,2065,R1,windturbine,2045,2
+6,2069,R1,windturbine,2045,2
+6,2070,R1,windturbine,2045,2
+6,2074,R1,windturbine,2045,2
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 bc415559..b43e725c 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,63 @@
 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
+0,2020,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,1
+1,2025,R1,windturbine,2020,1
+1,2030,R1,windturbine,2020,1
+1,2035,R1,windturbine,2020,1
+1,2040,R1,windturbine,2020,1
+1,2045,R1,windturbine,2020,1
+1,2049,R1,windturbine,2020,1
+2,2030,R1,windturbine,2025,2
+2,2035,R1,windturbine,2025,2
+2,2040,R1,windturbine,2025,2
+2,2045,R1,windturbine,2025,2
+2,2049,R1,windturbine,2025,2
+2,2050,R1,windturbine,2025,2
+2,2054,R1,windturbine,2025,2
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2054,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+4,2040,R1,windturbine,2035,2
+4,2045,R1,windturbine,2035,2
+4,2049,R1,windturbine,2035,2
+4,2050,R1,windturbine,2035,2
+4,2054,R1,windturbine,2035,2
+4,2055,R1,windturbine,2035,2
+4,2059,R1,windturbine,2035,2
+4,2060,R1,windturbine,2035,2
+4,2064,R1,windturbine,2035,2
+5,2045,R1,windturbine,2040,2
+5,2049,R1,windturbine,2040,2
+5,2050,R1,windturbine,2040,2
+5,2054,R1,windturbine,2040,2
+5,2055,R1,windturbine,2040,2
+5,2059,R1,windturbine,2040,2
+5,2060,R1,windturbine,2040,2
+5,2064,R1,windturbine,2040,2
+5,2065,R1,windturbine,2040,2
+5,2069,R1,windturbine,2040,2
+6,2050,R1,windturbine,2045,2
+6,2054,R1,windturbine,2045,2
+6,2055,R1,windturbine,2045,2
+6,2059,R1,windturbine,2045,2
+6,2060,R1,windturbine,2045,2
+6,2064,R1,windturbine,2045,2
+6,2065,R1,windturbine,2045,2
+6,2069,R1,windturbine,2045,2
+6,2070,R1,windturbine,2045,2
+6,2074,R1,windturbine,2045,2
+7,2055,R1,windturbine,2050,2
+7,2059,R1,windturbine,2050,2
+7,2060,R1,windturbine,2050,2
+7,2064,R1,windturbine,2050,2
+7,2065,R1,windturbine,2050,2
+7,2069,R1,windturbine,2050,2
+7,2070,R1,windturbine,2050,2
+7,2074,R1,windturbine,2050,2
+7,2075,R1,windturbine,2050,2
+7,2079,R1,windturbine,2050,2
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 e841617e..b59209fc 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
@@ -2,28 +2,28 @@ 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
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.44440000000
 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
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.33330000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.66670000000
 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
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.22220000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.44440000000
 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
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.33330000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.66670000000
 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
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.66670000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.33330000000
 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
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.44440000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.88890000000
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 0480fdee..308dc155 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,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
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.16000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.44440000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.32000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.32000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.33330000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.24000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.66670000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.48000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.48000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.22220000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.16000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.44440000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.32000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.32000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.33330000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.24000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.66670000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.48000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.48000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.66670000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.48000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.33330000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.96000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.96000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.44440000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.32000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.88890000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.64000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.64000000000
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 8d7d43bd..8a37abea 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,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
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.16000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.32000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.26670000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.32000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.24000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.48000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.40000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.48000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.16000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.32000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.26670000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.32000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.24000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.48000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.40000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.48000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.48000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.96000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.80000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.96000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.32000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.64000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.53330000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.64000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
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 cb0ec8b6..d486624b 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,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
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.11850000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.26670000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.23700000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.23700000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.23700000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.23700000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.17780000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.40000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.35560000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.35560000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.35560000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35560000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.11850000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.26670000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.23700000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.23700000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23700000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23700000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.17780000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.40000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.35560000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.35560000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.35560000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35560000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.35560000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.80000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.71110000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.71110000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.71110000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.71110000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.23700000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.53330000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.47410000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.47410000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.47410000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47410000000
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 4b2628f7..967c9114 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,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
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.11850000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.23700000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.24000000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.23700000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.23700000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.23700000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.17780000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.35560000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.36000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.35560000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.35560000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35560000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.11850000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.23700000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.24000000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.23700000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23700000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23700000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.17780000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.35560000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.36000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.35560000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.35560000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35560000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.35560000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.71110000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.72000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.71110000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.71110000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.71110000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.23700000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.47410000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.48000000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.47410000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.47410000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47410000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
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 05f58095..e2be8d72 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,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
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.24000000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.36000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.24000000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.36000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.72000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.48000000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
index bcdf148c..d6edd96c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10.00000000000
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
index 2eb0ec15..677048ec 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,10 @@
 asset,year,region,technology,installed,capacity
-0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,4.10000000000
-1,2034,R1,gasboiler,2025,4.10000000000
-1,2035,R1,gasboiler,2025,4.10000000000
-1,2039,R1,gasboiler,2025,4.10000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,6.90000000000
-3,2034,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2025,6.90000000000
-3,2039,R1,heatpump,2025,6.90000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
index 22334ba5..95b724d9 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2030.csv
@@ -1,15 +1,14 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,4.10000000000
-0,2034,R1,gasboiler,2025,4.10000000000
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,6.90000000000
-2,2034,R1,heatpump,2025,6.90000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
index 452c6c8a..33e9c12a 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2035.csv
@@ -1,17 +1,18 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,4.10000000000
-0,2039,R1,gasboiler,2025,4.10000000000
-1,2040,R1,gasboiler,2035,0.91000000000
-1,2044,R1,gasboiler,2035,0.91000000000
-1,2045,R1,gasboiler,2035,0.91000000000
-1,2049,R1,gasboiler,2035,0.91000000000
-2,2035,R1,heatpump,2025,6.90000000000
-2,2039,R1,heatpump,2025,6.90000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
-4,2040,R1,heatpump,2035,16.09000000000
-4,2044,R1,heatpump,2035,16.09000000000
-4,2045,R1,heatpump,2035,16.09000000000
-4,2049,R1,heatpump,2035,16.09000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
index e3ecc1d0..21be0313 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2040.csv
@@ -1,15 +1,22 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2035,0.91000000000
-0,2044,R1,gasboiler,2035,0.91000000000
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2040,R1,heatpump,2030,25.00000000000
-1,2044,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2035,16.09000000000
-2,2044,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2035,16.09000000000
-2,2049,R1,heatpump,2035,16.09000000000
-3,2045,R1,heatpump,2040,31.00000000000
-3,2049,R1,heatpump,2040,31.00000000000
-3,2050,R1,heatpump,2040,31.00000000000
-3,2054,R1,heatpump,2040,31.00000000000
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
index 82b22d9b..d02c2c7f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2045.csv
@@ -1,13 +1,26 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,gasboiler,2035,0.91000000000
-0,2049,R1,gasboiler,2035,0.91000000000
-1,2045,R1,heatpump,2035,16.09000000000
-1,2049,R1,heatpump,2035,16.09000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
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 42f4be20..8c8e1206 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,30 @@
 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
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
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 bfe116d0..729d406d 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,31 @@
 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,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
 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,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
 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,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
 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,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
 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 82873caa..afe86e12 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,25 @@
 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
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 741ea3c6..83daf7f1 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,25 @@
 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
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 c802f340..7bda2463 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,25 @@
 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
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c7be86b2..c535c679 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,25 @@
 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
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 8c187153..9abfcded 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,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
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000

From f80bc1a664c3f1cf4c92cce84f11e4d2ff9c5cd0 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 19 Jun 2024 15:49:52 +0100
Subject: [PATCH 242/419] Add default_retro example

---
 docs/advanced-guide/extending-muse.ipynb      |   3 +-
 docs/example-output.ipynb                     |   2 +-
 .../default_retro/input/BaseYearExport.csv    |  21 +++
 .../default_retro/input/BaseYearImport.csv    |  21 +++
 .../default_retro/input/GlobalCommodities.csv |   6 +
 .../default_retro/input/Projections.csv       |  21 +++
 .../data/example/default_retro/settings.toml  | 148 +++++++++++++++
 .../default_retro/technodata/Agents.csv       |   3 +
 .../default_retro/technodata/gas/CommIn.csv   |   3 +
 .../default_retro/technodata/gas/CommOut.csv  |   3 +
 .../technodata/gas/ExistingCapacity.csv       |   2 +
 .../technodata/gas/Technodata.csv             |   3 +
 .../default_retro/technodata/power/CommIn.csv |   4 +
 .../technodata/power/CommOut.csv              |   4 +
 .../technodata/power/ExistingCapacity.csv     |   3 +
 .../technodata/power/Technodata.csv           |   4 +
 .../preset/Residential2020Consumption.csv     |   7 +
 .../preset/Residential2050Consumption.csv     |   7 +
 .../technodata/residential/CommIn.csv         |   4 +
 .../technodata/residential/CommOut.csv        |   4 +
 .../residential/ExistingCapacity.csv          |   3 +
 .../technodata/residential/Technodata.csv     |   4 +
 src/muse/examples.py                          |  12 ++
 .../default_retro/Gas/Capacity/2020.csv       |   4 +
 .../default_retro/Gas/Capacity/2025.csv       |   9 +
 .../default_retro/Gas/Capacity/2030.csv       |  15 ++
 .../default_retro/Gas/Capacity/2035.csv       |  13 ++
 .../default_retro/Gas/Capacity/2040.csv       |  11 ++
 .../default_retro/Gas/Capacity/2045.csv       |   9 +
 .../default_retro/Gas/Capacity/2050.csv       |   9 +
 .../default_retro/MCACapacity.csv             |  57 ++++++
 .../default_retro/MCAPrices.csv               | 169 ++++++++++++++++++
 .../default_retro/Power/Capacity/2020.csv     |  16 ++
 .../default_retro/Power/Capacity/2025.csv     |  24 +++
 .../default_retro/Power/Capacity/2030.csv     |  30 ++++
 .../default_retro/Power/Capacity/2035.csv     |  36 ++++
 .../default_retro/Power/Capacity/2040.csv     |  42 +++++
 .../default_retro/Power/Capacity/2045.csv     |  47 +++++
 .../default_retro/Power/Capacity/2050.csv     |  45 +++++
 .../Residential/Capacity/2020.csv             |   6 +
 .../Residential/Capacity/2025.csv             |  13 ++
 .../Residential/Capacity/2030.csv             |  15 ++
 .../Residential/Capacity/2035.csv             |  17 ++
 .../Residential/Capacity/2040.csv             |  15 ++
 .../Residential/Capacity/2045.csv             |  13 ++
 .../Residential/Capacity/2050.csv             |  11 ++
 .../default_retro/Residential/Supply/2020.csv |  31 ++++
 .../default_retro/Residential/Supply/2025.csv |  43 +++++
 .../default_retro/Residential/Supply/2030.csv |  49 +++++
 .../default_retro/Residential/Supply/2035.csv |  49 +++++
 .../default_retro/Residential/Supply/2040.csv |  49 +++++
 .../default_retro/Residential/Supply/2045.csv |  37 ++++
 .../default_retro/Residential/Supply/2050.csv |  25 +++
 53 files changed, 1199 insertions(+), 2 deletions(-)
 create mode 100644 src/muse/data/example/default_retro/input/BaseYearExport.csv
 create mode 100644 src/muse/data/example/default_retro/input/BaseYearImport.csv
 create mode 100644 src/muse/data/example/default_retro/input/GlobalCommodities.csv
 create mode 100644 src/muse/data/example/default_retro/input/Projections.csv
 create mode 100644 src/muse/data/example/default_retro/settings.toml
 create mode 100644 src/muse/data/example/default_retro/technodata/Agents.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/gas/CommIn.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/gas/CommOut.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/gas/ExistingCapacity.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/gas/Technodata.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/power/CommIn.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/power/CommOut.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/power/ExistingCapacity.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/power/Technodata.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/preset/Residential2020Consumption.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/preset/Residential2050Consumption.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/residential/CommIn.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/residential/CommOut.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/residential/ExistingCapacity.csv
 create mode 100644 src/muse/data/example/default_retro/technodata/residential/Technodata.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2020.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2025.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2030.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2035.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2040.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2045.csv
 create mode 100644 tests/example_outputs/default_retro/Gas/Capacity/2050.csv
 create mode 100644 tests/example_outputs/default_retro/MCACapacity.csv
 create mode 100644 tests/example_outputs/default_retro/MCAPrices.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2020.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2025.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2030.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2035.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2040.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2045.csv
 create mode 100644 tests/example_outputs/default_retro/Power/Capacity/2050.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2020.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2025.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2030.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2035.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2040.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2045.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Capacity/2050.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2020.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2025.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2030.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2035.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2040.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2045.csv
 create mode 100644 tests/example_outputs/default_retro/Residential/Supply/2050.csv

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 897745af..0924de93 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -204,7 +204,7 @@
    "source": [
     "We can now run the simulation. There are two ways to do this. From the command-line, where we can do:\n",
     "\n",
-    "    python3 -m muse data/commercial/modified_settings.toml \n",
+    "    python3 -m muse model/modified_settings.toml \n",
     "\n",
     "(note that slashes may be the other way on Windows). Or directly from the notebook:"
    ]
@@ -421,6 +421,7 @@
    "outputs": [],
    "source": [
     "cache_files = sorted((Path() / \"Results\").glob(\"Cache*\"))\n",
+    "print(cache_files)\n",
     "assert len(cache_files) == 1\n",
     "cached = pd.read_csv(cache_files[0])\n",
     "assert tuple(cached.category.unique()) == (\"retrofit\",)"
diff --git a/docs/example-output.ipynb b/docs/example-output.ipynb
index 11c8ec9f..dd6ed152 100644
--- a/docs/example-output.ipynb
+++ b/docs/example-output.ipynb
@@ -33,7 +33,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,
diff --git a/src/muse/data/example/default_retro/input/BaseYearExport.csv b/src/muse/data/example/default_retro/input/BaseYearExport.csv
new file mode 100644
index 00000000..7218c1fc
--- /dev/null
+++ b/src/muse/data/example/default_retro/input/BaseYearExport.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ,PJ,PJ,kt,PJ
+R1,Exports,2010,0,0,0,0,0
+R1,Exports,2015,0,0,0,0,0
+R1,Exports,2020,0,0,0,0,0
+R1,Exports,2025,0,0,0,0,0
+R1,Exports,2030,0,0,0,0,0
+R1,Exports,2035,0,0,0,0,0
+R1,Exports,2040,0,0,0,0,0
+R1,Exports,2045,0,0,0,0,0
+R1,Exports,2050,0,0,0,0,0
+R1,Exports,2055,0,0,0,0,0
+R1,Exports,2060,0,0,0,0,0
+R1,Exports,2065,0,0,0,0,0
+R1,Exports,2070,0,0,0,0,0
+R1,Exports,2075,0,0,0,0,0
+R1,Exports,2080,0,0,0,0,0
+R1,Exports,2085,0,0,0,0,0
+R1,Exports,2090,0,0,0,0,0
+R1,Exports,2095,0,0,0,0,0
+R1,Exports,2100,0,0,0,0,0
diff --git a/src/muse/data/example/default_retro/input/BaseYearImport.csv b/src/muse/data/example/default_retro/input/BaseYearImport.csv
new file mode 100644
index 00000000..75b32276
--- /dev/null
+++ b/src/muse/data/example/default_retro/input/BaseYearImport.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ,PJ,PJ,kt,PJ
+R1,Imports,2010,0,0,0,0,0
+R1,Imports,2015,0,0,0,0,0
+R1,Imports,2020,0,0,0,0,0
+R1,Imports,2025,0,0,0,0,0
+R1,Imports,2030,0,0,0,0,0
+R1,Imports,2035,0,0,0,0,0
+R1,Imports,2040,0,0,0,0,0
+R1,Imports,2045,0,0,0,0,0
+R1,Imports,2050,0,0,0,0,0
+R1,Imports,2055,0,0,0,0,0
+R1,Imports,2060,0,0,0,0,0
+R1,Imports,2065,0,0,0,0,0
+R1,Imports,2070,0,0,0,0,0
+R1,Imports,2075,0,0,0,0,0
+R1,Imports,2080,0,0,0,0,0
+R1,Imports,2085,0,0,0,0,0
+R1,Imports,2090,0,0,0,0,0
+R1,Imports,2095,0,0,0,0,0
+R1,Imports,2100,0,0,0,0,0
diff --git a/src/muse/data/example/default_retro/input/GlobalCommodities.csv b/src/muse/data/example/default_retro/input/GlobalCommodities.csv
new file mode 100644
index 00000000..0d4c58da
--- /dev/null
+++ b/src/muse/data/example/default_retro/input/GlobalCommodities.csv
@@ -0,0 +1,6 @@
+Commodity,CommodityType,CommodityName,CommodityEmissionFactor_CO2,HeatRate,Unit
+Electricity,Energy,electricity,0,1,PJ
+Gas,Energy,gas,56.1,1,PJ
+Heat,Energy,heat,0,1,PJ
+Wind,Energy,wind,0,1,PJ
+CO2fuelcomsbustion,Environmental,CO2f,0,1,kt
diff --git a/src/muse/data/example/default_retro/input/Projections.csv b/src/muse/data/example/default_retro/input/Projections.csv
new file mode 100644
index 00000000..5b5e4326
--- /dev/null
+++ b/src/muse/data/example/default_retro/input/Projections.csv
@@ -0,0 +1,21 @@
+RegionName,Attribute,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/PJ,MUS$2010/kt,MUS$2010/kt
+R1,CommodityPrice,2010,14.81481472,6.6759,100,0,0
+R1,CommodityPrice,2015,17.89814806,6.914325,100,0.052913851,0
+R1,CommodityPrice,2020,19.5,7.15275,100,0.08314119,0
+R1,CommodityPrice,2025,21.93518528,8.10645,100,0.120069795,0
+R1,CommodityPrice,2030,26.50925917,9.06015,100,0.156998399,0
+R1,CommodityPrice,2035,26.51851861,9.2191,100,0.214877567,0
+R1,CommodityPrice,2040,23.85185194,9.37805,100,0.272756734,0
+R1,CommodityPrice,2045,23.97222222,9.193829337,100,0.35394801,0
+R1,CommodityPrice,2050,24.06481472,9.009608674,100,0.435139285,0
+R1,CommodityPrice,2055,25.3425925,8.832625604,100,0.542365578,0
+R1,CommodityPrice,2060,25.53703694,8.655642534,100,0.649591871,0
+R1,CommodityPrice,2065,25.32407417,8.485612708,100,0.780892624,0
+R1,CommodityPrice,2070,23.36111111,8.315582883,100,0.912193378,0
+R1,CommodityPrice,2075,22.27777778,8.152233126,100,1.078321687,0
+R1,CommodityPrice,2080,22.25925917,7.988883368,100,1.244449995,0
+R1,CommodityPrice,2085,22.17592583,7.831951236,100,1.4253503,0
+R1,CommodityPrice,2090,22.03703694,7.675019103,100,1.606250604,0
+R1,CommodityPrice,2095,21.94444444,7.524252461,100,1.73877515,0
+R1,CommodityPrice,2100,21.39814806,7.373485819,100,1.871299697,0
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
new file mode 100644
index 00000000..a1d71a62
--- /dev/null
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -0,0 +1,148 @@
+# Global settings - most REQUIRED
+
+time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
+foresight = 5  # Has to be a multiple of the minimum separation between the years in time framework
+regions = ["R1"]
+interest_rate = 0.1
+interpolation_mode = 'Active'
+log_level = 'info'
+excluded_commodities = ["wind"]
+# Convergence parameters
+equilibrium_variable = 'demand'
+maximum_iterations = 1
+tolerance = 0.1
+tolerance_unmet_demand = -0.1
+
+[[outputs]]
+quantity = "prices"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+
+[[outputs]]
+quantity = "capacity"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
+keep_columns = [
+    'technology',
+    'dst_region',
+    'region',
+    'agent',
+    'sector',
+    'type',
+    'year',
+    'capacity'
+]
+
+# Carbon budget control
+[carbon_budget_control]
+budget = []
+
+[global_input_files]
+projections = '{path}/input/Projections.csv'
+global_commodities = '{path}/input/GlobalCommodities.csv'
+
+[sectors.residential]
+type = 'default'
+priority = 1
+dispatch_production = 'share'
+technodata = '{path}/technodata/residential/Technodata.csv'
+commodities_in = '{path}/technodata/residential/CommIn.csv'
+commodities_out = '{path}/technodata/residential/CommOut.csv'
+
+[sectors.residential.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
+lpsolver = "scipy"  # Optional, defaults to "adhoc"
+constraints = [
+    # Optional, defaults to the constraints below
+    "max_production",
+    "max_capacity_expansion",
+    "demand",
+    "search_space"
+]
+demand_share = "new_and_retro"  # Optional, default to new_and_retro
+forecast = 5  # Optional, defaults to 5
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.residential.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+sink = 'csv'
+overwrite = true
+quantity.name = "supply"
+quantity.sum_over = "timeslice"
+quantity.drop = ["comm_usage", "units_prices"]
+
+[[sectors.residential.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.power]
+type = 'default'
+priority = 2
+dispatch_production = 'share'
+technodata = '{path}/technodata/power/Technodata.csv'
+commodities_in = '{path}/technodata/power/CommIn.csv'
+commodities_out = '{path}/technodata/power/CommOut.csv'
+
+[sectors.power.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.power.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.power.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.gas]
+type = 'default'
+priority = 3
+dispatch_production = 'share'
+technodata = '{path}/technodata/gas/Technodata.csv'
+commodities_in = '{path}/technodata/gas/CommIn.csv'
+commodities_out = '{path}/technodata/gas/CommOut.csv'
+
+[sectors.gas.subsectors.retro_and_new]
+agents = '{path}/technodata/Agents.csv'
+existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
+lpsolver = "scipy"
+
+[[sectors.gas.outputs]]
+filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
+quantity = "capacity"
+sink = 'csv'
+overwrite = true
+index = false
+
+[[sectors.gas.interactions]]
+net = 'new_to_retro'
+interaction = 'transfer'
+
+[sectors.residential_presets]
+type = 'presets'
+priority = 0
+consumption_path = "{path}/technodata/preset/*Consumption.csv"
+
+[timeslices]
+level_names = ["month", "day", "hour"]
+
+[timeslices.all-year.all-week]
+night = 1460
+morning = 1460
+afternoon = 1460
+early-peak = 1460
+late-peak = 1460
+evening = 1460
diff --git a/src/muse/data/example/default_retro/technodata/Agents.csv b/src/muse/data/example/default_retro/technodata/Agents.csv
new file mode 100644
index 00000000..26315bf8
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/Agents.csv
@@ -0,0 +1,3 @@
+AgentShare,Name,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,SpendLimit,Type
+Agent1,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,New
+Agent2,A1,R1,LCOE,,,1,,,TRUE,,,all,singleObj,1,-1,inf,Retrofit
diff --git a/src/muse/data/example/default_retro/technodata/gas/CommIn.csv b/src/muse/data/example/default_retro/technodata/gas/CommIn.csv
new file mode 100644
index 00000000..60af1f4a
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/gas/CommIn.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,0,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/gas/CommOut.csv b/src/muse/data/example/default_retro/technodata/gas/CommOut.csv
new file mode 100644
index 00000000..97520cdf
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/gas/CommOut.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,fixed,0,1,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/gas/ExistingCapacity.csv b/src/muse/data/example/default_retro/technodata/gas/ExistingCapacity.csv
new file mode 100644
index 00000000..6862d5bb
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/gas/ExistingCapacity.csv
@@ -0,0 +1,2 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gassupply1,R1,PJ/y,15,15,7.5,0,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/gas/Technodata.csv b/src/muse/data/example/default_retro/technodata/gas/Technodata.csv
new file mode 100644
index 00000000..25614cf7
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/gas/Technodata.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/default_retro/technodata/power/CommIn.csv b/src/muse/data/example/default_retro/technodata/power/CommIn.csv
new file mode 100644
index 00000000..c78f9c6e
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/power/CommIn.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,0,1.67,0,0,0
+windturbine,R1,2020,fixed,0,0,0,0,1
diff --git a/src/muse/data/example/default_retro/technodata/power/CommOut.csv b/src/muse/data/example/default_retro/technodata/power/CommOut.csv
new file mode 100644
index 00000000..03a2f4dd
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/power/CommOut.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,fixed,1,0,0,91.67,0
+windturbine,R1,2020,fixed,1,0,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/power/ExistingCapacity.csv b/src/muse/data/example/default_retro/technodata/power/ExistingCapacity.csv
new file mode 100644
index 00000000..2171d259
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/power/ExistingCapacity.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasCCGT,R1,PJ/y,1,1,0,0,0,0,0
+windturbine,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/power/Technodata.csv b/src/muse/data/example/default_retro/technodata/power/Technodata.csv
new file mode 100644
index 00000000..9d767cfa
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/power/Technodata.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/default_retro/technodata/preset/Residential2020Consumption.csv b/src/muse/data/example/default_retro/technodata/preset/Residential2020Consumption.csv
new file mode 100644
index 00000000..39eac92a
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/preset/Residential2020Consumption.csv
@@ -0,0 +1,7 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,1,0,0
+R1,gasboiler,2,0,0,1.5,0,0
+R1,gasboiler,3,0,0,1,0,0
+R1,gasboiler,4,0,0,1.5,0,0
+R1,gasboiler,5,0,0,3,0,0
+R1,gasboiler,6,0,0,2,0,0
diff --git a/src/muse/data/example/default_retro/technodata/preset/Residential2050Consumption.csv b/src/muse/data/example/default_retro/technodata/preset/Residential2050Consumption.csv
new file mode 100644
index 00000000..06ab89ab
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/preset/Residential2050Consumption.csv
@@ -0,0 +1,7 @@
+RegionName,ProcessName,Timeslice,electricity,gas,heat,CO2f,wind
+R1,gasboiler,1,0,0,3,0,0
+R1,gasboiler,2,0,0,4.5,0,0
+R1,gasboiler,3,0,0,3,0,0
+R1,gasboiler,4,0,0,4.5,0,0
+R1,gasboiler,5,0,0,9,0,0
+R1,gasboiler,6,0,0,6,0,0
diff --git a/src/muse/data/example/default_retro/technodata/residential/CommIn.csv b/src/muse/data/example/default_retro/technodata/residential/CommIn.csv
new file mode 100644
index 00000000..f72ef315
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/residential/CommIn.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,1.16,0,0,0
+heatpump,R1,2020,fixed,0.4,0,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/residential/CommOut.csv b/src/muse/data/example/default_retro/technodata/residential/CommOut.csv
new file mode 100644
index 00000000..f32c59a0
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/residential/CommOut.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
+Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,fixed,0,0,1,64.71,0
+heatpump,R1,2020,fixed,0,0,1,0,0
diff --git a/src/muse/data/example/default_retro/technodata/residential/ExistingCapacity.csv b/src/muse/data/example/default_retro/technodata/residential/ExistingCapacity.csv
new file mode 100644
index 00000000..f1520a30
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/residential/ExistingCapacity.csv
@@ -0,0 +1,3 @@
+ProcessName,RegionName,Unit,2020,2025,2030,2035,2040,2045,2050
+gasboiler,R1,PJ/y,10,5,0,0,0,0,0
+heatpump,R1,PJ/y,0,0,0,0,0,0,0
diff --git a/src/muse/data/example/default_retro/technodata/residential/Technodata.csv b/src/muse/data/example/default_retro/technodata/residential/Technodata.csv
new file mode 100644
index 00000000..aa4eb867
--- /dev/null
+++ b/src/muse/data/example/default_retro/technodata/residential/Technodata.csv
@@ -0,0 +1,4 @@
+ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/examples.py b/src/muse/examples.py
index 9bd3643f..bdf38b59 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -98,6 +98,8 @@ def copy_model(
 
     if name.lower() == "default":
         _copy_default(path)
+    elif name.lower() == "default_retro":
+        _copy_default_retro(path)
     elif name.lower() == "default_timeslice":
         _copy_default_timeslice(path)
     elif name.lower() == "medium":
@@ -288,6 +290,16 @@ def _copy_default(path: Path):
     copyfile(example_data_dir() / "default" / "settings.toml", path / "settings.toml")
 
 
+def _copy_default_retro(path: Path):
+    from shutil import copyfile, copytree
+
+    copytree(example_data_dir() / "default_retro" / "input", path / "input")
+    copytree(example_data_dir() / "default_retro" / "technodata", path / "technodata")
+    copyfile(
+        example_data_dir() / "default_retro" / "settings.toml", path / "settings.toml"
+    )
+
+
 def _copy_default_timeslice(path: Path):
     from shutil import copyfile, copytree
 
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2020.csv b/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
new file mode 100644
index 00000000..d1ee882b
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
@@ -0,0 +1,4 @@
+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_retro/Gas/Capacity/2025.csv b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..d1fb99f5
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
@@ -0,0 +1,9 @@
+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_retro/Gas/Capacity/2030.csv b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
new file mode 100644
index 00000000..e84ef6dc
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
@@ -0,0 +1,15 @@
+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_retro/Gas/Capacity/2035.csv b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..ccf34c3d
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
@@ -0,0 +1,13 @@
+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_retro/Gas/Capacity/2040.csv b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
new file mode 100644
index 00000000..79fdfddb
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
@@ -0,0 +1,11 @@
+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_retro/Gas/Capacity/2045.csv b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..b2ca194f
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
@@ -0,0 +1,9 @@
+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_retro/Gas/Capacity/2050.csv b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..4f3e3a18
--- /dev/null
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
@@ -0,0 +1,9 @@
+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_retro/MCACapacity.csv b/tests/example_outputs/default_retro/MCACapacity.csv
new file mode 100644
index 00000000..f5198d91
--- /dev/null
+++ b/tests/example_outputs/default_retro/MCACapacity.csv
@@ -0,0 +1,57 @@
+technology,dst_region,region,agent,sector,type,year,capacity
+gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2030,9.15000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
+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
+windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
+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
+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
+windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
+windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
+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
+windturbine,R1,R1,A1,power,retrofit,2050,9.15000000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv
new file mode 100644
index 00000000..d72a9e0c
--- /dev/null
+++ b/tests/example_outputs/default_retro/MCAPrices.csv
@@ -0,0 +1,169 @@
+timeslice,commodity,region,prices,year
+"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
+"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
+"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
+"('all-year', 'all-week', 'night')",electricity,R1,17.80250000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.92970000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.80250000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.92970000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.31130000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,18.05690000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,14.40060000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.58170000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.40060000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.58170000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.12530000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.05330000000,2030
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.76290000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.69860000000,2030
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,11.66880000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.88800000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.66880000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.88800000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.54600000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.51430000000,2035
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,12.10730000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.06810000000,2035
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.46950000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.71210000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.46950000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.71210000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.44080000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,42.34960000000,2040
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.95490000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,41.87300000000,2040
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,7.71450000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.97820000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.71450000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.97820000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.77020000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,34.17030000000,2045
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,8.24200000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,33.68450000000,2045
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,6.31290000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,6.59450000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,6.31290000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.59450000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.44070000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,27.56120000000,2050
+"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,6.87640000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,27.08910000000,2050
+"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2020.csv b/tests/example_outputs/default_retro/Power/Capacity/2020.csv
new file mode 100644
index 00000000..bdc2b6a7
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2020.csv
@@ -0,0 +1,16 @@
+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_retro/Power/Capacity/2025.csv b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
new file mode 100644
index 00000000..55cc9842
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
@@ -0,0 +1,24 @@
+asset,year,region,technology,installed,capacity
+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,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,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
+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
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2030.csv b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
new file mode 100644
index 00000000..a6c53c55
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
@@ -0,0 +1,30 @@
+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_retro/Power/Capacity/2035.csv b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
new file mode 100644
index 00000000..60e997ea
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
@@ -0,0 +1,36 @@
+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_retro/Power/Capacity/2040.csv b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
new file mode 100644
index 00000000..1cba828b
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
@@ -0,0 +1,42 @@
+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_retro/Power/Capacity/2045.csv b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
new file mode 100644
index 00000000..69e55cf6
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
@@ -0,0 +1,47 @@
+asset,year,region,technology,installed,capacity
+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,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+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,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,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
+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
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2050.csv b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
new file mode 100644
index 00000000..13bd77c9
--- /dev/null
+++ b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
@@ -0,0 +1,45 @@
+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_retro/Residential/Capacity/2020.csv b/tests/example_outputs/default_retro/Residential/Capacity/2020.csv
new file mode 100644
index 00000000..bcdf148c
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2020.csv
@@ -0,0 +1,6 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2025.csv b/tests/example_outputs/default_retro/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..2eb0ec15
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2025.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2030,R1,gasboiler,2025,4.10000000000
+1,2034,R1,gasboiler,2025,4.10000000000
+1,2035,R1,gasboiler,2025,4.10000000000
+1,2039,R1,gasboiler,2025,4.10000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,6.90000000000
+3,2034,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2025,6.90000000000
+3,2039,R1,heatpump,2025,6.90000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2030.csv b/tests/example_outputs/default_retro/Residential/Capacity/2030.csv
new file mode 100644
index 00000000..22334ba5
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2030.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2025,4.10000000000
+0,2034,R1,gasboiler,2025,4.10000000000
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,6.90000000000
+2,2034,R1,heatpump,2025,6.90000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2035.csv b/tests/example_outputs/default_retro/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..452c6c8a
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2035.csv
@@ -0,0 +1,17 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2025,4.10000000000
+0,2039,R1,gasboiler,2025,4.10000000000
+1,2040,R1,gasboiler,2035,0.91000000000
+1,2044,R1,gasboiler,2035,0.91000000000
+1,2045,R1,gasboiler,2035,0.91000000000
+1,2049,R1,gasboiler,2035,0.91000000000
+2,2035,R1,heatpump,2025,6.90000000000
+2,2039,R1,heatpump,2025,6.90000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,16.09000000000
+4,2044,R1,heatpump,2035,16.09000000000
+4,2045,R1,heatpump,2035,16.09000000000
+4,2049,R1,heatpump,2035,16.09000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2040.csv b/tests/example_outputs/default_retro/Residential/Capacity/2040.csv
new file mode 100644
index 00000000..e3ecc1d0
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2040.csv
@@ -0,0 +1,15 @@
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasboiler,2035,0.91000000000
+0,2044,R1,gasboiler,2035,0.91000000000
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2040,R1,heatpump,2030,25.00000000000
+1,2044,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2035,16.09000000000
+2,2044,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2035,16.09000000000
+2,2049,R1,heatpump,2035,16.09000000000
+3,2045,R1,heatpump,2040,31.00000000000
+3,2049,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2040,31.00000000000
+3,2054,R1,heatpump,2040,31.00000000000
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2045.csv b/tests/example_outputs/default_retro/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..82b22d9b
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2045.csv
@@ -0,0 +1,13 @@
+asset,year,region,technology,installed,capacity
+0,2045,R1,gasboiler,2035,0.91000000000
+0,2049,R1,gasboiler,2035,0.91000000000
+1,2045,R1,heatpump,2035,16.09000000000
+1,2049,R1,heatpump,2035,16.09000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+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
diff --git a/tests/example_outputs/default_retro/Residential/Capacity/2050.csv b/tests/example_outputs/default_retro/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..42f4be20
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Capacity/2050.csv
@@ -0,0 +1,11 @@
+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_retro/Residential/Supply/2020.csv b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
new file mode 100644
index 00000000..7b8c4061
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
@@ -0,0 +1,31 @@
+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_retro/Residential/Supply/2025.csv b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
new file mode 100644
index 00000000..bfe116d0
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
@@ -0,0 +1,43 @@
+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_retro/Residential/Supply/2030.csv b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
new file mode 100644
index 00000000..82873caa
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
@@ -0,0 +1,49 @@
+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_retro/Residential/Supply/2035.csv b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
new file mode 100644
index 00000000..741ea3c6
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
@@ -0,0 +1,49 @@
+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_retro/Residential/Supply/2040.csv b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
new file mode 100644
index 00000000..c802f340
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
@@ -0,0 +1,49 @@
+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_retro/Residential/Supply/2045.csv b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
new file mode 100644
index 00000000..c7be86b2
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
@@ -0,0 +1,37 @@
+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_retro/Residential/Supply/2050.csv b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
new file mode 100644
index 00000000..8c187153
--- /dev/null
+++ b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
@@ -0,0 +1,25 @@
+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

From d11a746c4c6896e1bde2469ce8468d3e0267b868 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 19 Jun 2024 16:02:36 +0100
Subject: [PATCH 243/419] Use default_retro model in failing notebook

---
 docs/advanced-guide/extending-muse.ipynb         | 8 ++++----
 docs/advanced-guide/further-extending-muse.ipynb | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 0924de93..b8976b02 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -169,7 +169,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Next, we  first copy the default model provided with muse to a local subfolder called \"model\". Then we read the `settings.toml` file and modify it using python. You may prefer to modify the `settings.toml` file using your favorite text editor. However, modifying the file programmatically allows us to\n",
+    "Next, we  first copy the `default_retro` model provided with muse to a local subfolder called \"model\". Then we read the `settings.toml` file and modify it using python. You may prefer to modify the `settings.toml` file using your favorite text editor. However, modifying the file programmatically allows us to\n",
     "routinely run this notebook as part of MUSE's test suite and check that the tutorial it is still up\n",
     "to date."
    ]
@@ -185,7 +185,7 @@
     "from muse import examples\n",
     "from toml import dump, load\n",
     "\n",
-    "model_path = examples.copy_model(overwrite=True)\n",
+    "model_path = examples.copy_model(name=\"default_retro\", overwrite=True)\n",
     "settings = load(model_path / \"settings.toml\")\n",
     "new_output = {\n",
     "    \"quantity\": \"consumption_zero\",\n",
@@ -366,7 +366,7 @@
     "from muse import examples\n",
     "from toml import dump, load\n",
     "\n",
-    "model_path = examples.copy_model(overwrite=True)\n",
+    "model_path = examples.copy_model(name=\"default_retro\", overwrite=True)\n",
     "settings = load(model_path / \"settings.toml\")\n",
     "new_output = {\n",
     "    \"quantity\": \"capacity\",\n",
@@ -510,7 +510,7 @@
     "from muse import examples\n",
     "from toml import dump, load\n",
     "\n",
-    "model_path = examples.copy_model(overwrite=True)\n",
+    "model_path = examples.copy_model(name=\"default_retro\", overwrite=True)\n",
     "settings = load(model_path / \"settings.toml\")\n",
     "settings[\"sectors\"][\"residential\"][\"outputs\"] = [\n",
     "    {\n",
diff --git a/docs/advanced-guide/further-extending-muse.ipynb b/docs/advanced-guide/further-extending-muse.ipynb
index 548e76f5..0a006e4f 100644
--- a/docs/advanced-guide/further-extending-muse.ipynb
+++ b/docs/advanced-guide/further-extending-muse.ipynb
@@ -217,7 +217,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.3"
   },
   "vscode": {
    "interpreter": {

From 1c498aff6f85bc497958af1c7374fad17f9d9636 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 19 Jun 2024 16:06:10 +0100
Subject: [PATCH 244/419] Fix failing wizard test

---
 tests/test_wizard.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/test_wizard.py b/tests/test_wizard.py
index 978973f6..347f9eb5 100644
--- a/tests/test_wizard.py
+++ b/tests/test_wizard.py
@@ -21,6 +21,13 @@ def model_path(tmp_path):
     return tmp_path / "model"
 
 
+@pytest.fixture
+def model_path_retro(tmp_path):
+    """Creates temporary folder containing the default_retro model."""
+    examples.copy_model(name="default_retro", path=tmp_path)
+    return tmp_path / "model"
+
+
 def test_modify_toml(tmp_path):
     """Test the modify_toml function."""
     # Create a temporary toml file
@@ -129,19 +136,19 @@ def test_add_price_data_for_new_year(model_path):
         assert "2030" in df["Time"].values
 
 
-def test_add_agent(model_path):
-    """Test the add_agent function on the default model."""
-    add_agent(model_path, "A2", "A1", "Agent3", "Agent4")
+def test_add_agent(model_path_retro):
+    """Test the add_agent function on the default_retro model."""
+    add_agent(model_path_retro, "A2", "A1", "Agent3", "Agent4")
 
     # Check if the new agent is added to the Agents.csv file
-    df = pd.read_csv(model_path / "technodata/Agents.csv")
+    df = pd.read_csv(model_path_retro / "technodata/Agents.csv")
     assert "A2" in df["Name"].values
     assert "Agent3" in df["AgentShare"].values
     assert "Agent4" in df["AgentShare"].values
 
     # Check if the retrofit agent is added to the Technodata.csv files
-    sector1_file = model_path / "technodata/power/Technodata.csv"
-    sector2_file = model_path / "technodata/gas/Technodata.csv"
+    sector1_file = model_path_retro / "technodata/power/Technodata.csv"
+    sector2_file = model_path_retro / "technodata/gas/Technodata.csv"
     df_sector1 = pd.read_csv(sector1_file)
     df_sector2 = pd.read_csv(sector2_file)
     assert "Agent4" in df_sector1.columns

From abdfd6ee473c79dd27c7a2659b2b78f7fbd4ac44 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 19 Jun 2024 16:41:33 +0100
Subject: [PATCH 245/419] Fix test_factory_smoke_test

---
 tests/test_subsector.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_subsector.py b/tests/test_subsector.py
index 356aad3b..9a0fd08d 100644
--- a/tests/test_subsector.py
+++ b/tests/test_subsector.py
@@ -129,8 +129,8 @@ def test_factory_smoke_test(model, technologies, tmp_path):
     settings = read_settings(tmp_path / "model" / "settings.toml")
 
     subsector = Subsector.factory(
-        settings.sectors.residential.subsectors.retro_and_new, technologies
+        settings.sectors.residential.subsectors.all, technologies
     )
 
     assert isinstance(subsector, Subsector)
-    assert len(subsector.agents) == 2
+    assert len(subsector.agents) == 1

From 91ad1c8cb1db715488e944633bd320ebef779e1a Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 08:58:28 +0100
Subject: [PATCH 246/419] Update GitHub URLs to point to new org

The org name was changed from SGIModel to EnergySystemsModellingLab at some point, but URLs in the code haven't been updated. While old URLs will still redirect to the right place, it's tidier if we just use the new ones. Fix this.
---
 .github/PULL_REQUEST_TEMPLATE.md              |   2 +-
 CHANGELOG.md                                  | 132 +++++++++---------
 README.md                                     |   2 +-
 docs/getting-help.rst                         |   8 +-
 docs/installation/developers.rst              |   2 +-
 docs/installation/standalone-muse.rst         |   2 +-
 docs/running-muse-example.ipynb               |   2 +-
 docs/user-guide/add-agent.ipynb               |   2 +-
 .../add-gdp-correlation-demand.ipynb          |   6 +-
 docs/user-guide/add-region.ipynb              |   6 +-
 docs/user-guide/add-solar.ipynb               |   8 +-
 .../additional-service-demand.ipynb           |   6 +-
 docs/user-guide/index.rst                     |  14 +-
 docs/user-guide/modify-timing-data.ipynb      |   4 +-
 src/muse_gui/__main__.py                      |   2 +-
 15 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 534959e7..412a1076 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@ Fixes # (issue)
 ## Type of change
 
 Please add a line in the relevant section of
-[CHANGELOG.md](https://github.com/SGIModel/StarMuse/blob/development/CHANGELOG.md) to
+[CHANGELOG.md](https://github.com/EnergySystemsModellingLab/StarMuse/blob/development/CHANGELOG.md) to
 document the change (include PR #) - note reverse order of PR #s.
 
 - [ ] New feature (non-breaking change which adds functionality)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343aec3c..45726972 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,48 +5,48 @@
 - Formatting commodity names in technodata enduse ([#237](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/237))
 - Separate publish workflow and add upload of executable to release ([#231](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/231))
 - Update main branch ([#225](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/225))
-- Notebooks in the documentation are run as tests ([#178](https://github.com/SGIModel/MUSE_OS/pull/178))
-- Tutorials in the documentation are run as tests ([#177](https://github.com/SGIModel/MUSE_OS/pull/177))
+- Notebooks in the documentation are run as tests ([#178](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/178))
+- Tutorials in the documentation are run as tests ([#177](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/177))
 - Clean notebooks before running them as tests in the documentaition ([#173](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/173))
-- Add technology-granularity to sectoral outputs ([#214](https://github.com/SGIModel/MUSE_OS/pull/214))
-- Add description to bisection method ([#149](https://github.com/SGIModel/MUSE_OS/pull/149))
-- Add description to demo cases ([#139](https://github.com/SGIModel/MUSE_OS/pull/139))
-- Run link-checker only once a week ([#148](https://github.com/SGIModel/MUSE_OS/pull/148))
-- Update documentation for installing MUSE ([#138](https://github.com/SGIModel/MUSE_OS/pull/138))
-- Updating pyproject.toml with valid python versions ([#121](https://github.com/SGIModel/MUSE_OS/pull/121))
-- Expand CI workflow ([#119](https://github.com/SGIModel/MUSE_OS/pull/119))
-- Convert setup.cfg to pyproject.toml and add entrypoint ([#118](https://github.com/SGIModel/MUSE_OS/pull/118))
-- Add GitHub action to check for broken links ([#115](https://github.com/SGIModel/MUSE_OS/pull/115))
-- Inconsistent trade case study ([#58](https://github.com/SGIModel/MUSE_OS/pull/58))
-- Update README.txt in installation path ([#57](https://github.com/SGIModel/MUSE_OS/pull/57))
-- Add tests to check the case of not using retrofit agents ([#53](https://github.com/SGIModel/MUSE_OS/pull/53))
-- Add a tutorial for caching quantities and fix a bug in the caching pipeline ([#52](https://github.com/SGIModel/MUSE_OS/pull/52))
-- Update documentation about not using retrofit ([51](https://github.com/SGIModel/MUSE_OS/pull/51))
-- Add error about not finding interaction network ([50](https://github.com/SGIModel/MUSE_OS/pull/50))
-- Add option for `standard_demand` and remove retro agents ([#35](https://github.com/SGIModel/MUSE_OS/pull/35))
-- Update main version ([#28](https://github.com/SGIModel/MUSE_OS/pull/28))
-- Update main version ([#26](https://github.com/SGIModel/MUSE_OS/pull/26))
-- Adds version numbering ([#21](https://github.com/SGIModel/MUSE_OS/pull/21))
-- Adds trade tutorial to the documentation ([#16](https://github.com/SGIModel/MUSE_OS/pull/16))
-- Adds error messages ([#42](https://github.com/SGIModel/MUSE_OS/pull/42))
-- Adds cache of quantities ([#15](https://github.com/SGIModel/MUSE_OS/pull/15))
+- Add technology-granularity to sectoral outputs ([#214](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/214))
+- Add description to bisection method ([#149](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/149))
+- Add description to demo cases ([#139](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/139))
+- Run link-checker only once a week ([#148](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/148))
+- Update documentation for installing MUSE ([#138](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/138))
+- Updating pyproject.toml with valid python versions ([#121](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/121))
+- Expand CI workflow ([#119](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/119))
+- Convert setup.cfg to pyproject.toml and add entrypoint ([#118](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/118))
+- Add GitHub action to check for broken links ([#115](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/115))
+- Inconsistent trade case study ([#58](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/58))
+- Update README.txt in installation path ([#57](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/57))
+- Add tests to check the case of not using retrofit agents ([#53](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/53))
+- Add a tutorial for caching quantities and fix a bug in the caching pipeline ([#52](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/52))
+- Update documentation about not using retrofit ([51](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/51))
+- Add error about not finding interaction network ([50](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/50))
+- Add option for `standard_demand` and remove retro agents ([#35](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/35))
+- Update main version ([#28](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/28))
+- Update main version ([#26](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/26))
+- Adds version numbering ([#21](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/21))
+- Adds trade tutorial to the documentation ([#16](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/16))
+- Adds error messages ([#42](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/42))
+- Adds cache of quantities ([#15](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/15))
 - Adds trade tutorial to the documentation
-- Updated branch names on pipelines ([#9](https://github.com/SGIModel/MUSE_OS/issues/9))
-- Edited default package name from StarMUSE to MUSE ([#4](https://github.com/SGIModel/MUSE_OS/issues/4))
-- Added new cases studies with multiple agents and spend limit ([#1](https://github.com/SGIModel/MUSE_OS/pull/1))
+- Updated branch names on pipelines ([#9](https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/9))
+- Edited default package name from StarMUSE to MUSE ([#4](https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/4))
+- Added new cases studies with multiple agents and spend limit ([#1](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/1))
 - Updates the model and the documentation to use the most recent version of MUSE
-  ([#964](https://github.com/SGIModel/StarMuse/pull/964))
+  ([#964](https://github.com/EnergySystemsModellingLab/StarMuse/pull/964))
 - Updates the model and the documentation to use the most recent version of MUSE
-  ([#963](https://github.com/SGIModel/StarMuse/pull/963))
+  ([#963](https://github.com/EnergySystemsModellingLab/StarMuse/pull/963))
 - Updates the documentation to use the most recent version of MUSE
-  ([#922](https://github.com/SGIModel/StarMuse/pull/922))
-- Updates the documentation to provide information on adhoc and scipy solvers as well as correctly defines ObjSort direction for minimisation/maximisation ([#949](https://github.com/SGIModel/StarMuse/pull/949))
-- Introduces a check on the type of the data defining the objectives (string for Objective, float/int for ObjData, and Boolean for Objsort) ([#945](https://github.com/SGIModel/StarMuse/issues/945]))
-- Updates the documentation to use the most recent version of MUSE ([#922](https://github.com/SGIModel/StarMuse/pull/922))
+  ([#922](https://github.com/EnergySystemsModellingLab/StarMuse/pull/922))
+- Updates the documentation to provide information on adhoc and scipy solvers as well as correctly defines ObjSort direction for minimisation/maximisation ([#949](https://github.com/EnergySystemsModellingLab/StarMuse/pull/949))
+- Introduces a check on the type of the data defining the objectives (string for Objective, float/int for ObjData, and Boolean for Objsort) ([#945](https://github.com/EnergySystemsModellingLab/StarMuse/issues/945]))
+- Updates the documentation to use the most recent version of MUSE ([#922](https://github.com/EnergySystemsModellingLab/StarMuse/pull/922))
 - Improves the CI system, with a more thorough pre-commit hooks and QA
-  ([#917](https://github.com/SGIModel/StarMuse/pull/917))
+  ([#917](https://github.com/EnergySystemsModellingLab/StarMuse/pull/917))
 - Introduces the CHANGELOG file and PR template
-  ([#916](https://github.com/SGIModel/StarMuse/pull/916))
+  ([#916](https://github.com/EnergySystemsModellingLab/StarMuse/pull/916))
 
 ## Optimizations
 
@@ -54,38 +54,38 @@
 
 ## Bug fixes
 
-- Update variable costs definition ([#247](https://github.com/SGIModel/MUSE_OS/pull/247))
-- Solves missing forecast update in agents ([#212](https://github.com/SGIModel/MUSE_OS/pull/212))
-- Solves missing file in tutorial 5 ([#182](https://github.com/SGIModel/MUSE_OS/pull/182))
-- Solves missing subsectors in documentation ([#146](https://github.com/SGIModel/MUSE_OS/pull/146))
-- Solves broken links in the documentation ([#137](https://github.com/SGIModel/MUSE_OS/pull/137))
-- NPV fails to align timeslices ([#135]<https://github.com/SGIModel/MUSE_OS/pull/135>)
-- OS case studies had obsolete output function removed ([#101]<https://github.com/SGIModel/MUSE_OS/pull/101>)
-- Growth constraints with destination and source region ([#96](https://github.com/SGIModel/MUSE_OS/pull/96))
-- Harmonise time dimension for asset interpolation before merging them ([#94](https://github.com/SGIModel/MUSE_OS/pull/94))
-- Error in costs reporting ([#92](https://github.com/SGIModel/MUSE_OS/pull/92))
-- Error in supply/consumption reporting ([#70](https://github.com/SGIModel/MUSE_OS/pull/70))
-- Added destination region in output ([#64](https://github.com/SGIModel/MUSE_OS/pull/64))
-- Consistency in packages use ([#38](https://github.com/SGIModel/MUSE_OS/pull/56))
-- Raise error for inconsistent commodities ([#38](https://github.com/SGIModel/MUSE_OS/issues/38))
-- Fix error in black ([#32](https://github.com/SGIModel/MUSE_OS/pull/32))
-- Fixes the dead links in the documentation now that the repository is open-sourced ([#3](https://github.com/SGIModel/MUSE_OS/issues/3))
-- Ensures that the adhoc and scipy solvers require the same input in the agents file to minimise and maximise. Specifically, both solvers now require TRUE for minimisation and FALSE for maximisation ([#845](https://github.com/SGIModel/StarMuse/issues/845))
+- Update variable costs definition ([#247](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/247))
+- Solves missing forecast update in agents ([#212](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/212))
+- Solves missing file in tutorial 5 ([#182](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/182))
+- Solves missing subsectors in documentation ([#146](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/146))
+- Solves broken links in the documentation ([#137](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/137))
+- NPV fails to align timeslices ([#135]<https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/135>)
+- OS case studies had obsolete output function removed ([#101]<https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/101>)
+- Growth constraints with destination and source region ([#96](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/96))
+- Harmonise time dimension for asset interpolation before merging them ([#94](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/94))
+- Error in costs reporting ([#92](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/92))
+- Error in supply/consumption reporting ([#70](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/70))
+- Added destination region in output ([#64](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/64))
+- Consistency in packages use ([#38](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/56))
+- Raise error for inconsistent commodities ([#38](https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/38))
+- Fix error in black ([#32](https://github.com/EnergySystemsModellingLab/MUSE_OS/pull/32))
+- Fixes the dead links in the documentation now that the repository is open-sourced ([#3](https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/3))
+- Ensures that the adhoc and scipy solvers require the same input in the agents file to minimise and maximise. Specifically, both solvers now require TRUE for minimisation and FALSE for maximisation ([#845](https://github.com/EnergySystemsModellingLab/StarMuse/issues/845))
 - Update the documentation to include a tutorial for implementing trade.
-- Update the documentation on adding spend limit constraint description ([#941](https://github.com/SGIModel/StarMuse/issues/941))
-- Fix typos in CHANGELOG file ([#939](https://github.com/SGIModel/StarMuse/pull/939))
-- Specify error message for no commodity outputs ([#937](https://github.com/SGIModel/StarMuse/issues/937))
-- Update the documentation on index redundancies ([#936](https://github.com/SGIModel/StarMuse/issues/936))
-- Update the documentation on timeslice file removed ([#935](https://github.com/SGIModel/StarMuse/issues/935))
-- Update the documentation on commodity types ([#934](https://github.com/SGIModel/StarMuse/issues/934))
-- Update the documentation on regions file removed ([#933](https://github.com/SGIModel/StarMuse/issues/933))
-- Update the documentation on commodity definition ([#932](https://github.com/SGIModel/StarMuse/issues/932))
-- Update the documentation on agent share ([#931](https://github.com/SGIModel/StarMuse/issues/931))
-- Update the documentation on equations displayed ([#930](https://github.com/SGIModel/StarMuse/issues/930))
-- Update the documentation to correctly add an agent ([#927](https://github.com/SGIModel/StarMuse/issues/927))
-- Comfort objective modified to keep asset dimensions ([#926](https://github.com/SGIModel/StarMuse/pull/926))
-- Update the documentation on growth rate ([#923](https://github.com/SGIModel/StarMuse/issues/923))
+- Update the documentation on adding spend limit constraint description ([#941](https://github.com/EnergySystemsModellingLab/StarMuse/issues/941))
+- Fix typos in CHANGELOG file ([#939](https://github.com/EnergySystemsModellingLab/StarMuse/pull/939))
+- Specify error message for no commodity outputs ([#937](https://github.com/EnergySystemsModellingLab/StarMuse/issues/937))
+- Update the documentation on index redundancies ([#936](https://github.com/EnergySystemsModellingLab/StarMuse/issues/936))
+- Update the documentation on timeslice file removed ([#935](https://github.com/EnergySystemsModellingLab/StarMuse/issues/935))
+- Update the documentation on commodity types ([#934](https://github.com/EnergySystemsModellingLab/StarMuse/issues/934))
+- Update the documentation on regions file removed ([#933](https://github.com/EnergySystemsModellingLab/StarMuse/issues/933))
+- Update the documentation on commodity definition ([#932](https://github.com/EnergySystemsModellingLab/StarMuse/issues/932))
+- Update the documentation on agent share ([#931](https://github.com/EnergySystemsModellingLab/StarMuse/issues/931))
+- Update the documentation on equations displayed ([#930](https://github.com/EnergySystemsModellingLab/StarMuse/issues/930))
+- Update the documentation to correctly add an agent ([#927](https://github.com/EnergySystemsModellingLab/StarMuse/issues/927))
+- Comfort objective modified to keep asset dimensions ([#926](https://github.com/EnergySystemsModellingLab/StarMuse/pull/926))
+- Update the documentation on growth rate ([#923](https://github.com/EnergySystemsModellingLab/StarMuse/issues/923))
 
 ## Breaking changes
 
-- Flake8 update on yaml ([#985](https://github.com/SGIModel/StarMuse/pull/985))
+- Flake8 update on yaml ([#985](https://github.com/EnergySystemsModellingLab/StarMuse/pull/985))
diff --git a/README.md b/README.md
index 82ef4f13..7a72ac47 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![PyPI status](https://img.shields.io/pypi/status/MUSE-OS.svg)](https://pypi.python.org/pypi/MUSE-OS/)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/MUSE-OS.svg)](https://pypi.python.org/pypi/MUSE-OS/)
 [![PyPI license](https://img.shields.io/pypi/l/MUSE-OS.svg)](https://pypi.python.org/pypi/MUSE-OS/)
-[![QA, tests and publishing](https://github.com/SGIModel/MUSE_OS/actions/workflows/ci.yml/badge.svg)](https://github.com/SGIModel/MUSE_OS/actions/workflows/ci.yml)
+[![QA, tests and publishing](https://github.com/EnergySystemsModellingLab/MUSE_OS/actions/workflows/ci.yml/badge.svg)](https://github.com/EnergySystemsModellingLab/MUSE_OS/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/EnergySystemsModellingLab/MUSE_OS/graph/badge.svg?token=KJFHOHMKWK)](https://codecov.io/gh/EnergySystemsModellingLab/MUSE_OS)
 
 # ModUlar energy system Simulation Environment: MUSE
diff --git a/docs/getting-help.rst b/docs/getting-help.rst
index 2a963a90..acb9f2c1 100644
--- a/docs/getting-help.rst
+++ b/docs/getting-help.rst
@@ -5,12 +5,12 @@ Getting help
 
 Using MUSE can be daunting at first. It is a very powerful tool, but unleashing all its capabilities might take some time and effort. There are several resources available to help you with that:
 
-- :ref:`customising-muse`: The tutorials - and the underlying code, `available in the GitHub repository <https://github.com/SGIModel/MUSE_OS/tree/develop/docs/tutorial-code>`_ - are the easiest way to start using MUSE and adapting it to your own needs. Look for one that looks similar to what you will need and use it as the starting point of your own simulation.
+- :ref:`customising-muse`: The tutorials - and the underlying code, `available in the GitHub repository <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/develop/docs/tutorial-code>`_ - are the easiest way to start using MUSE and adapting it to your own needs. Look for one that looks similar to what you will need and use it as the starting point of your own simulation.
 
 - The `MUSE users mailing list <https://groups.google.com/g/muse-model>`_ is your next stop to get help with MUSE. Have a look at past topics in case anyone has hit the same issue as you or open your own questions if nothing fits what you are looking for.
 
-- `GitHub Issues <https://github.com/SGIModel/MUSE_OS/issues>`_: Sometimes, the questions you are having are related to functionality that is simply not in MUSE - or even to a bug! In that case, having a look at the issues (past and still open) might help you solve your problem or steer you in the right direction.
+- `GitHub Issues <https://github.com/EnergySystemsModellingLab/MUSE_OS/issues>`_: Sometimes, the questions you are having are related to functionality that is simply not in MUSE - or even to a bug! In that case, having a look at the issues (past and still open) might help you solve your problem or steer you in the right direction.
 
-- `Opening a bug report in GitHub <https://github.com/SGIModel/MUSE_OS/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=%5BBUG%5D+>`_ is the right move if you are sure you have found something in MUSE that is plainly wrong. In such a complex, it is not unusual to find errors and counting with the collaboration of the community to spot them is essential to keep improving. Ideally, before opening a bug report, send your problem to the mailing list in case someone has already found that issue and has a solution for it or, on the contrary, can confirm that is indeed a bug. Keep in mind that it will take a while for bugs to be fixed, so this will rarely be a short term source of support. **You will need a GitHub account (it is free) to open a bug report**.
+- `Opening a bug report in GitHub <https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=%5BBUG%5D+>`_ is the right move if you are sure you have found something in MUSE that is plainly wrong. In such a complex, it is not unusual to find errors and counting with the collaboration of the community to spot them is essential to keep improving. Ideally, before opening a bug report, send your problem to the mailing list in case someone has already found that issue and has a solution for it or, on the contrary, can confirm that is indeed a bug. Keep in mind that it will take a while for bugs to be fixed, so this will rarely be a short term source of support. **You will need a GitHub account (it is free) to open a bug report**.
 
-- `Open a feature request in GitHub <https://github.com/SGIModel/MUSE_OS/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.md&title=>`_ if, despite al the functionality built in MUSE, there is something that is missing and that you think will be useful. As before, it would be ideal if this is sent before to the mailing list to get an idea of the appetite for such a new feature in the community. **You will need a GitHub account (it is free) to open a feature request**.
+- `Open a feature request in GitHub <https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.md&title=>`_ if, despite al the functionality built in MUSE, there is something that is missing and that you think will be useful. As before, it would be ideal if this is sent before to the mailing list to get an idea of the appetite for such a new feature in the community. **You will need a GitHub account (it is free) to open a feature request**.
diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 905d849c..865329b4 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -12,7 +12,7 @@ Once you have ``git`` in your system, clone the MUSE repository with:
 
 .. code-block:: bash
 
-    git clone https://github.com/SGIModel/MUSE_OS.git
+    git clone https://github.com/EnergySystemsModellingLab/MUSE_OS.git
 
 
 For developing MUSE, **it is highly recommended to use virtual environments**, so that you have more control on the versions of the dependencies being used, making easy to change them without affecting other tools using Python, or even to have several environments in parallel for different purposes (Eg. new features, bug fixing...). You can either use ``conda`` or ``venv`` as explained in :ref:`virtual-environments`.
diff --git a/docs/installation/standalone-muse.rst b/docs/installation/standalone-muse.rst
index 301ca723..309f49fe 100644
--- a/docs/installation/standalone-muse.rst
+++ b/docs/installation/standalone-muse.rst
@@ -7,7 +7,7 @@ MUSE is available as a standalone application for Windows that bundles together
 
 To get and install the standalone version of MUSE simply:
 
-- Go to the `releases page in GitHub <https://github.com/SGIModel/MUSE_OS/releases>`_ and download the standalone bundle for the release you are interested. Note that **there are bundles only from MUSE v1.1.0 onwards**, and it might be that not all releases have a bundle.
+- Go to the `releases page in GitHub <https://github.com/EnergySystemsModellingLab/MUSE_OS/releases>`_ and download the standalone bundle for the release you are interested. Note that **there are bundles only from MUSE v1.1.0 onwards**, and it might be that not all releases have a bundle.
 - Unzip it to a known location in your drive, eg. ``Documents/Programs/MUSE``
 
 Inside the resulting directory you will see many files and documents related to Python and MUSE dependencies. Look for ``muse.exe`` and ``muse_gui.exe``, which are the two executables of interest, one to run MUSE in the terminal (and therefore only makes sense to execute from the terminal!) and another to run the graphical user interface (GUI) of MUSE. Just double click in ``muse_gui.exe`` and you should see the main MUSE GUI, like the following:
diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index 2615eae1..f510e42c 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -6,7 +6,7 @@
    "source": [
     "# Running your first example\n",
     "\n",
-    "In this section we run an example simulation of MUSE and visualise the results. There are a number of different examples in the source code, which can be found [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code). Depending on [how you installed MUSE](installation/index.rst), there are two scenarios for running MUSE:\n",
+    "In this section we run an example simulation of MUSE and visualise the results. There are a number of different examples in the source code, which can be found [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code). Depending on [how you installed MUSE](installation/index.rst), there are two scenarios for running MUSE:\n",
     "\n",
     "- **Running the model and then analysing the data separately**. This is available for any of the installation methods.\n",
     "- **Running the model programmatically and analysing the data in the same session**. This is only possible if MUSE was installed using a virtual environment, either as [user](installation/virtual-env-based.rst) or [developer](installation/virtual-env-based.rst).\n",
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 89ad3598..dac394d2 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -26,7 +26,7 @@
     "\n",
     "Also notice that we amend the `Quantity` column. The reason for this is that we want to specify that Agent A1 makes up 50% of the population, and A2 makes up the remaining 50% of the population.\n",
     "\n",
-    "Again, we only show some of the columns due to space constraints, however see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv) for the full file.\n",
+    "Again, we only show some of the columns due to space constraints, however see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/2-add-agent/1-single-objective/technodata/Agents.csv) for the full file.\n",
     "\n",
     "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n",
     "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index bf6b2583..a530058e 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -46,11 +46,11 @@
     "\n",
     "The example files for each of those just mentioned can be found below, respectively:\n",
     "\n",
-    "- [Macrodrivers.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv)\n",
+    "- [Macrodrivers.csv](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/Macrodrivers.csv)\n",
     "\n",
-    "- [regressionparameters.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv)\n",
+    "- [regressionparameters.csv](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/regressionparameters.csv)\n",
     "\n",
-    "- [TimesliceSharepreset.csv](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv)\n",
+    "- [TimesliceSharepreset.csv](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/preset/TimesliceSharepreset.csv)\n",
     "\n",
     "For a full introduction to these files, see the link [here](../inputs/correlation_files.rst).\n",
     "\n",
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index f9e3025f..4d12b686 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -23,7 +23,7 @@
     "\n",
     "The process to change the input files, however, takes a bit more time. To achieve this, there must be data for each of the sectors for the new region. This, therefore, requires the modification of every [input file](../inputs/index.rst).\n",
     "\n",
-    "Due to space constraints, we will not show you how to edit all of the files. However, you can access the modified files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
+    "Due to space constraints, we will not show you how to edit all of the files. However, you can access the modified files [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
    ]
   },
   {
@@ -34,7 +34,7 @@
     "\n",
     "We have placed two examples as to how to edit the residential sector below. Again, the edited data are highlighted in **bold**, with the original data in normal text. \n",
     "\n",
-    "For the sake of brevity, we have omitted the entries for 2040 for the `CommIn.csv` file, however, just make sure to copy and paste the values for 2020 to 2040 here. The full file can be seen [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv). \n",
+    "For the sake of brevity, we have omitted the entries for 2040 for the `CommIn.csv` file, however, just make sure to copy and paste the values for 2020 to 2040 here. The full file can be seen [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommIn.csv). \n",
     "\n",
     "The following file is the modified ```/technodata/residential/CommIn.csv``` file:\n",
     "\n",
@@ -74,7 +74,7 @@
     "\n",
     "Now, go ahead and amend all of the other input files for each of the sectors by copying and pasting the rows from `R1` and replacing the `RegionName` to `R2` for the new rows. You must also modify the `BaseYearExport.csv`, `BaseYearImport.csv` and `Projections.csv` files in the `input` folder in a similar way. In this example we won't include any trade between regions, so all values in `BaseYearExport.csv` and `BaseYearImport.csv` should be left as zero.\n",
     "\n",
-    "All of the edited input files can be seen [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
+    "All of the edited input files can be seen [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/3-add-region/1-new-region)."
    ]
   },
   {
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 36be5962..8701c4e1 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -155,7 +155,7 @@
    "source": [
     "Here, we will only define the parameters: ```processName```, ```RegionName```, ```Time```, ```Level```,```cap_par```, ```Fuel```,```EndUse```,```Agent2``` and ```Agent1```\n",
     "\n",
-    "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```Technodata.csv``` file for brevity. You can see the full file [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
+    "We shall copy the existing parameters from the ```windturbine``` technology for the remaining parameters that can be seen in the ```Technodata.csv``` file for brevity. You can see the full file [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv).\n",
     "\n",
     "Again, flat forward extension is used here. Therefore, as in this example we only provide data for the benchmark year 2020. 2025 and the following benchmark years will keep the same characteristics, e.g. costs, for each benchmark year of the simulation."
    ]
@@ -185,7 +185,7 @@
    "source": [
     "Next, navigate to the ```input``` folder.\n",
     "\n",
-    "We must now edit each of the files found here to add the new solar commodity. Due to space constraints we will not display all of the entries contained in the input files. The edited files can be viewed [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/1-introduction) however."
+    "We must now edit each of the files found here to add the new solar commodity. Due to space constraints we will not display all of the entries contained in the input files. The edited files can be viewed [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/1-introduction) however."
    ]
   },
   {
@@ -423,7 +423,7 @@
     "|solarPV|R1|2020|fixed|0|0|0|0|0|1|\n",
     "|**solarPV**|**R1**|**2040**|**fixed**|**0**|**0**|**0**|**0**|**0**|**1**|\n",
     "\n",
-    "We must do the same for the `CommOut.csv` file. For the sake of brevity we won't show you this, but the link to the file can be found [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv).\n",
+    "We must do the same for the `CommOut.csv` file. For the sake of brevity we won't show you this, but the link to the file can be found [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv).\n",
     "\n",
     "We will now rerun the simulation, using the same command as previously and visualise the new results."
    ]
@@ -467,7 +467,7 @@
    "source": [
     "From the results, we can see that `windturbine` now outcompetes `solarPV` in the year 2025. However, between the years 2025 and 2050, as the cost of `solarPV` decreases, the share of `solarPV` begins to increase.\n",
     "\n",
-    "For the full example with the completed input files see [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)"
+    "For the full example with the completed input files see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology/2-scenario)"
    ]
   },
   {
diff --git a/docs/user-guide/additional-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb
index 3a0c1a0c..8bddef33 100644
--- a/docs/user-guide/additional-service-demand.ipynb
+++ b/docs/user-guide/additional-service-demand.ipynb
@@ -67,7 +67,7 @@
    "source": [
     "As can be seen, we only need to add a `cook` column in the file, as well as the demand level for each timeslice and each region. This can be seen through the addition of a positive number in the `cook` column.\n",
     "\n",
-    "The process is very similar for the `Residential2050Consumption.csv` file: again we copy the values over from the `heat` column. For the complete file see the link [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
+    "The process is very similar for the `Residential2050Consumption.csv` file: again we copy the values over from the `heat` column. For the complete file see the link [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/preset/Residential2050Consumption.csv)."
    ]
   },
   {
@@ -161,7 +161,7 @@
     "|**gas_stove**|**R2**|**2020**|**fixed**|**3.8**|**…**|**gas**|**cook**|**1**|\n",
     "\n",
     "\n",
-    "As can be seen we have added two technologies, in the two regions with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)."
+    "As can be seen we have added two technologies, in the two regions with different `cap_par` costs. We specified their respective fuels, and the enduse for both is `cook`. For the full file please see [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv)."
    ]
   },
   {
@@ -191,7 +191,7 @@
     "|solarPV|R2|…|**4**|**2**|**120**|…|1|\n",
     "|...|...|...|...|...|...|...|...|\n",
     "\n",
-    "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). "
+    "To prevent repetition of the [\"adding a new technology\"](add-solar.ipynb) section, we will leave the full files [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand/1-exogenous-demand). "
    ]
   },
   {
diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst
index 7dc6f125..2b2537a4 100644
--- a/docs/user-guide/index.rst
+++ b/docs/user-guide/index.rst
@@ -46,46 +46,46 @@ In the table below, you will notice a x2 after some of the technology tuples. Th
       - [gasboiler, heatpump]
       - [gasCCGT, windturbine, solarPV]
       - [gassuply1]
-      - `[1] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology>`_
+      - `[1] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/1-add-new-technology>`_
    *  - 2
       - [A1, A2]
       - [R1]
       - [gasboiler, heatpump]
       - [gasCCGT, windturbine, solarPV]
       - [gassuply1]
-      - `[2] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/2-add-agent>`_
+      - `[2] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/2-add-agent>`_
    *  - 3
       - [A1, A2] x2
       - [R1, R2]
       - [gasboiler, heatpump] x2
       - [gasCCGT, windturbine, solarPV] x2
       - [gassuply1] x2
-      - `[3] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/3-add-region>`_
+      - `[3] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/3-add-region>`_
    *  - 4
       - [A1, A2] x2
       - [R1, R2]
       - [gasboiler, heatpump] x2
       - [gasCCGT, windturbine, solarPV] x2
       - [gassuply1] x2
-      - `[4] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/4-modify-timing-data>`_
+      - `[4] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/4-modify-timing-data>`_
    *  - 5
       - [A1, A2] x2
       - [R1, R2]
       - [gasboiler, heatpump, electric_stove, gas_stove] x2
       - [gasCCGT, windturbine, solarPV] x2
       - [gassuply1] x2
-      - `[5] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand>`_
+      - `[5] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/5-add-service-demand>`_
    *  - 6
       - [A1]
       - [R1]
       - [gasboiler, heatpump]
       - [gasCCGT, windturbine, solarPV]
       - [gassuply1]
-      - `[6] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/6-add-correlation-demand>`_
+      - `[6] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/6-add-correlation-demand>`_
    *  - 7
       - [A1]
       - [R1]
       - [gasboiler, heatpump]
       - [gasCCGT, windturbine]
       - [gassuply1]
-      - `[7] <https://github.com/SGIModel/MUSE_OS/tree/main/docs/tutorial-code/7-min-max-timeslice-constraints>`_
+      - `[7] <https://github.com/EnergySystemsModellingLab/MUSE_OS/tree/main/docs/tutorial-code/7-min-max-timeslice-constraints>`_
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 0d232111..a9dd54ae 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -74,7 +74,7 @@
     "\n",
     "The `ProcessName` must be reported, but it is not binding on the results. It is just the way that the model reads the input data.\n",
     "\n",
-    "We do the same for the ```Residential2050Consumption.csv```, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file."
+    "We do the same for the ```Residential2050Consumption.csv```, but set the demand in 2050 to be triple that of 2020 in every timeslice. See [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/preset/Residential2050Consumption.csv) for the full file."
    ]
   },
   {
@@ -209,7 +209,7 @@
     "\n",
     "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",
-    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/SGIModel/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n"
+    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n"
    ]
   },
   {
diff --git a/src/muse_gui/__main__.py b/src/muse_gui/__main__.py
index 202e1fa5..96975bd6 100644
--- a/src/muse_gui/__main__.py
+++ b/src/muse_gui/__main__.py
@@ -57,7 +57,7 @@
             {
                 "type": "Link",
                 "menuTitle": "Log a question in GitHub",
-                "url": "https://github.com/SGIModel/MUSE_OS/issues/new/choose",
+                "url": "https://github.com/EnergySystemsModellingLab/MUSE_OS/issues/new/choose",
             },
             {
                 "type": "AboutDialog",

From d8b36b37632c32310bce64743277961dfe98c19e Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 09:29:09 +0100
Subject: [PATCH 247/419] pyproject.toml: Make @ahawkes author

---
 pyproject.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c1b5d5f9..c1dd87eb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,9 @@ requires = ["setuptools>=61", "wheel", "setuptools_scm>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
-authors = [{name = "Sustainable Gas Institute", email = "sgi@imperial.ac.uk"}]
+authors = [
+    {name = "Hawkes Research Group @ Chemical Engineering, Imperial College London", email = "a.hawkes@imperial.ac.uk"}
+]
 name = "MUSE_OS"
 description = "Energy System Model"
 readme = "README.md"

From 1ad584569496d03bb5ee972f672b724aab5bbc64 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 09:30:27 +0100
Subject: [PATCH 248/419] Add RSE team as author

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c1dd87eb..7bfd7ae2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 authors = [
-    {name = "Hawkes Research Group @ Chemical Engineering, Imperial College London", email = "a.hawkes@imperial.ac.uk"}
+    {name = "Hawkes Research Group @ Chemical Engineering, Imperial College London", email = "a.hawkes@imperial.ac.uk"},
+    {name = "Imperial College London RSE Team", email = "ict-rse-team@imperial.ac.uk"}
 ]
 name = "MUSE_OS"
 description = "Energy System Model"

From 27d6e08b9e23ddc561400018f6207dc37cf3cb57 Mon Sep 17 00:00:00 2001
From: Alex Dewar <alexdewar@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:46:22 +0100
Subject: [PATCH 249/419] Fix URL for old repo in PR template

Co-authored-by: Tom Bland <t.bland@imperial.ac.uk>
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 412a1076..9c7f5603 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@ Fixes # (issue)
 ## Type of change
 
 Please add a line in the relevant section of
-[CHANGELOG.md](https://github.com/EnergySystemsModellingLab/StarMuse/blob/development/CHANGELOG.md) to
+[CHANGELOG.md](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/development/CHANGELOG.md) to
 document the change (include PR #) - note reverse order of PR #s.
 
 - [ ] New feature (non-breaking change which adds functionality)

From 19c9b713663321a43e2fc71a6a8e8702773f7edd Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Thu, 20 Jun 2024 13:30:48 +0100
Subject: [PATCH 250/419] Enable customisation of constraints

---
 src/muse/constraints.py                               | 2 +-
 src/muse/data/example/default/settings.toml           | 3 ++-
 src/muse/data/example/default_timeslice/settings.toml | 3 ++-
 src/muse/sectors/subsector.py                         | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 67701269..9872044b 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -225,7 +225,7 @@ def factory(
     """
     from functools import partial
 
-    if settings is None:
+    if not settings:
         settings = (
             "max_production",
             "max_capacity_expansion",
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index a1d71a62..ea55d711 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index 585d142d..29622f6b 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -61,7 +61,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py
index 4c8f221f..f8b9d5d4 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -191,6 +191,7 @@ def factory(
             # only used by self-investing agents
             investment=getattr(settings, "lpsolver", "adhoc"),
             forecast=getattr(settings, "forecast", 5),
+            constraints=getattr(settings, "constraints", ()),
         )
         # technologies can have nans where a commodity
         # does not apply to a technology at all

From e2e6888367b475e371745e00b6ad109e148cb841 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Thu, 20 Jun 2024 14:04:46 +0100
Subject: [PATCH 251/419] Enable pyupgrade in ruff and fix the issues that pop
 up

---
 docs/advanced-guide/extending-muse.ipynb      |  18 +--
 docs/conf.py                                  |   3 +-
 .../3-add-region/visualise-new-region.ipynb   |   2 +-
 .../visualise-time-framework-changes.ipynb    |   2 +-
 .../visualise-timing-result-changes.ipynb     |   2 +-
 .../visualise-service-demand-addition.ipynb   |   2 +-
 .../visualise-correlation-demand.ipynb        |   2 +-
 .../1-min-constraint/output.py                |  10 +-
 .../2-max-constraint/output.py                |  10 +-
 pyproject.toml                                |   4 +
 src/muse/agents/agent.py                      |  19 +--
 src/muse/agents/factories.py                  |  91 +++++------
 src/muse/carbon_budget.py                     |  11 +-
 src/muse/commodities.py                       |  13 +-
 src/muse/constraints.py                       |  67 ++++----
 .../data/example/default_timeslice/output.py  |  10 +-
 src/muse/decisions.py                         |  36 ++---
 src/muse/decorators.py                        |   7 +-
 src/muse/demand_matching.py                   |   4 +-
 src/muse/demand_share.py                      |  26 ++--
 src/muse/examples.py                          |  34 ++---
 src/muse/filters.py                           |  29 ++--
 src/muse/hooks.py                             |  15 +-
 src/muse/interactions.py                      |  21 +--
 src/muse/investments.py                       |  41 +++--
 src/muse/mca.py                               |  57 ++++---
 src/muse/objectives.py                        |  23 ++-
 src/muse/outputs/cache.py                     |  63 ++++----
 src/muse/outputs/mca.py                       |  92 ++++++-----
 src/muse/outputs/sector.py                    |  43 +++---
 src/muse/outputs/sinks.py                     |  37 +++--
 src/muse/production.py                        |  19 +--
 src/muse/quantities.py                        |  15 +-
 src/muse/readers/__init__.py                  |   6 +-
 src/muse/readers/csv.py                       | 143 +++++++++---------
 src/muse/readers/toml.py                      |  98 ++++++------
 src/muse/registration.py                      |  13 +-
 src/muse/regressions.py                       |  84 +++++-----
 src/muse/sectors/abstract.py                  |   4 +-
 src/muse/sectors/legacy_sector.py             |  41 ++---
 src/muse/sectors/preset_sector.py             |  14 +-
 src/muse/sectors/register.py                  |  15 +-
 src/muse/sectors/sector.py                    |  40 +++--
 src/muse/sectors/subsector.py                 |  39 ++---
 src/muse/timeslices.py                        |  38 ++---
 src/muse/utilities.py                         |  55 +++----
 src/muse/wizard.py                            |   4 +-
 tests/conftest.py                             |   9 +-
 tests/test_aggregoutput.py                    |   4 +-
 tests/test_demand_share.py                    |  14 +-
 tests/test_docs_notebooks.py                  |   3 +-
 tests/test_legacy_sector.py                   |   4 +-
 tests/test_mca.py                             |   2 +-
 tests/test_outputs.py                         |  12 +-
 tests/test_quantities.py                      |   3 +-
 tests/test_readers.py                         |   4 +-
 tests/test_subsector.py                       |   8 +-
 tests/test_timeslices.py                      |   6 +-
 tests/test_trade.py                           |   5 +-
 tests/test_utilities.py                       |   4 +-
 tests/test_wizard.py                          |   4 +-
 61 files changed, 712 insertions(+), 792 deletions(-)

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 897745af..7d30313c 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -89,7 +89,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import List, Optional, Text\n",
+    "from typing import Optional\n",
     "\n",
     "from muse.outputs.sector import market_quantity, register_output_quantity\n",
     "from xarray import DataArray, Dataset\n",
@@ -137,7 +137,7 @@
     "\n",
     "@register_output_sink(name=\"txt\")\n",
     "@sink_to_file(\".txt\")\n",
-    "def text_dump(data: Any, filename: Text) -> None:\n",
+    "def text_dump(data: Any, filename: str) -> None:\n",
     "    from pathlib import Path\n",
     "\n",
     "    Path(filename).write_text(f\"Hello world!\\n\\n{data}\")"
@@ -286,7 +286,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import MutableMapping, Text\n",
+    "from collections.abc import MutableMapping\n",
     "\n",
     "import pandas as pd\n",
     "import xarray as xr\n",
@@ -295,13 +295,13 @@
     "\n",
     "@register_cached_quantity(overwrite=True)\n",
     "def capacity(\n",
-    "    cached: List[xr.DataArray],\n",
-    "    agents: MutableMapping[Text, MutableMapping[Text, Text]],\n",
+    "    cached: list[xr.DataArray],\n",
+    "    agents: MutableMapping[str, MutableMapping[str, str]],\n",
     ") -> pd.DataFrame:\n",
     "    \"\"\"Consolidates the cached capacity into a single DataFrame to save.\n",
     "\n",
     "    Args:\n",
-    "        cached (List[xr.DataArray]): The list of cached arrays during the calculation of\n",
+    "        cached (list[xr.DataArray]): The list of cached arrays during the calculation of\n",
     "        the time period with the capacity.\n",
     "        agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata.\n",
     "\n",
@@ -453,8 +453,8 @@
     "    market: Dataset,\n",
     "    capacity: DataArray,\n",
     "    technologies: Dataset,\n",
-    "    sum_over: Optional[List[Text]] = None,\n",
-    "    drop: Optional[List[Text]] = None,\n",
+    "    sum_over: Optional[list[str]] = None,\n",
+    "    drop: Optional[list[str]] = None,\n",
     "    rounding: int = 4,\n",
     "):\n",
     "    \"\"\"Current consumption.\"\"\"\n",
@@ -469,7 +469,7 @@
     "\n",
     "@register_output_sink(name=\"txt\", overwrite=True)\n",
     "@sink_to_file(\".txt\")\n",
-    "def text_dump(data: Any, filename: Text, msg: Optional[Text] = \"Hello, world!\") -> None:  # noqa: F811\n",
+    "def text_dump(data: Any, filename: str, msg: Optional[str] = \"Hello, world!\") -> None:  # noqa: F811\n",
     "    from pathlib import Path\n",
     "\n",
     "    Path(filename).write_text(f\"{msg}\\n\\n{data}\")"
diff --git a/docs/conf.py b/docs/conf.py
index 5512f9f2..58af920d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,7 +4,6 @@
 # list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 # -- Project information -----------------------------------------------------
-from typing import List
 
 project = "MUSE"
 copyright = "2022, Sustainable Gas Institute"
@@ -54,7 +53,7 @@
     "xarray": ("http://xarray.pydata.org/en/stable/", None),
 }
 
-bibtex_bibfiles: List[str] = []
+bibtex_bibfiles: list[str] = []
 
 # -- GraphViz configuration ----------------------------------
 graphviz_output_format = "svg"
diff --git a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
index 46ca83e1..e1099fea 100644
--- a/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
+++ b/docs/tutorial-code/3-add-region/visualise-new-region.ipynb
@@ -41,7 +41,7 @@
     ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    g = sns.FacetGrid(data=sector, col=\"region\")\n",
     "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "    g.add_legend()\n",
diff --git a/docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb
index 9c27622c..37f2daee 100644
--- a/docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb
@@ -26,7 +26,7 @@
     "limits = [20, 20, 60]\n",
     "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    fig, ax = plt.subplots(1, 2)\n",
     "    sns.lineplot(\n",
     "        data=sector[sector.region == \"R1\"],\n",
diff --git a/docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb b/docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb
index be79fea0..f1c78d46 100644
--- a/docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb
+++ b/docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb
@@ -25,7 +25,7 @@
     ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "\n",
     "    fig, ax = plt.subplots(1, 2)\n",
     "    sns.lineplot(\n",
diff --git a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
index 8c7514b7..f91011a7 100644
--- a/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
+++ b/docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb
@@ -26,7 +26,7 @@
     "limits = [20, 70, 60]\n",
     "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    fig, ax = plt.subplots(1, 2)\n",
     "    sns.lineplot(\n",
     "        data=sector[sector.region == \"R1\"],\n",
diff --git a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
index 9d71ae1a..7351d8f1 100644
--- a/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
+++ b/docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb
@@ -33,7 +33,7 @@
    "outputs": [],
    "source": [
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    sns.lineplot(\n",
     "        data=sector[sector.region == \"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
     "    )\n",
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
index 1b5785cb..95459f1f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py
@@ -1,4 +1,4 @@
-from typing import List, Optional, Text
+from typing import Optional
 
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
@@ -9,8 +9,8 @@ def supply_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
@@ -29,8 +29,8 @@ def consumption_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current consumption."""
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
index 1b5785cb..95459f1f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py
@@ -1,4 +1,4 @@
-from typing import List, Optional, Text
+from typing import Optional
 
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
@@ -9,8 +9,8 @@ def supply_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
@@ -29,8 +29,8 @@ def consumption_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current consumption."""
diff --git a/pyproject.toml b/pyproject.toml
index 7bfd7ae2..3500fe72 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -108,12 +108,16 @@ files = ["src/**/*.py", "tests/**/*.py"]
 module = ["setup"]
 ignore_errors = true
 
+[tool.ruff]
+target-version = "py39"
+
 [tool.ruff.lint]
 select = [
     "D",  # pydocstyle
     "E",  # pycodestyle
     "F",  # Pyflakes
     "I",  # isort
+    "UP",  # Pyupgrade
     "RUF"  # Ruff's own checks
 ]
 ignore = [
diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index c5b27d8e..8146711b 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -1,7 +1,8 @@
 """Holds all building agents."""
 
 from abc import ABC, abstractmethod
-from typing import Callable, Optional, Sequence, Text, Union
+from collections.abc import Sequence
+from typing import Callable, Optional, Union
 
 import xarray as xr
 
@@ -14,11 +15,11 @@ class AbstractAgent(ABC):
 
     def __init__(
         self,
-        name: Text = "Agent",
-        region: Text = "",
+        name: str = "Agent",
+        region: str = "",
         assets: Optional[xr.Dataset] = None,
-        interpolation: Text = "linear",
-        category: Optional[Text] = None,
+        interpolation: str = "linear",
+        category: Optional[str] = None,
         quantity: Optional[float] = 1,
     ):
         """Creates a standard MUSE agent.
@@ -102,10 +103,10 @@ class Agent(AbstractAgent):
 
     def __init__(
         self,
-        name: Text = "Agent",
-        region: Text = "USA",
+        name: str = "Agent",
+        region: str = "USA",
         assets: Optional[xr.Dataset] = None,
-        interpolation: Text = "linear",
+        interpolation: str = "linear",
         search_rules: Optional[Callable] = None,
         objectives: Optional[Callable] = None,
         decision: Optional[Callable] = None,
@@ -115,7 +116,7 @@ def __init__(
         housekeeping: Optional[Callable] = None,
         merge_transform: Optional[Callable] = None,
         demand_threshhold: Optional[float] = None,
-        category: Optional[Text] = None,
+        category: Optional[str] = None,
         asset_threshhold: float = 1e-4,
         quantity: Optional[float] = 1,
         spend_limit: int = 0,
diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py
index 91620cbe..efd7056f 100644
--- a/src/muse/agents/factories.py
+++ b/src/muse/agents/factories.py
@@ -1,7 +1,8 @@
 """Holds all building agents."""
 
+from collections.abc import Mapping, Sequence
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence, Text, Union
+from typing import Any, Callable, Optional, Union
 
 import xarray as xr
 
@@ -14,9 +15,9 @@ def create_standard_agent(
     technologies: xr.Dataset,
     capacity: xr.DataArray,
     year: int,
-    region: Text,
-    share: Optional[Text] = None,
-    interpolation: Text = "linear",
+    region: str,
+    share: Optional[str] = None,
+    interpolation: str = "linear",
     **kwargs,
 ):
     """Creates retrofit agent from muse primitives."""
@@ -46,11 +47,11 @@ def create_standard_agent(
 def create_retrofit_agent(
     technologies: xr.Dataset,
     capacity: xr.DataArray,
-    share: Text,
+    share: str,
     year: int,
-    region: Text,
-    interpolation: Text = "linear",
-    decision: Union[Callable, Text, Mapping] = "mean",
+    region: str,
+    interpolation: str = "linear",
+    decision: Union[Callable, str, Mapping] = "mean",
     **kwargs,
 ):
     """Creates retrofit agent from muse primitives."""
@@ -59,7 +60,7 @@ def create_retrofit_agent(
     from muse.filters import factory as filter_factory
 
     if not callable(decision):
-        name = decision if isinstance(decision, Text) else decision["name"]
+        name = decision if isinstance(decision, str) else decision["name"]
         unusual = {"lexo", "lexical_comparison", "epsilon_constaints", "epsilon"}
         if name in unusual:
             msg = (
@@ -91,13 +92,13 @@ def create_retrofit_agent(
 def create_newcapa_agent(
     capacity: xr.DataArray,
     year: int,
-    region: Text,
-    share: Text,
-    search_rules: Union[Text, Sequence[Text]] = "all",
-    interpolation: Text = "linear",
-    merge_transform: Union[Text, Mapping, Callable] = "new",
+    region: str,
+    share: str,
+    search_rules: Union[str, Sequence[str]] = "all",
+    interpolation: str = "linear",
+    merge_transform: Union[str, Mapping, Callable] = "new",
     quantity: float = 0.3,
-    housekeeping: Union[Text, Mapping, Callable] = "noop",
+    housekeeping: Union[str, Mapping, Callable] = "noop",
     retrofit_present: bool = True,
     **kwargs,
 ):
@@ -161,7 +162,7 @@ def create_newcapa_agent(
     return result
 
 
-def create_agent(agent_type: Text, **kwargs) -> Agent:
+def create_agent(agent_type: str, **kwargs) -> Agent:
     method = {
         "retrofit": create_retrofit_agent,
         "newcapa": create_newcapa_agent,
@@ -173,14 +174,14 @@ def create_agent(agent_type: Text, **kwargs) -> Agent:
 
 
 def factory(
-    existing_capacity_path: Optional[Union[Path, Text]] = None,
-    agent_parameters_path: Optional[Union[Path, Text]] = None,
-    technodata_path: Optional[Union[Path, Text]] = None,
-    technodata_timeslices_path: Optional[Union[Text, Path]] = None,
-    sector: Optional[Text] = None,
-    sectors_directory: Union[Text, Path] = DEFAULT_SECTORS_DIRECTORY,
+    existing_capacity_path: Optional[Union[Path, str]] = None,
+    agent_parameters_path: Optional[Union[Path, str]] = None,
+    technodata_path: Optional[Union[Path, str]] = None,
+    technodata_timeslices_path: Optional[Union[str, Path]] = None,
+    sector: Optional[str] = None,
+    sectors_directory: Union[str, Path] = DEFAULT_SECTORS_DIRECTORY,
     baseyear: int = 2010,
-) -> List[Agent]:
+) -> list[Agent]:
     """Reads list of agents from standard MUSE input files."""
     from copy import deepcopy
     from logging import getLogger
@@ -201,22 +202,22 @@ def factory(
 
     if existing_capacity_path is None:
         existing_capacity_path = find_sectors_file(
-            "Existing%s.csv" % sector, sector, sectors_directory
+            f"Existing{sector}.csv", sector, sectors_directory
         )
     if agent_parameters_path is None:
         agent_parameters_path = find_sectors_file(
-            "BuildingAgent%s.csv" % sector, sector, sectors_directory
+            f"BuildingAgent{sector}.csv", sector, sectors_directory
         )
     if technodata_path is None:
         technodata_path = find_sectors_file(
-            "technodata%s.csv" % sector, sector, sectors_directory
+            f"technodata{sector}.csv", sector, sectors_directory
         )
 
     params = read_csv_agent_parameters(agent_parameters_path)
     techno = read_technodictionary(technodata_path)
     capa = read_initial_assets(existing_capacity_path)
     if technodata_timeslices_path and isinstance(
-        technodata_timeslices_path, (Text, Path)
+        technodata_timeslices_path, (str, Path)
     ):
         technodata_timeslices = read_technodata_timeslices(technodata_timeslices_path)
     else:
@@ -263,24 +264,24 @@ def factory(
 
 
 def agents_factory(
-    params_or_path: Union[Text, Path, List],
-    capacity: Union[xr.DataArray, Text, Path],
+    params_or_path: Union[str, Path, list],
+    capacity: Union[xr.DataArray, str, Path],
     technologies: xr.Dataset,
-    regions: Optional[Sequence[Text]] = None,
+    regions: Optional[Sequence[str]] = None,
     year: Optional[int] = None,
     **kwargs,
-) -> List[Agent]:
+) -> list[Agent]:
     """Creates a list of agents for the chosen sector."""
     from copy import deepcopy
     from logging import getLogger
 
     from muse.readers import read_csv_agent_parameters, read_initial_assets
 
-    if isinstance(params_or_path, (Text, Path)):
+    if isinstance(params_or_path, (str, Path)):
         params = read_csv_agent_parameters(params_or_path)
     else:
         params = params_or_path
-    if isinstance(capacity, (Text, Path)):
+    if isinstance(capacity, (str, Path)):
         capacity = read_initial_assets(capacity)
     assert isinstance(capacity, xr.DataArray)
     if year is None:
@@ -328,10 +329,10 @@ def agents_factory(
 def _shared_capacity(
     technologies: xr.Dataset,
     capacity: xr.DataArray,
-    region: Text,
-    share: Text,
+    region: str,
+    share: str,
     year: int,
-    interpolation: Text = "linear",
+    interpolation: str = "linear",
 ) -> xr.DataArray:
     if "region" in capacity.dims:
         capacity = capacity.sel(region=region)
@@ -363,12 +364,12 @@ def _shared_capacity(
 
 
 def _standardize_inputs(
-    housekeeping: Union[Text, Mapping, Callable] = "clean",
-    merge_transform: Union[Text, Mapping, Callable] = "merge",
+    housekeeping: Union[str, Mapping, Callable] = "clean",
+    merge_transform: Union[str, Mapping, Callable] = "merge",
     objectives: Union[
-        Callable, Text, Mapping, Sequence[Union[Text, Mapping]]
+        Callable, str, Mapping, Sequence[Union[str, Mapping]]
     ] = "fixed_costs",
-    decision: Union[Callable, Text, Mapping] = "mean",
+    decision: Union[Callable, str, Mapping] = "mean",
     **kwargs,
 ):
     from muse.decisions import factory as decision_factory
@@ -392,20 +393,20 @@ def _standardize_inputs(
 
 
 def _standardize_investing_inputs(
-    search_rules: Optional[Union[Text, Sequence[Text]]] = None,
-    investment: Union[Callable, Text, Mapping] = "adhoc",
+    search_rules: Optional[Union[str, Sequence[str]]] = None,
+    investment: Union[Callable, str, Mapping] = "adhoc",
     constraints: Optional[
-        Union[Callable, Text, Mapping, Sequence[Union[Text, Mapping]]]
+        Union[Callable, str, Mapping, Sequence[Union[str, Mapping]]]
     ] = None,
     **kwargs,
-) -> Dict[Text, Any]:
+) -> dict[str, Any]:
     from muse.constraints import factory as constraints_factory
     from muse.investments import factory as investment_factory
 
     kwargs = _standardize_inputs(**kwargs)
     if search_rules is None:
         search_rules = list()
-    if isinstance(search_rules, Text):
+    if isinstance(search_rules, str):
         search_rules = [u.strip() for u in search_rules.split("->")]
     search_rules = list(search_rules)
     if len(search_rules) == 0 or search_rules[-1] != "compress":
diff --git a/src/muse/carbon_budget.py b/src/muse/carbon_budget.py
index 710a5eff..cc8993be 100644
--- a/src/muse/carbon_budget.py
+++ b/src/muse/carbon_budget.py
@@ -1,4 +1,5 @@
-from typing import Callable, MutableMapping, Sequence, Text
+from collections.abc import MutableMapping, Sequence
+from typing import Callable
 
 import numpy as np
 import xarray as xr
@@ -17,10 +18,10 @@
 """carbon budget fitters signature."""
 
 
-CARBON_BUDGET_METHODS: MutableMapping[Text, CARBON_BUDGET_METHODS_SIGNATURE] = {}
+CARBON_BUDGET_METHODS: MutableMapping[str, CARBON_BUDGET_METHODS_SIGNATURE] = {}
 """Dictionary of carbon budget methods checks."""
 
-CARBON_BUDGET_FITTERS: MutableMapping[Text, CARBON_BUDGET_FITTERS_SIGNATURE] = {}
+CARBON_BUDGET_FITTERS: MutableMapping[str, CARBON_BUDGET_FITTERS_SIGNATURE] = {}
 """Dictionary of carbon budget fitters."""
 
 
@@ -80,7 +81,7 @@ def fitting(
     sample_size: int = 4,
     refine_price: bool = True,
     price_too_high_threshold: float = 10,
-    fitter: Text = "slinear",
+    fitter: str = "slinear",
 ) -> float:
     """Used to solve the carbon market.
 
@@ -372,7 +373,7 @@ def bisection(
     sample_size: int = 2,
     refine_price: bool = True,
     price_too_high_threshold: float = 10,
-    fitter: Text = "slinear",
+    fitter: str = "slinear",
 ) -> float:
     """Applies bisection algorithm to escalate carbon price and meet the budget.
 
diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 6ff27f59..30398978 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -1,7 +1,8 @@
 """Methods and types around commodities."""
 
+from collections.abc import Sequence
 from enum import IntFlag, auto
-from typing import Sequence, Text, Union
+from typing import Union
 
 from numpy import ndarray
 from xarray import DataArray, Dataset
@@ -41,7 +42,7 @@ class CommodityUsage(IntFlag):
     # BYPRODUCT = auto()
 
     @property
-    def name(self) -> Text:
+    def name(self) -> str:
         """Hack to get the name of the flag consistently across python versions."""
         return (
             self._name_
@@ -124,8 +125,8 @@ def just_tech(x):
 
 def check_usage(
     data: Sequence[CommodityUsage],
-    flag: Union[Text, CommodityUsage, None],
-    match: Text = "all",
+    flag: Union[str, CommodityUsage, None],
+    match: str = "all",
 ) -> ndarray:
     """Match usage flags with input data array.
 
@@ -194,7 +195,7 @@ def check_usage(
 
     from numpy import bitwise_and, equal
 
-    if isinstance(flag, Text) and len(flag) > 0:
+    if isinstance(flag, str) and len(flag) > 0:
         usage = {
             k.lower(): getattr(CommodityUsage, k)
             for k in dir(CommodityUsage)
@@ -204,7 +205,7 @@ def check_usage(
         flag = reduce(
             lambda x, y: x | y, [usage[a.lower().strip()] for a in flag.split("|")]
         )
-    elif isinstance(flag, Text) or flag is None:
+    elif isinstance(flag, str) or flag is None:
         flag = CommodityUsage.OTHER
 
     if match.lower() == "all":
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 67701269..cdd714ca 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -98,18 +98,13 @@ def constraints(
 
 from __future__ import annotations
 
+from collections.abc import Mapping, MutableMapping, Sequence
 from dataclasses import dataclass
 from enum import Enum, auto
 from typing import (
     Any,
     Callable,
-    List,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
-    Tuple,
     Union,
     cast,
 )
@@ -162,7 +157,7 @@ class ConstraintKind(Enum):
     add constraints that are only used if some condition is met, e.g. minimum service
     conditions are defined in the technodata.
 """
-CONSTRAINTS: MutableMapping[Text, CONSTRAINT_SIGNATURE] = {}
+CONSTRAINTS: MutableMapping[str, CONSTRAINT_SIGNATURE] = {}
 """Registry of constraint functions."""
 
 
@@ -182,7 +177,7 @@ def decorated(
         market: xr.Dataset,
         technologies: xr.Dataset,
         **kwargs,
-    ) -> Optional[Constraint]:
+    ) -> Constraint | None:
         """Computes and standardizes a constraint."""
         constraint = function(  # type: ignore
             demand, assets, search_space, market, technologies, **kwargs
@@ -214,9 +209,7 @@ def decorated(
 
 
 def factory(
-    settings: Optional[
-        Union[Text, Mapping, Sequence[Text], Sequence[Union[Text, Mapping]]]
-    ] = None,
+    settings: str | Mapping | Sequence[str] | Sequence[str | Mapping] | None = None,
 ) -> Callable:
     """Creates a list of constraints from standard settings.
 
@@ -235,10 +228,10 @@ def factory(
         )
 
     def normalize(x) -> MutableMapping:
-        return dict(name=x) if isinstance(x, Text) else x
+        return dict(name=x) if isinstance(x, str) else x
 
-    if isinstance(settings, (Text, Mapping)):
-        settings = cast(Union[Sequence[Text], Sequence[Mapping]], [settings])
+    if isinstance(settings, (str, Mapping)):
+        settings = cast(Union[Sequence[str], Sequence[Mapping]], [settings])
     parameters = [normalize(x) for x in settings]
     names = [x.pop("name") for x in parameters]
 
@@ -252,8 +245,8 @@ def constraints(
         search_space: xr.DataArray,
         market: xr.Dataset,
         technologies: xr.Dataset,
-        year: Optional[int] = None,
-    ) -> List[Constraint]:
+        year: int | None = None,
+    ) -> list[Constraint]:
         if year is None:
             year = int(market.year.min())
         constraints = [
@@ -272,9 +265,9 @@ def max_capacity_expansion(
     search_space: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    year: Optional[int] = None,
-    forecast: Optional[int] = None,
-    interpolation: Text = "linear",
+    year: int | None = None,
+    forecast: int | None = None,
+    interpolation: str = "linear",
 ) -> Constraint:
     r"""Max-capacity addition, max-capacity growth, and capacity limits constraints.
 
@@ -318,7 +311,7 @@ def max_capacity_expansion(
     if forecast is None and len(getattr(market, "year", [])) <= 1:
         forecast = 5
     elif forecast is None:
-        forecast = next((int(u) for u in sorted(market.year - year) if u > 0))
+        forecast = next(int(u) for u in sorted(market.year - year) if u > 0)
     forecast_year = year + forecast
 
     capacity = (
@@ -397,9 +390,9 @@ def demand(
     search_space: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    year: Optional[int] = None,
+    year: int | None = None,
     forecast: int = 5,
-    interpolation: Text = "linear",
+    interpolation: str = "linear",
 ) -> Constraint:
     """Constraints production to meet demand."""
     from muse.commodities import is_enduse
@@ -421,9 +414,9 @@ def search_space(
     search_space: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    year: Optional[int] = None,
+    year: int | None = None,
     forecast: int = 5,
-) -> Optional[Constraint]:
+) -> Constraint | None:
     """Removes disabled technologies."""
     if search_space.all():
         return None
@@ -441,7 +434,7 @@ def max_production(
     search_space: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    year: Optional[int] = None,
+    year: int | None = None,
 ) -> Constraint:
     """Constructs constraint between capacity and maximum production.
 
@@ -507,8 +500,8 @@ def minimum_service(
     search_space: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    year: Optional[int] = None,
-) -> Optional[Constraint]:
+    year: int | None = None,
+) -> Constraint | None:
     """Constructs constraint between capacity and minimum service."""
     from xarray import ones_like, zeros_like
 
@@ -637,7 +630,7 @@ def lp_costs(
 
 def merge_lp(
     costs: xr.Dataset, *constraints: Constraint
-) -> Tuple[xr.Dataset, List[Constraint]]:
+) -> tuple[xr.Dataset, list[Constraint]]:
     """Unify coordinate systems of costs and constraints.
 
     In practice, this function brings costs and constraints into a single xr.Dataset and
@@ -972,11 +965,11 @@ class ScipyAdapter:
 
     c: np.ndarray
     to_muse: Callable[[np.ndarray], xr.Dataset]
-    bounds: Tuple[Optional[float], Optional[float]] = (0, np.inf)
-    A_ub: Optional[np.ndarray] = None
-    b_ub: Optional[np.ndarray] = None
-    A_eq: Optional[np.ndarray] = None
-    b_eq: Optional[np.ndarray] = None
+    bounds: tuple[float | None, float | None] = (0, np.inf)
+    A_ub: np.ndarray | None = None
+    b_ub: np.ndarray | None = None
+    A_eq: np.ndarray | None = None
+    b_eq: np.ndarray | None = None
 
     @classmethod
     def factory(
@@ -1046,7 +1039,7 @@ def _unified_dataset(
         return data.transpose(*data.dims)
 
     @staticmethod
-    def _selected_quantity(data: xr.Dataset, name: Text) -> xr.Dataset:
+    def _selected_quantity(data: xr.Dataset, name: str) -> xr.Dataset:
         result = cast(
             xr.Dataset, data[[u for u in data.data_vars if str(u).startswith(name)]]
         )
@@ -1080,14 +1073,14 @@ def extract_bA(constraints, *kinds):
             capa_constraints = [reshape(capacities[i]) for i in indices]
             prod_constraints = [reshape(productions[i]) for i in indices]
             if capa_constraints:
-                A: Optional[np.ndarray] = np.concatenate(
+                A: np.ndarray | None = np.concatenate(
                     (
                         np.concatenate(capa_constraints, axis=0),
                         np.concatenate(prod_constraints, axis=0),
                     ),
                     axis=1,
                 )
-                b: Optional[np.ndarray] = np.concatenate(
+                b: np.ndarray | None = np.concatenate(
                     [bs[i].stack(constraint=sorted(bs[i].dims)) for i in indices],
                     axis=0,
                 )
@@ -1119,7 +1112,7 @@ def extract_bA(constraints, *kinds):
 
     @staticmethod
     def _back_to_muse_quantity(
-        x: np.ndarray, template: Union[xr.DataArray, xr.Dataset]
+        x: np.ndarray, template: xr.DataArray | xr.Dataset
     ) -> xr.DataArray:
         result = xr.DataArray(
             x.reshape(template.shape), coords=template.coords, dims=template.dims
diff --git a/src/muse/data/example/default_timeslice/output.py b/src/muse/data/example/default_timeslice/output.py
index 1b5785cb..95459f1f 100644
--- a/src/muse/data/example/default_timeslice/output.py
+++ b/src/muse/data/example/default_timeslice/output.py
@@ -1,4 +1,4 @@
-from typing import List, Optional, Text
+from typing import Optional
 
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
@@ -9,8 +9,8 @@ def supply_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
@@ -29,8 +29,8 @@ def consumption_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current consumption."""
diff --git a/src/muse/decisions.py b/src/muse/decisions.py
index 03255bce..6c62b922 100644
--- a/src/muse/decisions.py
+++ b/src/muse/decisions.py
@@ -37,15 +37,11 @@ def weighted_sum(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:
     "single_objective",
     "factory",
 ]
+from collections.abc import Mapping, MutableMapping, Sequence
 from typing import (
     Any,
     Callable,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
-    Tuple,
     Union,
 )
 
@@ -53,7 +49,7 @@ def weighted_sum(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:
 
 from muse.registration import registrator
 
-PARAMS_TYPE = Sequence[Tuple[Text, bool, float]]
+PARAMS_TYPE = Sequence[tuple[str, bool, float]]
 """Standard decision parameter type.
 
 Until MUSE input is more flexible, we need to be able to translate from this
@@ -64,7 +60,7 @@ def weighted_sum(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:
 DECISION_SIGNATURE = Callable[[Dataset, PARAMS_TYPE], DataArray]
 """Signature of functions implementing decisions."""
 
-DECISIONS: MutableMapping[Text, DECISION_SIGNATURE] = {}
+DECISIONS: MutableMapping[str, DECISION_SIGNATURE] = {}
 """Dictionary of decision functions.
 
 Decision functions aggregate separate objectives into a single number per
@@ -73,7 +69,7 @@ def weighted_sum(objectives: Dataset, parameters: Any, **kwargs) -> DataArray:
 
 
 @registrator(registry=DECISIONS, loglevel="info")
-def register_decision(function: DECISION_SIGNATURE, name: Text):
+def register_decision(function: DECISION_SIGNATURE, name: str):
     """Decorator to register a function as a decision.
 
     Registers a function as a decision so that it can be applied easily when aggregating
@@ -100,13 +96,11 @@ def coeff_sign(minimise: bool, coeff: Any):
     return coeff if minimise else -coeff
 
 
-def factory(settings: Union[Text, Mapping] = "mean") -> Callable:
+def factory(settings: Union[str, Mapping] = "mean") -> Callable:
     """Creates a decision method based on the input settings."""
-    from typing import Dict
-
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         function = DECISIONS[settings]
-        params: Dict = {}
+        params: dict = {}
     else:
         function = DECISIONS[settings["name"]]
         params = {k: v for k, v in settings.items() if k != "name"}
@@ -127,7 +121,7 @@ def mean(objectives: Dataset, *args, **kwargs) -> DataArray:
 
 
 @register_decision
-def weighted_sum(objectives: Dataset, parameters: Mapping[Text, float]) -> DataArray:
+def weighted_sum(objectives: Dataset, parameters: Mapping[str, float]) -> DataArray:
     r"""Weighted sum over normalized objectives.
 
     The objectives are each normalized to [0, 1] over the `replacement`
@@ -173,7 +167,7 @@ def weighted_sum(objectives: Dataset, parameters: Mapping[Text, float]) -> DataA
 
 @register_decision(name="lexo")
 def lexical_comparison(
-    objectives: Dataset, parameters: Union[PARAMS_TYPE, Sequence[Tuple[Text, float]]]
+    objectives: Dataset, parameters: Union[PARAMS_TYPE, Sequence[tuple[str, float]]]
 ) -> DataArray:
     """Lexical comparison over the objectives.
 
@@ -201,7 +195,7 @@ def lexical_comparison(
 
 @register_decision(name="retro_lexo")
 def retro_lexical_comparison(
-    objectives: Dataset, parameters: Union[PARAMS_TYPE, Sequence[Tuple[Text, float]]]
+    objectives: Dataset, parameters: Union[PARAMS_TYPE, Sequence[tuple[str, float]]]
 ) -> DataArray:
     """Lexical comparison over the objectives.
 
@@ -230,7 +224,7 @@ def retro_lexical_comparison(
 
 
 def _epsilon_constraints(
-    objectives: Dataset, optimize: Text, mask: Optional[Any] = None, **epsilons
+    objectives: Dataset, optimize: str, mask: Optional[Any] = None, **epsilons
 ) -> DataArray:
     """Minimizes one objective subject to constraints on other objectives."""
     constraints = True
@@ -246,7 +240,7 @@ def _epsilon_constraints(
 @register_decision(name=("epsilon", "epsilon_con"))
 def epsilon_constraints(
     objectives: Dataset,
-    parameters: Union[PARAMS_TYPE, Sequence[Tuple[Text, bool, float]]],
+    parameters: Union[PARAMS_TYPE, Sequence[tuple[str, bool, float]]],
     mask: Optional[Any] = None,
 ) -> DataArray:
     r"""Minimizes first objective subject to constraints on other objectives.
@@ -309,7 +303,7 @@ def transform(name, minimize, epsilon=None):
 @register_decision(name=("single", "singleObj"))
 def single_objective(
     objectives: Dataset,
-    parameters: Union[Text, Tuple[Text, bool], Tuple[Text, bool, float], PARAMS_TYPE],
+    parameters: Union[str, tuple[str, bool], tuple[str, bool, float], PARAMS_TYPE],
 ) -> DataArray:
     """Single objective decision method.
 
@@ -324,9 +318,9 @@ def single_objective(
     - A tuple (string, bool, factor): defaults to standard sequence
       `[(string, direction, factor)]`
     """
-    if isinstance(parameters, Text):
+    if isinstance(parameters, str):
         params = parameters, 1, 1
-    elif len(parameters) == 1 and isinstance(parameters[0], Text):
+    elif len(parameters) == 1 and isinstance(parameters[0], str):
         params = parameters[0], 1, 1
     elif len(parameters) == 1:
         params = parameters[0]
diff --git a/src/muse/decorators.py b/src/muse/decorators.py
index aeb2802c..48c0d4a7 100644
--- a/src/muse/decorators.py
+++ b/src/muse/decorators.py
@@ -1,12 +1,13 @@
+from collections.abc import Mapping
 from logging import getLogger
-from typing import Callable, Mapping, Text
+from typing import Callable
 
 from muse.registration import registrator
 
 SETTINGS_CHECKS_SIGNATURE = Callable[[dict], None]
 """settings checks signature."""
 
-SETTINGS_CHECKS: Mapping[Text, SETTINGS_CHECKS_SIGNATURE] = {}
+SETTINGS_CHECKS: Mapping[str, SETTINGS_CHECKS_SIGNATURE] = {}
 """Dictionary of settings checks."""
 
 
@@ -26,7 +27,7 @@ def register_settings_check(function: SETTINGS_CHECKS_SIGNATURE):
     def decorated(settings) -> None:
         result = function(settings)
 
-        msg = " {} PASSED".format(function.__name__)
+        msg = f" {function.__name__} PASSED"
         getLogger(__name__).info(msg)
 
         return result
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index 270c2594..0a9c94d5 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -46,7 +46,7 @@
 __all__ = ["demand_matching"]
 
 
-from typing import Optional, Set
+from typing import Optional
 
 import pandas as pd
 from xarray import DataArray
@@ -56,7 +56,7 @@ def demand_matching(
     demand: DataArray,
     cost: DataArray,
     *constraints: DataArray,
-    protected_dims: Optional[Set] = None,
+    protected_dims: Optional[set] = None,
 ) -> DataArray:
     r"""Demand matching over heterogeneous dimensions.
 
diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 9cd5bf6a..03865a60 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -45,15 +45,11 @@ def demand_share(
     "unmet_forecasted_demand",
     "DEMAND_SHARE_SIGNATURE",
 ]
+from collections.abc import Hashable, Mapping, MutableMapping, Sequence
 from typing import (
     Any,
     Callable,
-    Hashable,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
     Union,
     cast,
 )
@@ -73,7 +69,7 @@ def demand_share(
 ]
 """Demand share signature."""
 
-DEMAND_SHARE: MutableMapping[Text, DEMAND_SHARE_SIGNATURE] = {}
+DEMAND_SHARE: MutableMapping[str, DEMAND_SHARE_SIGNATURE] = {}
 """Dictionary of demand share functions."""
 
 
@@ -84,11 +80,11 @@ def register_demand_share(function: DEMAND_SHARE_SIGNATURE):
 
 
 def factory(
-    settings: Optional[Union[Text, Mapping[Text, Any]]] = None,
+    settings: Optional[Union[str, Mapping[str, Any]]] = None,
 ) -> DEMAND_SHARE_SIGNATURE:
-    if settings is None or isinstance(settings, Text):
+    if settings is None or isinstance(settings, str):
         name = settings or "new_and_retro"
-        params: Mapping[Text, Any] = {}
+        params: Mapping[str, Any] = {}
     else:
         name = settings.get("name", "new_and_retro")
         params = {k: v for k, v in settings.items() if k != "name"}
@@ -116,7 +112,7 @@ def new_and_retro(
     agents: Sequence[AbstractAgent],
     market: xr.Dataset,
     technologies: xr.Dataset,
-    production: Union[Text, Mapping, Callable] = "maximum_production",
+    production: Union[str, Mapping, Callable] = "maximum_production",
     current_year: Optional[int] = None,
     forecast: int = 5,
 ) -> xr.DataArray:
@@ -327,7 +323,7 @@ def standard_demand(
     agents: Sequence[AbstractAgent],
     market: xr.Dataset,
     technologies: xr.Dataset,
-    production: Union[Text, Mapping, Callable] = "maximum_production",
+    production: Union[str, Mapping, Callable] = "maximum_production",
     current_year: Optional[int] = None,
     forecast: int = 5,
 ) -> xr.DataArray:
@@ -432,7 +428,7 @@ def unmet_forecasted_demand(
     market: xr.Dataset,
     technologies: xr.Dataset,
     current_year: Optional[int] = None,
-    production: Union[Text, Mapping, Callable] = "maximum_production",
+    production: Union[str, Mapping, Callable] = "maximum_production",
     forecast: int = 5,
 ) -> xr.DataArray:
     """Forecast demand that cannot be serviced by non-decommissioned current assets."""
@@ -512,7 +508,7 @@ def unmet_demand(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    production: Union[Text, Mapping, Callable] = "maximum_production",
+    production: Union[str, Mapping, Callable] = "maximum_production",
 ):
     r"""Share of the demand that cannot be serviced by the existing assets.
 
@@ -592,7 +588,7 @@ def new_and_retro_demands(
     capacity: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    production: Union[Text, Mapping, Callable] = "maximum_production",
+    production: Union[str, Mapping, Callable] = "maximum_production",
     current_year: Optional[int] = None,
     forecast: int = 5,
 ) -> xr.Dataset:
@@ -662,7 +658,7 @@ def new_demand(
     capacity: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    production: Union[Text, Mapping, Callable] = "maximum_production",
+    production: Union[str, Mapping, Callable] = "maximum_production",
     current_year: Optional[int] = None,
     forecast: int = 5,
 ) -> xr.DataArray:
diff --git a/src/muse/examples.py b/src/muse/examples.py
index 5db4e6c3..a888763f 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -27,7 +27,7 @@
 
 from logging import getLogger
 from pathlib import Path
-from typing import List, Optional, Text, Union, cast
+from typing import Optional, Union, cast
 
 import numpy as np
 import xarray as xr
@@ -45,12 +45,12 @@ def example_data_dir() -> Path:
     return Path(muse.__file__).parent / "data" / "example"
 
 
-def available_examples() -> List[str]:
+def available_examples() -> list[str]:
     """List examples available in the examples folder."""
     return [d.stem for d in example_data_dir().iterdir() if d.is_dir()]
 
 
-def model(name: Text = "default") -> MCA:
+def model(name: str = "default") -> MCA:
     """Fully constructs a given example model."""
     from tempfile import TemporaryDirectory
 
@@ -66,8 +66,8 @@ def model(name: Text = "default") -> MCA:
 
 
 def copy_model(
-    name: Text = "default",
-    path: Optional[Union[Text, Path]] = None,
+    name: str = "default",
+    path: Optional[Union[str, Path]] = None,
     overwrite: bool = False,
 ) -> Path:
     """Copy model files to given path.
@@ -86,14 +86,14 @@ def copy_model(
     path = Path() if path is None else Path(path)
 
     if path.exists() and not path.is_dir():
-        raise IOError(f"{path} exists and is not a directory")
+        raise OSError(f"{path} exists and is not a directory")
 
     path /= "model"
     if path.exists():
         if not path.is_dir():
-            raise IOError(f"{path} exists and is not a directory")
+            raise OSError(f"{path} exists and is not a directory")
         elif not overwrite:
-            raise IOError(f"{path} exists and ``overwrite`` is not allowed")
+            raise OSError(f"{path} exists and ``overwrite`` is not allowed")
         rmtree(path)
 
     if name.lower() == "default":
@@ -111,7 +111,7 @@ def copy_model(
     return path
 
 
-def technodata(sector: Text, model: Text = "default") -> xr.Dataset:
+def technodata(sector: str, model: str = "default") -> xr.Dataset:
     """Technology for a sector of a given example model."""
     from tempfile import TemporaryDirectory
 
@@ -129,7 +129,7 @@ def technodata(sector: Text, model: Text = "default") -> xr.Dataset:
         return read_technodata(settings, sector)
 
 
-def search_space(sector: Text, model: Text = "default") -> xr.DataArray:
+def search_space(sector: str, model: str = "default") -> xr.DataArray:
     """Determines which technology is considered for which asset.
 
     Used in constraints or during investment.
@@ -139,7 +139,7 @@ def search_space(sector: Text, model: Text = "default") -> xr.DataArray:
     return _nontrade_search_space(sector, model)
 
 
-def sector(sector: Text, model: Text = "default") -> AbstractSector:
+def sector(sector: str, model: str = "default") -> AbstractSector:
     """Loads a given sector from a given example model."""
     from tempfile import TemporaryDirectory
 
@@ -153,7 +153,7 @@ def sector(sector: Text, model: Text = "default") -> AbstractSector:
         return SECTORS_REGISTERED[kind](sector, settings)
 
 
-def available_sectors(model: Text = "default") -> List[Text]:
+def available_sectors(model: str = "default") -> list[str]:
     """Sectors in this particular model."""
     from tempfile import TemporaryDirectory
 
@@ -165,7 +165,7 @@ def available_sectors(model: Text = "default") -> List[Text]:
         return [u for u in undo_damage(settings).keys() if u != "list"]
 
 
-def mca_market(model: Text = "default") -> xr.Dataset:
+def mca_market(model: str = "default") -> xr.Dataset:
     """Initial market as seen by the MCA."""
     from tempfile import TemporaryDirectory
 
@@ -202,7 +202,7 @@ def mca_market(model: Text = "default") -> xr.Dataset:
         return cast(xr.Dataset, market)
 
 
-def residential_market(model: Text = "default") -> xr.Dataset:
+def residential_market(model: str = "default") -> xr.Dataset:
     """Initial market as seen by the residential sector."""
     from muse.mca import single_year_iteration
 
@@ -238,7 +238,7 @@ def random_agent_assets(rng: np.random.Generator):
     return result
 
 
-def matching_market(sector: Text, model: Text = "default") -> xr.Dataset:
+def matching_market(sector: str, model: str = "default") -> xr.Dataset:
     """Market with a demand matching the maximum production from a sector."""
     from muse.examples import sector as load_sector
     from muse.quantities import consumption, maximum_production
@@ -366,7 +366,7 @@ def _copy_trade(path: Path):
     copyfile(example_data_dir() / "trade" / "settings.toml", path / "settings.toml")
 
 
-def _trade_search_space(sector: Text, model: Text = "default") -> xr.DataArray:
+def _trade_search_space(sector: str, model: str = "default") -> xr.DataArray:
     from muse.agents import Agent
     from muse.examples import sector as load_sector
     from muse.sectors import Sector
@@ -392,7 +392,7 @@ def _trade_search_space(sector: Text, model: Text = "default") -> xr.DataArray:
     )
 
 
-def _nontrade_search_space(sector: Text, model: Text = "default") -> xr.DataArray:
+def _nontrade_search_space(sector: str, model: str = "default") -> xr.DataArray:
     from numpy import ones
 
     technology = technodata(sector, model).technology
diff --git a/src/muse/filters.py b/src/muse/filters.py
index 111d79c0..ba451d03 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -90,14 +90,11 @@ def search_space_initializer(
     "initialize_from_technologies",
 ]
 
+from collections.abc import Mapping, MutableMapping, Sequence
 from typing import (
     Any,
     Callable,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
     Union,
     cast,
 )
@@ -111,14 +108,14 @@ def search_space_initializer(
 SSF_SIGNATURE = Callable[[Agent, xr.DataArray, xr.Dataset, xr.Dataset], xr.DataArray]
 """ Search space filter signature """
 
-SEARCH_SPACE_FILTERS: MutableMapping[Text, SSF_SIGNATURE] = {}
+SEARCH_SPACE_FILTERS: MutableMapping[str, SSF_SIGNATURE] = {}
 """Filters for selecting technology search spaces."""
 
 
 SSI_SIGNATURE = Callable[[Agent, xr.DataArray, xr.Dataset, xr.Dataset], xr.DataArray]
 """ Search space initializer signature """
 
-SEARCH_SPACE_INITIALIZERS: MutableMapping[Text, SSI_SIGNATURE] = {}
+SEARCH_SPACE_INITIALIZERS: MutableMapping[str, SSI_SIGNATURE] = {}
 """Functions to create an initial search-space."""
 
 
@@ -165,8 +162,8 @@ def decorated(agent: Agent, *args, **kwargs) -> xr.DataArray:
 
 
 def factory(
-    settings: Optional[Union[Text, Mapping, Sequence[Union[Text, Mapping]]]] = None,
-    separator: Text = "->",
+    settings: Optional[Union[str, Mapping, Sequence[Union[str, Mapping]]]] = None,
+    separator: str = "->",
 ):
     """Creates filters from input TOML data.
 
@@ -198,17 +195,17 @@ def factory(
     from functools import partial
 
     if settings is None:
-        parameters: Sequence[Mapping[Text, Any]] = []
+        parameters: Sequence[Mapping[str, Any]] = []
     elif isinstance(settings, Mapping):
         parameters = [settings]
-    elif isinstance(settings, Text):
+    elif isinstance(settings, str):
         parameters = [{"name": name.strip()} for name in settings.split(separator)]
     else:
         parameters = [
-            {"name": item} if isinstance(item, Text) else item for item in settings
+            {"name": item} if isinstance(item, str) else item for item in settings
         ]
     if len(parameters) == 0 or parameters[0]["name"] not in SEARCH_SPACE_INITIALIZERS:
-        initial_settings: Mapping[Text, Text] = {"name": "initialize_from_technologies"}
+        initial_settings: Mapping[str, str] = {"name": "initialize_from_technologies"}
     else:
         initial_settings, parameters = cast(Mapping, parameters[0]), parameters[1:]
 
@@ -242,7 +239,7 @@ def same_enduse(
     search_space: xr.DataArray,
     technologies: xr.Dataset,
     *args,
-    enduse_label: Text = "service",
+    enduse_label: str = "service",
     **kwargs,
 ) -> xr.DataArray:
     """Only allow for technologies with at least the same end-use."""
@@ -335,7 +332,7 @@ def maturity(
     search_space: xr.DataArray,
     technologies: xr.Dataset,
     market: xr.Dataset,
-    enduse_label: Text = "service",
+    enduse_label: str = "service",
     **kwargs,
 ) -> xr.DataArray:
     """Only allows technologies that have achieve a given market share.
@@ -367,7 +364,7 @@ def spend_limit(
     search_space: xr.DataArray,
     technologies: xr.Dataset,
     market: xr.Dataset,
-    enduse_label: Text = "service",
+    enduse_label: str = "service",
     **kwargs,
 ) -> xr.DataArray:
     """Only allows technologies that have achieve a given market share.
@@ -463,7 +460,7 @@ def initialize_from_assets(
     demand: xr.DataArray,
     technologies: xr.Dataset,
     *args,
-    coords: Sequence[Text] = ("region", "technology"),
+    coords: Sequence[str] = ("region", "technology"),
     **kwargs,
 ):
     """Initialize a search space from existing technologies."""
diff --git a/src/muse/hooks.py b/src/muse/hooks.py
index eaca96c7..7456b393 100644
--- a/src/muse/hooks.py
+++ b/src/muse/hooks.py
@@ -11,20 +11,21 @@
     "housekeeping_factory",
     "asset_merge_factory",
 ]
-from typing import Callable, Mapping, MutableMapping, Text, Union
+from collections.abc import Mapping, MutableMapping
+from typing import Callable, Union
 
 from xarray import Dataset
 
 from muse.agents import Agent
 from muse.registration import registrator
 
-INITIAL_ASSET_TRANSFORM: MutableMapping[Text, Callable] = {}
+INITIAL_ASSET_TRANSFORM: MutableMapping[str, Callable] = {}
 """ Transform at the start of each step. """
-FINAL_ASSET_TRANSFORM: MutableMapping[Text, Callable] = {}
+FINAL_ASSET_TRANSFORM: MutableMapping[str, Callable] = {}
 """ Transform at the end of each step, including new assets. """
 
 
-def housekeeping_factory(settings: Union[Text, Mapping] = "noop") -> Callable:
+def housekeeping_factory(settings: Union[str, Mapping] = "noop") -> Callable:
     """Returns a function for performing initial housekeeping.
 
     For instance, remove technologies with no capacity now or in the future.
@@ -33,7 +34,7 @@ def housekeeping_factory(settings: Union[Text, Mapping] = "noop") -> Callable:
     """
     from muse.agents import AbstractAgent
 
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         name = settings
         params: Mapping = {}
     else:
@@ -48,7 +49,7 @@ def initial_assets_transform(agent: AbstractAgent, assets: Dataset) -> Dataset:
     return initial_assets_transform
 
 
-def asset_merge_factory(settings: Union[Text, Mapping] = "new") -> Callable:
+def asset_merge_factory(settings: Union[str, Mapping] = "new") -> Callable:
     """Returns a function for merging new investments into assets.
 
     Available merging functions should be registered with
@@ -60,7 +61,7 @@ def asset_merge_factory(settings: Union[Text, Mapping] = "new") -> Callable:
     Available housekeeping functions should be registered with
     :py:func:`@register_initial_asset_transform<register_initial_asset_transform>`.
     """
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         name = settings
         params: Mapping = {}
     else:
diff --git a/src/muse/interactions.py b/src/muse/interactions.py
index f6302d6c..091311cf 100644
--- a/src/muse/interactions.py
+++ b/src/muse/interactions.py
@@ -22,15 +22,16 @@
     "transfer_assets",
 ]
 
-from typing import Callable, List, Mapping, Optional, Sequence, Text, Tuple, Union
+from collections.abc import Mapping, Sequence
+from typing import Callable, Optional, Union
 
 from muse.agents import AbstractAgent, Agent
 from muse.errors import NoInteractionsFound
 from muse.registration import registrator
 
-AGENT_INTERACTIONS: Mapping[Text, Callable] = {}
+AGENT_INTERACTIONS: Mapping[str, Callable] = {}
 """All interaction between a single agents and its interactees."""
-INTERACTION_NETS: Mapping[Text, Callable] = {}
+INTERACTION_NETS: Mapping[str, Callable] = {}
 """All functions to computes lists of agents interaction with each other."""
 
 INTERACTION_NET = Sequence[Sequence[Agent]]
@@ -86,7 +87,7 @@ def register_agent_interaction(function: AGENT_INTERACTION_SIGNATURE):
 
 
 def factory(
-    inputs: Optional[Sequence[Union[Mapping, Tuple[Text, Text]]]] = None,
+    inputs: Optional[Sequence[Union[Mapping, tuple[str, str]]]] = None,
 ) -> Callable[[Sequence[AbstractAgent]], None]:
     """Creates an interaction functor."""
     if inputs is None:
@@ -100,10 +101,10 @@ def factory(
         else:
             net_params, action_params = params
 
-        if isinstance(net_params, Text):
+        if isinstance(net_params, str):
             net_params = {"name": net_params}
 
-        if isinstance(action_params, Text):
+        if isinstance(action_params, str):
             action_params = {"name": action_params}
 
         net = INTERACTION_NETS[net_params["name"]]
@@ -138,10 +139,10 @@ def compute_interactions(agents: Sequence[AbstractAgent]) -> None:
 
 
 def agents_groupby(
-    agents: Sequence[Agent], attributes: Sequence[Text]
-) -> Mapping[Tuple, List[Agent]]:
+    agents: Sequence[Agent], attributes: Sequence[str]
+) -> Mapping[tuple, list[Agent]]:
     attr_list = [tuple(getattr(agent, attr) for attr in attributes) for agent in agents]
-    result: Mapping[Tuple, List[Agent]] = {tuple(n): [] for n in attr_list}
+    result: Mapping[tuple, list[Agent]] = {tuple(n): [] for n in attr_list}
     for attrs, agent in zip(attr_list, agents):
         result[attrs].append(agent)
     return result
@@ -149,7 +150,7 @@ def agents_groupby(
 
 @register_interaction_net(name=["default", "new_to_retro"])
 def new_to_retro_net(
-    agents: Sequence[Agent], first_category: Text = "newcapa"
+    agents: Sequence[Agent], first_category: str = "newcapa"
 ) -> INTERACTION_NET:
     """Interactions between new and retrofit agents."""
     groups = agents_groupby(agents, ("region", "name"))
diff --git a/src/muse/investments.py b/src/muse/investments.py
index 41a85385..d6ed8248 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -47,14 +47,11 @@ def investment(
     "register_investment",
     "INVESTMENT_SIGNATURE",
 ]
+from collections.abc import Mapping, MutableMapping
 from typing import (
     Any,
     Callable,
-    List,
-    Mapping,
-    MutableMapping,
     Optional,
-    Text,
     Union,
     cast,
 )
@@ -69,12 +66,12 @@ def investment(
 from muse.registration import registrator
 
 INVESTMENT_SIGNATURE = Callable[
-    [xr.DataArray, xr.DataArray, xr.Dataset, List[Constraint], KwArg(Any)],
+    [xr.DataArray, xr.DataArray, xr.Dataset, list[Constraint], KwArg(Any)],
     Union[xr.DataArray, xr.Dataset],
 ]
 """Investment signature. """
 
-INVESTMENTS: MutableMapping[Text, INVESTMENT_SIGNATURE] = {}
+INVESTMENTS: MutableMapping[str, INVESTMENT_SIGNATURE] = {}
 """Dictionary of investment functions."""
 
 
@@ -94,7 +91,7 @@ def decorated(
         costs: xr.DataArray,
         search_space: xr.DataArray,
         technologies: xr.Dataset,
-        constraints: List[Constraint],
+        constraints: list[Constraint],
         **kwargs,
     ) -> xr.DataArray:
         result = function(costs, search_space, technologies, constraints, **kwargs)
@@ -113,13 +110,11 @@ def decorated(
     return decorated
 
 
-def factory(settings: Optional[Union[Text, Mapping]] = None) -> Callable:
-    from typing import Dict
-
+def factory(settings: Optional[Union[str, Mapping]] = None) -> Callable:
     if settings is None:
         name = "match_demand"
-        params: Dict = {}
-    elif isinstance(settings, Text):
+        params: dict = {}
+    elif isinstance(settings, str):
         name = settings
         params = {}
     else:
@@ -127,7 +122,7 @@ def factory(settings: Optional[Union[Text, Mapping]] = None) -> Callable:
         params = {k: v for k, v in settings.items() if k != "name"}
 
     top = params.get("timeslice_op", "max")
-    if isinstance(top, Text):
+    if isinstance(top, str):
         if top.lower() == "max":
 
             def timeslice_op(x: xr.DataArray) -> xr.DataArray:
@@ -150,7 +145,7 @@ def timeslice_op(x: xr.DataArray) -> xr.DataArray:
     def compute_investment(
         search: xr.Dataset,
         technologies: xr.Dataset,
-        constraints: List[Constraint],
+        constraints: list[Constraint],
         **kwargs,
     ) -> xr.DataArray:
         """Computes investment needed to fulfill demand.
@@ -182,7 +177,7 @@ def cliff_retirement_profile(
     technical_life: xr.DataArray,
     current_year: int = 0,
     protected: int = 0,
-    interpolation: Text = "linear",
+    interpolation: str = "linear",
     **kwargs,
 ) -> xr.DataArray:
     """Cliff-like retirement profile from current year.
@@ -251,7 +246,7 @@ def adhoc_match_demand(
     costs: xr.DataArray,
     search_space: xr.DataArray,
     technologies: xr.Dataset,
-    constraints: List[Constraint],
+    constraints: list[Constraint],
     year: int,
     timeslice_op: Optional[Callable[[xr.DataArray], xr.DataArray]] = None,
 ) -> xr.DataArray:
@@ -259,11 +254,9 @@ def adhoc_match_demand(
     from muse.quantities import capacity_in_use, maximum_production
     from muse.timeslices import QuantityType, convert_timeslice
 
-    demand = next((c for c in constraints if c.name == "demand")).b
+    demand = next(c for c in constraints if c.name == "demand").b
 
-    max_capacity = next(
-        (c for c in constraints if c.name == "max capacity expansion")
-    ).b
+    max_capacity = next(c for c in constraints if c.name == "max capacity expansion").b
     max_prod = maximum_production(
         technologies,
         max_capacity,
@@ -306,7 +299,7 @@ def scipy_match_demand(
     costs: xr.DataArray,
     search_space: xr.DataArray,
     technologies: xr.Dataset,
-    constraints: List[Constraint],
+    constraints: list[Constraint],
     year: Optional[int] = None,
     timeslice_op: Optional[Callable[[xr.DataArray], xr.DataArray]] = None,
     **options,
@@ -331,7 +324,7 @@ def scipy_match_demand(
         techs = technologies.sel(year=year).drop_vars("year")
     else:
         techs = technologies
-    timeslice = next((cs.timeslice for cs in constraints if "timeslice" in cs.dims))
+    timeslice = next(cs.timeslice for cs in constraints if "timeslice" in cs.dims)
 
     adapter = ScipyAdapter.factory(
         techs, cast(np.ndarray, costs), timeslice, *constraints
@@ -366,7 +359,7 @@ def cvxopt_match_demand(
     costs: xr.DataArray,
     search_space: xr.DataArray,
     technologies: xr.Dataset,
-    constraints: List[Constraint],
+    constraints: list[Constraint],
     year: Optional[int] = None,
     timeslice_op: Optional[Callable[[xr.DataArray], xr.DataArray]] = None,
     **options,
@@ -401,7 +394,7 @@ def default_to_scipy():
 
     if "timeslice" in costs.dims and timeslice_op is not None:
         costs = timeslice_op(costs)
-    timeslice = next((cs.timeslice for cs in constraints if "timeslice" in cs.dims))
+    timeslice = next(cs.timeslice for cs in constraints if "timeslice" in cs.dims)
     adapter = ScipyAdapter.factory(
         techs, -cast(np.ndarray, costs), timeslice, *constraints
     )
diff --git a/src/muse/mca.py b/src/muse/mca.py
index fde3735e..ac7a27e2 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -1,16 +1,11 @@
 from __future__ import annotations
 
+from collections.abc import Mapping, Sequence
 from pathlib import Path
 from typing import (
     Any,
     Callable,
-    List,
-    Mapping,
     NamedTuple,
-    Optional,
-    Sequence,
-    Text,
-    Union,
     cast,
 )
 
@@ -21,7 +16,7 @@
 from muse.sectors import SECTORS_REGISTERED, AbstractSector
 
 
-class MCA(object):
+class MCA:
     """Market Clearing Algorithm.
 
     The market clearing algorithm is the main object implementing the MUSE model. It is
@@ -30,7 +25,7 @@ class MCA(object):
     """
 
     @classmethod
-    def factory(cls, settings: Union[Text, Path, Mapping, Any]) -> MCA:
+    def factory(cls, settings: str | Path | Mapping | Any) -> MCA:
         """Loads MCA from input settings and input files.
 
         Arguments:
@@ -45,7 +40,7 @@ def factory(cls, settings: Union[Text, Path, Mapping, Any]) -> MCA:
         from muse.readers import read_settings
         from muse.readers.toml import convert
 
-        if isinstance(settings, (Text, Path)):
+        if isinstance(settings, (str, Path)):
             settings = read_settings(settings)  # type: ignore
         elif isinstance(settings, Mapping):
             settings = convert(settings)
@@ -120,25 +115,25 @@ def factory(cls, settings: Union[Text, Path, Mapping, Any]) -> MCA:
 
     def __init__(
         self,
-        sectors: List[AbstractSector],
+        sectors: list[AbstractSector],
         market: Dataset,
-        outputs: Optional[Callable[[List[AbstractSector], Dataset], Any]] = None,
-        outputs_cache: Optional[OutputCache] = None,
+        outputs: Callable[[list[AbstractSector], Dataset], Any] | None = None,
+        outputs_cache: OutputCache | None = None,
         time_framework: Sequence[int] = list(range(2010, 2100, 10)),
         equilibrium: bool = True,
-        equilibrium_variable: Text = "demand",
+        equilibrium_variable: str = "demand",
         maximum_iterations: int = 3,
         tolerance: float = 0.1,
         tolerance_unmet_demand: float = -0.1,
-        excluded_commodities: Optional[Sequence[Text]] = None,
-        carbon_budget: Optional[Sequence] = None,
-        carbon_price: Optional[Sequence] = None,
-        carbon_commodities: Optional[Sequence[Text]] = None,
+        excluded_commodities: Sequence[str] | None = None,
+        carbon_budget: Sequence | None = None,
+        carbon_price: Sequence | None = None,
+        carbon_commodities: Sequence[str] | None = None,
         debug: bool = False,
         control_undershoot: bool = True,
         control_overshoot: bool = True,
-        carbon_method: Text = "fitting",
-        method_options: Optional[Mapping] = None,
+        carbon_method: str = "fitting",
+        method_options: Mapping | None = None,
     ):
         """Market clearing algorithm class which rules the whole MUSE."""
         from logging import getLogger
@@ -151,7 +146,7 @@ def __init__(
 
         getLogger(__name__).info("MCA Initialisation")
 
-        self.sectors: List[AbstractSector] = list(sectors)
+        self.sectors: list[AbstractSector] = list(sectors)
         self.market = market
 
         # Simulation flow parameters
@@ -197,8 +192,8 @@ def __init__(
     def find_equilibrium(
         self,
         market: Dataset,
-        sectors: Optional[List[AbstractSector]] = None,
-        maxiter: Optional[int] = None,
+        sectors: list[AbstractSector] | None = None,
+        maxiter: int | None = None,
     ) -> FindEquilibriumResults:
         """Specialised version of the find_equilibrium function.
 
@@ -249,7 +244,7 @@ def update_carbon_budget(self, market: Dataset, year_idx: int) -> float:
             self.control_undershoot,
         )
 
-    def update_carbon_price(self, market) -> Optional[float]:
+    def update_carbon_price(self, market) -> float | None:
         """Calculates the updated carbon price, if required.
 
         If the emission calculated for the next time period is larger than the
@@ -442,11 +437,11 @@ class SingleYearIterationResult(NamedTuple):
     """
 
     market: Dataset
-    sectors: List[AbstractSector]
+    sectors: list[AbstractSector]
 
 
 def single_year_iteration(
-    market: Dataset, sectors: List[AbstractSector]
+    market: Dataset, sectors: list[AbstractSector]
 ) -> SingleYearIterationResult:
     """Runs one iteration of the sectors (runs each sector once).
 
@@ -511,17 +506,17 @@ class FindEquilibriumResults(NamedTuple):
 
     converged: bool
     market: Dataset
-    sectors: List[AbstractSector]
+    sectors: list[AbstractSector]
 
 
 def find_equilibrium(
     market: Dataset,
-    sectors: List[AbstractSector],
+    sectors: list[AbstractSector],
     maxiter: int = 3,
     tol: float = 0.1,
-    equilibrium_variable: Text = "demand",
+    equilibrium_variable: str = "demand",
     tol_unmet_demand: float = -0.1,
-    excluded_commodities: Optional[Sequence] = None,
+    excluded_commodities: Sequence | None = None,
     equilibrium: bool = True,
 ) -> FindEquilibriumResults:
     """Runs the equilibrium loop.
@@ -672,8 +667,8 @@ def check_equilibrium(
     market: Dataset,
     int_market: Dataset,
     tolerance: float,
-    equilibrium_variable: Text,
-    year: Optional[int] = None,
+    equilibrium_variable: str,
+    year: int | None = None,
 ) -> bool:
     """Checks if equilibrium has been reached.
 
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 72b00d98..87af8f9a 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -71,7 +71,8 @@ def comfort(
     "factory",
 ]
 
-from typing import Any, Callable, Mapping, MutableMapping, Sequence, Text, Union, cast
+from collections.abc import Mapping, MutableMapping, Sequence
+from typing import Any, Callable, Union, cast
 
 import numpy as np
 import xarray as xr
@@ -87,14 +88,14 @@ def comfort(
 ]
 """Objectives signature."""
 
-OBJECTIVES: MutableMapping[Text, OBJECTIVE_SIGNATURE] = {}
+OBJECTIVES: MutableMapping[str, OBJECTIVE_SIGNATURE] = {}
 """Dictionary of objectives when selecting replacement technology."""
 
 
-def objective_factory(settings=Union[Text, Mapping]):
+def objective_factory(settings=Union[str, Mapping]):
     from functools import partial
 
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         params = dict(name=settings)
     else:
         params = dict(**settings)
@@ -104,7 +105,7 @@ def objective_factory(settings=Union[Text, Mapping]):
 
 
 def factory(
-    settings: Union[Text, Mapping, Sequence[Union[Text, Mapping]]] = "LCOE",
+    settings: Union[str, Mapping, Sequence[Union[str, Mapping]]] = "LCOE",
 ) -> Callable:
     """Creates a function computing multiple objectives.
 
@@ -114,15 +115,14 @@ def factory(
     objectives defined by name or by dictionary.
     """
     from logging import getLogger
-    from typing import Dict, List
 
-    if isinstance(settings, Text):
-        params: List[Dict] = [{"name": settings}]
+    if isinstance(settings, str):
+        params: list[dict] = [{"name": settings}]
     elif isinstance(settings, Mapping):
         params = [dict(**settings)]
     else:
         params = [
-            {"name": param} if isinstance(param, Text) else dict(**param)
+            {"name": param} if isinstance(param, str) else dict(**param)
             for param in settings
         ]
 
@@ -178,10 +178,7 @@ def decorated_objective(
 
         dtype = result.values.dtype
         if not (np.issubdtype(dtype, np.number) or np.issubdtype(dtype, np.bool_)):
-            msg = "dtype of objective %s is not a number (%s)" % (
-                function.__name__,
-                dtype,
-            )
+            msg = f"dtype of objective {function.__name__} is not a number ({dtype})"
             getLogger(function.__module__).warning(msg)
 
         if "technology" in result.dims:
diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index 76d018e3..71712cd9 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -28,16 +28,11 @@
 from __future__ import annotations
 
 from collections import ChainMap
+from collections.abc import Mapping, MutableMapping, Sequence
 from functools import reduce
 from operator import attrgetter
 from typing import (
     Callable,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Text,
     Union,
 )
 
@@ -49,11 +44,11 @@
 from muse.sectors import AbstractSector
 
 OUTPUT_QUANTITY_SIGNATURE = Callable[
-    [List[xr.DataArray]], Union[xr.DataArray, pd.DataFrame]
+    [list[xr.DataArray]], Union[xr.DataArray, pd.DataFrame]
 ]
 """Signature of functions computing quantities for later analysis."""
 
-OUTPUT_QUANTITIES: MutableMapping[Text, OUTPUT_QUANTITY_SIGNATURE] = {}
+OUTPUT_QUANTITIES: MutableMapping[str, OUTPUT_QUANTITY_SIGNATURE] = {}
 """Quantity for post-simulation analysis."""
 
 CACHE_TOPIC_CHANNEL = "cache_quantity"
@@ -76,10 +71,10 @@ def decorated(*args, **kwargs):
 
 
 def cache_quantity(
-    function: Optional[Callable] = None,
-    quantity: Union[str, Sequence[str], None] = None,
+    function: Callable | None = None,
+    quantity: str | Sequence[str] | None = None,
     **kwargs: xr.DataArray,
-) -> Optional[Callable]:
+) -> Callable | None:
     """Cache one or more quantities to be post-processed later on.
 
     This function can be used as a decorator, in which case the quantity input argument
@@ -175,8 +170,8 @@ def decorated(*args, **kwargs):
 
 
 def match_quantities(
-    quantity: Union[str, Sequence[str]],
-    data: Union[xr.DataArray, xr.Dataset, Sequence[xr.DataArray]],
+    quantity: str | Sequence[str],
+    data: xr.DataArray | xr.Dataset | Sequence[xr.DataArray],
 ) -> Mapping[str, xr.DataArray]:
     """Matches the quantities with the corresponding data.
 
@@ -196,10 +191,10 @@ def match_quantities(
         (Mapping[str, xr.DataArray]) A dictionary matching the quantity names with the
         corresponding data.
     """
-    if isinstance(quantity, Text) and isinstance(data, xr.DataArray):
+    if isinstance(quantity, str) and isinstance(data, xr.DataArray):
         return {quantity: data}
 
-    elif isinstance(quantity, Text) and isinstance(data, xr.Dataset):
+    elif isinstance(quantity, str) and isinstance(data, xr.Dataset):
         return {quantity: data[quantity]}
 
     elif isinstance(quantity, Sequence) and isinstance(data, xr.Dataset):
@@ -245,10 +240,8 @@ class OutputCache:
     def __init__(
         self,
         *parameters: Mapping,
-        output_quantities: Optional[
-            MutableMapping[Text, OUTPUT_QUANTITY_SIGNATURE]
-        ] = None,
-        sectors: Optional[List[AbstractSector]] = None,
+        output_quantities: MutableMapping[str, OUTPUT_QUANTITY_SIGNATURE] | None = None,
+        sectors: list[AbstractSector] | None = None,
         topic: str = CACHE_TOPIC_CHANNEL,
     ):
         from muse.outputs.sector import _factory
@@ -256,7 +249,7 @@ def __init__(
         output_quantities = (
             OUTPUT_QUANTITIES if output_quantities is None else output_quantities
         )
-        self.agents: MutableMapping[Text, MutableMapping[Text, Text]] = (
+        self.agents: MutableMapping[str, MutableMapping[str, str]] = (
             extract_agents(sectors) if sectors is not None else {}
         )
 
@@ -270,7 +263,7 @@ def __init__(
                 f"Valid quantities are: {list(output_quantities.keys())}"
             )
 
-        self.to_save: Mapping[str, List[xr.DataArray]] = {
+        self.to_save: Mapping[str, list[xr.DataArray]] = {
             p["quantity"]: [] for p in parameters if p["quantity"] in output_quantities
         }
 
@@ -326,8 +319,8 @@ def consolidate_cache(self, year: int) -> None:
 
 
 def extract_agents(
-    sectors: List[AbstractSector],
-) -> MutableMapping[Text, MutableMapping[Text, Text]]:
+    sectors: list[AbstractSector],
+) -> MutableMapping[str, MutableMapping[str, str]]:
     """_summary_.
 
     Args:
@@ -341,7 +334,7 @@ def extract_agents(
 
 def extract_agents_internal(
     sector: AbstractSector,
-) -> MutableMapping[Text, MutableMapping[Text, Text]]:
+) -> MutableMapping[str, MutableMapping[str, str]]:
     """Extract simple agent metadata from a sector.
 
     Args:
@@ -351,7 +344,7 @@ def extract_agents_internal(
         Mapping[Text, Text]: A dictionary with the uuid of each agent as keys and a
         dictionary with the name, agent type and agent sector as values.
     """
-    info: MutableMapping[Text, MutableMapping[Text, Text]] = {}
+    info: MutableMapping[str, MutableMapping[str, str]] = {}
     sector_name = getattr(sector, "name", "unnamed")
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
     for agent in agents:
@@ -367,7 +360,7 @@ def extract_agents_internal(
     return info
 
 
-def _aggregate_cache(quantity: Text, data: List[xr.DataArray]) -> pd.DataFrame:
+def _aggregate_cache(quantity: str, data: list[xr.DataArray]) -> pd.DataFrame:
     """Combine a list of DataArrays in a dataframe.
 
     The merging gives precedence to the last entries of the list over the first ones.
@@ -403,9 +396,9 @@ def check_col(colname: str) -> str:
 
 
 def consolidate_quantity(
-    quantity: Text,
-    cached: List[xr.DataArray],
-    agents: MutableMapping[Text, MutableMapping[Text, Text]],
+    quantity: str,
+    cached: list[xr.DataArray],
+    agents: MutableMapping[str, MutableMapping[str, str]],
 ) -> pd.DataFrame:
     """Consolidates the cached quantity into a single DataFrame to save.
 
@@ -444,8 +437,8 @@ def consolidate_quantity(
 
 @register_cached_quantity
 def capacity(
-    cached: List[xr.DataArray],
-    agents: MutableMapping[Text, MutableMapping[Text, Text]],
+    cached: list[xr.DataArray],
+    agents: MutableMapping[str, MutableMapping[str, str]],
 ) -> pd.DataFrame:
     """Consolidates the cached capacities into a single DataFrame to save.
 
@@ -461,8 +454,8 @@ def capacity(
 
 @register_cached_quantity
 def production(
-    cached: List[xr.DataArray],
-    agents: MutableMapping[Text, MutableMapping[Text, Text]],
+    cached: list[xr.DataArray],
+    agents: MutableMapping[str, MutableMapping[str, str]],
 ) -> pd.DataFrame:
     """Consolidates the cached production into a single DataFrame to save.
 
@@ -478,8 +471,8 @@ def production(
 
 @register_cached_quantity(name="lifetime_levelized_cost_of_energy")
 def lcoe(
-    cached: List[xr.DataArray],
-    agents: MutableMapping[Text, MutableMapping[Text, Text]],
+    cached: list[xr.DataArray],
+    agents: MutableMapping[str, MutableMapping[str, str]],
 ) -> pd.DataFrame:
     """Consolidates the cached LCOE into a single DataFrame to save.
 
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 9424ea31..c93480bf 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -16,19 +16,13 @@ def quantity(
 or an xarray xr.DataArray.
 """
 
+from collections.abc import Hashable, Iterable, Mapping, MutableMapping, Sequence
 from operator import attrgetter
 from pathlib import Path
 from typing import (
     Any,
     Callable,
-    Hashable,
-    Iterable,
-    List,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
     Union,
     cast,
 )
@@ -43,14 +37,14 @@ def quantity(
 from muse.timeslices import QuantityType, convert_timeslice
 
 OUTPUT_QUANTITY_SIGNATURE = Callable[
-    [xr.Dataset, List[AbstractSector], KwArg(Any)], Union[xr.DataArray, pd.DataFrame]
+    [xr.Dataset, list[AbstractSector], KwArg(Any)], Union[xr.DataArray, pd.DataFrame]
 ]
 """Signature of functions computing quantities for later analysis."""
 
-OUTPUT_QUANTITIES: MutableMapping[Text, OUTPUT_QUANTITY_SIGNATURE] = {}
+OUTPUT_QUANTITIES: MutableMapping[str, OUTPUT_QUANTITY_SIGNATURE] = {}
 """Quantity for post-simulation analysis."""
 
-OUTPUTS_PARAMETERS = Union[Text, Mapping]
+OUTPUTS_PARAMETERS = Union[str, Mapping]
 """Acceptable Datastructures for outputs parameters"""
 
 
@@ -79,7 +73,7 @@ def round_values(function: Callable) -> OUTPUT_QUANTITY_SIGNATURE:
 
     @wraps(function)
     def rounded(
-        market: xr.Dataset, sectors: List[AbstractSector], rounding: int = 4, **kwargs
+        market: xr.Dataset, sectors: list[AbstractSector], rounding: int = 4, **kwargs
     ) -> xr.DataArray:
         result = function(market, sectors, **kwargs)
 
@@ -95,7 +89,7 @@ def rounded(
 
 def factory(
     *parameters: OUTPUTS_PARAMETERS,
-) -> Callable[[xr.Dataset, List[AbstractSector]], List[Path]]:
+) -> Callable[[xr.Dataset, list[AbstractSector]], list[Path]]:
     """Creates outputs functions for post-mortem analysis.
 
     Each parameter is a dictionary containing the following:
@@ -121,13 +115,13 @@ def reformat_finite_resources(params):
         from muse.readers.toml import MissingSettings
 
         name = params["quantity"]
-        if not isinstance(name, Text):
+        if not isinstance(name, str):
             name = name["name"]
         if name.lower() not in {"finite_resources", "finiteresources"}:
             return params
 
         quantity = params["quantity"]
-        if isinstance(quantity, Text):
+        if isinstance(quantity, str):
             quantity = dict(name=quantity)
         else:
             quantity = dict(**quantity)
@@ -153,7 +147,7 @@ def reformat_finite_resources(params):
 @register_output_quantity
 @round_values
 def consumption(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> xr.DataArray:
     """Current consumption."""
     from muse.outputs.sector import market_quantity
@@ -163,7 +157,7 @@ def consumption(
 
 @register_output_quantity
 @round_values
-def supply(market: xr.Dataset, sectors: List[AbstractSector], **kwargs) -> xr.DataArray:
+def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> xr.DataArray:
     """Current supply."""
     from muse.outputs.sector import market_quantity
 
@@ -174,9 +168,9 @@ def supply(market: xr.Dataset, sectors: List[AbstractSector], **kwargs) -> xr.Da
 @round_values
 def prices(
     market: xr.Dataset,
-    sectors: List[AbstractSector],
+    sectors: list[AbstractSector],
     drop_empty: bool = True,
-    keep_columns: Optional[Union[Sequence[Text], Text]] = "prices",
+    keep_columns: Optional[Union[Sequence[str], str]] = "prices",
     **kwargs,
 ) -> pd.DataFrame:
     """Current MCA market prices."""
@@ -187,7 +181,7 @@ def prices(
     if drop_empty:
         result = result[result.prices != 0]
 
-    if isinstance(keep_columns, Text):
+    if isinstance(keep_columns, str):
         result = result[[*ts_coords, keep_columns]]
 
     elif keep_columns is not None and len(keep_columns) > 0:
@@ -205,7 +199,7 @@ def prices(
 @register_output_quantity
 @round_values
 def capacity(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current capacity across all sectors."""
     return _aggregate_sectors(sectors, op=sector_capacity)
@@ -213,7 +207,7 @@ def capacity(
 
 def sector_capacity(sector: AbstractSector) -> pd.DataFrame:
     """Sector capacity with agent annotations."""
-    capa_sector: List[xr.DataArray] = []
+    capa_sector: list[xr.DataArray] = []
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
     for agent in agents:
         capa_agent = agent.assets.capacity
@@ -254,7 +248,7 @@ def sector_capacity(sector: AbstractSector) -> pd.DataFrame:
 
 
 def _aggregate_sectors(
-    sectors: List[AbstractSector], *args, op: Callable
+    sectors: list[AbstractSector], *args, op: Callable
 ) -> pd.DataFrame:
     """Aggregate outputs from all sectors."""
     alldata = [op(sector, *args) for sector in sectors]
@@ -270,10 +264,10 @@ class AggregateResources:
 
     def __init__(
         self,
-        commodities: Union[Text, Iterable[Hashable]] = (),
-        metric: Text = "consumption",
+        commodities: Union[str, Iterable[Hashable]] = (),
+        metric: str = "consumption",
     ):
-        if isinstance(commodities, Text):
+        if isinstance(commodities, str):
             commodities = [commodities]
         else:
             commodities = list(commodities)
@@ -284,7 +278,7 @@ def __init__(
     def __call__(
         self,
         market: xr.Dataset,
-        sectors: List[AbstractSector],
+        sectors: list[AbstractSector],
         year: Optional[int] = None,
     ) -> Optional[xr.DataArray]:
         if len(self.commodities) == 0:
@@ -307,14 +301,14 @@ class FiniteResources(AggregateResources):
 
     def __init__(
         self,
-        limits_path: Union[Text, Path, xr.DataArray],
-        commodities: Union[Text, Iterable[Hashable]] = (),
-        metric: Text = "consumption",
+        limits_path: Union[str, Path, xr.DataArray],
+        commodities: Union[str, Iterable[Hashable]] = (),
+        metric: str = "consumption",
     ):
         from muse.readers.csv import read_finite_resources
 
         super().__init__(commodities=commodities, metric=metric)
-        if isinstance(limits_path, Text):
+        if isinstance(limits_path, str):
             limits_path = Path(limits_path)
         if isinstance(limits_path, Path):
             limits_path = read_finite_resources(limits_path)
@@ -324,7 +318,7 @@ def __init__(
     def __call__(
         self,
         market: xr.Dataset,
-        sectors: List[AbstractSector],
+        sectors: list[AbstractSector],
         year: Optional[int] = None,
     ) -> Optional[xr.DataArray]:
         if len(self.commodities) == 0:
@@ -347,7 +341,7 @@ def __call__(
 
 @register_output_quantity(name=["timeslice_supply"])
 def metric_supply(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current timeslice supply across all sectors."""
     market_out = market.copy(deep=True)
@@ -358,7 +352,7 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
     """Sector supply with agent annotations."""
     from muse.production import supply
 
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     techs = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -426,7 +420,7 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
 
 @register_output_quantity(name=["yearly_supply"])
 def metricy_supply(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current yearlysupply across all sectors."""
     market_out = market.copy(deep=True)
@@ -496,7 +490,7 @@ def capacity(agents):
             ]
         )
 
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     techs = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -589,7 +583,7 @@ def capacity(agents):
 
 @register_output_quantity(name=["timeslice_consumption"])
 def metric_consumption(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current timeslice consumption across all sectors."""
     return _aggregate_sectors(sectors, market, op=sector_consumption)
@@ -602,7 +596,7 @@ def sector_consumption(
     from muse.production import supply
     from muse.quantities import consumption
 
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     techs = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -673,7 +667,7 @@ def sector_consumption(
 
 @register_output_quantity(name=["yearly_consumption"])
 def metricy_consumption(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current yearly consumption across all sectors."""
     return _aggregate_sectors(sectors, market, op=sectory_consumption)
@@ -686,7 +680,7 @@ def sectory_consumption(
     from muse.production import supply
     from muse.quantities import consumption
 
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     techs = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -746,7 +740,7 @@ def sectory_consumption(
 
 @register_output_quantity(name=["fuel_costs"])
 def metric_fuel_costs(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current lifetime levelised cost across all sectors."""
     return _aggregate_sectors(sectors, market, op=sector_fuel_costs)
@@ -760,7 +754,7 @@ def sector_fuel_costs(
     from muse.production import supply
     from muse.quantities import consumption
 
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -814,7 +808,7 @@ def sector_fuel_costs(
 
 @register_output_quantity(name=["capital_costs"])
 def metric_capital_costs(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current capital costs across all sectors."""
     return _aggregate_sectors(sectors, market, op=sector_capital_costs)
@@ -824,7 +818,7 @@ def sector_capital_costs(
     sector: AbstractSector, market: xr.Dataset, **kwargs
 ) -> pd.DataFrame:
     """Sector capital costs with agent annotations."""
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -865,7 +859,7 @@ def sector_capital_costs(
 
 @register_output_quantity(name=["emission_costs"])
 def metric_emission_costs(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current emission costs across all sectors."""
     return _aggregate_sectors(sectors, market, op=sector_emission_costs)
@@ -878,7 +872,7 @@ def sector_emission_costs(
     from muse.commodities import is_enduse, is_pollutant
     from muse.production import supply
 
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
 
@@ -933,7 +927,7 @@ def sector_emission_costs(
 
 @register_output_quantity(name=["LCOE"])
 def metric_lcoe(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current emission costs across all sectors."""
     return _aggregate_sectors(sectors, market, op=sector_lcoe)
@@ -962,7 +956,7 @@ def capacity_to_service_demand(demand, technologies):
         return max_demand / technologies.utilization_factor / max_hours
 
     # Filtering of the inputs
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
     retro = [a for a in agents if a.category == "retrofit"]
@@ -1135,7 +1129,7 @@ def capacity_to_service_demand(demand, technologies):
 
 @register_output_quantity(name=["EAC"])
 def metric_eac(
-    market: xr.Dataset, sectors: List[AbstractSector], **kwargs
+    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> pd.DataFrame:
     """Current emission costs across all sectors."""
     return _aggregate_sectors(sectors, market, op=sector_eac)
@@ -1164,7 +1158,7 @@ def capacity_to_service_demand(demand, technologies):
         return max_demand / technologies.utilization_factor / max_hours
 
     # Filtering of the inputs
-    data_sector: List[xr.DataArray] = []
+    data_sector: list[xr.DataArray] = []
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
     retro = [a for a in agents if a.category == "retrofit"]
diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py
index bf69de16..9eb6c59a 100644
--- a/src/muse/outputs/sector.py
+++ b/src/muse/outputs/sector.py
@@ -20,7 +20,8 @@ def quantity(
 The function should never modify it's arguments.
 """
 
-from typing import Any, Callable, List, Mapping, MutableMapping, Optional, Text, Union
+from collections.abc import Mapping, MutableMapping
+from typing import Any, Callable, Optional, Union
 
 import pandas as pd
 import xarray as xr
@@ -34,10 +35,10 @@ def quantity(
 ]
 """Signature of functions computing quantities for later analysis."""
 
-OUTPUT_QUANTITIES: MutableMapping[Text, OUTPUT_QUANTITY_SIGNATURE] = {}
+OUTPUT_QUANTITIES: MutableMapping[str, OUTPUT_QUANTITY_SIGNATURE] = {}
 """Quantity for post-simulation analysis."""
 
-OUTPUTS_PARAMETERS = Union[Text, Mapping]
+OUTPUTS_PARAMETERS = Union[str, Mapping]
 """Acceptable Datastructures for outputs parameters"""
 
 
@@ -59,7 +60,7 @@ def decorated(*args, **kwargs):
 
 
 def _quantity_factory(
-    parameters: Mapping, registry: Mapping[Text, Callable]
+    parameters: Mapping, registry: Mapping[str, Callable]
 ) -> Callable:
     from functools import partial
     from inspect import isclass
@@ -82,25 +83,25 @@ def _quantity_factory(
 
 
 def _factory(
-    registry: Mapping[Text, Callable],
+    registry: Mapping[str, Callable],
     *parameters: OUTPUTS_PARAMETERS,
-    sector_name: Text = "default",
+    sector_name: str = "default",
 ) -> Callable:
     from muse.outputs.sinks import factory as sink_factory
 
-    if isinstance(parameters, Text):
-        params: List = [{"quantity": parameters}]
+    if isinstance(parameters, str):
+        params: list = [{"quantity": parameters}]
     elif isinstance(parameters, Mapping):
         params = [parameters]
     else:
         params = [  # type: ignore
-            {"quantity": o} if isinstance(o, Text) else o for o in parameters
+            {"quantity": o} if isinstance(o, str) else o for o in parameters
         ]
 
     quantities = [_quantity_factory(param, registry) for param in params]
     sinks = [sink_factory(param, sector_name=sector_name) for param in params]
 
-    def save_multiple_outputs(market, *args, year: Optional[int] = None) -> List[Any]:
+    def save_multiple_outputs(market, *args, year: Optional[int] = None) -> list[Any]:
         if year is None:
             year = int(market.year.min())
 
@@ -113,8 +114,8 @@ def save_multiple_outputs(market, *args, year: Optional[int] = None) -> List[Any
 
 
 def factory(
-    *parameters: OUTPUTS_PARAMETERS, sector_name: Text = "default"
-) -> Callable[[xr.Dataset, xr.DataArray, xr.Dataset], List[Any]]:
+    *parameters: OUTPUTS_PARAMETERS, sector_name: str = "default"
+) -> Callable[[xr.Dataset, xr.DataArray, xr.Dataset], list[Any]]:
     """Creates outputs functions for post-mortem analysis.
 
     Each parameter is a dictionary containing the following:
@@ -152,14 +153,14 @@ def capacity(
 
 def market_quantity(
     quantity: xr.DataArray,
-    sum_over: Optional[Union[Text, List[Text]]] = None,
-    drop: Optional[Union[Text, List[Text]]] = None,
+    sum_over: Optional[Union[str, list[str]]] = None,
+    drop: Optional[Union[str, list[str]]] = None,
 ) -> xr.DataArray:
     from pandas import MultiIndex
 
     from muse.utilities import multiindex_to_coords
 
-    if isinstance(sum_over, Text):
+    if isinstance(sum_over, str):
         sum_over = [sum_over]
     if sum_over:
         sum_over = [s for s in sum_over if s in quantity.coords]
@@ -179,8 +180,8 @@ def consumption(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current consumption."""
@@ -199,8 +200,8 @@ def supply(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
@@ -219,8 +220,8 @@ def costs(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current costs."""
diff --git a/src/muse/outputs/sinks.py b/src/muse/outputs/sinks.py
index 683caadd..4d7325ee 100644
--- a/src/muse/outputs/sinks.py
+++ b/src/muse/outputs/sinks.py
@@ -17,14 +17,11 @@ def to_netcfd(quantity: DataArray, config: Mapping) -> Optional[Text]:
         pass
 """
 
+from collections.abc import Mapping, MutableMapping, Sequence
 from typing import (
     Any,
     Callable,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
     Union,
     cast,
 )
@@ -36,15 +33,15 @@ def to_netcfd(quantity: DataArray, config: Mapping) -> Optional[Text]:
 from muse.registration import registrator
 
 OUTPUT_SINK_SIGNATURE = Callable[
-    [Union[xr.DataArray, pd.DataFrame], int, KwArg(Any)], Optional[Text]
+    [Union[xr.DataArray, pd.DataFrame], int, KwArg(Any)], Optional[str]
 ]
 """Signature of functions used to save quantities."""
 
-OUTPUT_SINKS: MutableMapping[Text, Union[OUTPUT_SINK_SIGNATURE, Callable]] = {}
+OUTPUT_SINKS: MutableMapping[str, Union[OUTPUT_SINK_SIGNATURE, Callable]] = {}
 """Stores a quantity somewhere."""
 
 
-def factory(parameters: Mapping, sector_name: Text = "default") -> Callable:
+def factory(parameters: Mapping, sector_name: str = "default") -> Callable:
     from functools import partial
     from inspect import isclass
     from pathlib import Path
@@ -55,11 +52,11 @@ def factory(parameters: Mapping, sector_name: Text = "default") -> Callable:
     config.pop("quantity", None)
 
     def normalize(
-        params: Optional[Mapping], filename: Optional[Text] = None
+        params: Optional[Mapping], filename: Optional[str] = None
     ) -> MutableMapping:
         if isinstance(params, Mapping):
             params = dict(**params)
-        elif isinstance(params, Text):
+        elif isinstance(params, str):
             params = dict(name=params)
         else:
             suffix = config.get("suffix", Path(filename).suffix if filename else "csv")
@@ -96,7 +93,7 @@ def register_output_sink(function: OUTPUT_SINK_SIGNATURE = None) -> Callable:
     return function
 
 
-def sink_to_file(suffix: Text):
+def sink_to_file(suffix: str):
     """Simplifies sinks to files.
 
     The decorator takes care of figuring out the path to the file, as well as trims the
@@ -109,7 +106,7 @@ def sink_to_file(suffix: Text):
 
     from muse.defaults import DEFAULT_OUTPUT_DIRECTORY
 
-    def decorator(function: Callable[[Union[pd.DataFrame, xr.DataArray], Text], None]):
+    def decorator(function: Callable[[Union[pd.DataFrame, xr.DataArray], str], None]):
         @wraps(function)
         def decorated(
             quantity: Union[pd.DataFrame, xr.DataArray], year: int, **config
@@ -152,7 +149,7 @@ def decorated(
                         "not been given."
                     )
                     getLogger(function.__module__).critical(msg)
-                    raise IOError(msg)
+                    raise OSError(msg)
 
             filename.parent.mkdir(parents=True, exist_ok=True)
             function(quantity, filename, **params)  # type: ignore
@@ -164,7 +161,7 @@ def decorated(
 
 
 def standardize_quantity(
-    function: Callable[[Union[pd.DataFrame, xr.DataArray], Text], None],
+    function: Callable[[Union[pd.DataFrame, xr.DataArray], str], None],
 ):
     """Helps standardize how the quantities are specified.
 
@@ -191,7 +188,7 @@ def decorated(
         *args,
         set_index: Union[Any, NotSpecified] = NotSpecified,
         sort_index: Union[Any, NotSpecified, bool] = NotSpecified,
-        keep_columns: Union[Text, Sequence[Text], NotSpecified] = NotSpecified,
+        keep_columns: Union[str, Sequence[str], NotSpecified] = NotSpecified,
         group_by: Union[Any, NotSpecified] = NotSpecified,
         **config,
     ) -> None:
@@ -230,7 +227,7 @@ def decorated(
 @sink_to_file(".csv")
 @standardize_quantity
 def to_csv(
-    quantity: Union[pd.DataFrame, xr.DataArray], filename: Text, **params
+    quantity: Union[pd.DataFrame, xr.DataArray], filename: str, **params
 ) -> None:
     """Saves data array to csv format, using pandas.to_csv.
 
@@ -252,7 +249,7 @@ def to_csv(
 @register_output_sink(name=("netcdf", "nc"))
 @sink_to_file(".nc")
 def to_netcdf(
-    quantity: Union[xr.DataArray, pd.DataFrame], filename: Text, **params
+    quantity: Union[xr.DataArray, pd.DataFrame], filename: str, **params
 ) -> None:
     """Saves data array to csv format, using xarray.to_netcdf.
 
@@ -274,7 +271,7 @@ def to_netcdf(
 @sink_to_file(".xlsx")
 @standardize_quantity
 def to_excel(
-    quantity: Union[pd.DataFrame, xr.DataArray], filename: Text, **params
+    quantity: Union[pd.DataFrame, xr.DataArray], filename: str, **params
 ) -> None:
     """Saves data array to csv format, using pandas.to_excel.
 
@@ -290,7 +287,7 @@ def to_excel(
     try:
         quantity.to_excel(filename, **params)
     except ModuleNotFoundError as e:
-        msg = "Cannot save to excel format: missing python package (%s)" % e
+        msg = f"Cannot save to excel format: missing python package ({e})"
         getLogger(__name__).critical(msg)
         raise
 
@@ -301,8 +298,8 @@ class YearlyAggregate:
 
     def __init__(
         self,
-        final_sink: Optional[MutableMapping[Text, Any]] = None,
-        sector: Text = "",
+        final_sink: Optional[MutableMapping[str, Any]] = None,
+        sector: str = "",
         axis="year",
         **kwargs,
     ):
diff --git a/src/muse/production.py b/src/muse/production.py
index 32f09959..b8155bac 100644
--- a/src/muse/production.py
+++ b/src/muse/production.py
@@ -38,7 +38,8 @@ def production(
     "supply",
     "PRODUCTION_SIGNATURE",
 ]
-from typing import Any, Callable, Mapping, MutableMapping, Text, Union, cast
+from collections.abc import Mapping, MutableMapping
+from typing import Any, Callable, Union, cast
 
 import xarray as xr
 
@@ -47,7 +48,7 @@ def production(
 PRODUCTION_SIGNATURE = Callable[[xr.DataArray, xr.DataArray, xr.Dataset], xr.DataArray]
 """Production signature."""
 
-PRODUCTION_METHODS: MutableMapping[Text, PRODUCTION_SIGNATURE] = {}
+PRODUCTION_METHODS: MutableMapping[str, PRODUCTION_SIGNATURE] = {}
 """Dictionary of production methods. """
 
 
@@ -63,7 +64,7 @@ def register_production(function: PRODUCTION_SIGNATURE = None):
 
 
 def factory(
-    settings: Union[Text, Mapping] = "maximum_production", **kwargs
+    settings: Union[str, Mapping] = "maximum_production", **kwargs
 ) -> PRODUCTION_SIGNATURE:
     """Creates a production functor.
 
@@ -80,9 +81,9 @@ def factory(
 
     from muse.production import PRODUCTION_METHODS
 
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         name = settings
-        keywords: MutableMapping[Text, Any] = dict()
+        keywords: MutableMapping[str, Any] = dict()
     else:
         keywords = dict(**settings)
         name = keywords.pop("name")
@@ -129,7 +130,7 @@ def demand_matched_production(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    costs: Text = "prices",
+    costs: str = "prices",
 ) -> xr.DataArray:
     """Production from matching demand via annual lcoe."""
     from muse.quantities import annual_levelized_cost_of_energy as lcoe
@@ -160,7 +161,7 @@ def costed_production(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    costs: Union[xr.DataArray, Callable, Text] = "alcoe",
+    costs: Union[xr.DataArray, Callable, str] = "alcoe",
     with_minimum_service: bool = True,
     with_emission: bool = True,
 ) -> xr.DataArray:
@@ -179,9 +180,9 @@ def costed_production(
     )
     from muse.utilities import broadcast_techs
 
-    if isinstance(costs, Text) and costs.lower() == "alcoe":
+    if isinstance(costs, str) and costs.lower() == "alcoe":
         costs = annual_levelized_cost_of_energy
-    elif isinstance(costs, Text):
+    elif isinstance(costs, str):
         raise ValueError(f"Unknown cost {costs}")
     if callable(costs):
         technodata = cast(xr.Dataset, broadcast_techs(technologies, capacity))
diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index 604286d5..162e1fcf 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -5,7 +5,8 @@
 functions are used in different areas of the model.
 """
 
-from typing import Callable, Optional, Sequence, Text, Tuple, Union, cast
+from collections.abc import Sequence
+from typing import Callable, Optional, Union, cast
 
 import numpy as np
 import xarray as xr
@@ -15,7 +16,7 @@ def supply(
     capacity: xr.DataArray,
     demand: xr.DataArray,
     technologies: Union[xr.Dataset, xr.DataArray],
-    interpolation: Text = "linear",
+    interpolation: str = "linear",
     production_method: Optional[Callable] = None,
 ) -> xr.DataArray:
     """Production and emission for a given capacity servicing a given demand.
@@ -196,7 +197,7 @@ def gross_margin(
     # costs due to pollutants
     production_costs = prices * fixed_outputs
     environmental_costs = (production_costs.sel(commodity=environmentals)).sum(
-        ("commodity")
+        "commodity"
     )
     # revenues due to product sales
     revenues = (production_costs.sel(commodity=enduses)).sum("commodity")
@@ -312,8 +313,8 @@ def consumption(
 def annual_levelized_cost_of_energy(
     prices: xr.DataArray,
     technologies: xr.Dataset,
-    interpolation: Text = "linear",
-    fill_value: Union[int, Text] = "extrapolate",
+    interpolation: str = "linear",
+    fill_value: Union[int, str] = "extrapolate",
     **filters,
 ) -> xr.DataArray:
     """Undiscounted levelized cost of energy (LCOE) of technologies on each given year.
@@ -500,7 +501,7 @@ def demand_matched_production(
 def capacity_in_use(
     production: xr.DataArray,
     technologies: xr.Dataset,
-    max_dim: Optional[Union[Text, Tuple[Text]]] = "commodity",
+    max_dim: Optional[Union[str, tuple[str]]] = "commodity",
     **filters,
 ):
     """Capacity-in-use for each asset, given production.
@@ -549,7 +550,7 @@ def capacity_in_use(
 
 
 def supply_cost(
-    production: xr.DataArray, lcoe: xr.DataArray, asset_dim: Optional[Text] = "asset"
+    production: xr.DataArray, lcoe: xr.DataArray, asset_dim: Optional[str] = "asset"
 ) -> xr.DataArray:
     """Supply cost given production and the levelized cost of energy.
 
diff --git a/src/muse/readers/__init__.py b/src/muse/readers/__init__.py
index f9b7827b..631cecda 100644
--- a/src/muse/readers/__init__.py
+++ b/src/muse/readers/__init__.py
@@ -1,7 +1,5 @@
 """Aggregates methods to read data from file."""
 
-from typing import Text
-
 from muse.defaults import DATA_DIRECTORY
 from muse.readers.csv import *  # noqa: F403
 from muse.readers.toml import read_settings, read_timeslices  # noqa: F401
@@ -10,7 +8,7 @@
 """Default settings path."""
 
 
-def camel_to_snake(name: Text) -> Text:
+def camel_to_snake(name: str) -> str:
     """Transforms CamelCase to snake_case."""
     from re import sub
 
@@ -27,7 +25,7 @@ def kebab_to_camel(string):
     return "".join(x.capitalize() for x in string.split("-"))
 
 
-def snake_to_kebab(string: Text) -> Text:
+def snake_to_kebab(string: str) -> str:
     from re import sub
 
     result = sub(r"((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))", r"-\1", string)
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 44af8d96..d8446837 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -16,8 +16,9 @@
     "read_csv_outputs",
 ]
 
+from collections.abc import Sequence
 from pathlib import Path
-from typing import List, Optional, Sequence, Text, Union, cast
+from typing import Optional, Union, cast
 
 import numpy as np
 import pandas as pd
@@ -43,9 +44,9 @@ def to_numeric(x):
 
 
 def find_sectors_file(
-    filename: Union[Text, Path],
-    sector: Optional[Text] = None,
-    sectors_directory: Union[Text, Path] = DEFAULT_SECTORS_DIRECTORY,
+    filename: Union[str, Path],
+    sector: Optional[str] = None,
+    sectors_directory: Union[str, Path] = DEFAULT_SECTORS_DIRECTORY,
 ) -> Path:
     """Looks through a few standard place for sector files."""
     filename = Path(filename)
@@ -62,13 +63,13 @@ def find_sectors_file(
         if path.is_file():
             return path
     if sector is not None:
-        msg = "Could not find sector %s file %s." % (sector.title(), filename)
+        msg = f"Could not find sector {sector.title()} file {filename}."
     else:
-        msg = "Could not find file %s." % filename
-    raise IOError(msg)
+        msg = f"Could not find file {filename}."
+    raise OSError(msg)
 
 
-def read_technodictionary(filename: Union[Text, Path]) -> xr.Dataset:
+def read_technodictionary(filename: Union[str, Path]) -> xr.Dataset:
     """Reads and formats technodata into a dataset.
 
     There are three axes: technologies, regions, and year.
@@ -132,7 +133,7 @@ def to_agent_share(name):
     return result
 
 
-def read_technodata_timeslices(filename: Union[Text, Path]) -> xr.Dataset:
+def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset:
     from muse.readers import camel_to_snake
 
     csv = pd.read_csv(filename, float_precision="high", low_memory=False)
@@ -170,7 +171,7 @@ def read_technodata_timeslices(filename: Union[Text, Path]) -> xr.Dataset:
     return result
 
 
-def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
+def read_io_technodata(filename: Union[str, Path]) -> xr.Dataset:
     """Reads process inputs or outputs.
 
     There are four axes: (technology, region, year, commodity)
@@ -221,7 +222,7 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
     return result
 
 
-def read_initial_assets(filename: Union[Text, Path]) -> xr.DataArray:
+def read_initial_assets(filename: Union[str, Path]) -> xr.DataArray:
     """Reads and formats data about initial capacity into a dataframe."""
     data = pd.read_csv(filename, float_precision="high", low_memory=False)
     if "Time" in data.columns:
@@ -238,7 +239,7 @@ def read_initial_assets(filename: Union[Text, Path]) -> xr.DataArray:
     return result
 
 
-def read_initial_capacity(data: Union[Text, Path, pd.DataFrame]) -> xr.DataArray:
+def read_initial_capacity(data: Union[str, Path, pd.DataFrame]) -> xr.DataArray:
     if not isinstance(data, pd.DataFrame):
         data = pd.read_csv(data, float_precision="high", low_memory=False)
     if "Unit" in data.columns:
@@ -256,12 +257,12 @@ def read_initial_capacity(data: Union[Text, Path, pd.DataFrame]) -> xr.DataArray
 
 
 def read_technologies(
-    technodata_path_or_sector: Optional[Union[Text, Path]] = None,
-    technodata_timeslices_path: Optional[Union[Text, Path]] = None,
-    comm_out_path: Optional[Union[Text, Path]] = None,
-    comm_in_path: Optional[Union[Text, Path]] = None,
-    commodities: Optional[Union[Text, Path, xr.Dataset]] = None,
-    sectors_directory: Union[Text, Path] = DEFAULT_SECTORS_DIRECTORY,
+    technodata_path_or_sector: Optional[Union[str, Path]] = None,
+    technodata_timeslices_path: Optional[Union[str, Path]] = None,
+    comm_out_path: Optional[Union[str, Path]] = None,
+    comm_in_path: Optional[Union[str, Path]] = None,
+    commodities: Optional[Union[str, Path, xr.Dataset]] = None,
+    sectors_directory: Union[str, Path] = DEFAULT_SECTORS_DIRECTORY,
 ) -> xr.Dataset:
     """Reads data characterising technologies from files.
 
@@ -298,7 +299,7 @@ def read_technologies(
 
     if (not comm_out_path) and (not comm_in_path):
         sector = technodata_path_or_sector
-        assert sector is None or isinstance(sector, Text)
+        assert sector is None or isinstance(sector, str)
         tpath = find_sectors_file(
             f"technodata{sector.title()}.csv",
             sector,
@@ -315,7 +316,7 @@ def read_technologies(
             sectors_directory,
         )
     else:
-        assert isinstance(technodata_path_or_sector, (Text, Path))
+        assert isinstance(technodata_path_or_sector, (str, Path))
         assert comm_out_path is not None
         assert comm_in_path is not None
         tpath = Path(technodata_path_or_sector)
@@ -328,7 +329,7 @@ def read_technologies(
     - inputs: {ipath}
     """
     if technodata_timeslices_path and isinstance(
-        technodata_timeslices_path, (Text, Path)
+        technodata_timeslices_path, (str, Path)
     ):
         ttpath = Path(technodata_timeslices_path)
         msg += f"""- technodata_timeslices: {ttpath}
@@ -336,7 +337,7 @@ def read_technologies(
     else:
         ttpath = None
 
-    if isinstance(commodities, (Text, Path)):
+    if isinstance(commodities, (str, Path)):
         msg += f"""- global commodities file: {commodities}"""
 
     logger = getLogger(__name__)
@@ -363,17 +364,17 @@ def read_technologies(
     except xr.core.merge.MergeError:
         raise UnitsConflictInCommodities
 
-    if isinstance(ttpath, (Text, Path)):
+    if isinstance(ttpath, (str, Path)):
         technodata_timeslice = read_technodata_timeslices(ttpath)
         result = result.drop_vars("utilization_factor")
         result = result.merge(technodata_timeslice)
     else:
         technodata_timeslice = None
     # try and add info about commodities
-    if isinstance(commodities, (Text, Path)):
+    if isinstance(commodities, (str, Path)):
         try:
             commodities = read_global_commodities(commodities)
-        except IOError:
+        except OSError:
             logger.warning("Could not load global commodities file.")
             commodities = None
 
@@ -382,7 +383,7 @@ def read_technologies(
             result = result.merge(commodities.sel(commodity=result.commodity))
 
         else:
-            raise IOError(
+            raise OSError(
                 "Commodities not found in global commodities file: check spelling."
             )
 
@@ -397,11 +398,11 @@ def read_technologies(
     return result
 
 
-def read_csv_timeslices(path: Union[Text, Path], **kwargs) -> xr.DataArray:
+def read_csv_timeslices(path: Union[str, Path], **kwargs) -> xr.DataArray:
     """Reads timeslice information from input."""
     from logging import getLogger
 
-    getLogger(__name__).info("Reading timeslices from %s" % path)
+    getLogger(__name__).info(f"Reading timeslices from {path}")
     data = pd.read_csv(path, float_precision="high", **kwargs)
 
     def snake_case(string):
@@ -426,7 +427,7 @@ def snake_case(string):
     return result.timeslice
 
 
-def read_global_commodities(path: Union[Text, Path]) -> xr.Dataset:
+def read_global_commodities(path: Union[str, Path]) -> xr.Dataset:
     """Reads commodities information from input."""
     from logging import getLogger
 
@@ -436,7 +437,7 @@ def read_global_commodities(path: Union[Text, Path]) -> xr.Dataset:
     if path.is_dir():
         path = path / "MuseGlobalCommodities.csv"
     if not path.is_file():
-        raise IOError(f"File {path} does not exist.")
+        raise OSError(f"File {path} does not exist.")
 
     getLogger(__name__).info(f"Reading global commodities from {path}.")
 
@@ -458,9 +459,9 @@ def read_global_commodities(path: Union[Text, Path]) -> xr.Dataset:
 
 
 def read_timeslice_shares(
-    path: Union[Text, Path] = DEFAULT_SECTORS_DIRECTORY,
-    sector: Optional[Text] = None,
-    timeslice: Union[Text, Path, xr.DataArray] = "Timeslices{sector}.csv",
+    path: Union[str, Path] = DEFAULT_SECTORS_DIRECTORY,
+    sector: Optional[str] = None,
+    timeslice: Union[str, Path, xr.DataArray] = "Timeslices{sector}.csv",
 ) -> xr.Dataset:
     """Reads sliceshare information into a xr.Dataset.
 
@@ -479,15 +480,15 @@ def read_timeslice_shares(
             path, filename = path.parent, path.name
             re = match(r"TimesliceShare(.*)\.csv", filename)
             sector = path.name if re is None else re.group(1)
-    if isinstance(timeslice, Text) and "{sector}" in timeslice:
+    if isinstance(timeslice, str) and "{sector}" in timeslice:
         timeslice = timeslice.format(sector=sector)
-    if isinstance(timeslice, (Text, Path)) and not Path(timeslice).is_file():
+    if isinstance(timeslice, (str, Path)) and not Path(timeslice).is_file():
         timeslice = find_sectors_file(timeslice, sector, path)
-    if isinstance(timeslice, (Text, Path)):
+    if isinstance(timeslice, (str, Path)):
         timeslice = read_csv_timeslices(timeslice, low_memory=False)
 
-    share_path = find_sectors_file("TimesliceShare%s.csv" % sector, sector, path)
-    getLogger(__name__).info("Reading timeslice shares from %s" % share_path)
+    share_path = find_sectors_file(f"TimesliceShare{sector}.csv", sector, path)
+    getLogger(__name__).info(f"Reading timeslice shares from {share_path}")
     data = pd.read_csv(share_path, float_precision="high", low_memory=False)
     data.index = pd.MultiIndex.from_arrays(
         (data.RegionName, data.SN), names=("region", "timeslice")
@@ -507,7 +508,7 @@ def read_timeslice_shares(
     return result.shares
 
 
-def read_csv_agent_parameters(filename) -> List:
+def read_csv_agent_parameters(filename) -> list:
     """Reads standard MUSE agent-declaration csv-files.
 
     Returns a list of dictionaries, where each dictionary can be used to instantiate an
@@ -516,7 +517,7 @@ def read_csv_agent_parameters(filename) -> List:
     from re import sub
 
     if (
-        isinstance(filename, Text)
+        isinstance(filename, str)
         and Path(filename).suffix != ".csv"
         and not Path(filename).is_file()
     ):
@@ -554,7 +555,7 @@ def read_csv_agent_parameters(filename) -> List:
             if not issubclass(type(u), (int, float)):
                 raise ValueError(f"Agent ObjData requires a float entry in {filename}")
         decision_params = [
-            u for u in zip(objectives, sorting, floats) if isinstance(u[0], Text)
+            u for u in zip(objectives, sorting, floats) if isinstance(u[0], str)
         ]
 
         agent_type = {
@@ -587,7 +588,7 @@ def read_csv_agent_parameters(filename) -> List:
     return result
 
 
-def read_macro_drivers(path: Union[Text, Path]) -> xr.Dataset:
+def read_macro_drivers(path: Union[str, Path]) -> xr.Dataset:
     """Reads a standard MUSE csv file for macro drivers."""
     from logging import getLogger
 
@@ -612,9 +613,9 @@ def read_macro_drivers(path: Union[Text, Path]) -> xr.Dataset:
 
 
 def read_initial_market(
-    projections: Union[xr.DataArray, Path, Text],
-    base_year_import: Optional[Union[Text, Path, xr.DataArray]] = None,
-    base_year_export: Optional[Union[Text, Path, xr.DataArray]] = None,
+    projections: Union[xr.DataArray, Path, str],
+    base_year_import: Optional[Union[str, Path, xr.DataArray]] = None,
+    base_year_export: Optional[Union[str, Path, xr.DataArray]] = None,
     timeslices: Optional[xr.DataArray] = None,
 ) -> xr.Dataset:
     """Read projections, import and export csv files."""
@@ -623,14 +624,14 @@ def read_initial_market(
     from muse.timeslices import QuantityType, convert_timeslice
 
     # Projections must always be present
-    if isinstance(projections, (Text, Path)):
+    if isinstance(projections, (str, Path)):
         getLogger(__name__).info(f"Reading projections from {projections}")
         projections = read_attribute_table(projections)
     if timeslices is not None:
         projections = convert_timeslice(projections, timeslices, QuantityType.INTENSIVE)
 
     # Base year export is optional. If it is not there, it's set to zero
-    if isinstance(base_year_export, (Text, Path)):
+    if isinstance(base_year_export, (str, Path)):
         getLogger(__name__).info(f"Reading base year export from {base_year_export}")
         base_year_export = read_attribute_table(base_year_export)
     elif base_year_export is None:
@@ -638,7 +639,7 @@ def read_initial_market(
         base_year_export = xr.zeros_like(projections)
 
     # Base year import is optional. If it is not there, it's set to zero
-    if isinstance(base_year_import, (Text, Path)):
+    if isinstance(base_year_import, (str, Path)):
         getLogger(__name__).info(f"Reading base year import from {base_year_import}")
         base_year_import = read_attribute_table(base_year_import)
     elif base_year_import is None:
@@ -677,7 +678,7 @@ def read_initial_market(
     return result
 
 
-def read_attribute_table(path: Union[Text, Path]) -> xr.DataArray:
+def read_attribute_table(path: Union[str, Path]) -> xr.DataArray:
     """Read a standard MUSE csv file for price projections."""
     from logging import getLogger
 
@@ -685,7 +686,7 @@ def read_attribute_table(path: Union[Text, Path]) -> xr.DataArray:
 
     path = Path(path)
     if not path.is_file():
-        raise IOError(f"{path} does not exist.")
+        raise OSError(f"{path} does not exist.")
 
     getLogger(__name__).info(f"Reading prices from {path}")
 
@@ -714,7 +715,7 @@ def read_attribute_table(path: Union[Text, Path]) -> xr.DataArray:
     return result
 
 
-def read_regression_parameters(path: Union[Text, Path]) -> xr.Dataset:
+def read_regression_parameters(path: Union[str, Path]) -> xr.Dataset:
     """Reads the regression parameters from a standard MUSE csv file."""
     from logging import getLogger
 
@@ -722,7 +723,7 @@ def read_regression_parameters(path: Union[Text, Path]) -> xr.Dataset:
 
     path = Path(path)
     if not path.is_file():
-        raise IOError(f"{path} does not exist or is not a file.")
+        raise OSError(f"{path} does not exist or is not a file.")
     getLogger(__name__).info(f"Reading regression parameters from {path}.")
     table = pd.read_csv(path, float_precision="high", low_memory=False)
 
@@ -772,10 +773,10 @@ def read_regression_parameters(path: Union[Text, Path]) -> xr.Dataset:
 
 
 def read_csv_outputs(
-    paths: Union[Text, Path, Sequence[Union[Text, Path]]],
-    columns: Text = "commodity",
-    indices: Sequence[Text] = ("RegionName", "ProcessName", "Timeslice"),
-    drop: Sequence[Text] = ("Unnamed: 0",),
+    paths: Union[str, Path, Sequence[Union[str, Path]]],
+    columns: str = "commodity",
+    indices: Sequence[str] = ("RegionName", "ProcessName", "Timeslice"),
+    drop: Sequence[str] = ("Unnamed: 0",),
 ) -> xr.Dataset:
     """Read standard MUSE output files for consumption or supply."""
     from re import match
@@ -785,16 +786,16 @@ def read_csv_outputs(
     def expand_paths(path):
         from glob import glob
 
-        if isinstance(paths, Text):
+        if isinstance(paths, str):
             return [Path(p) for p in glob(path)]
         return Path(path)
 
-    if isinstance(paths, Text):
+    if isinstance(paths, str):
         allfiles = expand_paths(paths)
     else:
         allfiles = [expand_paths(p) for p in cast(Sequence, paths)]
     if len(allfiles) == 0:
-        raise IOError(f"No files found with paths {paths}")
+        raise OSError(f"No files found with paths {paths}")
 
     datas = {}
     for path in allfiles:
@@ -809,10 +810,10 @@ def expand_paths(path):
 
         reyear = match(r"\S*.(\d{4})\S*\.csv", path.name)
         if reyear is None:
-            raise IOError(f"Unexpected filename {path.name}")
+            raise OSError(f"Unexpected filename {path.name}")
         year = int(reyear.group(1))
         if year in datas:
-            raise IOError(f"Year f{year} was found twice")
+            raise OSError(f"Year f{year} was found twice")
         data.year = year
         datas[year] = xr.DataArray(data)
 
@@ -833,12 +834,12 @@ def expand_paths(path):
 
 
 def read_trade(
-    data: Union[pd.DataFrame, Text, Path],
+    data: Union[pd.DataFrame, str, Path],
     columns_are_source: bool = True,
-    parameters: Optional[Text] = None,
+    parameters: Optional[str] = None,
     skiprows: Optional[Sequence[int]] = None,
-    name: Optional[Text] = None,
-    drop: Optional[Union[Text, Sequence[Text]]] = None,
+    name: Optional[str] = None,
+    drop: Optional[Union[str, Sequence[str]]] = None,
 ) -> Union[xr.DataArray, xr.Dataset]:
     """Read CSV table with source and destination regions."""
     from muse.readers import camel_to_snake
@@ -855,7 +856,7 @@ def read_trade(
         row_region = "src_region"
         col_region = "dst_region"
     data = data.apply(to_numeric, axis=0)
-    if isinstance(drop, Text):
+    if isinstance(drop, str):
         drop = [drop]
     if drop:
         drop = list(set(drop).intersection(data.columns))
@@ -892,7 +893,7 @@ def read_trade(
     return result.rename(src_region="region")
 
 
-def read_finite_resources(path: Union[Text, Path]) -> xr.DataArray:
+def read_finite_resources(path: Union[str, Path]) -> xr.DataArray:
     """Reads finite resources from csv file.
 
     The CSV file is made up of columns "Region", "Year", as well
@@ -922,15 +923,15 @@ def read_finite_resources(path: Union[Text, Path]) -> xr.DataArray:
 def check_utilization_not_all_zero(data, filename):
     if "utilization_factor" not in data.columns:
         raise ValueError(
-            """A technology needs to have a utilization factor defined for every
-             timeslice. Please check file {}.""".format(filename)
+            f"""A technology needs to have a utilization factor defined for every
+             timeslice. Please check file {filename}."""
         )
 
     utilization_sum = data.groupby(["technology", "region", "year"]).sum()
 
     if (utilization_sum.utilization_factor == 0).any():
         raise ValueError(
-            """A technology can not have a utilization factor of 0 for every
-                timeslice. Please check file {}.""".format(filename)
+            f"""A technology can not have a utilization factor of 0 for every
+                timeslice. Please check file {filename}."""
         )
     return data
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index f05d4788..5b357d63 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -4,20 +4,14 @@
 
 import importlib.util as implib
 from collections import namedtuple
+from collections.abc import Mapping, MutableMapping, Sequence
 from copy import deepcopy
 from logging import getLogger
 from pathlib import Path
 from typing import (
     IO,
     Any,
-    Dict,
-    List,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
-    Text,
-    Tuple,
     Union,
 )
 
@@ -47,7 +41,7 @@ class IncorrectSettings(InputError):
 def convert(dictionary):
     """Converts a dictionary (with nested ones) to a nametuple."""
     for key, value in dictionary.items():
-        if isinstance(value, Dict):
+        if isinstance(value, dict):
             dictionary[key] = convert(value)
     return namedtuple("MUSEOptions", dictionary.keys())(**dictionary)
 
@@ -78,11 +72,11 @@ def __format__(self, spec):
 
 
 def format_path(
-    filepath: Text,
+    filepath: str,
     replacements: Optional[Mapping] = None,
-    path: Optional[Union[Text, Path]] = None,
-    cwd: Optional[Union[Text, Path]] = None,
-    muse_sectors: Optional[Text] = None,
+    path: Optional[Union[str, Path]] = None,
+    cwd: Optional[Union[str, Path]] = None,
+    muse_sectors: Optional[str] = None,
 ):
     """Replaces known patterns in a path.
 
@@ -110,10 +104,10 @@ def format_path(
 def format_paths(
     settings: Mapping,
     replacements: Optional[Mapping] = None,
-    path: Optional[Union[Text, Path]] = None,
-    cwd: Optional[Union[Text, Path]] = None,
-    muse_sectors: Optional[Text] = None,
-    suffixes: Sequence[Text] = (".csv", ".nc", ".xls", ".xlsx", ".py", ".toml"),
+    path: Optional[Union[str, Path]] = None,
+    cwd: Optional[Union[str, Path]] = None,
+    muse_sectors: Optional[str] = None,
+    suffixes: Sequence[str] = (".csv", ".nc", ".xls", ".xlsx", ".py", ".toml"),
 ):
     """Format paths passed to settings.
 
@@ -214,7 +208,7 @@ def format_paths(
         **({} if replacements is None else replacements),
     }
 
-    def format(path: Text) -> Text:
+    def format(path: str) -> str:
         if path.lower() in ("optional", "required"):
             return path
         return format_path(path, **patterns)  # type: ignore
@@ -228,7 +222,7 @@ def format(path: Text) -> Text:
 
     def is_a_path(key, value):
         return any(re.search(x, key) is not None for x in path_names) or (
-            isinstance(value, Text) and Path(value).suffix in suffixes
+            isinstance(value, str) and Path(value).suffix in suffixes
         )
 
     path = format(settings.get("path", str(patterns["path"])))
@@ -242,7 +236,7 @@ def is_a_path(key, value):
             result[key] = format(value)
         elif isinstance(value, Mapping):
             result[key] = format_paths(value, patterns, path)
-        elif isinstance(value, List):
+        elif isinstance(value, list):
             result[key] = [
                 format_paths(item, patterns, path)
                 if isinstance(item, Mapping)
@@ -256,8 +250,8 @@ def is_a_path(key, value):
 
 
 def read_split_toml(
-    tomlfile: Union[Text, Path, IO[Text], Mapping],
-    path: Optional[Union[Text, Path]] = None,
+    tomlfile: Union[str, Path, IO[str], Mapping],
+    path: Optional[Union[str, Path]] = None,
 ) -> MutableMapping:
     """Reads and consolidate TOML files.
 
@@ -349,8 +343,8 @@ def splice_section(settings: Mapping):
 
 
 def read_settings(
-    settings_file: Union[Text, Path, IO[Text], Mapping],
-    path: Optional[Union[Text, Path]] = None,
+    settings_file: Union[str, Path, IO[str], Mapping],
+    path: Optional[Union[str, Path]] = None,
 ) -> Any:
     """Loads the input settings for any MUSE simulation.
 
@@ -402,9 +396,9 @@ def read_settings(
 
 
 def read_ts_multiindex(
-    settings: Optional[Union[Mapping, Text]] = None,
+    settings: Optional[Union[Mapping, str]] = None,
     timeslice: Optional[xr.DataArray] = None,
-    transforms: Optional[Dict[Tuple, np.ndarray]] = None,
+    transforms: Optional[dict[tuple, np.ndarray]] = None,
 ) -> pd.MultiIndex:
     '''Read multiindex for a timeslice from TOML.
 
@@ -465,7 +459,7 @@ def read_ts_multiindex(
     indices = (TIMESLICE if timeslice is None else timeslice).get_index("timeslice")
     if transforms is None:
         transforms = TRANSFORMS
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         settings = loads(settings)
     elif settings is None:
         return indices
@@ -481,7 +475,7 @@ def read_ts_multiindex(
     levels = [
         settings.get(name, level) for name, level in zip(indices.names, indices.levels)
     ]
-    levels = [[level] if isinstance(level, Text) else level for level in levels]
+    levels = [[level] if isinstance(level, str) else level for level in levels]
     for i, level in enumerate(levels):
         known = [index[i] for index in transforms if len(index) > i]
         unexpected = set(level).difference(known)
@@ -494,9 +488,9 @@ def read_ts_multiindex(
 
 
 def read_timeslices(
-    settings: Optional[Union[Text, Mapping]] = None,
+    settings: Optional[Union[str, Mapping]] = None,
     timeslice: Optional[xr.DataArray] = None,
-    transforms: Optional[Dict[Tuple, np.ndarray]] = None,
+    transforms: Optional[dict[tuple, np.ndarray]] = None,
 ) -> xr.Dataset:
     '''Reads timeslice levels and create resulting timeslice coordinate.
 
@@ -586,22 +580,22 @@ def add_known_parameters(dd, u, parent=None):
             if isinstance(v, Mapping):
                 new_parent = k
                 if parent is not None:
-                    new_parent = "{}.{}".format(parent, k)
+                    new_parent = f"{parent}.{k}"
                 d[k] = add_known_parameters(d.get(k, {}), v, new_parent)
             else:
                 d[k] = v
         # Required parameters
-        elif isinstance(d[k], Text) and d[k].lower() == "required":
+        elif isinstance(d[k], str) and d[k].lower() == "required":
             missing.append(k)
         # Optional parameters with default values
-        elif isinstance(d[k], Text) and d[k].lower() == "optional":
+        elif isinstance(d[k], str) and d[k].lower() == "optional":
             d.pop(k)
         elif parent is not None:
-            defaults_used.append("{}.{}".format(parent, k))
+            defaults_used.append(f"{parent}.{k}")
         else:
             defaults_used.append(k)
 
-    msg = "ERROR - Required parameters missing in input file: {}.".format(missing)
+    msg = f"ERROR - Required parameters missing in input file: {missing}."
     if len(missing) > 0:
         raise MissingSettings(msg)
 
@@ -626,7 +620,7 @@ def add_unknown_parameters(dd, u):
     return d
 
 
-def validate_settings(settings: Dict) -> None:
+def validate_settings(settings: dict) -> None:
     """Run the checks on the settings file."""
     msg = " Validating input settings..."
     getLogger(__name__).info(msg)
@@ -637,7 +631,7 @@ def validate_settings(settings: Dict) -> None:
         SETTINGS_CHECKS[check](settings)
 
 
-def check_plugins(settings: Dict) -> None:
+def check_plugins(settings: dict) -> None:
     """Checks that the user custom defined python files exist.
 
     Checks that the user custom defined python files exist. If flagged to use, they are
@@ -648,10 +642,10 @@ def check_plugins(settings: Dict) -> None:
     """
     plugins = settings.get("plugins", [])
 
-    if isinstance(plugins, (Dict, Mapping)):
+    if isinstance(plugins, (dict, Mapping)):
         plugins = plugins.get("plugins")
 
-    if isinstance(plugins, (Path, Text)):
+    if isinstance(plugins, (Path, str)):
         plugins = [plugins]
 
     if not plugins:
@@ -672,7 +666,7 @@ def check_plugins(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_log_level(settings: Dict) -> None:
+def check_log_level(settings: dict) -> None:
     """Check the log level required in the simulation."""
     valid_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
     msg = "ERROR - Valid log levels are {}.".format(", ".join(valid_levels))
@@ -682,7 +676,7 @@ def check_log_level(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_interpolation_mode(settings: Dict) -> None:
+def check_interpolation_mode(settings: dict) -> None:
     """Just updates the interpolation mode to a bool.
 
     There's no check, actually.
@@ -702,7 +696,7 @@ def check_interpolation_mode(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_budget_parameters(settings: Dict) -> None:
+def check_budget_parameters(settings: dict) -> None:
     """Check the parameters that are required if carbon_budget > 0."""
     length = len(settings["carbon_budget_control"]["budget"])
     if length > 0:
@@ -725,7 +719,7 @@ def check_budget_parameters(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_foresight(settings: Dict) -> None:
+def check_foresight(settings: dict) -> None:
     """Check that foresight is a multiple of the smaller time_framework difference.
 
     If so, we update the time framework adding the foresight year to the list and
@@ -746,7 +740,7 @@ def check_foresight(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_iteration_control(settings: Dict) -> None:
+def check_iteration_control(settings: dict) -> None:
     """Checks the variables related to the control of the iterations.
 
     This includes whether equilibrium must be reached, the maximum number of iterations
@@ -768,7 +762,7 @@ def check_iteration_control(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_time_slices(settings: Dict) -> None:
+def check_time_slices(settings: dict) -> None:
     """Check the time slices.
 
     If there is no error, they are transformed into a xr.DataArray
@@ -782,7 +776,7 @@ def check_time_slices(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_global_data_files(settings: Dict) -> None:
+def check_global_data_files(settings: dict) -> None:
     """Checks that the global user files exist."""
     user_data = settings["global_input_files"]
 
@@ -791,7 +785,7 @@ def check_global_data_files(settings: Dict) -> None:
     else:
         basedir = settings["root"] / Path(user_data["path"])
 
-    msg = "ERROR Directory of global user files does not exist: {}.".format(basedir)
+    msg = f"ERROR Directory of global user files does not exist: {basedir}."
     assert basedir.exists(), msg
 
     # Update the path to the base directory
@@ -814,7 +808,7 @@ def check_global_data_files(settings: Dict) -> None:
 
 
 @register_settings_check(vary_name=False)
-def check_sectors_files(settings: Dict) -> None:
+def check_sectors_files(settings: dict) -> None:
     """Checks that the sector files exist."""
     sectors = settings["sectors"]
     priorities = {
@@ -844,10 +838,10 @@ def check_sectors_files(settings: Dict) -> None:
 
 def read_technodata(
     settings: Any,
-    sector_name: Optional[Text] = None,
+    sector_name: Optional[str] = None,
     time_framework: Optional[Sequence[int]] = None,
-    commodities: Optional[Union[Text, Path]] = None,
-    regions: Optional[Sequence[Text]] = None,
+    commodities: Optional[Union[str, Path]] = None,
+    regions: Optional[Sequence[str]] = None,
     **kwargs,
 ) -> xr.Dataset:
     """Helper function to create technodata for a given sector."""
@@ -873,7 +867,7 @@ def read_technodata(
         raise MissingSettings("Missing technodata section")
     technosettings = undo_damage(settings.technodata)
 
-    if isinstance(technosettings, Text):
+    if isinstance(technosettings, str):
         technosettings = dict(
             technodata=technosettings,
             technodata_timeslices=technodata_timeslices,
@@ -910,7 +904,7 @@ def read_technodata(
     techcomms = technologies.commodity[ins | outs]
     technologies = technologies.sel(commodity=techcomms)
     for name, value in technosettings.items():
-        if isinstance(name, (Text, Path)):
+        if isinstance(name, (str, Path)):
             data = read_trade(value, drop="Unit")
             if "region" in data.dims:
                 data = data.sel(region=regions)
diff --git a/src/muse/registration.py b/src/muse/registration.py
index d44910cf..23321e00 100644
--- a/src/muse/registration.py
+++ b/src/muse/registration.py
@@ -2,7 +2,8 @@
 
 __all__ = ["registrator"]
 
-from typing import Callable, MutableMapping, Optional, Sequence, Text, Union
+from collections.abc import MutableMapping, Sequence
+from typing import Callable, Optional, Union
 
 
 def name_variations(*args):
@@ -39,8 +40,8 @@ def nospacecase(name):
 def registrator(
     decorator: Optional[Callable] = None,
     registry: Optional[MutableMapping] = None,
-    logname: Optional[Text] = None,
-    loglevel: Optional[Text] = "Debug",
+    logname: Optional[str] = None,
+    loglevel: Optional[str] = "Debug",
 ) -> Callable:
     """A decorator to create a decorator that registers functions with MUSE.
 
@@ -132,7 +133,7 @@ def registrator(
     @wraps(decorator)
     def register(
         function=None,
-        name: Optional[Union[Text, Sequence[Text]]] = None,
+        name: Optional[Union[str, Sequence[str]]] = None,
         vary_name: bool = True,
         overwrite: bool = False,
     ):
@@ -148,7 +149,7 @@ def register(
 
         if name is None:
             names = [function.__name__]
-        elif isinstance(name, Text):
+        elif isinstance(name, str):
             names = [name, function.__name__]
         else:
             names = [*name, function.__name__]
@@ -156,7 +157,7 @@ def register(
         # all registered filters will use the same logger, at least for the
         # default logging done in the decorated function
         logger = getLogger(function.__module__)
-        msg = "Computing {}: {}".format(logname, names[0])
+        msg = f"Computing {logname}: {names[0]}"
 
         assert decorator is not None
         if "name" in signature(decorator).parameters:
diff --git a/src/muse/regressions.py b/src/muse/regressions.py
index dbd5f007..41471bb1 100644
--- a/src/muse/regressions.py
+++ b/src/muse/regressions.py
@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from collections.abc import Mapping, Sequence
 from pathlib import Path
-from typing import Callable, ClassVar, Mapping, Optional, Sequence, Text, Tuple, Union
+from typing import Callable, ClassVar
 
 from xarray import DataArray, Dataset
 
@@ -67,7 +68,7 @@ class Regression(Callable):
     This class attribute must be overridden.
     """
 
-    def __init__(self, interpolation: Text = "linear", base_year: int = 2010, **kwargs):
+    def __init__(self, interpolation: str = "linear", base_year: int = 2010, **kwargs):
         super().__init__()
         self.interpolation = interpolation
         """Interpolation method when interpolating years"""
@@ -82,15 +83,15 @@ def __init__(self, interpolation: Text = "linear", base_year: int = 2010, **kwar
     @abstractmethod
     def __call__(
         self,
-        gdp_or_dataset: Union[DataArray, Dataset],
-        population: Optional[DataArray],
-        year: Optional[Union[int, Sequence[int]]] = None,
+        gdp_or_dataset: DataArray | Dataset,
+        population: DataArray | None,
+        year: int | Sequence[int] | None = None,
         forecast: int = 5,
         **kwargs,
     ) -> DataArray:
         pass
 
-    def sel(self, **filters) -> "Regression":
+    def sel(self, **filters) -> Regression:
         """Regression over part of the data only."""
         return self.__class__(
             interpolation=self.interpolation,
@@ -100,7 +101,7 @@ def sel(self, **filters) -> "Regression":
 
     @staticmethod
     def _to_dataset(
-        first: Union[DataArray, Dataset], population: Optional[DataArray]
+        first: DataArray | Dataset, population: DataArray | None
     ) -> Dataset:
         data = first if isinstance(first, Dataset) else Dataset({"gdp": first})
         if population is not None:
@@ -108,7 +109,7 @@ def _to_dataset(
         return data
 
     @staticmethod
-    def _split_kwargs(data: Dataset, **kwargs) -> Tuple[Mapping, Mapping]:
+    def _split_kwargs(data: Dataset, **kwargs) -> tuple[Mapping, Mapping]:
         filters = {k: v for k, v in kwargs.items() if k in data.dims}
         attrs = {k: v for k, v in kwargs.items() if k not in data.dims}
         return filters, attrs
@@ -116,8 +117,8 @@ def _split_kwargs(data: Dataset, **kwargs) -> Tuple[Mapping, Mapping]:
     @classmethod
     def factory(
         cls,
-        regression_data: Union[Text, Path, Dataset],
-        interpolation: Text = "linear",
+        regression_data: str | Path | Dataset,
+        interpolation: str = "linear",
         base_year: int = 2010,
         **filters,
     ) -> Regression:
@@ -127,7 +128,7 @@ def factory(
         assert cls.__mappings__
         assert cls.__regression__ != ""
 
-        if isinstance(regression_data, (Text, Path)):
+        if isinstance(regression_data, (str, Path)):
             regression_data = read_regression_parameters(regression_data)
 
         # Get the parameters of interest with a 'simple' name
@@ -137,13 +138,13 @@ def factory(
 
 
 def factory(
-    regression_parameters: Union[Text, Path, Dataset],
-    sector: Optional[Union[Text, Sequence[Text]]] = None,
+    regression_parameters: str | Path | Dataset,
+    sector: str | Sequence[str] | None = None,
 ) -> Regression:
     """Creates regression functor from standard MUSE data for given sector."""
     from muse.readers import read_regression_parameters
 
-    if isinstance(regression_parameters, (Text, Path)):
+    if isinstance(regression_parameters, (str, Path)):
         regression_parameters = read_regression_parameters(regression_parameters)
 
     if sector is not None:
@@ -189,7 +190,7 @@ def _kebab_case(name: str) -> str:
 
 
 def register_regression(
-    Functor: Regression = None, name: Optional[Text] = None
+    Functor: Regression = None, name: str | None = None
 ) -> Regression:
     """Registers a functor with MUSE regressions.
 
@@ -213,15 +214,12 @@ def register_regression(
     logger = getLogger(__name__)
 
     def factory(file_or_dataset, *args, **kwargs):
-        if isinstance(file_or_dataset, (Path, Text)):
-            msg = "Creating regression functor {} from data in {}".format(
-                _kebab_case(name if name is not None else Functor.__name__),
-                file_or_dataset,
-            )
+        if isinstance(file_or_dataset, (Path, str)):
+            opt = _kebab_case(name if name is not None else Functor.__name__)
+            msg = f"Creating regression functor {opt} from data in {file_or_dataset}"
         else:
-            msg = "Creating regression functor {} from dataset".format(
-                _kebab_case(name if name is not None else Functor.__name__)
-            )
+            opt = _kebab_case(name if name is not None else Functor.__name__)
+            msg = f"Creating regression functor {opt} from dataset"
         logger.info(msg)
         function = getattr(Functor, "factory", Functor)
         return function(file_or_dataset, *args, **kwargs)
@@ -230,7 +228,7 @@ def factory(file_or_dataset, *args, **kwargs):
     REGRESSION_FUNCTOR_NAMES[Functor.__name__.lower()] = []
     for n in name_variations(*names):
         if n in REGRESSION_FUNCTOR_CREATOR:
-            msg = "A regression with the name %s already exists" % n
+            msg = f"A regression with the name {n} already exists"
             raise RuntimeError(msg)
         REGRESSION_FUNCTOR_CREATOR[n] = factory
         REGRESSION_FUNCTOR_NAMES[Functor.__name__.lower()].append(n)
@@ -239,7 +237,7 @@ def factory(file_or_dataset, *args, **kwargs):
 
 
 def regression_functor(
-    mappings: Mapping[Text, Text], name: Optional[Text] = None
+    mappings: Mapping[str, str], name: str | None = None
 ) -> Regression:
     """Creates a macro-driver functor from a function.
 
@@ -266,16 +264,16 @@ def decorator(func):
         classname = func.__name__
 
         logger = getLogger(__name__)
-        log = "Calling {} regression function".format(_kebab_case(classname))
+        log = f"Calling {_kebab_case(classname)} regression function"
 
         # the main function will transform the input so 'func' can deal with it
         @wraps(func)
         def __call__(
             self,
-            gdp_or_dataset: Union[DataArray, Dataset],
-            population: Optional[DataArray] = None,
-            year: Optional[Union[int, Sequence[int]]] = None,
-            forecast: Optional[Union[int, Sequence[int]]] = None,
+            gdp_or_dataset: DataArray | Dataset,
+            population: DataArray | None = None,
+            year: int | Sequence[int] | None = None,
+            forecast: int | Sequence[int] | None = None,
             **kwargs,
         ):
             from numpy import ndarray
@@ -328,12 +326,12 @@ def __call__(
         if __call__.__doc__ is None:
             __call__.__doc__ = "\n\n" + msg
         else:
-            __call__.__doc__ += "Regression function: {}\n\n{}".format(name_, msg)
+            __call__.__doc__ += f"Regression function: {name_}\n\n{msg}"
 
-        doc = """Regression function: {name}
+        doc = f"""Regression function: {name_}
 
-        This functor is a regression function registered with MUSE as '{name}'.
-        """.format(name=name_)
+        This functor is a regression function registered with MUSE as '{name_}'.
+        """
 
         Self = type(
             classname,
@@ -369,7 +367,7 @@ def ExponentialAdj(
     gdp: DataArray,
     population: DataArray,
     *args,
-    year: Optional[Union[int, Sequence[int]]] = None,
+    year: int | Sequence[int] | None = None,
     forecast: int = 5,
     n: int = 6,
     **kwargs,
@@ -421,7 +419,7 @@ def LogisticSigmoid(
     gdp: DataArray,
     population: DataArray,
     *args,
-    year: Optional[Union[int, Sequence[int]]] = None,
+    year: int | Sequence[int] | None = None,
     **kwargs,
 ) -> DataArray:
     """0.001 * (constant * pop + gdp * c / sqrt(1 + (gdp * scale / pop)^2)."""
@@ -465,9 +463,9 @@ class Linear(Regression):
 
     def __call__(
         self,
-        gdp_or_dataset: Union[DataArray, Dataset],
-        population: Optional[DataArray] = None,
-        year: Optional[Union[int, Sequence[int]]] = None,
+        gdp_or_dataset: DataArray | Dataset,
+        population: DataArray | None = None,
+        year: int | Sequence[int] | None = None,
         forecast: int = 5,
         **kwargs,
     ) -> DataArray:
@@ -506,15 +504,15 @@ def __call__(
 
 
 def endogenous_demand(
-    regression_parameters: Union[Text, Path, Dataset],
-    drivers: Union[Text, Path, Dataset],
-    sector: Optional[Union[Text, Sequence]] = None,
+    regression_parameters: str | Path | Dataset,
+    drivers: str | Path | Dataset,
+    sector: str | Sequence | None = None,
     **kwargs,
 ) -> Dataset:
     """Endogenous demand based on macro drivers and regression parameters."""
     from muse.readers import read_macro_drivers
 
     regression = factory(regression_parameters, sector=sector)
-    if isinstance(drivers, (Text, Path)):
+    if isinstance(drivers, (str, Path)):
         drivers = read_macro_drivers(drivers)
     return regression(drivers, **kwargs)
diff --git a/src/muse/sectors/abstract.py b/src/muse/sectors/abstract.py
index 3fd3c24c..231b444c 100644
--- a/src/muse/sectors/abstract.py
+++ b/src/muse/sectors/abstract.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import Any, Text
+from typing import Any
 
 from xarray import Dataset
 
@@ -22,7 +22,7 @@ class AbstractSector(ABC):
 
     @classmethod
     @abstractmethod
-    def factory(cls, name: Text, settings: Any) -> AbstractSector:
+    def factory(cls, name: str, settings: Any) -> AbstractSector:
         """Creates class from settings named-tuple."""
         pass
 
diff --git a/src/muse/sectors/legacy_sector.py b/src/muse/sectors/legacy_sector.py
index bb88bb70..ad61cdc6 100644
--- a/src/muse/sectors/legacy_sector.py
+++ b/src/muse/sectors/legacy_sector.py
@@ -4,10 +4,11 @@
 once accessing those sectors is no longer needed.
 """
 
+from collections.abc import Sequence
 from dataclasses import dataclass
 from itertools import chain
 from logging import getLogger
-from typing import Any, Dict, Sequence, Text, Tuple, Union
+from typing import Any, Union
 
 import numpy as np
 import pandas as pd
@@ -20,7 +21,7 @@
 
 
 @dataclass
-class LegacyMarket(object):
+class LegacyMarket:
     BaseYear: int
     EndYear: int
     Foresight: np.ndarray
@@ -32,13 +33,13 @@ class LegacyMarket(object):
     macro_drivers: pd.DataFrame
     dfRegions: pd.DataFrame
     Regions: np.ndarray
-    interpolation_mode: Text
+    interpolation_mode: str
 
 
 @register_sector(name="legacy")
 class LegacySector(AbstractSector):  # type: ignore
     @classmethod
-    def factory(cls, name: Text, settings: Any, **kwargs) -> "LegacySector":
+    def factory(cls, name: str, settings: Any, **kwargs) -> "LegacySector":
         from pathlib import Path
 
         from muse_legacy.sectors import SECTORS
@@ -130,7 +131,7 @@ def factory(cls, name: Text, settings: Any, **kwargs) -> "LegacySector":
             name: global_commodities.isel(commodity=sector_comm),
         }
 
-        msg = "LegacySector {} created successfully.".format(name)
+        msg = f"LegacySector {name} created successfully."
         getLogger(__name__).info(msg)
         return cls(
             name,
@@ -150,19 +151,19 @@ def factory(cls, name: Text, settings: Any, **kwargs) -> "LegacySector":
 
     def __init__(
         self,
-        name: Text,
+        name: str,
         old_sector,
-        timeslices: Dict,
-        commodities: Dict,
+        timeslices: dict,
+        commodities: dict,
         commodity_price: DataArray,
         static_trade: DataArray,
         regions: Sequence,
         time_framework: np.ndarray,
-        mode: Text,
+        mode: str,
         excess: Union[int, float],
-        market_iterative: Text,
-        sectors_dir: Text,
-        output_dir: Text,
+        market_iterative: str,
+        sectors_dir: str,
+        output_dir: str,
     ):
         super().__init__()
         self.name = name
@@ -277,7 +278,7 @@ def runprocessmodule(self, consumption, supplycost, supply, t):
         return result
 
     @staticmethod
-    def load_timeslices_and_aggregation(timeslices, sectors) -> Tuple[dict, str]:
+    def load_timeslices_and_aggregation(timeslices, sectors) -> tuple[dict, str]:
         """Loads all sector timeslices and finds the finest one."""
         timeslices = {"prices": timeslices.rename("prices timeslices")}
         finest = timeslices["prices"].copy()
@@ -378,11 +379,11 @@ def ndarray_to_xarray(
     global_commodities: DataArray,
     sector_commodities: DataArray,
     data_ts: pd.MultiIndex,
-    dims: Sequence[Text],
-    regions: Sequence[Text],
+    dims: Sequence[str],
+    regions: Sequence[str],
 ) -> DataArray:
     """From ndarray to dataarray."""
-    from typing import Hashable, Mapping
+    from collections.abc import Hashable, Mapping
 
     from muse.timeslices import convert_timeslice
 
@@ -403,11 +404,11 @@ def xarray_to_ndarray(
     ts: pd.MultiIndex,
     qt: QuantityType,
     global_commodities: DataArray,
-    dims: Sequence[Text],
-    regions: Sequence[Text],
+    dims: Sequence[str],
+    regions: Sequence[str],
 ) -> np.ndarray:
     """From dataarray to ndarray."""
-    from typing import Hashable, Mapping
+    from collections.abc import Hashable, Mapping
 
     from muse.timeslices import convert_timeslice
 
@@ -424,7 +425,7 @@ def xarray_to_ndarray(
     return result.values
 
 
-def commodities_idx(sector, comm: Text) -> Sequence:
+def commodities_idx(sector, comm: str) -> Sequence:
     """Gets the indices of the commodities involved in the processes of the sector.
 
     Arguments:
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 67327c5d..2bdbbdec 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Text
+from typing import Any
 
 from xarray import DataArray, Dataset
 
@@ -14,9 +14,9 @@ class PresetSector(AbstractSector):  # type: ignore
     """Sector with outcomes fixed from the start."""
 
     @classmethod
-    def factory(cls, name: Text, settings: Any) -> PresetSector:
+    def factory(cls, name: str, settings: Any) -> PresetSector:
         """Constructs a PresetSectors from input data."""
-        from typing import Sequence
+        from collections.abc import Sequence
 
         from xarray import DataArray, zeros_like
 
@@ -108,7 +108,7 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
             presets["costs"] = costs
 
         if len(presets.data_vars) == 0:
-            raise IOError("None of supply, consumption, costs given")
+            raise OSError("None of supply, consumption, costs given")
 
         # add missing data as zeros: we only need one of conumption, costs, supply
         components = {"supply", "consumption", "costs"}
@@ -140,14 +140,14 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
     def __init__(
         self,
         presets: Dataset,
-        interpolation_mode: Text = "linear",
-        name: Text = "preset",
+        interpolation_mode: str = "linear",
+        name: str = "preset",
     ):
         super().__init__()
 
         self.presets: Dataset = presets
         """Market across time and space."""
-        self.interpolation_mode: Text = interpolation_mode
+        self.interpolation_mode: str = interpolation_mode
         """Interpolation method"""
         self.name = name
         """Name by which to identify a sector"""
diff --git a/src/muse/sectors/register.py b/src/muse/sectors/register.py
index 690888d1..d761ced4 100644
--- a/src/muse/sectors/register.py
+++ b/src/muse/sectors/register.py
@@ -1,15 +1,16 @@
-from typing import Callable, Mapping, Optional, Sequence, Text, Type, Union
+from collections.abc import Mapping, Sequence
+from typing import Callable, Optional, Union
 
 from muse.sectors.abstract import AbstractSector
 
-SECTORS_REGISTERED: Mapping[Text, Callable] = {}
+SECTORS_REGISTERED: Mapping[str, Callable] = {}
 """Dictionary of sectors."""
 
 
 def register_sector(
-    sector_class: Optional[Type[AbstractSector]] = None,
-    name: Optional[Union[Text, Sequence[Text]]] = None,
-) -> Type[AbstractSector]:
+    sector_class: Optional[type[AbstractSector]] = None,
+    name: Optional[Union[str, Sequence[str]]] = None,
+) -> type[AbstractSector]:
     """Registers a sector so it is available MUSE-wide.
 
     Example:
@@ -24,8 +25,8 @@ def register_sector(
     if sector_class is None:
         return lambda x: register_sector(x, name=name)  # type: ignore
 
-    if isinstance(name, Text):
-        names: Sequence[Text] = (name,)
+    if isinstance(name, str):
+        names: Sequence[str] = (name,)
     elif name is None:
         names = (sector_class.__name__,)
     else:
diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py
index 4d08878c..f764dd64 100644
--- a/src/muse/sectors/sector.py
+++ b/src/muse/sectors/sector.py
@@ -1,15 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Iterator, Mapping, Sequence
 from typing import (
     Any,
     Callable,
-    Iterator,
-    Mapping,
-    Optional,
-    Sequence,
-    Text,
-    Tuple,
-    Union,
     cast,
 )
 
@@ -28,7 +22,7 @@ class Sector(AbstractSector):  # type: ignore
     """Base class for all sectors."""
 
     @classmethod
-    def factory(cls, name: Text, settings: Any) -> Sector:
+    def factory(cls, name: str, settings: Any) -> Sector:
         from muse.interactions import factory as interaction_factory
         from muse.outputs.sector import factory as ofactory
         from muse.production import factory as pfactory
@@ -62,7 +56,7 @@ def factory(cls, name: Text, settings: Any) -> Sector:
             ._asdict()
             .items()
         ]
-        are_disjoint_commodities = sum((len(s.commodities) for s in subsectors)) == len(
+        are_disjoint_commodities = sum(len(s.commodities) for s in subsectors) == len(
             set().union(*(set(s.commodities) for s in subsectors))  # type: ignore
         )
         if not are_disjoint_commodities:
@@ -73,7 +67,7 @@ def factory(cls, name: Text, settings: Any) -> Sector:
         supply_args = sector_settings.pop(
             "supply", sector_settings.pop("dispatch_production", {})
         )
-        if isinstance(supply_args, Text):
+        if isinstance(supply_args, str):
             supply_args = {"name": supply_args}
         else:
             supply_args = nametuple_to_dict(supply_args)
@@ -96,32 +90,32 @@ def factory(cls, name: Text, settings: Any) -> Sector:
 
     def __init__(
         self,
-        name: Text,
+        name: str,
         technologies: xr.Dataset,
         subsectors: Sequence[Subsector] = [],
-        timeslices: Optional[pd.MultiIndex] = None,
+        timeslices: pd.MultiIndex | None = None,
         technodata_timeslices: xr.Dataset = None,
-        interactions: Optional[Callable[[Sequence[AbstractAgent]], None]] = None,
-        interpolation: Text = "linear",
-        outputs: Optional[Callable] = None,
-        supply_prod: Optional[PRODUCTION_SIGNATURE] = None,
+        interactions: Callable[[Sequence[AbstractAgent]], None] | None = None,
+        interpolation: str = "linear",
+        outputs: Callable | None = None,
+        supply_prod: PRODUCTION_SIGNATURE | None = None,
     ):
         from muse.interactions import factory as interaction_factory
         from muse.outputs.sector import factory as ofactory
         from muse.production import maximum_production
 
-        self.name: Text = name
+        self.name: str = name
         """Name of the sector."""
         self.subsectors: Sequence[Subsector] = list(subsectors)
         """Subsectors controlled by this object."""
         self.technologies: xr.Dataset = technologies
         """Parameters describing the sector's technologies."""
-        self.timeslices: Optional[pd.MultiIndex] = timeslices
+        self.timeslices: pd.MultiIndex | None = timeslices
         """Timeslice at which this sector operates.
 
         If None, it will operate using the timeslice of the input market.
         """
-        self.interpolation: Mapping[Text, Any] = {
+        self.interpolation: Mapping[str, Any] = {
             "method": interpolation,
             "kwargs": {"fill_value": "extrapolate"},
         }
@@ -177,8 +171,8 @@ def forecast(self):
     def next(
         self,
         mca_market: xr.Dataset,
-        time_period: Optional[int] = None,
-        current_year: Optional[int] = None,
+        time_period: int | None = None,
+        current_year: int | None = None,
     ) -> xr.Dataset:
         """Advance sector by one time period.
 
@@ -410,12 +404,12 @@ def agents(self) -> Iterator[AbstractAgent]:
     def convert_market_timeslice(
         market: xr.Dataset,
         timeslice: pd.MultiIndex,
-        intensive: Union[Text, Tuple[Text]] = "prices",
+        intensive: str | tuple[str] = "prices",
     ) -> xr.Dataset:
         """Converts market from one to another timeslice."""
         from muse.timeslices import QuantityType, convert_timeslice
 
-        if isinstance(intensive, Text):
+        if isinstance(intensive, str):
             intensive = (intensive,)
 
         timesliced = {d for d in market.data_vars if "timeslice" in market[d].dims}
diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py
index 4c8f221f..f6f3564b 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -1,16 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Hashable, MutableMapping, Sequence
 from typing import (
     Any,
     Callable,
-    Hashable,
-    List,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Text,
-    Tuple,
-    Union,
     cast,
 )
 
@@ -26,11 +19,11 @@ class Subsector:
     def __init__(
         self,
         agents: Sequence[Agent],
-        commodities: Sequence[Text],
-        demand_share: Optional[Callable] = None,
-        constraints: Optional[Callable] = None,
-        investment: Optional[Callable] = None,
-        name: Text = "subsector",
+        commodities: Sequence[str],
+        demand_share: Callable | None = None,
+        constraints: Callable | None = None,
+        investment: Callable | None = None,
+        name: str = "subsector",
         forecast: int = 5,
         expand_market_prices: bool = False,
     ):
@@ -39,7 +32,7 @@ def __init__(
         from muse import investments as iv
 
         self.agents: Sequence[Agent] = list(agents)
-        self.commodities: List[Text] = list(commodities)
+        self.commodities: list[str] = list(commodities)
         self.demand_share = demand_share or ds.factory()
         self.constraints = constraints or cs.factory()
         self.investment = investment or iv.factory()
@@ -58,7 +51,7 @@ def invest(
         technologies: xr.Dataset,
         market: xr.Dataset,
         time_period: int = 5,
-        current_year: Optional[int] = None,
+        current_year: int | None = None,
     ) -> None:
         if current_year is None:
             current_year = market.year.min()
@@ -106,8 +99,8 @@ def aggregate_lp(
         technologies: xr.Dataset,
         market: xr.Dataset,
         time_period: int = 5,
-        current_year: Optional[int] = None,
-    ) -> Optional[Tuple[xr.Dataset, Sequence[xr.Dataset]]]:
+        current_year: int | None = None,
+    ) -> tuple[xr.Dataset, Sequence[xr.Dataset]] | None:
         from muse.utilities import agent_concatenation, reduce_assets
 
         if current_year is None:
@@ -170,9 +163,9 @@ def factory(
         cls,
         settings: Any,
         technologies: xr.Dataset,
-        regions: Optional[Sequence[Text]] = None,
-        current_year: Optional[int] = None,
-        name: Text = "subsector",
+        regions: Sequence[str] | None = None,
+        current_year: int | None = None,
+        name: str = "subsector",
     ) -> Subsector:
         from muse import constraints as cs
         from muse import demand_share as ds
@@ -232,7 +225,7 @@ def factory(
         expand_market_prices = getattr(settings, "expand_market_prices", None)
         if expand_market_prices is None:
             expand_market_prices = "dst_region" in technologies.dims and not any(
-                (isinstance(u, InvestingAgent) for u in agents)
+                isinstance(u, InvestingAgent) for u in agents
             )
 
         return cls(
@@ -248,8 +241,8 @@ def factory(
 
 
 def aggregate_enduses(
-    assets: Sequence[Union[xr.Dataset, xr.DataArray]], technologies: xr.Dataset
-) -> Sequence[Text]:
+    assets: Sequence[xr.Dataset | xr.DataArray], technologies: xr.Dataset
+) -> Sequence[str]:
     """Aggregate enduse commodities for input assets.
 
     This function is meant as a helper to figure out the commodities attached to a group
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 0255a6a8..8f3e791c 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -9,8 +9,9 @@
     "represent_hours",
 ]
 
+from collections.abc import Mapping, Sequence
 from enum import Enum, unique
-from typing import Dict, Mapping, Optional, Sequence, Text, Tuple, Union
+from typing import Optional, Union
 
 import xarray as xr
 from numpy import ndarray
@@ -21,7 +22,7 @@
 
 TIMESLICE: DataArray = None  # type: ignore
 """Array with the finest timeslice."""
-TRANSFORMS: Dict[Tuple, ndarray] = None  # type: ignore
+TRANSFORMS: dict[tuple, ndarray] = None  # type: ignore
 """Transforms from each aggregate to the finest timeslice."""
 
 DEFAULT_TIMESLICE_DESCRIPTION = """
@@ -68,9 +69,9 @@
 
 
 def reference_timeslice(
-    settings: Union[Mapping, Text],
-    level_names: Sequence[Text] = ("month", "day", "hour"),
-    name: Text = "timeslice",
+    settings: Union[Mapping, str],
+    level_names: Sequence[str] = ("month", "day", "hour"),
+    name: str = "timeslice",
 ) -> DataArray:
     '''Reads reference timeslice from toml like input.
 
@@ -113,11 +114,10 @@ def reference_timeslice(
           * week       (timeslice) object 64B 'weekday' 'weekend' ... 'weekend'
     '''
     from functools import reduce
-    from typing import List, Tuple
 
     from toml import loads
 
-    if isinstance(settings, Text):
+    if isinstance(settings, str):
         settings = loads(settings)
     settings = dict(**settings.get("timeslices", settings))
     if "level_names" in settings:
@@ -125,7 +125,7 @@ def reference_timeslice(
     settings.pop("aggregates", {})
 
     # figures out levels
-    levels: List[Tuple] = [(level,) for level in settings]
+    levels: list[tuple] = [(level,) for level in settings]
     ts = list(settings.values())
     while all(isinstance(v, Mapping) for v in ts):
         levels = [(*previous, b) for previous, a in zip(levels, ts) for b in a]
@@ -147,9 +147,9 @@ def reference_timeslice(
 
 
 def aggregate_transforms(
-    settings: Optional[Union[Mapping, Text]] = None,
+    settings: Optional[Union[Mapping, str]] = None,
     timeslice: Optional[DataArray] = None,
-) -> Dict[Tuple, ndarray]:
+) -> dict[tuple, ndarray]:
     '''Creates dictionary of transforms for aggregate levels.
 
     The transforms are used to create the projectors towards the finest timeslice.
@@ -201,13 +201,13 @@ def aggregate_transforms(
         timeslice = TIMESLICE
     if settings is None:
         settings = {}
-    elif isinstance(settings, Text):
+    elif isinstance(settings, str):
         settings = loads(settings)
 
     # get timeslice dimension
     Id = identity(len(timeslice), dtype=int)
     indices = timeslice.get_index("timeslice")
-    unitvecs: Dict[Tuple, ndarray] = {index: Id[i] for (i, index) in enumerate(indices)}
+    unitvecs: dict[tuple, ndarray] = {index: Id[i] for (i, index) in enumerate(indices)}
     if "timeslices" in settings or "aggregates" in settings:
         settings = settings.get("timeslices", settings).get("aggregates", {})
     assert isinstance(settings, Mapping)
@@ -225,7 +225,7 @@ def aggregate_transforms(
         level = matching_levels.index(True)
         levels[level].append(name)
 
-    result: Dict[Tuple, ndarray] = {}
+    result: dict[tuple, ndarray] = {}
     for index in set(product(*levels)).difference(unitvecs):
         if not any(level in settings for level in index):
             continue
@@ -237,7 +237,7 @@ def aggregate_transforms(
     return result
 
 
-def setup_module(settings: Union[Text, Mapping]):
+def setup_module(settings: Union[str, Mapping]):
     """Sets up module singletons."""
     global TIMESLICE
     global TRANSFORMS
@@ -248,7 +248,7 @@ def setup_module(settings: Union[Text, Mapping]):
 def timeslice_projector(
     x: Union[DataArray, MultiIndex],
     finest: Optional[DataArray] = None,
-    transforms: Optional[Dict[Tuple, ndarray]] = None,
+    transforms: Optional[dict[tuple, ndarray]] = None,
 ) -> DataArray:
     '''Project time-slice to standardized finest time-slices.
 
@@ -355,7 +355,7 @@ def timeslice_projector(
         transforms = TRANSFORMS
 
     index = finest.get_index("timeslice")
-    index = index.set_names((f"finest_{u}" for u in index.names))
+    index = index.set_names(f"finest_{u}" for u in index.names)
 
     if isinstance(x, MultiIndex):
         timeslices = x
@@ -399,9 +399,9 @@ class QuantityType(Enum):
 def convert_timeslice(
     x: Union[DataArray, Dataset],
     ts: Union[DataArray, Dataset, MultiIndex],
-    quantity: Union[QuantityType, Text] = QuantityType.EXTENSIVE,
+    quantity: Union[QuantityType, str] = QuantityType.EXTENSIVE,
     finest: Optional[DataArray] = None,
-    transforms: Optional[Dict[Tuple, ndarray]] = None,
+    transforms: Optional[dict[tuple, ndarray]] = None,
 ) -> Union[DataArray, Dataset]:
     '''Adjusts the timeslice of x to match that of ts.
 
@@ -546,7 +546,7 @@ def convert_timeslice(
     if quantity is QuantityType.EXTENSIVE:
         finest = finest.rename(timeslice="finest_timeslice")
         index = finest.get_index("finest_timeslice")
-        index = index.set_names((f"finest_{u}" for u in index.names))
+        index = index.set_names(f"finest_{u}" for u in index.names)
         mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "finest_timeslice")
         finest = finest.drop_vars(list(finest.coords)).assign_coords(mindex_coords)
         proj0 *= finest
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index de377c09..a2afd009 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -1,16 +1,11 @@
 """Collection of functions and stand-alone algorithms."""
 
+from collections.abc import Hashable, Iterable, Iterator, Mapping, Sequence
 from typing import (
     Any,
     Callable,
-    Hashable,
-    Iterable,
-    Iterator,
-    Mapping,
     NamedTuple,
     Optional,
-    Sequence,
-    Text,
     Union,
     cast,
 )
@@ -20,7 +15,7 @@
 
 
 def multiindex_to_coords(
-    data: Union[xr.Dataset, xr.DataArray], dimension: Text = "asset"
+    data: Union[xr.Dataset, xr.DataArray], dimension: str = "asset"
 ):
     """Flattens multi-index dimension into multi-coord dimension."""
     from pandas import MultiIndex
@@ -38,7 +33,7 @@ def multiindex_to_coords(
 
 
 def coords_to_multiindex(
-    data: Union[xr.Dataset, xr.DataArray], dimension: Text = "asset"
+    data: Union[xr.Dataset, xr.DataArray], dimension: str = "asset"
 ) -> Union[xr.Dataset, xr.DataArray]:
     """Creates a multi-index from flattened multiple coords."""
     from pandas import MultiIndex
@@ -53,8 +48,8 @@ def coords_to_multiindex(
 
 def reduce_assets(
     assets: Union[xr.DataArray, xr.Dataset, Sequence[Union[xr.Dataset, xr.DataArray]]],
-    coords: Optional[Union[Text, Sequence[Text], Iterable[Text]]] = None,
-    dim: Text = "asset",
+    coords: Optional[Union[str, Sequence[str], Iterable[str]]] = None,
+    dim: str = "asset",
     operation: Optional[Callable] = None,
 ) -> Union[xr.DataArray, xr.Dataset]:
     r"""Combine assets along given asset dimension.
@@ -159,8 +154,8 @@ def operation(x):
     if assets[dim].size == 0:
         return assets
     if coords is None:
-        coords = [cast(Text, k) for k, v in assets.coords.items() if v.dims == (dim,)]
-    elif isinstance(coords, Text):
+        coords = [cast(str, k) for k, v in assets.coords.items() if v.dims == (dim,)]
+    elif isinstance(coords, str):
         coords = (coords,)
     coords = [k for k in coords if k in assets.coords and assets[k].dims == (dim,)]
     assets = copy(assets)
@@ -179,8 +174,8 @@ def operation(x):
 def broadcast_techs(
     technologies: Union[xr.Dataset, xr.DataArray],
     template: Union[xr.DataArray, xr.Dataset],
-    dimension: Text = "asset",
-    interpolation: Text = "linear",
+    dimension: str = "asset",
+    interpolation: str = "linear",
     installed_as_year: bool = True,
     **kwargs,
 ) -> Union[xr.Dataset, xr.DataArray]:
@@ -262,14 +257,12 @@ def clean_assets(assets: xr.Dataset, years: Union[int, Sequence[int]]):
 def filter_input(
     dataset: Union[xr.Dataset, xr.DataArray],
     year: Optional[Union[int, Iterable[int]]] = None,
-    interpolation: Text = "linear",
+    interpolation: str = "linear",
     **kwargs,
 ) -> Union[xr.Dataset, xr.DataArray]:
     """Filter inputs, taking care to interpolate years."""
-    from typing import Set
-
     if year is None:
-        setyear: Set[int] = set()
+        setyear: set[int] = set()
     else:
         try:
             setyear = {int(year)}  # type: ignore
@@ -299,7 +292,7 @@ def filter_input(
 def filter_with_template(
     data: Union[xr.Dataset, xr.DataArray],
     template: Union[xr.DataArray, xr.Dataset],
-    asset_dimension: Text = "asset",
+    asset_dimension: str = "asset",
     **kwargs,
 ):
     """Filters data to match template.
@@ -388,8 +381,8 @@ def lexical_comparison(
 def merge_assets(
     capa_a: xr.DataArray,
     capa_b: xr.DataArray,
-    interpolation: Text = "linear",
-    dimension: Text = "asset",
+    interpolation: str = "linear",
+    dimension: str = "asset",
 ) -> xr.DataArray:
     """Merge two capacity arrays."""
     years = sorted(set(capa_a.year.values).union(capa_b.year.values))
@@ -429,7 +422,7 @@ def merge_assets(
     return result
 
 
-def avoid_repetitions(data: xr.DataArray, dim: Text = "year") -> xr.DataArray:
+def avoid_repetitions(data: xr.DataArray, dim: str = "year") -> xr.DataArray:
     """List of years such that there is no repetition in the data.
 
     It removes the central year of any three consecutive years where all data is
@@ -464,7 +457,7 @@ def future_propagation(
     data: xr.DataArray,
     future: xr.DataArray,
     threshold: float = 1e-12,
-    dim: Text = "year",
+    dim: str = "year",
 ) -> xr.DataArray:
     """Propagates values into the future.
 
@@ -543,8 +536,8 @@ def future_propagation(
 
 def agent_concatenation(
     data: Mapping[Hashable, Union[xr.DataArray, xr.Dataset]],
-    dim: Text = "asset",
-    name: Text = "agent",
+    dim: str = "asset",
+    name: str = "agent",
     fill_value: Any = 0,
 ) -> Union[xr.DataArray, xr.Dataset]:
     """Concatenates input map along given dimension.
@@ -619,8 +612,8 @@ def agent_concatenation(
 
 def aggregate_technology_model(
     data: Union[xr.DataArray, xr.Dataset],
-    dim: Text = "asset",
-    drop: Union[Text, Sequence[Text]] = "installed",
+    dim: str = "asset",
+    drop: Union[str, Sequence[str]] = "installed",
 ) -> Union[xr.DataArray, xr.Dataset]:
     """Aggregate together assets with the same installation year.
 
@@ -658,13 +651,9 @@ def aggregate_technology_model(
         ...     assert len(actual.asset) == 1
         ...     assert (actual == expected).all()
     """
-    if isinstance(drop, Text):
+    if isinstance(drop, str):
         drop = (drop,)
     return reduce_assets(
         data,
-        [
-            cast(Text, u)
-            for u in data.coords
-            if u not in drop and data[u].dims == (dim,)
-        ],
+        [cast(str, u) for u in data.coords if u not in drop and data[u].dims == (dim,)],
     )
diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index e0b1d669..c353ecfd 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,7 +1,7 @@
 import os
 from itertools import chain
 from pathlib import Path
-from typing import Callable, List
+from typing import Callable
 
 import pandas as pd
 from tomlkit import dumps, parse
@@ -21,7 +21,7 @@ def modify_toml(path_to_toml: Path, function: Callable):
     path_to_toml.write_text(dumps(data))
 
 
-def get_sectors(model_path: Path) -> List[str]:
+def get_sectors(model_path: Path) -> list[str]:
     """Get a list of sector names for a model.
 
     Args:
diff --git a/tests/conftest.py b/tests/conftest.py
index 523bea0d..620a50c2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,6 @@
+from collections.abc import Mapping, Sequence
 from pathlib import Path
-from typing import Callable, Mapping, Optional, Sequence, Text
+from typing import Callable, Optional
 
 import numpy as np
 from muse.agents import Agent
@@ -28,7 +29,7 @@ def cases_directory() -> Optional[Path]:
 
 
 @fixture(scope="session")
-def regression_directories(cases_directory) -> Mapping[Text, Path]:
+def regression_directories(cases_directory) -> Mapping[str, Path]:
     if cases_directory is None:
         return {}
     return {
@@ -420,7 +421,7 @@ def stock_factory() -> Callable:
 def _stock(
     coords,
     technologies,
-    region: Optional[Sequence[Text]] = None,
+    region: Optional[Sequence[str]] = None,
     nassets: Optional[int] = None,
 ) -> Dataset:
     from numpy import cumprod, stack
@@ -604,7 +605,7 @@ def save_registries():
     from contextlib import contextmanager
 
     @contextmanager
-    def saveme(module_name: Text, registry_name: Text):
+    def saveme(module_name: str, registry_name: str):
         from copy import deepcopy
         from importlib import import_module
 
diff --git a/tests/test_aggregoutput.py b/tests/test_aggregoutput.py
index d1f2f83f..8e44975a 100644
--- a/tests/test_aggregoutput.py
+++ b/tests/test_aggregoutput.py
@@ -82,9 +82,7 @@ def test_aggregate_sector_manyregions():
     from pandas import DataFrame, concat
 
     mca = examples.model("multiple_agents")
-    residential = next(
-        (sector for sector in mca.sectors if sector.name == "residential")
-    )
+    residential = next(sector for sector in mca.sectors if sector.name == "residential")
     agents = list(residential.agents)
     agents[0].assets["region"] = "BELARUS"
     agents[1].assets["region"] = "BELARUS"
diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py
index cb9ccbd6..6e835f7a 100644
--- a/tests/test_demand_share.py
+++ b/tests/test_demand_share.py
@@ -224,7 +224,6 @@ def method(capacity):
 
 def test_new_retro_demand_share(technologies, coords, market, timeslice, stock_factory):
     from dataclasses import dataclass
-    from typing import Text
     from uuid import UUID, uuid4
 
     from muse.commodities import is_enduse
@@ -242,10 +241,10 @@ def test_new_retro_demand_share(technologies, coords, market, timeslice, stock_f
     @dataclass
     class Agent:
         assets: xr.Dataset
-        category: Text
+        category: str
         uuid: UUID
-        name: Text
-        region: Text
+        name: str
+        region: str
         quantity: float
 
     agents = [
@@ -278,7 +277,6 @@ class Agent:
 
 def test_standard_demand_share(technologies, coords, market, timeslice, stock_factory):
     from dataclasses import dataclass
-    from typing import Text
     from uuid import UUID, uuid4
 
     from muse.commodities import is_enduse
@@ -297,10 +295,10 @@ def test_standard_demand_share(technologies, coords, market, timeslice, stock_fa
     @dataclass
     class Agent:
         assets: xr.Dataset
-        category: Text
+        category: str
         uuid: UUID
-        name: Text
-        region: Text
+        name: str
+        region: str
         quantity: float
 
     agents = [
diff --git a/tests/test_docs_notebooks.py b/tests/test_docs_notebooks.py
index a06e023d..2d2d94cd 100644
--- a/tests/test_docs_notebooks.py
+++ b/tests/test_docs_notebooks.py
@@ -1,12 +1,11 @@
 from pathlib import Path
-from typing import List
 
 import nbformat
 from nbconvert.preprocessors import ExecutePreprocessor
 from pytest import mark
 
 
-def available_notebooks() -> List[Path]:
+def available_notebooks() -> list[Path]:
     """Locate the available notebooks in the docs."""
     base_path = Path(__file__).parent.parent / "docs"
     return [p for p in base_path.rglob("*.ipynb") if "build" not in str(p)]
diff --git a/tests/test_legacy_sector.py b/tests/test_legacy_sector.py
index d0c6c882..d88562a3 100644
--- a/tests/test_legacy_sector.py
+++ b/tests/test_legacy_sector.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Optional, Text
+from typing import Optional
 
 from pytest import approx, mark
 
@@ -44,7 +44,7 @@ def legacy_inputs():
     ]
 
 
-def legacy_input_file(sector: Text) -> Optional[Path]:
+def legacy_input_file(sector: str) -> Optional[Path]:
     """Gets the legacy sector settings file."""
     input_file = (
         Path(__file__).parent
diff --git a/tests/test_mca.py b/tests/test_mca.py
index d1b4fb8e..ee07782b 100644
--- a/tests/test_mca.py
+++ b/tests/test_mca.py
@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 
 from muse.commodities import CommodityUsage
 from xarray import Dataset
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index 3e01123d..6f19d50e 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -1,7 +1,6 @@
 """Test saving outputs to file."""
 
 from pathlib import Path
-from typing import Dict, Text
 from unittest.mock import patch
 
 import numpy as np
@@ -217,7 +216,7 @@ class MySpecialReturn:
         pass
 
     @register_output_sink(overwrite=True)
-    def dummy(data, year: int, sector: Text, overwrite: bool) -> MySpecialReturn:
+    def dummy(data, year: int, sector: str, overwrite: bool) -> MySpecialReturn:
         nonlocal received_data, gyear, gsector, goverwrite
         received_data = data
         gyear = year
@@ -496,7 +495,7 @@ def test_match_quantities():
     da = xr.DataArray(name=q)
     ds = xr.Dataset({q: da})
 
-    def assert_equal(a: Dict[str, xr.DataArray], b: Dict[str, xr.DataArray]):
+    def assert_equal(a: dict[str, xr.DataArray], b: dict[str, xr.DataArray]):
         assert set(a.keys()) == set(b.keys())
         for k in a:
             xr.testing.assert_equal(a[k], b[k])
@@ -586,7 +585,7 @@ def test_aggregate_cache():
 
     c = a.copy()
     c.assign_coords(dim_0=c.dim_0.data * 10)
-    dc, da = [da.to_dataframe().reset_index() for da in [c, a]]
+    dc, da = (da.to_dataframe().reset_index() for da in [c, a])
 
     actual = _aggregate_cache(quantity, [c, a])
     expected = pd.DataFrame.merge(dc, da, how="outer").astype(float)
@@ -635,10 +634,7 @@ def test_consolidate_quantity(newcapa_agent, retro_agent):
     assert all(actual.year == newcapa_agent.forecast_year)
     assert all(actual.installed == newcapa_agent.year)
     assert all(
-        (
-            name in (newcapa_agent.name, retro_agent.name)
-            for name in actual.agent.unique()
-        )
+        name in (newcapa_agent.name, retro_agent.name) for name in actual.agent.unique()
     )
 
 
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index de16b0c0..74439b1b 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -9,7 +9,8 @@
 def demand(
     technologies: xr.Dataset, capacity: xr.DataArray, market: xr.DataArray
 ) -> xr.DataArray:
-    from typing import Any, Hashable, Mapping
+    from collections.abc import Hashable, Mapping
+    from typing import Any
 
     region = xr.DataArray(list(set(capacity.region.values)), dims="region")
     coords: Mapping[Hashable, Any] = {
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 467e8263..ddf98627 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -22,11 +22,9 @@ def user_data_files(settings: dict) -> None:
 @fixture
 def sectors_files(settings: dict):
     """Creates the files related to the sector."""
-    from typing import Text
-
     for data in settings["sectors"].values():
         for path in data.values():
-            if not isinstance(path, (Path, Text)):
+            if not isinstance(path, (Path, str)):
                 continue
             path = Path(path)
             if path.suffix != ".csv":
diff --git a/tests/test_subsector.py b/tests/test_subsector.py
index 356aad3b..7f664fdf 100644
--- a/tests/test_subsector.py
+++ b/tests/test_subsector.py
@@ -1,11 +1,11 @@
-from typing import Sequence, Text
+from collections.abc import Sequence
 
 import xarray as xr
 from pytest import fixture
 
 
 @fixture
-def model() -> Text:
+def model() -> str:
     return "medium"
 
 
@@ -36,7 +36,7 @@ def test_subsector_investing_aggregation():
         mca = examples.model(model)
         for sname in sector_list:
             agents = list(examples.sector(sname, model).agents)
-            sector = next((sector for sector in mca.sectors if sector.name == sname))
+            sector = next(sector for sector in mca.sectors if sector.name == sname)
             technologies = sector.technologies
             commodities = aggregate_enduses(
                 (agent.assets for agent in agents), technologies
@@ -115,7 +115,7 @@ def test_subsector_noninvesting_aggregation(market, model, technologies, tmp_pat
     assert "agent" in lpcosts.coords
     assert isinstance(lpconstraints, Sequence)
     assert len(lpconstraints) == 1
-    assert all((isinstance(u, xr.Dataset) for u in lpconstraints))
+    assert all(isinstance(u, xr.Dataset) for u in lpconstraints)
     # makes sure agent investment got called
     assert all(agent.year == 2025 for agent in agents)
 
diff --git a/tests/test_timeslices.py b/tests/test_timeslices.py
index ed7b89cc..49d548f0 100644
--- a/tests/test_timeslices.py
+++ b/tests/test_timeslices.py
@@ -156,7 +156,6 @@ def test_no_overlap():
 
 def test_aggregate_transforms_no_aggregates():
     from itertools import product
-    from typing import Dict
 
     from muse.timeslices import aggregate_transforms, reference_timeslice
     from numpy import ndarray, zeros
@@ -172,7 +171,7 @@ def test_aggregate_transforms_no_aggregates():
     )
 
     vectors = aggregate_transforms(timeslice=reference)
-    assert isinstance(vectors, Dict)
+    assert isinstance(vectors, dict)
     assert set(vectors) == set(product(["spring", "autumn"], ["weekday", "weekend"]))
     for i in range(reference.shape[0]):
         index = reference.timeslice[i].values.tolist()
@@ -185,7 +184,6 @@ def test_aggregate_transforms_no_aggregates():
 
 def test_aggregate_transforms_with_aggregates():
     from itertools import product
-    from typing import Dict
 
     from muse.timeslices import aggregate_transforms, reference_timeslice
     from toml import loads
@@ -219,7 +217,7 @@ def test_aggregate_transforms_with_aggregates():
     reference = reference_timeslice(toml)
 
     vectors = aggregate_transforms(toml, reference)
-    assert isinstance(vectors, Dict)
+    assert isinstance(vectors, dict)
     assert set(vectors) == set(
         product(
             ["winter", "spring", "summer", "autumn", "springautumn"],
diff --git a/tests/test_trade.py b/tests/test_trade.py
index 3e9bd5cb..bafa07db 100644
--- a/tests/test_trade.py
+++ b/tests/test_trade.py
@@ -1,4 +1,5 @@
-from typing import Any, Mapping, Text
+from collections.abc import Mapping
+from typing import Any
 
 import numpy as np
 import xarray as xr
@@ -6,7 +7,7 @@
 
 
 @fixture
-def constraints_args(sector="power", model="trade") -> Mapping[Text, Any]:
+def constraints_args(sector="power", model="trade") -> Mapping[str, Any]:
     from muse import examples
     from muse.utilities import agent_concatenation, reduce_assets
 
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index 1cb8caa3..9a05248d 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -1,5 +1,3 @@
-from typing import Tuple
-
 import numpy as np
 import xarray as xr
 from pytest import approx, mark
@@ -16,7 +14,7 @@ def make_array(array):
     "coordinates",
     [("technology", "installed", "region"), ("technology", "installed"), ("region",)],
 )
-def test_reduce_assets(coordinates: Tuple, capacity: xr.DataArray):
+def test_reduce_assets(coordinates: tuple, capacity: xr.DataArray):
     from muse.utilities import reduce_assets
 
     actual = reduce_assets(capacity, coords=coordinates)
diff --git a/tests/test_wizard.py b/tests/test_wizard.py
index 978973f6..37a073b0 100644
--- a/tests/test_wizard.py
+++ b/tests/test_wizard.py
@@ -153,7 +153,7 @@ def test_add_region(model_path):
     add_region(model_path, "R2", "R1")
 
     # Check if the new region is added to the settings.toml file
-    with open(model_path / "settings.toml", "r") as f:
+    with open(model_path / "settings.toml") as f:
         modified_settings_data = parse(f.read())
     assert "R2" in modified_settings_data["regions"]
 
@@ -178,7 +178,7 @@ def test_add_timeslice(model_path):
     add_timeslice(model_path, "midnight", "evening")
 
     # Check if the new timeslice is added to the settings.toml file
-    with open(model_path / "settings.toml", "r") as f:
+    with open(model_path / "settings.toml") as f:
         modified_settings_data = parse(f.read())
     assert "midnight" in modified_settings_data["timeslices"]["all-year"]["all-week"]
     n_timeslices = len(modified_settings_data["timeslices"]["all-year"]["all-week"])

From eea17c1b3c0254aee391cf0f5057dbbdd021bb4b Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Thu, 20 Jun 2024 14:15:45 +0100
Subject: [PATCH 252/419] I refactored developers.rst to make instructions more
 concise. As an "easy" fix regarding the test that makes the .ipynb notebook
 fail, I included `muse --model default` to be run as a necessary step to
 complete setting MUSE_OS up.

Given the fact that after patching the setup, 304 tests pass successfully while 10 are skipped, 1 comes with an expected
 fail and 4 warnings , it is probably better to sort these out in separate issues to separate responsibilities and make it easier to solve them.
---
 docs/installation/developers.rst | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 905d849c..44b49f5c 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -3,7 +3,9 @@
 Installation for developers
 ---------------------------
 
-Developers of MUSE will need to have the version control tool ``git`` installed in their system and be familiar with its usage. The `Introduction to Git and GitHub for software development <https://imperialcollegelondon.github.io/introductory_grad_school_git_course/>`_ course created by `Imperial RSE Team <https://www.imperial.ac.uk/admin-services/ict/self-service/research-support/rcs/service-offering/research-software-engineering/>`_ can be a good place to start.
+Developers of MUSE will need to have the version control tool ``git`` installed in their system and be familiar with its usage.
+The `Introduction to Git and GitHub for software development <https://imperialcollegelondon.github.io/introductory_grad_school_git_course/>`_ and `Further Git and GitHub for effective collaboration <https://imperialcollegelondon.github.io/intermediate_grad_school_git_course/index.html/>`_ courses by the `Imperial RSE Team <https://www.imperial.ac.uk/admin-services/ict/self-service/research-support/rcs/service-offering/research-software-engineering/>`_ are excellent starting points.
+
 
 Installing MUSE source code in editable mode
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -14,20 +16,29 @@ Once you have ``git`` in your system, clone the MUSE repository with:
 
     git clone https://github.com/SGIModel/MUSE_OS.git
 
+For developing MUSE, **it is highly recommended to do so in a virtual Python environment**. This is to isolate dependencies and to avoid version conflicts on other Python libraries.
+Moreover, this allows for unconstrained experimentation with the code without breaking system dependencies, which, as least as far as ``Linux`` is concerned, is an issue.
 
-For developing MUSE, **it is highly recommended to use virtual environments**, so that you have more control on the versions of the dependencies being used, making easy to change them without affecting other tools using Python, or even to have several environments in parallel for different purposes (Eg. new features, bug fixing...). You can either use ``conda`` or ``venv`` as explained in :ref:`virtual-environments`.
+Also, any operating system allows for multiple Python versions being installed in parallel for different purposes like creating new features and bug fixing.
+You can either use ``conda`` or ``pyenv`` in conjunction with ``venv`` as explained in :ref:`virtual-environments`.
 
 Once you have your environment created, **activate it** and install MUSE within the environment:
 
 .. code-block:: bash
 
     cd MUSE_OS
-    # 1- Create virtual environment
-    # 2- Activate virtual environment
+    # 1- Create a virtual environment
+    # 2- Activate that virtual environment
     # 3- Finally, install MUSE in editable mode with:
     python -m pip install -e .[dev,doc]
 
-Depending on your system, you might need to add quotation marks around ``[dev,doc]`` as in ``"[dev,doc]"``. This will install MUSE and all the dependencies required for its development. The downloaded code can be modified and the changes will be automatically reflected in the environment.
+.. note::
+    Depending on your system, you might need to add quotation marks around ``[dev,doc]`` as in ``"[dev,doc]"``.
+
+    For example on ``Windows``, the command will read `python -m pip install -e .[dev,doc]`. On Ubuntu Linux, it will be `python -m pip install -e ."[dev,doc]"`.
+    This will install MUSE including its dependencies for development. The downloaded code can be modified and the changes will be automatically reflected in the virtual environment.
+
+Finally, in the activated virtual environment, run `muse --model default` to generate output data that are used to make `pytest` run without failures.
 
 .. note::
 
@@ -48,7 +59,9 @@ To ensure the consistency of the code with other developers, install the pre-com
 Running tests
 ~~~~~~~~~~~~~
 
-In the developing phase, MUSE can also be used to run test cases to check that the model would reproduce expected results from a defined set of input data. Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/), from the testing framework of the same name.
+If you followed **Installation for developers**, you will run and develop your own tests for MUSE.
+This is to check that a model reproduces expected results for a defined set of input data.
+Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/), from the testing framework of the same name.
 
 Within the ``MUSE-OS`` directory, just run:
 

From e12e5c707c079eb4e604dd07ee0c66b84ab899fc Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:25:12 +0100
Subject: [PATCH 253/419] Add demand_limitting_capacity constraint

---
 src/muse/constraints.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index c6f7f665..cb0dc834 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -515,21 +515,33 @@ def demand_limitting_capacity(
     the maximum capacity expansion. In this case, the combined new capacity of all
     assets must be sufficient to meet the demand of the most demanding timeslice, and
     no more.
+
+    Rather than coding from scratch the constraint, we can use the max_production
+    constraint and the demand constraint to construct this constraint.
     """
     # We start with the maximum production constraint and the demand constraint
     capacity_constraint = max_production(
-        demand_, assets, search_space, market, technologies, year
+        demand_, assets, search_space, market, technologies, year=year
     )
     demand_constraint = demand(
-        demand_, assets, search_space, market, technologies, year
+        demand_, assets, search_space, market, technologies, year=year
     )
 
     # We need to find the most demanding timeslice and use as the demand constraint
-    b = demand_constraint.b.max("timeslice")
+    if "timeslice" in demand_constraint.b.dims:
+        b = demand_constraint.b.max("timeslice")
+    else:
+        b = demand_constraint.b
+
+    # Drop 'year' so there's no confusion with the 'year' in the capacity constraint
+    b = b.drop_vars("year")
 
     # Now we need to find the maximum capacity constraint (as the capacity here is
-    # negative)
-    capacity = capacity_constraint.capacity.max("timeslice")
+    # negative), and switch the sign to make it positive
+    if "timeslice" in capacity_constraint.capacity.dims:
+        capacity = -capacity_constraint.capacity.max("timeslice")
+    else:
+        capacity = -capacity_constraint.capacity
 
     return xr.Dataset(
         dict(capacity=capacity, production=0, b=b),

From c6c7c1b1a7d244ca63b7ed8fdd1f6fd0844d1d27 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:27:46 +0100
Subject: [PATCH 254/419] Update settings file with demand_limitting_capacity

---
 src/muse/constraints.py                               | 1 +
 src/muse/data/example/default/settings.toml           | 3 ++-
 src/muse/data/example/default_timeslice/settings.toml | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index cb0dc834..dbec97c7 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -232,6 +232,7 @@ def factory(
             "demand",
             "search_space",
             "minimum_service",
+            "demand_limitting_capacity",
         )
 
     def normalize(x) -> MutableMapping:
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index ea55d711..1a634187 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index 29622f6b..42f5da15 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -62,7 +62,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5

From d006f18d32d8278ab12661e236f8049a23f6b268 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:33:53 +0100
Subject: [PATCH 255/419] Add demand_limitting_capacity to the documentation

---
 docs/inputs/toml.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index 9a0653b1..70fb311d 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -544,6 +544,10 @@ to define the timeslice simply by referring to the slices it will use at each le
           how much the capacity can grow during each investment event.
         - :py:func:`~muse.constraints.search_space`: a binary (on-off) constraint
           specifying which technologies are considered for investment.
+        - :py:func:`~muse.constraints.minimum_service`: a lower constraint for
+          production for those technologies that need to keep a minimum production.
+        - :py:func:`~muse.constraints.demand_limitting_capacity`: limits the combined
+          capacity to be installed to the demand of the peak timeslice.
 
 
 *output*

From 50c19fa6fc906c5e7a4ef3f8cfa217e75545c1b1 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:42:07 +0100
Subject: [PATCH 256/419] Drop year only conditionally

---
 src/muse/constraints.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index dbec97c7..668123c5 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -534,9 +534,6 @@ def demand_limitting_capacity(
     else:
         b = demand_constraint.b
 
-    # Drop 'year' so there's no confusion with the 'year' in the capacity constraint
-    b = b.drop_vars("year")
-
     # Now we need to find the maximum capacity constraint (as the capacity here is
     # negative), and switch the sign to make it positive
     if "timeslice" in capacity_constraint.capacity.dims:
@@ -544,6 +541,10 @@ def demand_limitting_capacity(
     else:
         capacity = -capacity_constraint.capacity
 
+    # Drop 'year' so there's no conflict with the 'year' in the capacity constraint
+    if "year" in b.dims and "year" in capacity.dims:
+        b = b.drop_vars("year")
+
     return xr.Dataset(
         dict(capacity=capacity, production=0, b=b),
         attrs=dict(kind=ConstraintKind.UPPER_BOUND),

From 0d9dea8dc5f00944e48df487b1c61cce5a0dc2a3 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 21 Jun 2024 06:19:20 +0100
Subject: [PATCH 257/419] Check if year in coords, not dims

---
 src/muse/constraints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 668123c5..76f38517 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -542,7 +542,7 @@ def demand_limitting_capacity(
         capacity = -capacity_constraint.capacity
 
     # Drop 'year' so there's no conflict with the 'year' in the capacity constraint
-    if "year" in b.dims and "year" in capacity.dims:
+    if "year" in b.coords and "year" in capacity.coords:
         b = b.drop_vars("year")
 
     return xr.Dataset(

From 04a128628842067416d15ce87a9f90aa617186be Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 21 Jun 2024 06:20:09 +0100
Subject: [PATCH 258/419] Fix tutorial
 docs\tutorial-code\2-add-agent\2-multiple-objective

---
 .../Results/Gas/Capacity/2030.csv             |  10 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |   8 +-
 .../Results/Gas/Capacity/2045.csv             |   6 +-
 .../Results/Gas/Capacity/2050.csv             |   6 +-
 .../Results/MCACapacity.csv                   | 120 ++++++-----
 .../Results/MCAPrices.csv                     | 192 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  12 +-
 .../Results/Power/Capacity/2025.csv           |  26 +--
 .../Results/Power/Capacity/2030.csv           |  32 +--
 .../Results/Power/Capacity/2035.csv           |  37 +++-
 .../Results/Power/Capacity/2040.csv           |  48 +++--
 .../Results/Power/Capacity/2045.csv           |  58 ++++--
 .../Results/Power/Capacity/2050.csv           |  58 ++++--
 .../Results/Residential/Capacity/2020.csv     |   6 +-
 .../Results/Residential/Capacity/2025.csv     |  14 +-
 .../Results/Residential/Capacity/2030.csv     |  22 +-
 .../Results/Residential/Capacity/2035.csv     |  18 +-
 .../Results/Residential/Capacity/2040.csv     |  20 +-
 .../Results/Residential/Capacity/2045.csv     |  16 +-
 .../Results/Residential/Capacity/2050.csv     |  18 +-
 .../Results/Residential/Supply/2020.csv       |  36 ++--
 .../Results/Residential/Supply/2025.csv       |  66 +++---
 .../Results/Residential/Supply/2030.csv       |  72 ++++---
 .../Results/Residential/Supply/2035.csv       |  72 +++----
 .../Results/Residential/Supply/2040.csv       |  60 +++---
 .../Results/Residential/Supply/2045.csv       |  60 +++---
 .../Results/Residential/Supply/2050.csv       |  60 +++---
 .../2-multiple-objective/settings.toml        |   7 -
 ...sualise-new-agent-multiple-objective.ipynb |   4 +-
 ...visualise-new-agent-single-objective.ipynb |   4 +-
 31 files changed, 658 insertions(+), 520 deletions(-)

diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index c80c1939..ac5d5706 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,7 @@
 asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2035,R1,gassupply1,2030,23.20780000000
-1,2040,R1,gassupply1,2030,23.20780000000
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+1,2035,R1,gassupply1,2030,2.83560000000
+1,2040,R1,gassupply1,2030,2.83560000000
+1,2045,R1,gassupply1,2030,2.83560000000
+1,2050,R1,gassupply1,2030,2.83560000000
+1,2069,R1,gassupply1,2030,2.83560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index f8fd7fdc..edb1e4ba 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,23.20780000000
-1,2040,R1,gassupply1,2030,23.20780000000
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+1,2035,R1,gassupply1,2030,2.83560000000
+1,2040,R1,gassupply1,2030,2.83560000000
+1,2045,R1,gassupply1,2030,2.83560000000
+1,2050,R1,gassupply1,2030,2.83560000000
+1,2069,R1,gassupply1,2030,2.83560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index 5635a4c6..e6e3e0e6 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,5 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,23.20780000000
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+1,2040,R1,gassupply1,2030,2.83560000000
+1,2045,R1,gassupply1,2030,2.83560000000
+1,2050,R1,gassupply1,2030,2.83560000000
+1,2069,R1,gassupply1,2030,2.83560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index 0b1878a2..40297b9e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,23.20780000000
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+1,2045,R1,gassupply1,2030,2.83560000000
+1,2050,R1,gassupply1,2030,2.83560000000
+1,2069,R1,gassupply1,2030,2.83560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index 2015c16c..647a0839 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,23.20780000000
-1,2055,R1,gassupply1,2030,23.20780000000
-1,2069,R1,gassupply1,2030,23.20780000000
+1,2050,R1,gassupply1,2030,2.83560000000
+1,2055,R1,gassupply1,2030,2.83560000000
+1,2069,R1,gassupply1,2030,2.83560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 6d7e2601..59bfd398 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -8,58 +8,82 @@ gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,9.50000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A1,power,retrofit,2025,5.17550000000
+windturbine,R1,R1,A1,power,retrofit,2025,4.18750000000
 gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A2,power,retrofit,2025,10.00000000000
+windturbine,R1,R1,A2,power,retrofit,2025,4.18750000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2030,1.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2030,7.41230000000
-windturbine,R1,R1,A1,power,retrofit,2030,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2030,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2030,10.00000000000
+heatpump,R1,R1,A1,residential,retrofit,2030,4.40000000000
+gasboiler,R1,R1,A2,residential,retrofit,2030,1.10000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,9.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2030,4.40000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.71250000000
+windturbine,R1,R1,A1,power,retrofit,2030,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2030,9.71250000000
+windturbine,R1,R1,A2,power,retrofit,2030,4.18750000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,3.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,14.40000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2035,7.41230000000
-windturbine,R1,R1,A1,power,retrofit,2035,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2035,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2040,3.60000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,14.40000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,7.41230000000
-windturbine,R1,R1,A1,power,retrofit,2040,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2040,20.00000000000
-windturbine,R1,R1,A2,power,retrofit,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2045,3.72000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,20.28000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,7.41230000000
-solarPV,R1,R1,A1,power,retrofit,2045,0.99310000000
-windturbine,R1,R1,A1,power,retrofit,2045,5.17550000000
-solarPV,R1,R1,A2,power,retrofit,2045,20.00000000000
-solarPV,R1,R1,A2,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A2,power,retrofit,2045,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,22.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2050,3.72000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,20.28000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,7.41230000000
-solarPV,R1,R1,A1,power,retrofit,2050,0.99310000000
-solarPV,R1,R1,A1,power,retrofit,2050,6.98730000000
-solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,10.00000000000
-solarPV,R1,R1,A2,power,retrofit,2050,20.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,0.70780000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,22.50000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,1.10000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,4.40000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,12.50000000000
+gasboiler,R1,R1,A2,residential,retrofit,2035,1.10000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,4.40000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,12.50000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.71250000000
+solarPV,R1,R1,A1,power,retrofit,2035,1.50000000000
+windturbine,R1,R1,A1,power,retrofit,2035,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2035,9.71250000000
+solarPV,R1,R1,A2,power,retrofit,2035,1.50000000000
+windturbine,R1,R1,A2,power,retrofit,2035,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,1.41780000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,1.41780000000
+heatpump,R1,R1,A1,residential,retrofit,2040,12.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,8.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,12.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,8.50000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.71250000000
+solarPV,R1,R1,A1,power,retrofit,2040,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2040,3.55000000000
+windturbine,R1,R1,A1,power,retrofit,2040,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2040,9.71250000000
+solarPV,R1,R1,A2,power,retrofit,2040,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2040,3.55000000000
+windturbine,R1,R1,A2,power,retrofit,2040,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,1.41780000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,1.41780000000
+heatpump,R1,R1,A1,residential,retrofit,2045,8.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,15.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,8.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,15.50000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.71250000000
+solarPV,R1,R1,A1,power,retrofit,2045,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2045,3.55000000000
+solarPV,R1,R1,A1,power,retrofit,2045,3.55000000000
+windturbine,R1,R1,A1,power,retrofit,2045,4.18750000000
+solarPV,R1,R1,A2,power,retrofit,2045,9.71250000000
+solarPV,R1,R1,A2,power,retrofit,2045,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.55000000000
+solarPV,R1,R1,A2,power,retrofit,2045,3.55000000000
+windturbine,R1,R1,A2,power,retrofit,2045,4.18750000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,1.41780000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,1.41780000000
+heatpump,R1,R1,A1,residential,retrofit,2050,15.50000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,11.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,15.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,11.50000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.71250000000
+solarPV,R1,R1,A1,power,retrofit,2050,1.50000000000
+solarPV,R1,R1,A1,power,retrofit,2050,3.55000000000
+solarPV,R1,R1,A1,power,retrofit,2050,3.55000000000
+solarPV,R1,R1,A1,power,retrofit,2050,8.68750000000
+solarPV,R1,R1,A2,power,retrofit,2050,9.71250000000
+solarPV,R1,R1,A2,power,retrofit,2050,1.50000000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.55000000000
+solarPV,R1,R1,A2,power,retrofit,2050,3.55000000000
+solarPV,R1,R1,A2,power,retrofit,2050,8.68750000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,1.41780000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,1.41780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index cd286e91..7245c4b7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.64170000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.68030000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.18750000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.68850000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.74640000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.28130000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.64170000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.68030000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.18750000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68850000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.74640000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.28130000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.82890000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94460000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.56250000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.73530000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.81250000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.37500000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,14.17830000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,64.33340000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09740000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,14.24830000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,64.50080000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72970000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.17830000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,64.33340000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09740000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.24830000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,64.50080000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.21160000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.45800000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,65.00620000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46690000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,14.31820000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,64.66880000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.60290000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,11.37660000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,51.60220000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.90760000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,11.44950000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,51.80480000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.60290000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.37660000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,51.60220000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.90760000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.44950000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,51.80480000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.83460000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.66810000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,52.41790000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.21440000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,11.52240000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,52.00820000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16570000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.50280000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.47910000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25530000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24860000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.75780000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.72300000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16570000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50280000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.47910000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25530000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24860000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.75780000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.72300000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51060000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49720000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.53720000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.47230000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34040000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33140000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,1.01520000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.96990000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16890000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.42500000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16130000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25330000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.64130000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24200000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16890000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.42500000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16130000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25330000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.64130000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24200000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50660000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.30590000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.48390000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13180000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33770000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.86020000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.32260000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.07460000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.16550000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.36520000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.15290000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03050000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24830000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.55190000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.22930000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05060000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16550000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.36520000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15290000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03050000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24830000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.55190000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22930000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05060000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49650000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.12850000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45860000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.13020000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33100000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.74140000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.30580000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.07390000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
index 5a4a9175..b3996630 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
 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,15.17550000000
-1,2030,R1,windturbine,2020,15.17550000000
-1,2035,R1,windturbine,2020,15.17550000000
-1,2040,R1,windturbine,2020,15.17550000000
-1,2045,R1,windturbine,2020,15.17550000000
-1,2049,R1,windturbine,2020,15.17550000000
+1,2025,R1,windturbine,2020,8.37500000000
+1,2030,R1,windturbine,2020,8.37500000000
+1,2035,R1,windturbine,2020,8.37500000000
+1,2040,R1,windturbine,2020,8.37500000000
+1,2045,R1,windturbine,2020,8.37500000000
+1,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index d45cd142..b84e3ce6 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,15 +1,15 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,27.41230000000
-1,2035,R1,solarPV,2025,27.41230000000
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2025,R1,windturbine,2020,15.17550000000
-2,2030,R1,windturbine,2020,15.17550000000
-2,2035,R1,windturbine,2020,15.17550000000
-2,2040,R1,windturbine,2020,15.17550000000
-2,2045,R1,windturbine,2020,15.17550000000
-2,2049,R1,windturbine,2020,15.17550000000
+1,2030,R1,solarPV,2025,19.42500000000
+1,2035,R1,solarPV,2025,19.42500000000
+1,2040,R1,solarPV,2025,19.42500000000
+1,2045,R1,solarPV,2025,19.42500000000
+1,2049,R1,solarPV,2025,19.42500000000
+1,2050,R1,solarPV,2025,19.42500000000
+1,2054,R1,solarPV,2025,19.42500000000
+2,2025,R1,windturbine,2020,8.37500000000
+2,2030,R1,windturbine,2020,8.37500000000
+2,2035,R1,windturbine,2020,8.37500000000
+2,2040,R1,windturbine,2020,8.37500000000
+2,2045,R1,windturbine,2020,8.37500000000
+2,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index b1be23b1..62d5e401 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,13 +1,21 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2025,27.41230000000
-1,2035,R1,solarPV,2025,27.41230000000
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2030,R1,windturbine,2020,15.17550000000
-2,2035,R1,windturbine,2020,15.17550000000
-2,2040,R1,windturbine,2020,15.17550000000
-2,2045,R1,windturbine,2020,15.17550000000
-2,2049,R1,windturbine,2020,15.17550000000
+1,2030,R1,solarPV,2025,19.42500000000
+1,2035,R1,solarPV,2025,19.42500000000
+1,2040,R1,solarPV,2025,19.42500000000
+1,2045,R1,solarPV,2025,19.42500000000
+1,2049,R1,solarPV,2025,19.42500000000
+1,2050,R1,solarPV,2025,19.42500000000
+1,2054,R1,solarPV,2025,19.42500000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2049,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2054,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2030,R1,windturbine,2020,8.37500000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index e653f27a..84390f0e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,11 +1,28 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,solarPV,2025,27.41230000000
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2035,R1,windturbine,2020,15.17550000000
-2,2040,R1,windturbine,2020,15.17550000000
-2,2045,R1,windturbine,2020,15.17550000000
-2,2049,R1,windturbine,2020,15.17550000000
+0,2035,R1,solarPV,2025,19.42500000000
+0,2040,R1,solarPV,2025,19.42500000000
+0,2045,R1,solarPV,2025,19.42500000000
+0,2049,R1,solarPV,2025,19.42500000000
+0,2050,R1,solarPV,2025,19.42500000000
+0,2054,R1,solarPV,2025,19.42500000000
+1,2035,R1,solarPV,2030,3.00000000000
+1,2040,R1,solarPV,2030,3.00000000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2035,7.10000000000
+2,2045,R1,solarPV,2035,7.10000000000
+2,2049,R1,solarPV,2035,7.10000000000
+2,2050,R1,solarPV,2035,7.10000000000
+2,2054,R1,solarPV,2035,7.10000000000
+2,2055,R1,solarPV,2035,7.10000000000
+2,2059,R1,solarPV,2035,7.10000000000
+2,2060,R1,solarPV,2035,7.10000000000
+2,2064,R1,solarPV,2035,7.10000000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index c79dc3c1..79e92271 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,15 +1,35 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2025,27.41230000000
-1,2049,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2025,27.41230000000
-1,2054,R1,solarPV,2025,27.41230000000
-2,2045,R1,solarPV,2040,10.99310000000
-2,2049,R1,solarPV,2040,10.99310000000
-2,2050,R1,solarPV,2040,10.99310000000
-2,2054,R1,solarPV,2040,10.99310000000
-2,2055,R1,solarPV,2040,10.99310000000
-2,2069,R1,solarPV,2040,10.99310000000
-3,2040,R1,windturbine,2020,15.17550000000
-3,2045,R1,windturbine,2020,15.17550000000
-3,2049,R1,windturbine,2020,15.17550000000
+0,2040,R1,solarPV,2025,19.42500000000
+0,2045,R1,solarPV,2025,19.42500000000
+0,2049,R1,solarPV,2025,19.42500000000
+0,2050,R1,solarPV,2025,19.42500000000
+0,2054,R1,solarPV,2025,19.42500000000
+1,2040,R1,solarPV,2030,3.00000000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2035,7.10000000000
+2,2045,R1,solarPV,2035,7.10000000000
+2,2049,R1,solarPV,2035,7.10000000000
+2,2050,R1,solarPV,2035,7.10000000000
+2,2054,R1,solarPV,2035,7.10000000000
+2,2055,R1,solarPV,2035,7.10000000000
+2,2059,R1,solarPV,2035,7.10000000000
+2,2060,R1,solarPV,2035,7.10000000000
+2,2064,R1,solarPV,2035,7.10000000000
+3,2045,R1,solarPV,2040,7.10000000000
+3,2049,R1,solarPV,2040,7.10000000000
+3,2050,R1,solarPV,2040,7.10000000000
+3,2054,R1,solarPV,2040,7.10000000000
+3,2055,R1,solarPV,2040,7.10000000000
+3,2059,R1,solarPV,2040,7.10000000000
+3,2060,R1,solarPV,2040,7.10000000000
+3,2064,R1,solarPV,2040,7.10000000000
+3,2065,R1,solarPV,2040,7.10000000000
+3,2069,R1,solarPV,2040,7.10000000000
+4,2040,R1,windturbine,2020,8.37500000000
+4,2045,R1,windturbine,2020,8.37500000000
+4,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index 280cff3b..0d8295c0 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,19 +1,41 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2025,27.41230000000
-0,2049,R1,solarPV,2025,27.41230000000
-0,2050,R1,solarPV,2025,27.41230000000
-0,2054,R1,solarPV,2025,27.41230000000
-1,2045,R1,solarPV,2040,10.99310000000
-1,2049,R1,solarPV,2040,10.99310000000
-1,2050,R1,solarPV,2040,10.99310000000
-1,2054,R1,solarPV,2040,10.99310000000
-1,2055,R1,solarPV,2040,10.99310000000
-1,2069,R1,solarPV,2040,10.99310000000
-2,2050,R1,solarPV,2045,26.98730000000
-2,2054,R1,solarPV,2045,26.98730000000
-2,2055,R1,solarPV,2045,26.98730000000
-2,2069,R1,solarPV,2045,26.98730000000
-2,2070,R1,solarPV,2045,26.98730000000
-2,2074,R1,solarPV,2045,26.98730000000
-3,2045,R1,windturbine,2020,15.17550000000
-3,2049,R1,windturbine,2020,15.17550000000
+0,2045,R1,solarPV,2025,19.42500000000
+0,2049,R1,solarPV,2025,19.42500000000
+0,2050,R1,solarPV,2025,19.42500000000
+0,2054,R1,solarPV,2025,19.42500000000
+1,2045,R1,solarPV,2030,3.00000000000
+1,2049,R1,solarPV,2030,3.00000000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2035,7.10000000000
+2,2049,R1,solarPV,2035,7.10000000000
+2,2050,R1,solarPV,2035,7.10000000000
+2,2054,R1,solarPV,2035,7.10000000000
+2,2055,R1,solarPV,2035,7.10000000000
+2,2059,R1,solarPV,2035,7.10000000000
+2,2060,R1,solarPV,2035,7.10000000000
+2,2064,R1,solarPV,2035,7.10000000000
+3,2045,R1,solarPV,2040,7.10000000000
+3,2049,R1,solarPV,2040,7.10000000000
+3,2050,R1,solarPV,2040,7.10000000000
+3,2054,R1,solarPV,2040,7.10000000000
+3,2055,R1,solarPV,2040,7.10000000000
+3,2059,R1,solarPV,2040,7.10000000000
+3,2060,R1,solarPV,2040,7.10000000000
+3,2064,R1,solarPV,2040,7.10000000000
+3,2065,R1,solarPV,2040,7.10000000000
+3,2069,R1,solarPV,2040,7.10000000000
+4,2050,R1,solarPV,2045,17.37500000000
+4,2054,R1,solarPV,2045,17.37500000000
+4,2055,R1,solarPV,2045,17.37500000000
+4,2059,R1,solarPV,2045,17.37500000000
+4,2060,R1,solarPV,2045,17.37500000000
+4,2064,R1,solarPV,2045,17.37500000000
+4,2065,R1,solarPV,2045,17.37500000000
+4,2069,R1,solarPV,2045,17.37500000000
+4,2070,R1,solarPV,2045,17.37500000000
+4,2074,R1,solarPV,2045,17.37500000000
+5,2045,R1,windturbine,2020,8.37500000000
+5,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index 7393f070..26f737ea 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,19 +1,41 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,solarPV,2025,27.41230000000
-0,2054,R1,solarPV,2025,27.41230000000
-1,2050,R1,solarPV,2040,10.99310000000
-1,2054,R1,solarPV,2040,10.99310000000
-1,2055,R1,solarPV,2040,10.99310000000
-1,2069,R1,solarPV,2040,10.99310000000
-2,2050,R1,solarPV,2045,26.98730000000
-2,2054,R1,solarPV,2045,26.98730000000
-2,2055,R1,solarPV,2045,26.98730000000
-2,2069,R1,solarPV,2045,26.98730000000
-2,2070,R1,solarPV,2045,26.98730000000
-2,2074,R1,solarPV,2045,26.98730000000
-3,2055,R1,solarPV,2050,17.07570000000
-3,2069,R1,solarPV,2050,17.07570000000
-3,2070,R1,solarPV,2050,17.07570000000
-3,2074,R1,solarPV,2050,17.07570000000
-3,2075,R1,solarPV,2050,17.07570000000
-3,2079,R1,solarPV,2050,17.07570000000
+0,2050,R1,solarPV,2025,19.42500000000
+0,2054,R1,solarPV,2025,19.42500000000
+1,2050,R1,solarPV,2030,3.00000000000
+1,2054,R1,solarPV,2030,3.00000000000
+1,2055,R1,solarPV,2030,3.00000000000
+1,2059,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2035,7.10000000000
+2,2054,R1,solarPV,2035,7.10000000000
+2,2055,R1,solarPV,2035,7.10000000000
+2,2059,R1,solarPV,2035,7.10000000000
+2,2060,R1,solarPV,2035,7.10000000000
+2,2064,R1,solarPV,2035,7.10000000000
+3,2050,R1,solarPV,2040,7.10000000000
+3,2054,R1,solarPV,2040,7.10000000000
+3,2055,R1,solarPV,2040,7.10000000000
+3,2059,R1,solarPV,2040,7.10000000000
+3,2060,R1,solarPV,2040,7.10000000000
+3,2064,R1,solarPV,2040,7.10000000000
+3,2065,R1,solarPV,2040,7.10000000000
+3,2069,R1,solarPV,2040,7.10000000000
+4,2050,R1,solarPV,2045,17.37500000000
+4,2054,R1,solarPV,2045,17.37500000000
+4,2055,R1,solarPV,2045,17.37500000000
+4,2059,R1,solarPV,2045,17.37500000000
+4,2060,R1,solarPV,2045,17.37500000000
+4,2064,R1,solarPV,2045,17.37500000000
+4,2065,R1,solarPV,2045,17.37500000000
+4,2069,R1,solarPV,2045,17.37500000000
+4,2070,R1,solarPV,2045,17.37500000000
+4,2074,R1,solarPV,2045,17.37500000000
+5,2055,R1,solarPV,2050,19.42500000000
+5,2059,R1,solarPV,2050,19.42500000000
+5,2060,R1,solarPV,2050,19.42500000000
+5,2064,R1,solarPV,2050,19.42500000000
+5,2065,R1,solarPV,2050,19.42500000000
+5,2069,R1,solarPV,2050,19.42500000000
+5,2070,R1,solarPV,2050,19.42500000000
+5,2074,R1,solarPV,2050,19.42500000000
+5,2075,R1,solarPV,2050,19.42500000000
+5,2079,R1,solarPV,2050,19.42500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
index 1d1cd64d..bcdf148c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,109.50000000000
-1,2030,R1,heatpump,2020,109.50000000000
-1,2034,R1,heatpump,2020,109.50000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
index 41f56aa7..c2bf21f7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -1,5 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,109.50000000000
-1,2030,R1,heatpump,2020,109.50000000000
-1,2034,R1,heatpump,2020,109.50000000000
+1,2030,R1,gasboiler,2025,2.20000000000
+1,2034,R1,gasboiler,2025,2.20000000000
+1,2035,R1,gasboiler,2025,2.20000000000
+1,2039,R1,gasboiler,2025,2.20000000000
+2,2025,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2020,19.00000000000
+2,2034,R1,heatpump,2020,19.00000000000
+3,2030,R1,heatpump,2025,8.80000000000
+3,2034,R1,heatpump,2025,8.80000000000
+3,2035,R1,heatpump,2025,8.80000000000
+3,2039,R1,heatpump,2025,8.80000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
index e29079aa..d0d138b5 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -1,9 +1,15 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2030,3.60000000000
-0,2040,R1,gasboiler,2030,3.60000000000
-0,2044,R1,gasboiler,2030,3.60000000000
-1,2030,R1,heatpump,2020,109.50000000000
-1,2034,R1,heatpump,2020,109.50000000000
-2,2035,R1,heatpump,2030,114.40000000000
-2,2040,R1,heatpump,2030,114.40000000000
-2,2044,R1,heatpump,2030,114.40000000000
+0,2030,R1,gasboiler,2025,2.20000000000
+0,2034,R1,gasboiler,2025,2.20000000000
+0,2035,R1,gasboiler,2025,2.20000000000
+0,2039,R1,gasboiler,2025,2.20000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,8.80000000000
+2,2034,R1,heatpump,2025,8.80000000000
+2,2035,R1,heatpump,2025,8.80000000000
+2,2039,R1,heatpump,2025,8.80000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
index b03b48fc..e4f8a86d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -1,7 +1,13 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2030,3.60000000000
-0,2040,R1,gasboiler,2030,3.60000000000
-0,2044,R1,gasboiler,2030,3.60000000000
-2,2035,R1,heatpump,2030,114.40000000000
-2,2040,R1,heatpump,2030,114.40000000000
-2,2044,R1,heatpump,2030,114.40000000000
+0,2035,R1,gasboiler,2025,2.20000000000
+0,2039,R1,gasboiler,2025,2.20000000000
+1,2035,R1,heatpump,2025,8.80000000000
+1,2039,R1,heatpump,2025,8.80000000000
+2,2035,R1,heatpump,2030,25.00000000000
+2,2039,R1,heatpump,2030,25.00000000000
+2,2040,R1,heatpump,2030,25.00000000000
+2,2044,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2035,17.00000000000
+3,2044,R1,heatpump,2035,17.00000000000
+3,2045,R1,heatpump,2035,17.00000000000
+3,2049,R1,heatpump,2035,17.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
index 9da5588c..ef43badd 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -1,11 +1,11 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,gasboiler,2030,3.60000000000
-0,2044,R1,gasboiler,2030,3.60000000000
-1,2045,R1,gasboiler,2040,3.72000000000
-1,2050,R1,gasboiler,2040,3.72000000000
-1,2054,R1,gasboiler,2040,3.72000000000
-2,2040,R1,heatpump,2030,114.40000000000
-2,2044,R1,heatpump,2030,114.40000000000
-3,2045,R1,heatpump,2040,120.28000000000
-3,2050,R1,heatpump,2040,120.28000000000
-3,2054,R1,heatpump,2040,120.28000000000
+0,2040,R1,heatpump,2030,25.00000000000
+0,2044,R1,heatpump,2030,25.00000000000
+1,2040,R1,heatpump,2035,17.00000000000
+1,2044,R1,heatpump,2035,17.00000000000
+1,2045,R1,heatpump,2035,17.00000000000
+1,2049,R1,heatpump,2035,17.00000000000
+2,2045,R1,heatpump,2040,31.00000000000
+2,2049,R1,heatpump,2040,31.00000000000
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
index 95824543..8e4eab5a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -1,7 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gasboiler,2040,3.72000000000
-1,2050,R1,gasboiler,2040,3.72000000000
-1,2054,R1,gasboiler,2040,3.72000000000
-3,2045,R1,heatpump,2040,120.28000000000
-3,2050,R1,heatpump,2040,120.28000000000
-3,2054,R1,heatpump,2040,120.28000000000
+0,2045,R1,heatpump,2035,17.00000000000
+0,2049,R1,heatpump,2035,17.00000000000
+1,2045,R1,heatpump,2040,31.00000000000
+1,2049,R1,heatpump,2040,31.00000000000
+1,2050,R1,heatpump,2040,31.00000000000
+1,2054,R1,heatpump,2040,31.00000000000
+2,2050,R1,heatpump,2045,23.00000000000
+2,2054,R1,heatpump,2045,23.00000000000
+2,2055,R1,heatpump,2045,23.00000000000
+2,2059,R1,heatpump,2045,23.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
index 6ff2e689..917382bf 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -1,9 +1,11 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gasboiler,2040,3.72000000000
-1,2054,R1,gasboiler,2040,3.72000000000
-2,2055,R1,gasboiler,2050,2.66400000000
-2,2064,R1,gasboiler,2050,2.66400000000
-4,2050,R1,heatpump,2040,120.28000000000
-4,2054,R1,heatpump,2040,120.28000000000
-5,2055,R1,heatpump,2050,74.33600000000
-5,2064,R1,heatpump,2050,74.33600000000
+1,2050,R1,heatpump,2040,31.00000000000
+1,2054,R1,heatpump,2040,31.00000000000
+2,2050,R1,heatpump,2045,23.00000000000
+2,2054,R1,heatpump,2045,23.00000000000
+2,2055,R1,heatpump,2045,23.00000000000
+2,2059,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2050,31.00000000000
+3,2059,R1,heatpump,2050,31.00000000000
+3,2060,R1,heatpump,2050,31.00000000000
+3,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index ed498021..7b8c4061 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
 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.05820000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
+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,3.76770000000
+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.08730000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
+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,5.65150000000
+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.05820000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
+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,3.76770000000
+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.08730000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
+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,5.65150000000
+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.17470000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
+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,11.30310000000
+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.11640000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
+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,7.53540000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index 6123143a..05aa82fe 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,25 +1,43 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05820000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
-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.76770000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08730000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
-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.65150000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05820000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
-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.76770000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08730000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
-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.65150000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.17470000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
-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,11.30310000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.11640000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
-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,7.53540000000
+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.12220000000
+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.48890000000
+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,7.90900000000
+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.18330000000
+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.73330000000
+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,11.86350000000
+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.12220000000
+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.48890000000
+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,7.90900000000
+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.18330000000
+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.73330000000
+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,11.86350000000
+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.36670000000
+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.46670000000
+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,23.72700000000
+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.24440000000
+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.97780000000
+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,15.81800000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index f0ac673b..5a5c39ce 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,49 @@
 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.06100000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
-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.09150000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
-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.06100000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
-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.09150000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
-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.18310000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
-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.12200000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.12220000000
+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.48890000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.12220000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.48890000000
+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,7.90900000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,7.90900000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.18330000000
+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.73330000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.18330000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.73330000000
+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,11.86350000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,11.86350000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.12220000000
+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.48890000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.12220000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.48890000000
+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,7.90900000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,7.90900000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.18330000000
+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.73330000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.18330000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.73330000000
+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,11.86350000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,11.86350000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.36670000000
+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.46670000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.36670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.46670000000
+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,23.72700000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,23.72700000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.24440000000
+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.97780000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.24440000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.97780000000
+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,15.81800000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,15.81800000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index f7d82b38..c1f9d8c7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,37 +1,37 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.06100000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
-0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
-0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
-1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.09150000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
-1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
-1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
-2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.06100000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
-2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
-2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
-3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.09150000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
-3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
-3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
-4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.18310000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
-4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
-4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
-5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.12200000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
-5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
-5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.12220000000
+0,heat,2035,1,R1,all-year,all-week,night,heatpump,2025,0.48890000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,7.90900000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.18330000000
+1,heat,2035,1,R1,all-year,all-week,morning,heatpump,2025,0.73330000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,11.86350000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.12220000000
+2,heat,2035,1,R1,all-year,all-week,afternoon,heatpump,2025,0.48890000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,7.90900000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.18330000000
+3,heat,2035,1,R1,all-year,all-week,early-peak,heatpump,2025,0.73330000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,11.86350000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.36670000000
+4,heat,2035,1,R1,all-year,all-week,late-peak,heatpump,2025,1.46670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,23.72700000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.24440000000
+5,heat,2035,1,R1,all-year,all-week,evening,heatpump,2025,0.97780000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,15.81800000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index cb472ae2..f9c441c6 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,37 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
-0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
-0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
-0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
-1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
-1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
-1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
-1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
-2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
-2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
-2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
-3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
-3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
-3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
-4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
-4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
-4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
-5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
-5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
-5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
-5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
+0,heat,2040,0,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+1,heat,2040,0,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+5,heat,2040,0,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index 2bc6526c..c0074b8b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,37 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
-0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
-0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,2.91000000000
-0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
-0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
-1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
-1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
-1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
-1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
-1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
-2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
-2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
-2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
-2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
-3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
-3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
-3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
-3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
-4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
-4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
-4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
-4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
-5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
-5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
-5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
-5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
-5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
+0,heat,2045,0,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,1,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,0,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,1,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,0,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,1,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 0be0b395..76235fdc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,37 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
-0,heat,2050,4,R1,all-year,all-week,night,heatpump,2040,2.91000000000
-0,heat,2055,2,R1,all-year,all-week,night,gasboiler,2050,0.10380000000
-0,heat,2055,5,R1,all-year,all-week,night,heatpump,2050,2.89620000000
-0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
-0,CO2f,2055,2,R1,all-year,all-week,night,gasboiler,2050,6.71640000000
-1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
-1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
-1,heat,2055,2,R1,all-year,all-week,morning,gasboiler,2050,0.15570000000
-1,heat,2055,5,R1,all-year,all-week,morning,heatpump,2050,4.34430000000
-1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
-1,CO2f,2055,2,R1,all-year,all-week,morning,gasboiler,2050,10.07460000000
-2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
-2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
-2,heat,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,0.10380000000
-2,heat,2055,5,R1,all-year,all-week,afternoon,heatpump,2050,2.89620000000
-2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
-2,CO2f,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,6.71640000000
-3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
-3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
-3,heat,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,0.15570000000
-3,heat,2055,5,R1,all-year,all-week,early-peak,heatpump,2050,4.34430000000
-3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
-3,CO2f,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,10.07460000000
-4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
-4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
-4,heat,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,0.31140000000
-4,heat,2055,5,R1,all-year,all-week,late-peak,heatpump,2050,8.68860000000
-4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
-4,CO2f,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,20.14920000000
-5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
-5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
-5,heat,2055,2,R1,all-year,all-week,evening,gasboiler,2050,0.20760000000
-5,heat,2055,5,R1,all-year,all-week,evening,heatpump,2050,5.79240000000
-5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
-5,CO2f,2055,2,R1,all-year,all-week,evening,gasboiler,2050,13.43280000000
+0,heat,2050,1,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,2,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,1,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,2,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,2,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,2,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,2,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,1,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,2,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 704d93ac..a8b2ee92 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -54,13 +54,6 @@ commodities_out = '{path}/technodata/residential/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
-constraints = [
-    # Optional, defaults to the constraints below
-    "max_production",
-    "max_capacity_expansion",
-    "demand",
-    "search_space"
-]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
 
diff --git a/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb b/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
index b197a116..a87abc0e 100644
--- a/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/visualise-new-agent-multiple-objective.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"1-single-objective/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"2-multiple-objective/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\", \"agent\"])\n",
@@ -54,7 +54,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.4"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb b/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
index 8ca059c6..710be253 100644
--- a/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
+++ b/docs/tutorial-code/2-add-agent/visualise-new-agent-single-objective.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mca_capacity = pd.read_csv(\"2-multiple-objective/Results/MCACapacity.csv\")\n",
+    "mca_capacity = pd.read_csv(\"1-single-objective/Results/MCACapacity.csv\")\n",
     "power_sector = (\n",
     "    mca_capacity[mca_capacity.sector == \"power\"]\n",
     "    .groupby([\"technology\", \"year\", \"agent\"])\n",
@@ -54,7 +54,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.4"
   },
   "vscode": {
    "interpreter": {

From 5ef8aad5f4caf62d899f03e2ff629d42e12bce00 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 21 Jun 2024 07:57:01 +0100
Subject: [PATCH 259/419] Add test for demand_limitting_capacity

---
 src/muse/constraints.py   | 30 +++++++++++++++++++-----------
 tests/test_constraints.py | 27 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 76f38517..f856955b 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -518,7 +518,9 @@ def demand_limitting_capacity(
     no more.
 
     Rather than coding from scratch the constraint, we can use the max_production
-    constraint and the demand constraint to construct this constraint.
+    constraint and the demand constraint to construct this constraint. Starting from
+    the maximum production instead of the maximum capacity ensures that the constraint
+    accounts for the utilization factor of the technologies.
     """
     # We start with the maximum production constraint and the demand constraint
     capacity_constraint = max_production(
@@ -529,24 +531,30 @@ def demand_limitting_capacity(
     )
 
     # We need to find the most demanding timeslice and use as the demand constraint
-    if "timeslice" in demand_constraint.b.dims:
-        b = demand_constraint.b.max("timeslice")
-    else:
-        b = demand_constraint.b
+    b = (
+        demand_constraint.b.max("timeslice")
+        if "timeslice" in demand_constraint.b.dims
+        else demand_constraint.b
+    )
 
     # Now we need to find the maximum capacity constraint (as the capacity here is
-    # negative), and switch the sign to make it positive
-    if "timeslice" in capacity_constraint.capacity.dims:
-        capacity = -capacity_constraint.capacity.max("timeslice")
-    else:
-        capacity = -capacity_constraint.capacity
+    # negative), and switch the sign to make it positive. In practice, we want to
+    # capture the utilisation factor of the technologies.
+    capacity = (
+        -capacity_constraint.capacity.max("timeslice")
+        if "timeslice" in capacity_constraint.capacity.dims
+        else -capacity_constraint.capacity
+    )
 
     # Drop 'year' so there's no conflict with the 'year' in the capacity constraint
     if "year" in b.coords and "year" in capacity.coords:
         b = b.drop_vars("year")
 
+    # This constraint is independent on the production
+    production = 0
+
     return xr.Dataset(
-        dict(capacity=capacity, production=0, b=b),
+        dict(capacity=capacity, production=production, b=b),
         attrs=dict(kind=ConstraintKind.UPPER_BOUND),
     )
 
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index e88149ed..7470523f 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -110,6 +110,17 @@ def max_capacity_expansion(market_demand, assets, search_space, market, technolo
     )
 
 
+@fixture
+def demand_limitting_capacity(
+    market_demand, assets, search_space, market, technologies
+):
+    from muse.constraints import demand_limitting_capacity
+
+    return demand_limitting_capacity(
+        market_demand, assets, search_space, market, technologies
+    )
+
+
 @fixture(params=["timeslice_as_list", "timeslice_as_multindex"])
 def constraints(request, market_demand, assets, search_space, market, technologies):
     from muse import constraints as cs
@@ -492,3 +503,19 @@ def test_max_production(max_production):
     assert set(max_production.production.dims) == dims
     assert set(max_production.b.dims) == dims
     assert (max_production.capacity <= 0).all()
+
+
+def test_demand_limitting_capacity(
+    demand_limitting_capacity, max_production, demand_constraint
+):
+    assert demand_limitting_capacity.capacity.values == approx(
+        -max_production.capacity.max("timeslice").values
+        if "timeslice" in max_production.capacity.dims
+        else -max_production.capacity.values
+    )
+    assert demand_limitting_capacity.production == 0
+    assert demand_limitting_capacity.b.values == approx(
+        demand_constraint.b.max("timeslice").values
+        if "timeslice" in demand_constraint.b.dims
+        else demand_constraint.b.values
+    )

From 2aa8ea9dd253d80e2ca5c56b6985aec884a1b8da Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 21 Jun 2024 08:37:10 +0100
Subject: [PATCH 260/419] Add test_factory_constraints_passed_to_agents

---
 tests/test_subsector.py | 45 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/tests/test_subsector.py b/tests/test_subsector.py
index 356aad3b..693c084d 100644
--- a/tests/test_subsector.py
+++ b/tests/test_subsector.py
@@ -1,7 +1,8 @@
 from typing import Sequence, Text
+from unittest.mock import MagicMock, patch
 
 import xarray as xr
-from pytest import fixture
+from pytest import fixture, raises
 
 
 @fixture
@@ -134,3 +135,45 @@ def test_factory_smoke_test(model, technologies, tmp_path):
 
     assert isinstance(subsector, Subsector)
     assert len(subsector.agents) == 2
+
+
+def test_factory_constraints_passed_to_agents(model, technologies, tmp_path):
+    from muse import examples
+    from muse.readers.toml import read_settings
+    from muse.sectors.subsector import Subsector
+
+    examples.copy_model(model, tmp_path)
+    settings = read_settings(tmp_path / "model" / "settings.toml")
+
+    # The constraints in the settings are not none
+    assert len(settings.sectors.residential.subsectors.retro_and_new.constraints) > 0
+
+    class BreakException(Exception):
+        pass
+
+    _withness = MagicMock()
+
+    def agent_factory(*args, **kwargs):
+        _withness(*args, **kwargs)
+        raise BreakException()
+
+    # We asses they are indeed passed to the agents factory
+    with patch("muse.agents.agents_factory", new=agent_factory):
+        with raises(BreakException):
+            Subsector.factory(
+                settings.sectors.residential.subsectors.retro_and_new, technologies
+            )
+        assert (
+            _withness.call_args[1]["constraints"]
+            == settings.sectors.residential.subsectors.retro_and_new.constraints
+        )
+
+    # But if there are no constraints, we pass an empty tuple
+    settings.sectors.residential.subsectors.retro_and_new.constraints.clear()
+    _withness.reset_mock()
+    with patch("muse.agents.agents_factory", new=agent_factory):
+        with raises(BreakException):
+            Subsector.factory(
+                settings.sectors.residential.subsectors.retro_and_new, technologies
+            )
+        assert tuple(_withness.call_args[1]["constraints"]) == ()

From 73c734f15449dad42b309b6d1edadd418d8de40b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 07:42:29 +0000
Subject: [PATCH 261/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/test_subsector.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_subsector.py b/tests/test_subsector.py
index 01f5abe1..03ada8e2 100644
--- a/tests/test_subsector.py
+++ b/tests/test_subsector.py
@@ -1,5 +1,4 @@
 from collections.abc import Sequence
-from typing import Sequence, Text
 from unittest.mock import MagicMock, patch
 
 import xarray as xr

From 5aeea9737400e9293719409b77f50f1abd24b79d Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Fri, 21 Jun 2024 09:06:43 +0100
Subject: [PATCH 262/419] Fix complaint from QA

---
 src/muse/constraints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index d75704e1..db5902da 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -501,7 +501,7 @@ def demand_limitting_capacity(
     search_space: xr.DataArray,
     market: xr.Dataset,
     technologies: xr.Dataset,
-    year: Optional[int] = None,
+    year: int | None = None,
 ) -> Constraint:
     """Limits the maximum combined capacity to match the demand.
 

From ed3e15f4e8c94800d86a4df799d1f0ce9b59c290 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Fri, 21 Jun 2024 16:58:42 +0100
Subject: [PATCH 263/419] This patch checks whether the file
 "Results/MCACapacity.csv" exists, which is true only upon running `muse
 --model default` or any other model that creates MCACapacity.csv and only
 then proceeds running the test notebooks.

I hard-code this explicit file dependency which may not be the most general solution, however, due to the explicit dependency on MCACapacity.csv in one of the test notebooks, which itself is hardcoded, I think this is a straight-forward approach.
---
 docs/installation/developers.rst | 4 ++--
 tests/test_docs_notebooks.py     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 44b49f5c..44a21d3a 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -29,8 +29,8 @@ Once you have your environment created, **activate it** and install MUSE within
     cd MUSE_OS
     # 1- Create a virtual environment
     # 2- Activate that virtual environment
-    # 3- Finally, install MUSE in editable mode with:
-    python -m pip install -e .[dev,doc]
+    # 3- Install MUSE in editable mode with: python -m pip install -e .[dev,doc]
+    # 4 - Invoke `muse --model default`
 
 .. note::
     Depending on your system, you might need to add quotation marks around ``[dev,doc]`` as in ``"[dev,doc]"``.
diff --git a/tests/test_docs_notebooks.py b/tests/test_docs_notebooks.py
index a06e023d..9d70eb31 100644
--- a/tests/test_docs_notebooks.py
+++ b/tests/test_docs_notebooks.py
@@ -8,6 +8,9 @@
 
 def available_notebooks() -> List[Path]:
     """Locate the available notebooks in the docs."""
+    if not Path("Results/MCACapacity.csv").exists():
+        return []
+
     base_path = Path(__file__).parent.parent / "docs"
     return [p for p in base_path.rglob("*.ipynb") if "build" not in str(p)]
 

From 31f548df1b22c31f5541cfbc1fa29be751eda8b4 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 24 Jun 2024 01:32:45 +0100
Subject: [PATCH 264/419] More detailed explanation on how to set up ``pyenv``
 on ``Linux`` and ``Windows``.

What remains a TODO is a more detailed refinement of the documentation in terms of separating the way that exist to install MUSE. It should be made explicitly clear to settle on either of the following options.They are:

   i) standalone-muse
   ii) pipx-based installation
   iii) virtual-env-based either via
      - ``conda``
        or
      -``pyenv`` in combination with``venv``
   iv) developers (ideally via a virtual-env based setup as explained in iii)
---
 docs/installation/pipx-based.rst | 87 +++++++++++++++++++++-----------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 27a63f27..9af0b111 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -17,7 +17,7 @@ In the following sections, we will guide you step by step in configuring your sy
     The next sections will explain in detail the appropriate steps as well as commenting on possible caveats. **We strongly encourage you to read through the sections below** to understand what these steps entitle, but in the end, what we are going to do to install MUSE is the following:
 
     - Open a terminal
-    - Install `pyenv <https://github.com/pyenv/pyenv>`_ (Linux and MacOS) or `pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ (Windows) and make sure it works.
+    - Install `pyenv <https://github.com/pyenv/pyenv>`_ (Linux and MacOS) or `pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ (Windows) and ascertain it works by invoking `pyenv --version` in the terminal.
     - Run the following commands in the terminal:
 
         .. code-block::
@@ -35,7 +35,7 @@ In the following sections, we will guide you step by step in configuring your sy
 Launching a terminal
 ~~~~~~~~~~~~~~~~~~~~
 
-All operating systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let's just figure out how to launch it:
+All operating systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let us just figure out how to launch one:
 
 - **Linux**: Depending on the distribution, you might have a shortcut in your tasks bar already or it should be easily found in the menu. Look for ``Console`` or ``Terminal`` to lunch the application.
 - **MacOS**: Press ``Super key + Space`` to open the search box. There, type ``Terminal`` and press ``Enter``.
@@ -107,13 +107,43 @@ Installing ``pyenv``
 
 To install ``pyenv``, follow these steps:
 
-- **Linux**: In this case, you will need to clone the GitHub repository using ``git``. Most Linux distributions come with ``git`` installed, so this should work out of the box:
+- **Linux**: In this case, you will need to clone the GitHub repository using ``git``. Most Linux distributions come with ``git`` installed, so this should work out of the box.
+Then, complete the setup by adding ``pyenv`` to your profile, so the executable can be found. You can `check the instructions in the official webpage <https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv>`_,
+    or follow the below commands that were tested on `Ubuntu 22.04 LTS` using its popular `bash shell` and `z-shell`. To be specific, we tested them
+    on `GNU bash, version 5.1.16(1)-release (x86_64-pc-linux-gnu)` and `zsh 5.8.1 (x86_64-ubuntu-linux-gnu)`.
 
-    .. code-block:: bash
+    We now go through the installation procedure of `pyenv` on Linux, step-by-step:
 
-        git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+ .. code-block::
+
+            # Step 1: Install essential libraries needed for pyenv
+            sudo apt install -y make build-essential libssl-dev zlib1g-dev \
+            libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev \
+            libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python3-openssl \
+            git
+
+
+            # Step 2: Clone the `pyenv` repository for Linux
+            git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+
+
+            #Step 3: Run one code block in this step only, depending on what shell you use:
+
+            # If you are on the bash shell run the following:
+            echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc
+            echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc
+            echo 'eval "$(pyenv init --path)"' >> ~/.bashrc
+            source ~/.bashrc
+
+            # If you are on the z-shell, run the following:
+            echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.zshrc
+            echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.zshrc
+            echo 'eval "$(pyenv init --path)"' >> ~/.zshrc
+            source ~/.zshrc
+
+            # Step 4: Confirm successful installation of `pyenv` upon invoking the following command in the terminal. You should be returned something similar to `pyenv 2.4.1-10-g2e0bb023`
+            pyenv --version
 
-    Then, complete the setup by adding ``pyenv`` to your profile, so the executable can be found. `Check the instructions in the official webpage <https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv>`_.
 
 - **MacOS**: The simplest option is to use Homebrew:
 
@@ -124,12 +154,20 @@ To install ``pyenv``, follow these steps:
 
     Then, complete the setup by adding ``pyenv`` to your profile, so the executable can be found. `Check the instructions in the official webpage <https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv>`_.
 
-- **Windows**: ``pyenv-win`` is a separate project but it has the same functionality and it is also simpler to setup. Just run the following command and you should be ready to go:
+- **Windows**: ``pyenv-win`` is a separate project but it has the same functionality and it is also simpler to setup.
+You can read the detailed installation instructions `from the official pyenv-win website <https://github.com/pyenv-win/pyenv-win/tree/master>`_,
+but the easiest way is to run the following command in the ``powershell`` and, upon closing and launching a new shell, you should be ready to go:
 
     .. code-block:: powershell
 
+        # Step 1:
         Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/pyenv-win/pyenv-win/master/pyenv-win/install-pyenv-win.ps1" -OutFile "./install-pyenv-win.ps1"; &"./install-pyenv-win.ps1"
 
+        # Step 2: close the shell you invoked in the command from Step 1 and re-launch an new `powershell`. This is equivalent to invoke the shell command `source` in Linux.
+
+        # Step 3: Confirm success; you should be returned something similar to `pyenv 3.1.1`
+        pyenv --version
+
     .. note::
 
         If you are getting any ``UnauthorizedAccess`` error, then start Windows PowerShell with the “Run as administrator” option (see figure above) and run:
@@ -140,17 +178,6 @@ To install ``pyenv``, follow these steps:
 
         Finally open a normal PowerShell and re-run the above installation command.
 
-After completing the above steps, you will need to close the terminal and re-open it again. After that, to check if things work run:
-
-.. code-block:: bash
-
-    pyenv --version
-
-You should get something similar to:
-
-.. code-block:: output
-
-    pyenv 3.1.1
 
 Actually installing Python
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -161,22 +188,22 @@ With ``pyenv`` installed and correctly configured, it is now easy to install any
 
     pyenv install -l
 
-You should see a very long list of versions to choose from. Let's install the latest version of the 3.9 family:
+You should see a very long list of versions to choose from. Let us install the latest version of the 3.9 family:
 
 .. code-block:: bash
 
-    pyenv install 3.9.13
+    pyenv install 3.9.19
 
 The command will take a minute or two to complete, depending on your internet connection, and show an output similar to the following (this is just an example for Windows):
 
 .. code-block:: output
 
     :: [Info] ::  Mirror: https://www.python.org/ftp/python
-    :: [Downloading] ::  3.9.13 ...
-    :: [Downloading] ::  From https://www.python.org/ftp/python/3.9.13/python-3.9.13-amd64.exe
-    :: [Downloading] ::  To   C:\Users\your_username\.pyenv\pyenv-win\install_cache\python-3.9.13-amd64.exe
-    :: [Installing] ::  3.9.13 ...
-    :: [Info] :: completed! 3.9.13
+    :: [Downloading] ::  3.9.19 ...
+    :: [Downloading] ::  From https://www.python.org/ftp/python/3.9.19/python-3.9.19-amd64.exe
+    :: [Downloading] ::  To   C:\Users\your_username\.pyenv\pyenv-win\install_cache\python-3.9.19-amd64.exe
+    :: [Installing] ::  3.9.19 ...
+    :: [Info] :: completed! 3.9.19
 
 Now, we have a new Python version in our system, but it is still not available (if you run ``python --version`` you will get the same result as before). There are two options moving forward:
 
@@ -184,20 +211,22 @@ Now, we have a new Python version in our system, but it is still not available (
 
     .. code-block:: bash
 
-        pyenv global 3.9.13
+        pyenv global 3.9.19
 
 - If you just want it momentarily to install MUSE run instead the following command:
 
     .. code-block:: bash
 
-        pyenv shell 3.9.13
+        pyenv shell 3.9.19
 
-In both cases, if you run ``python --version`` afterwards, you should get ``Python 3.9.13``.
+In both cases, if you run ``python --version`` afterwards, you should get ``Python 3.9.19``.
 
 Installing ``pipx``
 ~~~~~~~~~~~~~~~~~~~
 
-Next we need to install ``pipx``, a Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments. We could skip this step and install MUSE directly, but that will risk to have conflicting dependencies in the future if you install any other application, breaking your MUSE installation, and we do not want that to happen.
+Next we need to install ``pipx``, a Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments.
+More specifically, ``pipx`` will create a virtual environment to run the tools it installs based on the python version that was used to install pipx to start with, unless you specify another version and that other version is system wide available.
+We could skip this step and install MUSE directly, but that will risk to have conflicting dependencies in the future if you install any other application, breaking your MUSE installation, and we do not want that to happen.
 
 The installation instructions for ``pipx`` can be found in the `official webpage <https://pypa.github.io/pipx/installation/>`_ specific for the three operating systems. The following instructions, however, should work for the three cases:
 

From e26b217a2ea67cdd39d133f7bb18baca1dcad2ee Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 11:15:21 +0100
Subject: [PATCH 265/419] Fill gaps in bar charts

---
 docs/user-guide/add-agent.ipynb                  | 10 ++++++++--
 docs/user-guide/add-gdp-correlation-demand.ipynb |  7 ++++---
 docs/user-guide/add-region.ipynb                 |  5 ++++-
 docs/user-guide/add-solar.ipynb                  |  7 ++++---
 docs/user-guide/additional-service-demand.ipynb  |  5 ++++-
 docs/user-guide/modify-timing-data.ipynb         | 12 ++++++++----
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index 89ad3598..c1e5e7b9 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -107,6 +107,7 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv\"\n",
     ")\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
@@ -116,7 +117,9 @@
     "    g.map_dataframe(\n",
     "        lambda data, **kwargs: data.pivot(\n",
     "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "        )\n",
+    "        .reindex(all_years)\n",
+    "        .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
@@ -167,6 +170,7 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv\"\n",
     ")\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
@@ -176,7 +180,9 @@
     "    g.map_dataframe(\n",
     "        lambda data, **kwargs: data.pivot(\n",
     "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "        )\n",
+    "        .reindex(all_years)\n",
+    "        .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb
index bf6b2583..64e10598 100644
--- a/docs/user-guide/add-gdp-correlation-demand.ipynb
+++ b/docs/user-guide/add-gdp-correlation-demand.ipynb
@@ -140,11 +140,12 @@
    "outputs": [],
    "source": [
     "fig, axes = plt.subplots(1, 3)\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
     "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
-    "        kind=\"bar\", stacked=True, ax=ax\n",
-    "    )\n",
+    "    sector_capacity.pivot(\n",
+    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "    ).reindex(all_years).plot(kind=\"bar\", stacked=True, ax=ax)\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
     "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index f9e3025f..4b453ef3 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -104,6 +104,7 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv\"\n",
     ")\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
@@ -113,7 +114,9 @@
     "    g.map_dataframe(\n",
     "        lambda data, **kwargs: data.pivot(\n",
     "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "        )\n",
+    "        .reindex(all_years)\n",
+    "        .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 36be5962..fa6d4d47 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -444,13 +444,14 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv\"\n",
     ")\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "\n",
     "fig, axes = plt.subplots(1, 3)\n",
     "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
     "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
-    "        kind=\"bar\", stacked=True, ax=ax\n",
-    "    )\n",
+    "    sector_capacity.pivot(\n",
+    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "    ).reindex(all_years).plot(kind=\"bar\", stacked=True, ax=ax)\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
     "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
diff --git a/docs/user-guide/additional-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb
index 3a0c1a0c..df86faeb 100644
--- a/docs/user-guide/additional-service-demand.ipynb
+++ b/docs/user-guide/additional-service-demand.ipynb
@@ -234,6 +234,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
     "        sector_data.groupby([\"technology\", \"region\", \"year\"]).sum().reset_index()\n",
@@ -242,7 +243,9 @@
     "    g.map_dataframe(\n",
     "        lambda data, **kwargs: data.pivot(\n",
     "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "        )\n",
+    "        .reindex(all_years)\n",
+    "        .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 0d232111..eb0ad991 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -113,7 +113,7 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv\"\n",
     ")\n",
-    "\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
     "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
@@ -122,7 +122,9 @@
     "    g.map_dataframe(\n",
     "        lambda data, **kwargs: data.pivot(\n",
     "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "        )\n",
+    "        .reindex(all_years)\n",
+    "        .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",
@@ -221,7 +223,7 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv\"\n",
     ")\n",
-    "\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
     "    sector_capacity = (\n",
     "        sector_data.groupby([\"region\", \"year\", \"technology\"]).sum().reset_index()\n",
@@ -230,7 +232,9 @@
     "    g.map_dataframe(\n",
     "        lambda data, **kwargs: data.pivot(\n",
     "            index=\"year\", columns=\"technology\", values=\"capacity\"\n",
-    "        ).plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
+    "        )\n",
+    "        .reindex(all_years)\n",
+    "        .plot(kind=\"bar\", stacked=True, ax=plt.gca())\n",
     "    )\n",
     "    g.add_legend()\n",
     "    g.set_ylabels(\"Capacity (PJ)\")\n",

From 1b10b604ce3801117855b722a97df89ec90a87e8 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 11:19:35 +0100
Subject: [PATCH 266/419] Update tables

---
 docs/user-guide/add-agent.ipynb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index c1e5e7b9..a19554f9 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -31,20 +31,18 @@
     "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|DecisionMethod|Quantity|…|Type|\n",
     "|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
     "|Agent1|A1|R1|LCOE|||1||…|singleObj|**0.5**|…|New|\n",
-    "|Agent2|A1|R1|LCOE|||1||…|singleObj|**0.5**|…|Retrofit|\n",
-    "|**Agent3**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|**0.5**|…|**New**|\n",
-    "|**Agent4**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|**0.5**|…|**Retrofit**|"
+    "|**Agent2**|**A2**|**R1**|**LCOE**|||**1**||…|**singleObj**|**0.5**|…|**New**|"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We then edit all of the `Technodata` files to split the existing capacity between the two agents by the proportions we like. As we now have two agents which take up 50% of the population each, we will split the existing capacity by 50% for each of the agents. Notice that we only require the columns `Agent2` and `Agent4` to define the retrofit agents.\n",
+    "We then edit all of the `Technodata` files to split the existing capacity between the two agents by the proportions we like. As we now have two agents which take up 50% of the population each, we will split the existing capacity by 50% for each of the agents. \n",
     "\n",
     "The new technodata file for the power sector will look like the following:\n",
     "\n",
-    "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent2|Agent4|\n",
+    "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent1|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|-|-|\n",
     "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|Retrofit|**Retrofit**|\n",
     "|gasCCGT|R1|2020|fixed|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
@@ -145,9 +143,7 @@
     "|AgentShare|Name|RegionName|Objective1|Objective2|Objective3|ObjData1|ObjData2|…|Objsort2|…|DecisionMethod|Quantity|…|Type|\n",
     "|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|\n",
     "|Agent1|A1|R1|LCOE|||1||…||…|singleObj|0.5|…|New|\n",
-    "|Agent2|A1|R1|LCOE|||1||…||…|singleObj|0.5|…|Retrofit|\n",
-    "|Agent3|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|New|\n",
-    "|Agent4|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|Retrofit|"
+    "|Agent2|A2|R1|LCOE|**EAC**||**0.5**|**0.5**|…|**True**|**…**|**weighted_sum**|0.5|…|New|"
    ]
   },
   {

From 3c1e588c5058859fc7a418f98c6bdc5162f6cfb0 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 5 Jun 2024 17:23:16 +0100
Subject: [PATCH 267/419] Reapply "Enforce minimum service factor limits"

This reverts commit 320738cf8fa6c6b8bcc16a84cec7771b9eba091f.
---
 src/muse/constraints.py       | 14 +++++++-------
 src/muse/readers/csv.py       | 15 +++++++++++++--
 tests/test_minimum_service.py | 29 +++++++++++++++--------------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 81f76b25..b75c08f3 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -1,6 +1,6 @@
 r"""Investment constraints.
 
-Constraints on investements ensure that investements match some given criteria. For
+Constraints on investments ensure that investments match some given criteria. For
 instance, the constraints could ensure that only so much of a new asset can be built
 every year.
 
@@ -8,7 +8,7 @@
 :py:meth:`~muse.constraints.register_constraints`. This registration step makes it
 possible for constraints to be declared in the TOML file.
 
-Generally, LP solvers accept linear constraint defined as:
+Generally, LP solvers accept linear constraints defined as:
 
 .. math::
 
@@ -16,8 +16,8 @@
 
 with :math:`A` a matrix, :math:`x` the decision variables, and :math:`b` a vector.
 However, these quantities are dimensionless. They do no have timeslices, assets, or
-replacement technologies, or any other dimensions that users have set-up in their model.
-The crux is to translates from MUSE's data-structures to a consistent dimensionless
+replacement technologies, or any other dimensions that users have set up in their model.
+The crux is to translate from MUSE's data-structures to a consistent dimensionless
 format.
 
 In MUSE, users can register constraints functions that return fully dimensional
@@ -44,8 +44,8 @@
 - Any dimension in :math:`A_c .* x_c` (:math:`A_p .* x_p`) that is also in :math:`b`
   defines diagonal entries into the left (right) submatrix of :math:`A`.
 - Any dimension in :math:`A_c .* x_c` (:math:`A_p .* x_b`) and missing from
-  :math:`b` is reduce by summation over a row in the left (right) submatrix of
-  :math:`A`. In other words, those dimension do become part of a standard tensor
+  :math:`b` is reduced by summation over a row in the left (right) submatrix of
+  :math:`A`. In other words, those dimensions become part of a standard tensor
   reduction or matrix multiplication.
 
 There are two additional rules. However, they are likely to be the result of an
@@ -281,7 +281,7 @@ def max_capacity_expansion(
     :math:`y=y_1` is the year marking the end of the investment period.
 
     Let :math:`\mathcal{A}^{i, r}_{t, \iota}(y)` be the current assets, before
-    invesment, and let :math:`\Delta\mathcal{A}^{i,r}_t` be the future investements.
+    investment, and let :math:`\Delta\mathcal{A}^{i,r}_t` be the future investments.
     The the constraint on agent :math:`i` are given as:
 
     .. math::
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index d8446837..24e907bf 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -130,6 +130,9 @@ def to_agent_share(name):
 
     if "year" in result.dims and len(result.year) == 1:
         result = result.isel(year=0, drop=True)
+
+    check_minimum_service_factors_in_range(data, filename)
+
     return result
 
 
@@ -145,7 +148,7 @@ def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset:
     data = csv[csv.technology != "Unit"]
 
     data = data.apply(to_numeric)
-    data = check_utilization_not_all_zero(data, filename)
+    check_utilization_not_all_zero(data, filename)
 
     ts = pd.MultiIndex.from_frame(
         data.drop(
@@ -934,4 +937,12 @@ def check_utilization_not_all_zero(data, filename):
             f"""A technology can not have a utilization factor of 0 for every
                 timeslice. Please check file {filename}."""
         )
-    return data
+
+
+def check_minimum_service_factors_in_range(data, filename):
+    min_service_factor = data["minimum_service_factor"]
+    if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
+        raise ValueError(
+            f"""Minimum service factor values must all be between 0 and 1 inclusive.
+             Please check file {filename}."""
+        )
diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index ded2b50d..2064cf86 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -1,8 +1,11 @@
+from itertools import permutations
+
+import numpy as np
 from pytest import mark
 
 
 def modify_minimum_service_factors(
-    model_path, sector, process_name, minimum_service_factor
+    model_path, sector, processes, minimum_service_factors
 ):
     import pandas as pd
 
@@ -10,27 +13,25 @@ def modify_minimum_service_factors(
         model_path / "technodata" / sector / "TechnodataTimeslices.csv"
     )
 
-    technodata_timeslices.loc[
-        technodata_timeslices["ProcessName"] == process_name[0], "MinimumServiceFactor"
-    ] = minimum_service_factor[0]
-
-    technodata_timeslices.loc[
-        technodata_timeslices["ProcessName"] == process_name[1], "MinimumServiceFactor"
-    ] = minimum_service_factor[1]
+    for process, minimum in zip(processes, minimum_service_factors):
+        technodata_timeslices.loc[
+            technodata_timeslices["ProcessName"] == process, "MinimumServiceFactor"
+        ] = minimum
 
     return technodata_timeslices
 
 
-@mark.parametrize("process_name", [("gasCCGT", "windturbine")])
 @mark.parametrize(
-    "minimum_service_factor", [([1, 2, 3, 4, 5, 6], [0] * 6), ([0], [1, 2, 3, 4, 5, 6])]
+    "minimum_service_factors",
+    permutations((np.linspace(0, 1, 6), [0] * 6)),
 )
-def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
+def test_minimum_service_factor(tmpdir, minimum_service_factors):
     import pandas as pd
     from muse import examples
     from muse.mca import MCA
 
     sector = "power"
+    processes = ("gasCCGT", "windturbine")
 
     # Copy the model inputs to tmpdir
     model_path = examples.copy_model(
@@ -40,8 +41,8 @@ def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
     technodata_timeslices = modify_minimum_service_factors(
         model_path=model_path,
         sector=sector,
-        process_name=process_name,
-        minimum_service_factor=minimum_service_factor,
+        processes=processes,
+        minimum_service_factors=minimum_service_factors,
     )
 
     technodata_timeslices.to_csv(
@@ -53,7 +54,7 @@ def test_minimum_service_factor(tmpdir, minimum_service_factor, process_name):
 
     supply_timeslice = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
 
-    for process, service_factor in zip(process_name, minimum_service_factor):
+    for process, service_factor in zip(processes, minimum_service_factors):
         for i, factor in enumerate(service_factor):
             assert (
                 supply_timeslice[

From 5418078f68133ff3d5f13f651d3014ab09e01a05 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 15:52:44 +0100
Subject: [PATCH 268/419] Fix: Skip minimum service factor check if not used

---
 src/muse/readers/csv.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 24e907bf..ad2ab518 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -940,7 +940,12 @@ def check_utilization_not_all_zero(data, filename):
 
 
 def check_minimum_service_factors_in_range(data, filename):
-    min_service_factor = data["minimum_service_factor"]
+    try:
+        min_service_factor = data["minimum_service_factor"]
+    except KeyError:
+        # Minimum service factor not specified, so we don't need to check it
+        return
+
     if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
         raise ValueError(
             f"""Minimum service factor values must all be between 0 and 1 inclusive.

From 61d6352600230cd80f6b7048e8ec30a30ac9665a Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 18 Jun 2024 16:10:54 +0100
Subject: [PATCH 269/419] Typo

---
 src/muse/readers/csv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index ad2ab518..17cccbc42 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -272,7 +272,7 @@ def read_technologies(
     Arguments:
         technodata_path_or_sector: If `comm_out_path` and `comm_in_path` are not given,
             then this argument refers to the name of the sector. The three paths are
-            then determined using standard locations and name. Specifically, thechnodata
+            then determined using standard locations and name. Specifically, technodata
             looks for a "technodataSECTORNAME.csv" file in the standard location for
             that sector. However, if  `comm_out_path` and `comm_in_path` are given, then
             this should be the path to the the technodata file.

From c5f779d52bc0fb272aff54eecd08971c757681b3 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 18 Jun 2024 17:35:46 +0100
Subject: [PATCH 270/419] read_technodictionary(): Also check factor
 utilization is non-zero

---
 src/muse/readers/csv.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 17cccbc42..67ecbe8c 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -98,9 +98,10 @@ def to_agent_share(name):
     data.columns.name = "technodata"
     data.index.name = "technology"
     data = data.drop(["process_name", "region_name", "time"], axis=1)
-
     data = data.apply(to_numeric, axis=0)
 
+    check_utilization_not_all_zero(data, filename)
+
     result = xr.Dataset.from_dataframe(data.sort_index())
     if "fuel" in result.variables:
         result["fuel"] = result.fuel.isel(region=0, year=0)

From 2d40a615c325b386f28f1322973d583f4c0f41f6 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 15:56:21 +0100
Subject: [PATCH 271/419] Check minimum service factors in
 read_technodata_timeslices too

---
 src/muse/readers/csv.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 67ecbe8c..8bfd7d1f 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -150,6 +150,7 @@ def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset:
 
     data = data.apply(to_numeric)
     check_utilization_not_all_zero(data, filename)
+    check_minimum_service_factors_in_range(data, filename)
 
     ts = pd.MultiIndex.from_frame(
         data.drop(

From 454c86d96ee36ca9ce9d5d6198e6dcb96f213201 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 15:56:50 +0100
Subject: [PATCH 272/419] Add test for minimum service factor check in
 read_technodata_timeslices

---
 tests/test_minimum_service.py | 36 +++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 2064cf86..89c7bc09 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -1,7 +1,7 @@
-from itertools import permutations
+from itertools import chain, permutations
 
 import numpy as np
-from pytest import mark
+from pytest import mark, raises
 
 
 def modify_minimum_service_factors(
@@ -64,3 +64,35 @@ def test_minimum_service_factor(tmpdir, minimum_service_factors):
                 ].supply
                 >= factor
             ).all()
+
+
+@mark.parametrize(
+    "minimum_service_factors",
+    chain.from_iterable(map(permutations, ((-1, 0), (2, 0), (float("nan"), 0)))),
+)
+def test_minimum_service_factor_invalid_input(tmpdir, minimum_service_factors):
+    from muse import examples
+    from muse.mca import MCA
+
+    sector = "power"
+    processes = ("gasCCGT", "windturbine")
+
+    # Copy the model inputs to tmpdir
+    model_path = examples.copy_model(
+        name="default_timeslice", path=tmpdir, overwrite=True
+    )
+
+    technodata_timeslices = modify_minimum_service_factors(
+        model_path=model_path,
+        sector=sector,
+        processes=processes,
+        minimum_service_factors=minimum_service_factors,
+    )
+
+    technodata_timeslices.to_csv(
+        model_path / "technodata" / sector / "TechnodataTimeslices.csv", index=False
+    )
+
+    with raises(ValueError):
+        with tmpdir.as_cwd():
+            MCA.factory(model_path / "settings.toml").run()

From fc963bc089b8ec2c7fcc767f0a94950b6ad093f2 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:10:18 +0100
Subject: [PATCH 273/419] Add tests for check_utilization_not_all_zero

---
 tests/test_readers.py | 49 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index ddf98627..d9500c5d 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -410,3 +410,52 @@ def test_read_trade_technodata(tmp_path):
         "max_capacity_growth",
         "total_capacity_limit",
     }
+
+
+def test_check_utilization_not_all_zero_success():
+    import pandas as pd
+    from muse.readers.csv import check_utilization_not_all_zero
+
+    df = pd.DataFrame(
+        {
+            "utilization_factor": (0, 1, 1),
+            "technology": ("gas", "gas", "solar"),
+            "region": ("GB", "GB", "FR"),
+            "year": (2010, 2010, 2011),
+        }
+    )
+    check_utilization_not_all_zero(df, "file.csv")
+
+
+def test_check_utilization_not_all_zero_fail_all_zero():
+    import pandas as pd
+    from muse.readers.csv import check_utilization_not_all_zero
+
+    df = pd.DataFrame(
+        {
+            "utilization_factor": (0, 0, 1),
+            "technology": ("gas", "gas", "solar"),
+            "region": ("GB", "GB", "FR"),
+            "year": (2010, 2010, 2011),
+        }
+    )
+
+    with raises(ValueError):
+        check_utilization_not_all_zero(df, "file.csv")
+
+
+def test_check_utilization_not_all_zero_fail_missing_column():
+    import pandas as pd
+    from muse.readers.csv import check_utilization_not_all_zero
+
+    # NB: Required utilization_factor column is missing
+    df = pd.DataFrame(
+        {
+            "technology": ("gas", "gas", "solar"),
+            "region": ("GB", "GB", "FR"),
+            "year": (2010, 2010, 2011),
+        }
+    )
+
+    with raises(ValueError):
+        check_utilization_not_all_zero(df, "file.csv")

From 4c10462d3764353b584e37c58b4838ea582bb299 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:18:10 +0100
Subject: [PATCH 274/419] Add tests for check_minimum_service_factors_in_range

---
 tests/test_readers.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index d9500c5d..e70c68f9 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,3 +1,4 @@
+from itertools import chain, permutations
 from pathlib import Path
 
 import toml
@@ -459,3 +460,34 @@ def test_check_utilization_not_all_zero_fail_missing_column():
 
     with raises(ValueError):
         check_utilization_not_all_zero(df, "file.csv")
+
+
+def test_check_minimum_service_factors_in_range_success():
+    import pandas as pd
+    from muse.readers.csv import check_minimum_service_factors_in_range
+
+    df = pd.DataFrame({"minimum_service_factor": (0, 1)})
+    check_minimum_service_factors_in_range(df, "file.csv")
+
+
+def test_check_minimum_service_factors_in_range_column_missing():
+    import pandas as pd
+    from muse.readers.csv import check_minimum_service_factors_in_range
+
+    # If the minimum_service_factor column is missing, the function should just return
+    # without raising an error
+    df = pd.DataFrame()
+    check_minimum_service_factors_in_range(df, "file.csv")
+
+
+@mark.parametrize(
+    "values", chain.from_iterable(permutations((0, bad)) for bad in (-1, 2))
+)
+def test_check_minimum_service_factors_in_range_fail(values):
+    import pandas as pd
+    from muse.readers.csv import check_minimum_service_factors_in_range
+
+    df = pd.DataFrame({"minimum_service_factor": values})
+
+    with raises(ValueError):
+        check_minimum_service_factors_in_range(df, "file.csv")

From f4199af145576a516660a4e68959cd349e87fb82 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:28:46 +0100
Subject: [PATCH 275/419] Make higher-level function for utilisation and
 minimum service factor checks

---
 src/muse/readers/csv.py | 16 +++++-----
 tests/test_readers.py   | 69 +++++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 8bfd7d1f..699318f2 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -100,7 +100,7 @@ def to_agent_share(name):
     data = data.drop(["process_name", "region_name", "time"], axis=1)
     data = data.apply(to_numeric, axis=0)
 
-    check_utilization_not_all_zero(data, filename)
+    check_utilization_and_minimum_service_factors(data, filename)
 
     result = xr.Dataset.from_dataframe(data.sort_index())
     if "fuel" in result.variables:
@@ -132,8 +132,6 @@ def to_agent_share(name):
     if "year" in result.dims and len(result.year) == 1:
         result = result.isel(year=0, drop=True)
 
-    check_minimum_service_factors_in_range(data, filename)
-
     return result
 
 
@@ -149,8 +147,7 @@ def read_technodata_timeslices(filename: Union[str, Path]) -> xr.Dataset:
     data = csv[csv.technology != "Unit"]
 
     data = data.apply(to_numeric)
-    check_utilization_not_all_zero(data, filename)
-    check_minimum_service_factors_in_range(data, filename)
+    check_utilization_and_minimum_service_factors(data, filename)
 
     ts = pd.MultiIndex.from_frame(
         data.drop(
@@ -925,13 +922,18 @@ def read_finite_resources(path: Union[str, Path]) -> xr.DataArray:
     return xr.Dataset.from_dataframe(data).to_array(dim="commodity")
 
 
-def check_utilization_not_all_zero(data, filename):
+def check_utilization_and_minimum_service_factors(data, filename):
     if "utilization_factor" not in data.columns:
         raise ValueError(
             f"""A technology needs to have a utilization factor defined for every
              timeslice. Please check file {filename}."""
         )
 
+    _check_utilization_not_all_zero(data, filename)
+    _check_minimum_service_factors_in_range(data, filename)
+
+
+def _check_utilization_not_all_zero(data, filename):
     utilization_sum = data.groupby(["technology", "region", "year"]).sum()
 
     if (utilization_sum.utilization_factor == 0).any():
@@ -941,7 +943,7 @@ def check_utilization_not_all_zero(data, filename):
         )
 
 
-def check_minimum_service_factors_in_range(data, filename):
+def _check_minimum_service_factors_in_range(data, filename):
     try:
         min_service_factor = data["minimum_service_factor"]
     except KeyError:
diff --git a/tests/test_readers.py b/tests/test_readers.py
index e70c68f9..3d589275 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,5 +1,6 @@
 from itertools import chain, permutations
 from pathlib import Path
+from unittest.mock import patch
 
 import toml
 import xarray as xr
@@ -415,7 +416,7 @@ def test_read_trade_technodata(tmp_path):
 
 def test_check_utilization_not_all_zero_success():
     import pandas as pd
-    from muse.readers.csv import check_utilization_not_all_zero
+    from muse.readers.csv import _check_utilization_not_all_zero
 
     df = pd.DataFrame(
         {
@@ -425,12 +426,12 @@ def test_check_utilization_not_all_zero_success():
             "year": (2010, 2010, 2011),
         }
     )
-    check_utilization_not_all_zero(df, "file.csv")
+    _check_utilization_not_all_zero(df, "file.csv")
 
 
 def test_check_utilization_not_all_zero_fail_all_zero():
     import pandas as pd
-    from muse.readers.csv import check_utilization_not_all_zero
+    from muse.readers.csv import _check_utilization_not_all_zero
 
     df = pd.DataFrame(
         {
@@ -442,42 +443,25 @@ def test_check_utilization_not_all_zero_fail_all_zero():
     )
 
     with raises(ValueError):
-        check_utilization_not_all_zero(df, "file.csv")
-
-
-def test_check_utilization_not_all_zero_fail_missing_column():
-    import pandas as pd
-    from muse.readers.csv import check_utilization_not_all_zero
-
-    # NB: Required utilization_factor column is missing
-    df = pd.DataFrame(
-        {
-            "technology": ("gas", "gas", "solar"),
-            "region": ("GB", "GB", "FR"),
-            "year": (2010, 2010, 2011),
-        }
-    )
-
-    with raises(ValueError):
-        check_utilization_not_all_zero(df, "file.csv")
+        _check_utilization_not_all_zero(df, "file.csv")
 
 
 def test_check_minimum_service_factors_in_range_success():
     import pandas as pd
-    from muse.readers.csv import check_minimum_service_factors_in_range
+    from muse.readers.csv import _check_minimum_service_factors_in_range
 
     df = pd.DataFrame({"minimum_service_factor": (0, 1)})
-    check_minimum_service_factors_in_range(df, "file.csv")
+    _check_minimum_service_factors_in_range(df, "file.csv")
 
 
 def test_check_minimum_service_factors_in_range_column_missing():
     import pandas as pd
-    from muse.readers.csv import check_minimum_service_factors_in_range
+    from muse.readers.csv import _check_minimum_service_factors_in_range
 
     # If the minimum_service_factor column is missing, the function should just return
     # without raising an error
     df = pd.DataFrame()
-    check_minimum_service_factors_in_range(df, "file.csv")
+    _check_minimum_service_factors_in_range(df, "file.csv")
 
 
 @mark.parametrize(
@@ -485,9 +469,40 @@ def test_check_minimum_service_factors_in_range_column_missing():
 )
 def test_check_minimum_service_factors_in_range_fail(values):
     import pandas as pd
-    from muse.readers.csv import check_minimum_service_factors_in_range
+    from muse.readers.csv import _check_minimum_service_factors_in_range
 
     df = pd.DataFrame({"minimum_service_factor": values})
 
     with raises(ValueError):
-        check_minimum_service_factors_in_range(df, "file.csv")
+        _check_minimum_service_factors_in_range(df, "file.csv")
+
+
+@patch("muse.readers.csv._check_minimum_service_factors_in_range")
+@patch("muse.readers.csv._check_utilization_not_all_zero")
+def test_check_utilization_and_minimum_service_factors(*mocks):
+    import pandas as pd
+    from muse.readers.csv import check_utilization_and_minimum_service_factors
+
+    df = pd.DataFrame({"utilization_factor": (0, 0, 1)})
+    check_utilization_and_minimum_service_factors(df, "file.csv")
+    for mock in mocks:
+        mock.assert_called_once_with(df, "file.csv")
+
+
+@patch("muse.readers.csv._check_minimum_service_factors_in_range")
+@patch("muse.readers.csv._check_utilization_not_all_zero")
+def test_check_utilization_and_minimum_service_factors_missing_column(*mocks):
+    import pandas as pd
+    from muse.readers.csv import check_utilization_and_minimum_service_factors
+
+    # NB: Required utilization_factor column is missing
+    df = pd.DataFrame(
+        {
+            "technology": ("gas", "gas", "solar"),
+            "region": ("GB", "GB", "FR"),
+            "year": (2010, 2010, 2011),
+        }
+    )
+
+    with raises(ValueError):
+        check_utilization_and_minimum_service_factors(df, "file.csv")

From 593a43bc94d5f948ff6d070a0b9d717ab158b7b8 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 16:53:50 +0100
Subject: [PATCH 276/419] Check that utilisation factors are in range

---
 src/muse/readers/csv.py | 10 ++++++++++
 tests/test_readers.py   | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 699318f2..5cf80c2e 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -930,6 +930,7 @@ def check_utilization_and_minimum_service_factors(data, filename):
         )
 
     _check_utilization_not_all_zero(data, filename)
+    _check_utilization_in_range(data, filename)
     _check_minimum_service_factors_in_range(data, filename)
 
 
@@ -943,6 +944,15 @@ def _check_utilization_not_all_zero(data, filename):
         )
 
 
+def _check_utilization_in_range(data, filename):
+    utilization = data["utilization_factor"]
+    if not np.all((0 <= utilization) & (utilization <= 1)):
+        raise ValueError(
+            f"""Utilization factor values must all be between 0 and 1 inclusive.
+            Please check file {filename}."""
+        )
+
+
 def _check_minimum_service_factors_in_range(data, filename):
     try:
         min_service_factor = data["minimum_service_factor"]
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 3d589275..fdf00040 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -429,6 +429,26 @@ def test_check_utilization_not_all_zero_success():
     _check_utilization_not_all_zero(df, "file.csv")
 
 
+def test_check_utilization_in_range_success():
+    import pandas as pd
+    from muse.readers.csv import _check_utilization_in_range
+
+    df = pd.DataFrame({"utilization_factor": (0, 1)})
+    _check_utilization_in_range(df, "file.csv")
+
+
+@mark.parametrize(
+    "values", chain.from_iterable(permutations((0, bad)) for bad in (-1, 2))
+)
+def test_check_utilization_in_range_fail(values):
+    import pandas as pd
+    from muse.readers.csv import _check_utilization_in_range
+
+    df = pd.DataFrame({"utilization_factor": values})
+    with raises(ValueError):
+        _check_utilization_in_range(df, "file.csv")
+
+
 def test_check_utilization_not_all_zero_fail_all_zero():
     import pandas as pd
     from muse.readers.csv import _check_utilization_not_all_zero
@@ -478,6 +498,7 @@ def test_check_minimum_service_factors_in_range_fail(values):
 
 
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
+@patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
 def test_check_utilization_and_minimum_service_factors(*mocks):
     import pandas as pd
@@ -490,6 +511,7 @@ def test_check_utilization_and_minimum_service_factors(*mocks):
 
 
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
+@patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
 def test_check_utilization_and_minimum_service_factors_missing_column(*mocks):
     import pandas as pd

From 9f14629ea7e9e9229420e2464760d48cef2e08de Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 17:04:56 +0100
Subject: [PATCH 277/419] Do check for min service factor column in
 check_utilization_and_minimum_service_factors

---
 src/muse/readers/csv.py | 10 ++++------
 tests/test_readers.py   | 34 +++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 5cf80c2e..606f400f 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -931,7 +931,9 @@ def check_utilization_and_minimum_service_factors(data, filename):
 
     _check_utilization_not_all_zero(data, filename)
     _check_utilization_in_range(data, filename)
-    _check_minimum_service_factors_in_range(data, filename)
+
+    if "minimum_service_factor" in data.columns:
+        _check_minimum_service_factors_in_range(data, filename)
 
 
 def _check_utilization_not_all_zero(data, filename):
@@ -954,11 +956,7 @@ def _check_utilization_in_range(data, filename):
 
 
 def _check_minimum_service_factors_in_range(data, filename):
-    try:
-        min_service_factor = data["minimum_service_factor"]
-    except KeyError:
-        # Minimum service factor not specified, so we don't need to check it
-        return
+    min_service_factor = data["minimum_service_factor"]
 
     if not np.all((0 <= min_service_factor) & (min_service_factor <= 1)):
         raise ValueError(
diff --git a/tests/test_readers.py b/tests/test_readers.py
index fdf00040..7b59808f 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -474,16 +474,6 @@ def test_check_minimum_service_factors_in_range_success():
     _check_minimum_service_factors_in_range(df, "file.csv")
 
 
-def test_check_minimum_service_factors_in_range_column_missing():
-    import pandas as pd
-    from muse.readers.csv import _check_minimum_service_factors_in_range
-
-    # If the minimum_service_factor column is missing, the function should just return
-    # without raising an error
-    df = pd.DataFrame()
-    _check_minimum_service_factors_in_range(df, "file.csv")
-
-
 @mark.parametrize(
     "values", chain.from_iterable(permutations((0, bad)) for bad in (-1, 2))
 )
@@ -497,23 +487,41 @@ def test_check_minimum_service_factors_in_range_fail(values):
         _check_minimum_service_factors_in_range(df, "file.csv")
 
 
-@patch("muse.readers.csv._check_minimum_service_factors_in_range")
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
+@patch("muse.readers.csv._check_minimum_service_factors_in_range")
 def test_check_utilization_and_minimum_service_factors(*mocks):
     import pandas as pd
     from muse.readers.csv import check_utilization_and_minimum_service_factors
 
-    df = pd.DataFrame({"utilization_factor": (0, 0, 1)})
+    df = pd.DataFrame(
+        {"utilization_factor": (0, 0, 1), "minimum_service_factor": (0, 0, 0)}
+    )
     check_utilization_and_minimum_service_factors(df, "file.csv")
     for mock in mocks:
         mock.assert_called_once_with(df, "file.csv")
 
 
+@patch("muse.readers.csv._check_utilization_in_range")
+@patch("muse.readers.csv._check_utilization_not_all_zero")
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
+def test_check_utilization_and_minimum_service_factors_no_min(
+    min_service_factor_mock, *mocks
+):
+    import pandas as pd
+    from muse.readers.csv import check_utilization_and_minimum_service_factors
+
+    df = pd.DataFrame({"utilization_factor": (0, 0, 1)})
+    check_utilization_and_minimum_service_factors(df, "file.csv")
+    for mock in mocks:
+        mock.assert_called_once_with(df, "file.csv")
+    min_service_factor_mock.assert_not_called()
+
+
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
-def test_check_utilization_and_minimum_service_factors_missing_column(*mocks):
+@patch("muse.readers.csv._check_minimum_service_factors_in_range")
+def test_check_utilization_and_minimum_service_factors_fail_missing_utilization(*mocks):
     import pandas as pd
     from muse.readers.csv import check_utilization_and_minimum_service_factors
 

From 5dba9f248327f3e6838230f2dd1d2ab5ee449ebc Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 17:18:13 +0100
Subject: [PATCH 278/419] Check whether utilization factors are below minimums

---
 src/muse/readers/csv.py |  8 ++++++++
 tests/test_readers.py   | 25 ++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 606f400f..bc63f991 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -934,6 +934,7 @@ def check_utilization_and_minimum_service_factors(data, filename):
 
     if "minimum_service_factor" in data.columns:
         _check_minimum_service_factors_in_range(data, filename)
+        _check_utilization_not_below_minimum(data, filename)
 
 
 def _check_utilization_not_all_zero(data, filename):
@@ -955,6 +956,13 @@ def _check_utilization_in_range(data, filename):
         )
 
 
+def _check_utilization_not_below_minimum(data, filename):
+    if (data["utilization_factor"] < data["minimum_service_factor"]).any():
+        raise ValueError(f"""Utilization factors must all be greater than or equal to
+                          their corresponding minimum service factors. Please check
+                         {filename}.""")
+
+
 def _check_minimum_service_factors_in_range(data, filename):
     min_service_factor = data["minimum_service_factor"]
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 7b59808f..0cec9c02 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -449,6 +449,25 @@ def test_check_utilization_in_range_fail(values):
         _check_utilization_in_range(df, "file.csv")
 
 
+def test_check_utilization_not_below_minimum_success():
+    import pandas as pd
+    from muse.readers.csv import _check_utilization_not_below_minimum
+
+    df = pd.DataFrame({"utilization_factor": (0, 1), "minimum_service_factor": (0, 0)})
+    _check_utilization_not_below_minimum(df, "file.csv")
+
+
+def test_check_utilization_not_below_minimum_fail():
+    import pandas as pd
+    from muse.readers.csv import _check_utilization_not_below_minimum
+
+    df = pd.DataFrame(
+        {"utilization_factor": (0, 1), "minimum_service_factor": (0.1, 0)}
+    )
+    with raises(ValueError):
+        _check_utilization_not_below_minimum(df, "file.csv")
+
+
 def test_check_utilization_not_all_zero_fail_all_zero():
     import pandas as pd
     from muse.readers.csv import _check_utilization_not_all_zero
@@ -489,6 +508,7 @@ def test_check_minimum_service_factors_in_range_fail(values):
 
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
+@patch("muse.readers.csv._check_utilization_not_below_minimum")
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
 def test_check_utilization_and_minimum_service_factors(*mocks):
     import pandas as pd
@@ -504,9 +524,10 @@ def test_check_utilization_and_minimum_service_factors(*mocks):
 
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
+@patch("muse.readers.csv._check_utilization_not_below_minimum")
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
 def test_check_utilization_and_minimum_service_factors_no_min(
-    min_service_factor_mock, *mocks
+    min_service_factor_mock, utilization_below_min_mock, *mocks
 ):
     import pandas as pd
     from muse.readers.csv import check_utilization_and_minimum_service_factors
@@ -516,10 +537,12 @@ def test_check_utilization_and_minimum_service_factors_no_min(
     for mock in mocks:
         mock.assert_called_once_with(df, "file.csv")
     min_service_factor_mock.assert_not_called()
+    utilization_below_min_mock.assert_not_called()
 
 
 @patch("muse.readers.csv._check_utilization_in_range")
 @patch("muse.readers.csv._check_utilization_not_all_zero")
+@patch("muse.readers.csv._check_utilization_not_below_minimum")
 @patch("muse.readers.csv._check_minimum_service_factors_in_range")
 def test_check_utilization_and_minimum_service_factors_fail_missing_utilization(*mocks):
     import pandas as pd

From 78c9b7f14a738f638d2ddbcdfb834e0f86c4bce1 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Thu, 20 Jun 2024 17:32:27 +0100
Subject: [PATCH 279/419] Replace test_minimum_service_factor_invalid_input
 with mocking

---
 tests/test_minimum_service.py | 41 +++++------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 89c7bc09..5188517f 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -1,7 +1,8 @@
-from itertools import chain, permutations
+from itertools import permutations
+from unittest.mock import patch
 
 import numpy as np
-from pytest import mark, raises
+from pytest import mark
 
 
 def modify_minimum_service_factors(
@@ -25,7 +26,8 @@ def modify_minimum_service_factors(
     "minimum_service_factors",
     permutations((np.linspace(0, 1, 6), [0] * 6)),
 )
-def test_minimum_service_factor(tmpdir, minimum_service_factors):
+@patch("muse.readers.csv.check_utilization_and_minimum_service_factors")
+def test_minimum_service_factor(check_mock, tmpdir, minimum_service_factors):
     import pandas as pd
     from muse import examples
     from muse.mca import MCA
@@ -51,6 +53,7 @@ def test_minimum_service_factor(tmpdir, minimum_service_factors):
 
     with tmpdir.as_cwd():
         MCA.factory(model_path / "settings.toml").run()
+    check_mock.assert_called_once()
 
     supply_timeslice = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
 
@@ -64,35 +67,3 @@ def test_minimum_service_factor(tmpdir, minimum_service_factors):
                 ].supply
                 >= factor
             ).all()
-
-
-@mark.parametrize(
-    "minimum_service_factors",
-    chain.from_iterable(map(permutations, ((-1, 0), (2, 0), (float("nan"), 0)))),
-)
-def test_minimum_service_factor_invalid_input(tmpdir, minimum_service_factors):
-    from muse import examples
-    from muse.mca import MCA
-
-    sector = "power"
-    processes = ("gasCCGT", "windturbine")
-
-    # Copy the model inputs to tmpdir
-    model_path = examples.copy_model(
-        name="default_timeslice", path=tmpdir, overwrite=True
-    )
-
-    technodata_timeslices = modify_minimum_service_factors(
-        model_path=model_path,
-        sector=sector,
-        processes=processes,
-        minimum_service_factors=minimum_service_factors,
-    )
-
-    technodata_timeslices.to_csv(
-        model_path / "technodata" / sector / "TechnodataTimeslices.csv", index=False
-    )
-
-    with raises(ValueError):
-        with tmpdir.as_cwd():
-            MCA.factory(model_path / "settings.toml").run()

From 013d6a4650daaf68abe4c2aa29a5eba7f0be1d12 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Fri, 21 Jun 2024 11:57:38 +0100
Subject: [PATCH 280/419] Fix: Check may be run more than once

---
 tests/test_minimum_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 5188517f..4efe8a7e 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -53,7 +53,7 @@ def test_minimum_service_factor(check_mock, tmpdir, minimum_service_factors):
 
     with tmpdir.as_cwd():
         MCA.factory(model_path / "settings.toml").run()
-    check_mock.assert_called_once()
+    check_mock.assert_called()
 
     supply_timeslice = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
 

From b444f6807300260dfa99f221008789333bfbef96 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Fri, 21 Jun 2024 12:34:48 +0100
Subject: [PATCH 281/419] Fix minimum_service example: Reduce utilization
 factor to be less than minimum

Fixes #362.
---
 .../example/minimum_service/technodata/industry/Technodata.csv  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv b/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
index 1822d785..ca9f1de4 100644
--- a/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
+++ b/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
@@ -1,6 +1,6 @@
 ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent2,Type,Fuel,MinimumServiceFactor,Enduse
 Unit,-,Year,-,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,Retrofit,-,-,-,-
 procammonia_1,R1,2010,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.01,ammonia
-procammonia_1,R1,2050,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.9,ammonia
+procammonia_1,R1,2050,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.85,ammonia
 procammonia_2,R1,2010,fixed,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia
 procammonia_2,R1,2050,fixed,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia

From 8c8cbbb680f6dc0657176185562cdb0b3400b006 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 14:11:19 +0100
Subject: [PATCH 282/419] Fix one more bar chart

---
 docs/user-guide/add-solar.ipynb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index fa6d4d47..913f18a0 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -347,11 +347,12 @@
    "outputs": [],
    "source": [
     "fig, axes = plt.subplots(1, 3)\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
     "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
-    "    sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
-    "        kind=\"bar\", stacked=True, ax=ax\n",
-    "    )\n",
+    "    sector_capacity.pivot(\n",
+    "        index=\"year\", columns=\"technology\", values=\"capacity\"\n",
+    "    ).reindex(all_years).plot(kind=\"bar\", stacked=True, ax=ax)\n",
     "    ax.set_ylabel(\"Capacity (PJ)\")\n",
     "    ax.set_xlabel(\"Year\")\n",
     "    ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
@@ -444,9 +445,9 @@
     "mca_capacity = pd.read_csv(\n",
     "    \"../tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv\"\n",
     ")\n",
-    "all_years = mca_capacity[\"year\"].unique()\n",
     "\n",
     "fig, axes = plt.subplots(1, 3)\n",
+    "all_years = mca_capacity[\"year\"].unique()\n",
     "for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
     "    sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
     "    sector_capacity.pivot(\n",

From 3ed9e41644fe238d9c3812b4dceca281fc62eabd Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 14:35:12 +0100
Subject: [PATCH 283/419] Address failing test for add_agent

---
 src/muse/wizard.py | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 17e328d8..37c199ed 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -150,35 +150,46 @@ def add_agent(
             the new agent will not have a 'retrofit' share.
     """
     agents_file = model_path / "technodata/Agents.csv"
-    df = pd.read_csv(agents_file)
+    agents_df = pd.read_csv(agents_file)
 
+    # Create mapping between share names
     copy_to_shares = {"New": agentshare_new, "Retrofit": agentshare_retrofit}
     copy_from_shares = {}
     for share_type in ["New", "Retrofit"]:
-        filtered_df = df.loc[
-            (df["Name"] == copy_from) & (df["Type"] == share_type), "AgentShare"
+        filtered_df = agents_df.loc[
+            (agents_df["Name"] == copy_from) & (agents_df["Type"] == share_type),
+            "AgentShare",
         ]
         copy_from_shares[share_type] = (
             filtered_df.iat[0] if not filtered_df.empty else None
         )
 
+    # Update agents file
+    for share_type in ["New", "Retrofit"]:
         if copy_to_shares[share_type] and copy_from_shares[share_type]:
-            rows = df[
-                (df["Name"] == copy_from)
-                & (df["AgentShare"] == copy_from_shares[share_type])
+            rows = agents_df[
+                (agents_df["Name"] == copy_from)
+                & (agents_df["AgentShare"] == copy_from_shares[share_type])
             ].copy()
             rows["Name"] = agent_name
             rows["AgentShare"] = copy_to_shares[share_type]
-            df = pd.concat([df, rows])
-    df.to_csv(agents_file, index=False)
+            agents_df = pd.concat([agents_df, rows])
+    agents_df.to_csv(agents_file, index=False)
 
+    # Update technodata files for each sector
     for sector in get_sectors(model_path):
         technodata_file = model_path / f"technodata/{sector}/Technodata.csv"
-        df = pd.read_csv(technodata_file)
+        technodata_df = pd.read_csv(technodata_file)
         for share_type in ["New", "Retrofit"]:
-            if copy_to_shares[share_type] and copy_from_shares[share_type]:
-                df[copy_to_shares[share_type]] = df[copy_from_shares[share_type]]
-        df.to_csv(technodata_file, index=False)
+            if (
+                copy_to_shares[share_type]
+                and copy_from_shares[share_type]
+                and copy_to_shares[share_type] in technodata_df.columns
+            ):
+                technodata_df[copy_to_shares[share_type]] = technodata_df[
+                    copy_from_shares[share_type]
+                ]
+        technodata_df.to_csv(technodata_file, index=False)
 
 
 def add_region(model_path: Path, region_name: str, copy_from: str) -> None:

From 348bd15c4e6060435de0f3cc19c58a820360f37c Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Tue, 18 Jun 2024 16:21:02 +0100
Subject: [PATCH 284/419] Expand test_read_trade_technodata to additional
 dataset attributes

---
 tests/test_readers.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index ddf98627..b6721f69 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,5 +1,6 @@
 from pathlib import Path
 
+import numpy as np
 import toml
 import xarray as xr
 from pytest import fixture, mark, raises
@@ -410,3 +411,8 @@ def test_read_trade_technodata(tmp_path):
         "max_capacity_growth",
         "total_capacity_limit",
     }
+    assert all(val == np.float64 for val in data.dtypes.values())
+    assert list(data.coords["dst_region"].values) == ["R1", "R2"]
+    assert list(data.coords["technology"].values) == ["gassupply1"]
+    assert list(data.coords["region"].values) == ["R1", "R2", "R3"]
+    assert all(var.coords.equals(data.coords) for var in data.data_vars.values())

From ff002b4feb2cbab2d4e3f806be3dcaa7a34a6ffd Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Tue, 18 Jun 2024 16:46:58 +0100
Subject: [PATCH 285/419] Expand test_read_existing_trade

---
 tests/test_readers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index b6721f69..e35f19d5 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -390,6 +390,10 @@ def test_read_existing_trade(tmp_path):
 
     assert isinstance(data, xr.DataArray)
     assert set(data.dims) == {"year", "technology", "dst_region", "region"}
+    assert list(data.coords["year"].values) == [2010, 2020, 2030, 2040, 2050]
+    assert list(data.coords["technology"].values) == ["gassupply1"]
+    assert list(data.coords["dst_region"].values) == ["R1", "R2"]
+    assert list(data.coords["region"].values) == ["R1", "R2"]
 
 
 def test_read_trade_technodata(tmp_path):

From 9ca8fb442f9b6333c86fdcaee7fd75a838e287ff Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 14:59:29 +0100
Subject: [PATCH 286/419] Add test_read_technodictionary

---
 tests/test_readers.py | 48 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index e35f19d5..834749b5 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -420,3 +420,51 @@ def test_read_trade_technodata(tmp_path):
     assert list(data.coords["technology"].values) == ["gassupply1"]
     assert list(data.coords["region"].values) == ["R1", "R2", "R3"]
     assert all(var.coords.equals(data.coords) for var in data.data_vars.values())
+
+
+@fixture
+def default_model(tmp_path):
+    from muse.examples import copy_model
+
+    copy_model("default", tmp_path)
+    return tmp_path / "model"
+
+
+def test_read_technodictionary(default_model):
+    from muse.readers.csv import read_technodictionary
+
+    path = default_model / "technodata" / "residential" / "Technodata.csv"
+    data = read_technodictionary(path)
+    assert isinstance(data, xr.Dataset)
+    assert set(data.dims) == {"technology", "region"}
+
+    assert dict(data.dtypes) == dict(
+        level=np.dtype("O"),
+        cap_par=np.dtype("float64"),
+        cap_exp=np.dtype("int64"),
+        fix_par=np.dtype("int64"),
+        fix_exp=np.dtype("int64"),
+        var_par=np.dtype("int64"),
+        interest_rate=np.dtype("float64"),
+        type=np.dtype("O"),
+        fuel=np.dtype("<U11"),
+        enduse=np.dtype("<U4"),
+        agent_share_2=np.dtype("int64"),
+        tech_type=np.dtype("<U6"),
+        efficiency=np.dtype("int64"),
+        max_capacity_addition=np.dtype("int64"),
+        max_capacity_growth=np.dtype("float64"),
+        scaling_size=np.dtype("float64"),
+        technical_life=np.dtype("int64"),
+        total_capacity_limit=np.dtype("int64"),
+        utilization_factor=np.dtype("int64"),
+        var_exp=np.dtype("int64"),
+    )
+    assert list(data.coords["technology"].values) == ["gasboiler", "heatpump"]
+    assert list(data.coords["region"].values) == ["R1"]
+
+    for var in data.data_vars:
+        if var in ("fuel", "enduse", "tech_type"):
+            assert list(data.data_vars[var].coords) == ["technology"]
+        else:
+            assert data.data_vars[var].coords.equals(data.coords)

From 1bc938f6a01b16de18c3c6b22996c757f54a464d Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:01:33 +0100
Subject: [PATCH 287/419] Add test_read_technodata_timeslices

---
 tests/test_readers.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 834749b5..dec37ffa 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -468,3 +468,39 @@ def test_read_technodictionary(default_model):
             assert list(data.data_vars[var].coords) == ["technology"]
         else:
             assert data.data_vars[var].coords.equals(data.coords)
+
+
+def test_read_technodata_timeslices(tmp_path):
+    from muse.examples import copy_model
+    from muse.readers.csv import read_technodata_timeslices
+
+    copy_model("default_timeslice", tmp_path)
+    path = tmp_path / "model" / "technodata" / "power" / "TechnodataTimeslices.csv"
+    data = read_technodata_timeslices(path)
+
+    assert isinstance(data, xr.Dataset)
+    assert set(data.dims) == {"technology", "region", "year", "timeslice"}
+    assert dict(data.dtypes) == dict(
+        utilization_factor=np.int64,
+        minimum_service_factor=np.int64,
+    )
+    assert list(data.coords["technology"].values) == ["gasCCGT", "windturbine"]
+    assert list(data.coords["region"].values) == ["R1"]
+    assert list(data.coords["year"].values) == [2020]
+    month_values = ["all-year"] * 6
+    day_values = ["all-week"] * 6
+    hour_values = [
+        "afternoon",
+        "early-peak",
+        "evening",
+        "late-peak",
+        "morning",
+        "night",
+    ]
+
+    assert list(data.coords["timeslice"].values) == list(
+        zip(month_values, day_values, hour_values)
+    )
+    assert list(data.coords["month"]) == month_values
+    assert list(data.coords["day"]) == day_values
+    assert list(data.coords["hour"]) == hour_values

From 74526f7a3d29390c860eed926dd6a5767bfbc9bc Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:01:46 +0100
Subject: [PATCH 288/419] Add test_read_io_technodata

---
 tests/test_readers.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index dec37ffa..be2aebfc 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -504,3 +504,30 @@ def test_read_technodata_timeslices(tmp_path):
     assert list(data.coords["month"]) == month_values
     assert list(data.coords["day"]) == day_values
     assert list(data.coords["hour"]) == hour_values
+
+
+def test_read_io_technodata(default_model):
+    from muse.readers.csv import read_io_technodata
+
+    path = default_model / "technodata" / "residential" / "CommOut.csv"
+    data = read_io_technodata(path)
+
+    assert isinstance(data, xr.Dataset)
+    assert set(data.dims) == {"technology", "region", "year", "commodity"}
+    assert dict(data.dtypes) == dict(
+        fixed=np.float64, flexible=np.float64, commodity_units=np.dtype("O")
+    )
+    assert list(data.coords["technology"].values) == ["gasboiler", "heatpump"]
+    assert list(data.coords["region"].values) == ["R1"]
+    assert list(data.coords["year"].values) == [2020]
+    assert list(data.coords["commodity"].values) == [
+        "electricity",
+        "gas",
+        "heat",
+        "CO2f",
+        "wind",
+    ]
+
+    assert data.data_vars["fixed"].coords.equals(data.coords)
+    assert data.data_vars["flexible"].coords.equals(data.coords)
+    assert list(data.data_vars["commodity_units"].coords) == ["commodity"]

From 9f16f92fde34092794c9e876fba4cb546ed233f2 Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:01:59 +0100
Subject: [PATCH 289/419] Add test_read_initial_assets

---
 tests/test_readers.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index be2aebfc..66bcfeda 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -531,3 +531,19 @@ def test_read_io_technodata(default_model):
     assert data.data_vars["fixed"].coords.equals(data.coords)
     assert data.data_vars["flexible"].coords.equals(data.coords)
     assert list(data.data_vars["commodity_units"].coords) == ["commodity"]
+
+
+def test_read_initial_assets(default_model):
+    from muse.readers.csv import read_initial_assets
+
+    path = default_model / "technodata" / "residential" / "ExistingCapacity.csv"
+    data = read_initial_assets(path)
+
+    assert isinstance(data, xr.DataArray)
+    assert set(data.dims) == {"region", "asset", "year"}
+    assert data.dtype == np.int64
+
+    assert list(data.coords["region"].values) == ["R1"]
+    assert list(data.coords["technology"].values) == ["gasboiler", "heatpump"]
+    assert list(data.coords["installed"].values) == [2020, 2020]
+    assert list(data.coords["year"].values) == list(range(2020, 2055, 5))

From 3603329cb0076d1113094d44a868c55a95d53395 Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:02:10 +0100
Subject: [PATCH 290/419] Add test_glob_commodities

---
 tests/test_readers.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 66bcfeda..a9da4abd 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -547,3 +547,29 @@ def test_read_initial_assets(default_model):
     assert list(data.coords["technology"].values) == ["gasboiler", "heatpump"]
     assert list(data.coords["installed"].values) == [2020, 2020]
     assert list(data.coords["year"].values) == list(range(2020, 2055, 5))
+
+
+def test_global_commodities(default_model):
+    from muse.readers.csv import read_global_commodities
+
+    path = default_model / "input" / "GlobalCommodities.csv"
+    data = read_global_commodities(path)
+
+    assert isinstance(data, xr.Dataset)
+    assert set(data.dims) == {"commodity"}
+    assert dict(data.dtypes) == dict(
+        comm_name=np.dtype("O"),
+        comm_type=np.dtype("O"),
+        emmission_factor=np.float64,
+        heat_rate=np.int64,
+        unit=np.dtype("O"),
+    )
+
+    assert list(data.coords["commodity"].values) == [
+        "electricity",
+        "gas",
+        "heat",
+        "wind",
+        "CO2f",
+    ]
+    assert all(var.coords.equals(data.coords) for var in data.data_vars.values())

From eff7af7bff19210431c5f517f0650228c7a10cc3 Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:02:22 +0100
Subject: [PATCH 291/419] Add test_read_csv_agent_parameters

---
 tests/test_readers.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index a9da4abd..56831e9f 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -573,3 +573,37 @@ def test_global_commodities(default_model):
         "CO2f",
     ]
     assert all(var.coords.equals(data.coords) for var in data.data_vars.values())
+
+
+def test_read_csv_agent_parameters(default_model):
+    from muse.readers.csv import read_csv_agent_parameters
+
+    path = default_model / "technodata" / "Agents.csv"
+    data = read_csv_agent_parameters(path)
+
+    assert data == [
+        {
+            "name": "A1",
+            "region": "R1",
+            "objectives": ["LCOE"],
+            "search_rules": "all",
+            "decision": {"name": "singleObj", "parameters": [("LCOE", True, 1)]},
+            "agent_type": "newcapa",
+            "quantity": 1,
+            "maturity_threshhold": -1,
+            "spend_limit": np.inf,
+            "share": "agent_share_1",
+        },
+        {
+            "name": "A1",
+            "region": "R1",
+            "objectives": ["LCOE"],
+            "search_rules": "all",
+            "decision": {"name": "singleObj", "parameters": [("LCOE", True, 1)]},
+            "agent_type": "retrofit",
+            "quantity": 1,
+            "maturity_threshhold": -1,
+            "spend_limit": np.inf,
+            "share": "agent_share_2",
+        },
+    ]

From 3a8ced99107441e8f01a87dc88b2cd16c1abb730 Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:02:41 +0100
Subject: [PATCH 292/419] Add test_read_initial_market

---
 tests/test_readers.py | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 56831e9f..e2bc08d9 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -607,3 +607,53 @@ def test_read_csv_agent_parameters(default_model):
             "share": "agent_share_2",
         },
     ]
+
+
+def test_read_initial_market(default_model):
+    from muse.readers.csv import read_initial_market
+    from muse.readers.toml import read_settings
+
+    settings = read_settings(default_model / "settings.toml")
+    path = default_model / "input" / "Projections.csv"
+    data = read_initial_market(path, timeslices=settings.timeslices)
+
+    assert isinstance(data, xr.Dataset)
+    assert set(data.dims) == {"region", "year", "commodity", "timeslice"}
+    assert dict(data.dtypes) == dict(
+        prices=np.float64,
+        exports=np.float64,
+        imports=np.float64,
+        static_trade=np.float64,
+    )
+    assert list(data.coords["region"].values) == ["R1"]
+    assert list(data.coords["year"].values) == list(range(2010, 2105, 5))
+    assert list(data.coords["commodity"].values) == [
+        "electricity",
+        "gas",
+        "heat",
+        "CO2f",
+        "wind",
+    ]
+    assert (
+        list(data.coords["units_prices"].values)
+        == ["MUS$2010/PJ"] * 3 + ["MUS$2010/kt"] * 2
+    )
+    month_values = ["all-year"] * 6
+    day_values = ["all-week"] * 6
+    hour_values = [
+        "night",
+        "morning",
+        "afternoon",
+        "early-peak",
+        "late-peak",
+        "evening",
+    ]
+
+    assert list(data.coords["timeslice"].values) == list(
+        zip(month_values, day_values, hour_values)
+    )
+    assert list(data.coords["month"]) == month_values
+    assert list(data.coords["day"]) == day_values
+    assert list(data.coords["hour"]) == hour_values
+
+    assert all(var.coords.equals(data.coords) for var in data.data_vars.values())

From ec1e1d7adb91cd1126046245196232e97bd432be Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:02:59 +0100
Subject: [PATCH 293/419] Add test_read_attribute_table

---
 tests/test_readers.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index e2bc08d9..be59c2b5 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -657,3 +657,28 @@ def test_read_initial_market(default_model):
     assert list(data.coords["hour"]) == hour_values
 
     assert all(var.coords.equals(data.coords) for var in data.data_vars.values())
+
+
+def test_read_attribute_table(default_model):
+    from muse.readers.csv import read_attribute_table
+
+    path = default_model / "input" / "Projections.csv"
+    data = read_attribute_table(path)
+
+    assert isinstance(data, xr.DataArray)
+    assert data.dtype == np.float64
+
+    assert set(data.dims) == {"region", "year", "commodity"}
+    assert list(data.coords["region"].values) == ["R1"]
+    assert list(data.coords["year"].values) == list(range(2010, 2105, 5))
+    assert list(data.coords["commodity"].values) == [
+        "electricity",
+        "gas",
+        "heat",
+        "CO2f",
+        "wind",
+    ]
+    assert (
+        list(data.coords["units_commodity_price"].values)
+        == ["MUS$2010/PJ"] * 3 + ["MUS$2010/kt"] * 2
+    )

From 88b82853d267f9bc2f0d2f4f79d78133eb2b9787 Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 24 Jun 2024 15:03:14 +0100
Subject: [PATCH 294/419] Add test_read_csv_outputs

---
 tests/test_readers.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index be59c2b5..e8563fc3 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -682,3 +682,26 @@ def test_read_attribute_table(default_model):
         list(data.coords["units_commodity_price"].values)
         == ["MUS$2010/PJ"] * 3 + ["MUS$2010/kt"] * 2
     )
+
+
+def test_read_csv_outputs(default_model):
+    from muse.readers.csv import read_csv_outputs
+
+    path = default_model / "technodata" / "preset" / "*Consumption.csv"
+    data = read_csv_outputs(str(path))
+
+    assert isinstance(data, xr.DataArray)
+    assert data.dtype == np.float64
+
+    assert set(data.dims) == {"year", "commodity", "region", "process", "timeslice"}
+    assert list(data.coords["region"].values) == ["R1"]
+    assert list(data.coords["process"].values) == ["gasboiler"]
+    assert list(data.coords["timeslice"].values) == list(range(1, 7))
+    assert list(data.coords["year"].values) == [2020, 2050]
+    assert list(data.coords["commodity"].values) == [
+        "electricity",
+        "gas",
+        "heat",
+        "CO2f",
+        "wind",
+    ]

From 6c7cd6f2d2dd48e87042c5768bfcffaa82747c45 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 15:30:03 +0100
Subject: [PATCH 295/419] Add debug config for default_retro

---
 .vscode/launch.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8efb5126..0093f157 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,6 +11,13 @@
             "module": "muse",
             "args": ["--model", "default"]
         },
+        {
+            "name": "Model: default_retro",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "muse",
+            "args": ["--model", "default_retro"]
+        },
         {
             "name": "Model: multiple_agents",
             "type": "debugpy",

From e2a3739500a56dda640611b5de2c67da3156f212 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 16:15:55 +0100
Subject: [PATCH 296/419] Actually fix wizzard test

---
 src/muse/wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 0bd243de..37bea903 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -184,7 +184,7 @@ def add_agent(
             if (
                 copy_to_shares[share_type]
                 and copy_from_shares[share_type]
-                and copy_to_shares[share_type] in technodata_df.columns
+                and copy_from_shares[share_type] in technodata_df.columns
             ):
                 technodata_df[copy_to_shares[share_type]] = technodata_df[
                     copy_from_shares[share_type]

From e3af6279f03fb01f2a985bf8dc8526161f40b630 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 16:23:30 +0100
Subject: [PATCH 297/419] Fix test_factory_constraints_passed_to_agents

---
 tests/test_subsector.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/test_subsector.py b/tests/test_subsector.py
index 07deba40..9c326f1f 100644
--- a/tests/test_subsector.py
+++ b/tests/test_subsector.py
@@ -146,7 +146,7 @@ def test_factory_constraints_passed_to_agents(model, technologies, tmp_path):
     settings = read_settings(tmp_path / "model" / "settings.toml")
 
     # The constraints in the settings are not none
-    assert len(settings.sectors.residential.subsectors.retro_and_new.constraints) > 0
+    assert len(settings.sectors.residential.subsectors.all.constraints) > 0
 
     class BreakException(Exception):
         pass
@@ -160,20 +160,16 @@ def agent_factory(*args, **kwargs):
     # We asses they are indeed passed to the agents factory
     with patch("muse.agents.agents_factory", new=agent_factory):
         with raises(BreakException):
-            Subsector.factory(
-                settings.sectors.residential.subsectors.retro_and_new, technologies
-            )
+            Subsector.factory(settings.sectors.residential.subsectors.all, technologies)
         assert (
             _withness.call_args[1]["constraints"]
-            == settings.sectors.residential.subsectors.retro_and_new.constraints
+            == settings.sectors.residential.subsectors.all.constraints
         )
 
     # But if there are no constraints, we pass an empty tuple
-    settings.sectors.residential.subsectors.retro_and_new.constraints.clear()
+    settings.sectors.residential.subsectors.all.constraints.clear()
     _withness.reset_mock()
     with patch("muse.agents.agents_factory", new=agent_factory):
         with raises(BreakException):
-            Subsector.factory(
-                settings.sectors.residential.subsectors.retro_and_new, technologies
-            )
+            Subsector.factory(settings.sectors.residential.subsectors.all, technologies)
         assert tuple(_withness.call_args[1]["constraints"]) == ()

From f2402969e3f25e4a824892490ab7671052bb782e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 16:30:34 +0100
Subject: [PATCH 298/419] Fix 3.9 error with |

---
 src/muse/wizard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/muse/wizard.py b/src/muse/wizard.py
index 37bea903..28b55513 100644
--- a/src/muse/wizard.py
+++ b/src/muse/wizard.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from itertools import chain
 from pathlib import Path

From b9b74becec0153398259cc44ed844d2e0a95ebd0 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 24 Jun 2024 16:51:48 +0100
Subject: [PATCH 299/419] Fix constraints tests

---
 src/muse/constraints.py   | 6 +++---
 tests/test_constraints.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 81f76b25..f88999e4 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -737,7 +737,7 @@ def lp_constraint_matrix(
          >>> technologies = res.technologies
          >>> market = examples.residential_market("medium")
          >>> search = examples.search_space("residential", model="medium")
-         >>> assets = next(a.assets for a in res.agents if a.category == "retrofit")
+         >>> assets = next(a.assets for a in res.agents)
          >>> demand = None # not used in max production
          >>> constraint = cs.max_production(demand, assets, search, market,
          ...                                technologies) # noqa: E501
@@ -874,7 +874,7 @@ class ScipyAdapter:
         >>> res = examples.sector("residential", model="medium")
         >>> market = examples.residential_market("medium")
         >>> search = examples.search_space("residential", model="medium")
-        >>> assets = next(a.assets for a in res.agents if a.category == "retrofit")
+        >>> assets = next(a.assets for a in res.agents)
         >>> market_demand =  0.8 * maximum_production(
         ...     res.technologies.interp(year=2025),
         ...     convert_timeslice(
@@ -902,7 +902,7 @@ class ScipyAdapter:
         but not over the assets. Hence the assets will be summed over in the final
         constraint:
 
-        >>> assert (constraint.b.data == np.array([50.0, 3.0, 3.0, 50.0 ])).all()
+        >>> assert (constraint.b.data == np.array([50.0, 12.0, 12.0, 50.0 ])).all()
         >>> assert set(constraint.b.dims) == {"replacement"}
         >>> assert constraint.kind == cs.ConstraintKind.UPPER_BOUND
 
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index e88149ed..c6feaee4 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -65,7 +65,7 @@ def lpcosts(technologies, market, costs):
 
 @fixture
 def assets(residential):
-    return next(a.assets for a in residential.agents if a.category == "retrofit")
+    return next(a.assets for a in residential.agents)
 
 
 @fixture
@@ -479,7 +479,7 @@ def test_max_capacity_expansion(max_capacity_expansion):
     assert max_capacity_expansion.production == 0
     assert max_capacity_expansion.b.dims == ("replacement",)
     assert max_capacity_expansion.b.shape == (4,)
-    assert max_capacity_expansion.b.values == approx([50, 3, 3, 50])
+    assert max_capacity_expansion.b.values == approx([50, 12, 12, 50])
     assert (
         max_capacity_expansion.replacement
         == ["estove", "gasboiler", "gasstove", "heatpump"]

From 7dafe83653f910de55548ca9b9957f5bfd07575a Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 17:03:00 +0000
Subject: [PATCH 300/419] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.9 → v0.4.10](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.9...v0.4.10)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0d4ea329..7a496e27 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.9
+    rev: v0.4.10
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]

From 650b2fc7f5b9822e05616cb8f326a551960175a6 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 25 Jun 2024 08:41:59 +0100
Subject: [PATCH 301/419] Regenerate settings files

---
 .../1-add-new-technology/1-introduction/settings.toml          | 3 ++-
 .../1-add-new-technology/2-scenario/settings.toml              | 3 ++-
 .../tutorial-code/2-add-agent/1-single-objective/settings.toml | 3 ++-
 .../2-add-agent/2-multiple-objective/settings.toml             | 3 ++-
 docs/tutorial-code/3-add-region/1-new-region/settings.toml     | 3 ++-
 .../4-modify-timing-data/1-modify-timeslices/settings.toml     | 3 ++-
 .../4-modify-timing-data/2-modify-time-framework/settings.toml | 3 ++-
 .../5-add-service-demand/1-exogenous-demand/settings.toml      | 3 ++-
 .../6-add-correlation-demand/1-correlation/settings.toml       | 3 ++-
 .../1-min-constraint/settings.toml                             | 3 ++-
 .../2-max-constraint/settings.toml                             | 3 ++-
 11 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index cee71eb4..44c1a83d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index cee71eb4..44c1a83d 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index cee71eb4..44c1a83d 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index cee71eb4..44c1a83d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index dc7a348b..d961c0c2 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index f2ae7a99..6f56de86 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 6dfed239..59ebdf63 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 2  # Optional, defaults to 5
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index f2ae7a99..6f56de86 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 4f1952a5..44e775fa 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index fff47e65..254dba3e 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -61,7 +61,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index fff47e65..254dba3e 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -61,7 +61,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "standard_demand"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5

From 4086309f6d30b68b91011627329dc4e1e8d22cd0 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 25 Jun 2024 17:00:54 +0100
Subject: [PATCH 302/419] Update readers tests

---
 tests/test_readers.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 31e110f1..0c23e1ee 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -451,7 +451,7 @@ def test_read_technodictionary(default_model):
         type=np.dtype("O"),
         fuel=np.dtype("<U11"),
         enduse=np.dtype("<U4"),
-        agent_share_2=np.dtype("int64"),
+        agent_share_1=np.dtype("int64"),
         tech_type=np.dtype("<U6"),
         efficiency=np.dtype("int64"),
         max_capacity_addition=np.dtype("int64"),
@@ -596,18 +596,6 @@ def test_read_csv_agent_parameters(default_model):
             "spend_limit": np.inf,
             "share": "agent_share_1",
         },
-        {
-            "name": "A1",
-            "region": "R1",
-            "objectives": ["LCOE"],
-            "search_rules": "all",
-            "decision": {"name": "singleObj", "parameters": [("LCOE", True, 1)]},
-            "agent_type": "retrofit",
-            "quantity": 1,
-            "maturity_threshhold": -1,
-            "spend_limit": np.inf,
-            "share": "agent_share_2",
-        },
     ]
 
 

From 7ba8bfd81d282f3e73aca32b6c8a0a0fa81cac62 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 26 Jun 2024 09:36:03 +0100
Subject: [PATCH 303/419] Remove Level parameter from Technodata files

---
 .../1-introduction/settings.toml              |  3 +-
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           | 10 +++----
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-scenario/settings.toml                  |  3 +-
 .../2-scenario/technodata/gas/Technodata.csv  |  6 ++--
 .../technodata/power/Technodata.csv           | 16 +++++------
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../1-single-objective/settings.toml          |  3 +-
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           | 16 +++++------
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-multiple-objective/settings.toml        |  3 +-
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           | 16 +++++------
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../3-add-region/1-new-region/settings.toml   |  3 +-
 .../technodata/gas/Technodata.csv             |  8 +++---
 .../technodata/power/Technodata.csv           | 28 +++++++++----------
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../1-modify-timeslices/settings.toml         |  3 +-
 .../technodata/gas/Technodata.csv             |  8 +++---
 .../technodata/power/Technodata.csv           | 28 +++++++++----------
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../2-modify-time-framework/settings.toml     |  3 +-
 .../technodata/gas/Technodata.csv             |  8 +++---
 .../technodata/power/Technodata.csv           | 28 +++++++++----------
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../1-exogenous-demand/settings.toml          |  3 +-
 .../technodata/gas/Technodata.csv             |  8 +++---
 .../technodata/power/Technodata.csv           | 28 +++++++++----------
 .../technodata/residential/Technodata.csv     | 20 ++++++-------
 .../1-correlation/settings.toml               |  3 +-
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           |  8 +++---
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../1-min-constraint/settings.toml            |  3 +-
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           |  8 +++---
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../2-max-constraint/settings.toml            |  3 +-
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           |  8 +++---
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../default/technodata/gas/Technodata.csv     |  6 ++--
 .../default/technodata/power/Technodata.csv   |  8 +++---
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../technodata/gas/Technodata.csv             |  6 ++--
 .../technodata/power/Technodata.csv           |  8 +++---
 .../technodata/residential/Technodata.csv     |  8 +++---
 .../technodata/residential/Technodata.csv     | 12 ++++----
 .../technodata/industry/Technodata.csv        | 12 ++++----
 .../residential/Technodata.csv                |  8 +++---
 .../trade/technodata/gas/Technodata.csv       |  8 +++---
 .../trade/technodata/power/Technodata.csv     | 12 ++++----
 .../technodata/residential/Technodata.csv     | 12 ++++----
 src/muse/readers/csv.py                       |  2 +-
 57 files changed, 267 insertions(+), 256 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 704d93ac..ae6e00b2 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
index 25614cf7..9dac054f 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
index b1e77966..80570f11 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
index 3ecb1c70..906ac729 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 704d93ac..ae6e00b2 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
index 25614cf7..9dac054f 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
index ae7066eb..a1388f72 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
index aa4eb867..bfa28701 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 704d93ac..ae6e00b2 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
index 05f7c836..6e681cd3 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
index d54a909f..fa4c384c 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
index e1a43e99..3bcf4ca5 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 704d93ac..ae6e00b2 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
index 05f7c836..6e681cd3 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
index d54a909f..fa4c384c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/Technodata.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,0.5,0.5
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,0.5,0.5
+solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
+solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,0.5,0.5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
index 382dc9b9..f2b7a285 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.04,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index d12df0db..39bad6de 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
index a10e7473..5d4bbde5 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
index 2e9d72c0..864fa878 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
index 889cba24..18e12460 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index c6b9c6df..407798c8 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
index b368d952..50a72437 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
index 719ba660..40b352b5 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
index 02d90fc2..fc3282b6 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index f3b4fe4b..177256be 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 2  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
index b368d952..50a72437 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index 06fe0069..87eb2da4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 8ba199f3..c1b5f5f8 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,3.8,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,8.866667,1,0,1,0,1,20,0.06,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index c6b9c6df..407798c8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
index a10e7473..5d4bbde5 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
-gassupply1,R2,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
index dd788335..ec2fcb29 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,fixed,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,fixed,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,fixed,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,fixed,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,fixed,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,36.30771182,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,23.78234399,1,0,1,0,1,4,2,120,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,36.30771182,1,0,1,0,1,10,2,200,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,40,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,30,1,0,1,0,1,4,2,120,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
index 53d32926..ece0e23d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/Technodata.csv
@@ -1,10 +1,10 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-electric_stove,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
-electric_stove,R2,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
-gas_stove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gas_stove,R2,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+electric_stove,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+electric_stove,R2,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+gas_stove,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gas_stove,R2,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 91dc51e1..5d841a5f 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -59,7 +59,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
index 25614cf7..9dac054f 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
index 9d767cfa..64a02bd9 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
index aa4eb867..bfa28701 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 585d142d..29622f6b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -61,7 +61,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
index 21c1ceea..0de62a9c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
index e87ff661..675fcbae 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv
index aa4eb867..bfa28701 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 585d142d..29622f6b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -61,7 +61,8 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service"
 ]
 demand_share = "new_and_retro"  # Optional, default to new_and_retro
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
index 21c1ceea..0de62a9c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
index e87ff661..675fcbae 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv
index aa4eb867..bfa28701 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/data/example/default/technodata/gas/Technodata.csv b/src/muse/data/example/default/technodata/gas/Technodata.csv
index 25614cf7..9dac054f 100644
--- a/src/muse/data/example/default/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/default/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/default/technodata/power/Technodata.csv b/src/muse/data/example/default/technodata/power/Technodata.csv
index 9d767cfa..64a02bd9 100644
--- a/src/muse/data/example/default/technodata/power/Technodata.csv
+++ b/src/muse/data/example/default/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/default/technodata/residential/Technodata.csv b/src/muse/data/example/default/technodata/residential/Technodata.csv
index aa4eb867..bfa28701 100644
--- a/src/muse/data/example/default/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/default/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
index 21c1ceea..0de62a9c 100644
--- a/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gassupply1,R1,2020,0,1,0,1,2.55,1,50,10,600,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
index e87ff661..675fcbae 100644
--- a/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/power/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,200,20,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,200,20,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv b/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv
index aa4eb867..bfa28701 100644
--- a/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/default_timeslice/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/data/example/medium/technodata/residential/Technodata.csv b/src/muse/data/example/medium/technodata/residential/Technodata.csv
index 8070b952..1172540c 100644
--- a/src/muse/data/example/medium/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/medium/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-estove,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
-gasstove,R1,2020,fixed,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+estove,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,cook,1
+gasstove,R1,2020,8.866666667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,cook,1
diff --git a/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv b/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
index ca9f1de4..7f00aeac 100644
--- a/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
+++ b/src/muse/data/example/minimum_service/technodata/industry/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent2,Type,Fuel,MinimumServiceFactor,Enduse
-Unit,-,Year,-,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,Retrofit,-,-,-,-
-procammonia_1,R1,2010,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.01,ammonia
-procammonia_1,R1,2050,fixed,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.85,ammonia
-procammonia_2,R1,2010,fixed,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia
-procammonia_2,R1,2050,fixed,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,InterestRate,ScalingSize,Agent2,Type,Fuel,MinimumServiceFactor,Enduse
+Unit,-,Year,MUS$2010/Mt,-,MUS$2010/Mt,-,MUS$2010/Mt,-,Mt,-,Mt,Years,-,-,-,Retrofit,-,-,-,-
+procammonia_1,R1,2010,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.01,ammonia
+procammonia_1,R1,2050,100,1,0.5,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel1,0.85,ammonia
+procammonia_2,R1,2010,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia
+procammonia_2,R1,2050,97.5,1,0.4875,1,0,1,5,0.03,100,20,0.85,0.1,0.1,1,energy,fuel2,0,ammonia
diff --git a/src/muse/data/example/multiple_agents/residential/Technodata.csv b/src/muse/data/example/multiple_agents/residential/Technodata.csv
index 9041d072..b298e586 100644
--- a/src/muse/data/example/multiple_agents/residential/Technodata.csv
+++ b/src/muse/data/example/multiple_agents/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent4
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,Retrofit
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,0.5,0.5
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,0.5,0.5
diff --git a/src/muse/data/example/trade/technodata/gas/Technodata.csv b/src/muse/data/example/trade/technodata/gas/Technodata.csv
index 8a8dc5c8..b418fd53 100644
--- a/src/muse/data/example/trade/technodata/gas/Technodata.csv
+++ b/src/muse/data/example/trade/technodata/gas/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,AgentShare
-Unit,-,Year,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,-
-gassupply1,R1,2010,fixed,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
-gassupply1,R2,2010,fixed,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
+ProcessName,RegionName,Time,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,AgentShare
+Unit,-,Year,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,-
+gassupply1,R1,2010,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R2,2010,3,1,10,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/trade/technodata/power/Technodata.csv b/src/muse/data/example/trade/technodata/power/Technodata.csv
index 7bf47fdb..61e971df 100644
--- a/src/muse/data/example/trade/technodata/power/Technodata.csv
+++ b/src/muse/data/example/trade/technodata/power/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_exp,fix_exp,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,AgentShare
-Unit,-,Year,-,-,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,
-gasCCGT,R1,2010,fixed,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2010,fixed,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-gasCCGT,R2,2010,fixed,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2010,fixed,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+ProcessName,RegionName,Time,cap_exp,fix_exp,var_par,var_exp,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,AgentShare
+Unit,-,Year,-,-,MUS$2010/PJ,-,Years,-,PJ,%,-,-,-,-,
+gasCCGT,R1,2010,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2010,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+gasCCGT,R2,2010,1,1,0,1,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2010,1,1,0,1,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
diff --git a/src/muse/data/example/trade/technodata/residential/Technodata.csv b/src/muse/data/example/trade/technodata/residential/Technodata.csv
index 12773162..9dc35cdc 100644
--- a/src/muse/data/example/trade/technodata/residential/Technodata.csv
+++ b/src/muse/data/example/trade/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2010,fixed,4.52,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2010,fixed,10.55,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2010,fixed,4.94,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2010,fixed,11.53,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2010,4.52,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2010,10.55,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2010,4.94,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2010,11.53,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index bc63f991..5c1a34e7 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -118,7 +118,7 @@ def to_agent_share(name):
         ]
 
     units = csv[csv.process_name == "Unit"].drop(
-        ["process_name", "region_name", "time", "level"], axis=1
+        ["process_name", "region_name", "time"], axis=1
     )
     for variable, value in units.items():
         if all(u not in {"-", "Retro", "New"} for u in value.values):

From 5cd5889b2f15d74e675dd93e132eaef1b3d996e9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 26 Jun 2024 09:37:50 +0100
Subject: [PATCH 304/419] Update reader test

---
 tests/test_readers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 31e110f1..4860df09 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -441,7 +441,6 @@ def test_read_technodictionary(default_model):
     assert set(data.dims) == {"technology", "region"}
 
     assert dict(data.dtypes) == dict(
-        level=np.dtype("O"),
         cap_par=np.dtype("float64"),
         cap_exp=np.dtype("int64"),
         fix_par=np.dtype("int64"),

From 282433100a28c72f7c305b3b4d879885400de2be Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 26 Jun 2024 09:49:26 +0100
Subject: [PATCH 305/419] Remove Level from more technodata files

---
 .../technodata/gas/Technodata.csv                      |  6 +++---
 .../technodata/power/Technodata.csv                    | 10 +++++-----
 .../technodata/residential/Technodata.csv              |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
index 57f66da8..93826a54 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,fixed,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
index de511a38..ea17ee23 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,fixed,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,fixed,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,fixed,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
+solarPV,R1,2020,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
index 6d2c3cb3..247bc4bf 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,-,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasboiler,R1,2020,fixed,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,fixed,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0

From 3fc4fbfdf813f3493851d7be9822f174681e1626 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 26 Jun 2024 09:52:33 +0100
Subject: [PATCH 306/419] Remove Level from Technodata documentation

---
 docs/inputs/technodata.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 9709e5cc..6ce2c743 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -27,9 +27,6 @@ Time
    represents the period of the simulation to which the value applies; it needs to
    contain at least the base year of the simulation
 
-Level
-   characterises either a fixed or a flexible input type
-
 cap_par, cap_exp
    are used in the capital cost estimation. Capital costs are calculated as:
 

From 8e0aca32d4d2ec76e093fd008c449498a972f4e3 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 26 Jun 2024 09:59:08 +0100
Subject: [PATCH 307/419] Small changes to the documentation/notebooks

---
 docs/inputs/commodities_io.rst  |  9 ++++-----
 docs/inputs/technodata.rst      |  6 +++---
 docs/user-guide/add-agent.ipynb | 18 +++++++++---------
 docs/user-guide/add-solar.ipynb | 18 +++++++++---------
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/docs/inputs/commodities_io.rst b/docs/inputs/commodities_io.rst
index c927e9ec..7db83f51 100644
--- a/docs/inputs/commodities_io.rst
+++ b/docs/inputs/commodities_io.rst
@@ -61,12 +61,11 @@ Time
    contain at least the base year of the simulation.
 
 Level
-   characterises either a fixed or a flexible input type the following columns should
-   contain the list of commodities the row.
+   characterises either a fixed or a flexible input type
 
-Unit
-   reports the unit in which the technology consumption is defined; it is for the user
-   internal reference only.
+The remaining columns should contain the full list of commodities.
+
+The first row of the table reports the units for each column; it is for the user reference only.
 
 The input data has to be provided for the base year. Additional years within the time
 framework of the overall simulation can be defined. In this case, MUSE would interpolate
diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 6ce2c743..65f8268d 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -11,10 +11,10 @@ the electric boiler used in households is taken as an example for a generic regi
 
 
 .. csv-table:: Techno-data: cost inputs
-   :header: ProcessName, RegionName, Time, Level, cap_par, cap_exp, fix_par, ...
+   :header: ProcessName, RegionName, Time, cap_par, cap_exp, fix_par, ...
 
-   resBoilerElectric, region1, 2010, fixed, 3.81, 1.00, 0.38, ...
-   resBoilerElectric, region1, 2030, fixed, 3.81, 1.00, 0.38, ...
+   resBoilerElectric, region1, 2010, 3.81, 1.00, 0.38, ...
+   resBoilerElectric, region1, 2030, 3.81, 1.00, 0.38, ...
 
 
 ProcessName
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index dac394d2..bc244182 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -44,15 +44,15 @@
     "\n",
     "The new technodata file for the power sector will look like the following:\n",
     "\n",
-    "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent2|Agent4|\n",
-    "|-|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|Retrofit|**Retrofit**|\n",
-    "|gasCCGT|R1|2020|fixed|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
-    "|gasCCGT|R1|2040|fixed|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
-    "|windturbine|R1|2020|fixed|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
-    "|windturbine|R1|2040|fixed|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
-    "|solarPV|R1|2020|fixed|40|1|...|solar|electricity|**0.5**|**0.5**|\n",
-    "|solarPV|R1|2040|fixed|30|1|...|solar|electricity|**0.5**|**0.5**|\n",
+    "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent2|Agent4|\n",
+    "|-|-|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|Retrofit|**Retrofit**|\n",
+    "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
+    "|gasCCGT|R1|2040|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
+    "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
+    "|windturbine|R1|2040|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
+    "|solarPV|R1|2020|40|1|...|solar|electricity|**0.5**|**0.5**|\n",
+    "|solarPV|R1|2040|30|1|...|solar|electricity|**0.5**|**0.5**|\n",
     "\n",
     "However, remember you will have to make the same changes for the residential and gas sectors!"
    ]
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 8701c4e1..1c70a433 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -388,15 +388,15 @@
     "\n",
     "First, we will amend the `Technodata.csv` file as follows:\n",
     "\n",
-    "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent2|\n",
-    "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|Retrofit|\n",
-    "|gasCCGT|R1|2020|fixed|23.78234399|1|…|gas|electricity|1|\n",
-    "|**gasCCGT**|**R1**|**2040**|**fixed**|**23.78234399**|**1**|**…**|**gas**|**electricity**|**1**|\n",
-    "|windturbine|R1|2020|fixed|36.30771182|1|…|wind|electricity|1|\n",
-    "|**windturbine**|**R1**|**2040**|**fixed**|**36.30771182**|**1**|**…**|**wind**|**electricity**|**1**|\n",
-    "|solarPV|R1|2020|fixed|**40**|1|...|solar|electricity|1|\n",
-    "|**solarPV**|**R1**|**2040**|**fixed**|**30**|**1**|**...**|**solar**|**electricity**|**1**|\n",
+    "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent2|\n",
+    "|-|-|-|-|-|-|-|-|-|\n",
+    "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|Retrofit|\n",
+    "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|1|\n",
+    "|**gasCCGT**|**R1**|**2040**|**23.78234399**|**1**|**…**|**gas**|**electricity**|**1**|\n",
+    "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|1|\n",
+    "|**windturbine**|**R1**|**2040**|**36.30771182**|**1**|**…**|**wind**|**electricity**|**1**|\n",
+    "|solarPV|R1|2020|**40**|1|...|solar|electricity|1|\n",
+    "|**solarPV**|**R1**|**2040**|**30**|**1**|**...**|**solar**|**electricity**|**1**|\n",
     "\n",
     "Notice that we must provide entries for 2040 for the other technologies, `gasCCGT` and `windturbine`. For this example, we will keep these the same as before, copying and pasting the rows. \n",
     "\n",

From 33b5d43fde50fbfb386790136d497e83f969ff2f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 26 Jun 2024 10:26:02 +0100
Subject: [PATCH 308/419] Tiny grammar change

---
 docs/inputs/commodities_io.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/inputs/commodities_io.rst b/docs/inputs/commodities_io.rst
index 7db83f51..482ff1db 100644
--- a/docs/inputs/commodities_io.rst
+++ b/docs/inputs/commodities_io.rst
@@ -61,11 +61,11 @@ Time
    contain at least the base year of the simulation.
 
 Level
-   characterises either a fixed or a flexible input type
+   characterises either a fixed or a flexible input type.
 
 The remaining columns should contain the full list of commodities.
 
-The first row of the table reports the units for each column; it is for the user reference only.
+The first row of the table reports the units for each column; it is for user reference only.
 
 The input data has to be provided for the base year. Additional years within the time
 framework of the overall simulation can be defined. In this case, MUSE would interpolate

From 5f392a3c855e5a22a5a02cc59cc64d248096c151 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 27 Jun 2024 10:17:04 +0100
Subject: [PATCH 309/419] Remove "Level" from CommOut files

---
 .../technodata/gas/CommOut.csv                |  6 ++--
 .../technodata/power/CommOut.csv              | 10 +++----
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../1-introduction/technodata/gas/CommOut.csv |  6 ++--
 .../technodata/power/CommOut.csv              | 10 +++----
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../2-scenario/technodata/gas/CommOut.csv     |  6 ++--
 .../2-scenario/technodata/power/CommOut.csv   | 16 +++++------
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../technodata/gas/CommOut.csv                |  6 ++--
 .../technodata/power/CommOut.csv              | 16 +++++------
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../technodata/gas/CommOut.csv                |  6 ++--
 .../technodata/power/CommOut.csv              | 16 +++++------
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../1-new-region/technodata/gas/CommOut.csv   |  8 +++---
 .../1-new-region/technodata/power/CommOut.csv | 28 +++++++++----------
 .../technodata/residential/CommOut.csv        | 12 ++++----
 .../technodata/gas/CommOut.csv                |  8 +++---
 .../technodata/power/CommOut.csv              | 28 +++++++++----------
 .../technodata/residential/CommOut.csv        | 12 ++++----
 .../technodata/gas/CommOut.csv                |  8 +++---
 .../technodata/power/CommOut.csv              | 28 +++++++++----------
 .../technodata/residential/CommOut.csv        | 12 ++++----
 .../technodata/gas/CommOut.csv                |  8 +++---
 .../technodata/power/CommOut.csv              | 28 +++++++++----------
 .../technodata/residential/CommOut.csv        | 20 ++++++-------
 .../1-correlation/technodata/gas/CommOut.csv  |  6 ++--
 .../technodata/power/CommOut.csv              |  8 +++---
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../technodata/gas/CommOut.csv                |  6 ++--
 .../technodata/power/CommOut.csv              |  8 +++---
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../technodata/gas/CommOut.csv                |  6 ++--
 .../technodata/power/CommOut.csv              |  8 +++---
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../default/technodata/gas/CommOut.csv        |  6 ++--
 .../default/technodata/power/CommOut.csv      |  8 +++---
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../technodata/gas/CommOut.csv                |  6 ++--
 .../technodata/power/CommOut.csv              |  8 +++---
 .../technodata/residential/CommOut.csv        |  8 +++---
 .../medium/technodata/residential/CommOut.csv | 12 ++++----
 .../technodata/industry/CommOut.csv           | 16 +++++------
 .../example/trade/technodata/gas/CommOut.csv  |  8 +++---
 .../trade/technodata/power/CommOut.csv        | 12 ++++----
 .../trade/technodata/residential/CommOut.csv  | 12 ++++----
 src/muse/readers/csv.py                       |  3 ++
 48 files changed, 257 insertions(+), 254 deletions(-)

diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/gas/CommOut.csv b/docs/tutorial-code/0-new-decision-metric/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv b/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv
index b1a8d48f..7c1b318d 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/power/CommOut.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/residential/CommOut.csv b/docs/tutorial-code/0-new-decision-metric/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/CommOut.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv
index b1a8d48f..7c1b318d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/power/CommOut.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/CommOut.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/CommOut.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv
index 0960c997..4659a4b1 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/power/CommOut.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/CommOut.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
index 0960c997..4659a4b1 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/power/CommOut.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
index 0960c997..4659a4b1 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/power/CommOut.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv
index cc721c76..f0eb38ea 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
+gassupply1,R2,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv
index b0b03543..b7be9372 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/power/CommOut.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
-gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
-windturbine,R2,2020,fixed,1,0,0,0,0,0
-windturbine,R2,2040,fixed,1,0,0,0,0,0
-solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
+gasCCGT,R2,2020,1,0,0,91.67,0,0
+gasCCGT,R2,2040,1,0,0,91.67,0,0
+windturbine,R2,2020,1,0,0,0,0,0
+windturbine,R2,2040,1,0,0,0,0,0
+solarPV,R2,2020,1,0,0,0,0,0
+solarPV,R2,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv
index f4ae2886..3d3f7198 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/technodata/residential/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
-gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
+gasboiler,R2,2020,0,0,1,64.71,0
+heatpump,R2,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
index cdeddecf..ab041ad3 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
+gassupply1,R2,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
index 8ab0fef9..8dd37bb8 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/power/CommOut.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
-gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
-windturbine,R2,2020,fixed,1,0,0,0,0,0
-windturbine,R2,2040,fixed,1,0,0,0,0,0
-solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
+gasCCGT,R2,2020,1,0,0,91.67,0,0
+gasCCGT,R2,2040,1,0,0,91.67,0,0
+windturbine,R2,2020,1,0,0,0,0,0
+windturbine,R2,2040,1,0,0,0,0,0
+solarPV,R2,2020,1,0,0,0,0,0
+solarPV,R2,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
index bc310414..10f54e99 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/technodata/residential/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
-gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
+gasboiler,R2,2020,0,0,1,64.71,0
+heatpump,R2,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
index cdeddecf..ab041ad3 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
+gassupply1,R2,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
index 8ab0fef9..8dd37bb8 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/CommOut.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
-gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
-windturbine,R2,2020,fixed,1,0,0,0,0,0
-windturbine,R2,2040,fixed,1,0,0,0,0,0
-solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
+gasCCGT,R2,2020,1,0,0,91.67,0,0
+gasCCGT,R2,2040,1,0,0,91.67,0,0
+windturbine,R2,2020,1,0,0,0,0,0
+windturbine,R2,2040,1,0,0,0,0,0
+solarPV,R2,2020,1,0,0,0,0,0
+solarPV,R2,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
index bc310414..10f54e99 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
-gasboiler,R2,2020,fixed,0,0,1,64.71,0
-heatpump,R2,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
+gasboiler,R2,2020,0,0,1,64.71,0
+heatpump,R2,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
index cc721c76..f0eb38ea 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
-gassupply1,R2,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
+gassupply1,R2,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
index b0b03543..b7be9372 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/power/CommOut.csv
@@ -1,14 +1,14 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,solar
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R1,2040,fixed,1,0,0,91.67,0,0
-windturbine,R1,2020,fixed,1,0,0,0,0,0
-windturbine,R1,2040,fixed,1,0,0,0,0,0
-solarPV,R1,2020,fixed,1,0,0,0,0,0
-solarPV,R1,2040,fixed,1,0,0,0,0,0
-gasCCGT,R2,2020,fixed,1,0,0,91.67,0,0
-gasCCGT,R2,2040,fixed,1,0,0,91.67,0,0
-windturbine,R2,2020,fixed,1,0,0,0,0,0
-windturbine,R2,2040,fixed,1,0,0,0,0,0
-solarPV,R2,2020,fixed,1,0,0,0,0,0
-solarPV,R2,2040,fixed,1,0,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,solar
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0,0
+gasCCGT,R1,2040,1,0,0,91.67,0,0
+windturbine,R1,2020,1,0,0,0,0,0
+windturbine,R1,2040,1,0,0,0,0,0
+solarPV,R1,2020,1,0,0,0,0,0
+solarPV,R1,2040,1,0,0,0,0,0
+gasCCGT,R2,2020,1,0,0,91.67,0,0
+gasCCGT,R2,2040,1,0,0,91.67,0,0
+windturbine,R2,2020,1,0,0,0,0,0
+windturbine,R2,2040,1,0,0,0,0,0
+solarPV,R2,2020,1,0,0,0,0,0
+solarPV,R2,2040,1,0,0,0,0,0
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
index e90d9dc1..8ce7a0df 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/technodata/residential/CommOut.csv
@@ -1,10 +1,10 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind,cook
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0,0
-heatpump,R1,2020,fixed,0,0,1,0,0,0
-gasboiler,R2,2020,fixed,0,0,1,64.71,0,0
-heatpump,R2,2020,fixed,0,0,1,0,0,0
-electric_stove,R1,2020,fixed,0,0,0,0,0,1
-electric_stove,R2,2020,fixed,0,0,0,0,0,1
-gas_stove,R1,2020,fixed,0,0,0,50,0,1
-gas_stove,R2,2020,fixed,0,0,0,50,0,1
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind,cook
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0,0
+heatpump,R1,2020,0,0,1,0,0,0
+gasboiler,R2,2020,0,0,1,64.71,0,0
+heatpump,R2,2020,0,0,1,0,0,0
+electric_stove,R1,2020,0,0,0,0,0,1
+electric_stove,R2,2020,0,0,0,0,0,1
+gas_stove,R1,2020,0,0,0,50,0,1
+gas_stove,R2,2020,0,0,0,50,0,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
index 03a2f4dd..efaac058 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/power/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0
-windturbine,R1,2020,fixed,1,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0
+windturbine,R1,2020,1,0,0,0,0
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv
index 03a2f4dd..efaac058 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/power/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0
-windturbine,R1,2020,fixed,1,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0
+windturbine,R1,2020,1,0,0,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv
index 03a2f4dd..efaac058 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/power/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0
-windturbine,R1,2020,fixed,1,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0
+windturbine,R1,2020,1,0,0,0,0
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/src/muse/data/example/default/technodata/gas/CommOut.csv b/src/muse/data/example/default/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/src/muse/data/example/default/technodata/gas/CommOut.csv
+++ b/src/muse/data/example/default/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/src/muse/data/example/default/technodata/power/CommOut.csv b/src/muse/data/example/default/technodata/power/CommOut.csv
index 03a2f4dd..efaac058 100644
--- a/src/muse/data/example/default/technodata/power/CommOut.csv
+++ b/src/muse/data/example/default/technodata/power/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0
-windturbine,R1,2020,fixed,1,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0
+windturbine,R1,2020,1,0,0,0,0
diff --git a/src/muse/data/example/default/technodata/residential/CommOut.csv b/src/muse/data/example/default/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/src/muse/data/example/default/technodata/residential/CommOut.csv
+++ b/src/muse/data/example/default/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/src/muse/data/example/default_timeslice/technodata/gas/CommOut.csv b/src/muse/data/example/default_timeslice/technodata/gas/CommOut.csv
index 97520cdf..cbe4de90 100644
--- a/src/muse/data/example/default_timeslice/technodata/gas/CommOut.csv
+++ b/src/muse/data/example/default_timeslice/technodata/gas/CommOut.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2020,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2020,0,1,0,0,0
diff --git a/src/muse/data/example/default_timeslice/technodata/power/CommOut.csv b/src/muse/data/example/default_timeslice/technodata/power/CommOut.csv
index 03a2f4dd..efaac058 100644
--- a/src/muse/data/example/default_timeslice/technodata/power/CommOut.csv
+++ b/src/muse/data/example/default_timeslice/technodata/power/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasCCGT,R1,2020,fixed,1,0,0,91.67,0
-windturbine,R1,2020,fixed,1,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2020,1,0,0,91.67,0
+windturbine,R1,2020,1,0,0,0,0
diff --git a/src/muse/data/example/default_timeslice/technodata/residential/CommOut.csv b/src/muse/data/example/default_timeslice/technodata/residential/CommOut.csv
index f32c59a0..78f28247 100644
--- a/src/muse/data/example/default_timeslice/technodata/residential/CommOut.csv
+++ b/src/muse/data/example/default_timeslice/technodata/residential/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.71,0
-heatpump,R1,2020,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.71,0
+heatpump,R1,2020,0,0,1,0,0
diff --git a/src/muse/data/example/medium/technodata/residential/CommOut.csv b/src/muse/data/example/medium/technodata/residential/CommOut.csv
index 0ad0e9a5..e791e310 100644
--- a/src/muse/data/example/medium/technodata/residential/CommOut.csv
+++ b/src/muse/data/example/medium/technodata/residential/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,cook,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
-gasboiler,R1,2020,fixed,0,0,1,64.70588235,0,0
-heatpump,R1,2020,fixed,0,0,1,0,0,0
-estove,R1,2020,fixed,0,0,0,50,1,0
-gasstove,R1,2020,fixed,0,0,0,0,1,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,cook,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ,PJ/PJ
+gasboiler,R1,2020,0,0,1,64.70588235,0,0
+heatpump,R1,2020,0,0,1,0,0,0
+estove,R1,2020,0,0,0,50,1,0
+gasstove,R1,2020,0,0,0,0,1,0
diff --git a/src/muse/data/example/minimum_service/technodata/industry/CommOut.csv b/src/muse/data/example/minimum_service/technodata/industry/CommOut.csv
index 848c8ecc..3ba00d7c 100644
--- a/src/muse/data/example/minimum_service/technodata/industry/CommOut.csv
+++ b/src/muse/data/example/minimum_service/technodata/industry/CommOut.csv
@@ -1,8 +1,8 @@
-ProcessName,RegionName,Time,Level,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
-Unit,-,Year,-,PJ/Mt,PJ/Mt,PJ/Mt,Mt/Mt,kt/Mt,kt/Mt,kt/Mt,kt/Mt,kt/Mt
-procammonia_1,R1,2010,fixed,0,0,0,1,4168.06,0,0,0,0
-procammonia_2,R1,2010,fixed,0,0,0,1,3111.835705,0,0,0,0
-procammonia_1,R1,2050,fixed,0,0,0,1,3910.772346,0,0,0,0
-procammonia_2,R1,2050,fixed,0,0,0,1,2919.747081,0,0,0,0
-procammonia_1,R1,2100,fixed,0,0,0,1,3910.772346,0,0,0,0
-procammonia_2,R1,2100,fixed,0,0,0,1,2919.747081,0,0,0,0
+ProcessName,RegionName,Time,fuel1,fuel2,fuel3,ammonia,CO2f,CO2r,CO2c,CO2s,N2O
+Unit,-,Year,PJ/Mt,PJ/Mt,PJ/Mt,Mt/Mt,kt/Mt,kt/Mt,kt/Mt,kt/Mt,kt/Mt
+procammonia_1,R1,2010,0,0,0,1,4168.06,0,0,0,0
+procammonia_2,R1,2010,0,0,0,1,3111.835705,0,0,0,0
+procammonia_1,R1,2050,0,0,0,1,3910.772346,0,0,0,0
+procammonia_2,R1,2050,0,0,0,1,2919.747081,0,0,0,0
+procammonia_1,R1,2100,0,0,0,1,3910.772346,0,0,0,0
+procammonia_2,R1,2100,0,0,0,1,2919.747081,0,0,0,0
diff --git a/src/muse/data/example/trade/technodata/gas/CommOut.csv b/src/muse/data/example/trade/technodata/gas/CommOut.csv
index 4f5d9a0f..2458e775 100644
--- a/src/muse/data/example/trade/technodata/gas/CommOut.csv
+++ b/src/muse/data/example/trade/technodata/gas/CommOut.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gassupply1,R1,2010,fixed,0,1,0,0,0
-gassupply1,R2,2010,fixed,0,1,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gassupply1,R1,2010,0,1,0,0,0
+gassupply1,R2,2010,0,1,0,0,0
diff --git a/src/muse/data/example/trade/technodata/power/CommOut.csv b/src/muse/data/example/trade/technodata/power/CommOut.csv
index cd25d81f..cfebcd83 100644
--- a/src/muse/data/example/trade/technodata/power/CommOut.csv
+++ b/src/muse/data/example/trade/technodata/power/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasCCGT,R1,2010,fixed,1,0,0,91.66666667,0
-windturbine,R1,2010,fixed,1,0,0,0,0
-gasCCGT,R2,2010,fixed,1,0,0,91.66666667,0
-windturbine,R2,2010,fixed,1,0,0,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasCCGT,R1,2010,1,0,0,91.66666667,0
+windturbine,R1,2010,1,0,0,0,0
+gasCCGT,R2,2010,1,0,0,91.66666667,0
+windturbine,R2,2010,1,0,0,0,0
diff --git a/src/muse/data/example/trade/technodata/residential/CommOut.csv b/src/muse/data/example/trade/technodata/residential/CommOut.csv
index 9bb16191..93c20877 100644
--- a/src/muse/data/example/trade/technodata/residential/CommOut.csv
+++ b/src/muse/data/example/trade/technodata/residential/CommOut.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,Level,electricity,gas,heat,CO2f,wind
-Unit,-,Year,-,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
-gasboiler,R1,2010,fixed,0,0,1,64.70588235,0
-heatpump,R1,2010,fixed,0,0,1,0,0
-gasboiler,R2,2010,fixed,0,0,1,77.64705882,0
-heatpump,R2,2010,fixed,0,0,1,0,0
+ProcessName,RegionName,Time,electricity,gas,heat,CO2f,wind
+Unit,-,Year,PJ/PJ,PJ/PJ,PJ/PJ,kt/PJ,PJ/PJ
+gasboiler,R1,2010,0,0,1,64.70588235,0
+heatpump,R1,2010,0,0,1,0,0
+gasboiler,R2,2010,0,0,1,77.64705882,0
+heatpump,R2,2010,0,0,1,0,0
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 5c1a34e7..6a220cfb 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -181,6 +181,9 @@ def read_io_technodata(filename: Union[str, Path]) -> xr.Dataset:
     from muse.readers import camel_to_snake
 
     csv = pd.read_csv(filename, float_precision="high", low_memory=False)
+    if "Level" not in csv.columns:
+        # Applies to outputs files, where level is not specified (must be "fixed")
+        csv["Level"] = "fixed"
     data = csv[csv.ProcessName != "Unit"]
 
     region = np.array(data.RegionName, dtype=str)

From b58daf3ef888f6853f956579f652c5fdf9e937a2 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 27 Jun 2024 10:50:06 +0100
Subject: [PATCH 310/419] Documentation for Level parameter

---
 docs/inputs/commodities_io.rst | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/inputs/commodities_io.rst b/docs/inputs/commodities_io.rst
index 482ff1db..97e2507b 100644
--- a/docs/inputs/commodities_io.rst
+++ b/docs/inputs/commodities_io.rst
@@ -60,8 +60,15 @@ Time
    represents the period of the simulation to which the value applies; it needs to
    contain at least the base year of the simulation.
 
-Level
-   characterises either a fixed or a flexible input type.
+Level (for **input** commodities only)
+   characterises inputs as either "fixed" or "flexible".
+   Fixed inputs are always used by a technology in a fixed proportion.
+   Flexible inputs allow a technology to choose amongst several alternative fuels,
+   depending on which one is cheapest at the time.
+   For example, if a vehicle can use either petrodiesel or biodiesel, these
+   should be specified as "flexible" inputs, and the technology will choose between
+   them based on the price of each.
+   If a process has a mix of fixed and flexible inputs, these should be split over two rows.
 
 The remaining columns should contain the full list of commodities.
 

From 6f7c1de6ac550d7293076cc752862e6f7e889983 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 27 Jun 2024 11:06:51 +0100
Subject: [PATCH 311/419] Add warning for flexible outputs

---
 src/muse/readers/csv.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 6a220cfb..b71ee8d0 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -355,6 +355,11 @@ def read_technologies(
     outs = read_io_technodata(opath).rename(
         flexible="flexible_outputs", fixed="fixed_outputs"
     )
+    if not (outs["flexible_outputs"] == 0).all():
+        raise ValueError(
+            f"'flexible' outputs are not permitted in {opath}. "
+            "All outputs must be 'fixed'"
+        )
     ins = read_io_technodata(ipath).rename(
         flexible="flexible_inputs", fixed="fixed_inputs"
     )

From 02daf3ce4952e77f5a1e4188d157477477896e53 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 27 Jun 2024 15:55:23 +0100
Subject: [PATCH 312/419] Drop flexible_outputs

---
 src/muse/commodities.py | 12 ++----------
 src/muse/readers/csv.py |  1 +
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 30398978..92ac1753 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -66,17 +66,9 @@ def just_tech(x):
                 dims.remove("commodity")
             return x.any(dims)
 
-        products = list(
-            just_tech(technologies[x] > 0)
-            for x in {"fixed_outputs", "flexible_outputs"}
-            if x in technologies.data_vars
-        )
-        if len(products) == 0:
+        if "fixed_outputs" not in technologies.data_vars:
             raise ValueError("Missing output array in technologies")
-        elif len(products) == 1:
-            products = products[0]
-        else:
-            products = bitwise_or(*products)
+        products = just_tech(technologies["fixed_outputs"] > 0)
         products = [
             CommodityUsage.PRODUCT if u else CommodityUsage.OTHER for u in products
         ]
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index b71ee8d0..7f1410c5 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -360,6 +360,7 @@ def read_technologies(
             f"'flexible' outputs are not permitted in {opath}. "
             "All outputs must be 'fixed'"
         )
+    outs = outs.drop("flexible_outputs")
     ins = read_io_technodata(ipath).rename(
         flexible="flexible_inputs", fixed="fixed_inputs"
     )

From 3a899369210b1810213a456a093c071532807247 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 27 Jun 2024 16:01:50 +0100
Subject: [PATCH 313/419] Use drop_vars instead of drop

---
 src/muse/readers/csv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index 7f1410c5..b482559b 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -190,7 +190,7 @@ def read_io_technodata(filename: Union[str, Path]) -> xr.Dataset:
     process = data.ProcessName
     year = [int(u) for u in data.Time]
 
-    data = data.drop(["ProcessName", "RegionName", "Time"], axis=1)
+    data = data.drop_vars(["ProcessName", "RegionName", "Time"], axis=1)
 
     ts = pd.MultiIndex.from_arrays(
         [process, region, year], names=("technology", "region", "year")

From d3205e0aa2ffd79e5ba4adf8d8fdbfafd1553b24 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 27 Jun 2024 16:06:12 +0100
Subject: [PATCH 314/419] Use drop_vars in the right place

---
 src/muse/readers/csv.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index b482559b..c47fc439 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -190,7 +190,7 @@ def read_io_technodata(filename: Union[str, Path]) -> xr.Dataset:
     process = data.ProcessName
     year = [int(u) for u in data.Time]
 
-    data = data.drop_vars(["ProcessName", "RegionName", "Time"], axis=1)
+    data = data.drop(["ProcessName", "RegionName", "Time"], axis=1)
 
     ts = pd.MultiIndex.from_arrays(
         [process, region, year], names=("technology", "region", "year")
@@ -360,7 +360,7 @@ def read_technologies(
             f"'flexible' outputs are not permitted in {opath}. "
             "All outputs must be 'fixed'"
         )
-    outs = outs.drop("flexible_outputs")
+    outs = outs.drop_vars("flexible_outputs")
     ins = read_io_technodata(ipath).rename(
         flexible="flexible_inputs", fixed="fixed_inputs"
     )

From 3d852ed3a07fb0225847280f4192ad2a0358e174 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 28 Jun 2024 14:08:05 +0100
Subject: [PATCH 315/419] More specific error message

---
 src/muse/commodities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 92ac1753..71440c6a 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -67,7 +67,7 @@ def just_tech(x):
             return x.any(dims)
 
         if "fixed_outputs" not in technologies.data_vars:
-            raise ValueError("Missing output array in technologies")
+            raise ValueError("Missing 'fixed_outputs' array in technologies")
         products = just_tech(technologies["fixed_outputs"] > 0)
         products = [
             CommodityUsage.PRODUCT if u else CommodityUsage.OTHER for u in products

From cb950dfa2c214ba690d1b587f9dfe1cfd9ff3392 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 28 Jun 2024 14:14:13 +0100
Subject: [PATCH 316/419] More clarity about default values

---
 docs/inputs/commodities_io.rst |  1 +
 src/muse/readers/csv.py        | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/inputs/commodities_io.rst b/docs/inputs/commodities_io.rst
index 97e2507b..3e2cd7cd 100644
--- a/docs/inputs/commodities_io.rst
+++ b/docs/inputs/commodities_io.rst
@@ -69,6 +69,7 @@ Level (for **input** commodities only)
    should be specified as "flexible" inputs, and the technology will choose between
    them based on the price of each.
    If a process has a mix of fixed and flexible inputs, these should be split over two rows.
+   Defaults to "fixed".
 
 The remaining columns should contain the full list of commodities.
 
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index c47fc439..4d6827da 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -181,11 +181,16 @@ def read_io_technodata(filename: Union[str, Path]) -> xr.Dataset:
     from muse.readers import camel_to_snake
 
     csv = pd.read_csv(filename, float_precision="high", low_memory=False)
-    if "Level" not in csv.columns:
-        # Applies to outputs files, where level is not specified (must be "fixed")
+
+    # Unspecified Level values default to "fixed"
+    if "Level" in csv.columns:
+        csv["Level"] = csv["Level"].fillna("fixed")
+    else:
+        # Particularly relevant to outputs files where the Level column is omitted by
+        # default, as only "fixed" outputs are allowed.
         csv["Level"] = "fixed"
-    data = csv[csv.ProcessName != "Unit"]
 
+    data = csv[csv.ProcessName != "Unit"]
     region = np.array(data.RegionName, dtype=str)
     process = data.ProcessName
     year = [int(u) for u in data.Time]

From ceee06ec5f55ee8fd5b1f1b777faaeb1bc8dc120 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Sun, 30 Jun 2024 16:08:18 +0100
Subject: [PATCH 317/419] Remove timeslice level names from drop_vars
 statements

---
 src/muse/agents/agent.py          |  2 +-
 src/muse/constraints.py           |  4 ++--
 src/muse/demand_matching.py       |  2 +-
 src/muse/examples.py              | 10 +++-------
 src/muse/mca.py                   | 26 ++++++++------------------
 src/muse/objectives.py            |  2 +-
 src/muse/outputs/mca.py           |  4 ++--
 src/muse/sectors/preset_sector.py | 12 ++++++------
 src/muse/sectors/subsector.py     |  2 +-
 tests/test_constraints.py         |  4 +---
 tests/test_demand_share.py        |  2 +-
 tests/test_mca.py                 | 17 ++++-------------
 tests/test_quantities.py          | 18 +++++-------------
 13 files changed, 36 insertions(+), 69 deletions(-)

diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 8146711b..ed647201 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -416,7 +416,7 @@ def next(
             return None
 
         if "timeslice" in search.dims:
-            search["demand"] = demand.drop_vars(["timeslice", "month", "day", "hour"])
+            search["demand"] = demand.drop_vars("timeslice")
         else:
             search["demand"] = demand
         not_assets = [u for u in search.demand.dims if u != "asset"]
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index b75c08f3..582770a3 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -622,7 +622,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 = production.drop_vars("timeslice")
             production[dim] = pd.Index(production.get_index(dim), tupleize_cols=False)
 
     return xr.Dataset(dict(capacity=costs, production=production))
@@ -689,7 +689,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 = constraint.drop_vars("timeslice")
             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})
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index 0a9c94d5..50328e91 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -248,7 +248,7 @@ def demand_matching(
 
     if len(multics) > 0:
         for k in multics:
-            ds = ds.drop_vars(["timeslice", "month", "day", "hour"])
+            ds = ds.drop_vars("timeslice")
             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 a888763f..90939b16 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -192,12 +192,8 @@ def mca_market(model: str = "default") -> xr.Dataset:
             .sel(region=settings.regions)
             .interp(year=settings.time_framework, method=settings.interpolation_mode)
         )
-        market["supply"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
-        market["consumption"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["supply"] = zeros_like(market.exports).drop_vars("timeslice")
+        market["consumption"] = zeros_like(market.exports).drop_vars("timeslice")
 
         return cast(xr.Dataset, market)
 
@@ -268,7 +264,7 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset:
                 {"asset", "dst_region"}.intersection(consump.dims)
             )
             + market.supply
-        ).drop_vars(["timeslice", "month", "day", "hour"])
+        ).drop_vars("timeslice")
     else:
         market["consumption"] = (
             consumption(loaded_sector.technologies, production).sum(
diff --git a/src/muse/mca.py b/src/muse/mca.py
index ac7a27e2..2f5b8105 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -59,12 +59,8 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA:
             ).sel(region=settings.regions)
         ).interp(year=settings.time_framework, method=settings.interpolation_mode)
 
-        market["supply"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
-        market["consumption"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["supply"] = zeros_like(market.exports).drop_vars("timeslice")
+        market["consumption"] = zeros_like(market.exports).drop_vars("timeslice")
 
         # We create the sectors
         sectors = []
@@ -461,9 +457,7 @@ 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().drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["updated_prices"] = market.prices.copy().drop_vars("timeslice")
 
     # eventually, the first market should be one that creates the initial demand
     for sector in sectors:
@@ -551,16 +545,12 @@ def find_equilibrium(
     else:
         included = ones(len(market.commodity), dtype=bool)
 
-    market["updated_prices"] = market.prices.copy().drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["updated_prices"] = market.prices.copy().drop_vars("timeslice")
     prior_market = market.copy(deep=True)
     converged = False
     equilibrium_sectors = sectors
     for i in range(maxiter):
-        market["prices"] = market.updated_prices.drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["prices"] = market.updated_prices.drop_vars("timeslice")
         prior_market, market = market, prior_market
         market.consumption[:] = 0.0
         market.supply[:] = 0.0
@@ -584,7 +574,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            ).drop_vars("timeslice")
 
             break
 
@@ -601,7 +591,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            ).drop_vars("timeslice")
         if not equilibrium:
             equilibrium_reached = True
             converged = True
@@ -628,7 +618,7 @@ def find_equilibrium(
         )
         market["prices"] = future_propagation(  # type: ignore
             market["prices"], new_price
-        ).drop_vars(["timeslice", "month", "day", "hour"])
+        ).drop_vars("timeslice")
         getLogger(__name__).critical(msg)
 
     return FindEquilibriumResults(
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 87af8f9a..5a38f301 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -142,7 +142,7 @@ def objectives(
         for name, objective in functions:
             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"])
+                obj = obj.drop_vars("timeslice")
             result[name] = obj
         return result
 
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index c93480bf..946148ec 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -364,7 +364,7 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
             agent_market = market.sel(year=output_year).copy()
             agent_market["consumption"] = (
                 agent_market.consumption * a.quantity
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            ).drop_vars("timeslice")
             included = [
                 i
                 for i in agent_market["commodity"].values
@@ -609,7 +609,7 @@ def sector_consumption(
             agent_market = market.sel(year=output_year).copy()
             agent_market["consumption"] = (
                 agent_market.consumption * a.quantity
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            ).drop_vars("timeslice")
             included = [
                 i
                 for i in agent_market["commodity"].values
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 2bdbbdec..cdc7bd4b 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -77,15 +77,15 @@ def factory(cls, name: str, settings: Any) -> PresetSector:
                 assert consumption.region.isin(shares.region).all()
                 if "timeslice" in shares.dims:
                     ts = shares.timeslice
-                    shares = shares.drop_vars(["timeslice", "month", "day", "hour"])
+                    shares = shares.drop_vars("timeslice")
                     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)
+            presets["consumption"] = consumption.drop_vars("timeslice").assign_coords(
+                timeslice=timeslice
+            )
 
         if getattr(sector_conf, "supply_path", None) is not None:
             supply = read_csv_outputs(sector_conf.supply_path)
@@ -116,7 +116,7 @@ def factory(cls, name: str, settings: Any) -> PresetSector:
             others = components.intersection(presets.data_vars).difference({component})
             if component not in presets and len(others) > 0:
                 presets[component] = zeros_like(presets[others.pop()]).drop_vars(
-                    ["timeslice", "month", "day", "hour"]
+                    "timeslice"
                 )
         # add timeslice, if missing
         for component in {"supply", "consumption"}:
@@ -168,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"])
+        ).drop_vars("timeslice")
         assert isinstance(result, Dataset)
         return result
 
diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py
index 846b379f..f1601a78 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -59,7 +59,7 @@ def invest(
             market = market.copy()
             market["prices"] = np.maximum(
                 market.prices, market.prices.rename(region="dst_region")
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            ).drop_vars("timeslice")
 
         for agent in self.agents:
             agent.asset_housekeeping()
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index e88149ed..f913a3ec 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -410,9 +410,7 @@ def _as_list(data: Union[xr.DataArray, xr.Dataset]) -> Union[xr.DataArray, xr.Da
             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
-        )
+        data = data.drop_vars("timeslice").assign_coords(mindex_coords)
     return data
 
 
diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py
index 6e835f7a..917ed46b 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"])
+    ).drop_vars("timeslice")
     market["prices"] = market.supply.dims, random(market.supply.shape)
 
     return market
diff --git a/tests/test_mca.py b/tests/test_mca.py
index ee07782b..388ee6c5 100644
--- a/tests/test_mca.py
+++ b/tests/test_mca.py
@@ -16,20 +16,14 @@ def test_check_equilibrium(market: Dataset):
     new_market = market.copy(deep=True)
 
     assert check_equilibrium(new_market, market, tol, equilibrium_variable)
-    new_market["supply"] = (
-        new_market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
-        + tol * 1.5
-    )
+    new_market["supply"] = new_market["supply"].drop_vars("timeslice") + 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"] = (
-        new_market["prices"].drop_vars(["timeslice", "month", "day", "hour"])
-        + tol * 1.5
-    )
+    new_market["prices"] = new_market["prices"].drop_vars("timeslice") + tol * 1.5
     assert not check_equilibrium(new_market, market, tol, equilibrium_variable)
 
 
@@ -39,16 +33,13 @@ def test_check_demand_fulfillment(market):
 
     tolerance_unmet_demand = -0.1
 
-    market["supply"] = market.consumption.copy(deep=True).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["supply"] = market.consumption.copy(deep=True).drop_vars("timeslice")
     assert check_demand_fulfillment(
         market,
         tolerance_unmet_demand,
     )
     market["supply"] = (
-        market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
-        + tolerance_unmet_demand * 1.5
+        market["supply"].drop_vars("timeslice") + tolerance_unmet_demand * 1.5
     )
     assert not check_demand_fulfillment(
         market,
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index 74439b1b..480a338d 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -460,7 +460,7 @@ def test_costed_production_exact_match(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = maxdemand.drop_vars(["timeslice", "month", "day", "hour"])
+    market["consumption"] = maxdemand.drop_vars("timeslice")
     result = costed_production(market.consumption, costs, capacity, technologies)
     assert isinstance(result, xr.DataArray)
     actual = xr.Dataset(dict(r=result)).groupby("region").sum("asset").r
@@ -487,9 +487,7 @@ def test_costed_production_single_region(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (0.9 * maxdemand).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = (0.9 * maxdemand).drop_vars("timeslice")
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -522,9 +520,7 @@ def test_costed_production_single_year(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (0.9 * maxdemand).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = (0.9 * maxdemand).drop_vars("timeslice")
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -560,9 +556,7 @@ def test_costed_production_over_capacity(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (maxdemand * 0.9).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = (maxdemand * 0.9).drop_vars("timeslice")
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -598,9 +592,7 @@ 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).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = (maxdemand * 0.9).drop_vars("timeslice")
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata

From 0a7463b60c759efaf137a015d408e34a53f44999 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Sun, 30 Jun 2024 22:13:37 +0100
Subject: [PATCH 318/419] Remove more hardcoded level names

---
 src/muse/investments.py |  6 +----
 src/muse/outputs/mca.py | 55 +++++++++++++++++------------------------
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/muse/investments.py b/src/muse/investments.py
index d6ed8248..9c40ef19 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -310,11 +310,7 @@ def scipy_match_demand(
 
     from muse.constraints import ScipyAdapter
 
-    df_technologies = (
-        technologies.to_dataframe()
-        .drop(["month", "day", "hour"], axis=1, errors="ignore")
-        .reset_index()
-    )
+    df_technologies = technologies.to_dataframe()
 
     if "timeslice" in costs.dims and timeslice_op is not None:
         costs = timeslice_op(costs)
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 946148ec..170bfbb9 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -396,26 +396,21 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
 
-            a = data_agent.to_dataframe("supply")
+            a = (
+                data_agent.reset_index("timeslice")
+                .to_dataframe("supply")
+                .reset_index()
+                .drop("timeslice", axis=1)
+            )
             a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-            if len(a) > 0 and len(a.technology.values) > 0:
-                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:
-        output = pd.concat([u for u in data_sector], sort=True)
+            if not a.empty:
+                data_sector.append(a[a["supply"] != 0])
 
+    if len(data_sector) > 0:
+        output = pd.concat([u for u in data_sector], sort=True).reset_index()
     else:
         output = pd.DataFrame()
-
-    # 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()
+    return output
 
 
 @register_output_quantity(name=["yearly_supply"])
@@ -643,26 +638,22 @@ def sector_consumption(
             data_agent["agent"] = a.name
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
-            a = data_agent.to_dataframe("consumption")
+
+            a = (
+                data_agent.reset_index("timeslice")
+                .to_dataframe("consumption")
+                .reset_index()
+                .drop("timeslice", axis=1)
+            )
             a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-            if len(a) > 0 and len(a.technology.values) > 0:
-                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:
-        output = pd.concat([u for u in data_sector], sort=True)
+            if not a.empty:
+                data_sector.append(a[a["consumption"] != 0])
 
+    if len(data_sector) > 0:
+        output = pd.concat([u for u in data_sector], sort=True).reset_index()
     else:
         output = pd.DataFrame()
-
-    # 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()
+    return output
 
 
 @register_output_quantity(name=["yearly_consumption"])

From 42c9f5797f1e1c631e53df33838810263f17e4a9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Sun, 30 Jun 2024 22:39:59 +0100
Subject: [PATCH 319/419] Drop index column from output files

---
 src/muse/outputs/mca.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 170bfbb9..a08b63fc 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -407,7 +407,11 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
                 data_sector.append(a[a["supply"] != 0])
 
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True).reset_index()
+        output = (
+            pd.concat([u for u in data_sector], sort=True)
+            .reset_index()
+            .drop("index", axis=1, errors="ignore")
+        )
     else:
         output = pd.DataFrame()
     return output
@@ -650,7 +654,11 @@ def sector_consumption(
                 data_sector.append(a[a["consumption"] != 0])
 
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True).reset_index()
+        output = (
+            pd.concat([u for u in data_sector], sort=True)
+            .reset_index()
+            .drop("index", axis=1, errors="ignore")
+        )
     else:
         output = pd.DataFrame()
     return output

From a66ec2200eeec727d1cc478fca3aa500e18ae9a4 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Sun, 30 Jun 2024 22:40:26 +0100
Subject: [PATCH 320/419] Regenerate results files

---
 .../Results/MCAMetric_Consumption.csv         | 590 ++++++------
 .../Results/MCAMetric_Supply.csv              | 878 +++++++++---------
 .../Results/MCAMetric_Consumption.csv         | 458 ++++-----
 .../Results/MCAMetric_Supply.csv              | 650 ++++++-------
 .../Results/MCAMetric_Consumption.csv         | 458 ++++-----
 .../Results/MCAMetric_Supply.csv              | 650 ++++++-------
 .../MCAMetric_Consumption.csv                 | 458 ++++-----
 .../default_timeslice/MCAMetric_Supply.csv    | 650 ++++++-------
 8 files changed, 2396 insertions(+), 2396 deletions(-)

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 3cbf732a..80927060 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,295 +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,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
+,agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+1,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+5,A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+8,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+10,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
+2,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+4,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
+5,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+7,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
+8,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+10,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
+11,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+13,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
+14,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+16,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
+17,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
+4,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
+5,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+6,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
+7,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
+8,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
+9,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+10,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
+11,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
+12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
+13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
+15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
+16,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
+17,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+18,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
+19,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
+20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
+21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
+23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
+5,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
+6,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+7,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
+8,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
+9,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
+10,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
+11,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+12,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
+13,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
+14,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
+15,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
+16,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+17,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
+18,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
+19,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
+20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
+21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
+23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
+24,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
+25,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
+26,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+27,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
+28,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
+29,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
+0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
+5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
+6,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
+7,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+8,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
+9,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
+10,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
+11,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
+12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
+13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
+15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
+16,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
+17,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
+18,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
+19,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+20,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
+21,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
+22,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
+23,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
+24,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
+25,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+26,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
+27,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
+28,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
+29,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
+30,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
+31,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+32,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
+33,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
+34,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
+35,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
+5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
+6,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
+7,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
+8,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+9,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
+10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
+11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
+12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
+13,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
+14,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
+15,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+16,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
+17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
+18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
+19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
+20,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
+21,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
+22,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+23,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
+24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
+25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
+26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
+27,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
+28,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
+29,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+30,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
+31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
+32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
+33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
+34,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
+35,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
+36,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+37,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
+38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
+39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
+40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
+41,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
+0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+2,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+4,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+8,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+10,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
+1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
+2,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
+5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,night,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
+6,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+7,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
+8,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
+9,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
+10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
+11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
+12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,morning,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
+13,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+14,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
+15,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
+16,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
+17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
+18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
+19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
+20,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+21,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
+22,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
+23,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
+24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
+25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
+26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
+27,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+28,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
+29,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
+30,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
+31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
+32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
+33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,1.12733333333,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
+34,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+35,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
+36,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
+37,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
+38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
+39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
+40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.75155555556,all-week,R1,evening,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
+41,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
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 33284fc1..bcfc0217 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,439 +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,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
+,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+1,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
+9,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
+10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,MUS$2010/PJ,2020
+1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,MUS$2010/PJ,2020
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,MUS$2010/PJ,2020
+3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,MUS$2010/PJ,2020
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,MUS$2010/PJ,2020
+5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,MUS$2010/PJ,2020
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+2,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+3,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+4,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+9,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+10,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
+14,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
+15,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
+16,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
+17,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,MUS$2010/PJ,2025
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2025
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2025
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,MUS$2010/kt,2025
+4,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,MUS$2010/PJ,2025
+5,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2025
+6,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2025
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,MUS$2010/kt,2025
+8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,MUS$2010/PJ,2025
+9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2025
+10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2025
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,MUS$2010/kt,2025
+12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,MUS$2010/PJ,2025
+13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2025
+14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2025
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,MUS$2010/kt,2025
+16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2025
+17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2025
+18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2025
+19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2025
+20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,MUS$2010/PJ,2025
+21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2025
+22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2025
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,MUS$2010/kt,2025
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.40572222222,gassupply1,MUS$2010/PJ,2025
+1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.60858333333,gassupply1,MUS$2010/PJ,2025
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.40572222222,gassupply1,MUS$2010/PJ,2025
+3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.60858333333,gassupply1,MUS$2010/PJ,2025
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.21716666667,gassupply1,MUS$2010/PJ,2025
+5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.81144444444,gassupply1,MUS$2010/PJ,2025
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
+19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
+23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2030
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2030
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2030
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2030
+4,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2030
+5,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2030
+6,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2030
+7,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2030
+8,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2030
+9,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2030
+10,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2030
+11,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2030
+12,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2030
+13,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2030
+14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2030
+15,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2030
+16,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2030
+17,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2030
+18,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2030
+19,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2030
+20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2030
+21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2030
+22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2030
+23,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2030
+24,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2030
+25,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2030
+26,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2030
+27,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2030
+28,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2030
+29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2030
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2030
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2030
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2030
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2030
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2030
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2030
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2030
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2030
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.12500000000,gassupply1,MUS$2010/PJ,2030
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,MUS$2010/PJ,2030
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.75000000000,gassupply1,MUS$2010/PJ,2030
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,MUS$2010/PJ,2030
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
+19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2035
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2035
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2035
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2035
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2035
+5,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2035
+6,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2035
+7,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2035
+8,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2035
+9,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2035
+10,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2035
+11,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2035
+12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2035
+13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2035
+14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2035
+15,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2035
+16,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2035
+17,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2035
+18,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2035
+19,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2035
+20,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2035
+21,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2035
+22,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2035
+23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2035
+24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2035
+25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2035
+26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2035
+27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2035
+28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2035
+29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2035
+30,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2035
+31,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2035
+32,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2035
+33,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2035
+34,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2035
+35,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2035
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2035
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2035
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2035
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2035
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2035
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2035
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2035
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2035
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,MUS$2010/PJ,2035
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.12500000000,gassupply1,MUS$2010/PJ,2035
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,MUS$2010/PJ,2035
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.75000000000,gassupply1,MUS$2010/PJ,2035
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
+19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
+23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2040
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2040
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2040
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2040
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2040
+5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2040
+6,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2040
+7,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2040
+8,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2040
+9,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2040
+10,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2040
+11,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2040
+12,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2040
+13,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2040
+14,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2040
+15,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2040
+16,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2040
+17,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2040
+18,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2040
+19,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2040
+20,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2040
+21,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2040
+22,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2040
+23,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2040
+24,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2040
+25,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2040
+26,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2040
+27,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2040
+28,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2040
+29,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2040
+30,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2040
+31,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2040
+32,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2040
+33,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,MUS$2010/PJ,2040
+34,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2040
+35,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2040
+36,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2040
+37,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2040
+38,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2040
+39,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2040
+40,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,MUS$2010/PJ,2040
+41,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2040
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2040
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2040
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2040
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2040
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2040
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2040
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2040
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2040
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,MUS$2010/PJ,2040
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,MUS$2010/PJ,2040
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,MUS$2010/PJ,2040
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,MUS$2010/PJ,2040
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
+19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2045
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2045
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2045
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2045
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
+5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2045
+6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
+7,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2045
+8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2045
+9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2045
+10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2045
+11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2045
+12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
+13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2045
+14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
+15,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2045
+16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2045
+17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2045
+18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2045
+19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2045
+20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
+21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2045
+22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
+23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2045
+24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2045
+25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2045
+26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2045
+27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2045
+28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
+29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2045
+30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
+31,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2045
+32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2045
+33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2045
+34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2045
+35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2045
+36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2045
+37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,MUS$2010/PJ,2045
+38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2045
+39,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2045
+40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2045
+41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2045
+42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2045
+43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2045
+44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2045
+45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,MUS$2010/PJ,2045
+46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2045
+47,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2045
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2045
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2045
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2045
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2045
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2045
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2045
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2045
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2045
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,MUS$2010/PJ,2045
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,MUS$2010/PJ,2045
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,MUS$2010/PJ,2045
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,MUS$2010/PJ,2045
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+3,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
+10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
+11,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2050
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2050
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2050
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
+5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.37577777778,solarPV,MUS$2010/PJ,2050
+6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2050
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2050
+8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2050
+9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2050
+10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
+11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2050
+12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
+13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.56366666667,solarPV,MUS$2010/PJ,2050
+14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2050
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2050
+16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2050
+17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2050
+18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
+19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2050
+20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
+21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.37577777778,solarPV,MUS$2010/PJ,2050
+22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2050
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2050
+24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2050
+25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2050
+26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
+27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2050
+28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
+29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.56366666667,solarPV,MUS$2010/PJ,2050
+30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2050
+31,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2050
+32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2050
+33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2050
+34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2050
+35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,MUS$2010/PJ,2050
+36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2050
+37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,1.12733333333,solarPV,MUS$2010/PJ,2050
+38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2050
+39,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2050
+40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2050
+41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2050
+42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2050
+43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,MUS$2010/PJ,2050
+44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2050
+45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.75155555556,solarPV,MUS$2010/PJ,2050
+46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2050
+47,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2050
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.06799865084,gassupply1,MUS$2010/PJ,2050
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.18250134916,gassupply1,MUS$2010/PJ,2050
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.10199797625,gassupply1,MUS$2010/PJ,2050
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.27375202375,gassupply1,MUS$2010/PJ,2050
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.06799865084,gassupply1,MUS$2010/PJ,2050
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.18250134916,gassupply1,MUS$2010/PJ,2050
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.10199797625,gassupply1,MUS$2010/PJ,2050
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.27375202375,gassupply1,MUS$2010/PJ,2050
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.20399595251,gassupply1,MUS$2010/PJ,2050
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.54750404749,gassupply1,MUS$2010/PJ,2050
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.13599730167,gassupply1,MUS$2010/PJ,2050
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.36500269833,gassupply1,MUS$2010/PJ,2050
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 69eb3a4f..33cb2ba9 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,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
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
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 e5a087bc..a503ba6f 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,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
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,MUS$2010/PJ,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 203194bc..41161810 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,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
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.29933962264,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.24297693920,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.63039735099,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25584988962,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.42026490066,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.17056659308,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.44900943396,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.36446540881,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.89801886792,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.72893081761,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.59867924528,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.48595387841,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.73008317930,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.99658348737,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.48672211953,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66438899158,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57971201589,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.79132274081,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.75563190996,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38647467726,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.52754849388,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.50375460664,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.52391847105,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.71516302770,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.68290720926,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.81734462532,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.34927898070,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.47677535180,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45527147284,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.54489641688,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.46361751743,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.63285057844,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.60430727773,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.72327147640,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.71528648334,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.30907834495,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.42190038562,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.40287151849,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48218098427,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.47685765556,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.64842582327,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.61918003621,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74107209271,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.73289057897,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.85843146883,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.43228388218,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41278669081,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49404806181,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48859371932,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.57228764589,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
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 d24d8c30..4f4464d5 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,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
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17924528302,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24297693920,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,16.43141509434,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.37748344371,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.25584988962,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,34.60390728477,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.25165562914,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17056659308,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,23.06927152318,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26886792453,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36446540881,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,24.64712264151,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.53773584906,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.72893081761,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,49.29424528302,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.35849056604,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48595387841,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,32.86283018868,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24336105977,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33219449579,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.36504158965,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.49829174368,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.24336105977,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33219449579,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36504158965,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.49829174368,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.73008317930,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.99658348737,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48672211953,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66438899158,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.19323733863,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.26377424694,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.25187730332,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.28985600794,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.39566137041,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.37781595498,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.19323733863,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.26377424694,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.25187730332,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.28985600794,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.39566137041,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.37781595498,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.57971201589,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.79132274081,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.75563190996,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.38647467726,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.52754849388,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.50375460664,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17463949035,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.23838767590,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.22763573642,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.27244820844,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.26195923553,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.35758151385,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.34145360463,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40867231266,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17463949035,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.23838767590,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.22763573642,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.27244820844,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26195923553,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.35758151385,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.34145360463,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40867231266,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.52391847105,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.71516302770,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.68290720926,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.81734462532,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.34927898070,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.47677535180,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.45527147284,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.54489641688,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15453917248,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21095019281,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20143575924,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24109049213,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.23842882778,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23180875871,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.31642528922,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30215363886,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.36163573820,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.35764324167,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15453917248,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21095019281,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20143575924,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24109049213,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.23842882778,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23180875871,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.31642528922,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30215363886,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.36163573820,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.35764324167,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46361751743,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.63285057844,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.60430727773,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.72327147640,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.71528648334,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30907834495,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.42190038562,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.40287151849,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.48218098427,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.47685765556,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21614194109,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20639334540,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24702403090,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.24429685966,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.28614382294,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.32421291164,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30959001810,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37053604636,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.36644528949,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.42921573441,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21614194109,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20639334540,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24702403090,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.24429685966,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.28614382294,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.32421291164,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30959001810,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37053604636,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.36644528949,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.42921573441,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.64842582327,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.61918003621,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74107209271,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.73289057897,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.85843146883,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.43228388218,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41278669081,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49404806181,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.48859371932,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.57228764589,windturbine,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
index 69eb3a4f..33cb2ba9 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,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
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
index 0f6d4a88..78834429 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,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
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.12888888889,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.13533333333,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.19333333333,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.20300000000,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.12888888889,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.13533333333,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.19333333333,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.20300000000,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.38666666667,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.40600000000,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.25777777778,gassupply1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.27066666667,gassupply1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,MUS$2010/PJ,2050

From b7d5dfe2d585a519f6c18cf6f0149de885590620 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 09:12:46 +0100
Subject: [PATCH 321/419] Revert "Remove timeslice level names from drop_vars
 statements"

This reverts commit ceee06ec5f55ee8fd5b1f1b777faaeb1bc8dc120.
---
 src/muse/agents/agent.py          |  2 +-
 src/muse/constraints.py           |  4 ++--
 src/muse/demand_matching.py       |  2 +-
 src/muse/examples.py              | 10 +++++++---
 src/muse/mca.py                   | 26 ++++++++++++++++++--------
 src/muse/objectives.py            |  2 +-
 src/muse/outputs/mca.py           |  4 ++--
 src/muse/sectors/preset_sector.py | 12 ++++++------
 src/muse/sectors/subsector.py     |  2 +-
 tests/test_constraints.py         |  4 +++-
 tests/test_demand_share.py        |  2 +-
 tests/test_mca.py                 | 17 +++++++++++++----
 tests/test_quantities.py          | 18 +++++++++++++-----
 13 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index ed647201..8146711b 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -416,7 +416,7 @@ def next(
             return None
 
         if "timeslice" in search.dims:
-            search["demand"] = demand.drop_vars("timeslice")
+            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"]
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 582770a3..b75c08f3 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -622,7 +622,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")
+            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))
@@ -689,7 +689,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")
+            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})
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index 50328e91..0a9c94d5 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -248,7 +248,7 @@ def demand_matching(
 
     if len(multics) > 0:
         for k in multics:
-            ds = ds.drop_vars("timeslice")
+            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 90939b16..a888763f 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -192,8 +192,12 @@ def mca_market(model: str = "default") -> xr.Dataset:
             .sel(region=settings.regions)
             .interp(year=settings.time_framework, method=settings.interpolation_mode)
         )
-        market["supply"] = zeros_like(market.exports).drop_vars("timeslice")
-        market["consumption"] = zeros_like(market.exports).drop_vars("timeslice")
+        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: str, model: str = "default") -> xr.Dataset:
                 {"asset", "dst_region"}.intersection(consump.dims)
             )
             + market.supply
-        ).drop_vars("timeslice")
+        ).drop_vars(["timeslice", "month", "day", "hour"])
     else:
         market["consumption"] = (
             consumption(loaded_sector.technologies, production).sum(
diff --git a/src/muse/mca.py b/src/muse/mca.py
index 2f5b8105..ac7a27e2 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -59,8 +59,12 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA:
             ).sel(region=settings.regions)
         ).interp(year=settings.time_framework, method=settings.interpolation_mode)
 
-        market["supply"] = zeros_like(market.exports).drop_vars("timeslice")
-        market["consumption"] = zeros_like(market.exports).drop_vars("timeslice")
+        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 = []
@@ -457,7 +461,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().drop_vars("timeslice")
+        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:
@@ -545,12 +551,16 @@ def find_equilibrium(
     else:
         included = ones(len(market.commodity), dtype=bool)
 
-    market["updated_prices"] = market.prices.copy().drop_vars("timeslice")
+    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.drop_vars("timeslice")
+        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
@@ -574,7 +584,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            ).drop_vars("timeslice")
+            ).drop_vars(["timeslice", "month", "day", "hour"])
 
             break
 
@@ -591,7 +601,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            ).drop_vars("timeslice")
+            ).drop_vars(["timeslice", "month", "day", "hour"])
         if not equilibrium:
             equilibrium_reached = True
             converged = True
@@ -618,7 +628,7 @@ def find_equilibrium(
         )
         market["prices"] = future_propagation(  # type: ignore
             market["prices"], new_price
-        ).drop_vars("timeslice")
+        ).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 5a38f301..87af8f9a 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -142,7 +142,7 @@ def objectives(
         for name, objective in functions:
             obj = objective(agent, demand, search_space, *args, **kwargs)
             if "timeslice" in obj.dims and "timeslice" in result.dims:
-                obj = obj.drop_vars("timeslice")
+                obj = obj.drop_vars(["timeslice", "month", "day", "hour"])
             result[name] = obj
         return result
 
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index a08b63fc..96ccaf83 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -364,7 +364,7 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
             agent_market = market.sel(year=output_year).copy()
             agent_market["consumption"] = (
                 agent_market.consumption * a.quantity
-            ).drop_vars("timeslice")
+            ).drop_vars(["timeslice", "month", "day", "hour"])
             included = [
                 i
                 for i in agent_market["commodity"].values
@@ -608,7 +608,7 @@ def sector_consumption(
             agent_market = market.sel(year=output_year).copy()
             agent_market["consumption"] = (
                 agent_market.consumption * a.quantity
-            ).drop_vars("timeslice")
+            ).drop_vars(["timeslice", "month", "day", "hour"])
             included = [
                 i
                 for i in agent_market["commodity"].values
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index cdc7bd4b..2bdbbdec 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -77,15 +77,15 @@ def factory(cls, name: str, settings: Any) -> PresetSector:
                 assert consumption.region.isin(shares.region).all()
                 if "timeslice" in shares.dims:
                     ts = shares.timeslice
-                    shares = shares.drop_vars("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").assign_coords(
-                timeslice=timeslice
-            )
+            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)
@@ -116,7 +116,7 @@ def factory(cls, name: str, settings: Any) -> PresetSector:
             others = components.intersection(presets.data_vars).difference({component})
             if component not in presets and len(others) > 0:
                 presets[component] = zeros_like(presets[others.pop()]).drop_vars(
-                    "timeslice"
+                    ["timeslice", "month", "day", "hour"]
                 )
         # add timeslice, if missing
         for component in {"supply", "consumption"}:
@@ -168,7 +168,7 @@ def next(self, mca_market: Dataset) -> Dataset:
         )
         result["costs"] = convert_timeslice(
             costs, mca_market.timeslice, QuantityType.INTENSIVE
-        ).drop_vars("timeslice")
+        ).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 f1601a78..846b379f 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -59,7 +59,7 @@ def invest(
             market = market.copy()
             market["prices"] = np.maximum(
                 market.prices, market.prices.rename(region="dst_region")
-            ).drop_vars("timeslice")
+            ).drop_vars(["timeslice", "month", "day", "hour"])
 
         for agent in self.agents:
             agent.asset_housekeeping()
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index f913a3ec..e88149ed 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -410,7 +410,9 @@ def _as_list(data: Union[xr.DataArray, xr.Dataset]) -> Union[xr.DataArray, xr.Da
             data.get_index("timeslice"), names=("month", "day", "hour")
         )
         mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "timeslice")
-        data = data.drop_vars("timeslice").assign_coords(mindex_coords)
+        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 917ed46b..6e835f7a 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")
+    ).drop_vars(["timeslice", "month", "day", "hour"])
     market["prices"] = market.supply.dims, random(market.supply.shape)
 
     return market
diff --git a/tests/test_mca.py b/tests/test_mca.py
index 388ee6c5..ee07782b 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"] = new_market["supply"].drop_vars("timeslice") + 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"] = new_market["prices"].drop_vars("timeslice") + 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,13 +39,16 @@ def test_check_demand_fulfillment(market):
 
     tolerance_unmet_demand = -0.1
 
-    market["supply"] = market.consumption.copy(deep=True).drop_vars("timeslice")
+    market["supply"] = market.consumption.copy(deep=True).drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     assert check_demand_fulfillment(
         market,
         tolerance_unmet_demand,
     )
     market["supply"] = (
-        market["supply"].drop_vars("timeslice") + tolerance_unmet_demand * 1.5
+        market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
+        + tolerance_unmet_demand * 1.5
     )
     assert not check_demand_fulfillment(
         market,
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index 480a338d..74439b1b 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -460,7 +460,7 @@ def test_costed_production_exact_match(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = maxdemand.drop_vars("timeslice")
+    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
@@ -487,7 +487,9 @@ def test_costed_production_single_region(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (0.9 * maxdemand).drop_vars("timeslice")
+    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
@@ -520,7 +522,9 @@ def test_costed_production_single_year(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (0.9 * maxdemand).drop_vars("timeslice")
+    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
@@ -556,7 +560,9 @@ def test_costed_production_over_capacity(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (maxdemand * 0.9).drop_vars("timeslice")
+    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
@@ -592,7 +598,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).drop_vars("timeslice")
+    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

From b068bc1f605139b9173751330201d37d7d3f7188 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 09:20:35 +0100
Subject: [PATCH 322/419] Update results file

---
 .../minimum_service/MCAMetric_Supply.csv      | 410 +++++++++---------
 1 file changed, 205 insertions(+), 205 deletions(-)

diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
index 9cf2795a..6e6fd26c 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,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
+,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,MUS$2010/kt,2010
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,MUS$2010/kt,2010
+2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,MUS$2010/Mt,2010
+3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,MUS$2010/Mt,2010
+4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,MUS$2010/kt,2010
+5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,MUS$2010/kt,2010
+6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,MUS$2010/Mt,2010
+7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,MUS$2010/Mt,2010
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,MUS$2010/kt,2010
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,MUS$2010/kt,2010
+10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,MUS$2010/Mt,2010
+11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,MUS$2010/Mt,2010
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,MUS$2010/kt,2015
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,MUS$2010/kt,2015
+2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,MUS$2010/Mt,2015
+3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,MUS$2010/Mt,2015
+4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,MUS$2010/kt,2015
+5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,MUS$2010/kt,2015
+6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,MUS$2010/Mt,2015
+7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,MUS$2010/Mt,2015
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,MUS$2010/kt,2015
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,MUS$2010/kt,2015
+10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,MUS$2010/Mt,2015
+11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,MUS$2010/Mt,2015
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,MUS$2010/kt,2020
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,MUS$2010/kt,2020
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,MUS$2010/kt,2020
+3,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,MUS$2010/Mt,2020
+4,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,MUS$2010/Mt,2020
+5,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,MUS$2010/Mt,2020
+6,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,MUS$2010/kt,2020
+7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,MUS$2010/kt,2020
+8,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,MUS$2010/kt,2020
+9,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,MUS$2010/Mt,2020
+10,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,MUS$2010/Mt,2020
+11,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2020
+12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,MUS$2010/kt,2020
+13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,MUS$2010/kt,2020
+14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,MUS$2010/kt,2020
+15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,MUS$2010/Mt,2020
+16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,MUS$2010/Mt,2020
+17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,MUS$2010/Mt,2020
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,MUS$2010/kt,2025
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,MUS$2010/kt,2025
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,MUS$2010/kt,2025
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,MUS$2010/kt,2025
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,MUS$2010/Mt,2025
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,MUS$2010/Mt,2025
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,MUS$2010/Mt,2025
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,MUS$2010/Mt,2025
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,MUS$2010/kt,2025
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,MUS$2010/kt,2025
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,MUS$2010/kt,2025
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,MUS$2010/kt,2025
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,MUS$2010/Mt,2025
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,MUS$2010/Mt,2025
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2025
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2025
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,MUS$2010/kt,2025
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,MUS$2010/kt,2025
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,MUS$2010/kt,2025
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,MUS$2010/kt,2025
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,MUS$2010/Mt,2025
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,MUS$2010/Mt,2025
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,MUS$2010/Mt,2025
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,MUS$2010/Mt,2025
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,MUS$2010/kt,2030
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,MUS$2010/kt,2030
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,MUS$2010/kt,2030
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,MUS$2010/kt,2030
+4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,MUS$2010/kt,2030
+5,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,MUS$2010/Mt,2030
+6,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,MUS$2010/Mt,2030
+7,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,MUS$2010/Mt,2030
+8,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,MUS$2010/Mt,2030
+9,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,MUS$2010/Mt,2030
+10,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,MUS$2010/kt,2030
+11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,MUS$2010/kt,2030
+12,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,MUS$2010/kt,2030
+13,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,MUS$2010/kt,2030
+14,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,MUS$2010/kt,2030
+15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,MUS$2010/Mt,2030
+16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,MUS$2010/Mt,2030
+17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2030
+18,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2030
+19,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2030
+20,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,MUS$2010/kt,2030
+21,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,MUS$2010/kt,2030
+22,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,MUS$2010/kt,2030
+23,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,MUS$2010/kt,2030
+24,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,MUS$2010/kt,2030
+25,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,MUS$2010/Mt,2030
+26,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,MUS$2010/Mt,2030
+27,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,MUS$2010/Mt,2030
+28,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,MUS$2010/Mt,2030
+29,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,MUS$2010/Mt,2030
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,MUS$2010/kt,2035
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,MUS$2010/kt,2035
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,MUS$2010/kt,2035
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,MUS$2010/kt,2035
+4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,MUS$2010/kt,2035
+5,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,MUS$2010/kt,2035
+6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,MUS$2010/Mt,2035
+7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,MUS$2010/Mt,2035
+8,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,MUS$2010/Mt,2035
+9,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,MUS$2010/Mt,2035
+10,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,MUS$2010/Mt,2035
+11,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,MUS$2010/Mt,2035
+12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,MUS$2010/kt,2035
+13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,MUS$2010/kt,2035
+14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,MUS$2010/kt,2035
+15,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,MUS$2010/kt,2035
+16,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,MUS$2010/kt,2035
+17,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,MUS$2010/kt,2035
+18,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,MUS$2010/Mt,2035
+19,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,MUS$2010/Mt,2035
+20,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2035
+21,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2035
+22,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2035
+23,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2035
+24,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,MUS$2010/kt,2035
+25,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,MUS$2010/kt,2035
+26,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,MUS$2010/kt,2035
+27,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,MUS$2010/kt,2035
+28,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,MUS$2010/kt,2035
+29,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,MUS$2010/kt,2035
+30,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,MUS$2010/Mt,2035
+31,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,MUS$2010/Mt,2035
+32,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,MUS$2010/Mt,2035
+33,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,MUS$2010/Mt,2035
+34,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,MUS$2010/Mt,2035
+35,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,MUS$2010/Mt,2035
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,MUS$2010/kt,2040
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,MUS$2010/kt,2040
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,MUS$2010/kt,2040
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,MUS$2010/kt,2040
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,MUS$2010/Mt,2040
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,MUS$2010/Mt,2040
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,MUS$2010/Mt,2040
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,MUS$2010/Mt,2040
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,MUS$2010/kt,2040
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,MUS$2010/kt,2040
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,MUS$2010/kt,2040
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,MUS$2010/kt,2040
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2040
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2040
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2040
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,MUS$2010/Mt,2040
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,MUS$2010/kt,2040
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,MUS$2010/kt,2040
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,MUS$2010/kt,2040
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,MUS$2010/kt,2040
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,MUS$2010/Mt,2040
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,MUS$2010/Mt,2040
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,MUS$2010/Mt,2040
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,MUS$2010/Mt,2040
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,MUS$2010/kt,2045
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,MUS$2010/kt,2045
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,MUS$2010/kt,2045
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,MUS$2010/kt,2045
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,MUS$2010/Mt,2045
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,MUS$2010/Mt,2045
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,MUS$2010/Mt,2045
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,MUS$2010/Mt,2045
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,MUS$2010/kt,2045
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,MUS$2010/kt,2045
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,MUS$2010/kt,2045
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,MUS$2010/kt,2045
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2045
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2045
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,MUS$2010/Mt,2045
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,MUS$2010/Mt,2045
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,MUS$2010/kt,2045
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,MUS$2010/kt,2045
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,MUS$2010/kt,2045
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,MUS$2010/kt,2045
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,MUS$2010/Mt,2045
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,MUS$2010/Mt,2045
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,MUS$2010/Mt,2045
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,MUS$2010/Mt,2045
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,MUS$2010/kt,2050
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,MUS$2010/kt,2050
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,MUS$2010/kt,2050
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,MUS$2010/kt,2050
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,MUS$2010/Mt,2050
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,MUS$2010/Mt,2050
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,MUS$2010/Mt,2050
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,MUS$2010/Mt,2050
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,MUS$2010/kt,2050
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,MUS$2010/kt,2050
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,MUS$2010/kt,2050
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,MUS$2010/kt,2050
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2050
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,MUS$2010/Mt,2050
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,MUS$2010/Mt,2050
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,MUS$2010/Mt,2050
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,MUS$2010/kt,2050
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,MUS$2010/kt,2050
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,MUS$2010/kt,2050
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,MUS$2010/kt,2050
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,MUS$2010/Mt,2050
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,MUS$2010/Mt,2050
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,MUS$2010/Mt,2050
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,MUS$2010/Mt,2050

From 6fb7c9ef72ed217bcc7c4ba774b20d466905a243 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 1 Jul 2024 12:31:54 +0100
Subject: [PATCH 323/419] Update test_docs_notebooks.py

Revoked changes to exclude the test in case input file is not there as per discussion for pull requests.

Updated the manual to instruct users to run the default model on Muse to complete the installation. This ensures all tests pass (some may be skipped) and avoids including model results files in the codebase.
---
 tests/test_docs_notebooks.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/test_docs_notebooks.py b/tests/test_docs_notebooks.py
index f4153172..2d2d94cd 100644
--- a/tests/test_docs_notebooks.py
+++ b/tests/test_docs_notebooks.py
@@ -7,9 +7,6 @@
 
 def available_notebooks() -> list[Path]:
     """Locate the available notebooks in the docs."""
-    if not Path("Results/MCACapacity.csv").exists():
-        return []
-
     base_path = Path(__file__).parent.parent / "docs"
     return [p for p in base_path.rglob("*.ipynb") if "build" not in str(p)]
 

From 8c05a6b87a49b667790fce78433482ca386512af Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 1 Jul 2024 12:51:59 +0100
Subject: [PATCH 324/419] Update docs/installation/pipx-based.rst

Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
---
 docs/installation/pipx-based.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 9af0b111..0418b6dc 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -17,7 +17,7 @@ In the following sections, we will guide you step by step in configuring your sy
     The next sections will explain in detail the appropriate steps as well as commenting on possible caveats. **We strongly encourage you to read through the sections below** to understand what these steps entitle, but in the end, what we are going to do to install MUSE is the following:
 
     - Open a terminal
-    - Install `pyenv <https://github.com/pyenv/pyenv>`_ (Linux and MacOS) or `pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ (Windows) and ascertain it works by invoking `pyenv --version` in the terminal.
+    - Install `pyenv <https://github.com/pyenv/pyenv>`_ (Linux and MacOS) or `pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ (Windows) and make sure it works by invoking `pyenv --version` in the terminal.
     - Run the following commands in the terminal:
 
         .. code-block::

From 90d401ec563477ef72655c0cb3afe5e8d78153db Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 17:32:54 +0100
Subject: [PATCH 325/419] Enable consumption data with no timeslice info

---
 src/muse/sectors/preset_sector.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 2bdbbdec..c800b96d 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -116,13 +116,13 @@ def factory(cls, name: str, settings: Any) -> PresetSector:
             others = components.intersection(presets.data_vars).difference({component})
             if component not in presets and len(others) > 0:
                 presets[component] = zeros_like(presets[others.pop()]).drop_vars(
-                    ["timeslice", "month", "day", "hour"]
+                    ["timeslice", "month", "day", "hour"], errors="ignore"
                 )
         # add timeslice, if missing
         for component in {"supply", "consumption"}:
             if "timeslice" not in presets[component].dims:
                 presets[component] = convert_timeslice(
-                    presets[component], presets.timeslice, QuantityType.EXTENSIVE
+                    presets[component], timeslice, QuantityType.EXTENSIVE
                 )
 
         comm_usage = (presets.costs > 0).any(set(presets.costs.dims) - {"commodity"})
@@ -168,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"])
+        ).drop_vars(["timeslice", "month", "day", "hour"], errors="ignore")
         assert isinstance(result, Dataset)
         return result
 

From 482a04c9b033ca907900929a5ea08f4917b96fb8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 17:08:22 +0000
Subject: [PATCH 326/419] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.10 → v0.5.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.10...v0.5.0)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7a496e27..0f078380 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.10
+    rev: v0.5.0
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]

From e08ffc458a45b65075397fed69e04b8e7ba67c70 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 17:08:33 +0000
Subject: [PATCH 327/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/muse_gui/__main__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse_gui/__main__.py b/src/muse_gui/__main__.py
index 96975bd6..d42493de 100644
--- a/src/muse_gui/__main__.py
+++ b/src/muse_gui/__main__.py
@@ -8,8 +8,8 @@
     raise ImportError(msg)
 
 os.environ["MUSE_COLOR_LOG"] = "False"
-from muse import VERSION  # noqa
-from muse.__main__ import muse_main  # noqa
+from muse import VERSION
+from muse.__main__ import muse_main
 
 parser = GooeyParser(description="Run a MUSE simulation")
 parser.add_argument(

From 10d82fa804f711d66218736845a048bd3f37f2d8 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 1 Jul 2024 18:31:31 +0100
Subject: [PATCH 328/419] Made documentation clearer regarding installation of
 pyenv on Windows and Linux. Added detailed instructions on how to install
 pyenv from both, terminal and powershell and provided a link to the official
 documentation of pyenv for users interested in a detailed discussion.

Also, I added a new section 3.3 of the documentation that explains how to create a virtual environment using `pyenv + venv`.
---
 docs/installation/pipx-based.rst        | 48 ++++++++++++-------------
 docs/installation/virtual-env-based.rst | 23 ++++++++++--
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 9af0b111..8fe93582 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -17,7 +17,7 @@ In the following sections, we will guide you step by step in configuring your sy
     The next sections will explain in detail the appropriate steps as well as commenting on possible caveats. **We strongly encourage you to read through the sections below** to understand what these steps entitle, but in the end, what we are going to do to install MUSE is the following:
 
     - Open a terminal
-    - Install `pyenv <https://github.com/pyenv/pyenv>`_ (Linux and MacOS) or `pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ (Windows) and ascertain it works by invoking `pyenv --version` in the terminal.
+    - Install `pyenv <https://github.com/pyenv/pyenv>`_ (Linux and MacOS) or `pyenv-win <https://pyenv-win.github.io/pyenv-win/>`_ (Windows) and make sure it works by invoking `pyenv --version` in the terminal.
     - Run the following commands in the terminal:
 
         .. code-block::
@@ -28,7 +28,7 @@ In the following sections, we will guide you step by step in configuring your sy
             python -m pipx ensurepath
             python -m pipx install muse-os
 
-    - After this, MUSE will be available to use system wide simply by invoking ``muse`` in the terminal, for example ``muse --model default``.
+    - After this, MUSE will be available to use system wide simply by invoking ``muse`` in the terminal. To illustrate this and to finish installation, run ``muse --model default``.
 
 .. _launch-terminal:
 
@@ -109,25 +109,25 @@ To install ``pyenv``, follow these steps:
 
 - **Linux**: In this case, you will need to clone the GitHub repository using ``git``. Most Linux distributions come with ``git`` installed, so this should work out of the box.
 Then, complete the setup by adding ``pyenv`` to your profile, so the executable can be found. You can `check the instructions in the official webpage <https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv>`_,
-    or follow the below commands that were tested on `Ubuntu 22.04 LTS` using its popular `bash shell` and `z-shell`. To be specific, we tested them
-    on `GNU bash, version 5.1.16(1)-release (x86_64-pc-linux-gnu)` and `zsh 5.8.1 (x86_64-ubuntu-linux-gnu)`.
+or follow the below commands that were tested on `Ubuntu 22.04 LTS` using its popular `bash shell` and `z-shell`. To be specific, we tested them
+on `GNU bash, version 5.1.16(1)-release (x86_64-pc-linux-gnu)` and `zsh 5.8.1 (x86_64-ubuntu-linux-gnu)`.
 
-    We now go through the installation procedure of `pyenv` on Linux, step-by-step:
+Now, we go through the installation procedure of ``pyenv`` on Linux, step-by-step:
 
  .. code-block::
 
             # Step 1: Install essential libraries needed for pyenv
             sudo apt install -y make build-essential libssl-dev zlib1g-dev \
-            libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev \
-            libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python3-openssl \
-            git
+                libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev \
+                libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python3-openssl \
+                git
 
 
             # Step 2: Clone the `pyenv` repository for Linux
             git clone https://github.com/pyenv/pyenv.git ~/.pyenv
 
 
-            #Step 3: Run one code block in this step only, depending on what shell you use:
+            # Step 3: Run one code block in this step only, depending on what shell you use:
 
             # If you are on the bash shell run the following:
             echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc
@@ -160,13 +160,13 @@ but the easiest way is to run the following command in the ``powershell`` and, u
 
     .. code-block:: powershell
 
-        # Step 1:
-        Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/pyenv-win/pyenv-win/master/pyenv-win/install-pyenv-win.ps1" -OutFile "./install-pyenv-win.ps1"; &"./install-pyenv-win.ps1"
+        # Step 1: In your powershell, invoke the following command:
+        `Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/pyenv-win/pyenv-win/master/pyenv-win/install-pyenv-win.ps1" -OutFile "./install-pyenv-win.ps1"; &"./install-pyenv-win.ps1"`
 
         # Step 2: close the shell you invoked in the command from Step 1 and re-launch an new `powershell`. This is equivalent to invoke the shell command `source` in Linux.
 
         # Step 3: Confirm success; you should be returned something similar to `pyenv 3.1.1`
-        pyenv --version
+        `pyenv --version`
 
     .. note::
 
@@ -179,7 +179,7 @@ but the easiest way is to run the following command in the ``powershell`` and, u
         Finally open a normal PowerShell and re-run the above installation command.
 
 
-Actually installing Python
+Installing your chosen Python version
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 With ``pyenv`` installed and correctly configured, it is now easy to install any Python version we want. To see the versions available run:
@@ -188,22 +188,22 @@ With ``pyenv`` installed and correctly configured, it is now easy to install any
 
     pyenv install -l
 
-You should see a very long list of versions to choose from. Let us install the latest version of the 3.9 family:
+You should see a long list of versions to choose from. Let's install one of the later version of the 3.9 family:
 
 .. code-block:: bash
 
-    pyenv install 3.9.19
+    pyenv install 3.9.13
 
-The command will take a minute or two to complete, depending on your internet connection, and show an output similar to the following (this is just an example for Windows):
+The command will take a minute or two to complete, depending on your internet connection, and show an output similar to the following (this is an example from Windows):
 
 .. code-block:: output
 
     :: [Info] ::  Mirror: https://www.python.org/ftp/python
-    :: [Downloading] ::  3.9.19 ...
-    :: [Downloading] ::  From https://www.python.org/ftp/python/3.9.19/python-3.9.19-amd64.exe
-    :: [Downloading] ::  To   C:\Users\your_username\.pyenv\pyenv-win\install_cache\python-3.9.19-amd64.exe
-    :: [Installing] ::  3.9.19 ...
-    :: [Info] :: completed! 3.9.19
+    :: [Downloading] ::  3.9.13 ...
+    :: [Downloading] ::  From https://www.python.org/ftp/python/3.9.13/python-3.9.13-amd64.exe
+    :: [Downloading] ::  To C:\Users\your_username\.pyenv\pyenv-win\install_cache\python-3.9.13-amd64.exe
+    :: [Installing] ::  3.9.13 ...
+    :: [Info] :: completed! 3.9.13
 
 Now, we have a new Python version in our system, but it is still not available (if you run ``python --version`` you will get the same result as before). There are two options moving forward:
 
@@ -211,15 +211,15 @@ Now, we have a new Python version in our system, but it is still not available (
 
     .. code-block:: bash
 
-        pyenv global 3.9.19
+        pyenv global 3.9.13
 
 - If you just want it momentarily to install MUSE run instead the following command:
 
     .. code-block:: bash
 
-        pyenv shell 3.9.19
+        pyenv shell 3.9.13
 
-In both cases, if you run ``python --version`` afterwards, you should get ``Python 3.9.19``.
+In both cases, if you run ``python --version`` afterwards, you should get ``Python 3.9.13``.
 
 Installing ``pipx``
 ~~~~~~~~~~~~~~~~~~~
diff --git a/docs/installation/virtual-env-based.rst b/docs/installation/virtual-env-based.rst
index d3a7e3a7..f487e23b 100644
--- a/docs/installation/virtual-env-based.rst
+++ b/docs/installation/virtual-env-based.rst
@@ -48,6 +48,9 @@ Later, to recover the system-wide "normal" python, deactivate the environment wi
 
     conda deactivate
 
+
+.. _python_venv:
+
 Creating a virtual environment with ``venv``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -87,8 +90,24 @@ Later, to recover the system-wide "normal" python, deactivate the environment wi
 
     deactivate
 
-Installing MUSE in a virtual environment
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Creating a virtual environment with ``pyenv + venv``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Alternatively to creating virtual environments in ``conda``, you can also make use of two well-tested and maintained libraries.
+We met the first one, ``pyenv``, already in the :ref:`pipx-based <pipx-based>` under the section :ref:`Installing pyenv <pipx-based-installing-pyenv>` and the installation procedure is exactly the same.
+If you go down that route, please follow the steps outlined there and chose a recent version ``Python``, say 3.9.
+
+The second package we need to create virtual environments for any specific ``Python`` version is called
+``venv``, and it ships with ``Python`` by default. To create such an environment, we first need to ensure that the
+``Python`` version we wish to use is indeed the one we want. To do this, open the terminal and invoke ``pyenv versions``.
+To install different versions or set them to local or global scope, please refer again to
+:ref:`Installing pyenv <pipx-based-installing-pyenv>`.
+
+We can now create virtual environments using ``Python`` directly as explained in :ref:`python_venv`.
+
+
+Installing standalone MUSE in a virtual environment
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Regardless of the method used, **once it has been created and activated**, you can install ``MUSE`` within using:
 

From c5de220b82de52799144020710ee5aa23d519f0e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 19:06:27 +0100
Subject: [PATCH 329/419] Change default to standard_demand

---
 src/muse/demand_share.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index 03865a60..be2b2f57 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -83,10 +83,10 @@ def factory(
     settings: Optional[Union[str, Mapping[str, Any]]] = None,
 ) -> DEMAND_SHARE_SIGNATURE:
     if settings is None or isinstance(settings, str):
-        name = settings or "new_and_retro"
+        name = settings or "standard_demand"
         params: Mapping[str, Any] = {}
     else:
-        name = settings.get("name", "new_and_retro")
+        name = settings.get("name", "standard_demand")
         params = {k: v for k, v in settings.items() if k != "name"}
 
     function = DEMAND_SHARE[name]

From 5e7d0a5c6752fc4675a6c502854ba351b8574319 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 1 Jul 2024 19:14:42 +0100
Subject: [PATCH 330/419] As per Alex's suggestion, I added an explicit note to
 run a MUSE model before the test scripts.

Running a model is now mentioned twice: once in the installation instructions and once before running the tests.

This ensures readers who do not follow the guide in sequence will understand the requirement and avoid confusion.
---
 docs/installation/developers.rst | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index cf65cd41..96897037 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -27,12 +27,13 @@ Once you have your environment created, **activate it** and install MUSE within
 .. code-block:: bash
 
     cd MUSE_OS
-    # 1- Create a virtual environment
-    # 2- Activate that virtual environment
-    # 3- Install MUSE in editable mode with: python -m pip install -e .[dev,doc]
+    # 1 - Create a virtual environment
+    # 2 - Activate that virtual environment
+    # 3 - Install MUSE in editable mode with: python -m pip install -e .[dev,doc]
     # 4 - Invoke `muse --model default`
 
 .. note::
+
     Depending on your system, you might need to add quotation marks around ``[dev,doc]`` as in ``"[dev,doc]"``.
 
     For example on ``Windows``, the command will read `python -m pip install -e .[dev,doc]`. On Ubuntu Linux, it will be `python -m pip install -e ."[dev,doc]"`.
@@ -59,14 +60,21 @@ To ensure the consistency of the code with other developers, install the pre-com
 Running tests
 ~~~~~~~~~~~~~
 
-If you followed **Installation for developers**, you will run and develop your own tests for MUSE.
-This is to check that a model reproduces expected results for a defined set of input data.
-Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/), from the testing framework of the same name.
+If you followed the **Installation for developers** guide, you are likely developing your own tests for MUSE.
+These tests ensure that a model produces reproducible results for a defined set of input data.
+Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/), using the testing framework of the same name.
 
-Within the ``MUSE-OS`` directory, just run:
+To run tests, within the ``MUSE-OS`` directory, activate the virtual environment where you installed ``MUSE`` and run a model as shown in Step 1 below.
+This can be your own model or, for simplicity, the default one.
+Although this was the final step when installing ``MUSE``, it is mentioned here again because running a model creates a set of files
+needed for the tests themselves. In Step 2, you can then run the actual tests, which should all pass before continuing code development.
 
 .. code-block:: bash
 
+    # Step 1: Run a model
+    muse --model default
+
+    # Step 2: Run the test scripts
     python -m pytest
 
 Building the documentation

From d6cbd8fe194b3e51f8f2bf8a6127d4e7e6999080 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 19:27:28 +0100
Subject: [PATCH 331/419] Re-run models

---
 .../Results/MCACapacity.csv                   | 117 ++-
 .../Results/MCAMetric_Consumption.csv         | 570 ++++++------
 .../Results/MCAMetric_Supply.csv              | 816 ++++++++----------
 .../Results/MCAPrices.csv                     | 132 +--
 .../0-new-decision-metric/settings.toml       |  20 +-
 .../technodata/Agents.csv                     |   1 -
 .../technodata/gas/Technodata.csv             |   6 +-
 .../technodata/power/Technodata.csv           |  10 +-
 .../technodata/residential/Technodata.csv     |   8 +-
 .../1-introduction/settings.toml              |   2 +-
 .../2-scenario/settings.toml                  |   2 +-
 .../1-single-objective/settings.toml          |   2 +-
 .../2-multiple-objective/settings.toml        |   2 +-
 .../3-add-region/1-new-region/settings.toml   |   2 +-
 .../1-modify-timeslices/settings.toml         |   2 +-
 .../2-modify-time-framework/settings.toml     |   2 +-
 .../1-exogenous-demand/settings.toml          |   2 +-
 .../1-correlation/settings.toml               |   2 +-
 .../1-min-constraint/settings.toml            |   2 +-
 .../2-max-constraint/settings.toml            |   2 +-
 docs/user-guide/modify-timing-data.ipynb      |   4 +-
 src/muse/data/example/default/settings.toml   |   2 +-
 .../data/example/default_retro/settings.toml  |   2 +-
 .../example/default_timeslice/settings.toml   |   2 +-
 .../example/minimum_service/settings.toml     |   2 +-
 25 files changed, 808 insertions(+), 906 deletions(-)

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 f307ea6d..f768aa6c 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -1,63 +1,56 @@
 ,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
-2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
-7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
-2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-12,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
-25,A1,6.75000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
-2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
-6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
-7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
-11,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
-12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
-31,A1,6.75000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
-0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
-1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
-2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
-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
-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
-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
-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
-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
+0,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
+0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
+0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
+1,A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
+2,A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
+1,A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
+11,A1,10.00000000000,R1,26,2020,R1,power,solarPV,newcapa,2025
+24,A1,6.00000000000,R1,49,2020,R1,power,windturbine,newcapa,2025
+1,A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+3,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
+4,A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
+2,A1,2.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
+14,A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
+15,A1,9.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
+35,A1,6.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
+2,A1,7.50000000000,R1,4,2020,R1,gas,gassupply1,newcapa,2030
+7,A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
+8,A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
+3,A1,2.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
+16,A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
+17,A1,9.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
+18,A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
+45,A1,6.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
+3,A1,3.38700000000,R1,7,2030,R1,gas,gassupply1,newcapa,2035
+11,A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
+12,A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
+4,A1,2.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
+19,A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
+20,A1,9.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
+21,A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
+22,A1,6.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
+56,A1,6.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
+4,A1,3.38700000000,R1,9,2030,R1,gas,gassupply1,newcapa,2040
+15,A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
+16,A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
+5,A1,2.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
+35,A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
+36,A1,9.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
+37,A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
+38,A1,6.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
+39,A1,6.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
+79,A1,6.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
+5,A1,3.38700000000,R1,16,2030,R1,gas,gassupply1,newcapa,2045
+19,A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
+20,A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
+7,A1,2.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
+8,A1,1.00000000000,R1,23,2045,R1,power,gasCCGT,newcapa,2050
+47,A1,9.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
+48,A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
+49,A1,6.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
+50,A1,6.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
+51,A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
+93,A1,10.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
+6,A1,3.38700000000,R1,19,2030,R1,gas,gassupply1,newcapa,2050
+7,A1,1.64630000000,R1,20,2045,R1,gas,gassupply1,newcapa,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 3cbf732a..d3cf5853 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,295 +1,277 @@
 ,agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-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
+0,A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,13,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+3,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+4,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+5,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,28,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+6,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,R1,37,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+7,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,40,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+8,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+9,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+10,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+11,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+0,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.08693150685,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.23135464231,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+2,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13881278539,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+3,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.13039726027,R1,26,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+4,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.34703196347,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+5,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20821917808,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+6,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.08693150685,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+7,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.23135464231,R1,59,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+8,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13881278539,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+9,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.13039726027,R1,76,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+10,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.34703196347,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+11,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20821917808,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.26079452055,R1,101,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+13,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.69406392694,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+14,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.41643835616,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+15,A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.17386301370,R1,126,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+16,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.46270928463,R1,134,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+17,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.27762557078,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+0,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+3,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+4,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+5,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+6,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+7,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+8,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+9,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+10,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+11,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+0,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22598870056,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+1,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13559322034,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+2,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16983050847,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+3,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20338983051,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+4,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33898305085,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+5,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20338983051,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+6,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25474576271,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+7,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30508474576,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+8,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22598870056,R1,69,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+9,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13559322034,R1,73,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+10,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16983050847,R1,76,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+11,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20338983051,R1,84,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+12,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33898305085,R1,99,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+13,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20338983051,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+14,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25474576271,R1,106,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+15,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30508474576,R1,114,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+16,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.67796610169,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+17,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40677966102,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+18,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.50949152542,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+19,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.61016949153,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+20,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.45197740113,R1,159,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+21,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.27118644068,R1,163,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+22,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.33966101695,R1,166,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+23,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40677966102,R1,174,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+0,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,28,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+3,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+4,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,48,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+5,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,52,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+6,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,68,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+7,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,72,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+8,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+9,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+10,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,R1,108,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+11,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+0,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22535211268,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+1,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13521126761,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+2,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16935211268,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+3,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+4,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13521126761,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+5,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33802816901,R1,44,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+6,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20281690141,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+7,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25402816901,R1,51,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+8,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30422535211,R1,59,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+9,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,R1,64,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+10,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22535211268,R1,79,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+11,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13521126761,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+12,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16935211268,R1,86,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+13,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,R1,94,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+14,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13521126761,R1,99,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+15,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33802816901,R1,114,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+16,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20281690141,R1,118,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+17,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25402816901,R1,121,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+18,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30422535211,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+19,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,R1,134,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+20,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.67605633803,R1,149,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+21,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40563380282,R1,153,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+22,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.50805633803,R1,156,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+23,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.60845070423,R1,164,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+24,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40563380282,R1,169,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+25,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.45070422535,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+26,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.27042253521,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+27,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.33870422535,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+28,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40563380282,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+29,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.27042253521,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+0,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+3,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+4,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,60,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+5,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,64,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+6,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,84,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+7,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+8,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+9,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,112,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+10,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+11,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,136,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+0,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22489959839,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+1,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13493975904,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+2,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16901204819,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+3,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+4,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+5,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,R1,34,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+6,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33734939759,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+7,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20240963855,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+8,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25351807229,R1,56,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+9,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30361445783,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+10,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+11,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+12,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22489959839,R1,89,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+13,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13493975904,R1,93,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+14,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16901204819,R1,96,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+15,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,R1,104,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+16,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,R1,109,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+17,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,R1,114,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+18,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33734939759,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+19,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20240963855,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+20,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25351807229,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+21,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30361445783,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+22,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,R1,149,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+23,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,R1,154,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+24,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.67469879518,R1,169,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+25,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40481927711,R1,173,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+26,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.50703614458,R1,176,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+27,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.60722891566,R1,184,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+28,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,R1,189,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+29,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,R1,194,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+30,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.44979919679,R1,209,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+31,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26987951807,R1,213,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+32,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.33802409639,R1,216,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+33,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,R1,224,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+34,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26987951807,R1,229,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+35,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26987951807,R1,234,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+0,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,44,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+3,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+4,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+5,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,76,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+6,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,100,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+7,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,104,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+8,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,128,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+9,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,132,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+10,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,156,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+11,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,160,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+0,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22456140351,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+1,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13473684211,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+2,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16875789474,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+3,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+4,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+5,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,R1,34,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+6,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,R1,39,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+7,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33684210526,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+8,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20210526316,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+9,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25313684211,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+10,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30315789474,R1,79,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+11,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,84,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+12,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,89,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+13,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,94,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+14,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22456140351,R1,119,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+15,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13473684211,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+16,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16875789474,R1,126,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+17,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,134,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+18,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,R1,139,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+19,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,R1,144,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+20,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,R1,149,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+21,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33684210526,R1,174,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+22,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20210526316,R1,178,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+23,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25313684211,R1,181,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+24,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30315789474,R1,189,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+25,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,194,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+26,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,199,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+27,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,R1,204,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+28,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.67368421053,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+29,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40421052632,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+30,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.50627368421,R1,236,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+31,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.60631578947,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+32,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,R1,249,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+33,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+34,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,R1,259,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+35,A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.44912280702,R1,284,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+36,A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26947368421,R1,288,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+37,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.33751578947,R1,291,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+38,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,R1,299,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+39,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,R1,304,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+40,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,R1,309,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+41,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,R1,314,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+0,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,24,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+3,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,56,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+4,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,84,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+5,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,88,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+6,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,116,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+7,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,R1,120,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+8,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,148,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+9,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,R1,152,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+10,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,180,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+11,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,R1,184,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+0,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,R1,16,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,24,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+2,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,R1,29,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+3,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,R1,34,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+4,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,R1,39,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+5,A1,8.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.08388837209,R1,41,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+6,A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22325581395,R1,49,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+7,A1,10.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.22325581395,R1,53,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+8,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,R1,76,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+9,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30139534884,R1,84,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+10,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,89,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+11,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,94,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+12,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,99,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+13,A1,8.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.12583255814,R1,101,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+14,A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33488372093,R1,109,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+15,A1,10.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33488372093,R1,113,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+16,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+17,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+18,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,R1,149,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+19,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,R1,154,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+20,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,R1,159,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+21,A1,8.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.08388837209,R1,161,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+22,A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.22325581395,R1,169,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+23,A1,10.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.22325581395,R1,173,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+24,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,R1,196,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+25,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.30139534884,R1,204,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+26,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,209,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+27,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,214,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+28,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,R1,219,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+29,A1,8.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.12583255814,R1,221,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+30,A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.33488372093,R1,229,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+31,A1,10.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33488372093,R1,233,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+32,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.50333023256,R1,256,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+33,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.60279069767,R1,264,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+34,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,R1,269,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+35,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,R1,274,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+36,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,R1,279,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+37,A1,8.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,R1,281,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+38,A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.66976744186,R1,289,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+39,A1,10.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66976744186,R1,293,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+40,A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.33555348837,R1,316,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+41,A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,R1,324,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+42,A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,R1,329,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+43,A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,R1,334,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+44,A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,R1,339,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+45,A1,8.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,R1,341,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+46,A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,solar,0.44651162791,R1,349,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+47,A1,10.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44651162791,R1,353,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 33284fc1..dfc47e7b 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,439 +1,379 @@
 ,agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-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
+0,A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,heat,R1,6,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,7,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+2,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,9,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+3,A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+4,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+5,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,21,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+6,A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,30,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+7,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,31,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+8,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,33,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+9,A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+10,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,43,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+11,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+13,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,55,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+14,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,57,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+15,A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,66,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+16,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,67,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+17,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,69,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+0,A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.05205479452,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.23135464231,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+2,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2020.00000000000,R1,power,0.13881278539,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+3,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,10,2020.00000000000,R1,power,4.77186301370,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+4,A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.07808219178,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+5,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,26,2020.00000000000,R1,power,0.34703196347,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+6,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,27,2020.00000000000,R1,power,0.20821917808,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+7,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2020.00000000000,R1,power,7.15779452055,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+8,A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2020.00000000000,R1,power,0.05205479452,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+9,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2020.00000000000,R1,power,0.23135464231,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+10,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,52,2020.00000000000,R1,power,0.13881278539,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+11,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,power,4.77186301370,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2020.00000000000,R1,power,0.07808219178,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+13,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,76,2020.00000000000,R1,power,0.34703196347,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+14,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,77,2020.00000000000,R1,power,0.20821917808,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+15,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,85,2020.00000000000,R1,power,7.15779452055,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+16,A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.15616438356,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+17,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.69406392694,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+18,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2020.00000000000,R1,power,0.41643835616,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+19,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,110,2020.00000000000,R1,power,14.31558904110,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+20,A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,125,2020.00000000000,R1,power,0.10410958904,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+21,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,126,2020.00000000000,R1,power,0.46270928463,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+22,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,127,2020.00000000000,R1,power,0.27762557078,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+23,A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,135,2020.00000000000,R1,power,9.54372602740,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+0,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.40915372907,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,0.61373059361,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+2,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.40915372907,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+3,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,0.61373059361,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+4,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,1.22746118721,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+5,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,0.81830745814,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+3,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+4,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+5,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+6,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.63793103448,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+7,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.86206896552,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+8,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.27586206897,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+9,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.72413793103,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+10,A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.18390804598,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+11,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,1.14942528736,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22598870056,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2020.00000000000,R1,power,0.13559322034,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.10169491525,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+3,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2025.00000000000,R1,power,0.20338983051,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+4,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,15,2025.00000000000,R1,power,9.32237288136,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+5,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,31,2020.00000000000,R1,power,0.33898305085,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+6,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.20338983051,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+7,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,0.15254237288,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+8,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.30508474576,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+9,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2025.00000000000,R1,power,13.98355932203,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+10,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.22598870056,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+11,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,62,2020.00000000000,R1,power,0.13559322034,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+12,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2025.00000000000,R1,power,0.10169491525,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+13,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,64,2025.00000000000,R1,power,0.20338983051,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+14,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2025.00000000000,R1,power,9.32237288136,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+15,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,91,2020.00000000000,R1,power,0.33898305085,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+16,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,92,2020.00000000000,R1,power,0.20338983051,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+17,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,93,2025.00000000000,R1,power,0.15254237288,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+18,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,94,2025.00000000000,R1,power,0.30508474576,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+19,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,105,2025.00000000000,R1,power,13.98355932203,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+20,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.67796610169,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+21,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,122,2020.00000000000,R1,power,0.40677966102,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+22,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,0.30508474576,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+23,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2025.00000000000,R1,power,0.61016949153,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+24,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,135,2025.00000000000,R1,power,27.96711864407,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+25,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,151,2020.00000000000,R1,power,0.45197740113,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+26,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,152,2020.00000000000,R1,power,0.27118644068,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+27,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,153,2025.00000000000,R1,power,0.20338983051,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+28,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,154,2025.00000000000,R1,power,0.40677966102,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+29,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,165,2025.00000000000,R1,power,18.64474576271,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+0,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.16983050847,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.25474576271,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+2,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.16983050847,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+3,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.25474576271,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+4,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.50949152542,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+5,A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.33966101695,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+0,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,12,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,13,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,32,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+3,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,33,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+4,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,52,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+5,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+6,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,72,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+7,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+8,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,92,2025.00000000000,R1,residential,1.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+9,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,93,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+10,A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2025.00000000000,R1,residential,1.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+11,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,113,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22535211268,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2020.00000000000,R1,power,0.13521126761,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.10140845070,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+3,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2025.00000000000,R1,power,0.20281690141,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+4,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.13521126761,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+5,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,17,2025.00000000000,R1,power,9.29611267606,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+6,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.33802816901,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+7,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.20281690141,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+8,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,38,2025.00000000000,R1,power,0.15211267606,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+9,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,39,2025.00000000000,R1,power,0.30422535211,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+10,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,40,2030.00000000000,R1,power,0.20281690141,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+11,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2025.00000000000,R1,power,13.94416901408,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+12,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,71,2020.00000000000,R1,power,0.22535211268,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+13,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.13521126761,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+14,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,0.10140845070,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+15,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.20281690141,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+16,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2030.00000000000,R1,power,0.13521126761,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+17,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,87,2025.00000000000,R1,power,9.29611267606,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+18,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,106,2020.00000000000,R1,power,0.33802816901,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+19,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,107,2020.00000000000,R1,power,0.20281690141,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+20,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,108,2025.00000000000,R1,power,0.15211267606,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+21,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,109,2025.00000000000,R1,power,0.30422535211,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+22,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,110,2030.00000000000,R1,power,0.20281690141,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+23,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,122,2025.00000000000,R1,power,13.94416901408,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+24,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.67605633803,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+25,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,142,2020.00000000000,R1,power,0.40563380282,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+26,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,143,2025.00000000000,R1,power,0.30422535211,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+27,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,144,2025.00000000000,R1,power,0.60845070423,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+28,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,145,2030.00000000000,R1,power,0.40563380282,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+29,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,157,2025.00000000000,R1,power,27.88833802817,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+30,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,176,2020.00000000000,R1,power,0.45070422535,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+31,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,177,2020.00000000000,R1,power,0.27042253521,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+32,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,178,2025.00000000000,R1,power,0.20281690141,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+33,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,179,2025.00000000000,R1,power,0.40563380282,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+34,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,180,2030.00000000000,R1,power,0.27042253521,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+35,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,192,2025.00000000000,R1,power,18.59222535211,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.16935211268,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.25402816901,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+2,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.16935211268,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+3,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.25402816901,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+4,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.50805633803,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+5,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.33870422535,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+0,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,15,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,16,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,39,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+3,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+4,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,63,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+5,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,64,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+6,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,87,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+7,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+8,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,111,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+9,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+10,A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,135,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+11,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,136,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22489959839,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2020.00000000000,R1,power,0.13493975904,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.10120481928,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+3,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2025.00000000000,R1,power,0.20240963855,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+4,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.13493975904,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+5,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2035.00000000000,R1,power,0.13493975904,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+6,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,19,2025.00000000000,R1,power,9.27744578313,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+7,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,41,2020.00000000000,R1,power,0.33734939759,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+8,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,42,2020.00000000000,R1,power,0.20240963855,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+9,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,43,2025.00000000000,R1,power,0.15180722892,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+10,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,44,2025.00000000000,R1,power,0.30361445783,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+11,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,45,2030.00000000000,R1,power,0.20240963855,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+12,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,46,2035.00000000000,R1,power,0.20240963855,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+13,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,59,2025.00000000000,R1,power,13.91616867470,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+14,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.22489959839,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+15,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2020.00000000000,R1,power,0.13493975904,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+16,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,83,2025.00000000000,R1,power,0.10120481928,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+17,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,84,2025.00000000000,R1,power,0.20240963855,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+18,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,85,2030.00000000000,R1,power,0.13493975904,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+19,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,86,2035.00000000000,R1,power,0.13493975904,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+20,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,99,2025.00000000000,R1,power,9.27744578313,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+21,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.33734939759,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+22,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,122,2020.00000000000,R1,power,0.20240963855,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+23,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,0.15180722892,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+24,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2025.00000000000,R1,power,0.30361445783,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+25,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,125,2030.00000000000,R1,power,0.20240963855,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+26,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,126,2035.00000000000,R1,power,0.20240963855,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+27,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,139,2025.00000000000,R1,power,13.91616867470,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+28,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,161,2020.00000000000,R1,power,0.67469879518,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+29,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,162,2020.00000000000,R1,power,0.40481927711,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+30,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2025.00000000000,R1,power,0.30361445783,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+31,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,164,2025.00000000000,R1,power,0.60722891566,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+32,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2030.00000000000,R1,power,0.40481927711,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+33,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,166,2035.00000000000,R1,power,0.40481927711,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+34,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,179,2025.00000000000,R1,power,27.83233734940,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+35,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,201,2020.00000000000,R1,power,0.44979919679,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+36,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,202,2020.00000000000,R1,power,0.26987951807,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+37,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,203,2025.00000000000,R1,power,0.20240963855,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+38,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,204,2025.00000000000,R1,power,0.40481927711,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+39,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,205,2030.00000000000,R1,power,0.26987951807,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+40,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,206,2035.00000000000,R1,power,0.26987951807,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+41,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,219,2025.00000000000,R1,power,18.55489156627,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.16901204819,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.25351807229,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+2,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.16901204819,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+3,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.25351807229,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+4,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.50703614458,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+5,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.33802409639,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+0,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,46,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+3,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,47,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+4,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+5,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,75,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+6,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,102,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+7,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,103,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+8,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,130,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+9,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,131,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+10,A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,158,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+11,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,159,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22456140351,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2020.00000000000,R1,power,0.13473684211,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.10105263158,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+3,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2025.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+4,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.13473684211,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+5,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2035.00000000000,R1,power,0.13473684211,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+6,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,7,2040.00000000000,R1,power,0.13473684211,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+7,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2025.00000000000,R1,power,9.26349473684,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+8,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,56,2020.00000000000,R1,power,0.33684210526,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+9,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,57,2020.00000000000,R1,power,0.20210526316,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+10,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,58,2025.00000000000,R1,power,0.15157894737,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+11,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,59,2025.00000000000,R1,power,0.30315789474,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+12,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2030.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+13,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2035.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+14,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,62,2040.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+15,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,80,2025.00000000000,R1,power,13.89524210526,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+16,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,111,2020.00000000000,R1,power,0.22456140351,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+17,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,112,2020.00000000000,R1,power,0.13473684211,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+18,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,113,2025.00000000000,R1,power,0.10105263158,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+19,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,114,2025.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+20,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,115,2030.00000000000,R1,power,0.13473684211,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+21,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,116,2035.00000000000,R1,power,0.13473684211,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+22,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,117,2040.00000000000,R1,power,0.13473684211,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+23,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,135,2025.00000000000,R1,power,9.26349473684,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+24,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,166,2020.00000000000,R1,power,0.33684210526,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+25,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,167,2020.00000000000,R1,power,0.20210526316,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+26,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,168,2025.00000000000,R1,power,0.15157894737,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+27,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,169,2025.00000000000,R1,power,0.30315789474,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+28,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,170,2030.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+29,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,171,2035.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+30,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,172,2040.00000000000,R1,power,0.20210526316,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+31,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,190,2025.00000000000,R1,power,13.89524210526,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+32,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,221,2020.00000000000,R1,power,0.67368421053,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+33,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,222,2020.00000000000,R1,power,0.40421052632,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+34,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,223,2025.00000000000,R1,power,0.30315789474,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+35,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,224,2025.00000000000,R1,power,0.60631578947,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+36,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,225,2030.00000000000,R1,power,0.40421052632,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+37,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,226,2035.00000000000,R1,power,0.40421052632,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+38,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,227,2040.00000000000,R1,power,0.40421052632,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+39,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,245,2025.00000000000,R1,power,27.79048421053,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+40,A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,276,2020.00000000000,R1,power,0.44912280702,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+41,A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,277,2020.00000000000,R1,power,0.26947368421,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+42,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,278,2025.00000000000,R1,power,0.20210526316,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+43,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,279,2025.00000000000,R1,power,0.40421052632,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+44,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,280,2030.00000000000,R1,power,0.26947368421,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+45,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,281,2035.00000000000,R1,power,0.26947368421,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+46,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,282,2040.00000000000,R1,power,0.26947368421,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+47,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,300,2025.00000000000,R1,power,18.52698947368,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.16875789474,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,4,2030.00000000000,R1,gas,0.25313684211,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+2,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.16875789474,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+3,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,10,2030.00000000000,R1,gas,0.25313684211,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+4,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,13,2030.00000000000,R1,gas,0.50627368421,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+5,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,16,2030.00000000000,R1,gas,0.33751578947,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+0,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,21,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,22,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+3,A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,54,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+4,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,85,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+5,A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,86,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+6,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,117,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+7,A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,118,2045.00000000000,R1,residential,1.83333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+8,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,149,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+9,A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,150,2045.00000000000,R1,residential,3.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+10,A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,181,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+11,A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,182,2045.00000000000,R1,residential,2.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+0,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.10046511628,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2025.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.13395348837,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+3,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2035.00000000000,R1,power,0.13395348837,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+4,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,7,2040.00000000000,R1,power,0.13395348837,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+5,A1,8.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,8,2045.00000000000,R1,power,0.05023255814,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+6,A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,9,2045.00000000000,R1,power,0.22325581395,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+7,A1,10.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,10,2045.00000000000,R1,power,0.22325581395,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+8,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2025.00000000000,R1,power,9.20963720930,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+9,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,32,2045.00000000000,R1,power,4.60481860465,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+10,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2025.00000000000,R1,power,0.15069767442,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+11,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,64,2025.00000000000,R1,power,0.30139534884,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+12,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,65,2030.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+13,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2035.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+14,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2040.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+15,A1,8.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,68,2045.00000000000,R1,power,0.07534883721,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+16,A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,69,2045.00000000000,R1,power,0.33488372093,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+17,A1,10.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,70,2045.00000000000,R1,power,0.33488372093,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+18,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,87,2025.00000000000,R1,power,13.81445581395,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+19,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2045.00000000000,R1,power,6.90722790698,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+20,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,0.10046511628,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+21,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2025.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+22,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,125,2030.00000000000,R1,power,0.13395348837,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+23,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,126,2035.00000000000,R1,power,0.13395348837,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+24,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,127,2040.00000000000,R1,power,0.13395348837,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+25,A1,8.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,128,2045.00000000000,R1,power,0.05023255814,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+26,A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,129,2045.00000000000,R1,power,0.22325581395,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+27,A1,10.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,130,2045.00000000000,R1,power,0.22325581395,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+28,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,147,2025.00000000000,R1,power,9.20963720930,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+29,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,152,2045.00000000000,R1,power,4.60481860465,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+30,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,183,2025.00000000000,R1,power,0.15069767442,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+31,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,184,2025.00000000000,R1,power,0.30139534884,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+32,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,185,2030.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+33,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,186,2035.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+34,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,187,2040.00000000000,R1,power,0.20093023256,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+35,A1,8.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,188,2045.00000000000,R1,power,0.07534883721,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+36,A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,189,2045.00000000000,R1,power,0.33488372093,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+37,A1,10.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,190,2045.00000000000,R1,power,0.33488372093,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+38,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,207,2025.00000000000,R1,power,13.81445581395,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+39,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,212,2045.00000000000,R1,power,6.90722790698,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+40,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,243,2025.00000000000,R1,power,0.30139534884,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+41,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,244,2025.00000000000,R1,power,0.60279069767,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+42,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,245,2030.00000000000,R1,power,0.40186046512,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+43,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,246,2035.00000000000,R1,power,0.40186046512,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+44,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,247,2040.00000000000,R1,power,0.40186046512,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+45,A1,8.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,248,2045.00000000000,R1,power,0.15069767442,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+46,A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,249,2045.00000000000,R1,power,0.66976744186,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+47,A1,10.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,250,2045.00000000000,R1,power,0.66976744186,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+48,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,267,2025.00000000000,R1,power,27.62891162791,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+49,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,272,2045.00000000000,R1,power,13.81445581395,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+50,A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,303,2025.00000000000,R1,power,0.20093023256,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+51,A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,304,2025.00000000000,R1,power,0.40186046512,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+52,A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,305,2030.00000000000,R1,power,0.26790697674,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+53,A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,306,2035.00000000000,R1,power,0.26790697674,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+54,A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,307,2040.00000000000,R1,power,0.26790697674,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+55,A1,8.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,308,2045.00000000000,R1,power,0.10046511628,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+56,A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,309,2045.00000000000,R1,power,0.44651162791,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+57,A1,10.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,310,2045.00000000000,R1,power,0.44651162791,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+58,A1,3.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,327,2025.00000000000,R1,power,18.41927441860,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+59,A1,8.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,332,2045.00000000000,R1,power,9.20963720930,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+0,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.16935211268,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,2.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,2,2045.00000000000,R1,gas,0.08231300360,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,4,2030.00000000000,R1,gas,0.25402816901,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+3,A1,2.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,5,2045.00000000000,R1,gas,0.12346950540,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+4,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.16935211268,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+5,A1,2.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,8,2045.00000000000,R1,gas,0.08231300360,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+6,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,10,2030.00000000000,R1,gas,0.25402816901,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+7,A1,2.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,11,2045.00000000000,R1,gas,0.12346950540,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+8,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,13,2030.00000000000,R1,gas,0.50805633803,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+9,A1,2.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,14,2045.00000000000,R1,gas,0.24693901081,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+10,A1,1.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,16,2030.00000000000,R1,gas,0.33870422535,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+11,A1,2.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,17,2045.00000000000,R1,gas,0.16462600721,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 c303e3a9..3abd17db 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.43850000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.65770000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.42780000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43850000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64160000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65770000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.28330000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31550000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.85550000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.87700000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.35030000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04160000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.52640000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07550000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.49840000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.35030000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.17650000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04160000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74910000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.52640000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27640000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07550000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.50750000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.05810000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.62270000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00090000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.70300000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.38410000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11830000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.38160000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03810000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.57320000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.06770000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54280000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38160000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.03810000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81550000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57320000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.31250000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06770000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63850000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.15090000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70850000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08900000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.76530000000,2035
 "('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')",heat,R1,0.10430000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.53940000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.40390000000,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')",heat,R1,0.03930000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81000000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.60650000000,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')",heat,R1,0.07050000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.53940000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.40390000000,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')",heat,R1,0.03930000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81000000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.60650000000,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')",heat,R1,0.07050000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.62590000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.21680000000,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')",heat,R1,0.21030000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08140000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.80950000000,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')",heat,R1,0.10930000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.59490000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.44080000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08850000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.04020000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.89320000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66170000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14870000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.07250000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59490000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44080000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08850000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04020000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89320000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66170000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14870000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07250000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.79150000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.32680000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39400000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21820000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.19200000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.88310000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.21970000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.11290000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.62940000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.63350000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04780000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04170000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94490000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95090000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.08970000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.07580000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.62940000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63350000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04780000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04170000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94490000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95090000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08970000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07580000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.89420000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90630000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28710000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23140000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.26080000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.26890000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14350000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.11870000000,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 50058a1a..a7805a7a 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -50,7 +50,7 @@ technodata = '{path}/technodata/residential/Technodata.csv'
 commodities_in = '{path}/technodata/residential/CommIn.csv'
 commodities_out = '{path}/technodata/residential/CommOut.csv'
 
-[sectors.residential.subsectors.retro_and_new]
+[sectors.residential.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"  # Optional, defaults to "adhoc"
@@ -61,13 +61,9 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
-[[sectors.residential.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.power]
 type = 'default'
 priority = 2
@@ -76,15 +72,11 @@ technodata = '{path}/technodata/power/Technodata.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
 commodities_out = '{path}/technodata/power/CommOut.csv'
 
-[sectors.power.subsectors.retro_and_new]
+[sectors.power.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-[[sectors.power.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.gas]
 type = 'default'
 priority = 3
@@ -93,15 +85,11 @@ technodata = '{path}/technodata/gas/Technodata.csv'
 commodities_in = '{path}/technodata/gas/CommIn.csv'
 commodities_out = '{path}/technodata/gas/CommOut.csv'
 
-[sectors.gas.subsectors.retro_and_new]
+[sectors.gas.subsectors.all]
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 
-[[sectors.gas.interactions]]
-net = 'new_to_retro'
-interaction = 'transfer'
-
 [sectors.residential_presets]
 type = 'presets'
 priority = 0
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv b/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv
index a6cfbe9f..cd1fc937 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/Agents.csv
@@ -1,3 +1,2 @@
 AgentShare,Name,AgentNumber,RegionName,Objective1,Objective2,Objective3,ObjData1,ObjData2,ObjData3,Objsort1,Objsort2,Objsort3,SearchRule,DecisionMethod,Quantity,MaturityThreshold,Budget,Type
 Agent1,A1,1,R1,LCOE,EAC,NPV,1,,,TRUE,TRUE,FALSE,all,median_objective,1,-1,inf,New
-Agent2,A1,2,R1,LCOE,EAC,NPV,1,,,TRUE,TRUE,FALSE,all,median_objective,1,-1,inf,Retrofit
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
index 93826a54..784df8fb 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/gas/Technodata.csv
@@ -1,3 +1,3 @@
-ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1,0
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
+gassupply1,R1,2020,0,1,0,1,2.55,1,5,1,60,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
index ea17ee23..ca34fc89 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/power/Technodata.csv
@@ -1,5 +1,5 @@
-ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1,0
-windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1,0
-solarPV,R1,2020,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1,0
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,New
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv b/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
index 247bc4bf..ac345de4 100644
--- a/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/0-new-decision-metric/technodata/residential/Technodata.csv
@@ -1,4 +1,4 @@
-ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2,Agent1
-Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit,New
-gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,gas,heat,1,0
-heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.02,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1,0
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,New
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 44c1a83d..7e87b786 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 44c1a83d..7e87b786 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 44c1a83d..7e87b786 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 44c1a83d..7e87b786 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index d961c0c2..6ef433d4 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 6f56de86..d8294d25 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 59ebdf63..d6d72532 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 2  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index 6f56de86..d8294d25 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 44e775fa..9642ac57 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 254dba3e..8a993c14 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -64,7 +64,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 254dba3e..8a993c14 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -64,7 +64,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 6c7e0bb1..35e630a2 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -176,10 +176,10 @@
    "source": [
     "The `time_framework` details each benchmark year in which we run the simulation. The ```foresight``` variable details how much foresight an agent has when making investments. \n",
     "\n",
-    "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.retro_and_new` section should now look as follows:\n",
+    "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.all` section should now look as follows:\n",
     "\n",
     "```toml\n",
-    "[sectors.power.subsectors.retro_and_new]\n",
+    "[sectors.power.subsectors.all]\n",
     "agents = '{path}/technodata/Agents.csv'\n",
     "existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'\n",
     "lpsolver = \"scipy\"\n",
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index e4c8ef38..81418f64 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index a1d71a62..161875f0 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space"
 ]
-demand_share = "new_and_retro"  # Optional, default to new_and_retro
+demand_share = "new_and_retro"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index 254dba3e..8a993c14 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -64,7 +64,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.outputs]]
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 4b80cb84..5235b01f 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -62,7 +62,7 @@ constraints = [
     "search_space",
     "minimum_service"
 ]
-demand_share = "standard_demand"  # Optional, default to new_and_retro
+demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
 
 [[sectors.industry.outputs]]

From 143972b10965dfc774fbf381cc9cb68c55460ce6 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 19:45:07 +0100
Subject: [PATCH 332/419] Remove print statement

---
 docs/advanced-guide/extending-muse.ipynb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 890f908d..89f2545e 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -421,7 +421,6 @@
    "outputs": [],
    "source": [
     "cache_files = sorted((Path() / \"Results\").glob(\"Cache*\"))\n",
-    "print(cache_files)\n",
     "assert len(cache_files) == 1\n",
     "cached = pd.read_csv(cache_files[0])\n",
     "assert tuple(cached.category.unique()) == (\"retrofit\",)"

From c4bdba7bcf5a8871b6fd008c43aec420cd470443 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 19:45:57 +0100
Subject: [PATCH 333/419] Declare demand_share explicitly

---
 src/muse/data/example/default_retro/settings.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index 161875f0..43ba48f5 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -95,6 +95,7 @@ commodities_out = '{path}/technodata/power/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "new_and_retro"
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -119,6 +120,7 @@ commodities_out = '{path}/technodata/gas/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "new_and_retro"
 
 [[sectors.gas.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'

From 1b8068e8973c936a48d33d301d07f0ccad7d2c26 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 20:05:24 +0100
Subject: [PATCH 334/419] Update maximum_iterations to 100

---
 .../Results/Gas/Capacity/2025.csv             |   6 +
 .../Results/Gas/Capacity/2030.csv             |  13 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  13 +
 .../Results/Gas/Capacity/2045.csv             |  19 +
 .../Results/Gas/Capacity/2050.csv             |  19 +
 .../1-introduction/Results/MCACapacity.csv    |  36 +-
 .../1-introduction/Results/MCAPrices.csv      | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  47 +-
 .../Results/Power/Capacity/2030.csv           |  65 +-
 .../Results/Power/Capacity/2035.csv           |  83 +-
 .../Results/Power/Capacity/2040.csv           | 103 +-
 .../Results/Power/Capacity/2045.csv           | 135 +--
 .../Results/Power/Capacity/2050.csv           | 157 ++-
 .../1-introduction/settings.toml              |   2 +-
 .../2-scenario/Results/Gas/Capacity/2025.csv  |   6 +
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  13 +
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  13 +
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  13 +
 .../2-scenario/Results/Gas/Capacity/2045.csv  |  21 +-
 .../2-scenario/Results/Gas/Capacity/2050.csv  |  21 +-
 .../2-scenario/Results/MCACapacity.csv        |  35 +-
 .../2-scenario/Results/MCAPrices.csv          | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  33 +-
 .../Results/Power/Capacity/2030.csv           |  37 +-
 .../Results/Power/Capacity/2035.csv           |  62 +-
 .../Results/Power/Capacity/2040.csv           |  82 +-
 .../Results/Power/Capacity/2045.csv           | 134 ++-
 .../Results/Power/Capacity/2050.csv           | 140 +--
 .../2-scenario/settings.toml                  |   2 +-
 .../Results/Gas/Capacity/2025.csv             |   6 +
 .../Results/Gas/Capacity/2030.csv             |  13 +
 .../Results/Gas/Capacity/2035.csv             |  13 +
 .../Results/Gas/Capacity/2040.csv             |  13 +
 .../Results/Gas/Capacity/2045.csv             |  13 +
 .../Results/Gas/Capacity/2050.csv             |  13 +
 .../Results/MCACapacity.csv                   |  58 +-
 .../1-single-objective/Results/MCAPrices.csv  | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  42 +-
 .../Results/Power/Capacity/2030.csv           |  60 +-
 .../Results/Power/Capacity/2035.csv           |  78 +-
 .../Results/Power/Capacity/2040.csv           |  98 +-
 .../Results/Power/Capacity/2045.csv           | 118 +--
 .../Results/Power/Capacity/2050.csv           | 148 ++-
 .../1-single-objective/settings.toml          |   2 +-
 .../Results/Gas/Capacity/2030.csv             |   5 +
 .../Results/Gas/Capacity/2035.csv             |   5 +
 .../Results/Gas/Capacity/2040.csv             |   5 +
 .../Results/Gas/Capacity/2045.csv             |   5 +
 .../Results/Gas/Capacity/2050.csv             |   5 +
 .../Results/MCACapacity.csv                   |  23 +-
 .../Results/MCAPrices.csv                     | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  35 +-
 .../Results/Power/Capacity/2030.csv           |  53 +-
 .../Results/Power/Capacity/2035.csv           |  71 +-
 .../Results/Power/Capacity/2040.csv           |  91 +-
 .../Results/Power/Capacity/2045.csv           | 131 +--
 .../Results/Power/Capacity/2050.csv           | 151 +--
 .../2-multiple-objective/settings.toml        |   2 +-
 .../Results/Gas/Capacity/2025.csv             |  18 +-
 .../Results/Gas/Capacity/2030.csv             |  32 +-
 .../Results/Gas/Capacity/2035.csv             |  32 +-
 .../Results/Gas/Capacity/2040.csv             |  32 +-
 .../Results/Gas/Capacity/2045.csv             |  48 +-
 .../Results/Gas/Capacity/2050.csv             |  48 +-
 .../1-new-region/Results/MCACapacity.csv      |  59 +-
 .../1-new-region/Results/MCAPrices.csv        | 432 ++++----
 .../Results/Power/Capacity/2025.csv           |  70 +-
 .../Results/Power/Capacity/2030.csv           |  90 +-
 .../Results/Power/Capacity/2035.csv           | 131 +--
 .../Results/Power/Capacity/2040.csv           | 169 ++-
 .../Results/Power/Capacity/2045.csv           | 263 +++--
 .../Results/Power/Capacity/2050.csv           | 293 ++----
 .../3-add-region/1-new-region/settings.toml   |   2 +-
 .../Results/Gas/Capacity/2025.csv             |  18 +-
 .../Results/Gas/Capacity/2030.csv             |  32 +-
 .../Results/Gas/Capacity/2035.csv             |  32 +-
 .../Results/Gas/Capacity/2040.csv             |  32 +-
 .../Results/Gas/Capacity/2045.csv             |  48 +-
 .../Results/Gas/Capacity/2050.csv             |  48 +-
 .../Results/MCACapacity.csv                   |  48 +-
 .../1-modify-timeslices/Results/MCAPrices.csv | 576 +++++------
 .../Results/Power/Capacity/2025.csv           |  70 +-
 .../Results/Power/Capacity/2030.csv           |  90 +-
 .../Results/Power/Capacity/2035.csv           | 108 +-
 .../Results/Power/Capacity/2040.csv           | 128 +--
 .../Results/Power/Capacity/2045.csv           | 206 ++--
 .../Results/Power/Capacity/2050.csv           | 260 ++---
 .../1-modify-timeslices/settings.toml         |   2 +-
 .../Results/Gas/Capacity/2026.csv             |  22 +-
 .../Results/Gas/Capacity/2028.csv             |  38 +-
 .../Results/Gas/Capacity/2030.csv             |  64 +-
 .../Results/Gas/Capacity/2032.csv             |  96 +-
 .../Results/Gas/Capacity/2034.csv             | 130 ++-
 .../Results/Gas/Capacity/2036.csv             | 130 ++-
 .../Results/Gas/Capacity/2038.csv             | 130 ++-
 .../Results/Gas/Capacity/2040.csv             | 130 ++-
 .../Results/MCACapacity.csv                   | 186 ++--
 .../Results/MCAPrices.csv                     | 960 +++++++++---------
 .../Results/Power/Capacity/2022.csv           |  70 +-
 .../Results/Power/Capacity/2024.csv           | 120 +--
 .../Results/Power/Capacity/2026.csv           | 182 ++--
 .../Results/Power/Capacity/2028.csv           | 236 ++---
 .../Results/Power/Capacity/2030.csv           | 318 +++---
 .../Results/Power/Capacity/2032.csv           | 392 ++++---
 .../Results/Power/Capacity/2034.csv           | 474 ++++-----
 .../Results/Power/Capacity/2036.csv           | 568 +++++------
 .../Results/Power/Capacity/2038.csv           | 634 ++++++------
 .../Results/Power/Capacity/2040.csv           | 748 ++++++--------
 .../2-modify-time-framework/settings.toml     |   2 +-
 .../Results/Gas/Capacity/2025.csv             |  18 +-
 .../Results/Gas/Capacity/2030.csv             |  32 +-
 .../Results/Gas/Capacity/2035.csv             |  32 +-
 .../Results/Gas/Capacity/2040.csv             |  32 +-
 .../Results/Gas/Capacity/2045.csv             |  48 +-
 .../Results/Gas/Capacity/2050.csv             |  48 +-
 .../Results/MCACapacity.csv                   |  48 +-
 .../1-exogenous-demand/Results/MCAPrices.csv  | 768 +++++++-------
 .../Results/Power/Capacity/2025.csv           |  70 +-
 .../Results/Power/Capacity/2030.csv           |  90 +-
 .../Results/Power/Capacity/2035.csv           | 108 +-
 .../Results/Power/Capacity/2040.csv           | 128 +--
 .../Results/Power/Capacity/2045.csv           | 206 ++--
 .../Results/Power/Capacity/2050.csv           | 260 ++---
 .../1-exogenous-demand/settings.toml          |   2 +-
 .../Results/Gas/Capacity/2030.csv             |   5 +
 .../Results/Gas/Capacity/2035.csv             |  11 +
 .../Results/Gas/Capacity/2040.csv             |  11 +
 .../Results/Gas/Capacity/2045.csv             |  11 +
 .../Results/Gas/Capacity/2050.csv             |  11 +
 .../1-correlation/Results/MCACapacity.csv     |  25 +-
 .../1-correlation/Results/MCAPrices.csv       | 216 ++--
 .../Results/Power/Capacity/2025.csv           |  26 +-
 .../Results/Power/Capacity/2030.csv           |  42 +-
 .../Results/Power/Capacity/2035.csv           |  42 +-
 .../Results/Power/Capacity/2040.csv           |  50 +-
 .../Results/Power/Capacity/2045.csv           |  56 +-
 .../Results/Power/Capacity/2050.csv           |  70 +-
 .../1-correlation/settings.toml               |   2 +-
 src/muse/data/default_settings.toml           |   2 +-
 src/muse/data/example/default/settings.toml   |   2 +-
 .../example/minimum_service/settings.toml     |   2 +-
 .../default/Gas/Capacity/2025.csv             |   6 +
 .../default/Gas/Capacity/2030.csv             |  18 +-
 .../default/Gas/Capacity/2035.csv             |  32 +-
 .../default/Gas/Capacity/2040.csv             |  32 +-
 .../default/Gas/Capacity/2045.csv             |  46 +-
 .../default/Gas/Capacity/2050.csv             |  46 +-
 tests/example_outputs/default/MCACapacity.csv |  44 +-
 tests/example_outputs/default/MCAPrices.csv   | 216 ++--
 .../default/Power/Capacity/2025.csv           |  29 +-
 .../default/Power/Capacity/2030.csv           |  43 +-
 .../default/Power/Capacity/2035.csv           |  59 +-
 .../default/Power/Capacity/2040.csv           |  77 +-
 .../default/Power/Capacity/2045.csv           |  97 +-
 .../default/Power/Capacity/2050.csv           | 132 ++-
 156 files changed, 8339 insertions(+), 7503 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
index d1ee882b..f94eb68b 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -2,3 +2,9 @@ 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,2030,R1,gassupply1,2025,2.68980000000
+1,2035,R1,gassupply1,2025,2.68980000000
+1,2040,R1,gassupply1,2025,2.68980000000
+1,2045,R1,gassupply1,2025,2.68980000000
+1,2050,R1,gassupply1,2025,2.68980000000
+1,2064,R1,gassupply1,2025,2.68980000000
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 d1ee882b..8c75b113 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
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.68980000000
+1,2035,R1,gassupply1,2025,2.68980000000
+1,2040,R1,gassupply1,2025,2.68980000000
+1,2045,R1,gassupply1,2025,2.68980000000
+1,2050,R1,gassupply1,2025,2.68980000000
+1,2064,R1,gassupply1,2025,2.68980000000
+2,2035,R1,gassupply1,2030,7.47130000000
+2,2040,R1,gassupply1,2030,7.47130000000
+2,2045,R1,gassupply1,2030,7.47130000000
+2,2050,R1,gassupply1,2030,7.47130000000
+2,2064,R1,gassupply1,2030,7.47130000000
+2,2065,R1,gassupply1,2030,7.47130000000
+2,2069,R1,gassupply1,2030,7.47130000000
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 d1ee882b..8c75b113 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
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.68980000000
+1,2035,R1,gassupply1,2025,2.68980000000
+1,2040,R1,gassupply1,2025,2.68980000000
+1,2045,R1,gassupply1,2025,2.68980000000
+1,2050,R1,gassupply1,2025,2.68980000000
+1,2064,R1,gassupply1,2025,2.68980000000
+2,2035,R1,gassupply1,2030,7.47130000000
+2,2040,R1,gassupply1,2030,7.47130000000
+2,2045,R1,gassupply1,2030,7.47130000000
+2,2050,R1,gassupply1,2030,7.47130000000
+2,2064,R1,gassupply1,2030,7.47130000000
+2,2065,R1,gassupply1,2030,7.47130000000
+2,2069,R1,gassupply1,2030,7.47130000000
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 d1ee882b..8c75b113 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
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.68980000000
+1,2035,R1,gassupply1,2025,2.68980000000
+1,2040,R1,gassupply1,2025,2.68980000000
+1,2045,R1,gassupply1,2025,2.68980000000
+1,2050,R1,gassupply1,2025,2.68980000000
+1,2064,R1,gassupply1,2025,2.68980000000
+2,2035,R1,gassupply1,2030,7.47130000000
+2,2040,R1,gassupply1,2030,7.47130000000
+2,2045,R1,gassupply1,2030,7.47130000000
+2,2050,R1,gassupply1,2030,7.47130000000
+2,2064,R1,gassupply1,2030,7.47130000000
+2,2065,R1,gassupply1,2030,7.47130000000
+2,2069,R1,gassupply1,2030,7.47130000000
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 d1ee882b..a4314e3b 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
@@ -2,3 +2,22 @@ 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,2030,R1,gassupply1,2025,2.68980000000
+1,2035,R1,gassupply1,2025,2.68980000000
+1,2040,R1,gassupply1,2025,2.68980000000
+1,2045,R1,gassupply1,2025,2.68980000000
+1,2050,R1,gassupply1,2025,2.68980000000
+1,2064,R1,gassupply1,2025,2.68980000000
+2,2035,R1,gassupply1,2030,7.47130000000
+2,2040,R1,gassupply1,2030,7.47130000000
+2,2045,R1,gassupply1,2030,7.47130000000
+2,2050,R1,gassupply1,2030,7.47130000000
+2,2064,R1,gassupply1,2030,7.47130000000
+2,2065,R1,gassupply1,2030,7.47130000000
+2,2069,R1,gassupply1,2030,7.47130000000
+3,2050,R1,gassupply1,2045,1.58320000000
+3,2064,R1,gassupply1,2045,1.58320000000
+3,2065,R1,gassupply1,2045,1.58320000000
+3,2069,R1,gassupply1,2045,1.58320000000
+3,2070,R1,gassupply1,2045,1.58320000000
+3,2084,R1,gassupply1,2045,1.58320000000
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 d1ee882b..a4314e3b 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
@@ -2,3 +2,22 @@ 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,2030,R1,gassupply1,2025,2.68980000000
+1,2035,R1,gassupply1,2025,2.68980000000
+1,2040,R1,gassupply1,2025,2.68980000000
+1,2045,R1,gassupply1,2025,2.68980000000
+1,2050,R1,gassupply1,2025,2.68980000000
+1,2064,R1,gassupply1,2025,2.68980000000
+2,2035,R1,gassupply1,2030,7.47130000000
+2,2040,R1,gassupply1,2030,7.47130000000
+2,2045,R1,gassupply1,2030,7.47130000000
+2,2050,R1,gassupply1,2030,7.47130000000
+2,2064,R1,gassupply1,2030,7.47130000000
+2,2065,R1,gassupply1,2030,7.47130000000
+2,2069,R1,gassupply1,2030,7.47130000000
+3,2050,R1,gassupply1,2045,1.58320000000
+3,2064,R1,gassupply1,2045,1.58320000000
+3,2065,R1,gassupply1,2045,1.58320000000
+3,2069,R1,gassupply1,2045,1.58320000000
+3,2070,R1,gassupply1,2045,1.58320000000
+3,2084,R1,gassupply1,2045,1.58320000000
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 6120b752..87f657af 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
@@ -10,41 +10,47 @@ windturbine,R1,R1,A1,power,newcapa,2025,6.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,2.68980000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.68980000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.47130000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.68980000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.47130000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,7.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.68980000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.47130000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,7.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.68980000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.47130000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.58320000000
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 e5e04c44..764d2557 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63580000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.43850000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.67970000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.65770000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63580000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43850000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.67970000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65770000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81120000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31550000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.72350000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.87700000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.14740000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72950000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.76370000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04160000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.22100000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09690000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.14830000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07550000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14740000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72950000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76370000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04160000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22100000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09690000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.14830000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07550000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.44210000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.20950000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31280000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.29470000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46600000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.53460000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11830000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.14580000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02990000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.85970000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.05460000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.21860000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04930000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.29180000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14580000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02990000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85970000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05460000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21860000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04930000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.29180000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10500000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43730000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12520000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.59700000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.34970000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.29150000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.07170000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.72530000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.17090000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.14480000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02990000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.92790000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.05840000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.21720000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04920000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.39380000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.11360000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14480000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02990000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.92790000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05840000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21720000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04920000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39380000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11360000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43430000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12460000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.79910000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.38380000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.28950000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.07140000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.86090000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.18610000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.14370000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02980000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.03960000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06120000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.21560000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04910000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.56110000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.11970000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14370000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.03960000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06120000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21560000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04910000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.56110000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11970000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43120000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12430000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.13230000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40800000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.28750000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07130000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.08370000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.19700000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.14550000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02980000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.28730000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.06560000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.21830000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04900000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.93270000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.12970000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14550000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.28730000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06560000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.21830000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04900000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.93270000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12970000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.43650000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12390000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.87570000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.44800000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.29100000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07110000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.57920000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.21480000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
index dcf2dd95..90541c9d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -1,29 +1,24 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,solarPV,2020,10
-1,2030,R1,solarPV,2020,10
-1,2035,R1,solarPV,2020,10
-1,2040,R1,solarPV,2020,10
-1,2045,R1,solarPV,2020,10
-1,2049,R1,solarPV,2020,10
-2,2030,R1,solarPV,2025,10
-2,2035,R1,solarPV,2025,10
-2,2040,R1,solarPV,2025,10
-2,2045,R1,solarPV,2025,10
-2,2049,R1,solarPV,2025,10
-2,2050,R1,solarPV,2025,10
-2,2054,R1,solarPV,2025,10
-3,2025,R1,windturbine,2020,6
-3,2030,R1,windturbine,2020,6
-3,2035,R1,windturbine,2020,6
-3,2040,R1,windturbine,2020,6
-3,2045,R1,windturbine,2020,6
-3,2049,R1,windturbine,2020,6
-4,2030,R1,windturbine,2025,4
-4,2035,R1,windturbine,2025,4
-4,2040,R1,windturbine,2025,4
-4,2045,R1,windturbine,2025,4
-4,2049,R1,windturbine,2025,4
-4,2050,R1,windturbine,2025,4
-4,2054,R1,windturbine,2025,4
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2054,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,solarPV,2020,10
+2,2030,R1,solarPV,2020,10
+2,2035,R1,solarPV,2020,10
+2,2040,R1,solarPV,2020,10
+2,2045,R1,solarPV,2020,10
+2,2049,R1,solarPV,2020,10
+4,2025,R1,windturbine,2020,6
+4,2030,R1,windturbine,2020,6
+4,2035,R1,windturbine,2020,6
+4,2040,R1,windturbine,2020,6
+4,2045,R1,windturbine,2020,6
+4,2049,R1,windturbine,2020,6
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 f768a64b..e4de90f2 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,34 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,solarPV,2020,10
-1,2030,R1,solarPV,2020,10
-1,2035,R1,solarPV,2020,10
-1,2040,R1,solarPV,2020,10
-1,2045,R1,solarPV,2020,10
-1,2049,R1,solarPV,2020,10
-2,2030,R1,solarPV,2025,10
-2,2035,R1,solarPV,2025,10
-2,2040,R1,solarPV,2025,10
-2,2045,R1,solarPV,2025,10
-2,2049,R1,solarPV,2025,10
-2,2050,R1,solarPV,2025,10
-2,2054,R1,solarPV,2025,10
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2054,R1,solarPV,2030,6
-3,2055,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2025,R1,windturbine,2020,6
-4,2030,R1,windturbine,2020,6
-4,2035,R1,windturbine,2020,6
-4,2040,R1,windturbine,2020,6
-4,2045,R1,windturbine,2020,6
-4,2049,R1,windturbine,2020,6
-5,2030,R1,windturbine,2025,4
-5,2035,R1,windturbine,2025,4
-5,2040,R1,windturbine,2025,4
-5,2045,R1,windturbine,2025,4
-5,2049,R1,windturbine,2025,4
-5,2050,R1,windturbine,2025,4
-5,2054,R1,windturbine,2025,4
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2054,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,solarPV,2020,10
+2,2030,R1,solarPV,2020,10
+2,2035,R1,solarPV,2020,10
+2,2040,R1,solarPV,2020,10
+2,2045,R1,solarPV,2020,10
+2,2049,R1,solarPV,2020,10
+4,2035,R1,solarPV,2030,6
+4,2040,R1,solarPV,2030,6
+4,2045,R1,solarPV,2030,6
+4,2049,R1,solarPV,2030,6
+4,2050,R1,solarPV,2030,6
+4,2054,R1,solarPV,2030,6
+4,2055,R1,solarPV,2030,6
+4,2059,R1,solarPV,2030,6
+5,2025,R1,windturbine,2020,6
+5,2030,R1,windturbine,2020,6
+5,2035,R1,windturbine,2020,6
+5,2040,R1,windturbine,2020,6
+5,2045,R1,windturbine,2020,6
+5,2049,R1,windturbine,2020,6
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 bc0bf29e..f3af614a 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,46 +1,43 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,solarPV,2020,10
-1,2030,R1,solarPV,2020,10
-1,2035,R1,solarPV,2020,10
-1,2040,R1,solarPV,2020,10
-1,2045,R1,solarPV,2020,10
-1,2049,R1,solarPV,2020,10
-2,2030,R1,solarPV,2025,10
-2,2035,R1,solarPV,2025,10
-2,2040,R1,solarPV,2025,10
-2,2045,R1,solarPV,2025,10
-2,2049,R1,solarPV,2025,10
-2,2050,R1,solarPV,2025,10
-2,2054,R1,solarPV,2025,10
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2054,R1,solarPV,2030,6
-3,2055,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2040,R1,solarPV,2035,5
-4,2045,R1,solarPV,2035,5
-4,2049,R1,solarPV,2035,5
-4,2050,R1,solarPV,2035,5
-4,2054,R1,solarPV,2035,5
-4,2055,R1,solarPV,2035,5
-4,2059,R1,solarPV,2035,5
-4,2060,R1,solarPV,2035,5
-4,2064,R1,solarPV,2035,5
-5,2025,R1,windturbine,2020,6
-5,2030,R1,windturbine,2020,6
-5,2035,R1,windturbine,2020,6
-5,2040,R1,windturbine,2020,6
-5,2045,R1,windturbine,2020,6
-5,2049,R1,windturbine,2020,6
-6,2030,R1,windturbine,2025,4
-6,2035,R1,windturbine,2025,4
-6,2040,R1,windturbine,2025,4
-6,2045,R1,windturbine,2025,4
-6,2049,R1,windturbine,2025,4
-6,2050,R1,windturbine,2025,4
-6,2054,R1,windturbine,2025,4
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2054,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,solarPV,2020,10
+2,2030,R1,solarPV,2020,10
+2,2035,R1,solarPV,2020,10
+2,2040,R1,solarPV,2020,10
+2,2045,R1,solarPV,2020,10
+2,2049,R1,solarPV,2020,10
+4,2035,R1,solarPV,2030,6
+4,2040,R1,solarPV,2030,6
+4,2045,R1,solarPV,2030,6
+4,2049,R1,solarPV,2030,6
+4,2050,R1,solarPV,2030,6
+4,2054,R1,solarPV,2030,6
+4,2055,R1,solarPV,2030,6
+4,2059,R1,solarPV,2030,6
+5,2040,R1,solarPV,2035,6
+5,2045,R1,solarPV,2035,6
+5,2049,R1,solarPV,2035,6
+5,2050,R1,solarPV,2035,6
+5,2054,R1,solarPV,2035,6
+5,2055,R1,solarPV,2035,6
+5,2059,R1,solarPV,2035,6
+5,2060,R1,solarPV,2035,6
+5,2064,R1,solarPV,2035,6
+6,2025,R1,windturbine,2020,6
+6,2030,R1,windturbine,2020,6
+6,2035,R1,windturbine,2020,6
+6,2040,R1,windturbine,2020,6
+6,2045,R1,windturbine,2020,6
+6,2049,R1,windturbine,2020,6
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 bc242a85..ab1876be 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,56 +1,53 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,solarPV,2020,10
-1,2030,R1,solarPV,2020,10
-1,2035,R1,solarPV,2020,10
-1,2040,R1,solarPV,2020,10
-1,2045,R1,solarPV,2020,10
-1,2049,R1,solarPV,2020,10
-2,2030,R1,solarPV,2025,10
-2,2035,R1,solarPV,2025,10
-2,2040,R1,solarPV,2025,10
-2,2045,R1,solarPV,2025,10
-2,2049,R1,solarPV,2025,10
-2,2050,R1,solarPV,2025,10
-2,2054,R1,solarPV,2025,10
-3,2035,R1,solarPV,2030,6
-3,2040,R1,solarPV,2030,6
-3,2045,R1,solarPV,2030,6
-3,2049,R1,solarPV,2030,6
-3,2050,R1,solarPV,2030,6
-3,2054,R1,solarPV,2030,6
-3,2055,R1,solarPV,2030,6
-3,2059,R1,solarPV,2030,6
-4,2040,R1,solarPV,2035,5
-4,2045,R1,solarPV,2035,5
-4,2049,R1,solarPV,2035,5
-4,2050,R1,solarPV,2035,5
-4,2054,R1,solarPV,2035,5
-4,2055,R1,solarPV,2035,5
-4,2059,R1,solarPV,2035,5
-4,2060,R1,solarPV,2035,5
-4,2064,R1,solarPV,2035,5
-5,2045,R1,solarPV,2040,7
-5,2049,R1,solarPV,2040,7
-5,2050,R1,solarPV,2040,7
-5,2054,R1,solarPV,2040,7
-5,2055,R1,solarPV,2040,7
-5,2059,R1,solarPV,2040,7
-5,2060,R1,solarPV,2040,7
-5,2064,R1,solarPV,2040,7
-5,2065,R1,solarPV,2040,7
-5,2069,R1,solarPV,2040,7
-6,2025,R1,windturbine,2020,6
-6,2030,R1,windturbine,2020,6
-6,2035,R1,windturbine,2020,6
-6,2040,R1,windturbine,2020,6
-6,2045,R1,windturbine,2020,6
-6,2049,R1,windturbine,2020,6
-7,2030,R1,windturbine,2025,4
-7,2035,R1,windturbine,2025,4
-7,2040,R1,windturbine,2025,4
-7,2045,R1,windturbine,2025,4
-7,2049,R1,windturbine,2025,4
-7,2050,R1,windturbine,2025,4
-7,2054,R1,windturbine,2025,4
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2054,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,solarPV,2020,10
+2,2030,R1,solarPV,2020,10
+2,2035,R1,solarPV,2020,10
+2,2040,R1,solarPV,2020,10
+2,2045,R1,solarPV,2020,10
+2,2049,R1,solarPV,2020,10
+4,2035,R1,solarPV,2030,6
+4,2040,R1,solarPV,2030,6
+4,2045,R1,solarPV,2030,6
+4,2049,R1,solarPV,2030,6
+4,2050,R1,solarPV,2030,6
+4,2054,R1,solarPV,2030,6
+4,2055,R1,solarPV,2030,6
+4,2059,R1,solarPV,2030,6
+5,2040,R1,solarPV,2035,6
+5,2045,R1,solarPV,2035,6
+5,2049,R1,solarPV,2035,6
+5,2050,R1,solarPV,2035,6
+5,2054,R1,solarPV,2035,6
+5,2055,R1,solarPV,2035,6
+5,2059,R1,solarPV,2035,6
+5,2060,R1,solarPV,2035,6
+5,2064,R1,solarPV,2035,6
+6,2045,R1,solarPV,2040,6
+6,2049,R1,solarPV,2040,6
+6,2050,R1,solarPV,2040,6
+6,2054,R1,solarPV,2040,6
+6,2055,R1,solarPV,2040,6
+6,2059,R1,solarPV,2040,6
+6,2060,R1,solarPV,2040,6
+6,2064,R1,solarPV,2040,6
+6,2065,R1,solarPV,2040,6
+6,2069,R1,solarPV,2040,6
+7,2025,R1,windturbine,2020,6
+7,2030,R1,windturbine,2020,6
+7,2035,R1,windturbine,2020,6
+7,2040,R1,windturbine,2020,6
+7,2045,R1,windturbine,2020,6
+7,2049,R1,windturbine,2020,6
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 5fc9f4fa..f59c2e5c 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
@@ -1,69 +1,78 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-2,2025,R1,solarPV,2020,10
-2,2030,R1,solarPV,2020,10
-2,2035,R1,solarPV,2020,10
-2,2040,R1,solarPV,2020,10
-2,2045,R1,solarPV,2020,10
-2,2049,R1,solarPV,2020,10
-3,2030,R1,solarPV,2025,10
-3,2035,R1,solarPV,2025,10
-3,2040,R1,solarPV,2025,10
-3,2045,R1,solarPV,2025,10
-3,2049,R1,solarPV,2025,10
-3,2050,R1,solarPV,2025,10
-3,2054,R1,solarPV,2025,10
-4,2035,R1,solarPV,2030,6
-4,2040,R1,solarPV,2030,6
-4,2045,R1,solarPV,2030,6
-4,2049,R1,solarPV,2030,6
-4,2050,R1,solarPV,2030,6
-4,2054,R1,solarPV,2030,6
-4,2055,R1,solarPV,2030,6
-4,2059,R1,solarPV,2030,6
-5,2040,R1,solarPV,2035,5
-5,2045,R1,solarPV,2035,5
-5,2049,R1,solarPV,2035,5
-5,2050,R1,solarPV,2035,5
-5,2054,R1,solarPV,2035,5
-5,2055,R1,solarPV,2035,5
-5,2059,R1,solarPV,2035,5
-5,2060,R1,solarPV,2035,5
-5,2064,R1,solarPV,2035,5
-6,2045,R1,solarPV,2040,7
-6,2049,R1,solarPV,2040,7
-6,2050,R1,solarPV,2040,7
-6,2054,R1,solarPV,2040,7
-6,2055,R1,solarPV,2040,7
-6,2059,R1,solarPV,2040,7
-6,2060,R1,solarPV,2040,7
-6,2064,R1,solarPV,2040,7
-6,2065,R1,solarPV,2040,7
-6,2069,R1,solarPV,2040,7
-7,2050,R1,solarPV,2045,10
-7,2054,R1,solarPV,2045,10
-7,2055,R1,solarPV,2045,10
-7,2059,R1,solarPV,2045,10
-7,2060,R1,solarPV,2045,10
-7,2064,R1,solarPV,2045,10
-7,2065,R1,solarPV,2045,10
-7,2069,R1,solarPV,2045,10
-7,2070,R1,solarPV,2045,10
-7,2074,R1,solarPV,2045,10
-8,2025,R1,windturbine,2020,6
-8,2030,R1,windturbine,2020,6
-8,2035,R1,windturbine,2020,6
-8,2040,R1,windturbine,2020,6
-8,2045,R1,windturbine,2020,6
-8,2049,R1,windturbine,2020,6
-9,2030,R1,windturbine,2025,4
-9,2035,R1,windturbine,2025,4
-9,2040,R1,windturbine,2025,4
-9,2045,R1,windturbine,2025,4
-9,2049,R1,windturbine,2025,4
-9,2050,R1,windturbine,2025,4
-9,2054,R1,windturbine,2025,4
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2054,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2050,R1,gasCCGT,2045,1
+2,2054,R1,gasCCGT,2045,1
+2,2055,R1,gasCCGT,2045,1
+2,2059,R1,gasCCGT,2045,1
+2,2060,R1,gasCCGT,2045,1
+2,2064,R1,gasCCGT,2045,1
+2,2065,R1,gasCCGT,2045,1
+2,2069,R1,gasCCGT,2045,1
+2,2070,R1,gasCCGT,2045,1
+2,2074,R1,gasCCGT,2045,1
+2,2075,R1,gasCCGT,2045,1
+2,2084,R1,gasCCGT,2045,1
+3,2025,R1,solarPV,2020,10
+3,2030,R1,solarPV,2020,10
+3,2035,R1,solarPV,2020,10
+3,2040,R1,solarPV,2020,10
+3,2045,R1,solarPV,2020,10
+3,2049,R1,solarPV,2020,10
+5,2035,R1,solarPV,2030,6
+5,2040,R1,solarPV,2030,6
+5,2045,R1,solarPV,2030,6
+5,2049,R1,solarPV,2030,6
+5,2050,R1,solarPV,2030,6
+5,2054,R1,solarPV,2030,6
+5,2055,R1,solarPV,2030,6
+5,2059,R1,solarPV,2030,6
+6,2040,R1,solarPV,2035,6
+6,2045,R1,solarPV,2035,6
+6,2049,R1,solarPV,2035,6
+6,2050,R1,solarPV,2035,6
+6,2054,R1,solarPV,2035,6
+6,2055,R1,solarPV,2035,6
+6,2059,R1,solarPV,2035,6
+6,2060,R1,solarPV,2035,6
+6,2064,R1,solarPV,2035,6
+7,2045,R1,solarPV,2040,6
+7,2049,R1,solarPV,2040,6
+7,2050,R1,solarPV,2040,6
+7,2054,R1,solarPV,2040,6
+7,2055,R1,solarPV,2040,6
+7,2059,R1,solarPV,2040,6
+7,2060,R1,solarPV,2040,6
+7,2064,R1,solarPV,2040,6
+7,2065,R1,solarPV,2040,6
+7,2069,R1,solarPV,2040,6
+8,2050,R1,solarPV,2045,10
+8,2054,R1,solarPV,2045,10
+8,2055,R1,solarPV,2045,10
+8,2059,R1,solarPV,2045,10
+8,2060,R1,solarPV,2045,10
+8,2064,R1,solarPV,2045,10
+8,2065,R1,solarPV,2045,10
+8,2069,R1,solarPV,2045,10
+8,2070,R1,solarPV,2045,10
+8,2074,R1,solarPV,2045,10
+9,2025,R1,windturbine,2020,6
+9,2030,R1,windturbine,2020,6
+9,2035,R1,windturbine,2020,6
+9,2040,R1,windturbine,2020,6
+9,2045,R1,windturbine,2020,6
+9,2049,R1,windturbine,2020,6
 10,2050,R1,windturbine,2045,10
 10,2054,R1,windturbine,2045,10
 10,2055,R1,windturbine,2045,10
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 3d219672..534dd8e5 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,79 +1,80 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-2,2025,R1,solarPV,2020,10
-2,2030,R1,solarPV,2020,10
-2,2035,R1,solarPV,2020,10
-2,2040,R1,solarPV,2020,10
-2,2045,R1,solarPV,2020,10
-2,2049,R1,solarPV,2020,10
-3,2030,R1,solarPV,2025,10
-3,2035,R1,solarPV,2025,10
-3,2040,R1,solarPV,2025,10
-3,2045,R1,solarPV,2025,10
-3,2049,R1,solarPV,2025,10
-3,2050,R1,solarPV,2025,10
-3,2054,R1,solarPV,2025,10
-4,2035,R1,solarPV,2030,6
-4,2040,R1,solarPV,2030,6
-4,2045,R1,solarPV,2030,6
-4,2049,R1,solarPV,2030,6
-4,2050,R1,solarPV,2030,6
-4,2054,R1,solarPV,2030,6
-4,2055,R1,solarPV,2030,6
-4,2059,R1,solarPV,2030,6
-5,2040,R1,solarPV,2035,5
-5,2045,R1,solarPV,2035,5
-5,2049,R1,solarPV,2035,5
-5,2050,R1,solarPV,2035,5
-5,2054,R1,solarPV,2035,5
-5,2055,R1,solarPV,2035,5
-5,2059,R1,solarPV,2035,5
-5,2060,R1,solarPV,2035,5
-5,2064,R1,solarPV,2035,5
-6,2045,R1,solarPV,2040,7
-6,2049,R1,solarPV,2040,7
-6,2050,R1,solarPV,2040,7
-6,2054,R1,solarPV,2040,7
-6,2055,R1,solarPV,2040,7
-6,2059,R1,solarPV,2040,7
-6,2060,R1,solarPV,2040,7
-6,2064,R1,solarPV,2040,7
-6,2065,R1,solarPV,2040,7
-6,2069,R1,solarPV,2040,7
-7,2050,R1,solarPV,2045,10
-7,2054,R1,solarPV,2045,10
-7,2055,R1,solarPV,2045,10
-7,2059,R1,solarPV,2045,10
-7,2060,R1,solarPV,2045,10
-7,2064,R1,solarPV,2045,10
-7,2065,R1,solarPV,2045,10
-7,2069,R1,solarPV,2045,10
-7,2070,R1,solarPV,2045,10
-7,2074,R1,solarPV,2045,10
-8,2055,R1,solarPV,2050,10
-8,2059,R1,solarPV,2050,10
-8,2060,R1,solarPV,2050,10
-8,2064,R1,solarPV,2050,10
-8,2065,R1,solarPV,2050,10
-8,2069,R1,solarPV,2050,10
-8,2070,R1,solarPV,2050,10
-8,2074,R1,solarPV,2050,10
-8,2075,R1,solarPV,2050,10
-8,2079,R1,solarPV,2050,10
-9,2025,R1,windturbine,2020,6
-9,2030,R1,windturbine,2020,6
-9,2035,R1,windturbine,2020,6
-9,2040,R1,windturbine,2020,6
-9,2045,R1,windturbine,2020,6
-9,2049,R1,windturbine,2020,6
-10,2030,R1,windturbine,2025,4
-10,2035,R1,windturbine,2025,4
-10,2040,R1,windturbine,2025,4
-10,2045,R1,windturbine,2025,4
-10,2049,R1,windturbine,2025,4
-10,2050,R1,windturbine,2025,4
-10,2054,R1,windturbine,2025,4
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2054,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2050,R1,gasCCGT,2045,1
+2,2054,R1,gasCCGT,2045,1
+2,2055,R1,gasCCGT,2045,1
+2,2059,R1,gasCCGT,2045,1
+2,2060,R1,gasCCGT,2045,1
+2,2064,R1,gasCCGT,2045,1
+2,2065,R1,gasCCGT,2045,1
+2,2069,R1,gasCCGT,2045,1
+2,2070,R1,gasCCGT,2045,1
+2,2074,R1,gasCCGT,2045,1
+2,2075,R1,gasCCGT,2045,1
+2,2079,R1,gasCCGT,2045,1
+2,2080,R1,gasCCGT,2045,1
+2,2084,R1,gasCCGT,2045,1
+3,2025,R1,solarPV,2020,10
+3,2030,R1,solarPV,2020,10
+3,2035,R1,solarPV,2020,10
+3,2040,R1,solarPV,2020,10
+3,2045,R1,solarPV,2020,10
+3,2049,R1,solarPV,2020,10
+5,2035,R1,solarPV,2030,6
+5,2040,R1,solarPV,2030,6
+5,2045,R1,solarPV,2030,6
+5,2049,R1,solarPV,2030,6
+5,2050,R1,solarPV,2030,6
+5,2054,R1,solarPV,2030,6
+5,2055,R1,solarPV,2030,6
+5,2059,R1,solarPV,2030,6
+6,2040,R1,solarPV,2035,6
+6,2045,R1,solarPV,2035,6
+6,2049,R1,solarPV,2035,6
+6,2050,R1,solarPV,2035,6
+6,2054,R1,solarPV,2035,6
+6,2055,R1,solarPV,2035,6
+6,2059,R1,solarPV,2035,6
+6,2060,R1,solarPV,2035,6
+6,2064,R1,solarPV,2035,6
+7,2045,R1,solarPV,2040,6
+7,2049,R1,solarPV,2040,6
+7,2050,R1,solarPV,2040,6
+7,2054,R1,solarPV,2040,6
+7,2055,R1,solarPV,2040,6
+7,2059,R1,solarPV,2040,6
+7,2060,R1,solarPV,2040,6
+7,2064,R1,solarPV,2040,6
+7,2065,R1,solarPV,2040,6
+7,2069,R1,solarPV,2040,6
+8,2050,R1,solarPV,2045,10
+8,2054,R1,solarPV,2045,10
+8,2055,R1,solarPV,2045,10
+8,2059,R1,solarPV,2045,10
+8,2060,R1,solarPV,2045,10
+8,2064,R1,solarPV,2045,10
+8,2065,R1,solarPV,2045,10
+8,2069,R1,solarPV,2045,10
+8,2070,R1,solarPV,2045,10
+8,2074,R1,solarPV,2045,10
+10,2025,R1,windturbine,2020,6
+10,2030,R1,windturbine,2020,6
+10,2035,R1,windturbine,2020,6
+10,2040,R1,windturbine,2020,6
+10,2045,R1,windturbine,2020,6
+10,2049,R1,windturbine,2020,6
 11,2050,R1,windturbine,2045,10
 11,2054,R1,windturbine,2045,10
 11,2055,R1,windturbine,2045,10
@@ -84,13 +85,3 @@ asset,year,region,technology,installed,capacity
 11,2069,R1,windturbine,2045,10
 11,2070,R1,windturbine,2045,10
 11,2074,R1,windturbine,2045,10
-12,2055,R1,windturbine,2050,6
-12,2059,R1,windturbine,2050,6
-12,2060,R1,windturbine,2050,6
-12,2064,R1,windturbine,2050,6
-12,2065,R1,windturbine,2050,6
-12,2069,R1,windturbine,2050,6
-12,2070,R1,windturbine,2050,6
-12,2074,R1,windturbine,2050,6
-12,2075,R1,windturbine,2050,6
-12,2079,R1,windturbine,2050,6
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 7e87b786..d6dd8abe 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
index d1ee882b..deed70ac 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -2,3 +2,9 @@ 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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
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 d1ee882b..a6dc3401 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
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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 d1ee882b..a6dc3401 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
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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 d1ee882b..a6dc3401 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
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
index c7b71d96..90db8083 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
@@ -2,5 +2,22 @@ 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,2050,R1,gassupply1,2045,2.04110000000
-1,2084,R1,gassupply1,2045,2.04110000000
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2050,R1,gassupply1,2045,2.04110000000
+3,2064,R1,gassupply1,2045,2.04110000000
+3,2065,R1,gassupply1,2045,2.04110000000
+3,2069,R1,gassupply1,2045,2.04110000000
+3,2070,R1,gassupply1,2045,2.04110000000
+3,2084,R1,gassupply1,2045,2.04110000000
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 c7b71d96..90db8083 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
@@ -2,5 +2,22 @@ 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,2050,R1,gassupply1,2045,2.04110000000
-1,2084,R1,gassupply1,2045,2.04110000000
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2050,R1,gassupply1,2045,2.04110000000
+3,2064,R1,gassupply1,2045,2.04110000000
+3,2065,R1,gassupply1,2045,2.04110000000
+3,2069,R1,gassupply1,2045,2.04110000000
+3,2070,R1,gassupply1,2045,2.04110000000
+3,2084,R1,gassupply1,2045,2.04110000000
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 e5f59108..26af66e8 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
@@ -10,44 +10,47 @@ windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,3.25000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,2.33440000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,3.25000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,2.04110000000
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 9ab212b2..0056a57b 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63800000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.68290000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63800000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68290000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81760000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.72780000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.17230000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72960000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.75620000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04200000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25850000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.13690000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07650000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17230000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72960000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75620000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04200000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25850000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13690000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07650000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51690000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.21030000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.28940000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23380000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34460000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46630000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.51930000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11990000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.17040000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.85220000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.05430000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25550000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05160000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.28050000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.10430000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17040000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85220000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05430000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25550000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05160000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28050000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10430000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13420000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57400000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.34690000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34070000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.07570000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.71020000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.16960000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16580000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.91920000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.05810000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24870000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05140000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.38060000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.11290000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16580000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.91920000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05810000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24870000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05140000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.38060000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11290000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49740000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13350000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.77240000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.38100000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33160000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.07540000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.84330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.18490000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16580000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.02690000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06080000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24870000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.54200000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.11890000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16580000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.02690000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06080000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24870000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.54200000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11890000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49740000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13180000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09380000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40480000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33160000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07460000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.05820000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.19560000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.21480000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.30390000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.06510000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.32220000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.95750000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.12860000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.21480000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30390000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06510000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.32220000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.95750000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12860000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.64440000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13180000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.92560000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.44340000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.42960000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07460000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.61240000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.21280000000,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/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
index 43008c47..3cff37a1 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -1,29 +1,22 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2025,R1,windturbine,2020,10.00000000000
 3,2030,R1,windturbine,2020,10.00000000000
 3,2035,R1,windturbine,2020,10.00000000000
 3,2040,R1,windturbine,2020,10.00000000000
 3,2045,R1,windturbine,2020,10.00000000000
 3,2049,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2025,3.25000000000
-4,2035,R1,windturbine,2025,3.25000000000
-4,2040,R1,windturbine,2025,3.25000000000
-4,2045,R1,windturbine,2025,3.25000000000
-4,2049,R1,windturbine,2025,3.25000000000
-4,2050,R1,windturbine,2025,3.25000000000
-4,2054,R1,windturbine,2025,3.25000000000
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 187ccbc8..5f560a34 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,26 +1,26 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 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,2025,R1,windturbine,2020,10.00000000000
 4,2030,R1,windturbine,2020,10.00000000000
@@ -28,10 +28,3 @@ asset,year,region,technology,installed,capacity
 4,2040,R1,windturbine,2020,10.00000000000
 4,2045,R1,windturbine,2020,10.00000000000
 4,2049,R1,windturbine,2020,10.00000000000
-5,2030,R1,windturbine,2025,3.25000000000
-5,2035,R1,windturbine,2025,3.25000000000
-5,2040,R1,windturbine,2025,3.25000000000
-5,2045,R1,windturbine,2025,3.25000000000
-5,2049,R1,windturbine,2025,3.25000000000
-5,2050,R1,windturbine,2025,3.25000000000
-5,2054,R1,windturbine,2025,3.25000000000
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 16821f81..8eedd23e 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,55 +1,37 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 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,2040,R1,solarPV,2035,10.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
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
 5,2025,R1,windturbine,2020,10.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
-6,2030,R1,windturbine,2025,3.25000000000
-6,2035,R1,windturbine,2025,3.25000000000
-6,2040,R1,windturbine,2025,3.25000000000
-6,2045,R1,windturbine,2025,3.25000000000
-6,2049,R1,windturbine,2025,3.25000000000
-6,2050,R1,windturbine,2025,3.25000000000
-6,2054,R1,windturbine,2025,3.25000000000
-7,2040,R1,windturbine,2035,2.00000000000
-7,2045,R1,windturbine,2035,2.00000000000
-7,2049,R1,windturbine,2035,2.00000000000
-7,2050,R1,windturbine,2035,2.00000000000
-7,2054,R1,windturbine,2035,2.00000000000
-7,2055,R1,windturbine,2035,2.00000000000
-7,2059,R1,windturbine,2035,2.00000000000
-7,2060,R1,windturbine,2035,2.00000000000
-7,2064,R1,windturbine,2035,2.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 16821f81..919a536e 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,55 +1,45 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 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,2040,R1,solarPV,2035,10.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,2025,R1,windturbine,2020,10.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
-6,2030,R1,windturbine,2025,3.25000000000
-6,2035,R1,windturbine,2025,3.25000000000
-6,2040,R1,windturbine,2025,3.25000000000
-6,2045,R1,windturbine,2025,3.25000000000
-6,2049,R1,windturbine,2025,3.25000000000
-6,2050,R1,windturbine,2025,3.25000000000
-6,2054,R1,windturbine,2025,3.25000000000
-7,2040,R1,windturbine,2035,2.00000000000
-7,2045,R1,windturbine,2035,2.00000000000
-7,2049,R1,windturbine,2035,2.00000000000
-7,2050,R1,windturbine,2035,2.00000000000
-7,2054,R1,windturbine,2035,2.00000000000
-7,2055,R1,windturbine,2035,2.00000000000
-7,2059,R1,windturbine,2035,2.00000000000
-7,2060,R1,windturbine,2035,2.00000000000
-7,2064,R1,windturbine,2035,2.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2040,6.00000000000
+5,2049,R1,solarPV,2040,6.00000000000
+5,2050,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,2025,R1,windturbine,2020,10.00000000000
+6,2030,R1,windturbine,2020,10.00000000000
+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/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
index 5715052f..8bbb8655 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
@@ -1,81 +1,71 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,1.22220000000
-1,2054,R1,gasCCGT,2045,1.22220000000
-1,2055,R1,gasCCGT,2045,1.22220000000
-1,2059,R1,gasCCGT,2045,1.22220000000
-1,2060,R1,gasCCGT,2045,1.22220000000
-1,2064,R1,gasCCGT,2045,1.22220000000
-1,2065,R1,gasCCGT,2045,1.22220000000
-1,2074,R1,gasCCGT,2045,1.22220000000
-1,2075,R1,gasCCGT,2045,1.22220000000
-1,2084,R1,gasCCGT,2045,1.22220000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,10.00000000000
-3,2035,R1,solarPV,2025,10.00000000000
-3,2040,R1,solarPV,2025,10.00000000000
-3,2045,R1,solarPV,2025,10.00000000000
-3,2049,R1,solarPV,2025,10.00000000000
-3,2050,R1,solarPV,2025,10.00000000000
-3,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2050,R1,gasCCGT,2045,1.22220000000
+2,2059,R1,gasCCGT,2045,1.22220000000
+2,2060,R1,gasCCGT,2045,1.22220000000
+2,2064,R1,gasCCGT,2045,1.22220000000
+2,2065,R1,gasCCGT,2045,1.22220000000
+2,2069,R1,gasCCGT,2045,1.22220000000
+2,2070,R1,gasCCGT,2045,1.22220000000
+2,2074,R1,gasCCGT,2045,1.22220000000
+2,2075,R1,gasCCGT,2045,1.22220000000
+2,2084,R1,gasCCGT,2045,1.22220000000
+3,2025,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2020,6.75000000000
+3,2045,R1,solarPV,2020,6.75000000000
+3,2049,R1,solarPV,2020,6.75000000000
 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,10.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
-6,2050,R1,solarPV,2045,10.00000000000
-6,2054,R1,solarPV,2045,10.00000000000
-6,2055,R1,solarPV,2045,10.00000000000
-6,2059,R1,solarPV,2045,10.00000000000
-6,2060,R1,solarPV,2045,10.00000000000
-6,2064,R1,solarPV,2045,10.00000000000
-6,2065,R1,solarPV,2045,10.00000000000
-6,2074,R1,solarPV,2045,10.00000000000
-7,2025,R1,windturbine,2020,10.00000000000
-7,2030,R1,windturbine,2020,10.00000000000
-7,2035,R1,windturbine,2020,10.00000000000
-7,2040,R1,windturbine,2020,10.00000000000
-7,2045,R1,windturbine,2020,10.00000000000
-7,2049,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2025,3.25000000000
-8,2035,R1,windturbine,2025,3.25000000000
-8,2040,R1,windturbine,2025,3.25000000000
-8,2045,R1,windturbine,2025,3.25000000000
-8,2049,R1,windturbine,2025,3.25000000000
-8,2050,R1,windturbine,2025,3.25000000000
-8,2054,R1,windturbine,2025,3.25000000000
-9,2040,R1,windturbine,2035,2.00000000000
-9,2045,R1,windturbine,2035,2.00000000000
-9,2049,R1,windturbine,2035,2.00000000000
-9,2050,R1,windturbine,2035,2.00000000000
-9,2054,R1,windturbine,2035,2.00000000000
-9,2055,R1,windturbine,2035,2.00000000000
-9,2059,R1,windturbine,2035,2.00000000000
-9,2060,R1,windturbine,2035,2.00000000000
-9,2064,R1,windturbine,2035,2.00000000000
-10,2050,R1,windturbine,2045,10.00000000000
-10,2054,R1,windturbine,2045,10.00000000000
-10,2055,R1,windturbine,2045,10.00000000000
-10,2059,R1,windturbine,2045,10.00000000000
-10,2060,R1,windturbine,2045,10.00000000000
-10,2064,R1,windturbine,2045,10.00000000000
-10,2065,R1,windturbine,2045,10.00000000000
-10,2074,R1,windturbine,2045,10.00000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,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,2050,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
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 fd158a69..8bbb8655 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,99 +1,71 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,1.22220000000
-1,2054,R1,gasCCGT,2045,1.22220000000
-1,2055,R1,gasCCGT,2045,1.22220000000
-1,2059,R1,gasCCGT,2045,1.22220000000
-1,2060,R1,gasCCGT,2045,1.22220000000
-1,2064,R1,gasCCGT,2045,1.22220000000
-1,2065,R1,gasCCGT,2045,1.22220000000
-1,2074,R1,gasCCGT,2045,1.22220000000
-1,2075,R1,gasCCGT,2045,1.22220000000
-1,2079,R1,gasCCGT,2045,1.22220000000
-1,2080,R1,gasCCGT,2045,1.22220000000
-1,2084,R1,gasCCGT,2045,1.22220000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,10.00000000000
-3,2035,R1,solarPV,2025,10.00000000000
-3,2040,R1,solarPV,2025,10.00000000000
-3,2045,R1,solarPV,2025,10.00000000000
-3,2049,R1,solarPV,2025,10.00000000000
-3,2050,R1,solarPV,2025,10.00000000000
-3,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2050,R1,gasCCGT,2045,1.22220000000
+2,2059,R1,gasCCGT,2045,1.22220000000
+2,2060,R1,gasCCGT,2045,1.22220000000
+2,2064,R1,gasCCGT,2045,1.22220000000
+2,2065,R1,gasCCGT,2045,1.22220000000
+2,2069,R1,gasCCGT,2045,1.22220000000
+2,2070,R1,gasCCGT,2045,1.22220000000
+2,2074,R1,gasCCGT,2045,1.22220000000
+2,2075,R1,gasCCGT,2045,1.22220000000
+2,2084,R1,gasCCGT,2045,1.22220000000
+3,2025,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2020,6.75000000000
+3,2045,R1,solarPV,2020,6.75000000000
+3,2049,R1,solarPV,2020,6.75000000000
 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,10.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
-6,2050,R1,solarPV,2045,10.00000000000
-6,2054,R1,solarPV,2045,10.00000000000
-6,2055,R1,solarPV,2045,10.00000000000
-6,2059,R1,solarPV,2045,10.00000000000
-6,2060,R1,solarPV,2045,10.00000000000
-6,2064,R1,solarPV,2045,10.00000000000
-6,2065,R1,solarPV,2045,10.00000000000
-6,2074,R1,solarPV,2045,10.00000000000
-7,2055,R1,solarPV,2050,10.00000000000
-7,2059,R1,solarPV,2050,10.00000000000
-7,2060,R1,solarPV,2050,10.00000000000
-7,2064,R1,solarPV,2050,10.00000000000
-7,2065,R1,solarPV,2050,10.00000000000
-7,2074,R1,solarPV,2050,10.00000000000
-7,2075,R1,solarPV,2050,10.00000000000
-7,2079,R1,solarPV,2050,10.00000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,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,2050,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
 8,2025,R1,windturbine,2020,10.00000000000
 8,2030,R1,windturbine,2020,10.00000000000
 8,2035,R1,windturbine,2020,10.00000000000
 8,2040,R1,windturbine,2020,10.00000000000
 8,2045,R1,windturbine,2020,10.00000000000
 8,2049,R1,windturbine,2020,10.00000000000
-9,2030,R1,windturbine,2025,3.25000000000
-9,2035,R1,windturbine,2025,3.25000000000
-9,2040,R1,windturbine,2025,3.25000000000
-9,2045,R1,windturbine,2025,3.25000000000
-9,2049,R1,windturbine,2025,3.25000000000
-9,2050,R1,windturbine,2025,3.25000000000
-9,2054,R1,windturbine,2025,3.25000000000
-10,2040,R1,windturbine,2035,2.00000000000
-10,2045,R1,windturbine,2035,2.00000000000
-10,2049,R1,windturbine,2035,2.00000000000
-10,2050,R1,windturbine,2035,2.00000000000
-10,2054,R1,windturbine,2035,2.00000000000
-10,2055,R1,windturbine,2035,2.00000000000
-10,2059,R1,windturbine,2035,2.00000000000
-10,2060,R1,windturbine,2035,2.00000000000
-10,2064,R1,windturbine,2035,2.00000000000
-11,2050,R1,windturbine,2045,10.00000000000
-11,2054,R1,windturbine,2045,10.00000000000
-11,2055,R1,windturbine,2045,10.00000000000
-11,2059,R1,windturbine,2045,10.00000000000
-11,2060,R1,windturbine,2045,10.00000000000
-11,2064,R1,windturbine,2045,10.00000000000
-11,2065,R1,windturbine,2045,10.00000000000
-11,2074,R1,windturbine,2045,10.00000000000
-12,2055,R1,windturbine,2050,3.25000000000
-12,2059,R1,windturbine,2050,3.25000000000
-12,2060,R1,windturbine,2050,3.25000000000
-12,2064,R1,windturbine,2050,3.25000000000
-12,2065,R1,windturbine,2050,3.25000000000
-12,2074,R1,windturbine,2050,3.25000000000
-12,2075,R1,windturbine,2050,3.25000000000
-12,2079,R1,windturbine,2050,3.25000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 7e87b786..d6dd8abe 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
index d1ee882b..e658e4eb 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
@@ -2,3 +2,9 @@ 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,2030,R1,gassupply1,2025,2.52000000000
+1,2035,R1,gassupply1,2025,2.52000000000
+1,2040,R1,gassupply1,2025,2.52000000000
+1,2045,R1,gassupply1,2025,2.52000000000
+1,2050,R1,gassupply1,2025,2.52000000000
+1,2064,R1,gassupply1,2025,2.52000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
index d1ee882b..c211647a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.52000000000
+1,2035,R1,gassupply1,2025,2.52000000000
+1,2040,R1,gassupply1,2025,2.52000000000
+1,2045,R1,gassupply1,2025,2.52000000000
+1,2050,R1,gassupply1,2025,2.52000000000
+1,2064,R1,gassupply1,2025,2.52000000000
+2,2035,R1,gassupply1,2030,8.41090000000
+2,2040,R1,gassupply1,2030,8.41090000000
+2,2045,R1,gassupply1,2030,8.41090000000
+2,2050,R1,gassupply1,2030,8.41090000000
+2,2064,R1,gassupply1,2030,8.41090000000
+2,2065,R1,gassupply1,2030,8.41090000000
+2,2069,R1,gassupply1,2030,8.41090000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
index d1ee882b..c211647a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.52000000000
+1,2035,R1,gassupply1,2025,2.52000000000
+1,2040,R1,gassupply1,2025,2.52000000000
+1,2045,R1,gassupply1,2025,2.52000000000
+1,2050,R1,gassupply1,2025,2.52000000000
+1,2064,R1,gassupply1,2025,2.52000000000
+2,2035,R1,gassupply1,2030,8.41090000000
+2,2040,R1,gassupply1,2030,8.41090000000
+2,2045,R1,gassupply1,2030,8.41090000000
+2,2050,R1,gassupply1,2030,8.41090000000
+2,2064,R1,gassupply1,2030,8.41090000000
+2,2065,R1,gassupply1,2030,8.41090000000
+2,2069,R1,gassupply1,2030,8.41090000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
index d1ee882b..c211647a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.52000000000
+1,2035,R1,gassupply1,2025,2.52000000000
+1,2040,R1,gassupply1,2025,2.52000000000
+1,2045,R1,gassupply1,2025,2.52000000000
+1,2050,R1,gassupply1,2025,2.52000000000
+1,2064,R1,gassupply1,2025,2.52000000000
+2,2035,R1,gassupply1,2030,8.41090000000
+2,2040,R1,gassupply1,2030,8.41090000000
+2,2045,R1,gassupply1,2030,8.41090000000
+2,2050,R1,gassupply1,2030,8.41090000000
+2,2064,R1,gassupply1,2030,8.41090000000
+2,2065,R1,gassupply1,2030,8.41090000000
+2,2069,R1,gassupply1,2030,8.41090000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
index d1ee882b..c211647a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.52000000000
+1,2035,R1,gassupply1,2025,2.52000000000
+1,2040,R1,gassupply1,2025,2.52000000000
+1,2045,R1,gassupply1,2025,2.52000000000
+1,2050,R1,gassupply1,2025,2.52000000000
+1,2064,R1,gassupply1,2025,2.52000000000
+2,2035,R1,gassupply1,2030,8.41090000000
+2,2040,R1,gassupply1,2030,8.41090000000
+2,2045,R1,gassupply1,2030,8.41090000000
+2,2050,R1,gassupply1,2030,8.41090000000
+2,2064,R1,gassupply1,2030,8.41090000000
+2,2065,R1,gassupply1,2030,8.41090000000
+2,2069,R1,gassupply1,2030,8.41090000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
index d1ee882b..c211647a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
@@ -2,3 +2,16 @@ 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,2030,R1,gassupply1,2025,2.52000000000
+1,2035,R1,gassupply1,2025,2.52000000000
+1,2040,R1,gassupply1,2025,2.52000000000
+1,2045,R1,gassupply1,2025,2.52000000000
+1,2050,R1,gassupply1,2025,2.52000000000
+1,2064,R1,gassupply1,2025,2.52000000000
+2,2035,R1,gassupply1,2030,8.41090000000
+2,2040,R1,gassupply1,2030,8.41090000000
+2,2045,R1,gassupply1,2030,8.41090000000
+2,2050,R1,gassupply1,2030,8.41090000000
+2,2064,R1,gassupply1,2030,8.41090000000
+2,2065,R1,gassupply1,2030,8.41090000000
+2,2069,R1,gassupply1,2030,8.41090000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
index 810e6d0f..80cbbaad 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -19,69 +19,87 @@ heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,4.06250000000
 windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
-windturbine,R1,R1,A1,power,newcapa,2030,0.81250000000
-solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A2,power,newcapa,2030,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2030,4.06250000000
 windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2030,0.81250000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,1.26000000000
 gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,newcapa,2030,1.26000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,4.06250000000
 solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
 windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
-windturbine,R1,R1,A1,power,newcapa,2035,0.81250000000
-solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
+gasCCGT,R1,R1,A2,power,newcapa,2035,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2035,4.06250000000
 solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
 windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2035,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.26000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,4.20550000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,1.26000000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,4.20550000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,4.06250000000
 solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
-windturbine,R1,R1,A1,power,newcapa,2040,0.81250000000
-solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
+gasCCGT,R1,R1,A2,power,newcapa,2040,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2040,4.06250000000
 solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
 windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2040,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.26000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,4.20550000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,1.26000000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,4.20550000000
 heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,4.06250000000
 solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
-windturbine,R1,R1,A1,power,newcapa,2045,0.81250000000
-solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
+gasCCGT,R1,R1,A2,power,newcapa,2045,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2045,4.06250000000
 solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
 windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2045,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.26000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,4.20550000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,1.26000000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,4.20550000000
 heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,4.06250000000
 solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
-windturbine,R1,R1,A1,power,newcapa,2050,0.81250000000
-solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
+gasCCGT,R1,R1,A2,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,4.06250000000
 solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
-windturbine,R1,R1,A2,power,newcapa,2050,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.26000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,4.20550000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,1.26000000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,4.20550000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index 0566010d..313fcb8f 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.68030000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.66080000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.74640000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.99120000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.68030000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66080000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.74640000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99120000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94460000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98240000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.81250000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.32160000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.17030000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.73130000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.76490000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.05050000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25550000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.10090000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.15000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.09550000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17030000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.73130000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76490000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05050000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25550000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.10090000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15000000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09550000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51090000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.22550000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31600000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.47310000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.53690000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.15380000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.16940000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.92700000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.05460000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25420000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05140000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.39290000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.10510000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16940000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.92700000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05460000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25420000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05140000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39290000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10510000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50830000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13350000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.80040000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.35010000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33890000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.07540000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.86050000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.17110000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16630000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.99100000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06110000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24950000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.48860000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.11970000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16630000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.99100000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06110000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24950000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.48860000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11970000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49900000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13310000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.98940000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40820000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33260000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.07520000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.98750000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.19690000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16250000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.10050000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06370000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24380000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.65260000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.12540000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16250000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.10050000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06370000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24380000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.65260000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12540000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.48750000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13200000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.31580000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43090000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.32500000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07470000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.20580000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.20710000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.15390000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.12160000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.06810000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.23080000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05070000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.68390000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.13520000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15390000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.12160000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06810000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.23080000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05070000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.68390000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13520000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.46160000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13070000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.37670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.47000000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.30780000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07410000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.24720000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.22460000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
index df8fb83e..4187ecc4 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
@@ -1,23 +1,25 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,20.00000000000
-1,2035,R1,solarPV,2025,20.00000000000
-1,2040,R1,solarPV,2025,20.00000000000
-1,2045,R1,solarPV,2025,20.00000000000
-1,2049,R1,solarPV,2025,20.00000000000
-1,2050,R1,solarPV,2025,20.00000000000
-1,2054,R1,solarPV,2025,20.00000000000
-2,2025,R1,windturbine,2020,8.37500000000
-2,2030,R1,windturbine,2020,8.37500000000
-2,2035,R1,windturbine,2020,8.37500000000
-2,2040,R1,windturbine,2020,8.37500000000
-2,2045,R1,windturbine,2020,8.37500000000
-2,2049,R1,windturbine,2020,8.37500000000
-3,2030,R1,windturbine,2025,1.62500000000
-3,2035,R1,windturbine,2025,1.62500000000
-3,2040,R1,windturbine,2025,1.62500000000
-3,2045,R1,windturbine,2025,1.62500000000
-3,2049,R1,windturbine,2025,1.62500000000
-3,2050,R1,windturbine,2025,1.62500000000
-3,2054,R1,windturbine,2025,1.62500000000
+1,2030,R1,gasCCGT,2025,6.00000000000
+1,2035,R1,gasCCGT,2025,6.00000000000
+1,2040,R1,gasCCGT,2025,6.00000000000
+1,2045,R1,gasCCGT,2025,6.00000000000
+1,2049,R1,gasCCGT,2025,6.00000000000
+1,2050,R1,gasCCGT,2025,6.00000000000
+1,2054,R1,gasCCGT,2025,6.00000000000
+1,2055,R1,gasCCGT,2025,6.00000000000
+1,2064,R1,gasCCGT,2025,6.00000000000
+2,2030,R1,solarPV,2025,8.12500000000
+2,2035,R1,solarPV,2025,8.12500000000
+2,2040,R1,solarPV,2025,8.12500000000
+2,2045,R1,solarPV,2025,8.12500000000
+2,2049,R1,solarPV,2025,8.12500000000
+2,2050,R1,solarPV,2025,8.12500000000
+2,2054,R1,solarPV,2025,8.12500000000
+3,2025,R1,windturbine,2020,8.37500000000
+3,2030,R1,windturbine,2020,8.37500000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
index 3293995f..cff8e055 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
@@ -1,31 +1,35 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,20.00000000000
-1,2035,R1,solarPV,2025,20.00000000000
-1,2040,R1,solarPV,2025,20.00000000000
-1,2045,R1,solarPV,2025,20.00000000000
-1,2049,R1,solarPV,2025,20.00000000000
-1,2050,R1,solarPV,2025,20.00000000000
-1,2054,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2030,3.00000000000
-2,2049,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2030,3.00000000000
-2,2054,R1,solarPV,2030,3.00000000000
-2,2055,R1,solarPV,2030,3.00000000000
-2,2059,R1,solarPV,2030,3.00000000000
-3,2025,R1,windturbine,2020,8.37500000000
-3,2030,R1,windturbine,2020,8.37500000000
-3,2035,R1,windturbine,2020,8.37500000000
-3,2040,R1,windturbine,2020,8.37500000000
-3,2045,R1,windturbine,2020,8.37500000000
-3,2049,R1,windturbine,2020,8.37500000000
-4,2030,R1,windturbine,2025,1.62500000000
-4,2035,R1,windturbine,2025,1.62500000000
-4,2040,R1,windturbine,2025,1.62500000000
-4,2045,R1,windturbine,2025,1.62500000000
-4,2049,R1,windturbine,2025,1.62500000000
-4,2050,R1,windturbine,2025,1.62500000000
-4,2054,R1,windturbine,2025,1.62500000000
+1,2030,R1,gasCCGT,2025,6.00000000000
+1,2035,R1,gasCCGT,2025,6.00000000000
+1,2040,R1,gasCCGT,2025,6.00000000000
+1,2045,R1,gasCCGT,2025,6.00000000000
+1,2049,R1,gasCCGT,2025,6.00000000000
+1,2050,R1,gasCCGT,2025,6.00000000000
+1,2054,R1,gasCCGT,2025,6.00000000000
+1,2055,R1,gasCCGT,2025,6.00000000000
+1,2059,R1,gasCCGT,2025,6.00000000000
+1,2060,R1,gasCCGT,2025,6.00000000000
+1,2064,R1,gasCCGT,2025,6.00000000000
+2,2030,R1,solarPV,2025,8.12500000000
+2,2035,R1,solarPV,2025,8.12500000000
+2,2040,R1,solarPV,2025,8.12500000000
+2,2045,R1,solarPV,2025,8.12500000000
+2,2049,R1,solarPV,2025,8.12500000000
+2,2050,R1,solarPV,2025,8.12500000000
+2,2054,R1,solarPV,2025,8.12500000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2025,R1,windturbine,2020,8.37500000000
+4,2030,R1,windturbine,2020,8.37500000000
+4,2035,R1,windturbine,2020,8.37500000000
+4,2040,R1,windturbine,2020,8.37500000000
+4,2045,R1,windturbine,2020,8.37500000000
+4,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
index 9edca4be..7595000f 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
@@ -1,40 +1,44 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,20.00000000000
-1,2035,R1,solarPV,2025,20.00000000000
-1,2040,R1,solarPV,2025,20.00000000000
-1,2045,R1,solarPV,2025,20.00000000000
-1,2049,R1,solarPV,2025,20.00000000000
-1,2050,R1,solarPV,2025,20.00000000000
-1,2054,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2030,3.00000000000
-2,2049,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2030,3.00000000000
-2,2054,R1,solarPV,2030,3.00000000000
-2,2055,R1,solarPV,2030,3.00000000000
-2,2059,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2054,R1,solarPV,2035,6.00000000000
-3,2055,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2025,R1,windturbine,2020,8.37500000000
-4,2030,R1,windturbine,2020,8.37500000000
-4,2035,R1,windturbine,2020,8.37500000000
-4,2040,R1,windturbine,2020,8.37500000000
-4,2045,R1,windturbine,2020,8.37500000000
-4,2049,R1,windturbine,2020,8.37500000000
-5,2030,R1,windturbine,2025,1.62500000000
-5,2035,R1,windturbine,2025,1.62500000000
-5,2040,R1,windturbine,2025,1.62500000000
-5,2045,R1,windturbine,2025,1.62500000000
-5,2049,R1,windturbine,2025,1.62500000000
-5,2050,R1,windturbine,2025,1.62500000000
-5,2054,R1,windturbine,2025,1.62500000000
+1,2030,R1,gasCCGT,2025,6.00000000000
+1,2035,R1,gasCCGT,2025,6.00000000000
+1,2040,R1,gasCCGT,2025,6.00000000000
+1,2045,R1,gasCCGT,2025,6.00000000000
+1,2049,R1,gasCCGT,2025,6.00000000000
+1,2050,R1,gasCCGT,2025,6.00000000000
+1,2054,R1,gasCCGT,2025,6.00000000000
+1,2055,R1,gasCCGT,2025,6.00000000000
+1,2059,R1,gasCCGT,2025,6.00000000000
+1,2060,R1,gasCCGT,2025,6.00000000000
+1,2064,R1,gasCCGT,2025,6.00000000000
+2,2030,R1,solarPV,2025,8.12500000000
+2,2035,R1,solarPV,2025,8.12500000000
+2,2040,R1,solarPV,2025,8.12500000000
+2,2045,R1,solarPV,2025,8.12500000000
+2,2049,R1,solarPV,2025,8.12500000000
+2,2050,R1,solarPV,2025,8.12500000000
+2,2054,R1,solarPV,2025,8.12500000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+5,2025,R1,windturbine,2020,8.37500000000
+5,2030,R1,windturbine,2020,8.37500000000
+5,2035,R1,windturbine,2020,8.37500000000
+5,2040,R1,windturbine,2020,8.37500000000
+5,2045,R1,windturbine,2020,8.37500000000
+5,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
index 433bfa74..c38e42cd 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
@@ -1,50 +1,54 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,20.00000000000
-1,2035,R1,solarPV,2025,20.00000000000
-1,2040,R1,solarPV,2025,20.00000000000
-1,2045,R1,solarPV,2025,20.00000000000
-1,2049,R1,solarPV,2025,20.00000000000
-1,2050,R1,solarPV,2025,20.00000000000
-1,2054,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2030,3.00000000000
-2,2049,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2030,3.00000000000
-2,2054,R1,solarPV,2030,3.00000000000
-2,2055,R1,solarPV,2030,3.00000000000
-2,2059,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2054,R1,solarPV,2035,6.00000000000
-3,2055,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2025,R1,windturbine,2020,8.37500000000
-5,2030,R1,windturbine,2020,8.37500000000
-5,2035,R1,windturbine,2020,8.37500000000
-5,2040,R1,windturbine,2020,8.37500000000
-5,2045,R1,windturbine,2020,8.37500000000
-5,2049,R1,windturbine,2020,8.37500000000
-6,2030,R1,windturbine,2025,1.62500000000
-6,2035,R1,windturbine,2025,1.62500000000
-6,2040,R1,windturbine,2025,1.62500000000
-6,2045,R1,windturbine,2025,1.62500000000
-6,2049,R1,windturbine,2025,1.62500000000
-6,2050,R1,windturbine,2025,1.62500000000
-6,2054,R1,windturbine,2025,1.62500000000
+1,2030,R1,gasCCGT,2025,6.00000000000
+1,2035,R1,gasCCGT,2025,6.00000000000
+1,2040,R1,gasCCGT,2025,6.00000000000
+1,2045,R1,gasCCGT,2025,6.00000000000
+1,2049,R1,gasCCGT,2025,6.00000000000
+1,2050,R1,gasCCGT,2025,6.00000000000
+1,2054,R1,gasCCGT,2025,6.00000000000
+1,2055,R1,gasCCGT,2025,6.00000000000
+1,2059,R1,gasCCGT,2025,6.00000000000
+1,2060,R1,gasCCGT,2025,6.00000000000
+1,2064,R1,gasCCGT,2025,6.00000000000
+2,2030,R1,solarPV,2025,8.12500000000
+2,2035,R1,solarPV,2025,8.12500000000
+2,2040,R1,solarPV,2025,8.12500000000
+2,2045,R1,solarPV,2025,8.12500000000
+2,2049,R1,solarPV,2025,8.12500000000
+2,2050,R1,solarPV,2025,8.12500000000
+2,2054,R1,solarPV,2025,8.12500000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+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,2025,R1,windturbine,2020,8.37500000000
+6,2030,R1,windturbine,2020,8.37500000000
+6,2035,R1,windturbine,2020,8.37500000000
+6,2040,R1,windturbine,2020,8.37500000000
+6,2045,R1,windturbine,2020,8.37500000000
+6,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
index b24e69bf..a1fb5aff 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
@@ -1,60 +1,64 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,20.00000000000
-1,2035,R1,solarPV,2025,20.00000000000
-1,2040,R1,solarPV,2025,20.00000000000
-1,2045,R1,solarPV,2025,20.00000000000
-1,2049,R1,solarPV,2025,20.00000000000
-1,2050,R1,solarPV,2025,20.00000000000
-1,2054,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2030,3.00000000000
-2,2049,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2030,3.00000000000
-2,2054,R1,solarPV,2030,3.00000000000
-2,2055,R1,solarPV,2030,3.00000000000
-2,2059,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2054,R1,solarPV,2035,6.00000000000
-3,2055,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,17.37500000000
-5,2054,R1,solarPV,2045,17.37500000000
-5,2055,R1,solarPV,2045,17.37500000000
-5,2059,R1,solarPV,2045,17.37500000000
-5,2060,R1,solarPV,2045,17.37500000000
-5,2064,R1,solarPV,2045,17.37500000000
-5,2065,R1,solarPV,2045,17.37500000000
-5,2069,R1,solarPV,2045,17.37500000000
-5,2070,R1,solarPV,2045,17.37500000000
-5,2074,R1,solarPV,2045,17.37500000000
-6,2025,R1,windturbine,2020,8.37500000000
-6,2030,R1,windturbine,2020,8.37500000000
-6,2035,R1,windturbine,2020,8.37500000000
-6,2040,R1,windturbine,2020,8.37500000000
-6,2045,R1,windturbine,2020,8.37500000000
-6,2049,R1,windturbine,2020,8.37500000000
-7,2030,R1,windturbine,2025,1.62500000000
-7,2035,R1,windturbine,2025,1.62500000000
-7,2040,R1,windturbine,2025,1.62500000000
-7,2045,R1,windturbine,2025,1.62500000000
-7,2049,R1,windturbine,2025,1.62500000000
-7,2050,R1,windturbine,2025,1.62500000000
-7,2054,R1,windturbine,2025,1.62500000000
+1,2030,R1,gasCCGT,2025,6.00000000000
+1,2035,R1,gasCCGT,2025,6.00000000000
+1,2040,R1,gasCCGT,2025,6.00000000000
+1,2045,R1,gasCCGT,2025,6.00000000000
+1,2049,R1,gasCCGT,2025,6.00000000000
+1,2050,R1,gasCCGT,2025,6.00000000000
+1,2054,R1,gasCCGT,2025,6.00000000000
+1,2055,R1,gasCCGT,2025,6.00000000000
+1,2059,R1,gasCCGT,2025,6.00000000000
+1,2060,R1,gasCCGT,2025,6.00000000000
+1,2064,R1,gasCCGT,2025,6.00000000000
+2,2030,R1,solarPV,2025,8.12500000000
+2,2035,R1,solarPV,2025,8.12500000000
+2,2040,R1,solarPV,2025,8.12500000000
+2,2045,R1,solarPV,2025,8.12500000000
+2,2049,R1,solarPV,2025,8.12500000000
+2,2050,R1,solarPV,2025,8.12500000000
+2,2054,R1,solarPV,2025,8.12500000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+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,17.37500000000
+6,2054,R1,solarPV,2045,17.37500000000
+6,2055,R1,solarPV,2045,17.37500000000
+6,2059,R1,solarPV,2045,17.37500000000
+6,2060,R1,solarPV,2045,17.37500000000
+6,2064,R1,solarPV,2045,17.37500000000
+6,2065,R1,solarPV,2045,17.37500000000
+6,2069,R1,solarPV,2045,17.37500000000
+6,2070,R1,solarPV,2045,17.37500000000
+6,2074,R1,solarPV,2045,17.37500000000
+7,2025,R1,windturbine,2020,8.37500000000
+7,2030,R1,windturbine,2020,8.37500000000
+7,2035,R1,windturbine,2020,8.37500000000
+7,2040,R1,windturbine,2020,8.37500000000
+7,2045,R1,windturbine,2020,8.37500000000
+7,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
index fae9c947..c5b2cb18 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
@@ -1,80 +1,74 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,20.00000000000
-1,2035,R1,solarPV,2025,20.00000000000
-1,2040,R1,solarPV,2025,20.00000000000
-1,2045,R1,solarPV,2025,20.00000000000
-1,2049,R1,solarPV,2025,20.00000000000
-1,2050,R1,solarPV,2025,20.00000000000
-1,2054,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2030,3.00000000000
-2,2049,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2030,3.00000000000
-2,2054,R1,solarPV,2030,3.00000000000
-2,2055,R1,solarPV,2030,3.00000000000
-2,2059,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2035,6.00000000000
-3,2045,R1,solarPV,2035,6.00000000000
-3,2049,R1,solarPV,2035,6.00000000000
-3,2050,R1,solarPV,2035,6.00000000000
-3,2054,R1,solarPV,2035,6.00000000000
-3,2055,R1,solarPV,2035,6.00000000000
-3,2059,R1,solarPV,2035,6.00000000000
-3,2060,R1,solarPV,2035,6.00000000000
-3,2064,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,17.37500000000
-5,2054,R1,solarPV,2045,17.37500000000
-5,2055,R1,solarPV,2045,17.37500000000
-5,2059,R1,solarPV,2045,17.37500000000
-5,2060,R1,solarPV,2045,17.37500000000
-5,2064,R1,solarPV,2045,17.37500000000
-5,2065,R1,solarPV,2045,17.37500000000
-5,2069,R1,solarPV,2045,17.37500000000
-5,2070,R1,solarPV,2045,17.37500000000
-5,2074,R1,solarPV,2045,17.37500000000
-6,2055,R1,solarPV,2050,20.00000000000
-6,2059,R1,solarPV,2050,20.00000000000
-6,2060,R1,solarPV,2050,20.00000000000
-6,2064,R1,solarPV,2050,20.00000000000
-6,2065,R1,solarPV,2050,20.00000000000
-6,2069,R1,solarPV,2050,20.00000000000
-6,2070,R1,solarPV,2050,20.00000000000
-6,2074,R1,solarPV,2050,20.00000000000
-6,2075,R1,solarPV,2050,20.00000000000
-6,2079,R1,solarPV,2050,20.00000000000
-7,2025,R1,windturbine,2020,8.37500000000
-7,2030,R1,windturbine,2020,8.37500000000
-7,2035,R1,windturbine,2020,8.37500000000
-7,2040,R1,windturbine,2020,8.37500000000
-7,2045,R1,windturbine,2020,8.37500000000
-7,2049,R1,windturbine,2020,8.37500000000
-8,2030,R1,windturbine,2025,1.62500000000
-8,2035,R1,windturbine,2025,1.62500000000
-8,2040,R1,windturbine,2025,1.62500000000
-8,2045,R1,windturbine,2025,1.62500000000
-8,2049,R1,windturbine,2025,1.62500000000
-8,2050,R1,windturbine,2025,1.62500000000
-8,2054,R1,windturbine,2025,1.62500000000
-9,2055,R1,windturbine,2050,1.62500000000
-9,2059,R1,windturbine,2050,1.62500000000
-9,2060,R1,windturbine,2050,1.62500000000
-9,2064,R1,windturbine,2050,1.62500000000
-9,2065,R1,windturbine,2050,1.62500000000
-9,2069,R1,windturbine,2050,1.62500000000
-9,2070,R1,windturbine,2050,1.62500000000
-9,2074,R1,windturbine,2050,1.62500000000
-9,2075,R1,windturbine,2050,1.62500000000
-9,2079,R1,windturbine,2050,1.62500000000
+1,2030,R1,gasCCGT,2025,6.00000000000
+1,2035,R1,gasCCGT,2025,6.00000000000
+1,2040,R1,gasCCGT,2025,6.00000000000
+1,2045,R1,gasCCGT,2025,6.00000000000
+1,2049,R1,gasCCGT,2025,6.00000000000
+1,2050,R1,gasCCGT,2025,6.00000000000
+1,2054,R1,gasCCGT,2025,6.00000000000
+1,2055,R1,gasCCGT,2025,6.00000000000
+1,2059,R1,gasCCGT,2025,6.00000000000
+1,2060,R1,gasCCGT,2025,6.00000000000
+1,2064,R1,gasCCGT,2025,6.00000000000
+2,2030,R1,solarPV,2025,8.12500000000
+2,2035,R1,solarPV,2025,8.12500000000
+2,2040,R1,solarPV,2025,8.12500000000
+2,2045,R1,solarPV,2025,8.12500000000
+2,2049,R1,solarPV,2025,8.12500000000
+2,2050,R1,solarPV,2025,8.12500000000
+2,2054,R1,solarPV,2025,8.12500000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+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,17.37500000000
+6,2054,R1,solarPV,2045,17.37500000000
+6,2055,R1,solarPV,2045,17.37500000000
+6,2059,R1,solarPV,2045,17.37500000000
+6,2060,R1,solarPV,2045,17.37500000000
+6,2064,R1,solarPV,2045,17.37500000000
+6,2065,R1,solarPV,2045,17.37500000000
+6,2069,R1,solarPV,2045,17.37500000000
+6,2070,R1,solarPV,2045,17.37500000000
+6,2074,R1,solarPV,2045,17.37500000000
+7,2055,R1,solarPV,2050,8.12500000000
+7,2059,R1,solarPV,2050,8.12500000000
+7,2060,R1,solarPV,2050,8.12500000000
+7,2064,R1,solarPV,2050,8.12500000000
+7,2065,R1,solarPV,2050,8.12500000000
+7,2069,R1,solarPV,2050,8.12500000000
+7,2070,R1,solarPV,2050,8.12500000000
+7,2074,R1,solarPV,2050,8.12500000000
+7,2075,R1,solarPV,2050,8.12500000000
+7,2079,R1,solarPV,2050,8.12500000000
+8,2025,R1,windturbine,2020,8.37500000000
+8,2030,R1,windturbine,2020,8.37500000000
+8,2035,R1,windturbine,2020,8.37500000000
+8,2040,R1,windturbine,2020,8.37500000000
+8,2045,R1,windturbine,2020,8.37500000000
+8,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 7e87b786..d6dd8abe 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index d1ee882b..542c24ec 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -2,3 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
+1,2040,R1,gassupply1,2030,25.13350000000
+1,2045,R1,gassupply1,2030,25.13350000000
+1,2050,R1,gassupply1,2030,25.13350000000
+1,2069,R1,gassupply1,2030,25.13350000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index d1ee882b..542c24ec 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -2,3 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
+1,2040,R1,gassupply1,2030,25.13350000000
+1,2045,R1,gassupply1,2030,25.13350000000
+1,2050,R1,gassupply1,2030,25.13350000000
+1,2069,R1,gassupply1,2030,25.13350000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index d1ee882b..542c24ec 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -2,3 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
+1,2040,R1,gassupply1,2030,25.13350000000
+1,2045,R1,gassupply1,2030,25.13350000000
+1,2050,R1,gassupply1,2030,25.13350000000
+1,2069,R1,gassupply1,2030,25.13350000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index d1ee882b..542c24ec 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -2,3 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
+1,2040,R1,gassupply1,2030,25.13350000000
+1,2045,R1,gassupply1,2030,25.13350000000
+1,2050,R1,gassupply1,2030,25.13350000000
+1,2069,R1,gassupply1,2030,25.13350000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index d1ee882b..542c24ec 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -2,3 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
+1,2040,R1,gassupply1,2030,25.13350000000
+1,2045,R1,gassupply1,2030,25.13350000000
+1,2050,R1,gassupply1,2030,25.13350000000
+1,2069,R1,gassupply1,2030,25.13350000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 097a1311..f09cdc60 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -17,7 +17,8 @@ gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,50.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,7.51380000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,0.76380000000
 windturbine,R1,R1,A1,power,newcapa,2030,4.97240000000
 solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
 windturbine,R1,R1,A2,power,newcapa,2030,10.00000000000
@@ -25,15 +26,19 @@ gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,18.00000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,50.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,7.51380000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,0.76380000000
 solarPV,R1,R1,A1,power,newcapa,2035,0.87850000000
 windturbine,R1,R1,A1,power,newcapa,2035,4.97240000000
 solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
 solarPV,R1,R1,A2,power,newcapa,2035,0.87850000000
 windturbine,R1,R1,A2,power,newcapa,2035,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.63350000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,22.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,18.00000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,50.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,7.51380000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,0.76380000000
 solarPV,R1,R1,A1,power,newcapa,2040,0.87850000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.37850000000
 windturbine,R1,R1,A1,power,newcapa,2040,4.97240000000
@@ -41,9 +46,12 @@ solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
 solarPV,R1,R1,A2,power,newcapa,2040,0.87850000000
 solarPV,R1,R1,A2,power,newcapa,2040,2.37850000000
 windturbine,R1,R1,A2,power,newcapa,2040,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.63350000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,22.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,24.00000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,50.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,7.51380000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,0.76380000000
 solarPV,R1,R1,A1,power,newcapa,2045,0.87850000000
 solarPV,R1,R1,A1,power,newcapa,2045,2.37850000000
 solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
@@ -53,9 +61,12 @@ solarPV,R1,R1,A2,power,newcapa,2045,0.87850000000
 solarPV,R1,R1,A2,power,newcapa,2045,2.37850000000
 solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
 windturbine,R1,R1,A2,power,newcapa,2045,10.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.63350000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,22.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,24.00000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,50.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,7.51380000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,0.76380000000
 solarPV,R1,R1,A1,power,newcapa,2050,0.87850000000
 solarPV,R1,R1,A1,power,newcapa,2050,2.37850000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
@@ -67,3 +78,5 @@ solarPV,R1,R1,A2,power,newcapa,2050,2.37850000000
 solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
 windturbine,R1,R1,A2,power,newcapa,2050,1.98620000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.63350000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,22.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 72175508..66430bcb 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.64250000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.19310000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.47150000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.96550000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.68960000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.28970000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.70730000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.44830000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.64250000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.19310000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.47150000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.96550000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68960000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.28970000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70730000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.44830000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.83110000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.57930000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.41460000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.89650000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.73680000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.38620000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.94300000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.93100000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.16960000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72970000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.44400000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04290000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25440000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09750000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66730000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07850000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16960000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72970000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44400000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04290000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25440000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09750000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66730000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07850000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50880000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.21190000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34190000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.24190000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33920000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89130000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.12350000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.16920000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.53410000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.04180000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25370000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.80230000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.07610000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16920000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.53410000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04180000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25370000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.80230000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07610000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50750000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13320000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.61150000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23320000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33830000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.07520000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.07120000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.11940000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.57900000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.04540000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.86940000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.08420000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57900000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04540000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86940000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08420000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13300000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.74500000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.26550000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33340000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.07520000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.16060000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13380000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16290000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.63180000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.04720000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24430000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94850000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.08820000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16290000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63180000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04720000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24430000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94850000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08820000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.48860000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90240000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28160000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.32570000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07480000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.26590000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14100000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.15280000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.63660000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04930000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.22910000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05070000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95560000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.09300000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15280000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63660000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04930000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22910000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05070000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95560000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09300000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45830000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13080000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91560000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30040000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.30550000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07420000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.27510000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14940000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index 0b03efcc..5379bc81 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,16 +1,25 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.51380000000
-1,2035,R1,solarPV,2025,17.51380000000
-1,2040,R1,solarPV,2025,17.51380000000
-1,2045,R1,solarPV,2025,17.51380000000
-1,2049,R1,solarPV,2025,17.51380000000
-1,2050,R1,solarPV,2025,17.51380000000
-1,2054,R1,solarPV,2025,17.51380000000
-2,2025,R1,windturbine,2020,14.97240000000
-2,2030,R1,windturbine,2020,14.97240000000
-2,2035,R1,windturbine,2020,14.97240000000
-2,2040,R1,windturbine,2020,14.97240000000
-2,2045,R1,windturbine,2020,14.97240000000
-2,2049,R1,windturbine,2020,14.97240000000
+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,2064,R1,gasCCGT,2025,3.00000000000
+2,2030,R1,solarPV,2025,10.76380000000
+2,2035,R1,solarPV,2025,10.76380000000
+2,2040,R1,solarPV,2025,10.76380000000
+2,2045,R1,solarPV,2025,10.76380000000
+2,2049,R1,solarPV,2025,10.76380000000
+2,2050,R1,solarPV,2025,10.76380000000
+2,2054,R1,solarPV,2025,10.76380000000
+3,2025,R1,windturbine,2020,14.97240000000
+3,2030,R1,windturbine,2020,14.97240000000
+3,2035,R1,windturbine,2020,14.97240000000
+3,2040,R1,windturbine,2020,14.97240000000
+3,2045,R1,windturbine,2020,14.97240000000
+3,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index aefd7581..4709befa 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,24 +1,35 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.51380000000
-1,2035,R1,solarPV,2025,17.51380000000
-1,2040,R1,solarPV,2025,17.51380000000
-1,2045,R1,solarPV,2025,17.51380000000
-1,2049,R1,solarPV,2025,17.51380000000
-1,2050,R1,solarPV,2025,17.51380000000
-1,2054,R1,solarPV,2025,17.51380000000
-2,2035,R1,solarPV,2030,1.75690000000
-2,2040,R1,solarPV,2030,1.75690000000
-2,2045,R1,solarPV,2030,1.75690000000
-2,2049,R1,solarPV,2030,1.75690000000
-2,2050,R1,solarPV,2030,1.75690000000
-2,2054,R1,solarPV,2030,1.75690000000
-2,2055,R1,solarPV,2030,1.75690000000
-2,2059,R1,solarPV,2030,1.75690000000
-3,2025,R1,windturbine,2020,14.97240000000
-3,2030,R1,windturbine,2020,14.97240000000
-3,2035,R1,windturbine,2020,14.97240000000
-3,2040,R1,windturbine,2020,14.97240000000
-3,2045,R1,windturbine,2020,14.97240000000
-3,2049,R1,windturbine,2020,14.97240000000
+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,2025,10.76380000000
+2,2035,R1,solarPV,2025,10.76380000000
+2,2040,R1,solarPV,2025,10.76380000000
+2,2045,R1,solarPV,2025,10.76380000000
+2,2049,R1,solarPV,2025,10.76380000000
+2,2050,R1,solarPV,2025,10.76380000000
+2,2054,R1,solarPV,2025,10.76380000000
+3,2035,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2030,1.75690000000
+3,2045,R1,solarPV,2030,1.75690000000
+3,2049,R1,solarPV,2030,1.75690000000
+3,2050,R1,solarPV,2030,1.75690000000
+3,2054,R1,solarPV,2030,1.75690000000
+3,2055,R1,solarPV,2030,1.75690000000
+3,2059,R1,solarPV,2030,1.75690000000
+4,2025,R1,windturbine,2020,14.97240000000
+4,2030,R1,windturbine,2020,14.97240000000
+4,2035,R1,windturbine,2020,14.97240000000
+4,2040,R1,windturbine,2020,14.97240000000
+4,2045,R1,windturbine,2020,14.97240000000
+4,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index 804dca49..53525ebb 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,33 +1,44 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.51380000000
-1,2035,R1,solarPV,2025,17.51380000000
-1,2040,R1,solarPV,2025,17.51380000000
-1,2045,R1,solarPV,2025,17.51380000000
-1,2049,R1,solarPV,2025,17.51380000000
-1,2050,R1,solarPV,2025,17.51380000000
-1,2054,R1,solarPV,2025,17.51380000000
-2,2035,R1,solarPV,2030,1.75690000000
-2,2040,R1,solarPV,2030,1.75690000000
-2,2045,R1,solarPV,2030,1.75690000000
-2,2049,R1,solarPV,2030,1.75690000000
-2,2050,R1,solarPV,2030,1.75690000000
-2,2054,R1,solarPV,2030,1.75690000000
-2,2055,R1,solarPV,2030,1.75690000000
-2,2059,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2035,4.75690000000
-3,2045,R1,solarPV,2035,4.75690000000
-3,2049,R1,solarPV,2035,4.75690000000
-3,2050,R1,solarPV,2035,4.75690000000
-3,2054,R1,solarPV,2035,4.75690000000
-3,2055,R1,solarPV,2035,4.75690000000
-3,2059,R1,solarPV,2035,4.75690000000
-3,2060,R1,solarPV,2035,4.75690000000
-3,2064,R1,solarPV,2035,4.75690000000
-4,2025,R1,windturbine,2020,14.97240000000
-4,2030,R1,windturbine,2020,14.97240000000
-4,2035,R1,windturbine,2020,14.97240000000
-4,2040,R1,windturbine,2020,14.97240000000
-4,2045,R1,windturbine,2020,14.97240000000
-4,2049,R1,windturbine,2020,14.97240000000
+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,2025,10.76380000000
+2,2035,R1,solarPV,2025,10.76380000000
+2,2040,R1,solarPV,2025,10.76380000000
+2,2045,R1,solarPV,2025,10.76380000000
+2,2049,R1,solarPV,2025,10.76380000000
+2,2050,R1,solarPV,2025,10.76380000000
+2,2054,R1,solarPV,2025,10.76380000000
+3,2035,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2030,1.75690000000
+3,2045,R1,solarPV,2030,1.75690000000
+3,2049,R1,solarPV,2030,1.75690000000
+3,2050,R1,solarPV,2030,1.75690000000
+3,2054,R1,solarPV,2030,1.75690000000
+3,2055,R1,solarPV,2030,1.75690000000
+3,2059,R1,solarPV,2030,1.75690000000
+4,2040,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2035,4.75690000000
+4,2049,R1,solarPV,2035,4.75690000000
+4,2050,R1,solarPV,2035,4.75690000000
+4,2054,R1,solarPV,2035,4.75690000000
+4,2055,R1,solarPV,2035,4.75690000000
+4,2059,R1,solarPV,2035,4.75690000000
+4,2060,R1,solarPV,2035,4.75690000000
+4,2064,R1,solarPV,2035,4.75690000000
+5,2025,R1,windturbine,2020,14.97240000000
+5,2030,R1,windturbine,2020,14.97240000000
+5,2035,R1,windturbine,2020,14.97240000000
+5,2040,R1,windturbine,2020,14.97240000000
+5,2045,R1,windturbine,2020,14.97240000000
+5,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index b4a84d56..7d0c5029 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,43 +1,54 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.51380000000
-1,2035,R1,solarPV,2025,17.51380000000
-1,2040,R1,solarPV,2025,17.51380000000
-1,2045,R1,solarPV,2025,17.51380000000
-1,2049,R1,solarPV,2025,17.51380000000
-1,2050,R1,solarPV,2025,17.51380000000
-1,2054,R1,solarPV,2025,17.51380000000
-2,2035,R1,solarPV,2030,1.75690000000
-2,2040,R1,solarPV,2030,1.75690000000
-2,2045,R1,solarPV,2030,1.75690000000
-2,2049,R1,solarPV,2030,1.75690000000
-2,2050,R1,solarPV,2030,1.75690000000
-2,2054,R1,solarPV,2030,1.75690000000
-2,2055,R1,solarPV,2030,1.75690000000
-2,2059,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2035,4.75690000000
-3,2045,R1,solarPV,2035,4.75690000000
-3,2049,R1,solarPV,2035,4.75690000000
-3,2050,R1,solarPV,2035,4.75690000000
-3,2054,R1,solarPV,2035,4.75690000000
-3,2055,R1,solarPV,2035,4.75690000000
-3,2059,R1,solarPV,2035,4.75690000000
-3,2060,R1,solarPV,2035,4.75690000000
-3,2064,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2025,R1,windturbine,2020,14.97240000000
-5,2030,R1,windturbine,2020,14.97240000000
-5,2035,R1,windturbine,2020,14.97240000000
-5,2040,R1,windturbine,2020,14.97240000000
-5,2045,R1,windturbine,2020,14.97240000000
-5,2049,R1,windturbine,2020,14.97240000000
+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,2025,10.76380000000
+2,2035,R1,solarPV,2025,10.76380000000
+2,2040,R1,solarPV,2025,10.76380000000
+2,2045,R1,solarPV,2025,10.76380000000
+2,2049,R1,solarPV,2025,10.76380000000
+2,2050,R1,solarPV,2025,10.76380000000
+2,2054,R1,solarPV,2025,10.76380000000
+3,2035,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2030,1.75690000000
+3,2045,R1,solarPV,2030,1.75690000000
+3,2049,R1,solarPV,2030,1.75690000000
+3,2050,R1,solarPV,2030,1.75690000000
+3,2054,R1,solarPV,2030,1.75690000000
+3,2055,R1,solarPV,2030,1.75690000000
+3,2059,R1,solarPV,2030,1.75690000000
+4,2040,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2035,4.75690000000
+4,2049,R1,solarPV,2035,4.75690000000
+4,2050,R1,solarPV,2035,4.75690000000
+4,2054,R1,solarPV,2035,4.75690000000
+4,2055,R1,solarPV,2035,4.75690000000
+4,2059,R1,solarPV,2035,4.75690000000
+4,2060,R1,solarPV,2035,4.75690000000
+4,2064,R1,solarPV,2035,4.75690000000
+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,2025,R1,windturbine,2020,14.97240000000
+6,2030,R1,windturbine,2020,14.97240000000
+6,2035,R1,windturbine,2020,14.97240000000
+6,2040,R1,windturbine,2020,14.97240000000
+6,2045,R1,windturbine,2020,14.97240000000
+6,2049,R1,windturbine,2020,14.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index a0f164dc..c7d1329c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,63 +1,74 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.51380000000
-1,2035,R1,solarPV,2025,17.51380000000
-1,2040,R1,solarPV,2025,17.51380000000
-1,2045,R1,solarPV,2025,17.51380000000
-1,2049,R1,solarPV,2025,17.51380000000
-1,2050,R1,solarPV,2025,17.51380000000
-1,2054,R1,solarPV,2025,17.51380000000
-2,2035,R1,solarPV,2030,1.75690000000
-2,2040,R1,solarPV,2030,1.75690000000
-2,2045,R1,solarPV,2030,1.75690000000
-2,2049,R1,solarPV,2030,1.75690000000
-2,2050,R1,solarPV,2030,1.75690000000
-2,2054,R1,solarPV,2030,1.75690000000
-2,2055,R1,solarPV,2030,1.75690000000
-2,2059,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2035,4.75690000000
-3,2045,R1,solarPV,2035,4.75690000000
-3,2049,R1,solarPV,2035,4.75690000000
-3,2050,R1,solarPV,2035,4.75690000000
-3,2054,R1,solarPV,2035,4.75690000000
-3,2055,R1,solarPV,2035,4.75690000000
-3,2059,R1,solarPV,2035,4.75690000000
-3,2060,R1,solarPV,2035,4.75690000000
-3,2064,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,20.00000000000
-5,2054,R1,solarPV,2045,20.00000000000
-5,2055,R1,solarPV,2045,20.00000000000
-5,2059,R1,solarPV,2045,20.00000000000
-5,2060,R1,solarPV,2045,20.00000000000
-5,2064,R1,solarPV,2045,20.00000000000
-5,2065,R1,solarPV,2045,20.00000000000
-5,2069,R1,solarPV,2045,20.00000000000
-5,2070,R1,solarPV,2045,20.00000000000
-5,2074,R1,solarPV,2045,20.00000000000
-6,2025,R1,windturbine,2020,14.97240000000
-6,2030,R1,windturbine,2020,14.97240000000
-6,2035,R1,windturbine,2020,14.97240000000
-6,2040,R1,windturbine,2020,14.97240000000
-6,2045,R1,windturbine,2020,14.97240000000
-6,2049,R1,windturbine,2020,14.97240000000
-7,2050,R1,windturbine,2045,3.97240000000
-7,2054,R1,windturbine,2045,3.97240000000
-7,2055,R1,windturbine,2045,3.97240000000
-7,2059,R1,windturbine,2045,3.97240000000
-7,2060,R1,windturbine,2045,3.97240000000
-7,2064,R1,windturbine,2045,3.97240000000
-7,2065,R1,windturbine,2045,3.97240000000
-7,2069,R1,windturbine,2045,3.97240000000
-7,2070,R1,windturbine,2045,3.97240000000
-7,2074,R1,windturbine,2045,3.97240000000
+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,2025,10.76380000000
+2,2035,R1,solarPV,2025,10.76380000000
+2,2040,R1,solarPV,2025,10.76380000000
+2,2045,R1,solarPV,2025,10.76380000000
+2,2049,R1,solarPV,2025,10.76380000000
+2,2050,R1,solarPV,2025,10.76380000000
+2,2054,R1,solarPV,2025,10.76380000000
+3,2035,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2030,1.75690000000
+3,2045,R1,solarPV,2030,1.75690000000
+3,2049,R1,solarPV,2030,1.75690000000
+3,2050,R1,solarPV,2030,1.75690000000
+3,2054,R1,solarPV,2030,1.75690000000
+3,2055,R1,solarPV,2030,1.75690000000
+3,2059,R1,solarPV,2030,1.75690000000
+4,2040,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2035,4.75690000000
+4,2049,R1,solarPV,2035,4.75690000000
+4,2050,R1,solarPV,2035,4.75690000000
+4,2054,R1,solarPV,2035,4.75690000000
+4,2055,R1,solarPV,2035,4.75690000000
+4,2059,R1,solarPV,2035,4.75690000000
+4,2060,R1,solarPV,2035,4.75690000000
+4,2064,R1,solarPV,2035,4.75690000000
+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,20.00000000000
+6,2054,R1,solarPV,2045,20.00000000000
+6,2055,R1,solarPV,2045,20.00000000000
+6,2059,R1,solarPV,2045,20.00000000000
+6,2060,R1,solarPV,2045,20.00000000000
+6,2064,R1,solarPV,2045,20.00000000000
+6,2065,R1,solarPV,2045,20.00000000000
+6,2069,R1,solarPV,2045,20.00000000000
+6,2070,R1,solarPV,2045,20.00000000000
+6,2074,R1,solarPV,2045,20.00000000000
+7,2025,R1,windturbine,2020,14.97240000000
+7,2030,R1,windturbine,2020,14.97240000000
+7,2035,R1,windturbine,2020,14.97240000000
+7,2040,R1,windturbine,2020,14.97240000000
+7,2045,R1,windturbine,2020,14.97240000000
+7,2049,R1,windturbine,2020,14.97240000000
+8,2050,R1,windturbine,2045,3.97240000000
+8,2054,R1,windturbine,2045,3.97240000000
+8,2055,R1,windturbine,2045,3.97240000000
+8,2059,R1,windturbine,2045,3.97240000000
+8,2060,R1,windturbine,2045,3.97240000000
+8,2064,R1,windturbine,2045,3.97240000000
+8,2065,R1,windturbine,2045,3.97240000000
+8,2069,R1,windturbine,2045,3.97240000000
+8,2070,R1,windturbine,2045,3.97240000000
+8,2074,R1,windturbine,2045,3.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index 6abe9bf8..73d8c115 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,73 +1,84 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,17.51380000000
-1,2035,R1,solarPV,2025,17.51380000000
-1,2040,R1,solarPV,2025,17.51380000000
-1,2045,R1,solarPV,2025,17.51380000000
-1,2049,R1,solarPV,2025,17.51380000000
-1,2050,R1,solarPV,2025,17.51380000000
-1,2054,R1,solarPV,2025,17.51380000000
-2,2035,R1,solarPV,2030,1.75690000000
-2,2040,R1,solarPV,2030,1.75690000000
-2,2045,R1,solarPV,2030,1.75690000000
-2,2049,R1,solarPV,2030,1.75690000000
-2,2050,R1,solarPV,2030,1.75690000000
-2,2054,R1,solarPV,2030,1.75690000000
-2,2055,R1,solarPV,2030,1.75690000000
-2,2059,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2035,4.75690000000
-3,2045,R1,solarPV,2035,4.75690000000
-3,2049,R1,solarPV,2035,4.75690000000
-3,2050,R1,solarPV,2035,4.75690000000
-3,2054,R1,solarPV,2035,4.75690000000
-3,2055,R1,solarPV,2035,4.75690000000
-3,2059,R1,solarPV,2035,4.75690000000
-3,2060,R1,solarPV,2035,4.75690000000
-3,2064,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2040,6.00000000000
-4,2049,R1,solarPV,2040,6.00000000000
-4,2050,R1,solarPV,2040,6.00000000000
-4,2054,R1,solarPV,2040,6.00000000000
-4,2055,R1,solarPV,2040,6.00000000000
-4,2059,R1,solarPV,2040,6.00000000000
-4,2060,R1,solarPV,2040,6.00000000000
-4,2064,R1,solarPV,2040,6.00000000000
-4,2065,R1,solarPV,2040,6.00000000000
-4,2069,R1,solarPV,2040,6.00000000000
-5,2050,R1,solarPV,2045,20.00000000000
-5,2054,R1,solarPV,2045,20.00000000000
-5,2055,R1,solarPV,2045,20.00000000000
-5,2059,R1,solarPV,2045,20.00000000000
-5,2060,R1,solarPV,2045,20.00000000000
-5,2064,R1,solarPV,2045,20.00000000000
-5,2065,R1,solarPV,2045,20.00000000000
-5,2069,R1,solarPV,2045,20.00000000000
-5,2070,R1,solarPV,2045,20.00000000000
-5,2074,R1,solarPV,2045,20.00000000000
-6,2055,R1,solarPV,2050,18.75690000000
-6,2059,R1,solarPV,2050,18.75690000000
-6,2060,R1,solarPV,2050,18.75690000000
-6,2064,R1,solarPV,2050,18.75690000000
-6,2065,R1,solarPV,2050,18.75690000000
-6,2069,R1,solarPV,2050,18.75690000000
-6,2070,R1,solarPV,2050,18.75690000000
-6,2074,R1,solarPV,2050,18.75690000000
-6,2075,R1,solarPV,2050,18.75690000000
-6,2079,R1,solarPV,2050,18.75690000000
-7,2025,R1,windturbine,2020,14.97240000000
-7,2030,R1,windturbine,2020,14.97240000000
-7,2035,R1,windturbine,2020,14.97240000000
-7,2040,R1,windturbine,2020,14.97240000000
-7,2045,R1,windturbine,2020,14.97240000000
-7,2049,R1,windturbine,2020,14.97240000000
-8,2050,R1,windturbine,2045,3.97240000000
-8,2054,R1,windturbine,2045,3.97240000000
-8,2055,R1,windturbine,2045,3.97240000000
-8,2059,R1,windturbine,2045,3.97240000000
-8,2060,R1,windturbine,2045,3.97240000000
-8,2064,R1,windturbine,2045,3.97240000000
-8,2065,R1,windturbine,2045,3.97240000000
-8,2069,R1,windturbine,2045,3.97240000000
-8,2070,R1,windturbine,2045,3.97240000000
-8,2074,R1,windturbine,2045,3.97240000000
+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,2025,10.76380000000
+2,2035,R1,solarPV,2025,10.76380000000
+2,2040,R1,solarPV,2025,10.76380000000
+2,2045,R1,solarPV,2025,10.76380000000
+2,2049,R1,solarPV,2025,10.76380000000
+2,2050,R1,solarPV,2025,10.76380000000
+2,2054,R1,solarPV,2025,10.76380000000
+3,2035,R1,solarPV,2030,1.75690000000
+3,2040,R1,solarPV,2030,1.75690000000
+3,2045,R1,solarPV,2030,1.75690000000
+3,2049,R1,solarPV,2030,1.75690000000
+3,2050,R1,solarPV,2030,1.75690000000
+3,2054,R1,solarPV,2030,1.75690000000
+3,2055,R1,solarPV,2030,1.75690000000
+3,2059,R1,solarPV,2030,1.75690000000
+4,2040,R1,solarPV,2035,4.75690000000
+4,2045,R1,solarPV,2035,4.75690000000
+4,2049,R1,solarPV,2035,4.75690000000
+4,2050,R1,solarPV,2035,4.75690000000
+4,2054,R1,solarPV,2035,4.75690000000
+4,2055,R1,solarPV,2035,4.75690000000
+4,2059,R1,solarPV,2035,4.75690000000
+4,2060,R1,solarPV,2035,4.75690000000
+4,2064,R1,solarPV,2035,4.75690000000
+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,20.00000000000
+6,2054,R1,solarPV,2045,20.00000000000
+6,2055,R1,solarPV,2045,20.00000000000
+6,2059,R1,solarPV,2045,20.00000000000
+6,2060,R1,solarPV,2045,20.00000000000
+6,2064,R1,solarPV,2045,20.00000000000
+6,2065,R1,solarPV,2045,20.00000000000
+6,2069,R1,solarPV,2045,20.00000000000
+6,2070,R1,solarPV,2045,20.00000000000
+6,2074,R1,solarPV,2045,20.00000000000
+7,2055,R1,solarPV,2050,15.38190000000
+7,2059,R1,solarPV,2050,15.38190000000
+7,2060,R1,solarPV,2050,15.38190000000
+7,2064,R1,solarPV,2050,15.38190000000
+7,2065,R1,solarPV,2050,15.38190000000
+7,2069,R1,solarPV,2050,15.38190000000
+7,2070,R1,solarPV,2050,15.38190000000
+7,2074,R1,solarPV,2050,15.38190000000
+7,2075,R1,solarPV,2050,15.38190000000
+7,2079,R1,solarPV,2050,15.38190000000
+8,2025,R1,windturbine,2020,14.97240000000
+8,2030,R1,windturbine,2020,14.97240000000
+8,2035,R1,windturbine,2020,14.97240000000
+8,2040,R1,windturbine,2020,14.97240000000
+8,2045,R1,windturbine,2020,14.97240000000
+8,2049,R1,windturbine,2020,14.97240000000
+9,2050,R1,windturbine,2045,3.97240000000
+9,2054,R1,windturbine,2045,3.97240000000
+9,2055,R1,windturbine,2045,3.97240000000
+9,2059,R1,windturbine,2045,3.97240000000
+9,2060,R1,windturbine,2045,3.97240000000
+9,2064,R1,windturbine,2045,3.97240000000
+9,2065,R1,windturbine,2045,3.97240000000
+9,2069,R1,windturbine,2045,3.97240000000
+9,2070,R1,windturbine,2045,3.97240000000
+9,2074,R1,windturbine,2045,3.97240000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 7e87b786..d6dd8abe 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
index 1d028468..71e5a914 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -2,6 +2,18 @@ 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
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,2.33440000000
+3,2035,R2,gassupply1,2025,2.33440000000
+3,2040,R2,gassupply1,2025,2.33440000000
+3,2045,R2,gassupply1,2025,2.33440000000
+3,2050,R2,gassupply1,2025,2.33440000000
+3,2064,R2,gassupply1,2025,2.33440000000
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 1d028468..00107563 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
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.33440000000
+4,2035,R2,gassupply1,2025,2.33440000000
+4,2040,R2,gassupply1,2025,2.33440000000
+4,2045,R2,gassupply1,2025,2.33440000000
+4,2050,R2,gassupply1,2025,2.33440000000
+4,2064,R2,gassupply1,2025,2.33440000000
+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 1d028468..00107563 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
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.33440000000
+4,2035,R2,gassupply1,2025,2.33440000000
+4,2040,R2,gassupply1,2025,2.33440000000
+4,2045,R2,gassupply1,2025,2.33440000000
+4,2050,R2,gassupply1,2025,2.33440000000
+4,2064,R2,gassupply1,2025,2.33440000000
+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 1d028468..00107563 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
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.33440000000
+4,2035,R2,gassupply1,2025,2.33440000000
+4,2040,R2,gassupply1,2025,2.33440000000
+4,2045,R2,gassupply1,2025,2.33440000000
+4,2050,R2,gassupply1,2025,2.33440000000
+4,2064,R2,gassupply1,2025,2.33440000000
+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/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
index 389309d7..a585b562 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
@@ -2,10 +2,44 @@ 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,2050,R1,gassupply1,2045,1.02060000000
-1,2084,R1,gassupply1,2045,1.02060000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2050,R2,gassupply1,2045,1.02060000000
-3,2084,R2,gassupply1,2045,1.02060000000
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2050,R1,gassupply1,2045,1.02060000000
+3,2064,R1,gassupply1,2045,1.02060000000
+3,2065,R1,gassupply1,2045,1.02060000000
+3,2069,R1,gassupply1,2045,1.02060000000
+3,2070,R1,gassupply1,2045,1.02060000000
+3,2084,R1,gassupply1,2045,1.02060000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,2.33440000000
+5,2035,R2,gassupply1,2025,2.33440000000
+5,2040,R2,gassupply1,2025,2.33440000000
+5,2045,R2,gassupply1,2025,2.33440000000
+5,2050,R2,gassupply1,2025,2.33440000000
+5,2064,R2,gassupply1,2025,2.33440000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,1.02060000000
+7,2064,R2,gassupply1,2045,1.02060000000
+7,2065,R2,gassupply1,2045,1.02060000000
+7,2069,R2,gassupply1,2045,1.02060000000
+7,2070,R2,gassupply1,2045,1.02060000000
+7,2084,R2,gassupply1,2045,1.02060000000
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 389309d7..a585b562 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
@@ -2,10 +2,44 @@ 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,2050,R1,gassupply1,2045,1.02060000000
-1,2084,R1,gassupply1,2045,1.02060000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2050,R2,gassupply1,2045,1.02060000000
-3,2084,R2,gassupply1,2045,1.02060000000
+1,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2050,R1,gassupply1,2045,1.02060000000
+3,2064,R1,gassupply1,2045,1.02060000000
+3,2065,R1,gassupply1,2045,1.02060000000
+3,2069,R1,gassupply1,2045,1.02060000000
+3,2070,R1,gassupply1,2045,1.02060000000
+3,2084,R1,gassupply1,2045,1.02060000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,2.33440000000
+5,2035,R2,gassupply1,2025,2.33440000000
+5,2040,R2,gassupply1,2025,2.33440000000
+5,2045,R2,gassupply1,2025,2.33440000000
+5,2050,R2,gassupply1,2025,2.33440000000
+5,2064,R2,gassupply1,2025,2.33440000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,1.02060000000
+7,2064,R2,gassupply1,2045,1.02060000000
+7,2065,R2,gassupply1,2045,1.02060000000
+7,2069,R2,gassupply1,2045,1.02060000000
+7,2070,R2,gassupply1,2045,1.02060000000
+7,2084,R2,gassupply1,2045,1.02060000000
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 fc7b10ad..19cab0f3 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
@@ -20,79 +20,86 @@ heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,19.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,3.25000000000
-solarPV,R2,R2,A1,power,newcapa,2030,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,5.88890000000
 windturbine,R2,R2,A1,power,newcapa,2030,16.75000000000
-windturbine,R2,R2,A1,power,newcapa,2030,3.25000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,2.33440000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,2.33440000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,10.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,26.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,3.25000000000
-solarPV,R2,R2,A1,power,newcapa,2035,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2035,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2035,6.00000000000
 windturbine,R2,R2,A1,power,newcapa,2035,16.75000000000
-windturbine,R2,R2,A1,power,newcapa,2035,3.25000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,26.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,16.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
-solarPV,R2,R2,A1,power,newcapa,2040,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
 windturbine,R2,R2,A1,power,newcapa,2040,16.75000000000
-windturbine,R2,R2,A1,power,newcapa,2040,3.25000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,16.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,32.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
-solarPV,R2,R2,A1,power,newcapa,2045,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2045,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
 windturbine,R2,R2,A1,power,newcapa,2045,16.75000000000
-windturbine,R2,R2,A1,power,newcapa,2045,3.25000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,32.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2050,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,3.25000000000
 windturbine,R2,R2,A1,power,newcapa,2050,12.75000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.33440000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,1.02060000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R2,R2,A1,gas,newcapa,2050,1.02060000000
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 60eaccd4..075509a8 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
@@ -47,291 +47,291 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.63730000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.63730000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.68190000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.68190000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.63730000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,17.63730000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.68190000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.68190000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.81580000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.81580000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.72660000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.72660000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.17040000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.17040000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72950000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.72950000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.75430000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.75430000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04190000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.04190000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25560000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.25560000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.09700000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,1.09700000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.13400000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.13400000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07620000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.07620000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17040000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.17040000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72950000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.72950000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75430000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.75430000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04190000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.04190000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25560000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.25560000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.09700000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.09700000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13400000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.13400000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07620000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07620000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51120000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.51120000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.21000000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.21000000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.28370000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.28370000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23270000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23270000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.34080000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.34080000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.46620000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,1.46620000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.51550000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.51550000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.11950000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.11950000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.16880000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.16880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03090000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.03090000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.85060000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.85060000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.05420000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.05420000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25320000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.25320000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05140000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.05140000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.27810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,1.27810000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.10410000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.10410000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16880000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.16880000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03090000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.03090000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85060000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.85060000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05420000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.05420000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25320000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.25320000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05140000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05140000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27810000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27810000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10410000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.10410000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50630000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.50630000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13350000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.56920000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.56920000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.34620000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.34620000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33750000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.33750000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.07540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.07540000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.70700000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.70700000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.16930000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.16930000000,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.16520000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.16520000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03080000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.03080000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.91780000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.91780000000,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.05810000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.05810000000,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.24790000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.24790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05130000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05130000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.37860000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.37860000000,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.11280000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.11280000000,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.16520000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.16520000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03080000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.03080000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.91780000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.91780000000,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.05810000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.05810000000,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.24790000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.24790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05130000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05130000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.37860000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.37860000000,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.11280000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11280000000,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,0.49570000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.49570000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13290000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13290000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.76830000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.76830000000,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.38050000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.38050000000,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,0.33050000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.33050000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.07510000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.84060000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.84060000000,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.18470000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.18470000000,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.16350000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.16350000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,6.49460000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.02570000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,1.02570000000,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.06080000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.06080000000,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.24530000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.24530000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05090000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05090000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.54020000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,1.54020000000,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.11880000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.11880000000,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.16350000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.16350000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R2,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.02570000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.02570000000,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.06080000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.06080000000,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.24530000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.24530000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05090000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05090000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.54020000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.54020000000,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.11880000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.11880000000,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,0.49060000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.49060000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13160000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09030000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.09030000000,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.40430000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.40430000000,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,0.32700000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.32700000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,6.50400000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07450000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.07450000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.05580000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,2.05580000000,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.19530000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.19530000000,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.18750000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.18750000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,5.20510000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.03060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.20520000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,1.20520000000,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.06510000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.06510000000,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.28130000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.28130000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,5.21360000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05090000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.05090000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.80940000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,1.80940000000,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.12850000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.12850000000,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.18750000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.18750000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R2,5.20510000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.03060000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.20520000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.20520000000,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.06510000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.06510000000,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.28130000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.28130000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.21360000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05090000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05090000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.80940000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.80940000000,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.12850000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.12850000000,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,0.56260000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.56260000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.23910000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13150000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.13150000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.62830000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.62830000000,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.44300000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.44300000000,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,0.37510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.37510000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,5.22210000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07450000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.07450000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.41460000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,2.41460000000,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.21260000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.21260000000,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/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
index 53a1613f..fedff132 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -1,51 +1,37 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2025,R1,windturbine,2020,10.00000000000
 3,2030,R1,windturbine,2020,10.00000000000
 3,2035,R1,windturbine,2020,10.00000000000
 3,2040,R1,windturbine,2020,10.00000000000
 3,2045,R1,windturbine,2020,10.00000000000
 3,2049,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2025,3.25000000000
-4,2035,R1,windturbine,2025,3.25000000000
-4,2040,R1,windturbine,2025,3.25000000000
-4,2045,R1,windturbine,2025,3.25000000000
-4,2049,R1,windturbine,2025,3.25000000000
-4,2050,R1,windturbine,2025,3.25000000000
-4,2054,R1,windturbine,2025,3.25000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-6,2030,R2,solarPV,2025,10.00000000000
-6,2035,R2,solarPV,2025,10.00000000000
-6,2040,R2,solarPV,2025,10.00000000000
-6,2045,R2,solarPV,2025,10.00000000000
-6,2049,R2,solarPV,2025,10.00000000000
-6,2050,R2,solarPV,2025,10.00000000000
-6,2054,R2,solarPV,2025,10.00000000000
-7,2025,R2,windturbine,2020,16.75000000000
-7,2030,R2,windturbine,2020,16.75000000000
-7,2035,R2,windturbine,2020,16.75000000000
-7,2040,R2,windturbine,2020,16.75000000000
-7,2045,R2,windturbine,2020,16.75000000000
-7,2049,R2,windturbine,2020,16.75000000000
-8,2030,R2,windturbine,2025,3.25000000000
-8,2035,R2,windturbine,2025,3.25000000000
-8,2040,R2,windturbine,2025,3.25000000000
-8,2045,R2,windturbine,2025,3.25000000000
-8,2049,R2,windturbine,2025,3.25000000000
-8,2050,R2,windturbine,2025,3.25000000000
-8,2054,R2,windturbine,2025,3.25000000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+5,2030,R2,gasCCGT,2025,5.88890000000
+5,2035,R2,gasCCGT,2025,5.88890000000
+5,2040,R2,gasCCGT,2025,5.88890000000
+5,2045,R2,gasCCGT,2025,5.88890000000
+5,2049,R2,gasCCGT,2025,5.88890000000
+5,2050,R2,gasCCGT,2025,5.88890000000
+5,2064,R2,gasCCGT,2025,5.88890000000
+6,2025,R2,windturbine,2020,16.75000000000
+6,2030,R2,windturbine,2020,16.75000000000
+6,2035,R2,windturbine,2020,16.75000000000
+6,2040,R2,windturbine,2020,16.75000000000
+6,2045,R2,windturbine,2020,16.75000000000
+6,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 ca50d052..1ca9071a 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,26 +1,26 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 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,2025,R1,windturbine,2020,10.00000000000
 4,2030,R1,windturbine,2020,10.00000000000
@@ -28,40 +28,26 @@ asset,year,region,technology,installed,capacity
 4,2040,R1,windturbine,2020,10.00000000000
 4,2045,R1,windturbine,2020,10.00000000000
 4,2049,R1,windturbine,2020,10.00000000000
-5,2030,R1,windturbine,2025,3.25000000000
-5,2035,R1,windturbine,2025,3.25000000000
-5,2040,R1,windturbine,2025,3.25000000000
-5,2045,R1,windturbine,2025,3.25000000000
-5,2049,R1,windturbine,2025,3.25000000000
-5,2050,R1,windturbine,2025,3.25000000000
-5,2054,R1,windturbine,2025,3.25000000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,solarPV,2025,10.00000000000
-7,2035,R2,solarPV,2025,10.00000000000
-7,2040,R2,solarPV,2025,10.00000000000
-7,2045,R2,solarPV,2025,10.00000000000
-7,2049,R2,solarPV,2025,10.00000000000
-7,2050,R2,solarPV,2025,10.00000000000
-7,2054,R2,solarPV,2025,10.00000000000
-8,2035,R2,solarPV,2030,6.00000000000
-8,2040,R2,solarPV,2030,6.00000000000
-8,2045,R2,solarPV,2030,6.00000000000
-8,2049,R2,solarPV,2030,6.00000000000
-8,2050,R2,solarPV,2030,6.00000000000
-8,2054,R2,solarPV,2030,6.00000000000
-8,2055,R2,solarPV,2030,6.00000000000
-8,2059,R2,solarPV,2030,6.00000000000
-9,2025,R2,windturbine,2020,16.75000000000
-9,2030,R2,windturbine,2020,16.75000000000
-9,2035,R2,windturbine,2020,16.75000000000
-9,2040,R2,windturbine,2020,16.75000000000
-9,2045,R2,windturbine,2020,16.75000000000
-9,2049,R2,windturbine,2020,16.75000000000
-10,2030,R2,windturbine,2025,3.25000000000
-10,2035,R2,windturbine,2025,3.25000000000
-10,2040,R2,windturbine,2025,3.25000000000
-10,2045,R2,windturbine,2025,3.25000000000
-10,2049,R2,windturbine,2025,3.25000000000
-10,2050,R2,windturbine,2025,3.25000000000
-10,2054,R2,windturbine,2025,3.25000000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2030,R2,gasCCGT,2025,5.88890000000
+6,2035,R2,gasCCGT,2025,5.88890000000
+6,2040,R2,gasCCGT,2025,5.88890000000
+6,2045,R2,gasCCGT,2025,5.88890000000
+6,2049,R2,gasCCGT,2025,5.88890000000
+6,2050,R2,gasCCGT,2025,5.88890000000
+6,2059,R2,gasCCGT,2025,5.88890000000
+6,2060,R2,gasCCGT,2025,5.88890000000
+6,2064,R2,gasCCGT,2025,5.88890000000
+7,2035,R2,solarPV,2030,6.00000000000
+7,2040,R2,solarPV,2030,6.00000000000
+7,2045,R2,solarPV,2030,6.00000000000
+7,2049,R2,solarPV,2030,6.00000000000
+7,2050,R2,solarPV,2030,6.00000000000
+7,2059,R2,solarPV,2030,6.00000000000
+8,2025,R2,windturbine,2020,16.75000000000
+8,2030,R2,windturbine,2020,16.75000000000
+8,2035,R2,windturbine,2020,16.75000000000
+8,2040,R2,windturbine,2020,16.75000000000
+8,2045,R2,windturbine,2020,16.75000000000
+8,2049,R2,windturbine,2020,16.75000000000
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 4795755b..7f59af05 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,94 +1,67 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 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,2040,R1,solarPV,2035,10.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
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
 5,2025,R1,windturbine,2020,10.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
-6,2030,R1,windturbine,2025,3.25000000000
-6,2035,R1,windturbine,2025,3.25000000000
-6,2040,R1,windturbine,2025,3.25000000000
-6,2045,R1,windturbine,2025,3.25000000000
-6,2049,R1,windturbine,2025,3.25000000000
-6,2050,R1,windturbine,2025,3.25000000000
-6,2054,R1,windturbine,2025,3.25000000000
-7,2040,R1,windturbine,2035,2.00000000000
-7,2045,R1,windturbine,2035,2.00000000000
-7,2049,R1,windturbine,2035,2.00000000000
-7,2050,R1,windturbine,2035,2.00000000000
-7,2054,R1,windturbine,2035,2.00000000000
-7,2055,R1,windturbine,2035,2.00000000000
-7,2059,R1,windturbine,2035,2.00000000000
-7,2060,R1,windturbine,2035,2.00000000000
-7,2064,R1,windturbine,2035,2.00000000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,1.00000000000
-9,2030,R2,solarPV,2025,10.00000000000
-9,2035,R2,solarPV,2025,10.00000000000
-9,2040,R2,solarPV,2025,10.00000000000
-9,2045,R2,solarPV,2025,10.00000000000
-9,2049,R2,solarPV,2025,10.00000000000
-9,2050,R2,solarPV,2025,10.00000000000
-9,2054,R2,solarPV,2025,10.00000000000
-10,2035,R2,solarPV,2030,6.00000000000
-10,2040,R2,solarPV,2030,6.00000000000
-10,2045,R2,solarPV,2030,6.00000000000
-10,2049,R2,solarPV,2030,6.00000000000
-10,2050,R2,solarPV,2030,6.00000000000
-10,2054,R2,solarPV,2030,6.00000000000
-10,2055,R2,solarPV,2030,6.00000000000
-10,2059,R2,solarPV,2030,6.00000000000
-11,2040,R2,solarPV,2035,6.00000000000
-11,2045,R2,solarPV,2035,6.00000000000
-11,2049,R2,solarPV,2035,6.00000000000
-11,2050,R2,solarPV,2035,6.00000000000
-11,2054,R2,solarPV,2035,6.00000000000
-11,2055,R2,solarPV,2035,6.00000000000
-11,2059,R2,solarPV,2035,6.00000000000
-11,2060,R2,solarPV,2035,6.00000000000
-11,2064,R2,solarPV,2035,6.00000000000
-12,2025,R2,windturbine,2020,16.75000000000
-12,2030,R2,windturbine,2020,16.75000000000
-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,2030,R2,windturbine,2025,3.25000000000
-13,2035,R2,windturbine,2025,3.25000000000
-13,2040,R2,windturbine,2025,3.25000000000
-13,2045,R2,windturbine,2025,3.25000000000
-13,2049,R2,windturbine,2025,3.25000000000
-13,2050,R2,windturbine,2025,3.25000000000
-13,2054,R2,windturbine,2025,3.25000000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,gasCCGT,2025,5.88890000000
+7,2035,R2,gasCCGT,2025,5.88890000000
+7,2040,R2,gasCCGT,2025,5.88890000000
+7,2045,R2,gasCCGT,2025,5.88890000000
+7,2049,R2,gasCCGT,2025,5.88890000000
+7,2050,R2,gasCCGT,2025,5.88890000000
+7,2059,R2,gasCCGT,2025,5.88890000000
+7,2060,R2,gasCCGT,2025,5.88890000000
+7,2064,R2,gasCCGT,2025,5.88890000000
+8,2035,R2,solarPV,2030,6.00000000000
+8,2040,R2,solarPV,2030,6.00000000000
+8,2045,R2,solarPV,2030,6.00000000000
+8,2049,R2,solarPV,2030,6.00000000000
+8,2050,R2,solarPV,2030,6.00000000000
+8,2059,R2,solarPV,2030,6.00000000000
+9,2040,R2,solarPV,2035,6.00000000000
+9,2045,R2,solarPV,2035,6.00000000000
+9,2049,R2,solarPV,2035,6.00000000000
+9,2050,R2,solarPV,2035,6.00000000000
+9,2059,R2,solarPV,2035,6.00000000000
+9,2060,R2,solarPV,2035,6.00000000000
+9,2064,R2,solarPV,2035,6.00000000000
+10,2025,R2,windturbine,2020,16.75000000000
+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
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 617904f7..f5a4e19c 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,104 +1,83 @@
 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,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
 3,2040,R1,solarPV,2030,6.00000000000
 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,2040,R1,solarPV,2035,10.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,2025,R1,windturbine,2020,10.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
-6,2030,R1,windturbine,2025,3.25000000000
-6,2035,R1,windturbine,2025,3.25000000000
-6,2040,R1,windturbine,2025,3.25000000000
-6,2045,R1,windturbine,2025,3.25000000000
-6,2049,R1,windturbine,2025,3.25000000000
-6,2050,R1,windturbine,2025,3.25000000000
-6,2054,R1,windturbine,2025,3.25000000000
-7,2040,R1,windturbine,2035,2.00000000000
-7,2045,R1,windturbine,2035,2.00000000000
-7,2049,R1,windturbine,2035,2.00000000000
-7,2050,R1,windturbine,2035,2.00000000000
-7,2054,R1,windturbine,2035,2.00000000000
-7,2055,R1,windturbine,2035,2.00000000000
-7,2059,R1,windturbine,2035,2.00000000000
-7,2060,R1,windturbine,2035,2.00000000000
-7,2064,R1,windturbine,2035,2.00000000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,1.00000000000
-9,2030,R2,solarPV,2025,10.00000000000
-9,2035,R2,solarPV,2025,10.00000000000
-9,2040,R2,solarPV,2025,10.00000000000
-9,2045,R2,solarPV,2025,10.00000000000
-9,2049,R2,solarPV,2025,10.00000000000
-9,2050,R2,solarPV,2025,10.00000000000
-9,2054,R2,solarPV,2025,10.00000000000
-10,2035,R2,solarPV,2030,6.00000000000
-10,2040,R2,solarPV,2030,6.00000000000
-10,2045,R2,solarPV,2030,6.00000000000
-10,2049,R2,solarPV,2030,6.00000000000
-10,2050,R2,solarPV,2030,6.00000000000
-10,2054,R2,solarPV,2030,6.00000000000
-10,2055,R2,solarPV,2030,6.00000000000
-10,2059,R2,solarPV,2030,6.00000000000
-11,2040,R2,solarPV,2035,6.00000000000
-11,2045,R2,solarPV,2035,6.00000000000
-11,2049,R2,solarPV,2035,6.00000000000
-11,2050,R2,solarPV,2035,6.00000000000
-11,2054,R2,solarPV,2035,6.00000000000
-11,2055,R2,solarPV,2035,6.00000000000
-11,2059,R2,solarPV,2035,6.00000000000
-11,2060,R2,solarPV,2035,6.00000000000
-11,2064,R2,solarPV,2035,6.00000000000
-12,2045,R2,solarPV,2040,6.00000000000
-12,2049,R2,solarPV,2040,6.00000000000
-12,2050,R2,solarPV,2040,6.00000000000
-12,2054,R2,solarPV,2040,6.00000000000
-12,2055,R2,solarPV,2040,6.00000000000
-12,2059,R2,solarPV,2040,6.00000000000
-12,2060,R2,solarPV,2040,6.00000000000
-12,2064,R2,solarPV,2040,6.00000000000
-12,2065,R2,solarPV,2040,6.00000000000
-12,2069,R2,solarPV,2040,6.00000000000
-13,2025,R2,windturbine,2020,16.75000000000
-13,2030,R2,windturbine,2020,16.75000000000
-13,2035,R2,windturbine,2020,16.75000000000
-13,2040,R2,windturbine,2020,16.75000000000
-13,2045,R2,windturbine,2020,16.75000000000
-13,2049,R2,windturbine,2020,16.75000000000
-14,2030,R2,windturbine,2025,3.25000000000
-14,2035,R2,windturbine,2025,3.25000000000
-14,2040,R2,windturbine,2025,3.25000000000
-14,2045,R2,windturbine,2025,3.25000000000
-14,2049,R2,windturbine,2025,3.25000000000
-14,2050,R2,windturbine,2025,3.25000000000
-14,2054,R2,windturbine,2025,3.25000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2040,6.00000000000
+5,2049,R1,solarPV,2040,6.00000000000
+5,2050,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,2025,R1,windturbine,2020,10.00000000000
+6,2030,R1,windturbine,2020,10.00000000000
+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
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+8,2030,R2,gasCCGT,2025,5.88890000000
+8,2035,R2,gasCCGT,2025,5.88890000000
+8,2040,R2,gasCCGT,2025,5.88890000000
+8,2045,R2,gasCCGT,2025,5.88890000000
+8,2049,R2,gasCCGT,2025,5.88890000000
+8,2050,R2,gasCCGT,2025,5.88890000000
+8,2059,R2,gasCCGT,2025,5.88890000000
+8,2060,R2,gasCCGT,2025,5.88890000000
+8,2064,R2,gasCCGT,2025,5.88890000000
+9,2035,R2,solarPV,2030,6.00000000000
+9,2040,R2,solarPV,2030,6.00000000000
+9,2045,R2,solarPV,2030,6.00000000000
+9,2049,R2,solarPV,2030,6.00000000000
+9,2050,R2,solarPV,2030,6.00000000000
+9,2059,R2,solarPV,2030,6.00000000000
+10,2040,R2,solarPV,2035,6.00000000000
+10,2045,R2,solarPV,2035,6.00000000000
+10,2049,R2,solarPV,2035,6.00000000000
+10,2050,R2,solarPV,2035,6.00000000000
+10,2059,R2,solarPV,2035,6.00000000000
+10,2060,R2,solarPV,2035,6.00000000000
+10,2064,R2,solarPV,2035,6.00000000000
+11,2045,R2,solarPV,2040,6.00000000000
+11,2049,R2,solarPV,2040,6.00000000000
+11,2050,R2,solarPV,2040,6.00000000000
+11,2059,R2,solarPV,2040,6.00000000000
+11,2060,R2,solarPV,2040,6.00000000000
+11,2064,R2,solarPV,2040,6.00000000000
+11,2065,R2,solarPV,2040,6.00000000000
+11,2069,R2,solarPV,2040,6.00000000000
+12,2025,R2,windturbine,2020,16.75000000000
+12,2030,R2,windturbine,2020,16.75000000000
+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
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 2f14e092..3d9c3de1 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
@@ -1,156 +1,125 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,1.22220000000
-1,2054,R1,gasCCGT,2045,1.22220000000
-1,2055,R1,gasCCGT,2045,1.22220000000
-1,2059,R1,gasCCGT,2045,1.22220000000
-1,2060,R1,gasCCGT,2045,1.22220000000
-1,2064,R1,gasCCGT,2045,1.22220000000
-1,2065,R1,gasCCGT,2045,1.22220000000
-1,2069,R1,gasCCGT,2045,1.22220000000
-1,2070,R1,gasCCGT,2045,1.22220000000
-1,2074,R1,gasCCGT,2045,1.22220000000
-1,2075,R1,gasCCGT,2045,1.22220000000
-1,2084,R1,gasCCGT,2045,1.22220000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,10.00000000000
-3,2035,R1,solarPV,2025,10.00000000000
-3,2040,R1,solarPV,2025,10.00000000000
-3,2045,R1,solarPV,2025,10.00000000000
-3,2049,R1,solarPV,2025,10.00000000000
-3,2050,R1,solarPV,2025,10.00000000000
-3,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2050,R1,gasCCGT,2045,1.22220000000
+2,2059,R1,gasCCGT,2045,1.22220000000
+2,2060,R1,gasCCGT,2045,1.22220000000
+2,2064,R1,gasCCGT,2045,1.22220000000
+2,2065,R1,gasCCGT,2045,1.22220000000
+2,2069,R1,gasCCGT,2045,1.22220000000
+2,2070,R1,gasCCGT,2045,1.22220000000
+2,2074,R1,gasCCGT,2045,1.22220000000
+2,2075,R1,gasCCGT,2045,1.22220000000
+2,2084,R1,gasCCGT,2045,1.22220000000
+3,2025,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2020,6.75000000000
+3,2045,R1,solarPV,2020,6.75000000000
+3,2049,R1,solarPV,2020,6.75000000000
 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,10.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
-6,2050,R1,solarPV,2045,10.00000000000
-6,2054,R1,solarPV,2045,10.00000000000
-6,2055,R1,solarPV,2045,10.00000000000
-6,2059,R1,solarPV,2045,10.00000000000
-6,2060,R1,solarPV,2045,10.00000000000
-6,2064,R1,solarPV,2045,10.00000000000
-6,2065,R1,solarPV,2045,10.00000000000
-6,2069,R1,solarPV,2045,10.00000000000
-6,2070,R1,solarPV,2045,10.00000000000
-6,2074,R1,solarPV,2045,10.00000000000
-7,2025,R1,windturbine,2020,10.00000000000
-7,2030,R1,windturbine,2020,10.00000000000
-7,2035,R1,windturbine,2020,10.00000000000
-7,2040,R1,windturbine,2020,10.00000000000
-7,2045,R1,windturbine,2020,10.00000000000
-7,2049,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2025,3.25000000000
-8,2035,R1,windturbine,2025,3.25000000000
-8,2040,R1,windturbine,2025,3.25000000000
-8,2045,R1,windturbine,2025,3.25000000000
-8,2049,R1,windturbine,2025,3.25000000000
-8,2050,R1,windturbine,2025,3.25000000000
-8,2054,R1,windturbine,2025,3.25000000000
-9,2040,R1,windturbine,2035,2.00000000000
-9,2045,R1,windturbine,2035,2.00000000000
-9,2049,R1,windturbine,2035,2.00000000000
-9,2050,R1,windturbine,2035,2.00000000000
-9,2054,R1,windturbine,2035,2.00000000000
-9,2055,R1,windturbine,2035,2.00000000000
-9,2059,R1,windturbine,2035,2.00000000000
-9,2060,R1,windturbine,2035,2.00000000000
-9,2064,R1,windturbine,2035,2.00000000000
-10,2050,R1,windturbine,2045,10.00000000000
-10,2054,R1,windturbine,2045,10.00000000000
-10,2055,R1,windturbine,2045,10.00000000000
-10,2059,R1,windturbine,2045,10.00000000000
-10,2060,R1,windturbine,2045,10.00000000000
-10,2064,R1,windturbine,2045,10.00000000000
-10,2065,R1,windturbine,2045,10.00000000000
-10,2069,R1,windturbine,2045,10.00000000000
-10,2070,R1,windturbine,2045,10.00000000000
-10,2074,R1,windturbine,2045,10.00000000000
-11,2020,R2,gasCCGT,2020,1.00000000000
-11,2025,R2,gasCCGT,2020,1.00000000000
-12,2030,R2,solarPV,2025,10.00000000000
-12,2035,R2,solarPV,2025,10.00000000000
-12,2040,R2,solarPV,2025,10.00000000000
-12,2045,R2,solarPV,2025,10.00000000000
-12,2049,R2,solarPV,2025,10.00000000000
-12,2050,R2,solarPV,2025,10.00000000000
-12,2054,R2,solarPV,2025,10.00000000000
-13,2035,R2,solarPV,2030,6.00000000000
-13,2040,R2,solarPV,2030,6.00000000000
-13,2045,R2,solarPV,2030,6.00000000000
-13,2049,R2,solarPV,2030,6.00000000000
-13,2050,R2,solarPV,2030,6.00000000000
-13,2054,R2,solarPV,2030,6.00000000000
-13,2055,R2,solarPV,2030,6.00000000000
-13,2059,R2,solarPV,2030,6.00000000000
-14,2040,R2,solarPV,2035,6.00000000000
-14,2045,R2,solarPV,2035,6.00000000000
-14,2049,R2,solarPV,2035,6.00000000000
-14,2050,R2,solarPV,2035,6.00000000000
-14,2054,R2,solarPV,2035,6.00000000000
-14,2055,R2,solarPV,2035,6.00000000000
-14,2059,R2,solarPV,2035,6.00000000000
-14,2060,R2,solarPV,2035,6.00000000000
-14,2064,R2,solarPV,2035,6.00000000000
-15,2045,R2,solarPV,2040,6.00000000000
-15,2049,R2,solarPV,2040,6.00000000000
-15,2050,R2,solarPV,2040,6.00000000000
-15,2054,R2,solarPV,2040,6.00000000000
-15,2055,R2,solarPV,2040,6.00000000000
-15,2059,R2,solarPV,2040,6.00000000000
-15,2060,R2,solarPV,2040,6.00000000000
-15,2064,R2,solarPV,2040,6.00000000000
-15,2065,R2,solarPV,2040,6.00000000000
-15,2069,R2,solarPV,2040,6.00000000000
-16,2050,R2,solarPV,2045,10.00000000000
-16,2054,R2,solarPV,2045,10.00000000000
-16,2055,R2,solarPV,2045,10.00000000000
-16,2059,R2,solarPV,2045,10.00000000000
-16,2060,R2,solarPV,2045,10.00000000000
-16,2064,R2,solarPV,2045,10.00000000000
-16,2065,R2,solarPV,2045,10.00000000000
-16,2069,R2,solarPV,2045,10.00000000000
-16,2070,R2,solarPV,2045,10.00000000000
-16,2074,R2,solarPV,2045,10.00000000000
-17,2025,R2,windturbine,2020,16.75000000000
-17,2030,R2,windturbine,2020,16.75000000000
-17,2035,R2,windturbine,2020,16.75000000000
-17,2040,R2,windturbine,2020,16.75000000000
-17,2045,R2,windturbine,2020,16.75000000000
-17,2049,R2,windturbine,2020,16.75000000000
-18,2030,R2,windturbine,2025,3.25000000000
-18,2035,R2,windturbine,2025,3.25000000000
-18,2040,R2,windturbine,2025,3.25000000000
-18,2045,R2,windturbine,2025,3.25000000000
-18,2049,R2,windturbine,2025,3.25000000000
-18,2050,R2,windturbine,2025,3.25000000000
-18,2054,R2,windturbine,2025,3.25000000000
-19,2050,R2,windturbine,2045,12.75000000000
-19,2054,R2,windturbine,2045,12.75000000000
-19,2055,R2,windturbine,2045,12.75000000000
-19,2059,R2,windturbine,2045,12.75000000000
-19,2060,R2,windturbine,2045,12.75000000000
-19,2064,R2,windturbine,2045,12.75000000000
-19,2065,R2,windturbine,2045,12.75000000000
-19,2069,R2,windturbine,2045,12.75000000000
-19,2070,R2,windturbine,2045,12.75000000000
-19,2074,R2,windturbine,2045,12.75000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,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,2050,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,5.88890000000
+11,2035,R2,gasCCGT,2025,5.88890000000
+11,2040,R2,gasCCGT,2025,5.88890000000
+11,2045,R2,gasCCGT,2025,5.88890000000
+11,2049,R2,gasCCGT,2025,5.88890000000
+11,2050,R2,gasCCGT,2025,5.88890000000
+11,2059,R2,gasCCGT,2025,5.88890000000
+11,2060,R2,gasCCGT,2025,5.88890000000
+11,2064,R2,gasCCGT,2025,5.88890000000
+12,2035,R2,solarPV,2030,6.00000000000
+12,2040,R2,solarPV,2030,6.00000000000
+12,2045,R2,solarPV,2030,6.00000000000
+12,2049,R2,solarPV,2030,6.00000000000
+12,2050,R2,solarPV,2030,6.00000000000
+12,2059,R2,solarPV,2030,6.00000000000
+13,2040,R2,solarPV,2035,6.00000000000
+13,2045,R2,solarPV,2035,6.00000000000
+13,2049,R2,solarPV,2035,6.00000000000
+13,2050,R2,solarPV,2035,6.00000000000
+13,2059,R2,solarPV,2035,6.00000000000
+13,2060,R2,solarPV,2035,6.00000000000
+13,2064,R2,solarPV,2035,6.00000000000
+14,2045,R2,solarPV,2040,6.00000000000
+14,2049,R2,solarPV,2040,6.00000000000
+14,2050,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,10.00000000000
+15,2059,R2,solarPV,2045,10.00000000000
+15,2060,R2,solarPV,2045,10.00000000000
+15,2064,R2,solarPV,2045,10.00000000000
+15,2065,R2,solarPV,2045,10.00000000000
+15,2069,R2,solarPV,2045,10.00000000000
+15,2070,R2,solarPV,2045,10.00000000000
+15,2074,R2,solarPV,2045,10.00000000000
+16,2025,R2,windturbine,2020,16.75000000000
+16,2030,R2,windturbine,2020,16.75000000000
+16,2035,R2,windturbine,2020,16.75000000000
+16,2040,R2,windturbine,2020,16.75000000000
+16,2045,R2,windturbine,2020,16.75000000000
+16,2049,R2,windturbine,2020,16.75000000000
+17,2050,R2,windturbine,2045,12.75000000000
+17,2059,R2,windturbine,2045,12.75000000000
+17,2060,R2,windturbine,2045,12.75000000000
+17,2064,R2,windturbine,2045,12.75000000000
+17,2065,R2,windturbine,2045,12.75000000000
+17,2069,R2,windturbine,2045,12.75000000000
+17,2070,R2,windturbine,2045,12.75000000000
+17,2074,R2,windturbine,2045,12.75000000000
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 ccaf6bbf..3d9c3de1 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,198 +1,125 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,1.22220000000
-1,2054,R1,gasCCGT,2045,1.22220000000
-1,2055,R1,gasCCGT,2045,1.22220000000
-1,2059,R1,gasCCGT,2045,1.22220000000
-1,2060,R1,gasCCGT,2045,1.22220000000
-1,2064,R1,gasCCGT,2045,1.22220000000
-1,2065,R1,gasCCGT,2045,1.22220000000
-1,2069,R1,gasCCGT,2045,1.22220000000
-1,2070,R1,gasCCGT,2045,1.22220000000
-1,2074,R1,gasCCGT,2045,1.22220000000
-1,2075,R1,gasCCGT,2045,1.22220000000
-1,2079,R1,gasCCGT,2045,1.22220000000
-1,2080,R1,gasCCGT,2045,1.22220000000
-1,2084,R1,gasCCGT,2045,1.22220000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,10.00000000000
-3,2035,R1,solarPV,2025,10.00000000000
-3,2040,R1,solarPV,2025,10.00000000000
-3,2045,R1,solarPV,2025,10.00000000000
-3,2049,R1,solarPV,2025,10.00000000000
-3,2050,R1,solarPV,2025,10.00000000000
-3,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2050,R1,gasCCGT,2045,1.22220000000
+2,2059,R1,gasCCGT,2045,1.22220000000
+2,2060,R1,gasCCGT,2045,1.22220000000
+2,2064,R1,gasCCGT,2045,1.22220000000
+2,2065,R1,gasCCGT,2045,1.22220000000
+2,2069,R1,gasCCGT,2045,1.22220000000
+2,2070,R1,gasCCGT,2045,1.22220000000
+2,2074,R1,gasCCGT,2045,1.22220000000
+2,2075,R1,gasCCGT,2045,1.22220000000
+2,2084,R1,gasCCGT,2045,1.22220000000
+3,2025,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2020,6.75000000000
+3,2045,R1,solarPV,2020,6.75000000000
+3,2049,R1,solarPV,2020,6.75000000000
 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,10.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
-6,2050,R1,solarPV,2045,10.00000000000
-6,2054,R1,solarPV,2045,10.00000000000
-6,2055,R1,solarPV,2045,10.00000000000
-6,2059,R1,solarPV,2045,10.00000000000
-6,2060,R1,solarPV,2045,10.00000000000
-6,2064,R1,solarPV,2045,10.00000000000
-6,2065,R1,solarPV,2045,10.00000000000
-6,2069,R1,solarPV,2045,10.00000000000
-6,2070,R1,solarPV,2045,10.00000000000
-6,2074,R1,solarPV,2045,10.00000000000
-7,2055,R1,solarPV,2050,10.00000000000
-7,2059,R1,solarPV,2050,10.00000000000
-7,2060,R1,solarPV,2050,10.00000000000
-7,2064,R1,solarPV,2050,10.00000000000
-7,2065,R1,solarPV,2050,10.00000000000
-7,2069,R1,solarPV,2050,10.00000000000
-7,2070,R1,solarPV,2050,10.00000000000
-7,2074,R1,solarPV,2050,10.00000000000
-7,2075,R1,solarPV,2050,10.00000000000
-7,2079,R1,solarPV,2050,10.00000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,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,2050,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
 8,2025,R1,windturbine,2020,10.00000000000
 8,2030,R1,windturbine,2020,10.00000000000
 8,2035,R1,windturbine,2020,10.00000000000
 8,2040,R1,windturbine,2020,10.00000000000
 8,2045,R1,windturbine,2020,10.00000000000
 8,2049,R1,windturbine,2020,10.00000000000
-9,2030,R1,windturbine,2025,3.25000000000
-9,2035,R1,windturbine,2025,3.25000000000
-9,2040,R1,windturbine,2025,3.25000000000
-9,2045,R1,windturbine,2025,3.25000000000
-9,2049,R1,windturbine,2025,3.25000000000
-9,2050,R1,windturbine,2025,3.25000000000
-9,2054,R1,windturbine,2025,3.25000000000
-10,2040,R1,windturbine,2035,2.00000000000
-10,2045,R1,windturbine,2035,2.00000000000
-10,2049,R1,windturbine,2035,2.00000000000
-10,2050,R1,windturbine,2035,2.00000000000
-10,2054,R1,windturbine,2035,2.00000000000
-10,2055,R1,windturbine,2035,2.00000000000
-10,2059,R1,windturbine,2035,2.00000000000
-10,2060,R1,windturbine,2035,2.00000000000
-10,2064,R1,windturbine,2035,2.00000000000
-11,2050,R1,windturbine,2045,10.00000000000
-11,2054,R1,windturbine,2045,10.00000000000
-11,2055,R1,windturbine,2045,10.00000000000
-11,2059,R1,windturbine,2045,10.00000000000
-11,2060,R1,windturbine,2045,10.00000000000
-11,2064,R1,windturbine,2045,10.00000000000
-11,2065,R1,windturbine,2045,10.00000000000
-11,2069,R1,windturbine,2045,10.00000000000
-11,2070,R1,windturbine,2045,10.00000000000
-11,2074,R1,windturbine,2045,10.00000000000
-12,2055,R1,windturbine,2050,3.25000000000
-12,2059,R1,windturbine,2050,3.25000000000
-12,2060,R1,windturbine,2050,3.25000000000
-12,2064,R1,windturbine,2050,3.25000000000
-12,2065,R1,windturbine,2050,3.25000000000
-12,2069,R1,windturbine,2050,3.25000000000
-12,2070,R1,windturbine,2050,3.25000000000
-12,2074,R1,windturbine,2050,3.25000000000
-12,2075,R1,windturbine,2050,3.25000000000
-12,2079,R1,windturbine,2050,3.25000000000
-13,2020,R2,gasCCGT,2020,1.00000000000
-13,2025,R2,gasCCGT,2020,1.00000000000
-14,2030,R2,solarPV,2025,10.00000000000
-14,2035,R2,solarPV,2025,10.00000000000
-14,2040,R2,solarPV,2025,10.00000000000
-14,2045,R2,solarPV,2025,10.00000000000
-14,2049,R2,solarPV,2025,10.00000000000
-14,2050,R2,solarPV,2025,10.00000000000
-14,2054,R2,solarPV,2025,10.00000000000
-15,2035,R2,solarPV,2030,6.00000000000
-15,2040,R2,solarPV,2030,6.00000000000
-15,2045,R2,solarPV,2030,6.00000000000
-15,2049,R2,solarPV,2030,6.00000000000
-15,2050,R2,solarPV,2030,6.00000000000
-15,2054,R2,solarPV,2030,6.00000000000
-15,2055,R2,solarPV,2030,6.00000000000
-15,2059,R2,solarPV,2030,6.00000000000
-16,2040,R2,solarPV,2035,6.00000000000
-16,2045,R2,solarPV,2035,6.00000000000
-16,2049,R2,solarPV,2035,6.00000000000
-16,2050,R2,solarPV,2035,6.00000000000
-16,2054,R2,solarPV,2035,6.00000000000
-16,2055,R2,solarPV,2035,6.00000000000
-16,2059,R2,solarPV,2035,6.00000000000
-16,2060,R2,solarPV,2035,6.00000000000
-16,2064,R2,solarPV,2035,6.00000000000
-17,2045,R2,solarPV,2040,6.00000000000
-17,2049,R2,solarPV,2040,6.00000000000
-17,2050,R2,solarPV,2040,6.00000000000
-17,2054,R2,solarPV,2040,6.00000000000
-17,2055,R2,solarPV,2040,6.00000000000
-17,2059,R2,solarPV,2040,6.00000000000
-17,2060,R2,solarPV,2040,6.00000000000
-17,2064,R2,solarPV,2040,6.00000000000
-17,2065,R2,solarPV,2040,6.00000000000
-17,2069,R2,solarPV,2040,6.00000000000
-18,2050,R2,solarPV,2045,10.00000000000
-18,2054,R2,solarPV,2045,10.00000000000
-18,2055,R2,solarPV,2045,10.00000000000
-18,2059,R2,solarPV,2045,10.00000000000
-18,2060,R2,solarPV,2045,10.00000000000
-18,2064,R2,solarPV,2045,10.00000000000
-18,2065,R2,solarPV,2045,10.00000000000
-18,2069,R2,solarPV,2045,10.00000000000
-18,2070,R2,solarPV,2045,10.00000000000
-18,2074,R2,solarPV,2045,10.00000000000
-19,2055,R2,solarPV,2050,10.00000000000
-19,2059,R2,solarPV,2050,10.00000000000
-19,2060,R2,solarPV,2050,10.00000000000
-19,2064,R2,solarPV,2050,10.00000000000
-19,2065,R2,solarPV,2050,10.00000000000
-19,2069,R2,solarPV,2050,10.00000000000
-19,2070,R2,solarPV,2050,10.00000000000
-19,2074,R2,solarPV,2050,10.00000000000
-19,2075,R2,solarPV,2050,10.00000000000
-19,2079,R2,solarPV,2050,10.00000000000
-20,2025,R2,windturbine,2020,16.75000000000
-20,2030,R2,windturbine,2020,16.75000000000
-20,2035,R2,windturbine,2020,16.75000000000
-20,2040,R2,windturbine,2020,16.75000000000
-20,2045,R2,windturbine,2020,16.75000000000
-20,2049,R2,windturbine,2020,16.75000000000
-21,2030,R2,windturbine,2025,3.25000000000
-21,2035,R2,windturbine,2025,3.25000000000
-21,2040,R2,windturbine,2025,3.25000000000
-21,2045,R2,windturbine,2025,3.25000000000
-21,2049,R2,windturbine,2025,3.25000000000
-21,2050,R2,windturbine,2025,3.25000000000
-21,2054,R2,windturbine,2025,3.25000000000
-22,2050,R2,windturbine,2045,12.75000000000
-22,2054,R2,windturbine,2045,12.75000000000
-22,2055,R2,windturbine,2045,12.75000000000
-22,2059,R2,windturbine,2045,12.75000000000
-22,2060,R2,windturbine,2045,12.75000000000
-22,2064,R2,windturbine,2045,12.75000000000
-22,2065,R2,windturbine,2045,12.75000000000
-22,2069,R2,windturbine,2045,12.75000000000
-22,2070,R2,windturbine,2045,12.75000000000
-22,2074,R2,windturbine,2045,12.75000000000
-23,2055,R2,windturbine,2050,3.25000000000
-23,2059,R2,windturbine,2050,3.25000000000
-23,2060,R2,windturbine,2050,3.25000000000
-23,2064,R2,windturbine,2050,3.25000000000
-23,2065,R2,windturbine,2050,3.25000000000
-23,2069,R2,windturbine,2050,3.25000000000
-23,2070,R2,windturbine,2050,3.25000000000
-23,2074,R2,windturbine,2050,3.25000000000
-23,2075,R2,windturbine,2050,3.25000000000
-23,2079,R2,windturbine,2050,3.25000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,5.88890000000
+11,2035,R2,gasCCGT,2025,5.88890000000
+11,2040,R2,gasCCGT,2025,5.88890000000
+11,2045,R2,gasCCGT,2025,5.88890000000
+11,2049,R2,gasCCGT,2025,5.88890000000
+11,2050,R2,gasCCGT,2025,5.88890000000
+11,2059,R2,gasCCGT,2025,5.88890000000
+11,2060,R2,gasCCGT,2025,5.88890000000
+11,2064,R2,gasCCGT,2025,5.88890000000
+12,2035,R2,solarPV,2030,6.00000000000
+12,2040,R2,solarPV,2030,6.00000000000
+12,2045,R2,solarPV,2030,6.00000000000
+12,2049,R2,solarPV,2030,6.00000000000
+12,2050,R2,solarPV,2030,6.00000000000
+12,2059,R2,solarPV,2030,6.00000000000
+13,2040,R2,solarPV,2035,6.00000000000
+13,2045,R2,solarPV,2035,6.00000000000
+13,2049,R2,solarPV,2035,6.00000000000
+13,2050,R2,solarPV,2035,6.00000000000
+13,2059,R2,solarPV,2035,6.00000000000
+13,2060,R2,solarPV,2035,6.00000000000
+13,2064,R2,solarPV,2035,6.00000000000
+14,2045,R2,solarPV,2040,6.00000000000
+14,2049,R2,solarPV,2040,6.00000000000
+14,2050,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,10.00000000000
+15,2059,R2,solarPV,2045,10.00000000000
+15,2060,R2,solarPV,2045,10.00000000000
+15,2064,R2,solarPV,2045,10.00000000000
+15,2065,R2,solarPV,2045,10.00000000000
+15,2069,R2,solarPV,2045,10.00000000000
+15,2070,R2,solarPV,2045,10.00000000000
+15,2074,R2,solarPV,2045,10.00000000000
+16,2025,R2,windturbine,2020,16.75000000000
+16,2030,R2,windturbine,2020,16.75000000000
+16,2035,R2,windturbine,2020,16.75000000000
+16,2040,R2,windturbine,2020,16.75000000000
+16,2045,R2,windturbine,2020,16.75000000000
+16,2049,R2,windturbine,2020,16.75000000000
+17,2050,R2,windturbine,2045,12.75000000000
+17,2059,R2,windturbine,2045,12.75000000000
+17,2060,R2,windturbine,2045,12.75000000000
+17,2064,R2,windturbine,2045,12.75000000000
+17,2065,R2,windturbine,2045,12.75000000000
+17,2069,R2,windturbine,2045,12.75000000000
+17,2070,R2,windturbine,2045,12.75000000000
+17,2074,R2,windturbine,2045,12.75000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 6ef433d4..3778d007 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
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 1d028468..eec33946 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
@@ -2,6 +2,18 @@ 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
+1,2030,R1,gassupply1,2025,2.10500000000
+1,2035,R1,gassupply1,2025,2.10500000000
+1,2040,R1,gassupply1,2025,2.10500000000
+1,2045,R1,gassupply1,2025,2.10500000000
+1,2050,R1,gassupply1,2025,2.10500000000
+1,2064,R1,gassupply1,2025,2.10500000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,2.10500000000
+3,2035,R2,gassupply1,2025,2.10500000000
+3,2040,R2,gassupply1,2025,2.10500000000
+3,2045,R2,gassupply1,2025,2.10500000000
+3,2050,R2,gassupply1,2025,2.10500000000
+3,2064,R2,gassupply1,2025,2.10500000000
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 1d028468..b41ec973 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
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,2.10500000000
+1,2035,R1,gassupply1,2025,2.10500000000
+1,2040,R1,gassupply1,2025,2.10500000000
+1,2045,R1,gassupply1,2025,2.10500000000
+1,2050,R1,gassupply1,2025,2.10500000000
+1,2064,R1,gassupply1,2025,2.10500000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.10500000000
+4,2035,R2,gassupply1,2025,2.10500000000
+4,2040,R2,gassupply1,2025,2.10500000000
+4,2045,R2,gassupply1,2025,2.10500000000
+4,2050,R2,gassupply1,2025,2.10500000000
+4,2064,R2,gassupply1,2025,2.10500000000
+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 1d028468..b41ec973 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
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,2.10500000000
+1,2035,R1,gassupply1,2025,2.10500000000
+1,2040,R1,gassupply1,2025,2.10500000000
+1,2045,R1,gassupply1,2025,2.10500000000
+1,2050,R1,gassupply1,2025,2.10500000000
+1,2064,R1,gassupply1,2025,2.10500000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.10500000000
+4,2035,R2,gassupply1,2025,2.10500000000
+4,2040,R2,gassupply1,2025,2.10500000000
+4,2045,R2,gassupply1,2025,2.10500000000
+4,2050,R2,gassupply1,2025,2.10500000000
+4,2064,R2,gassupply1,2025,2.10500000000
+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 1d028468..b41ec973 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
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,2.10500000000
+1,2035,R1,gassupply1,2025,2.10500000000
+1,2040,R1,gassupply1,2025,2.10500000000
+1,2045,R1,gassupply1,2025,2.10500000000
+1,2050,R1,gassupply1,2025,2.10500000000
+1,2064,R1,gassupply1,2025,2.10500000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.10500000000
+4,2035,R2,gassupply1,2025,2.10500000000
+4,2040,R2,gassupply1,2025,2.10500000000
+4,2045,R2,gassupply1,2025,2.10500000000
+4,2050,R2,gassupply1,2025,2.10500000000
+4,2064,R2,gassupply1,2025,2.10500000000
+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/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
index 3e3b0384..5e030fcb 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
@@ -2,10 +2,44 @@ 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,2050,R1,gassupply1,2045,0.24460000000
-1,2084,R1,gassupply1,2045,0.24460000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2050,R2,gassupply1,2045,0.24460000000
-3,2084,R2,gassupply1,2045,0.24460000000
+1,2030,R1,gassupply1,2025,2.10500000000
+1,2035,R1,gassupply1,2025,2.10500000000
+1,2040,R1,gassupply1,2025,2.10500000000
+1,2045,R1,gassupply1,2025,2.10500000000
+1,2050,R1,gassupply1,2025,2.10500000000
+1,2064,R1,gassupply1,2025,2.10500000000
+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,2050,R1,gassupply1,2045,0.24460000000
+3,2064,R1,gassupply1,2045,0.24460000000
+3,2065,R1,gassupply1,2045,0.24460000000
+3,2069,R1,gassupply1,2045,0.24460000000
+3,2070,R1,gassupply1,2045,0.24460000000
+3,2084,R1,gassupply1,2045,0.24460000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,2.10500000000
+5,2035,R2,gassupply1,2025,2.10500000000
+5,2040,R2,gassupply1,2025,2.10500000000
+5,2045,R2,gassupply1,2025,2.10500000000
+5,2050,R2,gassupply1,2025,2.10500000000
+5,2064,R2,gassupply1,2025,2.10500000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,0.24460000000
+7,2064,R2,gassupply1,2045,0.24460000000
+7,2065,R2,gassupply1,2045,0.24460000000
+7,2069,R2,gassupply1,2045,0.24460000000
+7,2070,R2,gassupply1,2045,0.24460000000
+7,2084,R2,gassupply1,2045,0.24460000000
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 3e3b0384..5e030fcb 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
@@ -2,10 +2,44 @@ 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,2050,R1,gassupply1,2045,0.24460000000
-1,2084,R1,gassupply1,2045,0.24460000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2050,R2,gassupply1,2045,0.24460000000
-3,2084,R2,gassupply1,2045,0.24460000000
+1,2030,R1,gassupply1,2025,2.10500000000
+1,2035,R1,gassupply1,2025,2.10500000000
+1,2040,R1,gassupply1,2025,2.10500000000
+1,2045,R1,gassupply1,2025,2.10500000000
+1,2050,R1,gassupply1,2025,2.10500000000
+1,2064,R1,gassupply1,2025,2.10500000000
+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,2050,R1,gassupply1,2045,0.24460000000
+3,2064,R1,gassupply1,2045,0.24460000000
+3,2065,R1,gassupply1,2045,0.24460000000
+3,2069,R1,gassupply1,2045,0.24460000000
+3,2070,R1,gassupply1,2045,0.24460000000
+3,2084,R1,gassupply1,2045,0.24460000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,2.10500000000
+5,2035,R2,gassupply1,2025,2.10500000000
+5,2040,R2,gassupply1,2025,2.10500000000
+5,2045,R2,gassupply1,2025,2.10500000000
+5,2050,R2,gassupply1,2025,2.10500000000
+5,2064,R2,gassupply1,2025,2.10500000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,0.24460000000
+7,2064,R2,gassupply1,2045,0.24460000000
+7,2065,R2,gassupply1,2045,0.24460000000
+7,2069,R2,gassupply1,2045,0.24460000000
+7,2070,R2,gassupply1,2045,0.24460000000
+7,2084,R2,gassupply1,2045,0.24460000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index f24ac169..209b3b0f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -20,78 +20,86 @@ heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.75150000000
 solarPV,R1,R1,A1,power,newcapa,2030,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,2.94090000000
-solarPV,R2,R2,A1,power,newcapa,2030,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,5.75150000000
 windturbine,R2,R2,A1,power,newcapa,2030,15.05910000000
-windturbine,R2,R2,A1,power,newcapa,2030,2.94090000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,2.10500000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,2.10500000000
 heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.75150000000
 solarPV,R1,R1,A1,power,newcapa,2035,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,5.60000000000
 windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,2.94090000000
-solarPV,R2,R2,A1,power,newcapa,2035,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2035,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2035,5.60000000000
 windturbine,R2,R2,A1,power,newcapa,2035,15.05910000000
-windturbine,R2,R2,A1,power,newcapa,2035,2.94090000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.10500000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.75150000000
 solarPV,R1,R1,A1,power,newcapa,2040,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,2.94090000000
-solarPV,R2,R2,A1,power,newcapa,2040,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
 windturbine,R2,R2,A1,power,newcapa,2040,15.05910000000
-windturbine,R2,R2,A1,power,newcapa,2040,2.94090000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.10500000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.75150000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,2.94090000000
-solarPV,R2,R2,A1,power,newcapa,2045,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2045,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
 windturbine,R2,R2,A1,power,newcapa,2045,15.05910000000
-windturbine,R2,R2,A1,power,newcapa,2045,2.94090000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.10500000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.75150000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,0.29290000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,2.94090000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2050,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,2.94090000000
 windturbine,R2,R2,A1,power,newcapa,2050,10.65910000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.10500000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,0.24460000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R2,R2,A1,gas,newcapa,2050,0.24460000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index f6ed71a7..123585bd 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,387 +63,387 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.61080000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.61080000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.15650000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.15650000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.31330000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.31330000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.78230000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.78230000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.63770000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.63770000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.22350000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.22350000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.44750000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.44750000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.11750000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,1.11750000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.61080000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.61080000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15650000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15650000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.31330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.31330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.78230000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.78230000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.63770000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.63770000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.22350000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.22350000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.44750000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.44750000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.11750000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.11750000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.73610000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.73610000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.46940000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.46940000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.93980000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.93980000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.34680000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.34680000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.67350000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.67350000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.31290000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.31290000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.62660000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.62660000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.56450000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,1.56450000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.67350000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.67350000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.31290000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.31290000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.62660000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.62660000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.56450000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.56450000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.67350000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.67350000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31290000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31290000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.62660000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.62660000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.56450000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.56450000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.09210000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.09210000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.52140000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.52140000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.54220000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.54220000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.02210000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.02210000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13160000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13160000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.74590000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.74590000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.77550000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.77550000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.03710000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.03710000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09210000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09210000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.52140000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.52140000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.54220000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.54220000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02210000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02210000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13160000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13160000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.74590000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.74590000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77550000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77550000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03710000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03710000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27630000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27630000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.57500000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,1.57500000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63520000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.63520000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.12040000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.12040000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.18420000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18420000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.04640000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,1.04640000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08730000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.08730000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.06220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.06220000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18420000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18420000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.04640000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.04640000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.08730000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.08730000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.06220000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.06220000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.04640000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.04640000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.08730000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.08730000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06220000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06220000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.09120000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.09120000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.61380000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.61380000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02870000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.02870000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13030000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13030000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.87760000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.87760000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.05060000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.05060000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09120000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09120000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02870000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02870000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13030000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13030000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87760000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87760000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05060000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05060000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27370000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27370000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06300000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06300000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84850000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.84850000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.18070000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.18070000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.18250000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18250000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.03670000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.03670000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.23000000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.23000000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.08880000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.08880000000,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', 'early-morning')",electricity,R1,0.18250000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18250000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03670000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03670000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.23000000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23000000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.08880000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.08880000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18250000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18250000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03670000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23000000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23000000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08880000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08880000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.08970000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08970000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.66410000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.66410000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,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.12820000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12820000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94930000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.94930000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05480000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.05480000000,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', 'mid-afternoon')",electricity,R1,0.08970000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08970000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.66410000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66410000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03070000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03070000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12820000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12820000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94930000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94930000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05480000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05480000000,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,0.26920000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26920000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06280000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.99830000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.99830000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.19910000000,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,0.17950000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17950000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.03660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.03660000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.33010000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.33010000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.09700000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.09700000000,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', 'early-morning')",electricity,R1,0.17950000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17950000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03660000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03660000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.33010000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.33010000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.09700000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.09700000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17950000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17950000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03660000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03660000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.33010000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.33010000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09700000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.08780000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.08780000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.74550000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.74550000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03220000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.03220000000,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.12550000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12550000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.06560000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,1.06560000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05770000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.05770000000,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', 'mid-afternoon')",electricity,R1,0.08780000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08780000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.74550000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74550000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03220000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03220000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12550000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12550000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.06560000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.06560000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05770000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05770000000,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,0.26350000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26350000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06240000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06240000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.24190000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.24190000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21210000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.21210000000,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,0.17570000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17570000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.49280000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,1.49280000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.10280000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.10280000000,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', 'early-morning')",electricity,R1,0.17570000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17570000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.49280000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.49280000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.10280000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.10280000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17570000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17570000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.49280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.49280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10280000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.09190000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.09190000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.82550000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.82550000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03450000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.03450000000,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.13130000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13130000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.17970000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,1.17970000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.06250000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.06250000000,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', 'mid-afternoon')",electricity,R1,0.09190000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09190000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.82550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.82550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03450000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03450000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13130000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13130000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.17970000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.17970000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06250000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06250000000,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,0.27560000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27560000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06230000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06230000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.48120000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.48120000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23320000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23320000000,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,0.18380000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18380000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.65250000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,1.65250000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.11220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.11220000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18380000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18380000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.65250000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.65250000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11220000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11220000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18380000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.65250000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.65250000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11220000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11220000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index f1b12cf3..1b5a118e 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -1,51 +1,37 @@
 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.05910000000
-1,2030,R1,solarPV,2020,5.05910000000
-1,2035,R1,solarPV,2020,5.05910000000
-1,2040,R1,solarPV,2020,5.05910000000
-1,2045,R1,solarPV,2020,5.05910000000
-1,2049,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.75150000000
+1,2035,R1,gasCCGT,2025,5.75150000000
+1,2040,R1,gasCCGT,2025,5.75150000000
+1,2045,R1,gasCCGT,2025,5.75150000000
+1,2049,R1,gasCCGT,2025,5.75150000000
+1,2050,R1,gasCCGT,2025,5.75150000000
+1,2064,R1,gasCCGT,2025,5.75150000000
+2,2025,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2020,5.05910000000
+2,2035,R1,solarPV,2020,5.05910000000
+2,2040,R1,solarPV,2020,5.05910000000
+2,2045,R1,solarPV,2020,5.05910000000
+2,2049,R1,solarPV,2020,5.05910000000
 3,2025,R1,windturbine,2020,10.00000000000
 3,2030,R1,windturbine,2020,10.00000000000
 3,2035,R1,windturbine,2020,10.00000000000
 3,2040,R1,windturbine,2020,10.00000000000
 3,2045,R1,windturbine,2020,10.00000000000
 3,2049,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2025,2.94090000000
-4,2035,R1,windturbine,2025,2.94090000000
-4,2040,R1,windturbine,2025,2.94090000000
-4,2045,R1,windturbine,2025,2.94090000000
-4,2049,R1,windturbine,2025,2.94090000000
-4,2050,R1,windturbine,2025,2.94090000000
-4,2054,R1,windturbine,2025,2.94090000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-6,2030,R2,solarPV,2025,10.00000000000
-6,2035,R2,solarPV,2025,10.00000000000
-6,2040,R2,solarPV,2025,10.00000000000
-6,2045,R2,solarPV,2025,10.00000000000
-6,2049,R2,solarPV,2025,10.00000000000
-6,2050,R2,solarPV,2025,10.00000000000
-6,2054,R2,solarPV,2025,10.00000000000
-7,2025,R2,windturbine,2020,15.05910000000
-7,2030,R2,windturbine,2020,15.05910000000
-7,2035,R2,windturbine,2020,15.05910000000
-7,2040,R2,windturbine,2020,15.05910000000
-7,2045,R2,windturbine,2020,15.05910000000
-7,2049,R2,windturbine,2020,15.05910000000
-8,2030,R2,windturbine,2025,2.94090000000
-8,2035,R2,windturbine,2025,2.94090000000
-8,2040,R2,windturbine,2025,2.94090000000
-8,2045,R2,windturbine,2025,2.94090000000
-8,2049,R2,windturbine,2025,2.94090000000
-8,2050,R2,windturbine,2025,2.94090000000
-8,2054,R2,windturbine,2025,2.94090000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+5,2030,R2,gasCCGT,2025,5.75150000000
+5,2035,R2,gasCCGT,2025,5.75150000000
+5,2040,R2,gasCCGT,2025,5.75150000000
+5,2045,R2,gasCCGT,2025,5.75150000000
+5,2049,R2,gasCCGT,2025,5.75150000000
+5,2050,R2,gasCCGT,2025,5.75150000000
+5,2064,R2,gasCCGT,2025,5.75150000000
+6,2025,R2,windturbine,2020,15.05910000000
+6,2030,R2,windturbine,2020,15.05910000000
+6,2035,R2,windturbine,2020,15.05910000000
+6,2040,R2,windturbine,2020,15.05910000000
+6,2045,R2,windturbine,2020,15.05910000000
+6,2049,R2,windturbine,2020,15.05910000000
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 efe97cc6..65068351 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,26 +1,26 @@
 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.05910000000
-1,2030,R1,solarPV,2020,5.05910000000
-1,2035,R1,solarPV,2020,5.05910000000
-1,2040,R1,solarPV,2020,5.05910000000
-1,2045,R1,solarPV,2020,5.05910000000
-1,2049,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.75150000000
+1,2035,R1,gasCCGT,2025,5.75150000000
+1,2040,R1,gasCCGT,2025,5.75150000000
+1,2045,R1,gasCCGT,2025,5.75150000000
+1,2049,R1,gasCCGT,2025,5.75150000000
+1,2050,R1,gasCCGT,2025,5.75150000000
+1,2059,R1,gasCCGT,2025,5.75150000000
+1,2060,R1,gasCCGT,2025,5.75150000000
+1,2064,R1,gasCCGT,2025,5.75150000000
+2,2025,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2020,5.05910000000
+2,2035,R1,solarPV,2020,5.05910000000
+2,2040,R1,solarPV,2020,5.05910000000
+2,2045,R1,solarPV,2020,5.05910000000
+2,2049,R1,solarPV,2020,5.05910000000
 3,2035,R1,solarPV,2030,5.60000000000
 3,2040,R1,solarPV,2030,5.60000000000
 3,2045,R1,solarPV,2030,5.60000000000
 3,2049,R1,solarPV,2030,5.60000000000
 3,2050,R1,solarPV,2030,5.60000000000
-3,2054,R1,solarPV,2030,5.60000000000
-3,2055,R1,solarPV,2030,5.60000000000
 3,2059,R1,solarPV,2030,5.60000000000
 4,2025,R1,windturbine,2020,10.00000000000
 4,2030,R1,windturbine,2020,10.00000000000
@@ -28,40 +28,26 @@ asset,year,region,technology,installed,capacity
 4,2040,R1,windturbine,2020,10.00000000000
 4,2045,R1,windturbine,2020,10.00000000000
 4,2049,R1,windturbine,2020,10.00000000000
-5,2030,R1,windturbine,2025,2.94090000000
-5,2035,R1,windturbine,2025,2.94090000000
-5,2040,R1,windturbine,2025,2.94090000000
-5,2045,R1,windturbine,2025,2.94090000000
-5,2049,R1,windturbine,2025,2.94090000000
-5,2050,R1,windturbine,2025,2.94090000000
-5,2054,R1,windturbine,2025,2.94090000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,solarPV,2025,10.00000000000
-7,2035,R2,solarPV,2025,10.00000000000
-7,2040,R2,solarPV,2025,10.00000000000
-7,2045,R2,solarPV,2025,10.00000000000
-7,2049,R2,solarPV,2025,10.00000000000
-7,2050,R2,solarPV,2025,10.00000000000
-7,2054,R2,solarPV,2025,10.00000000000
-8,2035,R2,solarPV,2030,5.60000000000
-8,2040,R2,solarPV,2030,5.60000000000
-8,2045,R2,solarPV,2030,5.60000000000
-8,2049,R2,solarPV,2030,5.60000000000
-8,2050,R2,solarPV,2030,5.60000000000
-8,2054,R2,solarPV,2030,5.60000000000
-8,2055,R2,solarPV,2030,5.60000000000
-8,2059,R2,solarPV,2030,5.60000000000
-9,2025,R2,windturbine,2020,15.05910000000
-9,2030,R2,windturbine,2020,15.05910000000
-9,2035,R2,windturbine,2020,15.05910000000
-9,2040,R2,windturbine,2020,15.05910000000
-9,2045,R2,windturbine,2020,15.05910000000
-9,2049,R2,windturbine,2020,15.05910000000
-10,2030,R2,windturbine,2025,2.94090000000
-10,2035,R2,windturbine,2025,2.94090000000
-10,2040,R2,windturbine,2025,2.94090000000
-10,2045,R2,windturbine,2025,2.94090000000
-10,2049,R2,windturbine,2025,2.94090000000
-10,2050,R2,windturbine,2025,2.94090000000
-10,2054,R2,windturbine,2025,2.94090000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2030,R2,gasCCGT,2025,5.75150000000
+6,2035,R2,gasCCGT,2025,5.75150000000
+6,2040,R2,gasCCGT,2025,5.75150000000
+6,2045,R2,gasCCGT,2025,5.75150000000
+6,2049,R2,gasCCGT,2025,5.75150000000
+6,2050,R2,gasCCGT,2025,5.75150000000
+6,2059,R2,gasCCGT,2025,5.75150000000
+6,2060,R2,gasCCGT,2025,5.75150000000
+6,2064,R2,gasCCGT,2025,5.75150000000
+7,2035,R2,solarPV,2030,5.60000000000
+7,2040,R2,solarPV,2030,5.60000000000
+7,2045,R2,solarPV,2030,5.60000000000
+7,2049,R2,solarPV,2030,5.60000000000
+7,2050,R2,solarPV,2030,5.60000000000
+7,2059,R2,solarPV,2030,5.60000000000
+8,2025,R2,windturbine,2020,15.05910000000
+8,2030,R2,windturbine,2020,15.05910000000
+8,2035,R2,windturbine,2020,15.05910000000
+8,2040,R2,windturbine,2020,15.05910000000
+8,2045,R2,windturbine,2020,15.05910000000
+8,2049,R2,windturbine,2020,15.05910000000
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 51fd698a..aa716523 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,33 +1,31 @@
 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.05910000000
-1,2030,R1,solarPV,2020,5.05910000000
-1,2035,R1,solarPV,2020,5.05910000000
-1,2040,R1,solarPV,2020,5.05910000000
-1,2045,R1,solarPV,2020,5.05910000000
-1,2049,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.75150000000
+1,2035,R1,gasCCGT,2025,5.75150000000
+1,2040,R1,gasCCGT,2025,5.75150000000
+1,2045,R1,gasCCGT,2025,5.75150000000
+1,2049,R1,gasCCGT,2025,5.75150000000
+1,2050,R1,gasCCGT,2025,5.75150000000
+1,2059,R1,gasCCGT,2025,5.75150000000
+1,2060,R1,gasCCGT,2025,5.75150000000
+1,2064,R1,gasCCGT,2025,5.75150000000
+2,2025,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2020,5.05910000000
+2,2035,R1,solarPV,2020,5.05910000000
+2,2040,R1,solarPV,2020,5.05910000000
+2,2045,R1,solarPV,2020,5.05910000000
+2,2049,R1,solarPV,2020,5.05910000000
 3,2035,R1,solarPV,2030,5.60000000000
 3,2040,R1,solarPV,2030,5.60000000000
 3,2045,R1,solarPV,2030,5.60000000000
 3,2049,R1,solarPV,2030,5.60000000000
 3,2050,R1,solarPV,2030,5.60000000000
-3,2054,R1,solarPV,2030,5.60000000000
-3,2055,R1,solarPV,2030,5.60000000000
 3,2059,R1,solarPV,2030,5.60000000000
 4,2040,R1,solarPV,2035,5.60000000000
 4,2045,R1,solarPV,2035,5.60000000000
 4,2049,R1,solarPV,2035,5.60000000000
 4,2050,R1,solarPV,2035,5.60000000000
-4,2054,R1,solarPV,2035,5.60000000000
-4,2055,R1,solarPV,2035,5.60000000000
 4,2059,R1,solarPV,2035,5.60000000000
 4,2060,R1,solarPV,2035,5.60000000000
 4,2064,R1,solarPV,2035,5.60000000000
@@ -37,49 +35,33 @@ asset,year,region,technology,installed,capacity
 5,2040,R1,windturbine,2020,10.00000000000
 5,2045,R1,windturbine,2020,10.00000000000
 5,2049,R1,windturbine,2020,10.00000000000
-6,2030,R1,windturbine,2025,2.94090000000
-6,2035,R1,windturbine,2025,2.94090000000
-6,2040,R1,windturbine,2025,2.94090000000
-6,2045,R1,windturbine,2025,2.94090000000
-6,2049,R1,windturbine,2025,2.94090000000
-6,2050,R1,windturbine,2025,2.94090000000
-6,2054,R1,windturbine,2025,2.94090000000
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-8,2030,R2,solarPV,2025,10.00000000000
-8,2035,R2,solarPV,2025,10.00000000000
-8,2040,R2,solarPV,2025,10.00000000000
-8,2045,R2,solarPV,2025,10.00000000000
-8,2049,R2,solarPV,2025,10.00000000000
-8,2050,R2,solarPV,2025,10.00000000000
-8,2054,R2,solarPV,2025,10.00000000000
-9,2035,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2030,5.60000000000
-9,2045,R2,solarPV,2030,5.60000000000
-9,2049,R2,solarPV,2030,5.60000000000
-9,2050,R2,solarPV,2030,5.60000000000
-9,2054,R2,solarPV,2030,5.60000000000
-9,2055,R2,solarPV,2030,5.60000000000
-9,2059,R2,solarPV,2030,5.60000000000
-10,2040,R2,solarPV,2035,5.60000000000
-10,2045,R2,solarPV,2035,5.60000000000
-10,2049,R2,solarPV,2035,5.60000000000
-10,2050,R2,solarPV,2035,5.60000000000
-10,2054,R2,solarPV,2035,5.60000000000
-10,2055,R2,solarPV,2035,5.60000000000
-10,2059,R2,solarPV,2035,5.60000000000
-10,2060,R2,solarPV,2035,5.60000000000
-10,2064,R2,solarPV,2035,5.60000000000
-11,2025,R2,windturbine,2020,15.05910000000
-11,2030,R2,windturbine,2020,15.05910000000
-11,2035,R2,windturbine,2020,15.05910000000
-11,2040,R2,windturbine,2020,15.05910000000
-11,2045,R2,windturbine,2020,15.05910000000
-11,2049,R2,windturbine,2020,15.05910000000
-12,2030,R2,windturbine,2025,2.94090000000
-12,2035,R2,windturbine,2025,2.94090000000
-12,2040,R2,windturbine,2025,2.94090000000
-12,2045,R2,windturbine,2025,2.94090000000
-12,2049,R2,windturbine,2025,2.94090000000
-12,2050,R2,windturbine,2025,2.94090000000
-12,2054,R2,windturbine,2025,2.94090000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,gasCCGT,2025,5.75150000000
+7,2035,R2,gasCCGT,2025,5.75150000000
+7,2040,R2,gasCCGT,2025,5.75150000000
+7,2045,R2,gasCCGT,2025,5.75150000000
+7,2049,R2,gasCCGT,2025,5.75150000000
+7,2050,R2,gasCCGT,2025,5.75150000000
+7,2059,R2,gasCCGT,2025,5.75150000000
+7,2060,R2,gasCCGT,2025,5.75150000000
+7,2064,R2,gasCCGT,2025,5.75150000000
+8,2035,R2,solarPV,2030,5.60000000000
+8,2040,R2,solarPV,2030,5.60000000000
+8,2045,R2,solarPV,2030,5.60000000000
+8,2049,R2,solarPV,2030,5.60000000000
+8,2050,R2,solarPV,2030,5.60000000000
+8,2059,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2035,5.60000000000
+9,2045,R2,solarPV,2035,5.60000000000
+9,2049,R2,solarPV,2035,5.60000000000
+9,2050,R2,solarPV,2035,5.60000000000
+9,2059,R2,solarPV,2035,5.60000000000
+9,2060,R2,solarPV,2035,5.60000000000
+9,2064,R2,solarPV,2035,5.60000000000
+10,2025,R2,windturbine,2020,15.05910000000
+10,2030,R2,windturbine,2020,15.05910000000
+10,2035,R2,windturbine,2020,15.05910000000
+10,2040,R2,windturbine,2020,15.05910000000
+10,2045,R2,windturbine,2020,15.05910000000
+10,2049,R2,windturbine,2020,15.05910000000
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 5ef44e97..803ae01c 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,41 +1,37 @@
 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.05910000000
-1,2030,R1,solarPV,2020,5.05910000000
-1,2035,R1,solarPV,2020,5.05910000000
-1,2040,R1,solarPV,2020,5.05910000000
-1,2045,R1,solarPV,2020,5.05910000000
-1,2049,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2025,10.00000000000
-2,2035,R1,solarPV,2025,10.00000000000
-2,2040,R1,solarPV,2025,10.00000000000
-2,2045,R1,solarPV,2025,10.00000000000
-2,2049,R1,solarPV,2025,10.00000000000
-2,2050,R1,solarPV,2025,10.00000000000
-2,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.75150000000
+1,2035,R1,gasCCGT,2025,5.75150000000
+1,2040,R1,gasCCGT,2025,5.75150000000
+1,2045,R1,gasCCGT,2025,5.75150000000
+1,2049,R1,gasCCGT,2025,5.75150000000
+1,2050,R1,gasCCGT,2025,5.75150000000
+1,2059,R1,gasCCGT,2025,5.75150000000
+1,2060,R1,gasCCGT,2025,5.75150000000
+1,2064,R1,gasCCGT,2025,5.75150000000
+2,2025,R1,solarPV,2020,5.05910000000
+2,2030,R1,solarPV,2020,5.05910000000
+2,2035,R1,solarPV,2020,5.05910000000
+2,2040,R1,solarPV,2020,5.05910000000
+2,2045,R1,solarPV,2020,5.05910000000
+2,2049,R1,solarPV,2020,5.05910000000
 3,2035,R1,solarPV,2030,5.60000000000
 3,2040,R1,solarPV,2030,5.60000000000
 3,2045,R1,solarPV,2030,5.60000000000
 3,2049,R1,solarPV,2030,5.60000000000
 3,2050,R1,solarPV,2030,5.60000000000
-3,2054,R1,solarPV,2030,5.60000000000
-3,2055,R1,solarPV,2030,5.60000000000
 3,2059,R1,solarPV,2030,5.60000000000
 4,2040,R1,solarPV,2035,5.60000000000
 4,2045,R1,solarPV,2035,5.60000000000
 4,2049,R1,solarPV,2035,5.60000000000
 4,2050,R1,solarPV,2035,5.60000000000
-4,2054,R1,solarPV,2035,5.60000000000
-4,2055,R1,solarPV,2035,5.60000000000
 4,2059,R1,solarPV,2035,5.60000000000
 4,2060,R1,solarPV,2035,5.60000000000
 4,2064,R1,solarPV,2035,5.60000000000
 5,2045,R1,solarPV,2040,5.60000000000
 5,2049,R1,solarPV,2040,5.60000000000
 5,2050,R1,solarPV,2040,5.60000000000
-5,2054,R1,solarPV,2040,5.60000000000
-5,2055,R1,solarPV,2040,5.60000000000
 5,2059,R1,solarPV,2040,5.60000000000
 5,2060,R1,solarPV,2040,5.60000000000
 5,2064,R1,solarPV,2040,5.60000000000
@@ -47,59 +43,41 @@ asset,year,region,technology,installed,capacity
 6,2040,R1,windturbine,2020,10.00000000000
 6,2045,R1,windturbine,2020,10.00000000000
 6,2049,R1,windturbine,2020,10.00000000000
-7,2030,R1,windturbine,2025,2.94090000000
-7,2035,R1,windturbine,2025,2.94090000000
-7,2040,R1,windturbine,2025,2.94090000000
-7,2045,R1,windturbine,2025,2.94090000000
-7,2049,R1,windturbine,2025,2.94090000000
-7,2050,R1,windturbine,2025,2.94090000000
-7,2054,R1,windturbine,2025,2.94090000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,1.00000000000
-9,2030,R2,solarPV,2025,10.00000000000
-9,2035,R2,solarPV,2025,10.00000000000
-9,2040,R2,solarPV,2025,10.00000000000
-9,2045,R2,solarPV,2025,10.00000000000
-9,2049,R2,solarPV,2025,10.00000000000
-9,2050,R2,solarPV,2025,10.00000000000
-9,2054,R2,solarPV,2025,10.00000000000
-10,2035,R2,solarPV,2030,5.60000000000
-10,2040,R2,solarPV,2030,5.60000000000
-10,2045,R2,solarPV,2030,5.60000000000
-10,2049,R2,solarPV,2030,5.60000000000
-10,2050,R2,solarPV,2030,5.60000000000
-10,2054,R2,solarPV,2030,5.60000000000
-10,2055,R2,solarPV,2030,5.60000000000
-10,2059,R2,solarPV,2030,5.60000000000
-11,2040,R2,solarPV,2035,5.60000000000
-11,2045,R2,solarPV,2035,5.60000000000
-11,2049,R2,solarPV,2035,5.60000000000
-11,2050,R2,solarPV,2035,5.60000000000
-11,2054,R2,solarPV,2035,5.60000000000
-11,2055,R2,solarPV,2035,5.60000000000
-11,2059,R2,solarPV,2035,5.60000000000
-11,2060,R2,solarPV,2035,5.60000000000
-11,2064,R2,solarPV,2035,5.60000000000
-12,2045,R2,solarPV,2040,5.60000000000
-12,2049,R2,solarPV,2040,5.60000000000
-12,2050,R2,solarPV,2040,5.60000000000
-12,2054,R2,solarPV,2040,5.60000000000
-12,2055,R2,solarPV,2040,5.60000000000
-12,2059,R2,solarPV,2040,5.60000000000
-12,2060,R2,solarPV,2040,5.60000000000
-12,2064,R2,solarPV,2040,5.60000000000
-12,2065,R2,solarPV,2040,5.60000000000
-12,2069,R2,solarPV,2040,5.60000000000
-13,2025,R2,windturbine,2020,15.05910000000
-13,2030,R2,windturbine,2020,15.05910000000
-13,2035,R2,windturbine,2020,15.05910000000
-13,2040,R2,windturbine,2020,15.05910000000
-13,2045,R2,windturbine,2020,15.05910000000
-13,2049,R2,windturbine,2020,15.05910000000
-14,2030,R2,windturbine,2025,2.94090000000
-14,2035,R2,windturbine,2025,2.94090000000
-14,2040,R2,windturbine,2025,2.94090000000
-14,2045,R2,windturbine,2025,2.94090000000
-14,2049,R2,windturbine,2025,2.94090000000
-14,2050,R2,windturbine,2025,2.94090000000
-14,2054,R2,windturbine,2025,2.94090000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+8,2030,R2,gasCCGT,2025,5.75150000000
+8,2035,R2,gasCCGT,2025,5.75150000000
+8,2040,R2,gasCCGT,2025,5.75150000000
+8,2045,R2,gasCCGT,2025,5.75150000000
+8,2049,R2,gasCCGT,2025,5.75150000000
+8,2050,R2,gasCCGT,2025,5.75150000000
+8,2059,R2,gasCCGT,2025,5.75150000000
+8,2060,R2,gasCCGT,2025,5.75150000000
+8,2064,R2,gasCCGT,2025,5.75150000000
+9,2035,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2030,5.60000000000
+9,2045,R2,solarPV,2030,5.60000000000
+9,2049,R2,solarPV,2030,5.60000000000
+9,2050,R2,solarPV,2030,5.60000000000
+9,2059,R2,solarPV,2030,5.60000000000
+10,2040,R2,solarPV,2035,5.60000000000
+10,2045,R2,solarPV,2035,5.60000000000
+10,2049,R2,solarPV,2035,5.60000000000
+10,2050,R2,solarPV,2035,5.60000000000
+10,2059,R2,solarPV,2035,5.60000000000
+10,2060,R2,solarPV,2035,5.60000000000
+10,2064,R2,solarPV,2035,5.60000000000
+11,2045,R2,solarPV,2040,5.60000000000
+11,2049,R2,solarPV,2040,5.60000000000
+11,2050,R2,solarPV,2040,5.60000000000
+11,2059,R2,solarPV,2040,5.60000000000
+11,2060,R2,solarPV,2040,5.60000000000
+11,2064,R2,solarPV,2040,5.60000000000
+11,2065,R2,solarPV,2040,5.60000000000
+11,2069,R2,solarPV,2040,5.60000000000
+12,2025,R2,windturbine,2020,15.05910000000
+12,2030,R2,windturbine,2020,15.05910000000
+12,2035,R2,windturbine,2020,15.05910000000
+12,2040,R2,windturbine,2020,15.05910000000
+12,2045,R2,windturbine,2020,15.05910000000
+12,2049,R2,windturbine,2020,15.05910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index 9e38d0b1..d2a868b8 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,61 +1,53 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,0.29290000000
-1,2054,R1,gasCCGT,2045,0.29290000000
-1,2055,R1,gasCCGT,2045,0.29290000000
-1,2059,R1,gasCCGT,2045,0.29290000000
-1,2060,R1,gasCCGT,2045,0.29290000000
-1,2064,R1,gasCCGT,2045,0.29290000000
-1,2065,R1,gasCCGT,2045,0.29290000000
-1,2069,R1,gasCCGT,2045,0.29290000000
-1,2070,R1,gasCCGT,2045,0.29290000000
-1,2074,R1,gasCCGT,2045,0.29290000000
-1,2075,R1,gasCCGT,2045,0.29290000000
-1,2084,R1,gasCCGT,2045,0.29290000000
-2,2025,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2020,5.05910000000
-2,2035,R1,solarPV,2020,5.05910000000
-2,2040,R1,solarPV,2020,5.05910000000
-2,2045,R1,solarPV,2020,5.05910000000
-2,2049,R1,solarPV,2020,5.05910000000
-3,2030,R1,solarPV,2025,10.00000000000
-3,2035,R1,solarPV,2025,10.00000000000
-3,2040,R1,solarPV,2025,10.00000000000
-3,2045,R1,solarPV,2025,10.00000000000
-3,2049,R1,solarPV,2025,10.00000000000
-3,2050,R1,solarPV,2025,10.00000000000
-3,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.75150000000
+1,2035,R1,gasCCGT,2025,5.75150000000
+1,2040,R1,gasCCGT,2025,5.75150000000
+1,2045,R1,gasCCGT,2025,5.75150000000
+1,2049,R1,gasCCGT,2025,5.75150000000
+1,2050,R1,gasCCGT,2025,5.75150000000
+1,2059,R1,gasCCGT,2025,5.75150000000
+1,2060,R1,gasCCGT,2025,5.75150000000
+1,2064,R1,gasCCGT,2025,5.75150000000
+2,2050,R1,gasCCGT,2045,0.29290000000
+2,2059,R1,gasCCGT,2045,0.29290000000
+2,2060,R1,gasCCGT,2045,0.29290000000
+2,2064,R1,gasCCGT,2045,0.29290000000
+2,2065,R1,gasCCGT,2045,0.29290000000
+2,2069,R1,gasCCGT,2045,0.29290000000
+2,2070,R1,gasCCGT,2045,0.29290000000
+2,2074,R1,gasCCGT,2045,0.29290000000
+2,2075,R1,gasCCGT,2045,0.29290000000
+2,2084,R1,gasCCGT,2045,0.29290000000
+3,2025,R1,solarPV,2020,5.05910000000
+3,2030,R1,solarPV,2020,5.05910000000
+3,2035,R1,solarPV,2020,5.05910000000
+3,2040,R1,solarPV,2020,5.05910000000
+3,2045,R1,solarPV,2020,5.05910000000
+3,2049,R1,solarPV,2020,5.05910000000
 4,2035,R1,solarPV,2030,5.60000000000
 4,2040,R1,solarPV,2030,5.60000000000
 4,2045,R1,solarPV,2030,5.60000000000
 4,2049,R1,solarPV,2030,5.60000000000
 4,2050,R1,solarPV,2030,5.60000000000
-4,2054,R1,solarPV,2030,5.60000000000
-4,2055,R1,solarPV,2030,5.60000000000
 4,2059,R1,solarPV,2030,5.60000000000
 5,2040,R1,solarPV,2035,5.60000000000
 5,2045,R1,solarPV,2035,5.60000000000
 5,2049,R1,solarPV,2035,5.60000000000
 5,2050,R1,solarPV,2035,5.60000000000
-5,2054,R1,solarPV,2035,5.60000000000
-5,2055,R1,solarPV,2035,5.60000000000
 5,2059,R1,solarPV,2035,5.60000000000
 5,2060,R1,solarPV,2035,5.60000000000
 5,2064,R1,solarPV,2035,5.60000000000
 6,2045,R1,solarPV,2040,5.60000000000
 6,2049,R1,solarPV,2040,5.60000000000
 6,2050,R1,solarPV,2040,5.60000000000
-6,2054,R1,solarPV,2040,5.60000000000
-6,2055,R1,solarPV,2040,5.60000000000
 6,2059,R1,solarPV,2040,5.60000000000
 6,2060,R1,solarPV,2040,5.60000000000
 6,2064,R1,solarPV,2040,5.60000000000
 6,2065,R1,solarPV,2040,5.60000000000
 6,2069,R1,solarPV,2040,5.60000000000
 7,2050,R1,solarPV,2045,10.00000000000
-7,2054,R1,solarPV,2045,10.00000000000
-7,2055,R1,solarPV,2045,10.00000000000
 7,2059,R1,solarPV,2045,10.00000000000
 7,2060,R1,solarPV,2045,10.00000000000
 7,2064,R1,solarPV,2045,10.00000000000
@@ -69,89 +61,65 @@ asset,year,region,technology,installed,capacity
 8,2040,R1,windturbine,2020,10.00000000000
 8,2045,R1,windturbine,2020,10.00000000000
 8,2049,R1,windturbine,2020,10.00000000000
-9,2030,R1,windturbine,2025,2.94090000000
-9,2035,R1,windturbine,2025,2.94090000000
-9,2040,R1,windturbine,2025,2.94090000000
-9,2045,R1,windturbine,2025,2.94090000000
-9,2049,R1,windturbine,2025,2.94090000000
-9,2050,R1,windturbine,2025,2.94090000000
-9,2054,R1,windturbine,2025,2.94090000000
-10,2050,R1,windturbine,2045,10.00000000000
-10,2054,R1,windturbine,2045,10.00000000000
-10,2055,R1,windturbine,2045,10.00000000000
-10,2059,R1,windturbine,2045,10.00000000000
-10,2060,R1,windturbine,2045,10.00000000000
-10,2064,R1,windturbine,2045,10.00000000000
-10,2065,R1,windturbine,2045,10.00000000000
-10,2069,R1,windturbine,2045,10.00000000000
-10,2070,R1,windturbine,2045,10.00000000000
-10,2074,R1,windturbine,2045,10.00000000000
-11,2020,R2,gasCCGT,2020,1.00000000000
-11,2025,R2,gasCCGT,2020,1.00000000000
-12,2030,R2,solarPV,2025,10.00000000000
-12,2035,R2,solarPV,2025,10.00000000000
-12,2040,R2,solarPV,2025,10.00000000000
-12,2045,R2,solarPV,2025,10.00000000000
-12,2049,R2,solarPV,2025,10.00000000000
-12,2050,R2,solarPV,2025,10.00000000000
-12,2054,R2,solarPV,2025,10.00000000000
-13,2035,R2,solarPV,2030,5.60000000000
-13,2040,R2,solarPV,2030,5.60000000000
-13,2045,R2,solarPV,2030,5.60000000000
-13,2049,R2,solarPV,2030,5.60000000000
-13,2050,R2,solarPV,2030,5.60000000000
-13,2054,R2,solarPV,2030,5.60000000000
-13,2055,R2,solarPV,2030,5.60000000000
-13,2059,R2,solarPV,2030,5.60000000000
-14,2040,R2,solarPV,2035,5.60000000000
-14,2045,R2,solarPV,2035,5.60000000000
-14,2049,R2,solarPV,2035,5.60000000000
-14,2050,R2,solarPV,2035,5.60000000000
-14,2054,R2,solarPV,2035,5.60000000000
-14,2055,R2,solarPV,2035,5.60000000000
-14,2059,R2,solarPV,2035,5.60000000000
-14,2060,R2,solarPV,2035,5.60000000000
-14,2064,R2,solarPV,2035,5.60000000000
-15,2045,R2,solarPV,2040,5.60000000000
-15,2049,R2,solarPV,2040,5.60000000000
-15,2050,R2,solarPV,2040,5.60000000000
-15,2054,R2,solarPV,2040,5.60000000000
-15,2055,R2,solarPV,2040,5.60000000000
-15,2059,R2,solarPV,2040,5.60000000000
-15,2060,R2,solarPV,2040,5.60000000000
-15,2064,R2,solarPV,2040,5.60000000000
-15,2065,R2,solarPV,2040,5.60000000000
-15,2069,R2,solarPV,2040,5.60000000000
-16,2050,R2,solarPV,2045,10.00000000000
-16,2054,R2,solarPV,2045,10.00000000000
-16,2055,R2,solarPV,2045,10.00000000000
-16,2059,R2,solarPV,2045,10.00000000000
-16,2060,R2,solarPV,2045,10.00000000000
-16,2064,R2,solarPV,2045,10.00000000000
-16,2065,R2,solarPV,2045,10.00000000000
-16,2069,R2,solarPV,2045,10.00000000000
-16,2070,R2,solarPV,2045,10.00000000000
-16,2074,R2,solarPV,2045,10.00000000000
-17,2025,R2,windturbine,2020,15.05910000000
-17,2030,R2,windturbine,2020,15.05910000000
-17,2035,R2,windturbine,2020,15.05910000000
-17,2040,R2,windturbine,2020,15.05910000000
-17,2045,R2,windturbine,2020,15.05910000000
-17,2049,R2,windturbine,2020,15.05910000000
-18,2030,R2,windturbine,2025,2.94090000000
-18,2035,R2,windturbine,2025,2.94090000000
-18,2040,R2,windturbine,2025,2.94090000000
-18,2045,R2,windturbine,2025,2.94090000000
-18,2049,R2,windturbine,2025,2.94090000000
-18,2050,R2,windturbine,2025,2.94090000000
-18,2054,R2,windturbine,2025,2.94090000000
-19,2050,R2,windturbine,2045,10.65910000000
-19,2054,R2,windturbine,2045,10.65910000000
-19,2055,R2,windturbine,2045,10.65910000000
-19,2059,R2,windturbine,2045,10.65910000000
-19,2060,R2,windturbine,2045,10.65910000000
-19,2064,R2,windturbine,2045,10.65910000000
-19,2065,R2,windturbine,2045,10.65910000000
-19,2069,R2,windturbine,2045,10.65910000000
-19,2070,R2,windturbine,2045,10.65910000000
-19,2074,R2,windturbine,2045,10.65910000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,5.75150000000
+11,2035,R2,gasCCGT,2025,5.75150000000
+11,2040,R2,gasCCGT,2025,5.75150000000
+11,2045,R2,gasCCGT,2025,5.75150000000
+11,2049,R2,gasCCGT,2025,5.75150000000
+11,2050,R2,gasCCGT,2025,5.75150000000
+11,2059,R2,gasCCGT,2025,5.75150000000
+11,2060,R2,gasCCGT,2025,5.75150000000
+11,2064,R2,gasCCGT,2025,5.75150000000
+12,2035,R2,solarPV,2030,5.60000000000
+12,2040,R2,solarPV,2030,5.60000000000
+12,2045,R2,solarPV,2030,5.60000000000
+12,2049,R2,solarPV,2030,5.60000000000
+12,2050,R2,solarPV,2030,5.60000000000
+12,2059,R2,solarPV,2030,5.60000000000
+13,2040,R2,solarPV,2035,5.60000000000
+13,2045,R2,solarPV,2035,5.60000000000
+13,2049,R2,solarPV,2035,5.60000000000
+13,2050,R2,solarPV,2035,5.60000000000
+13,2059,R2,solarPV,2035,5.60000000000
+13,2060,R2,solarPV,2035,5.60000000000
+13,2064,R2,solarPV,2035,5.60000000000
+14,2045,R2,solarPV,2040,5.60000000000
+14,2049,R2,solarPV,2040,5.60000000000
+14,2050,R2,solarPV,2040,5.60000000000
+14,2059,R2,solarPV,2040,5.60000000000
+14,2060,R2,solarPV,2040,5.60000000000
+14,2064,R2,solarPV,2040,5.60000000000
+14,2065,R2,solarPV,2040,5.60000000000
+14,2069,R2,solarPV,2040,5.60000000000
+15,2050,R2,solarPV,2045,10.00000000000
+15,2059,R2,solarPV,2045,10.00000000000
+15,2060,R2,solarPV,2045,10.00000000000
+15,2064,R2,solarPV,2045,10.00000000000
+15,2065,R2,solarPV,2045,10.00000000000
+15,2069,R2,solarPV,2045,10.00000000000
+15,2070,R2,solarPV,2045,10.00000000000
+15,2074,R2,solarPV,2045,10.00000000000
+16,2025,R2,windturbine,2020,15.05910000000
+16,2030,R2,windturbine,2020,15.05910000000
+16,2035,R2,windturbine,2020,15.05910000000
+16,2040,R2,windturbine,2020,15.05910000000
+16,2045,R2,windturbine,2020,15.05910000000
+16,2049,R2,windturbine,2020,15.05910000000
+17,2050,R2,windturbine,2045,10.65910000000
+17,2059,R2,windturbine,2045,10.65910000000
+17,2060,R2,windturbine,2045,10.65910000000
+17,2064,R2,windturbine,2045,10.65910000000
+17,2065,R2,windturbine,2045,10.65910000000
+17,2069,R2,windturbine,2045,10.65910000000
+17,2070,R2,windturbine,2045,10.65910000000
+17,2074,R2,windturbine,2045,10.65910000000
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 b8290871..d2a868b8 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,63 +1,53 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,0.29290000000
-1,2054,R1,gasCCGT,2045,0.29290000000
-1,2055,R1,gasCCGT,2045,0.29290000000
-1,2059,R1,gasCCGT,2045,0.29290000000
-1,2060,R1,gasCCGT,2045,0.29290000000
-1,2064,R1,gasCCGT,2045,0.29290000000
-1,2065,R1,gasCCGT,2045,0.29290000000
-1,2069,R1,gasCCGT,2045,0.29290000000
-1,2070,R1,gasCCGT,2045,0.29290000000
-1,2074,R1,gasCCGT,2045,0.29290000000
-1,2075,R1,gasCCGT,2045,0.29290000000
-1,2079,R1,gasCCGT,2045,0.29290000000
-1,2080,R1,gasCCGT,2045,0.29290000000
-1,2084,R1,gasCCGT,2045,0.29290000000
-2,2025,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2020,5.05910000000
-2,2035,R1,solarPV,2020,5.05910000000
-2,2040,R1,solarPV,2020,5.05910000000
-2,2045,R1,solarPV,2020,5.05910000000
-2,2049,R1,solarPV,2020,5.05910000000
-3,2030,R1,solarPV,2025,10.00000000000
-3,2035,R1,solarPV,2025,10.00000000000
-3,2040,R1,solarPV,2025,10.00000000000
-3,2045,R1,solarPV,2025,10.00000000000
-3,2049,R1,solarPV,2025,10.00000000000
-3,2050,R1,solarPV,2025,10.00000000000
-3,2054,R1,solarPV,2025,10.00000000000
+1,2030,R1,gasCCGT,2025,5.75150000000
+1,2035,R1,gasCCGT,2025,5.75150000000
+1,2040,R1,gasCCGT,2025,5.75150000000
+1,2045,R1,gasCCGT,2025,5.75150000000
+1,2049,R1,gasCCGT,2025,5.75150000000
+1,2050,R1,gasCCGT,2025,5.75150000000
+1,2059,R1,gasCCGT,2025,5.75150000000
+1,2060,R1,gasCCGT,2025,5.75150000000
+1,2064,R1,gasCCGT,2025,5.75150000000
+2,2050,R1,gasCCGT,2045,0.29290000000
+2,2059,R1,gasCCGT,2045,0.29290000000
+2,2060,R1,gasCCGT,2045,0.29290000000
+2,2064,R1,gasCCGT,2045,0.29290000000
+2,2065,R1,gasCCGT,2045,0.29290000000
+2,2069,R1,gasCCGT,2045,0.29290000000
+2,2070,R1,gasCCGT,2045,0.29290000000
+2,2074,R1,gasCCGT,2045,0.29290000000
+2,2075,R1,gasCCGT,2045,0.29290000000
+2,2084,R1,gasCCGT,2045,0.29290000000
+3,2025,R1,solarPV,2020,5.05910000000
+3,2030,R1,solarPV,2020,5.05910000000
+3,2035,R1,solarPV,2020,5.05910000000
+3,2040,R1,solarPV,2020,5.05910000000
+3,2045,R1,solarPV,2020,5.05910000000
+3,2049,R1,solarPV,2020,5.05910000000
 4,2035,R1,solarPV,2030,5.60000000000
 4,2040,R1,solarPV,2030,5.60000000000
 4,2045,R1,solarPV,2030,5.60000000000
 4,2049,R1,solarPV,2030,5.60000000000
 4,2050,R1,solarPV,2030,5.60000000000
-4,2054,R1,solarPV,2030,5.60000000000
-4,2055,R1,solarPV,2030,5.60000000000
 4,2059,R1,solarPV,2030,5.60000000000
 5,2040,R1,solarPV,2035,5.60000000000
 5,2045,R1,solarPV,2035,5.60000000000
 5,2049,R1,solarPV,2035,5.60000000000
 5,2050,R1,solarPV,2035,5.60000000000
-5,2054,R1,solarPV,2035,5.60000000000
-5,2055,R1,solarPV,2035,5.60000000000
 5,2059,R1,solarPV,2035,5.60000000000
 5,2060,R1,solarPV,2035,5.60000000000
 5,2064,R1,solarPV,2035,5.60000000000
 6,2045,R1,solarPV,2040,5.60000000000
 6,2049,R1,solarPV,2040,5.60000000000
 6,2050,R1,solarPV,2040,5.60000000000
-6,2054,R1,solarPV,2040,5.60000000000
-6,2055,R1,solarPV,2040,5.60000000000
 6,2059,R1,solarPV,2040,5.60000000000
 6,2060,R1,solarPV,2040,5.60000000000
 6,2064,R1,solarPV,2040,5.60000000000
 6,2065,R1,solarPV,2040,5.60000000000
 6,2069,R1,solarPV,2040,5.60000000000
 7,2050,R1,solarPV,2045,10.00000000000
-7,2054,R1,solarPV,2045,10.00000000000
-7,2055,R1,solarPV,2045,10.00000000000
 7,2059,R1,solarPV,2045,10.00000000000
 7,2060,R1,solarPV,2045,10.00000000000
 7,2064,R1,solarPV,2045,10.00000000000
@@ -65,135 +55,71 @@ asset,year,region,technology,installed,capacity
 7,2069,R1,solarPV,2045,10.00000000000
 7,2070,R1,solarPV,2045,10.00000000000
 7,2074,R1,solarPV,2045,10.00000000000
-8,2055,R1,solarPV,2050,10.00000000000
-8,2059,R1,solarPV,2050,10.00000000000
-8,2060,R1,solarPV,2050,10.00000000000
-8,2064,R1,solarPV,2050,10.00000000000
-8,2065,R1,solarPV,2050,10.00000000000
-8,2069,R1,solarPV,2050,10.00000000000
-8,2070,R1,solarPV,2050,10.00000000000
-8,2074,R1,solarPV,2050,10.00000000000
-8,2075,R1,solarPV,2050,10.00000000000
-8,2079,R1,solarPV,2050,10.00000000000
-9,2025,R1,windturbine,2020,10.00000000000
-9,2030,R1,windturbine,2020,10.00000000000
-9,2035,R1,windturbine,2020,10.00000000000
-9,2040,R1,windturbine,2020,10.00000000000
-9,2045,R1,windturbine,2020,10.00000000000
-9,2049,R1,windturbine,2020,10.00000000000
-10,2030,R1,windturbine,2025,2.94090000000
-10,2035,R1,windturbine,2025,2.94090000000
-10,2040,R1,windturbine,2025,2.94090000000
-10,2045,R1,windturbine,2025,2.94090000000
-10,2049,R1,windturbine,2025,2.94090000000
-10,2050,R1,windturbine,2025,2.94090000000
-10,2054,R1,windturbine,2025,2.94090000000
-11,2050,R1,windturbine,2045,10.00000000000
-11,2054,R1,windturbine,2045,10.00000000000
-11,2055,R1,windturbine,2045,10.00000000000
-11,2059,R1,windturbine,2045,10.00000000000
-11,2060,R1,windturbine,2045,10.00000000000
-11,2064,R1,windturbine,2045,10.00000000000
-11,2065,R1,windturbine,2045,10.00000000000
-11,2069,R1,windturbine,2045,10.00000000000
-11,2070,R1,windturbine,2045,10.00000000000
-11,2074,R1,windturbine,2045,10.00000000000
-12,2055,R1,windturbine,2050,2.94090000000
-12,2059,R1,windturbine,2050,2.94090000000
-12,2060,R1,windturbine,2050,2.94090000000
-12,2064,R1,windturbine,2050,2.94090000000
-12,2065,R1,windturbine,2050,2.94090000000
-12,2069,R1,windturbine,2050,2.94090000000
-12,2070,R1,windturbine,2050,2.94090000000
-12,2074,R1,windturbine,2050,2.94090000000
-12,2075,R1,windturbine,2050,2.94090000000
-12,2079,R1,windturbine,2050,2.94090000000
-13,2020,R2,gasCCGT,2020,1.00000000000
-13,2025,R2,gasCCGT,2020,1.00000000000
-14,2030,R2,solarPV,2025,10.00000000000
-14,2035,R2,solarPV,2025,10.00000000000
-14,2040,R2,solarPV,2025,10.00000000000
-14,2045,R2,solarPV,2025,10.00000000000
-14,2049,R2,solarPV,2025,10.00000000000
-14,2050,R2,solarPV,2025,10.00000000000
-14,2054,R2,solarPV,2025,10.00000000000
-15,2035,R2,solarPV,2030,5.60000000000
-15,2040,R2,solarPV,2030,5.60000000000
-15,2045,R2,solarPV,2030,5.60000000000
-15,2049,R2,solarPV,2030,5.60000000000
-15,2050,R2,solarPV,2030,5.60000000000
-15,2054,R2,solarPV,2030,5.60000000000
-15,2055,R2,solarPV,2030,5.60000000000
-15,2059,R2,solarPV,2030,5.60000000000
-16,2040,R2,solarPV,2035,5.60000000000
-16,2045,R2,solarPV,2035,5.60000000000
-16,2049,R2,solarPV,2035,5.60000000000
-16,2050,R2,solarPV,2035,5.60000000000
-16,2054,R2,solarPV,2035,5.60000000000
-16,2055,R2,solarPV,2035,5.60000000000
-16,2059,R2,solarPV,2035,5.60000000000
-16,2060,R2,solarPV,2035,5.60000000000
-16,2064,R2,solarPV,2035,5.60000000000
-17,2045,R2,solarPV,2040,5.60000000000
-17,2049,R2,solarPV,2040,5.60000000000
-17,2050,R2,solarPV,2040,5.60000000000
-17,2054,R2,solarPV,2040,5.60000000000
-17,2055,R2,solarPV,2040,5.60000000000
-17,2059,R2,solarPV,2040,5.60000000000
-17,2060,R2,solarPV,2040,5.60000000000
-17,2064,R2,solarPV,2040,5.60000000000
-17,2065,R2,solarPV,2040,5.60000000000
-17,2069,R2,solarPV,2040,5.60000000000
-18,2050,R2,solarPV,2045,10.00000000000
-18,2054,R2,solarPV,2045,10.00000000000
-18,2055,R2,solarPV,2045,10.00000000000
-18,2059,R2,solarPV,2045,10.00000000000
-18,2060,R2,solarPV,2045,10.00000000000
-18,2064,R2,solarPV,2045,10.00000000000
-18,2065,R2,solarPV,2045,10.00000000000
-18,2069,R2,solarPV,2045,10.00000000000
-18,2070,R2,solarPV,2045,10.00000000000
-18,2074,R2,solarPV,2045,10.00000000000
-19,2055,R2,solarPV,2050,10.00000000000
-19,2059,R2,solarPV,2050,10.00000000000
-19,2060,R2,solarPV,2050,10.00000000000
-19,2064,R2,solarPV,2050,10.00000000000
-19,2065,R2,solarPV,2050,10.00000000000
-19,2069,R2,solarPV,2050,10.00000000000
-19,2070,R2,solarPV,2050,10.00000000000
-19,2074,R2,solarPV,2050,10.00000000000
-19,2075,R2,solarPV,2050,10.00000000000
-19,2079,R2,solarPV,2050,10.00000000000
-20,2025,R2,windturbine,2020,15.05910000000
-20,2030,R2,windturbine,2020,15.05910000000
-20,2035,R2,windturbine,2020,15.05910000000
-20,2040,R2,windturbine,2020,15.05910000000
-20,2045,R2,windturbine,2020,15.05910000000
-20,2049,R2,windturbine,2020,15.05910000000
-21,2030,R2,windturbine,2025,2.94090000000
-21,2035,R2,windturbine,2025,2.94090000000
-21,2040,R2,windturbine,2025,2.94090000000
-21,2045,R2,windturbine,2025,2.94090000000
-21,2049,R2,windturbine,2025,2.94090000000
-21,2050,R2,windturbine,2025,2.94090000000
-21,2054,R2,windturbine,2025,2.94090000000
-22,2050,R2,windturbine,2045,10.65910000000
-22,2054,R2,windturbine,2045,10.65910000000
-22,2055,R2,windturbine,2045,10.65910000000
-22,2059,R2,windturbine,2045,10.65910000000
-22,2060,R2,windturbine,2045,10.65910000000
-22,2064,R2,windturbine,2045,10.65910000000
-22,2065,R2,windturbine,2045,10.65910000000
-22,2069,R2,windturbine,2045,10.65910000000
-22,2070,R2,windturbine,2045,10.65910000000
-22,2074,R2,windturbine,2045,10.65910000000
-23,2055,R2,windturbine,2050,2.94090000000
-23,2059,R2,windturbine,2050,2.94090000000
-23,2060,R2,windturbine,2050,2.94090000000
-23,2064,R2,windturbine,2050,2.94090000000
-23,2065,R2,windturbine,2050,2.94090000000
-23,2069,R2,windturbine,2050,2.94090000000
-23,2070,R2,windturbine,2050,2.94090000000
-23,2074,R2,windturbine,2050,2.94090000000
-23,2075,R2,windturbine,2050,2.94090000000
-23,2079,R2,windturbine,2050,2.94090000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,5.75150000000
+11,2035,R2,gasCCGT,2025,5.75150000000
+11,2040,R2,gasCCGT,2025,5.75150000000
+11,2045,R2,gasCCGT,2025,5.75150000000
+11,2049,R2,gasCCGT,2025,5.75150000000
+11,2050,R2,gasCCGT,2025,5.75150000000
+11,2059,R2,gasCCGT,2025,5.75150000000
+11,2060,R2,gasCCGT,2025,5.75150000000
+11,2064,R2,gasCCGT,2025,5.75150000000
+12,2035,R2,solarPV,2030,5.60000000000
+12,2040,R2,solarPV,2030,5.60000000000
+12,2045,R2,solarPV,2030,5.60000000000
+12,2049,R2,solarPV,2030,5.60000000000
+12,2050,R2,solarPV,2030,5.60000000000
+12,2059,R2,solarPV,2030,5.60000000000
+13,2040,R2,solarPV,2035,5.60000000000
+13,2045,R2,solarPV,2035,5.60000000000
+13,2049,R2,solarPV,2035,5.60000000000
+13,2050,R2,solarPV,2035,5.60000000000
+13,2059,R2,solarPV,2035,5.60000000000
+13,2060,R2,solarPV,2035,5.60000000000
+13,2064,R2,solarPV,2035,5.60000000000
+14,2045,R2,solarPV,2040,5.60000000000
+14,2049,R2,solarPV,2040,5.60000000000
+14,2050,R2,solarPV,2040,5.60000000000
+14,2059,R2,solarPV,2040,5.60000000000
+14,2060,R2,solarPV,2040,5.60000000000
+14,2064,R2,solarPV,2040,5.60000000000
+14,2065,R2,solarPV,2040,5.60000000000
+14,2069,R2,solarPV,2040,5.60000000000
+15,2050,R2,solarPV,2045,10.00000000000
+15,2059,R2,solarPV,2045,10.00000000000
+15,2060,R2,solarPV,2045,10.00000000000
+15,2064,R2,solarPV,2045,10.00000000000
+15,2065,R2,solarPV,2045,10.00000000000
+15,2069,R2,solarPV,2045,10.00000000000
+15,2070,R2,solarPV,2045,10.00000000000
+15,2074,R2,solarPV,2045,10.00000000000
+16,2025,R2,windturbine,2020,15.05910000000
+16,2030,R2,windturbine,2020,15.05910000000
+16,2035,R2,windturbine,2020,15.05910000000
+16,2040,R2,windturbine,2020,15.05910000000
+16,2045,R2,windturbine,2020,15.05910000000
+16,2049,R2,windturbine,2020,15.05910000000
+17,2050,R2,windturbine,2045,10.65910000000
+17,2059,R2,windturbine,2045,10.65910000000
+17,2060,R2,windturbine,2045,10.65910000000
+17,2064,R2,windturbine,2045,10.65910000000
+17,2065,R2,windturbine,2045,10.65910000000
+17,2069,R2,windturbine,2045,10.65910000000
+17,2070,R2,windturbine,2045,10.65910000000
+17,2074,R2,windturbine,2045,10.65910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index d8294d25..f6665d25 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
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 1d028468..64a7e08e 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,7 +1,23 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2028,R2,gassupply1,2020,10.50000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2028,R2,gassupply1,2026,3.23460000000
+3,2030,R2,gassupply1,2026,3.23460000000
+3,2035,R2,gassupply1,2026,3.23460000000
+3,2040,R2,gassupply1,2026,3.23460000000
+3,2045,R2,gassupply1,2026,3.23460000000
+3,2050,R2,gassupply1,2026,3.23460000000
+3,2062,R2,gassupply1,2026,3.23460000000
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 1d028468..e2e419be 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,7 +1,39 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2028,R2,gassupply1,2020,10.50000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2028,R2,gassupply1,2026,3.23460000000
+4,2030,R2,gassupply1,2026,3.23460000000
+4,2035,R2,gassupply1,2026,3.23460000000
+4,2040,R2,gassupply1,2026,3.23460000000
+4,2045,R2,gassupply1,2026,3.23460000000
+4,2050,R2,gassupply1,2026,3.23460000000
+4,2062,R2,gassupply1,2026,3.23460000000
+5,2030,R2,gassupply1,2028,3.53600000000
+5,2035,R2,gassupply1,2028,3.53600000000
+5,2040,R2,gassupply1,2028,3.53600000000
+5,2045,R2,gassupply1,2028,3.53600000000
+5,2050,R2,gassupply1,2028,3.53600000000
+5,2062,R2,gassupply1,2028,3.53600000000
+5,2063,R2,gassupply1,2028,3.53600000000
+5,2064,R2,gassupply1,2028,3.53600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index 1d028468..1b8fa9c4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,65 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+0,2032,R1,gassupply1,2020,4.50000000000
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2032,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2032,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2032,R1,gassupply1,2030,4.66260000000
+3,2035,R1,gassupply1,2030,4.66260000000
+3,2040,R1,gassupply1,2030,4.66260000000
+3,2045,R1,gassupply1,2030,4.66260000000
+3,2050,R1,gassupply1,2030,4.66260000000
+3,2062,R1,gassupply1,2030,4.66260000000
+3,2063,R1,gassupply1,2030,4.66260000000
+3,2064,R1,gassupply1,2030,4.66260000000
+3,2065,R1,gassupply1,2030,4.66260000000
+3,2066,R1,gassupply1,2030,4.66260000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2028,R2,gassupply1,2020,10.50000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+4,2032,R2,gassupply1,2020,4.50000000000
+5,2028,R2,gassupply1,2026,3.23460000000
+5,2030,R2,gassupply1,2026,3.23460000000
+5,2032,R2,gassupply1,2026,3.23460000000
+5,2035,R2,gassupply1,2026,3.23460000000
+5,2040,R2,gassupply1,2026,3.23460000000
+5,2045,R2,gassupply1,2026,3.23460000000
+5,2050,R2,gassupply1,2026,3.23460000000
+5,2062,R2,gassupply1,2026,3.23460000000
+6,2030,R2,gassupply1,2028,3.53600000000
+6,2032,R2,gassupply1,2028,3.53600000000
+6,2035,R2,gassupply1,2028,3.53600000000
+6,2040,R2,gassupply1,2028,3.53600000000
+6,2045,R2,gassupply1,2028,3.53600000000
+6,2050,R2,gassupply1,2028,3.53600000000
+6,2062,R2,gassupply1,2028,3.53600000000
+6,2063,R2,gassupply1,2028,3.53600000000
+6,2064,R2,gassupply1,2028,3.53600000000
+7,2032,R2,gassupply1,2030,4.66260000000
+7,2035,R2,gassupply1,2030,4.66260000000
+7,2040,R2,gassupply1,2030,4.66260000000
+7,2045,R2,gassupply1,2030,4.66260000000
+7,2050,R2,gassupply1,2030,4.66260000000
+7,2062,R2,gassupply1,2030,4.66260000000
+7,2063,R2,gassupply1,2030,4.66260000000
+7,2064,R2,gassupply1,2030,4.66260000000
+7,2065,R2,gassupply1,2030,4.66260000000
+7,2066,R2,gassupply1,2030,4.66260000000
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 1d028468..427e21ec 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,7 +1,97 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+0,2032,R1,gassupply1,2020,4.50000000000
+0,2034,R1,gassupply1,2020,1.50000000000
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2032,R1,gassupply1,2026,3.23460000000
+1,2034,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2032,R1,gassupply1,2028,3.53600000000
+2,2034,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2032,R1,gassupply1,2030,4.66260000000
+3,2034,R1,gassupply1,2030,4.66260000000
+3,2035,R1,gassupply1,2030,4.66260000000
+3,2040,R1,gassupply1,2030,4.66260000000
+3,2045,R1,gassupply1,2030,4.66260000000
+3,2050,R1,gassupply1,2030,4.66260000000
+3,2062,R1,gassupply1,2030,4.66260000000
+3,2063,R1,gassupply1,2030,4.66260000000
+3,2064,R1,gassupply1,2030,4.66260000000
+3,2065,R1,gassupply1,2030,4.66260000000
+3,2066,R1,gassupply1,2030,4.66260000000
+4,2034,R1,gassupply1,2032,3.00000000000
+4,2035,R1,gassupply1,2032,3.00000000000
+4,2040,R1,gassupply1,2032,3.00000000000
+4,2045,R1,gassupply1,2032,3.00000000000
+4,2050,R1,gassupply1,2032,3.00000000000
+4,2062,R1,gassupply1,2032,3.00000000000
+4,2063,R1,gassupply1,2032,3.00000000000
+4,2064,R1,gassupply1,2032,3.00000000000
+4,2065,R1,gassupply1,2032,3.00000000000
+4,2066,R1,gassupply1,2032,3.00000000000
+4,2067,R1,gassupply1,2032,3.00000000000
+4,2068,R1,gassupply1,2032,3.00000000000
+5,2020,R2,gassupply1,2020,15.00000000000
+5,2025,R2,gassupply1,2020,15.00000000000
+5,2028,R2,gassupply1,2020,10.50000000000
+5,2030,R2,gassupply1,2020,7.50000000000
+5,2032,R2,gassupply1,2020,4.50000000000
+5,2034,R2,gassupply1,2020,1.50000000000
+6,2028,R2,gassupply1,2026,3.23460000000
+6,2030,R2,gassupply1,2026,3.23460000000
+6,2032,R2,gassupply1,2026,3.23460000000
+6,2034,R2,gassupply1,2026,3.23460000000
+6,2035,R2,gassupply1,2026,3.23460000000
+6,2040,R2,gassupply1,2026,3.23460000000
+6,2045,R2,gassupply1,2026,3.23460000000
+6,2050,R2,gassupply1,2026,3.23460000000
+6,2062,R2,gassupply1,2026,3.23460000000
+7,2030,R2,gassupply1,2028,3.53600000000
+7,2032,R2,gassupply1,2028,3.53600000000
+7,2034,R2,gassupply1,2028,3.53600000000
+7,2035,R2,gassupply1,2028,3.53600000000
+7,2040,R2,gassupply1,2028,3.53600000000
+7,2045,R2,gassupply1,2028,3.53600000000
+7,2050,R2,gassupply1,2028,3.53600000000
+7,2062,R2,gassupply1,2028,3.53600000000
+7,2063,R2,gassupply1,2028,3.53600000000
+7,2064,R2,gassupply1,2028,3.53600000000
+8,2032,R2,gassupply1,2030,4.66260000000
+8,2034,R2,gassupply1,2030,4.66260000000
+8,2035,R2,gassupply1,2030,4.66260000000
+8,2040,R2,gassupply1,2030,4.66260000000
+8,2045,R2,gassupply1,2030,4.66260000000
+8,2050,R2,gassupply1,2030,4.66260000000
+8,2062,R2,gassupply1,2030,4.66260000000
+8,2063,R2,gassupply1,2030,4.66260000000
+8,2064,R2,gassupply1,2030,4.66260000000
+8,2065,R2,gassupply1,2030,4.66260000000
+8,2066,R2,gassupply1,2030,4.66260000000
+9,2034,R2,gassupply1,2032,3.00000000000
+9,2035,R2,gassupply1,2032,3.00000000000
+9,2040,R2,gassupply1,2032,3.00000000000
+9,2045,R2,gassupply1,2032,3.00000000000
+9,2050,R2,gassupply1,2032,3.00000000000
+9,2062,R2,gassupply1,2032,3.00000000000
+9,2063,R2,gassupply1,2032,3.00000000000
+9,2064,R2,gassupply1,2032,3.00000000000
+9,2065,R2,gassupply1,2032,3.00000000000
+9,2066,R2,gassupply1,2032,3.00000000000
+9,2067,R2,gassupply1,2032,3.00000000000
+9,2068,R2,gassupply1,2032,3.00000000000
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 1d028468..5404f883 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,7 +1,131 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+0,2032,R1,gassupply1,2020,4.50000000000
+0,2034,R1,gassupply1,2020,1.50000000000
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2032,R1,gassupply1,2026,3.23460000000
+1,2034,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2036,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2032,R1,gassupply1,2028,3.53600000000
+2,2034,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2036,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2032,R1,gassupply1,2030,4.66260000000
+3,2034,R1,gassupply1,2030,4.66260000000
+3,2035,R1,gassupply1,2030,4.66260000000
+3,2036,R1,gassupply1,2030,4.66260000000
+3,2040,R1,gassupply1,2030,4.66260000000
+3,2045,R1,gassupply1,2030,4.66260000000
+3,2050,R1,gassupply1,2030,4.66260000000
+3,2062,R1,gassupply1,2030,4.66260000000
+3,2063,R1,gassupply1,2030,4.66260000000
+3,2064,R1,gassupply1,2030,4.66260000000
+3,2065,R1,gassupply1,2030,4.66260000000
+3,2066,R1,gassupply1,2030,4.66260000000
+4,2034,R1,gassupply1,2032,3.00000000000
+4,2035,R1,gassupply1,2032,3.00000000000
+4,2036,R1,gassupply1,2032,3.00000000000
+4,2040,R1,gassupply1,2032,3.00000000000
+4,2045,R1,gassupply1,2032,3.00000000000
+4,2050,R1,gassupply1,2032,3.00000000000
+4,2062,R1,gassupply1,2032,3.00000000000
+4,2063,R1,gassupply1,2032,3.00000000000
+4,2064,R1,gassupply1,2032,3.00000000000
+4,2065,R1,gassupply1,2032,3.00000000000
+4,2066,R1,gassupply1,2032,3.00000000000
+4,2067,R1,gassupply1,2032,3.00000000000
+4,2068,R1,gassupply1,2032,3.00000000000
+5,2036,R1,gassupply1,2034,1.50000000000
+5,2040,R1,gassupply1,2034,1.50000000000
+5,2045,R1,gassupply1,2034,1.50000000000
+5,2050,R1,gassupply1,2034,1.50000000000
+5,2062,R1,gassupply1,2034,1.50000000000
+5,2063,R1,gassupply1,2034,1.50000000000
+5,2064,R1,gassupply1,2034,1.50000000000
+5,2065,R1,gassupply1,2034,1.50000000000
+5,2066,R1,gassupply1,2034,1.50000000000
+5,2067,R1,gassupply1,2034,1.50000000000
+5,2068,R1,gassupply1,2034,1.50000000000
+5,2069,R1,gassupply1,2034,1.50000000000
+5,2070,R1,gassupply1,2034,1.50000000000
+6,2020,R2,gassupply1,2020,15.00000000000
+6,2025,R2,gassupply1,2020,15.00000000000
+6,2028,R2,gassupply1,2020,10.50000000000
+6,2030,R2,gassupply1,2020,7.50000000000
+6,2032,R2,gassupply1,2020,4.50000000000
+6,2034,R2,gassupply1,2020,1.50000000000
+7,2028,R2,gassupply1,2026,3.23460000000
+7,2030,R2,gassupply1,2026,3.23460000000
+7,2032,R2,gassupply1,2026,3.23460000000
+7,2034,R2,gassupply1,2026,3.23460000000
+7,2035,R2,gassupply1,2026,3.23460000000
+7,2036,R2,gassupply1,2026,3.23460000000
+7,2040,R2,gassupply1,2026,3.23460000000
+7,2045,R2,gassupply1,2026,3.23460000000
+7,2050,R2,gassupply1,2026,3.23460000000
+7,2062,R2,gassupply1,2026,3.23460000000
+8,2030,R2,gassupply1,2028,3.53600000000
+8,2032,R2,gassupply1,2028,3.53600000000
+8,2034,R2,gassupply1,2028,3.53600000000
+8,2035,R2,gassupply1,2028,3.53600000000
+8,2036,R2,gassupply1,2028,3.53600000000
+8,2040,R2,gassupply1,2028,3.53600000000
+8,2045,R2,gassupply1,2028,3.53600000000
+8,2050,R2,gassupply1,2028,3.53600000000
+8,2062,R2,gassupply1,2028,3.53600000000
+8,2063,R2,gassupply1,2028,3.53600000000
+8,2064,R2,gassupply1,2028,3.53600000000
+9,2032,R2,gassupply1,2030,4.66260000000
+9,2034,R2,gassupply1,2030,4.66260000000
+9,2035,R2,gassupply1,2030,4.66260000000
+9,2036,R2,gassupply1,2030,4.66260000000
+9,2040,R2,gassupply1,2030,4.66260000000
+9,2045,R2,gassupply1,2030,4.66260000000
+9,2050,R2,gassupply1,2030,4.66260000000
+9,2062,R2,gassupply1,2030,4.66260000000
+9,2063,R2,gassupply1,2030,4.66260000000
+9,2064,R2,gassupply1,2030,4.66260000000
+9,2065,R2,gassupply1,2030,4.66260000000
+9,2066,R2,gassupply1,2030,4.66260000000
+10,2034,R2,gassupply1,2032,3.00000000000
+10,2035,R2,gassupply1,2032,3.00000000000
+10,2036,R2,gassupply1,2032,3.00000000000
+10,2040,R2,gassupply1,2032,3.00000000000
+10,2045,R2,gassupply1,2032,3.00000000000
+10,2050,R2,gassupply1,2032,3.00000000000
+10,2062,R2,gassupply1,2032,3.00000000000
+10,2063,R2,gassupply1,2032,3.00000000000
+10,2064,R2,gassupply1,2032,3.00000000000
+10,2065,R2,gassupply1,2032,3.00000000000
+10,2066,R2,gassupply1,2032,3.00000000000
+10,2067,R2,gassupply1,2032,3.00000000000
+10,2068,R2,gassupply1,2032,3.00000000000
+11,2036,R2,gassupply1,2034,1.50000000000
+11,2040,R2,gassupply1,2034,1.50000000000
+11,2045,R2,gassupply1,2034,1.50000000000
+11,2050,R2,gassupply1,2034,1.50000000000
+11,2062,R2,gassupply1,2034,1.50000000000
+11,2063,R2,gassupply1,2034,1.50000000000
+11,2064,R2,gassupply1,2034,1.50000000000
+11,2065,R2,gassupply1,2034,1.50000000000
+11,2066,R2,gassupply1,2034,1.50000000000
+11,2067,R2,gassupply1,2034,1.50000000000
+11,2068,R2,gassupply1,2034,1.50000000000
+11,2069,R2,gassupply1,2034,1.50000000000
+11,2070,R2,gassupply1,2034,1.50000000000
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 1d028468..5404f883 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,7 +1,131 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+0,2032,R1,gassupply1,2020,4.50000000000
+0,2034,R1,gassupply1,2020,1.50000000000
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2032,R1,gassupply1,2026,3.23460000000
+1,2034,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2036,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2032,R1,gassupply1,2028,3.53600000000
+2,2034,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2036,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2032,R1,gassupply1,2030,4.66260000000
+3,2034,R1,gassupply1,2030,4.66260000000
+3,2035,R1,gassupply1,2030,4.66260000000
+3,2036,R1,gassupply1,2030,4.66260000000
+3,2040,R1,gassupply1,2030,4.66260000000
+3,2045,R1,gassupply1,2030,4.66260000000
+3,2050,R1,gassupply1,2030,4.66260000000
+3,2062,R1,gassupply1,2030,4.66260000000
+3,2063,R1,gassupply1,2030,4.66260000000
+3,2064,R1,gassupply1,2030,4.66260000000
+3,2065,R1,gassupply1,2030,4.66260000000
+3,2066,R1,gassupply1,2030,4.66260000000
+4,2034,R1,gassupply1,2032,3.00000000000
+4,2035,R1,gassupply1,2032,3.00000000000
+4,2036,R1,gassupply1,2032,3.00000000000
+4,2040,R1,gassupply1,2032,3.00000000000
+4,2045,R1,gassupply1,2032,3.00000000000
+4,2050,R1,gassupply1,2032,3.00000000000
+4,2062,R1,gassupply1,2032,3.00000000000
+4,2063,R1,gassupply1,2032,3.00000000000
+4,2064,R1,gassupply1,2032,3.00000000000
+4,2065,R1,gassupply1,2032,3.00000000000
+4,2066,R1,gassupply1,2032,3.00000000000
+4,2067,R1,gassupply1,2032,3.00000000000
+4,2068,R1,gassupply1,2032,3.00000000000
+5,2036,R1,gassupply1,2034,1.50000000000
+5,2040,R1,gassupply1,2034,1.50000000000
+5,2045,R1,gassupply1,2034,1.50000000000
+5,2050,R1,gassupply1,2034,1.50000000000
+5,2062,R1,gassupply1,2034,1.50000000000
+5,2063,R1,gassupply1,2034,1.50000000000
+5,2064,R1,gassupply1,2034,1.50000000000
+5,2065,R1,gassupply1,2034,1.50000000000
+5,2066,R1,gassupply1,2034,1.50000000000
+5,2067,R1,gassupply1,2034,1.50000000000
+5,2068,R1,gassupply1,2034,1.50000000000
+5,2069,R1,gassupply1,2034,1.50000000000
+5,2070,R1,gassupply1,2034,1.50000000000
+6,2020,R2,gassupply1,2020,15.00000000000
+6,2025,R2,gassupply1,2020,15.00000000000
+6,2028,R2,gassupply1,2020,10.50000000000
+6,2030,R2,gassupply1,2020,7.50000000000
+6,2032,R2,gassupply1,2020,4.50000000000
+6,2034,R2,gassupply1,2020,1.50000000000
+7,2028,R2,gassupply1,2026,3.23460000000
+7,2030,R2,gassupply1,2026,3.23460000000
+7,2032,R2,gassupply1,2026,3.23460000000
+7,2034,R2,gassupply1,2026,3.23460000000
+7,2035,R2,gassupply1,2026,3.23460000000
+7,2036,R2,gassupply1,2026,3.23460000000
+7,2040,R2,gassupply1,2026,3.23460000000
+7,2045,R2,gassupply1,2026,3.23460000000
+7,2050,R2,gassupply1,2026,3.23460000000
+7,2062,R2,gassupply1,2026,3.23460000000
+8,2030,R2,gassupply1,2028,3.53600000000
+8,2032,R2,gassupply1,2028,3.53600000000
+8,2034,R2,gassupply1,2028,3.53600000000
+8,2035,R2,gassupply1,2028,3.53600000000
+8,2036,R2,gassupply1,2028,3.53600000000
+8,2040,R2,gassupply1,2028,3.53600000000
+8,2045,R2,gassupply1,2028,3.53600000000
+8,2050,R2,gassupply1,2028,3.53600000000
+8,2062,R2,gassupply1,2028,3.53600000000
+8,2063,R2,gassupply1,2028,3.53600000000
+8,2064,R2,gassupply1,2028,3.53600000000
+9,2032,R2,gassupply1,2030,4.66260000000
+9,2034,R2,gassupply1,2030,4.66260000000
+9,2035,R2,gassupply1,2030,4.66260000000
+9,2036,R2,gassupply1,2030,4.66260000000
+9,2040,R2,gassupply1,2030,4.66260000000
+9,2045,R2,gassupply1,2030,4.66260000000
+9,2050,R2,gassupply1,2030,4.66260000000
+9,2062,R2,gassupply1,2030,4.66260000000
+9,2063,R2,gassupply1,2030,4.66260000000
+9,2064,R2,gassupply1,2030,4.66260000000
+9,2065,R2,gassupply1,2030,4.66260000000
+9,2066,R2,gassupply1,2030,4.66260000000
+10,2034,R2,gassupply1,2032,3.00000000000
+10,2035,R2,gassupply1,2032,3.00000000000
+10,2036,R2,gassupply1,2032,3.00000000000
+10,2040,R2,gassupply1,2032,3.00000000000
+10,2045,R2,gassupply1,2032,3.00000000000
+10,2050,R2,gassupply1,2032,3.00000000000
+10,2062,R2,gassupply1,2032,3.00000000000
+10,2063,R2,gassupply1,2032,3.00000000000
+10,2064,R2,gassupply1,2032,3.00000000000
+10,2065,R2,gassupply1,2032,3.00000000000
+10,2066,R2,gassupply1,2032,3.00000000000
+10,2067,R2,gassupply1,2032,3.00000000000
+10,2068,R2,gassupply1,2032,3.00000000000
+11,2036,R2,gassupply1,2034,1.50000000000
+11,2040,R2,gassupply1,2034,1.50000000000
+11,2045,R2,gassupply1,2034,1.50000000000
+11,2050,R2,gassupply1,2034,1.50000000000
+11,2062,R2,gassupply1,2034,1.50000000000
+11,2063,R2,gassupply1,2034,1.50000000000
+11,2064,R2,gassupply1,2034,1.50000000000
+11,2065,R2,gassupply1,2034,1.50000000000
+11,2066,R2,gassupply1,2034,1.50000000000
+11,2067,R2,gassupply1,2034,1.50000000000
+11,2068,R2,gassupply1,2034,1.50000000000
+11,2069,R2,gassupply1,2034,1.50000000000
+11,2070,R2,gassupply1,2034,1.50000000000
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 1d028468..5404f883 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,7 +1,131 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+0,2032,R1,gassupply1,2020,4.50000000000
+0,2034,R1,gassupply1,2020,1.50000000000
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2032,R1,gassupply1,2026,3.23460000000
+1,2034,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2036,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2032,R1,gassupply1,2028,3.53600000000
+2,2034,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2036,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2032,R1,gassupply1,2030,4.66260000000
+3,2034,R1,gassupply1,2030,4.66260000000
+3,2035,R1,gassupply1,2030,4.66260000000
+3,2036,R1,gassupply1,2030,4.66260000000
+3,2040,R1,gassupply1,2030,4.66260000000
+3,2045,R1,gassupply1,2030,4.66260000000
+3,2050,R1,gassupply1,2030,4.66260000000
+3,2062,R1,gassupply1,2030,4.66260000000
+3,2063,R1,gassupply1,2030,4.66260000000
+3,2064,R1,gassupply1,2030,4.66260000000
+3,2065,R1,gassupply1,2030,4.66260000000
+3,2066,R1,gassupply1,2030,4.66260000000
+4,2034,R1,gassupply1,2032,3.00000000000
+4,2035,R1,gassupply1,2032,3.00000000000
+4,2036,R1,gassupply1,2032,3.00000000000
+4,2040,R1,gassupply1,2032,3.00000000000
+4,2045,R1,gassupply1,2032,3.00000000000
+4,2050,R1,gassupply1,2032,3.00000000000
+4,2062,R1,gassupply1,2032,3.00000000000
+4,2063,R1,gassupply1,2032,3.00000000000
+4,2064,R1,gassupply1,2032,3.00000000000
+4,2065,R1,gassupply1,2032,3.00000000000
+4,2066,R1,gassupply1,2032,3.00000000000
+4,2067,R1,gassupply1,2032,3.00000000000
+4,2068,R1,gassupply1,2032,3.00000000000
+5,2036,R1,gassupply1,2034,1.50000000000
+5,2040,R1,gassupply1,2034,1.50000000000
+5,2045,R1,gassupply1,2034,1.50000000000
+5,2050,R1,gassupply1,2034,1.50000000000
+5,2062,R1,gassupply1,2034,1.50000000000
+5,2063,R1,gassupply1,2034,1.50000000000
+5,2064,R1,gassupply1,2034,1.50000000000
+5,2065,R1,gassupply1,2034,1.50000000000
+5,2066,R1,gassupply1,2034,1.50000000000
+5,2067,R1,gassupply1,2034,1.50000000000
+5,2068,R1,gassupply1,2034,1.50000000000
+5,2069,R1,gassupply1,2034,1.50000000000
+5,2070,R1,gassupply1,2034,1.50000000000
+6,2020,R2,gassupply1,2020,15.00000000000
+6,2025,R2,gassupply1,2020,15.00000000000
+6,2028,R2,gassupply1,2020,10.50000000000
+6,2030,R2,gassupply1,2020,7.50000000000
+6,2032,R2,gassupply1,2020,4.50000000000
+6,2034,R2,gassupply1,2020,1.50000000000
+7,2028,R2,gassupply1,2026,3.23460000000
+7,2030,R2,gassupply1,2026,3.23460000000
+7,2032,R2,gassupply1,2026,3.23460000000
+7,2034,R2,gassupply1,2026,3.23460000000
+7,2035,R2,gassupply1,2026,3.23460000000
+7,2036,R2,gassupply1,2026,3.23460000000
+7,2040,R2,gassupply1,2026,3.23460000000
+7,2045,R2,gassupply1,2026,3.23460000000
+7,2050,R2,gassupply1,2026,3.23460000000
+7,2062,R2,gassupply1,2026,3.23460000000
+8,2030,R2,gassupply1,2028,3.53600000000
+8,2032,R2,gassupply1,2028,3.53600000000
+8,2034,R2,gassupply1,2028,3.53600000000
+8,2035,R2,gassupply1,2028,3.53600000000
+8,2036,R2,gassupply1,2028,3.53600000000
+8,2040,R2,gassupply1,2028,3.53600000000
+8,2045,R2,gassupply1,2028,3.53600000000
+8,2050,R2,gassupply1,2028,3.53600000000
+8,2062,R2,gassupply1,2028,3.53600000000
+8,2063,R2,gassupply1,2028,3.53600000000
+8,2064,R2,gassupply1,2028,3.53600000000
+9,2032,R2,gassupply1,2030,4.66260000000
+9,2034,R2,gassupply1,2030,4.66260000000
+9,2035,R2,gassupply1,2030,4.66260000000
+9,2036,R2,gassupply1,2030,4.66260000000
+9,2040,R2,gassupply1,2030,4.66260000000
+9,2045,R2,gassupply1,2030,4.66260000000
+9,2050,R2,gassupply1,2030,4.66260000000
+9,2062,R2,gassupply1,2030,4.66260000000
+9,2063,R2,gassupply1,2030,4.66260000000
+9,2064,R2,gassupply1,2030,4.66260000000
+9,2065,R2,gassupply1,2030,4.66260000000
+9,2066,R2,gassupply1,2030,4.66260000000
+10,2034,R2,gassupply1,2032,3.00000000000
+10,2035,R2,gassupply1,2032,3.00000000000
+10,2036,R2,gassupply1,2032,3.00000000000
+10,2040,R2,gassupply1,2032,3.00000000000
+10,2045,R2,gassupply1,2032,3.00000000000
+10,2050,R2,gassupply1,2032,3.00000000000
+10,2062,R2,gassupply1,2032,3.00000000000
+10,2063,R2,gassupply1,2032,3.00000000000
+10,2064,R2,gassupply1,2032,3.00000000000
+10,2065,R2,gassupply1,2032,3.00000000000
+10,2066,R2,gassupply1,2032,3.00000000000
+10,2067,R2,gassupply1,2032,3.00000000000
+10,2068,R2,gassupply1,2032,3.00000000000
+11,2036,R2,gassupply1,2034,1.50000000000
+11,2040,R2,gassupply1,2034,1.50000000000
+11,2045,R2,gassupply1,2034,1.50000000000
+11,2050,R2,gassupply1,2034,1.50000000000
+11,2062,R2,gassupply1,2034,1.50000000000
+11,2063,R2,gassupply1,2034,1.50000000000
+11,2064,R2,gassupply1,2034,1.50000000000
+11,2065,R2,gassupply1,2034,1.50000000000
+11,2066,R2,gassupply1,2034,1.50000000000
+11,2067,R2,gassupply1,2034,1.50000000000
+11,2068,R2,gassupply1,2034,1.50000000000
+11,2069,R2,gassupply1,2034,1.50000000000
+11,2070,R2,gassupply1,2034,1.50000000000
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 1d028468..5404f883 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,7 +1,131 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
 0,2025,R1,gassupply1,2020,15.00000000000
+0,2028,R1,gassupply1,2020,10.50000000000
 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
+0,2032,R1,gassupply1,2020,4.50000000000
+0,2034,R1,gassupply1,2020,1.50000000000
+1,2028,R1,gassupply1,2026,3.23460000000
+1,2030,R1,gassupply1,2026,3.23460000000
+1,2032,R1,gassupply1,2026,3.23460000000
+1,2034,R1,gassupply1,2026,3.23460000000
+1,2035,R1,gassupply1,2026,3.23460000000
+1,2036,R1,gassupply1,2026,3.23460000000
+1,2040,R1,gassupply1,2026,3.23460000000
+1,2045,R1,gassupply1,2026,3.23460000000
+1,2050,R1,gassupply1,2026,3.23460000000
+1,2062,R1,gassupply1,2026,3.23460000000
+2,2030,R1,gassupply1,2028,3.53600000000
+2,2032,R1,gassupply1,2028,3.53600000000
+2,2034,R1,gassupply1,2028,3.53600000000
+2,2035,R1,gassupply1,2028,3.53600000000
+2,2036,R1,gassupply1,2028,3.53600000000
+2,2040,R1,gassupply1,2028,3.53600000000
+2,2045,R1,gassupply1,2028,3.53600000000
+2,2050,R1,gassupply1,2028,3.53600000000
+2,2062,R1,gassupply1,2028,3.53600000000
+2,2063,R1,gassupply1,2028,3.53600000000
+2,2064,R1,gassupply1,2028,3.53600000000
+3,2032,R1,gassupply1,2030,4.66260000000
+3,2034,R1,gassupply1,2030,4.66260000000
+3,2035,R1,gassupply1,2030,4.66260000000
+3,2036,R1,gassupply1,2030,4.66260000000
+3,2040,R1,gassupply1,2030,4.66260000000
+3,2045,R1,gassupply1,2030,4.66260000000
+3,2050,R1,gassupply1,2030,4.66260000000
+3,2062,R1,gassupply1,2030,4.66260000000
+3,2063,R1,gassupply1,2030,4.66260000000
+3,2064,R1,gassupply1,2030,4.66260000000
+3,2065,R1,gassupply1,2030,4.66260000000
+3,2066,R1,gassupply1,2030,4.66260000000
+4,2034,R1,gassupply1,2032,3.00000000000
+4,2035,R1,gassupply1,2032,3.00000000000
+4,2036,R1,gassupply1,2032,3.00000000000
+4,2040,R1,gassupply1,2032,3.00000000000
+4,2045,R1,gassupply1,2032,3.00000000000
+4,2050,R1,gassupply1,2032,3.00000000000
+4,2062,R1,gassupply1,2032,3.00000000000
+4,2063,R1,gassupply1,2032,3.00000000000
+4,2064,R1,gassupply1,2032,3.00000000000
+4,2065,R1,gassupply1,2032,3.00000000000
+4,2066,R1,gassupply1,2032,3.00000000000
+4,2067,R1,gassupply1,2032,3.00000000000
+4,2068,R1,gassupply1,2032,3.00000000000
+5,2036,R1,gassupply1,2034,1.50000000000
+5,2040,R1,gassupply1,2034,1.50000000000
+5,2045,R1,gassupply1,2034,1.50000000000
+5,2050,R1,gassupply1,2034,1.50000000000
+5,2062,R1,gassupply1,2034,1.50000000000
+5,2063,R1,gassupply1,2034,1.50000000000
+5,2064,R1,gassupply1,2034,1.50000000000
+5,2065,R1,gassupply1,2034,1.50000000000
+5,2066,R1,gassupply1,2034,1.50000000000
+5,2067,R1,gassupply1,2034,1.50000000000
+5,2068,R1,gassupply1,2034,1.50000000000
+5,2069,R1,gassupply1,2034,1.50000000000
+5,2070,R1,gassupply1,2034,1.50000000000
+6,2020,R2,gassupply1,2020,15.00000000000
+6,2025,R2,gassupply1,2020,15.00000000000
+6,2028,R2,gassupply1,2020,10.50000000000
+6,2030,R2,gassupply1,2020,7.50000000000
+6,2032,R2,gassupply1,2020,4.50000000000
+6,2034,R2,gassupply1,2020,1.50000000000
+7,2028,R2,gassupply1,2026,3.23460000000
+7,2030,R2,gassupply1,2026,3.23460000000
+7,2032,R2,gassupply1,2026,3.23460000000
+7,2034,R2,gassupply1,2026,3.23460000000
+7,2035,R2,gassupply1,2026,3.23460000000
+7,2036,R2,gassupply1,2026,3.23460000000
+7,2040,R2,gassupply1,2026,3.23460000000
+7,2045,R2,gassupply1,2026,3.23460000000
+7,2050,R2,gassupply1,2026,3.23460000000
+7,2062,R2,gassupply1,2026,3.23460000000
+8,2030,R2,gassupply1,2028,3.53600000000
+8,2032,R2,gassupply1,2028,3.53600000000
+8,2034,R2,gassupply1,2028,3.53600000000
+8,2035,R2,gassupply1,2028,3.53600000000
+8,2036,R2,gassupply1,2028,3.53600000000
+8,2040,R2,gassupply1,2028,3.53600000000
+8,2045,R2,gassupply1,2028,3.53600000000
+8,2050,R2,gassupply1,2028,3.53600000000
+8,2062,R2,gassupply1,2028,3.53600000000
+8,2063,R2,gassupply1,2028,3.53600000000
+8,2064,R2,gassupply1,2028,3.53600000000
+9,2032,R2,gassupply1,2030,4.66260000000
+9,2034,R2,gassupply1,2030,4.66260000000
+9,2035,R2,gassupply1,2030,4.66260000000
+9,2036,R2,gassupply1,2030,4.66260000000
+9,2040,R2,gassupply1,2030,4.66260000000
+9,2045,R2,gassupply1,2030,4.66260000000
+9,2050,R2,gassupply1,2030,4.66260000000
+9,2062,R2,gassupply1,2030,4.66260000000
+9,2063,R2,gassupply1,2030,4.66260000000
+9,2064,R2,gassupply1,2030,4.66260000000
+9,2065,R2,gassupply1,2030,4.66260000000
+9,2066,R2,gassupply1,2030,4.66260000000
+10,2034,R2,gassupply1,2032,3.00000000000
+10,2035,R2,gassupply1,2032,3.00000000000
+10,2036,R2,gassupply1,2032,3.00000000000
+10,2040,R2,gassupply1,2032,3.00000000000
+10,2045,R2,gassupply1,2032,3.00000000000
+10,2050,R2,gassupply1,2032,3.00000000000
+10,2062,R2,gassupply1,2032,3.00000000000
+10,2063,R2,gassupply1,2032,3.00000000000
+10,2064,R2,gassupply1,2032,3.00000000000
+10,2065,R2,gassupply1,2032,3.00000000000
+10,2066,R2,gassupply1,2032,3.00000000000
+10,2067,R2,gassupply1,2032,3.00000000000
+10,2068,R2,gassupply1,2032,3.00000000000
+11,2036,R2,gassupply1,2034,1.50000000000
+11,2040,R2,gassupply1,2034,1.50000000000
+11,2045,R2,gassupply1,2034,1.50000000000
+11,2050,R2,gassupply1,2034,1.50000000000
+11,2062,R2,gassupply1,2034,1.50000000000
+11,2063,R2,gassupply1,2034,1.50000000000
+11,2064,R2,gassupply1,2034,1.50000000000
+11,2065,R2,gassupply1,2034,1.50000000000
+11,2066,R2,gassupply1,2034,1.50000000000
+11,2067,R2,gassupply1,2034,1.50000000000
+11,2068,R2,gassupply1,2034,1.50000000000
+11,2069,R2,gassupply1,2034,1.50000000000
+11,2070,R2,gassupply1,2034,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index b53c61be..34b40e3e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -20,11 +20,11 @@ gasboiler,R2,R2,A1,residential,newcapa,2024,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2024,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2024,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2024,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2024,1.85640000000
 windturbine,R1,R1,A1,power,newcapa,2024,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2024,4.17680000000
 gasCCGT,R2,R2,A1,power,newcapa,2024,1.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2024,1.85640000000
 windturbine,R2,R2,A1,power,newcapa,2024,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2024,4.17680000000
 gasboiler,R1,R1,A1,residential,newcapa,2026,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2026,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
@@ -34,13 +34,13 @@ heatpump,R2,R2,A1,residential,newcapa,2026,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2026,0.80000000000
+gasCCGT,R1,R1,A1,power,newcapa,2026,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2026,2.07980000000
 windturbine,R1,R1,A1,power,newcapa,2026,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2026,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2026,4.67960000000
 gasCCGT,R2,R2,A1,power,newcapa,2026,0.80000000000
+gasCCGT,R2,R2,A1,power,newcapa,2026,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2026,2.07980000000
 windturbine,R2,R2,A1,power,newcapa,2026,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2026,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2026,4.67960000000
 gasboiler,R1,R1,A1,residential,newcapa,2028,2.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2028,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
@@ -52,15 +52,19 @@ heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,0.40000000000
-solarPV,R1,R1,A1,power,newcapa,2028,5.16960000000
+gasCCGT,R1,R1,A1,power,newcapa,2028,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2028,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2028,2.29760000000
 windturbine,R1,R1,A1,power,newcapa,2028,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2028,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2028,4.67960000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,0.40000000000
-solarPV,R2,R2,A1,power,newcapa,2028,5.16960000000
+gasCCGT,R2,R2,A1,power,newcapa,2028,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2028,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2028,2.29760000000
 windturbine,R2,R2,A1,power,newcapa,2028,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2028,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2028,4.67960000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,10.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,10.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,3.23460000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
@@ -71,18 +75,22 @@ heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,5.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,5.16960000000
-solarPV,R1,R1,A1,power,newcapa,2030,5.20080000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,2.29760000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,2.31150000000
 windturbine,R1,R1,A1,power,newcapa,2030,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.67960000000
-solarPV,R2,R2,A1,power,newcapa,2030,5.16960000000
-solarPV,R2,R2,A1,power,newcapa,2030,5.20080000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,2.29760000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,2.31150000000
 windturbine,R2,R2,A1,power,newcapa,2030,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2030,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2030,4.67960000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,3.53600000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
@@ -93,18 +101,26 @@ heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,13.00000000000
-solarPV,R1,R1,A1,power,newcapa,2032,5.16960000000
-solarPV,R1,R1,A1,power,newcapa,2032,5.20080000000
-solarPV,R1,R1,A1,power,newcapa,2032,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,2.29760000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,2.31150000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,0.99560000000
 windturbine,R1,R1,A1,power,newcapa,2032,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2032,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2032,4.67960000000
-solarPV,R2,R2,A1,power,newcapa,2032,5.16960000000
-solarPV,R2,R2,A1,power,newcapa,2032,5.20080000000
-solarPV,R2,R2,A1,power,newcapa,2032,2.24000000000
+gasCCGT,R2,R2,A1,power,newcapa,2032,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2032,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2032,2.29760000000
+gasCCGT,R2,R2,A1,power,newcapa,2032,2.31150000000
+gasCCGT,R2,R2,A1,power,newcapa,2032,0.99560000000
 windturbine,R2,R2,A1,power,newcapa,2032,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2032,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2032,4.67960000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,4.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,3.53600000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,4.66260000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,4.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,3.53600000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,4.66260000000
 heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2034,5.00000000000
@@ -115,20 +131,30 @@ heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2034,5.16960000000
-solarPV,R1,R1,A1,power,newcapa,2034,5.20080000000
-solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,2.29760000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,2.31150000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,0.99560000000
 solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
 windturbine,R1,R1,A1,power,newcapa,2034,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2034,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2034,4.67960000000
-solarPV,R2,R2,A1,power,newcapa,2034,5.16960000000
-solarPV,R2,R2,A1,power,newcapa,2034,5.20080000000
-solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
+gasCCGT,R2,R2,A1,power,newcapa,2034,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2034,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2034,2.29760000000
+gasCCGT,R2,R2,A1,power,newcapa,2034,2.31150000000
+gasCCGT,R2,R2,A1,power,newcapa,2034,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2034,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2034,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2034,4.67960000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,1.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,3.53600000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,4.66260000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,3.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,1.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,3.53600000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,4.66260000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,3.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2036,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2036,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2036,13.00000000000
@@ -139,22 +165,32 @@ heatpump,R2,R2,A1,residential,newcapa,2036,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2036,5.16960000000
-solarPV,R1,R1,A1,power,newcapa,2036,5.20080000000
-solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,2.29760000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,2.31150000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,0.99560000000
 solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
 windturbine,R1,R1,A1,power,newcapa,2036,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2036,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2036,4.67960000000
-solarPV,R2,R2,A1,power,newcapa,2036,5.16960000000
-solarPV,R2,R2,A1,power,newcapa,2036,5.20080000000
-solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
+gasCCGT,R2,R2,A1,power,newcapa,2036,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2036,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2036,2.29760000000
+gasCCGT,R2,R2,A1,power,newcapa,2036,2.31150000000
+gasCCGT,R2,R2,A1,power,newcapa,2036,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2036,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2036,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2036,4.67960000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,3.53600000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,4.66260000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,1.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,3.53600000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,4.66260000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,3.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,1.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2038,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2038,13.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
@@ -165,24 +201,24 @@ heatpump,R2,R2,A1,residential,newcapa,2038,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2038,5.16960000000
-solarPV,R1,R1,A1,power,newcapa,2038,5.20080000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,2.29760000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,2.31150000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,0.99560000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
 windturbine,R1,R1,A1,power,newcapa,2038,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2038,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2038,4.67960000000
-solarPV,R2,R2,A1,power,newcapa,2038,5.16960000000
-solarPV,R2,R2,A1,power,newcapa,2038,5.20080000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
+gasCCGT,R2,R2,A1,power,newcapa,2038,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2038,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2038,2.29760000000
+gasCCGT,R2,R2,A1,power,newcapa,2038,2.31150000000
+gasCCGT,R2,R2,A1,power,newcapa,2038,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2038,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2038,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2038,4.67960000000
 heatpump,R1,R1,A1,residential,newcapa,2040,13.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
@@ -193,23 +229,33 @@ heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,8.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.16960000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.20080000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,1.85640000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,2.07980000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,2.29760000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,2.31150000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,0.99560000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 windturbine,R1,R1,A1,power,newcapa,2040,8.77320000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.17680000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.67960000000
-solarPV,R2,R2,A1,power,newcapa,2040,5.16960000000
-solarPV,R2,R2,A1,power,newcapa,2040,5.20080000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,1.85640000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,2.07980000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,2.29760000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,2.31150000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2040,8.77320000000
-windturbine,R2,R2,A1,power,newcapa,2040,4.17680000000
-windturbine,R2,R2,A1,power,newcapa,2040,4.67960000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,3.53600000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,4.66260000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,3.53600000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,4.66260000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,3.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 2d31bfb4..93d4bc92 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,16.45810000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,16.45810000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,6.03250000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,6.03250000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,80.16200000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,80.16200000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,0.39440000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,0.39440000000,2022
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2022
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,0.81010000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,0.81010000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,16.49190000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,16.49190000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,6.03470000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,6.03470000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,80.23150000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,80.23150000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,0.56340000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,0.56340000000,2022
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2022
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,1.15730000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,1.15730000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.45810000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.45810000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.03250000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.03250000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.16200000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.16200000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.39440000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.39440000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.81010000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.81010000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.49190000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,16.49190000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.03470000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.03470000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.23150000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.23150000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56340000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56340000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.15730000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.15730000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.61590000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,16.61590000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.04270000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.04270000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.48610000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.48610000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18320000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.18320000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.43040000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.43040000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,16.53700000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,16.53700000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,6.03760000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,6.03760000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,80.32400000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,80.32400000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,0.78880000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,0.78880000000,2022
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2022
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,1.62020000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,1.62020000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,16.53700000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,16.53700000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.03760000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.03760000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.32400000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.32400000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.78880000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.78880000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.62020000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.62020000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.53700000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.53700000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.03760000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.03760000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.32400000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.32400000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.78880000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.78880000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.62020000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.62020000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,13.22620000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,13.22620000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,4.83110000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,4.83110000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,64.25860000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,64.25860000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,0.37900000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,0.37900000000,2024
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2024
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,0.17000000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,0.17000000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,13.27880000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,13.27880000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,4.83510000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,4.83510000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,64.36960000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,64.36960000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,0.54220000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,0.54220000000,2024
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2024
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,0.24820000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,0.24820000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.22620000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.22620000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,4.83110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,4.83110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,64.25860000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,64.25860000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37900000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37900000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17000000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17000000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.27880000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.27880000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.83510000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,4.83510000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.36960000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,64.36960000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.54220000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.54220000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.24820000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.24820000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.47190000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.47190000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.84950000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,4.84950000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.77790000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,64.77790000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.14480000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.14480000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.56240000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.56240000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,13.34900000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,13.34900000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,4.84030000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,64.51790000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,64.51790000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,0.76060000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,0.76060000000,2024
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2024
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,0.35740000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,0.35740000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,13.34900000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,13.34900000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,4.84030000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,64.51790000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,64.51790000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.76060000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.76060000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.35740000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.35740000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.34900000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.34900000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,4.84030000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,4.84030000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,64.51790000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,64.51790000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.76060000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.76060000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.35740000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.35740000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,10.62420000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,10.62420000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,3.87000000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,3.87000000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,51.50710000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,51.50710000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,0.51840000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,0.51840000000,2026
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2026
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,0.12460000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,0.12460000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,10.68490000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,10.68490000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,3.87530000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,3.87530000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,51.63920000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,51.63920000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,0.74160000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,0.74160000000,2026
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2026
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,0.18390000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,0.18390000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.62420000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.62420000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.87000000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.87000000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,51.50710000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,51.50710000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.51840000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.51840000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.12460000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.12460000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.68490000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,10.68490000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.87530000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.87530000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.63920000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,51.63920000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74160000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.74160000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.18390000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.18390000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.90740000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,10.90740000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.89490000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.89490000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.12660000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,52.12660000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56540000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.56540000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43100000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43100000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,10.76570000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,10.76570000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,3.88250000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,51.81590000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,51.81590000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,1.04020000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,1.04020000000,2026
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2026
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,0.26820000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,0.26820000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,10.76570000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,10.76570000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.88250000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,51.81590000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,51.81590000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.04020000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.04020000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.26820000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.26820000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.76570000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.76570000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.88250000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.88250000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,51.81590000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,51.81590000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.04020000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.04020000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.26820000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.26820000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,8.52770000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,8.52770000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,41.28040000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,41.28040000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,0.64350000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,0.64350000000,2028
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2028
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,0.07950000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,0.07950000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,8.58830000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,8.58830000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,41.41860000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,41.41860000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,0.92040000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,0.92040000000,2028
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2028
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,0.12210000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,0.12210000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.52770000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.52770000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,41.28040000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,41.28040000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.64350000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.64350000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07950000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07950000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.58830000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,8.58830000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.41860000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,41.41860000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.92040000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.92040000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12210000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.12210000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.81090000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,8.81090000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,41.93000000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,41.93000000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.94210000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.94210000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.32290000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.32290000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,8.66920000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,8.66920000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,41.60370000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,41.60370000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,1.29080000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,1.29080000000,2028
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2028
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,0.18700000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,0.18700000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,8.66920000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,8.66920000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,41.60370000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,41.60370000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.29080000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.29080000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18700000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18700000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.66920000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.66920000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,41.60370000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,41.60370000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.29080000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.29080000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18700000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18700000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.09040000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.09040000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.25920000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.25920000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.76050000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.76050000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.03160000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.03160000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12910000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12910000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.37280000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.37280000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.08780000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.08780000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.05660000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.05660000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09040000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09040000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.25920000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.25920000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.76050000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.76050000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03160000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03160000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12910000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12910000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.37280000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.37280000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.08780000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.08780000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05660000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05660000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27110000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.80210000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.80210000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.29430000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.29430000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.20720000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.20720000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.18080000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18080000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.52650000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.52650000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.52530000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.52530000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.10060000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.10060000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18080000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18080000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.52650000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.52650000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.52530000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.52530000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.10060000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.10060000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18080000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18080000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.52650000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.52650000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.52530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.52530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10060000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.09010000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.09010000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,0.89190000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,0.89190000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,0.03500000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,0.03500000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12880000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12880000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,1.27550000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,1.27550000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,0.06350000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,0.06350000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09010000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09010000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.89190000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.89190000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03500000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03500000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12880000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12880000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27550000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27550000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06350000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06350000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27040000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27040000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06250000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06250000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.68880000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.68880000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.23770000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.23770000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,0.18030000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18030000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.03650000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.03650000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,1.78820000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,1.78820000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,0.11410000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,0.11410000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18030000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18030000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03650000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03650000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.78820000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.78820000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11410000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11410000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18030000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18030000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03650000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03650000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.78820000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.78820000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11410000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11410000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.08970000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.08970000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,0.93740000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,0.93740000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,0.03880000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,0.03880000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12820000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12820000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,1.34050000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,1.34050000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,0.07120000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,0.07120000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08970000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08970000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.93740000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.93740000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03880000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03880000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12820000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12820000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.34050000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.34050000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07120000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07120000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26920000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26920000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06250000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06250000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.82460000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.82460000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27190000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27190000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17950000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17950000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,1.87900000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,1.87900000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,0.12930000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,0.12930000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17950000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17950000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.87900000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.87900000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.12930000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.12930000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17950000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17950000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.87900000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.87900000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.12930000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.12930000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.08920000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.08920000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.97700000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.97700000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.04010000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.04010000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12750000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12750000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,1.39680000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,1.39680000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.07390000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.07390000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08920000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08920000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.97700000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.97700000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04010000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04010000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12750000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12750000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39680000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.39680000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07390000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07390000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26770000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26770000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06240000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06240000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.94230000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.94230000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28370000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.28370000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17850000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17850000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,1.95770000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,1.95770000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.13450000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.13450000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17850000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17850000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.95770000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.95770000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.13450000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.13450000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17850000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17850000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.95770000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.95770000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13450000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13450000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,0.08860000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,0.08860000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,1.01150000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,1.01150000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.04120000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.04120000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12660000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12660000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,1.44610000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,1.44610000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.07620000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.07620000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08860000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08860000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.01150000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.01150000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04120000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04120000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12660000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12660000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.44610000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.44610000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07620000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07620000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26590000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26590000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06220000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06220000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.04530000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.04530000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.29380000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.29380000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17730000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17730000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,2.02660000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,2.02660000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.13910000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.13910000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17730000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17730000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.02660000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.02660000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.13910000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.13910000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17730000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17730000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.02660000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.02660000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13910000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13910000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,0.08800000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08800000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.10110000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,3.10110000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.04200000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,1.04200000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.04220000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.04220000000,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.12570000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12570000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.10760000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,3.10760000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.02380000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.02380000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.48960000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.48960000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.07820000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.07820000000,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', 'mid-afternoon')",electricity,R1,0.08800000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08800000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,3.10110000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,3.10110000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.04200000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.04200000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04220000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04220000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12570000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12570000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.10760000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,3.10760000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02380000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02380000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.48960000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.48960000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07820000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07820000000,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,0.26390000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26390000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.13130000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,3.13130000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06210000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06210000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.13610000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.13610000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30280000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.30280000000,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,0.17600000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17600000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.11620000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,3.11620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.03630000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.03630000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.08740000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,2.08740000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.14300000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.14300000000,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', 'early-morning')",electricity,R1,0.17600000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17600000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,3.11620000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,3.11620000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03630000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03630000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.08740000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.08740000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.14300000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.14300000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17600000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17600000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,3.11620000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,3.11620000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03630000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03630000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.08740000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.08740000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14300000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14300000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 bcffc0cb..f6415404 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
@@ -3,41 +3,43 @@ 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,2022,R1,windturbine,2020,8.77320000000
-1,2024,R1,windturbine,2020,8.77320000000
-1,2025,R1,windturbine,2020,8.77320000000
-1,2030,R1,windturbine,2020,8.77320000000
-1,2035,R1,windturbine,2020,8.77320000000
-1,2040,R1,windturbine,2020,8.77320000000
-1,2045,R1,windturbine,2020,8.77320000000
-1,2046,R1,windturbine,2020,8.77320000000
-2,2024,R1,windturbine,2022,4.17680000000
-2,2025,R1,windturbine,2022,4.17680000000
-2,2030,R1,windturbine,2022,4.17680000000
-2,2035,R1,windturbine,2022,4.17680000000
-2,2040,R1,windturbine,2022,4.17680000000
-2,2045,R1,windturbine,2022,4.17680000000
-2,2046,R1,windturbine,2022,4.17680000000
-2,2047,R1,windturbine,2022,4.17680000000
-2,2048,R1,windturbine,2022,4.17680000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2022,R1,windturbine,2020,8.77320000000
+2,2024,R1,windturbine,2020,8.77320000000
+2,2025,R1,windturbine,2020,8.77320000000
+2,2030,R1,windturbine,2020,8.77320000000
+2,2035,R1,windturbine,2020,8.77320000000
+2,2040,R1,windturbine,2020,8.77320000000
+2,2045,R1,windturbine,2020,8.77320000000
+2,2046,R1,windturbine,2020,8.77320000000
 3,2020,R2,gasCCGT,2020,1.00000000000
 3,2022,R2,gasCCGT,2020,1.00000000000
 3,2024,R2,gasCCGT,2020,1.00000000000
 3,2025,R2,gasCCGT,2020,1.00000000000
-4,2022,R2,windturbine,2020,8.77320000000
-4,2024,R2,windturbine,2020,8.77320000000
-4,2025,R2,windturbine,2020,8.77320000000
-4,2030,R2,windturbine,2020,8.77320000000
-4,2035,R2,windturbine,2020,8.77320000000
-4,2040,R2,windturbine,2020,8.77320000000
-4,2045,R2,windturbine,2020,8.77320000000
-4,2046,R2,windturbine,2020,8.77320000000
-5,2024,R2,windturbine,2022,4.17680000000
-5,2025,R2,windturbine,2022,4.17680000000
-5,2030,R2,windturbine,2022,4.17680000000
-5,2035,R2,windturbine,2022,4.17680000000
-5,2040,R2,windturbine,2022,4.17680000000
-5,2045,R2,windturbine,2022,4.17680000000
-5,2046,R2,windturbine,2022,4.17680000000
-5,2047,R2,windturbine,2022,4.17680000000
-5,2048,R2,windturbine,2022,4.17680000000
+4,2024,R2,gasCCGT,2022,1.85640000000
+4,2025,R2,gasCCGT,2022,1.85640000000
+4,2030,R2,gasCCGT,2022,1.85640000000
+4,2035,R2,gasCCGT,2022,1.85640000000
+4,2040,R2,gasCCGT,2022,1.85640000000
+4,2045,R2,gasCCGT,2022,1.85640000000
+4,2046,R2,gasCCGT,2022,1.85640000000
+4,2047,R2,gasCCGT,2022,1.85640000000
+4,2050,R2,gasCCGT,2022,1.85640000000
+4,2058,R2,gasCCGT,2022,1.85640000000
+5,2022,R2,windturbine,2020,8.77320000000
+5,2024,R2,windturbine,2020,8.77320000000
+5,2025,R2,windturbine,2020,8.77320000000
+5,2030,R2,windturbine,2020,8.77320000000
+5,2035,R2,windturbine,2020,8.77320000000
+5,2040,R2,windturbine,2020,8.77320000000
+5,2045,R2,windturbine,2020,8.77320000000
+5,2046,R2,windturbine,2020,8.77320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index 76d90fa8..10657260 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -4,66 +4,70 @@ asset,year,region,technology,installed,capacity
 0,2024,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
-1,2022,R1,windturbine,2020,8.77320000000
-1,2024,R1,windturbine,2020,8.77320000000
-1,2025,R1,windturbine,2020,8.77320000000
-1,2026,R1,windturbine,2020,8.77320000000
-1,2030,R1,windturbine,2020,8.77320000000
-1,2035,R1,windturbine,2020,8.77320000000
-1,2040,R1,windturbine,2020,8.77320000000
-1,2045,R1,windturbine,2020,8.77320000000
-1,2046,R1,windturbine,2020,8.77320000000
-2,2024,R1,windturbine,2022,4.17680000000
-2,2025,R1,windturbine,2022,4.17680000000
-2,2026,R1,windturbine,2022,4.17680000000
-2,2030,R1,windturbine,2022,4.17680000000
-2,2035,R1,windturbine,2022,4.17680000000
-2,2040,R1,windturbine,2022,4.17680000000
-2,2045,R1,windturbine,2022,4.17680000000
-2,2046,R1,windturbine,2022,4.17680000000
-2,2047,R1,windturbine,2022,4.17680000000
-2,2048,R1,windturbine,2022,4.17680000000
-3,2026,R1,windturbine,2024,4.67960000000
-3,2030,R1,windturbine,2024,4.67960000000
-3,2035,R1,windturbine,2024,4.67960000000
-3,2040,R1,windturbine,2024,4.67960000000
-3,2045,R1,windturbine,2024,4.67960000000
-3,2046,R1,windturbine,2024,4.67960000000
-3,2047,R1,windturbine,2024,4.67960000000
-3,2048,R1,windturbine,2024,4.67960000000
-3,2049,R1,windturbine,2024,4.67960000000
-3,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2022,R1,windturbine,2020,8.77320000000
+3,2024,R1,windturbine,2020,8.77320000000
+3,2025,R1,windturbine,2020,8.77320000000
+3,2026,R1,windturbine,2020,8.77320000000
+3,2030,R1,windturbine,2020,8.77320000000
+3,2035,R1,windturbine,2020,8.77320000000
+3,2040,R1,windturbine,2020,8.77320000000
+3,2045,R1,windturbine,2020,8.77320000000
+3,2046,R1,windturbine,2020,8.77320000000
 4,2020,R2,gasCCGT,2020,1.00000000000
 4,2022,R2,gasCCGT,2020,1.00000000000
 4,2024,R2,gasCCGT,2020,1.00000000000
 4,2025,R2,gasCCGT,2020,1.00000000000
 4,2026,R2,gasCCGT,2020,0.80000000000
-5,2022,R2,windturbine,2020,8.77320000000
-5,2024,R2,windturbine,2020,8.77320000000
-5,2025,R2,windturbine,2020,8.77320000000
-5,2026,R2,windturbine,2020,8.77320000000
-5,2030,R2,windturbine,2020,8.77320000000
-5,2035,R2,windturbine,2020,8.77320000000
-5,2040,R2,windturbine,2020,8.77320000000
-5,2045,R2,windturbine,2020,8.77320000000
-5,2046,R2,windturbine,2020,8.77320000000
-6,2024,R2,windturbine,2022,4.17680000000
-6,2025,R2,windturbine,2022,4.17680000000
-6,2026,R2,windturbine,2022,4.17680000000
-6,2030,R2,windturbine,2022,4.17680000000
-6,2035,R2,windturbine,2022,4.17680000000
-6,2040,R2,windturbine,2022,4.17680000000
-6,2045,R2,windturbine,2022,4.17680000000
-6,2046,R2,windturbine,2022,4.17680000000
-6,2047,R2,windturbine,2022,4.17680000000
-6,2048,R2,windturbine,2022,4.17680000000
-7,2026,R2,windturbine,2024,4.67960000000
-7,2030,R2,windturbine,2024,4.67960000000
-7,2035,R2,windturbine,2024,4.67960000000
-7,2040,R2,windturbine,2024,4.67960000000
-7,2045,R2,windturbine,2024,4.67960000000
-7,2046,R2,windturbine,2024,4.67960000000
-7,2047,R2,windturbine,2024,4.67960000000
-7,2048,R2,windturbine,2024,4.67960000000
-7,2049,R2,windturbine,2024,4.67960000000
-7,2050,R2,windturbine,2024,4.67960000000
+5,2024,R2,gasCCGT,2022,1.85640000000
+5,2025,R2,gasCCGT,2022,1.85640000000
+5,2026,R2,gasCCGT,2022,1.85640000000
+5,2030,R2,gasCCGT,2022,1.85640000000
+5,2035,R2,gasCCGT,2022,1.85640000000
+5,2040,R2,gasCCGT,2022,1.85640000000
+5,2045,R2,gasCCGT,2022,1.85640000000
+5,2046,R2,gasCCGT,2022,1.85640000000
+5,2047,R2,gasCCGT,2022,1.85640000000
+5,2050,R2,gasCCGT,2022,1.85640000000
+5,2058,R2,gasCCGT,2022,1.85640000000
+6,2026,R2,gasCCGT,2024,2.07980000000
+6,2030,R2,gasCCGT,2024,2.07980000000
+6,2035,R2,gasCCGT,2024,2.07980000000
+6,2040,R2,gasCCGT,2024,2.07980000000
+6,2045,R2,gasCCGT,2024,2.07980000000
+6,2046,R2,gasCCGT,2024,2.07980000000
+6,2047,R2,gasCCGT,2024,2.07980000000
+6,2050,R2,gasCCGT,2024,2.07980000000
+6,2058,R2,gasCCGT,2024,2.07980000000
+6,2059,R2,gasCCGT,2024,2.07980000000
+6,2060,R2,gasCCGT,2024,2.07980000000
+7,2022,R2,windturbine,2020,8.77320000000
+7,2024,R2,windturbine,2020,8.77320000000
+7,2025,R2,windturbine,2020,8.77320000000
+7,2026,R2,windturbine,2020,8.77320000000
+7,2030,R2,windturbine,2020,8.77320000000
+7,2035,R2,windturbine,2020,8.77320000000
+7,2040,R2,windturbine,2020,8.77320000000
+7,2045,R2,windturbine,2020,8.77320000000
+7,2046,R2,windturbine,2020,8.77320000000
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 5b3b3357..36839f24 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
@@ -5,97 +5,103 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2022,R1,windturbine,2020,8.77320000000
-2,2024,R1,windturbine,2020,8.77320000000
-2,2025,R1,windturbine,2020,8.77320000000
-2,2026,R1,windturbine,2020,8.77320000000
-2,2028,R1,windturbine,2020,8.77320000000
-2,2030,R1,windturbine,2020,8.77320000000
-2,2035,R1,windturbine,2020,8.77320000000
-2,2040,R1,windturbine,2020,8.77320000000
-2,2045,R1,windturbine,2020,8.77320000000
-2,2046,R1,windturbine,2020,8.77320000000
-3,2024,R1,windturbine,2022,4.17680000000
-3,2025,R1,windturbine,2022,4.17680000000
-3,2026,R1,windturbine,2022,4.17680000000
-3,2028,R1,windturbine,2022,4.17680000000
-3,2030,R1,windturbine,2022,4.17680000000
-3,2035,R1,windturbine,2022,4.17680000000
-3,2040,R1,windturbine,2022,4.17680000000
-3,2045,R1,windturbine,2022,4.17680000000
-3,2046,R1,windturbine,2022,4.17680000000
-3,2047,R1,windturbine,2022,4.17680000000
-3,2048,R1,windturbine,2022,4.17680000000
-4,2026,R1,windturbine,2024,4.67960000000
-4,2028,R1,windturbine,2024,4.67960000000
-4,2030,R1,windturbine,2024,4.67960000000
-4,2035,R1,windturbine,2024,4.67960000000
-4,2040,R1,windturbine,2024,4.67960000000
-4,2045,R1,windturbine,2024,4.67960000000
-4,2046,R1,windturbine,2024,4.67960000000
-4,2047,R1,windturbine,2024,4.67960000000
-4,2048,R1,windturbine,2024,4.67960000000
-4,2049,R1,windturbine,2024,4.67960000000
-4,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2022,R1,windturbine,2020,8.77320000000
+4,2024,R1,windturbine,2020,8.77320000000
+4,2025,R1,windturbine,2020,8.77320000000
+4,2026,R1,windturbine,2020,8.77320000000
+4,2028,R1,windturbine,2020,8.77320000000
+4,2030,R1,windturbine,2020,8.77320000000
+4,2035,R1,windturbine,2020,8.77320000000
+4,2040,R1,windturbine,2020,8.77320000000
+4,2045,R1,windturbine,2020,8.77320000000
+4,2046,R1,windturbine,2020,8.77320000000
 5,2020,R2,gasCCGT,2020,1.00000000000
 5,2022,R2,gasCCGT,2020,1.00000000000
 5,2024,R2,gasCCGT,2020,1.00000000000
 5,2025,R2,gasCCGT,2020,1.00000000000
 5,2026,R2,gasCCGT,2020,0.80000000000
 5,2028,R2,gasCCGT,2020,0.40000000000
-6,2028,R2,solarPV,2026,5.16960000000
-6,2030,R2,solarPV,2026,5.16960000000
-6,2035,R2,solarPV,2026,5.16960000000
-6,2040,R2,solarPV,2026,5.16960000000
-6,2045,R2,solarPV,2026,5.16960000000
-6,2046,R2,solarPV,2026,5.16960000000
-6,2047,R2,solarPV,2026,5.16960000000
-6,2048,R2,solarPV,2026,5.16960000000
-6,2049,R2,solarPV,2026,5.16960000000
-6,2050,R2,solarPV,2026,5.16960000000
-6,2051,R2,solarPV,2026,5.16960000000
-6,2052,R2,solarPV,2026,5.16960000000
-7,2022,R2,windturbine,2020,8.77320000000
-7,2024,R2,windturbine,2020,8.77320000000
-7,2025,R2,windturbine,2020,8.77320000000
-7,2026,R2,windturbine,2020,8.77320000000
-7,2028,R2,windturbine,2020,8.77320000000
-7,2030,R2,windturbine,2020,8.77320000000
-7,2035,R2,windturbine,2020,8.77320000000
-7,2040,R2,windturbine,2020,8.77320000000
-7,2045,R2,windturbine,2020,8.77320000000
-7,2046,R2,windturbine,2020,8.77320000000
-8,2024,R2,windturbine,2022,4.17680000000
-8,2025,R2,windturbine,2022,4.17680000000
-8,2026,R2,windturbine,2022,4.17680000000
-8,2028,R2,windturbine,2022,4.17680000000
-8,2030,R2,windturbine,2022,4.17680000000
-8,2035,R2,windturbine,2022,4.17680000000
-8,2040,R2,windturbine,2022,4.17680000000
-8,2045,R2,windturbine,2022,4.17680000000
-8,2046,R2,windturbine,2022,4.17680000000
-8,2047,R2,windturbine,2022,4.17680000000
-8,2048,R2,windturbine,2022,4.17680000000
-9,2026,R2,windturbine,2024,4.67960000000
-9,2028,R2,windturbine,2024,4.67960000000
-9,2030,R2,windturbine,2024,4.67960000000
-9,2035,R2,windturbine,2024,4.67960000000
-9,2040,R2,windturbine,2024,4.67960000000
-9,2045,R2,windturbine,2024,4.67960000000
-9,2046,R2,windturbine,2024,4.67960000000
-9,2047,R2,windturbine,2024,4.67960000000
-9,2048,R2,windturbine,2024,4.67960000000
-9,2049,R2,windturbine,2024,4.67960000000
-9,2050,R2,windturbine,2024,4.67960000000
+6,2024,R2,gasCCGT,2022,1.85640000000
+6,2025,R2,gasCCGT,2022,1.85640000000
+6,2026,R2,gasCCGT,2022,1.85640000000
+6,2028,R2,gasCCGT,2022,1.85640000000
+6,2030,R2,gasCCGT,2022,1.85640000000
+6,2035,R2,gasCCGT,2022,1.85640000000
+6,2040,R2,gasCCGT,2022,1.85640000000
+6,2045,R2,gasCCGT,2022,1.85640000000
+6,2046,R2,gasCCGT,2022,1.85640000000
+6,2047,R2,gasCCGT,2022,1.85640000000
+6,2050,R2,gasCCGT,2022,1.85640000000
+6,2058,R2,gasCCGT,2022,1.85640000000
+7,2026,R2,gasCCGT,2024,2.07980000000
+7,2028,R2,gasCCGT,2024,2.07980000000
+7,2030,R2,gasCCGT,2024,2.07980000000
+7,2035,R2,gasCCGT,2024,2.07980000000
+7,2040,R2,gasCCGT,2024,2.07980000000
+7,2045,R2,gasCCGT,2024,2.07980000000
+7,2046,R2,gasCCGT,2024,2.07980000000
+7,2047,R2,gasCCGT,2024,2.07980000000
+7,2050,R2,gasCCGT,2024,2.07980000000
+7,2058,R2,gasCCGT,2024,2.07980000000
+7,2059,R2,gasCCGT,2024,2.07980000000
+7,2060,R2,gasCCGT,2024,2.07980000000
+8,2028,R2,gasCCGT,2026,2.29760000000
+8,2030,R2,gasCCGT,2026,2.29760000000
+8,2035,R2,gasCCGT,2026,2.29760000000
+8,2040,R2,gasCCGT,2026,2.29760000000
+8,2045,R2,gasCCGT,2026,2.29760000000
+8,2046,R2,gasCCGT,2026,2.29760000000
+8,2047,R2,gasCCGT,2026,2.29760000000
+8,2050,R2,gasCCGT,2026,2.29760000000
+8,2058,R2,gasCCGT,2026,2.29760000000
+8,2059,R2,gasCCGT,2026,2.29760000000
+8,2060,R2,gasCCGT,2026,2.29760000000
+8,2061,R2,gasCCGT,2026,2.29760000000
+8,2062,R2,gasCCGT,2026,2.29760000000
+9,2022,R2,windturbine,2020,8.77320000000
+9,2024,R2,windturbine,2020,8.77320000000
+9,2025,R2,windturbine,2020,8.77320000000
+9,2026,R2,windturbine,2020,8.77320000000
+9,2028,R2,windturbine,2020,8.77320000000
+9,2030,R2,windturbine,2020,8.77320000000
+9,2035,R2,windturbine,2020,8.77320000000
+9,2040,R2,windturbine,2020,8.77320000000
+9,2045,R2,windturbine,2020,8.77320000000
+9,2046,R2,windturbine,2020,8.77320000000
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 136a7e23..865b4c9e 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
@@ -5,123 +5,131 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2022,R1,windturbine,2020,8.77320000000
-3,2024,R1,windturbine,2020,8.77320000000
-3,2025,R1,windturbine,2020,8.77320000000
-3,2026,R1,windturbine,2020,8.77320000000
-3,2028,R1,windturbine,2020,8.77320000000
-3,2030,R1,windturbine,2020,8.77320000000
-3,2035,R1,windturbine,2020,8.77320000000
-3,2040,R1,windturbine,2020,8.77320000000
-3,2045,R1,windturbine,2020,8.77320000000
-3,2046,R1,windturbine,2020,8.77320000000
-4,2024,R1,windturbine,2022,4.17680000000
-4,2025,R1,windturbine,2022,4.17680000000
-4,2026,R1,windturbine,2022,4.17680000000
-4,2028,R1,windturbine,2022,4.17680000000
-4,2030,R1,windturbine,2022,4.17680000000
-4,2035,R1,windturbine,2022,4.17680000000
-4,2040,R1,windturbine,2022,4.17680000000
-4,2045,R1,windturbine,2022,4.17680000000
-4,2046,R1,windturbine,2022,4.17680000000
-4,2047,R1,windturbine,2022,4.17680000000
-4,2048,R1,windturbine,2022,4.17680000000
-5,2026,R1,windturbine,2024,4.67960000000
-5,2028,R1,windturbine,2024,4.67960000000
-5,2030,R1,windturbine,2024,4.67960000000
-5,2035,R1,windturbine,2024,4.67960000000
-5,2040,R1,windturbine,2024,4.67960000000
-5,2045,R1,windturbine,2024,4.67960000000
-5,2046,R1,windturbine,2024,4.67960000000
-5,2047,R1,windturbine,2024,4.67960000000
-5,2048,R1,windturbine,2024,4.67960000000
-5,2049,R1,windturbine,2024,4.67960000000
-5,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2022,R1,windturbine,2020,8.77320000000
+5,2024,R1,windturbine,2020,8.77320000000
+5,2025,R1,windturbine,2020,8.77320000000
+5,2026,R1,windturbine,2020,8.77320000000
+5,2028,R1,windturbine,2020,8.77320000000
+5,2030,R1,windturbine,2020,8.77320000000
+5,2035,R1,windturbine,2020,8.77320000000
+5,2040,R1,windturbine,2020,8.77320000000
+5,2045,R1,windturbine,2020,8.77320000000
+5,2046,R1,windturbine,2020,8.77320000000
 6,2020,R2,gasCCGT,2020,1.00000000000
 6,2022,R2,gasCCGT,2020,1.00000000000
 6,2024,R2,gasCCGT,2020,1.00000000000
 6,2025,R2,gasCCGT,2020,1.00000000000
 6,2026,R2,gasCCGT,2020,0.80000000000
 6,2028,R2,gasCCGT,2020,0.40000000000
-7,2028,R2,solarPV,2026,5.16960000000
-7,2030,R2,solarPV,2026,5.16960000000
-7,2035,R2,solarPV,2026,5.16960000000
-7,2040,R2,solarPV,2026,5.16960000000
-7,2045,R2,solarPV,2026,5.16960000000
-7,2046,R2,solarPV,2026,5.16960000000
-7,2047,R2,solarPV,2026,5.16960000000
-7,2048,R2,solarPV,2026,5.16960000000
-7,2049,R2,solarPV,2026,5.16960000000
-7,2050,R2,solarPV,2026,5.16960000000
-7,2051,R2,solarPV,2026,5.16960000000
-7,2052,R2,solarPV,2026,5.16960000000
-8,2030,R2,solarPV,2028,5.20080000000
-8,2035,R2,solarPV,2028,5.20080000000
-8,2040,R2,solarPV,2028,5.20080000000
-8,2045,R2,solarPV,2028,5.20080000000
-8,2046,R2,solarPV,2028,5.20080000000
-8,2047,R2,solarPV,2028,5.20080000000
-8,2048,R2,solarPV,2028,5.20080000000
-8,2049,R2,solarPV,2028,5.20080000000
-8,2050,R2,solarPV,2028,5.20080000000
-8,2051,R2,solarPV,2028,5.20080000000
-8,2052,R2,solarPV,2028,5.20080000000
-8,2053,R2,solarPV,2028,5.20080000000
-8,2054,R2,solarPV,2028,5.20080000000
-9,2022,R2,windturbine,2020,8.77320000000
-9,2024,R2,windturbine,2020,8.77320000000
-9,2025,R2,windturbine,2020,8.77320000000
-9,2026,R2,windturbine,2020,8.77320000000
-9,2028,R2,windturbine,2020,8.77320000000
-9,2030,R2,windturbine,2020,8.77320000000
-9,2035,R2,windturbine,2020,8.77320000000
-9,2040,R2,windturbine,2020,8.77320000000
-9,2045,R2,windturbine,2020,8.77320000000
-9,2046,R2,windturbine,2020,8.77320000000
-10,2024,R2,windturbine,2022,4.17680000000
-10,2025,R2,windturbine,2022,4.17680000000
-10,2026,R2,windturbine,2022,4.17680000000
-10,2028,R2,windturbine,2022,4.17680000000
-10,2030,R2,windturbine,2022,4.17680000000
-10,2035,R2,windturbine,2022,4.17680000000
-10,2040,R2,windturbine,2022,4.17680000000
-10,2045,R2,windturbine,2022,4.17680000000
-10,2046,R2,windturbine,2022,4.17680000000
-10,2047,R2,windturbine,2022,4.17680000000
-10,2048,R2,windturbine,2022,4.17680000000
-11,2026,R2,windturbine,2024,4.67960000000
-11,2028,R2,windturbine,2024,4.67960000000
-11,2030,R2,windturbine,2024,4.67960000000
-11,2035,R2,windturbine,2024,4.67960000000
-11,2040,R2,windturbine,2024,4.67960000000
-11,2045,R2,windturbine,2024,4.67960000000
-11,2046,R2,windturbine,2024,4.67960000000
-11,2047,R2,windturbine,2024,4.67960000000
-11,2048,R2,windturbine,2024,4.67960000000
-11,2049,R2,windturbine,2024,4.67960000000
-11,2050,R2,windturbine,2024,4.67960000000
+7,2024,R2,gasCCGT,2022,1.85640000000
+7,2025,R2,gasCCGT,2022,1.85640000000
+7,2026,R2,gasCCGT,2022,1.85640000000
+7,2028,R2,gasCCGT,2022,1.85640000000
+7,2030,R2,gasCCGT,2022,1.85640000000
+7,2035,R2,gasCCGT,2022,1.85640000000
+7,2040,R2,gasCCGT,2022,1.85640000000
+7,2045,R2,gasCCGT,2022,1.85640000000
+7,2046,R2,gasCCGT,2022,1.85640000000
+7,2047,R2,gasCCGT,2022,1.85640000000
+7,2050,R2,gasCCGT,2022,1.85640000000
+7,2058,R2,gasCCGT,2022,1.85640000000
+8,2026,R2,gasCCGT,2024,2.07980000000
+8,2028,R2,gasCCGT,2024,2.07980000000
+8,2030,R2,gasCCGT,2024,2.07980000000
+8,2035,R2,gasCCGT,2024,2.07980000000
+8,2040,R2,gasCCGT,2024,2.07980000000
+8,2045,R2,gasCCGT,2024,2.07980000000
+8,2046,R2,gasCCGT,2024,2.07980000000
+8,2047,R2,gasCCGT,2024,2.07980000000
+8,2050,R2,gasCCGT,2024,2.07980000000
+8,2058,R2,gasCCGT,2024,2.07980000000
+8,2059,R2,gasCCGT,2024,2.07980000000
+8,2060,R2,gasCCGT,2024,2.07980000000
+9,2028,R2,gasCCGT,2026,2.29760000000
+9,2030,R2,gasCCGT,2026,2.29760000000
+9,2035,R2,gasCCGT,2026,2.29760000000
+9,2040,R2,gasCCGT,2026,2.29760000000
+9,2045,R2,gasCCGT,2026,2.29760000000
+9,2046,R2,gasCCGT,2026,2.29760000000
+9,2047,R2,gasCCGT,2026,2.29760000000
+9,2050,R2,gasCCGT,2026,2.29760000000
+9,2058,R2,gasCCGT,2026,2.29760000000
+9,2059,R2,gasCCGT,2026,2.29760000000
+9,2060,R2,gasCCGT,2026,2.29760000000
+9,2061,R2,gasCCGT,2026,2.29760000000
+9,2062,R2,gasCCGT,2026,2.29760000000
+10,2030,R2,gasCCGT,2028,2.31150000000
+10,2035,R2,gasCCGT,2028,2.31150000000
+10,2040,R2,gasCCGT,2028,2.31150000000
+10,2045,R2,gasCCGT,2028,2.31150000000
+10,2046,R2,gasCCGT,2028,2.31150000000
+10,2047,R2,gasCCGT,2028,2.31150000000
+10,2050,R2,gasCCGT,2028,2.31150000000
+10,2058,R2,gasCCGT,2028,2.31150000000
+10,2059,R2,gasCCGT,2028,2.31150000000
+10,2060,R2,gasCCGT,2028,2.31150000000
+10,2061,R2,gasCCGT,2028,2.31150000000
+10,2062,R2,gasCCGT,2028,2.31150000000
+10,2063,R2,gasCCGT,2028,2.31150000000
+10,2064,R2,gasCCGT,2028,2.31150000000
+11,2022,R2,windturbine,2020,8.77320000000
+11,2024,R2,windturbine,2020,8.77320000000
+11,2025,R2,windturbine,2020,8.77320000000
+11,2026,R2,windturbine,2020,8.77320000000
+11,2028,R2,windturbine,2020,8.77320000000
+11,2030,R2,windturbine,2020,8.77320000000
+11,2035,R2,windturbine,2020,8.77320000000
+11,2040,R2,windturbine,2020,8.77320000000
+11,2045,R2,windturbine,2020,8.77320000000
+11,2046,R2,windturbine,2020,8.77320000000
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 50b2b0c1..0c3b7d2f 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
@@ -5,163 +5,173 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2032,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2032,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2032,R1,solarPV,2030,2.24000000000
-3,2035,R1,solarPV,2030,2.24000000000
-3,2040,R1,solarPV,2030,2.24000000000
-3,2045,R1,solarPV,2030,2.24000000000
-3,2046,R1,solarPV,2030,2.24000000000
-3,2047,R1,solarPV,2030,2.24000000000
-3,2048,R1,solarPV,2030,2.24000000000
-3,2049,R1,solarPV,2030,2.24000000000
-3,2050,R1,solarPV,2030,2.24000000000
-3,2051,R1,solarPV,2030,2.24000000000
-3,2052,R1,solarPV,2030,2.24000000000
-3,2053,R1,solarPV,2030,2.24000000000
-3,2054,R1,solarPV,2030,2.24000000000
-3,2055,R1,solarPV,2030,2.24000000000
-3,2056,R1,solarPV,2030,2.24000000000
-4,2022,R1,windturbine,2020,8.77320000000
-4,2024,R1,windturbine,2020,8.77320000000
-4,2025,R1,windturbine,2020,8.77320000000
-4,2026,R1,windturbine,2020,8.77320000000
-4,2028,R1,windturbine,2020,8.77320000000
-4,2030,R1,windturbine,2020,8.77320000000
-4,2032,R1,windturbine,2020,8.77320000000
-4,2035,R1,windturbine,2020,8.77320000000
-4,2040,R1,windturbine,2020,8.77320000000
-4,2045,R1,windturbine,2020,8.77320000000
-4,2046,R1,windturbine,2020,8.77320000000
-5,2024,R1,windturbine,2022,4.17680000000
-5,2025,R1,windturbine,2022,4.17680000000
-5,2026,R1,windturbine,2022,4.17680000000
-5,2028,R1,windturbine,2022,4.17680000000
-5,2030,R1,windturbine,2022,4.17680000000
-5,2032,R1,windturbine,2022,4.17680000000
-5,2035,R1,windturbine,2022,4.17680000000
-5,2040,R1,windturbine,2022,4.17680000000
-5,2045,R1,windturbine,2022,4.17680000000
-5,2046,R1,windturbine,2022,4.17680000000
-5,2047,R1,windturbine,2022,4.17680000000
-5,2048,R1,windturbine,2022,4.17680000000
-6,2026,R1,windturbine,2024,4.67960000000
-6,2028,R1,windturbine,2024,4.67960000000
-6,2030,R1,windturbine,2024,4.67960000000
-6,2032,R1,windturbine,2024,4.67960000000
-6,2035,R1,windturbine,2024,4.67960000000
-6,2040,R1,windturbine,2024,4.67960000000
-6,2045,R1,windturbine,2024,4.67960000000
-6,2046,R1,windturbine,2024,4.67960000000
-6,2047,R1,windturbine,2024,4.67960000000
-6,2048,R1,windturbine,2024,4.67960000000
-6,2049,R1,windturbine,2024,4.67960000000
-6,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2032,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2032,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2032,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2032,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2032,R1,gasCCGT,2030,0.99560000000
+5,2035,R1,gasCCGT,2030,0.99560000000
+5,2040,R1,gasCCGT,2030,0.99560000000
+5,2045,R1,gasCCGT,2030,0.99560000000
+5,2046,R1,gasCCGT,2030,0.99560000000
+5,2047,R1,gasCCGT,2030,0.99560000000
+5,2050,R1,gasCCGT,2030,0.99560000000
+5,2058,R1,gasCCGT,2030,0.99560000000
+5,2059,R1,gasCCGT,2030,0.99560000000
+5,2060,R1,gasCCGT,2030,0.99560000000
+5,2061,R1,gasCCGT,2030,0.99560000000
+5,2062,R1,gasCCGT,2030,0.99560000000
+5,2063,R1,gasCCGT,2030,0.99560000000
+5,2064,R1,gasCCGT,2030,0.99560000000
+5,2065,R1,gasCCGT,2030,0.99560000000
+5,2066,R1,gasCCGT,2030,0.99560000000
+6,2022,R1,windturbine,2020,8.77320000000
+6,2024,R1,windturbine,2020,8.77320000000
+6,2025,R1,windturbine,2020,8.77320000000
+6,2026,R1,windturbine,2020,8.77320000000
+6,2028,R1,windturbine,2020,8.77320000000
+6,2030,R1,windturbine,2020,8.77320000000
+6,2032,R1,windturbine,2020,8.77320000000
+6,2035,R1,windturbine,2020,8.77320000000
+6,2040,R1,windturbine,2020,8.77320000000
+6,2045,R1,windturbine,2020,8.77320000000
+6,2046,R1,windturbine,2020,8.77320000000
 7,2020,R2,gasCCGT,2020,1.00000000000
 7,2022,R2,gasCCGT,2020,1.00000000000
 7,2024,R2,gasCCGT,2020,1.00000000000
 7,2025,R2,gasCCGT,2020,1.00000000000
 7,2026,R2,gasCCGT,2020,0.80000000000
 7,2028,R2,gasCCGT,2020,0.40000000000
-8,2028,R2,solarPV,2026,5.16960000000
-8,2030,R2,solarPV,2026,5.16960000000
-8,2032,R2,solarPV,2026,5.16960000000
-8,2035,R2,solarPV,2026,5.16960000000
-8,2040,R2,solarPV,2026,5.16960000000
-8,2045,R2,solarPV,2026,5.16960000000
-8,2046,R2,solarPV,2026,5.16960000000
-8,2047,R2,solarPV,2026,5.16960000000
-8,2048,R2,solarPV,2026,5.16960000000
-8,2049,R2,solarPV,2026,5.16960000000
-8,2050,R2,solarPV,2026,5.16960000000
-8,2051,R2,solarPV,2026,5.16960000000
-8,2052,R2,solarPV,2026,5.16960000000
-9,2030,R2,solarPV,2028,5.20080000000
-9,2032,R2,solarPV,2028,5.20080000000
-9,2035,R2,solarPV,2028,5.20080000000
-9,2040,R2,solarPV,2028,5.20080000000
-9,2045,R2,solarPV,2028,5.20080000000
-9,2046,R2,solarPV,2028,5.20080000000
-9,2047,R2,solarPV,2028,5.20080000000
-9,2048,R2,solarPV,2028,5.20080000000
-9,2049,R2,solarPV,2028,5.20080000000
-9,2050,R2,solarPV,2028,5.20080000000
-9,2051,R2,solarPV,2028,5.20080000000
-9,2052,R2,solarPV,2028,5.20080000000
-9,2053,R2,solarPV,2028,5.20080000000
-9,2054,R2,solarPV,2028,5.20080000000
-10,2032,R2,solarPV,2030,2.24000000000
-10,2035,R2,solarPV,2030,2.24000000000
-10,2040,R2,solarPV,2030,2.24000000000
-10,2045,R2,solarPV,2030,2.24000000000
-10,2046,R2,solarPV,2030,2.24000000000
-10,2047,R2,solarPV,2030,2.24000000000
-10,2048,R2,solarPV,2030,2.24000000000
-10,2049,R2,solarPV,2030,2.24000000000
-10,2050,R2,solarPV,2030,2.24000000000
-10,2051,R2,solarPV,2030,2.24000000000
-10,2052,R2,solarPV,2030,2.24000000000
-10,2053,R2,solarPV,2030,2.24000000000
-10,2054,R2,solarPV,2030,2.24000000000
-10,2055,R2,solarPV,2030,2.24000000000
-10,2056,R2,solarPV,2030,2.24000000000
-11,2022,R2,windturbine,2020,8.77320000000
-11,2024,R2,windturbine,2020,8.77320000000
-11,2025,R2,windturbine,2020,8.77320000000
-11,2026,R2,windturbine,2020,8.77320000000
-11,2028,R2,windturbine,2020,8.77320000000
-11,2030,R2,windturbine,2020,8.77320000000
-11,2032,R2,windturbine,2020,8.77320000000
-11,2035,R2,windturbine,2020,8.77320000000
-11,2040,R2,windturbine,2020,8.77320000000
-11,2045,R2,windturbine,2020,8.77320000000
-11,2046,R2,windturbine,2020,8.77320000000
-12,2024,R2,windturbine,2022,4.17680000000
-12,2025,R2,windturbine,2022,4.17680000000
-12,2026,R2,windturbine,2022,4.17680000000
-12,2028,R2,windturbine,2022,4.17680000000
-12,2030,R2,windturbine,2022,4.17680000000
-12,2032,R2,windturbine,2022,4.17680000000
-12,2035,R2,windturbine,2022,4.17680000000
-12,2040,R2,windturbine,2022,4.17680000000
-12,2045,R2,windturbine,2022,4.17680000000
-12,2046,R2,windturbine,2022,4.17680000000
-12,2047,R2,windturbine,2022,4.17680000000
-12,2048,R2,windturbine,2022,4.17680000000
-13,2026,R2,windturbine,2024,4.67960000000
-13,2028,R2,windturbine,2024,4.67960000000
-13,2030,R2,windturbine,2024,4.67960000000
-13,2032,R2,windturbine,2024,4.67960000000
-13,2035,R2,windturbine,2024,4.67960000000
-13,2040,R2,windturbine,2024,4.67960000000
-13,2045,R2,windturbine,2024,4.67960000000
-13,2046,R2,windturbine,2024,4.67960000000
-13,2047,R2,windturbine,2024,4.67960000000
-13,2048,R2,windturbine,2024,4.67960000000
-13,2049,R2,windturbine,2024,4.67960000000
-13,2050,R2,windturbine,2024,4.67960000000
+8,2024,R2,gasCCGT,2022,1.85640000000
+8,2025,R2,gasCCGT,2022,1.85640000000
+8,2026,R2,gasCCGT,2022,1.85640000000
+8,2028,R2,gasCCGT,2022,1.85640000000
+8,2030,R2,gasCCGT,2022,1.85640000000
+8,2032,R2,gasCCGT,2022,1.85640000000
+8,2035,R2,gasCCGT,2022,1.85640000000
+8,2040,R2,gasCCGT,2022,1.85640000000
+8,2045,R2,gasCCGT,2022,1.85640000000
+8,2046,R2,gasCCGT,2022,1.85640000000
+8,2047,R2,gasCCGT,2022,1.85640000000
+8,2050,R2,gasCCGT,2022,1.85640000000
+8,2058,R2,gasCCGT,2022,1.85640000000
+9,2026,R2,gasCCGT,2024,2.07980000000
+9,2028,R2,gasCCGT,2024,2.07980000000
+9,2030,R2,gasCCGT,2024,2.07980000000
+9,2032,R2,gasCCGT,2024,2.07980000000
+9,2035,R2,gasCCGT,2024,2.07980000000
+9,2040,R2,gasCCGT,2024,2.07980000000
+9,2045,R2,gasCCGT,2024,2.07980000000
+9,2046,R2,gasCCGT,2024,2.07980000000
+9,2047,R2,gasCCGT,2024,2.07980000000
+9,2050,R2,gasCCGT,2024,2.07980000000
+9,2058,R2,gasCCGT,2024,2.07980000000
+9,2059,R2,gasCCGT,2024,2.07980000000
+9,2060,R2,gasCCGT,2024,2.07980000000
+10,2028,R2,gasCCGT,2026,2.29760000000
+10,2030,R2,gasCCGT,2026,2.29760000000
+10,2032,R2,gasCCGT,2026,2.29760000000
+10,2035,R2,gasCCGT,2026,2.29760000000
+10,2040,R2,gasCCGT,2026,2.29760000000
+10,2045,R2,gasCCGT,2026,2.29760000000
+10,2046,R2,gasCCGT,2026,2.29760000000
+10,2047,R2,gasCCGT,2026,2.29760000000
+10,2050,R2,gasCCGT,2026,2.29760000000
+10,2058,R2,gasCCGT,2026,2.29760000000
+10,2059,R2,gasCCGT,2026,2.29760000000
+10,2060,R2,gasCCGT,2026,2.29760000000
+10,2061,R2,gasCCGT,2026,2.29760000000
+10,2062,R2,gasCCGT,2026,2.29760000000
+11,2030,R2,gasCCGT,2028,2.31150000000
+11,2032,R2,gasCCGT,2028,2.31150000000
+11,2035,R2,gasCCGT,2028,2.31150000000
+11,2040,R2,gasCCGT,2028,2.31150000000
+11,2045,R2,gasCCGT,2028,2.31150000000
+11,2046,R2,gasCCGT,2028,2.31150000000
+11,2047,R2,gasCCGT,2028,2.31150000000
+11,2050,R2,gasCCGT,2028,2.31150000000
+11,2058,R2,gasCCGT,2028,2.31150000000
+11,2059,R2,gasCCGT,2028,2.31150000000
+11,2060,R2,gasCCGT,2028,2.31150000000
+11,2061,R2,gasCCGT,2028,2.31150000000
+11,2062,R2,gasCCGT,2028,2.31150000000
+11,2063,R2,gasCCGT,2028,2.31150000000
+11,2064,R2,gasCCGT,2028,2.31150000000
+12,2032,R2,gasCCGT,2030,0.99560000000
+12,2035,R2,gasCCGT,2030,0.99560000000
+12,2040,R2,gasCCGT,2030,0.99560000000
+12,2045,R2,gasCCGT,2030,0.99560000000
+12,2046,R2,gasCCGT,2030,0.99560000000
+12,2047,R2,gasCCGT,2030,0.99560000000
+12,2050,R2,gasCCGT,2030,0.99560000000
+12,2058,R2,gasCCGT,2030,0.99560000000
+12,2059,R2,gasCCGT,2030,0.99560000000
+12,2060,R2,gasCCGT,2030,0.99560000000
+12,2061,R2,gasCCGT,2030,0.99560000000
+12,2062,R2,gasCCGT,2030,0.99560000000
+12,2063,R2,gasCCGT,2030,0.99560000000
+12,2064,R2,gasCCGT,2030,0.99560000000
+12,2065,R2,gasCCGT,2030,0.99560000000
+12,2066,R2,gasCCGT,2030,0.99560000000
+13,2022,R2,windturbine,2020,8.77320000000
+13,2024,R2,windturbine,2020,8.77320000000
+13,2025,R2,windturbine,2020,8.77320000000
+13,2026,R2,windturbine,2020,8.77320000000
+13,2028,R2,windturbine,2020,8.77320000000
+13,2030,R2,windturbine,2020,8.77320000000
+13,2032,R2,windturbine,2020,8.77320000000
+13,2035,R2,windturbine,2020,8.77320000000
+13,2040,R2,windturbine,2020,8.77320000000
+13,2045,R2,windturbine,2020,8.77320000000
+13,2046,R2,windturbine,2020,8.77320000000
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 6c00c460..5038954e 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
@@ -5,209 +5,201 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2032,R1,solarPV,2026,5.16960000000
-1,2034,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2032,R1,solarPV,2028,5.20080000000
-2,2034,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2032,R1,solarPV,2030,2.24000000000
-3,2034,R1,solarPV,2030,2.24000000000
-3,2035,R1,solarPV,2030,2.24000000000
-3,2040,R1,solarPV,2030,2.24000000000
-3,2045,R1,solarPV,2030,2.24000000000
-3,2046,R1,solarPV,2030,2.24000000000
-3,2047,R1,solarPV,2030,2.24000000000
-3,2048,R1,solarPV,2030,2.24000000000
-3,2049,R1,solarPV,2030,2.24000000000
-3,2050,R1,solarPV,2030,2.24000000000
-3,2051,R1,solarPV,2030,2.24000000000
-3,2052,R1,solarPV,2030,2.24000000000
-3,2053,R1,solarPV,2030,2.24000000000
-3,2054,R1,solarPV,2030,2.24000000000
-3,2055,R1,solarPV,2030,2.24000000000
-3,2056,R1,solarPV,2030,2.24000000000
-4,2034,R1,solarPV,2032,2.24000000000
-4,2035,R1,solarPV,2032,2.24000000000
-4,2040,R1,solarPV,2032,2.24000000000
-4,2045,R1,solarPV,2032,2.24000000000
-4,2046,R1,solarPV,2032,2.24000000000
-4,2047,R1,solarPV,2032,2.24000000000
-4,2048,R1,solarPV,2032,2.24000000000
-4,2049,R1,solarPV,2032,2.24000000000
-4,2050,R1,solarPV,2032,2.24000000000
-4,2051,R1,solarPV,2032,2.24000000000
-4,2052,R1,solarPV,2032,2.24000000000
-4,2053,R1,solarPV,2032,2.24000000000
-4,2054,R1,solarPV,2032,2.24000000000
-4,2055,R1,solarPV,2032,2.24000000000
-4,2056,R1,solarPV,2032,2.24000000000
-4,2057,R1,solarPV,2032,2.24000000000
-4,2058,R1,solarPV,2032,2.24000000000
-5,2022,R1,windturbine,2020,8.77320000000
-5,2024,R1,windturbine,2020,8.77320000000
-5,2025,R1,windturbine,2020,8.77320000000
-5,2026,R1,windturbine,2020,8.77320000000
-5,2028,R1,windturbine,2020,8.77320000000
-5,2030,R1,windturbine,2020,8.77320000000
-5,2032,R1,windturbine,2020,8.77320000000
-5,2034,R1,windturbine,2020,8.77320000000
-5,2035,R1,windturbine,2020,8.77320000000
-5,2040,R1,windturbine,2020,8.77320000000
-5,2045,R1,windturbine,2020,8.77320000000
-5,2046,R1,windturbine,2020,8.77320000000
-6,2024,R1,windturbine,2022,4.17680000000
-6,2025,R1,windturbine,2022,4.17680000000
-6,2026,R1,windturbine,2022,4.17680000000
-6,2028,R1,windturbine,2022,4.17680000000
-6,2030,R1,windturbine,2022,4.17680000000
-6,2032,R1,windturbine,2022,4.17680000000
-6,2034,R1,windturbine,2022,4.17680000000
-6,2035,R1,windturbine,2022,4.17680000000
-6,2040,R1,windturbine,2022,4.17680000000
-6,2045,R1,windturbine,2022,4.17680000000
-6,2046,R1,windturbine,2022,4.17680000000
-6,2047,R1,windturbine,2022,4.17680000000
-6,2048,R1,windturbine,2022,4.17680000000
-7,2026,R1,windturbine,2024,4.67960000000
-7,2028,R1,windturbine,2024,4.67960000000
-7,2030,R1,windturbine,2024,4.67960000000
-7,2032,R1,windturbine,2024,4.67960000000
-7,2034,R1,windturbine,2024,4.67960000000
-7,2035,R1,windturbine,2024,4.67960000000
-7,2040,R1,windturbine,2024,4.67960000000
-7,2045,R1,windturbine,2024,4.67960000000
-7,2046,R1,windturbine,2024,4.67960000000
-7,2047,R1,windturbine,2024,4.67960000000
-7,2048,R1,windturbine,2024,4.67960000000
-7,2049,R1,windturbine,2024,4.67960000000
-7,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2032,R1,gasCCGT,2022,1.85640000000
+1,2034,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2032,R1,gasCCGT,2024,2.07980000000
+2,2034,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2032,R1,gasCCGT,2026,2.29760000000
+3,2034,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2032,R1,gasCCGT,2028,2.31150000000
+4,2034,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2032,R1,gasCCGT,2030,0.99560000000
+5,2034,R1,gasCCGT,2030,0.99560000000
+5,2035,R1,gasCCGT,2030,0.99560000000
+5,2040,R1,gasCCGT,2030,0.99560000000
+5,2045,R1,gasCCGT,2030,0.99560000000
+5,2046,R1,gasCCGT,2030,0.99560000000
+5,2047,R1,gasCCGT,2030,0.99560000000
+5,2050,R1,gasCCGT,2030,0.99560000000
+5,2058,R1,gasCCGT,2030,0.99560000000
+5,2059,R1,gasCCGT,2030,0.99560000000
+5,2060,R1,gasCCGT,2030,0.99560000000
+5,2061,R1,gasCCGT,2030,0.99560000000
+5,2062,R1,gasCCGT,2030,0.99560000000
+5,2063,R1,gasCCGT,2030,0.99560000000
+5,2064,R1,gasCCGT,2030,0.99560000000
+5,2065,R1,gasCCGT,2030,0.99560000000
+5,2066,R1,gasCCGT,2030,0.99560000000
+6,2034,R1,solarPV,2032,2.24000000000
+6,2035,R1,solarPV,2032,2.24000000000
+6,2040,R1,solarPV,2032,2.24000000000
+6,2045,R1,solarPV,2032,2.24000000000
+6,2046,R1,solarPV,2032,2.24000000000
+6,2047,R1,solarPV,2032,2.24000000000
+6,2050,R1,solarPV,2032,2.24000000000
+6,2058,R1,solarPV,2032,2.24000000000
+7,2022,R1,windturbine,2020,8.77320000000
+7,2024,R1,windturbine,2020,8.77320000000
+7,2025,R1,windturbine,2020,8.77320000000
+7,2026,R1,windturbine,2020,8.77320000000
+7,2028,R1,windturbine,2020,8.77320000000
+7,2030,R1,windturbine,2020,8.77320000000
+7,2032,R1,windturbine,2020,8.77320000000
+7,2034,R1,windturbine,2020,8.77320000000
+7,2035,R1,windturbine,2020,8.77320000000
+7,2040,R1,windturbine,2020,8.77320000000
+7,2045,R1,windturbine,2020,8.77320000000
+7,2046,R1,windturbine,2020,8.77320000000
 8,2020,R2,gasCCGT,2020,1.00000000000
 8,2022,R2,gasCCGT,2020,1.00000000000
 8,2024,R2,gasCCGT,2020,1.00000000000
 8,2025,R2,gasCCGT,2020,1.00000000000
 8,2026,R2,gasCCGT,2020,0.80000000000
 8,2028,R2,gasCCGT,2020,0.40000000000
-9,2028,R2,solarPV,2026,5.16960000000
-9,2030,R2,solarPV,2026,5.16960000000
-9,2032,R2,solarPV,2026,5.16960000000
-9,2034,R2,solarPV,2026,5.16960000000
-9,2035,R2,solarPV,2026,5.16960000000
-9,2040,R2,solarPV,2026,5.16960000000
-9,2045,R2,solarPV,2026,5.16960000000
-9,2046,R2,solarPV,2026,5.16960000000
-9,2047,R2,solarPV,2026,5.16960000000
-9,2048,R2,solarPV,2026,5.16960000000
-9,2049,R2,solarPV,2026,5.16960000000
-9,2050,R2,solarPV,2026,5.16960000000
-9,2051,R2,solarPV,2026,5.16960000000
-9,2052,R2,solarPV,2026,5.16960000000
-10,2030,R2,solarPV,2028,5.20080000000
-10,2032,R2,solarPV,2028,5.20080000000
-10,2034,R2,solarPV,2028,5.20080000000
-10,2035,R2,solarPV,2028,5.20080000000
-10,2040,R2,solarPV,2028,5.20080000000
-10,2045,R2,solarPV,2028,5.20080000000
-10,2046,R2,solarPV,2028,5.20080000000
-10,2047,R2,solarPV,2028,5.20080000000
-10,2048,R2,solarPV,2028,5.20080000000
-10,2049,R2,solarPV,2028,5.20080000000
-10,2050,R2,solarPV,2028,5.20080000000
-10,2051,R2,solarPV,2028,5.20080000000
-10,2052,R2,solarPV,2028,5.20080000000
-10,2053,R2,solarPV,2028,5.20080000000
-10,2054,R2,solarPV,2028,5.20080000000
-11,2032,R2,solarPV,2030,2.24000000000
-11,2034,R2,solarPV,2030,2.24000000000
-11,2035,R2,solarPV,2030,2.24000000000
-11,2040,R2,solarPV,2030,2.24000000000
-11,2045,R2,solarPV,2030,2.24000000000
-11,2046,R2,solarPV,2030,2.24000000000
-11,2047,R2,solarPV,2030,2.24000000000
-11,2048,R2,solarPV,2030,2.24000000000
-11,2049,R2,solarPV,2030,2.24000000000
-11,2050,R2,solarPV,2030,2.24000000000
-11,2051,R2,solarPV,2030,2.24000000000
-11,2052,R2,solarPV,2030,2.24000000000
-11,2053,R2,solarPV,2030,2.24000000000
-11,2054,R2,solarPV,2030,2.24000000000
-11,2055,R2,solarPV,2030,2.24000000000
-11,2056,R2,solarPV,2030,2.24000000000
-12,2034,R2,solarPV,2032,2.24000000000
-12,2035,R2,solarPV,2032,2.24000000000
-12,2040,R2,solarPV,2032,2.24000000000
-12,2045,R2,solarPV,2032,2.24000000000
-12,2046,R2,solarPV,2032,2.24000000000
-12,2047,R2,solarPV,2032,2.24000000000
-12,2048,R2,solarPV,2032,2.24000000000
-12,2049,R2,solarPV,2032,2.24000000000
-12,2050,R2,solarPV,2032,2.24000000000
-12,2051,R2,solarPV,2032,2.24000000000
-12,2052,R2,solarPV,2032,2.24000000000
-12,2053,R2,solarPV,2032,2.24000000000
-12,2054,R2,solarPV,2032,2.24000000000
-12,2055,R2,solarPV,2032,2.24000000000
-12,2056,R2,solarPV,2032,2.24000000000
-12,2057,R2,solarPV,2032,2.24000000000
-12,2058,R2,solarPV,2032,2.24000000000
-13,2022,R2,windturbine,2020,8.77320000000
-13,2024,R2,windturbine,2020,8.77320000000
-13,2025,R2,windturbine,2020,8.77320000000
-13,2026,R2,windturbine,2020,8.77320000000
-13,2028,R2,windturbine,2020,8.77320000000
-13,2030,R2,windturbine,2020,8.77320000000
-13,2032,R2,windturbine,2020,8.77320000000
-13,2034,R2,windturbine,2020,8.77320000000
-13,2035,R2,windturbine,2020,8.77320000000
-13,2040,R2,windturbine,2020,8.77320000000
-13,2045,R2,windturbine,2020,8.77320000000
-13,2046,R2,windturbine,2020,8.77320000000
-14,2024,R2,windturbine,2022,4.17680000000
-14,2025,R2,windturbine,2022,4.17680000000
-14,2026,R2,windturbine,2022,4.17680000000
-14,2028,R2,windturbine,2022,4.17680000000
-14,2030,R2,windturbine,2022,4.17680000000
-14,2032,R2,windturbine,2022,4.17680000000
-14,2034,R2,windturbine,2022,4.17680000000
-14,2035,R2,windturbine,2022,4.17680000000
-14,2040,R2,windturbine,2022,4.17680000000
-14,2045,R2,windturbine,2022,4.17680000000
-14,2046,R2,windturbine,2022,4.17680000000
-14,2047,R2,windturbine,2022,4.17680000000
-14,2048,R2,windturbine,2022,4.17680000000
-15,2026,R2,windturbine,2024,4.67960000000
-15,2028,R2,windturbine,2024,4.67960000000
-15,2030,R2,windturbine,2024,4.67960000000
-15,2032,R2,windturbine,2024,4.67960000000
-15,2034,R2,windturbine,2024,4.67960000000
-15,2035,R2,windturbine,2024,4.67960000000
-15,2040,R2,windturbine,2024,4.67960000000
-15,2045,R2,windturbine,2024,4.67960000000
-15,2046,R2,windturbine,2024,4.67960000000
-15,2047,R2,windturbine,2024,4.67960000000
-15,2048,R2,windturbine,2024,4.67960000000
-15,2049,R2,windturbine,2024,4.67960000000
-15,2050,R2,windturbine,2024,4.67960000000
+9,2024,R2,gasCCGT,2022,1.85640000000
+9,2025,R2,gasCCGT,2022,1.85640000000
+9,2026,R2,gasCCGT,2022,1.85640000000
+9,2028,R2,gasCCGT,2022,1.85640000000
+9,2030,R2,gasCCGT,2022,1.85640000000
+9,2032,R2,gasCCGT,2022,1.85640000000
+9,2034,R2,gasCCGT,2022,1.85640000000
+9,2035,R2,gasCCGT,2022,1.85640000000
+9,2040,R2,gasCCGT,2022,1.85640000000
+9,2045,R2,gasCCGT,2022,1.85640000000
+9,2046,R2,gasCCGT,2022,1.85640000000
+9,2047,R2,gasCCGT,2022,1.85640000000
+9,2050,R2,gasCCGT,2022,1.85640000000
+9,2058,R2,gasCCGT,2022,1.85640000000
+10,2026,R2,gasCCGT,2024,2.07980000000
+10,2028,R2,gasCCGT,2024,2.07980000000
+10,2030,R2,gasCCGT,2024,2.07980000000
+10,2032,R2,gasCCGT,2024,2.07980000000
+10,2034,R2,gasCCGT,2024,2.07980000000
+10,2035,R2,gasCCGT,2024,2.07980000000
+10,2040,R2,gasCCGT,2024,2.07980000000
+10,2045,R2,gasCCGT,2024,2.07980000000
+10,2046,R2,gasCCGT,2024,2.07980000000
+10,2047,R2,gasCCGT,2024,2.07980000000
+10,2050,R2,gasCCGT,2024,2.07980000000
+10,2058,R2,gasCCGT,2024,2.07980000000
+10,2059,R2,gasCCGT,2024,2.07980000000
+10,2060,R2,gasCCGT,2024,2.07980000000
+11,2028,R2,gasCCGT,2026,2.29760000000
+11,2030,R2,gasCCGT,2026,2.29760000000
+11,2032,R2,gasCCGT,2026,2.29760000000
+11,2034,R2,gasCCGT,2026,2.29760000000
+11,2035,R2,gasCCGT,2026,2.29760000000
+11,2040,R2,gasCCGT,2026,2.29760000000
+11,2045,R2,gasCCGT,2026,2.29760000000
+11,2046,R2,gasCCGT,2026,2.29760000000
+11,2047,R2,gasCCGT,2026,2.29760000000
+11,2050,R2,gasCCGT,2026,2.29760000000
+11,2058,R2,gasCCGT,2026,2.29760000000
+11,2059,R2,gasCCGT,2026,2.29760000000
+11,2060,R2,gasCCGT,2026,2.29760000000
+11,2061,R2,gasCCGT,2026,2.29760000000
+11,2062,R2,gasCCGT,2026,2.29760000000
+12,2030,R2,gasCCGT,2028,2.31150000000
+12,2032,R2,gasCCGT,2028,2.31150000000
+12,2034,R2,gasCCGT,2028,2.31150000000
+12,2035,R2,gasCCGT,2028,2.31150000000
+12,2040,R2,gasCCGT,2028,2.31150000000
+12,2045,R2,gasCCGT,2028,2.31150000000
+12,2046,R2,gasCCGT,2028,2.31150000000
+12,2047,R2,gasCCGT,2028,2.31150000000
+12,2050,R2,gasCCGT,2028,2.31150000000
+12,2058,R2,gasCCGT,2028,2.31150000000
+12,2059,R2,gasCCGT,2028,2.31150000000
+12,2060,R2,gasCCGT,2028,2.31150000000
+12,2061,R2,gasCCGT,2028,2.31150000000
+12,2062,R2,gasCCGT,2028,2.31150000000
+12,2063,R2,gasCCGT,2028,2.31150000000
+12,2064,R2,gasCCGT,2028,2.31150000000
+13,2032,R2,gasCCGT,2030,0.99560000000
+13,2034,R2,gasCCGT,2030,0.99560000000
+13,2035,R2,gasCCGT,2030,0.99560000000
+13,2040,R2,gasCCGT,2030,0.99560000000
+13,2045,R2,gasCCGT,2030,0.99560000000
+13,2046,R2,gasCCGT,2030,0.99560000000
+13,2047,R2,gasCCGT,2030,0.99560000000
+13,2050,R2,gasCCGT,2030,0.99560000000
+13,2058,R2,gasCCGT,2030,0.99560000000
+13,2059,R2,gasCCGT,2030,0.99560000000
+13,2060,R2,gasCCGT,2030,0.99560000000
+13,2061,R2,gasCCGT,2030,0.99560000000
+13,2062,R2,gasCCGT,2030,0.99560000000
+13,2063,R2,gasCCGT,2030,0.99560000000
+13,2064,R2,gasCCGT,2030,0.99560000000
+13,2065,R2,gasCCGT,2030,0.99560000000
+13,2066,R2,gasCCGT,2030,0.99560000000
+14,2034,R2,solarPV,2032,2.24000000000
+14,2035,R2,solarPV,2032,2.24000000000
+14,2040,R2,solarPV,2032,2.24000000000
+14,2045,R2,solarPV,2032,2.24000000000
+14,2046,R2,solarPV,2032,2.24000000000
+14,2047,R2,solarPV,2032,2.24000000000
+14,2050,R2,solarPV,2032,2.24000000000
+14,2058,R2,solarPV,2032,2.24000000000
+15,2022,R2,windturbine,2020,8.77320000000
+15,2024,R2,windturbine,2020,8.77320000000
+15,2025,R2,windturbine,2020,8.77320000000
+15,2026,R2,windturbine,2020,8.77320000000
+15,2028,R2,windturbine,2020,8.77320000000
+15,2030,R2,windturbine,2020,8.77320000000
+15,2032,R2,windturbine,2020,8.77320000000
+15,2034,R2,windturbine,2020,8.77320000000
+15,2035,R2,windturbine,2020,8.77320000000
+15,2040,R2,windturbine,2020,8.77320000000
+15,2045,R2,windturbine,2020,8.77320000000
+15,2046,R2,windturbine,2020,8.77320000000
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 ee8a6ac5..95b5f722 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
@@ -5,259 +5,233 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2032,R1,solarPV,2026,5.16960000000
-1,2034,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2036,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2032,R1,solarPV,2028,5.20080000000
-2,2034,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2036,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2032,R1,solarPV,2030,2.24000000000
-3,2034,R1,solarPV,2030,2.24000000000
-3,2035,R1,solarPV,2030,2.24000000000
-3,2036,R1,solarPV,2030,2.24000000000
-3,2040,R1,solarPV,2030,2.24000000000
-3,2045,R1,solarPV,2030,2.24000000000
-3,2046,R1,solarPV,2030,2.24000000000
-3,2047,R1,solarPV,2030,2.24000000000
-3,2048,R1,solarPV,2030,2.24000000000
-3,2049,R1,solarPV,2030,2.24000000000
-3,2050,R1,solarPV,2030,2.24000000000
-3,2051,R1,solarPV,2030,2.24000000000
-3,2052,R1,solarPV,2030,2.24000000000
-3,2053,R1,solarPV,2030,2.24000000000
-3,2054,R1,solarPV,2030,2.24000000000
-3,2055,R1,solarPV,2030,2.24000000000
-3,2056,R1,solarPV,2030,2.24000000000
-4,2034,R1,solarPV,2032,2.24000000000
-4,2035,R1,solarPV,2032,2.24000000000
-4,2036,R1,solarPV,2032,2.24000000000
-4,2040,R1,solarPV,2032,2.24000000000
-4,2045,R1,solarPV,2032,2.24000000000
-4,2046,R1,solarPV,2032,2.24000000000
-4,2047,R1,solarPV,2032,2.24000000000
-4,2048,R1,solarPV,2032,2.24000000000
-4,2049,R1,solarPV,2032,2.24000000000
-4,2050,R1,solarPV,2032,2.24000000000
-4,2051,R1,solarPV,2032,2.24000000000
-4,2052,R1,solarPV,2032,2.24000000000
-4,2053,R1,solarPV,2032,2.24000000000
-4,2054,R1,solarPV,2032,2.24000000000
-4,2055,R1,solarPV,2032,2.24000000000
-4,2056,R1,solarPV,2032,2.24000000000
-4,2057,R1,solarPV,2032,2.24000000000
-4,2058,R1,solarPV,2032,2.24000000000
-5,2036,R1,solarPV,2034,2.24000000000
-5,2040,R1,solarPV,2034,2.24000000000
-5,2045,R1,solarPV,2034,2.24000000000
-5,2046,R1,solarPV,2034,2.24000000000
-5,2047,R1,solarPV,2034,2.24000000000
-5,2048,R1,solarPV,2034,2.24000000000
-5,2049,R1,solarPV,2034,2.24000000000
-5,2050,R1,solarPV,2034,2.24000000000
-5,2051,R1,solarPV,2034,2.24000000000
-5,2052,R1,solarPV,2034,2.24000000000
-5,2053,R1,solarPV,2034,2.24000000000
-5,2054,R1,solarPV,2034,2.24000000000
-5,2055,R1,solarPV,2034,2.24000000000
-5,2056,R1,solarPV,2034,2.24000000000
-5,2057,R1,solarPV,2034,2.24000000000
-5,2058,R1,solarPV,2034,2.24000000000
-5,2059,R1,solarPV,2034,2.24000000000
-5,2060,R1,solarPV,2034,2.24000000000
-6,2022,R1,windturbine,2020,8.77320000000
-6,2024,R1,windturbine,2020,8.77320000000
-6,2025,R1,windturbine,2020,8.77320000000
-6,2026,R1,windturbine,2020,8.77320000000
-6,2028,R1,windturbine,2020,8.77320000000
-6,2030,R1,windturbine,2020,8.77320000000
-6,2032,R1,windturbine,2020,8.77320000000
-6,2034,R1,windturbine,2020,8.77320000000
-6,2035,R1,windturbine,2020,8.77320000000
-6,2036,R1,windturbine,2020,8.77320000000
-6,2040,R1,windturbine,2020,8.77320000000
-6,2045,R1,windturbine,2020,8.77320000000
-6,2046,R1,windturbine,2020,8.77320000000
-7,2024,R1,windturbine,2022,4.17680000000
-7,2025,R1,windturbine,2022,4.17680000000
-7,2026,R1,windturbine,2022,4.17680000000
-7,2028,R1,windturbine,2022,4.17680000000
-7,2030,R1,windturbine,2022,4.17680000000
-7,2032,R1,windturbine,2022,4.17680000000
-7,2034,R1,windturbine,2022,4.17680000000
-7,2035,R1,windturbine,2022,4.17680000000
-7,2036,R1,windturbine,2022,4.17680000000
-7,2040,R1,windturbine,2022,4.17680000000
-7,2045,R1,windturbine,2022,4.17680000000
-7,2046,R1,windturbine,2022,4.17680000000
-7,2047,R1,windturbine,2022,4.17680000000
-7,2048,R1,windturbine,2022,4.17680000000
-8,2026,R1,windturbine,2024,4.67960000000
-8,2028,R1,windturbine,2024,4.67960000000
-8,2030,R1,windturbine,2024,4.67960000000
-8,2032,R1,windturbine,2024,4.67960000000
-8,2034,R1,windturbine,2024,4.67960000000
-8,2035,R1,windturbine,2024,4.67960000000
-8,2036,R1,windturbine,2024,4.67960000000
-8,2040,R1,windturbine,2024,4.67960000000
-8,2045,R1,windturbine,2024,4.67960000000
-8,2046,R1,windturbine,2024,4.67960000000
-8,2047,R1,windturbine,2024,4.67960000000
-8,2048,R1,windturbine,2024,4.67960000000
-8,2049,R1,windturbine,2024,4.67960000000
-8,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2032,R1,gasCCGT,2022,1.85640000000
+1,2034,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2036,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2032,R1,gasCCGT,2024,2.07980000000
+2,2034,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2036,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2032,R1,gasCCGT,2026,2.29760000000
+3,2034,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2036,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2032,R1,gasCCGT,2028,2.31150000000
+4,2034,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2036,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2032,R1,gasCCGT,2030,0.99560000000
+5,2034,R1,gasCCGT,2030,0.99560000000
+5,2035,R1,gasCCGT,2030,0.99560000000
+5,2036,R1,gasCCGT,2030,0.99560000000
+5,2040,R1,gasCCGT,2030,0.99560000000
+5,2045,R1,gasCCGT,2030,0.99560000000
+5,2046,R1,gasCCGT,2030,0.99560000000
+5,2047,R1,gasCCGT,2030,0.99560000000
+5,2050,R1,gasCCGT,2030,0.99560000000
+5,2058,R1,gasCCGT,2030,0.99560000000
+5,2059,R1,gasCCGT,2030,0.99560000000
+5,2060,R1,gasCCGT,2030,0.99560000000
+5,2061,R1,gasCCGT,2030,0.99560000000
+5,2062,R1,gasCCGT,2030,0.99560000000
+5,2063,R1,gasCCGT,2030,0.99560000000
+5,2064,R1,gasCCGT,2030,0.99560000000
+5,2065,R1,gasCCGT,2030,0.99560000000
+5,2066,R1,gasCCGT,2030,0.99560000000
+6,2034,R1,solarPV,2032,2.24000000000
+6,2035,R1,solarPV,2032,2.24000000000
+6,2036,R1,solarPV,2032,2.24000000000
+6,2040,R1,solarPV,2032,2.24000000000
+6,2045,R1,solarPV,2032,2.24000000000
+6,2046,R1,solarPV,2032,2.24000000000
+6,2047,R1,solarPV,2032,2.24000000000
+6,2050,R1,solarPV,2032,2.24000000000
+6,2058,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2034,2.24000000000
+7,2040,R1,solarPV,2034,2.24000000000
+7,2045,R1,solarPV,2034,2.24000000000
+7,2046,R1,solarPV,2034,2.24000000000
+7,2047,R1,solarPV,2034,2.24000000000
+7,2050,R1,solarPV,2034,2.24000000000
+7,2058,R1,solarPV,2034,2.24000000000
+7,2059,R1,solarPV,2034,2.24000000000
+7,2060,R1,solarPV,2034,2.24000000000
+8,2022,R1,windturbine,2020,8.77320000000
+8,2024,R1,windturbine,2020,8.77320000000
+8,2025,R1,windturbine,2020,8.77320000000
+8,2026,R1,windturbine,2020,8.77320000000
+8,2028,R1,windturbine,2020,8.77320000000
+8,2030,R1,windturbine,2020,8.77320000000
+8,2032,R1,windturbine,2020,8.77320000000
+8,2034,R1,windturbine,2020,8.77320000000
+8,2035,R1,windturbine,2020,8.77320000000
+8,2036,R1,windturbine,2020,8.77320000000
+8,2040,R1,windturbine,2020,8.77320000000
+8,2045,R1,windturbine,2020,8.77320000000
+8,2046,R1,windturbine,2020,8.77320000000
 9,2020,R2,gasCCGT,2020,1.00000000000
 9,2022,R2,gasCCGT,2020,1.00000000000
 9,2024,R2,gasCCGT,2020,1.00000000000
 9,2025,R2,gasCCGT,2020,1.00000000000
 9,2026,R2,gasCCGT,2020,0.80000000000
 9,2028,R2,gasCCGT,2020,0.40000000000
-10,2028,R2,solarPV,2026,5.16960000000
-10,2030,R2,solarPV,2026,5.16960000000
-10,2032,R2,solarPV,2026,5.16960000000
-10,2034,R2,solarPV,2026,5.16960000000
-10,2035,R2,solarPV,2026,5.16960000000
-10,2036,R2,solarPV,2026,5.16960000000
-10,2040,R2,solarPV,2026,5.16960000000
-10,2045,R2,solarPV,2026,5.16960000000
-10,2046,R2,solarPV,2026,5.16960000000
-10,2047,R2,solarPV,2026,5.16960000000
-10,2048,R2,solarPV,2026,5.16960000000
-10,2049,R2,solarPV,2026,5.16960000000
-10,2050,R2,solarPV,2026,5.16960000000
-10,2051,R2,solarPV,2026,5.16960000000
-10,2052,R2,solarPV,2026,5.16960000000
-11,2030,R2,solarPV,2028,5.20080000000
-11,2032,R2,solarPV,2028,5.20080000000
-11,2034,R2,solarPV,2028,5.20080000000
-11,2035,R2,solarPV,2028,5.20080000000
-11,2036,R2,solarPV,2028,5.20080000000
-11,2040,R2,solarPV,2028,5.20080000000
-11,2045,R2,solarPV,2028,5.20080000000
-11,2046,R2,solarPV,2028,5.20080000000
-11,2047,R2,solarPV,2028,5.20080000000
-11,2048,R2,solarPV,2028,5.20080000000
-11,2049,R2,solarPV,2028,5.20080000000
-11,2050,R2,solarPV,2028,5.20080000000
-11,2051,R2,solarPV,2028,5.20080000000
-11,2052,R2,solarPV,2028,5.20080000000
-11,2053,R2,solarPV,2028,5.20080000000
-11,2054,R2,solarPV,2028,5.20080000000
-12,2032,R2,solarPV,2030,2.24000000000
-12,2034,R2,solarPV,2030,2.24000000000
-12,2035,R2,solarPV,2030,2.24000000000
-12,2036,R2,solarPV,2030,2.24000000000
-12,2040,R2,solarPV,2030,2.24000000000
-12,2045,R2,solarPV,2030,2.24000000000
-12,2046,R2,solarPV,2030,2.24000000000
-12,2047,R2,solarPV,2030,2.24000000000
-12,2048,R2,solarPV,2030,2.24000000000
-12,2049,R2,solarPV,2030,2.24000000000
-12,2050,R2,solarPV,2030,2.24000000000
-12,2051,R2,solarPV,2030,2.24000000000
-12,2052,R2,solarPV,2030,2.24000000000
-12,2053,R2,solarPV,2030,2.24000000000
-12,2054,R2,solarPV,2030,2.24000000000
-12,2055,R2,solarPV,2030,2.24000000000
-12,2056,R2,solarPV,2030,2.24000000000
-13,2034,R2,solarPV,2032,2.24000000000
-13,2035,R2,solarPV,2032,2.24000000000
-13,2036,R2,solarPV,2032,2.24000000000
-13,2040,R2,solarPV,2032,2.24000000000
-13,2045,R2,solarPV,2032,2.24000000000
-13,2046,R2,solarPV,2032,2.24000000000
-13,2047,R2,solarPV,2032,2.24000000000
-13,2048,R2,solarPV,2032,2.24000000000
-13,2049,R2,solarPV,2032,2.24000000000
-13,2050,R2,solarPV,2032,2.24000000000
-13,2051,R2,solarPV,2032,2.24000000000
-13,2052,R2,solarPV,2032,2.24000000000
-13,2053,R2,solarPV,2032,2.24000000000
-13,2054,R2,solarPV,2032,2.24000000000
-13,2055,R2,solarPV,2032,2.24000000000
-13,2056,R2,solarPV,2032,2.24000000000
-13,2057,R2,solarPV,2032,2.24000000000
-13,2058,R2,solarPV,2032,2.24000000000
-14,2036,R2,solarPV,2034,2.24000000000
-14,2040,R2,solarPV,2034,2.24000000000
-14,2045,R2,solarPV,2034,2.24000000000
-14,2046,R2,solarPV,2034,2.24000000000
-14,2047,R2,solarPV,2034,2.24000000000
-14,2048,R2,solarPV,2034,2.24000000000
-14,2049,R2,solarPV,2034,2.24000000000
-14,2050,R2,solarPV,2034,2.24000000000
-14,2051,R2,solarPV,2034,2.24000000000
-14,2052,R2,solarPV,2034,2.24000000000
-14,2053,R2,solarPV,2034,2.24000000000
-14,2054,R2,solarPV,2034,2.24000000000
-14,2055,R2,solarPV,2034,2.24000000000
-14,2056,R2,solarPV,2034,2.24000000000
-14,2057,R2,solarPV,2034,2.24000000000
-14,2058,R2,solarPV,2034,2.24000000000
-14,2059,R2,solarPV,2034,2.24000000000
-14,2060,R2,solarPV,2034,2.24000000000
-15,2022,R2,windturbine,2020,8.77320000000
-15,2024,R2,windturbine,2020,8.77320000000
-15,2025,R2,windturbine,2020,8.77320000000
-15,2026,R2,windturbine,2020,8.77320000000
-15,2028,R2,windturbine,2020,8.77320000000
-15,2030,R2,windturbine,2020,8.77320000000
-15,2032,R2,windturbine,2020,8.77320000000
-15,2034,R2,windturbine,2020,8.77320000000
-15,2035,R2,windturbine,2020,8.77320000000
-15,2036,R2,windturbine,2020,8.77320000000
-15,2040,R2,windturbine,2020,8.77320000000
-15,2045,R2,windturbine,2020,8.77320000000
-15,2046,R2,windturbine,2020,8.77320000000
-16,2024,R2,windturbine,2022,4.17680000000
-16,2025,R2,windturbine,2022,4.17680000000
-16,2026,R2,windturbine,2022,4.17680000000
-16,2028,R2,windturbine,2022,4.17680000000
-16,2030,R2,windturbine,2022,4.17680000000
-16,2032,R2,windturbine,2022,4.17680000000
-16,2034,R2,windturbine,2022,4.17680000000
-16,2035,R2,windturbine,2022,4.17680000000
-16,2036,R2,windturbine,2022,4.17680000000
-16,2040,R2,windturbine,2022,4.17680000000
-16,2045,R2,windturbine,2022,4.17680000000
-16,2046,R2,windturbine,2022,4.17680000000
-16,2047,R2,windturbine,2022,4.17680000000
-16,2048,R2,windturbine,2022,4.17680000000
-17,2026,R2,windturbine,2024,4.67960000000
-17,2028,R2,windturbine,2024,4.67960000000
-17,2030,R2,windturbine,2024,4.67960000000
-17,2032,R2,windturbine,2024,4.67960000000
-17,2034,R2,windturbine,2024,4.67960000000
-17,2035,R2,windturbine,2024,4.67960000000
-17,2036,R2,windturbine,2024,4.67960000000
-17,2040,R2,windturbine,2024,4.67960000000
-17,2045,R2,windturbine,2024,4.67960000000
-17,2046,R2,windturbine,2024,4.67960000000
-17,2047,R2,windturbine,2024,4.67960000000
-17,2048,R2,windturbine,2024,4.67960000000
-17,2049,R2,windturbine,2024,4.67960000000
-17,2050,R2,windturbine,2024,4.67960000000
+10,2024,R2,gasCCGT,2022,1.85640000000
+10,2025,R2,gasCCGT,2022,1.85640000000
+10,2026,R2,gasCCGT,2022,1.85640000000
+10,2028,R2,gasCCGT,2022,1.85640000000
+10,2030,R2,gasCCGT,2022,1.85640000000
+10,2032,R2,gasCCGT,2022,1.85640000000
+10,2034,R2,gasCCGT,2022,1.85640000000
+10,2035,R2,gasCCGT,2022,1.85640000000
+10,2036,R2,gasCCGT,2022,1.85640000000
+10,2040,R2,gasCCGT,2022,1.85640000000
+10,2045,R2,gasCCGT,2022,1.85640000000
+10,2046,R2,gasCCGT,2022,1.85640000000
+10,2047,R2,gasCCGT,2022,1.85640000000
+10,2050,R2,gasCCGT,2022,1.85640000000
+10,2058,R2,gasCCGT,2022,1.85640000000
+11,2026,R2,gasCCGT,2024,2.07980000000
+11,2028,R2,gasCCGT,2024,2.07980000000
+11,2030,R2,gasCCGT,2024,2.07980000000
+11,2032,R2,gasCCGT,2024,2.07980000000
+11,2034,R2,gasCCGT,2024,2.07980000000
+11,2035,R2,gasCCGT,2024,2.07980000000
+11,2036,R2,gasCCGT,2024,2.07980000000
+11,2040,R2,gasCCGT,2024,2.07980000000
+11,2045,R2,gasCCGT,2024,2.07980000000
+11,2046,R2,gasCCGT,2024,2.07980000000
+11,2047,R2,gasCCGT,2024,2.07980000000
+11,2050,R2,gasCCGT,2024,2.07980000000
+11,2058,R2,gasCCGT,2024,2.07980000000
+11,2059,R2,gasCCGT,2024,2.07980000000
+11,2060,R2,gasCCGT,2024,2.07980000000
+12,2028,R2,gasCCGT,2026,2.29760000000
+12,2030,R2,gasCCGT,2026,2.29760000000
+12,2032,R2,gasCCGT,2026,2.29760000000
+12,2034,R2,gasCCGT,2026,2.29760000000
+12,2035,R2,gasCCGT,2026,2.29760000000
+12,2036,R2,gasCCGT,2026,2.29760000000
+12,2040,R2,gasCCGT,2026,2.29760000000
+12,2045,R2,gasCCGT,2026,2.29760000000
+12,2046,R2,gasCCGT,2026,2.29760000000
+12,2047,R2,gasCCGT,2026,2.29760000000
+12,2050,R2,gasCCGT,2026,2.29760000000
+12,2058,R2,gasCCGT,2026,2.29760000000
+12,2059,R2,gasCCGT,2026,2.29760000000
+12,2060,R2,gasCCGT,2026,2.29760000000
+12,2061,R2,gasCCGT,2026,2.29760000000
+12,2062,R2,gasCCGT,2026,2.29760000000
+13,2030,R2,gasCCGT,2028,2.31150000000
+13,2032,R2,gasCCGT,2028,2.31150000000
+13,2034,R2,gasCCGT,2028,2.31150000000
+13,2035,R2,gasCCGT,2028,2.31150000000
+13,2036,R2,gasCCGT,2028,2.31150000000
+13,2040,R2,gasCCGT,2028,2.31150000000
+13,2045,R2,gasCCGT,2028,2.31150000000
+13,2046,R2,gasCCGT,2028,2.31150000000
+13,2047,R2,gasCCGT,2028,2.31150000000
+13,2050,R2,gasCCGT,2028,2.31150000000
+13,2058,R2,gasCCGT,2028,2.31150000000
+13,2059,R2,gasCCGT,2028,2.31150000000
+13,2060,R2,gasCCGT,2028,2.31150000000
+13,2061,R2,gasCCGT,2028,2.31150000000
+13,2062,R2,gasCCGT,2028,2.31150000000
+13,2063,R2,gasCCGT,2028,2.31150000000
+13,2064,R2,gasCCGT,2028,2.31150000000
+14,2032,R2,gasCCGT,2030,0.99560000000
+14,2034,R2,gasCCGT,2030,0.99560000000
+14,2035,R2,gasCCGT,2030,0.99560000000
+14,2036,R2,gasCCGT,2030,0.99560000000
+14,2040,R2,gasCCGT,2030,0.99560000000
+14,2045,R2,gasCCGT,2030,0.99560000000
+14,2046,R2,gasCCGT,2030,0.99560000000
+14,2047,R2,gasCCGT,2030,0.99560000000
+14,2050,R2,gasCCGT,2030,0.99560000000
+14,2058,R2,gasCCGT,2030,0.99560000000
+14,2059,R2,gasCCGT,2030,0.99560000000
+14,2060,R2,gasCCGT,2030,0.99560000000
+14,2061,R2,gasCCGT,2030,0.99560000000
+14,2062,R2,gasCCGT,2030,0.99560000000
+14,2063,R2,gasCCGT,2030,0.99560000000
+14,2064,R2,gasCCGT,2030,0.99560000000
+14,2065,R2,gasCCGT,2030,0.99560000000
+14,2066,R2,gasCCGT,2030,0.99560000000
+15,2034,R2,solarPV,2032,2.24000000000
+15,2035,R2,solarPV,2032,2.24000000000
+15,2036,R2,solarPV,2032,2.24000000000
+15,2040,R2,solarPV,2032,2.24000000000
+15,2045,R2,solarPV,2032,2.24000000000
+15,2046,R2,solarPV,2032,2.24000000000
+15,2047,R2,solarPV,2032,2.24000000000
+15,2050,R2,solarPV,2032,2.24000000000
+15,2058,R2,solarPV,2032,2.24000000000
+16,2036,R2,solarPV,2034,2.24000000000
+16,2040,R2,solarPV,2034,2.24000000000
+16,2045,R2,solarPV,2034,2.24000000000
+16,2046,R2,solarPV,2034,2.24000000000
+16,2047,R2,solarPV,2034,2.24000000000
+16,2050,R2,solarPV,2034,2.24000000000
+16,2058,R2,solarPV,2034,2.24000000000
+16,2059,R2,solarPV,2034,2.24000000000
+16,2060,R2,solarPV,2034,2.24000000000
+17,2022,R2,windturbine,2020,8.77320000000
+17,2024,R2,windturbine,2020,8.77320000000
+17,2025,R2,windturbine,2020,8.77320000000
+17,2026,R2,windturbine,2020,8.77320000000
+17,2028,R2,windturbine,2020,8.77320000000
+17,2030,R2,windturbine,2020,8.77320000000
+17,2032,R2,windturbine,2020,8.77320000000
+17,2034,R2,windturbine,2020,8.77320000000
+17,2035,R2,windturbine,2020,8.77320000000
+17,2036,R2,windturbine,2020,8.77320000000
+17,2040,R2,windturbine,2020,8.77320000000
+17,2045,R2,windturbine,2020,8.77320000000
+17,2046,R2,windturbine,2020,8.77320000000
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 74f10214..0bb607db 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
@@ -5,315 +5,271 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2032,R1,solarPV,2026,5.16960000000
-1,2034,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2036,R1,solarPV,2026,5.16960000000
-1,2038,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2032,R1,solarPV,2028,5.20080000000
-2,2034,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2036,R1,solarPV,2028,5.20080000000
-2,2038,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2032,R1,solarPV,2030,2.24000000000
-3,2034,R1,solarPV,2030,2.24000000000
-3,2035,R1,solarPV,2030,2.24000000000
-3,2036,R1,solarPV,2030,2.24000000000
-3,2038,R1,solarPV,2030,2.24000000000
-3,2040,R1,solarPV,2030,2.24000000000
-3,2045,R1,solarPV,2030,2.24000000000
-3,2046,R1,solarPV,2030,2.24000000000
-3,2047,R1,solarPV,2030,2.24000000000
-3,2048,R1,solarPV,2030,2.24000000000
-3,2049,R1,solarPV,2030,2.24000000000
-3,2050,R1,solarPV,2030,2.24000000000
-3,2051,R1,solarPV,2030,2.24000000000
-3,2052,R1,solarPV,2030,2.24000000000
-3,2053,R1,solarPV,2030,2.24000000000
-3,2054,R1,solarPV,2030,2.24000000000
-3,2055,R1,solarPV,2030,2.24000000000
-3,2056,R1,solarPV,2030,2.24000000000
-4,2034,R1,solarPV,2032,2.24000000000
-4,2035,R1,solarPV,2032,2.24000000000
-4,2036,R1,solarPV,2032,2.24000000000
-4,2038,R1,solarPV,2032,2.24000000000
-4,2040,R1,solarPV,2032,2.24000000000
-4,2045,R1,solarPV,2032,2.24000000000
-4,2046,R1,solarPV,2032,2.24000000000
-4,2047,R1,solarPV,2032,2.24000000000
-4,2048,R1,solarPV,2032,2.24000000000
-4,2049,R1,solarPV,2032,2.24000000000
-4,2050,R1,solarPV,2032,2.24000000000
-4,2051,R1,solarPV,2032,2.24000000000
-4,2052,R1,solarPV,2032,2.24000000000
-4,2053,R1,solarPV,2032,2.24000000000
-4,2054,R1,solarPV,2032,2.24000000000
-4,2055,R1,solarPV,2032,2.24000000000
-4,2056,R1,solarPV,2032,2.24000000000
-4,2057,R1,solarPV,2032,2.24000000000
-4,2058,R1,solarPV,2032,2.24000000000
-5,2036,R1,solarPV,2034,2.24000000000
-5,2038,R1,solarPV,2034,2.24000000000
-5,2040,R1,solarPV,2034,2.24000000000
-5,2045,R1,solarPV,2034,2.24000000000
-5,2046,R1,solarPV,2034,2.24000000000
-5,2047,R1,solarPV,2034,2.24000000000
-5,2048,R1,solarPV,2034,2.24000000000
-5,2049,R1,solarPV,2034,2.24000000000
-5,2050,R1,solarPV,2034,2.24000000000
-5,2051,R1,solarPV,2034,2.24000000000
-5,2052,R1,solarPV,2034,2.24000000000
-5,2053,R1,solarPV,2034,2.24000000000
-5,2054,R1,solarPV,2034,2.24000000000
-5,2055,R1,solarPV,2034,2.24000000000
-5,2056,R1,solarPV,2034,2.24000000000
-5,2057,R1,solarPV,2034,2.24000000000
-5,2058,R1,solarPV,2034,2.24000000000
-5,2059,R1,solarPV,2034,2.24000000000
-5,2060,R1,solarPV,2034,2.24000000000
-6,2038,R1,solarPV,2036,2.24000000000
-6,2040,R1,solarPV,2036,2.24000000000
-6,2045,R1,solarPV,2036,2.24000000000
-6,2046,R1,solarPV,2036,2.24000000000
-6,2047,R1,solarPV,2036,2.24000000000
-6,2048,R1,solarPV,2036,2.24000000000
-6,2049,R1,solarPV,2036,2.24000000000
-6,2050,R1,solarPV,2036,2.24000000000
-6,2051,R1,solarPV,2036,2.24000000000
-6,2052,R1,solarPV,2036,2.24000000000
-6,2053,R1,solarPV,2036,2.24000000000
-6,2054,R1,solarPV,2036,2.24000000000
-6,2055,R1,solarPV,2036,2.24000000000
-6,2056,R1,solarPV,2036,2.24000000000
-6,2057,R1,solarPV,2036,2.24000000000
-6,2058,R1,solarPV,2036,2.24000000000
-6,2059,R1,solarPV,2036,2.24000000000
-6,2060,R1,solarPV,2036,2.24000000000
-6,2061,R1,solarPV,2036,2.24000000000
-6,2062,R1,solarPV,2036,2.24000000000
-7,2022,R1,windturbine,2020,8.77320000000
-7,2024,R1,windturbine,2020,8.77320000000
-7,2025,R1,windturbine,2020,8.77320000000
-7,2026,R1,windturbine,2020,8.77320000000
-7,2028,R1,windturbine,2020,8.77320000000
-7,2030,R1,windturbine,2020,8.77320000000
-7,2032,R1,windturbine,2020,8.77320000000
-7,2034,R1,windturbine,2020,8.77320000000
-7,2035,R1,windturbine,2020,8.77320000000
-7,2036,R1,windturbine,2020,8.77320000000
-7,2038,R1,windturbine,2020,8.77320000000
-7,2040,R1,windturbine,2020,8.77320000000
-7,2045,R1,windturbine,2020,8.77320000000
-7,2046,R1,windturbine,2020,8.77320000000
-8,2024,R1,windturbine,2022,4.17680000000
-8,2025,R1,windturbine,2022,4.17680000000
-8,2026,R1,windturbine,2022,4.17680000000
-8,2028,R1,windturbine,2022,4.17680000000
-8,2030,R1,windturbine,2022,4.17680000000
-8,2032,R1,windturbine,2022,4.17680000000
-8,2034,R1,windturbine,2022,4.17680000000
-8,2035,R1,windturbine,2022,4.17680000000
-8,2036,R1,windturbine,2022,4.17680000000
-8,2038,R1,windturbine,2022,4.17680000000
-8,2040,R1,windturbine,2022,4.17680000000
-8,2045,R1,windturbine,2022,4.17680000000
-8,2046,R1,windturbine,2022,4.17680000000
-8,2047,R1,windturbine,2022,4.17680000000
-8,2048,R1,windturbine,2022,4.17680000000
-9,2026,R1,windturbine,2024,4.67960000000
-9,2028,R1,windturbine,2024,4.67960000000
-9,2030,R1,windturbine,2024,4.67960000000
-9,2032,R1,windturbine,2024,4.67960000000
-9,2034,R1,windturbine,2024,4.67960000000
-9,2035,R1,windturbine,2024,4.67960000000
-9,2036,R1,windturbine,2024,4.67960000000
-9,2038,R1,windturbine,2024,4.67960000000
-9,2040,R1,windturbine,2024,4.67960000000
-9,2045,R1,windturbine,2024,4.67960000000
-9,2046,R1,windturbine,2024,4.67960000000
-9,2047,R1,windturbine,2024,4.67960000000
-9,2048,R1,windturbine,2024,4.67960000000
-9,2049,R1,windturbine,2024,4.67960000000
-9,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2032,R1,gasCCGT,2022,1.85640000000
+1,2034,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2036,R1,gasCCGT,2022,1.85640000000
+1,2038,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2032,R1,gasCCGT,2024,2.07980000000
+2,2034,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2036,R1,gasCCGT,2024,2.07980000000
+2,2038,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2032,R1,gasCCGT,2026,2.29760000000
+3,2034,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2036,R1,gasCCGT,2026,2.29760000000
+3,2038,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2032,R1,gasCCGT,2028,2.31150000000
+4,2034,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2036,R1,gasCCGT,2028,2.31150000000
+4,2038,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2032,R1,gasCCGT,2030,0.99560000000
+5,2034,R1,gasCCGT,2030,0.99560000000
+5,2035,R1,gasCCGT,2030,0.99560000000
+5,2036,R1,gasCCGT,2030,0.99560000000
+5,2038,R1,gasCCGT,2030,0.99560000000
+5,2040,R1,gasCCGT,2030,0.99560000000
+5,2045,R1,gasCCGT,2030,0.99560000000
+5,2046,R1,gasCCGT,2030,0.99560000000
+5,2047,R1,gasCCGT,2030,0.99560000000
+5,2050,R1,gasCCGT,2030,0.99560000000
+5,2058,R1,gasCCGT,2030,0.99560000000
+5,2059,R1,gasCCGT,2030,0.99560000000
+5,2060,R1,gasCCGT,2030,0.99560000000
+5,2061,R1,gasCCGT,2030,0.99560000000
+5,2062,R1,gasCCGT,2030,0.99560000000
+5,2063,R1,gasCCGT,2030,0.99560000000
+5,2064,R1,gasCCGT,2030,0.99560000000
+5,2065,R1,gasCCGT,2030,0.99560000000
+5,2066,R1,gasCCGT,2030,0.99560000000
+6,2034,R1,solarPV,2032,2.24000000000
+6,2035,R1,solarPV,2032,2.24000000000
+6,2036,R1,solarPV,2032,2.24000000000
+6,2038,R1,solarPV,2032,2.24000000000
+6,2040,R1,solarPV,2032,2.24000000000
+6,2045,R1,solarPV,2032,2.24000000000
+6,2046,R1,solarPV,2032,2.24000000000
+6,2047,R1,solarPV,2032,2.24000000000
+6,2050,R1,solarPV,2032,2.24000000000
+6,2058,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2034,2.24000000000
+7,2038,R1,solarPV,2034,2.24000000000
+7,2040,R1,solarPV,2034,2.24000000000
+7,2045,R1,solarPV,2034,2.24000000000
+7,2046,R1,solarPV,2034,2.24000000000
+7,2047,R1,solarPV,2034,2.24000000000
+7,2050,R1,solarPV,2034,2.24000000000
+7,2058,R1,solarPV,2034,2.24000000000
+7,2059,R1,solarPV,2034,2.24000000000
+7,2060,R1,solarPV,2034,2.24000000000
+8,2038,R1,solarPV,2036,2.24000000000
+8,2040,R1,solarPV,2036,2.24000000000
+8,2045,R1,solarPV,2036,2.24000000000
+8,2046,R1,solarPV,2036,2.24000000000
+8,2047,R1,solarPV,2036,2.24000000000
+8,2050,R1,solarPV,2036,2.24000000000
+8,2058,R1,solarPV,2036,2.24000000000
+8,2059,R1,solarPV,2036,2.24000000000
+8,2060,R1,solarPV,2036,2.24000000000
+8,2061,R1,solarPV,2036,2.24000000000
+8,2062,R1,solarPV,2036,2.24000000000
+9,2022,R1,windturbine,2020,8.77320000000
+9,2024,R1,windturbine,2020,8.77320000000
+9,2025,R1,windturbine,2020,8.77320000000
+9,2026,R1,windturbine,2020,8.77320000000
+9,2028,R1,windturbine,2020,8.77320000000
+9,2030,R1,windturbine,2020,8.77320000000
+9,2032,R1,windturbine,2020,8.77320000000
+9,2034,R1,windturbine,2020,8.77320000000
+9,2035,R1,windturbine,2020,8.77320000000
+9,2036,R1,windturbine,2020,8.77320000000
+9,2038,R1,windturbine,2020,8.77320000000
+9,2040,R1,windturbine,2020,8.77320000000
+9,2045,R1,windturbine,2020,8.77320000000
+9,2046,R1,windturbine,2020,8.77320000000
 10,2020,R2,gasCCGT,2020,1.00000000000
 10,2022,R2,gasCCGT,2020,1.00000000000
 10,2024,R2,gasCCGT,2020,1.00000000000
 10,2025,R2,gasCCGT,2020,1.00000000000
 10,2026,R2,gasCCGT,2020,0.80000000000
 10,2028,R2,gasCCGT,2020,0.40000000000
-11,2028,R2,solarPV,2026,5.16960000000
-11,2030,R2,solarPV,2026,5.16960000000
-11,2032,R2,solarPV,2026,5.16960000000
-11,2034,R2,solarPV,2026,5.16960000000
-11,2035,R2,solarPV,2026,5.16960000000
-11,2036,R2,solarPV,2026,5.16960000000
-11,2038,R2,solarPV,2026,5.16960000000
-11,2040,R2,solarPV,2026,5.16960000000
-11,2045,R2,solarPV,2026,5.16960000000
-11,2046,R2,solarPV,2026,5.16960000000
-11,2047,R2,solarPV,2026,5.16960000000
-11,2048,R2,solarPV,2026,5.16960000000
-11,2049,R2,solarPV,2026,5.16960000000
-11,2050,R2,solarPV,2026,5.16960000000
-11,2051,R2,solarPV,2026,5.16960000000
-11,2052,R2,solarPV,2026,5.16960000000
-12,2030,R2,solarPV,2028,5.20080000000
-12,2032,R2,solarPV,2028,5.20080000000
-12,2034,R2,solarPV,2028,5.20080000000
-12,2035,R2,solarPV,2028,5.20080000000
-12,2036,R2,solarPV,2028,5.20080000000
-12,2038,R2,solarPV,2028,5.20080000000
-12,2040,R2,solarPV,2028,5.20080000000
-12,2045,R2,solarPV,2028,5.20080000000
-12,2046,R2,solarPV,2028,5.20080000000
-12,2047,R2,solarPV,2028,5.20080000000
-12,2048,R2,solarPV,2028,5.20080000000
-12,2049,R2,solarPV,2028,5.20080000000
-12,2050,R2,solarPV,2028,5.20080000000
-12,2051,R2,solarPV,2028,5.20080000000
-12,2052,R2,solarPV,2028,5.20080000000
-12,2053,R2,solarPV,2028,5.20080000000
-12,2054,R2,solarPV,2028,5.20080000000
-13,2032,R2,solarPV,2030,2.24000000000
-13,2034,R2,solarPV,2030,2.24000000000
-13,2035,R2,solarPV,2030,2.24000000000
-13,2036,R2,solarPV,2030,2.24000000000
-13,2038,R2,solarPV,2030,2.24000000000
-13,2040,R2,solarPV,2030,2.24000000000
-13,2045,R2,solarPV,2030,2.24000000000
-13,2046,R2,solarPV,2030,2.24000000000
-13,2047,R2,solarPV,2030,2.24000000000
-13,2048,R2,solarPV,2030,2.24000000000
-13,2049,R2,solarPV,2030,2.24000000000
-13,2050,R2,solarPV,2030,2.24000000000
-13,2051,R2,solarPV,2030,2.24000000000
-13,2052,R2,solarPV,2030,2.24000000000
-13,2053,R2,solarPV,2030,2.24000000000
-13,2054,R2,solarPV,2030,2.24000000000
-13,2055,R2,solarPV,2030,2.24000000000
-13,2056,R2,solarPV,2030,2.24000000000
-14,2034,R2,solarPV,2032,2.24000000000
-14,2035,R2,solarPV,2032,2.24000000000
-14,2036,R2,solarPV,2032,2.24000000000
-14,2038,R2,solarPV,2032,2.24000000000
-14,2040,R2,solarPV,2032,2.24000000000
-14,2045,R2,solarPV,2032,2.24000000000
-14,2046,R2,solarPV,2032,2.24000000000
-14,2047,R2,solarPV,2032,2.24000000000
-14,2048,R2,solarPV,2032,2.24000000000
-14,2049,R2,solarPV,2032,2.24000000000
-14,2050,R2,solarPV,2032,2.24000000000
-14,2051,R2,solarPV,2032,2.24000000000
-14,2052,R2,solarPV,2032,2.24000000000
-14,2053,R2,solarPV,2032,2.24000000000
-14,2054,R2,solarPV,2032,2.24000000000
-14,2055,R2,solarPV,2032,2.24000000000
-14,2056,R2,solarPV,2032,2.24000000000
-14,2057,R2,solarPV,2032,2.24000000000
-14,2058,R2,solarPV,2032,2.24000000000
-15,2036,R2,solarPV,2034,2.24000000000
-15,2038,R2,solarPV,2034,2.24000000000
-15,2040,R2,solarPV,2034,2.24000000000
-15,2045,R2,solarPV,2034,2.24000000000
-15,2046,R2,solarPV,2034,2.24000000000
-15,2047,R2,solarPV,2034,2.24000000000
-15,2048,R2,solarPV,2034,2.24000000000
-15,2049,R2,solarPV,2034,2.24000000000
-15,2050,R2,solarPV,2034,2.24000000000
-15,2051,R2,solarPV,2034,2.24000000000
-15,2052,R2,solarPV,2034,2.24000000000
-15,2053,R2,solarPV,2034,2.24000000000
-15,2054,R2,solarPV,2034,2.24000000000
-15,2055,R2,solarPV,2034,2.24000000000
-15,2056,R2,solarPV,2034,2.24000000000
-15,2057,R2,solarPV,2034,2.24000000000
-15,2058,R2,solarPV,2034,2.24000000000
-15,2059,R2,solarPV,2034,2.24000000000
-15,2060,R2,solarPV,2034,2.24000000000
-16,2038,R2,solarPV,2036,2.24000000000
-16,2040,R2,solarPV,2036,2.24000000000
-16,2045,R2,solarPV,2036,2.24000000000
-16,2046,R2,solarPV,2036,2.24000000000
-16,2047,R2,solarPV,2036,2.24000000000
-16,2048,R2,solarPV,2036,2.24000000000
-16,2049,R2,solarPV,2036,2.24000000000
-16,2050,R2,solarPV,2036,2.24000000000
-16,2051,R2,solarPV,2036,2.24000000000
-16,2052,R2,solarPV,2036,2.24000000000
-16,2053,R2,solarPV,2036,2.24000000000
-16,2054,R2,solarPV,2036,2.24000000000
-16,2055,R2,solarPV,2036,2.24000000000
-16,2056,R2,solarPV,2036,2.24000000000
-16,2057,R2,solarPV,2036,2.24000000000
-16,2058,R2,solarPV,2036,2.24000000000
-16,2059,R2,solarPV,2036,2.24000000000
-16,2060,R2,solarPV,2036,2.24000000000
-16,2061,R2,solarPV,2036,2.24000000000
-16,2062,R2,solarPV,2036,2.24000000000
-17,2022,R2,windturbine,2020,8.77320000000
-17,2024,R2,windturbine,2020,8.77320000000
-17,2025,R2,windturbine,2020,8.77320000000
-17,2026,R2,windturbine,2020,8.77320000000
-17,2028,R2,windturbine,2020,8.77320000000
-17,2030,R2,windturbine,2020,8.77320000000
-17,2032,R2,windturbine,2020,8.77320000000
-17,2034,R2,windturbine,2020,8.77320000000
-17,2035,R2,windturbine,2020,8.77320000000
-17,2036,R2,windturbine,2020,8.77320000000
-17,2038,R2,windturbine,2020,8.77320000000
-17,2040,R2,windturbine,2020,8.77320000000
-17,2045,R2,windturbine,2020,8.77320000000
-17,2046,R2,windturbine,2020,8.77320000000
-18,2024,R2,windturbine,2022,4.17680000000
-18,2025,R2,windturbine,2022,4.17680000000
-18,2026,R2,windturbine,2022,4.17680000000
-18,2028,R2,windturbine,2022,4.17680000000
-18,2030,R2,windturbine,2022,4.17680000000
-18,2032,R2,windturbine,2022,4.17680000000
-18,2034,R2,windturbine,2022,4.17680000000
-18,2035,R2,windturbine,2022,4.17680000000
-18,2036,R2,windturbine,2022,4.17680000000
-18,2038,R2,windturbine,2022,4.17680000000
-18,2040,R2,windturbine,2022,4.17680000000
-18,2045,R2,windturbine,2022,4.17680000000
-18,2046,R2,windturbine,2022,4.17680000000
-18,2047,R2,windturbine,2022,4.17680000000
-18,2048,R2,windturbine,2022,4.17680000000
-19,2026,R2,windturbine,2024,4.67960000000
-19,2028,R2,windturbine,2024,4.67960000000
-19,2030,R2,windturbine,2024,4.67960000000
-19,2032,R2,windturbine,2024,4.67960000000
-19,2034,R2,windturbine,2024,4.67960000000
-19,2035,R2,windturbine,2024,4.67960000000
-19,2036,R2,windturbine,2024,4.67960000000
-19,2038,R2,windturbine,2024,4.67960000000
-19,2040,R2,windturbine,2024,4.67960000000
-19,2045,R2,windturbine,2024,4.67960000000
-19,2046,R2,windturbine,2024,4.67960000000
-19,2047,R2,windturbine,2024,4.67960000000
-19,2048,R2,windturbine,2024,4.67960000000
-19,2049,R2,windturbine,2024,4.67960000000
-19,2050,R2,windturbine,2024,4.67960000000
+11,2024,R2,gasCCGT,2022,1.85640000000
+11,2025,R2,gasCCGT,2022,1.85640000000
+11,2026,R2,gasCCGT,2022,1.85640000000
+11,2028,R2,gasCCGT,2022,1.85640000000
+11,2030,R2,gasCCGT,2022,1.85640000000
+11,2032,R2,gasCCGT,2022,1.85640000000
+11,2034,R2,gasCCGT,2022,1.85640000000
+11,2035,R2,gasCCGT,2022,1.85640000000
+11,2036,R2,gasCCGT,2022,1.85640000000
+11,2038,R2,gasCCGT,2022,1.85640000000
+11,2040,R2,gasCCGT,2022,1.85640000000
+11,2045,R2,gasCCGT,2022,1.85640000000
+11,2046,R2,gasCCGT,2022,1.85640000000
+11,2047,R2,gasCCGT,2022,1.85640000000
+11,2050,R2,gasCCGT,2022,1.85640000000
+11,2058,R2,gasCCGT,2022,1.85640000000
+12,2026,R2,gasCCGT,2024,2.07980000000
+12,2028,R2,gasCCGT,2024,2.07980000000
+12,2030,R2,gasCCGT,2024,2.07980000000
+12,2032,R2,gasCCGT,2024,2.07980000000
+12,2034,R2,gasCCGT,2024,2.07980000000
+12,2035,R2,gasCCGT,2024,2.07980000000
+12,2036,R2,gasCCGT,2024,2.07980000000
+12,2038,R2,gasCCGT,2024,2.07980000000
+12,2040,R2,gasCCGT,2024,2.07980000000
+12,2045,R2,gasCCGT,2024,2.07980000000
+12,2046,R2,gasCCGT,2024,2.07980000000
+12,2047,R2,gasCCGT,2024,2.07980000000
+12,2050,R2,gasCCGT,2024,2.07980000000
+12,2058,R2,gasCCGT,2024,2.07980000000
+12,2059,R2,gasCCGT,2024,2.07980000000
+12,2060,R2,gasCCGT,2024,2.07980000000
+13,2028,R2,gasCCGT,2026,2.29760000000
+13,2030,R2,gasCCGT,2026,2.29760000000
+13,2032,R2,gasCCGT,2026,2.29760000000
+13,2034,R2,gasCCGT,2026,2.29760000000
+13,2035,R2,gasCCGT,2026,2.29760000000
+13,2036,R2,gasCCGT,2026,2.29760000000
+13,2038,R2,gasCCGT,2026,2.29760000000
+13,2040,R2,gasCCGT,2026,2.29760000000
+13,2045,R2,gasCCGT,2026,2.29760000000
+13,2046,R2,gasCCGT,2026,2.29760000000
+13,2047,R2,gasCCGT,2026,2.29760000000
+13,2050,R2,gasCCGT,2026,2.29760000000
+13,2058,R2,gasCCGT,2026,2.29760000000
+13,2059,R2,gasCCGT,2026,2.29760000000
+13,2060,R2,gasCCGT,2026,2.29760000000
+13,2061,R2,gasCCGT,2026,2.29760000000
+13,2062,R2,gasCCGT,2026,2.29760000000
+14,2030,R2,gasCCGT,2028,2.31150000000
+14,2032,R2,gasCCGT,2028,2.31150000000
+14,2034,R2,gasCCGT,2028,2.31150000000
+14,2035,R2,gasCCGT,2028,2.31150000000
+14,2036,R2,gasCCGT,2028,2.31150000000
+14,2038,R2,gasCCGT,2028,2.31150000000
+14,2040,R2,gasCCGT,2028,2.31150000000
+14,2045,R2,gasCCGT,2028,2.31150000000
+14,2046,R2,gasCCGT,2028,2.31150000000
+14,2047,R2,gasCCGT,2028,2.31150000000
+14,2050,R2,gasCCGT,2028,2.31150000000
+14,2058,R2,gasCCGT,2028,2.31150000000
+14,2059,R2,gasCCGT,2028,2.31150000000
+14,2060,R2,gasCCGT,2028,2.31150000000
+14,2061,R2,gasCCGT,2028,2.31150000000
+14,2062,R2,gasCCGT,2028,2.31150000000
+14,2063,R2,gasCCGT,2028,2.31150000000
+14,2064,R2,gasCCGT,2028,2.31150000000
+15,2032,R2,gasCCGT,2030,0.99560000000
+15,2034,R2,gasCCGT,2030,0.99560000000
+15,2035,R2,gasCCGT,2030,0.99560000000
+15,2036,R2,gasCCGT,2030,0.99560000000
+15,2038,R2,gasCCGT,2030,0.99560000000
+15,2040,R2,gasCCGT,2030,0.99560000000
+15,2045,R2,gasCCGT,2030,0.99560000000
+15,2046,R2,gasCCGT,2030,0.99560000000
+15,2047,R2,gasCCGT,2030,0.99560000000
+15,2050,R2,gasCCGT,2030,0.99560000000
+15,2058,R2,gasCCGT,2030,0.99560000000
+15,2059,R2,gasCCGT,2030,0.99560000000
+15,2060,R2,gasCCGT,2030,0.99560000000
+15,2061,R2,gasCCGT,2030,0.99560000000
+15,2062,R2,gasCCGT,2030,0.99560000000
+15,2063,R2,gasCCGT,2030,0.99560000000
+15,2064,R2,gasCCGT,2030,0.99560000000
+15,2065,R2,gasCCGT,2030,0.99560000000
+15,2066,R2,gasCCGT,2030,0.99560000000
+16,2034,R2,solarPV,2032,2.24000000000
+16,2035,R2,solarPV,2032,2.24000000000
+16,2036,R2,solarPV,2032,2.24000000000
+16,2038,R2,solarPV,2032,2.24000000000
+16,2040,R2,solarPV,2032,2.24000000000
+16,2045,R2,solarPV,2032,2.24000000000
+16,2046,R2,solarPV,2032,2.24000000000
+16,2047,R2,solarPV,2032,2.24000000000
+16,2050,R2,solarPV,2032,2.24000000000
+16,2058,R2,solarPV,2032,2.24000000000
+17,2036,R2,solarPV,2034,2.24000000000
+17,2038,R2,solarPV,2034,2.24000000000
+17,2040,R2,solarPV,2034,2.24000000000
+17,2045,R2,solarPV,2034,2.24000000000
+17,2046,R2,solarPV,2034,2.24000000000
+17,2047,R2,solarPV,2034,2.24000000000
+17,2050,R2,solarPV,2034,2.24000000000
+17,2058,R2,solarPV,2034,2.24000000000
+17,2059,R2,solarPV,2034,2.24000000000
+17,2060,R2,solarPV,2034,2.24000000000
+18,2038,R2,solarPV,2036,2.24000000000
+18,2040,R2,solarPV,2036,2.24000000000
+18,2045,R2,solarPV,2036,2.24000000000
+18,2046,R2,solarPV,2036,2.24000000000
+18,2047,R2,solarPV,2036,2.24000000000
+18,2050,R2,solarPV,2036,2.24000000000
+18,2058,R2,solarPV,2036,2.24000000000
+18,2059,R2,solarPV,2036,2.24000000000
+18,2060,R2,solarPV,2036,2.24000000000
+18,2061,R2,solarPV,2036,2.24000000000
+18,2062,R2,solarPV,2036,2.24000000000
+19,2022,R2,windturbine,2020,8.77320000000
+19,2024,R2,windturbine,2020,8.77320000000
+19,2025,R2,windturbine,2020,8.77320000000
+19,2026,R2,windturbine,2020,8.77320000000
+19,2028,R2,windturbine,2020,8.77320000000
+19,2030,R2,windturbine,2020,8.77320000000
+19,2032,R2,windturbine,2020,8.77320000000
+19,2034,R2,windturbine,2020,8.77320000000
+19,2035,R2,windturbine,2020,8.77320000000
+19,2036,R2,windturbine,2020,8.77320000000
+19,2038,R2,windturbine,2020,8.77320000000
+19,2040,R2,windturbine,2020,8.77320000000
+19,2045,R2,windturbine,2020,8.77320000000
+19,2046,R2,windturbine,2020,8.77320000000
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 d70c254e..6bbb7886 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
@@ -5,357 +5,295 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2032,R1,solarPV,2026,5.16960000000
-1,2034,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2036,R1,solarPV,2026,5.16960000000
-1,2038,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2032,R1,solarPV,2028,5.20080000000
-2,2034,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2036,R1,solarPV,2028,5.20080000000
-2,2038,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2032,R1,solarPV,2030,2.24000000000
-3,2034,R1,solarPV,2030,2.24000000000
-3,2035,R1,solarPV,2030,2.24000000000
-3,2036,R1,solarPV,2030,2.24000000000
-3,2038,R1,solarPV,2030,2.24000000000
-3,2040,R1,solarPV,2030,2.24000000000
-3,2045,R1,solarPV,2030,2.24000000000
-3,2046,R1,solarPV,2030,2.24000000000
-3,2047,R1,solarPV,2030,2.24000000000
-3,2048,R1,solarPV,2030,2.24000000000
-3,2049,R1,solarPV,2030,2.24000000000
-3,2050,R1,solarPV,2030,2.24000000000
-3,2051,R1,solarPV,2030,2.24000000000
-3,2052,R1,solarPV,2030,2.24000000000
-3,2053,R1,solarPV,2030,2.24000000000
-3,2054,R1,solarPV,2030,2.24000000000
-3,2055,R1,solarPV,2030,2.24000000000
-3,2056,R1,solarPV,2030,2.24000000000
-4,2034,R1,solarPV,2032,2.24000000000
-4,2035,R1,solarPV,2032,2.24000000000
-4,2036,R1,solarPV,2032,2.24000000000
-4,2038,R1,solarPV,2032,2.24000000000
-4,2040,R1,solarPV,2032,2.24000000000
-4,2045,R1,solarPV,2032,2.24000000000
-4,2046,R1,solarPV,2032,2.24000000000
-4,2047,R1,solarPV,2032,2.24000000000
-4,2048,R1,solarPV,2032,2.24000000000
-4,2049,R1,solarPV,2032,2.24000000000
-4,2050,R1,solarPV,2032,2.24000000000
-4,2051,R1,solarPV,2032,2.24000000000
-4,2052,R1,solarPV,2032,2.24000000000
-4,2053,R1,solarPV,2032,2.24000000000
-4,2054,R1,solarPV,2032,2.24000000000
-4,2055,R1,solarPV,2032,2.24000000000
-4,2056,R1,solarPV,2032,2.24000000000
-4,2057,R1,solarPV,2032,2.24000000000
-4,2058,R1,solarPV,2032,2.24000000000
-5,2036,R1,solarPV,2034,2.24000000000
-5,2038,R1,solarPV,2034,2.24000000000
-5,2040,R1,solarPV,2034,2.24000000000
-5,2045,R1,solarPV,2034,2.24000000000
-5,2046,R1,solarPV,2034,2.24000000000
-5,2047,R1,solarPV,2034,2.24000000000
-5,2048,R1,solarPV,2034,2.24000000000
-5,2049,R1,solarPV,2034,2.24000000000
-5,2050,R1,solarPV,2034,2.24000000000
-5,2051,R1,solarPV,2034,2.24000000000
-5,2052,R1,solarPV,2034,2.24000000000
-5,2053,R1,solarPV,2034,2.24000000000
-5,2054,R1,solarPV,2034,2.24000000000
-5,2055,R1,solarPV,2034,2.24000000000
-5,2056,R1,solarPV,2034,2.24000000000
-5,2057,R1,solarPV,2034,2.24000000000
-5,2058,R1,solarPV,2034,2.24000000000
-5,2059,R1,solarPV,2034,2.24000000000
-5,2060,R1,solarPV,2034,2.24000000000
-6,2038,R1,solarPV,2036,2.24000000000
-6,2040,R1,solarPV,2036,2.24000000000
-6,2045,R1,solarPV,2036,2.24000000000
-6,2046,R1,solarPV,2036,2.24000000000
-6,2047,R1,solarPV,2036,2.24000000000
-6,2048,R1,solarPV,2036,2.24000000000
-6,2049,R1,solarPV,2036,2.24000000000
-6,2050,R1,solarPV,2036,2.24000000000
-6,2051,R1,solarPV,2036,2.24000000000
-6,2052,R1,solarPV,2036,2.24000000000
-6,2053,R1,solarPV,2036,2.24000000000
-6,2054,R1,solarPV,2036,2.24000000000
-6,2055,R1,solarPV,2036,2.24000000000
-6,2056,R1,solarPV,2036,2.24000000000
-6,2057,R1,solarPV,2036,2.24000000000
-6,2058,R1,solarPV,2036,2.24000000000
-6,2059,R1,solarPV,2036,2.24000000000
-6,2060,R1,solarPV,2036,2.24000000000
-6,2061,R1,solarPV,2036,2.24000000000
-6,2062,R1,solarPV,2036,2.24000000000
-7,2040,R1,solarPV,2038,2.24000000000
-7,2045,R1,solarPV,2038,2.24000000000
-7,2046,R1,solarPV,2038,2.24000000000
-7,2047,R1,solarPV,2038,2.24000000000
-7,2048,R1,solarPV,2038,2.24000000000
-7,2049,R1,solarPV,2038,2.24000000000
-7,2050,R1,solarPV,2038,2.24000000000
-7,2051,R1,solarPV,2038,2.24000000000
-7,2052,R1,solarPV,2038,2.24000000000
-7,2053,R1,solarPV,2038,2.24000000000
-7,2054,R1,solarPV,2038,2.24000000000
-7,2055,R1,solarPV,2038,2.24000000000
-7,2056,R1,solarPV,2038,2.24000000000
-7,2057,R1,solarPV,2038,2.24000000000
-7,2058,R1,solarPV,2038,2.24000000000
-7,2059,R1,solarPV,2038,2.24000000000
-7,2060,R1,solarPV,2038,2.24000000000
-7,2061,R1,solarPV,2038,2.24000000000
-7,2062,R1,solarPV,2038,2.24000000000
-7,2063,R1,solarPV,2038,2.24000000000
-7,2064,R1,solarPV,2038,2.24000000000
-8,2022,R1,windturbine,2020,8.77320000000
-8,2024,R1,windturbine,2020,8.77320000000
-8,2025,R1,windturbine,2020,8.77320000000
-8,2026,R1,windturbine,2020,8.77320000000
-8,2028,R1,windturbine,2020,8.77320000000
-8,2030,R1,windturbine,2020,8.77320000000
-8,2032,R1,windturbine,2020,8.77320000000
-8,2034,R1,windturbine,2020,8.77320000000
-8,2035,R1,windturbine,2020,8.77320000000
-8,2036,R1,windturbine,2020,8.77320000000
-8,2038,R1,windturbine,2020,8.77320000000
-8,2040,R1,windturbine,2020,8.77320000000
-8,2045,R1,windturbine,2020,8.77320000000
-8,2046,R1,windturbine,2020,8.77320000000
-9,2024,R1,windturbine,2022,4.17680000000
-9,2025,R1,windturbine,2022,4.17680000000
-9,2026,R1,windturbine,2022,4.17680000000
-9,2028,R1,windturbine,2022,4.17680000000
-9,2030,R1,windturbine,2022,4.17680000000
-9,2032,R1,windturbine,2022,4.17680000000
-9,2034,R1,windturbine,2022,4.17680000000
-9,2035,R1,windturbine,2022,4.17680000000
-9,2036,R1,windturbine,2022,4.17680000000
-9,2038,R1,windturbine,2022,4.17680000000
-9,2040,R1,windturbine,2022,4.17680000000
-9,2045,R1,windturbine,2022,4.17680000000
-9,2046,R1,windturbine,2022,4.17680000000
-9,2047,R1,windturbine,2022,4.17680000000
-9,2048,R1,windturbine,2022,4.17680000000
-10,2026,R1,windturbine,2024,4.67960000000
-10,2028,R1,windturbine,2024,4.67960000000
-10,2030,R1,windturbine,2024,4.67960000000
-10,2032,R1,windturbine,2024,4.67960000000
-10,2034,R1,windturbine,2024,4.67960000000
-10,2035,R1,windturbine,2024,4.67960000000
-10,2036,R1,windturbine,2024,4.67960000000
-10,2038,R1,windturbine,2024,4.67960000000
-10,2040,R1,windturbine,2024,4.67960000000
-10,2045,R1,windturbine,2024,4.67960000000
-10,2046,R1,windturbine,2024,4.67960000000
-10,2047,R1,windturbine,2024,4.67960000000
-10,2048,R1,windturbine,2024,4.67960000000
-10,2049,R1,windturbine,2024,4.67960000000
-10,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2032,R1,gasCCGT,2022,1.85640000000
+1,2034,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2036,R1,gasCCGT,2022,1.85640000000
+1,2038,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2032,R1,gasCCGT,2024,2.07980000000
+2,2034,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2036,R1,gasCCGT,2024,2.07980000000
+2,2038,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2032,R1,gasCCGT,2026,2.29760000000
+3,2034,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2036,R1,gasCCGT,2026,2.29760000000
+3,2038,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2032,R1,gasCCGT,2028,2.31150000000
+4,2034,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2036,R1,gasCCGT,2028,2.31150000000
+4,2038,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2032,R1,gasCCGT,2030,0.99560000000
+5,2034,R1,gasCCGT,2030,0.99560000000
+5,2035,R1,gasCCGT,2030,0.99560000000
+5,2036,R1,gasCCGT,2030,0.99560000000
+5,2038,R1,gasCCGT,2030,0.99560000000
+5,2040,R1,gasCCGT,2030,0.99560000000
+5,2045,R1,gasCCGT,2030,0.99560000000
+5,2046,R1,gasCCGT,2030,0.99560000000
+5,2047,R1,gasCCGT,2030,0.99560000000
+5,2050,R1,gasCCGT,2030,0.99560000000
+5,2058,R1,gasCCGT,2030,0.99560000000
+5,2059,R1,gasCCGT,2030,0.99560000000
+5,2060,R1,gasCCGT,2030,0.99560000000
+5,2061,R1,gasCCGT,2030,0.99560000000
+5,2062,R1,gasCCGT,2030,0.99560000000
+5,2063,R1,gasCCGT,2030,0.99560000000
+5,2064,R1,gasCCGT,2030,0.99560000000
+5,2065,R1,gasCCGT,2030,0.99560000000
+5,2066,R1,gasCCGT,2030,0.99560000000
+6,2034,R1,solarPV,2032,2.24000000000
+6,2035,R1,solarPV,2032,2.24000000000
+6,2036,R1,solarPV,2032,2.24000000000
+6,2038,R1,solarPV,2032,2.24000000000
+6,2040,R1,solarPV,2032,2.24000000000
+6,2045,R1,solarPV,2032,2.24000000000
+6,2046,R1,solarPV,2032,2.24000000000
+6,2047,R1,solarPV,2032,2.24000000000
+6,2050,R1,solarPV,2032,2.24000000000
+6,2058,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2034,2.24000000000
+7,2038,R1,solarPV,2034,2.24000000000
+7,2040,R1,solarPV,2034,2.24000000000
+7,2045,R1,solarPV,2034,2.24000000000
+7,2046,R1,solarPV,2034,2.24000000000
+7,2047,R1,solarPV,2034,2.24000000000
+7,2050,R1,solarPV,2034,2.24000000000
+7,2058,R1,solarPV,2034,2.24000000000
+7,2059,R1,solarPV,2034,2.24000000000
+7,2060,R1,solarPV,2034,2.24000000000
+8,2038,R1,solarPV,2036,2.24000000000
+8,2040,R1,solarPV,2036,2.24000000000
+8,2045,R1,solarPV,2036,2.24000000000
+8,2046,R1,solarPV,2036,2.24000000000
+8,2047,R1,solarPV,2036,2.24000000000
+8,2050,R1,solarPV,2036,2.24000000000
+8,2058,R1,solarPV,2036,2.24000000000
+8,2059,R1,solarPV,2036,2.24000000000
+8,2060,R1,solarPV,2036,2.24000000000
+8,2061,R1,solarPV,2036,2.24000000000
+8,2062,R1,solarPV,2036,2.24000000000
+9,2040,R1,solarPV,2038,2.24000000000
+9,2045,R1,solarPV,2038,2.24000000000
+9,2046,R1,solarPV,2038,2.24000000000
+9,2047,R1,solarPV,2038,2.24000000000
+9,2050,R1,solarPV,2038,2.24000000000
+9,2058,R1,solarPV,2038,2.24000000000
+9,2059,R1,solarPV,2038,2.24000000000
+9,2060,R1,solarPV,2038,2.24000000000
+9,2061,R1,solarPV,2038,2.24000000000
+9,2062,R1,solarPV,2038,2.24000000000
+9,2063,R1,solarPV,2038,2.24000000000
+9,2064,R1,solarPV,2038,2.24000000000
+10,2022,R1,windturbine,2020,8.77320000000
+10,2024,R1,windturbine,2020,8.77320000000
+10,2025,R1,windturbine,2020,8.77320000000
+10,2026,R1,windturbine,2020,8.77320000000
+10,2028,R1,windturbine,2020,8.77320000000
+10,2030,R1,windturbine,2020,8.77320000000
+10,2032,R1,windturbine,2020,8.77320000000
+10,2034,R1,windturbine,2020,8.77320000000
+10,2035,R1,windturbine,2020,8.77320000000
+10,2036,R1,windturbine,2020,8.77320000000
+10,2038,R1,windturbine,2020,8.77320000000
+10,2040,R1,windturbine,2020,8.77320000000
+10,2045,R1,windturbine,2020,8.77320000000
+10,2046,R1,windturbine,2020,8.77320000000
 11,2020,R2,gasCCGT,2020,1.00000000000
 11,2022,R2,gasCCGT,2020,1.00000000000
 11,2024,R2,gasCCGT,2020,1.00000000000
 11,2025,R2,gasCCGT,2020,1.00000000000
 11,2026,R2,gasCCGT,2020,0.80000000000
 11,2028,R2,gasCCGT,2020,0.40000000000
-12,2028,R2,solarPV,2026,5.16960000000
-12,2030,R2,solarPV,2026,5.16960000000
-12,2032,R2,solarPV,2026,5.16960000000
-12,2034,R2,solarPV,2026,5.16960000000
-12,2035,R2,solarPV,2026,5.16960000000
-12,2036,R2,solarPV,2026,5.16960000000
-12,2038,R2,solarPV,2026,5.16960000000
-12,2040,R2,solarPV,2026,5.16960000000
-12,2045,R2,solarPV,2026,5.16960000000
-12,2046,R2,solarPV,2026,5.16960000000
-12,2047,R2,solarPV,2026,5.16960000000
-12,2048,R2,solarPV,2026,5.16960000000
-12,2049,R2,solarPV,2026,5.16960000000
-12,2050,R2,solarPV,2026,5.16960000000
-12,2051,R2,solarPV,2026,5.16960000000
-12,2052,R2,solarPV,2026,5.16960000000
-13,2030,R2,solarPV,2028,5.20080000000
-13,2032,R2,solarPV,2028,5.20080000000
-13,2034,R2,solarPV,2028,5.20080000000
-13,2035,R2,solarPV,2028,5.20080000000
-13,2036,R2,solarPV,2028,5.20080000000
-13,2038,R2,solarPV,2028,5.20080000000
-13,2040,R2,solarPV,2028,5.20080000000
-13,2045,R2,solarPV,2028,5.20080000000
-13,2046,R2,solarPV,2028,5.20080000000
-13,2047,R2,solarPV,2028,5.20080000000
-13,2048,R2,solarPV,2028,5.20080000000
-13,2049,R2,solarPV,2028,5.20080000000
-13,2050,R2,solarPV,2028,5.20080000000
-13,2051,R2,solarPV,2028,5.20080000000
-13,2052,R2,solarPV,2028,5.20080000000
-13,2053,R2,solarPV,2028,5.20080000000
-13,2054,R2,solarPV,2028,5.20080000000
-14,2032,R2,solarPV,2030,2.24000000000
-14,2034,R2,solarPV,2030,2.24000000000
-14,2035,R2,solarPV,2030,2.24000000000
-14,2036,R2,solarPV,2030,2.24000000000
-14,2038,R2,solarPV,2030,2.24000000000
-14,2040,R2,solarPV,2030,2.24000000000
-14,2045,R2,solarPV,2030,2.24000000000
-14,2046,R2,solarPV,2030,2.24000000000
-14,2047,R2,solarPV,2030,2.24000000000
-14,2048,R2,solarPV,2030,2.24000000000
-14,2049,R2,solarPV,2030,2.24000000000
-14,2050,R2,solarPV,2030,2.24000000000
-14,2051,R2,solarPV,2030,2.24000000000
-14,2052,R2,solarPV,2030,2.24000000000
-14,2053,R2,solarPV,2030,2.24000000000
-14,2054,R2,solarPV,2030,2.24000000000
-14,2055,R2,solarPV,2030,2.24000000000
-14,2056,R2,solarPV,2030,2.24000000000
-15,2034,R2,solarPV,2032,2.24000000000
-15,2035,R2,solarPV,2032,2.24000000000
-15,2036,R2,solarPV,2032,2.24000000000
-15,2038,R2,solarPV,2032,2.24000000000
-15,2040,R2,solarPV,2032,2.24000000000
-15,2045,R2,solarPV,2032,2.24000000000
-15,2046,R2,solarPV,2032,2.24000000000
-15,2047,R2,solarPV,2032,2.24000000000
-15,2048,R2,solarPV,2032,2.24000000000
-15,2049,R2,solarPV,2032,2.24000000000
-15,2050,R2,solarPV,2032,2.24000000000
-15,2051,R2,solarPV,2032,2.24000000000
-15,2052,R2,solarPV,2032,2.24000000000
-15,2053,R2,solarPV,2032,2.24000000000
-15,2054,R2,solarPV,2032,2.24000000000
-15,2055,R2,solarPV,2032,2.24000000000
-15,2056,R2,solarPV,2032,2.24000000000
-15,2057,R2,solarPV,2032,2.24000000000
-15,2058,R2,solarPV,2032,2.24000000000
-16,2036,R2,solarPV,2034,2.24000000000
-16,2038,R2,solarPV,2034,2.24000000000
-16,2040,R2,solarPV,2034,2.24000000000
-16,2045,R2,solarPV,2034,2.24000000000
-16,2046,R2,solarPV,2034,2.24000000000
-16,2047,R2,solarPV,2034,2.24000000000
-16,2048,R2,solarPV,2034,2.24000000000
-16,2049,R2,solarPV,2034,2.24000000000
-16,2050,R2,solarPV,2034,2.24000000000
-16,2051,R2,solarPV,2034,2.24000000000
-16,2052,R2,solarPV,2034,2.24000000000
-16,2053,R2,solarPV,2034,2.24000000000
-16,2054,R2,solarPV,2034,2.24000000000
-16,2055,R2,solarPV,2034,2.24000000000
-16,2056,R2,solarPV,2034,2.24000000000
-16,2057,R2,solarPV,2034,2.24000000000
-16,2058,R2,solarPV,2034,2.24000000000
-16,2059,R2,solarPV,2034,2.24000000000
-16,2060,R2,solarPV,2034,2.24000000000
-17,2038,R2,solarPV,2036,2.24000000000
-17,2040,R2,solarPV,2036,2.24000000000
-17,2045,R2,solarPV,2036,2.24000000000
-17,2046,R2,solarPV,2036,2.24000000000
-17,2047,R2,solarPV,2036,2.24000000000
-17,2048,R2,solarPV,2036,2.24000000000
-17,2049,R2,solarPV,2036,2.24000000000
-17,2050,R2,solarPV,2036,2.24000000000
-17,2051,R2,solarPV,2036,2.24000000000
-17,2052,R2,solarPV,2036,2.24000000000
-17,2053,R2,solarPV,2036,2.24000000000
-17,2054,R2,solarPV,2036,2.24000000000
-17,2055,R2,solarPV,2036,2.24000000000
-17,2056,R2,solarPV,2036,2.24000000000
-17,2057,R2,solarPV,2036,2.24000000000
-17,2058,R2,solarPV,2036,2.24000000000
-17,2059,R2,solarPV,2036,2.24000000000
-17,2060,R2,solarPV,2036,2.24000000000
-17,2061,R2,solarPV,2036,2.24000000000
-17,2062,R2,solarPV,2036,2.24000000000
-18,2040,R2,solarPV,2038,2.24000000000
-18,2045,R2,solarPV,2038,2.24000000000
-18,2046,R2,solarPV,2038,2.24000000000
-18,2047,R2,solarPV,2038,2.24000000000
-18,2048,R2,solarPV,2038,2.24000000000
-18,2049,R2,solarPV,2038,2.24000000000
-18,2050,R2,solarPV,2038,2.24000000000
-18,2051,R2,solarPV,2038,2.24000000000
-18,2052,R2,solarPV,2038,2.24000000000
-18,2053,R2,solarPV,2038,2.24000000000
-18,2054,R2,solarPV,2038,2.24000000000
-18,2055,R2,solarPV,2038,2.24000000000
-18,2056,R2,solarPV,2038,2.24000000000
-18,2057,R2,solarPV,2038,2.24000000000
-18,2058,R2,solarPV,2038,2.24000000000
-18,2059,R2,solarPV,2038,2.24000000000
-18,2060,R2,solarPV,2038,2.24000000000
-18,2061,R2,solarPV,2038,2.24000000000
-18,2062,R2,solarPV,2038,2.24000000000
-18,2063,R2,solarPV,2038,2.24000000000
-18,2064,R2,solarPV,2038,2.24000000000
-19,2022,R2,windturbine,2020,8.77320000000
-19,2024,R2,windturbine,2020,8.77320000000
-19,2025,R2,windturbine,2020,8.77320000000
-19,2026,R2,windturbine,2020,8.77320000000
-19,2028,R2,windturbine,2020,8.77320000000
-19,2030,R2,windturbine,2020,8.77320000000
-19,2032,R2,windturbine,2020,8.77320000000
-19,2034,R2,windturbine,2020,8.77320000000
-19,2035,R2,windturbine,2020,8.77320000000
-19,2036,R2,windturbine,2020,8.77320000000
-19,2038,R2,windturbine,2020,8.77320000000
-19,2040,R2,windturbine,2020,8.77320000000
-19,2045,R2,windturbine,2020,8.77320000000
-19,2046,R2,windturbine,2020,8.77320000000
-20,2024,R2,windturbine,2022,4.17680000000
-20,2025,R2,windturbine,2022,4.17680000000
-20,2026,R2,windturbine,2022,4.17680000000
-20,2028,R2,windturbine,2022,4.17680000000
-20,2030,R2,windturbine,2022,4.17680000000
-20,2032,R2,windturbine,2022,4.17680000000
-20,2034,R2,windturbine,2022,4.17680000000
-20,2035,R2,windturbine,2022,4.17680000000
-20,2036,R2,windturbine,2022,4.17680000000
-20,2038,R2,windturbine,2022,4.17680000000
-20,2040,R2,windturbine,2022,4.17680000000
-20,2045,R2,windturbine,2022,4.17680000000
-20,2046,R2,windturbine,2022,4.17680000000
-20,2047,R2,windturbine,2022,4.17680000000
-20,2048,R2,windturbine,2022,4.17680000000
-21,2026,R2,windturbine,2024,4.67960000000
-21,2028,R2,windturbine,2024,4.67960000000
-21,2030,R2,windturbine,2024,4.67960000000
-21,2032,R2,windturbine,2024,4.67960000000
-21,2034,R2,windturbine,2024,4.67960000000
-21,2035,R2,windturbine,2024,4.67960000000
-21,2036,R2,windturbine,2024,4.67960000000
-21,2038,R2,windturbine,2024,4.67960000000
-21,2040,R2,windturbine,2024,4.67960000000
-21,2045,R2,windturbine,2024,4.67960000000
-21,2046,R2,windturbine,2024,4.67960000000
-21,2047,R2,windturbine,2024,4.67960000000
-21,2048,R2,windturbine,2024,4.67960000000
-21,2049,R2,windturbine,2024,4.67960000000
-21,2050,R2,windturbine,2024,4.67960000000
+12,2024,R2,gasCCGT,2022,1.85640000000
+12,2025,R2,gasCCGT,2022,1.85640000000
+12,2026,R2,gasCCGT,2022,1.85640000000
+12,2028,R2,gasCCGT,2022,1.85640000000
+12,2030,R2,gasCCGT,2022,1.85640000000
+12,2032,R2,gasCCGT,2022,1.85640000000
+12,2034,R2,gasCCGT,2022,1.85640000000
+12,2035,R2,gasCCGT,2022,1.85640000000
+12,2036,R2,gasCCGT,2022,1.85640000000
+12,2038,R2,gasCCGT,2022,1.85640000000
+12,2040,R2,gasCCGT,2022,1.85640000000
+12,2045,R2,gasCCGT,2022,1.85640000000
+12,2046,R2,gasCCGT,2022,1.85640000000
+12,2047,R2,gasCCGT,2022,1.85640000000
+12,2050,R2,gasCCGT,2022,1.85640000000
+12,2058,R2,gasCCGT,2022,1.85640000000
+13,2026,R2,gasCCGT,2024,2.07980000000
+13,2028,R2,gasCCGT,2024,2.07980000000
+13,2030,R2,gasCCGT,2024,2.07980000000
+13,2032,R2,gasCCGT,2024,2.07980000000
+13,2034,R2,gasCCGT,2024,2.07980000000
+13,2035,R2,gasCCGT,2024,2.07980000000
+13,2036,R2,gasCCGT,2024,2.07980000000
+13,2038,R2,gasCCGT,2024,2.07980000000
+13,2040,R2,gasCCGT,2024,2.07980000000
+13,2045,R2,gasCCGT,2024,2.07980000000
+13,2046,R2,gasCCGT,2024,2.07980000000
+13,2047,R2,gasCCGT,2024,2.07980000000
+13,2050,R2,gasCCGT,2024,2.07980000000
+13,2058,R2,gasCCGT,2024,2.07980000000
+13,2059,R2,gasCCGT,2024,2.07980000000
+13,2060,R2,gasCCGT,2024,2.07980000000
+14,2028,R2,gasCCGT,2026,2.29760000000
+14,2030,R2,gasCCGT,2026,2.29760000000
+14,2032,R2,gasCCGT,2026,2.29760000000
+14,2034,R2,gasCCGT,2026,2.29760000000
+14,2035,R2,gasCCGT,2026,2.29760000000
+14,2036,R2,gasCCGT,2026,2.29760000000
+14,2038,R2,gasCCGT,2026,2.29760000000
+14,2040,R2,gasCCGT,2026,2.29760000000
+14,2045,R2,gasCCGT,2026,2.29760000000
+14,2046,R2,gasCCGT,2026,2.29760000000
+14,2047,R2,gasCCGT,2026,2.29760000000
+14,2050,R2,gasCCGT,2026,2.29760000000
+14,2058,R2,gasCCGT,2026,2.29760000000
+14,2059,R2,gasCCGT,2026,2.29760000000
+14,2060,R2,gasCCGT,2026,2.29760000000
+14,2061,R2,gasCCGT,2026,2.29760000000
+14,2062,R2,gasCCGT,2026,2.29760000000
+15,2030,R2,gasCCGT,2028,2.31150000000
+15,2032,R2,gasCCGT,2028,2.31150000000
+15,2034,R2,gasCCGT,2028,2.31150000000
+15,2035,R2,gasCCGT,2028,2.31150000000
+15,2036,R2,gasCCGT,2028,2.31150000000
+15,2038,R2,gasCCGT,2028,2.31150000000
+15,2040,R2,gasCCGT,2028,2.31150000000
+15,2045,R2,gasCCGT,2028,2.31150000000
+15,2046,R2,gasCCGT,2028,2.31150000000
+15,2047,R2,gasCCGT,2028,2.31150000000
+15,2050,R2,gasCCGT,2028,2.31150000000
+15,2058,R2,gasCCGT,2028,2.31150000000
+15,2059,R2,gasCCGT,2028,2.31150000000
+15,2060,R2,gasCCGT,2028,2.31150000000
+15,2061,R2,gasCCGT,2028,2.31150000000
+15,2062,R2,gasCCGT,2028,2.31150000000
+15,2063,R2,gasCCGT,2028,2.31150000000
+15,2064,R2,gasCCGT,2028,2.31150000000
+16,2032,R2,gasCCGT,2030,0.99560000000
+16,2034,R2,gasCCGT,2030,0.99560000000
+16,2035,R2,gasCCGT,2030,0.99560000000
+16,2036,R2,gasCCGT,2030,0.99560000000
+16,2038,R2,gasCCGT,2030,0.99560000000
+16,2040,R2,gasCCGT,2030,0.99560000000
+16,2045,R2,gasCCGT,2030,0.99560000000
+16,2046,R2,gasCCGT,2030,0.99560000000
+16,2047,R2,gasCCGT,2030,0.99560000000
+16,2050,R2,gasCCGT,2030,0.99560000000
+16,2058,R2,gasCCGT,2030,0.99560000000
+16,2059,R2,gasCCGT,2030,0.99560000000
+16,2060,R2,gasCCGT,2030,0.99560000000
+16,2061,R2,gasCCGT,2030,0.99560000000
+16,2062,R2,gasCCGT,2030,0.99560000000
+16,2063,R2,gasCCGT,2030,0.99560000000
+16,2064,R2,gasCCGT,2030,0.99560000000
+16,2065,R2,gasCCGT,2030,0.99560000000
+16,2066,R2,gasCCGT,2030,0.99560000000
+17,2034,R2,solarPV,2032,2.24000000000
+17,2035,R2,solarPV,2032,2.24000000000
+17,2036,R2,solarPV,2032,2.24000000000
+17,2038,R2,solarPV,2032,2.24000000000
+17,2040,R2,solarPV,2032,2.24000000000
+17,2045,R2,solarPV,2032,2.24000000000
+17,2046,R2,solarPV,2032,2.24000000000
+17,2047,R2,solarPV,2032,2.24000000000
+17,2050,R2,solarPV,2032,2.24000000000
+17,2058,R2,solarPV,2032,2.24000000000
+18,2036,R2,solarPV,2034,2.24000000000
+18,2038,R2,solarPV,2034,2.24000000000
+18,2040,R2,solarPV,2034,2.24000000000
+18,2045,R2,solarPV,2034,2.24000000000
+18,2046,R2,solarPV,2034,2.24000000000
+18,2047,R2,solarPV,2034,2.24000000000
+18,2050,R2,solarPV,2034,2.24000000000
+18,2058,R2,solarPV,2034,2.24000000000
+18,2059,R2,solarPV,2034,2.24000000000
+18,2060,R2,solarPV,2034,2.24000000000
+19,2038,R2,solarPV,2036,2.24000000000
+19,2040,R2,solarPV,2036,2.24000000000
+19,2045,R2,solarPV,2036,2.24000000000
+19,2046,R2,solarPV,2036,2.24000000000
+19,2047,R2,solarPV,2036,2.24000000000
+19,2050,R2,solarPV,2036,2.24000000000
+19,2058,R2,solarPV,2036,2.24000000000
+19,2059,R2,solarPV,2036,2.24000000000
+19,2060,R2,solarPV,2036,2.24000000000
+19,2061,R2,solarPV,2036,2.24000000000
+19,2062,R2,solarPV,2036,2.24000000000
+20,2040,R2,solarPV,2038,2.24000000000
+20,2045,R2,solarPV,2038,2.24000000000
+20,2046,R2,solarPV,2038,2.24000000000
+20,2047,R2,solarPV,2038,2.24000000000
+20,2050,R2,solarPV,2038,2.24000000000
+20,2058,R2,solarPV,2038,2.24000000000
+20,2059,R2,solarPV,2038,2.24000000000
+20,2060,R2,solarPV,2038,2.24000000000
+20,2061,R2,solarPV,2038,2.24000000000
+20,2062,R2,solarPV,2038,2.24000000000
+20,2063,R2,solarPV,2038,2.24000000000
+20,2064,R2,solarPV,2038,2.24000000000
+21,2022,R2,windturbine,2020,8.77320000000
+21,2024,R2,windturbine,2020,8.77320000000
+21,2025,R2,windturbine,2020,8.77320000000
+21,2026,R2,windturbine,2020,8.77320000000
+21,2028,R2,windturbine,2020,8.77320000000
+21,2030,R2,windturbine,2020,8.77320000000
+21,2032,R2,windturbine,2020,8.77320000000
+21,2034,R2,windturbine,2020,8.77320000000
+21,2035,R2,windturbine,2020,8.77320000000
+21,2036,R2,windturbine,2020,8.77320000000
+21,2038,R2,windturbine,2020,8.77320000000
+21,2040,R2,windturbine,2020,8.77320000000
+21,2045,R2,windturbine,2020,8.77320000000
+21,2046,R2,windturbine,2020,8.77320000000
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 48651a6e..4e21eb63 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
@@ -5,423 +5,343 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
 0,2026,R1,gasCCGT,2020,0.80000000000
 0,2028,R1,gasCCGT,2020,0.40000000000
-1,2028,R1,solarPV,2026,5.16960000000
-1,2030,R1,solarPV,2026,5.16960000000
-1,2032,R1,solarPV,2026,5.16960000000
-1,2034,R1,solarPV,2026,5.16960000000
-1,2035,R1,solarPV,2026,5.16960000000
-1,2036,R1,solarPV,2026,5.16960000000
-1,2038,R1,solarPV,2026,5.16960000000
-1,2040,R1,solarPV,2026,5.16960000000
-1,2042,R1,solarPV,2026,5.16960000000
-1,2045,R1,solarPV,2026,5.16960000000
-1,2046,R1,solarPV,2026,5.16960000000
-1,2047,R1,solarPV,2026,5.16960000000
-1,2048,R1,solarPV,2026,5.16960000000
-1,2049,R1,solarPV,2026,5.16960000000
-1,2050,R1,solarPV,2026,5.16960000000
-1,2051,R1,solarPV,2026,5.16960000000
-1,2052,R1,solarPV,2026,5.16960000000
-2,2030,R1,solarPV,2028,5.20080000000
-2,2032,R1,solarPV,2028,5.20080000000
-2,2034,R1,solarPV,2028,5.20080000000
-2,2035,R1,solarPV,2028,5.20080000000
-2,2036,R1,solarPV,2028,5.20080000000
-2,2038,R1,solarPV,2028,5.20080000000
-2,2040,R1,solarPV,2028,5.20080000000
-2,2042,R1,solarPV,2028,5.20080000000
-2,2045,R1,solarPV,2028,5.20080000000
-2,2046,R1,solarPV,2028,5.20080000000
-2,2047,R1,solarPV,2028,5.20080000000
-2,2048,R1,solarPV,2028,5.20080000000
-2,2049,R1,solarPV,2028,5.20080000000
-2,2050,R1,solarPV,2028,5.20080000000
-2,2051,R1,solarPV,2028,5.20080000000
-2,2052,R1,solarPV,2028,5.20080000000
-2,2053,R1,solarPV,2028,5.20080000000
-2,2054,R1,solarPV,2028,5.20080000000
-3,2032,R1,solarPV,2030,2.24000000000
-3,2034,R1,solarPV,2030,2.24000000000
-3,2035,R1,solarPV,2030,2.24000000000
-3,2036,R1,solarPV,2030,2.24000000000
-3,2038,R1,solarPV,2030,2.24000000000
-3,2040,R1,solarPV,2030,2.24000000000
-3,2042,R1,solarPV,2030,2.24000000000
-3,2045,R1,solarPV,2030,2.24000000000
-3,2046,R1,solarPV,2030,2.24000000000
-3,2047,R1,solarPV,2030,2.24000000000
-3,2048,R1,solarPV,2030,2.24000000000
-3,2049,R1,solarPV,2030,2.24000000000
-3,2050,R1,solarPV,2030,2.24000000000
-3,2051,R1,solarPV,2030,2.24000000000
-3,2052,R1,solarPV,2030,2.24000000000
-3,2053,R1,solarPV,2030,2.24000000000
-3,2054,R1,solarPV,2030,2.24000000000
-3,2055,R1,solarPV,2030,2.24000000000
-3,2056,R1,solarPV,2030,2.24000000000
-4,2034,R1,solarPV,2032,2.24000000000
-4,2035,R1,solarPV,2032,2.24000000000
-4,2036,R1,solarPV,2032,2.24000000000
-4,2038,R1,solarPV,2032,2.24000000000
-4,2040,R1,solarPV,2032,2.24000000000
-4,2042,R1,solarPV,2032,2.24000000000
-4,2045,R1,solarPV,2032,2.24000000000
-4,2046,R1,solarPV,2032,2.24000000000
-4,2047,R1,solarPV,2032,2.24000000000
-4,2048,R1,solarPV,2032,2.24000000000
-4,2049,R1,solarPV,2032,2.24000000000
-4,2050,R1,solarPV,2032,2.24000000000
-4,2051,R1,solarPV,2032,2.24000000000
-4,2052,R1,solarPV,2032,2.24000000000
-4,2053,R1,solarPV,2032,2.24000000000
-4,2054,R1,solarPV,2032,2.24000000000
-4,2055,R1,solarPV,2032,2.24000000000
-4,2056,R1,solarPV,2032,2.24000000000
-4,2057,R1,solarPV,2032,2.24000000000
-4,2058,R1,solarPV,2032,2.24000000000
-5,2036,R1,solarPV,2034,2.24000000000
-5,2038,R1,solarPV,2034,2.24000000000
-5,2040,R1,solarPV,2034,2.24000000000
-5,2042,R1,solarPV,2034,2.24000000000
-5,2045,R1,solarPV,2034,2.24000000000
-5,2046,R1,solarPV,2034,2.24000000000
-5,2047,R1,solarPV,2034,2.24000000000
-5,2048,R1,solarPV,2034,2.24000000000
-5,2049,R1,solarPV,2034,2.24000000000
-5,2050,R1,solarPV,2034,2.24000000000
-5,2051,R1,solarPV,2034,2.24000000000
-5,2052,R1,solarPV,2034,2.24000000000
-5,2053,R1,solarPV,2034,2.24000000000
-5,2054,R1,solarPV,2034,2.24000000000
-5,2055,R1,solarPV,2034,2.24000000000
-5,2056,R1,solarPV,2034,2.24000000000
-5,2057,R1,solarPV,2034,2.24000000000
-5,2058,R1,solarPV,2034,2.24000000000
-5,2059,R1,solarPV,2034,2.24000000000
-5,2060,R1,solarPV,2034,2.24000000000
-6,2038,R1,solarPV,2036,2.24000000000
-6,2040,R1,solarPV,2036,2.24000000000
-6,2042,R1,solarPV,2036,2.24000000000
-6,2045,R1,solarPV,2036,2.24000000000
-6,2046,R1,solarPV,2036,2.24000000000
-6,2047,R1,solarPV,2036,2.24000000000
-6,2048,R1,solarPV,2036,2.24000000000
-6,2049,R1,solarPV,2036,2.24000000000
-6,2050,R1,solarPV,2036,2.24000000000
-6,2051,R1,solarPV,2036,2.24000000000
-6,2052,R1,solarPV,2036,2.24000000000
-6,2053,R1,solarPV,2036,2.24000000000
-6,2054,R1,solarPV,2036,2.24000000000
-6,2055,R1,solarPV,2036,2.24000000000
-6,2056,R1,solarPV,2036,2.24000000000
-6,2057,R1,solarPV,2036,2.24000000000
-6,2058,R1,solarPV,2036,2.24000000000
-6,2059,R1,solarPV,2036,2.24000000000
-6,2060,R1,solarPV,2036,2.24000000000
-6,2061,R1,solarPV,2036,2.24000000000
-6,2062,R1,solarPV,2036,2.24000000000
-7,2040,R1,solarPV,2038,2.24000000000
-7,2042,R1,solarPV,2038,2.24000000000
-7,2045,R1,solarPV,2038,2.24000000000
-7,2046,R1,solarPV,2038,2.24000000000
-7,2047,R1,solarPV,2038,2.24000000000
-7,2048,R1,solarPV,2038,2.24000000000
-7,2049,R1,solarPV,2038,2.24000000000
-7,2050,R1,solarPV,2038,2.24000000000
-7,2051,R1,solarPV,2038,2.24000000000
-7,2052,R1,solarPV,2038,2.24000000000
-7,2053,R1,solarPV,2038,2.24000000000
-7,2054,R1,solarPV,2038,2.24000000000
-7,2055,R1,solarPV,2038,2.24000000000
-7,2056,R1,solarPV,2038,2.24000000000
-7,2057,R1,solarPV,2038,2.24000000000
-7,2058,R1,solarPV,2038,2.24000000000
-7,2059,R1,solarPV,2038,2.24000000000
-7,2060,R1,solarPV,2038,2.24000000000
-7,2061,R1,solarPV,2038,2.24000000000
-7,2062,R1,solarPV,2038,2.24000000000
-7,2063,R1,solarPV,2038,2.24000000000
-7,2064,R1,solarPV,2038,2.24000000000
-8,2042,R1,solarPV,2040,2.24000000000
-8,2045,R1,solarPV,2040,2.24000000000
-8,2046,R1,solarPV,2040,2.24000000000
-8,2047,R1,solarPV,2040,2.24000000000
-8,2048,R1,solarPV,2040,2.24000000000
-8,2049,R1,solarPV,2040,2.24000000000
-8,2050,R1,solarPV,2040,2.24000000000
-8,2051,R1,solarPV,2040,2.24000000000
-8,2052,R1,solarPV,2040,2.24000000000
-8,2053,R1,solarPV,2040,2.24000000000
-8,2054,R1,solarPV,2040,2.24000000000
-8,2055,R1,solarPV,2040,2.24000000000
-8,2056,R1,solarPV,2040,2.24000000000
-8,2057,R1,solarPV,2040,2.24000000000
-8,2058,R1,solarPV,2040,2.24000000000
-8,2059,R1,solarPV,2040,2.24000000000
-8,2060,R1,solarPV,2040,2.24000000000
-8,2061,R1,solarPV,2040,2.24000000000
-8,2062,R1,solarPV,2040,2.24000000000
-8,2063,R1,solarPV,2040,2.24000000000
-8,2064,R1,solarPV,2040,2.24000000000
-8,2065,R1,solarPV,2040,2.24000000000
-8,2066,R1,solarPV,2040,2.24000000000
-9,2022,R1,windturbine,2020,8.77320000000
-9,2024,R1,windturbine,2020,8.77320000000
-9,2025,R1,windturbine,2020,8.77320000000
-9,2026,R1,windturbine,2020,8.77320000000
-9,2028,R1,windturbine,2020,8.77320000000
-9,2030,R1,windturbine,2020,8.77320000000
-9,2032,R1,windturbine,2020,8.77320000000
-9,2034,R1,windturbine,2020,8.77320000000
-9,2035,R1,windturbine,2020,8.77320000000
-9,2036,R1,windturbine,2020,8.77320000000
-9,2038,R1,windturbine,2020,8.77320000000
-9,2040,R1,windturbine,2020,8.77320000000
-9,2042,R1,windturbine,2020,8.77320000000
-9,2045,R1,windturbine,2020,8.77320000000
-9,2046,R1,windturbine,2020,8.77320000000
-10,2024,R1,windturbine,2022,4.17680000000
-10,2025,R1,windturbine,2022,4.17680000000
-10,2026,R1,windturbine,2022,4.17680000000
-10,2028,R1,windturbine,2022,4.17680000000
-10,2030,R1,windturbine,2022,4.17680000000
-10,2032,R1,windturbine,2022,4.17680000000
-10,2034,R1,windturbine,2022,4.17680000000
-10,2035,R1,windturbine,2022,4.17680000000
-10,2036,R1,windturbine,2022,4.17680000000
-10,2038,R1,windturbine,2022,4.17680000000
-10,2040,R1,windturbine,2022,4.17680000000
-10,2042,R1,windturbine,2022,4.17680000000
-10,2045,R1,windturbine,2022,4.17680000000
-10,2046,R1,windturbine,2022,4.17680000000
-10,2047,R1,windturbine,2022,4.17680000000
-10,2048,R1,windturbine,2022,4.17680000000
-11,2026,R1,windturbine,2024,4.67960000000
-11,2028,R1,windturbine,2024,4.67960000000
-11,2030,R1,windturbine,2024,4.67960000000
-11,2032,R1,windturbine,2024,4.67960000000
-11,2034,R1,windturbine,2024,4.67960000000
-11,2035,R1,windturbine,2024,4.67960000000
-11,2036,R1,windturbine,2024,4.67960000000
-11,2038,R1,windturbine,2024,4.67960000000
-11,2040,R1,windturbine,2024,4.67960000000
-11,2042,R1,windturbine,2024,4.67960000000
-11,2045,R1,windturbine,2024,4.67960000000
-11,2046,R1,windturbine,2024,4.67960000000
-11,2047,R1,windturbine,2024,4.67960000000
-11,2048,R1,windturbine,2024,4.67960000000
-11,2049,R1,windturbine,2024,4.67960000000
-11,2050,R1,windturbine,2024,4.67960000000
+1,2024,R1,gasCCGT,2022,1.85640000000
+1,2025,R1,gasCCGT,2022,1.85640000000
+1,2026,R1,gasCCGT,2022,1.85640000000
+1,2028,R1,gasCCGT,2022,1.85640000000
+1,2030,R1,gasCCGT,2022,1.85640000000
+1,2032,R1,gasCCGT,2022,1.85640000000
+1,2034,R1,gasCCGT,2022,1.85640000000
+1,2035,R1,gasCCGT,2022,1.85640000000
+1,2036,R1,gasCCGT,2022,1.85640000000
+1,2038,R1,gasCCGT,2022,1.85640000000
+1,2040,R1,gasCCGT,2022,1.85640000000
+1,2042,R1,gasCCGT,2022,1.85640000000
+1,2045,R1,gasCCGT,2022,1.85640000000
+1,2046,R1,gasCCGT,2022,1.85640000000
+1,2047,R1,gasCCGT,2022,1.85640000000
+1,2050,R1,gasCCGT,2022,1.85640000000
+1,2058,R1,gasCCGT,2022,1.85640000000
+2,2026,R1,gasCCGT,2024,2.07980000000
+2,2028,R1,gasCCGT,2024,2.07980000000
+2,2030,R1,gasCCGT,2024,2.07980000000
+2,2032,R1,gasCCGT,2024,2.07980000000
+2,2034,R1,gasCCGT,2024,2.07980000000
+2,2035,R1,gasCCGT,2024,2.07980000000
+2,2036,R1,gasCCGT,2024,2.07980000000
+2,2038,R1,gasCCGT,2024,2.07980000000
+2,2040,R1,gasCCGT,2024,2.07980000000
+2,2042,R1,gasCCGT,2024,2.07980000000
+2,2045,R1,gasCCGT,2024,2.07980000000
+2,2046,R1,gasCCGT,2024,2.07980000000
+2,2047,R1,gasCCGT,2024,2.07980000000
+2,2050,R1,gasCCGT,2024,2.07980000000
+2,2058,R1,gasCCGT,2024,2.07980000000
+2,2059,R1,gasCCGT,2024,2.07980000000
+2,2060,R1,gasCCGT,2024,2.07980000000
+3,2028,R1,gasCCGT,2026,2.29760000000
+3,2030,R1,gasCCGT,2026,2.29760000000
+3,2032,R1,gasCCGT,2026,2.29760000000
+3,2034,R1,gasCCGT,2026,2.29760000000
+3,2035,R1,gasCCGT,2026,2.29760000000
+3,2036,R1,gasCCGT,2026,2.29760000000
+3,2038,R1,gasCCGT,2026,2.29760000000
+3,2040,R1,gasCCGT,2026,2.29760000000
+3,2042,R1,gasCCGT,2026,2.29760000000
+3,2045,R1,gasCCGT,2026,2.29760000000
+3,2046,R1,gasCCGT,2026,2.29760000000
+3,2047,R1,gasCCGT,2026,2.29760000000
+3,2050,R1,gasCCGT,2026,2.29760000000
+3,2058,R1,gasCCGT,2026,2.29760000000
+3,2059,R1,gasCCGT,2026,2.29760000000
+3,2060,R1,gasCCGT,2026,2.29760000000
+3,2061,R1,gasCCGT,2026,2.29760000000
+3,2062,R1,gasCCGT,2026,2.29760000000
+4,2030,R1,gasCCGT,2028,2.31150000000
+4,2032,R1,gasCCGT,2028,2.31150000000
+4,2034,R1,gasCCGT,2028,2.31150000000
+4,2035,R1,gasCCGT,2028,2.31150000000
+4,2036,R1,gasCCGT,2028,2.31150000000
+4,2038,R1,gasCCGT,2028,2.31150000000
+4,2040,R1,gasCCGT,2028,2.31150000000
+4,2042,R1,gasCCGT,2028,2.31150000000
+4,2045,R1,gasCCGT,2028,2.31150000000
+4,2046,R1,gasCCGT,2028,2.31150000000
+4,2047,R1,gasCCGT,2028,2.31150000000
+4,2050,R1,gasCCGT,2028,2.31150000000
+4,2058,R1,gasCCGT,2028,2.31150000000
+4,2059,R1,gasCCGT,2028,2.31150000000
+4,2060,R1,gasCCGT,2028,2.31150000000
+4,2061,R1,gasCCGT,2028,2.31150000000
+4,2062,R1,gasCCGT,2028,2.31150000000
+4,2063,R1,gasCCGT,2028,2.31150000000
+4,2064,R1,gasCCGT,2028,2.31150000000
+5,2032,R1,gasCCGT,2030,0.99560000000
+5,2034,R1,gasCCGT,2030,0.99560000000
+5,2035,R1,gasCCGT,2030,0.99560000000
+5,2036,R1,gasCCGT,2030,0.99560000000
+5,2038,R1,gasCCGT,2030,0.99560000000
+5,2040,R1,gasCCGT,2030,0.99560000000
+5,2042,R1,gasCCGT,2030,0.99560000000
+5,2045,R1,gasCCGT,2030,0.99560000000
+5,2046,R1,gasCCGT,2030,0.99560000000
+5,2047,R1,gasCCGT,2030,0.99560000000
+5,2050,R1,gasCCGT,2030,0.99560000000
+5,2058,R1,gasCCGT,2030,0.99560000000
+5,2059,R1,gasCCGT,2030,0.99560000000
+5,2060,R1,gasCCGT,2030,0.99560000000
+5,2061,R1,gasCCGT,2030,0.99560000000
+5,2062,R1,gasCCGT,2030,0.99560000000
+5,2063,R1,gasCCGT,2030,0.99560000000
+5,2064,R1,gasCCGT,2030,0.99560000000
+5,2065,R1,gasCCGT,2030,0.99560000000
+5,2066,R1,gasCCGT,2030,0.99560000000
+6,2034,R1,solarPV,2032,2.24000000000
+6,2035,R1,solarPV,2032,2.24000000000
+6,2036,R1,solarPV,2032,2.24000000000
+6,2038,R1,solarPV,2032,2.24000000000
+6,2040,R1,solarPV,2032,2.24000000000
+6,2042,R1,solarPV,2032,2.24000000000
+6,2045,R1,solarPV,2032,2.24000000000
+6,2046,R1,solarPV,2032,2.24000000000
+6,2047,R1,solarPV,2032,2.24000000000
+6,2050,R1,solarPV,2032,2.24000000000
+6,2058,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2034,2.24000000000
+7,2038,R1,solarPV,2034,2.24000000000
+7,2040,R1,solarPV,2034,2.24000000000
+7,2042,R1,solarPV,2034,2.24000000000
+7,2045,R1,solarPV,2034,2.24000000000
+7,2046,R1,solarPV,2034,2.24000000000
+7,2047,R1,solarPV,2034,2.24000000000
+7,2050,R1,solarPV,2034,2.24000000000
+7,2058,R1,solarPV,2034,2.24000000000
+7,2059,R1,solarPV,2034,2.24000000000
+7,2060,R1,solarPV,2034,2.24000000000
+8,2038,R1,solarPV,2036,2.24000000000
+8,2040,R1,solarPV,2036,2.24000000000
+8,2042,R1,solarPV,2036,2.24000000000
+8,2045,R1,solarPV,2036,2.24000000000
+8,2046,R1,solarPV,2036,2.24000000000
+8,2047,R1,solarPV,2036,2.24000000000
+8,2050,R1,solarPV,2036,2.24000000000
+8,2058,R1,solarPV,2036,2.24000000000
+8,2059,R1,solarPV,2036,2.24000000000
+8,2060,R1,solarPV,2036,2.24000000000
+8,2061,R1,solarPV,2036,2.24000000000
+8,2062,R1,solarPV,2036,2.24000000000
+9,2040,R1,solarPV,2038,2.24000000000
+9,2042,R1,solarPV,2038,2.24000000000
+9,2045,R1,solarPV,2038,2.24000000000
+9,2046,R1,solarPV,2038,2.24000000000
+9,2047,R1,solarPV,2038,2.24000000000
+9,2050,R1,solarPV,2038,2.24000000000
+9,2058,R1,solarPV,2038,2.24000000000
+9,2059,R1,solarPV,2038,2.24000000000
+9,2060,R1,solarPV,2038,2.24000000000
+9,2061,R1,solarPV,2038,2.24000000000
+9,2062,R1,solarPV,2038,2.24000000000
+9,2063,R1,solarPV,2038,2.24000000000
+9,2064,R1,solarPV,2038,2.24000000000
+10,2042,R1,solarPV,2040,2.24000000000
+10,2045,R1,solarPV,2040,2.24000000000
+10,2046,R1,solarPV,2040,2.24000000000
+10,2047,R1,solarPV,2040,2.24000000000
+10,2050,R1,solarPV,2040,2.24000000000
+10,2058,R1,solarPV,2040,2.24000000000
+10,2059,R1,solarPV,2040,2.24000000000
+10,2060,R1,solarPV,2040,2.24000000000
+10,2061,R1,solarPV,2040,2.24000000000
+10,2062,R1,solarPV,2040,2.24000000000
+10,2063,R1,solarPV,2040,2.24000000000
+10,2064,R1,solarPV,2040,2.24000000000
+10,2065,R1,solarPV,2040,2.24000000000
+10,2066,R1,solarPV,2040,2.24000000000
+11,2022,R1,windturbine,2020,8.77320000000
+11,2024,R1,windturbine,2020,8.77320000000
+11,2025,R1,windturbine,2020,8.77320000000
+11,2026,R1,windturbine,2020,8.77320000000
+11,2028,R1,windturbine,2020,8.77320000000
+11,2030,R1,windturbine,2020,8.77320000000
+11,2032,R1,windturbine,2020,8.77320000000
+11,2034,R1,windturbine,2020,8.77320000000
+11,2035,R1,windturbine,2020,8.77320000000
+11,2036,R1,windturbine,2020,8.77320000000
+11,2038,R1,windturbine,2020,8.77320000000
+11,2040,R1,windturbine,2020,8.77320000000
+11,2042,R1,windturbine,2020,8.77320000000
+11,2045,R1,windturbine,2020,8.77320000000
+11,2046,R1,windturbine,2020,8.77320000000
 12,2020,R2,gasCCGT,2020,1.00000000000
 12,2022,R2,gasCCGT,2020,1.00000000000
 12,2024,R2,gasCCGT,2020,1.00000000000
 12,2025,R2,gasCCGT,2020,1.00000000000
 12,2026,R2,gasCCGT,2020,0.80000000000
 12,2028,R2,gasCCGT,2020,0.40000000000
-13,2028,R2,solarPV,2026,5.16960000000
-13,2030,R2,solarPV,2026,5.16960000000
-13,2032,R2,solarPV,2026,5.16960000000
-13,2034,R2,solarPV,2026,5.16960000000
-13,2035,R2,solarPV,2026,5.16960000000
-13,2036,R2,solarPV,2026,5.16960000000
-13,2038,R2,solarPV,2026,5.16960000000
-13,2040,R2,solarPV,2026,5.16960000000
-13,2042,R2,solarPV,2026,5.16960000000
-13,2045,R2,solarPV,2026,5.16960000000
-13,2046,R2,solarPV,2026,5.16960000000
-13,2047,R2,solarPV,2026,5.16960000000
-13,2048,R2,solarPV,2026,5.16960000000
-13,2049,R2,solarPV,2026,5.16960000000
-13,2050,R2,solarPV,2026,5.16960000000
-13,2051,R2,solarPV,2026,5.16960000000
-13,2052,R2,solarPV,2026,5.16960000000
-14,2030,R2,solarPV,2028,5.20080000000
-14,2032,R2,solarPV,2028,5.20080000000
-14,2034,R2,solarPV,2028,5.20080000000
-14,2035,R2,solarPV,2028,5.20080000000
-14,2036,R2,solarPV,2028,5.20080000000
-14,2038,R2,solarPV,2028,5.20080000000
-14,2040,R2,solarPV,2028,5.20080000000
-14,2042,R2,solarPV,2028,5.20080000000
-14,2045,R2,solarPV,2028,5.20080000000
-14,2046,R2,solarPV,2028,5.20080000000
-14,2047,R2,solarPV,2028,5.20080000000
-14,2048,R2,solarPV,2028,5.20080000000
-14,2049,R2,solarPV,2028,5.20080000000
-14,2050,R2,solarPV,2028,5.20080000000
-14,2051,R2,solarPV,2028,5.20080000000
-14,2052,R2,solarPV,2028,5.20080000000
-14,2053,R2,solarPV,2028,5.20080000000
-14,2054,R2,solarPV,2028,5.20080000000
-15,2032,R2,solarPV,2030,2.24000000000
-15,2034,R2,solarPV,2030,2.24000000000
-15,2035,R2,solarPV,2030,2.24000000000
-15,2036,R2,solarPV,2030,2.24000000000
-15,2038,R2,solarPV,2030,2.24000000000
-15,2040,R2,solarPV,2030,2.24000000000
-15,2042,R2,solarPV,2030,2.24000000000
-15,2045,R2,solarPV,2030,2.24000000000
-15,2046,R2,solarPV,2030,2.24000000000
-15,2047,R2,solarPV,2030,2.24000000000
-15,2048,R2,solarPV,2030,2.24000000000
-15,2049,R2,solarPV,2030,2.24000000000
-15,2050,R2,solarPV,2030,2.24000000000
-15,2051,R2,solarPV,2030,2.24000000000
-15,2052,R2,solarPV,2030,2.24000000000
-15,2053,R2,solarPV,2030,2.24000000000
-15,2054,R2,solarPV,2030,2.24000000000
-15,2055,R2,solarPV,2030,2.24000000000
-15,2056,R2,solarPV,2030,2.24000000000
-16,2034,R2,solarPV,2032,2.24000000000
-16,2035,R2,solarPV,2032,2.24000000000
-16,2036,R2,solarPV,2032,2.24000000000
-16,2038,R2,solarPV,2032,2.24000000000
-16,2040,R2,solarPV,2032,2.24000000000
-16,2042,R2,solarPV,2032,2.24000000000
-16,2045,R2,solarPV,2032,2.24000000000
-16,2046,R2,solarPV,2032,2.24000000000
-16,2047,R2,solarPV,2032,2.24000000000
-16,2048,R2,solarPV,2032,2.24000000000
-16,2049,R2,solarPV,2032,2.24000000000
-16,2050,R2,solarPV,2032,2.24000000000
-16,2051,R2,solarPV,2032,2.24000000000
-16,2052,R2,solarPV,2032,2.24000000000
-16,2053,R2,solarPV,2032,2.24000000000
-16,2054,R2,solarPV,2032,2.24000000000
-16,2055,R2,solarPV,2032,2.24000000000
-16,2056,R2,solarPV,2032,2.24000000000
-16,2057,R2,solarPV,2032,2.24000000000
-16,2058,R2,solarPV,2032,2.24000000000
-17,2036,R2,solarPV,2034,2.24000000000
-17,2038,R2,solarPV,2034,2.24000000000
-17,2040,R2,solarPV,2034,2.24000000000
-17,2042,R2,solarPV,2034,2.24000000000
-17,2045,R2,solarPV,2034,2.24000000000
-17,2046,R2,solarPV,2034,2.24000000000
-17,2047,R2,solarPV,2034,2.24000000000
-17,2048,R2,solarPV,2034,2.24000000000
-17,2049,R2,solarPV,2034,2.24000000000
-17,2050,R2,solarPV,2034,2.24000000000
-17,2051,R2,solarPV,2034,2.24000000000
-17,2052,R2,solarPV,2034,2.24000000000
-17,2053,R2,solarPV,2034,2.24000000000
-17,2054,R2,solarPV,2034,2.24000000000
-17,2055,R2,solarPV,2034,2.24000000000
-17,2056,R2,solarPV,2034,2.24000000000
-17,2057,R2,solarPV,2034,2.24000000000
-17,2058,R2,solarPV,2034,2.24000000000
-17,2059,R2,solarPV,2034,2.24000000000
-17,2060,R2,solarPV,2034,2.24000000000
-18,2038,R2,solarPV,2036,2.24000000000
-18,2040,R2,solarPV,2036,2.24000000000
-18,2042,R2,solarPV,2036,2.24000000000
-18,2045,R2,solarPV,2036,2.24000000000
-18,2046,R2,solarPV,2036,2.24000000000
-18,2047,R2,solarPV,2036,2.24000000000
-18,2048,R2,solarPV,2036,2.24000000000
-18,2049,R2,solarPV,2036,2.24000000000
-18,2050,R2,solarPV,2036,2.24000000000
-18,2051,R2,solarPV,2036,2.24000000000
-18,2052,R2,solarPV,2036,2.24000000000
-18,2053,R2,solarPV,2036,2.24000000000
-18,2054,R2,solarPV,2036,2.24000000000
-18,2055,R2,solarPV,2036,2.24000000000
-18,2056,R2,solarPV,2036,2.24000000000
-18,2057,R2,solarPV,2036,2.24000000000
-18,2058,R2,solarPV,2036,2.24000000000
-18,2059,R2,solarPV,2036,2.24000000000
-18,2060,R2,solarPV,2036,2.24000000000
-18,2061,R2,solarPV,2036,2.24000000000
-18,2062,R2,solarPV,2036,2.24000000000
-19,2040,R2,solarPV,2038,2.24000000000
-19,2042,R2,solarPV,2038,2.24000000000
-19,2045,R2,solarPV,2038,2.24000000000
-19,2046,R2,solarPV,2038,2.24000000000
-19,2047,R2,solarPV,2038,2.24000000000
-19,2048,R2,solarPV,2038,2.24000000000
-19,2049,R2,solarPV,2038,2.24000000000
-19,2050,R2,solarPV,2038,2.24000000000
-19,2051,R2,solarPV,2038,2.24000000000
-19,2052,R2,solarPV,2038,2.24000000000
-19,2053,R2,solarPV,2038,2.24000000000
-19,2054,R2,solarPV,2038,2.24000000000
-19,2055,R2,solarPV,2038,2.24000000000
-19,2056,R2,solarPV,2038,2.24000000000
-19,2057,R2,solarPV,2038,2.24000000000
-19,2058,R2,solarPV,2038,2.24000000000
-19,2059,R2,solarPV,2038,2.24000000000
-19,2060,R2,solarPV,2038,2.24000000000
-19,2061,R2,solarPV,2038,2.24000000000
-19,2062,R2,solarPV,2038,2.24000000000
-19,2063,R2,solarPV,2038,2.24000000000
-19,2064,R2,solarPV,2038,2.24000000000
-20,2042,R2,solarPV,2040,2.24000000000
-20,2045,R2,solarPV,2040,2.24000000000
-20,2046,R2,solarPV,2040,2.24000000000
-20,2047,R2,solarPV,2040,2.24000000000
-20,2048,R2,solarPV,2040,2.24000000000
-20,2049,R2,solarPV,2040,2.24000000000
-20,2050,R2,solarPV,2040,2.24000000000
-20,2051,R2,solarPV,2040,2.24000000000
-20,2052,R2,solarPV,2040,2.24000000000
-20,2053,R2,solarPV,2040,2.24000000000
-20,2054,R2,solarPV,2040,2.24000000000
-20,2055,R2,solarPV,2040,2.24000000000
-20,2056,R2,solarPV,2040,2.24000000000
-20,2057,R2,solarPV,2040,2.24000000000
-20,2058,R2,solarPV,2040,2.24000000000
-20,2059,R2,solarPV,2040,2.24000000000
-20,2060,R2,solarPV,2040,2.24000000000
-20,2061,R2,solarPV,2040,2.24000000000
-20,2062,R2,solarPV,2040,2.24000000000
-20,2063,R2,solarPV,2040,2.24000000000
-20,2064,R2,solarPV,2040,2.24000000000
-20,2065,R2,solarPV,2040,2.24000000000
-20,2066,R2,solarPV,2040,2.24000000000
-21,2022,R2,windturbine,2020,8.77320000000
-21,2024,R2,windturbine,2020,8.77320000000
-21,2025,R2,windturbine,2020,8.77320000000
-21,2026,R2,windturbine,2020,8.77320000000
-21,2028,R2,windturbine,2020,8.77320000000
-21,2030,R2,windturbine,2020,8.77320000000
-21,2032,R2,windturbine,2020,8.77320000000
-21,2034,R2,windturbine,2020,8.77320000000
-21,2035,R2,windturbine,2020,8.77320000000
-21,2036,R2,windturbine,2020,8.77320000000
-21,2038,R2,windturbine,2020,8.77320000000
-21,2040,R2,windturbine,2020,8.77320000000
-21,2042,R2,windturbine,2020,8.77320000000
-21,2045,R2,windturbine,2020,8.77320000000
-21,2046,R2,windturbine,2020,8.77320000000
-22,2024,R2,windturbine,2022,4.17680000000
-22,2025,R2,windturbine,2022,4.17680000000
-22,2026,R2,windturbine,2022,4.17680000000
-22,2028,R2,windturbine,2022,4.17680000000
-22,2030,R2,windturbine,2022,4.17680000000
-22,2032,R2,windturbine,2022,4.17680000000
-22,2034,R2,windturbine,2022,4.17680000000
-22,2035,R2,windturbine,2022,4.17680000000
-22,2036,R2,windturbine,2022,4.17680000000
-22,2038,R2,windturbine,2022,4.17680000000
-22,2040,R2,windturbine,2022,4.17680000000
-22,2042,R2,windturbine,2022,4.17680000000
-22,2045,R2,windturbine,2022,4.17680000000
-22,2046,R2,windturbine,2022,4.17680000000
-22,2047,R2,windturbine,2022,4.17680000000
-22,2048,R2,windturbine,2022,4.17680000000
-23,2026,R2,windturbine,2024,4.67960000000
-23,2028,R2,windturbine,2024,4.67960000000
-23,2030,R2,windturbine,2024,4.67960000000
-23,2032,R2,windturbine,2024,4.67960000000
-23,2034,R2,windturbine,2024,4.67960000000
-23,2035,R2,windturbine,2024,4.67960000000
-23,2036,R2,windturbine,2024,4.67960000000
-23,2038,R2,windturbine,2024,4.67960000000
-23,2040,R2,windturbine,2024,4.67960000000
-23,2042,R2,windturbine,2024,4.67960000000
-23,2045,R2,windturbine,2024,4.67960000000
-23,2046,R2,windturbine,2024,4.67960000000
-23,2047,R2,windturbine,2024,4.67960000000
-23,2048,R2,windturbine,2024,4.67960000000
-23,2049,R2,windturbine,2024,4.67960000000
-23,2050,R2,windturbine,2024,4.67960000000
+13,2024,R2,gasCCGT,2022,1.85640000000
+13,2025,R2,gasCCGT,2022,1.85640000000
+13,2026,R2,gasCCGT,2022,1.85640000000
+13,2028,R2,gasCCGT,2022,1.85640000000
+13,2030,R2,gasCCGT,2022,1.85640000000
+13,2032,R2,gasCCGT,2022,1.85640000000
+13,2034,R2,gasCCGT,2022,1.85640000000
+13,2035,R2,gasCCGT,2022,1.85640000000
+13,2036,R2,gasCCGT,2022,1.85640000000
+13,2038,R2,gasCCGT,2022,1.85640000000
+13,2040,R2,gasCCGT,2022,1.85640000000
+13,2042,R2,gasCCGT,2022,1.85640000000
+13,2045,R2,gasCCGT,2022,1.85640000000
+13,2046,R2,gasCCGT,2022,1.85640000000
+13,2047,R2,gasCCGT,2022,1.85640000000
+13,2050,R2,gasCCGT,2022,1.85640000000
+13,2058,R2,gasCCGT,2022,1.85640000000
+14,2026,R2,gasCCGT,2024,2.07980000000
+14,2028,R2,gasCCGT,2024,2.07980000000
+14,2030,R2,gasCCGT,2024,2.07980000000
+14,2032,R2,gasCCGT,2024,2.07980000000
+14,2034,R2,gasCCGT,2024,2.07980000000
+14,2035,R2,gasCCGT,2024,2.07980000000
+14,2036,R2,gasCCGT,2024,2.07980000000
+14,2038,R2,gasCCGT,2024,2.07980000000
+14,2040,R2,gasCCGT,2024,2.07980000000
+14,2042,R2,gasCCGT,2024,2.07980000000
+14,2045,R2,gasCCGT,2024,2.07980000000
+14,2046,R2,gasCCGT,2024,2.07980000000
+14,2047,R2,gasCCGT,2024,2.07980000000
+14,2050,R2,gasCCGT,2024,2.07980000000
+14,2058,R2,gasCCGT,2024,2.07980000000
+14,2059,R2,gasCCGT,2024,2.07980000000
+14,2060,R2,gasCCGT,2024,2.07980000000
+15,2028,R2,gasCCGT,2026,2.29760000000
+15,2030,R2,gasCCGT,2026,2.29760000000
+15,2032,R2,gasCCGT,2026,2.29760000000
+15,2034,R2,gasCCGT,2026,2.29760000000
+15,2035,R2,gasCCGT,2026,2.29760000000
+15,2036,R2,gasCCGT,2026,2.29760000000
+15,2038,R2,gasCCGT,2026,2.29760000000
+15,2040,R2,gasCCGT,2026,2.29760000000
+15,2042,R2,gasCCGT,2026,2.29760000000
+15,2045,R2,gasCCGT,2026,2.29760000000
+15,2046,R2,gasCCGT,2026,2.29760000000
+15,2047,R2,gasCCGT,2026,2.29760000000
+15,2050,R2,gasCCGT,2026,2.29760000000
+15,2058,R2,gasCCGT,2026,2.29760000000
+15,2059,R2,gasCCGT,2026,2.29760000000
+15,2060,R2,gasCCGT,2026,2.29760000000
+15,2061,R2,gasCCGT,2026,2.29760000000
+15,2062,R2,gasCCGT,2026,2.29760000000
+16,2030,R2,gasCCGT,2028,2.31150000000
+16,2032,R2,gasCCGT,2028,2.31150000000
+16,2034,R2,gasCCGT,2028,2.31150000000
+16,2035,R2,gasCCGT,2028,2.31150000000
+16,2036,R2,gasCCGT,2028,2.31150000000
+16,2038,R2,gasCCGT,2028,2.31150000000
+16,2040,R2,gasCCGT,2028,2.31150000000
+16,2042,R2,gasCCGT,2028,2.31150000000
+16,2045,R2,gasCCGT,2028,2.31150000000
+16,2046,R2,gasCCGT,2028,2.31150000000
+16,2047,R2,gasCCGT,2028,2.31150000000
+16,2050,R2,gasCCGT,2028,2.31150000000
+16,2058,R2,gasCCGT,2028,2.31150000000
+16,2059,R2,gasCCGT,2028,2.31150000000
+16,2060,R2,gasCCGT,2028,2.31150000000
+16,2061,R2,gasCCGT,2028,2.31150000000
+16,2062,R2,gasCCGT,2028,2.31150000000
+16,2063,R2,gasCCGT,2028,2.31150000000
+16,2064,R2,gasCCGT,2028,2.31150000000
+17,2032,R2,gasCCGT,2030,0.99560000000
+17,2034,R2,gasCCGT,2030,0.99560000000
+17,2035,R2,gasCCGT,2030,0.99560000000
+17,2036,R2,gasCCGT,2030,0.99560000000
+17,2038,R2,gasCCGT,2030,0.99560000000
+17,2040,R2,gasCCGT,2030,0.99560000000
+17,2042,R2,gasCCGT,2030,0.99560000000
+17,2045,R2,gasCCGT,2030,0.99560000000
+17,2046,R2,gasCCGT,2030,0.99560000000
+17,2047,R2,gasCCGT,2030,0.99560000000
+17,2050,R2,gasCCGT,2030,0.99560000000
+17,2058,R2,gasCCGT,2030,0.99560000000
+17,2059,R2,gasCCGT,2030,0.99560000000
+17,2060,R2,gasCCGT,2030,0.99560000000
+17,2061,R2,gasCCGT,2030,0.99560000000
+17,2062,R2,gasCCGT,2030,0.99560000000
+17,2063,R2,gasCCGT,2030,0.99560000000
+17,2064,R2,gasCCGT,2030,0.99560000000
+17,2065,R2,gasCCGT,2030,0.99560000000
+17,2066,R2,gasCCGT,2030,0.99560000000
+18,2034,R2,solarPV,2032,2.24000000000
+18,2035,R2,solarPV,2032,2.24000000000
+18,2036,R2,solarPV,2032,2.24000000000
+18,2038,R2,solarPV,2032,2.24000000000
+18,2040,R2,solarPV,2032,2.24000000000
+18,2042,R2,solarPV,2032,2.24000000000
+18,2045,R2,solarPV,2032,2.24000000000
+18,2046,R2,solarPV,2032,2.24000000000
+18,2047,R2,solarPV,2032,2.24000000000
+18,2050,R2,solarPV,2032,2.24000000000
+18,2058,R2,solarPV,2032,2.24000000000
+19,2036,R2,solarPV,2034,2.24000000000
+19,2038,R2,solarPV,2034,2.24000000000
+19,2040,R2,solarPV,2034,2.24000000000
+19,2042,R2,solarPV,2034,2.24000000000
+19,2045,R2,solarPV,2034,2.24000000000
+19,2046,R2,solarPV,2034,2.24000000000
+19,2047,R2,solarPV,2034,2.24000000000
+19,2050,R2,solarPV,2034,2.24000000000
+19,2058,R2,solarPV,2034,2.24000000000
+19,2059,R2,solarPV,2034,2.24000000000
+19,2060,R2,solarPV,2034,2.24000000000
+20,2038,R2,solarPV,2036,2.24000000000
+20,2040,R2,solarPV,2036,2.24000000000
+20,2042,R2,solarPV,2036,2.24000000000
+20,2045,R2,solarPV,2036,2.24000000000
+20,2046,R2,solarPV,2036,2.24000000000
+20,2047,R2,solarPV,2036,2.24000000000
+20,2050,R2,solarPV,2036,2.24000000000
+20,2058,R2,solarPV,2036,2.24000000000
+20,2059,R2,solarPV,2036,2.24000000000
+20,2060,R2,solarPV,2036,2.24000000000
+20,2061,R2,solarPV,2036,2.24000000000
+20,2062,R2,solarPV,2036,2.24000000000
+21,2040,R2,solarPV,2038,2.24000000000
+21,2042,R2,solarPV,2038,2.24000000000
+21,2045,R2,solarPV,2038,2.24000000000
+21,2046,R2,solarPV,2038,2.24000000000
+21,2047,R2,solarPV,2038,2.24000000000
+21,2050,R2,solarPV,2038,2.24000000000
+21,2058,R2,solarPV,2038,2.24000000000
+21,2059,R2,solarPV,2038,2.24000000000
+21,2060,R2,solarPV,2038,2.24000000000
+21,2061,R2,solarPV,2038,2.24000000000
+21,2062,R2,solarPV,2038,2.24000000000
+21,2063,R2,solarPV,2038,2.24000000000
+21,2064,R2,solarPV,2038,2.24000000000
+22,2042,R2,solarPV,2040,2.24000000000
+22,2045,R2,solarPV,2040,2.24000000000
+22,2046,R2,solarPV,2040,2.24000000000
+22,2047,R2,solarPV,2040,2.24000000000
+22,2050,R2,solarPV,2040,2.24000000000
+22,2058,R2,solarPV,2040,2.24000000000
+22,2059,R2,solarPV,2040,2.24000000000
+22,2060,R2,solarPV,2040,2.24000000000
+22,2061,R2,solarPV,2040,2.24000000000
+22,2062,R2,solarPV,2040,2.24000000000
+22,2063,R2,solarPV,2040,2.24000000000
+22,2064,R2,solarPV,2040,2.24000000000
+22,2065,R2,solarPV,2040,2.24000000000
+22,2066,R2,solarPV,2040,2.24000000000
+23,2022,R2,windturbine,2020,8.77320000000
+23,2024,R2,windturbine,2020,8.77320000000
+23,2025,R2,windturbine,2020,8.77320000000
+23,2026,R2,windturbine,2020,8.77320000000
+23,2028,R2,windturbine,2020,8.77320000000
+23,2030,R2,windturbine,2020,8.77320000000
+23,2032,R2,windturbine,2020,8.77320000000
+23,2034,R2,windturbine,2020,8.77320000000
+23,2035,R2,windturbine,2020,8.77320000000
+23,2036,R2,windturbine,2020,8.77320000000
+23,2038,R2,windturbine,2020,8.77320000000
+23,2040,R2,windturbine,2020,8.77320000000
+23,2042,R2,windturbine,2020,8.77320000000
+23,2045,R2,windturbine,2020,8.77320000000
+23,2046,R2,windturbine,2020,8.77320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index d6d72532..358609af 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
index 1d028468..f6828ce3 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
@@ -2,6 +2,18 @@ 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
+1,2030,R1,gassupply1,2025,10.04010000000
+1,2035,R1,gassupply1,2025,10.04010000000
+1,2040,R1,gassupply1,2025,10.04010000000
+1,2045,R1,gassupply1,2025,10.04010000000
+1,2050,R1,gassupply1,2025,10.04010000000
+1,2064,R1,gassupply1,2025,10.04010000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,10.04010000000
+3,2035,R2,gassupply1,2025,10.04010000000
+3,2040,R2,gassupply1,2025,10.04010000000
+3,2045,R2,gassupply1,2025,10.04010000000
+3,2050,R2,gassupply1,2025,10.04010000000
+3,2064,R2,gassupply1,2025,10.04010000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index 1d028468..05e9d3e6 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,10.04010000000
+1,2035,R1,gassupply1,2025,10.04010000000
+1,2040,R1,gassupply1,2025,10.04010000000
+1,2045,R1,gassupply1,2025,10.04010000000
+1,2050,R1,gassupply1,2025,10.04010000000
+1,2064,R1,gassupply1,2025,10.04010000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,10.04010000000
+4,2035,R2,gassupply1,2025,10.04010000000
+4,2040,R2,gassupply1,2025,10.04010000000
+4,2045,R2,gassupply1,2025,10.04010000000
+4,2050,R2,gassupply1,2025,10.04010000000
+4,2064,R2,gassupply1,2025,10.04010000000
+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-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index 1d028468..05e9d3e6 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,10.04010000000
+1,2035,R1,gassupply1,2025,10.04010000000
+1,2040,R1,gassupply1,2025,10.04010000000
+1,2045,R1,gassupply1,2025,10.04010000000
+1,2050,R1,gassupply1,2025,10.04010000000
+1,2064,R1,gassupply1,2025,10.04010000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,10.04010000000
+4,2035,R2,gassupply1,2025,10.04010000000
+4,2040,R2,gassupply1,2025,10.04010000000
+4,2045,R2,gassupply1,2025,10.04010000000
+4,2050,R2,gassupply1,2025,10.04010000000
+4,2064,R2,gassupply1,2025,10.04010000000
+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-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index 1d028468..05e9d3e6 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -2,6 +2,32 @@ 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
+1,2030,R1,gassupply1,2025,10.04010000000
+1,2035,R1,gassupply1,2025,10.04010000000
+1,2040,R1,gassupply1,2025,10.04010000000
+1,2045,R1,gassupply1,2025,10.04010000000
+1,2050,R1,gassupply1,2025,10.04010000000
+1,2064,R1,gassupply1,2025,10.04010000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,10.04010000000
+4,2035,R2,gassupply1,2025,10.04010000000
+4,2040,R2,gassupply1,2025,10.04010000000
+4,2045,R2,gassupply1,2025,10.04010000000
+4,2050,R2,gassupply1,2025,10.04010000000
+4,2064,R2,gassupply1,2025,10.04010000000
+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-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index 32cbc24e..67aea911 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -2,10 +2,44 @@ 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,2050,R1,gassupply1,2045,1.32420000000
-1,2084,R1,gassupply1,2045,1.32420000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2050,R2,gassupply1,2045,1.32420000000
-3,2084,R2,gassupply1,2045,1.32420000000
+1,2030,R1,gassupply1,2025,10.04010000000
+1,2035,R1,gassupply1,2025,10.04010000000
+1,2040,R1,gassupply1,2025,10.04010000000
+1,2045,R1,gassupply1,2025,10.04010000000
+1,2050,R1,gassupply1,2025,10.04010000000
+1,2064,R1,gassupply1,2025,10.04010000000
+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,2050,R1,gassupply1,2045,1.32420000000
+3,2064,R1,gassupply1,2045,1.32420000000
+3,2065,R1,gassupply1,2045,1.32420000000
+3,2069,R1,gassupply1,2045,1.32420000000
+3,2070,R1,gassupply1,2045,1.32420000000
+3,2084,R1,gassupply1,2045,1.32420000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,10.04010000000
+5,2035,R2,gassupply1,2025,10.04010000000
+5,2040,R2,gassupply1,2025,10.04010000000
+5,2045,R2,gassupply1,2025,10.04010000000
+5,2050,R2,gassupply1,2025,10.04010000000
+5,2064,R2,gassupply1,2025,10.04010000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,1.32420000000
+7,2064,R2,gassupply1,2045,1.32420000000
+7,2065,R2,gassupply1,2045,1.32420000000
+7,2069,R2,gassupply1,2045,1.32420000000
+7,2070,R2,gassupply1,2045,1.32420000000
+7,2084,R2,gassupply1,2045,1.32420000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 32cbc24e..67aea911 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -2,10 +2,44 @@ 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,2050,R1,gassupply1,2045,1.32420000000
-1,2084,R1,gassupply1,2045,1.32420000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2050,R2,gassupply1,2045,1.32420000000
-3,2084,R2,gassupply1,2045,1.32420000000
+1,2030,R1,gassupply1,2025,10.04010000000
+1,2035,R1,gassupply1,2025,10.04010000000
+1,2040,R1,gassupply1,2025,10.04010000000
+1,2045,R1,gassupply1,2025,10.04010000000
+1,2050,R1,gassupply1,2025,10.04010000000
+1,2064,R1,gassupply1,2025,10.04010000000
+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,2050,R1,gassupply1,2045,1.32420000000
+3,2064,R1,gassupply1,2045,1.32420000000
+3,2065,R1,gassupply1,2045,1.32420000000
+3,2069,R1,gassupply1,2045,1.32420000000
+3,2070,R1,gassupply1,2045,1.32420000000
+3,2084,R1,gassupply1,2045,1.32420000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,10.04010000000
+5,2035,R2,gassupply1,2025,10.04010000000
+5,2040,R2,gassupply1,2025,10.04010000000
+5,2045,R2,gassupply1,2025,10.04010000000
+5,2050,R2,gassupply1,2025,10.04010000000
+5,2064,R2,gassupply1,2025,10.04010000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,1.32420000000
+7,2064,R2,gassupply1,2045,1.32420000000
+7,2065,R2,gassupply1,2045,1.32420000000
+7,2069,R2,gassupply1,2045,1.32420000000
+7,2070,R2,gassupply1,2045,1.32420000000
+7,2084,R2,gassupply1,2045,1.32420000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 383297dd..73ab4b14 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -30,15 +30,15 @@ electric_stove,R2,R2,A1,residential,newcapa,2030,17.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2030,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,10.50300000000
 solarPV,R1,R1,A1,power,newcapa,2030,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2030,20.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,3.63180000000
-solarPV,R2,R2,A1,power,newcapa,2030,20.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,10.50300000000
 windturbine,R2,R2,A1,power,newcapa,2030,32.36820000000
-windturbine,R2,R2,A1,power,newcapa,2030,3.63180000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,10.04010000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,10.04010000000
 electric_stove,R1,R1,A1,residential,newcapa,2035,11.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2035,22.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
@@ -47,15 +47,17 @@ electric_stove,R2,R2,A1,residential,newcapa,2035,11.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2035,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,10.50300000000
 solarPV,R1,R1,A1,power,newcapa,2035,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2035,20.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,11.20000000000
 windturbine,R1,R1,A1,power,newcapa,2035,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,3.63180000000
-solarPV,R2,R2,A1,power,newcapa,2035,20.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2035,10.50300000000
 solarPV,R2,R2,A1,power,newcapa,2035,11.20000000000
 windturbine,R2,R2,A1,power,newcapa,2035,32.36820000000
-windturbine,R2,R2,A1,power,newcapa,2035,3.63180000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,10.04010000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,10.04010000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
 electric_stove,R1,R1,A1,residential,newcapa,2040,22.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2040,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
@@ -64,17 +66,19 @@ electric_stove,R2,R2,A1,residential,newcapa,2040,22.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2040,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,10.50300000000
 solarPV,R1,R1,A1,power,newcapa,2040,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2040,20.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
 windturbine,R1,R1,A1,power,newcapa,2040,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,3.63180000000
-solarPV,R2,R2,A1,power,newcapa,2040,20.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,10.50300000000
 solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
 windturbine,R2,R2,A1,power,newcapa,2040,32.36820000000
-windturbine,R2,R2,A1,power,newcapa,2040,3.63180000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,10.04010000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,10.04010000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
 electric_stove,R1,R1,A1,residential,newcapa,2045,17.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2045,27.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
@@ -83,19 +87,21 @@ electric_stove,R2,R2,A1,residential,newcapa,2045,17.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2045,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,10.50300000000
 solarPV,R1,R1,A1,power,newcapa,2045,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2045,20.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
 windturbine,R1,R1,A1,power,newcapa,2045,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.63180000000
-solarPV,R2,R2,A1,power,newcapa,2045,20.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2045,10.50300000000
 solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
 windturbine,R2,R2,A1,power,newcapa,2045,32.36820000000
-windturbine,R2,R2,A1,power,newcapa,2045,3.63180000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,10.04010000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,10.04010000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
 electric_stove,R1,R1,A1,residential,newcapa,2050,27.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2050,23.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
@@ -104,20 +110,22 @@ electric_stove,R2,R2,A1,residential,newcapa,2050,27.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2050,23.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,10.50300000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,1.58590000000
-solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.63180000000
 windturbine,R1,R1,A1,power,newcapa,2050,20.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2050,10.50300000000
 solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,3.63180000000
 windturbine,R2,R2,A1,power,newcapa,2050,23.56820000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,10.04010000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,1.32420000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,10.04010000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
 gassupply1,R2,R2,A1,gas,newcapa,2050,1.32420000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index 91c33273..01a32a81 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,483 +79,483 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.58870000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,17.58870000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.15650000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,80.15650000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.20270000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.20270000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.78230000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.78230000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,80.15070000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,80.15070000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.60610000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,17.60610000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.22350000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,80.22350000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.75330000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,0.75330000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.28960000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.28960000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.11750000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,1.11750000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,80.21520000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,80.21520000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.58870000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.58870000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,80.15650000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,80.15650000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,1.07610000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,1.07610000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.20270000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.20270000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.78230000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.78230000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,80.15070000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,80.15070000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60610000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60610000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.22350000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,80.22350000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.75330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.75330000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.28960000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.28960000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.11750000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,1.11750000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,80.21520000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,80.21520000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.66980000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.66980000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.46940000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,80.46940000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,1.07610000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,1.07610000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.60810000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,0.60810000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.34680000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,2.34680000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,80.45200000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,80.45200000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.62920000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,17.62920000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.31290000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,80.31290000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,2.25990000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,2.25990000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.40540000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,0.40540000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.56450000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,1.56450000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,80.30130000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,80.30130000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.62920000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.62920000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,80.31290000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,80.31290000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,1.50660000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,1.50660000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.40540000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.40540000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,1.56450000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,1.56450000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,80.30130000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,80.30130000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.62920000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.62920000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,80.31290000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,80.31290000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,1.50660000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,1.50660000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.40540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.40540000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.56450000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.56450000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,80.30130000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,80.30130000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.09230000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.09230000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.52070000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.52070000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.50660000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.50660000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.50320000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.50320000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.01890000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.01890000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.52070000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.52070000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13180000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13180000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.74460000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.74460000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.01890000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,0.01890000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.71960000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,0.71960000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.03050000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.03050000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.74460000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.74460000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09230000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09230000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.52070000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.52070000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.03050000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,0.03050000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.50320000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.50320000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01890000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01890000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.52070000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.52070000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13180000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13180000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.74460000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.74460000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01890000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01890000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.71960000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.71960000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.03050000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.03050000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.74460000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.74460000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27680000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27680000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.56920000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,1.56920000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.03050000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.03050000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.51730000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.51730000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.09170000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,1.56920000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,1.56920000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.18460000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18460000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.04380000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,1.04380000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.09170000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.09170000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.00890000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.00890000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.04940000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.04940000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,1.04380000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,1.04380000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18460000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18460000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.04380000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.04380000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,0.04940000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,0.04940000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.00890000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.00890000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.04940000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.04940000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,1.04380000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,1.04380000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18460000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18460000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.04380000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.04380000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.04940000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.04940000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.00890000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.00890000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.04940000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.04940000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.04380000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.04380000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.09140000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.09140000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.04940000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.04940000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.56840000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.56840000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02750000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.02750000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.01570000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.01570000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.13060000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.13060000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.02750000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,0.02750000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81270000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,0.81270000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04830000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.04830000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.02400000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.02400000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.09140000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.09140000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.04830000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,0.04830000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.56840000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.56840000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02750000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02750000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01570000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01570000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.13060000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.13060000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02750000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02750000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81270000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.81270000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04830000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.04830000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.02400000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02400000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.27420000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.27420000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06300000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06300000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04830000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.04830000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.71180000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.71180000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.17040000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.17040000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.06300000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06300000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.18280000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,0.18280000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.03670000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.03670000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.17040000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.17040000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.13910000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.13910000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.08430000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.08430000000,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', 'evening')",cook,R1,0.03670000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.03670000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.18280000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.18280000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03670000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03670000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.08430000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,0.08430000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.13910000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.13910000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.08430000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.08430000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03670000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03670000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.18280000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.18280000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03670000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03670000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.08430000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.08430000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.13910000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.13910000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08430000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08430000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03670000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03670000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.08990000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.08990000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.01570000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.01570000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08430000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08430000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.61420000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.61420000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02940000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.02940000000,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', 'night')",cook,R1,0.01570000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.01570000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12840000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12840000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.02400000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.02400000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.02940000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.02940000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.87800000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.87800000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.05210000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.05210000000,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', 'morning')",cook,R1,0.02400000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.02400000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08990000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08990000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01570000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01570000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.05210000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.05210000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02940000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02940000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01570000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01570000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12840000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12840000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02400000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02400000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02940000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02940000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87800000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87800000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05210000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05210000000,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', 'early-peak')",cook,R1,0.02400000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02400000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26960000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26960000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06280000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06280000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.05210000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.05210000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84810000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.84810000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.18730000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.18730000000,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', 'late-peak')",cook,R1,0.06280000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17970000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17970000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.03660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.03660000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.18730000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.18730000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.23020000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.23020000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.09180000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.09180000000,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', 'evening')",cook,R1,0.03660000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.03660000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17970000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17970000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03660000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03660000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.09180000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.09180000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.23020000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23020000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.09180000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.09180000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03660000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03660000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17970000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17970000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03660000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03660000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.09180000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.09180000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23020000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23020000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09180000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09180000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03660000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03660000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.08800000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.08800000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49030000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,6.49030000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09180000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09180000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.68840000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.68840000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,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', 'night')",cook,R1,0.01560000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.01560000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.12560000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.12560000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49250000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,6.49250000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.03070000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.98390000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.98390000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.05480000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.05480000000,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', 'morning')",cook,R1,0.02390000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.02390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.08800000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.08800000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,6.49030000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,6.49030000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.05480000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.05480000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.68840000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.68840000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03070000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01560000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.12560000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.12560000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49250000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,6.49250000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03070000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03070000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.98390000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.98390000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05480000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05480000000,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', 'early-peak')",cook,R1,0.02390000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.26390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.26390000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.50050000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,6.50050000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06240000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06240000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.05480000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.05480000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.07010000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.07010000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.19910000000,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', 'late-peak')",cook,R1,0.06240000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06240000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.17590000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,0.17590000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.49540000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,6.49540000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.19910000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.19910000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.37840000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,1.37840000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.09710000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.09710000000,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', 'evening')",cook,R1,0.03640000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.03640000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.17590000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.17590000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,6.49540000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,6.49540000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.09710000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.09710000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.37840000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.37840000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.09710000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.09710000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03640000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03640000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.17590000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.17590000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,6.49540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,6.49540000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.09710000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.09710000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.37840000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.37840000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09710000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09710000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03640000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03640000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.10000000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,5.19730000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,5.19730000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.01560000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.01560000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09710000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09710000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.79400000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.79400000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.03290000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.03290000000,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', 'night')",cook,R1,0.01560000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.01560000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.14290000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.14290000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,5.20130000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,5.20130000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.02390000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.02390000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.03290000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.03290000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.13480000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,1.13480000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.05920000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.05920000000,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', 'morning')",cook,R1,0.02390000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.02390000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.10000000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,5.19730000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,5.19730000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01560000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.05920000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.05920000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.79400000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.79400000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03290000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03290000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01560000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.14290000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.14290000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.20130000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,5.20130000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.02390000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.02390000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03290000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03290000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13480000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.13480000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05920000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05920000000,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', 'early-peak')",cook,R1,0.02390000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.02390000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.30000000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.30000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.21570000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,5.21570000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.06230000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.06230000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.05920000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.05920000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.38670000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.38670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21830000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.21830000000,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', 'late-peak')",cook,R1,0.06230000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.06230000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,0.20000000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,5.20650000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,5.20650000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.03640000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.03640000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.21830000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.21830000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.58960000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,1.58960000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.10560000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.10560000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.03640000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.03640000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.20000000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,5.20650000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,5.20650000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.03640000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.03640000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.10560000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.10560000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.58960000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.58960000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.10560000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.10560000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.03640000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.03640000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.20000000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,5.20650000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,5.20650000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.03640000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.03640000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.10560000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.10560000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.58960000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.58960000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10560000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10560000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.03640000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.03640000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.10560000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.10560000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index cbe32778..700763c4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -1,51 +1,37 @@
 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,12.36820000000
-1,2030,R1,solarPV,2020,12.36820000000
-1,2035,R1,solarPV,2020,12.36820000000
-1,2040,R1,solarPV,2020,12.36820000000
-1,2045,R1,solarPV,2020,12.36820000000
-1,2049,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2025,20.00000000000
-2,2040,R1,solarPV,2025,20.00000000000
-2,2045,R1,solarPV,2025,20.00000000000
-2,2049,R1,solarPV,2025,20.00000000000
-2,2050,R1,solarPV,2025,20.00000000000
-2,2054,R1,solarPV,2025,20.00000000000
+1,2030,R1,gasCCGT,2025,10.50300000000
+1,2035,R1,gasCCGT,2025,10.50300000000
+1,2040,R1,gasCCGT,2025,10.50300000000
+1,2045,R1,gasCCGT,2025,10.50300000000
+1,2049,R1,gasCCGT,2025,10.50300000000
+1,2050,R1,gasCCGT,2025,10.50300000000
+1,2064,R1,gasCCGT,2025,10.50300000000
+2,2025,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2020,12.36820000000
+2,2035,R1,solarPV,2020,12.36820000000
+2,2040,R1,solarPV,2020,12.36820000000
+2,2045,R1,solarPV,2020,12.36820000000
+2,2049,R1,solarPV,2020,12.36820000000
 3,2025,R1,windturbine,2020,20.00000000000
 3,2030,R1,windturbine,2020,20.00000000000
 3,2035,R1,windturbine,2020,20.00000000000
 3,2040,R1,windturbine,2020,20.00000000000
 3,2045,R1,windturbine,2020,20.00000000000
 3,2049,R1,windturbine,2020,20.00000000000
-4,2030,R1,windturbine,2025,3.63180000000
-4,2035,R1,windturbine,2025,3.63180000000
-4,2040,R1,windturbine,2025,3.63180000000
-4,2045,R1,windturbine,2025,3.63180000000
-4,2049,R1,windturbine,2025,3.63180000000
-4,2050,R1,windturbine,2025,3.63180000000
-4,2054,R1,windturbine,2025,3.63180000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-6,2030,R2,solarPV,2025,20.00000000000
-6,2035,R2,solarPV,2025,20.00000000000
-6,2040,R2,solarPV,2025,20.00000000000
-6,2045,R2,solarPV,2025,20.00000000000
-6,2049,R2,solarPV,2025,20.00000000000
-6,2050,R2,solarPV,2025,20.00000000000
-6,2054,R2,solarPV,2025,20.00000000000
-7,2025,R2,windturbine,2020,32.36820000000
-7,2030,R2,windturbine,2020,32.36820000000
-7,2035,R2,windturbine,2020,32.36820000000
-7,2040,R2,windturbine,2020,32.36820000000
-7,2045,R2,windturbine,2020,32.36820000000
-7,2049,R2,windturbine,2020,32.36820000000
-8,2030,R2,windturbine,2025,3.63180000000
-8,2035,R2,windturbine,2025,3.63180000000
-8,2040,R2,windturbine,2025,3.63180000000
-8,2045,R2,windturbine,2025,3.63180000000
-8,2049,R2,windturbine,2025,3.63180000000
-8,2050,R2,windturbine,2025,3.63180000000
-8,2054,R2,windturbine,2025,3.63180000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+5,2030,R2,gasCCGT,2025,10.50300000000
+5,2035,R2,gasCCGT,2025,10.50300000000
+5,2040,R2,gasCCGT,2025,10.50300000000
+5,2045,R2,gasCCGT,2025,10.50300000000
+5,2049,R2,gasCCGT,2025,10.50300000000
+5,2050,R2,gasCCGT,2025,10.50300000000
+5,2064,R2,gasCCGT,2025,10.50300000000
+6,2025,R2,windturbine,2020,32.36820000000
+6,2030,R2,windturbine,2020,32.36820000000
+6,2035,R2,windturbine,2020,32.36820000000
+6,2040,R2,windturbine,2020,32.36820000000
+6,2045,R2,windturbine,2020,32.36820000000
+6,2049,R2,windturbine,2020,32.36820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index 9095af81..37225d0a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -1,26 +1,26 @@
 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,12.36820000000
-1,2030,R1,solarPV,2020,12.36820000000
-1,2035,R1,solarPV,2020,12.36820000000
-1,2040,R1,solarPV,2020,12.36820000000
-1,2045,R1,solarPV,2020,12.36820000000
-1,2049,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2025,20.00000000000
-2,2040,R1,solarPV,2025,20.00000000000
-2,2045,R1,solarPV,2025,20.00000000000
-2,2049,R1,solarPV,2025,20.00000000000
-2,2050,R1,solarPV,2025,20.00000000000
-2,2054,R1,solarPV,2025,20.00000000000
+1,2030,R1,gasCCGT,2025,10.50300000000
+1,2035,R1,gasCCGT,2025,10.50300000000
+1,2040,R1,gasCCGT,2025,10.50300000000
+1,2045,R1,gasCCGT,2025,10.50300000000
+1,2049,R1,gasCCGT,2025,10.50300000000
+1,2050,R1,gasCCGT,2025,10.50300000000
+1,2059,R1,gasCCGT,2025,10.50300000000
+1,2060,R1,gasCCGT,2025,10.50300000000
+1,2064,R1,gasCCGT,2025,10.50300000000
+2,2025,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2020,12.36820000000
+2,2035,R1,solarPV,2020,12.36820000000
+2,2040,R1,solarPV,2020,12.36820000000
+2,2045,R1,solarPV,2020,12.36820000000
+2,2049,R1,solarPV,2020,12.36820000000
 3,2035,R1,solarPV,2030,11.20000000000
 3,2040,R1,solarPV,2030,11.20000000000
 3,2045,R1,solarPV,2030,11.20000000000
 3,2049,R1,solarPV,2030,11.20000000000
 3,2050,R1,solarPV,2030,11.20000000000
-3,2054,R1,solarPV,2030,11.20000000000
-3,2055,R1,solarPV,2030,11.20000000000
 3,2059,R1,solarPV,2030,11.20000000000
 4,2025,R1,windturbine,2020,20.00000000000
 4,2030,R1,windturbine,2020,20.00000000000
@@ -28,40 +28,26 @@ asset,year,region,technology,installed,capacity
 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,3.63180000000
-5,2035,R1,windturbine,2025,3.63180000000
-5,2040,R1,windturbine,2025,3.63180000000
-5,2045,R1,windturbine,2025,3.63180000000
-5,2049,R1,windturbine,2025,3.63180000000
-5,2050,R1,windturbine,2025,3.63180000000
-5,2054,R1,windturbine,2025,3.63180000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,solarPV,2025,20.00000000000
-7,2035,R2,solarPV,2025,20.00000000000
-7,2040,R2,solarPV,2025,20.00000000000
-7,2045,R2,solarPV,2025,20.00000000000
-7,2049,R2,solarPV,2025,20.00000000000
-7,2050,R2,solarPV,2025,20.00000000000
-7,2054,R2,solarPV,2025,20.00000000000
-8,2035,R2,solarPV,2030,11.20000000000
-8,2040,R2,solarPV,2030,11.20000000000
-8,2045,R2,solarPV,2030,11.20000000000
-8,2049,R2,solarPV,2030,11.20000000000
-8,2050,R2,solarPV,2030,11.20000000000
-8,2054,R2,solarPV,2030,11.20000000000
-8,2055,R2,solarPV,2030,11.20000000000
-8,2059,R2,solarPV,2030,11.20000000000
-9,2025,R2,windturbine,2020,32.36820000000
-9,2030,R2,windturbine,2020,32.36820000000
-9,2035,R2,windturbine,2020,32.36820000000
-9,2040,R2,windturbine,2020,32.36820000000
-9,2045,R2,windturbine,2020,32.36820000000
-9,2049,R2,windturbine,2020,32.36820000000
-10,2030,R2,windturbine,2025,3.63180000000
-10,2035,R2,windturbine,2025,3.63180000000
-10,2040,R2,windturbine,2025,3.63180000000
-10,2045,R2,windturbine,2025,3.63180000000
-10,2049,R2,windturbine,2025,3.63180000000
-10,2050,R2,windturbine,2025,3.63180000000
-10,2054,R2,windturbine,2025,3.63180000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2030,R2,gasCCGT,2025,10.50300000000
+6,2035,R2,gasCCGT,2025,10.50300000000
+6,2040,R2,gasCCGT,2025,10.50300000000
+6,2045,R2,gasCCGT,2025,10.50300000000
+6,2049,R2,gasCCGT,2025,10.50300000000
+6,2050,R2,gasCCGT,2025,10.50300000000
+6,2059,R2,gasCCGT,2025,10.50300000000
+6,2060,R2,gasCCGT,2025,10.50300000000
+6,2064,R2,gasCCGT,2025,10.50300000000
+7,2035,R2,solarPV,2030,11.20000000000
+7,2040,R2,solarPV,2030,11.20000000000
+7,2045,R2,solarPV,2030,11.20000000000
+7,2049,R2,solarPV,2030,11.20000000000
+7,2050,R2,solarPV,2030,11.20000000000
+7,2059,R2,solarPV,2030,11.20000000000
+8,2025,R2,windturbine,2020,32.36820000000
+8,2030,R2,windturbine,2020,32.36820000000
+8,2035,R2,windturbine,2020,32.36820000000
+8,2040,R2,windturbine,2020,32.36820000000
+8,2045,R2,windturbine,2020,32.36820000000
+8,2049,R2,windturbine,2020,32.36820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index b8099837..fbb7d82a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -1,33 +1,31 @@
 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,12.36820000000
-1,2030,R1,solarPV,2020,12.36820000000
-1,2035,R1,solarPV,2020,12.36820000000
-1,2040,R1,solarPV,2020,12.36820000000
-1,2045,R1,solarPV,2020,12.36820000000
-1,2049,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2025,20.00000000000
-2,2040,R1,solarPV,2025,20.00000000000
-2,2045,R1,solarPV,2025,20.00000000000
-2,2049,R1,solarPV,2025,20.00000000000
-2,2050,R1,solarPV,2025,20.00000000000
-2,2054,R1,solarPV,2025,20.00000000000
+1,2030,R1,gasCCGT,2025,10.50300000000
+1,2035,R1,gasCCGT,2025,10.50300000000
+1,2040,R1,gasCCGT,2025,10.50300000000
+1,2045,R1,gasCCGT,2025,10.50300000000
+1,2049,R1,gasCCGT,2025,10.50300000000
+1,2050,R1,gasCCGT,2025,10.50300000000
+1,2059,R1,gasCCGT,2025,10.50300000000
+1,2060,R1,gasCCGT,2025,10.50300000000
+1,2064,R1,gasCCGT,2025,10.50300000000
+2,2025,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2020,12.36820000000
+2,2035,R1,solarPV,2020,12.36820000000
+2,2040,R1,solarPV,2020,12.36820000000
+2,2045,R1,solarPV,2020,12.36820000000
+2,2049,R1,solarPV,2020,12.36820000000
 3,2035,R1,solarPV,2030,11.20000000000
 3,2040,R1,solarPV,2030,11.20000000000
 3,2045,R1,solarPV,2030,11.20000000000
 3,2049,R1,solarPV,2030,11.20000000000
 3,2050,R1,solarPV,2030,11.20000000000
-3,2054,R1,solarPV,2030,11.20000000000
-3,2055,R1,solarPV,2030,11.20000000000
 3,2059,R1,solarPV,2030,11.20000000000
 4,2040,R1,solarPV,2035,11.20000000000
 4,2045,R1,solarPV,2035,11.20000000000
 4,2049,R1,solarPV,2035,11.20000000000
 4,2050,R1,solarPV,2035,11.20000000000
-4,2054,R1,solarPV,2035,11.20000000000
-4,2055,R1,solarPV,2035,11.20000000000
 4,2059,R1,solarPV,2035,11.20000000000
 4,2060,R1,solarPV,2035,11.20000000000
 4,2064,R1,solarPV,2035,11.20000000000
@@ -37,49 +35,33 @@ asset,year,region,technology,installed,capacity
 5,2040,R1,windturbine,2020,20.00000000000
 5,2045,R1,windturbine,2020,20.00000000000
 5,2049,R1,windturbine,2020,20.00000000000
-6,2030,R1,windturbine,2025,3.63180000000
-6,2035,R1,windturbine,2025,3.63180000000
-6,2040,R1,windturbine,2025,3.63180000000
-6,2045,R1,windturbine,2025,3.63180000000
-6,2049,R1,windturbine,2025,3.63180000000
-6,2050,R1,windturbine,2025,3.63180000000
-6,2054,R1,windturbine,2025,3.63180000000
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-8,2030,R2,solarPV,2025,20.00000000000
-8,2035,R2,solarPV,2025,20.00000000000
-8,2040,R2,solarPV,2025,20.00000000000
-8,2045,R2,solarPV,2025,20.00000000000
-8,2049,R2,solarPV,2025,20.00000000000
-8,2050,R2,solarPV,2025,20.00000000000
-8,2054,R2,solarPV,2025,20.00000000000
-9,2035,R2,solarPV,2030,11.20000000000
-9,2040,R2,solarPV,2030,11.20000000000
-9,2045,R2,solarPV,2030,11.20000000000
-9,2049,R2,solarPV,2030,11.20000000000
-9,2050,R2,solarPV,2030,11.20000000000
-9,2054,R2,solarPV,2030,11.20000000000
-9,2055,R2,solarPV,2030,11.20000000000
-9,2059,R2,solarPV,2030,11.20000000000
-10,2040,R2,solarPV,2035,11.20000000000
-10,2045,R2,solarPV,2035,11.20000000000
-10,2049,R2,solarPV,2035,11.20000000000
-10,2050,R2,solarPV,2035,11.20000000000
-10,2054,R2,solarPV,2035,11.20000000000
-10,2055,R2,solarPV,2035,11.20000000000
-10,2059,R2,solarPV,2035,11.20000000000
-10,2060,R2,solarPV,2035,11.20000000000
-10,2064,R2,solarPV,2035,11.20000000000
-11,2025,R2,windturbine,2020,32.36820000000
-11,2030,R2,windturbine,2020,32.36820000000
-11,2035,R2,windturbine,2020,32.36820000000
-11,2040,R2,windturbine,2020,32.36820000000
-11,2045,R2,windturbine,2020,32.36820000000
-11,2049,R2,windturbine,2020,32.36820000000
-12,2030,R2,windturbine,2025,3.63180000000
-12,2035,R2,windturbine,2025,3.63180000000
-12,2040,R2,windturbine,2025,3.63180000000
-12,2045,R2,windturbine,2025,3.63180000000
-12,2049,R2,windturbine,2025,3.63180000000
-12,2050,R2,windturbine,2025,3.63180000000
-12,2054,R2,windturbine,2025,3.63180000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,gasCCGT,2025,10.50300000000
+7,2035,R2,gasCCGT,2025,10.50300000000
+7,2040,R2,gasCCGT,2025,10.50300000000
+7,2045,R2,gasCCGT,2025,10.50300000000
+7,2049,R2,gasCCGT,2025,10.50300000000
+7,2050,R2,gasCCGT,2025,10.50300000000
+7,2059,R2,gasCCGT,2025,10.50300000000
+7,2060,R2,gasCCGT,2025,10.50300000000
+7,2064,R2,gasCCGT,2025,10.50300000000
+8,2035,R2,solarPV,2030,11.20000000000
+8,2040,R2,solarPV,2030,11.20000000000
+8,2045,R2,solarPV,2030,11.20000000000
+8,2049,R2,solarPV,2030,11.20000000000
+8,2050,R2,solarPV,2030,11.20000000000
+8,2059,R2,solarPV,2030,11.20000000000
+9,2040,R2,solarPV,2035,11.20000000000
+9,2045,R2,solarPV,2035,11.20000000000
+9,2049,R2,solarPV,2035,11.20000000000
+9,2050,R2,solarPV,2035,11.20000000000
+9,2059,R2,solarPV,2035,11.20000000000
+9,2060,R2,solarPV,2035,11.20000000000
+9,2064,R2,solarPV,2035,11.20000000000
+10,2025,R2,windturbine,2020,32.36820000000
+10,2030,R2,windturbine,2020,32.36820000000
+10,2035,R2,windturbine,2020,32.36820000000
+10,2040,R2,windturbine,2020,32.36820000000
+10,2045,R2,windturbine,2020,32.36820000000
+10,2049,R2,windturbine,2020,32.36820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index 308c7ffa..dc49ed92 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -1,41 +1,37 @@
 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,12.36820000000
-1,2030,R1,solarPV,2020,12.36820000000
-1,2035,R1,solarPV,2020,12.36820000000
-1,2040,R1,solarPV,2020,12.36820000000
-1,2045,R1,solarPV,2020,12.36820000000
-1,2049,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2025,20.00000000000
-2,2035,R1,solarPV,2025,20.00000000000
-2,2040,R1,solarPV,2025,20.00000000000
-2,2045,R1,solarPV,2025,20.00000000000
-2,2049,R1,solarPV,2025,20.00000000000
-2,2050,R1,solarPV,2025,20.00000000000
-2,2054,R1,solarPV,2025,20.00000000000
+1,2030,R1,gasCCGT,2025,10.50300000000
+1,2035,R1,gasCCGT,2025,10.50300000000
+1,2040,R1,gasCCGT,2025,10.50300000000
+1,2045,R1,gasCCGT,2025,10.50300000000
+1,2049,R1,gasCCGT,2025,10.50300000000
+1,2050,R1,gasCCGT,2025,10.50300000000
+1,2059,R1,gasCCGT,2025,10.50300000000
+1,2060,R1,gasCCGT,2025,10.50300000000
+1,2064,R1,gasCCGT,2025,10.50300000000
+2,2025,R1,solarPV,2020,12.36820000000
+2,2030,R1,solarPV,2020,12.36820000000
+2,2035,R1,solarPV,2020,12.36820000000
+2,2040,R1,solarPV,2020,12.36820000000
+2,2045,R1,solarPV,2020,12.36820000000
+2,2049,R1,solarPV,2020,12.36820000000
 3,2035,R1,solarPV,2030,11.20000000000
 3,2040,R1,solarPV,2030,11.20000000000
 3,2045,R1,solarPV,2030,11.20000000000
 3,2049,R1,solarPV,2030,11.20000000000
 3,2050,R1,solarPV,2030,11.20000000000
-3,2054,R1,solarPV,2030,11.20000000000
-3,2055,R1,solarPV,2030,11.20000000000
 3,2059,R1,solarPV,2030,11.20000000000
 4,2040,R1,solarPV,2035,11.20000000000
 4,2045,R1,solarPV,2035,11.20000000000
 4,2049,R1,solarPV,2035,11.20000000000
 4,2050,R1,solarPV,2035,11.20000000000
-4,2054,R1,solarPV,2035,11.20000000000
-4,2055,R1,solarPV,2035,11.20000000000
 4,2059,R1,solarPV,2035,11.20000000000
 4,2060,R1,solarPV,2035,11.20000000000
 4,2064,R1,solarPV,2035,11.20000000000
 5,2045,R1,solarPV,2040,11.20000000000
 5,2049,R1,solarPV,2040,11.20000000000
 5,2050,R1,solarPV,2040,11.20000000000
-5,2054,R1,solarPV,2040,11.20000000000
-5,2055,R1,solarPV,2040,11.20000000000
 5,2059,R1,solarPV,2040,11.20000000000
 5,2060,R1,solarPV,2040,11.20000000000
 5,2064,R1,solarPV,2040,11.20000000000
@@ -47,59 +43,41 @@ asset,year,region,technology,installed,capacity
 6,2040,R1,windturbine,2020,20.00000000000
 6,2045,R1,windturbine,2020,20.00000000000
 6,2049,R1,windturbine,2020,20.00000000000
-7,2030,R1,windturbine,2025,3.63180000000
-7,2035,R1,windturbine,2025,3.63180000000
-7,2040,R1,windturbine,2025,3.63180000000
-7,2045,R1,windturbine,2025,3.63180000000
-7,2049,R1,windturbine,2025,3.63180000000
-7,2050,R1,windturbine,2025,3.63180000000
-7,2054,R1,windturbine,2025,3.63180000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,1.00000000000
-9,2030,R2,solarPV,2025,20.00000000000
-9,2035,R2,solarPV,2025,20.00000000000
-9,2040,R2,solarPV,2025,20.00000000000
-9,2045,R2,solarPV,2025,20.00000000000
-9,2049,R2,solarPV,2025,20.00000000000
-9,2050,R2,solarPV,2025,20.00000000000
-9,2054,R2,solarPV,2025,20.00000000000
-10,2035,R2,solarPV,2030,11.20000000000
-10,2040,R2,solarPV,2030,11.20000000000
-10,2045,R2,solarPV,2030,11.20000000000
-10,2049,R2,solarPV,2030,11.20000000000
-10,2050,R2,solarPV,2030,11.20000000000
-10,2054,R2,solarPV,2030,11.20000000000
-10,2055,R2,solarPV,2030,11.20000000000
-10,2059,R2,solarPV,2030,11.20000000000
-11,2040,R2,solarPV,2035,11.20000000000
-11,2045,R2,solarPV,2035,11.20000000000
-11,2049,R2,solarPV,2035,11.20000000000
-11,2050,R2,solarPV,2035,11.20000000000
-11,2054,R2,solarPV,2035,11.20000000000
-11,2055,R2,solarPV,2035,11.20000000000
-11,2059,R2,solarPV,2035,11.20000000000
-11,2060,R2,solarPV,2035,11.20000000000
-11,2064,R2,solarPV,2035,11.20000000000
-12,2045,R2,solarPV,2040,11.20000000000
-12,2049,R2,solarPV,2040,11.20000000000
-12,2050,R2,solarPV,2040,11.20000000000
-12,2054,R2,solarPV,2040,11.20000000000
-12,2055,R2,solarPV,2040,11.20000000000
-12,2059,R2,solarPV,2040,11.20000000000
-12,2060,R2,solarPV,2040,11.20000000000
-12,2064,R2,solarPV,2040,11.20000000000
-12,2065,R2,solarPV,2040,11.20000000000
-12,2069,R2,solarPV,2040,11.20000000000
-13,2025,R2,windturbine,2020,32.36820000000
-13,2030,R2,windturbine,2020,32.36820000000
-13,2035,R2,windturbine,2020,32.36820000000
-13,2040,R2,windturbine,2020,32.36820000000
-13,2045,R2,windturbine,2020,32.36820000000
-13,2049,R2,windturbine,2020,32.36820000000
-14,2030,R2,windturbine,2025,3.63180000000
-14,2035,R2,windturbine,2025,3.63180000000
-14,2040,R2,windturbine,2025,3.63180000000
-14,2045,R2,windturbine,2025,3.63180000000
-14,2049,R2,windturbine,2025,3.63180000000
-14,2050,R2,windturbine,2025,3.63180000000
-14,2054,R2,windturbine,2025,3.63180000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+8,2030,R2,gasCCGT,2025,10.50300000000
+8,2035,R2,gasCCGT,2025,10.50300000000
+8,2040,R2,gasCCGT,2025,10.50300000000
+8,2045,R2,gasCCGT,2025,10.50300000000
+8,2049,R2,gasCCGT,2025,10.50300000000
+8,2050,R2,gasCCGT,2025,10.50300000000
+8,2059,R2,gasCCGT,2025,10.50300000000
+8,2060,R2,gasCCGT,2025,10.50300000000
+8,2064,R2,gasCCGT,2025,10.50300000000
+9,2035,R2,solarPV,2030,11.20000000000
+9,2040,R2,solarPV,2030,11.20000000000
+9,2045,R2,solarPV,2030,11.20000000000
+9,2049,R2,solarPV,2030,11.20000000000
+9,2050,R2,solarPV,2030,11.20000000000
+9,2059,R2,solarPV,2030,11.20000000000
+10,2040,R2,solarPV,2035,11.20000000000
+10,2045,R2,solarPV,2035,11.20000000000
+10,2049,R2,solarPV,2035,11.20000000000
+10,2050,R2,solarPV,2035,11.20000000000
+10,2059,R2,solarPV,2035,11.20000000000
+10,2060,R2,solarPV,2035,11.20000000000
+10,2064,R2,solarPV,2035,11.20000000000
+11,2045,R2,solarPV,2040,11.20000000000
+11,2049,R2,solarPV,2040,11.20000000000
+11,2050,R2,solarPV,2040,11.20000000000
+11,2059,R2,solarPV,2040,11.20000000000
+11,2060,R2,solarPV,2040,11.20000000000
+11,2064,R2,solarPV,2040,11.20000000000
+11,2065,R2,solarPV,2040,11.20000000000
+11,2069,R2,solarPV,2040,11.20000000000
+12,2025,R2,windturbine,2020,32.36820000000
+12,2030,R2,windturbine,2020,32.36820000000
+12,2035,R2,windturbine,2020,32.36820000000
+12,2040,R2,windturbine,2020,32.36820000000
+12,2045,R2,windturbine,2020,32.36820000000
+12,2049,R2,windturbine,2020,32.36820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index a0ea61ec..f127abcc 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,61 +1,53 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,1.58590000000
-1,2054,R1,gasCCGT,2045,1.58590000000
-1,2055,R1,gasCCGT,2045,1.58590000000
-1,2059,R1,gasCCGT,2045,1.58590000000
-1,2060,R1,gasCCGT,2045,1.58590000000
-1,2064,R1,gasCCGT,2045,1.58590000000
-1,2065,R1,gasCCGT,2045,1.58590000000
-1,2069,R1,gasCCGT,2045,1.58590000000
-1,2070,R1,gasCCGT,2045,1.58590000000
-1,2074,R1,gasCCGT,2045,1.58590000000
-1,2075,R1,gasCCGT,2045,1.58590000000
-1,2084,R1,gasCCGT,2045,1.58590000000
-2,2025,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2020,12.36820000000
-2,2035,R1,solarPV,2020,12.36820000000
-2,2040,R1,solarPV,2020,12.36820000000
-2,2045,R1,solarPV,2020,12.36820000000
-2,2049,R1,solarPV,2020,12.36820000000
-3,2030,R1,solarPV,2025,20.00000000000
-3,2035,R1,solarPV,2025,20.00000000000
-3,2040,R1,solarPV,2025,20.00000000000
-3,2045,R1,solarPV,2025,20.00000000000
-3,2049,R1,solarPV,2025,20.00000000000
-3,2050,R1,solarPV,2025,20.00000000000
-3,2054,R1,solarPV,2025,20.00000000000
+1,2030,R1,gasCCGT,2025,10.50300000000
+1,2035,R1,gasCCGT,2025,10.50300000000
+1,2040,R1,gasCCGT,2025,10.50300000000
+1,2045,R1,gasCCGT,2025,10.50300000000
+1,2049,R1,gasCCGT,2025,10.50300000000
+1,2050,R1,gasCCGT,2025,10.50300000000
+1,2059,R1,gasCCGT,2025,10.50300000000
+1,2060,R1,gasCCGT,2025,10.50300000000
+1,2064,R1,gasCCGT,2025,10.50300000000
+2,2050,R1,gasCCGT,2045,1.58590000000
+2,2059,R1,gasCCGT,2045,1.58590000000
+2,2060,R1,gasCCGT,2045,1.58590000000
+2,2064,R1,gasCCGT,2045,1.58590000000
+2,2065,R1,gasCCGT,2045,1.58590000000
+2,2069,R1,gasCCGT,2045,1.58590000000
+2,2070,R1,gasCCGT,2045,1.58590000000
+2,2074,R1,gasCCGT,2045,1.58590000000
+2,2075,R1,gasCCGT,2045,1.58590000000
+2,2084,R1,gasCCGT,2045,1.58590000000
+3,2025,R1,solarPV,2020,12.36820000000
+3,2030,R1,solarPV,2020,12.36820000000
+3,2035,R1,solarPV,2020,12.36820000000
+3,2040,R1,solarPV,2020,12.36820000000
+3,2045,R1,solarPV,2020,12.36820000000
+3,2049,R1,solarPV,2020,12.36820000000
 4,2035,R1,solarPV,2030,11.20000000000
 4,2040,R1,solarPV,2030,11.20000000000
 4,2045,R1,solarPV,2030,11.20000000000
 4,2049,R1,solarPV,2030,11.20000000000
 4,2050,R1,solarPV,2030,11.20000000000
-4,2054,R1,solarPV,2030,11.20000000000
-4,2055,R1,solarPV,2030,11.20000000000
 4,2059,R1,solarPV,2030,11.20000000000
 5,2040,R1,solarPV,2035,11.20000000000
 5,2045,R1,solarPV,2035,11.20000000000
 5,2049,R1,solarPV,2035,11.20000000000
 5,2050,R1,solarPV,2035,11.20000000000
-5,2054,R1,solarPV,2035,11.20000000000
-5,2055,R1,solarPV,2035,11.20000000000
 5,2059,R1,solarPV,2035,11.20000000000
 5,2060,R1,solarPV,2035,11.20000000000
 5,2064,R1,solarPV,2035,11.20000000000
 6,2045,R1,solarPV,2040,11.20000000000
 6,2049,R1,solarPV,2040,11.20000000000
 6,2050,R1,solarPV,2040,11.20000000000
-6,2054,R1,solarPV,2040,11.20000000000
-6,2055,R1,solarPV,2040,11.20000000000
 6,2059,R1,solarPV,2040,11.20000000000
 6,2060,R1,solarPV,2040,11.20000000000
 6,2064,R1,solarPV,2040,11.20000000000
 6,2065,R1,solarPV,2040,11.20000000000
 6,2069,R1,solarPV,2040,11.20000000000
 7,2050,R1,solarPV,2045,20.00000000000
-7,2054,R1,solarPV,2045,20.00000000000
-7,2055,R1,solarPV,2045,20.00000000000
 7,2059,R1,solarPV,2045,20.00000000000
 7,2060,R1,solarPV,2045,20.00000000000
 7,2064,R1,solarPV,2045,20.00000000000
@@ -69,89 +61,65 @@ asset,year,region,technology,installed,capacity
 8,2040,R1,windturbine,2020,20.00000000000
 8,2045,R1,windturbine,2020,20.00000000000
 8,2049,R1,windturbine,2020,20.00000000000
-9,2030,R1,windturbine,2025,3.63180000000
-9,2035,R1,windturbine,2025,3.63180000000
-9,2040,R1,windturbine,2025,3.63180000000
-9,2045,R1,windturbine,2025,3.63180000000
-9,2049,R1,windturbine,2025,3.63180000000
-9,2050,R1,windturbine,2025,3.63180000000
-9,2054,R1,windturbine,2025,3.63180000000
-10,2050,R1,windturbine,2045,20.00000000000
-10,2054,R1,windturbine,2045,20.00000000000
-10,2055,R1,windturbine,2045,20.00000000000
-10,2059,R1,windturbine,2045,20.00000000000
-10,2060,R1,windturbine,2045,20.00000000000
-10,2064,R1,windturbine,2045,20.00000000000
-10,2065,R1,windturbine,2045,20.00000000000
-10,2069,R1,windturbine,2045,20.00000000000
-10,2070,R1,windturbine,2045,20.00000000000
-10,2074,R1,windturbine,2045,20.00000000000
-11,2020,R2,gasCCGT,2020,1.00000000000
-11,2025,R2,gasCCGT,2020,1.00000000000
-12,2030,R2,solarPV,2025,20.00000000000
-12,2035,R2,solarPV,2025,20.00000000000
-12,2040,R2,solarPV,2025,20.00000000000
-12,2045,R2,solarPV,2025,20.00000000000
-12,2049,R2,solarPV,2025,20.00000000000
-12,2050,R2,solarPV,2025,20.00000000000
-12,2054,R2,solarPV,2025,20.00000000000
-13,2035,R2,solarPV,2030,11.20000000000
-13,2040,R2,solarPV,2030,11.20000000000
-13,2045,R2,solarPV,2030,11.20000000000
-13,2049,R2,solarPV,2030,11.20000000000
-13,2050,R2,solarPV,2030,11.20000000000
-13,2054,R2,solarPV,2030,11.20000000000
-13,2055,R2,solarPV,2030,11.20000000000
-13,2059,R2,solarPV,2030,11.20000000000
-14,2040,R2,solarPV,2035,11.20000000000
-14,2045,R2,solarPV,2035,11.20000000000
-14,2049,R2,solarPV,2035,11.20000000000
-14,2050,R2,solarPV,2035,11.20000000000
-14,2054,R2,solarPV,2035,11.20000000000
-14,2055,R2,solarPV,2035,11.20000000000
-14,2059,R2,solarPV,2035,11.20000000000
-14,2060,R2,solarPV,2035,11.20000000000
-14,2064,R2,solarPV,2035,11.20000000000
-15,2045,R2,solarPV,2040,11.20000000000
-15,2049,R2,solarPV,2040,11.20000000000
-15,2050,R2,solarPV,2040,11.20000000000
-15,2054,R2,solarPV,2040,11.20000000000
-15,2055,R2,solarPV,2040,11.20000000000
-15,2059,R2,solarPV,2040,11.20000000000
-15,2060,R2,solarPV,2040,11.20000000000
-15,2064,R2,solarPV,2040,11.20000000000
-15,2065,R2,solarPV,2040,11.20000000000
-15,2069,R2,solarPV,2040,11.20000000000
-16,2050,R2,solarPV,2045,20.00000000000
-16,2054,R2,solarPV,2045,20.00000000000
-16,2055,R2,solarPV,2045,20.00000000000
-16,2059,R2,solarPV,2045,20.00000000000
-16,2060,R2,solarPV,2045,20.00000000000
-16,2064,R2,solarPV,2045,20.00000000000
-16,2065,R2,solarPV,2045,20.00000000000
-16,2069,R2,solarPV,2045,20.00000000000
-16,2070,R2,solarPV,2045,20.00000000000
-16,2074,R2,solarPV,2045,20.00000000000
-17,2025,R2,windturbine,2020,32.36820000000
-17,2030,R2,windturbine,2020,32.36820000000
-17,2035,R2,windturbine,2020,32.36820000000
-17,2040,R2,windturbine,2020,32.36820000000
-17,2045,R2,windturbine,2020,32.36820000000
-17,2049,R2,windturbine,2020,32.36820000000
-18,2030,R2,windturbine,2025,3.63180000000
-18,2035,R2,windturbine,2025,3.63180000000
-18,2040,R2,windturbine,2025,3.63180000000
-18,2045,R2,windturbine,2025,3.63180000000
-18,2049,R2,windturbine,2025,3.63180000000
-18,2050,R2,windturbine,2025,3.63180000000
-18,2054,R2,windturbine,2025,3.63180000000
-19,2050,R2,windturbine,2045,23.56820000000
-19,2054,R2,windturbine,2045,23.56820000000
-19,2055,R2,windturbine,2045,23.56820000000
-19,2059,R2,windturbine,2045,23.56820000000
-19,2060,R2,windturbine,2045,23.56820000000
-19,2064,R2,windturbine,2045,23.56820000000
-19,2065,R2,windturbine,2045,23.56820000000
-19,2069,R2,windturbine,2045,23.56820000000
-19,2070,R2,windturbine,2045,23.56820000000
-19,2074,R2,windturbine,2045,23.56820000000
+9,2050,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,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,10.50300000000
+11,2035,R2,gasCCGT,2025,10.50300000000
+11,2040,R2,gasCCGT,2025,10.50300000000
+11,2045,R2,gasCCGT,2025,10.50300000000
+11,2049,R2,gasCCGT,2025,10.50300000000
+11,2050,R2,gasCCGT,2025,10.50300000000
+11,2059,R2,gasCCGT,2025,10.50300000000
+11,2060,R2,gasCCGT,2025,10.50300000000
+11,2064,R2,gasCCGT,2025,10.50300000000
+12,2035,R2,solarPV,2030,11.20000000000
+12,2040,R2,solarPV,2030,11.20000000000
+12,2045,R2,solarPV,2030,11.20000000000
+12,2049,R2,solarPV,2030,11.20000000000
+12,2050,R2,solarPV,2030,11.20000000000
+12,2059,R2,solarPV,2030,11.20000000000
+13,2040,R2,solarPV,2035,11.20000000000
+13,2045,R2,solarPV,2035,11.20000000000
+13,2049,R2,solarPV,2035,11.20000000000
+13,2050,R2,solarPV,2035,11.20000000000
+13,2059,R2,solarPV,2035,11.20000000000
+13,2060,R2,solarPV,2035,11.20000000000
+13,2064,R2,solarPV,2035,11.20000000000
+14,2045,R2,solarPV,2040,11.20000000000
+14,2049,R2,solarPV,2040,11.20000000000
+14,2050,R2,solarPV,2040,11.20000000000
+14,2059,R2,solarPV,2040,11.20000000000
+14,2060,R2,solarPV,2040,11.20000000000
+14,2064,R2,solarPV,2040,11.20000000000
+14,2065,R2,solarPV,2040,11.20000000000
+14,2069,R2,solarPV,2040,11.20000000000
+15,2050,R2,solarPV,2045,20.00000000000
+15,2059,R2,solarPV,2045,20.00000000000
+15,2060,R2,solarPV,2045,20.00000000000
+15,2064,R2,solarPV,2045,20.00000000000
+15,2065,R2,solarPV,2045,20.00000000000
+15,2069,R2,solarPV,2045,20.00000000000
+15,2070,R2,solarPV,2045,20.00000000000
+15,2074,R2,solarPV,2045,20.00000000000
+16,2025,R2,windturbine,2020,32.36820000000
+16,2030,R2,windturbine,2020,32.36820000000
+16,2035,R2,windturbine,2020,32.36820000000
+16,2040,R2,windturbine,2020,32.36820000000
+16,2045,R2,windturbine,2020,32.36820000000
+16,2049,R2,windturbine,2020,32.36820000000
+17,2050,R2,windturbine,2045,23.56820000000
+17,2059,R2,windturbine,2045,23.56820000000
+17,2060,R2,windturbine,2045,23.56820000000
+17,2064,R2,windturbine,2045,23.56820000000
+17,2065,R2,windturbine,2045,23.56820000000
+17,2069,R2,windturbine,2045,23.56820000000
+17,2070,R2,windturbine,2045,23.56820000000
+17,2074,R2,windturbine,2045,23.56820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index 44f9f68b..f127abcc 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,63 +1,53 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2050,R1,gasCCGT,2045,1.58590000000
-1,2054,R1,gasCCGT,2045,1.58590000000
-1,2055,R1,gasCCGT,2045,1.58590000000
-1,2059,R1,gasCCGT,2045,1.58590000000
-1,2060,R1,gasCCGT,2045,1.58590000000
-1,2064,R1,gasCCGT,2045,1.58590000000
-1,2065,R1,gasCCGT,2045,1.58590000000
-1,2069,R1,gasCCGT,2045,1.58590000000
-1,2070,R1,gasCCGT,2045,1.58590000000
-1,2074,R1,gasCCGT,2045,1.58590000000
-1,2075,R1,gasCCGT,2045,1.58590000000
-1,2079,R1,gasCCGT,2045,1.58590000000
-1,2080,R1,gasCCGT,2045,1.58590000000
-1,2084,R1,gasCCGT,2045,1.58590000000
-2,2025,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2020,12.36820000000
-2,2035,R1,solarPV,2020,12.36820000000
-2,2040,R1,solarPV,2020,12.36820000000
-2,2045,R1,solarPV,2020,12.36820000000
-2,2049,R1,solarPV,2020,12.36820000000
-3,2030,R1,solarPV,2025,20.00000000000
-3,2035,R1,solarPV,2025,20.00000000000
-3,2040,R1,solarPV,2025,20.00000000000
-3,2045,R1,solarPV,2025,20.00000000000
-3,2049,R1,solarPV,2025,20.00000000000
-3,2050,R1,solarPV,2025,20.00000000000
-3,2054,R1,solarPV,2025,20.00000000000
+1,2030,R1,gasCCGT,2025,10.50300000000
+1,2035,R1,gasCCGT,2025,10.50300000000
+1,2040,R1,gasCCGT,2025,10.50300000000
+1,2045,R1,gasCCGT,2025,10.50300000000
+1,2049,R1,gasCCGT,2025,10.50300000000
+1,2050,R1,gasCCGT,2025,10.50300000000
+1,2059,R1,gasCCGT,2025,10.50300000000
+1,2060,R1,gasCCGT,2025,10.50300000000
+1,2064,R1,gasCCGT,2025,10.50300000000
+2,2050,R1,gasCCGT,2045,1.58590000000
+2,2059,R1,gasCCGT,2045,1.58590000000
+2,2060,R1,gasCCGT,2045,1.58590000000
+2,2064,R1,gasCCGT,2045,1.58590000000
+2,2065,R1,gasCCGT,2045,1.58590000000
+2,2069,R1,gasCCGT,2045,1.58590000000
+2,2070,R1,gasCCGT,2045,1.58590000000
+2,2074,R1,gasCCGT,2045,1.58590000000
+2,2075,R1,gasCCGT,2045,1.58590000000
+2,2084,R1,gasCCGT,2045,1.58590000000
+3,2025,R1,solarPV,2020,12.36820000000
+3,2030,R1,solarPV,2020,12.36820000000
+3,2035,R1,solarPV,2020,12.36820000000
+3,2040,R1,solarPV,2020,12.36820000000
+3,2045,R1,solarPV,2020,12.36820000000
+3,2049,R1,solarPV,2020,12.36820000000
 4,2035,R1,solarPV,2030,11.20000000000
 4,2040,R1,solarPV,2030,11.20000000000
 4,2045,R1,solarPV,2030,11.20000000000
 4,2049,R1,solarPV,2030,11.20000000000
 4,2050,R1,solarPV,2030,11.20000000000
-4,2054,R1,solarPV,2030,11.20000000000
-4,2055,R1,solarPV,2030,11.20000000000
 4,2059,R1,solarPV,2030,11.20000000000
 5,2040,R1,solarPV,2035,11.20000000000
 5,2045,R1,solarPV,2035,11.20000000000
 5,2049,R1,solarPV,2035,11.20000000000
 5,2050,R1,solarPV,2035,11.20000000000
-5,2054,R1,solarPV,2035,11.20000000000
-5,2055,R1,solarPV,2035,11.20000000000
 5,2059,R1,solarPV,2035,11.20000000000
 5,2060,R1,solarPV,2035,11.20000000000
 5,2064,R1,solarPV,2035,11.20000000000
 6,2045,R1,solarPV,2040,11.20000000000
 6,2049,R1,solarPV,2040,11.20000000000
 6,2050,R1,solarPV,2040,11.20000000000
-6,2054,R1,solarPV,2040,11.20000000000
-6,2055,R1,solarPV,2040,11.20000000000
 6,2059,R1,solarPV,2040,11.20000000000
 6,2060,R1,solarPV,2040,11.20000000000
 6,2064,R1,solarPV,2040,11.20000000000
 6,2065,R1,solarPV,2040,11.20000000000
 6,2069,R1,solarPV,2040,11.20000000000
 7,2050,R1,solarPV,2045,20.00000000000
-7,2054,R1,solarPV,2045,20.00000000000
-7,2055,R1,solarPV,2045,20.00000000000
 7,2059,R1,solarPV,2045,20.00000000000
 7,2060,R1,solarPV,2045,20.00000000000
 7,2064,R1,solarPV,2045,20.00000000000
@@ -65,135 +55,71 @@ asset,year,region,technology,installed,capacity
 7,2069,R1,solarPV,2045,20.00000000000
 7,2070,R1,solarPV,2045,20.00000000000
 7,2074,R1,solarPV,2045,20.00000000000
-8,2055,R1,solarPV,2050,20.00000000000
-8,2059,R1,solarPV,2050,20.00000000000
-8,2060,R1,solarPV,2050,20.00000000000
-8,2064,R1,solarPV,2050,20.00000000000
-8,2065,R1,solarPV,2050,20.00000000000
-8,2069,R1,solarPV,2050,20.00000000000
-8,2070,R1,solarPV,2050,20.00000000000
-8,2074,R1,solarPV,2050,20.00000000000
-8,2075,R1,solarPV,2050,20.00000000000
-8,2079,R1,solarPV,2050,20.00000000000
-9,2025,R1,windturbine,2020,20.00000000000
-9,2030,R1,windturbine,2020,20.00000000000
-9,2035,R1,windturbine,2020,20.00000000000
-9,2040,R1,windturbine,2020,20.00000000000
-9,2045,R1,windturbine,2020,20.00000000000
-9,2049,R1,windturbine,2020,20.00000000000
-10,2030,R1,windturbine,2025,3.63180000000
-10,2035,R1,windturbine,2025,3.63180000000
-10,2040,R1,windturbine,2025,3.63180000000
-10,2045,R1,windturbine,2025,3.63180000000
-10,2049,R1,windturbine,2025,3.63180000000
-10,2050,R1,windturbine,2025,3.63180000000
-10,2054,R1,windturbine,2025,3.63180000000
-11,2050,R1,windturbine,2045,20.00000000000
-11,2054,R1,windturbine,2045,20.00000000000
-11,2055,R1,windturbine,2045,20.00000000000
-11,2059,R1,windturbine,2045,20.00000000000
-11,2060,R1,windturbine,2045,20.00000000000
-11,2064,R1,windturbine,2045,20.00000000000
-11,2065,R1,windturbine,2045,20.00000000000
-11,2069,R1,windturbine,2045,20.00000000000
-11,2070,R1,windturbine,2045,20.00000000000
-11,2074,R1,windturbine,2045,20.00000000000
-12,2055,R1,windturbine,2050,3.63180000000
-12,2059,R1,windturbine,2050,3.63180000000
-12,2060,R1,windturbine,2050,3.63180000000
-12,2064,R1,windturbine,2050,3.63180000000
-12,2065,R1,windturbine,2050,3.63180000000
-12,2069,R1,windturbine,2050,3.63180000000
-12,2070,R1,windturbine,2050,3.63180000000
-12,2074,R1,windturbine,2050,3.63180000000
-12,2075,R1,windturbine,2050,3.63180000000
-12,2079,R1,windturbine,2050,3.63180000000
-13,2020,R2,gasCCGT,2020,1.00000000000
-13,2025,R2,gasCCGT,2020,1.00000000000
-14,2030,R2,solarPV,2025,20.00000000000
-14,2035,R2,solarPV,2025,20.00000000000
-14,2040,R2,solarPV,2025,20.00000000000
-14,2045,R2,solarPV,2025,20.00000000000
-14,2049,R2,solarPV,2025,20.00000000000
-14,2050,R2,solarPV,2025,20.00000000000
-14,2054,R2,solarPV,2025,20.00000000000
-15,2035,R2,solarPV,2030,11.20000000000
-15,2040,R2,solarPV,2030,11.20000000000
-15,2045,R2,solarPV,2030,11.20000000000
-15,2049,R2,solarPV,2030,11.20000000000
-15,2050,R2,solarPV,2030,11.20000000000
-15,2054,R2,solarPV,2030,11.20000000000
-15,2055,R2,solarPV,2030,11.20000000000
-15,2059,R2,solarPV,2030,11.20000000000
-16,2040,R2,solarPV,2035,11.20000000000
-16,2045,R2,solarPV,2035,11.20000000000
-16,2049,R2,solarPV,2035,11.20000000000
-16,2050,R2,solarPV,2035,11.20000000000
-16,2054,R2,solarPV,2035,11.20000000000
-16,2055,R2,solarPV,2035,11.20000000000
-16,2059,R2,solarPV,2035,11.20000000000
-16,2060,R2,solarPV,2035,11.20000000000
-16,2064,R2,solarPV,2035,11.20000000000
-17,2045,R2,solarPV,2040,11.20000000000
-17,2049,R2,solarPV,2040,11.20000000000
-17,2050,R2,solarPV,2040,11.20000000000
-17,2054,R2,solarPV,2040,11.20000000000
-17,2055,R2,solarPV,2040,11.20000000000
-17,2059,R2,solarPV,2040,11.20000000000
-17,2060,R2,solarPV,2040,11.20000000000
-17,2064,R2,solarPV,2040,11.20000000000
-17,2065,R2,solarPV,2040,11.20000000000
-17,2069,R2,solarPV,2040,11.20000000000
-18,2050,R2,solarPV,2045,20.00000000000
-18,2054,R2,solarPV,2045,20.00000000000
-18,2055,R2,solarPV,2045,20.00000000000
-18,2059,R2,solarPV,2045,20.00000000000
-18,2060,R2,solarPV,2045,20.00000000000
-18,2064,R2,solarPV,2045,20.00000000000
-18,2065,R2,solarPV,2045,20.00000000000
-18,2069,R2,solarPV,2045,20.00000000000
-18,2070,R2,solarPV,2045,20.00000000000
-18,2074,R2,solarPV,2045,20.00000000000
-19,2055,R2,solarPV,2050,20.00000000000
-19,2059,R2,solarPV,2050,20.00000000000
-19,2060,R2,solarPV,2050,20.00000000000
-19,2064,R2,solarPV,2050,20.00000000000
-19,2065,R2,solarPV,2050,20.00000000000
-19,2069,R2,solarPV,2050,20.00000000000
-19,2070,R2,solarPV,2050,20.00000000000
-19,2074,R2,solarPV,2050,20.00000000000
-19,2075,R2,solarPV,2050,20.00000000000
-19,2079,R2,solarPV,2050,20.00000000000
-20,2025,R2,windturbine,2020,32.36820000000
-20,2030,R2,windturbine,2020,32.36820000000
-20,2035,R2,windturbine,2020,32.36820000000
-20,2040,R2,windturbine,2020,32.36820000000
-20,2045,R2,windturbine,2020,32.36820000000
-20,2049,R2,windturbine,2020,32.36820000000
-21,2030,R2,windturbine,2025,3.63180000000
-21,2035,R2,windturbine,2025,3.63180000000
-21,2040,R2,windturbine,2025,3.63180000000
-21,2045,R2,windturbine,2025,3.63180000000
-21,2049,R2,windturbine,2025,3.63180000000
-21,2050,R2,windturbine,2025,3.63180000000
-21,2054,R2,windturbine,2025,3.63180000000
-22,2050,R2,windturbine,2045,23.56820000000
-22,2054,R2,windturbine,2045,23.56820000000
-22,2055,R2,windturbine,2045,23.56820000000
-22,2059,R2,windturbine,2045,23.56820000000
-22,2060,R2,windturbine,2045,23.56820000000
-22,2064,R2,windturbine,2045,23.56820000000
-22,2065,R2,windturbine,2045,23.56820000000
-22,2069,R2,windturbine,2045,23.56820000000
-22,2070,R2,windturbine,2045,23.56820000000
-22,2074,R2,windturbine,2045,23.56820000000
-23,2055,R2,windturbine,2050,3.63180000000
-23,2059,R2,windturbine,2050,3.63180000000
-23,2060,R2,windturbine,2050,3.63180000000
-23,2064,R2,windturbine,2050,3.63180000000
-23,2065,R2,windturbine,2050,3.63180000000
-23,2069,R2,windturbine,2050,3.63180000000
-23,2070,R2,windturbine,2050,3.63180000000
-23,2074,R2,windturbine,2050,3.63180000000
-23,2075,R2,windturbine,2050,3.63180000000
-23,2079,R2,windturbine,2050,3.63180000000
+8,2025,R1,windturbine,2020,20.00000000000
+8,2030,R1,windturbine,2020,20.00000000000
+8,2035,R1,windturbine,2020,20.00000000000
+8,2040,R1,windturbine,2020,20.00000000000
+8,2045,R1,windturbine,2020,20.00000000000
+8,2049,R1,windturbine,2020,20.00000000000
+9,2050,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,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,10.50300000000
+11,2035,R2,gasCCGT,2025,10.50300000000
+11,2040,R2,gasCCGT,2025,10.50300000000
+11,2045,R2,gasCCGT,2025,10.50300000000
+11,2049,R2,gasCCGT,2025,10.50300000000
+11,2050,R2,gasCCGT,2025,10.50300000000
+11,2059,R2,gasCCGT,2025,10.50300000000
+11,2060,R2,gasCCGT,2025,10.50300000000
+11,2064,R2,gasCCGT,2025,10.50300000000
+12,2035,R2,solarPV,2030,11.20000000000
+12,2040,R2,solarPV,2030,11.20000000000
+12,2045,R2,solarPV,2030,11.20000000000
+12,2049,R2,solarPV,2030,11.20000000000
+12,2050,R2,solarPV,2030,11.20000000000
+12,2059,R2,solarPV,2030,11.20000000000
+13,2040,R2,solarPV,2035,11.20000000000
+13,2045,R2,solarPV,2035,11.20000000000
+13,2049,R2,solarPV,2035,11.20000000000
+13,2050,R2,solarPV,2035,11.20000000000
+13,2059,R2,solarPV,2035,11.20000000000
+13,2060,R2,solarPV,2035,11.20000000000
+13,2064,R2,solarPV,2035,11.20000000000
+14,2045,R2,solarPV,2040,11.20000000000
+14,2049,R2,solarPV,2040,11.20000000000
+14,2050,R2,solarPV,2040,11.20000000000
+14,2059,R2,solarPV,2040,11.20000000000
+14,2060,R2,solarPV,2040,11.20000000000
+14,2064,R2,solarPV,2040,11.20000000000
+14,2065,R2,solarPV,2040,11.20000000000
+14,2069,R2,solarPV,2040,11.20000000000
+15,2050,R2,solarPV,2045,20.00000000000
+15,2059,R2,solarPV,2045,20.00000000000
+15,2060,R2,solarPV,2045,20.00000000000
+15,2064,R2,solarPV,2045,20.00000000000
+15,2065,R2,solarPV,2045,20.00000000000
+15,2069,R2,solarPV,2045,20.00000000000
+15,2070,R2,solarPV,2045,20.00000000000
+15,2074,R2,solarPV,2045,20.00000000000
+16,2025,R2,windturbine,2020,32.36820000000
+16,2030,R2,windturbine,2020,32.36820000000
+16,2035,R2,windturbine,2020,32.36820000000
+16,2040,R2,windturbine,2020,32.36820000000
+16,2045,R2,windturbine,2020,32.36820000000
+16,2049,R2,windturbine,2020,32.36820000000
+17,2050,R2,windturbine,2045,23.56820000000
+17,2059,R2,windturbine,2045,23.56820000000
+17,2060,R2,windturbine,2045,23.56820000000
+17,2064,R2,windturbine,2045,23.56820000000
+17,2065,R2,windturbine,2045,23.56820000000
+17,2069,R2,windturbine,2045,23.56820000000
+17,2070,R2,windturbine,2045,23.56820000000
+17,2074,R2,windturbine,2045,23.56820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index d8294d25..f6665d25 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind", "solar"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
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 d1ee882b..5340a31b 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
@@ -2,3 +2,8 @@ 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,2035,R1,gassupply1,2030,5.08550000000
+1,2040,R1,gassupply1,2030,5.08550000000
+1,2045,R1,gassupply1,2030,5.08550000000
+1,2050,R1,gassupply1,2030,5.08550000000
+1,2069,R1,gassupply1,2030,5.08550000000
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 d1ee882b..a19926e7 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
@@ -2,3 +2,14 @@ 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,2035,R1,gassupply1,2030,5.08550000000
+1,2040,R1,gassupply1,2030,5.08550000000
+1,2045,R1,gassupply1,2030,5.08550000000
+1,2050,R1,gassupply1,2030,5.08550000000
+1,2069,R1,gassupply1,2030,5.08550000000
+2,2040,R1,gassupply1,2035,0.13890000000
+2,2045,R1,gassupply1,2035,0.13890000000
+2,2050,R1,gassupply1,2035,0.13890000000
+2,2069,R1,gassupply1,2035,0.13890000000
+2,2070,R1,gassupply1,2035,0.13890000000
+2,2074,R1,gassupply1,2035,0.13890000000
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 d1ee882b..a19926e7 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
@@ -2,3 +2,14 @@ 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,2035,R1,gassupply1,2030,5.08550000000
+1,2040,R1,gassupply1,2030,5.08550000000
+1,2045,R1,gassupply1,2030,5.08550000000
+1,2050,R1,gassupply1,2030,5.08550000000
+1,2069,R1,gassupply1,2030,5.08550000000
+2,2040,R1,gassupply1,2035,0.13890000000
+2,2045,R1,gassupply1,2035,0.13890000000
+2,2050,R1,gassupply1,2035,0.13890000000
+2,2069,R1,gassupply1,2035,0.13890000000
+2,2070,R1,gassupply1,2035,0.13890000000
+2,2074,R1,gassupply1,2035,0.13890000000
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 d1ee882b..a19926e7 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
@@ -2,3 +2,14 @@ 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,2035,R1,gassupply1,2030,5.08550000000
+1,2040,R1,gassupply1,2030,5.08550000000
+1,2045,R1,gassupply1,2030,5.08550000000
+1,2050,R1,gassupply1,2030,5.08550000000
+1,2069,R1,gassupply1,2030,5.08550000000
+2,2040,R1,gassupply1,2035,0.13890000000
+2,2045,R1,gassupply1,2035,0.13890000000
+2,2050,R1,gassupply1,2035,0.13890000000
+2,2069,R1,gassupply1,2035,0.13890000000
+2,2070,R1,gassupply1,2035,0.13890000000
+2,2074,R1,gassupply1,2035,0.13890000000
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 d1ee882b..a19926e7 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
@@ -2,3 +2,14 @@ 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,2035,R1,gassupply1,2030,5.08550000000
+1,2040,R1,gassupply1,2030,5.08550000000
+1,2045,R1,gassupply1,2030,5.08550000000
+1,2050,R1,gassupply1,2030,5.08550000000
+1,2069,R1,gassupply1,2030,5.08550000000
+2,2040,R1,gassupply1,2035,0.13890000000
+2,2045,R1,gassupply1,2035,0.13890000000
+2,2050,R1,gassupply1,2035,0.13890000000
+2,2069,R1,gassupply1,2035,0.13890000000
+2,2070,R1,gassupply1,2035,0.13890000000
+2,2074,R1,gassupply1,2035,0.13890000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
index 407fd307..46094120 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -9,26 +9,35 @@ windturbine,R1,R1,A1,power,newcapa,2025,9.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,8.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,2.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,5.08550000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,1.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,5.08550000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.13890000000
 heatpump,R1,R1,A1,residential,newcapa,2045,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,12.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,5.08550000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,0.13890000000
 heatpump,R1,R1,A1,residential,newcapa,2050,12.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,7.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,9.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,5.08550000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.13890000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
index c0c943ac..1356533a 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.67430000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.23100000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.63070000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.15480000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.73820000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.34810000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95050000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.74030000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.67430000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.23100000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63070000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.15480000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.73820000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.34810000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95050000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.74030000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.92830000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.69610000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90100000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.48050000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.80220000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.46520000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.27030000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.32580000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.72790000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.73190000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04910000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,1.10090000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.10550000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.09310000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.72790000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73190000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04910000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.10090000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10550000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09310000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.22460000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.22630000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30040000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.47640000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.48090000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.15010000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.86900000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.05310000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.31190000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.10250000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86900000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05310000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.31190000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10250000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63740000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.33950000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.75640000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.16700000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.07000000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.05860000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.61470000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.11480000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.07000000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05860000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.61470000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11480000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.24300000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.38880000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.16110000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.18910000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.28860000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06660000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.94410000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.13300000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.28860000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06660000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.94410000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13300000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.90090000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.46150000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.60100000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.22160000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.16600000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.55540000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.07530000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25010000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.34620000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.15280000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16600000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03060000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.55540000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07530000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25010000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.34620000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15280000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50020000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13220000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.70510000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.54050000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33430000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,6.50410000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.13840000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.25690000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
index 645c3d6c..385f51c2 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
@@ -1,16 +1,16 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,9
-1,2030,R1,windturbine,2020,9
-1,2035,R1,windturbine,2020,9
-1,2040,R1,windturbine,2020,9
-1,2045,R1,windturbine,2020,9
-1,2049,R1,windturbine,2020,9
-2,2030,R1,windturbine,2025,8
-2,2035,R1,windturbine,2025,8
-2,2040,R1,windturbine,2025,8
-2,2045,R1,windturbine,2025,8
-2,2049,R1,windturbine,2025,8
-2,2050,R1,windturbine,2025,8
-2,2054,R1,windturbine,2025,8
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+2,2025,R1,windturbine,2020,9
+2,2030,R1,windturbine,2020,9
+2,2035,R1,windturbine,2020,9
+2,2040,R1,windturbine,2020,9
+2,2045,R1,windturbine,2020,9
+2,2049,R1,windturbine,2020,9
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 3b8f4eac..1b734399 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,24 +1,24 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,9
-1,2030,R1,windturbine,2020,9
-1,2035,R1,windturbine,2020,9
-1,2040,R1,windturbine,2020,9
-1,2045,R1,windturbine,2020,9
-1,2049,R1,windturbine,2020,9
-2,2030,R1,windturbine,2025,8
-2,2035,R1,windturbine,2025,8
-2,2040,R1,windturbine,2025,8
-2,2045,R1,windturbine,2025,8
-2,2049,R1,windturbine,2025,8
-2,2050,R1,windturbine,2025,8
-2,2054,R1,windturbine,2025,8
-3,2035,R1,windturbine,2030,1
-3,2040,R1,windturbine,2030,1
-3,2045,R1,windturbine,2030,1
-3,2049,R1,windturbine,2030,1
-3,2050,R1,windturbine,2030,1
-3,2054,R1,windturbine,2030,1
-3,2055,R1,windturbine,2030,1
-3,2059,R1,windturbine,2030,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+2,2025,R1,windturbine,2020,9
+2,2030,R1,windturbine,2020,9
+2,2035,R1,windturbine,2020,9
+2,2040,R1,windturbine,2020,9
+2,2045,R1,windturbine,2020,9
+2,2049,R1,windturbine,2020,9
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
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 3b8f4eac..1b734399 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,24 +1,24 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,9
-1,2030,R1,windturbine,2020,9
-1,2035,R1,windturbine,2020,9
-1,2040,R1,windturbine,2020,9
-1,2045,R1,windturbine,2020,9
-1,2049,R1,windturbine,2020,9
-2,2030,R1,windturbine,2025,8
-2,2035,R1,windturbine,2025,8
-2,2040,R1,windturbine,2025,8
-2,2045,R1,windturbine,2025,8
-2,2049,R1,windturbine,2025,8
-2,2050,R1,windturbine,2025,8
-2,2054,R1,windturbine,2025,8
-3,2035,R1,windturbine,2030,1
-3,2040,R1,windturbine,2030,1
-3,2045,R1,windturbine,2030,1
-3,2049,R1,windturbine,2030,1
-3,2050,R1,windturbine,2030,1
-3,2054,R1,windturbine,2030,1
-3,2055,R1,windturbine,2030,1
-3,2059,R1,windturbine,2030,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+2,2025,R1,windturbine,2020,9
+2,2030,R1,windturbine,2020,9
+2,2035,R1,windturbine,2020,9
+2,2040,R1,windturbine,2020,9
+2,2045,R1,windturbine,2020,9
+2,2049,R1,windturbine,2020,9
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
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 3b8f4eac..4eff0b6e 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,24 +1,32 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,9
-1,2030,R1,windturbine,2020,9
-1,2035,R1,windturbine,2020,9
-1,2040,R1,windturbine,2020,9
-1,2045,R1,windturbine,2020,9
-1,2049,R1,windturbine,2020,9
-2,2030,R1,windturbine,2025,8
-2,2035,R1,windturbine,2025,8
-2,2040,R1,windturbine,2025,8
-2,2045,R1,windturbine,2025,8
-2,2049,R1,windturbine,2025,8
-2,2050,R1,windturbine,2025,8
-2,2054,R1,windturbine,2025,8
-3,2035,R1,windturbine,2030,1
-3,2040,R1,windturbine,2030,1
-3,2045,R1,windturbine,2030,1
-3,2049,R1,windturbine,2030,1
-3,2050,R1,windturbine,2030,1
-3,2054,R1,windturbine,2030,1
-3,2055,R1,windturbine,2030,1
-3,2059,R1,windturbine,2030,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+2,2025,R1,windturbine,2020,9
+2,2030,R1,windturbine,2020,9
+2,2035,R1,windturbine,2020,9
+2,2040,R1,windturbine,2020,9
+2,2045,R1,windturbine,2020,9
+2,2049,R1,windturbine,2020,9
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+5,2045,R1,windturbine,2040,1
+5,2049,R1,windturbine,2040,1
+5,2050,R1,windturbine,2040,1
+5,2059,R1,windturbine,2040,1
+5,2060,R1,windturbine,2040,1
+5,2064,R1,windturbine,2040,1
+5,2065,R1,windturbine,2040,1
+5,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
index f9864862..abd03451 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
@@ -1,34 +1,40 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
 2,2025,R1,windturbine,2020,9
 2,2030,R1,windturbine,2020,9
 2,2035,R1,windturbine,2020,9
 2,2040,R1,windturbine,2020,9
 2,2045,R1,windturbine,2020,9
 2,2049,R1,windturbine,2020,9
-3,2030,R1,windturbine,2025,8
-3,2035,R1,windturbine,2025,8
-3,2040,R1,windturbine,2025,8
-3,2045,R1,windturbine,2025,8
-3,2049,R1,windturbine,2025,8
-3,2050,R1,windturbine,2025,8
-3,2054,R1,windturbine,2025,8
-4,2035,R1,windturbine,2030,1
-4,2040,R1,windturbine,2030,1
-4,2045,R1,windturbine,2030,1
-4,2049,R1,windturbine,2030,1
-4,2050,R1,windturbine,2030,1
-4,2054,R1,windturbine,2030,1
-4,2055,R1,windturbine,2030,1
-4,2059,R1,windturbine,2030,1
-7,2050,R1,windturbine,2045,10
-7,2054,R1,windturbine,2045,10
-7,2055,R1,windturbine,2045,10
-7,2059,R1,windturbine,2045,10
-7,2060,R1,windturbine,2045,10
-7,2064,R1,windturbine,2045,10
-7,2065,R1,windturbine,2045,10
-7,2069,R1,windturbine,2045,10
-7,2070,R1,windturbine,2045,10
-7,2074,R1,windturbine,2045,10
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+5,2045,R1,windturbine,2040,1
+5,2049,R1,windturbine,2040,1
+5,2050,R1,windturbine,2040,1
+5,2059,R1,windturbine,2040,1
+5,2060,R1,windturbine,2040,1
+5,2064,R1,windturbine,2040,1
+5,2065,R1,windturbine,2040,1
+5,2069,R1,windturbine,2040,1
+6,2050,R1,windturbine,2045,9
+6,2059,R1,windturbine,2045,9
+6,2060,R1,windturbine,2045,9
+6,2064,R1,windturbine,2045,9
+6,2065,R1,windturbine,2045,9
+6,2069,R1,windturbine,2045,9
+6,2070,R1,windturbine,2045,9
+6,2074,R1,windturbine,2045,9
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
index 8f32f484..8ac237f5 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
@@ -1,44 +1,44 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2055,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
 2,2025,R1,windturbine,2020,9
 2,2030,R1,windturbine,2020,9
 2,2035,R1,windturbine,2020,9
 2,2040,R1,windturbine,2020,9
 2,2045,R1,windturbine,2020,9
 2,2049,R1,windturbine,2020,9
-3,2030,R1,windturbine,2025,8
-3,2035,R1,windturbine,2025,8
-3,2040,R1,windturbine,2025,8
-3,2045,R1,windturbine,2025,8
-3,2049,R1,windturbine,2025,8
-3,2050,R1,windturbine,2025,8
-3,2054,R1,windturbine,2025,8
-4,2035,R1,windturbine,2030,1
-4,2040,R1,windturbine,2030,1
-4,2045,R1,windturbine,2030,1
-4,2049,R1,windturbine,2030,1
-4,2050,R1,windturbine,2030,1
-4,2054,R1,windturbine,2030,1
-4,2055,R1,windturbine,2030,1
-4,2059,R1,windturbine,2030,1
-7,2050,R1,windturbine,2045,10
-7,2054,R1,windturbine,2045,10
-7,2055,R1,windturbine,2045,10
-7,2059,R1,windturbine,2045,10
-7,2060,R1,windturbine,2045,10
-7,2064,R1,windturbine,2045,10
-7,2065,R1,windturbine,2045,10
-7,2069,R1,windturbine,2045,10
-7,2070,R1,windturbine,2045,10
-7,2074,R1,windturbine,2045,10
-8,2055,R1,windturbine,2050,8
-8,2059,R1,windturbine,2050,8
-8,2060,R1,windturbine,2050,8
-8,2064,R1,windturbine,2050,8
-8,2065,R1,windturbine,2050,8
-8,2069,R1,windturbine,2050,8
-8,2070,R1,windturbine,2050,8
-8,2074,R1,windturbine,2050,8
-8,2075,R1,windturbine,2050,8
-8,2079,R1,windturbine,2050,8
+3,2035,R1,windturbine,2030,2
+3,2040,R1,windturbine,2030,2
+3,2045,R1,windturbine,2030,2
+3,2049,R1,windturbine,2030,2
+3,2050,R1,windturbine,2030,2
+3,2055,R1,windturbine,2030,2
+3,2059,R1,windturbine,2030,2
+5,2045,R1,windturbine,2040,1
+5,2049,R1,windturbine,2040,1
+5,2050,R1,windturbine,2040,1
+5,2055,R1,windturbine,2040,1
+5,2059,R1,windturbine,2040,1
+5,2060,R1,windturbine,2040,1
+5,2064,R1,windturbine,2040,1
+5,2065,R1,windturbine,2040,1
+5,2069,R1,windturbine,2040,1
+6,2050,R1,windturbine,2045,9
+6,2055,R1,windturbine,2045,9
+6,2059,R1,windturbine,2045,9
+6,2060,R1,windturbine,2045,9
+6,2064,R1,windturbine,2045,9
+6,2065,R1,windturbine,2045,9
+6,2069,R1,windturbine,2045,9
+6,2070,R1,windturbine,2045,9
+6,2074,R1,windturbine,2045,9
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 9642ac57..ba2fb16b 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/src/muse/data/default_settings.toml b/src/muse/data/default_settings.toml
index 83998517..b26f8426 100644
--- a/src/muse/data/default_settings.toml
+++ b/src/muse/data/default_settings.toml
@@ -11,7 +11,7 @@ log_level = 'info'
 # Convergence parameters
 equilibrium = true
 equilibrium_variable = 'demand'
-maximum_iterations = 3
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 excluded_commodities = []
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 81418f64..19bdec4f 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 5235b01f..25ec0459 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -10,7 +10,7 @@ log_level = 'info'
 excluded_commodities = ["fuel1", "fuel2", "fuel3"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 2
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/tests/example_outputs/default/Gas/Capacity/2025.csv b/tests/example_outputs/default/Gas/Capacity/2025.csv
index d1ee882b..f0d285df 100644
--- a/tests/example_outputs/default/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2025.csv
@@ -2,3 +2,9 @@ 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,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2030.csv b/tests/example_outputs/default/Gas/Capacity/2030.csv
index c7ef92d2..a06e32df 100644
--- a/tests/example_outputs/default/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2030.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2035.csv b/tests/example_outputs/default/Gas/Capacity/2035.csv
index b101c0bb..df83ced5 100644
--- a/tests/example_outputs/default/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2035.csv
@@ -2,14 +2,24 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
-2,2040,R1,gassupply1,2035,0.16290000000
-2,2045,R1,gassupply1,2035,0.16290000000
-2,2050,R1,gassupply1,2035,0.16290000000
-2,2069,R1,gassupply1,2035,0.16290000000
-2,2070,R1,gassupply1,2035,0.16290000000
-2,2074,R1,gassupply1,2035,0.16290000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
+3,2040,R1,gassupply1,2035,0.32590000000
+3,2045,R1,gassupply1,2035,0.32590000000
+3,2050,R1,gassupply1,2035,0.32590000000
+3,2064,R1,gassupply1,2035,0.32590000000
+3,2065,R1,gassupply1,2035,0.32590000000
+3,2069,R1,gassupply1,2035,0.32590000000
+3,2070,R1,gassupply1,2035,0.32590000000
+3,2074,R1,gassupply1,2035,0.32590000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2040.csv b/tests/example_outputs/default/Gas/Capacity/2040.csv
index b101c0bb..df83ced5 100644
--- a/tests/example_outputs/default/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2040.csv
@@ -2,14 +2,24 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
-2,2040,R1,gassupply1,2035,0.16290000000
-2,2045,R1,gassupply1,2035,0.16290000000
-2,2050,R1,gassupply1,2035,0.16290000000
-2,2069,R1,gassupply1,2035,0.16290000000
-2,2070,R1,gassupply1,2035,0.16290000000
-2,2074,R1,gassupply1,2035,0.16290000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
+3,2040,R1,gassupply1,2035,0.32590000000
+3,2045,R1,gassupply1,2035,0.32590000000
+3,2050,R1,gassupply1,2035,0.32590000000
+3,2064,R1,gassupply1,2035,0.32590000000
+3,2065,R1,gassupply1,2035,0.32590000000
+3,2069,R1,gassupply1,2035,0.32590000000
+3,2070,R1,gassupply1,2035,0.32590000000
+3,2074,R1,gassupply1,2035,0.32590000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2045.csv b/tests/example_outputs/default/Gas/Capacity/2045.csv
index efe0a32e..e5543717 100644
--- a/tests/example_outputs/default/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2045.csv
@@ -2,20 +2,32 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
-2,2040,R1,gassupply1,2035,0.16290000000
-2,2045,R1,gassupply1,2035,0.16290000000
-2,2050,R1,gassupply1,2035,0.16290000000
-2,2069,R1,gassupply1,2035,0.16290000000
-2,2070,R1,gassupply1,2035,0.16290000000
-2,2074,R1,gassupply1,2035,0.16290000000
-3,2050,R1,gassupply1,2045,3.46340000000
-3,2069,R1,gassupply1,2045,3.46340000000
-3,2070,R1,gassupply1,2045,3.46340000000
-3,2074,R1,gassupply1,2045,3.46340000000
-3,2075,R1,gassupply1,2045,3.46340000000
-3,2084,R1,gassupply1,2045,3.46340000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
+3,2040,R1,gassupply1,2035,0.32590000000
+3,2045,R1,gassupply1,2035,0.32590000000
+3,2050,R1,gassupply1,2035,0.32590000000
+3,2064,R1,gassupply1,2035,0.32590000000
+3,2065,R1,gassupply1,2035,0.32590000000
+3,2069,R1,gassupply1,2035,0.32590000000
+3,2070,R1,gassupply1,2035,0.32590000000
+3,2074,R1,gassupply1,2035,0.32590000000
+4,2050,R1,gassupply1,2045,3.49130000000
+4,2064,R1,gassupply1,2045,3.49130000000
+4,2065,R1,gassupply1,2045,3.49130000000
+4,2069,R1,gassupply1,2045,3.49130000000
+4,2070,R1,gassupply1,2045,3.49130000000
+4,2074,R1,gassupply1,2045,3.49130000000
+4,2075,R1,gassupply1,2045,3.49130000000
+4,2084,R1,gassupply1,2045,3.49130000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2050.csv b/tests/example_outputs/default/Gas/Capacity/2050.csv
index efe0a32e..e5543717 100644
--- a/tests/example_outputs/default/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2050.csv
@@ -2,20 +2,32 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
-2,2040,R1,gassupply1,2035,0.16290000000
-2,2045,R1,gassupply1,2035,0.16290000000
-2,2050,R1,gassupply1,2035,0.16290000000
-2,2069,R1,gassupply1,2035,0.16290000000
-2,2070,R1,gassupply1,2035,0.16290000000
-2,2074,R1,gassupply1,2035,0.16290000000
-3,2050,R1,gassupply1,2045,3.46340000000
-3,2069,R1,gassupply1,2045,3.46340000000
-3,2070,R1,gassupply1,2045,3.46340000000
-3,2074,R1,gassupply1,2045,3.46340000000
-3,2075,R1,gassupply1,2045,3.46340000000
-3,2084,R1,gassupply1,2045,3.46340000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
+3,2040,R1,gassupply1,2035,0.32590000000
+3,2045,R1,gassupply1,2035,0.32590000000
+3,2050,R1,gassupply1,2035,0.32590000000
+3,2064,R1,gassupply1,2035,0.32590000000
+3,2065,R1,gassupply1,2035,0.32590000000
+3,2069,R1,gassupply1,2035,0.32590000000
+3,2070,R1,gassupply1,2035,0.32590000000
+3,2074,R1,gassupply1,2035,0.32590000000
+4,2050,R1,gassupply1,2045,3.49130000000
+4,2064,R1,gassupply1,2045,3.49130000000
+4,2065,R1,gassupply1,2045,3.49130000000
+4,2069,R1,gassupply1,2045,3.49130000000
+4,2070,R1,gassupply1,2045,3.49130000000
+4,2074,R1,gassupply1,2045,3.49130000000
+4,2075,R1,gassupply1,2045,3.49130000000
+4,2084,R1,gassupply1,2045,3.49130000000
diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv
index 8b42c2e7..bff22f00 100644
--- a/tests/example_outputs/default/MCACapacity.csv
+++ b/tests/example_outputs/default/MCACapacity.csv
@@ -10,49 +10,49 @@ gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,6.81430000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,7.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.68000000000
+windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.54570000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.68000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.16290000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.54570000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.32590000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.68000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.16290000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.54570000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,0.32590000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.68000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.16290000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,3.46340000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.54570000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.32590000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,3.49130000000
diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv
index 216fdd12..0769f75a 100644
--- a/tests/example_outputs/default/MCAPrices.csv
+++ b/tests/example_outputs/default/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.31130000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.05690000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.42450000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.31900000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.61760000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.48000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.15060000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.42450000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.31900000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.61760000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.48000000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15060000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.19710000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.96920000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.08790000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.53010000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.81070000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.64210000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.04840000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.70880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.57540000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.06480000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.94800000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.76670000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.12800000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.70880000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.57540000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06480000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.94800000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.76670000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12800000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.66620000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.35450000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30870000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.44270000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.18730000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.96030000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.19790000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.21200000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.53550000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.35880000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.21470000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.81110000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.56390000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.82470000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.53550000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.35880000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21470000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.81110000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.56390000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82470000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.63920000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.20200000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.66490000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.46920000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,10.08700000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.77280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.43640000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.22390000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.79980000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.16810000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.07260000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,8.10620000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.37610000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14560000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.79980000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.16810000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07260000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.10620000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.37610000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14560000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.02670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.03140000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.04070000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.51190000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.41280000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.58930000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.68790000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.24300000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.49520000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.60170000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.07770000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.86820000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.80540000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.15690000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.49520000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.60170000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07770000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.86820000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.80540000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15690000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.98900000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.45620000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.50350000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.55700000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,7.24150000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.01560000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.66220000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.26310000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default/Power/Capacity/2025.csv b/tests/example_outputs/default/Power/Capacity/2025.csv
index 3578c2db..64665258 100644
--- a/tests/example_outputs/default/Power/Capacity/2025.csv
+++ b/tests/example_outputs/default/Power/Capacity/2025.csv
@@ -7,30 +7,19 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
diff --git a/tests/example_outputs/default/Power/Capacity/2030.csv b/tests/example_outputs/default/Power/Capacity/2030.csv
index ec5a6f8f..e2ed2347 100644
--- a/tests/example_outputs/default/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default/Power/Capacity/2030.csv
@@ -7,38 +7,25 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
-4,2035,R1,windturbine,2030,7
-4,2040,R1,windturbine,2030,7
-4,2045,R1,windturbine,2030,7
-4,2049,R1,windturbine,2030,7
-4,2050,R1,windturbine,2030,7
-4,2054,R1,windturbine,2030,7
-4,2055,R1,windturbine,2030,7
-4,2059,R1,windturbine,2030,7
+3,2035,R1,windturbine,2030,8
+3,2040,R1,windturbine,2030,8
+3,2045,R1,windturbine,2030,8
+3,2049,R1,windturbine,2030,8
+3,2050,R1,windturbine,2030,8
+3,2059,R1,windturbine,2030,8
diff --git a/tests/example_outputs/default/Power/Capacity/2035.csv b/tests/example_outputs/default/Power/Capacity/2035.csv
index 16b99119..c5db9b61 100644
--- a/tests/example_outputs/default/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default/Power/Capacity/2035.csv
@@ -7,47 +7,32 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
-4,2035,R1,windturbine,2030,7
-4,2040,R1,windturbine,2030,7
-4,2045,R1,windturbine,2030,7
-4,2049,R1,windturbine,2030,7
-4,2050,R1,windturbine,2030,7
-4,2054,R1,windturbine,2030,7
-4,2055,R1,windturbine,2030,7
-4,2059,R1,windturbine,2030,7
-5,2040,R1,windturbine,2035,5
-5,2045,R1,windturbine,2035,5
-5,2049,R1,windturbine,2035,5
-5,2050,R1,windturbine,2035,5
-5,2054,R1,windturbine,2035,5
-5,2055,R1,windturbine,2035,5
-5,2059,R1,windturbine,2035,5
-5,2060,R1,windturbine,2035,5
-5,2064,R1,windturbine,2035,5
+3,2035,R1,windturbine,2030,8
+3,2040,R1,windturbine,2030,8
+3,2045,R1,windturbine,2030,8
+3,2049,R1,windturbine,2030,8
+3,2050,R1,windturbine,2030,8
+3,2059,R1,windturbine,2030,8
+4,2040,R1,windturbine,2035,5
+4,2045,R1,windturbine,2035,5
+4,2049,R1,windturbine,2035,5
+4,2050,R1,windturbine,2035,5
+4,2059,R1,windturbine,2035,5
+4,2060,R1,windturbine,2035,5
+4,2064,R1,windturbine,2035,5
diff --git a/tests/example_outputs/default/Power/Capacity/2040.csv b/tests/example_outputs/default/Power/Capacity/2040.csv
index 5dcc0efe..4d5eecd8 100644
--- a/tests/example_outputs/default/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default/Power/Capacity/2040.csv
@@ -7,57 +7,40 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
-4,2035,R1,windturbine,2030,7
-4,2040,R1,windturbine,2030,7
-4,2045,R1,windturbine,2030,7
-4,2049,R1,windturbine,2030,7
-4,2050,R1,windturbine,2030,7
-4,2054,R1,windturbine,2030,7
-4,2055,R1,windturbine,2030,7
-4,2059,R1,windturbine,2030,7
-5,2040,R1,windturbine,2035,5
-5,2045,R1,windturbine,2035,5
-5,2049,R1,windturbine,2035,5
-5,2050,R1,windturbine,2035,5
-5,2054,R1,windturbine,2035,5
-5,2055,R1,windturbine,2035,5
-5,2059,R1,windturbine,2035,5
-5,2060,R1,windturbine,2035,5
-5,2064,R1,windturbine,2035,5
-6,2045,R1,windturbine,2040,7
-6,2049,R1,windturbine,2040,7
-6,2050,R1,windturbine,2040,7
-6,2054,R1,windturbine,2040,7
-6,2055,R1,windturbine,2040,7
-6,2059,R1,windturbine,2040,7
-6,2060,R1,windturbine,2040,7
-6,2064,R1,windturbine,2040,7
-6,2065,R1,windturbine,2040,7
-6,2069,R1,windturbine,2040,7
+3,2035,R1,windturbine,2030,8
+3,2040,R1,windturbine,2030,8
+3,2045,R1,windturbine,2030,8
+3,2049,R1,windturbine,2030,8
+3,2050,R1,windturbine,2030,8
+3,2059,R1,windturbine,2030,8
+4,2040,R1,windturbine,2035,5
+4,2045,R1,windturbine,2035,5
+4,2049,R1,windturbine,2035,5
+4,2050,R1,windturbine,2035,5
+4,2059,R1,windturbine,2035,5
+4,2060,R1,windturbine,2035,5
+4,2064,R1,windturbine,2035,5
+5,2045,R1,windturbine,2040,7
+5,2049,R1,windturbine,2040,7
+5,2050,R1,windturbine,2040,7
+5,2059,R1,windturbine,2040,7
+5,2060,R1,windturbine,2040,7
+5,2064,R1,windturbine,2040,7
+5,2065,R1,windturbine,2040,7
+5,2069,R1,windturbine,2040,7
diff --git a/tests/example_outputs/default/Power/Capacity/2045.csv b/tests/example_outputs/default/Power/Capacity/2045.csv
index 1099e527..83bf2bdf 100644
--- a/tests/example_outputs/default/Power/Capacity/2045.csv
+++ b/tests/example_outputs/default/Power/Capacity/2045.csv
@@ -7,23 +7,17 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2050,R1,gasCCGT,2045,2
-2,2054,R1,gasCCGT,2045,2
-2,2055,R1,gasCCGT,2045,2
 2,2059,R1,gasCCGT,2045,2
 2,2060,R1,gasCCGT,2045,2
 2,2064,R1,gasCCGT,2045,2
@@ -39,47 +33,32 @@ asset,year,region,technology,installed,capacity
 3,2040,R1,windturbine,2020,10
 3,2045,R1,windturbine,2020,10
 3,2049,R1,windturbine,2020,10
-4,2030,R1,windturbine,2025,10
-4,2035,R1,windturbine,2025,10
-4,2040,R1,windturbine,2025,10
-4,2045,R1,windturbine,2025,10
-4,2049,R1,windturbine,2025,10
-4,2050,R1,windturbine,2025,10
-4,2054,R1,windturbine,2025,10
-5,2035,R1,windturbine,2030,7
-5,2040,R1,windturbine,2030,7
-5,2045,R1,windturbine,2030,7
-5,2049,R1,windturbine,2030,7
-5,2050,R1,windturbine,2030,7
-5,2054,R1,windturbine,2030,7
-5,2055,R1,windturbine,2030,7
-5,2059,R1,windturbine,2030,7
-6,2040,R1,windturbine,2035,5
-6,2045,R1,windturbine,2035,5
-6,2049,R1,windturbine,2035,5
-6,2050,R1,windturbine,2035,5
-6,2054,R1,windturbine,2035,5
-6,2055,R1,windturbine,2035,5
-6,2059,R1,windturbine,2035,5
-6,2060,R1,windturbine,2035,5
-6,2064,R1,windturbine,2035,5
-7,2045,R1,windturbine,2040,7
-7,2049,R1,windturbine,2040,7
-7,2050,R1,windturbine,2040,7
-7,2054,R1,windturbine,2040,7
-7,2055,R1,windturbine,2040,7
-7,2059,R1,windturbine,2040,7
-7,2060,R1,windturbine,2040,7
-7,2064,R1,windturbine,2040,7
-7,2065,R1,windturbine,2040,7
-7,2069,R1,windturbine,2040,7
-8,2050,R1,windturbine,2045,10
-8,2054,R1,windturbine,2045,10
-8,2055,R1,windturbine,2045,10
-8,2059,R1,windturbine,2045,10
-8,2060,R1,windturbine,2045,10
-8,2064,R1,windturbine,2045,10
-8,2065,R1,windturbine,2045,10
-8,2069,R1,windturbine,2045,10
-8,2070,R1,windturbine,2045,10
-8,2074,R1,windturbine,2045,10
+4,2035,R1,windturbine,2030,8
+4,2040,R1,windturbine,2030,8
+4,2045,R1,windturbine,2030,8
+4,2049,R1,windturbine,2030,8
+4,2050,R1,windturbine,2030,8
+4,2059,R1,windturbine,2030,8
+5,2040,R1,windturbine,2035,5
+5,2045,R1,windturbine,2035,5
+5,2049,R1,windturbine,2035,5
+5,2050,R1,windturbine,2035,5
+5,2059,R1,windturbine,2035,5
+5,2060,R1,windturbine,2035,5
+5,2064,R1,windturbine,2035,5
+6,2045,R1,windturbine,2040,7
+6,2049,R1,windturbine,2040,7
+6,2050,R1,windturbine,2040,7
+6,2059,R1,windturbine,2040,7
+6,2060,R1,windturbine,2040,7
+6,2064,R1,windturbine,2040,7
+6,2065,R1,windturbine,2040,7
+6,2069,R1,windturbine,2040,7
+7,2050,R1,windturbine,2045,10
+7,2059,R1,windturbine,2045,10
+7,2060,R1,windturbine,2045,10
+7,2064,R1,windturbine,2045,10
+7,2065,R1,windturbine,2045,10
+7,2069,R1,windturbine,2045,10
+7,2070,R1,windturbine,2045,10
+7,2074,R1,windturbine,2045,10
diff --git a/tests/example_outputs/default/Power/Capacity/2050.csv b/tests/example_outputs/default/Power/Capacity/2050.csv
index c1628364..beb0cbad 100644
--- a/tests/example_outputs/default/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default/Power/Capacity/2050.csv
@@ -7,22 +7,19 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
 0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2055,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2050,R1,gasCCGT,2045,2
-2,2054,R1,gasCCGT,2045,2
 2,2055,R1,gasCCGT,2045,2
 2,2059,R1,gasCCGT,2045,2
 2,2060,R1,gasCCGT,2045,2
@@ -35,63 +32,52 @@ asset,year,region,technology,installed,capacity
 2,2079,R1,gasCCGT,2045,2
 2,2080,R1,gasCCGT,2045,2
 2,2084,R1,gasCCGT,2045,2
-4,2025,R1,windturbine,2020,10
-4,2030,R1,windturbine,2020,10
-4,2035,R1,windturbine,2020,10
-4,2040,R1,windturbine,2020,10
-4,2045,R1,windturbine,2020,10
-4,2049,R1,windturbine,2020,10
-5,2030,R1,windturbine,2025,10
-5,2035,R1,windturbine,2025,10
-5,2040,R1,windturbine,2025,10
-5,2045,R1,windturbine,2025,10
-5,2049,R1,windturbine,2025,10
-5,2050,R1,windturbine,2025,10
-5,2054,R1,windturbine,2025,10
-6,2035,R1,windturbine,2030,7
-6,2040,R1,windturbine,2030,7
-6,2045,R1,windturbine,2030,7
-6,2049,R1,windturbine,2030,7
-6,2050,R1,windturbine,2030,7
-6,2054,R1,windturbine,2030,7
-6,2055,R1,windturbine,2030,7
-6,2059,R1,windturbine,2030,7
-7,2040,R1,windturbine,2035,5
-7,2045,R1,windturbine,2035,5
-7,2049,R1,windturbine,2035,5
-7,2050,R1,windturbine,2035,5
-7,2054,R1,windturbine,2035,5
-7,2055,R1,windturbine,2035,5
-7,2059,R1,windturbine,2035,5
-7,2060,R1,windturbine,2035,5
-7,2064,R1,windturbine,2035,5
-8,2045,R1,windturbine,2040,7
-8,2049,R1,windturbine,2040,7
-8,2050,R1,windturbine,2040,7
-8,2054,R1,windturbine,2040,7
-8,2055,R1,windturbine,2040,7
-8,2059,R1,windturbine,2040,7
-8,2060,R1,windturbine,2040,7
-8,2064,R1,windturbine,2040,7
-8,2065,R1,windturbine,2040,7
-8,2069,R1,windturbine,2040,7
-9,2050,R1,windturbine,2045,10
-9,2054,R1,windturbine,2045,10
-9,2055,R1,windturbine,2045,10
-9,2059,R1,windturbine,2045,10
-9,2060,R1,windturbine,2045,10
-9,2064,R1,windturbine,2045,10
-9,2065,R1,windturbine,2045,10
-9,2069,R1,windturbine,2045,10
-9,2070,R1,windturbine,2045,10
-9,2074,R1,windturbine,2045,10
-10,2055,R1,windturbine,2050,10
-10,2059,R1,windturbine,2050,10
-10,2060,R1,windturbine,2050,10
-10,2064,R1,windturbine,2050,10
-10,2065,R1,windturbine,2050,10
-10,2069,R1,windturbine,2050,10
-10,2070,R1,windturbine,2050,10
-10,2074,R1,windturbine,2050,10
-10,2075,R1,windturbine,2050,10
-10,2079,R1,windturbine,2050,10
+3,2025,R1,windturbine,2020,10
+3,2030,R1,windturbine,2020,10
+3,2035,R1,windturbine,2020,10
+3,2040,R1,windturbine,2020,10
+3,2045,R1,windturbine,2020,10
+3,2049,R1,windturbine,2020,10
+4,2035,R1,windturbine,2030,8
+4,2040,R1,windturbine,2030,8
+4,2045,R1,windturbine,2030,8
+4,2049,R1,windturbine,2030,8
+4,2050,R1,windturbine,2030,8
+4,2055,R1,windturbine,2030,8
+4,2059,R1,windturbine,2030,8
+5,2040,R1,windturbine,2035,5
+5,2045,R1,windturbine,2035,5
+5,2049,R1,windturbine,2035,5
+5,2050,R1,windturbine,2035,5
+5,2055,R1,windturbine,2035,5
+5,2059,R1,windturbine,2035,5
+5,2060,R1,windturbine,2035,5
+5,2064,R1,windturbine,2035,5
+6,2045,R1,windturbine,2040,7
+6,2049,R1,windturbine,2040,7
+6,2050,R1,windturbine,2040,7
+6,2055,R1,windturbine,2040,7
+6,2059,R1,windturbine,2040,7
+6,2060,R1,windturbine,2040,7
+6,2064,R1,windturbine,2040,7
+6,2065,R1,windturbine,2040,7
+6,2069,R1,windturbine,2040,7
+7,2050,R1,windturbine,2045,10
+7,2055,R1,windturbine,2045,10
+7,2059,R1,windturbine,2045,10
+7,2060,R1,windturbine,2045,10
+7,2064,R1,windturbine,2045,10
+7,2065,R1,windturbine,2045,10
+7,2069,R1,windturbine,2045,10
+7,2070,R1,windturbine,2045,10
+7,2074,R1,windturbine,2045,10
+8,2055,R1,windturbine,2050,1
+8,2059,R1,windturbine,2050,1
+8,2060,R1,windturbine,2050,1
+8,2064,R1,windturbine,2050,1
+8,2065,R1,windturbine,2050,1
+8,2069,R1,windturbine,2050,1
+8,2070,R1,windturbine,2050,1
+8,2074,R1,windturbine,2050,1
+8,2075,R1,windturbine,2050,1
+8,2079,R1,windturbine,2050,1

From 48d78bf7914dab167d05f396512a53c355976a36 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 20:13:48 +0100
Subject: [PATCH 335/419] Change default value

---
 docs/inputs/toml.rst | 2 +-
 src/muse/mca.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index 9a0653b1..07ba53e2 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -70,7 +70,7 @@ a whole.
    whether equilibrium of `demand` or `prices` should be sought. Defaults to `demand`.
 
 *maximum_iterations*
-   Maximum number of iterations when searching for equilibrium. Defaults to 3.
+   Maximum number of iterations when searching for equilibrium. Defaults to 100.
 
 *tolerance*
    Tolerance criteria when checking for equilibrium. Defaults to 0.1. 0.1 signifies that 10% of a deviation is allowed among the iterative value of either demand or price over a year per region.
diff --git a/src/muse/mca.py b/src/muse/mca.py
index ac7a27e2..e7716e56 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -122,7 +122,7 @@ def __init__(
         time_framework: Sequence[int] = list(range(2010, 2100, 10)),
         equilibrium: bool = True,
         equilibrium_variable: str = "demand",
-        maximum_iterations: int = 3,
+        maximum_iterations: int = 100,
         tolerance: float = 0.1,
         tolerance_unmet_demand: float = -0.1,
         excluded_commodities: Sequence[str] | None = None,

From d4ef25b782f8878c2eb07197ee35b31d32c87403 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 1 Jul 2024 20:48:40 +0100
Subject: [PATCH 336/419] Update more results files

---
 .../data/example/default_retro/settings.toml  |   2 +-
 .../default_retro/Gas/Capacity/2025.csv       |  12 +-
 .../default_retro/Gas/Capacity/2030.csv       |  12 +-
 .../default_retro/Gas/Capacity/2035.csv       |  10 +-
 .../default_retro/Gas/Capacity/2040.csv       |   8 +-
 .../default_retro/Gas/Capacity/2045.csv       |   6 +-
 .../default_retro/Gas/Capacity/2050.csv       |   6 +-
 .../default_retro/MCACapacity.csv             |  20 +-
 .../default_retro/MCAPrices.csv               | 216 ++++++++---------
 .../default_retro/Power/Capacity/2025.csv     |  30 +--
 .../default_retro/Power/Capacity/2030.csv     |  30 ++-
 .../default_retro/Power/Capacity/2035.csv     |  28 +--
 .../default_retro/Power/Capacity/2040.csv     |  26 +-
 .../default_retro/Power/Capacity/2045.csv     |  24 +-
 .../default_retro/Power/Capacity/2050.csv     |  22 +-
 .../medium/Gas/Capacity/2025.csv              |  16 +-
 .../medium/Gas/Capacity/2030.csv              |  34 +--
 .../medium/Gas/Capacity/2035.csv              |  34 +--
 .../medium/Gas/Capacity/2040.csv              |  34 +--
 .../medium/Gas/Capacity/2045.csv              |  50 ++--
 .../medium/Gas/Capacity/2050.csv              |  50 ++--
 tests/example_outputs/medium/MCACapacity.csv  |  38 +--
 tests/example_outputs/medium/MCAPrices.csv    | 228 +++++++++---------
 .../medium/Power/Capacity/2025.csv            |  14 +-
 .../medium/Power/Capacity/2030.csv            |  30 +--
 .../medium/Power/Capacity/2035.csv            |  44 ++--
 .../medium/Power/Capacity/2040.csv            |  46 ++--
 .../medium/Power/Capacity/2045.csv            |  48 ++--
 .../medium/Power/Capacity/2050.csv            |  57 ++---
 .../multiple_agents/Gas/Capacity/2025.csv     |   6 +
 .../multiple_agents/Gas/Capacity/2030.csv     |  18 +-
 .../multiple_agents/Gas/Capacity/2035.csv     |  18 +-
 .../multiple_agents/Gas/Capacity/2040.csv     |  18 +-
 .../multiple_agents/Gas/Capacity/2045.csv     |  28 ++-
 .../multiple_agents/Gas/Capacity/2050.csv     |  28 ++-
 .../multiple_agents/MCACapacity.csv           |  38 +--
 .../multiple_agents/MCAPrices.csv             | 216 ++++++++---------
 .../multiple_agents/Power/Capacity/2025.csv   |  29 +--
 .../multiple_agents/Power/Capacity/2030.csv   |  43 ++--
 .../multiple_agents/Power/Capacity/2035.csv   |  59 ++---
 .../multiple_agents/Power/Capacity/2040.csv   |  77 +++---
 .../multiple_agents/Power/Capacity/2045.csv   |  97 +++-----
 .../multiple_agents/Power/Capacity/2050.csv   | 132 +++++-----
 43 files changed, 943 insertions(+), 1039 deletions(-)

diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index 43ba48f5..7ecc8ac8 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -9,7 +9,7 @@ log_level = 'info'
 excluded_commodities = ["wind"]
 # Convergence parameters
 equilibrium_variable = 'demand'
-maximum_iterations = 1
+maximum_iterations = 100
 tolerance = 0.1
 tolerance_unmet_demand = -0.1
 
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2025.csv b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
index d1fb99f5..b130ea35 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
 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
+1,2030,R1,gassupply1,2025,9.58580000000
+1,2035,R1,gassupply1,2025,9.58580000000
+1,2040,R1,gassupply1,2025,9.58580000000
+1,2045,R1,gassupply1,2025,9.58580000000
+1,2050,R1,gassupply1,2025,9.58580000000
+1,2064,R1,gassupply1,2025,9.58580000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2030.csv b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
index e84ef6dc..6022de35 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
@@ -1,11 +1,11 @@
 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
+1,2030,R1,gassupply1,2025,9.58580000000
+1,2035,R1,gassupply1,2025,9.58580000000
+1,2040,R1,gassupply1,2025,9.58580000000
+1,2045,R1,gassupply1,2025,9.58580000000
+1,2050,R1,gassupply1,2025,9.58580000000
+1,2064,R1,gassupply1,2025,9.58580000000
 2,2035,R1,gassupply1,2030,7.50000000000
 2,2040,R1,gassupply1,2030,7.50000000000
 2,2045,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2035.csv b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
index ccf34c3d..fc532dfe 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
@@ -1,9 +1,9 @@
 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
+1,2035,R1,gassupply1,2025,9.58580000000
+1,2040,R1,gassupply1,2025,9.58580000000
+1,2045,R1,gassupply1,2025,9.58580000000
+1,2050,R1,gassupply1,2025,9.58580000000
+1,2064,R1,gassupply1,2025,9.58580000000
 2,2035,R1,gassupply1,2030,7.50000000000
 2,2040,R1,gassupply1,2030,7.50000000000
 2,2045,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2040.csv b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
index 79fdfddb..01d270dd 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
@@ -1,8 +1,8 @@
 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
+1,2040,R1,gassupply1,2025,9.58580000000
+1,2045,R1,gassupply1,2025,9.58580000000
+1,2050,R1,gassupply1,2025,9.58580000000
+1,2064,R1,gassupply1,2025,9.58580000000
 2,2040,R1,gassupply1,2030,7.50000000000
 2,2045,R1,gassupply1,2030,7.50000000000
 2,2050,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2045.csv b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
index b2ca194f..0a3a5cc0 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
@@ -1,7 +1,7 @@
 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
+1,2045,R1,gassupply1,2025,9.58580000000
+1,2050,R1,gassupply1,2025,9.58580000000
+1,2064,R1,gassupply1,2025,9.58580000000
 2,2045,R1,gassupply1,2030,7.50000000000
 2,2050,R1,gassupply1,2030,7.50000000000
 2,2064,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2050.csv b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
index 4f3e3a18..ac0bf7c7 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
@@ -1,7 +1,7 @@
 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
+1,2050,R1,gassupply1,2025,9.58580000000
+1,2055,R1,gassupply1,2025,9.58580000000
+1,2064,R1,gassupply1,2025,9.58580000000
 2,2050,R1,gassupply1,2030,7.50000000000
 2,2055,R1,gassupply1,2030,7.50000000000
 2,2064,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default_retro/MCACapacity.csv b/tests/example_outputs/default_retro/MCACapacity.csv
index f5198d91..8af577d6 100644
--- a/tests/example_outputs/default_retro/MCACapacity.csv
+++ b/tests/example_outputs/default_retro/MCACapacity.csv
@@ -11,47 +11,47 @@ gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
 gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
 windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2030,9.15000000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,9.58580000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
 windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,9.15000000000
 windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,9.58580000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 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,4.06670000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.15000000000
 windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,9.58580000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
 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,4.06670000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.15000000000
 windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,9.58580000000
 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
-windturbine,R1,R1,A1,power,retrofit,2050,9.15000000000
+gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
 windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,9.58580000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv
index d72a9e0c..be198817 100644
--- a/tests/example_outputs/default_retro/MCAPrices.csv
+++ b/tests/example_outputs/default_retro/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.31130000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.05690000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.40060000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.98080000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20570000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.58170000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.47480000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.34200000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.40060000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.34750000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.98080000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.20570000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.58170000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.52260000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47480000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34200000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.12530000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.05330000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.97130000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.88510000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.76290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.69860000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.97120000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.50070000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.66880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.09210000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.21620000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.88800000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.64110000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.35110000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.66880000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.63000000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09210000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21620000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.88800000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.84810000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64110000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.35110000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.54600000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.51430000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.29990000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.86410000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.10730000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.06810000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.19200000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.50390000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.46950000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.09040000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.10490000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.71210000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.63790000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.18960000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.46950000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.40980000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09040000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10490000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.71210000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.63980000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.63790000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.18960000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.44080000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.34960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.28960000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.57450000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.95490000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.87300000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.18700000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.29600000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.71450000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.22400000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.11010000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.97820000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.83800000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.19750000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.71450000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.21710000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.22400000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.11010000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.97820000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.44850000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.83800000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19750000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.77020000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.17030000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.68810000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.58980000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.24200000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.68450000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.45340000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.30650000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.31290000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.30790000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.07300000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.59450000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.96360000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.14640000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.31290000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.64020000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30790000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07300000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.59450000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.86180000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96360000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14640000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.44070000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.56120000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.93760000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.51470000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.87640000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.08910000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.62040000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.24440000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2025.csv b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
index 55cc9842..9a5639fc 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2025.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
@@ -6,19 +6,19 @@ asset,year,region,technology,installed,capacity
 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,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
-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
+1,2030,R1,gasCCGT,2025,4.06670000000
+1,2035,R1,gasCCGT,2025,4.06670000000
+1,2040,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2059,R1,gasCCGT,2025,4.06670000000
+1,2060,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
+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/tests/example_outputs/default_retro/Power/Capacity/2030.csv b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
index a6c53c55..f8563fa6 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
@@ -5,26 +5,24 @@ asset,year,region,technology,installed,capacity
 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
+1,2030,R1,gasCCGT,2025,4.06670000000
+1,2035,R1,gasCCGT,2025,4.06670000000
+1,2040,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2059,R1,gasCCGT,2025,4.06670000000
+1,2060,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
+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,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_retro/Power/Capacity/2035.csv b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
index 60e997ea..bf92ea4f 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
@@ -4,33 +4,29 @@ asset,year,region,technology,installed,capacity
 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
+1,2035,R1,gasCCGT,2025,4.06670000000
+1,2040,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2059,R1,gasCCGT,2025,4.06670000000
+1,2060,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
+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,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_retro/Power/Capacity/2040.csv b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
index 1cba828b..bdcfc5bb 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
@@ -3,38 +3,32 @@ asset,year,region,technology,installed,capacity
 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
+1,2040,R1,gasCCGT,2025,4.06670000000
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2059,R1,gasCCGT,2025,4.06670000000
+1,2060,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
+2,2040,R1,windturbine,2020,10.00000000000
+2,2045,R1,windturbine,2020,10.00000000000
+2,2049,R1,windturbine,2020,10.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
 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
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2045.csv b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
index 69e55cf6..7fb6c692 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2045.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
@@ -2,42 +2,34 @@ asset,year,region,technology,installed,capacity
 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,2045,R1,windturbine,2020,10.00000000000
-1,2049,R1,windturbine,2020,10.00000000000
-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
+1,2045,R1,gasCCGT,2025,4.06670000000
+1,2049,R1,gasCCGT,2025,4.06670000000
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2059,R1,gasCCGT,2025,4.06670000000
+1,2060,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
+2,2045,R1,windturbine,2020,10.00000000000
+2,2049,R1,windturbine,2020,10.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,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
 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
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2050.csv b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
index 13bd77c9..74312e85 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
@@ -1,22 +1,21 @@
 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
+1,2050,R1,gasCCGT,2025,4.06670000000
+1,2055,R1,gasCCGT,2025,4.06670000000
+1,2059,R1,gasCCGT,2025,4.06670000000
+1,2060,R1,gasCCGT,2025,4.06670000000
+1,2064,R1,gasCCGT,2025,4.06670000000
 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
@@ -24,7 +23,6 @@ asset,year,region,technology,installed,capacity
 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
@@ -33,13 +31,3 @@ asset,year,region,technology,installed,capacity
 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/medium/Gas/Capacity/2025.csv b/tests/example_outputs/medium/Gas/Capacity/2025.csv
index 6a5d9a98..10f872ff 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2025.csv
@@ -7,11 +7,11 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gassupply1,2020,10.72460000000
 0,2050,R1,gassupply1,2020,10.72460000000
 0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,7.48600000000
-1,2035,R1,gassupply1,2025,7.48600000000
-1,2040,R1,gassupply1,2025,7.48600000000
-1,2045,R1,gassupply1,2025,7.48600000000
-1,2050,R1,gassupply1,2025,7.48600000000
-1,2059,R1,gassupply1,2025,7.48600000000
-1,2060,R1,gassupply1,2025,7.48600000000
-1,2064,R1,gassupply1,2025,7.48600000000
+1,2030,R1,gassupply1,2025,12.65760000000
+1,2035,R1,gassupply1,2025,12.65760000000
+1,2040,R1,gassupply1,2025,12.65760000000
+1,2045,R1,gassupply1,2025,12.65760000000
+1,2050,R1,gassupply1,2025,12.65760000000
+1,2059,R1,gassupply1,2025,12.65760000000
+1,2060,R1,gassupply1,2025,12.65760000000
+1,2064,R1,gassupply1,2025,12.65760000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2030.csv b/tests/example_outputs/medium/Gas/Capacity/2030.csv
index 3aab0e20..8c4b7958 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2030.csv
@@ -7,20 +7,20 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gassupply1,2020,10.72460000000
 0,2050,R1,gassupply1,2020,10.72460000000
 0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,7.48600000000
-1,2035,R1,gassupply1,2025,7.48600000000
-1,2040,R1,gassupply1,2025,7.48600000000
-1,2045,R1,gassupply1,2025,7.48600000000
-1,2050,R1,gassupply1,2025,7.48600000000
-1,2059,R1,gassupply1,2025,7.48600000000
-1,2060,R1,gassupply1,2025,7.48600000000
-1,2064,R1,gassupply1,2025,7.48600000000
-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
+1,2030,R1,gassupply1,2025,12.65760000000
+1,2035,R1,gassupply1,2025,12.65760000000
+1,2040,R1,gassupply1,2025,12.65760000000
+1,2045,R1,gassupply1,2025,12.65760000000
+1,2050,R1,gassupply1,2025,12.65760000000
+1,2059,R1,gassupply1,2025,12.65760000000
+1,2060,R1,gassupply1,2025,12.65760000000
+1,2064,R1,gassupply1,2025,12.65760000000
+2,2035,R1,gassupply1,2030,10.78820000000
+2,2040,R1,gassupply1,2030,10.78820000000
+2,2045,R1,gassupply1,2030,10.78820000000
+2,2050,R1,gassupply1,2030,10.78820000000
+2,2059,R1,gassupply1,2030,10.78820000000
+2,2060,R1,gassupply1,2030,10.78820000000
+2,2064,R1,gassupply1,2030,10.78820000000
+2,2065,R1,gassupply1,2030,10.78820000000
+2,2069,R1,gassupply1,2030,10.78820000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2035.csv b/tests/example_outputs/medium/Gas/Capacity/2035.csv
index 3aab0e20..8c4b7958 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2035.csv
@@ -7,20 +7,20 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gassupply1,2020,10.72460000000
 0,2050,R1,gassupply1,2020,10.72460000000
 0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,7.48600000000
-1,2035,R1,gassupply1,2025,7.48600000000
-1,2040,R1,gassupply1,2025,7.48600000000
-1,2045,R1,gassupply1,2025,7.48600000000
-1,2050,R1,gassupply1,2025,7.48600000000
-1,2059,R1,gassupply1,2025,7.48600000000
-1,2060,R1,gassupply1,2025,7.48600000000
-1,2064,R1,gassupply1,2025,7.48600000000
-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
+1,2030,R1,gassupply1,2025,12.65760000000
+1,2035,R1,gassupply1,2025,12.65760000000
+1,2040,R1,gassupply1,2025,12.65760000000
+1,2045,R1,gassupply1,2025,12.65760000000
+1,2050,R1,gassupply1,2025,12.65760000000
+1,2059,R1,gassupply1,2025,12.65760000000
+1,2060,R1,gassupply1,2025,12.65760000000
+1,2064,R1,gassupply1,2025,12.65760000000
+2,2035,R1,gassupply1,2030,10.78820000000
+2,2040,R1,gassupply1,2030,10.78820000000
+2,2045,R1,gassupply1,2030,10.78820000000
+2,2050,R1,gassupply1,2030,10.78820000000
+2,2059,R1,gassupply1,2030,10.78820000000
+2,2060,R1,gassupply1,2030,10.78820000000
+2,2064,R1,gassupply1,2030,10.78820000000
+2,2065,R1,gassupply1,2030,10.78820000000
+2,2069,R1,gassupply1,2030,10.78820000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2040.csv b/tests/example_outputs/medium/Gas/Capacity/2040.csv
index 3aab0e20..8c4b7958 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2040.csv
@@ -7,20 +7,20 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gassupply1,2020,10.72460000000
 0,2050,R1,gassupply1,2020,10.72460000000
 0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,7.48600000000
-1,2035,R1,gassupply1,2025,7.48600000000
-1,2040,R1,gassupply1,2025,7.48600000000
-1,2045,R1,gassupply1,2025,7.48600000000
-1,2050,R1,gassupply1,2025,7.48600000000
-1,2059,R1,gassupply1,2025,7.48600000000
-1,2060,R1,gassupply1,2025,7.48600000000
-1,2064,R1,gassupply1,2025,7.48600000000
-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
+1,2030,R1,gassupply1,2025,12.65760000000
+1,2035,R1,gassupply1,2025,12.65760000000
+1,2040,R1,gassupply1,2025,12.65760000000
+1,2045,R1,gassupply1,2025,12.65760000000
+1,2050,R1,gassupply1,2025,12.65760000000
+1,2059,R1,gassupply1,2025,12.65760000000
+1,2060,R1,gassupply1,2025,12.65760000000
+1,2064,R1,gassupply1,2025,12.65760000000
+2,2035,R1,gassupply1,2030,10.78820000000
+2,2040,R1,gassupply1,2030,10.78820000000
+2,2045,R1,gassupply1,2030,10.78820000000
+2,2050,R1,gassupply1,2030,10.78820000000
+2,2059,R1,gassupply1,2030,10.78820000000
+2,2060,R1,gassupply1,2030,10.78820000000
+2,2064,R1,gassupply1,2030,10.78820000000
+2,2065,R1,gassupply1,2030,10.78820000000
+2,2069,R1,gassupply1,2030,10.78820000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2045.csv b/tests/example_outputs/medium/Gas/Capacity/2045.csv
index 47a6562c..d7f38468 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2045.csv
@@ -7,28 +7,28 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gassupply1,2020,10.72460000000
 0,2050,R1,gassupply1,2020,10.72460000000
 0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,7.48600000000
-1,2035,R1,gassupply1,2025,7.48600000000
-1,2040,R1,gassupply1,2025,7.48600000000
-1,2045,R1,gassupply1,2025,7.48600000000
-1,2050,R1,gassupply1,2025,7.48600000000
-1,2059,R1,gassupply1,2025,7.48600000000
-1,2060,R1,gassupply1,2025,7.48600000000
-1,2064,R1,gassupply1,2025,7.48600000000
-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,2050,R1,gassupply1,2045,0.95610000000
-3,2059,R1,gassupply1,2045,0.95610000000
-3,2060,R1,gassupply1,2045,0.95610000000
-3,2064,R1,gassupply1,2045,0.95610000000
-3,2065,R1,gassupply1,2045,0.95610000000
-3,2069,R1,gassupply1,2045,0.95610000000
-3,2070,R1,gassupply1,2045,0.95610000000
-3,2084,R1,gassupply1,2045,0.95610000000
+1,2030,R1,gassupply1,2025,12.65760000000
+1,2035,R1,gassupply1,2025,12.65760000000
+1,2040,R1,gassupply1,2025,12.65760000000
+1,2045,R1,gassupply1,2025,12.65760000000
+1,2050,R1,gassupply1,2025,12.65760000000
+1,2059,R1,gassupply1,2025,12.65760000000
+1,2060,R1,gassupply1,2025,12.65760000000
+1,2064,R1,gassupply1,2025,12.65760000000
+2,2035,R1,gassupply1,2030,10.78820000000
+2,2040,R1,gassupply1,2030,10.78820000000
+2,2045,R1,gassupply1,2030,10.78820000000
+2,2050,R1,gassupply1,2030,10.78820000000
+2,2059,R1,gassupply1,2030,10.78820000000
+2,2060,R1,gassupply1,2030,10.78820000000
+2,2064,R1,gassupply1,2030,10.78820000000
+2,2065,R1,gassupply1,2030,10.78820000000
+2,2069,R1,gassupply1,2030,10.78820000000
+3,2050,R1,gassupply1,2045,0.88640000000
+3,2059,R1,gassupply1,2045,0.88640000000
+3,2060,R1,gassupply1,2045,0.88640000000
+3,2064,R1,gassupply1,2045,0.88640000000
+3,2065,R1,gassupply1,2045,0.88640000000
+3,2069,R1,gassupply1,2045,0.88640000000
+3,2070,R1,gassupply1,2045,0.88640000000
+3,2084,R1,gassupply1,2045,0.88640000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2050.csv b/tests/example_outputs/medium/Gas/Capacity/2050.csv
index 47a6562c..d7f38468 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2050.csv
@@ -7,28 +7,28 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gassupply1,2020,10.72460000000
 0,2050,R1,gassupply1,2020,10.72460000000
 0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,7.48600000000
-1,2035,R1,gassupply1,2025,7.48600000000
-1,2040,R1,gassupply1,2025,7.48600000000
-1,2045,R1,gassupply1,2025,7.48600000000
-1,2050,R1,gassupply1,2025,7.48600000000
-1,2059,R1,gassupply1,2025,7.48600000000
-1,2060,R1,gassupply1,2025,7.48600000000
-1,2064,R1,gassupply1,2025,7.48600000000
-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,2050,R1,gassupply1,2045,0.95610000000
-3,2059,R1,gassupply1,2045,0.95610000000
-3,2060,R1,gassupply1,2045,0.95610000000
-3,2064,R1,gassupply1,2045,0.95610000000
-3,2065,R1,gassupply1,2045,0.95610000000
-3,2069,R1,gassupply1,2045,0.95610000000
-3,2070,R1,gassupply1,2045,0.95610000000
-3,2084,R1,gassupply1,2045,0.95610000000
+1,2030,R1,gassupply1,2025,12.65760000000
+1,2035,R1,gassupply1,2025,12.65760000000
+1,2040,R1,gassupply1,2025,12.65760000000
+1,2045,R1,gassupply1,2025,12.65760000000
+1,2050,R1,gassupply1,2025,12.65760000000
+1,2059,R1,gassupply1,2025,12.65760000000
+1,2060,R1,gassupply1,2025,12.65760000000
+1,2064,R1,gassupply1,2025,12.65760000000
+2,2035,R1,gassupply1,2030,10.78820000000
+2,2040,R1,gassupply1,2030,10.78820000000
+2,2045,R1,gassupply1,2030,10.78820000000
+2,2050,R1,gassupply1,2030,10.78820000000
+2,2059,R1,gassupply1,2030,10.78820000000
+2,2060,R1,gassupply1,2030,10.78820000000
+2,2064,R1,gassupply1,2030,10.78820000000
+2,2065,R1,gassupply1,2030,10.78820000000
+2,2069,R1,gassupply1,2030,10.78820000000
+3,2050,R1,gassupply1,2045,0.88640000000
+3,2059,R1,gassupply1,2045,0.88640000000
+3,2060,R1,gassupply1,2045,0.88640000000
+3,2064,R1,gassupply1,2045,0.88640000000
+3,2065,R1,gassupply1,2045,0.88640000000
+3,2069,R1,gassupply1,2045,0.88640000000
+3,2070,R1,gassupply1,2045,0.88640000000
+3,2084,R1,gassupply1,2045,0.88640000000
diff --git a/tests/example_outputs/medium/MCACapacity.csv b/tests/example_outputs/medium/MCACapacity.csv
index 1b4f50fd..26cc97a1 100644
--- a/tests/example_outputs/medium/MCACapacity.csv
+++ b/tests/example_outputs/medium/MCACapacity.csv
@@ -14,54 +14,54 @@ gasstove,R1,R1,A1,residential,newcapa,2030,4.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,5.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,18.22460000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.48600000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,12.65760000000
 gasboiler,R1,R1,A1,residential,newcapa,2035,7.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2035,11.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2035,7.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,7.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,3.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2035,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.48600000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.83330000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,12.65760000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,10.78820000000
 gasstove,R1,R1,A1,residential,newcapa,2040,7.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2040,14.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,7.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,14.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.48600000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.83330000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,12.65760000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,10.78820000000
 gasstove,R1,R1,A1,residential,newcapa,2045,14.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2045,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,14.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2045,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.48600000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.83330000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,12.65760000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,10.78820000000
 gasstove,R1,R1,A1,residential,newcapa,2050,10.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2050,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,17.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.48600000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.83330000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.95610000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,12.65760000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,10.78820000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.88640000000
diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv
index 98411f10..09c4ff9a 100644
--- a/tests/example_outputs/medium/MCAPrices.csv
+++ b/tests/example_outputs/medium/MCAPrices.csv
@@ -29,183 +29,183 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.90460000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.29070000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.78210000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.45370000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,80.16690000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,18.08280000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.43610000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.83470000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.67320000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,2.18060000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,80.25040000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.90460000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.29070000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,1.25200000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78210000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.45370000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",cook,R1,80.16690000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.08280000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.43610000000,2025
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.83470000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.67320000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,2.18060000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,80.25040000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.61740000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.87220000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,1.25200000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.34640000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.36110000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,80.50080000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.26100000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.58150000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,2.50410000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,3.56430000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.90740000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,80.33390000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.35700000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.47780000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,1.66940000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.32160000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.53230000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,64.26830000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.51620000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.71790000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.98760000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.82890000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,64.40250000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.35700000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.47780000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.32160000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.53230000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",cook,R1,64.26830000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.51620000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.71790000000,2030
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.98760000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.82890000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,64.40250000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.99390000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.44320000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.00620000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.84040000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,64.80590000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.67550000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.95890000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.65700000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.14570000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,64.53690000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.51890000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.81140000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.33250000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.59390000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,51.52350000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.66300000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,52.11940000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.00240000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.91680000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,51.68560000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.51890000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.81140000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33250000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.59390000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",cook,R1,51.52350000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.66300000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,52.11940000000,2035
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.00240000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.91680000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,51.68560000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.09520000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,53.05220000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.02720000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.99120000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,52.17350000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.80700000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.42880000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.67490000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.25730000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",cook,R1,51.84800000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.94320000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.48480000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.07730000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",cook,R1,0.44140000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25000000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.41680000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.73590000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.15620000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",cook,R1,0.66380000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.94320000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.48480000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07730000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.44140000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25000000000,2040
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.41680000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.73590000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15620000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.66380000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50000000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.84510000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.52360000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.55540000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R1,1.33800000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33330000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.89160000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.99270000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.26210000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",cook,R1,0.88740000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.05670000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06180000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25000000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.58670000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.12110000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.05670000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06180000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25000000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.58670000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12110000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50000000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.18350000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13210000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.41360000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33330000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.11780000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07480000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.19940000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.16670000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.14470000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.06630000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.25000000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.71850000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05110000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.13130000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16670000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.14470000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06630000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25000000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.71850000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05110000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13130000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50000000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.44600000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13210000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.45420000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33330000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.29330000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07480000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.21750000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2050
diff --git a/tests/example_outputs/medium/Power/Capacity/2025.csv b/tests/example_outputs/medium/Power/Capacity/2025.csv
index 88f22d6e..db1fb82a 100644
--- a/tests/example_outputs/medium/Power/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2025.csv
@@ -1,16 +1,16 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
 2,2025,R1,windturbine,2020,1
 2,2030,R1,windturbine,2020,1
 2,2035,R1,windturbine,2020,1
 2,2040,R1,windturbine,2020,1
 2,2045,R1,windturbine,2020,1
 2,2049,R1,windturbine,2020,1
-3,2030,R1,windturbine,2025,5
-3,2035,R1,windturbine,2025,5
-3,2040,R1,windturbine,2025,5
-3,2045,R1,windturbine,2025,5
-3,2049,R1,windturbine,2025,5
-3,2050,R1,windturbine,2025,5
-3,2054,R1,windturbine,2025,5
diff --git a/tests/example_outputs/medium/Power/Capacity/2030.csv b/tests/example_outputs/medium/Power/Capacity/2030.csv
index 35026f11..e27dbf28 100644
--- a/tests/example_outputs/medium/Power/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2030.csv
@@ -1,24 +1,24 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
 2,2025,R1,windturbine,2020,1
 2,2030,R1,windturbine,2020,1
 2,2035,R1,windturbine,2020,1
 2,2040,R1,windturbine,2020,1
 2,2045,R1,windturbine,2020,1
 2,2049,R1,windturbine,2020,1
-3,2030,R1,windturbine,2025,5
-3,2035,R1,windturbine,2025,5
-3,2040,R1,windturbine,2025,5
-3,2045,R1,windturbine,2025,5
-3,2049,R1,windturbine,2025,5
-3,2050,R1,windturbine,2025,5
-3,2054,R1,windturbine,2025,5
-4,2035,R1,windturbine,2030,5
-4,2040,R1,windturbine,2030,5
-4,2045,R1,windturbine,2030,5
-4,2049,R1,windturbine,2030,5
-4,2050,R1,windturbine,2030,5
-4,2054,R1,windturbine,2030,5
-4,2055,R1,windturbine,2030,5
-4,2059,R1,windturbine,2030,5
+3,2035,R1,windturbine,2030,3
+3,2040,R1,windturbine,2030,3
+3,2045,R1,windturbine,2030,3
+3,2049,R1,windturbine,2030,3
+3,2050,R1,windturbine,2030,3
+3,2059,R1,windturbine,2030,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2035.csv b/tests/example_outputs/medium/Power/Capacity/2035.csv
index 85a4a7a7..321bfcae 100644
--- a/tests/example_outputs/medium/Power/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2035.csv
@@ -1,33 +1,31 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-2,2025,R1,windturbine,2020,1
-2,2030,R1,windturbine,2020,1
-2,2035,R1,windturbine,2020,1
-2,2040,R1,windturbine,2020,1
-2,2045,R1,windturbine,2020,1
-2,2049,R1,windturbine,2020,1
-3,2030,R1,windturbine,2025,5
-3,2035,R1,windturbine,2025,5
-3,2040,R1,windturbine,2025,5
-3,2045,R1,windturbine,2025,5
-3,2049,R1,windturbine,2025,5
-3,2050,R1,windturbine,2025,5
-3,2054,R1,windturbine,2025,5
-4,2035,R1,windturbine,2030,5
-4,2040,R1,windturbine,2030,5
-4,2045,R1,windturbine,2030,5
-4,2049,R1,windturbine,2030,5
-4,2050,R1,windturbine,2030,5
-4,2054,R1,windturbine,2030,5
-4,2055,R1,windturbine,2030,5
-4,2059,R1,windturbine,2030,5
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+3,2025,R1,windturbine,2020,1
+3,2030,R1,windturbine,2020,1
+3,2035,R1,windturbine,2020,1
+3,2040,R1,windturbine,2020,1
+3,2045,R1,windturbine,2020,1
+3,2049,R1,windturbine,2020,1
+4,2035,R1,windturbine,2030,3
+4,2040,R1,windturbine,2030,3
+4,2045,R1,windturbine,2030,3
+4,2049,R1,windturbine,2030,3
+4,2050,R1,windturbine,2030,3
+4,2059,R1,windturbine,2030,3
 5,2040,R1,windturbine,2035,10
 5,2045,R1,windturbine,2035,10
 5,2049,R1,windturbine,2035,10
 5,2050,R1,windturbine,2035,10
-5,2054,R1,windturbine,2035,10
-5,2055,R1,windturbine,2035,10
 5,2059,R1,windturbine,2035,10
 5,2060,R1,windturbine,2035,10
 5,2064,R1,windturbine,2035,10
diff --git a/tests/example_outputs/medium/Power/Capacity/2040.csv b/tests/example_outputs/medium/Power/Capacity/2040.csv
index b0b0b653..803b7b9b 100644
--- a/tests/example_outputs/medium/Power/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2040.csv
@@ -1,41 +1,37 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-2,2025,R1,windturbine,2020,1
-2,2030,R1,windturbine,2020,1
-2,2035,R1,windturbine,2020,1
-2,2040,R1,windturbine,2020,1
-2,2045,R1,windturbine,2020,1
-2,2049,R1,windturbine,2020,1
-3,2030,R1,windturbine,2025,5
-3,2035,R1,windturbine,2025,5
-3,2040,R1,windturbine,2025,5
-3,2045,R1,windturbine,2025,5
-3,2049,R1,windturbine,2025,5
-3,2050,R1,windturbine,2025,5
-3,2054,R1,windturbine,2025,5
-4,2035,R1,windturbine,2030,5
-4,2040,R1,windturbine,2030,5
-4,2045,R1,windturbine,2030,5
-4,2049,R1,windturbine,2030,5
-4,2050,R1,windturbine,2030,5
-4,2054,R1,windturbine,2030,5
-4,2055,R1,windturbine,2030,5
-4,2059,R1,windturbine,2030,5
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+3,2025,R1,windturbine,2020,1
+3,2030,R1,windturbine,2020,1
+3,2035,R1,windturbine,2020,1
+3,2040,R1,windturbine,2020,1
+3,2045,R1,windturbine,2020,1
+3,2049,R1,windturbine,2020,1
+4,2035,R1,windturbine,2030,3
+4,2040,R1,windturbine,2030,3
+4,2045,R1,windturbine,2030,3
+4,2049,R1,windturbine,2030,3
+4,2050,R1,windturbine,2030,3
+4,2059,R1,windturbine,2030,3
 5,2040,R1,windturbine,2035,10
 5,2045,R1,windturbine,2035,10
 5,2049,R1,windturbine,2035,10
 5,2050,R1,windturbine,2035,10
-5,2054,R1,windturbine,2035,10
-5,2055,R1,windturbine,2035,10
 5,2059,R1,windturbine,2035,10
 5,2060,R1,windturbine,2035,10
 5,2064,R1,windturbine,2035,10
 6,2045,R1,windturbine,2040,3
 6,2049,R1,windturbine,2040,3
 6,2050,R1,windturbine,2040,3
-6,2054,R1,windturbine,2040,3
-6,2055,R1,windturbine,2040,3
 6,2059,R1,windturbine,2040,3
 6,2060,R1,windturbine,2040,3
 6,2064,R1,windturbine,2040,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2045.csv b/tests/example_outputs/medium/Power/Capacity/2045.csv
index 2529222d..3b9a469f 100644
--- a/tests/example_outputs/medium/Power/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2045.csv
@@ -1,49 +1,43 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-2,2025,R1,windturbine,2020,1
-2,2030,R1,windturbine,2020,1
-2,2035,R1,windturbine,2020,1
-2,2040,R1,windturbine,2020,1
-2,2045,R1,windturbine,2020,1
-2,2049,R1,windturbine,2020,1
-3,2030,R1,windturbine,2025,5
-3,2035,R1,windturbine,2025,5
-3,2040,R1,windturbine,2025,5
-3,2045,R1,windturbine,2025,5
-3,2049,R1,windturbine,2025,5
-3,2050,R1,windturbine,2025,5
-3,2054,R1,windturbine,2025,5
-4,2035,R1,windturbine,2030,5
-4,2040,R1,windturbine,2030,5
-4,2045,R1,windturbine,2030,5
-4,2049,R1,windturbine,2030,5
-4,2050,R1,windturbine,2030,5
-4,2054,R1,windturbine,2030,5
-4,2055,R1,windturbine,2030,5
-4,2059,R1,windturbine,2030,5
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+3,2025,R1,windturbine,2020,1
+3,2030,R1,windturbine,2020,1
+3,2035,R1,windturbine,2020,1
+3,2040,R1,windturbine,2020,1
+3,2045,R1,windturbine,2020,1
+3,2049,R1,windturbine,2020,1
+4,2035,R1,windturbine,2030,3
+4,2040,R1,windturbine,2030,3
+4,2045,R1,windturbine,2030,3
+4,2049,R1,windturbine,2030,3
+4,2050,R1,windturbine,2030,3
+4,2059,R1,windturbine,2030,3
 5,2040,R1,windturbine,2035,10
 5,2045,R1,windturbine,2035,10
 5,2049,R1,windturbine,2035,10
 5,2050,R1,windturbine,2035,10
-5,2054,R1,windturbine,2035,10
-5,2055,R1,windturbine,2035,10
 5,2059,R1,windturbine,2035,10
 5,2060,R1,windturbine,2035,10
 5,2064,R1,windturbine,2035,10
 6,2045,R1,windturbine,2040,3
 6,2049,R1,windturbine,2040,3
 6,2050,R1,windturbine,2040,3
-6,2054,R1,windturbine,2040,3
-6,2055,R1,windturbine,2040,3
 6,2059,R1,windturbine,2040,3
 6,2060,R1,windturbine,2040,3
 6,2064,R1,windturbine,2040,3
 6,2065,R1,windturbine,2040,3
 6,2069,R1,windturbine,2040,3
 7,2050,R1,windturbine,2045,4
-7,2054,R1,windturbine,2045,4
-7,2055,R1,windturbine,2045,4
 7,2059,R1,windturbine,2045,4
 7,2060,R1,windturbine,2045,4
 7,2064,R1,windturbine,2045,4
diff --git a/tests/example_outputs/medium/Power/Capacity/2050.csv b/tests/example_outputs/medium/Power/Capacity/2050.csv
index a9845da7..a90aff24 100644
--- a/tests/example_outputs/medium/Power/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2050.csv
@@ -1,32 +1,33 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-2,2025,R1,windturbine,2020,1
-2,2030,R1,windturbine,2020,1
-2,2035,R1,windturbine,2020,1
-2,2040,R1,windturbine,2020,1
-2,2045,R1,windturbine,2020,1
-2,2049,R1,windturbine,2020,1
-3,2030,R1,windturbine,2025,5
-3,2035,R1,windturbine,2025,5
-3,2040,R1,windturbine,2025,5
-3,2045,R1,windturbine,2025,5
-3,2049,R1,windturbine,2025,5
-3,2050,R1,windturbine,2025,5
-3,2054,R1,windturbine,2025,5
-4,2035,R1,windturbine,2030,5
-4,2040,R1,windturbine,2030,5
-4,2045,R1,windturbine,2030,5
-4,2049,R1,windturbine,2030,5
-4,2050,R1,windturbine,2030,5
-4,2054,R1,windturbine,2030,5
-4,2055,R1,windturbine,2030,5
-4,2059,R1,windturbine,2030,5
+1,2030,R1,gasCCGT,2025,3
+1,2035,R1,gasCCGT,2025,3
+1,2040,R1,gasCCGT,2025,3
+1,2045,R1,gasCCGT,2025,3
+1,2049,R1,gasCCGT,2025,3
+1,2050,R1,gasCCGT,2025,3
+1,2055,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
+1,2064,R1,gasCCGT,2025,3
+3,2025,R1,windturbine,2020,1
+3,2030,R1,windturbine,2020,1
+3,2035,R1,windturbine,2020,1
+3,2040,R1,windturbine,2020,1
+3,2045,R1,windturbine,2020,1
+3,2049,R1,windturbine,2020,1
+4,2035,R1,windturbine,2030,3
+4,2040,R1,windturbine,2030,3
+4,2045,R1,windturbine,2030,3
+4,2049,R1,windturbine,2030,3
+4,2050,R1,windturbine,2030,3
+4,2055,R1,windturbine,2030,3
+4,2059,R1,windturbine,2030,3
 5,2040,R1,windturbine,2035,10
 5,2045,R1,windturbine,2035,10
 5,2049,R1,windturbine,2035,10
 5,2050,R1,windturbine,2035,10
-5,2054,R1,windturbine,2035,10
 5,2055,R1,windturbine,2035,10
 5,2059,R1,windturbine,2035,10
 5,2060,R1,windturbine,2035,10
@@ -34,7 +35,6 @@ asset,year,region,technology,installed,capacity
 6,2045,R1,windturbine,2040,3
 6,2049,R1,windturbine,2040,3
 6,2050,R1,windturbine,2040,3
-6,2054,R1,windturbine,2040,3
 6,2055,R1,windturbine,2040,3
 6,2059,R1,windturbine,2040,3
 6,2060,R1,windturbine,2040,3
@@ -42,7 +42,6 @@ asset,year,region,technology,installed,capacity
 6,2065,R1,windturbine,2040,3
 6,2069,R1,windturbine,2040,3
 7,2050,R1,windturbine,2045,4
-7,2054,R1,windturbine,2045,4
 7,2055,R1,windturbine,2045,4
 7,2059,R1,windturbine,2045,4
 7,2060,R1,windturbine,2045,4
@@ -51,13 +50,3 @@ asset,year,region,technology,installed,capacity
 7,2069,R1,windturbine,2045,4
 7,2070,R1,windturbine,2045,4
 7,2074,R1,windturbine,2045,4
-8,2055,R1,windturbine,2050,5
-8,2059,R1,windturbine,2050,5
-8,2060,R1,windturbine,2050,5
-8,2064,R1,windturbine,2050,5
-8,2065,R1,windturbine,2050,5
-8,2069,R1,windturbine,2050,5
-8,2070,R1,windturbine,2050,5
-8,2074,R1,windturbine,2050,5
-8,2075,R1,windturbine,2050,5
-8,2079,R1,windturbine,2050,5
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
index d1ee882b..f0d285df 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
@@ -2,3 +2,9 @@ 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,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
index c7ef92d2..a06e32df 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
index c7ef92d2..a06e32df 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
index c7ef92d2..a06e32df 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
index c9a529f3..a5722dbd 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
@@ -2,12 +2,22 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
-2,2050,R1,gassupply1,2045,3.62630000000
-2,2069,R1,gassupply1,2045,3.62630000000
-2,2070,R1,gassupply1,2045,3.62630000000
-2,2084,R1,gassupply1,2045,3.62630000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
+3,2050,R1,gassupply1,2045,3.81710000000
+3,2064,R1,gassupply1,2045,3.81710000000
+3,2065,R1,gassupply1,2045,3.81710000000
+3,2069,R1,gassupply1,2045,3.81710000000
+3,2070,R1,gassupply1,2045,3.81710000000
+3,2084,R1,gassupply1,2045,3.81710000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
index c9a529f3..a5722dbd 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
@@ -2,12 +2,22 @@ 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,2035,R1,gassupply1,2030,6.68000000000
-1,2040,R1,gassupply1,2030,6.68000000000
-1,2045,R1,gassupply1,2030,6.68000000000
-1,2050,R1,gassupply1,2030,6.68000000000
-1,2069,R1,gassupply1,2030,6.68000000000
-2,2050,R1,gassupply1,2045,3.62630000000
-2,2069,R1,gassupply1,2045,3.62630000000
-2,2070,R1,gassupply1,2045,3.62630000000
-2,2084,R1,gassupply1,2045,3.62630000000
+1,2030,R1,gassupply1,2025,6.81430000000
+1,2035,R1,gassupply1,2025,6.81430000000
+1,2040,R1,gassupply1,2025,6.81430000000
+1,2045,R1,gassupply1,2025,6.81430000000
+1,2050,R1,gassupply1,2025,6.81430000000
+1,2064,R1,gassupply1,2025,6.81430000000
+2,2035,R1,gassupply1,2030,6.54570000000
+2,2040,R1,gassupply1,2030,6.54570000000
+2,2045,R1,gassupply1,2030,6.54570000000
+2,2050,R1,gassupply1,2030,6.54570000000
+2,2064,R1,gassupply1,2030,6.54570000000
+2,2065,R1,gassupply1,2030,6.54570000000
+2,2069,R1,gassupply1,2030,6.54570000000
+3,2050,R1,gassupply1,2045,3.81710000000
+3,2064,R1,gassupply1,2045,3.81710000000
+3,2065,R1,gassupply1,2045,3.81710000000
+3,2069,R1,gassupply1,2045,3.81710000000
+3,2070,R1,gassupply1,2045,3.81710000000
+3,2084,R1,gassupply1,2045,3.81710000000
diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv
index 36be371a..96e87da9 100644
--- a/tests/example_outputs/multiple_agents/MCACapacity.csv
+++ b/tests/example_outputs/multiple_agents/MCACapacity.csv
@@ -15,54 +15,54 @@ heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,6.81430000000
 heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,7.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.68000000000
+windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.54570000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.68000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.54570000000
 heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.68000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.54570000000
 heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.68000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,3.62630000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.81430000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.54570000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,3.81710000000
diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv
index 9da3fbc1..0db837fc 100644
--- a/tests/example_outputs/multiple_agents/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.80250000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.92970000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.31130000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,18.05690000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.42450000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.31900000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.61760000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.48000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.15060000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.42450000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.31900000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07490000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.61760000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.48000000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15060000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.19710000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,64.96920000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.08790000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.53010000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.81070000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.64210000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.04840000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.70880000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.57540000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.06480000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.94800000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.76670000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.12800000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.70880000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.57540000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06480000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.94800000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.76670000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12800000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.66620000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.35450000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30870000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.44270000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.18730000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,51.96030000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.19790000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.21200000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.53230000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,41.35880000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.18980000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.80630000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,41.56390000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.78720000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.53230000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,41.35880000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.18980000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.80630000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,41.56390000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.78720000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.62950000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,42.20200000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.58960000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.46920000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,10.08050000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,41.77280000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.38630000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.22390000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.79720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,33.16810000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.07160000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,8.10230000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,33.37600000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14330000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.79720000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,33.16810000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07160000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.10230000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,33.37600000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14330000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.01900000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,34.03120000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.04070000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50290000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,8.40760000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,33.58920000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.68790000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.23900000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,6.49310000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,26.60170000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.07770000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,6.86510000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,26.80530000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.15690000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.49310000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,2.15990000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,26.60170000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07770000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.86510000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,2.17730000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,26.80530000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15690000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.98280000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,2.22960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,27.45580000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.50350000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.55700000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,7.23730000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,2.19470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,27.01550000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.66220000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.26310000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
index 3578c2db..64665258 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
@@ -7,30 +7,19 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
index ec5a6f8f..e2ed2347 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
@@ -7,38 +7,25 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
-4,2035,R1,windturbine,2030,7
-4,2040,R1,windturbine,2030,7
-4,2045,R1,windturbine,2030,7
-4,2049,R1,windturbine,2030,7
-4,2050,R1,windturbine,2030,7
-4,2054,R1,windturbine,2030,7
-4,2055,R1,windturbine,2030,7
-4,2059,R1,windturbine,2030,7
+3,2035,R1,windturbine,2030,8
+3,2040,R1,windturbine,2030,8
+3,2045,R1,windturbine,2030,8
+3,2049,R1,windturbine,2030,8
+3,2050,R1,windturbine,2030,8
+3,2059,R1,windturbine,2030,8
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
index 8d9c15b2..fa5e3aaf 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
@@ -7,47 +7,32 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
-4,2035,R1,windturbine,2030,7
-4,2040,R1,windturbine,2030,7
-4,2045,R1,windturbine,2030,7
-4,2049,R1,windturbine,2030,7
-4,2050,R1,windturbine,2030,7
-4,2054,R1,windturbine,2030,7
-4,2055,R1,windturbine,2030,7
-4,2059,R1,windturbine,2030,7
-5,2040,R1,windturbine,2035,6
-5,2045,R1,windturbine,2035,6
-5,2049,R1,windturbine,2035,6
-5,2050,R1,windturbine,2035,6
-5,2054,R1,windturbine,2035,6
-5,2055,R1,windturbine,2035,6
-5,2059,R1,windturbine,2035,6
-5,2060,R1,windturbine,2035,6
-5,2064,R1,windturbine,2035,6
+3,2035,R1,windturbine,2030,8
+3,2040,R1,windturbine,2030,8
+3,2045,R1,windturbine,2030,8
+3,2049,R1,windturbine,2030,8
+3,2050,R1,windturbine,2030,8
+3,2059,R1,windturbine,2030,8
+4,2040,R1,windturbine,2035,6
+4,2045,R1,windturbine,2035,6
+4,2049,R1,windturbine,2035,6
+4,2050,R1,windturbine,2035,6
+4,2059,R1,windturbine,2035,6
+4,2060,R1,windturbine,2035,6
+4,2064,R1,windturbine,2035,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
index 0ba925e6..951d3e5e 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
@@ -7,57 +7,40 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2025,R1,windturbine,2020,10
 2,2030,R1,windturbine,2020,10
 2,2035,R1,windturbine,2020,10
 2,2040,R1,windturbine,2020,10
 2,2045,R1,windturbine,2020,10
 2,2049,R1,windturbine,2020,10
-3,2030,R1,windturbine,2025,10
-3,2035,R1,windturbine,2025,10
-3,2040,R1,windturbine,2025,10
-3,2045,R1,windturbine,2025,10
-3,2049,R1,windturbine,2025,10
-3,2050,R1,windturbine,2025,10
-3,2054,R1,windturbine,2025,10
-4,2035,R1,windturbine,2030,7
-4,2040,R1,windturbine,2030,7
-4,2045,R1,windturbine,2030,7
-4,2049,R1,windturbine,2030,7
-4,2050,R1,windturbine,2030,7
-4,2054,R1,windturbine,2030,7
-4,2055,R1,windturbine,2030,7
-4,2059,R1,windturbine,2030,7
-5,2040,R1,windturbine,2035,6
-5,2045,R1,windturbine,2035,6
-5,2049,R1,windturbine,2035,6
-5,2050,R1,windturbine,2035,6
-5,2054,R1,windturbine,2035,6
-5,2055,R1,windturbine,2035,6
-5,2059,R1,windturbine,2035,6
-5,2060,R1,windturbine,2035,6
-5,2064,R1,windturbine,2035,6
-6,2045,R1,windturbine,2040,6
-6,2049,R1,windturbine,2040,6
-6,2050,R1,windturbine,2040,6
-6,2054,R1,windturbine,2040,6
-6,2055,R1,windturbine,2040,6
-6,2059,R1,windturbine,2040,6
-6,2060,R1,windturbine,2040,6
-6,2064,R1,windturbine,2040,6
-6,2065,R1,windturbine,2040,6
-6,2069,R1,windturbine,2040,6
+3,2035,R1,windturbine,2030,8
+3,2040,R1,windturbine,2030,8
+3,2045,R1,windturbine,2030,8
+3,2049,R1,windturbine,2030,8
+3,2050,R1,windturbine,2030,8
+3,2059,R1,windturbine,2030,8
+4,2040,R1,windturbine,2035,6
+4,2045,R1,windturbine,2035,6
+4,2049,R1,windturbine,2035,6
+4,2050,R1,windturbine,2035,6
+4,2059,R1,windturbine,2035,6
+4,2060,R1,windturbine,2035,6
+4,2064,R1,windturbine,2035,6
+5,2045,R1,windturbine,2040,6
+5,2049,R1,windturbine,2040,6
+5,2050,R1,windturbine,2040,6
+5,2059,R1,windturbine,2040,6
+5,2060,R1,windturbine,2040,6
+5,2064,R1,windturbine,2040,6
+5,2065,R1,windturbine,2040,6
+5,2069,R1,windturbine,2040,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
index 99ff9edf..04534bed 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
@@ -7,23 +7,17 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2050,R1,gasCCGT,2045,2
-2,2054,R1,gasCCGT,2045,2
-2,2055,R1,gasCCGT,2045,2
 2,2059,R1,gasCCGT,2045,2
 2,2060,R1,gasCCGT,2045,2
 2,2064,R1,gasCCGT,2045,2
@@ -39,47 +33,32 @@ asset,year,region,technology,installed,capacity
 3,2040,R1,windturbine,2020,10
 3,2045,R1,windturbine,2020,10
 3,2049,R1,windturbine,2020,10
-4,2030,R1,windturbine,2025,10
-4,2035,R1,windturbine,2025,10
-4,2040,R1,windturbine,2025,10
-4,2045,R1,windturbine,2025,10
-4,2049,R1,windturbine,2025,10
-4,2050,R1,windturbine,2025,10
-4,2054,R1,windturbine,2025,10
-5,2035,R1,windturbine,2030,7
-5,2040,R1,windturbine,2030,7
-5,2045,R1,windturbine,2030,7
-5,2049,R1,windturbine,2030,7
-5,2050,R1,windturbine,2030,7
-5,2054,R1,windturbine,2030,7
-5,2055,R1,windturbine,2030,7
-5,2059,R1,windturbine,2030,7
-6,2040,R1,windturbine,2035,6
-6,2045,R1,windturbine,2035,6
-6,2049,R1,windturbine,2035,6
-6,2050,R1,windturbine,2035,6
-6,2054,R1,windturbine,2035,6
-6,2055,R1,windturbine,2035,6
-6,2059,R1,windturbine,2035,6
-6,2060,R1,windturbine,2035,6
-6,2064,R1,windturbine,2035,6
-7,2045,R1,windturbine,2040,6
-7,2049,R1,windturbine,2040,6
-7,2050,R1,windturbine,2040,6
-7,2054,R1,windturbine,2040,6
-7,2055,R1,windturbine,2040,6
-7,2059,R1,windturbine,2040,6
-7,2060,R1,windturbine,2040,6
-7,2064,R1,windturbine,2040,6
-7,2065,R1,windturbine,2040,6
-7,2069,R1,windturbine,2040,6
-8,2050,R1,windturbine,2045,10
-8,2054,R1,windturbine,2045,10
-8,2055,R1,windturbine,2045,10
-8,2059,R1,windturbine,2045,10
-8,2060,R1,windturbine,2045,10
-8,2064,R1,windturbine,2045,10
-8,2065,R1,windturbine,2045,10
-8,2069,R1,windturbine,2045,10
-8,2070,R1,windturbine,2045,10
-8,2074,R1,windturbine,2045,10
+4,2035,R1,windturbine,2030,8
+4,2040,R1,windturbine,2030,8
+4,2045,R1,windturbine,2030,8
+4,2049,R1,windturbine,2030,8
+4,2050,R1,windturbine,2030,8
+4,2059,R1,windturbine,2030,8
+5,2040,R1,windturbine,2035,6
+5,2045,R1,windturbine,2035,6
+5,2049,R1,windturbine,2035,6
+5,2050,R1,windturbine,2035,6
+5,2059,R1,windturbine,2035,6
+5,2060,R1,windturbine,2035,6
+5,2064,R1,windturbine,2035,6
+6,2045,R1,windturbine,2040,6
+6,2049,R1,windturbine,2040,6
+6,2050,R1,windturbine,2040,6
+6,2059,R1,windturbine,2040,6
+6,2060,R1,windturbine,2040,6
+6,2064,R1,windturbine,2040,6
+6,2065,R1,windturbine,2040,6
+6,2069,R1,windturbine,2040,6
+7,2050,R1,windturbine,2045,10
+7,2059,R1,windturbine,2045,10
+7,2060,R1,windturbine,2045,10
+7,2064,R1,windturbine,2045,10
+7,2065,R1,windturbine,2045,10
+7,2069,R1,windturbine,2045,10
+7,2070,R1,windturbine,2045,10
+7,2074,R1,windturbine,2045,10
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
index c4509cb0..9ca97e84 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
@@ -7,22 +7,19 @@ asset,year,region,technology,installed,capacity
 0,2045,R1,gasCCGT,2020,3
 0,2049,R1,gasCCGT,2020,3
 0,2050,R1,gasCCGT,2020,3
-0,2054,R1,gasCCGT,2020,3
 0,2055,R1,gasCCGT,2020,3
 0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,1
-1,2035,R1,gasCCGT,2025,1
-1,2040,R1,gasCCGT,2025,1
-1,2045,R1,gasCCGT,2025,1
-1,2049,R1,gasCCGT,2025,1
-1,2050,R1,gasCCGT,2025,1
-1,2054,R1,gasCCGT,2025,1
-1,2055,R1,gasCCGT,2025,1
-1,2059,R1,gasCCGT,2025,1
-1,2060,R1,gasCCGT,2025,1
-1,2064,R1,gasCCGT,2025,1
+1,2030,R1,gasCCGT,2025,5
+1,2035,R1,gasCCGT,2025,5
+1,2040,R1,gasCCGT,2025,5
+1,2045,R1,gasCCGT,2025,5
+1,2049,R1,gasCCGT,2025,5
+1,2050,R1,gasCCGT,2025,5
+1,2055,R1,gasCCGT,2025,5
+1,2059,R1,gasCCGT,2025,5
+1,2060,R1,gasCCGT,2025,5
+1,2064,R1,gasCCGT,2025,5
 2,2050,R1,gasCCGT,2045,2
-2,2054,R1,gasCCGT,2045,2
 2,2055,R1,gasCCGT,2045,2
 2,2059,R1,gasCCGT,2045,2
 2,2060,R1,gasCCGT,2045,2
@@ -35,63 +32,52 @@ asset,year,region,technology,installed,capacity
 2,2079,R1,gasCCGT,2045,2
 2,2080,R1,gasCCGT,2045,2
 2,2084,R1,gasCCGT,2045,2
-4,2025,R1,windturbine,2020,10
-4,2030,R1,windturbine,2020,10
-4,2035,R1,windturbine,2020,10
-4,2040,R1,windturbine,2020,10
-4,2045,R1,windturbine,2020,10
-4,2049,R1,windturbine,2020,10
-5,2030,R1,windturbine,2025,10
-5,2035,R1,windturbine,2025,10
-5,2040,R1,windturbine,2025,10
-5,2045,R1,windturbine,2025,10
-5,2049,R1,windturbine,2025,10
-5,2050,R1,windturbine,2025,10
-5,2054,R1,windturbine,2025,10
-6,2035,R1,windturbine,2030,7
-6,2040,R1,windturbine,2030,7
-6,2045,R1,windturbine,2030,7
-6,2049,R1,windturbine,2030,7
-6,2050,R1,windturbine,2030,7
-6,2054,R1,windturbine,2030,7
-6,2055,R1,windturbine,2030,7
-6,2059,R1,windturbine,2030,7
-7,2040,R1,windturbine,2035,6
-7,2045,R1,windturbine,2035,6
-7,2049,R1,windturbine,2035,6
-7,2050,R1,windturbine,2035,6
-7,2054,R1,windturbine,2035,6
-7,2055,R1,windturbine,2035,6
-7,2059,R1,windturbine,2035,6
-7,2060,R1,windturbine,2035,6
-7,2064,R1,windturbine,2035,6
-8,2045,R1,windturbine,2040,6
-8,2049,R1,windturbine,2040,6
-8,2050,R1,windturbine,2040,6
-8,2054,R1,windturbine,2040,6
-8,2055,R1,windturbine,2040,6
-8,2059,R1,windturbine,2040,6
-8,2060,R1,windturbine,2040,6
-8,2064,R1,windturbine,2040,6
-8,2065,R1,windturbine,2040,6
-8,2069,R1,windturbine,2040,6
-9,2050,R1,windturbine,2045,10
-9,2054,R1,windturbine,2045,10
-9,2055,R1,windturbine,2045,10
-9,2059,R1,windturbine,2045,10
-9,2060,R1,windturbine,2045,10
-9,2064,R1,windturbine,2045,10
-9,2065,R1,windturbine,2045,10
-9,2069,R1,windturbine,2045,10
-9,2070,R1,windturbine,2045,10
-9,2074,R1,windturbine,2045,10
-10,2055,R1,windturbine,2050,10
-10,2059,R1,windturbine,2050,10
-10,2060,R1,windturbine,2050,10
-10,2064,R1,windturbine,2050,10
-10,2065,R1,windturbine,2050,10
-10,2069,R1,windturbine,2050,10
-10,2070,R1,windturbine,2050,10
-10,2074,R1,windturbine,2050,10
-10,2075,R1,windturbine,2050,10
-10,2079,R1,windturbine,2050,10
+3,2025,R1,windturbine,2020,10
+3,2030,R1,windturbine,2020,10
+3,2035,R1,windturbine,2020,10
+3,2040,R1,windturbine,2020,10
+3,2045,R1,windturbine,2020,10
+3,2049,R1,windturbine,2020,10
+4,2035,R1,windturbine,2030,8
+4,2040,R1,windturbine,2030,8
+4,2045,R1,windturbine,2030,8
+4,2049,R1,windturbine,2030,8
+4,2050,R1,windturbine,2030,8
+4,2055,R1,windturbine,2030,8
+4,2059,R1,windturbine,2030,8
+5,2040,R1,windturbine,2035,6
+5,2045,R1,windturbine,2035,6
+5,2049,R1,windturbine,2035,6
+5,2050,R1,windturbine,2035,6
+5,2055,R1,windturbine,2035,6
+5,2059,R1,windturbine,2035,6
+5,2060,R1,windturbine,2035,6
+5,2064,R1,windturbine,2035,6
+6,2045,R1,windturbine,2040,6
+6,2049,R1,windturbine,2040,6
+6,2050,R1,windturbine,2040,6
+6,2055,R1,windturbine,2040,6
+6,2059,R1,windturbine,2040,6
+6,2060,R1,windturbine,2040,6
+6,2064,R1,windturbine,2040,6
+6,2065,R1,windturbine,2040,6
+6,2069,R1,windturbine,2040,6
+7,2050,R1,windturbine,2045,10
+7,2055,R1,windturbine,2045,10
+7,2059,R1,windturbine,2045,10
+7,2060,R1,windturbine,2045,10
+7,2064,R1,windturbine,2045,10
+7,2065,R1,windturbine,2045,10
+7,2069,R1,windturbine,2045,10
+7,2070,R1,windturbine,2045,10
+7,2074,R1,windturbine,2045,10
+8,2055,R1,windturbine,2050,1
+8,2059,R1,windturbine,2050,1
+8,2060,R1,windturbine,2050,1
+8,2064,R1,windturbine,2050,1
+8,2065,R1,windturbine,2050,1
+8,2069,R1,windturbine,2050,1
+8,2070,R1,windturbine,2050,1
+8,2074,R1,windturbine,2050,1
+8,2075,R1,windturbine,2050,1
+8,2079,R1,windturbine,2050,1

From baf1efb4798155a7ca682043296d5947f4e7968e Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 2 Jul 2024 05:53:45 +0100
Subject: [PATCH 337/419] Use Even Bettter TOML

---
 .vscode/extensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 7f428979..a76470d2 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,7 +3,7 @@
     // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
     // List of extensions which should be recommended for users of this workspace.
     "recommendations": [
-        "bungcip.better-toml",
+        "bungcip.even-better-toml",
         "janisdd.vscode-edit-csv",
         "github.vscode-pull-request-github",
         "ms-python.python",

From e3e744b4020c2816da1466af6255509632757da4 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 2 Jul 2024 05:59:53 +0100
Subject: [PATCH 338/419] Correctly use minimum service factor

---
 src/muse/constraints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index b75c08f3..ed6504fb 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -530,7 +530,7 @@ def minimum_service(
         .drop_vars("technology")
     )
     capacity = convert_timeslice(
-        techs.fixed_outputs * techs.utilization_factor * techs.minimum_service_factor,
+        techs.fixed_outputs * techs.minimum_service_factor,
         market.timeslice,
         QuantityType.EXTENSIVE,
     )

From 9456a3fc1dd12ed84a97bb75f11178b7614fc694 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 2 Jul 2024 06:20:27 +0100
Subject: [PATCH 339/419] Update documentation

---
 docs/inputs/technodata.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 65f8268d..8c37583d 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -112,7 +112,10 @@ TechnicalLife
    represents the number of years that a technology operates before it is decommissioned.
 
 UtilizationFactor
-   represents the maximum actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year. Must be between 0 and 1.
+   represents the *maximum* actual output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year. Must be between 0 and 1.
+
+MinimumServiceFactor
+   Is the *minimum* output of the technology in a year, divided by the theoretical maximum output if the technology were operating at full capacity for the whole year. Must be between 0 and 1 and be smaller or equal than the `UtilizationFactor`. It is used to define the minimum service level that a technology must provide due to, typically, technical or efficiency constraints.
 
 ScalingSize
    represents the reference capacity at which capital costs are estimated when used as agents' objective as described in :ref:`inputs-agents`.

From 73bfbad3b7fd5149d73b47e68c3dc0d5481e618d Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 11:08:54 +0100
Subject: [PATCH 340/419] Text changes in notebooks

---
 docs/running-muse-example.ipynb               |  2 +-
 docs/user-guide/add-agent.ipynb               |  6 ++---
 docs/user-guide/add-region.ipynb              |  4 ++--
 docs/user-guide/add-solar.ipynb               | 24 +++++++++----------
 .../additional-service-demand.ipynb           |  8 +++----
 docs/user-guide/modify-timing-data.ipynb      | 16 ++++++-------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index f510e42c..537cc66d 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -212,7 +212,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this toy example, we can see that the end-use technology of choice in the residential sector becomes a heatpump. The heatpump displaces the gas boiler. Therefore, the supply of gas crashes due to a reduced demand. To account for the increase in demand for electricity, the agent invests heavily in wind turbines.\n",
+    "In this toy example, we can see that the end-use technology of choice in the residential sector becomes a heatpump, which displaces the gas boiler. To account for the increase in demand for electricity, the agent invests heavily in wind turbines.\n",
     "\n",
     "Note, that the units are in petajoules (PJ). MUSE requires consistent units across each of the sectors, and each of the input files (which we will see later). The model does not make any unit conversion internally."
    ]
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index d6a713e0..f5d60326 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -44,7 +44,7 @@
     "\n",
     "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent1|Agent2|\n",
     "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|Retrofit|**Retrofit**|\n",
+    "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|New|**New**|\n",
     "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
     "|gasCCGT|R1|2040|23.78234399|1|…|gas|electricity|**0.5**|**0.5**|\n",
     "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|**0.5**|**0.5**|\n",
@@ -52,7 +52,7 @@
     "|solarPV|R1|2020|40|1|...|solar|electricity|**0.5**|**0.5**|\n",
     "|solarPV|R1|2040|30|1|...|solar|electricity|**0.5**|**0.5**|\n",
     "\n",
-    "However, remember you will have to make the same changes for the residential and gas sectors!"
+    "Remember you will have to make the same changes for the residential and gas sectors!"
    ]
   },
   {
@@ -129,7 +129,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this scenario, with both agents running the same objective, identical results between agents can be seen. There is large uptake in `windturbine`, whilst `solarPV` is invested in especially in later years where a change in the price of `solarPV` was set in the previous tutorial."
+    "In this scenario, with both agents running the same objective, identical results between agents can be seen. There is large uptake in `windturbine` early on, whilst `solarPV` is invested in especially in later years where a change in the price of `solarPV` was set in the previous tutorial."
    ]
   },
   {
diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb
index 64abe00c..290836f3 100644
--- a/docs/user-guide/add-region.ipynb
+++ b/docs/user-guide/add-region.ipynb
@@ -60,9 +60,9 @@
     "\n",
     "Again, we don't show the entries for 2040, apart from the edited windturbine row, for the sake of brevity.\n",
     "\n",
-    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
+    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
+    "|Unit|-|Year|…|PJ|%|PJ|…|New|\n",
     "|gasCCGT|R1|2020|…|2|1|60|…|1|\n",
     "|windturbine|R1|2020|…|2|1|60|…|1|\n",
     "|solarPV|R1|2020|…|2|1|60|…|1|\n",
diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb
index 519f6693..53bb6a18 100644
--- a/docs/user-guide/add-solar.ipynb
+++ b/docs/user-guide/add-solar.ipynb
@@ -83,7 +83,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Within the default folder there is the ```settings.toml``` file, input folder and technodata folder. To add a technology within the power sector, we must open the ```technodata``` folder followed by the ```power``` folder.\n",
+    "Within the default folder there is the ```settings.toml``` file, `input` folder and `technodata` folder. To add a technology within the power sector, we must open the ```technodata``` folder followed by the ```power``` folder.\n",
     "\n",
     "At this point, we must note that we require consistency in input and output units. For example, if capacity is in PJ, the same basis would be needed for the output files `CommIn.csv` and `CommOut.csv`. In addition, across sectors a commodity needs to maintain the same unit. In these examples, we use the unit petajoule (PJ).\n",
     "\n",
@@ -117,12 +117,12 @@
    "source": [
     "We repeat this process for the file: ```CommOut.csv```. This file specifies the output of the technology. In our case, solar photovoltaics only output ```electricity```. This is unlike ```gasCCGT``` which also outputs ```CO2f```, or carbon dioxide.\n",
     "\n",
-    "|ProcessName|RegionName|Time|Level|electricity|gas|heat|CO2f|wind|**solar**|\n",
-    "|-|-|-|-|-|-|-|-|-|----|\n",
-    "|Unit|-|Year|-|PJ/PJ|PJ/PJ|PJ/PJ|kt/PJ|PJ/PJ|**PJ/PJ**|\n",
-    "|gasCCGT|R1|2020|fixed|1|0|0|91.67|0|**0**|\n",
-    "|windturbine|R1|2020|fixed|1|0|0|0|0|**0**|\n",
-    "|**solarPV**|**R1**|**2020**|**fixed**|**1**|**0**|**0**|**0**|**0**|**0**|\n",
+    "|ProcessName|RegionName|Time|electricity|gas|heat|CO2f|wind|**solar**|\n",
+    "|-|-|-|-|-|-|-|-|----|\n",
+    "|Unit|-|Year|PJ/PJ|PJ/PJ|PJ/PJ|kt/PJ|PJ/PJ|**PJ/PJ**|\n",
+    "|gasCCGT|R1|2020|1|0|0|91.67|0|**0**|\n",
+    "|windturbine|R1|2020|1|0|0|0|0|**0**|\n",
+    "|**solarPV**|**R1**|**2020**|**1**|**0**|**0**|**0**|**0**|**0**|\n",
     "\n",
     "Similar to the the ```CommIn.csv```, we create a new row, and add in the solar commodity. We must ensure that we call our new commodity and technologies the same as the previous file for MUSE to successfully run. ie `solar` and `solarPV`.\n",
     "\n",
@@ -164,9 +164,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent2|\n",
+    "|ProcessName|RegionName|Time|Level|cap_par|cap_exp|…|Fuel|EndUse|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|Retrofit|\n",
+    "|Unit|-|Year|-|MUS$2010/PJ_a|-|…|-|-|New|\n",
     "|gasCCGT|R1|2020|fixed|23.78234399|1|…|gas|electricity|1|\n",
     "|windturbine|R1|2020|fixed|36.30771182|1|…|wind|electricity|1|\n",
     "|**solarPV**|**R1**|**2020**|**fixed**|**30**|**1**|...|**solar**|**electricity**|**1**"
@@ -284,7 +284,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Now we are able to run our simulation, with the new solar power technology.\n",
+    "Now we are able to run our simulation with the new solar power technology.\n",
     "\n",
     "To do this we run the same run command as previously in the command line:\n",
     "\n",
@@ -389,9 +389,9 @@
     "\n",
     "First, we will amend the `Technodata.csv` file as follows:\n",
     "\n",
-    "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent2|\n",
+    "|ProcessName|RegionName|Time|cap_par|cap_exp|…|Fuel|EndUse|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|Retrofit|\n",
+    "|Unit|-|Year|MUS$2010/PJ_a|-|…|-|-|New|\n",
     "|gasCCGT|R1|2020|23.78234399|1|…|gas|electricity|1|\n",
     "|**gasCCGT**|**R1**|**2040**|**23.78234399**|**1**|**…**|**gas**|**electricity**|**1**|\n",
     "|windturbine|R1|2020|36.30771182|1|…|wind|electricity|1|\n",
diff --git a/docs/user-guide/additional-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb
index c765c366..68512b56 100644
--- a/docs/user-guide/additional-service-demand.ipynb
+++ b/docs/user-guide/additional-service-demand.ipynb
@@ -150,9 +150,9 @@
     "\n",
     "An important modification, however, is specifying the end-use for these new technologies to be `cook` and not `heat`.\n",
     "\n",
-    "|ProcessName|RegionName|Time|Level|cap_par|…|Fuel|EndUse|Agent2|\n",
+    "|ProcessName|RegionName|Time|Level|cap_par|…|Fuel|EndUse|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|-|MUS$2010/PJ_a|…|-|-|Retrofit|\n",
+    "|Unit|-|Year|-|MUS$2010/PJ_a|…|-|-|New|\n",
     "|gasboiler|R1|2020|fixed|3.8|…|gas|heat|1|\n",
     "|...|...|...|...|...|...|...|...|...|\n",
     "|**electric_stove**|**R1**|**2020**|**fixed**|**8.8667**|**…**|**electricity**|**cook**|**1**|\n",
@@ -180,9 +180,9 @@
     "\n",
     "Due to the additional demand for electricity brought on by the new `cook` demand, it is necessary to relax the growth constraints in the `technodata/power/Technodata.csv` file. For this example, we will double all the values for `MaxCapaciyAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`, as follows:\n",
     "\n",
-    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
+    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|…|PJ|%|PJ|…|Retrofit|\n",
+    "|Unit|-|…|PJ|%|PJ|…|New|\n",
     "|gasCCGT|R1|…|**4**|**2**|**120**|…|1|\n",
     "|windturbine|R1|…|**4**|**2**|**120**|…|1|\n",
     "|solarPV|R1|…|**4**|**2**|**120**|…|1|\n",
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 35e630a2..361b507c 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -188,9 +188,9 @@
     "\n",
     "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv``` (we will double `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
     "\n",
-    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
+    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|…|PJ|%|PJ|…|Retrofit|\n",
+    "|Unit|-|…|PJ|%|PJ|…|New|\n",
     "|gasCCGT|R1|…|**4**|**2**|**120**|…|1|\n",
     "|windturbine|R1|…|**4**|**2**|**120**|…|1|\n",
     "|solarPV|R1|…|**4**|**2**|**120**|…|1|\n",
@@ -201,13 +201,13 @@
     "\n",
     "We also modify the constraints defined in the `Technodata.csv` file for the residential sector (doubling `MaxCapacityAddition` and `TotalCapacityLimit`, and tripling  `MaxCapacityGrowth`), as shown below:\n",
     "\n",
-    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent2|\n",
+    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
     "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|PJ|%|PJ|…|Retrofit|\n",
-    "|gasboiler|R1|2020|…|**20**|**0.06**|**120**|…|1|\n",
-    "|heatpump|R1|2020|…|**20**|**0.06**|**120**|…|1|\n",
-    "|gasboiler|R2|2020|…|**20**|**0.06**|**120**|…|1|\n",
-    "|heatpump|R2|2020|…|**20**|**0.06**|**120**|…|1|\n",
+    "|Unit|-|Year|…|PJ|%|PJ|…|New|\n",
+    "|gasboiler|R1|2020|…|**20**|**0.6**|**120**|…|1|\n",
+    "|heatpump|R1|2020|…|**20**|**0.6**|**120**|…|1|\n",
+    "|gasboiler|R2|2020|…|**20**|**0.6**|**120**|…|1|\n",
+    "|heatpump|R2|2020|…|**20**|**0.6**|**120**|…|1|\n",
     "\n",
     "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
     "\n",

From 3ab1cee15c1c82941ef7fa62b9c20f8eefbb827c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 11:35:36 +0100
Subject: [PATCH 341/419] Simplify model 4.2, modify text

---
 .../Results/Gas/Capacity/2025.csv             |  19 +
 .../Results/Gas/Capacity/2026.csv             |  28 +-
 .../Results/Gas/Capacity/2028.csv             |  28 +-
 .../Results/Gas/Capacity/2030.csv             |  32 +-
 .../Results/Gas/Capacity/2032.csv             |  36 +-
 .../Results/Gas/Capacity/2034.csv             |  40 +-
 .../Results/Gas/Capacity/2035.csv             |  33 +
 .../Results/Gas/Capacity/2036.csv             |  40 +-
 .../Results/Gas/Capacity/2038.csv             |  40 +-
 .../Results/Gas/Capacity/2040.csv             |  40 +-
 .../Results/Gas/Capacity/2045.csv             |  45 ++
 .../Results/Gas/Capacity/2050.csv             |  45 ++
 .../Results/MCACapacity.csv                   |  68 +-
 .../Results/MCAPrices.csv                     | 608 +++++++++---------
 .../Results/Power/Capacity/2020.csv           |  53 +-
 .../Results/Power/Capacity/2022.csv           |  86 ++-
 .../Results/Power/Capacity/2024.csv           | 123 ++--
 .../Results/Power/Capacity/2025.csv           |  37 ++
 .../Results/Power/Capacity/2026.csv           | 166 +++--
 .../Results/Power/Capacity/2028.csv           | 198 +++---
 .../Results/Power/Capacity/2030.csv           | 248 ++++---
 .../Results/Power/Capacity/2032.csv           | 300 +++++----
 .../Results/Power/Capacity/2034.csv           | 360 ++++++-----
 .../Results/Power/Capacity/2035.csv           |  67 ++
 .../Results/Power/Capacity/2036.csv           | 432 +++++++------
 .../Results/Power/Capacity/2038.csv           | 484 ++++++++------
 .../Results/Power/Capacity/2040.csv           | 576 +++++++++--------
 .../Results/Power/Capacity/2045.csv           | 125 ++++
 .../Results/Power/Capacity/2050.csv           | 125 ++++
 .../Results/Residential/Capacity/2025.csv     |  19 +
 .../Results/Residential/Capacity/2035.csv     |  35 +
 .../Results/Residential/Capacity/2045.csv     |  51 ++
 .../Results/Residential/Capacity/2050.csv     |  59 ++
 .../Results/Residential/Supply/2025.csv       | 121 ++++
 .../Results/Residential/Supply/2035.csv       |  97 +++
 .../Results/Residential/Supply/2045.csv       |  97 +++
 .../Results/Residential/Supply/2050.csv       |  97 +++
 .../technodata/power/Technodata.csv           |  24 +-
 .../technodata/residential/Technodata.csv     |   8 +-
 .../4-modify-timing-data/generate_models.py   |  22 -
 docs/user-guide/add-agent.ipynb               |   2 +-
 docs/user-guide/modify-timing-data.ipynb      |  29 +-
 42 files changed, 3316 insertions(+), 1827 deletions(-)
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 create mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv

diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
new file mode 100644
index 00000000..71e5a914
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
@@ -0,0 +1,19 @@
+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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,2.33440000000
+3,2035,R2,gassupply1,2025,2.33440000000
+3,2040,R2,gassupply1,2025,2.33440000000
+3,2045,R2,gassupply1,2025,2.33440000000
+3,2050,R2,gassupply1,2025,2.33440000000
+3,2064,R2,gassupply1,2025,2.33440000000
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 64a7e08e..81460746 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
@@ -3,21 +3,21 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gassupply1,2020,15.00000000000
 0,2028,R1,gassupply1,2020,10.50000000000
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2020,R2,gassupply1,2020,15.00000000000
 2,2025,R2,gassupply1,2020,15.00000000000
 2,2028,R2,gassupply1,2020,10.50000000000
 2,2030,R2,gassupply1,2020,7.50000000000
-3,2028,R2,gassupply1,2026,3.23460000000
-3,2030,R2,gassupply1,2026,3.23460000000
-3,2035,R2,gassupply1,2026,3.23460000000
-3,2040,R2,gassupply1,2026,3.23460000000
-3,2045,R2,gassupply1,2026,3.23460000000
-3,2050,R2,gassupply1,2026,3.23460000000
-3,2062,R2,gassupply1,2026,3.23460000000
+3,2028,R2,gassupply1,2026,3.52150000000
+3,2030,R2,gassupply1,2026,3.52150000000
+3,2035,R2,gassupply1,2026,3.52150000000
+3,2040,R2,gassupply1,2026,3.52150000000
+3,2045,R2,gassupply1,2026,3.52150000000
+3,2050,R2,gassupply1,2026,3.52150000000
+3,2062,R2,gassupply1,2026,3.52150000000
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 e2e419be..5a49d77f 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
@@ -3,13 +3,13 @@ asset,year,region,technology,installed,capacity
 0,2025,R1,gassupply1,2020,15.00000000000
 0,2028,R1,gassupply1,2020,10.50000000000
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2035,R1,gassupply1,2028,3.53600000000
 2,2040,R1,gassupply1,2028,3.53600000000
@@ -22,13 +22,13 @@ asset,year,region,technology,installed,capacity
 3,2025,R2,gassupply1,2020,15.00000000000
 3,2028,R2,gassupply1,2020,10.50000000000
 3,2030,R2,gassupply1,2020,7.50000000000
-4,2028,R2,gassupply1,2026,3.23460000000
-4,2030,R2,gassupply1,2026,3.23460000000
-4,2035,R2,gassupply1,2026,3.23460000000
-4,2040,R2,gassupply1,2026,3.23460000000
-4,2045,R2,gassupply1,2026,3.23460000000
-4,2050,R2,gassupply1,2026,3.23460000000
-4,2062,R2,gassupply1,2026,3.23460000000
+4,2028,R2,gassupply1,2026,3.52150000000
+4,2030,R2,gassupply1,2026,3.52150000000
+4,2035,R2,gassupply1,2026,3.52150000000
+4,2040,R2,gassupply1,2026,3.52150000000
+4,2045,R2,gassupply1,2026,3.52150000000
+4,2050,R2,gassupply1,2026,3.52150000000
+4,2062,R2,gassupply1,2026,3.52150000000
 5,2030,R2,gassupply1,2028,3.53600000000
 5,2035,R2,gassupply1,2028,3.53600000000
 5,2040,R2,gassupply1,2028,3.53600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index 1b8fa9c4..f62030d9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -4,14 +4,14 @@ asset,year,region,technology,installed,capacity
 0,2028,R1,gassupply1,2020,10.50000000000
 0,2030,R1,gassupply1,2020,7.50000000000
 0,2032,R1,gassupply1,2020,4.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2032,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2032,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2032,R1,gassupply1,2028,3.53600000000
 2,2035,R1,gassupply1,2028,3.53600000000
@@ -36,14 +36,14 @@ asset,year,region,technology,installed,capacity
 4,2028,R2,gassupply1,2020,10.50000000000
 4,2030,R2,gassupply1,2020,7.50000000000
 4,2032,R2,gassupply1,2020,4.50000000000
-5,2028,R2,gassupply1,2026,3.23460000000
-5,2030,R2,gassupply1,2026,3.23460000000
-5,2032,R2,gassupply1,2026,3.23460000000
-5,2035,R2,gassupply1,2026,3.23460000000
-5,2040,R2,gassupply1,2026,3.23460000000
-5,2045,R2,gassupply1,2026,3.23460000000
-5,2050,R2,gassupply1,2026,3.23460000000
-5,2062,R2,gassupply1,2026,3.23460000000
+5,2028,R2,gassupply1,2026,3.52150000000
+5,2030,R2,gassupply1,2026,3.52150000000
+5,2032,R2,gassupply1,2026,3.52150000000
+5,2035,R2,gassupply1,2026,3.52150000000
+5,2040,R2,gassupply1,2026,3.52150000000
+5,2045,R2,gassupply1,2026,3.52150000000
+5,2050,R2,gassupply1,2026,3.52150000000
+5,2062,R2,gassupply1,2026,3.52150000000
 6,2030,R2,gassupply1,2028,3.53600000000
 6,2032,R2,gassupply1,2028,3.53600000000
 6,2035,R2,gassupply1,2028,3.53600000000
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 427e21ec..e86e1f35 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
@@ -5,15 +5,15 @@ asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
 0,2032,R1,gassupply1,2020,4.50000000000
 0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2032,R1,gassupply1,2026,3.23460000000
-1,2034,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2032,R1,gassupply1,2026,3.52150000000
+1,2034,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2032,R1,gassupply1,2028,3.53600000000
 2,2034,R1,gassupply1,2028,3.53600000000
@@ -53,15 +53,15 @@ asset,year,region,technology,installed,capacity
 5,2030,R2,gassupply1,2020,7.50000000000
 5,2032,R2,gassupply1,2020,4.50000000000
 5,2034,R2,gassupply1,2020,1.50000000000
-6,2028,R2,gassupply1,2026,3.23460000000
-6,2030,R2,gassupply1,2026,3.23460000000
-6,2032,R2,gassupply1,2026,3.23460000000
-6,2034,R2,gassupply1,2026,3.23460000000
-6,2035,R2,gassupply1,2026,3.23460000000
-6,2040,R2,gassupply1,2026,3.23460000000
-6,2045,R2,gassupply1,2026,3.23460000000
-6,2050,R2,gassupply1,2026,3.23460000000
-6,2062,R2,gassupply1,2026,3.23460000000
+6,2028,R2,gassupply1,2026,3.52150000000
+6,2030,R2,gassupply1,2026,3.52150000000
+6,2032,R2,gassupply1,2026,3.52150000000
+6,2034,R2,gassupply1,2026,3.52150000000
+6,2035,R2,gassupply1,2026,3.52150000000
+6,2040,R2,gassupply1,2026,3.52150000000
+6,2045,R2,gassupply1,2026,3.52150000000
+6,2050,R2,gassupply1,2026,3.52150000000
+6,2062,R2,gassupply1,2026,3.52150000000
 7,2030,R2,gassupply1,2028,3.53600000000
 7,2032,R2,gassupply1,2028,3.53600000000
 7,2034,R2,gassupply1,2028,3.53600000000
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 5404f883..904bb24d 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
@@ -5,16 +5,16 @@ asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
 0,2032,R1,gassupply1,2020,4.50000000000
 0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2032,R1,gassupply1,2026,3.23460000000
-1,2034,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2036,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2032,R1,gassupply1,2026,3.52150000000
+1,2034,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2036,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2032,R1,gassupply1,2028,3.53600000000
 2,2034,R1,gassupply1,2028,3.53600000000
@@ -70,16 +70,16 @@ asset,year,region,technology,installed,capacity
 6,2030,R2,gassupply1,2020,7.50000000000
 6,2032,R2,gassupply1,2020,4.50000000000
 6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.23460000000
-7,2030,R2,gassupply1,2026,3.23460000000
-7,2032,R2,gassupply1,2026,3.23460000000
-7,2034,R2,gassupply1,2026,3.23460000000
-7,2035,R2,gassupply1,2026,3.23460000000
-7,2036,R2,gassupply1,2026,3.23460000000
-7,2040,R2,gassupply1,2026,3.23460000000
-7,2045,R2,gassupply1,2026,3.23460000000
-7,2050,R2,gassupply1,2026,3.23460000000
-7,2062,R2,gassupply1,2026,3.23460000000
+7,2028,R2,gassupply1,2026,3.52150000000
+7,2030,R2,gassupply1,2026,3.52150000000
+7,2032,R2,gassupply1,2026,3.52150000000
+7,2034,R2,gassupply1,2026,3.52150000000
+7,2035,R2,gassupply1,2026,3.52150000000
+7,2036,R2,gassupply1,2026,3.52150000000
+7,2040,R2,gassupply1,2026,3.52150000000
+7,2045,R2,gassupply1,2026,3.52150000000
+7,2050,R2,gassupply1,2026,3.52150000000
+7,2062,R2,gassupply1,2026,3.52150000000
 8,2030,R2,gassupply1,2028,3.53600000000
 8,2032,R2,gassupply1,2028,3.53600000000
 8,2034,R2,gassupply1,2028,3.53600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
new file mode 100644
index 00000000..00107563
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
@@ -0,0 +1,33 @@
+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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,15.00000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.33440000000
+4,2035,R2,gassupply1,2025,2.33440000000
+4,2040,R2,gassupply1,2025,2.33440000000
+4,2045,R2,gassupply1,2025,2.33440000000
+4,2050,R2,gassupply1,2025,2.33440000000
+4,2064,R2,gassupply1,2025,2.33440000000
+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/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 5404f883..904bb24d 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
@@ -5,16 +5,16 @@ asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
 0,2032,R1,gassupply1,2020,4.50000000000
 0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2032,R1,gassupply1,2026,3.23460000000
-1,2034,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2036,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2032,R1,gassupply1,2026,3.52150000000
+1,2034,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2036,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2032,R1,gassupply1,2028,3.53600000000
 2,2034,R1,gassupply1,2028,3.53600000000
@@ -70,16 +70,16 @@ asset,year,region,technology,installed,capacity
 6,2030,R2,gassupply1,2020,7.50000000000
 6,2032,R2,gassupply1,2020,4.50000000000
 6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.23460000000
-7,2030,R2,gassupply1,2026,3.23460000000
-7,2032,R2,gassupply1,2026,3.23460000000
-7,2034,R2,gassupply1,2026,3.23460000000
-7,2035,R2,gassupply1,2026,3.23460000000
-7,2036,R2,gassupply1,2026,3.23460000000
-7,2040,R2,gassupply1,2026,3.23460000000
-7,2045,R2,gassupply1,2026,3.23460000000
-7,2050,R2,gassupply1,2026,3.23460000000
-7,2062,R2,gassupply1,2026,3.23460000000
+7,2028,R2,gassupply1,2026,3.52150000000
+7,2030,R2,gassupply1,2026,3.52150000000
+7,2032,R2,gassupply1,2026,3.52150000000
+7,2034,R2,gassupply1,2026,3.52150000000
+7,2035,R2,gassupply1,2026,3.52150000000
+7,2036,R2,gassupply1,2026,3.52150000000
+7,2040,R2,gassupply1,2026,3.52150000000
+7,2045,R2,gassupply1,2026,3.52150000000
+7,2050,R2,gassupply1,2026,3.52150000000
+7,2062,R2,gassupply1,2026,3.52150000000
 8,2030,R2,gassupply1,2028,3.53600000000
 8,2032,R2,gassupply1,2028,3.53600000000
 8,2034,R2,gassupply1,2028,3.53600000000
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 5404f883..904bb24d 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
@@ -5,16 +5,16 @@ asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
 0,2032,R1,gassupply1,2020,4.50000000000
 0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2032,R1,gassupply1,2026,3.23460000000
-1,2034,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2036,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2032,R1,gassupply1,2026,3.52150000000
+1,2034,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2036,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2032,R1,gassupply1,2028,3.53600000000
 2,2034,R1,gassupply1,2028,3.53600000000
@@ -70,16 +70,16 @@ asset,year,region,technology,installed,capacity
 6,2030,R2,gassupply1,2020,7.50000000000
 6,2032,R2,gassupply1,2020,4.50000000000
 6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.23460000000
-7,2030,R2,gassupply1,2026,3.23460000000
-7,2032,R2,gassupply1,2026,3.23460000000
-7,2034,R2,gassupply1,2026,3.23460000000
-7,2035,R2,gassupply1,2026,3.23460000000
-7,2036,R2,gassupply1,2026,3.23460000000
-7,2040,R2,gassupply1,2026,3.23460000000
-7,2045,R2,gassupply1,2026,3.23460000000
-7,2050,R2,gassupply1,2026,3.23460000000
-7,2062,R2,gassupply1,2026,3.23460000000
+7,2028,R2,gassupply1,2026,3.52150000000
+7,2030,R2,gassupply1,2026,3.52150000000
+7,2032,R2,gassupply1,2026,3.52150000000
+7,2034,R2,gassupply1,2026,3.52150000000
+7,2035,R2,gassupply1,2026,3.52150000000
+7,2036,R2,gassupply1,2026,3.52150000000
+7,2040,R2,gassupply1,2026,3.52150000000
+7,2045,R2,gassupply1,2026,3.52150000000
+7,2050,R2,gassupply1,2026,3.52150000000
+7,2062,R2,gassupply1,2026,3.52150000000
 8,2030,R2,gassupply1,2028,3.53600000000
 8,2032,R2,gassupply1,2028,3.53600000000
 8,2034,R2,gassupply1,2028,3.53600000000
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 5404f883..904bb24d 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
@@ -5,16 +5,16 @@ asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
 0,2032,R1,gassupply1,2020,4.50000000000
 0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.23460000000
-1,2030,R1,gassupply1,2026,3.23460000000
-1,2032,R1,gassupply1,2026,3.23460000000
-1,2034,R1,gassupply1,2026,3.23460000000
-1,2035,R1,gassupply1,2026,3.23460000000
-1,2036,R1,gassupply1,2026,3.23460000000
-1,2040,R1,gassupply1,2026,3.23460000000
-1,2045,R1,gassupply1,2026,3.23460000000
-1,2050,R1,gassupply1,2026,3.23460000000
-1,2062,R1,gassupply1,2026,3.23460000000
+1,2028,R1,gassupply1,2026,3.52150000000
+1,2030,R1,gassupply1,2026,3.52150000000
+1,2032,R1,gassupply1,2026,3.52150000000
+1,2034,R1,gassupply1,2026,3.52150000000
+1,2035,R1,gassupply1,2026,3.52150000000
+1,2036,R1,gassupply1,2026,3.52150000000
+1,2040,R1,gassupply1,2026,3.52150000000
+1,2045,R1,gassupply1,2026,3.52150000000
+1,2050,R1,gassupply1,2026,3.52150000000
+1,2062,R1,gassupply1,2026,3.52150000000
 2,2030,R1,gassupply1,2028,3.53600000000
 2,2032,R1,gassupply1,2028,3.53600000000
 2,2034,R1,gassupply1,2028,3.53600000000
@@ -70,16 +70,16 @@ asset,year,region,technology,installed,capacity
 6,2030,R2,gassupply1,2020,7.50000000000
 6,2032,R2,gassupply1,2020,4.50000000000
 6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.23460000000
-7,2030,R2,gassupply1,2026,3.23460000000
-7,2032,R2,gassupply1,2026,3.23460000000
-7,2034,R2,gassupply1,2026,3.23460000000
-7,2035,R2,gassupply1,2026,3.23460000000
-7,2036,R2,gassupply1,2026,3.23460000000
-7,2040,R2,gassupply1,2026,3.23460000000
-7,2045,R2,gassupply1,2026,3.23460000000
-7,2050,R2,gassupply1,2026,3.23460000000
-7,2062,R2,gassupply1,2026,3.23460000000
+7,2028,R2,gassupply1,2026,3.52150000000
+7,2030,R2,gassupply1,2026,3.52150000000
+7,2032,R2,gassupply1,2026,3.52150000000
+7,2034,R2,gassupply1,2026,3.52150000000
+7,2035,R2,gassupply1,2026,3.52150000000
+7,2036,R2,gassupply1,2026,3.52150000000
+7,2040,R2,gassupply1,2026,3.52150000000
+7,2045,R2,gassupply1,2026,3.52150000000
+7,2050,R2,gassupply1,2026,3.52150000000
+7,2062,R2,gassupply1,2026,3.52150000000
 8,2030,R2,gassupply1,2028,3.53600000000
 8,2032,R2,gassupply1,2028,3.53600000000
 8,2034,R2,gassupply1,2028,3.53600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
new file mode 100644
index 00000000..a585b562
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
@@ -0,0 +1,45 @@
+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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2050,R1,gassupply1,2045,1.02060000000
+3,2064,R1,gassupply1,2045,1.02060000000
+3,2065,R1,gassupply1,2045,1.02060000000
+3,2069,R1,gassupply1,2045,1.02060000000
+3,2070,R1,gassupply1,2045,1.02060000000
+3,2084,R1,gassupply1,2045,1.02060000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,2.33440000000
+5,2035,R2,gassupply1,2025,2.33440000000
+5,2040,R2,gassupply1,2025,2.33440000000
+5,2045,R2,gassupply1,2025,2.33440000000
+5,2050,R2,gassupply1,2025,2.33440000000
+5,2064,R2,gassupply1,2025,2.33440000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,1.02060000000
+7,2064,R2,gassupply1,2045,1.02060000000
+7,2065,R2,gassupply1,2045,1.02060000000
+7,2069,R2,gassupply1,2045,1.02060000000
+7,2070,R2,gassupply1,2045,1.02060000000
+7,2084,R2,gassupply1,2045,1.02060000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
new file mode 100644
index 00000000..a585b562
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
@@ -0,0 +1,45 @@
+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,2030,R1,gassupply1,2025,2.33440000000
+1,2035,R1,gassupply1,2025,2.33440000000
+1,2040,R1,gassupply1,2025,2.33440000000
+1,2045,R1,gassupply1,2025,2.33440000000
+1,2050,R1,gassupply1,2025,2.33440000000
+1,2064,R1,gassupply1,2025,2.33440000000
+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,2050,R1,gassupply1,2045,1.02060000000
+3,2064,R1,gassupply1,2045,1.02060000000
+3,2065,R1,gassupply1,2045,1.02060000000
+3,2069,R1,gassupply1,2045,1.02060000000
+3,2070,R1,gassupply1,2045,1.02060000000
+3,2084,R1,gassupply1,2045,1.02060000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,15.00000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2030,R2,gassupply1,2025,2.33440000000
+5,2035,R2,gassupply1,2025,2.33440000000
+5,2040,R2,gassupply1,2025,2.33440000000
+5,2045,R2,gassupply1,2025,2.33440000000
+5,2050,R2,gassupply1,2025,2.33440000000
+5,2064,R2,gassupply1,2025,2.33440000000
+6,2035,R2,gassupply1,2030,7.50000000000
+6,2040,R2,gassupply1,2030,7.50000000000
+6,2045,R2,gassupply1,2030,7.50000000000
+6,2050,R2,gassupply1,2030,7.50000000000
+6,2064,R2,gassupply1,2030,7.50000000000
+6,2065,R2,gassupply1,2030,7.50000000000
+6,2069,R2,gassupply1,2030,7.50000000000
+7,2050,R2,gassupply1,2045,1.02060000000
+7,2064,R2,gassupply1,2045,1.02060000000
+7,2065,R2,gassupply1,2045,1.02060000000
+7,2069,R2,gassupply1,2045,1.02060000000
+7,2070,R2,gassupply1,2045,1.02060000000
+7,2084,R2,gassupply1,2045,1.02060000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 34b40e3e..3ea7214c 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -9,8 +9,9 @@ gasboiler,R1,R1,A1,residential,newcapa,2022,8.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2022,11.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2022,8.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2022,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2022,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2022,8.77320000000
+gasCCGT,R1,R1,A1,power,newcapa,2022,1.34360000000
+solarPV,R1,R1,A1,power,newcapa,2022,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2022,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2022,1.00000000000
 windturbine,R2,R2,A1,power,newcapa,2022,8.77320000000
 gasboiler,R1,R1,A1,residential,newcapa,2024,6.00000000000
@@ -19,9 +20,10 @@ heatpump,R1,R1,A1,residential,newcapa,2024,4.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2024,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2024,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2024,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2024,1.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2024,1.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2024,1.85640000000
-windturbine,R1,R1,A1,power,newcapa,2024,8.77320000000
+solarPV,R1,R1,A1,power,newcapa,2024,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2024,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2024,1.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2024,1.85640000000
 windturbine,R2,R2,A1,power,newcapa,2024,8.77320000000
@@ -33,10 +35,11 @@ gasboiler,R2,R2,A1,residential,newcapa,2026,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,0.80000000000
+gasCCGT,R1,R1,A1,power,newcapa,2026,1.14360000000
 gasCCGT,R1,R1,A1,power,newcapa,2026,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2026,2.07980000000
-windturbine,R1,R1,A1,power,newcapa,2026,8.77320000000
+solarPV,R1,R1,A1,power,newcapa,2026,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2026,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2026,0.80000000000
 gasCCGT,R2,R2,A1,power,newcapa,2026,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2026,2.07980000000
@@ -51,20 +54,21 @@ heatpump,R2,R2,A1,residential,newcapa,2028,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,0.40000000000
+gasCCGT,R1,R1,A1,power,newcapa,2028,0.74360000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,2.29760000000
-windturbine,R1,R1,A1,power,newcapa,2028,8.77320000000
+solarPV,R1,R1,A1,power,newcapa,2028,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2028,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,0.40000000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,2.29760000000
 windturbine,R2,R2,A1,power,newcapa,2028,8.77320000000
 gassupply1,R1,R1,A1,gas,newcapa,2028,10.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,3.52150000000
 gassupply1,R2,R2,A1,gas,newcapa,2028,10.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,3.52150000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
@@ -75,21 +79,23 @@ heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,5.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,0.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,2.31150000000
-windturbine,R1,R1,A1,power,newcapa,2030,8.77320000000
+solarPV,R1,R1,A1,power,newcapa,2030,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,2.29760000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,2.31150000000
 windturbine,R2,R2,A1,power,newcapa,2030,8.77320000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,3.52150000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,3.52150000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,3.53600000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
@@ -101,12 +107,14 @@ heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,13.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,0.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,0.99560000000
-windturbine,R1,R1,A1,power,newcapa,2032,8.77320000000
+solarPV,R1,R1,A1,power,newcapa,2032,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2032,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,2.29760000000
@@ -114,11 +122,11 @@ gasCCGT,R2,R2,A1,power,newcapa,2032,2.31150000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,0.99560000000
 windturbine,R2,R2,A1,power,newcapa,2032,8.77320000000
 gassupply1,R1,R1,A1,gas,newcapa,2032,4.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,3.52150000000
 gassupply1,R1,R1,A1,gas,newcapa,2032,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2032,4.66260000000
 gassupply1,R2,R2,A1,gas,newcapa,2032,4.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,3.52150000000
 gassupply1,R2,R2,A1,gas,newcapa,2032,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2032,4.66260000000
 heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
@@ -131,13 +139,15 @@ heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,0.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,0.99560000000
+solarPV,R1,R1,A1,power,newcapa,2034,4.00000000000
 solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2034,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2034,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,2.29760000000
@@ -146,12 +156,12 @@ gasCCGT,R2,R2,A1,power,newcapa,2034,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2034,8.77320000000
 gassupply1,R1,R1,A1,gas,newcapa,2034,1.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,3.52150000000
 gassupply1,R1,R1,A1,gas,newcapa,2034,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2034,4.66260000000
 gassupply1,R1,R1,A1,gas,newcapa,2034,3.00000000000
 gassupply1,R2,R2,A1,gas,newcapa,2034,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,3.52150000000
 gassupply1,R2,R2,A1,gas,newcapa,2034,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2034,4.66260000000
 gassupply1,R2,R2,A1,gas,newcapa,2034,3.00000000000
@@ -165,14 +175,16 @@ heatpump,R2,R2,A1,residential,newcapa,2036,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,0.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,0.99560000000
+solarPV,R1,R1,A1,power,newcapa,2036,4.00000000000
 solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2036,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2036,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,2.29760000000
@@ -181,12 +193,12 @@ gasCCGT,R2,R2,A1,power,newcapa,2036,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2036,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,3.52150000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,4.66260000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,3.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,3.52150000000
 gassupply1,R2,R2,A1,gas,newcapa,2036,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2036,4.66260000000
 gassupply1,R2,R2,A1,gas,newcapa,2036,3.00000000000
@@ -201,15 +213,17 @@ heatpump,R2,R2,A1,residential,newcapa,2038,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,0.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,0.99560000000
+solarPV,R1,R1,A1,power,newcapa,2038,4.00000000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2038,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2038,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2038,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2038,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2038,2.29760000000
@@ -229,16 +243,18 @@ heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,0.34360000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,0.99560000000
+solarPV,R1,R1,A1,power,newcapa,2040,4.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2040,8.77320000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,2.29760000000
@@ -249,12 +265,12 @@ solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 windturbine,R2,R2,A1,power,newcapa,2040,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.23460000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,3.52150000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,4.66260000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,3.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.23460000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,3.52150000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,4.66260000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,3.00000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 93d4bc92..97cf6a87 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.39440000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,0.39440000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,0.44830000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,0.44830000000,2022
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2022
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2022
 "('all-year', 'all-week', 'night')",heat,R1,0.81010000000,2022
 "('all-year', 'all-week', 'night')",heat,R2,0.81010000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,0.56340000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56340000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64040000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,0.64040000000,2022
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2022
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2022
 "('all-year', 'all-week', 'morning')",heat,R1,1.15730000000,2022
 "('all-year', 'all-week', 'morning')",heat,R2,1.15730000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.39440000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.39440000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44830000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44830000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.81010000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.81010000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56340000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56340000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64040000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64040000000,2022
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2022
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2022
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.15730000000,2022
 "('all-year', 'all-week', 'early-peak')",heat,R2,1.15730000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18320000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.18320000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34490000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34490000000,2022
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2022
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2022
 "('all-year', 'all-week', 'late-peak')",heat,R1,2.43040000000,2022
 "('all-year', 'all-week', 'late-peak')",heat,R2,2.43040000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,0.78880000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,0.78880000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,0.89660000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,0.89660000000,2022
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2022
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2022
 "('all-year', 'all-week', 'evening')",heat,R1,1.62020000000,2022
 "('all-year', 'all-week', 'evening')",heat,R2,1.62020000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.78880000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.78880000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89660000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89660000000,2022
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2022
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2022
 "('all-year', 'all-week', 'early-morning')",heat,R1,1.62020000000,2022
 "('all-year', 'all-week', 'early-morning')",heat,R2,1.62020000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.78880000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.78880000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89660000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89660000000,2022
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2022
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2022
 "('all-year', 'all-week', 'late-afternoon')",heat,R1,1.62020000000,2022
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,1.62020000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.37900000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.37900000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,0.39760000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,0.39760000000,2024
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2024
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,0.17000000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,0.17000000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,0.17110000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,0.17110000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.54220000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.54220000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,0.56880000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,0.56880000000,2024
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2024
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,0.24820000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,0.24820000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,0.25050000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,0.25050000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.37900000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.37900000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.39760000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.39760000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17000000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17000000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17110000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17110000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.54220000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.54220000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56880000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56880000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24820000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.24820000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.25050000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.25050000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.14480000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.14480000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.20100000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.20100000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56240000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.56240000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.57240000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.57240000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,0.76060000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,0.76060000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,0.79790000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,0.79790000000,2024
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2024
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,0.35740000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,0.35740000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,0.36190000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,0.36190000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.76060000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.76060000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.79790000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.79790000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.35740000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.35740000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.36190000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.36190000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.76060000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.76060000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.79790000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.79790000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.35740000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.35740000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.36190000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.36190000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.51840000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.51840000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,0.53490000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,0.53490000000,2026
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2026
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.12460000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.12460000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,0.12510000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,0.12510000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,0.74160000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,0.74160000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,0.76520000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,0.76520000000,2026
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2026
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.18390000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.18390000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,0.18480000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,0.18480000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.51840000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.51840000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.53490000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.53490000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.12460000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.12460000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.12510000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.12510000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74160000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.74160000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.76520000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.76520000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18390000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.18390000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.18480000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.18480000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.56540000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.56540000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.61520000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.61520000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43100000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43100000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.43500000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.43500000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,1.04020000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,1.04020000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,1.07330000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,1.07330000000,2026
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2026
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.26820000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.26820000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,0.27000000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,0.27000000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.04020000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.04020000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.07330000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.07330000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.26820000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.26820000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.27000000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.27000000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.04020000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.04020000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.07330000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.07330000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.26820000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.26820000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.27000000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.27000000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.64350000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.64350000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,0.65860000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,0.65860000000,2028
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2028
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.07950000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.07950000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,0.07990000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,0.07990000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,0.92040000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,0.92040000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94210000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,0.94210000000,2028
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2028
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.12210000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.12210000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,0.12300000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,0.12300000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.64350000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.64350000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.65860000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.65860000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07950000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07950000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07990000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07990000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.92040000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.92040000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94210000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94210000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12210000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12210000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12300000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.12300000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.94210000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.94210000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98770000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.98770000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32290000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.32290000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.32690000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.32690000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,1.29080000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,1.29080000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,1.32110000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,1.32110000000,2028
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2028
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.18700000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.18700000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,0.18880000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,0.18880000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.29080000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.29080000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.32110000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.32110000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18700000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18700000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18880000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18880000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.29080000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.29080000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.32110000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.32110000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18700000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18700000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18880000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18880000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.76050000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.76050000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.77470000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.77470000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03160000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.03160000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.03200000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.03200000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.08780000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.08780000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.10800000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.10800000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.05660000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.05660000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.05740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.05740000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.76050000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.76050000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.77470000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.77470000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03160000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03160000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03200000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03200000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.08780000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.08780000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10800000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.10800000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05660000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05660000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.05740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.05740000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.29430000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.29430000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.33690000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.33690000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.20720000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.20720000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.21120000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.21120000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.52530000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.52530000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.55360000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.55360000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.10060000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.10060000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.10230000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.10230000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.52530000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.52530000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.55360000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.55360000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10060000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10060000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.10230000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.10230000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.52530000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.52530000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.55360000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.55360000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10060000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10060000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10230000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10230000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.89190000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.89190000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,0.90700000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,0.90700000000,2032
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2032
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.03500000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.03500000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,0.03540000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,0.03540000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,1.27550000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,1.27550000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,1.29700000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,1.29700000000,2032
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2032
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.06350000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.06350000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,0.06430000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,0.06430000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.89190000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.89190000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.90700000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.90700000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03500000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03500000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03540000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03540000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27550000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27550000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.29700000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.29700000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06350000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06350000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.06430000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.06430000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.68880000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.68880000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.73420000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.73420000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23770000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23770000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.24140000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.24140000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,1.78820000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,1.78820000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,1.81840000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,1.81840000000,2032
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2032
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.11410000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.11410000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,0.11570000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,0.11570000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.78820000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.78820000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.81840000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.81840000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11410000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11410000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.11570000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.11570000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.78820000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.78820000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.81840000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.81840000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11410000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11410000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11570000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11570000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.93740000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.93740000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,0.95330000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,0.95330000000,2034
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2034
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.03880000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.03880000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,0.03920000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,0.03920000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.34050000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.34050000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,1.36310000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,1.36310000000,2034
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2034
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.07120000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.07120000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,0.07210000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,0.07210000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.93740000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.93740000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.95330000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.95330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03880000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03880000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03920000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03920000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.34050000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.34050000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.36310000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.36310000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07120000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07120000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07210000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07210000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.82460000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.82460000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.87230000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.87230000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27190000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27190000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27580000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27580000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,1.87900000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,1.87900000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,1.91070000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,1.91070000000,2034
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2034
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.12930000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.12930000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,0.13100000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,0.13100000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.87900000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.87900000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.91070000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.91070000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.12930000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.12930000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.13100000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.13100000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.87900000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.87900000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.91070000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.91070000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.12930000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.12930000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13100000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13100000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.97700000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.97700000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,0.99350000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,0.99350000000,2036
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2036
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.04010000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.04010000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.04050000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.04050000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,1.39680000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,1.39680000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,1.42040000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,1.42040000000,2036
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2036
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.07390000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.07390000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.07480000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.07480000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.97700000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.97700000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.99350000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.99350000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04010000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04010000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04050000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04050000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39680000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.39680000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.42040000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.42040000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07390000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07390000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07480000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07480000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.94230000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.94230000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.99200000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.99200000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28370000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28370000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28780000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.28780000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,1.95770000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,1.95770000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,1.99080000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,1.99080000000,2036
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2036
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.13450000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.13450000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.13630000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.13630000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.95770000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.95770000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.99080000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.99080000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13450000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13450000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.13630000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.13630000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.95770000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.95770000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.99080000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.99080000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13450000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13450000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13630000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13630000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,1.01150000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,1.01150000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,1.02860000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,1.02860000000,2038
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2038
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.04120000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.04120000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.04170000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.04170000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.44610000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.44610000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,1.47060000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,1.47060000000,2038
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2038
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.07620000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.07620000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.07720000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.07720000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.01150000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.01150000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.02860000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.02860000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04120000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04120000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04170000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04170000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.44610000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.44610000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47060000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.47060000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07620000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07620000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07720000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07720000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.04530000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.04530000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09680000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.09680000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.29380000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.29380000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.29820000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.29820000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,2.02660000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,2.02660000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,2.06090000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,2.06090000000,2038
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2038
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.13910000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.13910000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.14100000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.14100000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.02660000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.02660000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.06090000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.06090000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13910000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13910000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.14100000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.14100000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.02660000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.02660000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.06090000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.06090000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13910000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13910000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14100000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14100000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,1.04200000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.04200000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.05960000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,1.05960000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04220000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.04220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.04270000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.04270000000,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,1.48960000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.48960000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.51480000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.51480000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.07820000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.07820000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.07920000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.07920000000,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', 'mid-afternoon')",electricity,R1,1.04200000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.04200000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.05960000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.05960000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04220000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04220000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04270000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04270000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.48960000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.48960000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.51480000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.51480000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07820000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07820000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07920000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07920000000,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,3.13610000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.13610000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.18920000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.18920000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30280000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30280000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30720000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.30720000000,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,2.08740000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,2.08740000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.12270000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,2.12270000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.14300000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.14300000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.14500000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.14500000000,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', 'early-morning')",electricity,R1,2.08740000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.08740000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.12270000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.12270000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14300000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14300000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.14500000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.14500000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.08740000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.08740000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.12270000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.12270000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14300000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14300000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14500000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14500000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 a483cb37..1ec7ed69 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,21 +1,36 @@
 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,windturbine,2020,8.77320000000
-1,2025,R1,windturbine,2020,8.77320000000
-1,2030,R1,windturbine,2020,8.77320000000
-1,2035,R1,windturbine,2020,8.77320000000
-1,2040,R1,windturbine,2020,8.77320000000
-1,2045,R1,windturbine,2020,8.77320000000
-1,2046,R1,windturbine,2020,8.77320000000
-2,2020,R2,gasCCGT,2020,1.00000000000
-2,2022,R2,gasCCGT,2020,1.00000000000
-2,2025,R2,gasCCGT,2020,1.00000000000
-3,2022,R2,windturbine,2020,8.77320000000
-3,2025,R2,windturbine,2020,8.77320000000
-3,2030,R2,windturbine,2020,8.77320000000
-3,2035,R2,windturbine,2020,8.77320000000
-3,2040,R2,windturbine,2020,8.77320000000
-3,2045,R2,windturbine,2020,8.77320000000
-3,2046,R2,windturbine,2020,8.77320000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
+1,2022,R1,solarPV,2020,4.00000000000
+1,2025,R1,solarPV,2020,4.00000000000
+1,2030,R1,solarPV,2020,4.00000000000
+1,2035,R1,solarPV,2020,4.00000000000
+1,2040,R1,solarPV,2020,4.00000000000
+1,2045,R1,solarPV,2020,4.00000000000
+1,2046,R1,solarPV,2020,4.00000000000
+2,2022,R1,windturbine,2020,4.00000000000
+2,2025,R1,windturbine,2020,4.00000000000
+2,2030,R1,windturbine,2020,4.00000000000
+2,2035,R1,windturbine,2020,4.00000000000
+2,2040,R1,windturbine,2020,4.00000000000
+2,2045,R1,windturbine,2020,4.00000000000
+2,2046,R1,windturbine,2020,4.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,8.77320000000
+4,2025,R2,windturbine,2020,8.77320000000
+4,2030,R2,windturbine,2020,8.77320000000
+4,2035,R2,windturbine,2020,8.77320000000
+4,2040,R2,windturbine,2020,8.77320000000
+4,2045,R2,windturbine,2020,8.77320000000
+4,2046,R2,windturbine,2020,8.77320000000
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 f6415404..3f3404b9 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,8 +1,16 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2030,R1,gasCCGT,2022,1.85640000000
@@ -12,34 +20,46 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
-2,2022,R1,windturbine,2020,8.77320000000
-2,2024,R1,windturbine,2020,8.77320000000
-2,2025,R1,windturbine,2020,8.77320000000
-2,2030,R1,windturbine,2020,8.77320000000
-2,2035,R1,windturbine,2020,8.77320000000
-2,2040,R1,windturbine,2020,8.77320000000
-2,2045,R1,windturbine,2020,8.77320000000
-2,2046,R1,windturbine,2020,8.77320000000
-3,2020,R2,gasCCGT,2020,1.00000000000
-3,2022,R2,gasCCGT,2020,1.00000000000
-3,2024,R2,gasCCGT,2020,1.00000000000
-3,2025,R2,gasCCGT,2020,1.00000000000
-4,2024,R2,gasCCGT,2022,1.85640000000
-4,2025,R2,gasCCGT,2022,1.85640000000
-4,2030,R2,gasCCGT,2022,1.85640000000
-4,2035,R2,gasCCGT,2022,1.85640000000
-4,2040,R2,gasCCGT,2022,1.85640000000
-4,2045,R2,gasCCGT,2022,1.85640000000
-4,2046,R2,gasCCGT,2022,1.85640000000
-4,2047,R2,gasCCGT,2022,1.85640000000
-4,2050,R2,gasCCGT,2022,1.85640000000
-4,2058,R2,gasCCGT,2022,1.85640000000
-5,2022,R2,windturbine,2020,8.77320000000
-5,2024,R2,windturbine,2020,8.77320000000
-5,2025,R2,windturbine,2020,8.77320000000
-5,2030,R2,windturbine,2020,8.77320000000
-5,2035,R2,windturbine,2020,8.77320000000
-5,2040,R2,windturbine,2020,8.77320000000
-5,2045,R2,windturbine,2020,8.77320000000
-5,2046,R2,windturbine,2020,8.77320000000
+2,2022,R1,solarPV,2020,4.00000000000
+2,2024,R1,solarPV,2020,4.00000000000
+2,2025,R1,solarPV,2020,4.00000000000
+2,2030,R1,solarPV,2020,4.00000000000
+2,2035,R1,solarPV,2020,4.00000000000
+2,2040,R1,solarPV,2020,4.00000000000
+2,2045,R1,solarPV,2020,4.00000000000
+2,2046,R1,solarPV,2020,4.00000000000
+3,2022,R1,windturbine,2020,4.00000000000
+3,2024,R1,windturbine,2020,4.00000000000
+3,2025,R1,windturbine,2020,4.00000000000
+3,2030,R1,windturbine,2020,4.00000000000
+3,2035,R1,windturbine,2020,4.00000000000
+3,2040,R1,windturbine,2020,4.00000000000
+3,2045,R1,windturbine,2020,4.00000000000
+3,2046,R1,windturbine,2020,4.00000000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2022,R2,gasCCGT,2020,1.00000000000
+4,2024,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+5,2024,R2,gasCCGT,2022,1.85640000000
+5,2025,R2,gasCCGT,2022,1.85640000000
+5,2030,R2,gasCCGT,2022,1.85640000000
+5,2035,R2,gasCCGT,2022,1.85640000000
+5,2040,R2,gasCCGT,2022,1.85640000000
+5,2045,R2,gasCCGT,2022,1.85640000000
+5,2046,R2,gasCCGT,2022,1.85640000000
+5,2047,R2,gasCCGT,2022,1.85640000000
+5,2050,R2,gasCCGT,2022,1.85640000000
+5,2056,R2,gasCCGT,2022,1.85640000000
+5,2057,R2,gasCCGT,2022,1.85640000000
+5,2058,R2,gasCCGT,2022,1.85640000000
+6,2022,R2,windturbine,2020,8.77320000000
+6,2024,R2,windturbine,2020,8.77320000000
+6,2025,R2,windturbine,2020,8.77320000000
+6,2030,R2,windturbine,2020,8.77320000000
+6,2035,R2,windturbine,2020,8.77320000000
+6,2040,R2,windturbine,2020,8.77320000000
+6,2045,R2,windturbine,2020,8.77320000000
+6,2046,R2,windturbine,2020,8.77320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index 10657260..0c12ad7e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -1,9 +1,17 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -14,6 +22,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2030,R1,gasCCGT,2024,2.07980000000
@@ -23,51 +33,66 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
-3,2022,R1,windturbine,2020,8.77320000000
-3,2024,R1,windturbine,2020,8.77320000000
-3,2025,R1,windturbine,2020,8.77320000000
-3,2026,R1,windturbine,2020,8.77320000000
-3,2030,R1,windturbine,2020,8.77320000000
-3,2035,R1,windturbine,2020,8.77320000000
-3,2040,R1,windturbine,2020,8.77320000000
-3,2045,R1,windturbine,2020,8.77320000000
-3,2046,R1,windturbine,2020,8.77320000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2022,R2,gasCCGT,2020,1.00000000000
-4,2024,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
-4,2026,R2,gasCCGT,2020,0.80000000000
-5,2024,R2,gasCCGT,2022,1.85640000000
-5,2025,R2,gasCCGT,2022,1.85640000000
-5,2026,R2,gasCCGT,2022,1.85640000000
-5,2030,R2,gasCCGT,2022,1.85640000000
-5,2035,R2,gasCCGT,2022,1.85640000000
-5,2040,R2,gasCCGT,2022,1.85640000000
-5,2045,R2,gasCCGT,2022,1.85640000000
-5,2046,R2,gasCCGT,2022,1.85640000000
-5,2047,R2,gasCCGT,2022,1.85640000000
-5,2050,R2,gasCCGT,2022,1.85640000000
-5,2058,R2,gasCCGT,2022,1.85640000000
-6,2026,R2,gasCCGT,2024,2.07980000000
-6,2030,R2,gasCCGT,2024,2.07980000000
-6,2035,R2,gasCCGT,2024,2.07980000000
-6,2040,R2,gasCCGT,2024,2.07980000000
-6,2045,R2,gasCCGT,2024,2.07980000000
-6,2046,R2,gasCCGT,2024,2.07980000000
-6,2047,R2,gasCCGT,2024,2.07980000000
-6,2050,R2,gasCCGT,2024,2.07980000000
-6,2058,R2,gasCCGT,2024,2.07980000000
-6,2059,R2,gasCCGT,2024,2.07980000000
-6,2060,R2,gasCCGT,2024,2.07980000000
-7,2022,R2,windturbine,2020,8.77320000000
-7,2024,R2,windturbine,2020,8.77320000000
-7,2025,R2,windturbine,2020,8.77320000000
-7,2026,R2,windturbine,2020,8.77320000000
-7,2030,R2,windturbine,2020,8.77320000000
-7,2035,R2,windturbine,2020,8.77320000000
-7,2040,R2,windturbine,2020,8.77320000000
-7,2045,R2,windturbine,2020,8.77320000000
-7,2046,R2,windturbine,2020,8.77320000000
+3,2022,R1,solarPV,2020,4.00000000000
+3,2024,R1,solarPV,2020,4.00000000000
+3,2025,R1,solarPV,2020,4.00000000000
+3,2026,R1,solarPV,2020,4.00000000000
+3,2030,R1,solarPV,2020,4.00000000000
+3,2035,R1,solarPV,2020,4.00000000000
+3,2040,R1,solarPV,2020,4.00000000000
+3,2045,R1,solarPV,2020,4.00000000000
+3,2046,R1,solarPV,2020,4.00000000000
+4,2022,R1,windturbine,2020,4.00000000000
+4,2024,R1,windturbine,2020,4.00000000000
+4,2025,R1,windturbine,2020,4.00000000000
+4,2026,R1,windturbine,2020,4.00000000000
+4,2030,R1,windturbine,2020,4.00000000000
+4,2035,R1,windturbine,2020,4.00000000000
+4,2040,R1,windturbine,2020,4.00000000000
+4,2045,R1,windturbine,2020,4.00000000000
+4,2046,R1,windturbine,2020,4.00000000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2022,R2,gasCCGT,2020,1.00000000000
+5,2024,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+5,2026,R2,gasCCGT,2020,0.80000000000
+6,2024,R2,gasCCGT,2022,1.85640000000
+6,2025,R2,gasCCGT,2022,1.85640000000
+6,2026,R2,gasCCGT,2022,1.85640000000
+6,2030,R2,gasCCGT,2022,1.85640000000
+6,2035,R2,gasCCGT,2022,1.85640000000
+6,2040,R2,gasCCGT,2022,1.85640000000
+6,2045,R2,gasCCGT,2022,1.85640000000
+6,2046,R2,gasCCGT,2022,1.85640000000
+6,2047,R2,gasCCGT,2022,1.85640000000
+6,2050,R2,gasCCGT,2022,1.85640000000
+6,2056,R2,gasCCGT,2022,1.85640000000
+6,2057,R2,gasCCGT,2022,1.85640000000
+6,2058,R2,gasCCGT,2022,1.85640000000
+7,2026,R2,gasCCGT,2024,2.07980000000
+7,2030,R2,gasCCGT,2024,2.07980000000
+7,2035,R2,gasCCGT,2024,2.07980000000
+7,2040,R2,gasCCGT,2024,2.07980000000
+7,2045,R2,gasCCGT,2024,2.07980000000
+7,2046,R2,gasCCGT,2024,2.07980000000
+7,2047,R2,gasCCGT,2024,2.07980000000
+7,2050,R2,gasCCGT,2024,2.07980000000
+7,2056,R2,gasCCGT,2024,2.07980000000
+7,2057,R2,gasCCGT,2024,2.07980000000
+7,2058,R2,gasCCGT,2024,2.07980000000
+7,2059,R2,gasCCGT,2024,2.07980000000
+7,2060,R2,gasCCGT,2024,2.07980000000
+8,2022,R2,windturbine,2020,8.77320000000
+8,2024,R2,windturbine,2020,8.77320000000
+8,2025,R2,windturbine,2020,8.77320000000
+8,2026,R2,windturbine,2020,8.77320000000
+8,2030,R2,windturbine,2020,8.77320000000
+8,2035,R2,windturbine,2020,8.77320000000
+8,2040,R2,windturbine,2020,8.77320000000
+8,2045,R2,windturbine,2020,8.77320000000
+8,2046,R2,windturbine,2020,8.77320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
new file mode 100644
index 00000000..fedff132
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
@@ -0,0 +1,37 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2025,R1,windturbine,2020,10.00000000000
+3,2030,R1,windturbine,2020,10.00000000000
+3,2035,R1,windturbine,2020,10.00000000000
+3,2040,R1,windturbine,2020,10.00000000000
+3,2045,R1,windturbine,2020,10.00000000000
+3,2049,R1,windturbine,2020,10.00000000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,1.00000000000
+5,2030,R2,gasCCGT,2025,5.88890000000
+5,2035,R2,gasCCGT,2025,5.88890000000
+5,2040,R2,gasCCGT,2025,5.88890000000
+5,2045,R2,gasCCGT,2025,5.88890000000
+5,2049,R2,gasCCGT,2025,5.88890000000
+5,2050,R2,gasCCGT,2025,5.88890000000
+5,2064,R2,gasCCGT,2025,5.88890000000
+6,2025,R2,windturbine,2020,16.75000000000
+6,2030,R2,windturbine,2020,16.75000000000
+6,2035,R2,windturbine,2020,16.75000000000
+6,2040,R2,windturbine,2020,16.75000000000
+6,2045,R2,windturbine,2020,16.75000000000
+6,2049,R2,windturbine,2020,16.75000000000
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 36839f24..b4388905 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,10 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -16,6 +24,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -26,6 +36,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -37,71 +49,89 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
 3,2061,R1,gasCCGT,2026,2.29760000000
 3,2062,R1,gasCCGT,2026,2.29760000000
-4,2022,R1,windturbine,2020,8.77320000000
-4,2024,R1,windturbine,2020,8.77320000000
-4,2025,R1,windturbine,2020,8.77320000000
-4,2026,R1,windturbine,2020,8.77320000000
-4,2028,R1,windturbine,2020,8.77320000000
-4,2030,R1,windturbine,2020,8.77320000000
-4,2035,R1,windturbine,2020,8.77320000000
-4,2040,R1,windturbine,2020,8.77320000000
-4,2045,R1,windturbine,2020,8.77320000000
-4,2046,R1,windturbine,2020,8.77320000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2022,R2,gasCCGT,2020,1.00000000000
-5,2024,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-5,2026,R2,gasCCGT,2020,0.80000000000
-5,2028,R2,gasCCGT,2020,0.40000000000
-6,2024,R2,gasCCGT,2022,1.85640000000
-6,2025,R2,gasCCGT,2022,1.85640000000
-6,2026,R2,gasCCGT,2022,1.85640000000
-6,2028,R2,gasCCGT,2022,1.85640000000
-6,2030,R2,gasCCGT,2022,1.85640000000
-6,2035,R2,gasCCGT,2022,1.85640000000
-6,2040,R2,gasCCGT,2022,1.85640000000
-6,2045,R2,gasCCGT,2022,1.85640000000
-6,2046,R2,gasCCGT,2022,1.85640000000
-6,2047,R2,gasCCGT,2022,1.85640000000
-6,2050,R2,gasCCGT,2022,1.85640000000
-6,2058,R2,gasCCGT,2022,1.85640000000
-7,2026,R2,gasCCGT,2024,2.07980000000
-7,2028,R2,gasCCGT,2024,2.07980000000
-7,2030,R2,gasCCGT,2024,2.07980000000
-7,2035,R2,gasCCGT,2024,2.07980000000
-7,2040,R2,gasCCGT,2024,2.07980000000
-7,2045,R2,gasCCGT,2024,2.07980000000
-7,2046,R2,gasCCGT,2024,2.07980000000
-7,2047,R2,gasCCGT,2024,2.07980000000
-7,2050,R2,gasCCGT,2024,2.07980000000
-7,2058,R2,gasCCGT,2024,2.07980000000
-7,2059,R2,gasCCGT,2024,2.07980000000
-7,2060,R2,gasCCGT,2024,2.07980000000
-8,2028,R2,gasCCGT,2026,2.29760000000
-8,2030,R2,gasCCGT,2026,2.29760000000
-8,2035,R2,gasCCGT,2026,2.29760000000
-8,2040,R2,gasCCGT,2026,2.29760000000
-8,2045,R2,gasCCGT,2026,2.29760000000
-8,2046,R2,gasCCGT,2026,2.29760000000
-8,2047,R2,gasCCGT,2026,2.29760000000
-8,2050,R2,gasCCGT,2026,2.29760000000
-8,2058,R2,gasCCGT,2026,2.29760000000
-8,2059,R2,gasCCGT,2026,2.29760000000
-8,2060,R2,gasCCGT,2026,2.29760000000
-8,2061,R2,gasCCGT,2026,2.29760000000
-8,2062,R2,gasCCGT,2026,2.29760000000
-9,2022,R2,windturbine,2020,8.77320000000
-9,2024,R2,windturbine,2020,8.77320000000
-9,2025,R2,windturbine,2020,8.77320000000
-9,2026,R2,windturbine,2020,8.77320000000
-9,2028,R2,windturbine,2020,8.77320000000
-9,2030,R2,windturbine,2020,8.77320000000
-9,2035,R2,windturbine,2020,8.77320000000
-9,2040,R2,windturbine,2020,8.77320000000
-9,2045,R2,windturbine,2020,8.77320000000
-9,2046,R2,windturbine,2020,8.77320000000
+4,2022,R1,solarPV,2020,4.00000000000
+4,2024,R1,solarPV,2020,4.00000000000
+4,2025,R1,solarPV,2020,4.00000000000
+4,2026,R1,solarPV,2020,4.00000000000
+4,2028,R1,solarPV,2020,4.00000000000
+4,2030,R1,solarPV,2020,4.00000000000
+4,2035,R1,solarPV,2020,4.00000000000
+4,2040,R1,solarPV,2020,4.00000000000
+4,2045,R1,solarPV,2020,4.00000000000
+4,2046,R1,solarPV,2020,4.00000000000
+5,2022,R1,windturbine,2020,4.00000000000
+5,2024,R1,windturbine,2020,4.00000000000
+5,2025,R1,windturbine,2020,4.00000000000
+5,2026,R1,windturbine,2020,4.00000000000
+5,2028,R1,windturbine,2020,4.00000000000
+5,2030,R1,windturbine,2020,4.00000000000
+5,2035,R1,windturbine,2020,4.00000000000
+5,2040,R1,windturbine,2020,4.00000000000
+5,2045,R1,windturbine,2020,4.00000000000
+5,2046,R1,windturbine,2020,4.00000000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2022,R2,gasCCGT,2020,1.00000000000
+6,2024,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+6,2026,R2,gasCCGT,2020,0.80000000000
+6,2028,R2,gasCCGT,2020,0.40000000000
+7,2024,R2,gasCCGT,2022,1.85640000000
+7,2025,R2,gasCCGT,2022,1.85640000000
+7,2026,R2,gasCCGT,2022,1.85640000000
+7,2028,R2,gasCCGT,2022,1.85640000000
+7,2030,R2,gasCCGT,2022,1.85640000000
+7,2035,R2,gasCCGT,2022,1.85640000000
+7,2040,R2,gasCCGT,2022,1.85640000000
+7,2045,R2,gasCCGT,2022,1.85640000000
+7,2046,R2,gasCCGT,2022,1.85640000000
+7,2047,R2,gasCCGT,2022,1.85640000000
+7,2050,R2,gasCCGT,2022,1.85640000000
+7,2056,R2,gasCCGT,2022,1.85640000000
+7,2057,R2,gasCCGT,2022,1.85640000000
+7,2058,R2,gasCCGT,2022,1.85640000000
+8,2026,R2,gasCCGT,2024,2.07980000000
+8,2028,R2,gasCCGT,2024,2.07980000000
+8,2030,R2,gasCCGT,2024,2.07980000000
+8,2035,R2,gasCCGT,2024,2.07980000000
+8,2040,R2,gasCCGT,2024,2.07980000000
+8,2045,R2,gasCCGT,2024,2.07980000000
+8,2046,R2,gasCCGT,2024,2.07980000000
+8,2047,R2,gasCCGT,2024,2.07980000000
+8,2050,R2,gasCCGT,2024,2.07980000000
+8,2056,R2,gasCCGT,2024,2.07980000000
+8,2057,R2,gasCCGT,2024,2.07980000000
+8,2058,R2,gasCCGT,2024,2.07980000000
+8,2059,R2,gasCCGT,2024,2.07980000000
+8,2060,R2,gasCCGT,2024,2.07980000000
+9,2028,R2,gasCCGT,2026,2.29760000000
+9,2030,R2,gasCCGT,2026,2.29760000000
+9,2035,R2,gasCCGT,2026,2.29760000000
+9,2040,R2,gasCCGT,2026,2.29760000000
+9,2045,R2,gasCCGT,2026,2.29760000000
+9,2046,R2,gasCCGT,2026,2.29760000000
+9,2047,R2,gasCCGT,2026,2.29760000000
+9,2050,R2,gasCCGT,2026,2.29760000000
+9,2056,R2,gasCCGT,2026,2.29760000000
+9,2057,R2,gasCCGT,2026,2.29760000000
+9,2058,R2,gasCCGT,2026,2.29760000000
+9,2059,R2,gasCCGT,2026,2.29760000000
+9,2060,R2,gasCCGT,2026,2.29760000000
+9,2061,R2,gasCCGT,2026,2.29760000000
+9,2062,R2,gasCCGT,2026,2.29760000000
+10,2022,R2,windturbine,2020,8.77320000000
+10,2024,R2,windturbine,2020,8.77320000000
+10,2025,R2,windturbine,2020,8.77320000000
+10,2026,R2,windturbine,2020,8.77320000000
+10,2028,R2,windturbine,2020,8.77320000000
+10,2030,R2,windturbine,2020,8.77320000000
+10,2035,R2,windturbine,2020,8.77320000000
+10,2040,R2,windturbine,2020,8.77320000000
+10,2045,R2,windturbine,2020,8.77320000000
+10,2046,R2,windturbine,2020,8.77320000000
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 865b4c9e..ea5c54f8 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,10 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -16,6 +24,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -26,6 +36,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -37,6 +49,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -49,6 +63,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -56,80 +72,98 @@ asset,year,region,technology,installed,capacity
 4,2062,R1,gasCCGT,2028,2.31150000000
 4,2063,R1,gasCCGT,2028,2.31150000000
 4,2064,R1,gasCCGT,2028,2.31150000000
-5,2022,R1,windturbine,2020,8.77320000000
-5,2024,R1,windturbine,2020,8.77320000000
-5,2025,R1,windturbine,2020,8.77320000000
-5,2026,R1,windturbine,2020,8.77320000000
-5,2028,R1,windturbine,2020,8.77320000000
-5,2030,R1,windturbine,2020,8.77320000000
-5,2035,R1,windturbine,2020,8.77320000000
-5,2040,R1,windturbine,2020,8.77320000000
-5,2045,R1,windturbine,2020,8.77320000000
-5,2046,R1,windturbine,2020,8.77320000000
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2022,R2,gasCCGT,2020,1.00000000000
-6,2024,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-6,2026,R2,gasCCGT,2020,0.80000000000
-6,2028,R2,gasCCGT,2020,0.40000000000
-7,2024,R2,gasCCGT,2022,1.85640000000
-7,2025,R2,gasCCGT,2022,1.85640000000
-7,2026,R2,gasCCGT,2022,1.85640000000
-7,2028,R2,gasCCGT,2022,1.85640000000
-7,2030,R2,gasCCGT,2022,1.85640000000
-7,2035,R2,gasCCGT,2022,1.85640000000
-7,2040,R2,gasCCGT,2022,1.85640000000
-7,2045,R2,gasCCGT,2022,1.85640000000
-7,2046,R2,gasCCGT,2022,1.85640000000
-7,2047,R2,gasCCGT,2022,1.85640000000
-7,2050,R2,gasCCGT,2022,1.85640000000
-7,2058,R2,gasCCGT,2022,1.85640000000
-8,2026,R2,gasCCGT,2024,2.07980000000
-8,2028,R2,gasCCGT,2024,2.07980000000
-8,2030,R2,gasCCGT,2024,2.07980000000
-8,2035,R2,gasCCGT,2024,2.07980000000
-8,2040,R2,gasCCGT,2024,2.07980000000
-8,2045,R2,gasCCGT,2024,2.07980000000
-8,2046,R2,gasCCGT,2024,2.07980000000
-8,2047,R2,gasCCGT,2024,2.07980000000
-8,2050,R2,gasCCGT,2024,2.07980000000
-8,2058,R2,gasCCGT,2024,2.07980000000
-8,2059,R2,gasCCGT,2024,2.07980000000
-8,2060,R2,gasCCGT,2024,2.07980000000
-9,2028,R2,gasCCGT,2026,2.29760000000
-9,2030,R2,gasCCGT,2026,2.29760000000
-9,2035,R2,gasCCGT,2026,2.29760000000
-9,2040,R2,gasCCGT,2026,2.29760000000
-9,2045,R2,gasCCGT,2026,2.29760000000
-9,2046,R2,gasCCGT,2026,2.29760000000
-9,2047,R2,gasCCGT,2026,2.29760000000
-9,2050,R2,gasCCGT,2026,2.29760000000
-9,2058,R2,gasCCGT,2026,2.29760000000
-9,2059,R2,gasCCGT,2026,2.29760000000
-9,2060,R2,gasCCGT,2026,2.29760000000
-9,2061,R2,gasCCGT,2026,2.29760000000
-9,2062,R2,gasCCGT,2026,2.29760000000
-10,2030,R2,gasCCGT,2028,2.31150000000
-10,2035,R2,gasCCGT,2028,2.31150000000
-10,2040,R2,gasCCGT,2028,2.31150000000
-10,2045,R2,gasCCGT,2028,2.31150000000
-10,2046,R2,gasCCGT,2028,2.31150000000
-10,2047,R2,gasCCGT,2028,2.31150000000
-10,2050,R2,gasCCGT,2028,2.31150000000
-10,2058,R2,gasCCGT,2028,2.31150000000
-10,2059,R2,gasCCGT,2028,2.31150000000
-10,2060,R2,gasCCGT,2028,2.31150000000
-10,2061,R2,gasCCGT,2028,2.31150000000
-10,2062,R2,gasCCGT,2028,2.31150000000
-10,2063,R2,gasCCGT,2028,2.31150000000
-10,2064,R2,gasCCGT,2028,2.31150000000
-11,2022,R2,windturbine,2020,8.77320000000
-11,2024,R2,windturbine,2020,8.77320000000
-11,2025,R2,windturbine,2020,8.77320000000
-11,2026,R2,windturbine,2020,8.77320000000
-11,2028,R2,windturbine,2020,8.77320000000
-11,2030,R2,windturbine,2020,8.77320000000
-11,2035,R2,windturbine,2020,8.77320000000
-11,2040,R2,windturbine,2020,8.77320000000
-11,2045,R2,windturbine,2020,8.77320000000
-11,2046,R2,windturbine,2020,8.77320000000
+5,2022,R1,solarPV,2020,4.00000000000
+5,2024,R1,solarPV,2020,4.00000000000
+5,2025,R1,solarPV,2020,4.00000000000
+5,2026,R1,solarPV,2020,4.00000000000
+5,2028,R1,solarPV,2020,4.00000000000
+5,2030,R1,solarPV,2020,4.00000000000
+5,2035,R1,solarPV,2020,4.00000000000
+5,2040,R1,solarPV,2020,4.00000000000
+5,2045,R1,solarPV,2020,4.00000000000
+5,2046,R1,solarPV,2020,4.00000000000
+6,2022,R1,windturbine,2020,4.00000000000
+6,2024,R1,windturbine,2020,4.00000000000
+6,2025,R1,windturbine,2020,4.00000000000
+6,2026,R1,windturbine,2020,4.00000000000
+6,2028,R1,windturbine,2020,4.00000000000
+6,2030,R1,windturbine,2020,4.00000000000
+6,2035,R1,windturbine,2020,4.00000000000
+6,2040,R1,windturbine,2020,4.00000000000
+6,2045,R1,windturbine,2020,4.00000000000
+6,2046,R1,windturbine,2020,4.00000000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2022,R2,gasCCGT,2020,1.00000000000
+7,2024,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,1.00000000000
+7,2026,R2,gasCCGT,2020,0.80000000000
+7,2028,R2,gasCCGT,2020,0.40000000000
+8,2024,R2,gasCCGT,2022,1.85640000000
+8,2025,R2,gasCCGT,2022,1.85640000000
+8,2026,R2,gasCCGT,2022,1.85640000000
+8,2028,R2,gasCCGT,2022,1.85640000000
+8,2030,R2,gasCCGT,2022,1.85640000000
+8,2035,R2,gasCCGT,2022,1.85640000000
+8,2040,R2,gasCCGT,2022,1.85640000000
+8,2045,R2,gasCCGT,2022,1.85640000000
+8,2046,R2,gasCCGT,2022,1.85640000000
+8,2047,R2,gasCCGT,2022,1.85640000000
+8,2050,R2,gasCCGT,2022,1.85640000000
+8,2056,R2,gasCCGT,2022,1.85640000000
+8,2057,R2,gasCCGT,2022,1.85640000000
+8,2058,R2,gasCCGT,2022,1.85640000000
+9,2026,R2,gasCCGT,2024,2.07980000000
+9,2028,R2,gasCCGT,2024,2.07980000000
+9,2030,R2,gasCCGT,2024,2.07980000000
+9,2035,R2,gasCCGT,2024,2.07980000000
+9,2040,R2,gasCCGT,2024,2.07980000000
+9,2045,R2,gasCCGT,2024,2.07980000000
+9,2046,R2,gasCCGT,2024,2.07980000000
+9,2047,R2,gasCCGT,2024,2.07980000000
+9,2050,R2,gasCCGT,2024,2.07980000000
+9,2056,R2,gasCCGT,2024,2.07980000000
+9,2057,R2,gasCCGT,2024,2.07980000000
+9,2058,R2,gasCCGT,2024,2.07980000000
+9,2059,R2,gasCCGT,2024,2.07980000000
+9,2060,R2,gasCCGT,2024,2.07980000000
+10,2028,R2,gasCCGT,2026,2.29760000000
+10,2030,R2,gasCCGT,2026,2.29760000000
+10,2035,R2,gasCCGT,2026,2.29760000000
+10,2040,R2,gasCCGT,2026,2.29760000000
+10,2045,R2,gasCCGT,2026,2.29760000000
+10,2046,R2,gasCCGT,2026,2.29760000000
+10,2047,R2,gasCCGT,2026,2.29760000000
+10,2050,R2,gasCCGT,2026,2.29760000000
+10,2056,R2,gasCCGT,2026,2.29760000000
+10,2057,R2,gasCCGT,2026,2.29760000000
+10,2058,R2,gasCCGT,2026,2.29760000000
+10,2059,R2,gasCCGT,2026,2.29760000000
+10,2060,R2,gasCCGT,2026,2.29760000000
+10,2061,R2,gasCCGT,2026,2.29760000000
+10,2062,R2,gasCCGT,2026,2.29760000000
+11,2030,R2,gasCCGT,2028,2.31150000000
+11,2035,R2,gasCCGT,2028,2.31150000000
+11,2040,R2,gasCCGT,2028,2.31150000000
+11,2045,R2,gasCCGT,2028,2.31150000000
+11,2046,R2,gasCCGT,2028,2.31150000000
+11,2047,R2,gasCCGT,2028,2.31150000000
+11,2050,R2,gasCCGT,2028,2.31150000000
+11,2056,R2,gasCCGT,2028,2.31150000000
+11,2057,R2,gasCCGT,2028,2.31150000000
+11,2058,R2,gasCCGT,2028,2.31150000000
+11,2059,R2,gasCCGT,2028,2.31150000000
+11,2060,R2,gasCCGT,2028,2.31150000000
+11,2061,R2,gasCCGT,2028,2.31150000000
+11,2062,R2,gasCCGT,2028,2.31150000000
+11,2063,R2,gasCCGT,2028,2.31150000000
+11,2064,R2,gasCCGT,2028,2.31150000000
+12,2022,R2,windturbine,2020,8.77320000000
+12,2024,R2,windturbine,2020,8.77320000000
+12,2025,R2,windturbine,2020,8.77320000000
+12,2026,R2,windturbine,2020,8.77320000000
+12,2028,R2,windturbine,2020,8.77320000000
+12,2030,R2,windturbine,2020,8.77320000000
+12,2035,R2,windturbine,2020,8.77320000000
+12,2040,R2,windturbine,2020,8.77320000000
+12,2045,R2,windturbine,2020,8.77320000000
+12,2046,R2,windturbine,2020,8.77320000000
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 0c3b7d2f..66e96fec 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,10 +1,19 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2032,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -17,6 +26,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -28,6 +39,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -40,6 +53,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -53,6 +68,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -67,6 +84,8 @@ asset,year,region,technology,installed,capacity
 5,2046,R1,gasCCGT,2030,0.99560000000
 5,2047,R1,gasCCGT,2030,0.99560000000
 5,2050,R1,gasCCGT,2030,0.99560000000
+5,2056,R1,gasCCGT,2030,0.99560000000
+5,2057,R1,gasCCGT,2030,0.99560000000
 5,2058,R1,gasCCGT,2030,0.99560000000
 5,2059,R1,gasCCGT,2030,0.99560000000
 5,2060,R1,gasCCGT,2030,0.99560000000
@@ -76,102 +95,123 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,windturbine,2020,8.77320000000
-6,2024,R1,windturbine,2020,8.77320000000
-6,2025,R1,windturbine,2020,8.77320000000
-6,2026,R1,windturbine,2020,8.77320000000
-6,2028,R1,windturbine,2020,8.77320000000
-6,2030,R1,windturbine,2020,8.77320000000
-6,2032,R1,windturbine,2020,8.77320000000
-6,2035,R1,windturbine,2020,8.77320000000
-6,2040,R1,windturbine,2020,8.77320000000
-6,2045,R1,windturbine,2020,8.77320000000
-6,2046,R1,windturbine,2020,8.77320000000
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2022,R2,gasCCGT,2020,1.00000000000
-7,2024,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-7,2026,R2,gasCCGT,2020,0.80000000000
-7,2028,R2,gasCCGT,2020,0.40000000000
-8,2024,R2,gasCCGT,2022,1.85640000000
-8,2025,R2,gasCCGT,2022,1.85640000000
-8,2026,R2,gasCCGT,2022,1.85640000000
-8,2028,R2,gasCCGT,2022,1.85640000000
-8,2030,R2,gasCCGT,2022,1.85640000000
-8,2032,R2,gasCCGT,2022,1.85640000000
-8,2035,R2,gasCCGT,2022,1.85640000000
-8,2040,R2,gasCCGT,2022,1.85640000000
-8,2045,R2,gasCCGT,2022,1.85640000000
-8,2046,R2,gasCCGT,2022,1.85640000000
-8,2047,R2,gasCCGT,2022,1.85640000000
-8,2050,R2,gasCCGT,2022,1.85640000000
-8,2058,R2,gasCCGT,2022,1.85640000000
-9,2026,R2,gasCCGT,2024,2.07980000000
-9,2028,R2,gasCCGT,2024,2.07980000000
-9,2030,R2,gasCCGT,2024,2.07980000000
-9,2032,R2,gasCCGT,2024,2.07980000000
-9,2035,R2,gasCCGT,2024,2.07980000000
-9,2040,R2,gasCCGT,2024,2.07980000000
-9,2045,R2,gasCCGT,2024,2.07980000000
-9,2046,R2,gasCCGT,2024,2.07980000000
-9,2047,R2,gasCCGT,2024,2.07980000000
-9,2050,R2,gasCCGT,2024,2.07980000000
-9,2058,R2,gasCCGT,2024,2.07980000000
-9,2059,R2,gasCCGT,2024,2.07980000000
-9,2060,R2,gasCCGT,2024,2.07980000000
-10,2028,R2,gasCCGT,2026,2.29760000000
-10,2030,R2,gasCCGT,2026,2.29760000000
-10,2032,R2,gasCCGT,2026,2.29760000000
-10,2035,R2,gasCCGT,2026,2.29760000000
-10,2040,R2,gasCCGT,2026,2.29760000000
-10,2045,R2,gasCCGT,2026,2.29760000000
-10,2046,R2,gasCCGT,2026,2.29760000000
-10,2047,R2,gasCCGT,2026,2.29760000000
-10,2050,R2,gasCCGT,2026,2.29760000000
-10,2058,R2,gasCCGT,2026,2.29760000000
-10,2059,R2,gasCCGT,2026,2.29760000000
-10,2060,R2,gasCCGT,2026,2.29760000000
-10,2061,R2,gasCCGT,2026,2.29760000000
-10,2062,R2,gasCCGT,2026,2.29760000000
-11,2030,R2,gasCCGT,2028,2.31150000000
-11,2032,R2,gasCCGT,2028,2.31150000000
-11,2035,R2,gasCCGT,2028,2.31150000000
-11,2040,R2,gasCCGT,2028,2.31150000000
-11,2045,R2,gasCCGT,2028,2.31150000000
-11,2046,R2,gasCCGT,2028,2.31150000000
-11,2047,R2,gasCCGT,2028,2.31150000000
-11,2050,R2,gasCCGT,2028,2.31150000000
-11,2058,R2,gasCCGT,2028,2.31150000000
-11,2059,R2,gasCCGT,2028,2.31150000000
-11,2060,R2,gasCCGT,2028,2.31150000000
-11,2061,R2,gasCCGT,2028,2.31150000000
-11,2062,R2,gasCCGT,2028,2.31150000000
-11,2063,R2,gasCCGT,2028,2.31150000000
-11,2064,R2,gasCCGT,2028,2.31150000000
-12,2032,R2,gasCCGT,2030,0.99560000000
-12,2035,R2,gasCCGT,2030,0.99560000000
-12,2040,R2,gasCCGT,2030,0.99560000000
-12,2045,R2,gasCCGT,2030,0.99560000000
-12,2046,R2,gasCCGT,2030,0.99560000000
-12,2047,R2,gasCCGT,2030,0.99560000000
-12,2050,R2,gasCCGT,2030,0.99560000000
-12,2058,R2,gasCCGT,2030,0.99560000000
-12,2059,R2,gasCCGT,2030,0.99560000000
-12,2060,R2,gasCCGT,2030,0.99560000000
-12,2061,R2,gasCCGT,2030,0.99560000000
-12,2062,R2,gasCCGT,2030,0.99560000000
-12,2063,R2,gasCCGT,2030,0.99560000000
-12,2064,R2,gasCCGT,2030,0.99560000000
-12,2065,R2,gasCCGT,2030,0.99560000000
-12,2066,R2,gasCCGT,2030,0.99560000000
-13,2022,R2,windturbine,2020,8.77320000000
-13,2024,R2,windturbine,2020,8.77320000000
-13,2025,R2,windturbine,2020,8.77320000000
-13,2026,R2,windturbine,2020,8.77320000000
-13,2028,R2,windturbine,2020,8.77320000000
-13,2030,R2,windturbine,2020,8.77320000000
-13,2032,R2,windturbine,2020,8.77320000000
-13,2035,R2,windturbine,2020,8.77320000000
-13,2040,R2,windturbine,2020,8.77320000000
-13,2045,R2,windturbine,2020,8.77320000000
-13,2046,R2,windturbine,2020,8.77320000000
+6,2022,R1,solarPV,2020,4.00000000000
+6,2024,R1,solarPV,2020,4.00000000000
+6,2025,R1,solarPV,2020,4.00000000000
+6,2026,R1,solarPV,2020,4.00000000000
+6,2028,R1,solarPV,2020,4.00000000000
+6,2030,R1,solarPV,2020,4.00000000000
+6,2032,R1,solarPV,2020,4.00000000000
+6,2035,R1,solarPV,2020,4.00000000000
+6,2040,R1,solarPV,2020,4.00000000000
+6,2045,R1,solarPV,2020,4.00000000000
+6,2046,R1,solarPV,2020,4.00000000000
+7,2022,R1,windturbine,2020,4.00000000000
+7,2024,R1,windturbine,2020,4.00000000000
+7,2025,R1,windturbine,2020,4.00000000000
+7,2026,R1,windturbine,2020,4.00000000000
+7,2028,R1,windturbine,2020,4.00000000000
+7,2030,R1,windturbine,2020,4.00000000000
+7,2032,R1,windturbine,2020,4.00000000000
+7,2035,R1,windturbine,2020,4.00000000000
+7,2040,R1,windturbine,2020,4.00000000000
+7,2045,R1,windturbine,2020,4.00000000000
+7,2046,R1,windturbine,2020,4.00000000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2022,R2,gasCCGT,2020,1.00000000000
+8,2024,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,1.00000000000
+8,2026,R2,gasCCGT,2020,0.80000000000
+8,2028,R2,gasCCGT,2020,0.40000000000
+9,2024,R2,gasCCGT,2022,1.85640000000
+9,2025,R2,gasCCGT,2022,1.85640000000
+9,2026,R2,gasCCGT,2022,1.85640000000
+9,2028,R2,gasCCGT,2022,1.85640000000
+9,2030,R2,gasCCGT,2022,1.85640000000
+9,2032,R2,gasCCGT,2022,1.85640000000
+9,2035,R2,gasCCGT,2022,1.85640000000
+9,2040,R2,gasCCGT,2022,1.85640000000
+9,2045,R2,gasCCGT,2022,1.85640000000
+9,2046,R2,gasCCGT,2022,1.85640000000
+9,2047,R2,gasCCGT,2022,1.85640000000
+9,2050,R2,gasCCGT,2022,1.85640000000
+9,2056,R2,gasCCGT,2022,1.85640000000
+9,2057,R2,gasCCGT,2022,1.85640000000
+9,2058,R2,gasCCGT,2022,1.85640000000
+10,2026,R2,gasCCGT,2024,2.07980000000
+10,2028,R2,gasCCGT,2024,2.07980000000
+10,2030,R2,gasCCGT,2024,2.07980000000
+10,2032,R2,gasCCGT,2024,2.07980000000
+10,2035,R2,gasCCGT,2024,2.07980000000
+10,2040,R2,gasCCGT,2024,2.07980000000
+10,2045,R2,gasCCGT,2024,2.07980000000
+10,2046,R2,gasCCGT,2024,2.07980000000
+10,2047,R2,gasCCGT,2024,2.07980000000
+10,2050,R2,gasCCGT,2024,2.07980000000
+10,2056,R2,gasCCGT,2024,2.07980000000
+10,2057,R2,gasCCGT,2024,2.07980000000
+10,2058,R2,gasCCGT,2024,2.07980000000
+10,2059,R2,gasCCGT,2024,2.07980000000
+10,2060,R2,gasCCGT,2024,2.07980000000
+11,2028,R2,gasCCGT,2026,2.29760000000
+11,2030,R2,gasCCGT,2026,2.29760000000
+11,2032,R2,gasCCGT,2026,2.29760000000
+11,2035,R2,gasCCGT,2026,2.29760000000
+11,2040,R2,gasCCGT,2026,2.29760000000
+11,2045,R2,gasCCGT,2026,2.29760000000
+11,2046,R2,gasCCGT,2026,2.29760000000
+11,2047,R2,gasCCGT,2026,2.29760000000
+11,2050,R2,gasCCGT,2026,2.29760000000
+11,2056,R2,gasCCGT,2026,2.29760000000
+11,2057,R2,gasCCGT,2026,2.29760000000
+11,2058,R2,gasCCGT,2026,2.29760000000
+11,2059,R2,gasCCGT,2026,2.29760000000
+11,2060,R2,gasCCGT,2026,2.29760000000
+11,2061,R2,gasCCGT,2026,2.29760000000
+11,2062,R2,gasCCGT,2026,2.29760000000
+12,2030,R2,gasCCGT,2028,2.31150000000
+12,2032,R2,gasCCGT,2028,2.31150000000
+12,2035,R2,gasCCGT,2028,2.31150000000
+12,2040,R2,gasCCGT,2028,2.31150000000
+12,2045,R2,gasCCGT,2028,2.31150000000
+12,2046,R2,gasCCGT,2028,2.31150000000
+12,2047,R2,gasCCGT,2028,2.31150000000
+12,2050,R2,gasCCGT,2028,2.31150000000
+12,2056,R2,gasCCGT,2028,2.31150000000
+12,2057,R2,gasCCGT,2028,2.31150000000
+12,2058,R2,gasCCGT,2028,2.31150000000
+12,2059,R2,gasCCGT,2028,2.31150000000
+12,2060,R2,gasCCGT,2028,2.31150000000
+12,2061,R2,gasCCGT,2028,2.31150000000
+12,2062,R2,gasCCGT,2028,2.31150000000
+12,2063,R2,gasCCGT,2028,2.31150000000
+12,2064,R2,gasCCGT,2028,2.31150000000
+13,2032,R2,gasCCGT,2030,0.99560000000
+13,2035,R2,gasCCGT,2030,0.99560000000
+13,2040,R2,gasCCGT,2030,0.99560000000
+13,2045,R2,gasCCGT,2030,0.99560000000
+13,2046,R2,gasCCGT,2030,0.99560000000
+13,2047,R2,gasCCGT,2030,0.99560000000
+13,2050,R2,gasCCGT,2030,0.99560000000
+13,2056,R2,gasCCGT,2030,0.99560000000
+13,2057,R2,gasCCGT,2030,0.99560000000
+13,2058,R2,gasCCGT,2030,0.99560000000
+13,2059,R2,gasCCGT,2030,0.99560000000
+13,2060,R2,gasCCGT,2030,0.99560000000
+13,2061,R2,gasCCGT,2030,0.99560000000
+13,2062,R2,gasCCGT,2030,0.99560000000
+13,2063,R2,gasCCGT,2030,0.99560000000
+13,2064,R2,gasCCGT,2030,0.99560000000
+13,2065,R2,gasCCGT,2030,0.99560000000
+13,2066,R2,gasCCGT,2030,0.99560000000
+14,2022,R2,windturbine,2020,8.77320000000
+14,2024,R2,windturbine,2020,8.77320000000
+14,2025,R2,windturbine,2020,8.77320000000
+14,2026,R2,windturbine,2020,8.77320000000
+14,2028,R2,windturbine,2020,8.77320000000
+14,2030,R2,windturbine,2020,8.77320000000
+14,2032,R2,windturbine,2020,8.77320000000
+14,2035,R2,windturbine,2020,8.77320000000
+14,2040,R2,windturbine,2020,8.77320000000
+14,2045,R2,windturbine,2020,8.77320000000
+14,2046,R2,windturbine,2020,8.77320000000
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 5038954e..f3c4b502 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,10 +1,20 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2032,R1,gasCCGT,2020,0.34360000000
+0,2034,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -18,6 +28,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -30,6 +42,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -43,6 +57,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -57,6 +73,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -72,6 +90,8 @@ asset,year,region,technology,installed,capacity
 5,2046,R1,gasCCGT,2030,0.99560000000
 5,2047,R1,gasCCGT,2030,0.99560000000
 5,2050,R1,gasCCGT,2030,0.99560000000
+5,2056,R1,gasCCGT,2030,0.99560000000
+5,2057,R1,gasCCGT,2030,0.99560000000
 5,2058,R1,gasCCGT,2030,0.99560000000
 5,2059,R1,gasCCGT,2030,0.99560000000
 5,2060,R1,gasCCGT,2030,0.99560000000
@@ -81,125 +101,151 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,solarPV,2032,2.24000000000
-6,2035,R1,solarPV,2032,2.24000000000
-6,2040,R1,solarPV,2032,2.24000000000
-6,2045,R1,solarPV,2032,2.24000000000
-6,2046,R1,solarPV,2032,2.24000000000
-6,2047,R1,solarPV,2032,2.24000000000
-6,2050,R1,solarPV,2032,2.24000000000
-6,2058,R1,solarPV,2032,2.24000000000
-7,2022,R1,windturbine,2020,8.77320000000
-7,2024,R1,windturbine,2020,8.77320000000
-7,2025,R1,windturbine,2020,8.77320000000
-7,2026,R1,windturbine,2020,8.77320000000
-7,2028,R1,windturbine,2020,8.77320000000
-7,2030,R1,windturbine,2020,8.77320000000
-7,2032,R1,windturbine,2020,8.77320000000
-7,2034,R1,windturbine,2020,8.77320000000
-7,2035,R1,windturbine,2020,8.77320000000
-7,2040,R1,windturbine,2020,8.77320000000
-7,2045,R1,windturbine,2020,8.77320000000
-7,2046,R1,windturbine,2020,8.77320000000
-8,2020,R2,gasCCGT,2020,1.00000000000
-8,2022,R2,gasCCGT,2020,1.00000000000
-8,2024,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,1.00000000000
-8,2026,R2,gasCCGT,2020,0.80000000000
-8,2028,R2,gasCCGT,2020,0.40000000000
-9,2024,R2,gasCCGT,2022,1.85640000000
-9,2025,R2,gasCCGT,2022,1.85640000000
-9,2026,R2,gasCCGT,2022,1.85640000000
-9,2028,R2,gasCCGT,2022,1.85640000000
-9,2030,R2,gasCCGT,2022,1.85640000000
-9,2032,R2,gasCCGT,2022,1.85640000000
-9,2034,R2,gasCCGT,2022,1.85640000000
-9,2035,R2,gasCCGT,2022,1.85640000000
-9,2040,R2,gasCCGT,2022,1.85640000000
-9,2045,R2,gasCCGT,2022,1.85640000000
-9,2046,R2,gasCCGT,2022,1.85640000000
-9,2047,R2,gasCCGT,2022,1.85640000000
-9,2050,R2,gasCCGT,2022,1.85640000000
-9,2058,R2,gasCCGT,2022,1.85640000000
-10,2026,R2,gasCCGT,2024,2.07980000000
-10,2028,R2,gasCCGT,2024,2.07980000000
-10,2030,R2,gasCCGT,2024,2.07980000000
-10,2032,R2,gasCCGT,2024,2.07980000000
-10,2034,R2,gasCCGT,2024,2.07980000000
-10,2035,R2,gasCCGT,2024,2.07980000000
-10,2040,R2,gasCCGT,2024,2.07980000000
-10,2045,R2,gasCCGT,2024,2.07980000000
-10,2046,R2,gasCCGT,2024,2.07980000000
-10,2047,R2,gasCCGT,2024,2.07980000000
-10,2050,R2,gasCCGT,2024,2.07980000000
-10,2058,R2,gasCCGT,2024,2.07980000000
-10,2059,R2,gasCCGT,2024,2.07980000000
-10,2060,R2,gasCCGT,2024,2.07980000000
-11,2028,R2,gasCCGT,2026,2.29760000000
-11,2030,R2,gasCCGT,2026,2.29760000000
-11,2032,R2,gasCCGT,2026,2.29760000000
-11,2034,R2,gasCCGT,2026,2.29760000000
-11,2035,R2,gasCCGT,2026,2.29760000000
-11,2040,R2,gasCCGT,2026,2.29760000000
-11,2045,R2,gasCCGT,2026,2.29760000000
-11,2046,R2,gasCCGT,2026,2.29760000000
-11,2047,R2,gasCCGT,2026,2.29760000000
-11,2050,R2,gasCCGT,2026,2.29760000000
-11,2058,R2,gasCCGT,2026,2.29760000000
-11,2059,R2,gasCCGT,2026,2.29760000000
-11,2060,R2,gasCCGT,2026,2.29760000000
-11,2061,R2,gasCCGT,2026,2.29760000000
-11,2062,R2,gasCCGT,2026,2.29760000000
-12,2030,R2,gasCCGT,2028,2.31150000000
-12,2032,R2,gasCCGT,2028,2.31150000000
-12,2034,R2,gasCCGT,2028,2.31150000000
-12,2035,R2,gasCCGT,2028,2.31150000000
-12,2040,R2,gasCCGT,2028,2.31150000000
-12,2045,R2,gasCCGT,2028,2.31150000000
-12,2046,R2,gasCCGT,2028,2.31150000000
-12,2047,R2,gasCCGT,2028,2.31150000000
-12,2050,R2,gasCCGT,2028,2.31150000000
-12,2058,R2,gasCCGT,2028,2.31150000000
-12,2059,R2,gasCCGT,2028,2.31150000000
-12,2060,R2,gasCCGT,2028,2.31150000000
-12,2061,R2,gasCCGT,2028,2.31150000000
-12,2062,R2,gasCCGT,2028,2.31150000000
-12,2063,R2,gasCCGT,2028,2.31150000000
-12,2064,R2,gasCCGT,2028,2.31150000000
-13,2032,R2,gasCCGT,2030,0.99560000000
-13,2034,R2,gasCCGT,2030,0.99560000000
-13,2035,R2,gasCCGT,2030,0.99560000000
-13,2040,R2,gasCCGT,2030,0.99560000000
-13,2045,R2,gasCCGT,2030,0.99560000000
-13,2046,R2,gasCCGT,2030,0.99560000000
-13,2047,R2,gasCCGT,2030,0.99560000000
-13,2050,R2,gasCCGT,2030,0.99560000000
-13,2058,R2,gasCCGT,2030,0.99560000000
-13,2059,R2,gasCCGT,2030,0.99560000000
-13,2060,R2,gasCCGT,2030,0.99560000000
-13,2061,R2,gasCCGT,2030,0.99560000000
-13,2062,R2,gasCCGT,2030,0.99560000000
-13,2063,R2,gasCCGT,2030,0.99560000000
-13,2064,R2,gasCCGT,2030,0.99560000000
-13,2065,R2,gasCCGT,2030,0.99560000000
-13,2066,R2,gasCCGT,2030,0.99560000000
-14,2034,R2,solarPV,2032,2.24000000000
-14,2035,R2,solarPV,2032,2.24000000000
-14,2040,R2,solarPV,2032,2.24000000000
-14,2045,R2,solarPV,2032,2.24000000000
-14,2046,R2,solarPV,2032,2.24000000000
-14,2047,R2,solarPV,2032,2.24000000000
-14,2050,R2,solarPV,2032,2.24000000000
-14,2058,R2,solarPV,2032,2.24000000000
-15,2022,R2,windturbine,2020,8.77320000000
-15,2024,R2,windturbine,2020,8.77320000000
-15,2025,R2,windturbine,2020,8.77320000000
-15,2026,R2,windturbine,2020,8.77320000000
-15,2028,R2,windturbine,2020,8.77320000000
-15,2030,R2,windturbine,2020,8.77320000000
-15,2032,R2,windturbine,2020,8.77320000000
-15,2034,R2,windturbine,2020,8.77320000000
-15,2035,R2,windturbine,2020,8.77320000000
-15,2040,R2,windturbine,2020,8.77320000000
-15,2045,R2,windturbine,2020,8.77320000000
-15,2046,R2,windturbine,2020,8.77320000000
+6,2022,R1,solarPV,2020,4.00000000000
+6,2024,R1,solarPV,2020,4.00000000000
+6,2025,R1,solarPV,2020,4.00000000000
+6,2026,R1,solarPV,2020,4.00000000000
+6,2028,R1,solarPV,2020,4.00000000000
+6,2030,R1,solarPV,2020,4.00000000000
+6,2032,R1,solarPV,2020,4.00000000000
+6,2034,R1,solarPV,2020,4.00000000000
+6,2035,R1,solarPV,2020,4.00000000000
+6,2040,R1,solarPV,2020,4.00000000000
+6,2045,R1,solarPV,2020,4.00000000000
+6,2046,R1,solarPV,2020,4.00000000000
+7,2034,R1,solarPV,2032,2.24000000000
+7,2035,R1,solarPV,2032,2.24000000000
+7,2040,R1,solarPV,2032,2.24000000000
+7,2045,R1,solarPV,2032,2.24000000000
+7,2046,R1,solarPV,2032,2.24000000000
+7,2047,R1,solarPV,2032,2.24000000000
+7,2050,R1,solarPV,2032,2.24000000000
+7,2056,R1,solarPV,2032,2.24000000000
+7,2057,R1,solarPV,2032,2.24000000000
+7,2058,R1,solarPV,2032,2.24000000000
+8,2022,R1,windturbine,2020,4.00000000000
+8,2024,R1,windturbine,2020,4.00000000000
+8,2025,R1,windturbine,2020,4.00000000000
+8,2026,R1,windturbine,2020,4.00000000000
+8,2028,R1,windturbine,2020,4.00000000000
+8,2030,R1,windturbine,2020,4.00000000000
+8,2032,R1,windturbine,2020,4.00000000000
+8,2034,R1,windturbine,2020,4.00000000000
+8,2035,R1,windturbine,2020,4.00000000000
+8,2040,R1,windturbine,2020,4.00000000000
+8,2045,R1,windturbine,2020,4.00000000000
+8,2046,R1,windturbine,2020,4.00000000000
+9,2020,R2,gasCCGT,2020,1.00000000000
+9,2022,R2,gasCCGT,2020,1.00000000000
+9,2024,R2,gasCCGT,2020,1.00000000000
+9,2025,R2,gasCCGT,2020,1.00000000000
+9,2026,R2,gasCCGT,2020,0.80000000000
+9,2028,R2,gasCCGT,2020,0.40000000000
+10,2024,R2,gasCCGT,2022,1.85640000000
+10,2025,R2,gasCCGT,2022,1.85640000000
+10,2026,R2,gasCCGT,2022,1.85640000000
+10,2028,R2,gasCCGT,2022,1.85640000000
+10,2030,R2,gasCCGT,2022,1.85640000000
+10,2032,R2,gasCCGT,2022,1.85640000000
+10,2034,R2,gasCCGT,2022,1.85640000000
+10,2035,R2,gasCCGT,2022,1.85640000000
+10,2040,R2,gasCCGT,2022,1.85640000000
+10,2045,R2,gasCCGT,2022,1.85640000000
+10,2046,R2,gasCCGT,2022,1.85640000000
+10,2047,R2,gasCCGT,2022,1.85640000000
+10,2050,R2,gasCCGT,2022,1.85640000000
+10,2056,R2,gasCCGT,2022,1.85640000000
+10,2057,R2,gasCCGT,2022,1.85640000000
+10,2058,R2,gasCCGT,2022,1.85640000000
+11,2026,R2,gasCCGT,2024,2.07980000000
+11,2028,R2,gasCCGT,2024,2.07980000000
+11,2030,R2,gasCCGT,2024,2.07980000000
+11,2032,R2,gasCCGT,2024,2.07980000000
+11,2034,R2,gasCCGT,2024,2.07980000000
+11,2035,R2,gasCCGT,2024,2.07980000000
+11,2040,R2,gasCCGT,2024,2.07980000000
+11,2045,R2,gasCCGT,2024,2.07980000000
+11,2046,R2,gasCCGT,2024,2.07980000000
+11,2047,R2,gasCCGT,2024,2.07980000000
+11,2050,R2,gasCCGT,2024,2.07980000000
+11,2056,R2,gasCCGT,2024,2.07980000000
+11,2057,R2,gasCCGT,2024,2.07980000000
+11,2058,R2,gasCCGT,2024,2.07980000000
+11,2059,R2,gasCCGT,2024,2.07980000000
+11,2060,R2,gasCCGT,2024,2.07980000000
+12,2028,R2,gasCCGT,2026,2.29760000000
+12,2030,R2,gasCCGT,2026,2.29760000000
+12,2032,R2,gasCCGT,2026,2.29760000000
+12,2034,R2,gasCCGT,2026,2.29760000000
+12,2035,R2,gasCCGT,2026,2.29760000000
+12,2040,R2,gasCCGT,2026,2.29760000000
+12,2045,R2,gasCCGT,2026,2.29760000000
+12,2046,R2,gasCCGT,2026,2.29760000000
+12,2047,R2,gasCCGT,2026,2.29760000000
+12,2050,R2,gasCCGT,2026,2.29760000000
+12,2056,R2,gasCCGT,2026,2.29760000000
+12,2057,R2,gasCCGT,2026,2.29760000000
+12,2058,R2,gasCCGT,2026,2.29760000000
+12,2059,R2,gasCCGT,2026,2.29760000000
+12,2060,R2,gasCCGT,2026,2.29760000000
+12,2061,R2,gasCCGT,2026,2.29760000000
+12,2062,R2,gasCCGT,2026,2.29760000000
+13,2030,R2,gasCCGT,2028,2.31150000000
+13,2032,R2,gasCCGT,2028,2.31150000000
+13,2034,R2,gasCCGT,2028,2.31150000000
+13,2035,R2,gasCCGT,2028,2.31150000000
+13,2040,R2,gasCCGT,2028,2.31150000000
+13,2045,R2,gasCCGT,2028,2.31150000000
+13,2046,R2,gasCCGT,2028,2.31150000000
+13,2047,R2,gasCCGT,2028,2.31150000000
+13,2050,R2,gasCCGT,2028,2.31150000000
+13,2056,R2,gasCCGT,2028,2.31150000000
+13,2057,R2,gasCCGT,2028,2.31150000000
+13,2058,R2,gasCCGT,2028,2.31150000000
+13,2059,R2,gasCCGT,2028,2.31150000000
+13,2060,R2,gasCCGT,2028,2.31150000000
+13,2061,R2,gasCCGT,2028,2.31150000000
+13,2062,R2,gasCCGT,2028,2.31150000000
+13,2063,R2,gasCCGT,2028,2.31150000000
+13,2064,R2,gasCCGT,2028,2.31150000000
+14,2032,R2,gasCCGT,2030,0.99560000000
+14,2034,R2,gasCCGT,2030,0.99560000000
+14,2035,R2,gasCCGT,2030,0.99560000000
+14,2040,R2,gasCCGT,2030,0.99560000000
+14,2045,R2,gasCCGT,2030,0.99560000000
+14,2046,R2,gasCCGT,2030,0.99560000000
+14,2047,R2,gasCCGT,2030,0.99560000000
+14,2050,R2,gasCCGT,2030,0.99560000000
+14,2056,R2,gasCCGT,2030,0.99560000000
+14,2057,R2,gasCCGT,2030,0.99560000000
+14,2058,R2,gasCCGT,2030,0.99560000000
+14,2059,R2,gasCCGT,2030,0.99560000000
+14,2060,R2,gasCCGT,2030,0.99560000000
+14,2061,R2,gasCCGT,2030,0.99560000000
+14,2062,R2,gasCCGT,2030,0.99560000000
+14,2063,R2,gasCCGT,2030,0.99560000000
+14,2064,R2,gasCCGT,2030,0.99560000000
+14,2065,R2,gasCCGT,2030,0.99560000000
+14,2066,R2,gasCCGT,2030,0.99560000000
+15,2034,R2,solarPV,2032,2.24000000000
+15,2035,R2,solarPV,2032,2.24000000000
+15,2040,R2,solarPV,2032,2.24000000000
+15,2045,R2,solarPV,2032,2.24000000000
+15,2046,R2,solarPV,2032,2.24000000000
+15,2047,R2,solarPV,2032,2.24000000000
+15,2050,R2,solarPV,2032,2.24000000000
+15,2056,R2,solarPV,2032,2.24000000000
+15,2057,R2,solarPV,2032,2.24000000000
+15,2058,R2,solarPV,2032,2.24000000000
+16,2022,R2,windturbine,2020,8.77320000000
+16,2024,R2,windturbine,2020,8.77320000000
+16,2025,R2,windturbine,2020,8.77320000000
+16,2026,R2,windturbine,2020,8.77320000000
+16,2028,R2,windturbine,2020,8.77320000000
+16,2030,R2,windturbine,2020,8.77320000000
+16,2032,R2,windturbine,2020,8.77320000000
+16,2034,R2,windturbine,2020,8.77320000000
+16,2035,R2,windturbine,2020,8.77320000000
+16,2040,R2,windturbine,2020,8.77320000000
+16,2045,R2,windturbine,2020,8.77320000000
+16,2046,R2,windturbine,2020,8.77320000000
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 95b5f722..4bbea51e 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,10 +1,21 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2032,R1,gasCCGT,2020,0.34360000000
+0,2034,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2036,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -19,6 +30,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -32,6 +45,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -46,6 +61,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -61,6 +78,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -77,6 +96,8 @@ asset,year,region,technology,installed,capacity
 5,2046,R1,gasCCGT,2030,0.99560000000
 5,2047,R1,gasCCGT,2030,0.99560000000
 5,2050,R1,gasCCGT,2030,0.99560000000
+5,2056,R1,gasCCGT,2030,0.99560000000
+5,2057,R1,gasCCGT,2030,0.99560000000
 5,2058,R1,gasCCGT,2030,0.99560000000
 5,2059,R1,gasCCGT,2030,0.99560000000
 5,2060,R1,gasCCGT,2030,0.99560000000
@@ -86,152 +107,183 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,solarPV,2032,2.24000000000
-6,2035,R1,solarPV,2032,2.24000000000
-6,2036,R1,solarPV,2032,2.24000000000
-6,2040,R1,solarPV,2032,2.24000000000
-6,2045,R1,solarPV,2032,2.24000000000
-6,2046,R1,solarPV,2032,2.24000000000
-6,2047,R1,solarPV,2032,2.24000000000
-6,2050,R1,solarPV,2032,2.24000000000
-6,2058,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2034,2.24000000000
-7,2040,R1,solarPV,2034,2.24000000000
-7,2045,R1,solarPV,2034,2.24000000000
-7,2046,R1,solarPV,2034,2.24000000000
-7,2047,R1,solarPV,2034,2.24000000000
-7,2050,R1,solarPV,2034,2.24000000000
-7,2058,R1,solarPV,2034,2.24000000000
-7,2059,R1,solarPV,2034,2.24000000000
-7,2060,R1,solarPV,2034,2.24000000000
-8,2022,R1,windturbine,2020,8.77320000000
-8,2024,R1,windturbine,2020,8.77320000000
-8,2025,R1,windturbine,2020,8.77320000000
-8,2026,R1,windturbine,2020,8.77320000000
-8,2028,R1,windturbine,2020,8.77320000000
-8,2030,R1,windturbine,2020,8.77320000000
-8,2032,R1,windturbine,2020,8.77320000000
-8,2034,R1,windturbine,2020,8.77320000000
-8,2035,R1,windturbine,2020,8.77320000000
-8,2036,R1,windturbine,2020,8.77320000000
-8,2040,R1,windturbine,2020,8.77320000000
-8,2045,R1,windturbine,2020,8.77320000000
-8,2046,R1,windturbine,2020,8.77320000000
-9,2020,R2,gasCCGT,2020,1.00000000000
-9,2022,R2,gasCCGT,2020,1.00000000000
-9,2024,R2,gasCCGT,2020,1.00000000000
-9,2025,R2,gasCCGT,2020,1.00000000000
-9,2026,R2,gasCCGT,2020,0.80000000000
-9,2028,R2,gasCCGT,2020,0.40000000000
-10,2024,R2,gasCCGT,2022,1.85640000000
-10,2025,R2,gasCCGT,2022,1.85640000000
-10,2026,R2,gasCCGT,2022,1.85640000000
-10,2028,R2,gasCCGT,2022,1.85640000000
-10,2030,R2,gasCCGT,2022,1.85640000000
-10,2032,R2,gasCCGT,2022,1.85640000000
-10,2034,R2,gasCCGT,2022,1.85640000000
-10,2035,R2,gasCCGT,2022,1.85640000000
-10,2036,R2,gasCCGT,2022,1.85640000000
-10,2040,R2,gasCCGT,2022,1.85640000000
-10,2045,R2,gasCCGT,2022,1.85640000000
-10,2046,R2,gasCCGT,2022,1.85640000000
-10,2047,R2,gasCCGT,2022,1.85640000000
-10,2050,R2,gasCCGT,2022,1.85640000000
-10,2058,R2,gasCCGT,2022,1.85640000000
-11,2026,R2,gasCCGT,2024,2.07980000000
-11,2028,R2,gasCCGT,2024,2.07980000000
-11,2030,R2,gasCCGT,2024,2.07980000000
-11,2032,R2,gasCCGT,2024,2.07980000000
-11,2034,R2,gasCCGT,2024,2.07980000000
-11,2035,R2,gasCCGT,2024,2.07980000000
-11,2036,R2,gasCCGT,2024,2.07980000000
-11,2040,R2,gasCCGT,2024,2.07980000000
-11,2045,R2,gasCCGT,2024,2.07980000000
-11,2046,R2,gasCCGT,2024,2.07980000000
-11,2047,R2,gasCCGT,2024,2.07980000000
-11,2050,R2,gasCCGT,2024,2.07980000000
-11,2058,R2,gasCCGT,2024,2.07980000000
-11,2059,R2,gasCCGT,2024,2.07980000000
-11,2060,R2,gasCCGT,2024,2.07980000000
-12,2028,R2,gasCCGT,2026,2.29760000000
-12,2030,R2,gasCCGT,2026,2.29760000000
-12,2032,R2,gasCCGT,2026,2.29760000000
-12,2034,R2,gasCCGT,2026,2.29760000000
-12,2035,R2,gasCCGT,2026,2.29760000000
-12,2036,R2,gasCCGT,2026,2.29760000000
-12,2040,R2,gasCCGT,2026,2.29760000000
-12,2045,R2,gasCCGT,2026,2.29760000000
-12,2046,R2,gasCCGT,2026,2.29760000000
-12,2047,R2,gasCCGT,2026,2.29760000000
-12,2050,R2,gasCCGT,2026,2.29760000000
-12,2058,R2,gasCCGT,2026,2.29760000000
-12,2059,R2,gasCCGT,2026,2.29760000000
-12,2060,R2,gasCCGT,2026,2.29760000000
-12,2061,R2,gasCCGT,2026,2.29760000000
-12,2062,R2,gasCCGT,2026,2.29760000000
-13,2030,R2,gasCCGT,2028,2.31150000000
-13,2032,R2,gasCCGT,2028,2.31150000000
-13,2034,R2,gasCCGT,2028,2.31150000000
-13,2035,R2,gasCCGT,2028,2.31150000000
-13,2036,R2,gasCCGT,2028,2.31150000000
-13,2040,R2,gasCCGT,2028,2.31150000000
-13,2045,R2,gasCCGT,2028,2.31150000000
-13,2046,R2,gasCCGT,2028,2.31150000000
-13,2047,R2,gasCCGT,2028,2.31150000000
-13,2050,R2,gasCCGT,2028,2.31150000000
-13,2058,R2,gasCCGT,2028,2.31150000000
-13,2059,R2,gasCCGT,2028,2.31150000000
-13,2060,R2,gasCCGT,2028,2.31150000000
-13,2061,R2,gasCCGT,2028,2.31150000000
-13,2062,R2,gasCCGT,2028,2.31150000000
-13,2063,R2,gasCCGT,2028,2.31150000000
-13,2064,R2,gasCCGT,2028,2.31150000000
-14,2032,R2,gasCCGT,2030,0.99560000000
-14,2034,R2,gasCCGT,2030,0.99560000000
-14,2035,R2,gasCCGT,2030,0.99560000000
-14,2036,R2,gasCCGT,2030,0.99560000000
-14,2040,R2,gasCCGT,2030,0.99560000000
-14,2045,R2,gasCCGT,2030,0.99560000000
-14,2046,R2,gasCCGT,2030,0.99560000000
-14,2047,R2,gasCCGT,2030,0.99560000000
-14,2050,R2,gasCCGT,2030,0.99560000000
-14,2058,R2,gasCCGT,2030,0.99560000000
-14,2059,R2,gasCCGT,2030,0.99560000000
-14,2060,R2,gasCCGT,2030,0.99560000000
-14,2061,R2,gasCCGT,2030,0.99560000000
-14,2062,R2,gasCCGT,2030,0.99560000000
-14,2063,R2,gasCCGT,2030,0.99560000000
-14,2064,R2,gasCCGT,2030,0.99560000000
-14,2065,R2,gasCCGT,2030,0.99560000000
-14,2066,R2,gasCCGT,2030,0.99560000000
-15,2034,R2,solarPV,2032,2.24000000000
-15,2035,R2,solarPV,2032,2.24000000000
-15,2036,R2,solarPV,2032,2.24000000000
-15,2040,R2,solarPV,2032,2.24000000000
-15,2045,R2,solarPV,2032,2.24000000000
-15,2046,R2,solarPV,2032,2.24000000000
-15,2047,R2,solarPV,2032,2.24000000000
-15,2050,R2,solarPV,2032,2.24000000000
-15,2058,R2,solarPV,2032,2.24000000000
-16,2036,R2,solarPV,2034,2.24000000000
-16,2040,R2,solarPV,2034,2.24000000000
-16,2045,R2,solarPV,2034,2.24000000000
-16,2046,R2,solarPV,2034,2.24000000000
-16,2047,R2,solarPV,2034,2.24000000000
-16,2050,R2,solarPV,2034,2.24000000000
-16,2058,R2,solarPV,2034,2.24000000000
-16,2059,R2,solarPV,2034,2.24000000000
-16,2060,R2,solarPV,2034,2.24000000000
-17,2022,R2,windturbine,2020,8.77320000000
-17,2024,R2,windturbine,2020,8.77320000000
-17,2025,R2,windturbine,2020,8.77320000000
-17,2026,R2,windturbine,2020,8.77320000000
-17,2028,R2,windturbine,2020,8.77320000000
-17,2030,R2,windturbine,2020,8.77320000000
-17,2032,R2,windturbine,2020,8.77320000000
-17,2034,R2,windturbine,2020,8.77320000000
-17,2035,R2,windturbine,2020,8.77320000000
-17,2036,R2,windturbine,2020,8.77320000000
-17,2040,R2,windturbine,2020,8.77320000000
-17,2045,R2,windturbine,2020,8.77320000000
-17,2046,R2,windturbine,2020,8.77320000000
+6,2022,R1,solarPV,2020,4.00000000000
+6,2024,R1,solarPV,2020,4.00000000000
+6,2025,R1,solarPV,2020,4.00000000000
+6,2026,R1,solarPV,2020,4.00000000000
+6,2028,R1,solarPV,2020,4.00000000000
+6,2030,R1,solarPV,2020,4.00000000000
+6,2032,R1,solarPV,2020,4.00000000000
+6,2034,R1,solarPV,2020,4.00000000000
+6,2035,R1,solarPV,2020,4.00000000000
+6,2036,R1,solarPV,2020,4.00000000000
+6,2040,R1,solarPV,2020,4.00000000000
+6,2045,R1,solarPV,2020,4.00000000000
+6,2046,R1,solarPV,2020,4.00000000000
+7,2034,R1,solarPV,2032,2.24000000000
+7,2035,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2032,2.24000000000
+7,2040,R1,solarPV,2032,2.24000000000
+7,2045,R1,solarPV,2032,2.24000000000
+7,2046,R1,solarPV,2032,2.24000000000
+7,2047,R1,solarPV,2032,2.24000000000
+7,2050,R1,solarPV,2032,2.24000000000
+7,2056,R1,solarPV,2032,2.24000000000
+7,2057,R1,solarPV,2032,2.24000000000
+7,2058,R1,solarPV,2032,2.24000000000
+8,2036,R1,solarPV,2034,2.24000000000
+8,2040,R1,solarPV,2034,2.24000000000
+8,2045,R1,solarPV,2034,2.24000000000
+8,2046,R1,solarPV,2034,2.24000000000
+8,2047,R1,solarPV,2034,2.24000000000
+8,2050,R1,solarPV,2034,2.24000000000
+8,2056,R1,solarPV,2034,2.24000000000
+8,2057,R1,solarPV,2034,2.24000000000
+8,2058,R1,solarPV,2034,2.24000000000
+8,2059,R1,solarPV,2034,2.24000000000
+8,2060,R1,solarPV,2034,2.24000000000
+9,2022,R1,windturbine,2020,4.00000000000
+9,2024,R1,windturbine,2020,4.00000000000
+9,2025,R1,windturbine,2020,4.00000000000
+9,2026,R1,windturbine,2020,4.00000000000
+9,2028,R1,windturbine,2020,4.00000000000
+9,2030,R1,windturbine,2020,4.00000000000
+9,2032,R1,windturbine,2020,4.00000000000
+9,2034,R1,windturbine,2020,4.00000000000
+9,2035,R1,windturbine,2020,4.00000000000
+9,2036,R1,windturbine,2020,4.00000000000
+9,2040,R1,windturbine,2020,4.00000000000
+9,2045,R1,windturbine,2020,4.00000000000
+9,2046,R1,windturbine,2020,4.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2022,R2,gasCCGT,2020,1.00000000000
+10,2024,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+10,2026,R2,gasCCGT,2020,0.80000000000
+10,2028,R2,gasCCGT,2020,0.40000000000
+11,2024,R2,gasCCGT,2022,1.85640000000
+11,2025,R2,gasCCGT,2022,1.85640000000
+11,2026,R2,gasCCGT,2022,1.85640000000
+11,2028,R2,gasCCGT,2022,1.85640000000
+11,2030,R2,gasCCGT,2022,1.85640000000
+11,2032,R2,gasCCGT,2022,1.85640000000
+11,2034,R2,gasCCGT,2022,1.85640000000
+11,2035,R2,gasCCGT,2022,1.85640000000
+11,2036,R2,gasCCGT,2022,1.85640000000
+11,2040,R2,gasCCGT,2022,1.85640000000
+11,2045,R2,gasCCGT,2022,1.85640000000
+11,2046,R2,gasCCGT,2022,1.85640000000
+11,2047,R2,gasCCGT,2022,1.85640000000
+11,2050,R2,gasCCGT,2022,1.85640000000
+11,2056,R2,gasCCGT,2022,1.85640000000
+11,2057,R2,gasCCGT,2022,1.85640000000
+11,2058,R2,gasCCGT,2022,1.85640000000
+12,2026,R2,gasCCGT,2024,2.07980000000
+12,2028,R2,gasCCGT,2024,2.07980000000
+12,2030,R2,gasCCGT,2024,2.07980000000
+12,2032,R2,gasCCGT,2024,2.07980000000
+12,2034,R2,gasCCGT,2024,2.07980000000
+12,2035,R2,gasCCGT,2024,2.07980000000
+12,2036,R2,gasCCGT,2024,2.07980000000
+12,2040,R2,gasCCGT,2024,2.07980000000
+12,2045,R2,gasCCGT,2024,2.07980000000
+12,2046,R2,gasCCGT,2024,2.07980000000
+12,2047,R2,gasCCGT,2024,2.07980000000
+12,2050,R2,gasCCGT,2024,2.07980000000
+12,2056,R2,gasCCGT,2024,2.07980000000
+12,2057,R2,gasCCGT,2024,2.07980000000
+12,2058,R2,gasCCGT,2024,2.07980000000
+12,2059,R2,gasCCGT,2024,2.07980000000
+12,2060,R2,gasCCGT,2024,2.07980000000
+13,2028,R2,gasCCGT,2026,2.29760000000
+13,2030,R2,gasCCGT,2026,2.29760000000
+13,2032,R2,gasCCGT,2026,2.29760000000
+13,2034,R2,gasCCGT,2026,2.29760000000
+13,2035,R2,gasCCGT,2026,2.29760000000
+13,2036,R2,gasCCGT,2026,2.29760000000
+13,2040,R2,gasCCGT,2026,2.29760000000
+13,2045,R2,gasCCGT,2026,2.29760000000
+13,2046,R2,gasCCGT,2026,2.29760000000
+13,2047,R2,gasCCGT,2026,2.29760000000
+13,2050,R2,gasCCGT,2026,2.29760000000
+13,2056,R2,gasCCGT,2026,2.29760000000
+13,2057,R2,gasCCGT,2026,2.29760000000
+13,2058,R2,gasCCGT,2026,2.29760000000
+13,2059,R2,gasCCGT,2026,2.29760000000
+13,2060,R2,gasCCGT,2026,2.29760000000
+13,2061,R2,gasCCGT,2026,2.29760000000
+13,2062,R2,gasCCGT,2026,2.29760000000
+14,2030,R2,gasCCGT,2028,2.31150000000
+14,2032,R2,gasCCGT,2028,2.31150000000
+14,2034,R2,gasCCGT,2028,2.31150000000
+14,2035,R2,gasCCGT,2028,2.31150000000
+14,2036,R2,gasCCGT,2028,2.31150000000
+14,2040,R2,gasCCGT,2028,2.31150000000
+14,2045,R2,gasCCGT,2028,2.31150000000
+14,2046,R2,gasCCGT,2028,2.31150000000
+14,2047,R2,gasCCGT,2028,2.31150000000
+14,2050,R2,gasCCGT,2028,2.31150000000
+14,2056,R2,gasCCGT,2028,2.31150000000
+14,2057,R2,gasCCGT,2028,2.31150000000
+14,2058,R2,gasCCGT,2028,2.31150000000
+14,2059,R2,gasCCGT,2028,2.31150000000
+14,2060,R2,gasCCGT,2028,2.31150000000
+14,2061,R2,gasCCGT,2028,2.31150000000
+14,2062,R2,gasCCGT,2028,2.31150000000
+14,2063,R2,gasCCGT,2028,2.31150000000
+14,2064,R2,gasCCGT,2028,2.31150000000
+15,2032,R2,gasCCGT,2030,0.99560000000
+15,2034,R2,gasCCGT,2030,0.99560000000
+15,2035,R2,gasCCGT,2030,0.99560000000
+15,2036,R2,gasCCGT,2030,0.99560000000
+15,2040,R2,gasCCGT,2030,0.99560000000
+15,2045,R2,gasCCGT,2030,0.99560000000
+15,2046,R2,gasCCGT,2030,0.99560000000
+15,2047,R2,gasCCGT,2030,0.99560000000
+15,2050,R2,gasCCGT,2030,0.99560000000
+15,2056,R2,gasCCGT,2030,0.99560000000
+15,2057,R2,gasCCGT,2030,0.99560000000
+15,2058,R2,gasCCGT,2030,0.99560000000
+15,2059,R2,gasCCGT,2030,0.99560000000
+15,2060,R2,gasCCGT,2030,0.99560000000
+15,2061,R2,gasCCGT,2030,0.99560000000
+15,2062,R2,gasCCGT,2030,0.99560000000
+15,2063,R2,gasCCGT,2030,0.99560000000
+15,2064,R2,gasCCGT,2030,0.99560000000
+15,2065,R2,gasCCGT,2030,0.99560000000
+15,2066,R2,gasCCGT,2030,0.99560000000
+16,2034,R2,solarPV,2032,2.24000000000
+16,2035,R2,solarPV,2032,2.24000000000
+16,2036,R2,solarPV,2032,2.24000000000
+16,2040,R2,solarPV,2032,2.24000000000
+16,2045,R2,solarPV,2032,2.24000000000
+16,2046,R2,solarPV,2032,2.24000000000
+16,2047,R2,solarPV,2032,2.24000000000
+16,2050,R2,solarPV,2032,2.24000000000
+16,2056,R2,solarPV,2032,2.24000000000
+16,2057,R2,solarPV,2032,2.24000000000
+16,2058,R2,solarPV,2032,2.24000000000
+17,2036,R2,solarPV,2034,2.24000000000
+17,2040,R2,solarPV,2034,2.24000000000
+17,2045,R2,solarPV,2034,2.24000000000
+17,2046,R2,solarPV,2034,2.24000000000
+17,2047,R2,solarPV,2034,2.24000000000
+17,2050,R2,solarPV,2034,2.24000000000
+17,2056,R2,solarPV,2034,2.24000000000
+17,2057,R2,solarPV,2034,2.24000000000
+17,2058,R2,solarPV,2034,2.24000000000
+17,2059,R2,solarPV,2034,2.24000000000
+17,2060,R2,solarPV,2034,2.24000000000
+18,2022,R2,windturbine,2020,8.77320000000
+18,2024,R2,windturbine,2020,8.77320000000
+18,2025,R2,windturbine,2020,8.77320000000
+18,2026,R2,windturbine,2020,8.77320000000
+18,2028,R2,windturbine,2020,8.77320000000
+18,2030,R2,windturbine,2020,8.77320000000
+18,2032,R2,windturbine,2020,8.77320000000
+18,2034,R2,windturbine,2020,8.77320000000
+18,2035,R2,windturbine,2020,8.77320000000
+18,2036,R2,windturbine,2020,8.77320000000
+18,2040,R2,windturbine,2020,8.77320000000
+18,2045,R2,windturbine,2020,8.77320000000
+18,2046,R2,windturbine,2020,8.77320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
new file mode 100644
index 00000000..7f59af05
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
@@ -0,0 +1,67 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2025,R1,solarPV,2020,6.75000000000
+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,2035,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2030,6.00000000000
+3,2045,R1,solarPV,2030,6.00000000000
+3,2049,R1,solarPV,2030,6.00000000000
+3,2050,R1,solarPV,2030,6.00000000000
+3,2059,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+5,2025,R1,windturbine,2020,10.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
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,1.00000000000
+7,2030,R2,gasCCGT,2025,5.88890000000
+7,2035,R2,gasCCGT,2025,5.88890000000
+7,2040,R2,gasCCGT,2025,5.88890000000
+7,2045,R2,gasCCGT,2025,5.88890000000
+7,2049,R2,gasCCGT,2025,5.88890000000
+7,2050,R2,gasCCGT,2025,5.88890000000
+7,2059,R2,gasCCGT,2025,5.88890000000
+7,2060,R2,gasCCGT,2025,5.88890000000
+7,2064,R2,gasCCGT,2025,5.88890000000
+8,2035,R2,solarPV,2030,6.00000000000
+8,2040,R2,solarPV,2030,6.00000000000
+8,2045,R2,solarPV,2030,6.00000000000
+8,2049,R2,solarPV,2030,6.00000000000
+8,2050,R2,solarPV,2030,6.00000000000
+8,2059,R2,solarPV,2030,6.00000000000
+9,2040,R2,solarPV,2035,6.00000000000
+9,2045,R2,solarPV,2035,6.00000000000
+9,2049,R2,solarPV,2035,6.00000000000
+9,2050,R2,solarPV,2035,6.00000000000
+9,2059,R2,solarPV,2035,6.00000000000
+9,2060,R2,solarPV,2035,6.00000000000
+9,2064,R2,solarPV,2035,6.00000000000
+10,2025,R2,windturbine,2020,16.75000000000
+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
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 0bb607db..e5409877 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,10 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2032,R1,gasCCGT,2020,0.34360000000
+0,2034,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2036,R1,gasCCGT,2020,0.34360000000
+0,2038,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -20,6 +32,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -34,6 +48,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -49,6 +65,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -65,6 +83,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -82,6 +102,8 @@ asset,year,region,technology,installed,capacity
 5,2046,R1,gasCCGT,2030,0.99560000000
 5,2047,R1,gasCCGT,2030,0.99560000000
 5,2050,R1,gasCCGT,2030,0.99560000000
+5,2056,R1,gasCCGT,2030,0.99560000000
+5,2057,R1,gasCCGT,2030,0.99560000000
 5,2058,R1,gasCCGT,2030,0.99560000000
 5,2059,R1,gasCCGT,2030,0.99560000000
 5,2060,R1,gasCCGT,2030,0.99560000000
@@ -91,185 +113,221 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,solarPV,2032,2.24000000000
-6,2035,R1,solarPV,2032,2.24000000000
-6,2036,R1,solarPV,2032,2.24000000000
-6,2038,R1,solarPV,2032,2.24000000000
-6,2040,R1,solarPV,2032,2.24000000000
-6,2045,R1,solarPV,2032,2.24000000000
-6,2046,R1,solarPV,2032,2.24000000000
-6,2047,R1,solarPV,2032,2.24000000000
-6,2050,R1,solarPV,2032,2.24000000000
-6,2058,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2034,2.24000000000
-7,2038,R1,solarPV,2034,2.24000000000
-7,2040,R1,solarPV,2034,2.24000000000
-7,2045,R1,solarPV,2034,2.24000000000
-7,2046,R1,solarPV,2034,2.24000000000
-7,2047,R1,solarPV,2034,2.24000000000
-7,2050,R1,solarPV,2034,2.24000000000
-7,2058,R1,solarPV,2034,2.24000000000
-7,2059,R1,solarPV,2034,2.24000000000
-7,2060,R1,solarPV,2034,2.24000000000
-8,2038,R1,solarPV,2036,2.24000000000
-8,2040,R1,solarPV,2036,2.24000000000
-8,2045,R1,solarPV,2036,2.24000000000
-8,2046,R1,solarPV,2036,2.24000000000
-8,2047,R1,solarPV,2036,2.24000000000
-8,2050,R1,solarPV,2036,2.24000000000
-8,2058,R1,solarPV,2036,2.24000000000
-8,2059,R1,solarPV,2036,2.24000000000
-8,2060,R1,solarPV,2036,2.24000000000
-8,2061,R1,solarPV,2036,2.24000000000
-8,2062,R1,solarPV,2036,2.24000000000
-9,2022,R1,windturbine,2020,8.77320000000
-9,2024,R1,windturbine,2020,8.77320000000
-9,2025,R1,windturbine,2020,8.77320000000
-9,2026,R1,windturbine,2020,8.77320000000
-9,2028,R1,windturbine,2020,8.77320000000
-9,2030,R1,windturbine,2020,8.77320000000
-9,2032,R1,windturbine,2020,8.77320000000
-9,2034,R1,windturbine,2020,8.77320000000
-9,2035,R1,windturbine,2020,8.77320000000
-9,2036,R1,windturbine,2020,8.77320000000
-9,2038,R1,windturbine,2020,8.77320000000
-9,2040,R1,windturbine,2020,8.77320000000
-9,2045,R1,windturbine,2020,8.77320000000
-9,2046,R1,windturbine,2020,8.77320000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2022,R2,gasCCGT,2020,1.00000000000
-10,2024,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-10,2026,R2,gasCCGT,2020,0.80000000000
-10,2028,R2,gasCCGT,2020,0.40000000000
-11,2024,R2,gasCCGT,2022,1.85640000000
-11,2025,R2,gasCCGT,2022,1.85640000000
-11,2026,R2,gasCCGT,2022,1.85640000000
-11,2028,R2,gasCCGT,2022,1.85640000000
-11,2030,R2,gasCCGT,2022,1.85640000000
-11,2032,R2,gasCCGT,2022,1.85640000000
-11,2034,R2,gasCCGT,2022,1.85640000000
-11,2035,R2,gasCCGT,2022,1.85640000000
-11,2036,R2,gasCCGT,2022,1.85640000000
-11,2038,R2,gasCCGT,2022,1.85640000000
-11,2040,R2,gasCCGT,2022,1.85640000000
-11,2045,R2,gasCCGT,2022,1.85640000000
-11,2046,R2,gasCCGT,2022,1.85640000000
-11,2047,R2,gasCCGT,2022,1.85640000000
-11,2050,R2,gasCCGT,2022,1.85640000000
-11,2058,R2,gasCCGT,2022,1.85640000000
-12,2026,R2,gasCCGT,2024,2.07980000000
-12,2028,R2,gasCCGT,2024,2.07980000000
-12,2030,R2,gasCCGT,2024,2.07980000000
-12,2032,R2,gasCCGT,2024,2.07980000000
-12,2034,R2,gasCCGT,2024,2.07980000000
-12,2035,R2,gasCCGT,2024,2.07980000000
-12,2036,R2,gasCCGT,2024,2.07980000000
-12,2038,R2,gasCCGT,2024,2.07980000000
-12,2040,R2,gasCCGT,2024,2.07980000000
-12,2045,R2,gasCCGT,2024,2.07980000000
-12,2046,R2,gasCCGT,2024,2.07980000000
-12,2047,R2,gasCCGT,2024,2.07980000000
-12,2050,R2,gasCCGT,2024,2.07980000000
-12,2058,R2,gasCCGT,2024,2.07980000000
-12,2059,R2,gasCCGT,2024,2.07980000000
-12,2060,R2,gasCCGT,2024,2.07980000000
-13,2028,R2,gasCCGT,2026,2.29760000000
-13,2030,R2,gasCCGT,2026,2.29760000000
-13,2032,R2,gasCCGT,2026,2.29760000000
-13,2034,R2,gasCCGT,2026,2.29760000000
-13,2035,R2,gasCCGT,2026,2.29760000000
-13,2036,R2,gasCCGT,2026,2.29760000000
-13,2038,R2,gasCCGT,2026,2.29760000000
-13,2040,R2,gasCCGT,2026,2.29760000000
-13,2045,R2,gasCCGT,2026,2.29760000000
-13,2046,R2,gasCCGT,2026,2.29760000000
-13,2047,R2,gasCCGT,2026,2.29760000000
-13,2050,R2,gasCCGT,2026,2.29760000000
-13,2058,R2,gasCCGT,2026,2.29760000000
-13,2059,R2,gasCCGT,2026,2.29760000000
-13,2060,R2,gasCCGT,2026,2.29760000000
-13,2061,R2,gasCCGT,2026,2.29760000000
-13,2062,R2,gasCCGT,2026,2.29760000000
-14,2030,R2,gasCCGT,2028,2.31150000000
-14,2032,R2,gasCCGT,2028,2.31150000000
-14,2034,R2,gasCCGT,2028,2.31150000000
-14,2035,R2,gasCCGT,2028,2.31150000000
-14,2036,R2,gasCCGT,2028,2.31150000000
-14,2038,R2,gasCCGT,2028,2.31150000000
-14,2040,R2,gasCCGT,2028,2.31150000000
-14,2045,R2,gasCCGT,2028,2.31150000000
-14,2046,R2,gasCCGT,2028,2.31150000000
-14,2047,R2,gasCCGT,2028,2.31150000000
-14,2050,R2,gasCCGT,2028,2.31150000000
-14,2058,R2,gasCCGT,2028,2.31150000000
-14,2059,R2,gasCCGT,2028,2.31150000000
-14,2060,R2,gasCCGT,2028,2.31150000000
-14,2061,R2,gasCCGT,2028,2.31150000000
-14,2062,R2,gasCCGT,2028,2.31150000000
-14,2063,R2,gasCCGT,2028,2.31150000000
-14,2064,R2,gasCCGT,2028,2.31150000000
-15,2032,R2,gasCCGT,2030,0.99560000000
-15,2034,R2,gasCCGT,2030,0.99560000000
-15,2035,R2,gasCCGT,2030,0.99560000000
-15,2036,R2,gasCCGT,2030,0.99560000000
-15,2038,R2,gasCCGT,2030,0.99560000000
-15,2040,R2,gasCCGT,2030,0.99560000000
-15,2045,R2,gasCCGT,2030,0.99560000000
-15,2046,R2,gasCCGT,2030,0.99560000000
-15,2047,R2,gasCCGT,2030,0.99560000000
-15,2050,R2,gasCCGT,2030,0.99560000000
-15,2058,R2,gasCCGT,2030,0.99560000000
-15,2059,R2,gasCCGT,2030,0.99560000000
-15,2060,R2,gasCCGT,2030,0.99560000000
-15,2061,R2,gasCCGT,2030,0.99560000000
-15,2062,R2,gasCCGT,2030,0.99560000000
-15,2063,R2,gasCCGT,2030,0.99560000000
-15,2064,R2,gasCCGT,2030,0.99560000000
-15,2065,R2,gasCCGT,2030,0.99560000000
-15,2066,R2,gasCCGT,2030,0.99560000000
-16,2034,R2,solarPV,2032,2.24000000000
-16,2035,R2,solarPV,2032,2.24000000000
-16,2036,R2,solarPV,2032,2.24000000000
-16,2038,R2,solarPV,2032,2.24000000000
-16,2040,R2,solarPV,2032,2.24000000000
-16,2045,R2,solarPV,2032,2.24000000000
-16,2046,R2,solarPV,2032,2.24000000000
-16,2047,R2,solarPV,2032,2.24000000000
-16,2050,R2,solarPV,2032,2.24000000000
-16,2058,R2,solarPV,2032,2.24000000000
-17,2036,R2,solarPV,2034,2.24000000000
-17,2038,R2,solarPV,2034,2.24000000000
-17,2040,R2,solarPV,2034,2.24000000000
-17,2045,R2,solarPV,2034,2.24000000000
-17,2046,R2,solarPV,2034,2.24000000000
-17,2047,R2,solarPV,2034,2.24000000000
-17,2050,R2,solarPV,2034,2.24000000000
-17,2058,R2,solarPV,2034,2.24000000000
-17,2059,R2,solarPV,2034,2.24000000000
-17,2060,R2,solarPV,2034,2.24000000000
-18,2038,R2,solarPV,2036,2.24000000000
-18,2040,R2,solarPV,2036,2.24000000000
-18,2045,R2,solarPV,2036,2.24000000000
-18,2046,R2,solarPV,2036,2.24000000000
-18,2047,R2,solarPV,2036,2.24000000000
-18,2050,R2,solarPV,2036,2.24000000000
-18,2058,R2,solarPV,2036,2.24000000000
-18,2059,R2,solarPV,2036,2.24000000000
-18,2060,R2,solarPV,2036,2.24000000000
-18,2061,R2,solarPV,2036,2.24000000000
-18,2062,R2,solarPV,2036,2.24000000000
-19,2022,R2,windturbine,2020,8.77320000000
-19,2024,R2,windturbine,2020,8.77320000000
-19,2025,R2,windturbine,2020,8.77320000000
-19,2026,R2,windturbine,2020,8.77320000000
-19,2028,R2,windturbine,2020,8.77320000000
-19,2030,R2,windturbine,2020,8.77320000000
-19,2032,R2,windturbine,2020,8.77320000000
-19,2034,R2,windturbine,2020,8.77320000000
-19,2035,R2,windturbine,2020,8.77320000000
-19,2036,R2,windturbine,2020,8.77320000000
-19,2038,R2,windturbine,2020,8.77320000000
-19,2040,R2,windturbine,2020,8.77320000000
-19,2045,R2,windturbine,2020,8.77320000000
-19,2046,R2,windturbine,2020,8.77320000000
+6,2022,R1,solarPV,2020,4.00000000000
+6,2024,R1,solarPV,2020,4.00000000000
+6,2025,R1,solarPV,2020,4.00000000000
+6,2026,R1,solarPV,2020,4.00000000000
+6,2028,R1,solarPV,2020,4.00000000000
+6,2030,R1,solarPV,2020,4.00000000000
+6,2032,R1,solarPV,2020,4.00000000000
+6,2034,R1,solarPV,2020,4.00000000000
+6,2035,R1,solarPV,2020,4.00000000000
+6,2036,R1,solarPV,2020,4.00000000000
+6,2038,R1,solarPV,2020,4.00000000000
+6,2040,R1,solarPV,2020,4.00000000000
+6,2045,R1,solarPV,2020,4.00000000000
+6,2046,R1,solarPV,2020,4.00000000000
+7,2034,R1,solarPV,2032,2.24000000000
+7,2035,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2032,2.24000000000
+7,2038,R1,solarPV,2032,2.24000000000
+7,2040,R1,solarPV,2032,2.24000000000
+7,2045,R1,solarPV,2032,2.24000000000
+7,2046,R1,solarPV,2032,2.24000000000
+7,2047,R1,solarPV,2032,2.24000000000
+7,2050,R1,solarPV,2032,2.24000000000
+7,2056,R1,solarPV,2032,2.24000000000
+7,2057,R1,solarPV,2032,2.24000000000
+7,2058,R1,solarPV,2032,2.24000000000
+8,2036,R1,solarPV,2034,2.24000000000
+8,2038,R1,solarPV,2034,2.24000000000
+8,2040,R1,solarPV,2034,2.24000000000
+8,2045,R1,solarPV,2034,2.24000000000
+8,2046,R1,solarPV,2034,2.24000000000
+8,2047,R1,solarPV,2034,2.24000000000
+8,2050,R1,solarPV,2034,2.24000000000
+8,2056,R1,solarPV,2034,2.24000000000
+8,2057,R1,solarPV,2034,2.24000000000
+8,2058,R1,solarPV,2034,2.24000000000
+8,2059,R1,solarPV,2034,2.24000000000
+8,2060,R1,solarPV,2034,2.24000000000
+9,2038,R1,solarPV,2036,2.24000000000
+9,2040,R1,solarPV,2036,2.24000000000
+9,2045,R1,solarPV,2036,2.24000000000
+9,2046,R1,solarPV,2036,2.24000000000
+9,2047,R1,solarPV,2036,2.24000000000
+9,2050,R1,solarPV,2036,2.24000000000
+9,2056,R1,solarPV,2036,2.24000000000
+9,2057,R1,solarPV,2036,2.24000000000
+9,2058,R1,solarPV,2036,2.24000000000
+9,2059,R1,solarPV,2036,2.24000000000
+9,2060,R1,solarPV,2036,2.24000000000
+9,2061,R1,solarPV,2036,2.24000000000
+9,2062,R1,solarPV,2036,2.24000000000
+10,2022,R1,windturbine,2020,4.00000000000
+10,2024,R1,windturbine,2020,4.00000000000
+10,2025,R1,windturbine,2020,4.00000000000
+10,2026,R1,windturbine,2020,4.00000000000
+10,2028,R1,windturbine,2020,4.00000000000
+10,2030,R1,windturbine,2020,4.00000000000
+10,2032,R1,windturbine,2020,4.00000000000
+10,2034,R1,windturbine,2020,4.00000000000
+10,2035,R1,windturbine,2020,4.00000000000
+10,2036,R1,windturbine,2020,4.00000000000
+10,2038,R1,windturbine,2020,4.00000000000
+10,2040,R1,windturbine,2020,4.00000000000
+10,2045,R1,windturbine,2020,4.00000000000
+10,2046,R1,windturbine,2020,4.00000000000
+11,2020,R2,gasCCGT,2020,1.00000000000
+11,2022,R2,gasCCGT,2020,1.00000000000
+11,2024,R2,gasCCGT,2020,1.00000000000
+11,2025,R2,gasCCGT,2020,1.00000000000
+11,2026,R2,gasCCGT,2020,0.80000000000
+11,2028,R2,gasCCGT,2020,0.40000000000
+12,2024,R2,gasCCGT,2022,1.85640000000
+12,2025,R2,gasCCGT,2022,1.85640000000
+12,2026,R2,gasCCGT,2022,1.85640000000
+12,2028,R2,gasCCGT,2022,1.85640000000
+12,2030,R2,gasCCGT,2022,1.85640000000
+12,2032,R2,gasCCGT,2022,1.85640000000
+12,2034,R2,gasCCGT,2022,1.85640000000
+12,2035,R2,gasCCGT,2022,1.85640000000
+12,2036,R2,gasCCGT,2022,1.85640000000
+12,2038,R2,gasCCGT,2022,1.85640000000
+12,2040,R2,gasCCGT,2022,1.85640000000
+12,2045,R2,gasCCGT,2022,1.85640000000
+12,2046,R2,gasCCGT,2022,1.85640000000
+12,2047,R2,gasCCGT,2022,1.85640000000
+12,2050,R2,gasCCGT,2022,1.85640000000
+12,2056,R2,gasCCGT,2022,1.85640000000
+12,2057,R2,gasCCGT,2022,1.85640000000
+12,2058,R2,gasCCGT,2022,1.85640000000
+13,2026,R2,gasCCGT,2024,2.07980000000
+13,2028,R2,gasCCGT,2024,2.07980000000
+13,2030,R2,gasCCGT,2024,2.07980000000
+13,2032,R2,gasCCGT,2024,2.07980000000
+13,2034,R2,gasCCGT,2024,2.07980000000
+13,2035,R2,gasCCGT,2024,2.07980000000
+13,2036,R2,gasCCGT,2024,2.07980000000
+13,2038,R2,gasCCGT,2024,2.07980000000
+13,2040,R2,gasCCGT,2024,2.07980000000
+13,2045,R2,gasCCGT,2024,2.07980000000
+13,2046,R2,gasCCGT,2024,2.07980000000
+13,2047,R2,gasCCGT,2024,2.07980000000
+13,2050,R2,gasCCGT,2024,2.07980000000
+13,2056,R2,gasCCGT,2024,2.07980000000
+13,2057,R2,gasCCGT,2024,2.07980000000
+13,2058,R2,gasCCGT,2024,2.07980000000
+13,2059,R2,gasCCGT,2024,2.07980000000
+13,2060,R2,gasCCGT,2024,2.07980000000
+14,2028,R2,gasCCGT,2026,2.29760000000
+14,2030,R2,gasCCGT,2026,2.29760000000
+14,2032,R2,gasCCGT,2026,2.29760000000
+14,2034,R2,gasCCGT,2026,2.29760000000
+14,2035,R2,gasCCGT,2026,2.29760000000
+14,2036,R2,gasCCGT,2026,2.29760000000
+14,2038,R2,gasCCGT,2026,2.29760000000
+14,2040,R2,gasCCGT,2026,2.29760000000
+14,2045,R2,gasCCGT,2026,2.29760000000
+14,2046,R2,gasCCGT,2026,2.29760000000
+14,2047,R2,gasCCGT,2026,2.29760000000
+14,2050,R2,gasCCGT,2026,2.29760000000
+14,2056,R2,gasCCGT,2026,2.29760000000
+14,2057,R2,gasCCGT,2026,2.29760000000
+14,2058,R2,gasCCGT,2026,2.29760000000
+14,2059,R2,gasCCGT,2026,2.29760000000
+14,2060,R2,gasCCGT,2026,2.29760000000
+14,2061,R2,gasCCGT,2026,2.29760000000
+14,2062,R2,gasCCGT,2026,2.29760000000
+15,2030,R2,gasCCGT,2028,2.31150000000
+15,2032,R2,gasCCGT,2028,2.31150000000
+15,2034,R2,gasCCGT,2028,2.31150000000
+15,2035,R2,gasCCGT,2028,2.31150000000
+15,2036,R2,gasCCGT,2028,2.31150000000
+15,2038,R2,gasCCGT,2028,2.31150000000
+15,2040,R2,gasCCGT,2028,2.31150000000
+15,2045,R2,gasCCGT,2028,2.31150000000
+15,2046,R2,gasCCGT,2028,2.31150000000
+15,2047,R2,gasCCGT,2028,2.31150000000
+15,2050,R2,gasCCGT,2028,2.31150000000
+15,2056,R2,gasCCGT,2028,2.31150000000
+15,2057,R2,gasCCGT,2028,2.31150000000
+15,2058,R2,gasCCGT,2028,2.31150000000
+15,2059,R2,gasCCGT,2028,2.31150000000
+15,2060,R2,gasCCGT,2028,2.31150000000
+15,2061,R2,gasCCGT,2028,2.31150000000
+15,2062,R2,gasCCGT,2028,2.31150000000
+15,2063,R2,gasCCGT,2028,2.31150000000
+15,2064,R2,gasCCGT,2028,2.31150000000
+16,2032,R2,gasCCGT,2030,0.99560000000
+16,2034,R2,gasCCGT,2030,0.99560000000
+16,2035,R2,gasCCGT,2030,0.99560000000
+16,2036,R2,gasCCGT,2030,0.99560000000
+16,2038,R2,gasCCGT,2030,0.99560000000
+16,2040,R2,gasCCGT,2030,0.99560000000
+16,2045,R2,gasCCGT,2030,0.99560000000
+16,2046,R2,gasCCGT,2030,0.99560000000
+16,2047,R2,gasCCGT,2030,0.99560000000
+16,2050,R2,gasCCGT,2030,0.99560000000
+16,2056,R2,gasCCGT,2030,0.99560000000
+16,2057,R2,gasCCGT,2030,0.99560000000
+16,2058,R2,gasCCGT,2030,0.99560000000
+16,2059,R2,gasCCGT,2030,0.99560000000
+16,2060,R2,gasCCGT,2030,0.99560000000
+16,2061,R2,gasCCGT,2030,0.99560000000
+16,2062,R2,gasCCGT,2030,0.99560000000
+16,2063,R2,gasCCGT,2030,0.99560000000
+16,2064,R2,gasCCGT,2030,0.99560000000
+16,2065,R2,gasCCGT,2030,0.99560000000
+16,2066,R2,gasCCGT,2030,0.99560000000
+17,2034,R2,solarPV,2032,2.24000000000
+17,2035,R2,solarPV,2032,2.24000000000
+17,2036,R2,solarPV,2032,2.24000000000
+17,2038,R2,solarPV,2032,2.24000000000
+17,2040,R2,solarPV,2032,2.24000000000
+17,2045,R2,solarPV,2032,2.24000000000
+17,2046,R2,solarPV,2032,2.24000000000
+17,2047,R2,solarPV,2032,2.24000000000
+17,2050,R2,solarPV,2032,2.24000000000
+17,2056,R2,solarPV,2032,2.24000000000
+17,2057,R2,solarPV,2032,2.24000000000
+17,2058,R2,solarPV,2032,2.24000000000
+18,2036,R2,solarPV,2034,2.24000000000
+18,2038,R2,solarPV,2034,2.24000000000
+18,2040,R2,solarPV,2034,2.24000000000
+18,2045,R2,solarPV,2034,2.24000000000
+18,2046,R2,solarPV,2034,2.24000000000
+18,2047,R2,solarPV,2034,2.24000000000
+18,2050,R2,solarPV,2034,2.24000000000
+18,2056,R2,solarPV,2034,2.24000000000
+18,2057,R2,solarPV,2034,2.24000000000
+18,2058,R2,solarPV,2034,2.24000000000
+18,2059,R2,solarPV,2034,2.24000000000
+18,2060,R2,solarPV,2034,2.24000000000
+19,2038,R2,solarPV,2036,2.24000000000
+19,2040,R2,solarPV,2036,2.24000000000
+19,2045,R2,solarPV,2036,2.24000000000
+19,2046,R2,solarPV,2036,2.24000000000
+19,2047,R2,solarPV,2036,2.24000000000
+19,2050,R2,solarPV,2036,2.24000000000
+19,2056,R2,solarPV,2036,2.24000000000
+19,2057,R2,solarPV,2036,2.24000000000
+19,2058,R2,solarPV,2036,2.24000000000
+19,2059,R2,solarPV,2036,2.24000000000
+19,2060,R2,solarPV,2036,2.24000000000
+19,2061,R2,solarPV,2036,2.24000000000
+19,2062,R2,solarPV,2036,2.24000000000
+20,2022,R2,windturbine,2020,8.77320000000
+20,2024,R2,windturbine,2020,8.77320000000
+20,2025,R2,windturbine,2020,8.77320000000
+20,2026,R2,windturbine,2020,8.77320000000
+20,2028,R2,windturbine,2020,8.77320000000
+20,2030,R2,windturbine,2020,8.77320000000
+20,2032,R2,windturbine,2020,8.77320000000
+20,2034,R2,windturbine,2020,8.77320000000
+20,2035,R2,windturbine,2020,8.77320000000
+20,2036,R2,windturbine,2020,8.77320000000
+20,2038,R2,windturbine,2020,8.77320000000
+20,2040,R2,windturbine,2020,8.77320000000
+20,2045,R2,windturbine,2020,8.77320000000
+20,2046,R2,windturbine,2020,8.77320000000
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 6bbb7886..a09b4c30 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,10 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2032,R1,gasCCGT,2020,0.34360000000
+0,2034,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2036,R1,gasCCGT,2020,0.34360000000
+0,2038,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -20,6 +32,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -34,6 +48,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -49,6 +65,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -65,6 +83,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -82,6 +102,8 @@ asset,year,region,technology,installed,capacity
 5,2046,R1,gasCCGT,2030,0.99560000000
 5,2047,R1,gasCCGT,2030,0.99560000000
 5,2050,R1,gasCCGT,2030,0.99560000000
+5,2056,R1,gasCCGT,2030,0.99560000000
+5,2057,R1,gasCCGT,2030,0.99560000000
 5,2058,R1,gasCCGT,2030,0.99560000000
 5,2059,R1,gasCCGT,2030,0.99560000000
 5,2060,R1,gasCCGT,2030,0.99560000000
@@ -91,209 +113,249 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,solarPV,2032,2.24000000000
-6,2035,R1,solarPV,2032,2.24000000000
-6,2036,R1,solarPV,2032,2.24000000000
-6,2038,R1,solarPV,2032,2.24000000000
-6,2040,R1,solarPV,2032,2.24000000000
-6,2045,R1,solarPV,2032,2.24000000000
-6,2046,R1,solarPV,2032,2.24000000000
-6,2047,R1,solarPV,2032,2.24000000000
-6,2050,R1,solarPV,2032,2.24000000000
-6,2058,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2034,2.24000000000
-7,2038,R1,solarPV,2034,2.24000000000
-7,2040,R1,solarPV,2034,2.24000000000
-7,2045,R1,solarPV,2034,2.24000000000
-7,2046,R1,solarPV,2034,2.24000000000
-7,2047,R1,solarPV,2034,2.24000000000
-7,2050,R1,solarPV,2034,2.24000000000
-7,2058,R1,solarPV,2034,2.24000000000
-7,2059,R1,solarPV,2034,2.24000000000
-7,2060,R1,solarPV,2034,2.24000000000
-8,2038,R1,solarPV,2036,2.24000000000
-8,2040,R1,solarPV,2036,2.24000000000
-8,2045,R1,solarPV,2036,2.24000000000
-8,2046,R1,solarPV,2036,2.24000000000
-8,2047,R1,solarPV,2036,2.24000000000
-8,2050,R1,solarPV,2036,2.24000000000
-8,2058,R1,solarPV,2036,2.24000000000
-8,2059,R1,solarPV,2036,2.24000000000
-8,2060,R1,solarPV,2036,2.24000000000
-8,2061,R1,solarPV,2036,2.24000000000
-8,2062,R1,solarPV,2036,2.24000000000
-9,2040,R1,solarPV,2038,2.24000000000
-9,2045,R1,solarPV,2038,2.24000000000
-9,2046,R1,solarPV,2038,2.24000000000
-9,2047,R1,solarPV,2038,2.24000000000
-9,2050,R1,solarPV,2038,2.24000000000
-9,2058,R1,solarPV,2038,2.24000000000
-9,2059,R1,solarPV,2038,2.24000000000
-9,2060,R1,solarPV,2038,2.24000000000
-9,2061,R1,solarPV,2038,2.24000000000
-9,2062,R1,solarPV,2038,2.24000000000
-9,2063,R1,solarPV,2038,2.24000000000
-9,2064,R1,solarPV,2038,2.24000000000
-10,2022,R1,windturbine,2020,8.77320000000
-10,2024,R1,windturbine,2020,8.77320000000
-10,2025,R1,windturbine,2020,8.77320000000
-10,2026,R1,windturbine,2020,8.77320000000
-10,2028,R1,windturbine,2020,8.77320000000
-10,2030,R1,windturbine,2020,8.77320000000
-10,2032,R1,windturbine,2020,8.77320000000
-10,2034,R1,windturbine,2020,8.77320000000
-10,2035,R1,windturbine,2020,8.77320000000
-10,2036,R1,windturbine,2020,8.77320000000
-10,2038,R1,windturbine,2020,8.77320000000
-10,2040,R1,windturbine,2020,8.77320000000
-10,2045,R1,windturbine,2020,8.77320000000
-10,2046,R1,windturbine,2020,8.77320000000
-11,2020,R2,gasCCGT,2020,1.00000000000
-11,2022,R2,gasCCGT,2020,1.00000000000
-11,2024,R2,gasCCGT,2020,1.00000000000
-11,2025,R2,gasCCGT,2020,1.00000000000
-11,2026,R2,gasCCGT,2020,0.80000000000
-11,2028,R2,gasCCGT,2020,0.40000000000
-12,2024,R2,gasCCGT,2022,1.85640000000
-12,2025,R2,gasCCGT,2022,1.85640000000
-12,2026,R2,gasCCGT,2022,1.85640000000
-12,2028,R2,gasCCGT,2022,1.85640000000
-12,2030,R2,gasCCGT,2022,1.85640000000
-12,2032,R2,gasCCGT,2022,1.85640000000
-12,2034,R2,gasCCGT,2022,1.85640000000
-12,2035,R2,gasCCGT,2022,1.85640000000
-12,2036,R2,gasCCGT,2022,1.85640000000
-12,2038,R2,gasCCGT,2022,1.85640000000
-12,2040,R2,gasCCGT,2022,1.85640000000
-12,2045,R2,gasCCGT,2022,1.85640000000
-12,2046,R2,gasCCGT,2022,1.85640000000
-12,2047,R2,gasCCGT,2022,1.85640000000
-12,2050,R2,gasCCGT,2022,1.85640000000
-12,2058,R2,gasCCGT,2022,1.85640000000
-13,2026,R2,gasCCGT,2024,2.07980000000
-13,2028,R2,gasCCGT,2024,2.07980000000
-13,2030,R2,gasCCGT,2024,2.07980000000
-13,2032,R2,gasCCGT,2024,2.07980000000
-13,2034,R2,gasCCGT,2024,2.07980000000
-13,2035,R2,gasCCGT,2024,2.07980000000
-13,2036,R2,gasCCGT,2024,2.07980000000
-13,2038,R2,gasCCGT,2024,2.07980000000
-13,2040,R2,gasCCGT,2024,2.07980000000
-13,2045,R2,gasCCGT,2024,2.07980000000
-13,2046,R2,gasCCGT,2024,2.07980000000
-13,2047,R2,gasCCGT,2024,2.07980000000
-13,2050,R2,gasCCGT,2024,2.07980000000
-13,2058,R2,gasCCGT,2024,2.07980000000
-13,2059,R2,gasCCGT,2024,2.07980000000
-13,2060,R2,gasCCGT,2024,2.07980000000
-14,2028,R2,gasCCGT,2026,2.29760000000
-14,2030,R2,gasCCGT,2026,2.29760000000
-14,2032,R2,gasCCGT,2026,2.29760000000
-14,2034,R2,gasCCGT,2026,2.29760000000
-14,2035,R2,gasCCGT,2026,2.29760000000
-14,2036,R2,gasCCGT,2026,2.29760000000
-14,2038,R2,gasCCGT,2026,2.29760000000
-14,2040,R2,gasCCGT,2026,2.29760000000
-14,2045,R2,gasCCGT,2026,2.29760000000
-14,2046,R2,gasCCGT,2026,2.29760000000
-14,2047,R2,gasCCGT,2026,2.29760000000
-14,2050,R2,gasCCGT,2026,2.29760000000
-14,2058,R2,gasCCGT,2026,2.29760000000
-14,2059,R2,gasCCGT,2026,2.29760000000
-14,2060,R2,gasCCGT,2026,2.29760000000
-14,2061,R2,gasCCGT,2026,2.29760000000
-14,2062,R2,gasCCGT,2026,2.29760000000
-15,2030,R2,gasCCGT,2028,2.31150000000
-15,2032,R2,gasCCGT,2028,2.31150000000
-15,2034,R2,gasCCGT,2028,2.31150000000
-15,2035,R2,gasCCGT,2028,2.31150000000
-15,2036,R2,gasCCGT,2028,2.31150000000
-15,2038,R2,gasCCGT,2028,2.31150000000
-15,2040,R2,gasCCGT,2028,2.31150000000
-15,2045,R2,gasCCGT,2028,2.31150000000
-15,2046,R2,gasCCGT,2028,2.31150000000
-15,2047,R2,gasCCGT,2028,2.31150000000
-15,2050,R2,gasCCGT,2028,2.31150000000
-15,2058,R2,gasCCGT,2028,2.31150000000
-15,2059,R2,gasCCGT,2028,2.31150000000
-15,2060,R2,gasCCGT,2028,2.31150000000
-15,2061,R2,gasCCGT,2028,2.31150000000
-15,2062,R2,gasCCGT,2028,2.31150000000
-15,2063,R2,gasCCGT,2028,2.31150000000
-15,2064,R2,gasCCGT,2028,2.31150000000
-16,2032,R2,gasCCGT,2030,0.99560000000
-16,2034,R2,gasCCGT,2030,0.99560000000
-16,2035,R2,gasCCGT,2030,0.99560000000
-16,2036,R2,gasCCGT,2030,0.99560000000
-16,2038,R2,gasCCGT,2030,0.99560000000
-16,2040,R2,gasCCGT,2030,0.99560000000
-16,2045,R2,gasCCGT,2030,0.99560000000
-16,2046,R2,gasCCGT,2030,0.99560000000
-16,2047,R2,gasCCGT,2030,0.99560000000
-16,2050,R2,gasCCGT,2030,0.99560000000
-16,2058,R2,gasCCGT,2030,0.99560000000
-16,2059,R2,gasCCGT,2030,0.99560000000
-16,2060,R2,gasCCGT,2030,0.99560000000
-16,2061,R2,gasCCGT,2030,0.99560000000
-16,2062,R2,gasCCGT,2030,0.99560000000
-16,2063,R2,gasCCGT,2030,0.99560000000
-16,2064,R2,gasCCGT,2030,0.99560000000
-16,2065,R2,gasCCGT,2030,0.99560000000
-16,2066,R2,gasCCGT,2030,0.99560000000
-17,2034,R2,solarPV,2032,2.24000000000
-17,2035,R2,solarPV,2032,2.24000000000
-17,2036,R2,solarPV,2032,2.24000000000
-17,2038,R2,solarPV,2032,2.24000000000
-17,2040,R2,solarPV,2032,2.24000000000
-17,2045,R2,solarPV,2032,2.24000000000
-17,2046,R2,solarPV,2032,2.24000000000
-17,2047,R2,solarPV,2032,2.24000000000
-17,2050,R2,solarPV,2032,2.24000000000
-17,2058,R2,solarPV,2032,2.24000000000
-18,2036,R2,solarPV,2034,2.24000000000
-18,2038,R2,solarPV,2034,2.24000000000
-18,2040,R2,solarPV,2034,2.24000000000
-18,2045,R2,solarPV,2034,2.24000000000
-18,2046,R2,solarPV,2034,2.24000000000
-18,2047,R2,solarPV,2034,2.24000000000
-18,2050,R2,solarPV,2034,2.24000000000
-18,2058,R2,solarPV,2034,2.24000000000
-18,2059,R2,solarPV,2034,2.24000000000
-18,2060,R2,solarPV,2034,2.24000000000
-19,2038,R2,solarPV,2036,2.24000000000
-19,2040,R2,solarPV,2036,2.24000000000
-19,2045,R2,solarPV,2036,2.24000000000
-19,2046,R2,solarPV,2036,2.24000000000
-19,2047,R2,solarPV,2036,2.24000000000
-19,2050,R2,solarPV,2036,2.24000000000
-19,2058,R2,solarPV,2036,2.24000000000
-19,2059,R2,solarPV,2036,2.24000000000
-19,2060,R2,solarPV,2036,2.24000000000
-19,2061,R2,solarPV,2036,2.24000000000
-19,2062,R2,solarPV,2036,2.24000000000
-20,2040,R2,solarPV,2038,2.24000000000
-20,2045,R2,solarPV,2038,2.24000000000
-20,2046,R2,solarPV,2038,2.24000000000
-20,2047,R2,solarPV,2038,2.24000000000
-20,2050,R2,solarPV,2038,2.24000000000
-20,2058,R2,solarPV,2038,2.24000000000
-20,2059,R2,solarPV,2038,2.24000000000
-20,2060,R2,solarPV,2038,2.24000000000
-20,2061,R2,solarPV,2038,2.24000000000
-20,2062,R2,solarPV,2038,2.24000000000
-20,2063,R2,solarPV,2038,2.24000000000
-20,2064,R2,solarPV,2038,2.24000000000
-21,2022,R2,windturbine,2020,8.77320000000
-21,2024,R2,windturbine,2020,8.77320000000
-21,2025,R2,windturbine,2020,8.77320000000
-21,2026,R2,windturbine,2020,8.77320000000
-21,2028,R2,windturbine,2020,8.77320000000
-21,2030,R2,windturbine,2020,8.77320000000
-21,2032,R2,windturbine,2020,8.77320000000
-21,2034,R2,windturbine,2020,8.77320000000
-21,2035,R2,windturbine,2020,8.77320000000
-21,2036,R2,windturbine,2020,8.77320000000
-21,2038,R2,windturbine,2020,8.77320000000
-21,2040,R2,windturbine,2020,8.77320000000
-21,2045,R2,windturbine,2020,8.77320000000
-21,2046,R2,windturbine,2020,8.77320000000
+6,2022,R1,solarPV,2020,4.00000000000
+6,2024,R1,solarPV,2020,4.00000000000
+6,2025,R1,solarPV,2020,4.00000000000
+6,2026,R1,solarPV,2020,4.00000000000
+6,2028,R1,solarPV,2020,4.00000000000
+6,2030,R1,solarPV,2020,4.00000000000
+6,2032,R1,solarPV,2020,4.00000000000
+6,2034,R1,solarPV,2020,4.00000000000
+6,2035,R1,solarPV,2020,4.00000000000
+6,2036,R1,solarPV,2020,4.00000000000
+6,2038,R1,solarPV,2020,4.00000000000
+6,2040,R1,solarPV,2020,4.00000000000
+6,2045,R1,solarPV,2020,4.00000000000
+6,2046,R1,solarPV,2020,4.00000000000
+7,2034,R1,solarPV,2032,2.24000000000
+7,2035,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2032,2.24000000000
+7,2038,R1,solarPV,2032,2.24000000000
+7,2040,R1,solarPV,2032,2.24000000000
+7,2045,R1,solarPV,2032,2.24000000000
+7,2046,R1,solarPV,2032,2.24000000000
+7,2047,R1,solarPV,2032,2.24000000000
+7,2050,R1,solarPV,2032,2.24000000000
+7,2056,R1,solarPV,2032,2.24000000000
+7,2057,R1,solarPV,2032,2.24000000000
+7,2058,R1,solarPV,2032,2.24000000000
+8,2036,R1,solarPV,2034,2.24000000000
+8,2038,R1,solarPV,2034,2.24000000000
+8,2040,R1,solarPV,2034,2.24000000000
+8,2045,R1,solarPV,2034,2.24000000000
+8,2046,R1,solarPV,2034,2.24000000000
+8,2047,R1,solarPV,2034,2.24000000000
+8,2050,R1,solarPV,2034,2.24000000000
+8,2056,R1,solarPV,2034,2.24000000000
+8,2057,R1,solarPV,2034,2.24000000000
+8,2058,R1,solarPV,2034,2.24000000000
+8,2059,R1,solarPV,2034,2.24000000000
+8,2060,R1,solarPV,2034,2.24000000000
+9,2038,R1,solarPV,2036,2.24000000000
+9,2040,R1,solarPV,2036,2.24000000000
+9,2045,R1,solarPV,2036,2.24000000000
+9,2046,R1,solarPV,2036,2.24000000000
+9,2047,R1,solarPV,2036,2.24000000000
+9,2050,R1,solarPV,2036,2.24000000000
+9,2056,R1,solarPV,2036,2.24000000000
+9,2057,R1,solarPV,2036,2.24000000000
+9,2058,R1,solarPV,2036,2.24000000000
+9,2059,R1,solarPV,2036,2.24000000000
+9,2060,R1,solarPV,2036,2.24000000000
+9,2061,R1,solarPV,2036,2.24000000000
+9,2062,R1,solarPV,2036,2.24000000000
+10,2040,R1,solarPV,2038,2.24000000000
+10,2045,R1,solarPV,2038,2.24000000000
+10,2046,R1,solarPV,2038,2.24000000000
+10,2047,R1,solarPV,2038,2.24000000000
+10,2050,R1,solarPV,2038,2.24000000000
+10,2056,R1,solarPV,2038,2.24000000000
+10,2057,R1,solarPV,2038,2.24000000000
+10,2058,R1,solarPV,2038,2.24000000000
+10,2059,R1,solarPV,2038,2.24000000000
+10,2060,R1,solarPV,2038,2.24000000000
+10,2061,R1,solarPV,2038,2.24000000000
+10,2062,R1,solarPV,2038,2.24000000000
+10,2063,R1,solarPV,2038,2.24000000000
+10,2064,R1,solarPV,2038,2.24000000000
+11,2022,R1,windturbine,2020,4.00000000000
+11,2024,R1,windturbine,2020,4.00000000000
+11,2025,R1,windturbine,2020,4.00000000000
+11,2026,R1,windturbine,2020,4.00000000000
+11,2028,R1,windturbine,2020,4.00000000000
+11,2030,R1,windturbine,2020,4.00000000000
+11,2032,R1,windturbine,2020,4.00000000000
+11,2034,R1,windturbine,2020,4.00000000000
+11,2035,R1,windturbine,2020,4.00000000000
+11,2036,R1,windturbine,2020,4.00000000000
+11,2038,R1,windturbine,2020,4.00000000000
+11,2040,R1,windturbine,2020,4.00000000000
+11,2045,R1,windturbine,2020,4.00000000000
+11,2046,R1,windturbine,2020,4.00000000000
+12,2020,R2,gasCCGT,2020,1.00000000000
+12,2022,R2,gasCCGT,2020,1.00000000000
+12,2024,R2,gasCCGT,2020,1.00000000000
+12,2025,R2,gasCCGT,2020,1.00000000000
+12,2026,R2,gasCCGT,2020,0.80000000000
+12,2028,R2,gasCCGT,2020,0.40000000000
+13,2024,R2,gasCCGT,2022,1.85640000000
+13,2025,R2,gasCCGT,2022,1.85640000000
+13,2026,R2,gasCCGT,2022,1.85640000000
+13,2028,R2,gasCCGT,2022,1.85640000000
+13,2030,R2,gasCCGT,2022,1.85640000000
+13,2032,R2,gasCCGT,2022,1.85640000000
+13,2034,R2,gasCCGT,2022,1.85640000000
+13,2035,R2,gasCCGT,2022,1.85640000000
+13,2036,R2,gasCCGT,2022,1.85640000000
+13,2038,R2,gasCCGT,2022,1.85640000000
+13,2040,R2,gasCCGT,2022,1.85640000000
+13,2045,R2,gasCCGT,2022,1.85640000000
+13,2046,R2,gasCCGT,2022,1.85640000000
+13,2047,R2,gasCCGT,2022,1.85640000000
+13,2050,R2,gasCCGT,2022,1.85640000000
+13,2056,R2,gasCCGT,2022,1.85640000000
+13,2057,R2,gasCCGT,2022,1.85640000000
+13,2058,R2,gasCCGT,2022,1.85640000000
+14,2026,R2,gasCCGT,2024,2.07980000000
+14,2028,R2,gasCCGT,2024,2.07980000000
+14,2030,R2,gasCCGT,2024,2.07980000000
+14,2032,R2,gasCCGT,2024,2.07980000000
+14,2034,R2,gasCCGT,2024,2.07980000000
+14,2035,R2,gasCCGT,2024,2.07980000000
+14,2036,R2,gasCCGT,2024,2.07980000000
+14,2038,R2,gasCCGT,2024,2.07980000000
+14,2040,R2,gasCCGT,2024,2.07980000000
+14,2045,R2,gasCCGT,2024,2.07980000000
+14,2046,R2,gasCCGT,2024,2.07980000000
+14,2047,R2,gasCCGT,2024,2.07980000000
+14,2050,R2,gasCCGT,2024,2.07980000000
+14,2056,R2,gasCCGT,2024,2.07980000000
+14,2057,R2,gasCCGT,2024,2.07980000000
+14,2058,R2,gasCCGT,2024,2.07980000000
+14,2059,R2,gasCCGT,2024,2.07980000000
+14,2060,R2,gasCCGT,2024,2.07980000000
+15,2028,R2,gasCCGT,2026,2.29760000000
+15,2030,R2,gasCCGT,2026,2.29760000000
+15,2032,R2,gasCCGT,2026,2.29760000000
+15,2034,R2,gasCCGT,2026,2.29760000000
+15,2035,R2,gasCCGT,2026,2.29760000000
+15,2036,R2,gasCCGT,2026,2.29760000000
+15,2038,R2,gasCCGT,2026,2.29760000000
+15,2040,R2,gasCCGT,2026,2.29760000000
+15,2045,R2,gasCCGT,2026,2.29760000000
+15,2046,R2,gasCCGT,2026,2.29760000000
+15,2047,R2,gasCCGT,2026,2.29760000000
+15,2050,R2,gasCCGT,2026,2.29760000000
+15,2056,R2,gasCCGT,2026,2.29760000000
+15,2057,R2,gasCCGT,2026,2.29760000000
+15,2058,R2,gasCCGT,2026,2.29760000000
+15,2059,R2,gasCCGT,2026,2.29760000000
+15,2060,R2,gasCCGT,2026,2.29760000000
+15,2061,R2,gasCCGT,2026,2.29760000000
+15,2062,R2,gasCCGT,2026,2.29760000000
+16,2030,R2,gasCCGT,2028,2.31150000000
+16,2032,R2,gasCCGT,2028,2.31150000000
+16,2034,R2,gasCCGT,2028,2.31150000000
+16,2035,R2,gasCCGT,2028,2.31150000000
+16,2036,R2,gasCCGT,2028,2.31150000000
+16,2038,R2,gasCCGT,2028,2.31150000000
+16,2040,R2,gasCCGT,2028,2.31150000000
+16,2045,R2,gasCCGT,2028,2.31150000000
+16,2046,R2,gasCCGT,2028,2.31150000000
+16,2047,R2,gasCCGT,2028,2.31150000000
+16,2050,R2,gasCCGT,2028,2.31150000000
+16,2056,R2,gasCCGT,2028,2.31150000000
+16,2057,R2,gasCCGT,2028,2.31150000000
+16,2058,R2,gasCCGT,2028,2.31150000000
+16,2059,R2,gasCCGT,2028,2.31150000000
+16,2060,R2,gasCCGT,2028,2.31150000000
+16,2061,R2,gasCCGT,2028,2.31150000000
+16,2062,R2,gasCCGT,2028,2.31150000000
+16,2063,R2,gasCCGT,2028,2.31150000000
+16,2064,R2,gasCCGT,2028,2.31150000000
+17,2032,R2,gasCCGT,2030,0.99560000000
+17,2034,R2,gasCCGT,2030,0.99560000000
+17,2035,R2,gasCCGT,2030,0.99560000000
+17,2036,R2,gasCCGT,2030,0.99560000000
+17,2038,R2,gasCCGT,2030,0.99560000000
+17,2040,R2,gasCCGT,2030,0.99560000000
+17,2045,R2,gasCCGT,2030,0.99560000000
+17,2046,R2,gasCCGT,2030,0.99560000000
+17,2047,R2,gasCCGT,2030,0.99560000000
+17,2050,R2,gasCCGT,2030,0.99560000000
+17,2056,R2,gasCCGT,2030,0.99560000000
+17,2057,R2,gasCCGT,2030,0.99560000000
+17,2058,R2,gasCCGT,2030,0.99560000000
+17,2059,R2,gasCCGT,2030,0.99560000000
+17,2060,R2,gasCCGT,2030,0.99560000000
+17,2061,R2,gasCCGT,2030,0.99560000000
+17,2062,R2,gasCCGT,2030,0.99560000000
+17,2063,R2,gasCCGT,2030,0.99560000000
+17,2064,R2,gasCCGT,2030,0.99560000000
+17,2065,R2,gasCCGT,2030,0.99560000000
+17,2066,R2,gasCCGT,2030,0.99560000000
+18,2034,R2,solarPV,2032,2.24000000000
+18,2035,R2,solarPV,2032,2.24000000000
+18,2036,R2,solarPV,2032,2.24000000000
+18,2038,R2,solarPV,2032,2.24000000000
+18,2040,R2,solarPV,2032,2.24000000000
+18,2045,R2,solarPV,2032,2.24000000000
+18,2046,R2,solarPV,2032,2.24000000000
+18,2047,R2,solarPV,2032,2.24000000000
+18,2050,R2,solarPV,2032,2.24000000000
+18,2056,R2,solarPV,2032,2.24000000000
+18,2057,R2,solarPV,2032,2.24000000000
+18,2058,R2,solarPV,2032,2.24000000000
+19,2036,R2,solarPV,2034,2.24000000000
+19,2038,R2,solarPV,2034,2.24000000000
+19,2040,R2,solarPV,2034,2.24000000000
+19,2045,R2,solarPV,2034,2.24000000000
+19,2046,R2,solarPV,2034,2.24000000000
+19,2047,R2,solarPV,2034,2.24000000000
+19,2050,R2,solarPV,2034,2.24000000000
+19,2056,R2,solarPV,2034,2.24000000000
+19,2057,R2,solarPV,2034,2.24000000000
+19,2058,R2,solarPV,2034,2.24000000000
+19,2059,R2,solarPV,2034,2.24000000000
+19,2060,R2,solarPV,2034,2.24000000000
+20,2038,R2,solarPV,2036,2.24000000000
+20,2040,R2,solarPV,2036,2.24000000000
+20,2045,R2,solarPV,2036,2.24000000000
+20,2046,R2,solarPV,2036,2.24000000000
+20,2047,R2,solarPV,2036,2.24000000000
+20,2050,R2,solarPV,2036,2.24000000000
+20,2056,R2,solarPV,2036,2.24000000000
+20,2057,R2,solarPV,2036,2.24000000000
+20,2058,R2,solarPV,2036,2.24000000000
+20,2059,R2,solarPV,2036,2.24000000000
+20,2060,R2,solarPV,2036,2.24000000000
+20,2061,R2,solarPV,2036,2.24000000000
+20,2062,R2,solarPV,2036,2.24000000000
+21,2040,R2,solarPV,2038,2.24000000000
+21,2045,R2,solarPV,2038,2.24000000000
+21,2046,R2,solarPV,2038,2.24000000000
+21,2047,R2,solarPV,2038,2.24000000000
+21,2050,R2,solarPV,2038,2.24000000000
+21,2056,R2,solarPV,2038,2.24000000000
+21,2057,R2,solarPV,2038,2.24000000000
+21,2058,R2,solarPV,2038,2.24000000000
+21,2059,R2,solarPV,2038,2.24000000000
+21,2060,R2,solarPV,2038,2.24000000000
+21,2061,R2,solarPV,2038,2.24000000000
+21,2062,R2,solarPV,2038,2.24000000000
+21,2063,R2,solarPV,2038,2.24000000000
+21,2064,R2,solarPV,2038,2.24000000000
+22,2022,R2,windturbine,2020,8.77320000000
+22,2024,R2,windturbine,2020,8.77320000000
+22,2025,R2,windturbine,2020,8.77320000000
+22,2026,R2,windturbine,2020,8.77320000000
+22,2028,R2,windturbine,2020,8.77320000000
+22,2030,R2,windturbine,2020,8.77320000000
+22,2032,R2,windturbine,2020,8.77320000000
+22,2034,R2,windturbine,2020,8.77320000000
+22,2035,R2,windturbine,2020,8.77320000000
+22,2036,R2,windturbine,2020,8.77320000000
+22,2038,R2,windturbine,2020,8.77320000000
+22,2040,R2,windturbine,2020,8.77320000000
+22,2045,R2,windturbine,2020,8.77320000000
+22,2046,R2,windturbine,2020,8.77320000000
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 4e21eb63..57788586 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,10 +1,23 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.00000000000
-0,2024,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-0,2026,R1,gasCCGT,2020,0.80000000000
-0,2028,R1,gasCCGT,2020,0.40000000000
+0,2022,R1,gasCCGT,2020,1.34360000000
+0,2024,R1,gasCCGT,2020,1.34360000000
+0,2025,R1,gasCCGT,2020,1.34360000000
+0,2026,R1,gasCCGT,2020,1.14360000000
+0,2028,R1,gasCCGT,2020,0.74360000000
+0,2030,R1,gasCCGT,2020,0.34360000000
+0,2032,R1,gasCCGT,2020,0.34360000000
+0,2034,R1,gasCCGT,2020,0.34360000000
+0,2035,R1,gasCCGT,2020,0.34360000000
+0,2036,R1,gasCCGT,2020,0.34360000000
+0,2038,R1,gasCCGT,2020,0.34360000000
+0,2040,R1,gasCCGT,2020,0.34360000000
+0,2042,R1,gasCCGT,2020,0.34360000000
+0,2045,R1,gasCCGT,2020,0.34360000000
+0,2046,R1,gasCCGT,2020,0.34360000000
+0,2047,R1,gasCCGT,2020,0.34360000000
+0,2050,R1,gasCCGT,2020,0.34360000000
+0,2056,R1,gasCCGT,2020,0.34360000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -21,6 +34,8 @@ asset,year,region,technology,installed,capacity
 1,2046,R1,gasCCGT,2022,1.85640000000
 1,2047,R1,gasCCGT,2022,1.85640000000
 1,2050,R1,gasCCGT,2022,1.85640000000
+1,2056,R1,gasCCGT,2022,1.85640000000
+1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
 2,2026,R1,gasCCGT,2024,2.07980000000
 2,2028,R1,gasCCGT,2024,2.07980000000
@@ -36,6 +51,8 @@ asset,year,region,technology,installed,capacity
 2,2046,R1,gasCCGT,2024,2.07980000000
 2,2047,R1,gasCCGT,2024,2.07980000000
 2,2050,R1,gasCCGT,2024,2.07980000000
+2,2056,R1,gasCCGT,2024,2.07980000000
+2,2057,R1,gasCCGT,2024,2.07980000000
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
@@ -52,6 +69,8 @@ asset,year,region,technology,installed,capacity
 3,2046,R1,gasCCGT,2026,2.29760000000
 3,2047,R1,gasCCGT,2026,2.29760000000
 3,2050,R1,gasCCGT,2026,2.29760000000
+3,2056,R1,gasCCGT,2026,2.29760000000
+3,2057,R1,gasCCGT,2026,2.29760000000
 3,2058,R1,gasCCGT,2026,2.29760000000
 3,2059,R1,gasCCGT,2026,2.29760000000
 3,2060,R1,gasCCGT,2026,2.29760000000
@@ -69,6 +88,8 @@ asset,year,region,technology,installed,capacity
 4,2046,R1,gasCCGT,2028,2.31150000000
 4,2047,R1,gasCCGT,2028,2.31150000000
 4,2050,R1,gasCCGT,2028,2.31150000000
+4,2056,R1,gasCCGT,2028,2.31150000000
+4,2057,R1,gasCCGT,2028,2.31150000000
 4,2058,R1,gasCCGT,2028,2.31150000000
 4,2059,R1,gasCCGT,2028,2.31150000000
 4,2060,R1,gasCCGT,2028,2.31150000000
@@ -87,6 +108,8 @@ asset,year,region,technology,installed,capacity
 5,2046,R1,gasCCGT,2030,0.99560000000
 5,2047,R1,gasCCGT,2030,0.99560000000
 5,2050,R1,gasCCGT,2030,0.99560000000
+5,2056,R1,gasCCGT,2030,0.99560000000
+5,2057,R1,gasCCGT,2030,0.99560000000
 5,2058,R1,gasCCGT,2030,0.99560000000
 5,2059,R1,gasCCGT,2030,0.99560000000
 5,2060,R1,gasCCGT,2030,0.99560000000
@@ -96,252 +119,297 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2034,R1,solarPV,2032,2.24000000000
-6,2035,R1,solarPV,2032,2.24000000000
-6,2036,R1,solarPV,2032,2.24000000000
-6,2038,R1,solarPV,2032,2.24000000000
-6,2040,R1,solarPV,2032,2.24000000000
-6,2042,R1,solarPV,2032,2.24000000000
-6,2045,R1,solarPV,2032,2.24000000000
-6,2046,R1,solarPV,2032,2.24000000000
-6,2047,R1,solarPV,2032,2.24000000000
-6,2050,R1,solarPV,2032,2.24000000000
-6,2058,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2034,2.24000000000
-7,2038,R1,solarPV,2034,2.24000000000
-7,2040,R1,solarPV,2034,2.24000000000
-7,2042,R1,solarPV,2034,2.24000000000
-7,2045,R1,solarPV,2034,2.24000000000
-7,2046,R1,solarPV,2034,2.24000000000
-7,2047,R1,solarPV,2034,2.24000000000
-7,2050,R1,solarPV,2034,2.24000000000
-7,2058,R1,solarPV,2034,2.24000000000
-7,2059,R1,solarPV,2034,2.24000000000
-7,2060,R1,solarPV,2034,2.24000000000
-8,2038,R1,solarPV,2036,2.24000000000
-8,2040,R1,solarPV,2036,2.24000000000
-8,2042,R1,solarPV,2036,2.24000000000
-8,2045,R1,solarPV,2036,2.24000000000
-8,2046,R1,solarPV,2036,2.24000000000
-8,2047,R1,solarPV,2036,2.24000000000
-8,2050,R1,solarPV,2036,2.24000000000
-8,2058,R1,solarPV,2036,2.24000000000
-8,2059,R1,solarPV,2036,2.24000000000
-8,2060,R1,solarPV,2036,2.24000000000
-8,2061,R1,solarPV,2036,2.24000000000
-8,2062,R1,solarPV,2036,2.24000000000
-9,2040,R1,solarPV,2038,2.24000000000
-9,2042,R1,solarPV,2038,2.24000000000
-9,2045,R1,solarPV,2038,2.24000000000
-9,2046,R1,solarPV,2038,2.24000000000
-9,2047,R1,solarPV,2038,2.24000000000
-9,2050,R1,solarPV,2038,2.24000000000
-9,2058,R1,solarPV,2038,2.24000000000
-9,2059,R1,solarPV,2038,2.24000000000
-9,2060,R1,solarPV,2038,2.24000000000
-9,2061,R1,solarPV,2038,2.24000000000
-9,2062,R1,solarPV,2038,2.24000000000
-9,2063,R1,solarPV,2038,2.24000000000
-9,2064,R1,solarPV,2038,2.24000000000
-10,2042,R1,solarPV,2040,2.24000000000
-10,2045,R1,solarPV,2040,2.24000000000
-10,2046,R1,solarPV,2040,2.24000000000
-10,2047,R1,solarPV,2040,2.24000000000
-10,2050,R1,solarPV,2040,2.24000000000
-10,2058,R1,solarPV,2040,2.24000000000
-10,2059,R1,solarPV,2040,2.24000000000
-10,2060,R1,solarPV,2040,2.24000000000
-10,2061,R1,solarPV,2040,2.24000000000
-10,2062,R1,solarPV,2040,2.24000000000
-10,2063,R1,solarPV,2040,2.24000000000
-10,2064,R1,solarPV,2040,2.24000000000
-10,2065,R1,solarPV,2040,2.24000000000
-10,2066,R1,solarPV,2040,2.24000000000
-11,2022,R1,windturbine,2020,8.77320000000
-11,2024,R1,windturbine,2020,8.77320000000
-11,2025,R1,windturbine,2020,8.77320000000
-11,2026,R1,windturbine,2020,8.77320000000
-11,2028,R1,windturbine,2020,8.77320000000
-11,2030,R1,windturbine,2020,8.77320000000
-11,2032,R1,windturbine,2020,8.77320000000
-11,2034,R1,windturbine,2020,8.77320000000
-11,2035,R1,windturbine,2020,8.77320000000
-11,2036,R1,windturbine,2020,8.77320000000
-11,2038,R1,windturbine,2020,8.77320000000
-11,2040,R1,windturbine,2020,8.77320000000
-11,2042,R1,windturbine,2020,8.77320000000
-11,2045,R1,windturbine,2020,8.77320000000
-11,2046,R1,windturbine,2020,8.77320000000
-12,2020,R2,gasCCGT,2020,1.00000000000
-12,2022,R2,gasCCGT,2020,1.00000000000
-12,2024,R2,gasCCGT,2020,1.00000000000
-12,2025,R2,gasCCGT,2020,1.00000000000
-12,2026,R2,gasCCGT,2020,0.80000000000
-12,2028,R2,gasCCGT,2020,0.40000000000
-13,2024,R2,gasCCGT,2022,1.85640000000
-13,2025,R2,gasCCGT,2022,1.85640000000
-13,2026,R2,gasCCGT,2022,1.85640000000
-13,2028,R2,gasCCGT,2022,1.85640000000
-13,2030,R2,gasCCGT,2022,1.85640000000
-13,2032,R2,gasCCGT,2022,1.85640000000
-13,2034,R2,gasCCGT,2022,1.85640000000
-13,2035,R2,gasCCGT,2022,1.85640000000
-13,2036,R2,gasCCGT,2022,1.85640000000
-13,2038,R2,gasCCGT,2022,1.85640000000
-13,2040,R2,gasCCGT,2022,1.85640000000
-13,2042,R2,gasCCGT,2022,1.85640000000
-13,2045,R2,gasCCGT,2022,1.85640000000
-13,2046,R2,gasCCGT,2022,1.85640000000
-13,2047,R2,gasCCGT,2022,1.85640000000
-13,2050,R2,gasCCGT,2022,1.85640000000
-13,2058,R2,gasCCGT,2022,1.85640000000
-14,2026,R2,gasCCGT,2024,2.07980000000
-14,2028,R2,gasCCGT,2024,2.07980000000
-14,2030,R2,gasCCGT,2024,2.07980000000
-14,2032,R2,gasCCGT,2024,2.07980000000
-14,2034,R2,gasCCGT,2024,2.07980000000
-14,2035,R2,gasCCGT,2024,2.07980000000
-14,2036,R2,gasCCGT,2024,2.07980000000
-14,2038,R2,gasCCGT,2024,2.07980000000
-14,2040,R2,gasCCGT,2024,2.07980000000
-14,2042,R2,gasCCGT,2024,2.07980000000
-14,2045,R2,gasCCGT,2024,2.07980000000
-14,2046,R2,gasCCGT,2024,2.07980000000
-14,2047,R2,gasCCGT,2024,2.07980000000
-14,2050,R2,gasCCGT,2024,2.07980000000
-14,2058,R2,gasCCGT,2024,2.07980000000
-14,2059,R2,gasCCGT,2024,2.07980000000
-14,2060,R2,gasCCGT,2024,2.07980000000
-15,2028,R2,gasCCGT,2026,2.29760000000
-15,2030,R2,gasCCGT,2026,2.29760000000
-15,2032,R2,gasCCGT,2026,2.29760000000
-15,2034,R2,gasCCGT,2026,2.29760000000
-15,2035,R2,gasCCGT,2026,2.29760000000
-15,2036,R2,gasCCGT,2026,2.29760000000
-15,2038,R2,gasCCGT,2026,2.29760000000
-15,2040,R2,gasCCGT,2026,2.29760000000
-15,2042,R2,gasCCGT,2026,2.29760000000
-15,2045,R2,gasCCGT,2026,2.29760000000
-15,2046,R2,gasCCGT,2026,2.29760000000
-15,2047,R2,gasCCGT,2026,2.29760000000
-15,2050,R2,gasCCGT,2026,2.29760000000
-15,2058,R2,gasCCGT,2026,2.29760000000
-15,2059,R2,gasCCGT,2026,2.29760000000
-15,2060,R2,gasCCGT,2026,2.29760000000
-15,2061,R2,gasCCGT,2026,2.29760000000
-15,2062,R2,gasCCGT,2026,2.29760000000
-16,2030,R2,gasCCGT,2028,2.31150000000
-16,2032,R2,gasCCGT,2028,2.31150000000
-16,2034,R2,gasCCGT,2028,2.31150000000
-16,2035,R2,gasCCGT,2028,2.31150000000
-16,2036,R2,gasCCGT,2028,2.31150000000
-16,2038,R2,gasCCGT,2028,2.31150000000
-16,2040,R2,gasCCGT,2028,2.31150000000
-16,2042,R2,gasCCGT,2028,2.31150000000
-16,2045,R2,gasCCGT,2028,2.31150000000
-16,2046,R2,gasCCGT,2028,2.31150000000
-16,2047,R2,gasCCGT,2028,2.31150000000
-16,2050,R2,gasCCGT,2028,2.31150000000
-16,2058,R2,gasCCGT,2028,2.31150000000
-16,2059,R2,gasCCGT,2028,2.31150000000
-16,2060,R2,gasCCGT,2028,2.31150000000
-16,2061,R2,gasCCGT,2028,2.31150000000
-16,2062,R2,gasCCGT,2028,2.31150000000
-16,2063,R2,gasCCGT,2028,2.31150000000
-16,2064,R2,gasCCGT,2028,2.31150000000
-17,2032,R2,gasCCGT,2030,0.99560000000
-17,2034,R2,gasCCGT,2030,0.99560000000
-17,2035,R2,gasCCGT,2030,0.99560000000
-17,2036,R2,gasCCGT,2030,0.99560000000
-17,2038,R2,gasCCGT,2030,0.99560000000
-17,2040,R2,gasCCGT,2030,0.99560000000
-17,2042,R2,gasCCGT,2030,0.99560000000
-17,2045,R2,gasCCGT,2030,0.99560000000
-17,2046,R2,gasCCGT,2030,0.99560000000
-17,2047,R2,gasCCGT,2030,0.99560000000
-17,2050,R2,gasCCGT,2030,0.99560000000
-17,2058,R2,gasCCGT,2030,0.99560000000
-17,2059,R2,gasCCGT,2030,0.99560000000
-17,2060,R2,gasCCGT,2030,0.99560000000
-17,2061,R2,gasCCGT,2030,0.99560000000
-17,2062,R2,gasCCGT,2030,0.99560000000
-17,2063,R2,gasCCGT,2030,0.99560000000
-17,2064,R2,gasCCGT,2030,0.99560000000
-17,2065,R2,gasCCGT,2030,0.99560000000
-17,2066,R2,gasCCGT,2030,0.99560000000
-18,2034,R2,solarPV,2032,2.24000000000
-18,2035,R2,solarPV,2032,2.24000000000
-18,2036,R2,solarPV,2032,2.24000000000
-18,2038,R2,solarPV,2032,2.24000000000
-18,2040,R2,solarPV,2032,2.24000000000
-18,2042,R2,solarPV,2032,2.24000000000
-18,2045,R2,solarPV,2032,2.24000000000
-18,2046,R2,solarPV,2032,2.24000000000
-18,2047,R2,solarPV,2032,2.24000000000
-18,2050,R2,solarPV,2032,2.24000000000
-18,2058,R2,solarPV,2032,2.24000000000
-19,2036,R2,solarPV,2034,2.24000000000
-19,2038,R2,solarPV,2034,2.24000000000
-19,2040,R2,solarPV,2034,2.24000000000
-19,2042,R2,solarPV,2034,2.24000000000
-19,2045,R2,solarPV,2034,2.24000000000
-19,2046,R2,solarPV,2034,2.24000000000
-19,2047,R2,solarPV,2034,2.24000000000
-19,2050,R2,solarPV,2034,2.24000000000
-19,2058,R2,solarPV,2034,2.24000000000
-19,2059,R2,solarPV,2034,2.24000000000
-19,2060,R2,solarPV,2034,2.24000000000
-20,2038,R2,solarPV,2036,2.24000000000
-20,2040,R2,solarPV,2036,2.24000000000
-20,2042,R2,solarPV,2036,2.24000000000
-20,2045,R2,solarPV,2036,2.24000000000
-20,2046,R2,solarPV,2036,2.24000000000
-20,2047,R2,solarPV,2036,2.24000000000
-20,2050,R2,solarPV,2036,2.24000000000
-20,2058,R2,solarPV,2036,2.24000000000
-20,2059,R2,solarPV,2036,2.24000000000
-20,2060,R2,solarPV,2036,2.24000000000
-20,2061,R2,solarPV,2036,2.24000000000
-20,2062,R2,solarPV,2036,2.24000000000
-21,2040,R2,solarPV,2038,2.24000000000
-21,2042,R2,solarPV,2038,2.24000000000
-21,2045,R2,solarPV,2038,2.24000000000
-21,2046,R2,solarPV,2038,2.24000000000
-21,2047,R2,solarPV,2038,2.24000000000
-21,2050,R2,solarPV,2038,2.24000000000
-21,2058,R2,solarPV,2038,2.24000000000
-21,2059,R2,solarPV,2038,2.24000000000
-21,2060,R2,solarPV,2038,2.24000000000
-21,2061,R2,solarPV,2038,2.24000000000
-21,2062,R2,solarPV,2038,2.24000000000
-21,2063,R2,solarPV,2038,2.24000000000
-21,2064,R2,solarPV,2038,2.24000000000
-22,2042,R2,solarPV,2040,2.24000000000
-22,2045,R2,solarPV,2040,2.24000000000
-22,2046,R2,solarPV,2040,2.24000000000
-22,2047,R2,solarPV,2040,2.24000000000
-22,2050,R2,solarPV,2040,2.24000000000
-22,2058,R2,solarPV,2040,2.24000000000
-22,2059,R2,solarPV,2040,2.24000000000
-22,2060,R2,solarPV,2040,2.24000000000
-22,2061,R2,solarPV,2040,2.24000000000
-22,2062,R2,solarPV,2040,2.24000000000
-22,2063,R2,solarPV,2040,2.24000000000
-22,2064,R2,solarPV,2040,2.24000000000
-22,2065,R2,solarPV,2040,2.24000000000
-22,2066,R2,solarPV,2040,2.24000000000
-23,2022,R2,windturbine,2020,8.77320000000
-23,2024,R2,windturbine,2020,8.77320000000
-23,2025,R2,windturbine,2020,8.77320000000
-23,2026,R2,windturbine,2020,8.77320000000
-23,2028,R2,windturbine,2020,8.77320000000
-23,2030,R2,windturbine,2020,8.77320000000
-23,2032,R2,windturbine,2020,8.77320000000
-23,2034,R2,windturbine,2020,8.77320000000
-23,2035,R2,windturbine,2020,8.77320000000
-23,2036,R2,windturbine,2020,8.77320000000
-23,2038,R2,windturbine,2020,8.77320000000
-23,2040,R2,windturbine,2020,8.77320000000
-23,2042,R2,windturbine,2020,8.77320000000
-23,2045,R2,windturbine,2020,8.77320000000
-23,2046,R2,windturbine,2020,8.77320000000
+6,2022,R1,solarPV,2020,4.00000000000
+6,2024,R1,solarPV,2020,4.00000000000
+6,2025,R1,solarPV,2020,4.00000000000
+6,2026,R1,solarPV,2020,4.00000000000
+6,2028,R1,solarPV,2020,4.00000000000
+6,2030,R1,solarPV,2020,4.00000000000
+6,2032,R1,solarPV,2020,4.00000000000
+6,2034,R1,solarPV,2020,4.00000000000
+6,2035,R1,solarPV,2020,4.00000000000
+6,2036,R1,solarPV,2020,4.00000000000
+6,2038,R1,solarPV,2020,4.00000000000
+6,2040,R1,solarPV,2020,4.00000000000
+6,2042,R1,solarPV,2020,4.00000000000
+6,2045,R1,solarPV,2020,4.00000000000
+6,2046,R1,solarPV,2020,4.00000000000
+7,2034,R1,solarPV,2032,2.24000000000
+7,2035,R1,solarPV,2032,2.24000000000
+7,2036,R1,solarPV,2032,2.24000000000
+7,2038,R1,solarPV,2032,2.24000000000
+7,2040,R1,solarPV,2032,2.24000000000
+7,2042,R1,solarPV,2032,2.24000000000
+7,2045,R1,solarPV,2032,2.24000000000
+7,2046,R1,solarPV,2032,2.24000000000
+7,2047,R1,solarPV,2032,2.24000000000
+7,2050,R1,solarPV,2032,2.24000000000
+7,2056,R1,solarPV,2032,2.24000000000
+7,2057,R1,solarPV,2032,2.24000000000
+7,2058,R1,solarPV,2032,2.24000000000
+8,2036,R1,solarPV,2034,2.24000000000
+8,2038,R1,solarPV,2034,2.24000000000
+8,2040,R1,solarPV,2034,2.24000000000
+8,2042,R1,solarPV,2034,2.24000000000
+8,2045,R1,solarPV,2034,2.24000000000
+8,2046,R1,solarPV,2034,2.24000000000
+8,2047,R1,solarPV,2034,2.24000000000
+8,2050,R1,solarPV,2034,2.24000000000
+8,2056,R1,solarPV,2034,2.24000000000
+8,2057,R1,solarPV,2034,2.24000000000
+8,2058,R1,solarPV,2034,2.24000000000
+8,2059,R1,solarPV,2034,2.24000000000
+8,2060,R1,solarPV,2034,2.24000000000
+9,2038,R1,solarPV,2036,2.24000000000
+9,2040,R1,solarPV,2036,2.24000000000
+9,2042,R1,solarPV,2036,2.24000000000
+9,2045,R1,solarPV,2036,2.24000000000
+9,2046,R1,solarPV,2036,2.24000000000
+9,2047,R1,solarPV,2036,2.24000000000
+9,2050,R1,solarPV,2036,2.24000000000
+9,2056,R1,solarPV,2036,2.24000000000
+9,2057,R1,solarPV,2036,2.24000000000
+9,2058,R1,solarPV,2036,2.24000000000
+9,2059,R1,solarPV,2036,2.24000000000
+9,2060,R1,solarPV,2036,2.24000000000
+9,2061,R1,solarPV,2036,2.24000000000
+9,2062,R1,solarPV,2036,2.24000000000
+10,2040,R1,solarPV,2038,2.24000000000
+10,2042,R1,solarPV,2038,2.24000000000
+10,2045,R1,solarPV,2038,2.24000000000
+10,2046,R1,solarPV,2038,2.24000000000
+10,2047,R1,solarPV,2038,2.24000000000
+10,2050,R1,solarPV,2038,2.24000000000
+10,2056,R1,solarPV,2038,2.24000000000
+10,2057,R1,solarPV,2038,2.24000000000
+10,2058,R1,solarPV,2038,2.24000000000
+10,2059,R1,solarPV,2038,2.24000000000
+10,2060,R1,solarPV,2038,2.24000000000
+10,2061,R1,solarPV,2038,2.24000000000
+10,2062,R1,solarPV,2038,2.24000000000
+10,2063,R1,solarPV,2038,2.24000000000
+10,2064,R1,solarPV,2038,2.24000000000
+11,2042,R1,solarPV,2040,2.24000000000
+11,2045,R1,solarPV,2040,2.24000000000
+11,2046,R1,solarPV,2040,2.24000000000
+11,2047,R1,solarPV,2040,2.24000000000
+11,2050,R1,solarPV,2040,2.24000000000
+11,2056,R1,solarPV,2040,2.24000000000
+11,2057,R1,solarPV,2040,2.24000000000
+11,2058,R1,solarPV,2040,2.24000000000
+11,2059,R1,solarPV,2040,2.24000000000
+11,2060,R1,solarPV,2040,2.24000000000
+11,2061,R1,solarPV,2040,2.24000000000
+11,2062,R1,solarPV,2040,2.24000000000
+11,2063,R1,solarPV,2040,2.24000000000
+11,2064,R1,solarPV,2040,2.24000000000
+11,2065,R1,solarPV,2040,2.24000000000
+11,2066,R1,solarPV,2040,2.24000000000
+12,2022,R1,windturbine,2020,4.00000000000
+12,2024,R1,windturbine,2020,4.00000000000
+12,2025,R1,windturbine,2020,4.00000000000
+12,2026,R1,windturbine,2020,4.00000000000
+12,2028,R1,windturbine,2020,4.00000000000
+12,2030,R1,windturbine,2020,4.00000000000
+12,2032,R1,windturbine,2020,4.00000000000
+12,2034,R1,windturbine,2020,4.00000000000
+12,2035,R1,windturbine,2020,4.00000000000
+12,2036,R1,windturbine,2020,4.00000000000
+12,2038,R1,windturbine,2020,4.00000000000
+12,2040,R1,windturbine,2020,4.00000000000
+12,2042,R1,windturbine,2020,4.00000000000
+12,2045,R1,windturbine,2020,4.00000000000
+12,2046,R1,windturbine,2020,4.00000000000
+13,2020,R2,gasCCGT,2020,1.00000000000
+13,2022,R2,gasCCGT,2020,1.00000000000
+13,2024,R2,gasCCGT,2020,1.00000000000
+13,2025,R2,gasCCGT,2020,1.00000000000
+13,2026,R2,gasCCGT,2020,0.80000000000
+13,2028,R2,gasCCGT,2020,0.40000000000
+14,2024,R2,gasCCGT,2022,1.85640000000
+14,2025,R2,gasCCGT,2022,1.85640000000
+14,2026,R2,gasCCGT,2022,1.85640000000
+14,2028,R2,gasCCGT,2022,1.85640000000
+14,2030,R2,gasCCGT,2022,1.85640000000
+14,2032,R2,gasCCGT,2022,1.85640000000
+14,2034,R2,gasCCGT,2022,1.85640000000
+14,2035,R2,gasCCGT,2022,1.85640000000
+14,2036,R2,gasCCGT,2022,1.85640000000
+14,2038,R2,gasCCGT,2022,1.85640000000
+14,2040,R2,gasCCGT,2022,1.85640000000
+14,2042,R2,gasCCGT,2022,1.85640000000
+14,2045,R2,gasCCGT,2022,1.85640000000
+14,2046,R2,gasCCGT,2022,1.85640000000
+14,2047,R2,gasCCGT,2022,1.85640000000
+14,2050,R2,gasCCGT,2022,1.85640000000
+14,2056,R2,gasCCGT,2022,1.85640000000
+14,2057,R2,gasCCGT,2022,1.85640000000
+14,2058,R2,gasCCGT,2022,1.85640000000
+15,2026,R2,gasCCGT,2024,2.07980000000
+15,2028,R2,gasCCGT,2024,2.07980000000
+15,2030,R2,gasCCGT,2024,2.07980000000
+15,2032,R2,gasCCGT,2024,2.07980000000
+15,2034,R2,gasCCGT,2024,2.07980000000
+15,2035,R2,gasCCGT,2024,2.07980000000
+15,2036,R2,gasCCGT,2024,2.07980000000
+15,2038,R2,gasCCGT,2024,2.07980000000
+15,2040,R2,gasCCGT,2024,2.07980000000
+15,2042,R2,gasCCGT,2024,2.07980000000
+15,2045,R2,gasCCGT,2024,2.07980000000
+15,2046,R2,gasCCGT,2024,2.07980000000
+15,2047,R2,gasCCGT,2024,2.07980000000
+15,2050,R2,gasCCGT,2024,2.07980000000
+15,2056,R2,gasCCGT,2024,2.07980000000
+15,2057,R2,gasCCGT,2024,2.07980000000
+15,2058,R2,gasCCGT,2024,2.07980000000
+15,2059,R2,gasCCGT,2024,2.07980000000
+15,2060,R2,gasCCGT,2024,2.07980000000
+16,2028,R2,gasCCGT,2026,2.29760000000
+16,2030,R2,gasCCGT,2026,2.29760000000
+16,2032,R2,gasCCGT,2026,2.29760000000
+16,2034,R2,gasCCGT,2026,2.29760000000
+16,2035,R2,gasCCGT,2026,2.29760000000
+16,2036,R2,gasCCGT,2026,2.29760000000
+16,2038,R2,gasCCGT,2026,2.29760000000
+16,2040,R2,gasCCGT,2026,2.29760000000
+16,2042,R2,gasCCGT,2026,2.29760000000
+16,2045,R2,gasCCGT,2026,2.29760000000
+16,2046,R2,gasCCGT,2026,2.29760000000
+16,2047,R2,gasCCGT,2026,2.29760000000
+16,2050,R2,gasCCGT,2026,2.29760000000
+16,2056,R2,gasCCGT,2026,2.29760000000
+16,2057,R2,gasCCGT,2026,2.29760000000
+16,2058,R2,gasCCGT,2026,2.29760000000
+16,2059,R2,gasCCGT,2026,2.29760000000
+16,2060,R2,gasCCGT,2026,2.29760000000
+16,2061,R2,gasCCGT,2026,2.29760000000
+16,2062,R2,gasCCGT,2026,2.29760000000
+17,2030,R2,gasCCGT,2028,2.31150000000
+17,2032,R2,gasCCGT,2028,2.31150000000
+17,2034,R2,gasCCGT,2028,2.31150000000
+17,2035,R2,gasCCGT,2028,2.31150000000
+17,2036,R2,gasCCGT,2028,2.31150000000
+17,2038,R2,gasCCGT,2028,2.31150000000
+17,2040,R2,gasCCGT,2028,2.31150000000
+17,2042,R2,gasCCGT,2028,2.31150000000
+17,2045,R2,gasCCGT,2028,2.31150000000
+17,2046,R2,gasCCGT,2028,2.31150000000
+17,2047,R2,gasCCGT,2028,2.31150000000
+17,2050,R2,gasCCGT,2028,2.31150000000
+17,2056,R2,gasCCGT,2028,2.31150000000
+17,2057,R2,gasCCGT,2028,2.31150000000
+17,2058,R2,gasCCGT,2028,2.31150000000
+17,2059,R2,gasCCGT,2028,2.31150000000
+17,2060,R2,gasCCGT,2028,2.31150000000
+17,2061,R2,gasCCGT,2028,2.31150000000
+17,2062,R2,gasCCGT,2028,2.31150000000
+17,2063,R2,gasCCGT,2028,2.31150000000
+17,2064,R2,gasCCGT,2028,2.31150000000
+18,2032,R2,gasCCGT,2030,0.99560000000
+18,2034,R2,gasCCGT,2030,0.99560000000
+18,2035,R2,gasCCGT,2030,0.99560000000
+18,2036,R2,gasCCGT,2030,0.99560000000
+18,2038,R2,gasCCGT,2030,0.99560000000
+18,2040,R2,gasCCGT,2030,0.99560000000
+18,2042,R2,gasCCGT,2030,0.99560000000
+18,2045,R2,gasCCGT,2030,0.99560000000
+18,2046,R2,gasCCGT,2030,0.99560000000
+18,2047,R2,gasCCGT,2030,0.99560000000
+18,2050,R2,gasCCGT,2030,0.99560000000
+18,2056,R2,gasCCGT,2030,0.99560000000
+18,2057,R2,gasCCGT,2030,0.99560000000
+18,2058,R2,gasCCGT,2030,0.99560000000
+18,2059,R2,gasCCGT,2030,0.99560000000
+18,2060,R2,gasCCGT,2030,0.99560000000
+18,2061,R2,gasCCGT,2030,0.99560000000
+18,2062,R2,gasCCGT,2030,0.99560000000
+18,2063,R2,gasCCGT,2030,0.99560000000
+18,2064,R2,gasCCGT,2030,0.99560000000
+18,2065,R2,gasCCGT,2030,0.99560000000
+18,2066,R2,gasCCGT,2030,0.99560000000
+19,2034,R2,solarPV,2032,2.24000000000
+19,2035,R2,solarPV,2032,2.24000000000
+19,2036,R2,solarPV,2032,2.24000000000
+19,2038,R2,solarPV,2032,2.24000000000
+19,2040,R2,solarPV,2032,2.24000000000
+19,2042,R2,solarPV,2032,2.24000000000
+19,2045,R2,solarPV,2032,2.24000000000
+19,2046,R2,solarPV,2032,2.24000000000
+19,2047,R2,solarPV,2032,2.24000000000
+19,2050,R2,solarPV,2032,2.24000000000
+19,2056,R2,solarPV,2032,2.24000000000
+19,2057,R2,solarPV,2032,2.24000000000
+19,2058,R2,solarPV,2032,2.24000000000
+20,2036,R2,solarPV,2034,2.24000000000
+20,2038,R2,solarPV,2034,2.24000000000
+20,2040,R2,solarPV,2034,2.24000000000
+20,2042,R2,solarPV,2034,2.24000000000
+20,2045,R2,solarPV,2034,2.24000000000
+20,2046,R2,solarPV,2034,2.24000000000
+20,2047,R2,solarPV,2034,2.24000000000
+20,2050,R2,solarPV,2034,2.24000000000
+20,2056,R2,solarPV,2034,2.24000000000
+20,2057,R2,solarPV,2034,2.24000000000
+20,2058,R2,solarPV,2034,2.24000000000
+20,2059,R2,solarPV,2034,2.24000000000
+20,2060,R2,solarPV,2034,2.24000000000
+21,2038,R2,solarPV,2036,2.24000000000
+21,2040,R2,solarPV,2036,2.24000000000
+21,2042,R2,solarPV,2036,2.24000000000
+21,2045,R2,solarPV,2036,2.24000000000
+21,2046,R2,solarPV,2036,2.24000000000
+21,2047,R2,solarPV,2036,2.24000000000
+21,2050,R2,solarPV,2036,2.24000000000
+21,2056,R2,solarPV,2036,2.24000000000
+21,2057,R2,solarPV,2036,2.24000000000
+21,2058,R2,solarPV,2036,2.24000000000
+21,2059,R2,solarPV,2036,2.24000000000
+21,2060,R2,solarPV,2036,2.24000000000
+21,2061,R2,solarPV,2036,2.24000000000
+21,2062,R2,solarPV,2036,2.24000000000
+22,2040,R2,solarPV,2038,2.24000000000
+22,2042,R2,solarPV,2038,2.24000000000
+22,2045,R2,solarPV,2038,2.24000000000
+22,2046,R2,solarPV,2038,2.24000000000
+22,2047,R2,solarPV,2038,2.24000000000
+22,2050,R2,solarPV,2038,2.24000000000
+22,2056,R2,solarPV,2038,2.24000000000
+22,2057,R2,solarPV,2038,2.24000000000
+22,2058,R2,solarPV,2038,2.24000000000
+22,2059,R2,solarPV,2038,2.24000000000
+22,2060,R2,solarPV,2038,2.24000000000
+22,2061,R2,solarPV,2038,2.24000000000
+22,2062,R2,solarPV,2038,2.24000000000
+22,2063,R2,solarPV,2038,2.24000000000
+22,2064,R2,solarPV,2038,2.24000000000
+23,2042,R2,solarPV,2040,2.24000000000
+23,2045,R2,solarPV,2040,2.24000000000
+23,2046,R2,solarPV,2040,2.24000000000
+23,2047,R2,solarPV,2040,2.24000000000
+23,2050,R2,solarPV,2040,2.24000000000
+23,2056,R2,solarPV,2040,2.24000000000
+23,2057,R2,solarPV,2040,2.24000000000
+23,2058,R2,solarPV,2040,2.24000000000
+23,2059,R2,solarPV,2040,2.24000000000
+23,2060,R2,solarPV,2040,2.24000000000
+23,2061,R2,solarPV,2040,2.24000000000
+23,2062,R2,solarPV,2040,2.24000000000
+23,2063,R2,solarPV,2040,2.24000000000
+23,2064,R2,solarPV,2040,2.24000000000
+23,2065,R2,solarPV,2040,2.24000000000
+23,2066,R2,solarPV,2040,2.24000000000
+24,2022,R2,windturbine,2020,8.77320000000
+24,2024,R2,windturbine,2020,8.77320000000
+24,2025,R2,windturbine,2020,8.77320000000
+24,2026,R2,windturbine,2020,8.77320000000
+24,2028,R2,windturbine,2020,8.77320000000
+24,2030,R2,windturbine,2020,8.77320000000
+24,2032,R2,windturbine,2020,8.77320000000
+24,2034,R2,windturbine,2020,8.77320000000
+24,2035,R2,windturbine,2020,8.77320000000
+24,2036,R2,windturbine,2020,8.77320000000
+24,2038,R2,windturbine,2020,8.77320000000
+24,2040,R2,windturbine,2020,8.77320000000
+24,2042,R2,windturbine,2020,8.77320000000
+24,2045,R2,windturbine,2020,8.77320000000
+24,2046,R2,windturbine,2020,8.77320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
new file mode 100644
index 00000000..3d9c3de1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
@@ -0,0 +1,125 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2050,R1,gasCCGT,2045,1.22220000000
+2,2059,R1,gasCCGT,2045,1.22220000000
+2,2060,R1,gasCCGT,2045,1.22220000000
+2,2064,R1,gasCCGT,2045,1.22220000000
+2,2065,R1,gasCCGT,2045,1.22220000000
+2,2069,R1,gasCCGT,2045,1.22220000000
+2,2070,R1,gasCCGT,2045,1.22220000000
+2,2074,R1,gasCCGT,2045,1.22220000000
+2,2075,R1,gasCCGT,2045,1.22220000000
+2,2084,R1,gasCCGT,2045,1.22220000000
+3,2025,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2020,6.75000000000
+3,2045,R1,solarPV,2020,6.75000000000
+3,2049,R1,solarPV,2020,6.75000000000
+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,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,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,2050,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,5.88890000000
+11,2035,R2,gasCCGT,2025,5.88890000000
+11,2040,R2,gasCCGT,2025,5.88890000000
+11,2045,R2,gasCCGT,2025,5.88890000000
+11,2049,R2,gasCCGT,2025,5.88890000000
+11,2050,R2,gasCCGT,2025,5.88890000000
+11,2059,R2,gasCCGT,2025,5.88890000000
+11,2060,R2,gasCCGT,2025,5.88890000000
+11,2064,R2,gasCCGT,2025,5.88890000000
+12,2035,R2,solarPV,2030,6.00000000000
+12,2040,R2,solarPV,2030,6.00000000000
+12,2045,R2,solarPV,2030,6.00000000000
+12,2049,R2,solarPV,2030,6.00000000000
+12,2050,R2,solarPV,2030,6.00000000000
+12,2059,R2,solarPV,2030,6.00000000000
+13,2040,R2,solarPV,2035,6.00000000000
+13,2045,R2,solarPV,2035,6.00000000000
+13,2049,R2,solarPV,2035,6.00000000000
+13,2050,R2,solarPV,2035,6.00000000000
+13,2059,R2,solarPV,2035,6.00000000000
+13,2060,R2,solarPV,2035,6.00000000000
+13,2064,R2,solarPV,2035,6.00000000000
+14,2045,R2,solarPV,2040,6.00000000000
+14,2049,R2,solarPV,2040,6.00000000000
+14,2050,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,10.00000000000
+15,2059,R2,solarPV,2045,10.00000000000
+15,2060,R2,solarPV,2045,10.00000000000
+15,2064,R2,solarPV,2045,10.00000000000
+15,2065,R2,solarPV,2045,10.00000000000
+15,2069,R2,solarPV,2045,10.00000000000
+15,2070,R2,solarPV,2045,10.00000000000
+15,2074,R2,solarPV,2045,10.00000000000
+16,2025,R2,windturbine,2020,16.75000000000
+16,2030,R2,windturbine,2020,16.75000000000
+16,2035,R2,windturbine,2020,16.75000000000
+16,2040,R2,windturbine,2020,16.75000000000
+16,2045,R2,windturbine,2020,16.75000000000
+16,2049,R2,windturbine,2020,16.75000000000
+17,2050,R2,windturbine,2045,12.75000000000
+17,2059,R2,windturbine,2045,12.75000000000
+17,2060,R2,windturbine,2045,12.75000000000
+17,2064,R2,windturbine,2045,12.75000000000
+17,2065,R2,windturbine,2045,12.75000000000
+17,2069,R2,windturbine,2045,12.75000000000
+17,2070,R2,windturbine,2045,12.75000000000
+17,2074,R2,windturbine,2045,12.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
new file mode 100644
index 00000000..3d9c3de1
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
@@ -0,0 +1,125 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2030,R1,gasCCGT,2025,5.88890000000
+1,2035,R1,gasCCGT,2025,5.88890000000
+1,2040,R1,gasCCGT,2025,5.88890000000
+1,2045,R1,gasCCGT,2025,5.88890000000
+1,2049,R1,gasCCGT,2025,5.88890000000
+1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
+1,2064,R1,gasCCGT,2025,5.88890000000
+2,2050,R1,gasCCGT,2045,1.22220000000
+2,2059,R1,gasCCGT,2045,1.22220000000
+2,2060,R1,gasCCGT,2045,1.22220000000
+2,2064,R1,gasCCGT,2045,1.22220000000
+2,2065,R1,gasCCGT,2045,1.22220000000
+2,2069,R1,gasCCGT,2045,1.22220000000
+2,2070,R1,gasCCGT,2045,1.22220000000
+2,2074,R1,gasCCGT,2045,1.22220000000
+2,2075,R1,gasCCGT,2045,1.22220000000
+2,2084,R1,gasCCGT,2045,1.22220000000
+3,2025,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2020,6.75000000000
+3,2045,R1,solarPV,2020,6.75000000000
+3,2049,R1,solarPV,2020,6.75000000000
+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,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,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,2050,R1,solarPV,2045,10.00000000000
+7,2059,R1,solarPV,2045,10.00000000000
+7,2060,R1,solarPV,2045,10.00000000000
+7,2064,R1,solarPV,2045,10.00000000000
+7,2065,R1,solarPV,2045,10.00000000000
+7,2069,R1,solarPV,2045,10.00000000000
+7,2070,R1,solarPV,2045,10.00000000000
+7,2074,R1,solarPV,2045,10.00000000000
+8,2025,R1,windturbine,2020,10.00000000000
+8,2030,R1,windturbine,2020,10.00000000000
+8,2035,R1,windturbine,2020,10.00000000000
+8,2040,R1,windturbine,2020,10.00000000000
+8,2045,R1,windturbine,2020,10.00000000000
+8,2049,R1,windturbine,2020,10.00000000000
+9,2050,R1,windturbine,2045,10.00000000000
+9,2059,R1,windturbine,2045,10.00000000000
+9,2060,R1,windturbine,2045,10.00000000000
+9,2064,R1,windturbine,2045,10.00000000000
+9,2065,R1,windturbine,2045,10.00000000000
+9,2069,R1,windturbine,2045,10.00000000000
+9,2070,R1,windturbine,2045,10.00000000000
+9,2074,R1,windturbine,2045,10.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2025,R2,gasCCGT,2020,1.00000000000
+11,2030,R2,gasCCGT,2025,5.88890000000
+11,2035,R2,gasCCGT,2025,5.88890000000
+11,2040,R2,gasCCGT,2025,5.88890000000
+11,2045,R2,gasCCGT,2025,5.88890000000
+11,2049,R2,gasCCGT,2025,5.88890000000
+11,2050,R2,gasCCGT,2025,5.88890000000
+11,2059,R2,gasCCGT,2025,5.88890000000
+11,2060,R2,gasCCGT,2025,5.88890000000
+11,2064,R2,gasCCGT,2025,5.88890000000
+12,2035,R2,solarPV,2030,6.00000000000
+12,2040,R2,solarPV,2030,6.00000000000
+12,2045,R2,solarPV,2030,6.00000000000
+12,2049,R2,solarPV,2030,6.00000000000
+12,2050,R2,solarPV,2030,6.00000000000
+12,2059,R2,solarPV,2030,6.00000000000
+13,2040,R2,solarPV,2035,6.00000000000
+13,2045,R2,solarPV,2035,6.00000000000
+13,2049,R2,solarPV,2035,6.00000000000
+13,2050,R2,solarPV,2035,6.00000000000
+13,2059,R2,solarPV,2035,6.00000000000
+13,2060,R2,solarPV,2035,6.00000000000
+13,2064,R2,solarPV,2035,6.00000000000
+14,2045,R2,solarPV,2040,6.00000000000
+14,2049,R2,solarPV,2040,6.00000000000
+14,2050,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,10.00000000000
+15,2059,R2,solarPV,2045,10.00000000000
+15,2060,R2,solarPV,2045,10.00000000000
+15,2064,R2,solarPV,2045,10.00000000000
+15,2065,R2,solarPV,2045,10.00000000000
+15,2069,R2,solarPV,2045,10.00000000000
+15,2070,R2,solarPV,2045,10.00000000000
+15,2074,R2,solarPV,2045,10.00000000000
+16,2025,R2,windturbine,2020,16.75000000000
+16,2030,R2,windturbine,2020,16.75000000000
+16,2035,R2,windturbine,2020,16.75000000000
+16,2040,R2,windturbine,2020,16.75000000000
+16,2045,R2,windturbine,2020,16.75000000000
+16,2049,R2,windturbine,2020,16.75000000000
+17,2050,R2,windturbine,2045,12.75000000000
+17,2059,R2,windturbine,2045,12.75000000000
+17,2060,R2,windturbine,2045,12.75000000000
+17,2064,R2,windturbine,2045,12.75000000000
+17,2065,R2,windturbine,2045,12.75000000000
+17,2069,R2,windturbine,2045,12.75000000000
+17,2070,R2,windturbine,2045,12.75000000000
+17,2074,R2,windturbine,2045,12.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
new file mode 100644
index 00000000..570b873b
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
@@ -0,0 +1,19 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2020,R2,gasboiler,2020,10
+3,2025,R2,gasboiler,2020,5
+4,2025,R2,heatpump,2020,19
+4,2030,R2,heatpump,2020,19
+4,2034,R2,heatpump,2020,19
+5,2030,R2,heatpump,2025,10
+5,2034,R2,heatpump,2025,10
+5,2035,R2,heatpump,2025,10
+5,2039,R2,heatpump,2025,10
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
new file mode 100644
index 00000000..88b92f80
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
@@ -0,0 +1,35 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2020,R2,gasboiler,2020,10
+5,2025,R2,gasboiler,2020,5
+6,2025,R2,heatpump,2020,19
+6,2030,R2,heatpump,2020,19
+6,2034,R2,heatpump,2020,19
+7,2030,R2,heatpump,2025,10
+7,2034,R2,heatpump,2025,10
+7,2035,R2,heatpump,2025,10
+7,2039,R2,heatpump,2025,10
+8,2035,R2,heatpump,2030,26
+8,2039,R2,heatpump,2030,26
+8,2040,R2,heatpump,2030,26
+8,2044,R2,heatpump,2030,26
+9,2040,R2,heatpump,2035,16
+9,2044,R2,heatpump,2035,16
+9,2045,R2,heatpump,2035,16
+9,2049,R2,heatpump,2035,16
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
new file mode 100644
index 00000000..b12e02b2
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
@@ -0,0 +1,51 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2020,R2,gasboiler,2020,10
+7,2025,R2,gasboiler,2020,5
+8,2025,R2,heatpump,2020,19
+8,2030,R2,heatpump,2020,19
+8,2034,R2,heatpump,2020,19
+9,2030,R2,heatpump,2025,10
+9,2034,R2,heatpump,2025,10
+9,2035,R2,heatpump,2025,10
+9,2039,R2,heatpump,2025,10
+10,2035,R2,heatpump,2030,26
+10,2039,R2,heatpump,2030,26
+10,2040,R2,heatpump,2030,26
+10,2044,R2,heatpump,2030,26
+11,2040,R2,heatpump,2035,16
+11,2044,R2,heatpump,2035,16
+11,2045,R2,heatpump,2035,16
+11,2049,R2,heatpump,2035,16
+12,2045,R2,heatpump,2040,32
+12,2049,R2,heatpump,2040,32
+12,2050,R2,heatpump,2040,32
+12,2054,R2,heatpump,2040,32
+13,2050,R2,heatpump,2045,22
+13,2054,R2,heatpump,2045,22
+13,2055,R2,heatpump,2045,22
+13,2059,R2,heatpump,2045,22
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
new file mode 100644
index 00000000..59b8c0a4
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
@@ -0,0 +1,59 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2020,10
+0,2025,R1,gasboiler,2020,5
+1,2025,R1,heatpump,2020,19
+1,2030,R1,heatpump,2020,19
+1,2034,R1,heatpump,2020,19
+2,2030,R1,heatpump,2025,10
+2,2034,R1,heatpump,2025,10
+2,2035,R1,heatpump,2025,10
+2,2039,R1,heatpump,2025,10
+3,2035,R1,heatpump,2030,26
+3,2039,R1,heatpump,2030,26
+3,2040,R1,heatpump,2030,26
+3,2044,R1,heatpump,2030,26
+4,2040,R1,heatpump,2035,16
+4,2044,R1,heatpump,2035,16
+4,2045,R1,heatpump,2035,16
+4,2049,R1,heatpump,2035,16
+5,2045,R1,heatpump,2040,32
+5,2049,R1,heatpump,2040,32
+5,2050,R1,heatpump,2040,32
+5,2054,R1,heatpump,2040,32
+6,2050,R1,heatpump,2045,22
+6,2054,R1,heatpump,2045,22
+6,2055,R1,heatpump,2045,22
+6,2059,R1,heatpump,2045,22
+7,2055,R1,heatpump,2050,32
+7,2059,R1,heatpump,2050,32
+7,2060,R1,heatpump,2050,32
+7,2064,R1,heatpump,2050,32
+8,2020,R2,gasboiler,2020,10
+8,2025,R2,gasboiler,2020,5
+9,2025,R2,heatpump,2020,19
+9,2030,R2,heatpump,2020,19
+9,2034,R2,heatpump,2020,19
+10,2030,R2,heatpump,2025,10
+10,2034,R2,heatpump,2025,10
+10,2035,R2,heatpump,2025,10
+10,2039,R2,heatpump,2025,10
+11,2035,R2,heatpump,2030,26
+11,2039,R2,heatpump,2030,26
+11,2040,R2,heatpump,2030,26
+11,2044,R2,heatpump,2030,26
+12,2040,R2,heatpump,2035,16
+12,2044,R2,heatpump,2035,16
+12,2045,R2,heatpump,2035,16
+12,2049,R2,heatpump,2035,16
+13,2045,R2,heatpump,2040,32
+13,2049,R2,heatpump,2040,32
+13,2050,R2,heatpump,2040,32
+13,2054,R2,heatpump,2040,32
+14,2050,R2,heatpump,2045,22
+14,2054,R2,heatpump,2045,22
+14,2055,R2,heatpump,2045,22
+14,2059,R2,heatpump,2045,22
+15,2055,R2,heatpump,2050,32
+15,2059,R2,heatpump,2050,32
+15,2060,R2,heatpump,2050,32
+15,2064,R2,heatpump,2050,32
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
new file mode 100644
index 00000000..8a6b5683
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
@@ -0,0 +1,121 @@
+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,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
+2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R1,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R2,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+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,heatpump,2020,0.79170000000
+3,heat,R1,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+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,heatpump,2020,0.79170000000
+3,heat,R2,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+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,heatpump,2020,1.58330000000
+4,heat,R1,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+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,heatpump,2020,1.58330000000
+4,heat,R2,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
new file mode 100644
index 00000000..f7f70781
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
@@ -0,0 +1,97 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
+2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
new file mode 100644
index 00000000..383d0d54
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
@@ -0,0 +1,97 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
+2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
new file mode 100644
index 00000000..803ba258
--- /dev/null
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
@@ -0,0 +1,97 @@
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
+2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R1,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R2,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
index ad4e691f..35173cf4 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
-gasCCGT,R1,2020,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R1,2040,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,36.30771182,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R1,2040,36.30771182,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,40,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R1,2040,30,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-gasCCGT,R2,2020,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-gasCCGT,R2,2040,23.78234399,1,0,1,0,1,6,3,180,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R2,2020,36.30771182,1,0,1,0,1,15,3,300,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-windturbine,R2,2040,36.30771182,1,0,1,0,1,15,3,300,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R2,2020,40,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
-solarPV,R2,2040,30,1,0,1,0,1,6,3,180,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R1,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R1,2040,36.30771182,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R1,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R2,2020,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+gasCCGT,R2,2040,23.78234399,1,0,1,0,1,2,1,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R2,2020,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+windturbine,R2,2040,36.30771182,1,0,1,0,1,5,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R2,2020,40,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+solarPV,R2,2040,30,1,0,1,0,1,2,1,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
index 3f30c801..aca2d3a2 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv
@@ -1,6 +1,6 @@
 ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New
-gasboiler,R1,2020,3.8,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2020,8.866667,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2020,3.8,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2020,8.866667,1,0,1,0,1,20,0.6000000000000001,120,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R1,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2020,3.8,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2020,8.866667,1,0,1,0,1,10,0.2,60,10,1,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index d7d58db1..eeac11b8 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -89,28 +89,6 @@ def generate_model_2():
             lambda x: x["sectors"][sector]["subsectors"]["all"].update({"forecast": 2}),
         )
 
-    # Increase capacity limits in power sector
-    technodata_file = model_path / "technodata/power/Technodata.csv"
-    df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
-    df.loc[1:, "MaxCapacityAddition"] *= 3
-    df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
-    df.loc[1:, "MaxCapacityGrowth"] *= 3
-    df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
-    df.loc[1:, "TotalCapacityLimit"] *= 3
-    df.to_csv(technodata_file, index=False)
-
-    # Increase capacity limits in residential sector
-    technodata_file = model_path / "technodata/residential/Technodata.csv"
-    df = pd.read_csv(technodata_file)
-    df.loc[1:, "MaxCapacityAddition"] = pd.to_numeric(df.loc[1:, "MaxCapacityAddition"])
-    df.loc[1:, "MaxCapacityAddition"] *= 2
-    df.loc[1:, "MaxCapacityGrowth"] = pd.to_numeric(df.loc[1:, "MaxCapacityGrowth"])
-    df.loc[1:, "MaxCapacityGrowth"] *= 3
-    df.loc[1:, "TotalCapacityLimit"] = pd.to_numeric(df.loc[1:, "TotalCapacityLimit"])
-    df.loc[1:, "TotalCapacityLimit"] *= 2
-    df.to_csv(technodata_file, index=False)
-
 
 if __name__ == "__main__":
     generate_model_1()
diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb
index f5d60326..b75d7cc0 100644
--- a/docs/user-guide/add-agent.ipynb
+++ b/docs/user-guide/add-agent.ipynb
@@ -152,7 +152,7 @@
    "source": [
     "The `Objsort2` parameter indicates that the new objective should be minimised, rather than maximised.\n",
     "\n",
-    "We will then re-run the simulation. You may find that the simulation fails to complete due to insufficient capacity limits in the `residential` sector. In this case, try doubling `MaxCapacityGrowth` for `gasboiler` and `heatpump` in the `technodata/residential/Technodata.csv` file to 0.04 and running the simulation again.\n",
+    "We will then re-run the simulation. You may find that the simulation fails to complete due to insufficient capacity limits in the `residential` sector. In this case, try doubling `MaxCapacityGrowth` for `gasboiler` and `heatpump` in the `technodata/residential/Technodata.csv` file to 0.4 and running the simulation again.\n",
     "\n",
     "Once the model has run to completion, we can visualise the results as before:"
    ]
diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb
index 361b507c..54436079 100644
--- a/docs/user-guide/modify-timing-data.ipynb
+++ b/docs/user-guide/modify-timing-data.ipynb
@@ -184,34 +184,7 @@
     "existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'\n",
     "lpsolver = \"scipy\"\n",
     "forecast = 2\n",
-    "```\n",
-    "\n",
-    "As we have modified the timeslicing arrangements there will be a change in the underlying demand for heating. This may require more electricity to service this demand. Therefore, we relax the constraints for growth in the power sector for all technologies and constraints in the ```technodata/power/Technodata.csv``` (we will double `MaxCapacityAddition`, `MaxCapacityGrowth` and `TotalCapacityLimit`), as shown below:\n",
-    "\n",
-    "|ProcessName|RegionName|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
-    "|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|…|PJ|%|PJ|…|New|\n",
-    "|gasCCGT|R1|…|**4**|**2**|**120**|…|1|\n",
-    "|windturbine|R1|…|**4**|**2**|**120**|…|1|\n",
-    "|solarPV|R1|…|**4**|**2**|**120**|…|1|\n",
-    "|gasCCGT|R2|…|**4**|**2**|**120**|…|1|\n",
-    "|windturbine|R2|…|**10**|**2**|**200**|…|1|\n",
-    "|solarPV|R2|…|**4**|**2**|**120**|…|1|\n",
-    "|...|...|...|...|...|...|...|...|\n",
-    "\n",
-    "We also modify the constraints defined in the `Technodata.csv` file for the residential sector (doubling `MaxCapacityAddition` and `TotalCapacityLimit`, and tripling  `MaxCapacityGrowth`), as shown below:\n",
-    "\n",
-    "|ProcessName|RegionName|Time|…|MaxCapacityAddition|MaxCapacityGrowth|TotalCapacityLimit|…|Agent1|\n",
-    "|-|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|…|PJ|%|PJ|…|New|\n",
-    "|gasboiler|R1|2020|…|**20**|**0.6**|**120**|…|1|\n",
-    "|heatpump|R1|2020|…|**20**|**0.6**|**120**|…|1|\n",
-    "|gasboiler|R2|2020|…|**20**|**0.6**|**120**|…|1|\n",
-    "|heatpump|R2|2020|…|**20**|**0.6**|**120**|…|1|\n",
-    "\n",
-    "It must be noted, that this is a toy example. For modelling a real life scenario, data should be sought to ensure that these constraints remain realistic.\n",
-    "\n",
-    "For the full power sector ```Technodata.csv``` file click [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv), and for the full residential sector ```Technodata.csv``` file click [here](https://github.com/EnergySystemsModellingLab/MUSE_OS/blob/main/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/technodata/residential/Technodata.csv).\n"
+    "```"
    ]
   },
   {

From 0c2f4dde3abd048d173192b8515047a85cb35817 Mon Sep 17 00:00:00 2001
From: Diego Alonso Alvarez <d.alonso-alvarez@imperial.ac.uk>
Date: Tue, 2 Jul 2024 12:59:02 +0100
Subject: [PATCH 342/419] Consider a more complex approach no finidng the max
 capacity

---
 .../Results/Gas/Capacity/2030.csv             |  10 +-
 .../Results/Gas/Capacity/2035.csv             |  16 +-
 .../Results/Gas/Capacity/2040.csv             |  21 +-
 .../Results/Gas/Capacity/2045.csv             |  26 +-
 .../Results/Gas/Capacity/2050.csv             |  37 +-
 .../Results/MCACapacity.csv                   | 146 ++--
 .../Results/MCAPrices.csv                     | 192 ++---
 .../Results/Power/Capacity/2020.csv           |  12 +-
 .../Results/Power/Capacity/2025.csv           |  26 +-
 .../Results/Power/Capacity/2030.csv           |  40 +-
 .../Results/Power/Capacity/2035.csv           |  54 +-
 .../Results/Power/Capacity/2040.csv           |  68 +-
 .../Results/Power/Capacity/2045.csv           |  80 +--
 .../Results/Power/Capacity/2050.csv           |  80 +--
 .../Results/Residential/Capacity/2020.csv     |   6 +-
 .../Results/Residential/Capacity/2025.csv     |  14 +-
 .../Results/Residential/Capacity/2030.csv     |  22 +-
 .../Results/Residential/Capacity/2035.csv     |  18 +-
 .../Results/Residential/Capacity/2040.csv     |  20 +-
 .../Results/Residential/Capacity/2045.csv     |  16 +-
 .../Results/Residential/Capacity/2050.csv     |  18 +-
 .../Results/Residential/Supply/2020.csv       |  36 +-
 .../Results/Residential/Supply/2025.csv       |  66 +-
 .../Results/Residential/Supply/2030.csv       |  72 +-
 .../Results/Residential/Supply/2035.csv       |  72 +-
 .../Results/Residential/Supply/2040.csv       |  60 +-
 .../Results/Residential/Supply/2045.csv       |  60 +-
 .../Results/Residential/Supply/2050.csv       |  60 +-
 .../Results/Gas/Capacity/2020.csv             |  14 +-
 .../Results/Gas/Capacity/2025.csv             |  22 +-
 .../Results/Gas/Capacity/2030.csv             |  36 +-
 .../Results/Gas/Capacity/2035.csv             |  33 +-
 .../Results/Gas/Capacity/2040.csv             |  37 +-
 .../Results/Gas/Capacity/2045.csv             |  42 +-
 .../Results/Gas/Capacity/2050.csv             |  43 +-
 .../2-max-constraint/Results/MCACapacity.csv  |  90 ++-
 .../Results/MCAMetric_Consumption.csv         | 372 ++++++----
 .../Results/MCAMetric_Supply.csv              | 660 +++++++++++++-----
 .../2-max-constraint/Results/MCAPrices.csv    | 204 +++---
 .../Results/Power/Capacity/2020.csv           |  21 +-
 .../Results/Power/Capacity/2025.csv           |  48 +-
 .../Results/Power/Capacity/2030.csv           |  72 +-
 .../Results/Power/Capacity/2035.csv           |  97 ++-
 .../Results/Power/Capacity/2040.csv           | 122 +++-
 .../Results/Power/Capacity/2045.csv           | 144 ++--
 .../Results/Power/Capacity/2050.csv           | 134 ++--
 .../Results/Power/Supply/2020.csv             |  32 +-
 .../Results/Power/Supply/2025.csv             |  80 ++-
 .../Results/Power/Supply/2030.csv             | 120 +++-
 .../Results/Power/Supply/2035.csv             | 168 +++--
 .../Results/Power/Supply/2040.csv             | 216 ++++--
 .../Results/Power/Supply/2045.csv             | 252 +++++--
 .../Results/Power/Supply/2050.csv             | 264 +++++--
 .../visualise-max-service.ipynb               |   2 +-
 .../visualise-min-service.ipynb               |   2 +-
 src/muse/constraints.py                       |  42 +-
 56 files changed, 3069 insertions(+), 1648 deletions(-)

diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index ac5d5706..49c37aea 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,7 @@
 asset,year,region,technology,installed,capacity
 0,2030,R1,gassupply1,2020,7.50000000000
-1,2035,R1,gassupply1,2030,2.83560000000
-1,2040,R1,gassupply1,2030,2.83560000000
-1,2045,R1,gassupply1,2030,2.83560000000
-1,2050,R1,gassupply1,2030,2.83560000000
-1,2069,R1,gassupply1,2030,2.83560000000
+1,2035,R1,gassupply1,2030,1.41560000000
+1,2040,R1,gassupply1,2030,1.41560000000
+1,2045,R1,gassupply1,2030,1.41560000000
+1,2050,R1,gassupply1,2030,1.41560000000
+1,2069,R1,gassupply1,2030,1.41560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index edb1e4ba..8ce13fd6 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,12 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2030,2.83560000000
-1,2040,R1,gassupply1,2030,2.83560000000
-1,2045,R1,gassupply1,2030,2.83560000000
-1,2050,R1,gassupply1,2030,2.83560000000
-1,2069,R1,gassupply1,2030,2.83560000000
+1,2035,R1,gassupply1,2030,1.41560000000
+1,2040,R1,gassupply1,2030,1.41560000000
+1,2045,R1,gassupply1,2030,1.41560000000
+1,2050,R1,gassupply1,2030,1.41560000000
+1,2069,R1,gassupply1,2030,1.41560000000
+2,2040,R1,gassupply1,2035,0.11800000000
+2,2045,R1,gassupply1,2035,0.11800000000
+2,2050,R1,gassupply1,2035,0.11800000000
+2,2069,R1,gassupply1,2035,0.11800000000
+2,2070,R1,gassupply1,2035,0.11800000000
+2,2074,R1,gassupply1,2035,0.11800000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index e6e3e0e6..028d04af 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,18 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2030,2.83560000000
-1,2045,R1,gassupply1,2030,2.83560000000
-1,2050,R1,gassupply1,2030,2.83560000000
-1,2069,R1,gassupply1,2030,2.83560000000
+0,2040,R1,gassupply1,2030,1.41560000000
+0,2045,R1,gassupply1,2030,1.41560000000
+0,2050,R1,gassupply1,2030,1.41560000000
+0,2069,R1,gassupply1,2030,1.41560000000
+1,2040,R1,gassupply1,2035,0.11800000000
+1,2045,R1,gassupply1,2035,0.11800000000
+1,2050,R1,gassupply1,2035,0.11800000000
+1,2069,R1,gassupply1,2035,0.11800000000
+1,2070,R1,gassupply1,2035,0.11800000000
+1,2074,R1,gassupply1,2035,0.11800000000
+2,2045,R1,gassupply1,2040,0.22020000000
+2,2050,R1,gassupply1,2040,0.22020000000
+2,2069,R1,gassupply1,2040,0.22020000000
+2,2070,R1,gassupply1,2040,0.22020000000
+2,2074,R1,gassupply1,2040,0.22020000000
+2,2075,R1,gassupply1,2040,0.22020000000
+2,2079,R1,gassupply1,2040,0.22020000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index 40297b9e..eb87bb43 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,24 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2030,2.83560000000
-1,2050,R1,gassupply1,2030,2.83560000000
-1,2069,R1,gassupply1,2030,2.83560000000
+0,2045,R1,gassupply1,2030,1.41560000000
+0,2050,R1,gassupply1,2030,1.41560000000
+0,2069,R1,gassupply1,2030,1.41560000000
+1,2045,R1,gassupply1,2035,0.11800000000
+1,2050,R1,gassupply1,2035,0.11800000000
+1,2069,R1,gassupply1,2035,0.11800000000
+1,2070,R1,gassupply1,2035,0.11800000000
+1,2074,R1,gassupply1,2035,0.11800000000
+2,2045,R1,gassupply1,2040,0.22020000000
+2,2050,R1,gassupply1,2040,0.22020000000
+2,2069,R1,gassupply1,2040,0.22020000000
+2,2070,R1,gassupply1,2040,0.22020000000
+2,2074,R1,gassupply1,2040,0.22020000000
+2,2075,R1,gassupply1,2040,0.22020000000
+2,2079,R1,gassupply1,2040,0.22020000000
+3,2050,R1,gassupply1,2045,0.21820000000
+3,2069,R1,gassupply1,2045,0.21820000000
+3,2070,R1,gassupply1,2045,0.21820000000
+3,2074,R1,gassupply1,2045,0.21820000000
+3,2075,R1,gassupply1,2045,0.21820000000
+3,2079,R1,gassupply1,2045,0.21820000000
+3,2080,R1,gassupply1,2045,0.21820000000
+3,2084,R1,gassupply1,2045,0.21820000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index 647a0839..80865a0c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,35 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2030,2.83560000000
-1,2055,R1,gassupply1,2030,2.83560000000
-1,2069,R1,gassupply1,2030,2.83560000000
+0,2050,R1,gassupply1,2030,1.41560000000
+0,2055,R1,gassupply1,2030,1.41560000000
+0,2069,R1,gassupply1,2030,1.41560000000
+1,2050,R1,gassupply1,2035,0.11800000000
+1,2055,R1,gassupply1,2035,0.11800000000
+1,2069,R1,gassupply1,2035,0.11800000000
+1,2070,R1,gassupply1,2035,0.11800000000
+1,2074,R1,gassupply1,2035,0.11800000000
+2,2050,R1,gassupply1,2040,0.22020000000
+2,2055,R1,gassupply1,2040,0.22020000000
+2,2069,R1,gassupply1,2040,0.22020000000
+2,2070,R1,gassupply1,2040,0.22020000000
+2,2074,R1,gassupply1,2040,0.22020000000
+2,2075,R1,gassupply1,2040,0.22020000000
+2,2079,R1,gassupply1,2040,0.22020000000
+3,2050,R1,gassupply1,2045,0.21820000000
+3,2055,R1,gassupply1,2045,0.21820000000
+3,2069,R1,gassupply1,2045,0.21820000000
+3,2070,R1,gassupply1,2045,0.21820000000
+3,2074,R1,gassupply1,2045,0.21820000000
+3,2075,R1,gassupply1,2045,0.21820000000
+3,2079,R1,gassupply1,2045,0.21820000000
+3,2080,R1,gassupply1,2045,0.21820000000
+3,2084,R1,gassupply1,2045,0.21820000000
+4,2055,R1,gassupply1,2050,0.59600000000
+4,2069,R1,gassupply1,2050,0.59600000000
+4,2070,R1,gassupply1,2050,0.59600000000
+4,2074,R1,gassupply1,2050,0.59600000000
+4,2075,R1,gassupply1,2050,0.59600000000
+4,2079,R1,gassupply1,2050,0.59600000000
+4,2080,R1,gassupply1,2050,0.59600000000
+4,2084,R1,gassupply1,2050,0.59600000000
+4,2085,R1,gassupply1,2050,0.59600000000
+4,2089,R1,gassupply1,2050,0.59600000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 59bfd398..2cdf535f 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -8,82 +8,84 @@ gassupply1,R1,R1,A2,gas,retrofit,2020,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,2.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,retrofit,2025,2.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2025,9.50000000000
+heatpump,R1,R1,A2,residential,retrofit,2025,100.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A1,power,retrofit,2025,4.18750000000
+windturbine,R1,R1,A1,power,retrofit,2025,5.17550000000
 gasCCGT,R1,R1,A2,power,retrofit,2025,0.50000000000
-windturbine,R1,R1,A2,power,retrofit,2025,4.18750000000
+windturbine,R1,R1,A2,power,retrofit,2025,5.17550000000
 gassupply1,R1,R1,A1,gas,retrofit,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,retrofit,2025,7.50000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,1.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,4.40000000000
-gasboiler,R1,R1,A2,residential,retrofit,2030,1.10000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,9.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2030,4.40000000000
-solarPV,R1,R1,A1,power,retrofit,2030,9.71250000000
-windturbine,R1,R1,A1,power,retrofit,2030,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2030,9.71250000000
-windturbine,R1,R1,A2,power,retrofit,2030,4.18750000000
+heatpump,R1,R1,A2,residential,retrofit,2030,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2030,9.82450000000
+windturbine,R1,R1,A1,power,retrofit,2030,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2030,9.82450000000
+windturbine,R1,R1,A2,power,retrofit,2030,5.17550000000
 gassupply1,R1,R1,A1,gas,retrofit,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,retrofit,2030,3.75000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,1.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,4.40000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,12.50000000000
-gasboiler,R1,R1,A2,residential,retrofit,2035,1.10000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,4.40000000000
-heatpump,R1,R1,A2,residential,retrofit,2035,12.50000000000
-solarPV,R1,R1,A1,power,retrofit,2035,9.71250000000
-solarPV,R1,R1,A1,power,retrofit,2035,1.50000000000
-windturbine,R1,R1,A1,power,retrofit,2035,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2035,9.71250000000
-solarPV,R1,R1,A2,power,retrofit,2035,1.50000000000
-windturbine,R1,R1,A2,power,retrofit,2035,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,1.41780000000
-gassupply1,R1,R1,A2,gas,retrofit,2035,1.41780000000
-heatpump,R1,R1,A1,residential,retrofit,2040,12.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2040,8.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,12.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2040,8.50000000000
-solarPV,R1,R1,A1,power,retrofit,2040,9.71250000000
-solarPV,R1,R1,A1,power,retrofit,2040,1.50000000000
-solarPV,R1,R1,A1,power,retrofit,2040,3.55000000000
-windturbine,R1,R1,A1,power,retrofit,2040,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2040,9.71250000000
-solarPV,R1,R1,A2,power,retrofit,2040,1.50000000000
-solarPV,R1,R1,A2,power,retrofit,2040,3.55000000000
-windturbine,R1,R1,A2,power,retrofit,2040,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,1.41780000000
-gassupply1,R1,R1,A2,gas,retrofit,2040,1.41780000000
-heatpump,R1,R1,A1,residential,retrofit,2045,8.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2045,15.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,8.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2045,15.50000000000
-solarPV,R1,R1,A1,power,retrofit,2045,9.71250000000
-solarPV,R1,R1,A1,power,retrofit,2045,1.50000000000
-solarPV,R1,R1,A1,power,retrofit,2045,3.55000000000
-solarPV,R1,R1,A1,power,retrofit,2045,3.55000000000
-windturbine,R1,R1,A1,power,retrofit,2045,4.18750000000
-solarPV,R1,R1,A2,power,retrofit,2045,9.71250000000
-solarPV,R1,R1,A2,power,retrofit,2045,1.50000000000
-solarPV,R1,R1,A2,power,retrofit,2045,3.55000000000
-solarPV,R1,R1,A2,power,retrofit,2045,3.55000000000
-windturbine,R1,R1,A2,power,retrofit,2045,4.18750000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,1.41780000000
-gassupply1,R1,R1,A2,gas,retrofit,2045,1.41780000000
-heatpump,R1,R1,A1,residential,retrofit,2050,15.50000000000
-heatpump,R1,R1,A1,residential,retrofit,2050,11.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,15.50000000000
-heatpump,R1,R1,A2,residential,retrofit,2050,11.50000000000
-solarPV,R1,R1,A1,power,retrofit,2050,9.71250000000
-solarPV,R1,R1,A1,power,retrofit,2050,1.50000000000
-solarPV,R1,R1,A1,power,retrofit,2050,3.55000000000
-solarPV,R1,R1,A1,power,retrofit,2050,3.55000000000
-solarPV,R1,R1,A1,power,retrofit,2050,8.68750000000
-solarPV,R1,R1,A2,power,retrofit,2050,9.71250000000
-solarPV,R1,R1,A2,power,retrofit,2050,1.50000000000
-solarPV,R1,R1,A2,power,retrofit,2050,3.55000000000
-solarPV,R1,R1,A2,power,retrofit,2050,3.55000000000
-solarPV,R1,R1,A2,power,retrofit,2050,8.68750000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,1.41780000000
-gassupply1,R1,R1,A2,gas,retrofit,2050,1.41780000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,3.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2035,14.40000000000
+heatpump,R1,R1,A2,residential,retrofit,2035,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2035,9.82450000000
+solarPV,R1,R1,A1,power,retrofit,2035,1.22540000000
+windturbine,R1,R1,A1,power,retrofit,2035,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2035,9.82450000000
+solarPV,R1,R1,A2,power,retrofit,2035,1.22540000000
+windturbine,R1,R1,A2,power,retrofit,2035,5.17550000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2035,0.70780000000
+gasboiler,R1,R1,A1,residential,retrofit,2040,3.60000000000
+heatpump,R1,R1,A1,residential,retrofit,2040,14.40000000000
+heatpump,R1,R1,A2,residential,retrofit,2040,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.82450000000
+solarPV,R1,R1,A1,power,retrofit,2040,1.22540000000
+solarPV,R1,R1,A1,power,retrofit,2040,2.67970000000
+windturbine,R1,R1,A1,power,retrofit,2040,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2040,9.82450000000
+solarPV,R1,R1,A2,power,retrofit,2040,1.22540000000
+solarPV,R1,R1,A2,power,retrofit,2040,2.67970000000
+windturbine,R1,R1,A2,power,retrofit,2040,5.17550000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,0.70780000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,0.05900000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2040,0.05900000000
+gasboiler,R1,R1,A1,residential,retrofit,2045,3.72000000000
+heatpump,R1,R1,A1,residential,retrofit,2045,20.28000000000
+heatpump,R1,R1,A2,residential,retrofit,2045,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.82450000000
+solarPV,R1,R1,A1,power,retrofit,2045,1.22540000000
+solarPV,R1,R1,A1,power,retrofit,2045,2.67970000000
+solarPV,R1,R1,A1,power,retrofit,2045,2.91460000000
+windturbine,R1,R1,A1,power,retrofit,2045,5.17550000000
+solarPV,R1,R1,A2,power,retrofit,2045,9.82450000000
+solarPV,R1,R1,A2,power,retrofit,2045,1.22540000000
+solarPV,R1,R1,A2,power,retrofit,2045,2.67970000000
+solarPV,R1,R1,A2,power,retrofit,2045,2.91460000000
+windturbine,R1,R1,A2,power,retrofit,2045,5.17550000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.70780000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.05900000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,0.11010000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,0.05900000000
+gassupply1,R1,R1,A2,gas,retrofit,2045,0.11010000000
+gasboiler,R1,R1,A1,residential,retrofit,2050,3.72000000000
+heatpump,R1,R1,A1,residential,retrofit,2050,20.28000000000
+heatpump,R1,R1,A2,residential,retrofit,2050,100.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.82450000000
+solarPV,R1,R1,A1,power,retrofit,2050,1.22540000000
+solarPV,R1,R1,A1,power,retrofit,2050,2.67970000000
+solarPV,R1,R1,A1,power,retrofit,2050,2.91460000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.54580000000
+solarPV,R1,R1,A2,power,retrofit,2050,9.82450000000
+solarPV,R1,R1,A2,power,retrofit,2050,1.22540000000
+solarPV,R1,R1,A2,power,retrofit,2050,2.67970000000
+solarPV,R1,R1,A2,power,retrofit,2050,2.91460000000
+solarPV,R1,R1,A2,power,retrofit,2050,9.54580000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.70780000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.05900000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.11010000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,0.10910000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,0.70780000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,0.05900000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,0.11010000000
+gassupply1,R1,R1,A2,gas,retrofit,2050,0.10910000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 7245c4b7..c92055b0 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,17.68030000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,17.66480000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,80.18750000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,17.74640000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,17.72310000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,80.28130000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.68030000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.66480000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,80.21470000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,80.18750000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.74640000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.72310000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,80.32210000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,80.28130000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94460000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.89810000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,80.64410000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,80.56250000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,17.81250000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,17.78150000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,80.42940000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,80.37500000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,14.17830000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,64.33340000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.17020000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.73060000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,14.24830000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,64.50080000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25540000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,1.09950000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.17830000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,64.33340000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17020000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,6.49460000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.73060000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.24830000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,64.50080000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25540000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,6.49930000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.09950000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.45800000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,65.00620000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51070000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,6.51350000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.21990000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,14.31820000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,64.66880000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34050000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,6.50400000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.47060000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,11.37660000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,51.60220000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.17010000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.60360000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,11.44950000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,51.80480000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25520000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.90930000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.37660000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,51.60220000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.17010000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,5.20510000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.60360000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.44950000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,51.80480000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25520000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,5.21360000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.90930000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.66810000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,52.41790000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.51030000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,5.23910000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.84130000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,11.52240000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,52.00820000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.34020000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,5.22210000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.21740000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.16570000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.16940000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.47910000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.50340000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24860000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25410000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.72300000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.75920000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16570000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16940000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.47910000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50340000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24860000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25410000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.72300000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.75920000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49720000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50820000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.47230000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.54250000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.33140000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33880000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.96990000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,1.01760000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.16130000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.16810000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.42540000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.24200000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.25210000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.64240000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16130000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03070000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16810000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,3.34830000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.42540000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24200000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.25210000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,3.36220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.64240000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.48390000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13180000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.50430000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,3.40400000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.31010000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.32260000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.07460000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33620000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,3.37620000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.86210000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.15290000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,4.17350000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03050000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.16500000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.36560000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.22930000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,4.18510000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05060000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.24760000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.55280000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.15290000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,4.17350000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03050000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.16500000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,2.68810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.36560000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.22930000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,4.18510000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05060000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.24760000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,2.70390000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.55280000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.45860000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,4.21960000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.13020000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.49510000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,2.75160000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.13180000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.30580000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,4.19660000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.07390000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.33010000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,2.71980000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.74280000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
index b3996630..2db4a714 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
 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,8.37500000000
-1,2030,R1,windturbine,2020,8.37500000000
-1,2035,R1,windturbine,2020,8.37500000000
-1,2040,R1,windturbine,2020,8.37500000000
-1,2045,R1,windturbine,2020,8.37500000000
-1,2049,R1,windturbine,2020,8.37500000000
+1,2025,R1,windturbine,2020,10.35100000000
+1,2030,R1,windturbine,2020,10.35100000000
+1,2035,R1,windturbine,2020,10.35100000000
+1,2040,R1,windturbine,2020,10.35100000000
+1,2045,R1,windturbine,2020,10.35100000000
+1,2049,R1,windturbine,2020,10.35100000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index b84e3ce6..c95be067 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,15 +1,15 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,solarPV,2025,19.42500000000
-1,2035,R1,solarPV,2025,19.42500000000
-1,2040,R1,solarPV,2025,19.42500000000
-1,2045,R1,solarPV,2025,19.42500000000
-1,2049,R1,solarPV,2025,19.42500000000
-1,2050,R1,solarPV,2025,19.42500000000
-1,2054,R1,solarPV,2025,19.42500000000
-2,2025,R1,windturbine,2020,8.37500000000
-2,2030,R1,windturbine,2020,8.37500000000
-2,2035,R1,windturbine,2020,8.37500000000
-2,2040,R1,windturbine,2020,8.37500000000
-2,2045,R1,windturbine,2020,8.37500000000
-2,2049,R1,windturbine,2020,8.37500000000
+1,2030,R1,solarPV,2025,19.64900000000
+1,2035,R1,solarPV,2025,19.64900000000
+1,2040,R1,solarPV,2025,19.64900000000
+1,2045,R1,solarPV,2025,19.64900000000
+1,2049,R1,solarPV,2025,19.64900000000
+1,2050,R1,solarPV,2025,19.64900000000
+1,2054,R1,solarPV,2025,19.64900000000
+2,2025,R1,windturbine,2020,10.35100000000
+2,2030,R1,windturbine,2020,10.35100000000
+2,2035,R1,windturbine,2020,10.35100000000
+2,2040,R1,windturbine,2020,10.35100000000
+2,2045,R1,windturbine,2020,10.35100000000
+2,2049,R1,windturbine,2020,10.35100000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index 62d5e401..45ea2350 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,21 +1,21 @@
 asset,year,region,technology,installed,capacity
-1,2030,R1,solarPV,2025,19.42500000000
-1,2035,R1,solarPV,2025,19.42500000000
-1,2040,R1,solarPV,2025,19.42500000000
-1,2045,R1,solarPV,2025,19.42500000000
-1,2049,R1,solarPV,2025,19.42500000000
-1,2050,R1,solarPV,2025,19.42500000000
-1,2054,R1,solarPV,2025,19.42500000000
-2,2035,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2030,3.00000000000
-2,2049,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2030,3.00000000000
-2,2054,R1,solarPV,2030,3.00000000000
-2,2055,R1,solarPV,2030,3.00000000000
-2,2059,R1,solarPV,2030,3.00000000000
-3,2030,R1,windturbine,2020,8.37500000000
-3,2035,R1,windturbine,2020,8.37500000000
-3,2040,R1,windturbine,2020,8.37500000000
-3,2045,R1,windturbine,2020,8.37500000000
-3,2049,R1,windturbine,2020,8.37500000000
+1,2030,R1,solarPV,2025,19.64900000000
+1,2035,R1,solarPV,2025,19.64900000000
+1,2040,R1,solarPV,2025,19.64900000000
+1,2045,R1,solarPV,2025,19.64900000000
+1,2049,R1,solarPV,2025,19.64900000000
+1,2050,R1,solarPV,2025,19.64900000000
+1,2054,R1,solarPV,2025,19.64900000000
+2,2035,R1,solarPV,2030,2.45080000000
+2,2040,R1,solarPV,2030,2.45080000000
+2,2045,R1,solarPV,2030,2.45080000000
+2,2049,R1,solarPV,2030,2.45080000000
+2,2050,R1,solarPV,2030,2.45080000000
+2,2054,R1,solarPV,2030,2.45080000000
+2,2055,R1,solarPV,2030,2.45080000000
+2,2059,R1,solarPV,2030,2.45080000000
+3,2030,R1,windturbine,2020,10.35100000000
+3,2035,R1,windturbine,2020,10.35100000000
+3,2040,R1,windturbine,2020,10.35100000000
+3,2045,R1,windturbine,2020,10.35100000000
+3,2049,R1,windturbine,2020,10.35100000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index 84390f0e..450fbae8 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,28 +1,28 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,solarPV,2025,19.42500000000
-0,2040,R1,solarPV,2025,19.42500000000
-0,2045,R1,solarPV,2025,19.42500000000
-0,2049,R1,solarPV,2025,19.42500000000
-0,2050,R1,solarPV,2025,19.42500000000
-0,2054,R1,solarPV,2025,19.42500000000
-1,2035,R1,solarPV,2030,3.00000000000
-1,2040,R1,solarPV,2030,3.00000000000
-1,2045,R1,solarPV,2030,3.00000000000
-1,2049,R1,solarPV,2030,3.00000000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2035,7.10000000000
-2,2045,R1,solarPV,2035,7.10000000000
-2,2049,R1,solarPV,2035,7.10000000000
-2,2050,R1,solarPV,2035,7.10000000000
-2,2054,R1,solarPV,2035,7.10000000000
-2,2055,R1,solarPV,2035,7.10000000000
-2,2059,R1,solarPV,2035,7.10000000000
-2,2060,R1,solarPV,2035,7.10000000000
-2,2064,R1,solarPV,2035,7.10000000000
-3,2035,R1,windturbine,2020,8.37500000000
-3,2040,R1,windturbine,2020,8.37500000000
-3,2045,R1,windturbine,2020,8.37500000000
-3,2049,R1,windturbine,2020,8.37500000000
+0,2035,R1,solarPV,2025,19.64900000000
+0,2040,R1,solarPV,2025,19.64900000000
+0,2045,R1,solarPV,2025,19.64900000000
+0,2049,R1,solarPV,2025,19.64900000000
+0,2050,R1,solarPV,2025,19.64900000000
+0,2054,R1,solarPV,2025,19.64900000000
+1,2035,R1,solarPV,2030,2.45080000000
+1,2040,R1,solarPV,2030,2.45080000000
+1,2045,R1,solarPV,2030,2.45080000000
+1,2049,R1,solarPV,2030,2.45080000000
+1,2050,R1,solarPV,2030,2.45080000000
+1,2054,R1,solarPV,2030,2.45080000000
+1,2055,R1,solarPV,2030,2.45080000000
+1,2059,R1,solarPV,2030,2.45080000000
+2,2040,R1,solarPV,2035,5.35930000000
+2,2045,R1,solarPV,2035,5.35930000000
+2,2049,R1,solarPV,2035,5.35930000000
+2,2050,R1,solarPV,2035,5.35930000000
+2,2054,R1,solarPV,2035,5.35930000000
+2,2055,R1,solarPV,2035,5.35930000000
+2,2059,R1,solarPV,2035,5.35930000000
+2,2060,R1,solarPV,2035,5.35930000000
+2,2064,R1,solarPV,2035,5.35930000000
+3,2035,R1,windturbine,2020,10.35100000000
+3,2040,R1,windturbine,2020,10.35100000000
+3,2045,R1,windturbine,2020,10.35100000000
+3,2049,R1,windturbine,2020,10.35100000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index 79e92271..85454102 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,35 +1,35 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,solarPV,2025,19.42500000000
-0,2045,R1,solarPV,2025,19.42500000000
-0,2049,R1,solarPV,2025,19.42500000000
-0,2050,R1,solarPV,2025,19.42500000000
-0,2054,R1,solarPV,2025,19.42500000000
-1,2040,R1,solarPV,2030,3.00000000000
-1,2045,R1,solarPV,2030,3.00000000000
-1,2049,R1,solarPV,2030,3.00000000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2040,R1,solarPV,2035,7.10000000000
-2,2045,R1,solarPV,2035,7.10000000000
-2,2049,R1,solarPV,2035,7.10000000000
-2,2050,R1,solarPV,2035,7.10000000000
-2,2054,R1,solarPV,2035,7.10000000000
-2,2055,R1,solarPV,2035,7.10000000000
-2,2059,R1,solarPV,2035,7.10000000000
-2,2060,R1,solarPV,2035,7.10000000000
-2,2064,R1,solarPV,2035,7.10000000000
-3,2045,R1,solarPV,2040,7.10000000000
-3,2049,R1,solarPV,2040,7.10000000000
-3,2050,R1,solarPV,2040,7.10000000000
-3,2054,R1,solarPV,2040,7.10000000000
-3,2055,R1,solarPV,2040,7.10000000000
-3,2059,R1,solarPV,2040,7.10000000000
-3,2060,R1,solarPV,2040,7.10000000000
-3,2064,R1,solarPV,2040,7.10000000000
-3,2065,R1,solarPV,2040,7.10000000000
-3,2069,R1,solarPV,2040,7.10000000000
-4,2040,R1,windturbine,2020,8.37500000000
-4,2045,R1,windturbine,2020,8.37500000000
-4,2049,R1,windturbine,2020,8.37500000000
+0,2040,R1,solarPV,2025,19.64900000000
+0,2045,R1,solarPV,2025,19.64900000000
+0,2049,R1,solarPV,2025,19.64900000000
+0,2050,R1,solarPV,2025,19.64900000000
+0,2054,R1,solarPV,2025,19.64900000000
+1,2040,R1,solarPV,2030,2.45080000000
+1,2045,R1,solarPV,2030,2.45080000000
+1,2049,R1,solarPV,2030,2.45080000000
+1,2050,R1,solarPV,2030,2.45080000000
+1,2054,R1,solarPV,2030,2.45080000000
+1,2055,R1,solarPV,2030,2.45080000000
+1,2059,R1,solarPV,2030,2.45080000000
+2,2040,R1,solarPV,2035,5.35930000000
+2,2045,R1,solarPV,2035,5.35930000000
+2,2049,R1,solarPV,2035,5.35930000000
+2,2050,R1,solarPV,2035,5.35930000000
+2,2054,R1,solarPV,2035,5.35930000000
+2,2055,R1,solarPV,2035,5.35930000000
+2,2059,R1,solarPV,2035,5.35930000000
+2,2060,R1,solarPV,2035,5.35930000000
+2,2064,R1,solarPV,2035,5.35930000000
+3,2045,R1,solarPV,2040,5.82920000000
+3,2049,R1,solarPV,2040,5.82920000000
+3,2050,R1,solarPV,2040,5.82920000000
+3,2054,R1,solarPV,2040,5.82920000000
+3,2055,R1,solarPV,2040,5.82920000000
+3,2059,R1,solarPV,2040,5.82920000000
+3,2060,R1,solarPV,2040,5.82920000000
+3,2064,R1,solarPV,2040,5.82920000000
+3,2065,R1,solarPV,2040,5.82920000000
+3,2069,R1,solarPV,2040,5.82920000000
+4,2040,R1,windturbine,2020,10.35100000000
+4,2045,R1,windturbine,2020,10.35100000000
+4,2049,R1,windturbine,2020,10.35100000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index 0d8295c0..218db3ce 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,41 +1,41 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,solarPV,2025,19.42500000000
-0,2049,R1,solarPV,2025,19.42500000000
-0,2050,R1,solarPV,2025,19.42500000000
-0,2054,R1,solarPV,2025,19.42500000000
-1,2045,R1,solarPV,2030,3.00000000000
-1,2049,R1,solarPV,2030,3.00000000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2045,R1,solarPV,2035,7.10000000000
-2,2049,R1,solarPV,2035,7.10000000000
-2,2050,R1,solarPV,2035,7.10000000000
-2,2054,R1,solarPV,2035,7.10000000000
-2,2055,R1,solarPV,2035,7.10000000000
-2,2059,R1,solarPV,2035,7.10000000000
-2,2060,R1,solarPV,2035,7.10000000000
-2,2064,R1,solarPV,2035,7.10000000000
-3,2045,R1,solarPV,2040,7.10000000000
-3,2049,R1,solarPV,2040,7.10000000000
-3,2050,R1,solarPV,2040,7.10000000000
-3,2054,R1,solarPV,2040,7.10000000000
-3,2055,R1,solarPV,2040,7.10000000000
-3,2059,R1,solarPV,2040,7.10000000000
-3,2060,R1,solarPV,2040,7.10000000000
-3,2064,R1,solarPV,2040,7.10000000000
-3,2065,R1,solarPV,2040,7.10000000000
-3,2069,R1,solarPV,2040,7.10000000000
-4,2050,R1,solarPV,2045,17.37500000000
-4,2054,R1,solarPV,2045,17.37500000000
-4,2055,R1,solarPV,2045,17.37500000000
-4,2059,R1,solarPV,2045,17.37500000000
-4,2060,R1,solarPV,2045,17.37500000000
-4,2064,R1,solarPV,2045,17.37500000000
-4,2065,R1,solarPV,2045,17.37500000000
-4,2069,R1,solarPV,2045,17.37500000000
-4,2070,R1,solarPV,2045,17.37500000000
-4,2074,R1,solarPV,2045,17.37500000000
-5,2045,R1,windturbine,2020,8.37500000000
-5,2049,R1,windturbine,2020,8.37500000000
+0,2045,R1,solarPV,2025,19.64900000000
+0,2049,R1,solarPV,2025,19.64900000000
+0,2050,R1,solarPV,2025,19.64900000000
+0,2054,R1,solarPV,2025,19.64900000000
+1,2045,R1,solarPV,2030,2.45080000000
+1,2049,R1,solarPV,2030,2.45080000000
+1,2050,R1,solarPV,2030,2.45080000000
+1,2054,R1,solarPV,2030,2.45080000000
+1,2055,R1,solarPV,2030,2.45080000000
+1,2059,R1,solarPV,2030,2.45080000000
+2,2045,R1,solarPV,2035,5.35930000000
+2,2049,R1,solarPV,2035,5.35930000000
+2,2050,R1,solarPV,2035,5.35930000000
+2,2054,R1,solarPV,2035,5.35930000000
+2,2055,R1,solarPV,2035,5.35930000000
+2,2059,R1,solarPV,2035,5.35930000000
+2,2060,R1,solarPV,2035,5.35930000000
+2,2064,R1,solarPV,2035,5.35930000000
+3,2045,R1,solarPV,2040,5.82920000000
+3,2049,R1,solarPV,2040,5.82920000000
+3,2050,R1,solarPV,2040,5.82920000000
+3,2054,R1,solarPV,2040,5.82920000000
+3,2055,R1,solarPV,2040,5.82920000000
+3,2059,R1,solarPV,2040,5.82920000000
+3,2060,R1,solarPV,2040,5.82920000000
+3,2064,R1,solarPV,2040,5.82920000000
+3,2065,R1,solarPV,2040,5.82920000000
+3,2069,R1,solarPV,2040,5.82920000000
+4,2050,R1,solarPV,2045,19.09170000000
+4,2054,R1,solarPV,2045,19.09170000000
+4,2055,R1,solarPV,2045,19.09170000000
+4,2059,R1,solarPV,2045,19.09170000000
+4,2060,R1,solarPV,2045,19.09170000000
+4,2064,R1,solarPV,2045,19.09170000000
+4,2065,R1,solarPV,2045,19.09170000000
+4,2069,R1,solarPV,2045,19.09170000000
+4,2070,R1,solarPV,2045,19.09170000000
+4,2074,R1,solarPV,2045,19.09170000000
+5,2045,R1,windturbine,2020,10.35100000000
+5,2049,R1,windturbine,2020,10.35100000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index 26f737ea..4918146b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,41 +1,41 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,solarPV,2025,19.42500000000
-0,2054,R1,solarPV,2025,19.42500000000
-1,2050,R1,solarPV,2030,3.00000000000
-1,2054,R1,solarPV,2030,3.00000000000
-1,2055,R1,solarPV,2030,3.00000000000
-1,2059,R1,solarPV,2030,3.00000000000
-2,2050,R1,solarPV,2035,7.10000000000
-2,2054,R1,solarPV,2035,7.10000000000
-2,2055,R1,solarPV,2035,7.10000000000
-2,2059,R1,solarPV,2035,7.10000000000
-2,2060,R1,solarPV,2035,7.10000000000
-2,2064,R1,solarPV,2035,7.10000000000
-3,2050,R1,solarPV,2040,7.10000000000
-3,2054,R1,solarPV,2040,7.10000000000
-3,2055,R1,solarPV,2040,7.10000000000
-3,2059,R1,solarPV,2040,7.10000000000
-3,2060,R1,solarPV,2040,7.10000000000
-3,2064,R1,solarPV,2040,7.10000000000
-3,2065,R1,solarPV,2040,7.10000000000
-3,2069,R1,solarPV,2040,7.10000000000
-4,2050,R1,solarPV,2045,17.37500000000
-4,2054,R1,solarPV,2045,17.37500000000
-4,2055,R1,solarPV,2045,17.37500000000
-4,2059,R1,solarPV,2045,17.37500000000
-4,2060,R1,solarPV,2045,17.37500000000
-4,2064,R1,solarPV,2045,17.37500000000
-4,2065,R1,solarPV,2045,17.37500000000
-4,2069,R1,solarPV,2045,17.37500000000
-4,2070,R1,solarPV,2045,17.37500000000
-4,2074,R1,solarPV,2045,17.37500000000
-5,2055,R1,solarPV,2050,19.42500000000
-5,2059,R1,solarPV,2050,19.42500000000
-5,2060,R1,solarPV,2050,19.42500000000
-5,2064,R1,solarPV,2050,19.42500000000
-5,2065,R1,solarPV,2050,19.42500000000
-5,2069,R1,solarPV,2050,19.42500000000
-5,2070,R1,solarPV,2050,19.42500000000
-5,2074,R1,solarPV,2050,19.42500000000
-5,2075,R1,solarPV,2050,19.42500000000
-5,2079,R1,solarPV,2050,19.42500000000
+0,2050,R1,solarPV,2025,19.64900000000
+0,2054,R1,solarPV,2025,19.64900000000
+1,2050,R1,solarPV,2030,2.45080000000
+1,2054,R1,solarPV,2030,2.45080000000
+1,2055,R1,solarPV,2030,2.45080000000
+1,2059,R1,solarPV,2030,2.45080000000
+2,2050,R1,solarPV,2035,5.35930000000
+2,2054,R1,solarPV,2035,5.35930000000
+2,2055,R1,solarPV,2035,5.35930000000
+2,2059,R1,solarPV,2035,5.35930000000
+2,2060,R1,solarPV,2035,5.35930000000
+2,2064,R1,solarPV,2035,5.35930000000
+3,2050,R1,solarPV,2040,5.82920000000
+3,2054,R1,solarPV,2040,5.82920000000
+3,2055,R1,solarPV,2040,5.82920000000
+3,2059,R1,solarPV,2040,5.82920000000
+3,2060,R1,solarPV,2040,5.82920000000
+3,2064,R1,solarPV,2040,5.82920000000
+3,2065,R1,solarPV,2040,5.82920000000
+3,2069,R1,solarPV,2040,5.82920000000
+4,2050,R1,solarPV,2045,19.09170000000
+4,2054,R1,solarPV,2045,19.09170000000
+4,2055,R1,solarPV,2045,19.09170000000
+4,2059,R1,solarPV,2045,19.09170000000
+4,2060,R1,solarPV,2045,19.09170000000
+4,2064,R1,solarPV,2045,19.09170000000
+4,2065,R1,solarPV,2045,19.09170000000
+4,2069,R1,solarPV,2045,19.09170000000
+4,2070,R1,solarPV,2045,19.09170000000
+4,2074,R1,solarPV,2045,19.09170000000
+5,2055,R1,solarPV,2050,19.40080000000
+5,2059,R1,solarPV,2050,19.40080000000
+5,2060,R1,solarPV,2050,19.40080000000
+5,2064,R1,solarPV,2050,19.40080000000
+5,2065,R1,solarPV,2050,19.40080000000
+5,2069,R1,solarPV,2050,19.40080000000
+5,2070,R1,solarPV,2050,19.40080000000
+5,2074,R1,solarPV,2050,19.40080000000
+5,2075,R1,solarPV,2050,19.40080000000
+5,2079,R1,solarPV,2050,19.40080000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
index bcdf148c..1d1cd64d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,19.00000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
+1,2025,R1,heatpump,2020,109.50000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
index c2bf21f7..41f56aa7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -1,13 +1,5 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2030,R1,gasboiler,2025,2.20000000000
-1,2034,R1,gasboiler,2025,2.20000000000
-1,2035,R1,gasboiler,2025,2.20000000000
-1,2039,R1,gasboiler,2025,2.20000000000
-2,2025,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2020,19.00000000000
-2,2034,R1,heatpump,2020,19.00000000000
-3,2030,R1,heatpump,2025,8.80000000000
-3,2034,R1,heatpump,2025,8.80000000000
-3,2035,R1,heatpump,2025,8.80000000000
-3,2039,R1,heatpump,2025,8.80000000000
+1,2025,R1,heatpump,2020,109.50000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
index d0d138b5..e29079aa 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -1,15 +1,9 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gasboiler,2025,2.20000000000
-0,2034,R1,gasboiler,2025,2.20000000000
-0,2035,R1,gasboiler,2025,2.20000000000
-0,2039,R1,gasboiler,2025,2.20000000000
-1,2030,R1,heatpump,2020,19.00000000000
-1,2034,R1,heatpump,2020,19.00000000000
-2,2030,R1,heatpump,2025,8.80000000000
-2,2034,R1,heatpump,2025,8.80000000000
-2,2035,R1,heatpump,2025,8.80000000000
-2,2039,R1,heatpump,2025,8.80000000000
-3,2035,R1,heatpump,2030,25.00000000000
-3,2039,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2030,25.00000000000
-3,2044,R1,heatpump,2030,25.00000000000
+0,2035,R1,gasboiler,2030,3.60000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+1,2030,R1,heatpump,2020,109.50000000000
+1,2034,R1,heatpump,2020,109.50000000000
+2,2035,R1,heatpump,2030,114.40000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
index e4f8a86d..b03b48fc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -1,13 +1,7 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,gasboiler,2025,2.20000000000
-0,2039,R1,gasboiler,2025,2.20000000000
-1,2035,R1,heatpump,2025,8.80000000000
-1,2039,R1,heatpump,2025,8.80000000000
-2,2035,R1,heatpump,2030,25.00000000000
-2,2039,R1,heatpump,2030,25.00000000000
-2,2040,R1,heatpump,2030,25.00000000000
-2,2044,R1,heatpump,2030,25.00000000000
-3,2040,R1,heatpump,2035,17.00000000000
-3,2044,R1,heatpump,2035,17.00000000000
-3,2045,R1,heatpump,2035,17.00000000000
-3,2049,R1,heatpump,2035,17.00000000000
+0,2035,R1,gasboiler,2030,3.60000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+2,2035,R1,heatpump,2030,114.40000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
index ef43badd..9da5588c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -1,11 +1,11 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,heatpump,2030,25.00000000000
-0,2044,R1,heatpump,2030,25.00000000000
-1,2040,R1,heatpump,2035,17.00000000000
-1,2044,R1,heatpump,2035,17.00000000000
-1,2045,R1,heatpump,2035,17.00000000000
-1,2049,R1,heatpump,2035,17.00000000000
-2,2045,R1,heatpump,2040,31.00000000000
-2,2049,R1,heatpump,2040,31.00000000000
-2,2050,R1,heatpump,2040,31.00000000000
-2,2054,R1,heatpump,2040,31.00000000000
+0,2040,R1,gasboiler,2030,3.60000000000
+0,2044,R1,gasboiler,2030,3.60000000000
+1,2045,R1,gasboiler,2040,3.72000000000
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+2,2040,R1,heatpump,2030,114.40000000000
+2,2044,R1,heatpump,2030,114.40000000000
+3,2045,R1,heatpump,2040,120.28000000000
+3,2050,R1,heatpump,2040,120.28000000000
+3,2054,R1,heatpump,2040,120.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
index 8e4eab5a..95824543 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -1,11 +1,7 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,heatpump,2035,17.00000000000
-0,2049,R1,heatpump,2035,17.00000000000
-1,2045,R1,heatpump,2040,31.00000000000
-1,2049,R1,heatpump,2040,31.00000000000
-1,2050,R1,heatpump,2040,31.00000000000
-1,2054,R1,heatpump,2040,31.00000000000
-2,2050,R1,heatpump,2045,23.00000000000
-2,2054,R1,heatpump,2045,23.00000000000
-2,2055,R1,heatpump,2045,23.00000000000
-2,2059,R1,heatpump,2045,23.00000000000
+1,2045,R1,gasboiler,2040,3.72000000000
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+3,2045,R1,heatpump,2040,120.28000000000
+3,2050,R1,heatpump,2040,120.28000000000
+3,2054,R1,heatpump,2040,120.28000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
index 917382bf..6ff2e689 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -1,11 +1,9 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,heatpump,2040,31.00000000000
-1,2054,R1,heatpump,2040,31.00000000000
-2,2050,R1,heatpump,2045,23.00000000000
-2,2054,R1,heatpump,2045,23.00000000000
-2,2055,R1,heatpump,2045,23.00000000000
-2,2059,R1,heatpump,2045,23.00000000000
-3,2055,R1,heatpump,2050,31.00000000000
-3,2059,R1,heatpump,2050,31.00000000000
-3,2060,R1,heatpump,2050,31.00000000000
-3,2064,R1,heatpump,2050,31.00000000000
+1,2050,R1,gasboiler,2040,3.72000000000
+1,2054,R1,gasboiler,2040,3.72000000000
+2,2055,R1,gasboiler,2050,2.66400000000
+2,2064,R1,gasboiler,2050,2.66400000000
+4,2050,R1,heatpump,2040,120.28000000000
+4,2054,R1,heatpump,2040,120.28000000000
+5,2055,R1,heatpump,2050,74.33600000000
+5,2064,R1,heatpump,2050,74.33600000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index 7b8c4061..ed498021 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
 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,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05820000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
 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
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,3.76770000000
 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,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08730000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
 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
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,5.65150000000
 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,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05820000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
 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
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,3.76770000000
 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,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08730000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
 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
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,5.65150000000
 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,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.17470000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
 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
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,11.30310000000
 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,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.11640000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
 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
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,7.53540000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index 05aa82fe..6123143a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,43 +1,25 @@
 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.12220000000
-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.48890000000
-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,7.90900000000
-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.18330000000
-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.73330000000
-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,11.86350000000
-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.12220000000
-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.48890000000
-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,7.90900000000
-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.18330000000
-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.73330000000
-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,11.86350000000
-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.36670000000
-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.46670000000
-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,23.72700000000
-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.24440000000
-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.97780000000
-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,15.81800000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05820000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27510000000
+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.76770000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08730000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91270000000
+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.65150000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05820000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27510000000
+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.76770000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08730000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91270000000
+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.65150000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.17470000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.82530000000
+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,11.30310000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.11640000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55020000000
+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,7.53540000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index 5a5c39ce..f0ac673b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,49 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.12220000000
-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.48890000000
-0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.12220000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.48890000000
-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,7.90900000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,7.90900000000
-1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.18330000000
-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.73330000000
-1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.18330000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.73330000000
-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,11.86350000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,11.86350000000
-2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.12220000000
-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.48890000000
-2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.12220000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.48890000000
-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,7.90900000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,7.90900000000
-3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.18330000000
-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.73330000000
-3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.18330000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.73330000000
-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,11.86350000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,11.86350000000
-4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.36670000000
-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.46670000000
-4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.36670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.46670000000
-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,23.72700000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,23.72700000000
-5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.24440000000
-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.97780000000
-5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.24440000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.97780000000
-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,15.81800000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,15.81800000000
+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.06100000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
+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.09150000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
+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.06100000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
+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.09150000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
+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.18310000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
+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.12200000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index c1f9d8c7..f7d82b38 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,37 +1,37 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.12220000000
-0,heat,2035,1,R1,all-year,all-week,night,heatpump,2025,0.48890000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,7.90900000000
-1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.18330000000
-1,heat,2035,1,R1,all-year,all-week,morning,heatpump,2025,0.73330000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,11.86350000000
-2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.12220000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,heatpump,2025,0.48890000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,7.90900000000
-3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.18330000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,heatpump,2025,0.73330000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,11.86350000000
-4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.36670000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,heatpump,2025,1.46670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,23.72700000000
-5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.24440000000
-5,heat,2035,1,R1,all-year,all-week,evening,heatpump,2025,0.97780000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,15.81800000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.06100000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.93900000000
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,3.94840000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.09150000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.90850000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,5.92260000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.06100000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.93900000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,3.94840000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.09150000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.90850000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,5.92260000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.18310000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.81690000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,11.84520000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.12200000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.87800000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,7.89680000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index f9c441c6..cb472ae2 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,25 +1,37 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,0,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-0,heat,2040,1,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-1,heat,2040,0,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-2,heat,2040,0,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-3,heat,2040,0,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-4,heat,2040,0,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-5,heat,2040,0,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.07120000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.26210000000
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,4.60650000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.10680000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.39320000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,6.90970000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.07120000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.26210000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,4.60650000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.10680000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.39320000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,6.90970000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.21360000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.78640000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,13.81940000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.14240000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.52430000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,9.21290000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index c0074b8b..2bc6526c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,25 +1,37 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,0,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,1,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,1,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,2,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-1,heat,2045,0,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,1,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-2,heat,2045,0,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,1,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-3,heat,2045,0,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,1,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-4,heat,2045,0,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,1,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-5,heat,2045,0,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,1,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.08000000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.58670000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,2.91000000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,5.17680000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.12000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.88000000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,7.76520000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.08000000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.58670000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.17680000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.12000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.88000000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,7.76520000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.24000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.76000000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,15.53040000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.16000000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.17330000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,10.35360000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 76235fdc..0be0b395 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,25 +1,37 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,1,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,2,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,2,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,3,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-1,heat,2050,1,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,2,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-2,heat,2050,1,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,2,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-3,heat,2050,1,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,2,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-4,heat,2050,1,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,2,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-5,heat,2050,1,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,2,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.09000000000
+0,heat,2050,4,R1,all-year,all-week,night,heatpump,2040,2.91000000000
+0,heat,2055,2,R1,all-year,all-week,night,gasboiler,2050,0.10380000000
+0,heat,2055,5,R1,all-year,all-week,night,heatpump,2050,2.89620000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,5.82390000000
+0,CO2f,2055,2,R1,all-year,all-week,night,gasboiler,2050,6.71640000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.13500000000
+1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2040,4.36500000000
+1,heat,2055,2,R1,all-year,all-week,morning,gasboiler,2050,0.15570000000
+1,heat,2055,5,R1,all-year,all-week,morning,heatpump,2050,4.34430000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,8.73580000000
+1,CO2f,2055,2,R1,all-year,all-week,morning,gasboiler,2050,10.07460000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.09000000000
+2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2040,2.91000000000
+2,heat,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,0.10380000000
+2,heat,2055,5,R1,all-year,all-week,afternoon,heatpump,2050,2.89620000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,5.82390000000
+2,CO2f,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,6.71640000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.13500000000
+3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2040,4.36500000000
+3,heat,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,0.15570000000
+3,heat,2055,5,R1,all-year,all-week,early-peak,heatpump,2050,4.34430000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,8.73580000000
+3,CO2f,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,10.07460000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.27000000000
+4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2040,8.73000000000
+4,heat,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,0.31140000000
+4,heat,2055,5,R1,all-year,all-week,late-peak,heatpump,2050,8.68860000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,17.47170000000
+4,CO2f,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,20.14920000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.18000000000
+5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2040,5.82000000000
+5,heat,2055,2,R1,all-year,all-week,evening,gasboiler,2050,0.20760000000
+5,heat,2055,5,R1,all-year,all-week,evening,heatpump,2050,5.79240000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,11.64780000000
+5,CO2f,2055,2,R1,all-year,all-week,evening,gasboiler,2050,13.43280000000
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 33bbbed3..ff007065 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,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
+0,2025,R1,gassupply1,2020,18.27480000000
+0,2030,R1,gassupply1,2020,10.77480000000
+0,2035,R1,gassupply1,2020,3.27480000000
+0,2040,R1,gassupply1,2020,3.27480000000
+0,2045,R1,gassupply1,2020,3.27480000000
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
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 9d035dfd..05a22971 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,16 @@
 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
+0,2025,R1,gassupply1,2020,18.27480000000
+0,2030,R1,gassupply1,2020,10.77480000000
+0,2035,R1,gassupply1,2020,3.27480000000
+0,2040,R1,gassupply1,2020,3.27480000000
+0,2045,R1,gassupply1,2020,3.27480000000
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
+1,2030,R1,gassupply1,2025,0.27920000000
+1,2035,R1,gassupply1,2025,0.27920000000
+1,2040,R1,gassupply1,2025,0.27920000000
+1,2045,R1,gassupply1,2025,0.27920000000
+1,2050,R1,gassupply1,2025,0.27920000000
+1,2059,R1,gassupply1,2025,0.27920000000
+1,2060,R1,gassupply1,2025,0.27920000000
+1,2064,R1,gassupply1,2025,0.27920000000
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 4cae2884..5a95df6f 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,24 @@
 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
+0,2030,R1,gassupply1,2020,10.77480000000
+0,2035,R1,gassupply1,2020,3.27480000000
+0,2040,R1,gassupply1,2020,3.27480000000
+0,2045,R1,gassupply1,2020,3.27480000000
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
+1,2030,R1,gassupply1,2025,0.27920000000
+1,2035,R1,gassupply1,2025,0.27920000000
+1,2040,R1,gassupply1,2025,0.27920000000
+1,2045,R1,gassupply1,2025,0.27920000000
+1,2050,R1,gassupply1,2025,0.27920000000
+1,2059,R1,gassupply1,2025,0.27920000000
+1,2060,R1,gassupply1,2025,0.27920000000
+1,2064,R1,gassupply1,2025,0.27920000000
+2,2035,R1,gassupply1,2030,10.48740000000
+2,2040,R1,gassupply1,2030,10.48740000000
+2,2045,R1,gassupply1,2030,10.48740000000
+2,2050,R1,gassupply1,2030,10.48740000000
+2,2059,R1,gassupply1,2030,10.48740000000
+2,2060,R1,gassupply1,2030,10.48740000000
+2,2064,R1,gassupply1,2030,10.48740000000
+2,2065,R1,gassupply1,2030,10.48740000000
+2,2069,R1,gassupply1,2030,10.48740000000
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 772418b7..578ee527 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,22 @@
 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
+0,2035,R1,gassupply1,2020,3.27480000000
+0,2040,R1,gassupply1,2020,3.27480000000
+0,2045,R1,gassupply1,2020,3.27480000000
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
+1,2035,R1,gassupply1,2025,0.27920000000
+1,2040,R1,gassupply1,2025,0.27920000000
+1,2045,R1,gassupply1,2025,0.27920000000
+1,2050,R1,gassupply1,2025,0.27920000000
+1,2059,R1,gassupply1,2025,0.27920000000
+1,2060,R1,gassupply1,2025,0.27920000000
+1,2064,R1,gassupply1,2025,0.27920000000
+2,2035,R1,gassupply1,2030,10.48740000000
+2,2040,R1,gassupply1,2030,10.48740000000
+2,2045,R1,gassupply1,2030,10.48740000000
+2,2050,R1,gassupply1,2030,10.48740000000
+2,2059,R1,gassupply1,2030,10.48740000000
+2,2060,R1,gassupply1,2030,10.48740000000
+2,2064,R1,gassupply1,2030,10.48740000000
+2,2065,R1,gassupply1,2030,10.48740000000
+2,2069,R1,gassupply1,2030,10.48740000000
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 70eb04b5..c9719d8f 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,28 @@
 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
+0,2040,R1,gassupply1,2020,3.27480000000
+0,2045,R1,gassupply1,2020,3.27480000000
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
+1,2040,R1,gassupply1,2025,0.27920000000
+1,2045,R1,gassupply1,2025,0.27920000000
+1,2050,R1,gassupply1,2025,0.27920000000
+1,2059,R1,gassupply1,2025,0.27920000000
+1,2060,R1,gassupply1,2025,0.27920000000
+1,2064,R1,gassupply1,2025,0.27920000000
+2,2040,R1,gassupply1,2030,10.48740000000
+2,2045,R1,gassupply1,2030,10.48740000000
+2,2050,R1,gassupply1,2030,10.48740000000
+2,2059,R1,gassupply1,2030,10.48740000000
+2,2060,R1,gassupply1,2030,10.48740000000
+2,2064,R1,gassupply1,2030,10.48740000000
+2,2065,R1,gassupply1,2030,10.48740000000
+2,2069,R1,gassupply1,2030,10.48740000000
+3,2045,R1,gassupply1,2040,0.69800000000
+3,2050,R1,gassupply1,2040,0.69800000000
+3,2059,R1,gassupply1,2040,0.69800000000
+3,2060,R1,gassupply1,2040,0.69800000000
+3,2064,R1,gassupply1,2040,0.69800000000
+3,2065,R1,gassupply1,2040,0.69800000000
+3,2069,R1,gassupply1,2040,0.69800000000
+3,2070,R1,gassupply1,2040,0.69800000000
+3,2079,R1,gassupply1,2040,0.69800000000
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 fdf6b01b..f1e5c4cf 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,35 @@
 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
+0,2045,R1,gassupply1,2020,3.27480000000
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
+1,2045,R1,gassupply1,2025,0.27920000000
+1,2050,R1,gassupply1,2025,0.27920000000
+1,2059,R1,gassupply1,2025,0.27920000000
+1,2060,R1,gassupply1,2025,0.27920000000
+1,2064,R1,gassupply1,2025,0.27920000000
+2,2045,R1,gassupply1,2030,10.48740000000
+2,2050,R1,gassupply1,2030,10.48740000000
+2,2059,R1,gassupply1,2030,10.48740000000
+2,2060,R1,gassupply1,2030,10.48740000000
+2,2064,R1,gassupply1,2030,10.48740000000
+2,2065,R1,gassupply1,2030,10.48740000000
+2,2069,R1,gassupply1,2030,10.48740000000
+3,2045,R1,gassupply1,2040,0.69800000000
+3,2050,R1,gassupply1,2040,0.69800000000
+3,2059,R1,gassupply1,2040,0.69800000000
+3,2060,R1,gassupply1,2040,0.69800000000
+3,2064,R1,gassupply1,2040,0.69800000000
+3,2065,R1,gassupply1,2040,0.69800000000
+3,2069,R1,gassupply1,2040,0.69800000000
+3,2070,R1,gassupply1,2040,0.69800000000
+3,2079,R1,gassupply1,2040,0.69800000000
+4,2050,R1,gassupply1,2045,0.92770000000
+4,2059,R1,gassupply1,2045,0.92770000000
+4,2060,R1,gassupply1,2045,0.92770000000
+4,2064,R1,gassupply1,2045,0.92770000000
+4,2065,R1,gassupply1,2045,0.92770000000
+4,2069,R1,gassupply1,2045,0.92770000000
+4,2070,R1,gassupply1,2045,0.92770000000
+4,2079,R1,gassupply1,2045,0.92770000000
+4,2080,R1,gassupply1,2045,0.92770000000
+4,2084,R1,gassupply1,2045,0.92770000000
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 ed1ed9d4..ded32114 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,36 @@
 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
+0,2050,R1,gassupply1,2020,3.27480000000
+0,2055,R1,gassupply1,2020,3.27480000000
+0,2059,R1,gassupply1,2020,3.27480000000
+1,2050,R1,gassupply1,2025,0.27920000000
+1,2055,R1,gassupply1,2025,0.27920000000
+1,2059,R1,gassupply1,2025,0.27920000000
+1,2060,R1,gassupply1,2025,0.27920000000
+1,2064,R1,gassupply1,2025,0.27920000000
+2,2050,R1,gassupply1,2030,10.48740000000
+2,2055,R1,gassupply1,2030,10.48740000000
+2,2059,R1,gassupply1,2030,10.48740000000
+2,2060,R1,gassupply1,2030,10.48740000000
+2,2064,R1,gassupply1,2030,10.48740000000
+2,2065,R1,gassupply1,2030,10.48740000000
+2,2069,R1,gassupply1,2030,10.48740000000
+3,2050,R1,gassupply1,2040,0.69800000000
+3,2055,R1,gassupply1,2040,0.69800000000
+3,2059,R1,gassupply1,2040,0.69800000000
+3,2060,R1,gassupply1,2040,0.69800000000
+3,2064,R1,gassupply1,2040,0.69800000000
+3,2065,R1,gassupply1,2040,0.69800000000
+3,2069,R1,gassupply1,2040,0.69800000000
+3,2070,R1,gassupply1,2040,0.69800000000
+3,2079,R1,gassupply1,2040,0.69800000000
+4,2050,R1,gassupply1,2045,0.92770000000
+4,2055,R1,gassupply1,2045,0.92770000000
+4,2059,R1,gassupply1,2045,0.92770000000
+4,2060,R1,gassupply1,2045,0.92770000000
+4,2064,R1,gassupply1,2045,0.92770000000
+4,2065,R1,gassupply1,2045,0.92770000000
+4,2069,R1,gassupply1,2045,0.92770000000
+4,2070,R1,gassupply1,2045,0.92770000000
+4,2079,R1,gassupply1,2045,0.92770000000
+4,2080,R1,gassupply1,2045,0.92770000000
+4,2084,R1,gassupply1,2045,0.92770000000
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 07d7b4ce..b28e2e1b 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
@@ -4,48 +4,76 @@ A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
 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.35560000000,R1,9,2020,R1,power,windturbine,retrofit,2025
-A1,15.42960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
+A1,1.25560000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
+A1,0.84440000000,R1,26,2020,R1,power,windturbine,retrofit,2025
+A1,18.27480000000,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.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,0.25560000000,R1,0,2020,R1,power,gasCCGT,retrofit,2030
+A1,0.39220000000,R1,1,2025,R1,power,gasCCGT,retrofit,2030
+A1,0.84440000000,R1,42,2020,R1,power,windturbine,retrofit,2030
+A1,1.15110000000,R1,43,2025,R1,power,windturbine,retrofit,2030
+A1,10.77480000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
+A1,0.27920000000,R1,1,2025,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.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.25560000000,R1,0,2020,R1,power,gasCCGT,retrofit,2035
+A1,0.39220000000,R1,1,2025,R1,power,gasCCGT,retrofit,2035
+A1,0.26830000000,R1,2,2030,R1,power,gasCCGT,retrofit,2035
+A1,0.84440000000,R1,39,2020,R1,power,windturbine,retrofit,2035
+A1,1.15110000000,R1,40,2025,R1,power,windturbine,retrofit,2035
+A1,1.41780000000,R1,41,2030,R1,power,windturbine,retrofit,2035
+A1,3.27480000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
+A1,0.27920000000,R1,1,2025,R1,gas,gassupply1,retrofit,2035
+A1,10.48740000000,R1,2,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.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.25560000000,R1,0,2020,R1,power,gasCCGT,retrofit,2040
+A1,0.39220000000,R1,1,2025,R1,power,gasCCGT,retrofit,2040
+A1,0.26830000000,R1,2,2030,R1,power,gasCCGT,retrofit,2040
+A1,0.20420000000,R1,3,2035,R1,power,gasCCGT,retrofit,2040
+A1,0.84440000000,R1,56,2020,R1,power,windturbine,retrofit,2040
+A1,1.15110000000,R1,57,2025,R1,power,windturbine,retrofit,2040
+A1,1.41780000000,R1,58,2030,R1,power,windturbine,retrofit,2040
+A1,1.81350000000,R1,59,2035,R1,power,windturbine,retrofit,2040
+A1,3.27480000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
+A1,0.27920000000,R1,1,2025,R1,gas,gassupply1,retrofit,2040
+A1,10.48740000000,R1,2,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.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,0.25560000000,R1,0,2020,R1,power,gasCCGT,retrofit,2045
+A1,0.39220000000,R1,1,2025,R1,power,gasCCGT,retrofit,2045
+A1,0.26830000000,R1,2,2030,R1,power,gasCCGT,retrofit,2045
+A1,0.20420000000,R1,3,2035,R1,power,gasCCGT,retrofit,2045
+A1,0.13330000000,R1,4,2040,R1,power,gasCCGT,retrofit,2045
+A1,0.84440000000,R1,75,2020,R1,power,windturbine,retrofit,2045
+A1,1.15110000000,R1,76,2025,R1,power,windturbine,retrofit,2045
+A1,1.41780000000,R1,77,2030,R1,power,windturbine,retrofit,2045
+A1,1.81350000000,R1,78,2035,R1,power,windturbine,retrofit,2045
+A1,1.94810000000,R1,79,2040,R1,power,windturbine,retrofit,2045
+A1,3.27480000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
+A1,0.27920000000,R1,1,2025,R1,gas,gassupply1,retrofit,2045
+A1,10.48740000000,R1,2,2030,R1,gas,gassupply1,retrofit,2045
+A1,0.69800000000,R1,3,2040,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.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
+A1,0.25560000000,R1,0,2020,R1,power,gasCCGT,retrofit,2050
+A1,0.39220000000,R1,1,2025,R1,power,gasCCGT,retrofit,2050
+A1,0.26830000000,R1,2,2030,R1,power,gasCCGT,retrofit,2050
+A1,0.20420000000,R1,3,2035,R1,power,gasCCGT,retrofit,2050
+A1,0.13330000000,R1,4,2040,R1,power,gasCCGT,retrofit,2050
+A1,0.15360000000,R1,5,2045,R1,power,gasCCGT,retrofit,2050
+A1,1.15110000000,R1,90,2025,R1,power,windturbine,retrofit,2050
+A1,1.41780000000,R1,91,2030,R1,power,windturbine,retrofit,2050
+A1,1.81350000000,R1,92,2035,R1,power,windturbine,retrofit,2050
+A1,1.94810000000,R1,93,2040,R1,power,windturbine,retrofit,2050
+A1,2.18240000000,R1,94,2045,R1,power,windturbine,retrofit,2050
+A1,3.27480000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
+A1,0.27920000000,R1,1,2025,R1,gas,gassupply1,retrofit,2050
+A1,10.48740000000,R1,2,2030,R1,gas,gassupply1,retrofit,2050
+A1,0.69800000000,R1,3,2040,R1,gas,gassupply1,retrofit,2050
+A1,0.92770000000,R1,4,2045,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 203194bc..2f4e7dbf 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
@@ -17,18 +17,18 @@ A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.0000000
 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,gas,0.42157436802,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.16978248089,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.79149889625,R1,17,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15938189845,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52766593083,R1,33,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.10625459897,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.63236155203,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25467372134,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.26472310406,R1,65,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50934744268,R1,71,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.84314873604,R1,81,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33956496179,R1,87,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
@@ -47,18 +47,30 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,72,2025
 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.09292597263,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18386810518,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14262116669,R1,9,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25064125917,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.22390704479,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22151699302,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.34364863831,R1,33,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30196263786,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14927136319,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.14767799535,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.22909909220,R1,57,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20130842524,R1,63,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.13938895895,R1,73,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27580215777,R1,79,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.21393175004,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37596188875,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.27877791789,R1,97,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.55160431554,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.42786350007,R1,105,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75192377750,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.18585194526,R1,121,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36773621036,R1,127,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.28524233338,R1,129,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50128251833,R1,135,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
@@ -77,24 +89,42 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,88,2030
 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,gas,0.06987917932,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13826653549,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10724934913,R1,9,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18847911944,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07337313829,R1,17,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23214223591,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17302534774,R1,29,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17117842265,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26555629457,R1,37,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23334321824,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.18167661512,R1,45,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28739956224,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11535023182,R1,57,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.11411894843,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17703752971,R1,65,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15556214550,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12111774342,R1,73,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19159970816,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10481876898,R1,85,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20739980324,R1,91,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16087402370,R1,93,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28271867916,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11005970743,R1,101,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.34821335386,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.20963753796,R1,113,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41479960648,R1,119,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32174804739,R1,121,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.56543735831,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.22011941486,R1,129,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.69642670773,R1,135,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.13975835864,R1,141,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27653307099,R1,147,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.21449869826,R1,149,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37695823888,R1,155,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14674627657,R1,157,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.46428447182,R1,163,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
@@ -113,30 +143,54 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,72,2035
 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.06139641156,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.12148209526,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09423014470,R1,9,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.16559927722,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.06446623214,R1,17,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20396204414,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26089611997,R1,27,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04906374107,R1,29,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.15655584790,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15488472326,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.24027919265,R1,45,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21113233328,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16438364030,R1,53,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26004329852,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33263192617,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12510854280,R1,65,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10437056527,R1,73,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.10325648217,R1,79,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16018612844,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.14075488886,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10958909353,R1,89,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17336219902,R1,95,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22175461745,R1,99,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08340569520,R1,101,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09209461734,R1,109,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18222314288,R1,115,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14134521705,R1,117,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24839891582,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09669934821,R1,125,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30594306621,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.39134417995,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07359561160,R1,137,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.18418923469,R1,145,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36444628577,R1,151,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.28269043411,R1,153,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49679783165,R1,159,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.19339869642,R1,161,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.61188613242,R1,167,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.78268835990,R1,171,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14719122320,R1,173,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12279282313,R1,181,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24296419051,R1,187,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.18846028941,R1,189,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33119855443,R1,195,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12893246428,R1,197,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40792408828,R1,203,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.52179223993,R1,207,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09812748213,R1,209,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,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
@@ -155,36 +209,66 @@ A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,72,2040
 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,gas,0.05298573175,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.10484029193,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08132157960,R1,9,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.14291387164,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05563501834,R1,17,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17602133225,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22515602257,R1,27,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04234251085,R1,29,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24186647685,R1,35,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.02764472961,R1,37,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.13837545460,R1,45,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13689839299,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.21237624120,R1,53,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18661412519,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14529422733,R1,61,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22984519666,R1,67,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29400430974,R1,71,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11058003720,R1,73,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31582449257,R1,79,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07219588936,R1,81,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09225030307,R1,89,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.09126559533,R1,95,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14158416080,R1,97,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.12440941679,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09686281822,R1,105,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15323013111,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19600287316,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07372002480,R1,117,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21054966171,R1,123,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04813059291,R1,125,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07947859763,R1,133,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15726043790,R1,139,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12198236940,R1,141,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21437080746,R1,147,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08345252751,R1,149,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26403199837,R1,155,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33773403386,R1,159,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.06351376628,R1,161,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36279971528,R1,167,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04146709442,R1,169,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.15895719526,R1,177,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31452087580,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.24396473881,R1,185,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.42874161491,R1,191,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16690505502,R1,193,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.52806399674,R1,199,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.67546806772,R1,203,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12702753256,R1,205,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72559943056,R1,211,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08293418883,R1,213,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10597146351,R1,221,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20968058387,R1,227,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16264315921,R1,229,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28582774327,R1,235,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11127003668,R1,237,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35204266449,R1,243,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45031204515,R1,247,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08468502171,R1,249,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48373295371,R1,255,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05528945922,R1,257,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,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
@@ -197,33 +281,69 @@ A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,48,2040
 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
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05162536697,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07923371539,R1,5,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13924467632,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05420663531,R1,13,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17150213030,R1,19,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21937532814,R1,23,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04125540195,R1,25,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23565675534,R1,31,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.02693497407,R1,33,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26399583715,R1,39,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.03102011180,R1,41,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.13563559567,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.20817115336,R1,53,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18291913189,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.14241737546,R1,61,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22529422036,R1,67,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28818297145,R1,71,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10839053254,R1,73,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30957111072,R1,79,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07076639774,R1,81,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.34679881937,R1,87,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08149930140,R1,89,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09042373045,R1,97,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.13878076891,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.12194608793,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09494491697,R1,109,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15019614691,R1,115,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19212198096,R1,119,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07226035503,R1,121,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20638074048,R1,127,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04717759850,R1,129,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23119921291,R1,135,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05433286760,R1,137,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.07743805045,R1,145,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11885057308,R1,149,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20886701449,R1,155,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08130995297,R1,157,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25725319545,R1,163,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.32906299221,R1,167,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.06188310292,R1,169,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35348513302,R1,175,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04040246110,R1,177,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.39599375572,R1,183,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.04653016770,R1,185,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.15487610090,R1,193,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.23770114616,R1,197,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41773402897,R1,203,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16261990594,R1,205,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51450639090,R1,211,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.65812598442,R1,215,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12376620585,R1,217,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.70697026603,R1,223,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08080492221,R1,225,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.79198751144,R1,231,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.09306033541,R1,233,2045.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10325073393,R1,241,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.15846743077,R1,245,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27848935265,R1,251,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.10841327063,R1,253,2030.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.34300426060,R1,259,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43875065628,R1,263,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08251080390,R1,265,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47131351069,R1,271,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05386994814,R1,273,2040.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.52799167429,R1,279,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.06204022361,R1,281,2045.00000000000,R1,power,gasCCGT,"('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/MCAMetric_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
index d24d8c30..e91a5603 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
@@ -35,30 +35,30 @@ A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,r
 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,electricity,R1,0,2020.00000000000,R1,power,0.25243974133,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.16978248089,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,8,2020.00000000000,R1,power,23.14115108760,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,0.47395143488,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,17,2020.00000000000,R1,power,0.15938189845,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,24,2020.00000000000,R1,power,43.44712803532,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.31596762325,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2020.00000000000,R1,power,0.10625459897,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,40,2020.00000000000,R1,power,28.96475202355,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.37865961199,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.25467372134,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,56,2020.00000000000,R1,power,34.71172663139,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,0.75731922399,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,65,2020.00000000000,R1,power,0.50934744268,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,72,2020.00000000000,R1,power,69.42345326279,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.50487948266,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.33956496179,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,88,2020.00000000000,R1,power,46.28230217519,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.74157777778,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.32204444444,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,1.58028888889,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,1.32204444444,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,2.64408888889,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,2.74122222222,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
@@ -83,24 +83,54 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,resident
 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,electricity,R1,0,2020.00000000000,R1,power,0.05564429499,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.18386810518,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.08540189622,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.25064125917,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2020.00000000000,R1,power,5.10091252160,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2025.00000000000,R1,power,7.82879182663,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.13407607472,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.22151699302,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2025.00000000000,R1,power,0.20577762773,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2025.00000000000,R1,power,0.30196263786,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,36,2020.00000000000,R1,power,12.29075376998,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,38,2025.00000000000,R1,power,18.86363513392,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.08938404982,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.14767799535,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.13718508515,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2025.00000000000,R1,power,0.20130842524,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,power,8.19383584665,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,62,2025.00000000000,R1,power,12.57575675595,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.08346644248,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2020.00000000000,R1,power,0.27580215777,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.12810284433,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2025.00000000000,R1,power,0.37596188875,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,84,2020.00000000000,R1,power,7.65136878240,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,86,2025.00000000000,R1,power,11.74318773995,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,0.16693288497,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2020.00000000000,R1,power,0.55160431554,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.25620568866,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2025.00000000000,R1,power,0.75192377750,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,108,2020.00000000000,R1,power,15.30273756480,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,110,2025.00000000000,R1,power,23.48637547989,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,0.11128858998,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.36773621036,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2025.00000000000,R1,power,0.17080379244,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,0.50128251833,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,132,2020.00000000000,R1,power,10.20182504320,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,134,2025.00000000000,R1,power,15.65758365326,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.46844286626,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2025.00000000000,R1,gas,0.01213713374,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,0.80811111111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.02093777778,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.89023011316,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2025.00000000000,R1,gas,0.02306544239,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2020.00000000000,R1,gas,0.80811111111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.02093777778,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,12,2020.00000000000,R1,gas,1.61622222222,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,13,2025.00000000000,R1,gas,0.04187555556,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,15,2020.00000000000,R1,gas,1.56956660287,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,16,2025.00000000000,R1,gas,0.04066673046,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
@@ -125,36 +155,78 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,110,2025.00000000000,R1,residen
 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,electricity,R1,0,2020.00000000000,R1,power,0.04184381995,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.13826653549,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.06422116714,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.18847911944,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.04393601095,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.23214223591,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2020.00000000000,R1,power,3.83582297503,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,16,2025.00000000000,R1,power,5.88715439212,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2030.00000000000,R1,power,4.02761412379,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2020.00000000000,R1,power,0.10360799266,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,29,2020.00000000000,R1,power,0.17117842265,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,30,2025.00000000000,R1,power,0.15901574525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,31,2025.00000000000,R1,power,0.23334321824,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2030.00000000000,R1,power,0.10878839229,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2030.00000000000,R1,power,0.28739956224,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,9.49774468686,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2025.00000000000,R1,power,14.57697336722,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,46,2030.00000000000,R1,power,9.97263192120,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,56,2020.00000000000,R1,power,0.06907199510,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,57,2020.00000000000,R1,power,0.11411894843,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,58,2025.00000000000,R1,power,0.10601049683,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,59,2025.00000000000,R1,power,0.15556214550,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2030.00000000000,R1,power,0.07252559486,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2030.00000000000,R1,power,0.19159970816,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,70,2020.00000000000,R1,power,6.33182979124,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,72,2025.00000000000,R1,power,9.71798224482,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,74,2030.00000000000,R1,power,6.64842128080,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,84,2020.00000000000,R1,power,0.06276572993,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,85,2020.00000000000,R1,power,0.20739980324,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,86,2025.00000000000,R1,power,0.09633175072,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,87,2025.00000000000,R1,power,0.28271867916,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,88,2030.00000000000,R1,power,0.06590401642,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,89,2030.00000000000,R1,power,0.34821335386,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,98,2020.00000000000,R1,power,5.75373446255,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,100,2025.00000000000,R1,power,8.83073158818,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,102,2030.00000000000,R1,power,6.04142118568,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,112,2020.00000000000,R1,power,0.12553145986,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,113,2020.00000000000,R1,power,0.41479960648,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,114,2025.00000000000,R1,power,0.19266350143,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,115,2025.00000000000,R1,power,0.56543735831,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,116,2030.00000000000,R1,power,0.13180803285,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,117,2030.00000000000,R1,power,0.69642670773,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,126,2020.00000000000,R1,power,11.50746892510,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,128,2025.00000000000,R1,power,17.66146317635,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,130,2030.00000000000,R1,power,12.08284237136,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,140,2020.00000000000,R1,power,0.08368763990,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.27653307099,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,142,2025.00000000000,R1,power,0.12844233429,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,143,2025.00000000000,R1,power,0.37695823888,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,144,2030.00000000000,R1,power,0.08787202190,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,145,2030.00000000000,R1,power,0.46428447182,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,154,2020.00000000000,R1,power,7.67164595007,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,156,2025.00000000000,R1,power,11.77430878424,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,158,2030.00000000000,R1,power,8.05522824757,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.13298576945,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2025.00000000000,R1,gas,0.01133672852,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2030.00000000000,R1,gas,0.42588083536,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,0.23515990253,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.02004683648,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.75308881655,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.27571076286,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2025.00000000000,R1,gas,0.02350370330,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2030.00000000000,R1,gas,0.88295108939,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2020.00000000000,R1,gas,0.23515990253,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.02004683648,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.75308881655,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,12,2020.00000000000,R1,gas,0.47031980505,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,13,2025.00000000000,R1,gas,0.04009367295,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,14,2030.00000000000,R1,gas,1.50617763310,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,15,2020.00000000000,R1,gas,0.48005902902,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,16,2025.00000000000,R1,gas,0.04092391922,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,17,2030.00000000000,R1,gas,1.53736705176,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
@@ -179,42 +251,96 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2030.00000000000,R1,resident
 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,electricity,R1,0,2020.00000000000,R1,power,0.03676431830,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.12148209526,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.05642523635,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.16559927722,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.03860253422,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.20396204414,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,6,2035.00000000000,R1,power,0.26089611997,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,7,2035.00000000000,R1,power,0.02937948567,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,3.37018505865,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,20,2025.00000000000,R1,power,5.17250141610,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2030.00000000000,R1,power,3.53869431158,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2035.00000000000,R1,power,2.69321745122,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.09374601671,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.15488472326,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,38,2025.00000000000,R1,power,0.14387975608,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,39,2025.00000000000,R1,power,0.21113233328,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2030.00000000000,R1,power,0.09843331754,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2030.00000000000,R1,power,0.26004329852,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2035.00000000000,R1,power,0.33263192617,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,0.07491529509,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,8.59369735175,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,56,2025.00000000000,R1,power,13.18945723986,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,58,2030.00000000000,R1,power,9.02338221933,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2035.00000000000,R1,power,6.86748510109,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.06249734447,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2020.00000000000,R1,power,0.10325648217,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.09591983739,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2025.00000000000,R1,power,0.14075488886,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2030.00000000000,R1,power,0.06562221170,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,77,2030.00000000000,R1,power,0.17336219902,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,78,2035.00000000000,R1,power,0.22175461745,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,79,2035.00000000000,R1,power,0.04994353006,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,90,2020.00000000000,R1,power,5.72913156783,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2025.00000000000,R1,power,8.79297149324,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,94,2030.00000000000,R1,power,6.01558814622,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,97,2035.00000000000,R1,power,4.57832340073,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,108,2020.00000000000,R1,power,0.05514647745,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,109,2020.00000000000,R1,power,0.18222314288,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,110,2025.00000000000,R1,power,0.08463785452,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,111,2025.00000000000,R1,power,0.24839891582,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,112,2030.00000000000,R1,power,0.05790380132,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,113,2030.00000000000,R1,power,0.30594306621,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,114,2035.00000000000,R1,power,0.39134417995,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,115,2035.00000000000,R1,power,0.04406922850,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,126,2020.00000000000,R1,power,5.05527758797,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,128,2025.00000000000,R1,power,7.75875212415,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,130,2030.00000000000,R1,power,5.30804146737,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,133,2035.00000000000,R1,power,4.03982617682,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,144,2020.00000000000,R1,power,0.11029295490,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,145,2020.00000000000,R1,power,0.36444628577,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,146,2025.00000000000,R1,power,0.16927570905,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,147,2025.00000000000,R1,power,0.49679783165,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,148,2030.00000000000,R1,power,0.11580760265,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,149,2030.00000000000,R1,power,0.61188613242,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,150,2035.00000000000,R1,power,0.78268835990,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,151,2035.00000000000,R1,power,0.08813845700,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,162,2020.00000000000,R1,power,10.11055517595,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,164,2025.00000000000,R1,power,15.51750424830,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,166,2030.00000000000,R1,power,10.61608293474,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,169,2035.00000000000,R1,power,8.07965235365,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,180,2020.00000000000,R1,power,0.07352863660,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,181,2020.00000000000,R1,power,0.24296419051,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,182,2025.00000000000,R1,power,0.11285047270,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,183,2025.00000000000,R1,power,0.33119855443,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,184,2030.00000000000,R1,power,0.07720506843,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,185,2030.00000000000,R1,power,0.40792408828,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,186,2035.00000000000,R1,power,0.52179223993,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,187,2035.00000000000,R1,power,0.05875897134,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,198,2020.00000000000,R1,power,6.74037011730,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,200,2025.00000000000,R1,power,10.34500283220,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,202,2030.00000000000,R1,power,7.07738862316,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,205,2035.00000000000,R1,power,5.38643490243,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.10094819793,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2025.00000000000,R1,gas,0.00860559983,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2030.00000000000,R1,gas,0.32328198002,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.19505771559,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2025.00000000000,R1,gas,0.01662821802,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2030.00000000000,R1,gas,0.62466339973,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.27548987271,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2025.00000000000,R1,gas,0.02348487293,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2030.00000000000,R1,gas,0.88224369880,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,12,2020.00000000000,R1,gas,0.19505771559,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,13,2025.00000000000,R1,gas,0.01662821802,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,14,2030.00000000000,R1,gas,0.62466339973,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,16,2020.00000000000,R1,gas,0.39011543118,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,17,2025.00000000000,R1,gas,0.03325643603,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,18,2030.00000000000,R1,gas,1.24932679946,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,20,2020.00000000000,R1,gas,0.46370890804,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,21,2025.00000000000,R1,gas,0.03953010931,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,22,2030.00000000000,R1,gas,1.48500653821,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
@@ -239,48 +365,120 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,resident
 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,electricity,R1,0,2020.00000000000,R1,power,0.03172798309,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.10484029193,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.04869555665,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.14291387164,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.03331438224,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.17602133225,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,6,2035.00000000000,R1,power,0.22515602257,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,7,2035.00000000000,R1,power,0.02535479692,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,8,2040.00000000000,R1,power,0.24186647685,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,9,2040.00000000000,R1,power,0.01655373031,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2020.00000000000,R1,power,2.90850420944,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,24,2025.00000000000,R1,power,4.46392167796,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2030.00000000000,R1,power,3.05392941991,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2035.00000000000,R1,power,2.32427423345,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,31,2040.00000000000,R1,power,1.51748045710,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,44,2020.00000000000,R1,power,0.08285955365,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,45,2020.00000000000,R1,power,0.13689839299,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,46,2025.00000000000,R1,power,0.12717140191,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,47,2025.00000000000,R1,power,0.18661412519,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2030.00000000000,R1,power,0.08700253134,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,0.22984519666,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,0.29400430974,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2035.00000000000,R1,power,0.06621559114,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2040.00000000000,R1,power,0.31582449257,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,53,2040.00000000000,R1,power,0.04323107147,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,7.59573528351,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,68,2025.00000000000,R1,power,11.65780241339,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,70,2030.00000000000,R1,power,7.97552204769,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,73,2035.00000000000,R1,power,6.06998323961,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2040.00000000000,R1,power,3.96299232183,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,88,2020.00000000000,R1,power,0.05523970244,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,89,2020.00000000000,R1,power,0.09126559533,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,90,2025.00000000000,R1,power,0.08478093461,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,91,2025.00000000000,R1,power,0.12440941679,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,92,2030.00000000000,R1,power,0.05800168756,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,93,2030.00000000000,R1,power,0.15323013111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,94,2035.00000000000,R1,power,0.19600287316,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,95,2035.00000000000,R1,power,0.04414372743,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2040.00000000000,R1,power,0.21054966171,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2040.00000000000,R1,power,0.02882071431,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,110,2020.00000000000,R1,power,5.06382352234,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,112,2025.00000000000,R1,power,7.77186827560,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,114,2030.00000000000,R1,power,5.31701469846,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,117,2035.00000000000,R1,power,4.04665549307,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,119,2040.00000000000,R1,power,2.64199488122,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,132,2020.00000000000,R1,power,0.04759197463,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,133,2020.00000000000,R1,power,0.15726043790,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,134,2025.00000000000,R1,power,0.07304333497,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,135,2025.00000000000,R1,power,0.21437080746,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,136,2030.00000000000,R1,power,0.04997157336,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,137,2030.00000000000,R1,power,0.26403199837,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,138,2035.00000000000,R1,power,0.33773403386,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,139,2035.00000000000,R1,power,0.03803219538,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,140,2040.00000000000,R1,power,0.36279971528,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,141,2040.00000000000,R1,power,0.02483059546,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,154,2020.00000000000,R1,power,4.36275631415,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,156,2025.00000000000,R1,power,6.69588251694,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,158,2030.00000000000,R1,power,4.58089412986,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,161,2035.00000000000,R1,power,3.48641135018,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,163,2040.00000000000,R1,power,2.27622068564,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,176,2020.00000000000,R1,power,0.09518394926,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,177,2020.00000000000,R1,power,0.31452087580,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,178,2025.00000000000,R1,power,0.14608666995,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,179,2025.00000000000,R1,power,0.42874161491,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,180,2030.00000000000,R1,power,0.09994314672,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,181,2030.00000000000,R1,power,0.52806399674,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,182,2035.00000000000,R1,power,0.67546806772,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,183,2035.00000000000,R1,power,0.07606439075,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,184,2040.00000000000,R1,power,0.72559943056,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,185,2040.00000000000,R1,power,0.04966119092,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,198,2020.00000000000,R1,power,8.72551262831,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,200,2025.00000000000,R1,power,13.39176503388,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,202,2030.00000000000,R1,power,9.16178825972,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,205,2035.00000000000,R1,power,6.97282270036,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,207,2040.00000000000,R1,power,4.55244137129,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,220,2020.00000000000,R1,power,0.06345596617,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,221,2020.00000000000,R1,power,0.20968058387,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,222,2025.00000000000,R1,power,0.09739111330,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,223,2025.00000000000,R1,power,0.28582774327,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,224,2030.00000000000,R1,power,0.06662876448,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,225,2030.00000000000,R1,power,0.35204266449,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,226,2035.00000000000,R1,power,0.45031204515,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,227,2035.00000000000,R1,power,0.05070959384,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,228,2040.00000000000,R1,power,0.48373295371,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,229,2040.00000000000,R1,power,0.03310746061,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,242,2020.00000000000,R1,power,5.81700841887,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,244,2025.00000000000,R1,power,8.92784335592,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,246,2030.00000000000,R1,power,6.10785883981,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,249,2035.00000000000,R1,power,4.64854846691,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,251,2040.00000000000,R1,power,3.03496091419,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.10606224581,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2025.00000000000,R1,gas,0.00904156055,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2030.00000000000,R1,gas,0.33965948412,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2040.00000000000,R1,gas,0.02260582062,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,0.20560965715,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2025.00000000000,R1,gas,0.01752774657,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.65845550925,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2040.00000000000,R1,gas,0.04382308703,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.29212739954,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2025.00000000000,R1,gas,0.02490318352,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,12,2030.00000000000,R1,gas,0.93552461640,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,13,2040.00000000000,R1,gas,0.06226324498,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,15,2020.00000000000,R1,gas,0.20560965715,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,16,2025.00000000000,R1,gas,0.01752774657,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,17,2030.00000000000,R1,gas,0.65845550925,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,18,2040.00000000000,R1,gas,0.04382308703,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,20,2020.00000000000,R1,gas,0.41121931430,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,21,2025.00000000000,R1,gas,0.03505549314,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,22,2030.00000000000,R1,gas,1.31691101851,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,23,2040.00000000000,R1,gas,0.08764617405,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,25,2020.00000000000,R1,gas,0.49122222222,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,26,2025.00000000000,R1,gas,0.04187555556,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,27,2030.00000000000,R1,gas,1.57311666667,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,28,2040.00000000000,R1,gas,0.10469777778,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
@@ -293,33 +491,135 @@ A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,54,2040.00000000000,R1,resident
 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
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.03091339339,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.04744533855,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.13924467632,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.03245906306,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.17150213030,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2035.00000000000,R1,power,0.21937532814,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,6,2035.00000000000,R1,power,0.02470383350,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,7,2040.00000000000,R1,power,0.23565675534,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,8,2040.00000000000,R1,power,0.01612872699,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,9,2045.00000000000,R1,power,0.26399583715,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,10,2045.00000000000,R1,power,0.01857491725,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,24,2020.00000000000,R1,power,2.83383077230,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2025.00000000000,R1,power,4.34931418531,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2030.00000000000,R1,power,2.97552231091,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2035.00000000000,R1,power,2.26460041717,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,32,2040.00000000000,R1,power,1.47852040294,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,34,2045.00000000000,R1,power,1.70276266405,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.08121891957,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.12465338525,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.18291913189,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2030.00000000000,R1,power,0.08527986554,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2030.00000000000,R1,power,0.22529422036,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,53,2035.00000000000,R1,power,0.28818297145,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,54,2035.00000000000,R1,power,0.06490451050,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,55,2040.00000000000,R1,power,0.30957111072,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,56,2040.00000000000,R1,power,0.04237508847,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,57,2045.00000000000,R1,power,0.34679881937,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,58,2045.00000000000,R1,power,0.04880197689,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,72,2020.00000000000,R1,power,7.44533835653,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,73,2025.00000000000,R1,power,11.42697582546,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2030.00000000000,R1,power,7.81760527436,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,78,2035.00000000000,R1,power,5.94979647796,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,80,2040.00000000000,R1,power,3.88452435993,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,82,2045.00000000000,R1,power,4.47367722119,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,0.05414594638,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2025.00000000000,R1,power,0.08310225683,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.12194608793,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.05685324370,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2030.00000000000,R1,power,0.15019614691,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2035.00000000000,R1,power,0.19212198096,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2035.00000000000,R1,power,0.04326967367,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2040.00000000000,R1,power,0.20638074048,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,104,2040.00000000000,R1,power,0.02825005898,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,105,2045.00000000000,R1,power,0.23119921291,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,106,2045.00000000000,R1,power,0.03253465126,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,120,2020.00000000000,R1,power,4.96355890436,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,121,2025.00000000000,R1,power,7.61798388364,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,123,2030.00000000000,R1,power,5.21173684957,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,126,2035.00000000000,R1,power,3.96653098531,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,128,2040.00000000000,R1,power,2.58968290662,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,130,2045.00000000000,R1,power,2.98245148079,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,144,2020.00000000000,R1,power,0.04637009009,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,145,2025.00000000000,R1,power,0.07116800783,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,146,2025.00000000000,R1,power,0.20886701449,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,147,2030.00000000000,R1,power,0.04868859459,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,148,2030.00000000000,R1,power,0.25725319545,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,149,2035.00000000000,R1,power,0.32906299221,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,150,2035.00000000000,R1,power,0.03705575025,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,151,2040.00000000000,R1,power,0.35348513302,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,152,2040.00000000000,R1,power,0.02419309048,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,153,2045.00000000000,R1,power,0.39599375572,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,154,2045.00000000000,R1,power,0.02786237587,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,168,2020.00000000000,R1,power,4.25074615845,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,169,2025.00000000000,R1,power,6.52397127796,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,171,2030.00000000000,R1,power,4.46328346637,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,174,2035.00000000000,R1,power,3.39690062575,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,176,2040.00000000000,R1,power,2.21778060441,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,178,2045.00000000000,R1,power,2.55414399608,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,192,2020.00000000000,R1,power,0.09274018018,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,193,2025.00000000000,R1,power,0.14233601566,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,194,2025.00000000000,R1,power,0.41773402897,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,195,2030.00000000000,R1,power,0.09737718919,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,196,2030.00000000000,R1,power,0.51450639090,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,197,2035.00000000000,R1,power,0.65812598442,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,198,2035.00000000000,R1,power,0.07411150051,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,199,2040.00000000000,R1,power,0.70697026603,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,200,2040.00000000000,R1,power,0.04838618096,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,201,2045.00000000000,R1,power,0.79198751144,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,202,2045.00000000000,R1,power,0.05572475174,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,216,2020.00000000000,R1,power,8.50149231689,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,217,2025.00000000000,R1,power,13.04794255593,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,219,2030.00000000000,R1,power,8.92656693274,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,222,2035.00000000000,R1,power,6.79380125150,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,224,2040.00000000000,R1,power,4.43556120881,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,226,2045.00000000000,R1,power,5.10828799215,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,240,2020.00000000000,R1,power,0.06182678679,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,241,2025.00000000000,R1,power,0.09489067711,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,242,2025.00000000000,R1,power,0.27848935265,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,243,2030.00000000000,R1,power,0.06491812612,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,244,2030.00000000000,R1,power,0.34300426060,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,245,2035.00000000000,R1,power,0.43875065628,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,246,2035.00000000000,R1,power,0.04940766700,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,247,2040.00000000000,R1,power,0.47131351069,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,248,2040.00000000000,R1,power,0.03225745397,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,249,2045.00000000000,R1,power,0.52799167429,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,250,2045.00000000000,R1,power,0.03714983449,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,264,2020.00000000000,R1,power,5.66766154460,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,265,2025.00000000000,R1,power,8.69862837062,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,267,2030.00000000000,R1,power,5.95104462183,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,6.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,270,2035.00000000000,R1,power,4.52920083433,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,8.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,272,2040.00000000000,R1,power,2.95704080588,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,10.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,274,2045.00000000000,R1,power,3.40552532810,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.09824444444,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2025.00000000000,R1,gas,0.00837511111,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2030.00000000000,R1,gas,0.31462333333,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2040.00000000000,R1,gas,0.02093955556,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2045.00000000000,R1,gas,0.02782977778,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,0.19648888889,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2025.00000000000,R1,gas,0.01675022222,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.62924666667,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2040.00000000000,R1,gas,0.04187911111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2045.00000000000,R1,gas,0.05565955556,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.29473333333,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2025.00000000000,R1,gas,0.02512533333,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,12,2030.00000000000,R1,gas,0.94387000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,13,2040.00000000000,R1,gas,0.06281866667,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,14,2045.00000000000,R1,gas,0.08348933333,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,15,2020.00000000000,R1,gas,0.19648888889,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,16,2025.00000000000,R1,gas,0.01675022222,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,17,2030.00000000000,R1,gas,0.62924666667,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,18,2040.00000000000,R1,gas,0.04187911111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,19,2045.00000000000,R1,gas,0.05565955556,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,20,2020.00000000000,R1,gas,0.39297777778,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,21,2025.00000000000,R1,gas,0.03350044444,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,22,2030.00000000000,R1,gas,1.25849333333,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,23,2040.00000000000,R1,gas,0.08375822222,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,24,2045.00000000000,R1,gas,0.11131911111,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,25,2020.00000000000,R1,gas,0.49122222222,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,26,2025.00000000000,R1,gas,0.04187555556,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,27,2030.00000000000,R1,gas,1.57311666667,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,28,2040.00000000000,R1,gas,0.10469777778,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,29,2045.00000000000,R1,gas,0.13914888889,gassupply1,"('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/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index ed4a4096..e94703cc 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.28530000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.03380000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.25950000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,2.55980000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06030000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.78690000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07210000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.54220000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06030000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.08440000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12060000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,6.31150000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.12510000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.20050000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.38610000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.03590000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20590000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.36000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81090000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.06190000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.37560000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.27560000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.05110000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.06820000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.29290000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.35830000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.74090000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06190000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.37460000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.95000000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.49100000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12390000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.01550000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.70430000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.12030000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.76190000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.18380000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.57070000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.03430000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.19500000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.28330000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.17590000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.06070000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.31560000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18620000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.59800000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.07120000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21900000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.27800000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.11040000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06070000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.31190000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.56940000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.23140000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.12140000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70600000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.37360000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.67180000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.12390000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.48880000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06470000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.67540000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.02940000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.08440000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.38680000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.05680000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.16220000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06730000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.91490000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.08030000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.12470000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09910000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.31950000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.05680000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15840000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21050000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.64900000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.11370000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.44890000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13490000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,3.19510000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.13510000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.33370000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06990000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.83910000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.02930000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.09380000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.11280000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.71520000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.05670000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.18260000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07250000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.40900000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.08060000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.14250000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10690000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64720000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.05670000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17870000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.22610000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30340000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.11340000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.51420000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14530000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,4.01690000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.13550000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.38580000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.99740000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.02780000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.05760000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.03230000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.05560000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.13900000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.88460000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.08330000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.12040000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96350000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.05560000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13490000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.93600000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.11110000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.46860000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,4.80760000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.13890000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.36950000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 f79ba32f..f1da6623 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,16 @@
 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
+0,2025,R1,gasCCGT,2020,1.25560000000
+0,2030,R1,gasCCGT,2020,0.25560000000
+0,2035,R1,gasCCGT,2020,0.25560000000
+0,2040,R1,gasCCGT,2020,0.25560000000
+0,2045,R1,gasCCGT,2020,0.25560000000
+0,2049,R1,gasCCGT,2020,0.25560000000
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2025,R1,windturbine,2020,0.84440000000
+1,2030,R1,windturbine,2020,0.84440000000
+1,2035,R1,windturbine,2020,0.84440000000
+1,2040,R1,windturbine,2020,0.84440000000
+1,2045,R1,windturbine,2020,0.84440000000
+1,2049,R1,windturbine,2020,0.84440000000
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 525499d5..c63b7fb6 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,35 @@
 asset,year,region,technology,installed,capacity
-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
-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
+0,2025,R1,gasCCGT,2020,1.25560000000
+0,2030,R1,gasCCGT,2020,0.25560000000
+0,2035,R1,gasCCGT,2020,0.25560000000
+0,2040,R1,gasCCGT,2020,0.25560000000
+0,2045,R1,gasCCGT,2020,0.25560000000
+0,2049,R1,gasCCGT,2020,0.25560000000
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2054,R1,gasCCGT,2020,0.25560000000
+0,2055,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2030,R1,gasCCGT,2025,0.39220000000
+1,2035,R1,gasCCGT,2025,0.39220000000
+1,2040,R1,gasCCGT,2025,0.39220000000
+1,2045,R1,gasCCGT,2025,0.39220000000
+1,2049,R1,gasCCGT,2025,0.39220000000
+1,2050,R1,gasCCGT,2025,0.39220000000
+1,2054,R1,gasCCGT,2025,0.39220000000
+1,2055,R1,gasCCGT,2025,0.39220000000
+1,2059,R1,gasCCGT,2025,0.39220000000
+1,2060,R1,gasCCGT,2025,0.39220000000
+1,2064,R1,gasCCGT,2025,0.39220000000
+2,2025,R1,windturbine,2020,0.84440000000
+2,2030,R1,windturbine,2020,0.84440000000
+2,2035,R1,windturbine,2020,0.84440000000
+2,2040,R1,windturbine,2020,0.84440000000
+2,2045,R1,windturbine,2020,0.84440000000
+2,2049,R1,windturbine,2020,0.84440000000
+3,2030,R1,windturbine,2025,1.15110000000
+3,2035,R1,windturbine,2025,1.15110000000
+3,2040,R1,windturbine,2025,1.15110000000
+3,2045,R1,windturbine,2025,1.15110000000
+3,2049,R1,windturbine,2025,1.15110000000
+3,2050,R1,windturbine,2025,1.15110000000
+3,2054,R1,windturbine,2025,1.15110000000
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 98ef6ffe..041ba78f 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,53 @@
 asset,year,region,technology,installed,capacity
-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
+0,2030,R1,gasCCGT,2020,0.25560000000
+0,2035,R1,gasCCGT,2020,0.25560000000
+0,2040,R1,gasCCGT,2020,0.25560000000
+0,2045,R1,gasCCGT,2020,0.25560000000
+0,2049,R1,gasCCGT,2020,0.25560000000
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2054,R1,gasCCGT,2020,0.25560000000
+0,2055,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2030,R1,gasCCGT,2025,0.39220000000
+1,2035,R1,gasCCGT,2025,0.39220000000
+1,2040,R1,gasCCGT,2025,0.39220000000
+1,2045,R1,gasCCGT,2025,0.39220000000
+1,2049,R1,gasCCGT,2025,0.39220000000
+1,2050,R1,gasCCGT,2025,0.39220000000
+1,2054,R1,gasCCGT,2025,0.39220000000
+1,2055,R1,gasCCGT,2025,0.39220000000
+1,2059,R1,gasCCGT,2025,0.39220000000
+1,2060,R1,gasCCGT,2025,0.39220000000
+1,2064,R1,gasCCGT,2025,0.39220000000
+2,2035,R1,gasCCGT,2030,0.26830000000
+2,2040,R1,gasCCGT,2030,0.26830000000
+2,2045,R1,gasCCGT,2030,0.26830000000
+2,2049,R1,gasCCGT,2030,0.26830000000
+2,2050,R1,gasCCGT,2030,0.26830000000
+2,2054,R1,gasCCGT,2030,0.26830000000
+2,2055,R1,gasCCGT,2030,0.26830000000
+2,2059,R1,gasCCGT,2030,0.26830000000
+2,2060,R1,gasCCGT,2030,0.26830000000
+2,2064,R1,gasCCGT,2030,0.26830000000
+2,2065,R1,gasCCGT,2030,0.26830000000
+2,2069,R1,gasCCGT,2030,0.26830000000
+3,2030,R1,windturbine,2020,0.84440000000
+3,2035,R1,windturbine,2020,0.84440000000
+3,2040,R1,windturbine,2020,0.84440000000
+3,2045,R1,windturbine,2020,0.84440000000
+3,2049,R1,windturbine,2020,0.84440000000
+4,2030,R1,windturbine,2025,1.15110000000
+4,2035,R1,windturbine,2025,1.15110000000
+4,2040,R1,windturbine,2025,1.15110000000
+4,2045,R1,windturbine,2025,1.15110000000
+4,2049,R1,windturbine,2025,1.15110000000
+4,2050,R1,windturbine,2025,1.15110000000
+4,2054,R1,windturbine,2025,1.15110000000
+5,2035,R1,windturbine,2030,1.41780000000
+5,2040,R1,windturbine,2030,1.41780000000
+5,2045,R1,windturbine,2030,1.41780000000
+5,2049,R1,windturbine,2030,1.41780000000
+5,2050,R1,windturbine,2030,1.41780000000
+5,2054,R1,windturbine,2030,1.41780000000
+5,2055,R1,windturbine,2030,1.41780000000
+5,2059,R1,windturbine,2030,1.41780000000
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 e9cb4c69..b6eaebe2 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,71 @@
 asset,year,region,technology,installed,capacity
-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
+0,2035,R1,gasCCGT,2020,0.25560000000
+0,2040,R1,gasCCGT,2020,0.25560000000
+0,2045,R1,gasCCGT,2020,0.25560000000
+0,2049,R1,gasCCGT,2020,0.25560000000
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2054,R1,gasCCGT,2020,0.25560000000
+0,2055,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2035,R1,gasCCGT,2025,0.39220000000
+1,2040,R1,gasCCGT,2025,0.39220000000
+1,2045,R1,gasCCGT,2025,0.39220000000
+1,2049,R1,gasCCGT,2025,0.39220000000
+1,2050,R1,gasCCGT,2025,0.39220000000
+1,2054,R1,gasCCGT,2025,0.39220000000
+1,2055,R1,gasCCGT,2025,0.39220000000
+1,2059,R1,gasCCGT,2025,0.39220000000
+1,2060,R1,gasCCGT,2025,0.39220000000
+1,2064,R1,gasCCGT,2025,0.39220000000
+2,2035,R1,gasCCGT,2030,0.26830000000
+2,2040,R1,gasCCGT,2030,0.26830000000
+2,2045,R1,gasCCGT,2030,0.26830000000
+2,2049,R1,gasCCGT,2030,0.26830000000
+2,2050,R1,gasCCGT,2030,0.26830000000
+2,2054,R1,gasCCGT,2030,0.26830000000
+2,2055,R1,gasCCGT,2030,0.26830000000
+2,2059,R1,gasCCGT,2030,0.26830000000
+2,2060,R1,gasCCGT,2030,0.26830000000
+2,2064,R1,gasCCGT,2030,0.26830000000
+2,2065,R1,gasCCGT,2030,0.26830000000
+2,2069,R1,gasCCGT,2030,0.26830000000
+3,2040,R1,gasCCGT,2035,0.20420000000
+3,2045,R1,gasCCGT,2035,0.20420000000
+3,2049,R1,gasCCGT,2035,0.20420000000
+3,2050,R1,gasCCGT,2035,0.20420000000
+3,2054,R1,gasCCGT,2035,0.20420000000
+3,2055,R1,gasCCGT,2035,0.20420000000
+3,2059,R1,gasCCGT,2035,0.20420000000
+3,2060,R1,gasCCGT,2035,0.20420000000
+3,2064,R1,gasCCGT,2035,0.20420000000
+3,2065,R1,gasCCGT,2035,0.20420000000
+3,2069,R1,gasCCGT,2035,0.20420000000
+3,2070,R1,gasCCGT,2035,0.20420000000
+3,2074,R1,gasCCGT,2035,0.20420000000
+4,2035,R1,windturbine,2020,0.84440000000
+4,2040,R1,windturbine,2020,0.84440000000
+4,2045,R1,windturbine,2020,0.84440000000
+4,2049,R1,windturbine,2020,0.84440000000
+5,2035,R1,windturbine,2025,1.15110000000
+5,2040,R1,windturbine,2025,1.15110000000
+5,2045,R1,windturbine,2025,1.15110000000
+5,2049,R1,windturbine,2025,1.15110000000
+5,2050,R1,windturbine,2025,1.15110000000
+5,2054,R1,windturbine,2025,1.15110000000
+6,2035,R1,windturbine,2030,1.41780000000
+6,2040,R1,windturbine,2030,1.41780000000
+6,2045,R1,windturbine,2030,1.41780000000
+6,2049,R1,windturbine,2030,1.41780000000
+6,2050,R1,windturbine,2030,1.41780000000
+6,2054,R1,windturbine,2030,1.41780000000
+6,2055,R1,windturbine,2030,1.41780000000
+6,2059,R1,windturbine,2030,1.41780000000
+7,2040,R1,windturbine,2035,1.81350000000
+7,2045,R1,windturbine,2035,1.81350000000
+7,2049,R1,windturbine,2035,1.81350000000
+7,2050,R1,windturbine,2035,1.81350000000
+7,2054,R1,windturbine,2035,1.81350000000
+7,2055,R1,windturbine,2035,1.81350000000
+7,2059,R1,windturbine,2035,1.81350000000
+7,2060,R1,windturbine,2035,1.81350000000
+7,2064,R1,windturbine,2035,1.81350000000
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 4aa4b743..50f2133e 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,89 @@
 asset,year,region,technology,installed,capacity
-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
+0,2040,R1,gasCCGT,2020,0.25560000000
+0,2045,R1,gasCCGT,2020,0.25560000000
+0,2049,R1,gasCCGT,2020,0.25560000000
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2054,R1,gasCCGT,2020,0.25560000000
+0,2055,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2040,R1,gasCCGT,2025,0.39220000000
+1,2045,R1,gasCCGT,2025,0.39220000000
+1,2049,R1,gasCCGT,2025,0.39220000000
+1,2050,R1,gasCCGT,2025,0.39220000000
+1,2054,R1,gasCCGT,2025,0.39220000000
+1,2055,R1,gasCCGT,2025,0.39220000000
+1,2059,R1,gasCCGT,2025,0.39220000000
+1,2060,R1,gasCCGT,2025,0.39220000000
+1,2064,R1,gasCCGT,2025,0.39220000000
+2,2040,R1,gasCCGT,2030,0.26830000000
+2,2045,R1,gasCCGT,2030,0.26830000000
+2,2049,R1,gasCCGT,2030,0.26830000000
+2,2050,R1,gasCCGT,2030,0.26830000000
+2,2054,R1,gasCCGT,2030,0.26830000000
+2,2055,R1,gasCCGT,2030,0.26830000000
+2,2059,R1,gasCCGT,2030,0.26830000000
+2,2060,R1,gasCCGT,2030,0.26830000000
+2,2064,R1,gasCCGT,2030,0.26830000000
+2,2065,R1,gasCCGT,2030,0.26830000000
+2,2069,R1,gasCCGT,2030,0.26830000000
+3,2040,R1,gasCCGT,2035,0.20420000000
+3,2045,R1,gasCCGT,2035,0.20420000000
+3,2049,R1,gasCCGT,2035,0.20420000000
+3,2050,R1,gasCCGT,2035,0.20420000000
+3,2054,R1,gasCCGT,2035,0.20420000000
+3,2055,R1,gasCCGT,2035,0.20420000000
+3,2059,R1,gasCCGT,2035,0.20420000000
+3,2060,R1,gasCCGT,2035,0.20420000000
+3,2064,R1,gasCCGT,2035,0.20420000000
+3,2065,R1,gasCCGT,2035,0.20420000000
+3,2069,R1,gasCCGT,2035,0.20420000000
+3,2070,R1,gasCCGT,2035,0.20420000000
+3,2074,R1,gasCCGT,2035,0.20420000000
+4,2045,R1,gasCCGT,2040,0.13330000000
+4,2049,R1,gasCCGT,2040,0.13330000000
+4,2050,R1,gasCCGT,2040,0.13330000000
+4,2054,R1,gasCCGT,2040,0.13330000000
+4,2055,R1,gasCCGT,2040,0.13330000000
+4,2059,R1,gasCCGT,2040,0.13330000000
+4,2060,R1,gasCCGT,2040,0.13330000000
+4,2064,R1,gasCCGT,2040,0.13330000000
+4,2065,R1,gasCCGT,2040,0.13330000000
+4,2069,R1,gasCCGT,2040,0.13330000000
+4,2070,R1,gasCCGT,2040,0.13330000000
+4,2074,R1,gasCCGT,2040,0.13330000000
+4,2075,R1,gasCCGT,2040,0.13330000000
+4,2079,R1,gasCCGT,2040,0.13330000000
+5,2040,R1,windturbine,2020,0.84440000000
+5,2045,R1,windturbine,2020,0.84440000000
+5,2049,R1,windturbine,2020,0.84440000000
+6,2040,R1,windturbine,2025,1.15110000000
+6,2045,R1,windturbine,2025,1.15110000000
+6,2049,R1,windturbine,2025,1.15110000000
+6,2050,R1,windturbine,2025,1.15110000000
+6,2054,R1,windturbine,2025,1.15110000000
+7,2040,R1,windturbine,2030,1.41780000000
+7,2045,R1,windturbine,2030,1.41780000000
+7,2049,R1,windturbine,2030,1.41780000000
+7,2050,R1,windturbine,2030,1.41780000000
+7,2054,R1,windturbine,2030,1.41780000000
+7,2055,R1,windturbine,2030,1.41780000000
+7,2059,R1,windturbine,2030,1.41780000000
+8,2040,R1,windturbine,2035,1.81350000000
+8,2045,R1,windturbine,2035,1.81350000000
+8,2049,R1,windturbine,2035,1.81350000000
+8,2050,R1,windturbine,2035,1.81350000000
+8,2054,R1,windturbine,2035,1.81350000000
+8,2055,R1,windturbine,2035,1.81350000000
+8,2059,R1,windturbine,2035,1.81350000000
+8,2060,R1,windturbine,2035,1.81350000000
+8,2064,R1,windturbine,2035,1.81350000000
+9,2045,R1,windturbine,2040,1.94810000000
+9,2049,R1,windturbine,2040,1.94810000000
+9,2050,R1,windturbine,2040,1.94810000000
+9,2054,R1,windturbine,2040,1.94810000000
+9,2055,R1,windturbine,2040,1.94810000000
+9,2059,R1,windturbine,2040,1.94810000000
+9,2060,R1,windturbine,2040,1.94810000000
+9,2064,R1,windturbine,2040,1.94810000000
+9,2065,R1,windturbine,2040,1.94810000000
+9,2069,R1,windturbine,2040,1.94810000000
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 16a516dc..ea44c628 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,105 @@
 asset,year,region,technology,installed,capacity
-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
+0,2045,R1,gasCCGT,2020,0.25560000000
+0,2049,R1,gasCCGT,2020,0.25560000000
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2054,R1,gasCCGT,2020,0.25560000000
+0,2055,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2045,R1,gasCCGT,2025,0.39220000000
+1,2049,R1,gasCCGT,2025,0.39220000000
+1,2050,R1,gasCCGT,2025,0.39220000000
+1,2054,R1,gasCCGT,2025,0.39220000000
+1,2055,R1,gasCCGT,2025,0.39220000000
+1,2059,R1,gasCCGT,2025,0.39220000000
+1,2060,R1,gasCCGT,2025,0.39220000000
+1,2064,R1,gasCCGT,2025,0.39220000000
+2,2045,R1,gasCCGT,2030,0.26830000000
+2,2049,R1,gasCCGT,2030,0.26830000000
+2,2050,R1,gasCCGT,2030,0.26830000000
+2,2054,R1,gasCCGT,2030,0.26830000000
+2,2055,R1,gasCCGT,2030,0.26830000000
+2,2059,R1,gasCCGT,2030,0.26830000000
+2,2060,R1,gasCCGT,2030,0.26830000000
+2,2064,R1,gasCCGT,2030,0.26830000000
+2,2065,R1,gasCCGT,2030,0.26830000000
+2,2069,R1,gasCCGT,2030,0.26830000000
+3,2045,R1,gasCCGT,2035,0.20420000000
+3,2049,R1,gasCCGT,2035,0.20420000000
+3,2050,R1,gasCCGT,2035,0.20420000000
+3,2054,R1,gasCCGT,2035,0.20420000000
+3,2055,R1,gasCCGT,2035,0.20420000000
+3,2059,R1,gasCCGT,2035,0.20420000000
+3,2060,R1,gasCCGT,2035,0.20420000000
+3,2064,R1,gasCCGT,2035,0.20420000000
+3,2065,R1,gasCCGT,2035,0.20420000000
+3,2069,R1,gasCCGT,2035,0.20420000000
+3,2070,R1,gasCCGT,2035,0.20420000000
+3,2074,R1,gasCCGT,2035,0.20420000000
+4,2045,R1,gasCCGT,2040,0.13330000000
+4,2049,R1,gasCCGT,2040,0.13330000000
+4,2050,R1,gasCCGT,2040,0.13330000000
+4,2054,R1,gasCCGT,2040,0.13330000000
+4,2055,R1,gasCCGT,2040,0.13330000000
+4,2059,R1,gasCCGT,2040,0.13330000000
+4,2060,R1,gasCCGT,2040,0.13330000000
+4,2064,R1,gasCCGT,2040,0.13330000000
+4,2065,R1,gasCCGT,2040,0.13330000000
+4,2069,R1,gasCCGT,2040,0.13330000000
+4,2070,R1,gasCCGT,2040,0.13330000000
+4,2074,R1,gasCCGT,2040,0.13330000000
+4,2075,R1,gasCCGT,2040,0.13330000000
+4,2079,R1,gasCCGT,2040,0.13330000000
+5,2050,R1,gasCCGT,2045,0.15360000000
+5,2054,R1,gasCCGT,2045,0.15360000000
+5,2055,R1,gasCCGT,2045,0.15360000000
+5,2059,R1,gasCCGT,2045,0.15360000000
+5,2060,R1,gasCCGT,2045,0.15360000000
+5,2064,R1,gasCCGT,2045,0.15360000000
+5,2065,R1,gasCCGT,2045,0.15360000000
+5,2069,R1,gasCCGT,2045,0.15360000000
+5,2070,R1,gasCCGT,2045,0.15360000000
+5,2074,R1,gasCCGT,2045,0.15360000000
+5,2075,R1,gasCCGT,2045,0.15360000000
+5,2079,R1,gasCCGT,2045,0.15360000000
+5,2080,R1,gasCCGT,2045,0.15360000000
+5,2084,R1,gasCCGT,2045,0.15360000000
+6,2045,R1,windturbine,2020,0.84440000000
+6,2049,R1,windturbine,2020,0.84440000000
+7,2045,R1,windturbine,2025,1.15110000000
+7,2049,R1,windturbine,2025,1.15110000000
+7,2050,R1,windturbine,2025,1.15110000000
+7,2054,R1,windturbine,2025,1.15110000000
+8,2045,R1,windturbine,2030,1.41780000000
+8,2049,R1,windturbine,2030,1.41780000000
+8,2050,R1,windturbine,2030,1.41780000000
+8,2054,R1,windturbine,2030,1.41780000000
+8,2055,R1,windturbine,2030,1.41780000000
+8,2059,R1,windturbine,2030,1.41780000000
+9,2045,R1,windturbine,2035,1.81350000000
+9,2049,R1,windturbine,2035,1.81350000000
+9,2050,R1,windturbine,2035,1.81350000000
+9,2054,R1,windturbine,2035,1.81350000000
+9,2055,R1,windturbine,2035,1.81350000000
+9,2059,R1,windturbine,2035,1.81350000000
+9,2060,R1,windturbine,2035,1.81350000000
+9,2064,R1,windturbine,2035,1.81350000000
+10,2045,R1,windturbine,2040,1.94810000000
+10,2049,R1,windturbine,2040,1.94810000000
+10,2050,R1,windturbine,2040,1.94810000000
+10,2054,R1,windturbine,2040,1.94810000000
+10,2055,R1,windturbine,2040,1.94810000000
+10,2059,R1,windturbine,2040,1.94810000000
+10,2060,R1,windturbine,2040,1.94810000000
+10,2064,R1,windturbine,2040,1.94810000000
+10,2065,R1,windturbine,2040,1.94810000000
+10,2069,R1,windturbine,2040,1.94810000000
+11,2050,R1,windturbine,2045,2.18240000000
+11,2054,R1,windturbine,2045,2.18240000000
+11,2055,R1,windturbine,2045,2.18240000000
+11,2059,R1,windturbine,2045,2.18240000000
+11,2060,R1,windturbine,2045,2.18240000000
+11,2064,R1,windturbine,2045,2.18240000000
+11,2065,R1,windturbine,2045,2.18240000000
+11,2069,R1,windturbine,2045,2.18240000000
+11,2070,R1,windturbine,2045,2.18240000000
+11,2074,R1,windturbine,2045,2.18240000000
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 bc415559..f0b26141 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,95 @@
 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
+0,2050,R1,gasCCGT,2020,0.25560000000
+0,2054,R1,gasCCGT,2020,0.25560000000
+0,2055,R1,gasCCGT,2020,0.25560000000
+0,2059,R1,gasCCGT,2020,0.25560000000
+1,2050,R1,gasCCGT,2025,0.39220000000
+1,2054,R1,gasCCGT,2025,0.39220000000
+1,2055,R1,gasCCGT,2025,0.39220000000
+1,2059,R1,gasCCGT,2025,0.39220000000
+1,2060,R1,gasCCGT,2025,0.39220000000
+1,2064,R1,gasCCGT,2025,0.39220000000
+2,2050,R1,gasCCGT,2030,0.26830000000
+2,2054,R1,gasCCGT,2030,0.26830000000
+2,2055,R1,gasCCGT,2030,0.26830000000
+2,2059,R1,gasCCGT,2030,0.26830000000
+2,2060,R1,gasCCGT,2030,0.26830000000
+2,2064,R1,gasCCGT,2030,0.26830000000
+2,2065,R1,gasCCGT,2030,0.26830000000
+2,2069,R1,gasCCGT,2030,0.26830000000
+3,2050,R1,gasCCGT,2035,0.20420000000
+3,2054,R1,gasCCGT,2035,0.20420000000
+3,2055,R1,gasCCGT,2035,0.20420000000
+3,2059,R1,gasCCGT,2035,0.20420000000
+3,2060,R1,gasCCGT,2035,0.20420000000
+3,2064,R1,gasCCGT,2035,0.20420000000
+3,2065,R1,gasCCGT,2035,0.20420000000
+3,2069,R1,gasCCGT,2035,0.20420000000
+3,2070,R1,gasCCGT,2035,0.20420000000
+3,2074,R1,gasCCGT,2035,0.20420000000
+4,2050,R1,gasCCGT,2040,0.13330000000
+4,2054,R1,gasCCGT,2040,0.13330000000
+4,2055,R1,gasCCGT,2040,0.13330000000
+4,2059,R1,gasCCGT,2040,0.13330000000
+4,2060,R1,gasCCGT,2040,0.13330000000
+4,2064,R1,gasCCGT,2040,0.13330000000
+4,2065,R1,gasCCGT,2040,0.13330000000
+4,2069,R1,gasCCGT,2040,0.13330000000
+4,2070,R1,gasCCGT,2040,0.13330000000
+4,2074,R1,gasCCGT,2040,0.13330000000
+4,2075,R1,gasCCGT,2040,0.13330000000
+4,2079,R1,gasCCGT,2040,0.13330000000
+5,2050,R1,gasCCGT,2045,0.15360000000
+5,2054,R1,gasCCGT,2045,0.15360000000
+5,2055,R1,gasCCGT,2045,0.15360000000
+5,2059,R1,gasCCGT,2045,0.15360000000
+5,2060,R1,gasCCGT,2045,0.15360000000
+5,2064,R1,gasCCGT,2045,0.15360000000
+5,2065,R1,gasCCGT,2045,0.15360000000
+5,2069,R1,gasCCGT,2045,0.15360000000
+5,2070,R1,gasCCGT,2045,0.15360000000
+5,2074,R1,gasCCGT,2045,0.15360000000
+5,2075,R1,gasCCGT,2045,0.15360000000
+5,2079,R1,gasCCGT,2045,0.15360000000
+5,2080,R1,gasCCGT,2045,0.15360000000
+5,2084,R1,gasCCGT,2045,0.15360000000
+7,2050,R1,windturbine,2025,1.15110000000
+7,2054,R1,windturbine,2025,1.15110000000
+8,2050,R1,windturbine,2030,1.41780000000
+8,2054,R1,windturbine,2030,1.41780000000
+8,2055,R1,windturbine,2030,1.41780000000
+8,2059,R1,windturbine,2030,1.41780000000
+9,2050,R1,windturbine,2035,1.81350000000
+9,2054,R1,windturbine,2035,1.81350000000
+9,2055,R1,windturbine,2035,1.81350000000
+9,2059,R1,windturbine,2035,1.81350000000
+9,2060,R1,windturbine,2035,1.81350000000
+9,2064,R1,windturbine,2035,1.81350000000
+10,2050,R1,windturbine,2040,1.94810000000
+10,2054,R1,windturbine,2040,1.94810000000
+10,2055,R1,windturbine,2040,1.94810000000
+10,2059,R1,windturbine,2040,1.94810000000
+10,2060,R1,windturbine,2040,1.94810000000
+10,2064,R1,windturbine,2040,1.94810000000
+10,2065,R1,windturbine,2040,1.94810000000
+10,2069,R1,windturbine,2040,1.94810000000
+11,2050,R1,windturbine,2045,2.18240000000
+11,2054,R1,windturbine,2045,2.18240000000
+11,2055,R1,windturbine,2045,2.18240000000
+11,2059,R1,windturbine,2045,2.18240000000
+11,2060,R1,windturbine,2045,2.18240000000
+11,2064,R1,windturbine,2045,2.18240000000
+11,2065,R1,windturbine,2045,2.18240000000
+11,2069,R1,windturbine,2045,2.18240000000
+11,2070,R1,windturbine,2045,2.18240000000
+11,2074,R1,windturbine,2045,2.18240000000
+12,2055,R1,windturbine,2050,2.13850000000
+12,2059,R1,windturbine,2050,2.13850000000
+12,2060,R1,windturbine,2050,2.13850000000
+12,2064,R1,windturbine,2050,2.13850000000
+12,2065,R1,windturbine,2050,2.13850000000
+12,2069,R1,windturbine,2050,2.13850000000
+12,2070,R1,windturbine,2050,2.13850000000
+12,2074,R1,windturbine,2050,2.13850000000
+12,2075,R1,windturbine,2050,2.13850000000
+12,2079,R1,windturbine,2050,2.13850000000
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 aa3821f8..9458e809 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,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
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.25110000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,23.01940000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.17110000000
 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
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.50220000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,46.03870000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.13110000000
 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,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.75330000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,69.05810000000
 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
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.50220000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,46.03870000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.13110000000
 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
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00440000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,92.07740000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.26220000000
 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,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.25560000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,115.09680000000
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 e841617e..3e5e2b7b 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,53 @@
 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
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.25110000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,23.01940000000
+0,0,2030,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2030,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,1,2030,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2030,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,2,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.17110000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.18870000000
+0,3,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.25730000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.50220000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,46.03870000000
+1,0,2030,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2030,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,1,2030,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2030,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,2,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.13110000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.25570000000
+1,3,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.34850000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.75330000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,69.05810000000
+2,0,2030,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2030,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2030,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.07910000000
+2,3,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.10780000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.50220000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,46.03870000000
+3,0,2030,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2030,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2030,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,2,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.13110000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.25570000000
+3,3,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.34850000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00440000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,92.07740000000
+4,0,2030,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2030,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2030,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,2,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.26220000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.51140000000
+4,3,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.69710000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.25560000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,115.09680000000
+5,0,2030,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2030,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,1,2030,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2030,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.21300000000
+5,3,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.29030000000
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 0480fdee..e1c898f1 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,91 @@
 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
+0,0,2030,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2030,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,0,2035,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2035,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,1,2030,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2030,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,1,2035,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2035,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,2,2035,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2035,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,3,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.18870000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.13000000000
+0,4,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.25730000000
+0,4,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.17730000000
+0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.21830000000
+1,0,2030,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2030,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,0,2035,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2035,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,1,2030,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2030,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,1,2035,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2035,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,2,2035,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2035,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,3,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.25570000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.17240000000
+1,4,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.34850000000
+1,4,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23500000000
+1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.28950000000
+2,0,2030,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2030,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2035,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2030,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2035,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2035,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,3,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.07910000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.03940000000
+2,4,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.10780000000
+2,4,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.05370000000
+2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.06610000000
+3,0,2030,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2030,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2035,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2030,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2035,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2035,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,3,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.25570000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.17240000000
+3,4,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.34850000000
+3,4,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23500000000
+3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.28950000000
+4,0,2030,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2030,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2035,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2030,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2035,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2035,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,3,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.51140000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.34480000000
+4,4,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.69710000000
+4,4,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.47000000000
+4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.57890000000
+5,0,2030,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2030,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,0,2035,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2035,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,1,2030,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2030,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,1,2035,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2035,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,2,2035,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2035,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,3,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.21300000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.12410000000
+5,4,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.29030000000
+5,4,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.16920000000
+5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.20840000000
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 8d7d43bd..69f150ca 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,127 @@
 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
+0,0,2035,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2035,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,0,2040,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,1,2035,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2035,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,1,2040,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,2,2035,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2035,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,2,2040,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,3,2040,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,4,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.13000000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.11130000000
+0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.17730000000
+0,5,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15170000000
+0,6,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.21830000000
+0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.18690000000
+0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.23910000000
+1,0,2035,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2035,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,0,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,1,2035,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2035,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,1,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,2,2035,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2035,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,2,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,3,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,4,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.17240000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.14890000000
+1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23500000000
+1,5,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20290000000
+1,6,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.28950000000
+1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25000000000
+1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.31970000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2035,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2035,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2035,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,4,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.03940000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.03890000000
+2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.05370000000
+2,5,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.05310000000
+2,6,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.06610000000
+2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.06530000000
+2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.08360000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2035,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2035,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2035,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,4,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.17240000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.14890000000
+3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23500000000
+3,5,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20290000000
+3,6,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.28950000000
+3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25000000000
+3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.31970000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2035,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2035,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2035,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,4,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.34480000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.29780000000
+4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.47000000000
+4,5,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40590000000
+4,6,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.57890000000
+4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.49990000000
+4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.63950000000
+5,0,2035,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2035,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,0,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,1,2035,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2035,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,1,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,2,2035,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2035,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,2,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,3,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,4,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.12410000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.11400000000
+5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.16920000000
+5,5,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.15550000000
+5,6,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.20840000000
+5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.19150000000
+5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.24490000000
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 cb0ec8b6..5d06eb72 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,163 @@
 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
+0,0,2040,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,0,2045,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,1,2040,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,1,2045,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,2,2040,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,2,2045,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,3,2040,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2040,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,3,2045,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,4,2045,electricity,all-year,all-week,night,R1,gasCCGT,2040,0.02670000000
+0,4,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2040,2.44450000000
+0,5,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.11130000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.09360000000
+0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15170000000
+0,6,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.12770000000
+0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.18690000000
+0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.15720000000
+0,8,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.23910000000
+0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.20110000000
+0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.21600000000
+1,0,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,0,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,1,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,1,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,2,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,2,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,3,2040,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2040,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,3,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,4,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2040,0.05330000000
+1,4,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2040,4.88910000000
+1,5,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.14890000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.12570000000
+1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20290000000
+1,6,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.17140000000
+1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25000000000
+1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.21110000000
+1,8,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.31970000000
+1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.27000000000
+1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.29000000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2040,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2040,0.08000000000
+2,4,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2040,7.33360000000
+2,5,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.03890000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.03460000000
+2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.05310000000
+2,6,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.04720000000
+2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.06530000000
+2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.05810000000
+2,8,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.08360000000
+2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.07440000000
+2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.07990000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2040,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2040,0.05330000000
+3,4,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2040,4.88910000000
+3,5,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.14890000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.12570000000
+3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20290000000
+3,6,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.17140000000
+3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25000000000
+3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.21110000000
+3,8,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.31970000000
+3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.27000000000
+3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.29000000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2040,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2040,0.10670000000
+4,4,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2040,9.77810000000
+4,5,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.29780000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.25140000000
+4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40590000000
+4,6,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.34280000000
+4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.49990000000
+4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.42220000000
+4,8,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.63950000000
+4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.54000000000
+4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.58010000000
+5,0,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,0,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,1,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,1,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,2,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,2,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,3,2040,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2040,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,3,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,4,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2040,0.13330000000
+5,4,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2040,12.22270000000
+5,5,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.11400000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.09880000000
+5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.15550000000
+5,6,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.13460000000
+5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.19150000000
+5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.16580000000
+5,8,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.24490000000
+5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.21210000000
+5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.22790000000
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 4b2628f7..9dde9938 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,193 @@
 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
+0,0,2045,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,0,2050,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,1,2045,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,1,2050,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,2,2045,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,2,2050,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,3,2045,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,3,2050,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,4,2045,electricity,all-year,all-week,night,R1,gasCCGT,2040,0.02670000000
+0,4,2045,CO2f,all-year,all-week,night,R1,gasCCGT,2040,2.44450000000
+0,4,2050,electricity,all-year,all-week,night,R1,gasCCGT,2040,0.02670000000
+0,4,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2040,2.44450000000
+0,5,2050,electricity,all-year,all-week,night,R1,gasCCGT,2045,0.03070000000
+0,5,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2045,2.81530000000
+0,6,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.09360000000
+0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.12770000000
+0,7,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.12420000000
+0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.15720000000
+0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.15300000000
+0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.20110000000
+0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.19570000000
+0,10,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.21600000000
+0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.21020000000
+0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.23550000000
+1,0,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,0,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,1,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,1,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,2,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,2,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,3,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,3,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,4,2045,electricity,all-year,all-week,morning,R1,gasCCGT,2040,0.05330000000
+1,4,2045,CO2f,all-year,all-week,morning,R1,gasCCGT,2040,4.88910000000
+1,4,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2040,0.05330000000
+1,4,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2040,4.88910000000
+1,5,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2045,0.06140000000
+1,5,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2045,5.63060000000
+1,6,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.12570000000
+1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.17140000000
+1,7,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.16730000000
+1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.21110000000
+1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.20600000000
+1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.27000000000
+1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.26350000000
+1,10,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.29000000000
+1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.28310000000
+1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.31710000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,0,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,gasCCGT,2040,0.08000000000
+2,4,2045,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2040,7.33360000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2040,0.08000000000
+2,4,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2040,7.33360000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2045,0.09210000000
+2,5,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2045,8.44590000000
+2,6,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.03460000000
+2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.04720000000
+2,7,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.04810000000
+2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.05810000000
+2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.05920000000
+2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.07440000000
+2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.07580000000
+2,10,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.07990000000
+2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.08140000000
+2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.09120000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,0,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,gasCCGT,2040,0.05330000000
+3,4,2045,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2040,4.88910000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2040,0.05330000000
+3,4,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2040,4.88910000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2045,0.06140000000
+3,5,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2045,5.63060000000
+3,6,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.12570000000
+3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.17140000000
+3,7,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.16730000000
+3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.21110000000
+3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.20600000000
+3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.27000000000
+3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.26350000000
+3,10,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.29000000000
+3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.28310000000
+3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.31710000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,0,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,gasCCGT,2040,0.10670000000
+4,4,2045,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2040,9.77810000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2040,0.10670000000
+4,4,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2040,9.77810000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2045,0.12280000000
+4,5,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2045,11.26120000000
+4,6,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.25140000000
+4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.34280000000
+4,7,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.33460000000
+4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.42220000000
+4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.41210000000
+4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.54000000000
+4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.52710000000
+4,10,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.58010000000
+4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.56620000000
+4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.63430000000
+5,0,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,0,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,1,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,1,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,2,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,2,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,3,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,3,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,4,2045,electricity,all-year,all-week,evening,R1,gasCCGT,2040,0.13330000000
+5,4,2045,CO2f,all-year,all-week,evening,R1,gasCCGT,2040,12.22270000000
+5,4,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2040,0.13330000000
+5,4,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2040,12.22270000000
+5,5,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2045,0.15360000000
+5,5,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2045,14.07640000000
+5,6,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.09880000000
+5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.13460000000
+5,7,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.13420000000
+5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.16580000000
+5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.16530000000
+5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.21210000000
+5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.21150000000
+5,10,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.22790000000
+5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.22720000000
+5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.25450000000
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 05f58095..37715edd 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,205 @@
 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
+0,0,2050,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,0,2055,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.05110000000
+0,0,2055,CO2f,all-year,all-week,night,R1,gasCCGT,2020,4.68540000000
+0,1,2050,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,1,2055,electricity,all-year,all-week,night,R1,gasCCGT,2025,0.07840000000
+0,1,2055,CO2f,all-year,all-week,night,R1,gasCCGT,2025,7.19100000000
+0,2,2050,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,2,2055,electricity,all-year,all-week,night,R1,gasCCGT,2030,0.05370000000
+0,2,2055,CO2f,all-year,all-week,night,R1,gasCCGT,2030,4.91960000000
+0,3,2050,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,3,2055,electricity,all-year,all-week,night,R1,gasCCGT,2035,0.04080000000
+0,3,2055,CO2f,all-year,all-week,night,R1,gasCCGT,2035,3.74420000000
+0,4,2050,electricity,all-year,all-week,night,R1,gasCCGT,2040,0.02670000000
+0,4,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2040,2.44450000000
+0,4,2055,electricity,all-year,all-week,night,R1,gasCCGT,2040,0.02670000000
+0,4,2055,CO2f,all-year,all-week,night,R1,gasCCGT,2040,2.44450000000
+0,5,2050,electricity,all-year,all-week,night,R1,gasCCGT,2045,0.03070000000
+0,5,2050,CO2f,all-year,all-week,night,R1,gasCCGT,2045,2.81530000000
+0,5,2055,electricity,all-year,all-week,night,R1,gasCCGT,2045,0.03070000000
+0,5,2055,CO2f,all-year,all-week,night,R1,gasCCGT,2045,2.81530000000
+0,7,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.12420000000
+0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.15300000000
+0,8,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.13710000000
+0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.19570000000
+0,9,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.17530000000
+0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.21020000000
+0,10,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.18840000000
+0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.23550000000
+0,11,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.21100000000
+0,12,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.20680000000
+1,0,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,0,2055,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.10220000000
+1,0,2055,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,9.37070000000
+1,1,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,1,2055,electricity,all-year,all-week,morning,R1,gasCCGT,2025,0.15690000000
+1,1,2055,CO2f,all-year,all-week,morning,R1,gasCCGT,2025,14.38200000000
+1,2,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,2,2055,electricity,all-year,all-week,morning,R1,gasCCGT,2030,0.10730000000
+1,2,2055,CO2f,all-year,all-week,morning,R1,gasCCGT,2030,9.83920000000
+1,3,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,3,2055,electricity,all-year,all-week,morning,R1,gasCCGT,2035,0.08170000000
+1,3,2055,CO2f,all-year,all-week,morning,R1,gasCCGT,2035,7.48840000000
+1,4,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2040,0.05330000000
+1,4,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2040,4.88910000000
+1,4,2055,electricity,all-year,all-week,morning,R1,gasCCGT,2040,0.05330000000
+1,4,2055,CO2f,all-year,all-week,morning,R1,gasCCGT,2040,4.88910000000
+1,5,2050,electricity,all-year,all-week,morning,R1,gasCCGT,2045,0.06140000000
+1,5,2050,CO2f,all-year,all-week,morning,R1,gasCCGT,2045,5.63060000000
+1,5,2055,electricity,all-year,all-week,morning,R1,gasCCGT,2045,0.06140000000
+1,5,2055,CO2f,all-year,all-week,morning,R1,gasCCGT,2045,5.63060000000
+1,7,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.16730000000
+1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.20600000000
+1,8,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.18460000000
+1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.26350000000
+1,9,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.23620000000
+1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.28310000000
+1,10,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.25370000000
+1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.31710000000
+1,11,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.28420000000
+1,12,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.27850000000
+2,0,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,0,2055,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.15330000000
+2,0,2055,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,14.05610000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,1,2055,electricity,all-year,all-week,afternoon,R1,gasCCGT,2025,0.23530000000
+2,1,2055,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2025,21.57300000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,2,2055,electricity,all-year,all-week,afternoon,R1,gasCCGT,2030,0.16100000000
+2,2,2055,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2030,14.75890000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,gasCCGT,2035,0.12250000000
+2,3,2055,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2035,11.23260000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2040,0.08000000000
+2,4,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2040,7.33360000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,gasCCGT,2040,0.08000000000
+2,4,2055,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2040,7.33360000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,gasCCGT,2045,0.09210000000
+2,5,2050,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2045,8.44590000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,gasCCGT,2045,0.09210000000
+2,5,2055,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2045,8.44590000000
+2,7,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.04810000000
+2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.05920000000
+2,8,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.05310000000
+2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.07580000000
+2,9,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.06790000000
+2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.08140000000
+2,10,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.07290000000
+2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.09120000000
+2,11,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.08170000000
+2,12,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.08010000000
+3,0,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,0,2055,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.10220000000
+3,0,2055,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,9.37070000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,1,2055,electricity,all-year,all-week,early-peak,R1,gasCCGT,2025,0.15690000000
+3,1,2055,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2025,14.38200000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,2,2055,electricity,all-year,all-week,early-peak,R1,gasCCGT,2030,0.10730000000
+3,2,2055,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2030,9.83920000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,gasCCGT,2035,0.08170000000
+3,3,2055,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2035,7.48840000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2040,0.05330000000
+3,4,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2040,4.88910000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,gasCCGT,2040,0.05330000000
+3,4,2055,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2040,4.88910000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,gasCCGT,2045,0.06140000000
+3,5,2050,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2045,5.63060000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,gasCCGT,2045,0.06140000000
+3,5,2055,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2045,5.63060000000
+3,7,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.16730000000
+3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.20600000000
+3,8,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.18460000000
+3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.26350000000
+3,9,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.23620000000
+3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.28310000000
+3,10,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.25370000000
+3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.31710000000
+3,11,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.28420000000
+3,12,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.27850000000
+4,0,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,0,2055,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.20440000000
+4,0,2055,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,18.74140000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,1,2055,electricity,all-year,all-week,late-peak,R1,gasCCGT,2025,0.31380000000
+4,1,2055,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2025,28.76400000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,2,2055,electricity,all-year,all-week,late-peak,R1,gasCCGT,2030,0.21470000000
+4,2,2055,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2030,19.67850000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,gasCCGT,2035,0.16340000000
+4,3,2055,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2035,14.97680000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2040,0.10670000000
+4,4,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2040,9.77810000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,gasCCGT,2040,0.10670000000
+4,4,2055,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2040,9.77810000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,gasCCGT,2045,0.12280000000
+4,5,2050,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2045,11.26120000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,gasCCGT,2045,0.12280000000
+4,5,2055,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2045,11.26120000000
+4,7,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.33460000000
+4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.41210000000
+4,8,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.36920000000
+4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.52710000000
+4,9,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.47230000000
+4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.56620000000
+4,10,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.50740000000
+4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.63430000000
+4,11,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.56840000000
+4,12,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.55690000000
+5,0,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,0,2055,electricity,all-year,all-week,evening,R1,gasCCGT,2020,0.25560000000
+5,0,2055,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,23.42680000000
+5,1,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,1,2055,electricity,all-year,all-week,evening,R1,gasCCGT,2025,0.39220000000
+5,1,2055,CO2f,all-year,all-week,evening,R1,gasCCGT,2025,35.95500000000
+5,2,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,2,2055,electricity,all-year,all-week,evening,R1,gasCCGT,2030,0.26830000000
+5,2,2055,CO2f,all-year,all-week,evening,R1,gasCCGT,2030,24.59810000000
+5,3,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,3,2055,electricity,all-year,all-week,evening,R1,gasCCGT,2035,0.20420000000
+5,3,2055,CO2f,all-year,all-week,evening,R1,gasCCGT,2035,18.72110000000
+5,4,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2040,0.13330000000
+5,4,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2040,12.22270000000
+5,4,2055,electricity,all-year,all-week,evening,R1,gasCCGT,2040,0.13330000000
+5,4,2055,CO2f,all-year,all-week,evening,R1,gasCCGT,2040,12.22270000000
+5,5,2050,electricity,all-year,all-week,evening,R1,gasCCGT,2045,0.15360000000
+5,5,2050,CO2f,all-year,all-week,evening,R1,gasCCGT,2045,14.07640000000
+5,5,2055,electricity,all-year,all-week,evening,R1,gasCCGT,2045,0.15360000000
+5,5,2055,CO2f,all-year,all-week,evening,R1,gasCCGT,2045,14.07640000000
+5,7,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.13420000000
+5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.16530000000
+5,8,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.14820000000
+5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.21150000000
+5,9,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.18950000000
+5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.22720000000
+5,10,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.20360000000
+5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.25450000000
+5,11,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.22810000000
+5,12,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.22350000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
index 5662e13e..65735a0f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-max-service.ipynb
@@ -68,7 +68,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.4"
   },
   "vscode": {
    "interpreter": {
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
index 69d35dba..fb9ead46 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
@@ -121,7 +121,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.12.4"
   },
   "vscode": {
    "interpreter": {
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index a1c2ab1e..a84f6cfe 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -523,27 +523,37 @@ def demand_limitting_capacity(
         demand_, assets, search_space, market, technologies, year=year
     )
 
-    # We need to find the most demanding timeslice and use as the demand constraint
-    b = (
-        demand_constraint.b.max("timeslice")
-        if "timeslice" in demand_constraint.b.dims
-        else demand_constraint.b
-    )
-
-    # Now we need to find the maximum capacity constraint (as the capacity here is
-    # negative), and switch the sign to make it positive. In practice, we want to
-    # capture the utilisation factor of the technologies.
-    capacity = (
-        -capacity_constraint.capacity.max("timeslice")
-        if "timeslice" in capacity_constraint.capacity.dims
-        else -capacity_constraint.capacity
-    )
+    # We are interested in the demand of the demand constraint and the capacity of the
+    # capacity constraint.
+    b = demand_constraint.b
+    capacity = -capacity_constraint.capacity
 
     # Drop 'year' so there's no conflict with the 'year' in the capacity constraint
     if "year" in b.coords and "year" in capacity.coords:
         b = b.drop_vars("year")
 
-    # This constraint is independent on the production
+    # If there are timeslices, we need to find the one where more capacity is needed to
+    # meet the demand which would be a combination of a high demand and a low
+    # utilization factor.
+    if "timeslice" in b.dims or "timeslice" in capacity.dims:
+        ratio = b / capacity
+        ts = ratio.timeslice.isel(
+            timeslice=ratio.min("replacement").argmax("timeslice")
+        )
+        # We select this timeslice for each array - don't trust the indices:
+        # search for the right timeslice in the array and select it.
+        b = (
+            b.isel(timeslice=(b.timeslice == ts).argmax("timeslice"))
+            if "timeslice" in b.dims
+            else b
+        )
+        capacity = (
+            capacity.isel(timeslice=(capacity.timeslice == ts).argmax("timeslice"))
+            if "timeslice" in capacity.dims
+            else capacity
+        )
+
+    # This constraint is independent of the production
     production = 0
 
     return xr.Dataset(

From 52e145b676170783f8396691059bedee7532b0fc Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 13:54:34 +0100
Subject: [PATCH 343/419] Helper function for dropping timeslice

---
 src/muse/agents/agent.py          |  4 ++-
 src/muse/constraints.py           |  5 ++--
 src/muse/demand_matching.py       |  4 ++-
 src/muse/examples.py              | 13 ++++-----
 src/muse/investments.py           |  6 +----
 src/muse/mca.py                   | 45 +++++++++++++++----------------
 src/muse/objectives.py            |  3 ++-
 src/muse/outputs/mca.py           | 10 +++----
 src/muse/sectors/preset_sector.py | 19 +++++++------
 src/muse/sectors/subsector.py     |  7 ++---
 src/muse/timeslices.py            |  7 +++++
 11 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 8146711b..be7aac7c 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -6,6 +6,8 @@
 
 import xarray as xr
 
+from muse.timeslices import drop_timeslice
+
 
 class AbstractAgent(ABC):
     """Base class for all agents."""
@@ -416,7 +418,7 @@ def next(
             return None
 
         if "timeslice" in search.dims:
-            search["demand"] = demand.drop_vars(["timeslice", "month", "day", "hour"])
+            search["demand"] = drop_timeslice(demand)
         else:
             search["demand"] = demand
         not_assets = [u for u in search.demand.dims if u != "asset"]
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index ed6504fb..8129fe57 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -115,6 +115,7 @@ def constraints(
 from mypy_extensions import KwArg
 
 from muse.registration import registrator
+from muse.timeslices import drop_timeslice
 
 CAPACITY_DIMS = "asset", "replacement", "region"
 """Default dimensions for capacity decision variables."""
@@ -622,7 +623,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 = drop_timeslice(production)
             production[dim] = pd.Index(production.get_index(dim), tupleize_cols=False)
 
     return xr.Dataset(dict(capacity=costs, production=production))
@@ -689,7 +690,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 = drop_timeslice(constraint)
             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})
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index 0a9c94d5..9640bc74 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -51,6 +51,8 @@
 import pandas as pd
 from xarray import DataArray
 
+from muse.timeslices import drop_timeslice
+
 
 def demand_matching(
     demand: DataArray,
@@ -248,7 +250,7 @@ def demand_matching(
 
     if len(multics) > 0:
         for k in multics:
-            ds = ds.drop_vars(["timeslice", "month", "day", "hour"])
+            ds = drop_timeslice(ds)
             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 a888763f..65106bda 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -34,6 +34,7 @@
 
 from muse.mca import MCA
 from muse.sectors import AbstractSector
+from muse.timeslices import drop_timeslice
 
 __all__ = ["model", "technodata"]
 
@@ -192,12 +193,8 @@ def mca_market(model: str = "default") -> xr.Dataset:
             .sel(region=settings.regions)
             .interp(year=settings.time_framework, method=settings.interpolation_mode)
         )
-        market["supply"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
-        market["consumption"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["supply"] = drop_timeslice(zeros_like(market.exports))
+        market["consumption"] = drop_timeslice(zeros_like(market.exports))
 
         return cast(xr.Dataset, market)
 
@@ -263,12 +260,12 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset:
         market = market.rename(dst_region="region")
     if market.region.dims:
         consump = consumption(loaded_sector.technologies, production)
-        market["consumption"] = (
+        market["consumption"] = drop_timeslice(
             consump.groupby("region").sum(
                 {"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/investments.py b/src/muse/investments.py
index d6ed8248..9c40ef19 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -310,11 +310,7 @@ def scipy_match_demand(
 
     from muse.constraints import ScipyAdapter
 
-    df_technologies = (
-        technologies.to_dataframe()
-        .drop(["month", "day", "hour"], axis=1, errors="ignore")
-        .reset_index()
-    )
+    df_technologies = technologies.to_dataframe()
 
     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 ac7a27e2..c09489ae 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -14,6 +14,7 @@
 from muse.outputs.cache import OutputCache
 from muse.readers import read_initial_market
 from muse.sectors import SECTORS_REGISTERED, AbstractSector
+from muse.timeslices import drop_timeslice
 
 
 class MCA:
@@ -59,12 +60,8 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA:
             ).sel(region=settings.regions)
         ).interp(year=settings.time_framework, method=settings.interpolation_mode)
 
-        market["supply"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
-        market["consumption"] = zeros_like(market.exports).drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["supply"] = drop_timeslice(zeros_like(market.exports))
+        market["consumption"] = drop_timeslice(zeros_like(market.exports))
 
         # We create the sectors
         sectors = []
@@ -461,9 +458,7 @@ 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().drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["updated_prices"] = drop_timeslice(market.prices.copy())
 
     # eventually, the first market should be one that creates the initial demand
     for sector in sectors:
@@ -551,16 +546,12 @@ def find_equilibrium(
     else:
         included = ones(len(market.commodity), dtype=bool)
 
-    market["updated_prices"] = market.prices.copy().drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["updated_prices"] = drop_timeslice(market.prices.copy())
     prior_market = market.copy(deep=True)
     converged = False
     equilibrium_sectors = sectors
     for i in range(maxiter):
-        market["prices"] = market.updated_prices.drop_vars(
-            ["timeslice", "month", "day", "hour"]
-        )
+        market["prices"] = drop_timeslice(market.updated_prices)
         prior_market, market = market, prior_market
         market.consumption[:] = 0.0
         market.supply[:] = 0.0
@@ -582,9 +573,11 @@ def find_equilibrium(
             new_price.loc[dict(commodity=included)] = market.updated_prices.sel(
                 commodity=included, year=market.year[1]
             )
-            market["prices"] = future_propagation(  # type: ignore
-                market["prices"], new_price
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            market["prices"] = drop_timeslice(
+                future_propagation(  # type: ignore
+                    market["prices"], new_price
+                )
+            )
 
             break
 
@@ -599,9 +592,11 @@ def find_equilibrium(
                     dict(year=market.year[1], commodity=included)
                 ]
             )
-            market["prices"] = future_propagation(  # type: ignore
-                market["prices"], new_price
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            market["prices"] = drop_timeslice(
+                future_propagation(  # type: ignore
+                    market["prices"], new_price
+                )
+            )
         if not equilibrium:
             equilibrium_reached = True
             converged = True
@@ -626,9 +621,11 @@ def find_equilibrium(
             0.2
             * market.updated_prices.loc[dict(year=market.year[1], commodity=included)]
         )
-        market["prices"] = future_propagation(  # type: ignore
-            market["prices"], new_price
-        ).drop_vars(["timeslice", "month", "day", "hour"])
+        market["prices"] = drop_timeslice(
+            future_propagation(  # type: ignore
+                market["prices"], new_price
+            )
+        )
         getLogger(__name__).critical(msg)
 
     return FindEquilibriumResults(
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index 87af8f9a..998437fd 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -81,6 +81,7 @@ def comfort(
 from muse.agents import Agent
 from muse.outputs.cache import cache_quantity
 from muse.registration import registrator
+from muse.timeslices import drop_timeslice
 
 OBJECTIVE_SIGNATURE = Callable[
     [Agent, xr.DataArray, xr.DataArray, xr.Dataset, xr.Dataset, KwArg(Any)],
@@ -142,7 +143,7 @@ def objectives(
         for name, objective in functions:
             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"])
+                obj = drop_timeslice(obj)
             result[name] = obj
         return result
 
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index c93480bf..1c016651 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -34,7 +34,7 @@ def quantity(
 
 from muse.registration import registrator
 from muse.sectors import AbstractSector
-from muse.timeslices import QuantityType, convert_timeslice
+from muse.timeslices import QuantityType, convert_timeslice, drop_timeslice
 
 OUTPUT_QUANTITY_SIGNATURE = Callable[
     [xr.Dataset, list[AbstractSector], KwArg(Any)], Union[xr.DataArray, pd.DataFrame]
@@ -362,9 +362,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"] = drop_timeslice(
                 agent_market.consumption * a.quantity
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            )
             included = [
                 i
                 for i in agent_market["commodity"].values
@@ -607,9 +607,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"] = drop_timeslice(
                 agent_market.consumption * a.quantity
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            )
             included = [
                 i
                 for i in agent_market["commodity"].values
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index 2bdbbdec..8028d8d5 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -7,6 +7,7 @@
 from xarray import DataArray, Dataset
 
 from muse.sectors.register import AbstractSector, register_sector
+from muse.timeslices import drop_timeslice
 
 
 @register_sector(name=("preset", "presets"))
@@ -77,15 +78,15 @@ def factory(cls, name: str, settings: Any) -> PresetSector:
                 assert consumption.region.isin(shares.region).all()
                 if "timeslice" in shares.dims:
                     ts = shares.timeslice
-                    shares = shares.drop_vars(["timeslice", "month", "day", "hour"])
+                    shares = drop_timeslice(shares)
                     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)
+            presets["consumption"] = drop_timeslice(consumption).assign_coords(
+                timeslice=timeslice
+            )
 
         if getattr(sector_conf, "supply_path", None) is not None:
             supply = read_csv_outputs(sector_conf.supply_path)
@@ -115,9 +116,7 @@ def factory(cls, name: str, 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()]).drop_vars(
-                    ["timeslice", "month", "day", "hour"]
-                )
+                presets[component] = drop_timeslice(zeros_like(presets[others.pop()]))
         # add timeslice, if missing
         for component in {"supply", "consumption"}:
             if "timeslice" not in presets[component].dims:
@@ -166,9 +165,9 @@ def next(self, mca_market: Dataset) -> Dataset:
             mca_market.timeslice,
             QuantityType.EXTENSIVE,
         )
-        result["costs"] = convert_timeslice(
-            costs, mca_market.timeslice, QuantityType.INTENSIVE
-        ).drop_vars(["timeslice", "month", "day", "hour"])
+        result["costs"] = drop_timeslice(
+            convert_timeslice(costs, mca_market.timeslice, QuantityType.INTENSIVE)
+        )
         assert isinstance(result, Dataset)
         return result
 
diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py
index 846b379f..c6d35ef0 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -11,6 +11,7 @@
 import xarray as xr
 
 from muse.agents import Agent
+from muse.timeslices import drop_timeslice
 
 
 class Subsector:
@@ -57,9 +58,9 @@ def invest(
             current_year = market.year.min()
         if self.expand_market_prices:
             market = market.copy()
-            market["prices"] = np.maximum(
-                market.prices, market.prices.rename(region="dst_region")
-            ).drop_vars(["timeslice", "month", "day", "hour"])
+            market["prices"] = drop_timeslice(
+                np.maximum(market.prices, market.prices.rename(region="dst_region"))
+            )
 
         for agent in self.agents:
             agent.asset_housekeeping()
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 8f3e791c..350ea5cf 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -596,4 +596,11 @@ def represent_hours(
     return convert_timeslice(DataArray([nhours]), timeslices).squeeze()
 
 
+def drop_timeslice(data):
+    if "timeslice" not in data.dims:
+        return data
+
+    return data.drop_vars([c for c in data.timeslice.indexes])
+
+
 setup_module(DEFAULT_TIMESLICE_DESCRIPTION)

From d8a84bf36770cc85a8fd745a5928d490f6ba971c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 14:04:45 +0100
Subject: [PATCH 344/419] More usage of the helper

---
 tests/test_constraints.py  |  5 ++---
 tests/test_demand_share.py |  7 ++++---
 tests/test_mca.py          | 20 +++++---------------
 tests/test_quantities.py   | 19 ++++++-------------
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index e88149ed..60a3a269 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -3,6 +3,7 @@
 import numpy as np
 import pandas as pd
 import xarray as xr
+from muse.timeslices import drop_timeslice
 from pytest import approx, fixture
 
 
@@ -410,9 +411,7 @@ def _as_list(data: Union[xr.DataArray, xr.Dataset]) -> Union[xr.DataArray, xr.Da
             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
-        )
+        data = drop_timeslice(data).assign_coords(mindex_coords)
     return data
 
 
diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py
index 6e835f7a..9b69cdef 100644
--- a/tests/test_demand_share.py
+++ b/tests/test_demand_share.py
@@ -1,4 +1,5 @@
 import xarray as xr
+from muse.timeslices import drop_timeslice
 from pytest import approx, fixture, raises
 
 
@@ -25,9 +26,9 @@ def _matching_market(technologies, stock, timeslice):
         QuantityType.EXTENSIVE,
     )
     market["supply"] = production.sum("asset")
-    market["consumption"] = (
-        consumption(technologies, production).sum("asset") + market.supply
-    ).drop_vars(["timeslice", "month", "day", "hour"])
+    market["consumption"] = consumption(technologies, production).sum(
+        "asset"
+    ) + drop_timeslice(market.supply)
     market["prices"] = market.supply.dims, random(market.supply.shape)
 
     return market
diff --git a/tests/test_mca.py b/tests/test_mca.py
index ee07782b..8db98378 100644
--- a/tests/test_mca.py
+++ b/tests/test_mca.py
@@ -1,6 +1,7 @@
 from collections.abc import Sequence
 
 from muse.commodities import CommodityUsage
+from muse.timeslices import drop_timeslice
 from xarray import Dataset
 
 
@@ -16,20 +17,14 @@ def test_check_equilibrium(market: Dataset):
     new_market = market.copy(deep=True)
 
     assert check_equilibrium(new_market, market, tol, equilibrium_variable)
-    new_market["supply"] = (
-        new_market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
-        + tol * 1.5
-    )
+    new_market["supply"] = drop_timeslice(new_market["supply"]) + 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"] = (
-        new_market["prices"].drop_vars(["timeslice", "month", "day", "hour"])
-        + tol * 1.5
-    )
+    new_market["prices"] = drop_timeslice(new_market["prices"]) + tol * 1.5
     assert not check_equilibrium(new_market, market, tol, equilibrium_variable)
 
 
@@ -39,17 +34,12 @@ def test_check_demand_fulfillment(market):
 
     tolerance_unmet_demand = -0.1
 
-    market["supply"] = market.consumption.copy(deep=True).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["supply"] = drop_timeslice(market.consumption.copy(deep=True))
     assert check_demand_fulfillment(
         market,
         tolerance_unmet_demand,
     )
-    market["supply"] = (
-        market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
-        + tolerance_unmet_demand * 1.5
-    )
+    market["supply"] = drop_timeslice(market["supply"]) + 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 74439b1b..686a2c14 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -2,6 +2,7 @@
 
 import numpy as np
 import xarray as xr
+from muse.timeslices import drop_timeslice
 from pytest import approx, fixture
 
 
@@ -460,7 +461,7 @@ def test_costed_production_exact_match(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = maxdemand.drop_vars(["timeslice", "month", "day", "hour"])
+    market["consumption"] = drop_timeslice(maxdemand)
     result = costed_production(market.consumption, costs, capacity, technologies)
     assert isinstance(result, xr.DataArray)
     actual = xr.Dataset(dict(r=result)).groupby("region").sum("asset").r
@@ -487,9 +488,7 @@ def test_costed_production_single_region(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (0.9 * maxdemand).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = drop_timeslice(0.9 * maxdemand)
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -522,9 +521,7 @@ def test_costed_production_single_year(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (0.9 * maxdemand).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = drop_timeslice(0.9 * maxdemand)
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -560,9 +557,7 @@ def test_costed_production_over_capacity(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = (maxdemand * 0.9).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = drop_timeslice(maxdemand * 0.9)
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -598,9 +593,7 @@ 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).drop_vars(
-        ["timeslice", "month", "day", "hour"]
-    )
+    market["consumption"] = drop_timeslice(maxdemand * 0.9)
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata

From f94cdfcfbfe5e163da293279ffbc7c0f4c813896 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 14:15:59 +0100
Subject: [PATCH 345/419] Add docstring

---
 src/muse/timeslices.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 350ea5cf..31a3ac4f 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -596,7 +596,11 @@ def represent_hours(
     return convert_timeslice(DataArray([nhours]), timeslices).squeeze()
 
 
-def drop_timeslice(data):
+def drop_timeslice(data: DataArray):
+    """Drop the timeslice variable from a DataArray.
+
+    If the array doesn't contain the timeslice variable, return the input unchanged.
+    """
     if "timeslice" not in data.dims:
         return data
 

From 3c26c0312c0cc42ba5793ad2e659b13658df47bc Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 14:28:14 +0100
Subject: [PATCH 346/419] Delete old results files

---
 .../Results/Gas/Capacity/2025.csv             |  19 ---
 .../Results/Gas/Capacity/2035.csv             |  33 -----
 .../Results/Gas/Capacity/2045.csv             |  45 -------
 .../Results/Gas/Capacity/2050.csv             |  45 -------
 .../Results/Power/Capacity/2025.csv           |  37 ------
 .../Results/Power/Capacity/2035.csv           |  67 ----------
 .../Results/Power/Capacity/2045.csv           | 125 ------------------
 .../Results/Power/Capacity/2050.csv           | 125 ------------------
 .../Results/Residential/Capacity/2025.csv     |  19 ---
 .../Results/Residential/Capacity/2035.csv     |  35 -----
 .../Results/Residential/Capacity/2045.csv     |  51 -------
 .../Results/Residential/Capacity/2050.csv     |  59 ---------
 .../Results/Residential/Supply/2025.csv       | 121 -----------------
 .../Results/Residential/Supply/2035.csv       |  97 --------------
 .../Results/Residential/Supply/2045.csv       |  97 --------------
 .../Results/Residential/Supply/2050.csv       |  97 --------------
 16 files changed, 1072 deletions(-)
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
 delete mode 100644 docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv

diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
deleted file mode 100644
index 71e5a914..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2025.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2030,R2,gassupply1,2025,2.33440000000
-3,2035,R2,gassupply1,2025,2.33440000000
-3,2040,R2,gassupply1,2025,2.33440000000
-3,2045,R2,gassupply1,2025,2.33440000000
-3,2050,R2,gassupply1,2025,2.33440000000
-3,2064,R2,gassupply1,2025,2.33440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
deleted file mode 100644
index 00107563..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2035.csv
+++ /dev/null
@@ -1,33 +0,0 @@
-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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
-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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.33440000000
-4,2035,R2,gassupply1,2025,2.33440000000
-4,2040,R2,gassupply1,2025,2.33440000000
-4,2045,R2,gassupply1,2025,2.33440000000
-4,2050,R2,gassupply1,2025,2.33440000000
-4,2064,R2,gassupply1,2025,2.33440000000
-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/2-modify-time-framework/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
deleted file mode 100644
index a585b562..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2045.csv
+++ /dev/null
@@ -1,45 +0,0 @@
-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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
-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,2050,R1,gassupply1,2045,1.02060000000
-3,2064,R1,gassupply1,2045,1.02060000000
-3,2065,R1,gassupply1,2045,1.02060000000
-3,2069,R1,gassupply1,2045,1.02060000000
-3,2070,R1,gassupply1,2045,1.02060000000
-3,2084,R1,gassupply1,2045,1.02060000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,2.33440000000
-5,2035,R2,gassupply1,2025,2.33440000000
-5,2040,R2,gassupply1,2025,2.33440000000
-5,2045,R2,gassupply1,2025,2.33440000000
-5,2050,R2,gassupply1,2025,2.33440000000
-5,2064,R2,gassupply1,2025,2.33440000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,1.02060000000
-7,2064,R2,gassupply1,2045,1.02060000000
-7,2065,R2,gassupply1,2045,1.02060000000
-7,2069,R2,gassupply1,2045,1.02060000000
-7,2070,R2,gassupply1,2045,1.02060000000
-7,2084,R2,gassupply1,2045,1.02060000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
deleted file mode 100644
index a585b562..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2050.csv
+++ /dev/null
@@ -1,45 +0,0 @@
-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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
-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,2050,R1,gassupply1,2045,1.02060000000
-3,2064,R1,gassupply1,2045,1.02060000000
-3,2065,R1,gassupply1,2045,1.02060000000
-3,2069,R1,gassupply1,2045,1.02060000000
-3,2070,R1,gassupply1,2045,1.02060000000
-3,2084,R1,gassupply1,2045,1.02060000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,2.33440000000
-5,2035,R2,gassupply1,2025,2.33440000000
-5,2040,R2,gassupply1,2025,2.33440000000
-5,2045,R2,gassupply1,2025,2.33440000000
-5,2050,R2,gassupply1,2025,2.33440000000
-5,2064,R2,gassupply1,2025,2.33440000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,1.02060000000
-7,2064,R2,gassupply1,2045,1.02060000000
-7,2065,R2,gassupply1,2045,1.02060000000
-7,2069,R2,gassupply1,2045,1.02060000000
-7,2070,R2,gassupply1,2045,1.02060000000
-7,2084,R2,gassupply1,2045,1.02060000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
deleted file mode 100644
index fedff132..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2025.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2025,R1,windturbine,2020,10.00000000000
-3,2030,R1,windturbine,2020,10.00000000000
-3,2035,R1,windturbine,2020,10.00000000000
-3,2040,R1,windturbine,2020,10.00000000000
-3,2045,R1,windturbine,2020,10.00000000000
-3,2049,R1,windturbine,2020,10.00000000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
-5,2030,R2,gasCCGT,2025,5.88890000000
-5,2035,R2,gasCCGT,2025,5.88890000000
-5,2040,R2,gasCCGT,2025,5.88890000000
-5,2045,R2,gasCCGT,2025,5.88890000000
-5,2049,R2,gasCCGT,2025,5.88890000000
-5,2050,R2,gasCCGT,2025,5.88890000000
-5,2064,R2,gasCCGT,2025,5.88890000000
-6,2025,R2,windturbine,2020,16.75000000000
-6,2030,R2,windturbine,2020,16.75000000000
-6,2035,R2,windturbine,2020,16.75000000000
-6,2040,R2,windturbine,2020,16.75000000000
-6,2045,R2,windturbine,2020,16.75000000000
-6,2049,R2,windturbine,2020,16.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
deleted file mode 100644
index 7f59af05..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2035.csv
+++ /dev/null
@@ -1,67 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-5,2025,R1,windturbine,2020,10.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
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,gasCCGT,2025,5.88890000000
-7,2035,R2,gasCCGT,2025,5.88890000000
-7,2040,R2,gasCCGT,2025,5.88890000000
-7,2045,R2,gasCCGT,2025,5.88890000000
-7,2049,R2,gasCCGT,2025,5.88890000000
-7,2050,R2,gasCCGT,2025,5.88890000000
-7,2059,R2,gasCCGT,2025,5.88890000000
-7,2060,R2,gasCCGT,2025,5.88890000000
-7,2064,R2,gasCCGT,2025,5.88890000000
-8,2035,R2,solarPV,2030,6.00000000000
-8,2040,R2,solarPV,2030,6.00000000000
-8,2045,R2,solarPV,2030,6.00000000000
-8,2049,R2,solarPV,2030,6.00000000000
-8,2050,R2,solarPV,2030,6.00000000000
-8,2059,R2,solarPV,2030,6.00000000000
-9,2040,R2,solarPV,2035,6.00000000000
-9,2045,R2,solarPV,2035,6.00000000000
-9,2049,R2,solarPV,2035,6.00000000000
-9,2050,R2,solarPV,2035,6.00000000000
-9,2059,R2,solarPV,2035,6.00000000000
-9,2060,R2,solarPV,2035,6.00000000000
-9,2064,R2,solarPV,2035,6.00000000000
-10,2025,R2,windturbine,2020,16.75000000000
-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
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
deleted file mode 100644
index 3d9c3de1..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2045.csv
+++ /dev/null
@@ -1,125 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2050,R1,gasCCGT,2045,1.22220000000
-2,2059,R1,gasCCGT,2045,1.22220000000
-2,2060,R1,gasCCGT,2045,1.22220000000
-2,2064,R1,gasCCGT,2045,1.22220000000
-2,2065,R1,gasCCGT,2045,1.22220000000
-2,2069,R1,gasCCGT,2045,1.22220000000
-2,2070,R1,gasCCGT,2045,1.22220000000
-2,2074,R1,gasCCGT,2045,1.22220000000
-2,2075,R1,gasCCGT,2045,1.22220000000
-2,2084,R1,gasCCGT,2045,1.22220000000
-3,2025,R1,solarPV,2020,6.75000000000
-3,2030,R1,solarPV,2020,6.75000000000
-3,2035,R1,solarPV,2020,6.75000000000
-3,2040,R1,solarPV,2020,6.75000000000
-3,2045,R1,solarPV,2020,6.75000000000
-3,2049,R1,solarPV,2020,6.75000000000
-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,2059,R1,solarPV,2030,6.00000000000
-5,2040,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2035,6.00000000000
-5,2049,R1,solarPV,2035,6.00000000000
-5,2050,R1,solarPV,2035,6.00000000000
-5,2059,R1,solarPV,2035,6.00000000000
-5,2060,R1,solarPV,2035,6.00000000000
-5,2064,R1,solarPV,2035,6.00000000000
-6,2045,R1,solarPV,2040,6.00000000000
-6,2049,R1,solarPV,2040,6.00000000000
-6,2050,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,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,5.88890000000
-11,2035,R2,gasCCGT,2025,5.88890000000
-11,2040,R2,gasCCGT,2025,5.88890000000
-11,2045,R2,gasCCGT,2025,5.88890000000
-11,2049,R2,gasCCGT,2025,5.88890000000
-11,2050,R2,gasCCGT,2025,5.88890000000
-11,2059,R2,gasCCGT,2025,5.88890000000
-11,2060,R2,gasCCGT,2025,5.88890000000
-11,2064,R2,gasCCGT,2025,5.88890000000
-12,2035,R2,solarPV,2030,6.00000000000
-12,2040,R2,solarPV,2030,6.00000000000
-12,2045,R2,solarPV,2030,6.00000000000
-12,2049,R2,solarPV,2030,6.00000000000
-12,2050,R2,solarPV,2030,6.00000000000
-12,2059,R2,solarPV,2030,6.00000000000
-13,2040,R2,solarPV,2035,6.00000000000
-13,2045,R2,solarPV,2035,6.00000000000
-13,2049,R2,solarPV,2035,6.00000000000
-13,2050,R2,solarPV,2035,6.00000000000
-13,2059,R2,solarPV,2035,6.00000000000
-13,2060,R2,solarPV,2035,6.00000000000
-13,2064,R2,solarPV,2035,6.00000000000
-14,2045,R2,solarPV,2040,6.00000000000
-14,2049,R2,solarPV,2040,6.00000000000
-14,2050,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,10.00000000000
-15,2059,R2,solarPV,2045,10.00000000000
-15,2060,R2,solarPV,2045,10.00000000000
-15,2064,R2,solarPV,2045,10.00000000000
-15,2065,R2,solarPV,2045,10.00000000000
-15,2069,R2,solarPV,2045,10.00000000000
-15,2070,R2,solarPV,2045,10.00000000000
-15,2074,R2,solarPV,2045,10.00000000000
-16,2025,R2,windturbine,2020,16.75000000000
-16,2030,R2,windturbine,2020,16.75000000000
-16,2035,R2,windturbine,2020,16.75000000000
-16,2040,R2,windturbine,2020,16.75000000000
-16,2045,R2,windturbine,2020,16.75000000000
-16,2049,R2,windturbine,2020,16.75000000000
-17,2050,R2,windturbine,2045,12.75000000000
-17,2059,R2,windturbine,2045,12.75000000000
-17,2060,R2,windturbine,2045,12.75000000000
-17,2064,R2,windturbine,2045,12.75000000000
-17,2065,R2,windturbine,2045,12.75000000000
-17,2069,R2,windturbine,2045,12.75000000000
-17,2070,R2,windturbine,2045,12.75000000000
-17,2074,R2,windturbine,2045,12.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
deleted file mode 100644
index 3d9c3de1..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2050.csv
+++ /dev/null
@@ -1,125 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,5.88890000000
-1,2035,R1,gasCCGT,2025,5.88890000000
-1,2040,R1,gasCCGT,2025,5.88890000000
-1,2045,R1,gasCCGT,2025,5.88890000000
-1,2049,R1,gasCCGT,2025,5.88890000000
-1,2050,R1,gasCCGT,2025,5.88890000000
-1,2059,R1,gasCCGT,2025,5.88890000000
-1,2060,R1,gasCCGT,2025,5.88890000000
-1,2064,R1,gasCCGT,2025,5.88890000000
-2,2050,R1,gasCCGT,2045,1.22220000000
-2,2059,R1,gasCCGT,2045,1.22220000000
-2,2060,R1,gasCCGT,2045,1.22220000000
-2,2064,R1,gasCCGT,2045,1.22220000000
-2,2065,R1,gasCCGT,2045,1.22220000000
-2,2069,R1,gasCCGT,2045,1.22220000000
-2,2070,R1,gasCCGT,2045,1.22220000000
-2,2074,R1,gasCCGT,2045,1.22220000000
-2,2075,R1,gasCCGT,2045,1.22220000000
-2,2084,R1,gasCCGT,2045,1.22220000000
-3,2025,R1,solarPV,2020,6.75000000000
-3,2030,R1,solarPV,2020,6.75000000000
-3,2035,R1,solarPV,2020,6.75000000000
-3,2040,R1,solarPV,2020,6.75000000000
-3,2045,R1,solarPV,2020,6.75000000000
-3,2049,R1,solarPV,2020,6.75000000000
-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,2059,R1,solarPV,2030,6.00000000000
-5,2040,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2035,6.00000000000
-5,2049,R1,solarPV,2035,6.00000000000
-5,2050,R1,solarPV,2035,6.00000000000
-5,2059,R1,solarPV,2035,6.00000000000
-5,2060,R1,solarPV,2035,6.00000000000
-5,2064,R1,solarPV,2035,6.00000000000
-6,2045,R1,solarPV,2040,6.00000000000
-6,2049,R1,solarPV,2040,6.00000000000
-6,2050,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,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,5.88890000000
-11,2035,R2,gasCCGT,2025,5.88890000000
-11,2040,R2,gasCCGT,2025,5.88890000000
-11,2045,R2,gasCCGT,2025,5.88890000000
-11,2049,R2,gasCCGT,2025,5.88890000000
-11,2050,R2,gasCCGT,2025,5.88890000000
-11,2059,R2,gasCCGT,2025,5.88890000000
-11,2060,R2,gasCCGT,2025,5.88890000000
-11,2064,R2,gasCCGT,2025,5.88890000000
-12,2035,R2,solarPV,2030,6.00000000000
-12,2040,R2,solarPV,2030,6.00000000000
-12,2045,R2,solarPV,2030,6.00000000000
-12,2049,R2,solarPV,2030,6.00000000000
-12,2050,R2,solarPV,2030,6.00000000000
-12,2059,R2,solarPV,2030,6.00000000000
-13,2040,R2,solarPV,2035,6.00000000000
-13,2045,R2,solarPV,2035,6.00000000000
-13,2049,R2,solarPV,2035,6.00000000000
-13,2050,R2,solarPV,2035,6.00000000000
-13,2059,R2,solarPV,2035,6.00000000000
-13,2060,R2,solarPV,2035,6.00000000000
-13,2064,R2,solarPV,2035,6.00000000000
-14,2045,R2,solarPV,2040,6.00000000000
-14,2049,R2,solarPV,2040,6.00000000000
-14,2050,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,10.00000000000
-15,2059,R2,solarPV,2045,10.00000000000
-15,2060,R2,solarPV,2045,10.00000000000
-15,2064,R2,solarPV,2045,10.00000000000
-15,2065,R2,solarPV,2045,10.00000000000
-15,2069,R2,solarPV,2045,10.00000000000
-15,2070,R2,solarPV,2045,10.00000000000
-15,2074,R2,solarPV,2045,10.00000000000
-16,2025,R2,windturbine,2020,16.75000000000
-16,2030,R2,windturbine,2020,16.75000000000
-16,2035,R2,windturbine,2020,16.75000000000
-16,2040,R2,windturbine,2020,16.75000000000
-16,2045,R2,windturbine,2020,16.75000000000
-16,2049,R2,windturbine,2020,16.75000000000
-17,2050,R2,windturbine,2045,12.75000000000
-17,2059,R2,windturbine,2045,12.75000000000
-17,2060,R2,windturbine,2045,12.75000000000
-17,2064,R2,windturbine,2045,12.75000000000
-17,2065,R2,windturbine,2045,12.75000000000
-17,2069,R2,windturbine,2045,12.75000000000
-17,2070,R2,windturbine,2045,12.75000000000
-17,2074,R2,windturbine,2045,12.75000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
deleted file mode 100644
index 570b873b..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2025.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2020,R2,gasboiler,2020,10
-3,2025,R2,gasboiler,2020,5
-4,2025,R2,heatpump,2020,19
-4,2030,R2,heatpump,2020,19
-4,2034,R2,heatpump,2020,19
-5,2030,R2,heatpump,2025,10
-5,2034,R2,heatpump,2025,10
-5,2035,R2,heatpump,2025,10
-5,2039,R2,heatpump,2025,10
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
deleted file mode 100644
index 88b92f80..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2035.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2020,R2,gasboiler,2020,10
-5,2025,R2,gasboiler,2020,5
-6,2025,R2,heatpump,2020,19
-6,2030,R2,heatpump,2020,19
-6,2034,R2,heatpump,2020,19
-7,2030,R2,heatpump,2025,10
-7,2034,R2,heatpump,2025,10
-7,2035,R2,heatpump,2025,10
-7,2039,R2,heatpump,2025,10
-8,2035,R2,heatpump,2030,26
-8,2039,R2,heatpump,2030,26
-8,2040,R2,heatpump,2030,26
-8,2044,R2,heatpump,2030,26
-9,2040,R2,heatpump,2035,16
-9,2044,R2,heatpump,2035,16
-9,2045,R2,heatpump,2035,16
-9,2049,R2,heatpump,2035,16
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
deleted file mode 100644
index b12e02b2..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2045.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2020,R2,gasboiler,2020,10
-7,2025,R2,gasboiler,2020,5
-8,2025,R2,heatpump,2020,19
-8,2030,R2,heatpump,2020,19
-8,2034,R2,heatpump,2020,19
-9,2030,R2,heatpump,2025,10
-9,2034,R2,heatpump,2025,10
-9,2035,R2,heatpump,2025,10
-9,2039,R2,heatpump,2025,10
-10,2035,R2,heatpump,2030,26
-10,2039,R2,heatpump,2030,26
-10,2040,R2,heatpump,2030,26
-10,2044,R2,heatpump,2030,26
-11,2040,R2,heatpump,2035,16
-11,2044,R2,heatpump,2035,16
-11,2045,R2,heatpump,2035,16
-11,2049,R2,heatpump,2035,16
-12,2045,R2,heatpump,2040,32
-12,2049,R2,heatpump,2040,32
-12,2050,R2,heatpump,2040,32
-12,2054,R2,heatpump,2040,32
-13,2050,R2,heatpump,2045,22
-13,2054,R2,heatpump,2045,22
-13,2055,R2,heatpump,2045,22
-13,2059,R2,heatpump,2045,22
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
deleted file mode 100644
index 59b8c0a4..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2050.csv
+++ /dev/null
@@ -1,59 +0,0 @@
-asset,year,region,technology,installed,capacity
-0,2020,R1,gasboiler,2020,10
-0,2025,R1,gasboiler,2020,5
-1,2025,R1,heatpump,2020,19
-1,2030,R1,heatpump,2020,19
-1,2034,R1,heatpump,2020,19
-2,2030,R1,heatpump,2025,10
-2,2034,R1,heatpump,2025,10
-2,2035,R1,heatpump,2025,10
-2,2039,R1,heatpump,2025,10
-3,2035,R1,heatpump,2030,26
-3,2039,R1,heatpump,2030,26
-3,2040,R1,heatpump,2030,26
-3,2044,R1,heatpump,2030,26
-4,2040,R1,heatpump,2035,16
-4,2044,R1,heatpump,2035,16
-4,2045,R1,heatpump,2035,16
-4,2049,R1,heatpump,2035,16
-5,2045,R1,heatpump,2040,32
-5,2049,R1,heatpump,2040,32
-5,2050,R1,heatpump,2040,32
-5,2054,R1,heatpump,2040,32
-6,2050,R1,heatpump,2045,22
-6,2054,R1,heatpump,2045,22
-6,2055,R1,heatpump,2045,22
-6,2059,R1,heatpump,2045,22
-7,2055,R1,heatpump,2050,32
-7,2059,R1,heatpump,2050,32
-7,2060,R1,heatpump,2050,32
-7,2064,R1,heatpump,2050,32
-8,2020,R2,gasboiler,2020,10
-8,2025,R2,gasboiler,2020,5
-9,2025,R2,heatpump,2020,19
-9,2030,R2,heatpump,2020,19
-9,2034,R2,heatpump,2020,19
-10,2030,R2,heatpump,2025,10
-10,2034,R2,heatpump,2025,10
-10,2035,R2,heatpump,2025,10
-10,2039,R2,heatpump,2025,10
-11,2035,R2,heatpump,2030,26
-11,2039,R2,heatpump,2030,26
-11,2040,R2,heatpump,2030,26
-11,2044,R2,heatpump,2030,26
-12,2040,R2,heatpump,2035,16
-12,2044,R2,heatpump,2035,16
-12,2045,R2,heatpump,2035,16
-12,2049,R2,heatpump,2035,16
-13,2045,R2,heatpump,2040,32
-13,2049,R2,heatpump,2040,32
-13,2050,R2,heatpump,2040,32
-13,2054,R2,heatpump,2040,32
-14,2050,R2,heatpump,2045,22
-14,2054,R2,heatpump,2045,22
-14,2055,R2,heatpump,2045,22
-14,2059,R2,heatpump,2045,22
-15,2055,R2,heatpump,2050,32
-15,2059,R2,heatpump,2050,32
-15,2060,R2,heatpump,2050,32
-15,2064,R2,heatpump,2050,32
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
deleted file mode 100644
index 8a6b5683..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2025.csv
+++ /dev/null
@@ -1,121 +0,0 @@
-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,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R1,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R2,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R1,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R2,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
-2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R1,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R1,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R2,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R2,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-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,heatpump,2020,0.79170000000
-3,heat,R1,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-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,heatpump,2020,0.79170000000
-3,heat,R2,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-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,heatpump,2020,1.58330000000
-4,heat,R1,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-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,heatpump,2020,1.58330000000
-4,heat,R2,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R1,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R2,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
deleted file mode 100644
index f7f70781..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2035.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
-2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
deleted file mode 100644
index 383d0d54..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2045.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
-2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
deleted file mode 100644
index 803ba258..00000000
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2050.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
-2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R1,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R2,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000

From 9ee059d3aa4404f12cfca58410e4d0b7af1ef2a9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 14:43:07 +0100
Subject: [PATCH 347/419] Add safety check in scripts to prevent results
 duplication

---
 .../1-add-new-technology/generate_models.py          |  2 ++
 docs/tutorial-code/2-add-agent/generate_models.py    | 12 ++++++++----
 docs/tutorial-code/3-add-region/generate_models.py   |  6 ++++--
 .../4-modify-timing-data/generate_models.py          | 12 ++++++++----
 .../5-add-service-demand/generate_models.py          |  6 ++++--
 .../generate_models.py                               |  2 ++
 6 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/generate_models.py b/docs/tutorial-code/1-add-new-technology/generate_models.py
index eb93aaf7..2fd8e167 100644
--- a/docs/tutorial-code/1-add-new-technology/generate_models.py
+++ b/docs/tutorial-code/1-add-new-technology/generate_models.py
@@ -70,6 +70,8 @@ def generate_model_2() -> None:
 
     # Starting point: copy model from 1-introduction
     shutil.copytree(parent_path / "1-introduction", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Copy price data for 2020 -> 2040
     add_price_data_for_new_year(model_path, "2040", "power", "2020")
diff --git a/docs/tutorial-code/2-add-agent/generate_models.py b/docs/tutorial-code/2-add-agent/generate_models.py
index 2fa029c2..e89da4db 100644
--- a/docs/tutorial-code/2-add-agent/generate_models.py
+++ b/docs/tutorial-code/2-add-agent/generate_models.py
@@ -14,12 +14,14 @@ def generate_model_1():
 
     """
     model_name = "1-single-objective"
-
-    # Starting point: copy model from previous tutorial
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
+
+    # Starting point: copy model from previous tutorial
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Copy agent A1 -> A2
     add_agent(
@@ -51,12 +53,14 @@ def generate_model_2():
 
     """
     model_name = "2-multiple-objective"
-
-    # Starting point: copy model from previous tutorial
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
+
+    # Starting point: copy model from previous tutorial
     shutil.copytree(parent_path / "1-single-objective", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Add second objective for agent A2
     agents_file = model_path / "technodata/Agents.csv"
diff --git a/docs/tutorial-code/3-add-region/generate_models.py b/docs/tutorial-code/3-add-region/generate_models.py
index 13569688..fbc8bf97 100644
--- a/docs/tutorial-code/3-add-region/generate_models.py
+++ b/docs/tutorial-code/3-add-region/generate_models.py
@@ -14,12 +14,14 @@ def generate_model_1():
 
     """
     model_name = "1-new-region"
-
-    # Starting point: copy model from tutorial 1
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
+
+    # Starting point: copy model from tutorial 1
     shutil.copytree(parent_path / "../1-add-new-technology/2-scenario", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Add region R2
     add_region(model_path, region_name="R2", copy_from="R1")
diff --git a/docs/tutorial-code/4-modify-timing-data/generate_models.py b/docs/tutorial-code/4-modify-timing-data/generate_models.py
index eeac11b8..6939a7f6 100644
--- a/docs/tutorial-code/4-modify-timing-data/generate_models.py
+++ b/docs/tutorial-code/4-modify-timing-data/generate_models.py
@@ -15,12 +15,14 @@ def generate_model_1():
 
     """
     model_name = "1-modify-timeslices"
-
-    # Starting point: copy model from tutorial 3
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
+
+    # Starting point: copy model from tutorial 3
     shutil.copytree(parent_path / "../3-add-region/1-new-region", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Add timeslices
     add_timeslice(model_path, timeslice_name="early-morning", copy_from="evening")
@@ -71,12 +73,14 @@ def generate_model_2():
 
     """
     model_name = "2-modify-time-framework"
-
-    # Starting point: copy previous model
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
+
+    # Starting point: copy previous model
     shutil.copytree(parent_path / "1-modify-timeslices", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Modify time framework
     settings_file = model_path / "settings.toml"
diff --git a/docs/tutorial-code/5-add-service-demand/generate_models.py b/docs/tutorial-code/5-add-service-demand/generate_models.py
index a766b002..f3b11cee 100644
--- a/docs/tutorial-code/5-add-service-demand/generate_models.py
+++ b/docs/tutorial-code/5-add-service-demand/generate_models.py
@@ -14,15 +14,17 @@ def generate_model_1():
 
     """
     model_name = "1-exogenous-demand"
-
-    # Starting point: copy model from tutorial 4
     model_path = parent_path / model_name
     if model_path.exists():
         shutil.rmtree(model_path)
+
+    # Starting point: copy model from tutorial 4
     shutil.copytree(
         parent_path / "../4-modify-timing-data/1-modify-timeslices",
         model_path,
     )
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Copy gas commodity in power sector -> cook
     add_new_commodity(model_path, "cook", "residential", "heat")
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
index 8e5e0a53..feda3991 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/generate_models.py
@@ -51,6 +51,8 @@ def generate_model_2() -> None:
 
     # Starting point: copy model from 1-min-constraint
     shutil.copytree(parent_path / "1-min-constraint", model_path)
+    if (model_path / "Results").exists():
+        shutil.rmtree(model_path / "Results")
 
     # Modify UtilizationFactor and MinimumServiceFactor for windturbine
     timeslices_file = model_path / "technodata/power/TechnodataTimeslices.csv"

From c4de33bf65a8f5d6f2d009c3287bfb71abac0747 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 15:01:55 +0100
Subject: [PATCH 348/419] Fix error from previous commit

---
 src/muse/investments.py    | 6 +++++-
 tests/test_demand_share.py | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/muse/investments.py b/src/muse/investments.py
index 9c40ef19..d6ed8248 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -310,7 +310,11 @@ def scipy_match_demand(
 
     from muse.constraints import ScipyAdapter
 
-    df_technologies = technologies.to_dataframe()
+    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/tests/test_demand_share.py b/tests/test_demand_share.py
index 9b69cdef..54940789 100644
--- a/tests/test_demand_share.py
+++ b/tests/test_demand_share.py
@@ -26,9 +26,9 @@ def _matching_market(technologies, stock, timeslice):
         QuantityType.EXTENSIVE,
     )
     market["supply"] = production.sum("asset")
-    market["consumption"] = consumption(technologies, production).sum(
-        "asset"
-    ) + drop_timeslice(market.supply)
+    market["consumption"] = drop_timeslice(
+        consumption(technologies, production).sum("asset") + market.supply
+    )
     market["prices"] = market.supply.dims, random(market.supply.shape)
 
     return market

From e6b52f2731a68758cfa43bcdfea2ca5b53c13811 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 15:57:35 +0100
Subject: [PATCH 349/419] Add test and typing

---
 src/muse/timeslices.py   |  2 +-
 tests/test_timeslices.py | 46 ++++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 31a3ac4f..71033d35 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -596,7 +596,7 @@ def represent_hours(
     return convert_timeslice(DataArray([nhours]), timeslices).squeeze()
 
 
-def drop_timeslice(data: DataArray):
+def drop_timeslice(data: DataArray) -> DataArray:
     """Drop the timeslice variable from a DataArray.
 
     If the array doesn't contain the timeslice variable, return the input unchanged.
diff --git a/tests/test_timeslices.py b/tests/test_timeslices.py
index 49d548f0..7134d8c2 100644
--- a/tests/test_timeslices.py
+++ b/tests/test_timeslices.py
@@ -40,7 +40,7 @@ def transforms(toml, reference):
 
 
 @fixture
-def rough(reference):
+def timeslice_dataarray(reference):
     from pandas import MultiIndex
 
     return DataArray(
@@ -59,28 +59,34 @@ def rough(reference):
     )
 
 
-def test_convert_extensive_timeslice(reference, rough, transforms):
-    z = convert_timeslice(rough, reference, finest=reference, transforms=transforms)
+def test_convert_extensive_timeslice(reference, timeslice_dataarray, transforms):
+    z = convert_timeslice(
+        timeslice_dataarray, reference, finest=reference, transforms=transforms
+    )
     assert z.shape == reference.shape
     assert z.values == approx(
         [
-            float(rough[0] * reference[0] / (reference[0] + reference[1])),
-            float(rough[0] * reference[1] / (reference[0] + reference[1])),
+            float(
+                timeslice_dataarray[0] * reference[0] / (reference[0] + reference[1])
+            ),
+            float(
+                timeslice_dataarray[0] * reference[1] / (reference[0] + reference[1])
+            ),
             0,
             0,
-            float(rough[1]),
+            float(timeslice_dataarray[1]),
             0,
             0,
             0,
-            float(rough[2]),
+            float(timeslice_dataarray[2]),
             0,
         ]
     )
 
 
-def test_convert_intensive_timeslice(reference, rough, transforms):
+def test_convert_intensive_timeslice(reference, timeslice_dataarray, transforms):
     z = convert_timeslice(
-        rough,
+        timeslice_dataarray,
         reference,
         finest=reference,
         transforms=transforms,
@@ -89,15 +95,15 @@ def test_convert_intensive_timeslice(reference, rough, transforms):
 
     assert z.values == approx(
         [
-            float(rough[0]),
-            float(rough[0]),
+            float(timeslice_dataarray[0]),
+            float(timeslice_dataarray[0]),
             0,
             0,
-            float(rough[1]),
+            float(timeslice_dataarray[1]),
             0,
             0,
             0,
-            float(rough[2]),
+            float(timeslice_dataarray[2]),
             0,
         ]
     )
@@ -241,3 +247,17 @@ def to_bitstring(x):
     assert (
         to_bitstring(vectors[("springautumn", "week", "night")]) == "0101000001010000"
     )
+
+
+def test_drop_timeslice(timeslice_dataarray):
+    from muse.timeslices import drop_timeslice
+
+    dropped = drop_timeslice(timeslice_dataarray)
+    coords_to_check = {"timeslice", "semester", "week", "day"}
+    assert coords_to_check.issubset(timeslice_dataarray.coords)
+    assert not coords_to_check.intersection(dropped.coords)
+
+    # Test on arrays without timeslice data
+    data_without_timeslice = DataArray([1, 2, 3], dims=["x"])
+    assert drop_timeslice(data_without_timeslice).equals(data_without_timeslice)
+    assert drop_timeslice(dropped).equals(dropped)

From 8543264a4b629fa15bbe77437d39d823e97ad45c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 2 Jul 2024 16:00:41 +0100
Subject: [PATCH 350/419] Remove list comprehension

---
 src/muse/timeslices.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 71033d35..547d09be 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -604,7 +604,7 @@ def drop_timeslice(data: DataArray) -> DataArray:
     if "timeslice" not in data.dims:
         return data
 
-    return data.drop_vars([c for c in data.timeslice.indexes])
+    return data.drop_vars(data.timeslice.indexes)
 
 
 setup_module(DEFAULT_TIMESLICE_DESCRIPTION)

From bb6e8217ea665bf6a206aa05ffacdf7194b138fe Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Tue, 2 Jul 2024 16:04:53 +0100
Subject: [PATCH 351/419] Update docs/installation/pipx-based.rst

Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
---
 docs/installation/pipx-based.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 8fe93582..977dc768 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -188,7 +188,7 @@ With ``pyenv`` installed and correctly configured, it is now easy to install any
 
     pyenv install -l
 
-You should see a long list of versions to choose from. Let's install one of the later version of the 3.9 family:
+You should see a long list of versions to choose from. Let's install one of the later versions of the 3.9 family:
 
 .. code-block:: bash
 

From c9b93f873059c8aa44b0462ba1f824bf199e8639 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Tue, 2 Jul 2024 16:05:34 +0100
Subject: [PATCH 352/419] Update docs/installation/pipx-based.rst

Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
---
 docs/installation/pipx-based.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 977dc768..09d8c32e 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -35,7 +35,7 @@ In the following sections, we will guide you step by step in configuring your sy
 Launching a terminal
 ~~~~~~~~~~~~~~~~~~~~
 
-All operating systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let us just figure out how to launch one:
+All operating systems have a Terminal application that let you run commands. You will need to use it extensively when using MUSE, so we strongly suggest you get familiar with it. For now, let's just figure out how to launch one:
 
 - **Linux**: Depending on the distribution, you might have a shortcut in your tasks bar already or it should be easily found in the menu. Look for ``Console`` or ``Terminal`` to lunch the application.
 - **MacOS**: Press ``Super key + Space`` to open the search box. There, type ``Terminal`` and press ``Enter``.

From 7168611f8ba4b3b36cf3fe49a38f32574cec03ea Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Tue, 2 Jul 2024 16:13:44 +0100
Subject: [PATCH 353/419] Update docs/installation/pipx-based.rst

Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
---
 docs/installation/pipx-based.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 09d8c32e..7550945f 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -224,7 +224,7 @@ In both cases, if you run ``python --version`` afterwards, you should get ``Pyth
 Installing ``pipx``
 ~~~~~~~~~~~~~~~~~~~
 
-Next we need to install ``pipx``, a Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments.
+Next we need to install ``pipx``, a Python application manager that facilitates installing, keeping applications updated and running them in their own isolated environments.
 More specifically, ``pipx`` will create a virtual environment to run the tools it installs based on the python version that was used to install pipx to start with, unless you specify another version and that other version is system wide available.
 We could skip this step and install MUSE directly, but that will risk to have conflicting dependencies in the future if you install any other application, breaking your MUSE installation, and we do not want that to happen.
 

From c6d549c6b1266824aa208f19c091e0a0f5bfb00f Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Wed, 3 Jul 2024 09:29:26 +0100
Subject: [PATCH 354/419] Update docs/installation/pipx-based.rst

Co-authored-by: Alex Dewar <alexdewar@users.noreply.github.com>
---
 docs/installation/pipx-based.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index 7550945f..b1816ffd 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -161,12 +161,12 @@ but the easiest way is to run the following command in the ``powershell`` and, u
     .. code-block:: powershell
 
         # Step 1: In your powershell, invoke the following command:
-        `Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/pyenv-win/pyenv-win/master/pyenv-win/install-pyenv-win.ps1" -OutFile "./install-pyenv-win.ps1"; &"./install-pyenv-win.ps1"`
+        Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/pyenv-win/pyenv-win/master/pyenv-win/install-pyenv-win.ps1" -OutFile "./install-pyenv-win.ps1"; &"./install-pyenv-win.ps1"
 
-        # Step 2: close the shell you invoked in the command from Step 1 and re-launch an new `powershell`. This is equivalent to invoke the shell command `source` in Linux.
+        # Step 2: close the shell you invoked in the command from Step 1 and re-launch powershell
 
         # Step 3: Confirm success; you should be returned something similar to `pyenv 3.1.1`
-        `pyenv --version`
+        pyenv --version
 
     .. note::
 

From 79ae6cf5fd4a92059dcb639fe05db30d7d2de175 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Wed, 3 Jul 2024 09:31:42 +0100
Subject: [PATCH 355/419] Update pipx-based.rst

Modified descriptions as per discussion.
---
 docs/installation/pipx-based.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index b1816ffd..880c2840 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -28,7 +28,7 @@ In the following sections, we will guide you step by step in configuring your sy
             python -m pipx ensurepath
             python -m pipx install muse-os
 
-    - After this, MUSE will be available to use system wide simply by invoking ``muse`` in the terminal. To illustrate this and to finish installation, run ``muse --model default``.
+    - After this, MUSE will be available to use system wide simply by invoking muse in the terminal. To illustrate this and to test your installation, run muse --model default. You should then see a a list of outputs printed to the terminal showing the computations going on in the background.
 
 .. _launch-terminal:
 

From 5e6579f41c4b63dfb2d988b52bf8f8e4db645855 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 10:05:12 +0100
Subject: [PATCH 356/419] Regenerate results files

---
 .../1-introduction/settings.toml              |   3 +-
 .../2-scenario/settings.toml                  |   3 +-
 .../1-single-objective/settings.toml          |   3 +-
 .../Results/Gas/Capacity/2030.csv             |  10 +-
 .../Results/Gas/Capacity/2035.csv             |  10 +-
 .../Results/Gas/Capacity/2040.csv             |  10 +-
 .../Results/Gas/Capacity/2045.csv             |  10 +-
 .../Results/Gas/Capacity/2050.csv             |  10 +-
 .../Results/MCACapacity.csv                   | 115 +++++----
 .../Results/MCAPrices.csv                     | 128 ++++-----
 .../Results/Power/Capacity/2020.csv           |  12 +-
 .../Results/Power/Capacity/2025.csv           |  33 ++-
 .../Results/Power/Capacity/2030.csv           |  49 ++--
 .../Results/Power/Capacity/2035.csv           |  67 ++---
 .../Results/Power/Capacity/2040.csv           |  67 ++---
 .../Results/Power/Capacity/2045.csv           |  97 ++++---
 .../Results/Power/Capacity/2050.csv           | 117 +++++----
 .../Results/Residential/Capacity/2020.csv     |   6 +-
 .../Results/Residential/Capacity/2025.csv     |  10 +-
 .../Results/Residential/Capacity/2030.csv     |  17 +-
 .../Results/Residential/Capacity/2035.csv     |  21 +-
 .../Results/Residential/Capacity/2040.csv     |  28 +-
 .../Results/Residential/Capacity/2045.csv     |  32 ++-
 .../Results/Residential/Capacity/2050.csv     |  38 ++-
 .../Results/Residential/Supply/2020.csv       |  36 +--
 .../Results/Residential/Supply/2025.csv       |  54 ++--
 .../Results/Residential/Supply/2030.csv       |  36 ++-
 .../Results/Residential/Supply/2035.csv       |  36 ++-
 .../Results/Residential/Supply/2040.csv       |  36 ++-
 .../Results/Residential/Supply/2045.csv       |  36 ++-
 .../Results/Residential/Supply/2050.csv       |  36 ++-
 .../2-multiple-objective/settings.toml        |   3 +-
 .../3-add-region/1-new-region/settings.toml   |   3 +-
 .../1-modify-timeslices/settings.toml         |   3 +-
 .../2-modify-time-framework/settings.toml     |   3 +-
 .../1-exogenous-demand/settings.toml          |   3 +-
 .../1-correlation/settings.toml               |   3 +-
 .../1-min-constraint/settings.toml            |   3 +-
 .../Results/Gas/Capacity/2020.csv             |  14 +-
 .../Results/Gas/Capacity/2025.csv             |  14 +-
 .../Results/Gas/Capacity/2030.csv             |  14 +-
 .../Results/Gas/Capacity/2035.csv             |  14 +-
 .../Results/Gas/Capacity/2040.csv             |  14 +-
 .../Results/Gas/Capacity/2045.csv             |  14 +-
 .../Results/Gas/Capacity/2050.csv             |  14 +-
 .../2-max-constraint/Results/MCACapacity.csv  |  49 ++--
 .../Results/MCAMetric_Consumption.csv         | 222 +++++++---------
 .../Results/MCAMetric_Supply.csv              | 242 ++++++++----------
 .../2-max-constraint/Results/MCAPrices.csv    | 140 +++++-----
 .../Results/Power/Capacity/2020.csv           |   6 -
 .../Results/Power/Capacity/2025.csv           |  20 +-
 .../Results/Power/Capacity/2030.csv           |  36 ++-
 .../Results/Power/Capacity/2035.csv           |  54 ++--
 .../Results/Power/Capacity/2040.csv           |  74 +++---
 .../Results/Power/Capacity/2045.csv           |  94 ++++---
 .../Results/Power/Capacity/2050.csv           | 114 ++++-----
 .../Results/Power/Supply/2020.csv             |  28 +-
 .../Results/Power/Supply/2025.csv             |  38 +--
 .../Results/Power/Supply/2030.csv             |  48 ++--
 .../Results/Power/Supply/2035.csv             |  72 +++---
 .../Results/Power/Supply/2040.csv             |  96 +++----
 .../Results/Power/Supply/2045.csv             | 114 ++++-----
 .../Results/Power/Supply/2050.csv             | 120 ++++-----
 .../2-max-constraint/settings.toml            |   3 +-
 64 files changed, 1431 insertions(+), 1424 deletions(-)

diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index d6dd8abe..a0e0cd7c 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index d6dd8abe..a0e0cd7c 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index d6dd8abe..a0e0cd7c 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index 542c24ec..7837213d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -2,8 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
-1,2040,R1,gassupply1,2030,25.13350000000
-1,2045,R1,gassupply1,2030,25.13350000000
-1,2050,R1,gassupply1,2030,25.13350000000
-1,2069,R1,gassupply1,2030,25.13350000000
+1,2035,R1,gassupply1,2030,5.46550000000
+1,2040,R1,gassupply1,2030,5.46550000000
+1,2045,R1,gassupply1,2030,5.46550000000
+1,2050,R1,gassupply1,2030,5.46550000000
+1,2069,R1,gassupply1,2030,5.46550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index 542c24ec..7837213d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -2,8 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
-1,2040,R1,gassupply1,2030,25.13350000000
-1,2045,R1,gassupply1,2030,25.13350000000
-1,2050,R1,gassupply1,2030,25.13350000000
-1,2069,R1,gassupply1,2030,25.13350000000
+1,2035,R1,gassupply1,2030,5.46550000000
+1,2040,R1,gassupply1,2030,5.46550000000
+1,2045,R1,gassupply1,2030,5.46550000000
+1,2050,R1,gassupply1,2030,5.46550000000
+1,2069,R1,gassupply1,2030,5.46550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index 542c24ec..7837213d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -2,8 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
-1,2040,R1,gassupply1,2030,25.13350000000
-1,2045,R1,gassupply1,2030,25.13350000000
-1,2050,R1,gassupply1,2030,25.13350000000
-1,2069,R1,gassupply1,2030,25.13350000000
+1,2035,R1,gassupply1,2030,5.46550000000
+1,2040,R1,gassupply1,2030,5.46550000000
+1,2045,R1,gassupply1,2030,5.46550000000
+1,2050,R1,gassupply1,2030,5.46550000000
+1,2069,R1,gassupply1,2030,5.46550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index 542c24ec..7837213d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -2,8 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
-1,2040,R1,gassupply1,2030,25.13350000000
-1,2045,R1,gassupply1,2030,25.13350000000
-1,2050,R1,gassupply1,2030,25.13350000000
-1,2069,R1,gassupply1,2030,25.13350000000
+1,2035,R1,gassupply1,2030,5.46550000000
+1,2040,R1,gassupply1,2030,5.46550000000
+1,2045,R1,gassupply1,2030,5.46550000000
+1,2050,R1,gassupply1,2030,5.46550000000
+1,2069,R1,gassupply1,2030,5.46550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index 542c24ec..7837213d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -2,8 +2,8 @@ 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,2035,R1,gassupply1,2030,25.13350000000
-1,2040,R1,gassupply1,2030,25.13350000000
-1,2045,R1,gassupply1,2030,25.13350000000
-1,2050,R1,gassupply1,2030,25.13350000000
-1,2069,R1,gassupply1,2030,25.13350000000
+1,2035,R1,gassupply1,2030,5.46550000000
+1,2040,R1,gassupply1,2030,5.46550000000
+1,2045,R1,gassupply1,2030,5.46550000000
+1,2050,R1,gassupply1,2030,5.46550000000
+1,2069,R1,gassupply1,2030,5.46550000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index f09cdc60..1e2906cd 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -8,75 +8,88 @@ gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
 gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,50.00000000000
+heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A1,power,newcapa,2025,4.97240000000
+windturbine,R1,R1,A1,power,newcapa,2025,4.18750000000
 gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A2,power,newcapa,2025,10.00000000000
+windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
 gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
 gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,50.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,0.76380000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.97240000000
+solarPV,R1,R1,A1,power,newcapa,2030,4.06250000000
+windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
 solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A2,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2030,0.81250000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
 gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,18.00000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,50.00000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,0.76380000000
-solarPV,R1,R1,A1,power,newcapa,2035,0.87850000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.97240000000
+solarPV,R1,R1,A1,power,newcapa,2035,4.06250000000
+solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
+windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
 solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2035,0.87850000000
-windturbine,R1,R1,A2,power,newcapa,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.63350000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,22.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,18.00000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,50.00000000000
+solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
+windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2035,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.73270000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,2.73270000000
+heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,0.76380000000
-solarPV,R1,R1,A1,power,newcapa,2040,0.87850000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.37850000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.97240000000
+solarPV,R1,R1,A1,power,newcapa,2040,4.06250000000
+solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
+solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
 solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2040,0.87850000000
-solarPV,R1,R1,A2,power,newcapa,2040,2.37850000000
-windturbine,R1,R1,A2,power,newcapa,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.63350000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,22.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,24.00000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,50.00000000000
+solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
+solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
+windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2040,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.73270000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,2.73270000000
+heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,0.76380000000
-solarPV,R1,R1,A1,power,newcapa,2045,0.87850000000
-solarPV,R1,R1,A1,power,newcapa,2045,2.37850000000
+solarPV,R1,R1,A1,power,newcapa,2045,4.06250000000
+solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.97240000000
+solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
 solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,0.87850000000
-solarPV,R1,R1,A2,power,newcapa,2045,2.37850000000
+solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
+solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2045,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.63350000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,22.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,24.00000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,50.00000000000
+windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
+windturbine,R1,R1,A2,power,newcapa,2045,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.73270000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,2.73270000000
+heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
+heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
+heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,0.76380000000
-solarPV,R1,R1,A1,power,newcapa,2050,0.87850000000
-solarPV,R1,R1,A1,power,newcapa,2050,2.37850000000
+solarPV,R1,R1,A1,power,newcapa,2050,4.06250000000
+solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
+solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.98620000000
+solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
 solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,0.87850000000
-solarPV,R1,R1,A2,power,newcapa,2050,2.37850000000
+solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A2,power,newcapa,2050,1.98620000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.63350000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,22.50000000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
+windturbine,R1,R1,A2,power,newcapa,2050,0.81250000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.73270000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,2.73270000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 66430bcb..2c421efe 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.47150000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.66080000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.96550000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.70730000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.99120000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.44830000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.47150000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66080000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.96550000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70730000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99120000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.44830000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.41460000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98240000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.89650000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.94300000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.32160000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.93100000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.44400000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.46760000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04290000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.05050000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66730000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.70270000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07850000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.09550000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44400000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.46760000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04290000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05050000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66730000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70270000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07850000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09550000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34190000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.41340000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24190000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31000000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89130000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.93880000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.12350000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.15380000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.53410000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.54820000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.04180000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.04280000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.80230000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.82350000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.07610000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.07820000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.53410000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54820000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04180000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04280000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.80230000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82350000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07610000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07820000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.61150000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65440000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23320000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.24180000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.07120000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.09970000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.11940000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.12320000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.57900000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.57870000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04540000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.86940000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.86900000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08420000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.08550000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57900000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57870000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04540000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86940000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86900000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08420000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08550000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.74500000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.74420000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.26550000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27070000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.16060000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.16010000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13380000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.13610000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.63180000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.63150000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
 "('all-year', 'all-week', 'night')",heat,R1,0.04720000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94850000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94820000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
 "('all-year', 'all-week', 'morning')",heat,R1,0.08820000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63180000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63150000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.04720000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94850000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94820000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.08820000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90240000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90160000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28160000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28150000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.26590000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.26540000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14100000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.14090000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63660000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.63780000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
 "('all-year', 'all-week', 'night')",heat,R1,0.04930000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95560000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95740000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
 "('all-year', 'all-week', 'morning')",heat,R1,0.09300000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63660000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63780000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.04930000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95560000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95740000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.09300000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91560000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91920000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30040000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.30030000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27510000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.27750000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14940000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14930000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
index 3e93f592..b3996630 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
 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,14.97240000000
-1,2030,R1,windturbine,2020,14.97240000000
-1,2035,R1,windturbine,2020,14.97240000000
-1,2040,R1,windturbine,2020,14.97240000000
-1,2045,R1,windturbine,2020,14.97240000000
-1,2049,R1,windturbine,2020,14.97240000000
+1,2025,R1,windturbine,2020,8.37500000000
+1,2030,R1,windturbine,2020,8.37500000000
+1,2035,R1,windturbine,2020,8.37500000000
+1,2040,R1,windturbine,2020,8.37500000000
+1,2045,R1,windturbine,2020,8.37500000000
+1,2049,R1,windturbine,2020,8.37500000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index 5379bc81..c1c8bb2b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -10,16 +10,23 @@ asset,year,region,technology,installed,capacity
 1,2054,R1,gasCCGT,2025,3.00000000000
 1,2055,R1,gasCCGT,2025,3.00000000000
 1,2064,R1,gasCCGT,2025,3.00000000000
-2,2030,R1,solarPV,2025,10.76380000000
-2,2035,R1,solarPV,2025,10.76380000000
-2,2040,R1,solarPV,2025,10.76380000000
-2,2045,R1,solarPV,2025,10.76380000000
-2,2049,R1,solarPV,2025,10.76380000000
-2,2050,R1,solarPV,2025,10.76380000000
-2,2054,R1,solarPV,2025,10.76380000000
-3,2025,R1,windturbine,2020,14.97240000000
-3,2030,R1,windturbine,2020,14.97240000000
-3,2035,R1,windturbine,2020,14.97240000000
-3,2040,R1,windturbine,2020,14.97240000000
-3,2045,R1,windturbine,2020,14.97240000000
-3,2049,R1,windturbine,2020,14.97240000000
+2,2030,R1,solarPV,2025,14.06250000000
+2,2035,R1,solarPV,2025,14.06250000000
+2,2040,R1,solarPV,2025,14.06250000000
+2,2045,R1,solarPV,2025,14.06250000000
+2,2049,R1,solarPV,2025,14.06250000000
+2,2050,R1,solarPV,2025,14.06250000000
+2,2054,R1,solarPV,2025,14.06250000000
+3,2025,R1,windturbine,2020,8.37500000000
+3,2030,R1,windturbine,2020,8.37500000000
+3,2035,R1,windturbine,2020,8.37500000000
+3,2040,R1,windturbine,2020,8.37500000000
+3,2045,R1,windturbine,2020,8.37500000000
+3,2049,R1,windturbine,2020,8.37500000000
+4,2030,R1,windturbine,2025,0.81250000000
+4,2035,R1,windturbine,2025,0.81250000000
+4,2040,R1,windturbine,2025,0.81250000000
+4,2045,R1,windturbine,2025,0.81250000000
+4,2049,R1,windturbine,2025,0.81250000000
+4,2050,R1,windturbine,2025,0.81250000000
+4,2054,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index 4709befa..900647f7 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -12,24 +12,31 @@ asset,year,region,technology,installed,capacity
 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,2025,10.76380000000
-2,2035,R1,solarPV,2025,10.76380000000
-2,2040,R1,solarPV,2025,10.76380000000
-2,2045,R1,solarPV,2025,10.76380000000
-2,2049,R1,solarPV,2025,10.76380000000
-2,2050,R1,solarPV,2025,10.76380000000
-2,2054,R1,solarPV,2025,10.76380000000
-3,2035,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2030,1.75690000000
-3,2045,R1,solarPV,2030,1.75690000000
-3,2049,R1,solarPV,2030,1.75690000000
-3,2050,R1,solarPV,2030,1.75690000000
-3,2054,R1,solarPV,2030,1.75690000000
-3,2055,R1,solarPV,2030,1.75690000000
-3,2059,R1,solarPV,2030,1.75690000000
-4,2025,R1,windturbine,2020,14.97240000000
-4,2030,R1,windturbine,2020,14.97240000000
-4,2035,R1,windturbine,2020,14.97240000000
-4,2040,R1,windturbine,2020,14.97240000000
-4,2045,R1,windturbine,2020,14.97240000000
-4,2049,R1,windturbine,2020,14.97240000000
+2,2030,R1,solarPV,2025,14.06250000000
+2,2035,R1,solarPV,2025,14.06250000000
+2,2040,R1,solarPV,2025,14.06250000000
+2,2045,R1,solarPV,2025,14.06250000000
+2,2049,R1,solarPV,2025,14.06250000000
+2,2050,R1,solarPV,2025,14.06250000000
+2,2054,R1,solarPV,2025,14.06250000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2025,R1,windturbine,2020,8.37500000000
+4,2030,R1,windturbine,2020,8.37500000000
+4,2035,R1,windturbine,2020,8.37500000000
+4,2040,R1,windturbine,2020,8.37500000000
+4,2045,R1,windturbine,2020,8.37500000000
+4,2049,R1,windturbine,2020,8.37500000000
+5,2030,R1,windturbine,2025,0.81250000000
+5,2035,R1,windturbine,2025,0.81250000000
+5,2040,R1,windturbine,2025,0.81250000000
+5,2045,R1,windturbine,2025,0.81250000000
+5,2049,R1,windturbine,2025,0.81250000000
+5,2050,R1,windturbine,2025,0.81250000000
+5,2054,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index 53525ebb..9cc10830 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -12,33 +12,40 @@ asset,year,region,technology,installed,capacity
 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,2025,10.76380000000
-2,2035,R1,solarPV,2025,10.76380000000
-2,2040,R1,solarPV,2025,10.76380000000
-2,2045,R1,solarPV,2025,10.76380000000
-2,2049,R1,solarPV,2025,10.76380000000
-2,2050,R1,solarPV,2025,10.76380000000
-2,2054,R1,solarPV,2025,10.76380000000
-3,2035,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2030,1.75690000000
-3,2045,R1,solarPV,2030,1.75690000000
-3,2049,R1,solarPV,2030,1.75690000000
-3,2050,R1,solarPV,2030,1.75690000000
-3,2054,R1,solarPV,2030,1.75690000000
-3,2055,R1,solarPV,2030,1.75690000000
-3,2059,R1,solarPV,2030,1.75690000000
-4,2040,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2035,4.75690000000
-4,2049,R1,solarPV,2035,4.75690000000
-4,2050,R1,solarPV,2035,4.75690000000
-4,2054,R1,solarPV,2035,4.75690000000
-4,2055,R1,solarPV,2035,4.75690000000
-4,2059,R1,solarPV,2035,4.75690000000
-4,2060,R1,solarPV,2035,4.75690000000
-4,2064,R1,solarPV,2035,4.75690000000
-5,2025,R1,windturbine,2020,14.97240000000
-5,2030,R1,windturbine,2020,14.97240000000
-5,2035,R1,windturbine,2020,14.97240000000
-5,2040,R1,windturbine,2020,14.97240000000
-5,2045,R1,windturbine,2020,14.97240000000
-5,2049,R1,windturbine,2020,14.97240000000
+2,2030,R1,solarPV,2025,14.06250000000
+2,2035,R1,solarPV,2025,14.06250000000
+2,2040,R1,solarPV,2025,14.06250000000
+2,2045,R1,solarPV,2025,14.06250000000
+2,2049,R1,solarPV,2025,14.06250000000
+2,2050,R1,solarPV,2025,14.06250000000
+2,2054,R1,solarPV,2025,14.06250000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
+5,2025,R1,windturbine,2020,8.37500000000
+5,2030,R1,windturbine,2020,8.37500000000
+5,2035,R1,windturbine,2020,8.37500000000
+5,2040,R1,windturbine,2020,8.37500000000
+5,2045,R1,windturbine,2020,8.37500000000
+5,2049,R1,windturbine,2020,8.37500000000
+6,2030,R1,windturbine,2025,0.81250000000
+6,2035,R1,windturbine,2025,0.81250000000
+6,2040,R1,windturbine,2025,0.81250000000
+6,2045,R1,windturbine,2025,0.81250000000
+6,2049,R1,windturbine,2025,0.81250000000
+6,2050,R1,windturbine,2025,0.81250000000
+6,2054,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index 7d0c5029..073749d1 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -12,30 +12,30 @@ asset,year,region,technology,installed,capacity
 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,2025,10.76380000000
-2,2035,R1,solarPV,2025,10.76380000000
-2,2040,R1,solarPV,2025,10.76380000000
-2,2045,R1,solarPV,2025,10.76380000000
-2,2049,R1,solarPV,2025,10.76380000000
-2,2050,R1,solarPV,2025,10.76380000000
-2,2054,R1,solarPV,2025,10.76380000000
-3,2035,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2030,1.75690000000
-3,2045,R1,solarPV,2030,1.75690000000
-3,2049,R1,solarPV,2030,1.75690000000
-3,2050,R1,solarPV,2030,1.75690000000
-3,2054,R1,solarPV,2030,1.75690000000
-3,2055,R1,solarPV,2030,1.75690000000
-3,2059,R1,solarPV,2030,1.75690000000
-4,2040,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2035,4.75690000000
-4,2049,R1,solarPV,2035,4.75690000000
-4,2050,R1,solarPV,2035,4.75690000000
-4,2054,R1,solarPV,2035,4.75690000000
-4,2055,R1,solarPV,2035,4.75690000000
-4,2059,R1,solarPV,2035,4.75690000000
-4,2060,R1,solarPV,2035,4.75690000000
-4,2064,R1,solarPV,2035,4.75690000000
+2,2030,R1,solarPV,2025,14.06250000000
+2,2035,R1,solarPV,2025,14.06250000000
+2,2040,R1,solarPV,2025,14.06250000000
+2,2045,R1,solarPV,2025,14.06250000000
+2,2049,R1,solarPV,2025,14.06250000000
+2,2050,R1,solarPV,2025,14.06250000000
+2,2054,R1,solarPV,2025,14.06250000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
 5,2045,R1,solarPV,2040,6.00000000000
 5,2049,R1,solarPV,2040,6.00000000000
 5,2050,R1,solarPV,2040,6.00000000000
@@ -46,9 +46,16 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,solarPV,2040,6.00000000000
 5,2065,R1,solarPV,2040,6.00000000000
 5,2069,R1,solarPV,2040,6.00000000000
-6,2025,R1,windturbine,2020,14.97240000000
-6,2030,R1,windturbine,2020,14.97240000000
-6,2035,R1,windturbine,2020,14.97240000000
-6,2040,R1,windturbine,2020,14.97240000000
-6,2045,R1,windturbine,2020,14.97240000000
-6,2049,R1,windturbine,2020,14.97240000000
+6,2025,R1,windturbine,2020,8.37500000000
+6,2030,R1,windturbine,2020,8.37500000000
+6,2035,R1,windturbine,2020,8.37500000000
+6,2040,R1,windturbine,2020,8.37500000000
+6,2045,R1,windturbine,2020,8.37500000000
+6,2049,R1,windturbine,2020,8.37500000000
+7,2030,R1,windturbine,2025,0.81250000000
+7,2035,R1,windturbine,2025,0.81250000000
+7,2040,R1,windturbine,2025,0.81250000000
+7,2045,R1,windturbine,2025,0.81250000000
+7,2049,R1,windturbine,2025,0.81250000000
+7,2050,R1,windturbine,2025,0.81250000000
+7,2054,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index c7d1329c..60bb36ed 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -12,30 +12,30 @@ asset,year,region,technology,installed,capacity
 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,2025,10.76380000000
-2,2035,R1,solarPV,2025,10.76380000000
-2,2040,R1,solarPV,2025,10.76380000000
-2,2045,R1,solarPV,2025,10.76380000000
-2,2049,R1,solarPV,2025,10.76380000000
-2,2050,R1,solarPV,2025,10.76380000000
-2,2054,R1,solarPV,2025,10.76380000000
-3,2035,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2030,1.75690000000
-3,2045,R1,solarPV,2030,1.75690000000
-3,2049,R1,solarPV,2030,1.75690000000
-3,2050,R1,solarPV,2030,1.75690000000
-3,2054,R1,solarPV,2030,1.75690000000
-3,2055,R1,solarPV,2030,1.75690000000
-3,2059,R1,solarPV,2030,1.75690000000
-4,2040,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2035,4.75690000000
-4,2049,R1,solarPV,2035,4.75690000000
-4,2050,R1,solarPV,2035,4.75690000000
-4,2054,R1,solarPV,2035,4.75690000000
-4,2055,R1,solarPV,2035,4.75690000000
-4,2059,R1,solarPV,2035,4.75690000000
-4,2060,R1,solarPV,2035,4.75690000000
-4,2064,R1,solarPV,2035,4.75690000000
+2,2030,R1,solarPV,2025,14.06250000000
+2,2035,R1,solarPV,2025,14.06250000000
+2,2040,R1,solarPV,2025,14.06250000000
+2,2045,R1,solarPV,2025,14.06250000000
+2,2049,R1,solarPV,2025,14.06250000000
+2,2050,R1,solarPV,2025,14.06250000000
+2,2054,R1,solarPV,2025,14.06250000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
 5,2045,R1,solarPV,2040,6.00000000000
 5,2049,R1,solarPV,2040,6.00000000000
 5,2050,R1,solarPV,2040,6.00000000000
@@ -46,29 +46,26 @@ asset,year,region,technology,installed,capacity
 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,20.00000000000
-6,2054,R1,solarPV,2045,20.00000000000
-6,2055,R1,solarPV,2045,20.00000000000
-6,2059,R1,solarPV,2045,20.00000000000
-6,2060,R1,solarPV,2045,20.00000000000
-6,2064,R1,solarPV,2045,20.00000000000
-6,2065,R1,solarPV,2045,20.00000000000
-6,2069,R1,solarPV,2045,20.00000000000
-6,2070,R1,solarPV,2045,20.00000000000
-6,2074,R1,solarPV,2045,20.00000000000
-7,2025,R1,windturbine,2020,14.97240000000
-7,2030,R1,windturbine,2020,14.97240000000
-7,2035,R1,windturbine,2020,14.97240000000
-7,2040,R1,windturbine,2020,14.97240000000
-7,2045,R1,windturbine,2020,14.97240000000
-7,2049,R1,windturbine,2020,14.97240000000
-8,2050,R1,windturbine,2045,3.97240000000
-8,2054,R1,windturbine,2045,3.97240000000
-8,2055,R1,windturbine,2045,3.97240000000
-8,2059,R1,windturbine,2045,3.97240000000
-8,2060,R1,windturbine,2045,3.97240000000
-8,2064,R1,windturbine,2045,3.97240000000
-8,2065,R1,windturbine,2045,3.97240000000
-8,2069,R1,windturbine,2045,3.97240000000
-8,2070,R1,windturbine,2045,3.97240000000
-8,2074,R1,windturbine,2045,3.97240000000
+6,2050,R1,solarPV,2045,17.37500000000
+6,2054,R1,solarPV,2045,17.37500000000
+6,2055,R1,solarPV,2045,17.37500000000
+6,2059,R1,solarPV,2045,17.37500000000
+6,2060,R1,solarPV,2045,17.37500000000
+6,2064,R1,solarPV,2045,17.37500000000
+6,2065,R1,solarPV,2045,17.37500000000
+6,2069,R1,solarPV,2045,17.37500000000
+6,2070,R1,solarPV,2045,17.37500000000
+6,2074,R1,solarPV,2045,17.37500000000
+7,2025,R1,windturbine,2020,8.37500000000
+7,2030,R1,windturbine,2020,8.37500000000
+7,2035,R1,windturbine,2020,8.37500000000
+7,2040,R1,windturbine,2020,8.37500000000
+7,2045,R1,windturbine,2020,8.37500000000
+7,2049,R1,windturbine,2020,8.37500000000
+8,2030,R1,windturbine,2025,0.81250000000
+8,2035,R1,windturbine,2025,0.81250000000
+8,2040,R1,windturbine,2025,0.81250000000
+8,2045,R1,windturbine,2025,0.81250000000
+8,2049,R1,windturbine,2025,0.81250000000
+8,2050,R1,windturbine,2025,0.81250000000
+8,2054,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index 73d8c115..d2ea0694 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -12,30 +12,30 @@ asset,year,region,technology,installed,capacity
 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,2025,10.76380000000
-2,2035,R1,solarPV,2025,10.76380000000
-2,2040,R1,solarPV,2025,10.76380000000
-2,2045,R1,solarPV,2025,10.76380000000
-2,2049,R1,solarPV,2025,10.76380000000
-2,2050,R1,solarPV,2025,10.76380000000
-2,2054,R1,solarPV,2025,10.76380000000
-3,2035,R1,solarPV,2030,1.75690000000
-3,2040,R1,solarPV,2030,1.75690000000
-3,2045,R1,solarPV,2030,1.75690000000
-3,2049,R1,solarPV,2030,1.75690000000
-3,2050,R1,solarPV,2030,1.75690000000
-3,2054,R1,solarPV,2030,1.75690000000
-3,2055,R1,solarPV,2030,1.75690000000
-3,2059,R1,solarPV,2030,1.75690000000
-4,2040,R1,solarPV,2035,4.75690000000
-4,2045,R1,solarPV,2035,4.75690000000
-4,2049,R1,solarPV,2035,4.75690000000
-4,2050,R1,solarPV,2035,4.75690000000
-4,2054,R1,solarPV,2035,4.75690000000
-4,2055,R1,solarPV,2035,4.75690000000
-4,2059,R1,solarPV,2035,4.75690000000
-4,2060,R1,solarPV,2035,4.75690000000
-4,2064,R1,solarPV,2035,4.75690000000
+2,2030,R1,solarPV,2025,14.06250000000
+2,2035,R1,solarPV,2025,14.06250000000
+2,2040,R1,solarPV,2025,14.06250000000
+2,2045,R1,solarPV,2025,14.06250000000
+2,2049,R1,solarPV,2025,14.06250000000
+2,2050,R1,solarPV,2025,14.06250000000
+2,2054,R1,solarPV,2025,14.06250000000
+3,2035,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2030,3.00000000000
+3,2045,R1,solarPV,2030,3.00000000000
+3,2049,R1,solarPV,2030,3.00000000000
+3,2050,R1,solarPV,2030,3.00000000000
+3,2054,R1,solarPV,2030,3.00000000000
+3,2055,R1,solarPV,2030,3.00000000000
+3,2059,R1,solarPV,2030,3.00000000000
+4,2040,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2035,6.00000000000
+4,2049,R1,solarPV,2035,6.00000000000
+4,2050,R1,solarPV,2035,6.00000000000
+4,2054,R1,solarPV,2035,6.00000000000
+4,2055,R1,solarPV,2035,6.00000000000
+4,2059,R1,solarPV,2035,6.00000000000
+4,2060,R1,solarPV,2035,6.00000000000
+4,2064,R1,solarPV,2035,6.00000000000
 5,2045,R1,solarPV,2040,6.00000000000
 5,2049,R1,solarPV,2040,6.00000000000
 5,2050,R1,solarPV,2040,6.00000000000
@@ -46,39 +46,36 @@ asset,year,region,technology,installed,capacity
 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,20.00000000000
-6,2054,R1,solarPV,2045,20.00000000000
-6,2055,R1,solarPV,2045,20.00000000000
-6,2059,R1,solarPV,2045,20.00000000000
-6,2060,R1,solarPV,2045,20.00000000000
-6,2064,R1,solarPV,2045,20.00000000000
-6,2065,R1,solarPV,2045,20.00000000000
-6,2069,R1,solarPV,2045,20.00000000000
-6,2070,R1,solarPV,2045,20.00000000000
-6,2074,R1,solarPV,2045,20.00000000000
-7,2055,R1,solarPV,2050,15.38190000000
-7,2059,R1,solarPV,2050,15.38190000000
-7,2060,R1,solarPV,2050,15.38190000000
-7,2064,R1,solarPV,2050,15.38190000000
-7,2065,R1,solarPV,2050,15.38190000000
-7,2069,R1,solarPV,2050,15.38190000000
-7,2070,R1,solarPV,2050,15.38190000000
-7,2074,R1,solarPV,2050,15.38190000000
-7,2075,R1,solarPV,2050,15.38190000000
-7,2079,R1,solarPV,2050,15.38190000000
-8,2025,R1,windturbine,2020,14.97240000000
-8,2030,R1,windturbine,2020,14.97240000000
-8,2035,R1,windturbine,2020,14.97240000000
-8,2040,R1,windturbine,2020,14.97240000000
-8,2045,R1,windturbine,2020,14.97240000000
-8,2049,R1,windturbine,2020,14.97240000000
-9,2050,R1,windturbine,2045,3.97240000000
-9,2054,R1,windturbine,2045,3.97240000000
-9,2055,R1,windturbine,2045,3.97240000000
-9,2059,R1,windturbine,2045,3.97240000000
-9,2060,R1,windturbine,2045,3.97240000000
-9,2064,R1,windturbine,2045,3.97240000000
-9,2065,R1,windturbine,2045,3.97240000000
-9,2069,R1,windturbine,2045,3.97240000000
-9,2070,R1,windturbine,2045,3.97240000000
-9,2074,R1,windturbine,2045,3.97240000000
+6,2050,R1,solarPV,2045,17.37500000000
+6,2054,R1,solarPV,2045,17.37500000000
+6,2055,R1,solarPV,2045,17.37500000000
+6,2059,R1,solarPV,2045,17.37500000000
+6,2060,R1,solarPV,2045,17.37500000000
+6,2064,R1,solarPV,2045,17.37500000000
+6,2065,R1,solarPV,2045,17.37500000000
+6,2069,R1,solarPV,2045,17.37500000000
+6,2070,R1,solarPV,2045,17.37500000000
+6,2074,R1,solarPV,2045,17.37500000000
+7,2055,R1,solarPV,2050,14.87500000000
+7,2059,R1,solarPV,2050,14.87500000000
+7,2060,R1,solarPV,2050,14.87500000000
+7,2064,R1,solarPV,2050,14.87500000000
+7,2065,R1,solarPV,2050,14.87500000000
+7,2069,R1,solarPV,2050,14.87500000000
+7,2070,R1,solarPV,2050,14.87500000000
+7,2074,R1,solarPV,2050,14.87500000000
+7,2075,R1,solarPV,2050,14.87500000000
+7,2079,R1,solarPV,2050,14.87500000000
+8,2025,R1,windturbine,2020,8.37500000000
+8,2030,R1,windturbine,2020,8.37500000000
+8,2035,R1,windturbine,2020,8.37500000000
+8,2040,R1,windturbine,2020,8.37500000000
+8,2045,R1,windturbine,2020,8.37500000000
+8,2049,R1,windturbine,2020,8.37500000000
+9,2030,R1,windturbine,2025,0.81250000000
+9,2035,R1,windturbine,2025,0.81250000000
+9,2040,R1,windturbine,2025,0.81250000000
+9,2045,R1,windturbine,2025,0.81250000000
+9,2049,R1,windturbine,2025,0.81250000000
+9,2050,R1,windturbine,2025,0.81250000000
+9,2054,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
index 6ced4e3e..bcdf148c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2020.csv
@@ -1,6 +1,6 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
index 6ced4e3e..9d7ceeff 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -1,6 +1,10 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
index 8c62e15f..b636c62a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2030.csv
@@ -1,9 +1,14 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
-2,2035,R1,heatpump,2030,68.00000000000
-2,2040,R1,heatpump,2030,68.00000000000
-2,2044,R1,heatpump,2030,68.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
index 8c62e15f..e9ff1ceb 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -1,9 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
-2,2035,R1,heatpump,2030,68.00000000000
-2,2040,R1,heatpump,2030,68.00000000000
-2,2044,R1,heatpump,2030,68.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
index fdaab67a..2d54c0aa 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2040.csv
@@ -1,12 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
-2,2035,R1,heatpump,2030,68.00000000000
-2,2040,R1,heatpump,2030,68.00000000000
-2,2044,R1,heatpump,2030,68.00000000000
-3,2045,R1,heatpump,2040,74.00000000000
-3,2050,R1,heatpump,2040,74.00000000000
-3,2054,R1,heatpump,2040,74.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
index fdaab67a..5924d03b 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -1,12 +1,26 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
-2,2035,R1,heatpump,2030,68.00000000000
-2,2040,R1,heatpump,2030,68.00000000000
-2,2044,R1,heatpump,2030,68.00000000000
-3,2045,R1,heatpump,2040,74.00000000000
-3,2050,R1,heatpump,2040,74.00000000000
-3,2054,R1,heatpump,2040,74.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
+6,2050,R1,heatpump,2045,23.00000000000
+6,2054,R1,heatpump,2045,23.00000000000
+6,2055,R1,heatpump,2045,23.00000000000
+6,2059,R1,heatpump,2045,23.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
index 40fee66e..be30eaf2 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -1,14 +1,30 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasboiler,2020,10.00000000000
 0,2025,R1,gasboiler,2020,5.00000000000
-1,2025,R1,heatpump,2020,59.50000000000
-1,2030,R1,heatpump,2020,59.50000000000
-1,2034,R1,heatpump,2020,59.50000000000
-2,2035,R1,heatpump,2030,68.00000000000
-2,2040,R1,heatpump,2030,68.00000000000
-2,2044,R1,heatpump,2030,68.00000000000
-3,2045,R1,heatpump,2040,74.00000000000
-3,2050,R1,heatpump,2040,74.00000000000
-3,2054,R1,heatpump,2040,74.00000000000
-4,2055,R1,heatpump,2050,77.00000000000
-4,2064,R1,heatpump,2050,77.00000000000
+1,2025,R1,heatpump,2020,19.00000000000
+1,2030,R1,heatpump,2020,19.00000000000
+1,2034,R1,heatpump,2020,19.00000000000
+2,2030,R1,heatpump,2025,11.00000000000
+2,2034,R1,heatpump,2025,11.00000000000
+2,2035,R1,heatpump,2025,11.00000000000
+2,2039,R1,heatpump,2025,11.00000000000
+3,2035,R1,heatpump,2030,25.00000000000
+3,2039,R1,heatpump,2030,25.00000000000
+3,2040,R1,heatpump,2030,25.00000000000
+3,2044,R1,heatpump,2030,25.00000000000
+4,2040,R1,heatpump,2035,17.00000000000
+4,2044,R1,heatpump,2035,17.00000000000
+4,2045,R1,heatpump,2035,17.00000000000
+4,2049,R1,heatpump,2035,17.00000000000
+5,2045,R1,heatpump,2040,31.00000000000
+5,2049,R1,heatpump,2040,31.00000000000
+5,2050,R1,heatpump,2040,31.00000000000
+5,2054,R1,heatpump,2040,31.00000000000
+6,2050,R1,heatpump,2045,23.00000000000
+6,2054,R1,heatpump,2045,23.00000000000
+6,2055,R1,heatpump,2045,23.00000000000
+6,2059,R1,heatpump,2045,23.00000000000
+7,2055,R1,heatpump,2050,31.00000000000
+7,2059,R1,heatpump,2050,31.00000000000
+7,2060,R1,heatpump,2050,31.00000000000
+7,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index 54de8901..7b8c4061 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
 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.10340000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.23000000000
+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,6.68840000000
+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.15500000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.84500000000
+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,10.03260000000
+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.10340000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.23000000000
+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,6.68840000000
+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.15500000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.84500000000
+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,10.03260000000
+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.31010000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.68990000000
+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,20.06510000000
+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.20670000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.45990000000
+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,13.37670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index 1cc95438..b07adde6 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,25 +1,31 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.10340000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.23000000000
-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,6.68840000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.15500000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.84500000000
-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,10.03260000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.10340000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.23000000000
-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,6.68840000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.15500000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.84500000000
-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,10.03260000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.31010000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.68990000000
-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,20.06510000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.20670000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.45990000000
-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,13.37670000000
+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,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.61110000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,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.91670000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,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.61110000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,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.91670000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,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.83330000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,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,1.22220000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index 33c6a1bf..33951ce2 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,13 +1,25 @@
 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,2,R1,all-year,all-week,night,heatpump,2030,2.00000000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,2.50000000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,3.00000000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.66670000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,2.00000000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,2.50000000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,3.00000000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,5.00000000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,6.00000000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,3.33330000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,4.00000000000
+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.61110000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.91670000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.61110000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.91670000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.83330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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,1.22220000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index 870af7b7..c606a299 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,13 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,2.00000000000
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.33330000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,3.00000000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.50000000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,2.00000000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.33330000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,3.00000000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.50000000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,6.00000000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,7.00000000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,4.00000000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.66670000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.94440000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.41670000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.94440000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.41670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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.83330000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+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.88890000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index ee789ddb..d66038bc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,13 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.33330000000
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.66670000000
-1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.50000000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,4.00000000000
-2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.33330000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.66670000000
-3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.50000000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,4.00000000000
-4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,7.00000000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,8.00000000000
-5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.66670000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.33330000000
+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.94440000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+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.41670000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+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.94440000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+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.41670000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+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.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+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.88890000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index 4148e836..2f0389d3 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,13 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.66670000000
-0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,3.00000000000
-1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,4.00000000000
-1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.50000000000
-2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.66670000000
-2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,3.00000000000
-3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,4.00000000000
-3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.50000000000
-4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,8.00000000000
-4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,9.00000000000
-5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.33330000000
-5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,6.00000000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 19c87e9b..3b6658d8 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,13 +1,25 @@
 timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,3.00000000000
-0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,3.00000000000
-1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.50000000000
-1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,4.50000000000
-2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,3.00000000000
-2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,3.00000000000
-3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.50000000000
-3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,4.50000000000
-4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,9.00000000000
-4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,9.00000000000
-5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,6.00000000000
-5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,6.00000000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index d6dd8abe..a0e0cd7c 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 3778d007..3f0ba229 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index f6665d25..809cb60a 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 358609af..6507bf44 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 2  # Optional, defaults to 5
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index f6665d25..809cb60a 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index ba2fb16b..df473010 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -60,7 +60,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 8a993c14..a59baa1c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -62,7 +62,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
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 ff007065..bb34a24d 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,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,18.27480000000
-0,2030,R1,gassupply1,2020,10.77480000000
-0,2035,R1,gassupply1,2020,3.27480000000
-0,2040,R1,gassupply1,2020,3.27480000000
-0,2045,R1,gassupply1,2020,3.27480000000
-0,2050,R1,gassupply1,2020,3.27480000000
-0,2059,R1,gassupply1,2020,3.27480000000
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 33bbbed3..bb34a24d 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,9 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 33bbbed3..bb34a24d 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,9 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 33bbbed3..bb34a24d 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,9 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 33bbbed3..bb34a24d 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,9 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 33bbbed3..bb34a24d 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,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
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 33bbbed3..bb34a24d 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,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
+0,2025,R1,gassupply1,2020,20.54670000000
+0,2030,R1,gassupply1,2020,13.04670000000
+0,2035,R1,gassupply1,2020,5.54670000000
+0,2040,R1,gassupply1,2020,5.54670000000
+0,2045,R1,gassupply1,2020,5.54670000000
+0,2050,R1,gassupply1,2020,5.54670000000
+0,2059,R1,gassupply1,2020,5.54670000000
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 d3ebc278..1fa3b0b5 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
@@ -4,40 +4,35 @@ A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
 A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
-A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
-A1,15.42960000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
+A1,20.54670000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
 A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
 A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
-A1,2.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
-A1,7.92960000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
+A1,1.00000000000,R1,55,2025,R1,power,windturbine,newcapa,2030
+A1,13.04670000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
 A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
 A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
-A1,2.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
-A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
-A1,0.42960000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
+A1,1.00000000000,R1,85,2025,R1,power,windturbine,newcapa,2035
+A1,1.00000000000,R1,86,2030,R1,power,windturbine,newcapa,2035
+A1,5.54670000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
 A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
 A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
-A1,0.42960000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
+A1,1.00000000000,R1,121,2025,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,122,2030,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,123,2035,R1,power,windturbine,newcapa,2040
+A1,5.54670000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
 A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
 A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
-A1,0.42960000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
+A1,1.00000000000,R1,163,2025,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,164,2030,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,165,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,166,2040,R1,power,windturbine,newcapa,2045
+A1,5.54670000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
 A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
 A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-A1,2.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
-A1,0.42960000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
+A1,1.00000000000,R1,218,2025,R1,power,windturbine,newcapa,2050
+A1,1.00000000000,R1,219,2030,R1,power,windturbine,newcapa,2050
+A1,1.00000000000,R1,220,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,221,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,222,2045,R1,power,windturbine,newcapa,2050
+A1,5.54670000000,R1,6,2020,R1,gas,gassupply1,newcapa,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 1f41565b..95252e87 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
@@ -17,18 +17,12 @@ A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,R1,49,2020.00000000
 A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
 A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,R1,61,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
 A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.47007407407,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.14074074074,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,R1,17,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,R1,33,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.67000000000,R1,65,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,CONSUMABLE|ENERGY,gas,1.41022222222,R1,81,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
 A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
 A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
 A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
@@ -41,18 +35,12 @@ A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,R1,68,2020.
 A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
 A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
 A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.22222222222,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44444444444,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.22222222222,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44444444444,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,71,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.33333333333,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.44444444444,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.88888888889,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,63,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,135,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
 A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
 A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
 A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,R1,28,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
@@ -65,24 +53,18 @@ A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,R1,88,2025.
 A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,92,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
 A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,R1,108,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
 A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,112,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.16000000000,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.16000000000,R1,47,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,87,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.96000000000,R1,91,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.96000000000,R1,95,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,107,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,115,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,87,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,R1,119,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,143,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,R1,151,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,175,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,183,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
 A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,R1,12,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
 A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
 A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,R1,36,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
@@ -95,30 +77,24 @@ A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,R1,108,2030
 A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,112,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
 A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,R1,132,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
 A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,136,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,35,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,39,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,43,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,59,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,63,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,67,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,R1,79,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,83,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,87,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,91,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,R1,127,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,131,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,135,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,R1,139,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,31,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,63,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,71,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,95,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,135,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,143,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,R1,151,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,175,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,183,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,R1,191,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,215,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,223,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,R1,231,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
 A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,R1,16,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
 A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
 A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,R1,44,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
@@ -131,36 +107,30 @@ A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,128,2035
 A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,132,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
 A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,156,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
 A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,160,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.11851851852,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,47,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,51,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.11851851852,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,79,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,R1,91,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,95,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,99,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,103,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,107,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.35555555556,R1,119,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.71111111111,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.23703703704,R1,147,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,151,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,155,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,159,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.47407407407,R1,163,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,R1,31,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,63,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,79,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,R1,111,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,R1,119,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,R1,127,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,159,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,167,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,R1,175,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,183,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,207,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,215,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,R1,223,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.28000000000,R1,231,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,R1,255,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,R1,263,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,R1,271,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.85333333333,R1,279,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
 A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,R1,20,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
 A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,R1,24,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
 A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,R1,52,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
@@ -173,33 +143,33 @@ A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,R1,148,2040
 A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,R1,152,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
 A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,R1,180,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
 A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,R1,184,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,11,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,15,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,19,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,23,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,27,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,47,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,51,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,55,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,59,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.24000000000,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,119,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.36000000000,R1,123,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,139,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,143,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,147,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,151,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.72000000000,R1,155,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,171,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,175,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,179,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,183,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,6.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.48000000000,R1,187,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,R1,15,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,R1,23,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,R1,31,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,11.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,47,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,95,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,11.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,103,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,R1,135,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,R1,143,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,151,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,11.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,159,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,R1,183,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,R1,191,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,R1,199,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,207,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,11.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,215,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,239,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,247,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,R1,255,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.02857142857,R1,263,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,11.00000000000,newcapa,CONSUMABLE|ENERGY,wind,1.02857142857,R1,271,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,295,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,5.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,303,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,7.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,R1,311,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,9.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.68571428571,R1,319,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,11.00000000000,newcapa,CONSUMABLE|ENERGY,wind,0.68571428571,R1,327,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 4fc23b3b..5cbfb015 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
@@ -35,29 +35,23 @@ A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,57,2020.00000000000,R1,re
 A1,0.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,66,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
 A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,67,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
 A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,69,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.21111111111,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,19.35255555556,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.21111111111,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.28148148148,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.14074074074,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,25.80340740741,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.31666666667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.31666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,29.02883333333,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.63333333333,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.63333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,58.05766666667,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.42222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,8,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,0.63333333333,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,24,2020.00000000000,R1,power,58.05766666667,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.42222222222,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,40,2020.00000000000,R1,power,38.70511111111,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.63333333333,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,56,2020.00000000000,R1,power,58.05766666667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,1.00000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,72,2020.00000000000,R1,power,91.67000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.84444444444,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,R1,88,2020.00000000000,R1,power,77.41022222222,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.02733333333,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.54100000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
 A1,0.00000000000,newcapa,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,newcapa,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,newcapa,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,newcapa,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,1.54100000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,3.08200000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
 A1,0.00000000000,newcapa,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
 A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.09195402299,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
 A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.57471264368,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
@@ -71,18 +65,12 @@ A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residenti
 A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.72413793103,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
 A1,1.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.18390804598,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
 A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,1.14942528736,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,17,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,18,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2020.00000000000,R1,power,0.22222222222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.33333333333,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,65,2020.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,1.33333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.44444444444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.88888888889,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.66666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,27,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2025.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2025.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
 A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,12,2025.00000000000,R1,residential,0.55555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
 A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,13,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
 A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,32,2025.00000000000,R1,residential,0.83333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
@@ -95,24 +83,18 @@ A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,92,2025.00000000000,R1,residenti
 A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,93,2030.00000000000,R1,residential,4.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
 A1,2.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2025.00000000000,R1,residential,1.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
 A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,113,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.16000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,21,2020.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,22,2025.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,23,2030.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,41,2020.00000000000,R1,power,0.16000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,42,2025.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,43,2030.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,62,2025.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2030.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,81,2020.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,82,2025.00000000000,R1,power,0.96000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,83,2030.00000000000,R1,power,0.96000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2025.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,103,2030.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,35,2025.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2030.00000000000,R1,power,0.50000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,69,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2025.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2030.00000000000,R1,power,0.60000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,131,2025.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,133,2030.00000000000,R1,power,1.00000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2025.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
 A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,15,2030.00000000000,R1,residential,1.44444444444,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
 A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,16,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
 A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,39,2030.00000000000,R1,residential,2.16666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
@@ -125,30 +107,24 @@ A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,111,2030.00000000000,R1,resident
 A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,112,2035.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
 A1,3.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,135,2030.00000000000,R1,residential,2.88888888889,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
 A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,136,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,26,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,27,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,28,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.13333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,50,2025.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2030.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,52,2035.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,73,2020.00000000000,R1,power,0.20000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,74,2025.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,75,2030.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,76,2035.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,97,2020.00000000000,R1,power,0.40000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.80000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.26666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,122,2025.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2030.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,124,2035.00000000000,R1,power,0.53333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,7,2035.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,43,2025.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,45,2030.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,47,2035.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,83,2025.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,85,2030.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,87,2035.00000000000,R1,power,0.31111111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,125,2030.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,127,2035.00000000000,R1,power,0.46666666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2025.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2030.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,167,2035.00000000000,R1,power,0.93333333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,203,2025.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,205,2030.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,207,2035.00000000000,R1,power,0.62222222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
 A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,18,2035.00000000000,R1,residential,0.88888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
 A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,19,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
 A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,46,2035.00000000000,R1,residential,1.33333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
@@ -161,36 +137,30 @@ A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,130,2035.00000000000,R1,resident
 A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,131,2040.00000000000,R1,residential,5.33333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
 A1,4.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,158,2035.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
 A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,159,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.11851851852,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,29,2020.00000000000,R1,power,0.17777777778,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,30,2025.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,31,2030.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,32,2035.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,33,2040.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,57,2020.00000000000,R1,power,0.11851851852,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,58,2025.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,59,2030.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,60,2035.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2040.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,85,2020.00000000000,R1,power,0.17777777778,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,86,2025.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,87,2030.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,88,2035.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,89,2040.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,113,2020.00000000000,R1,power,0.35555555556,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,114,2025.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,115,2030.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,116,2035.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,117,2040.00000000000,R1,power,0.71111111111,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.23703703704,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,142,2025.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,143,2030.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,144,2035.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,145,2040.00000000000,R1,power,0.47407407407,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.21333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.21333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,7,2035.00000000000,R1,power,0.21333333333,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,9,2040.00000000000,R1,power,0.42666666667,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,51,2025.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,53,2030.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,55,2035.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,57,2040.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2025.00000000000,R1,power,0.21333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2030.00000000000,R1,power,0.21333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,103,2035.00000000000,R1,power,0.21333333333,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,105,2040.00000000000,R1,power,0.42666666667,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,147,2025.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,149,2030.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,151,2035.00000000000,R1,power,0.32000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,153,2040.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,195,2025.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,197,2030.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,199,2035.00000000000,R1,power,0.64000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,201,2040.00000000000,R1,power,1.28000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,243,2025.00000000000,R1,power,0.42666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,245,2030.00000000000,R1,power,0.42666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,247,2035.00000000000,R1,power,0.42666666667,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,249,2040.00000000000,R1,power,0.85333333333,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
 A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,21,2040.00000000000,R1,residential,1.77777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
 A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,22,2045.00000000000,R1,residential,1.22222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
 A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,53,2040.00000000000,R1,residential,2.66666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
@@ -203,33 +173,33 @@ A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,149,2040.00000000000,R1,resident
 A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,150,2045.00000000000,R1,residential,3.66666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
 A1,5.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,181,2040.00000000000,R1,residential,3.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
 A1,6.00000000000,newcapa,PRODUCT|ENERGY,heat,R1,182,2045.00000000000,R1,residential,2.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2030.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,4,2035.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2040.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,6,2045.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,34,2025.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,35,2030.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,36,2035.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,37,2040.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,38,2045.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,66,2025.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2030.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,68,2035.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,69,2040.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,70,2045.00000000000,R1,power,0.24000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,98,2025.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,99,2030.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,100,2035.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,101,2040.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,102,2045.00000000000,R1,power,0.36000000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,130,2025.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,131,2030.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,132,2035.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,133,2040.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,134,2045.00000000000,R1,power,0.72000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,162,2025.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,163,2030.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,164,2035.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,165,2040.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,6.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,166,2045.00000000000,R1,power,0.48000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.17142857143,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,5,2030.00000000000,R1,power,0.17142857143,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,7,2035.00000000000,R1,power,0.17142857143,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,9,2040.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,11.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,11,2045.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,59,2025.00000000000,R1,power,0.25714285714,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,61,2030.00000000000,R1,power,0.25714285714,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,63,2035.00000000000,R1,power,0.25714285714,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,65,2040.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,11.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,67,2045.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,115,2025.00000000000,R1,power,0.17142857143,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,117,2030.00000000000,R1,power,0.17142857143,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,119,2035.00000000000,R1,power,0.17142857143,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,121,2040.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,11.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,123,2045.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,171,2025.00000000000,R1,power,0.25714285714,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,173,2030.00000000000,R1,power,0.25714285714,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,175,2035.00000000000,R1,power,0.25714285714,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,177,2040.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,11.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,179,2045.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,227,2025.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,229,2030.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,231,2035.00000000000,R1,power,0.51428571429,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,233,2040.00000000000,R1,power,1.02857142857,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,11.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,235,2045.00000000000,R1,power,1.02857142857,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,283,2025.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,5.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,285,2030.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,7.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,287,2035.00000000000,R1,power,0.34285714286,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,9.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,289,2040.00000000000,R1,power,0.68571428571,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,11.00000000000,newcapa,PRODUCT|ENERGY,electricity,R1,291,2045.00000000000,R1,power,0.68571428571,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/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index a6f115e1..29ec2b0b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.28530000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.03380000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,2.31300000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.55980000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06030000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,3.46940000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.78690000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07210000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.54220000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06030000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,3.46940000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.08440000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12060000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.93890000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,6.31150000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.12510000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.06920000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.09520000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.11660000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.17160000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.14290000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.24420000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14290000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2030
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16960000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.14290000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.24420000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.60620000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.14290000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.90480000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.14290000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2030
 "('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.07210000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02790000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.18020000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04460000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14410000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10810000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04460000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.18020000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08930000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.14410000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.05950000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02690000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04690000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04260000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09380000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05960000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2045
 "('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2045
 "('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2045
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2045
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2045
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2045
 "('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2050
 "('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2050
 "('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2050
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2050
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2050
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2050
 "('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 1cdc9617..c4df69fe 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,3 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
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 76d5d485..124d5700 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,16 +1,10 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,2
-2,2035,R1,windturbine,2025,2
-2,2040,R1,windturbine,2025,2
-2,2045,R1,windturbine,2025,2
-2,2049,R1,windturbine,2025,2
-2,2050,R1,windturbine,2025,2
-2,2054,R1,windturbine,2025,2
+3,2030,R1,windturbine,2025,1
+3,2035,R1,windturbine,2025,1
+3,2040,R1,windturbine,2025,1
+3,2045,R1,windturbine,2025,1
+3,2049,R1,windturbine,2025,1
+3,2050,R1,windturbine,2025,1
+3,2054,R1,windturbine,2025,1
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 d6618461..2fb46add 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,24 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,2
-2,2035,R1,windturbine,2025,2
-2,2040,R1,windturbine,2025,2
-2,2045,R1,windturbine,2025,2
-2,2049,R1,windturbine,2025,2
-2,2050,R1,windturbine,2025,2
-2,2054,R1,windturbine,2025,2
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
+4,2030,R1,windturbine,2025,1
+4,2035,R1,windturbine,2025,1
+4,2040,R1,windturbine,2025,1
+4,2045,R1,windturbine,2025,1
+4,2049,R1,windturbine,2025,1
+4,2050,R1,windturbine,2025,1
+4,2054,R1,windturbine,2025,1
+5,2035,R1,windturbine,2030,1
+5,2040,R1,windturbine,2030,1
+5,2045,R1,windturbine,2030,1
+5,2049,R1,windturbine,2030,1
+5,2050,R1,windturbine,2030,1
+5,2054,R1,windturbine,2030,1
+5,2055,R1,windturbine,2030,1
+5,2059,R1,windturbine,2030,1
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 b4e690fa..ff9768e7 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,33 +1,27 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,2
-2,2035,R1,windturbine,2025,2
-2,2040,R1,windturbine,2025,2
-2,2045,R1,windturbine,2025,2
-2,2049,R1,windturbine,2025,2
-2,2050,R1,windturbine,2025,2
-2,2054,R1,windturbine,2025,2
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
+5,2030,R1,windturbine,2025,1
+5,2035,R1,windturbine,2025,1
+5,2040,R1,windturbine,2025,1
+5,2045,R1,windturbine,2025,1
+5,2049,R1,windturbine,2025,1
+5,2050,R1,windturbine,2025,1
+5,2054,R1,windturbine,2025,1
+6,2035,R1,windturbine,2030,1
+6,2040,R1,windturbine,2030,1
+6,2045,R1,windturbine,2030,1
+6,2049,R1,windturbine,2030,1
+6,2050,R1,windturbine,2030,1
+6,2054,R1,windturbine,2030,1
+6,2055,R1,windturbine,2030,1
+6,2059,R1,windturbine,2030,1
+7,2040,R1,windturbine,2035,1
+7,2045,R1,windturbine,2035,1
+7,2049,R1,windturbine,2035,1
+7,2050,R1,windturbine,2035,1
+7,2054,R1,windturbine,2035,1
+7,2055,R1,windturbine,2035,1
+7,2059,R1,windturbine,2035,1
+7,2060,R1,windturbine,2035,1
+7,2064,R1,windturbine,2035,1
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 07f25ec0..aeb13e4d 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,43 +1,37 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,2
-2,2035,R1,windturbine,2025,2
-2,2040,R1,windturbine,2025,2
-2,2045,R1,windturbine,2025,2
-2,2049,R1,windturbine,2025,2
-2,2050,R1,windturbine,2025,2
-2,2054,R1,windturbine,2025,2
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
+6,2030,R1,windturbine,2025,1
+6,2035,R1,windturbine,2025,1
+6,2040,R1,windturbine,2025,1
+6,2045,R1,windturbine,2025,1
+6,2049,R1,windturbine,2025,1
+6,2050,R1,windturbine,2025,1
+6,2054,R1,windturbine,2025,1
+7,2035,R1,windturbine,2030,1
+7,2040,R1,windturbine,2030,1
+7,2045,R1,windturbine,2030,1
+7,2049,R1,windturbine,2030,1
+7,2050,R1,windturbine,2030,1
+7,2054,R1,windturbine,2030,1
+7,2055,R1,windturbine,2030,1
+7,2059,R1,windturbine,2030,1
+8,2040,R1,windturbine,2035,1
+8,2045,R1,windturbine,2035,1
+8,2049,R1,windturbine,2035,1
+8,2050,R1,windturbine,2035,1
+8,2054,R1,windturbine,2035,1
+8,2055,R1,windturbine,2035,1
+8,2059,R1,windturbine,2035,1
+8,2060,R1,windturbine,2035,1
+8,2064,R1,windturbine,2035,1
+9,2045,R1,windturbine,2040,2
+9,2049,R1,windturbine,2040,2
+9,2050,R1,windturbine,2040,2
+9,2054,R1,windturbine,2040,2
+9,2055,R1,windturbine,2040,2
+9,2059,R1,windturbine,2040,2
+9,2060,R1,windturbine,2040,2
+9,2064,R1,windturbine,2040,2
+9,2065,R1,windturbine,2040,2
+9,2069,R1,windturbine,2040,2
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 07e8e9f8..4bae2ba1 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,53 +1,47 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,2
-2,2035,R1,windturbine,2025,2
-2,2040,R1,windturbine,2025,2
-2,2045,R1,windturbine,2025,2
-2,2049,R1,windturbine,2025,2
-2,2050,R1,windturbine,2025,2
-2,2054,R1,windturbine,2025,2
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
-6,2050,R1,windturbine,2045,2
-6,2054,R1,windturbine,2045,2
-6,2055,R1,windturbine,2045,2
-6,2059,R1,windturbine,2045,2
-6,2060,R1,windturbine,2045,2
-6,2064,R1,windturbine,2045,2
-6,2065,R1,windturbine,2045,2
-6,2069,R1,windturbine,2045,2
-6,2070,R1,windturbine,2045,2
-6,2074,R1,windturbine,2045,2
+7,2030,R1,windturbine,2025,1
+7,2035,R1,windturbine,2025,1
+7,2040,R1,windturbine,2025,1
+7,2045,R1,windturbine,2025,1
+7,2049,R1,windturbine,2025,1
+7,2050,R1,windturbine,2025,1
+7,2054,R1,windturbine,2025,1
+8,2035,R1,windturbine,2030,1
+8,2040,R1,windturbine,2030,1
+8,2045,R1,windturbine,2030,1
+8,2049,R1,windturbine,2030,1
+8,2050,R1,windturbine,2030,1
+8,2054,R1,windturbine,2030,1
+8,2055,R1,windturbine,2030,1
+8,2059,R1,windturbine,2030,1
+9,2040,R1,windturbine,2035,1
+9,2045,R1,windturbine,2035,1
+9,2049,R1,windturbine,2035,1
+9,2050,R1,windturbine,2035,1
+9,2054,R1,windturbine,2035,1
+9,2055,R1,windturbine,2035,1
+9,2059,R1,windturbine,2035,1
+9,2060,R1,windturbine,2035,1
+9,2064,R1,windturbine,2035,1
+10,2045,R1,windturbine,2040,2
+10,2049,R1,windturbine,2040,2
+10,2050,R1,windturbine,2040,2
+10,2054,R1,windturbine,2040,2
+10,2055,R1,windturbine,2040,2
+10,2059,R1,windturbine,2040,2
+10,2060,R1,windturbine,2040,2
+10,2064,R1,windturbine,2040,2
+10,2065,R1,windturbine,2040,2
+10,2069,R1,windturbine,2040,2
+11,2050,R1,windturbine,2045,2
+11,2054,R1,windturbine,2045,2
+11,2055,R1,windturbine,2045,2
+11,2059,R1,windturbine,2045,2
+11,2060,R1,windturbine,2045,2
+11,2064,R1,windturbine,2045,2
+11,2065,R1,windturbine,2045,2
+11,2069,R1,windturbine,2045,2
+11,2070,R1,windturbine,2045,2
+11,2074,R1,windturbine,2045,2
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 b43e725c..33008623 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,63 +1,57 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
-2,2030,R1,windturbine,2025,2
-2,2035,R1,windturbine,2025,2
-2,2040,R1,windturbine,2025,2
-2,2045,R1,windturbine,2025,2
-2,2049,R1,windturbine,2025,2
-2,2050,R1,windturbine,2025,2
-2,2054,R1,windturbine,2025,2
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2054,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-4,2040,R1,windturbine,2035,2
-4,2045,R1,windturbine,2035,2
-4,2049,R1,windturbine,2035,2
-4,2050,R1,windturbine,2035,2
-4,2054,R1,windturbine,2035,2
-4,2055,R1,windturbine,2035,2
-4,2059,R1,windturbine,2035,2
-4,2060,R1,windturbine,2035,2
-4,2064,R1,windturbine,2035,2
-5,2045,R1,windturbine,2040,2
-5,2049,R1,windturbine,2040,2
-5,2050,R1,windturbine,2040,2
-5,2054,R1,windturbine,2040,2
-5,2055,R1,windturbine,2040,2
-5,2059,R1,windturbine,2040,2
-5,2060,R1,windturbine,2040,2
-5,2064,R1,windturbine,2040,2
-5,2065,R1,windturbine,2040,2
-5,2069,R1,windturbine,2040,2
-6,2050,R1,windturbine,2045,2
-6,2054,R1,windturbine,2045,2
-6,2055,R1,windturbine,2045,2
-6,2059,R1,windturbine,2045,2
-6,2060,R1,windturbine,2045,2
-6,2064,R1,windturbine,2045,2
-6,2065,R1,windturbine,2045,2
-6,2069,R1,windturbine,2045,2
-6,2070,R1,windturbine,2045,2
-6,2074,R1,windturbine,2045,2
-7,2055,R1,windturbine,2050,2
-7,2059,R1,windturbine,2050,2
-7,2060,R1,windturbine,2050,2
-7,2064,R1,windturbine,2050,2
-7,2065,R1,windturbine,2050,2
-7,2069,R1,windturbine,2050,2
-7,2070,R1,windturbine,2050,2
-7,2074,R1,windturbine,2050,2
-7,2075,R1,windturbine,2050,2
-7,2079,R1,windturbine,2050,2
+8,2030,R1,windturbine,2025,1
+8,2035,R1,windturbine,2025,1
+8,2040,R1,windturbine,2025,1
+8,2045,R1,windturbine,2025,1
+8,2049,R1,windturbine,2025,1
+8,2050,R1,windturbine,2025,1
+8,2054,R1,windturbine,2025,1
+9,2035,R1,windturbine,2030,1
+9,2040,R1,windturbine,2030,1
+9,2045,R1,windturbine,2030,1
+9,2049,R1,windturbine,2030,1
+9,2050,R1,windturbine,2030,1
+9,2054,R1,windturbine,2030,1
+9,2055,R1,windturbine,2030,1
+9,2059,R1,windturbine,2030,1
+10,2040,R1,windturbine,2035,1
+10,2045,R1,windturbine,2035,1
+10,2049,R1,windturbine,2035,1
+10,2050,R1,windturbine,2035,1
+10,2054,R1,windturbine,2035,1
+10,2055,R1,windturbine,2035,1
+10,2059,R1,windturbine,2035,1
+10,2060,R1,windturbine,2035,1
+10,2064,R1,windturbine,2035,1
+11,2045,R1,windturbine,2040,2
+11,2049,R1,windturbine,2040,2
+11,2050,R1,windturbine,2040,2
+11,2054,R1,windturbine,2040,2
+11,2055,R1,windturbine,2040,2
+11,2059,R1,windturbine,2040,2
+11,2060,R1,windturbine,2040,2
+11,2064,R1,windturbine,2040,2
+11,2065,R1,windturbine,2040,2
+11,2069,R1,windturbine,2040,2
+12,2050,R1,windturbine,2045,2
+12,2054,R1,windturbine,2045,2
+12,2055,R1,windturbine,2045,2
+12,2059,R1,windturbine,2045,2
+12,2060,R1,windturbine,2045,2
+12,2064,R1,windturbine,2045,2
+12,2065,R1,windturbine,2045,2
+12,2069,R1,windturbine,2045,2
+12,2070,R1,windturbine,2045,2
+12,2074,R1,windturbine,2045,2
+13,2055,R1,windturbine,2050,2
+13,2059,R1,windturbine,2050,2
+13,2060,R1,windturbine,2050,2
+13,2064,R1,windturbine,2050,2
+13,2065,R1,windturbine,2050,2
+13,2069,R1,windturbine,2050,2
+13,2070,R1,windturbine,2050,2
+13,2074,R1,windturbine,2050,2
+13,2075,R1,windturbine,2050,2
+13,2079,R1,windturbine,2050,2
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 9458e809..ce642a34 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,25 @@
 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.25110000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,23.01940000000
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.17110000000
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
 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.50220000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,46.03870000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.13110000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
 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.75330000000
-2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,69.05810000000
+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.50220000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,46.03870000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.13110000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
 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,1.00440000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,92.07740000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.26220000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
 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.25560000000
-5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,115.09680000000
+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 b59209fc..eb7cf766 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,19 @@
 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.22220000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.44440000000
-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.33330000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.66670000000
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
+0,3,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
+1,3,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
 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.22220000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.44440000000
-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.33330000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.66670000000
-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.66670000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.33330000000
+2,3,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
+3,3,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
+4,3,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
 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.44440000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.88890000000
+5,3,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
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 308dc155..3b5b32fb 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,19 @@
 timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.16000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.44440000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.32000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.32000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.33330000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.24000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.66670000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.48000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.48000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.22220000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.16000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.44440000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.32000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.32000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.33330000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.24000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.66670000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.48000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.48000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.66670000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.48000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.33330000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.96000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.96000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.44440000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.32000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.88890000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.64000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.64000000000
+0,4,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
+0,4,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
+0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+1,4,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,4,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
+2,4,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
+2,4,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
+2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+3,4,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,4,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
+3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+4,4,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,4,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
+5,4,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,4,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
+5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
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 8a37abea..eca7c9eb 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,31 @@
 timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.16000000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.32000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.26670000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.32000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.24000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.48000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.40000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.48000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.16000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.32000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.26670000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.32000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.24000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.48000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.40000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.48000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.48000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.96000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.80000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.96000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.32000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.64000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.53330000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.64000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
+0,5,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
+0,6,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,5,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
+1,6,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
+1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
+2,5,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
+2,6,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
+3,5,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
+3,6,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,5,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
+4,6,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
+4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
+5,5,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
+5,6,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
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 d486624b..b71f068d 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,43 @@
 timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.11850000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.26670000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.23700000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.23700000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.23700000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.23700000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.17780000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.40000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.35560000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.35560000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.35560000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35560000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.11850000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.26670000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.23700000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.23700000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23700000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23700000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.17780000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.40000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.35560000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.35560000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.35560000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35560000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.35560000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.80000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.71110000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.71110000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.71110000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.71110000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.23700000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.53330000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.47410000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.47410000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.47410000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47410000000
+0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
+0,6,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
+0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
+0,8,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
+0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
+1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
+1,6,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
+1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
+1,8,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
+1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
+2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
+2,6,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
+2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
+2,8,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
+2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
+3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
+3,6,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
+3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
+3,8,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
+3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
+4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
+4,6,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
+4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
+4,8,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
+4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
+5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
+5,6,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
+5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
+5,8,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
+5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
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 967c9114..bbbec449 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,55 @@
 timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.11850000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.23700000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.24000000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.23700000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.23700000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.23700000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.17780000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.35560000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.36000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.35560000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.35560000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35560000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.11850000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.23700000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.24000000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.23700000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23700000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23700000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.17780000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.35560000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.36000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.35560000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.35560000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35560000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.35560000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.71110000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.72000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.71110000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.71110000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.71110000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.23700000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.47410000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.48000000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.47410000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.47410000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47410000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
+0,7,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
+0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
+0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
+0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
+0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
+0,10,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
+0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
+0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
+1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
+1,7,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
+1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
+1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
+1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
+1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
+1,10,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
+1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
+1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
+2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
+2,7,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
+2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
+2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
+2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
+2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
+2,10,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
+2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
+2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
+3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
+3,7,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
+3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
+3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
+3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
+3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
+3,10,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
+3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
+3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
+4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
+4,7,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
+4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
+4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
+4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
+4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
+4,10,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
+4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
+4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
+5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
+5,7,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
+5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
+5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
+5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
+5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
+5,10,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
+5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
+5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
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 e2be8d72..ceb22ad2 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,month,day,hour,region,technology,installed,supply
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.24000000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.36000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.24000000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.36000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.72000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.48000000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
+0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
+0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
+0,9,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.15000000000
+0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
+0,10,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.15000000000
+0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
+0,11,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.30000000000
+0,12,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
+0,12,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.30000000000
+0,13,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.30000000000
+1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
+1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
+1,9,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.22500000000
+1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
+1,10,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.22500000000
+1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
+1,11,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.45000000000
+1,12,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
+1,12,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.45000000000
+1,13,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.45000000000
+2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
+2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
+2,9,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.15000000000
+2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
+2,10,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.15000000000
+2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
+2,11,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.30000000000
+2,12,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
+2,12,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.30000000000
+2,13,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.30000000000
+3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
+3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
+3,9,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.22500000000
+3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
+3,10,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.22500000000
+3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
+3,11,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.45000000000
+3,12,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
+3,12,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.45000000000
+3,13,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.45000000000
+4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
+4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
+4,9,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.45000000000
+4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
+4,10,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.45000000000
+4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
+4,11,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.90000000000
+4,12,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
+4,12,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.90000000000
+4,13,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.90000000000
+5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
+5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
+5,9,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.30000000000
+5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
+5,10,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.30000000000
+5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
+5,11,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.60000000000
+5,12,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
+5,12,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.60000000000
+5,13,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.60000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 8a993c14..a59baa1c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -62,7 +62,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limitting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5

From 7f9aaa15488d8b8ce50eb12ce7d69956a3ab8840 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 10:07:49 +0100
Subject: [PATCH 357/419] Fix typo

---
 docs/inputs/toml.rst                           |  2 +-
 .../1-introduction/settings.toml               |  2 +-
 .../2-scenario/settings.toml                   |  2 +-
 .../1-single-objective/settings.toml           |  2 +-
 .../2-multiple-objective/settings.toml         |  2 +-
 .../3-add-region/1-new-region/settings.toml    |  2 +-
 .../1-modify-timeslices/settings.toml          |  2 +-
 .../2-modify-time-framework/settings.toml      |  2 +-
 .../1-exogenous-demand/settings.toml           |  2 +-
 .../1-correlation/settings.toml                |  2 +-
 .../1-min-constraint/settings.toml             |  2 +-
 .../2-max-constraint/settings.toml             |  2 +-
 src/muse/constraints.py                        |  4 ++--
 src/muse/data/example/default/settings.toml    |  2 +-
 .../example/default_timeslice/settings.toml    |  2 +-
 tests/test_constraints.py                      | 18 ++++++++----------
 16 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index 670301ce..60d27fb3 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -546,7 +546,7 @@ to define the timeslice simply by referring to the slices it will use at each le
           specifying which technologies are considered for investment.
         - :py:func:`~muse.constraints.minimum_service`: a lower constraint for
           production for those technologies that need to keep a minimum production.
-        - :py:func:`~muse.constraints.demand_limitting_capacity`: limits the combined
+        - :py:func:`~muse.constraints.demand_limiting_capacity`: limits the combined
           capacity to be installed to the demand of the peak timeslice.
 
 
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index a0e0cd7c..145f1ecd 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index a0e0cd7c..145f1ecd 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index a0e0cd7c..145f1ecd 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index a0e0cd7c..145f1ecd 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 3f0ba229..89707c05 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 809cb60a..13d0af16 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 6507bf44..7204788a 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 2  # Optional, defaults to 5
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index 809cb60a..13d0af16 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index df473010..b1e4a3b5 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index a59baa1c..dba9af19 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -63,7 +63,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index a59baa1c..dba9af19 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -63,7 +63,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 492e0162..16c146f9 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -225,7 +225,7 @@ def factory(
             "demand",
             "search_space",
             "minimum_service",
-            "demand_limitting_capacity",
+            "demand_limiting_capacity",
         )
 
     def normalize(x) -> MutableMapping:
@@ -495,7 +495,7 @@ def max_production(
 
 
 @register_constraints
-def demand_limitting_capacity(
+def demand_limiting_capacity(
     demand_: xr.DataArray,
     assets: xr.Dataset,
     search_space: xr.DataArray,
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 93232313..35e8627a 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -61,7 +61,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index a59baa1c..dba9af19 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -63,7 +63,7 @@ constraints = [
     "demand",
     "search_space",
     "minimum_service",
-    "demand_limitting_capacity"
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index e992bee0..90794ea5 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -111,12 +111,10 @@ def max_capacity_expansion(market_demand, assets, search_space, market, technolo
 
 
 @fixture
-def demand_limitting_capacity(
-    market_demand, assets, search_space, market, technologies
-):
-    from muse.constraints import demand_limitting_capacity
+def demand_limiting_capacity(market_demand, assets, search_space, market, technologies):
+    from muse.constraints import demand_limiting_capacity
 
-    return demand_limitting_capacity(
+    return demand_limiting_capacity(
         market_demand, assets, search_space, market, technologies
     )
 
@@ -505,16 +503,16 @@ def test_max_production(max_production):
     assert (max_production.capacity <= 0).all()
 
 
-def test_demand_limitting_capacity(
-    demand_limitting_capacity, max_production, demand_constraint
+def test_demand_limiting_capacity(
+    demand_limiting_capacity, max_production, demand_constraint
 ):
-    assert demand_limitting_capacity.capacity.values == approx(
+    assert demand_limiting_capacity.capacity.values == approx(
         -max_production.capacity.max("timeslice").values
         if "timeslice" in max_production.capacity.dims
         else -max_production.capacity.values
     )
-    assert demand_limitting_capacity.production == 0
-    assert demand_limitting_capacity.b.values == approx(
+    assert demand_limiting_capacity.production == 0
+    assert demand_limiting_capacity.b.values == approx(
         demand_constraint.b.max("timeslice").values
         if "timeslice" in demand_constraint.b.dims
         else demand_constraint.b.values

From 0bd12ed40cf01a2b9cc7e029813d70c663e8860d Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 10:58:09 +0100
Subject: [PATCH 358/419] Preserve timeslice column in outputs

---
 .../Results/MCAMetric_Consumption.csv         | 590 ++++++------
 .../Results/MCAMetric_Supply.csv              | 878 +++++++++---------
 .../Results/MCAMetric_Consumption.csv         | 458 ++++-----
 .../Results/MCAMetric_Supply.csv              | 650 ++++++-------
 .../Results/MCAMetric_Consumption.csv         | 458 ++++-----
 .../Results/MCAMetric_Supply.csv              | 650 ++++++-------
 src/muse/outputs/mca.py                       |  27 +-
 .../MCAMetric_Consumption.csv                 | 458 ++++-----
 .../default_timeslice/MCAMetric_Supply.csv    | 650 ++++++-------
 .../minimum_service/MCAMetric_Supply.csv      | 410 ++++----
 10 files changed, 2607 insertions(+), 2622 deletions(-)

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 80927060..747a6ae3 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,295 +1,295 @@
-,agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-1,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-5,A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-8,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-10,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
-2,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-4,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
-5,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-7,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
-8,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-10,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
-11,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-13,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
-14,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-16,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2025
-17,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
-4,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
-5,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-6,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
-7,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
-8,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
-9,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-10,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
-11,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
-12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
-13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
-15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
-16,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
-17,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-18,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
-19,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
-20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2030
-21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2030
-23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2030
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
-5,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
-6,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-7,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
-8,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
-9,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
-10,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
-11,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-12,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
-13,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
-14,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
-15,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
-16,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-17,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
-18,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
-19,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
-20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
-21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
-23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
-24,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
-25,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2035
-26,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-27,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2035
-28,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2035
-29,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2035
-0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
-5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
-6,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
-7,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-8,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
-9,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
-10,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
-11,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
-12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
-13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
-15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
-16,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
-17,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
-18,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
-19,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-20,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
-21,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
-22,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
-23,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
-24,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
-25,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-26,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
-27,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
-28,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
-29,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
-30,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2040
-31,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-32,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2040
-33,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2040
-34,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2040
-35,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,MUS$2010/kt,2040
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
-5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
-6,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
-7,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
-8,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-9,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
-10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
-11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
-12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
-13,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
-14,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
-15,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-16,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
-17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
-18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
-19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
-20,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
-21,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
-22,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-23,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
-24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
-25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
-26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
-27,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
-28,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
-29,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-30,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
-31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
-32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
-33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
-34,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
-35,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,MUS$2010/kt,2045
-36,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-37,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2045
-38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2045
-39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2045
-40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,MUS$2010/kt,2045
-41,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,MUS$2010/kt,2045
-0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-2,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-4,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-8,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-10,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
-1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
-2,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
-5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,night,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
-6,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-7,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
-8,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
-9,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
-10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
-11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
-12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,morning,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
-13,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-14,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
-15,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
-16,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
-17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
-18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
-19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
-20,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-21,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
-22,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
-23,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
-24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
-25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
-26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
-27,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-28,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
-29,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
-30,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
-31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
-32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
-33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,1.12733333333,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
-34,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-35,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,MUS$2010/PJ,2050
-36,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,MUS$2010/kt,2050
-37,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,MUS$2010/kt,2050
-38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,MUS$2010/kt,2050
-39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,MUS$2010/kt,2050
-40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.75155555556,all-week,R1,evening,2045,all-year,R1,power,solarPV,MUS$2010/kt,2050
-41,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+,agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+1,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+5,A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+8,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+10,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
+2,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+4,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
+5,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+7,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
+8,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+10,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
+11,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+13,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
+14,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+16,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
+17,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+4,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+5,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+6,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
+7,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+8,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+9,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+10,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
+11,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
+15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+16,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+17,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+18,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
+19,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
+23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
+4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
+10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
+13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
+16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+5,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+6,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+7,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
+8,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+9,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+10,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+11,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+12,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
+13,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+14,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+15,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+16,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+17,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
+18,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+19,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
+23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+24,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+25,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+26,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+27,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
+28,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+29,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+6,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+7,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+8,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
+9,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+10,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+11,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
+15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+16,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+17,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+18,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+19,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+20,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
+21,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+22,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+23,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+24,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+25,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+26,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
+27,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+28,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+29,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+30,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+31,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+32,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
+33,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+34,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+35,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
+4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
+10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
+13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
+16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+6,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+7,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+8,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+9,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
+10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+13,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+14,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+15,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+16,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
+17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+20,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+21,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+22,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+23,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
+24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+27,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+28,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+29,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+30,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
+31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+34,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+35,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+36,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+37,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
+38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+41,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+2,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+4,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+8,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+10,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+2,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+6,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+7,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+8,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+9,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+13,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+14,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+15,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+16,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+20,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+21,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+22,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+23,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+27,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+28,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+29,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+30,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,1.12733333333,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+34,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+35,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+36,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+37,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.75155555556,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+41,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
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 bcfc0217..f2fe9d06 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,439 +1,439 @@
-,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-1,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
-9,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
-10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,MUS$2010/PJ,2020
-1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,MUS$2010/PJ,2020
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,MUS$2010/PJ,2020
-3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,MUS$2010/PJ,2020
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,MUS$2010/PJ,2020
-5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,MUS$2010/PJ,2020
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-2,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-3,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-4,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-9,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-10,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
-14,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
-15,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
-16,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
-17,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,MUS$2010/PJ,2025
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2025
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2025
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,MUS$2010/kt,2025
-4,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,MUS$2010/PJ,2025
-5,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2025
-6,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2025
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,MUS$2010/kt,2025
-8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,MUS$2010/PJ,2025
-9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2025
-10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2025
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,MUS$2010/kt,2025
-12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,MUS$2010/PJ,2025
-13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2025
-14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2025
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,MUS$2010/kt,2025
-16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2025
-17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2025
-18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2025
-19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2025
-20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,MUS$2010/PJ,2025
-21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2025
-22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2025
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,MUS$2010/kt,2025
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.40572222222,gassupply1,MUS$2010/PJ,2025
-1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.60858333333,gassupply1,MUS$2010/PJ,2025
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.40572222222,gassupply1,MUS$2010/PJ,2025
-3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.60858333333,gassupply1,MUS$2010/PJ,2025
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.21716666667,gassupply1,MUS$2010/PJ,2025
-5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.81144444444,gassupply1,MUS$2010/PJ,2025
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
-19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
-23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2030
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2030
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2030
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2030
-4,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2030
-5,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2030
-6,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2030
-7,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2030
-8,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2030
-9,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2030
-10,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2030
-11,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2030
-12,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2030
-13,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2030
-14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2030
-15,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2030
-16,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2030
-17,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2030
-18,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2030
-19,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2030
-20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2030
-21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2030
-22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2030
-23,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2030
-24,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2030
-25,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2030
-26,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2030
-27,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2030
-28,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2030
-29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2030
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2030
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2030
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2030
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2030
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2030
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2030
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2030
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2030
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.12500000000,gassupply1,MUS$2010/PJ,2030
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,MUS$2010/PJ,2030
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.75000000000,gassupply1,MUS$2010/PJ,2030
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,MUS$2010/PJ,2030
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
-19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2035
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2035
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2035
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2035
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2035
-5,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2035
-6,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2035
-7,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2035
-8,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2035
-9,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2035
-10,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2035
-11,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2035
-12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2035
-13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2035
-14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2035
-15,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2035
-16,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2035
-17,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2035
-18,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2035
-19,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2035
-20,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2035
-21,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2035
-22,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2035
-23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2035
-24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2035
-25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2035
-26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2035
-27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2035
-28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2035
-29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2035
-30,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2035
-31,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2035
-32,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2035
-33,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2035
-34,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2035
-35,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2035
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2035
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2035
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2035
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2035
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,MUS$2010/PJ,2035
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.37500000000,gassupply1,MUS$2010/PJ,2035
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,MUS$2010/PJ,2035
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.56250000000,gassupply1,MUS$2010/PJ,2035
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,MUS$2010/PJ,2035
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.12500000000,gassupply1,MUS$2010/PJ,2035
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,MUS$2010/PJ,2035
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.75000000000,gassupply1,MUS$2010/PJ,2035
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
-19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
-23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2040
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2040
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2040
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2040
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2040
-5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2040
-6,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2040
-7,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2040
-8,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2040
-9,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2040
-10,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2040
-11,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2040
-12,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2040
-13,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2040
-14,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2040
-15,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2040
-16,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2040
-17,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2040
-18,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2040
-19,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2040
-20,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2040
-21,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2040
-22,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2040
-23,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2040
-24,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2040
-25,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2040
-26,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2040
-27,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2040
-28,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2040
-29,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2040
-30,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2040
-31,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2040
-32,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2040
-33,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,MUS$2010/PJ,2040
-34,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2040
-35,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2040
-36,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2040
-37,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2040
-38,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2040
-39,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2040
-40,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,MUS$2010/PJ,2040
-41,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2040
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2040
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2040
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2040
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2040
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2040
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2040
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2040
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2040
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,MUS$2010/PJ,2040
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,MUS$2010/PJ,2040
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,MUS$2010/PJ,2040
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,MUS$2010/PJ,2040
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
-19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2045
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2045
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2045
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2045
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
-5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2045
-6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
-7,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2045
-8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2045
-9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2045
-10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2045
-11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2045
-12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
-13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2045
-14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
-15,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2045
-16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,MUS$2010/PJ,2045
-17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2045
-18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2045
-19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2045
-20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
-21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2045
-22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2045
-23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2045
-24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,MUS$2010/PJ,2045
-25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2045
-26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2045
-27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2045
-28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
-29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2045
-30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2045
-31,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2045
-32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,MUS$2010/PJ,2045
-33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2045
-34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2045
-35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2045
-36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2045
-37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,MUS$2010/PJ,2045
-38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2045
-39,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2045
-40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,MUS$2010/PJ,2045
-41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2045
-42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2045
-43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2045
-44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2045
-45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,MUS$2010/PJ,2045
-46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2045
-47,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2045
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2045
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2045
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2045
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2045
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,MUS$2010/PJ,2045
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,MUS$2010/PJ,2045
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,MUS$2010/PJ,2045
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,MUS$2010/PJ,2045
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,MUS$2010/PJ,2045
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,MUS$2010/PJ,2045
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,MUS$2010/PJ,2045
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,MUS$2010/PJ,2045
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-3,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
-10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
-11,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2050
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2050
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2050
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
-5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.37577777778,solarPV,MUS$2010/PJ,2050
-6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2050
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2050
-8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2050
-9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2050
-10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
-11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2050
-12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
-13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.56366666667,solarPV,MUS$2010/PJ,2050
-14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2050
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2050
-16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,MUS$2010/PJ,2050
-17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,MUS$2010/PJ,2050
-18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
-19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,MUS$2010/PJ,2050
-20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,MUS$2010/PJ,2050
-21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.37577777778,solarPV,MUS$2010/PJ,2050
-22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.15000000000,windturbine,MUS$2010/PJ,2050
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,MUS$2010/kt,2050
-24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,MUS$2010/PJ,2050
-25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,MUS$2010/PJ,2050
-26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
-27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,MUS$2010/PJ,2050
-28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,MUS$2010/PJ,2050
-29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.56366666667,solarPV,MUS$2010/PJ,2050
-30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.22500000000,windturbine,MUS$2010/PJ,2050
-31,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,MUS$2010/kt,2050
-32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,MUS$2010/PJ,2050
-33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,MUS$2010/PJ,2050
-34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2050
-35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,MUS$2010/PJ,2050
-36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,MUS$2010/PJ,2050
-37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,1.12733333333,solarPV,MUS$2010/PJ,2050
-38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.45000000000,windturbine,MUS$2010/PJ,2050
-39,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,MUS$2010/kt,2050
-40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,MUS$2010/PJ,2050
-41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,MUS$2010/PJ,2050
-42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2050
-43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,MUS$2010/PJ,2050
-44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,MUS$2010/PJ,2050
-45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.75155555556,solarPV,MUS$2010/PJ,2050
-46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.30000000000,windturbine,MUS$2010/PJ,2050
-47,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,MUS$2010/kt,2050
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.06799865084,gassupply1,MUS$2010/PJ,2050
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.18250134916,gassupply1,MUS$2010/PJ,2050
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.10199797625,gassupply1,MUS$2010/PJ,2050
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.27375202375,gassupply1,MUS$2010/PJ,2050
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.06799865084,gassupply1,MUS$2010/PJ,2050
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.18250134916,gassupply1,MUS$2010/PJ,2050
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.10199797625,gassupply1,MUS$2010/PJ,2050
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.27375202375,gassupply1,MUS$2010/PJ,2050
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.20399595251,gassupply1,MUS$2010/PJ,2050
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.54750404749,gassupply1,MUS$2010/PJ,2050
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.13599730167,gassupply1,MUS$2010/PJ,2050
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.36500269833,gassupply1,MUS$2010/PJ,2050
+,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+1,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+9,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
+1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
+3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
+5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+2,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+3,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+4,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+9,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+10,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+14,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+15,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+16,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+17,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2025
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2025
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2025
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2025
+4,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2025
+5,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2025
+6,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2025
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2025
+8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2025
+9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2025
+10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2025
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2025
+12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2025
+13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2025
+14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2025
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2025
+16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2025
+17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2025
+18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2025
+19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2025
+20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2025
+21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2025
+22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2025
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2025
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.40572222222,gassupply1,0,MUS$2010/PJ,2025
+1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.60858333333,gassupply1,1,MUS$2010/PJ,2025
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.40572222222,gassupply1,2,MUS$2010/PJ,2025
+3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.60858333333,gassupply1,3,MUS$2010/PJ,2025
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.21716666667,gassupply1,4,MUS$2010/PJ,2025
+5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.81144444444,gassupply1,5,MUS$2010/PJ,2025
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
+3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
+7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
+11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
+15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
+19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
+23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2030
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2030
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2030
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2030
+4,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2030
+5,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2030
+6,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2030
+7,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2030
+8,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2030
+9,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2030
+10,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2030
+11,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2030
+12,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2030
+13,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2030
+14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2030
+15,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2030
+16,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2030
+17,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2030
+18,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2030
+19,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2030
+20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030
+21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2030
+22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030
+23,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2030
+24,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030
+25,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2030
+26,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2030
+27,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2030
+28,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2030
+29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2030
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.37500000000,gassupply1,0,MUS$2010/PJ,2030
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,0,MUS$2010/PJ,2030
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.56250000000,gassupply1,1,MUS$2010/PJ,2030
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,1,MUS$2010/PJ,2030
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.37500000000,gassupply1,2,MUS$2010/PJ,2030
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,2,MUS$2010/PJ,2030
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.56250000000,gassupply1,3,MUS$2010/PJ,2030
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,3,MUS$2010/PJ,2030
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.12500000000,gassupply1,4,MUS$2010/PJ,2030
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,4,MUS$2010/PJ,2030
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.75000000000,gassupply1,5,MUS$2010/PJ,2030
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,5,MUS$2010/PJ,2030
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
+19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2035
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2035
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2035
+5,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035
+6,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035
+7,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2035
+8,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035
+9,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2035
+10,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2035
+11,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035
+12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035
+13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2035
+14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035
+15,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2035
+16,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2035
+17,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035
+18,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035
+19,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2035
+20,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035
+21,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2035
+22,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2035
+23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035
+24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035
+25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2035
+26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035
+27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2035
+28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2035
+29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035
+30,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035
+31,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2035
+32,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035
+33,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2035
+34,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2035
+35,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,0,MUS$2010/PJ,2035
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.37500000000,gassupply1,0,MUS$2010/PJ,2035
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,1,MUS$2010/PJ,2035
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.56250000000,gassupply1,1,MUS$2010/PJ,2035
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,2,MUS$2010/PJ,2035
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.37500000000,gassupply1,2,MUS$2010/PJ,2035
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,3,MUS$2010/PJ,2035
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.56250000000,gassupply1,3,MUS$2010/PJ,2035
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,4,MUS$2010/PJ,2035
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.12500000000,gassupply1,4,MUS$2010/PJ,2035
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,5,MUS$2010/PJ,2035
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.75000000000,gassupply1,5,MUS$2010/PJ,2035
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
+3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
+7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
+11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
+15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
+19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
+23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2040
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2040
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2040
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2040
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2040
+5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,0,MUS$2010/PJ,2040
+6,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2040
+7,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2040
+8,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2040
+9,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2040
+10,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2040
+11,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2040
+12,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,1,MUS$2010/PJ,2040
+13,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2040
+14,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2040
+15,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2040
+16,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2040
+17,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2040
+18,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2040
+19,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,2,MUS$2010/PJ,2040
+20,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2040
+21,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2040
+22,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2040
+23,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2040
+24,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2040
+25,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2040
+26,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,3,MUS$2010/PJ,2040
+27,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2040
+28,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2040
+29,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2040
+30,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2040
+31,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2040
+32,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2040
+33,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,4,MUS$2010/PJ,2040
+34,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2040
+35,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2040
+36,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2040
+37,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2040
+38,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2040
+39,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2040
+40,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,5,MUS$2010/PJ,2040
+41,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2040
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,0,MUS$2010/PJ,2040
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,0,MUS$2010/PJ,2040
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,1,MUS$2010/PJ,2040
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,1,MUS$2010/PJ,2040
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,2,MUS$2010/PJ,2040
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,2,MUS$2010/PJ,2040
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,3,MUS$2010/PJ,2040
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,3,MUS$2010/PJ,2040
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,4,MUS$2010/PJ,2040
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,4,MUS$2010/PJ,2040
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,5,MUS$2010/PJ,2040
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,5,MUS$2010/PJ,2040
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
+2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
+3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
+6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
+10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
+11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
+12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
+13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
+14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
+16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
+17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
+18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
+19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
+20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
+21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
+22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2045
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2045
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
+5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,0,MUS$2010/PJ,2045
+6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
+7,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045
+8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045
+9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2045
+10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045
+11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2045
+12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
+13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,1,MUS$2010/PJ,2045
+14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
+15,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045
+16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045
+17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2045
+18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045
+19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2045
+20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
+21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,2,MUS$2010/PJ,2045
+22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
+23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045
+24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045
+25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2045
+26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045
+27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2045
+28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
+29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,3,MUS$2010/PJ,2045
+30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
+31,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045
+32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045
+33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2045
+34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045
+35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2045
+36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
+37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,4,MUS$2010/PJ,2045
+38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
+39,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045
+40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045
+41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2045
+42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045
+43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2045
+44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
+45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,5,MUS$2010/PJ,2045
+46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
+47,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,0,MUS$2010/PJ,2045
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,0,MUS$2010/PJ,2045
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,1,MUS$2010/PJ,2045
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,1,MUS$2010/PJ,2045
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,2,MUS$2010/PJ,2045
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,2,MUS$2010/PJ,2045
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,3,MUS$2010/PJ,2045
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,3,MUS$2010/PJ,2045
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,4,MUS$2010/PJ,2045
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,4,MUS$2010/PJ,2045
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,5,MUS$2010/PJ,2045
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,5,MUS$2010/PJ,2045
+0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
+1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
+2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
+3,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
+4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
+5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
+6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
+7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
+8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
+9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
+10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
+11,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
+0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2050
+1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2050
+2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2050
+3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,0,MUS$2010/PJ,2050
+4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2050
+5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.37577777778,solarPV,0,MUS$2010/PJ,2050
+6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2050
+7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2050
+8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2050
+9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2050
+10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2050
+11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,1,MUS$2010/PJ,2050
+12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2050
+13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.56366666667,solarPV,1,MUS$2010/PJ,2050
+14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2050
+15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2050
+16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2050
+17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2050
+18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2050
+19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,2,MUS$2010/PJ,2050
+20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2050
+21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.37577777778,solarPV,2,MUS$2010/PJ,2050
+22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2050
+23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2050
+24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2050
+25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2050
+26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2050
+27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,3,MUS$2010/PJ,2050
+28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2050
+29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.56366666667,solarPV,3,MUS$2010/PJ,2050
+30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2050
+31,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2050
+32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2050
+33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2050
+34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2050
+35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,4,MUS$2010/PJ,2050
+36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2050
+37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,1.12733333333,solarPV,4,MUS$2010/PJ,2050
+38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2050
+39,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2050
+40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2050
+41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2050
+42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2050
+43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,5,MUS$2010/PJ,2050
+44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2050
+45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.75155555556,solarPV,5,MUS$2010/PJ,2050
+46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2050
+47,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2050
+0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.06799865084,gassupply1,0,MUS$2010/PJ,2050
+1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.18250134916,gassupply1,0,MUS$2010/PJ,2050
+2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.10199797625,gassupply1,1,MUS$2010/PJ,2050
+3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.27375202375,gassupply1,1,MUS$2010/PJ,2050
+4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.06799865084,gassupply1,2,MUS$2010/PJ,2050
+5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.18250134916,gassupply1,2,MUS$2010/PJ,2050
+6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.10199797625,gassupply1,3,MUS$2010/PJ,2050
+7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.27375202375,gassupply1,3,MUS$2010/PJ,2050
+8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.20399595251,gassupply1,4,MUS$2010/PJ,2050
+9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.54750404749,gassupply1,4,MUS$2010/PJ,2050
+10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.13599730167,gassupply1,5,MUS$2010/PJ,2050
+11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.36500269833,gassupply1,5,MUS$2010/PJ,2050
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 33cb2ba9..4e06e1ae 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,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
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 a503ba6f..ba9bb550 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,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,MUS$2010/PJ,2050
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,0,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,1,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,2,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,3,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,4,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,5,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,0,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,2,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,3,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,4,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,5,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,0,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,2,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,3,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,4,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,5,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,0,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,1,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,2,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,3,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,4,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,5,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,0,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,0,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,0,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,1,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,1,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,2,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,2,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,2,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,3,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,3,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,3,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,4,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,4,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,4,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,5,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,5,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,5,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,0,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,0,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,0,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,1,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,1,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,1,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,2,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,2,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,2,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,3,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,3,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,3,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,4,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,4,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,4,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,5,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,5,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,5,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,0,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,0,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,0,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,0,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,0,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,1,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,1,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,1,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,1,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,1,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,2,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,2,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,2,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,2,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,2,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,3,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,3,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,3,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,3,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,3,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,4,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,4,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,4,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,4,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,4,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,5,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,5,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,5,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,5,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,5,MUS$2010/PJ,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 41161810..06d0d943 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,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.29933962264,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.24297693920,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.63039735099,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25584988962,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.42026490066,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.17056659308,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.44900943396,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.36446540881,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.89801886792,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.72893081761,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.59867924528,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.48595387841,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.73008317930,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.99658348737,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.48672211953,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66438899158,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57971201589,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.79132274081,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.75563190996,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38647467726,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.52754849388,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.50375460664,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.52391847105,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.71516302770,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.68290720926,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.81734462532,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.34927898070,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.47677535180,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45527147284,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.54489641688,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.46361751743,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.63285057844,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.60430727773,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.72327147640,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.71528648334,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.30907834495,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.42190038562,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.40287151849,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48218098427,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.47685765556,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.64842582327,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.61918003621,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74107209271,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.73289057897,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.85843146883,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.43228388218,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41278669081,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49404806181,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48859371932,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.57228764589,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.29933962264,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.24297693920,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.63039735099,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25584988962,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.42026490066,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.17056659308,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.44900943396,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.36446540881,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.89801886792,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.72893081761,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.59867924528,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.48595387841,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.73008317930,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.99658348737,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.48672211953,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66438899158,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57971201589,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.79132274081,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.75563190996,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38647467726,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.52754849388,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.50375460664,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.52391847105,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.71516302770,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.68290720926,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.81734462532,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.34927898070,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.47677535180,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45527147284,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.54489641688,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.46361751743,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.63285057844,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.60430727773,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.72327147640,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.71528648334,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.30907834495,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.42190038562,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.40287151849,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48218098427,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.47685765556,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.64842582327,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.61918003621,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74107209271,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.73289057897,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.85843146883,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.43228388218,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41278669081,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49404806181,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48859371932,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.57228764589,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
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 4f4464d5..1b999426 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,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17924528302,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24297693920,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,16.43141509434,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.37748344371,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.25584988962,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,34.60390728477,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.25165562914,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17056659308,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,23.06927152318,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26886792453,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36446540881,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,24.64712264151,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.53773584906,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.72893081761,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,49.29424528302,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.35849056604,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48595387841,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,32.86283018868,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24336105977,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33219449579,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.36504158965,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.49829174368,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.24336105977,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33219449579,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36504158965,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.49829174368,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.73008317930,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.99658348737,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48672211953,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66438899158,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.19323733863,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.26377424694,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.25187730332,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.28985600794,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.39566137041,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.37781595498,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.19323733863,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.26377424694,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.25187730332,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.28985600794,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.39566137041,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.37781595498,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.57971201589,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.79132274081,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.75563190996,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.38647467726,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.52754849388,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.50375460664,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17463949035,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.23838767590,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.22763573642,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.27244820844,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.26195923553,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.35758151385,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.34145360463,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40867231266,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17463949035,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.23838767590,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.22763573642,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.27244820844,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26195923553,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.35758151385,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.34145360463,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40867231266,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.52391847105,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.71516302770,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.68290720926,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.81734462532,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.34927898070,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.47677535180,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.45527147284,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.54489641688,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15453917248,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21095019281,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20143575924,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24109049213,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.23842882778,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23180875871,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.31642528922,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30215363886,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.36163573820,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.35764324167,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15453917248,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21095019281,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20143575924,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24109049213,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.23842882778,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23180875871,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.31642528922,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30215363886,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.36163573820,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.35764324167,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46361751743,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.63285057844,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.60430727773,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.72327147640,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.71528648334,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30907834495,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.42190038562,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.40287151849,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.48218098427,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.47685765556,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21614194109,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20639334540,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24702403090,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.24429685966,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.28614382294,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.32421291164,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30959001810,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37053604636,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.36644528949,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.42921573441,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21614194109,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20639334540,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24702403090,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.24429685966,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.28614382294,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.32421291164,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30959001810,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37053604636,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.36644528949,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.42921573441,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.64842582327,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.61918003621,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74107209271,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.73289057897,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.85843146883,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.43228388218,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41278669081,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49404806181,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.48859371932,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.57228764589,windturbine,MUS$2010/PJ,2050
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17924528302,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24297693920,windturbine,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,16.43141509434,gasCCGT,0,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.37748344371,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.25584988962,windturbine,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,34.60390728477,gasCCGT,1,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.25165562914,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17056659308,windturbine,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,23.06927152318,gasCCGT,2,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26886792453,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36446540881,windturbine,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,24.64712264151,gasCCGT,3,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.53773584906,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.72893081761,windturbine,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,49.29424528302,gasCCGT,4,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.35849056604,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48595387841,windturbine,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,32.86283018868,gasCCGT,5,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24336105977,windturbine,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33219449579,windturbine,0,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.36504158965,windturbine,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.49829174368,windturbine,1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.24336105977,windturbine,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33219449579,windturbine,2,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36504158965,windturbine,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.49829174368,windturbine,3,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.73008317930,windturbine,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.99658348737,windturbine,4,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48672211953,windturbine,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66438899158,windturbine,5,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,0,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,2,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,3,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,4,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,5,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.19323733863,windturbine,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.26377424694,windturbine,0,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.25187730332,windturbine,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.28985600794,windturbine,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.39566137041,windturbine,1,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.37781595498,windturbine,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.19323733863,windturbine,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.26377424694,windturbine,2,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.25187730332,windturbine,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.28985600794,windturbine,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.39566137041,windturbine,3,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.37781595498,windturbine,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.57971201589,windturbine,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.79132274081,windturbine,4,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.75563190996,windturbine,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.38647467726,windturbine,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.52754849388,windturbine,5,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.50375460664,windturbine,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17463949035,windturbine,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.23838767590,windturbine,0,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.22763573642,windturbine,0,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.27244820844,windturbine,0,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.26195923553,windturbine,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.35758151385,windturbine,1,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.34145360463,windturbine,1,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40867231266,windturbine,1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17463949035,windturbine,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.23838767590,windturbine,2,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.22763573642,windturbine,2,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.27244820844,windturbine,2,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26195923553,windturbine,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.35758151385,windturbine,3,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.34145360463,windturbine,3,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40867231266,windturbine,3,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.52391847105,windturbine,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.71516302770,windturbine,4,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.68290720926,windturbine,4,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.81734462532,windturbine,4,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.34927898070,windturbine,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.47677535180,windturbine,5,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.45527147284,windturbine,5,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.54489641688,windturbine,5,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15453917248,windturbine,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21095019281,windturbine,0,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20143575924,windturbine,0,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24109049213,windturbine,0,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.23842882778,windturbine,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23180875871,windturbine,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.31642528922,windturbine,1,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30215363886,windturbine,1,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.36163573820,windturbine,1,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.35764324167,windturbine,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15453917248,windturbine,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21095019281,windturbine,2,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20143575924,windturbine,2,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24109049213,windturbine,2,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.23842882778,windturbine,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23180875871,windturbine,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.31642528922,windturbine,3,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30215363886,windturbine,3,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.36163573820,windturbine,3,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.35764324167,windturbine,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46361751743,windturbine,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.63285057844,windturbine,4,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.60430727773,windturbine,4,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.72327147640,windturbine,4,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.71528648334,windturbine,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30907834495,windturbine,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.42190038562,windturbine,5,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.40287151849,windturbine,5,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.48218098427,windturbine,5,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.47685765556,windturbine,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21614194109,windturbine,0,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20639334540,windturbine,0,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24702403090,windturbine,0,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.24429685966,windturbine,0,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.28614382294,windturbine,0,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.32421291164,windturbine,1,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30959001810,windturbine,1,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37053604636,windturbine,1,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.36644528949,windturbine,1,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.42921573441,windturbine,1,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21614194109,windturbine,2,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20639334540,windturbine,2,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24702403090,windturbine,2,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.24429685966,windturbine,2,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.28614382294,windturbine,2,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.32421291164,windturbine,3,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30959001810,windturbine,3,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37053604636,windturbine,3,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.36644528949,windturbine,3,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.42921573441,windturbine,3,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.64842582327,windturbine,4,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.61918003621,windturbine,4,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74107209271,windturbine,4,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.73289057897,windturbine,4,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.85843146883,windturbine,4,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.43228388218,windturbine,5,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41278669081,windturbine,5,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49404806181,windturbine,5,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.48859371932,windturbine,5,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.57228764589,windturbine,5,MUS$2010/PJ,2050
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 13979ce9..950ed1ed 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -35,6 +35,7 @@ def quantity(
 from muse.registration import registrator
 from muse.sectors import AbstractSector
 from muse.timeslices import QuantityType, convert_timeslice, drop_timeslice
+from muse.utilities import multiindex_to_coords
 
 OUTPUT_QUANTITY_SIGNATURE = Callable[
     [xr.Dataset, list[AbstractSector], KwArg(Any)], Union[xr.DataArray, pd.DataFrame]
@@ -396,22 +397,13 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
 
-            a = (
-                data_agent.reset_index("timeslice")
-                .to_dataframe("supply")
-                .reset_index()
-                .drop("timeslice", axis=1)
-            )
+            a = multiindex_to_coords(data_agent, "timeslice").to_dataframe("supply")
             a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
             if not a.empty:
                 data_sector.append(a[a["supply"] != 0])
 
     if len(data_sector) > 0:
-        output = (
-            pd.concat([u for u in data_sector], sort=True)
-            .reset_index()
-            .drop("index", axis=1, errors="ignore")
-        )
+        output = pd.concat([u for u in data_sector], sort=True).reset_index()
     else:
         output = pd.DataFrame()
     return output
@@ -643,22 +635,15 @@ def sector_consumption(
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
 
-            a = (
-                data_agent.reset_index("timeslice")
-                .to_dataframe("consumption")
-                .reset_index()
-                .drop("timeslice", axis=1)
+            a = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
+                "consumption"
             )
             a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
             if not a.empty:
                 data_sector.append(a[a["consumption"] != 0])
 
     if len(data_sector) > 0:
-        output = (
-            pd.concat([u for u in data_sector], sort=True)
-            .reset_index()
-            .drop("index", axis=1, errors="ignore")
-        )
+        output = pd.concat([u for u in data_sector], sort=True).reset_index()
     else:
         output = pd.DataFrame()
     return output
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
index 33cb2ba9..4e06e1ae 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,day,dst_region,hour,installed,month,region,sector,technology,units_prices,year
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,MUS$2010/kt,2050
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
index 78834429..5bd01ac0 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,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.12888888889,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.13533333333,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.19333333333,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.20300000000,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.12888888889,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.13533333333,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.19333333333,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.20300000000,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.38666666667,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.40600000000,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.25777777778,gassupply1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.27066666667,gassupply1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,MUS$2010/PJ,2050
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,0,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,1,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,2,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,3,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,4,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,5,MUS$2010/kt,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,0,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,0,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,1,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,2,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,2,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,3,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,3,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,4,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,4,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,5,MUS$2010/PJ,2030
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,5,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,0,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,1,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,2,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,3,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,4,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,5,MUS$2010/PJ,2030
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,0,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,1,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,2,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,3,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,4,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,5,MUS$2010/PJ,2035
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.12888888889,gassupply1,0,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.13533333333,gassupply1,0,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.19333333333,gassupply1,1,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.20300000000,gassupply1,1,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.12888888889,gassupply1,2,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.13533333333,gassupply1,2,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.19333333333,gassupply1,3,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.20300000000,gassupply1,3,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.38666666667,gassupply1,4,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.40600000000,gassupply1,4,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.25777777778,gassupply1,5,MUS$2010/PJ,2035
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.27066666667,gassupply1,5,MUS$2010/PJ,2035
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,0,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,0,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,0,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,1,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,1,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,2,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,2,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,2,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,3,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,3,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,3,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,4,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,4,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,4,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,5,MUS$2010/PJ,2040
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,5,MUS$2010/PJ,2040
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,5,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,0,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,0,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,1,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,1,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,2,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,2,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,3,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,3,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,4,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,4,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,5,MUS$2010/PJ,2040
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,5,MUS$2010/PJ,2040
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,0,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,0,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,0,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,1,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,1,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,1,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,2,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,2,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,2,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,3,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,3,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,3,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,4,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,4,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,4,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,5,MUS$2010/PJ,2045
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,5,MUS$2010/PJ,2045
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,5,MUS$2010/PJ,2045
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,0,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,0,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,1,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,1,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,2,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,2,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,3,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,3,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,4,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,4,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,5,MUS$2010/PJ,2045
+A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,5,MUS$2010/PJ,2045
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,0,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,0,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,0,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,0,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,0,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,1,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,1,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,1,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,1,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,1,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,2,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,2,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,2,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,2,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,2,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,3,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,3,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,3,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,3,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,3,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,4,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,4,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,4,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,4,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,4,MUS$2010/PJ,2050
+A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,5,MUS$2010/PJ,2050
+A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,5,MUS$2010/PJ,2050
+A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,5,MUS$2010/PJ,2050
+A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,5,MUS$2010/PJ,2050
+A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
index 6e6fd26c..aca57bbe 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,day,dst_region,hour,installed,month,region,sector,supply,technology,units_prices,year
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,MUS$2010/kt,2010
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,MUS$2010/kt,2010
-2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,MUS$2010/Mt,2010
-3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,MUS$2010/Mt,2010
-4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,MUS$2010/kt,2010
-5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,MUS$2010/kt,2010
-6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,MUS$2010/Mt,2010
-7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,MUS$2010/Mt,2010
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,MUS$2010/kt,2010
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,MUS$2010/kt,2010
-10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,MUS$2010/Mt,2010
-11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,MUS$2010/Mt,2010
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,MUS$2010/kt,2015
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,MUS$2010/kt,2015
-2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,MUS$2010/Mt,2015
-3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,MUS$2010/Mt,2015
-4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,MUS$2010/kt,2015
-5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,MUS$2010/kt,2015
-6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,MUS$2010/Mt,2015
-7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,MUS$2010/Mt,2015
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,MUS$2010/kt,2015
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,MUS$2010/kt,2015
-10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,MUS$2010/Mt,2015
-11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,MUS$2010/Mt,2015
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,MUS$2010/kt,2020
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,MUS$2010/kt,2020
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,MUS$2010/kt,2020
-3,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,MUS$2010/Mt,2020
-4,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,MUS$2010/Mt,2020
-5,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,MUS$2010/Mt,2020
-6,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,MUS$2010/kt,2020
-7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,MUS$2010/kt,2020
-8,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,MUS$2010/kt,2020
-9,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,MUS$2010/Mt,2020
-10,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,MUS$2010/Mt,2020
-11,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2020
-12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,MUS$2010/kt,2020
-13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,MUS$2010/kt,2020
-14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,MUS$2010/kt,2020
-15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,MUS$2010/Mt,2020
-16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,MUS$2010/Mt,2020
-17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,MUS$2010/Mt,2020
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,MUS$2010/kt,2025
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,MUS$2010/kt,2025
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,MUS$2010/kt,2025
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,MUS$2010/kt,2025
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,MUS$2010/Mt,2025
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,MUS$2010/Mt,2025
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,MUS$2010/Mt,2025
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,MUS$2010/Mt,2025
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,MUS$2010/kt,2025
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,MUS$2010/kt,2025
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,MUS$2010/kt,2025
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,MUS$2010/kt,2025
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,MUS$2010/Mt,2025
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,MUS$2010/Mt,2025
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2025
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2025
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,MUS$2010/kt,2025
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,MUS$2010/kt,2025
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,MUS$2010/kt,2025
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,MUS$2010/kt,2025
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,MUS$2010/Mt,2025
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,MUS$2010/Mt,2025
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,MUS$2010/Mt,2025
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,MUS$2010/Mt,2025
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,MUS$2010/kt,2030
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,MUS$2010/kt,2030
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,MUS$2010/kt,2030
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,MUS$2010/kt,2030
-4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,MUS$2010/kt,2030
-5,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,MUS$2010/Mt,2030
-6,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,MUS$2010/Mt,2030
-7,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,MUS$2010/Mt,2030
-8,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,MUS$2010/Mt,2030
-9,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,MUS$2010/Mt,2030
-10,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,MUS$2010/kt,2030
-11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,MUS$2010/kt,2030
-12,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,MUS$2010/kt,2030
-13,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,MUS$2010/kt,2030
-14,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,MUS$2010/kt,2030
-15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,MUS$2010/Mt,2030
-16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,MUS$2010/Mt,2030
-17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2030
-18,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2030
-19,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2030
-20,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,MUS$2010/kt,2030
-21,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,MUS$2010/kt,2030
-22,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,MUS$2010/kt,2030
-23,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,MUS$2010/kt,2030
-24,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,MUS$2010/kt,2030
-25,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,MUS$2010/Mt,2030
-26,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,MUS$2010/Mt,2030
-27,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,MUS$2010/Mt,2030
-28,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,MUS$2010/Mt,2030
-29,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,MUS$2010/Mt,2030
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,MUS$2010/kt,2035
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,MUS$2010/kt,2035
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,MUS$2010/kt,2035
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,MUS$2010/kt,2035
-4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,MUS$2010/kt,2035
-5,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,MUS$2010/kt,2035
-6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,MUS$2010/Mt,2035
-7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,MUS$2010/Mt,2035
-8,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,MUS$2010/Mt,2035
-9,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,MUS$2010/Mt,2035
-10,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,MUS$2010/Mt,2035
-11,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,MUS$2010/Mt,2035
-12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,MUS$2010/kt,2035
-13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,MUS$2010/kt,2035
-14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,MUS$2010/kt,2035
-15,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,MUS$2010/kt,2035
-16,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,MUS$2010/kt,2035
-17,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,MUS$2010/kt,2035
-18,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,MUS$2010/Mt,2035
-19,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,MUS$2010/Mt,2035
-20,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,MUS$2010/Mt,2035
-21,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2035
-22,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2035
-23,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2035
-24,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,MUS$2010/kt,2035
-25,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,MUS$2010/kt,2035
-26,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,MUS$2010/kt,2035
-27,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,MUS$2010/kt,2035
-28,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,MUS$2010/kt,2035
-29,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,MUS$2010/kt,2035
-30,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,MUS$2010/Mt,2035
-31,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,MUS$2010/Mt,2035
-32,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,MUS$2010/Mt,2035
-33,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,MUS$2010/Mt,2035
-34,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,MUS$2010/Mt,2035
-35,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,MUS$2010/Mt,2035
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,MUS$2010/kt,2040
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,MUS$2010/kt,2040
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,MUS$2010/kt,2040
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,MUS$2010/kt,2040
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,MUS$2010/Mt,2040
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,MUS$2010/Mt,2040
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,MUS$2010/Mt,2040
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,MUS$2010/Mt,2040
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,MUS$2010/kt,2040
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,MUS$2010/kt,2040
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,MUS$2010/kt,2040
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,MUS$2010/kt,2040
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,MUS$2010/Mt,2040
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2040
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2040
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,MUS$2010/Mt,2040
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,MUS$2010/kt,2040
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,MUS$2010/kt,2040
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,MUS$2010/kt,2040
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,MUS$2010/kt,2040
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,MUS$2010/Mt,2040
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,MUS$2010/Mt,2040
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,MUS$2010/Mt,2040
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,MUS$2010/Mt,2040
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,MUS$2010/kt,2045
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,MUS$2010/kt,2045
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,MUS$2010/kt,2045
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,MUS$2010/kt,2045
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,MUS$2010/Mt,2045
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,MUS$2010/Mt,2045
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,MUS$2010/Mt,2045
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,MUS$2010/Mt,2045
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,MUS$2010/kt,2045
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,MUS$2010/kt,2045
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,MUS$2010/kt,2045
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,MUS$2010/kt,2045
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,MUS$2010/Mt,2045
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2045
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,MUS$2010/Mt,2045
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,MUS$2010/Mt,2045
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,MUS$2010/kt,2045
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,MUS$2010/kt,2045
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,MUS$2010/kt,2045
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,MUS$2010/kt,2045
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,MUS$2010/Mt,2045
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,MUS$2010/Mt,2045
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,MUS$2010/Mt,2045
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,MUS$2010/Mt,2045
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,MUS$2010/kt,2050
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,MUS$2010/kt,2050
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,MUS$2010/kt,2050
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,MUS$2010/kt,2050
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,MUS$2010/Mt,2050
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,MUS$2010/Mt,2050
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,MUS$2010/Mt,2050
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,MUS$2010/Mt,2050
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,MUS$2010/kt,2050
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,MUS$2010/kt,2050
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,MUS$2010/kt,2050
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,MUS$2010/kt,2050
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,MUS$2010/Mt,2050
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,MUS$2010/Mt,2050
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,MUS$2010/Mt,2050
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,MUS$2010/Mt,2050
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,MUS$2010/kt,2050
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,MUS$2010/kt,2050
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,MUS$2010/kt,2050
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,MUS$2010/kt,2050
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,MUS$2010/Mt,2050
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,MUS$2010/Mt,2050
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,MUS$2010/Mt,2050
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,MUS$2010/Mt,2050
+,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,0,MUS$2010/kt,2010
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,0,MUS$2010/kt,2010
+2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,0,MUS$2010/Mt,2010
+3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,0,MUS$2010/Mt,2010
+4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,1,MUS$2010/kt,2010
+5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,1,MUS$2010/kt,2010
+6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,1,MUS$2010/Mt,2010
+7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,1,MUS$2010/Mt,2010
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,2,MUS$2010/kt,2010
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,2,MUS$2010/kt,2010
+10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,2,MUS$2010/Mt,2010
+11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,2,MUS$2010/Mt,2010
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,0,MUS$2010/kt,2015
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,0,MUS$2010/kt,2015
+2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,0,MUS$2010/Mt,2015
+3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,0,MUS$2010/Mt,2015
+4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,1,MUS$2010/kt,2015
+5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,1,MUS$2010/kt,2015
+6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,1,MUS$2010/Mt,2015
+7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,1,MUS$2010/Mt,2015
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,2,MUS$2010/kt,2015
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,2,MUS$2010/kt,2015
+10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,2,MUS$2010/Mt,2015
+11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,2,MUS$2010/Mt,2015
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,0,MUS$2010/kt,2020
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,0,MUS$2010/kt,2020
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,0,MUS$2010/kt,2020
+3,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,0,MUS$2010/Mt,2020
+4,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,0,MUS$2010/Mt,2020
+5,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,0,MUS$2010/Mt,2020
+6,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,1,MUS$2010/kt,2020
+7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,1,MUS$2010/kt,2020
+8,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,1,MUS$2010/kt,2020
+9,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,1,MUS$2010/Mt,2020
+10,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,1,MUS$2010/Mt,2020
+11,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2020
+12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,2,MUS$2010/kt,2020
+13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,2,MUS$2010/kt,2020
+14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,2,MUS$2010/kt,2020
+15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,2,MUS$2010/Mt,2020
+16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,2,MUS$2010/Mt,2020
+17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,2,MUS$2010/Mt,2020
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,0,MUS$2010/kt,2025
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,0,MUS$2010/kt,2025
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,0,MUS$2010/kt,2025
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,0,MUS$2010/kt,2025
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,0,MUS$2010/Mt,2025
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,0,MUS$2010/Mt,2025
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,0,MUS$2010/Mt,2025
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,0,MUS$2010/Mt,2025
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,1,MUS$2010/kt,2025
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,1,MUS$2010/kt,2025
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,1,MUS$2010/kt,2025
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,1,MUS$2010/kt,2025
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,1,MUS$2010/Mt,2025
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,1,MUS$2010/Mt,2025
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2025
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2025
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,2,MUS$2010/kt,2025
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,2,MUS$2010/kt,2025
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,2,MUS$2010/kt,2025
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,2,MUS$2010/kt,2025
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,2,MUS$2010/Mt,2025
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,2,MUS$2010/Mt,2025
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,2,MUS$2010/Mt,2025
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,2,MUS$2010/Mt,2025
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,0,MUS$2010/kt,2030
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,0,MUS$2010/kt,2030
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,0,MUS$2010/kt,2030
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,0,MUS$2010/kt,2030
+4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,0,MUS$2010/kt,2030
+5,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,0,MUS$2010/Mt,2030
+6,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,0,MUS$2010/Mt,2030
+7,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,0,MUS$2010/Mt,2030
+8,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,0,MUS$2010/Mt,2030
+9,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,0,MUS$2010/Mt,2030
+10,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,1,MUS$2010/kt,2030
+11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,1,MUS$2010/kt,2030
+12,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,1,MUS$2010/kt,2030
+13,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,1,MUS$2010/kt,2030
+14,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,1,MUS$2010/kt,2030
+15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,1,MUS$2010/Mt,2030
+16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,1,MUS$2010/Mt,2030
+17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2030
+18,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2030
+19,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2030
+20,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,2,MUS$2010/kt,2030
+21,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,2,MUS$2010/kt,2030
+22,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,2,MUS$2010/kt,2030
+23,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,2,MUS$2010/kt,2030
+24,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,2,MUS$2010/kt,2030
+25,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,2,MUS$2010/Mt,2030
+26,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,2,MUS$2010/Mt,2030
+27,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,2,MUS$2010/Mt,2030
+28,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,2,MUS$2010/Mt,2030
+29,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,2,MUS$2010/Mt,2030
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,0,MUS$2010/kt,2035
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,0,MUS$2010/kt,2035
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,0,MUS$2010/kt,2035
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,0,MUS$2010/kt,2035
+4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,0,MUS$2010/kt,2035
+5,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,0,MUS$2010/kt,2035
+6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,0,MUS$2010/Mt,2035
+7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,0,MUS$2010/Mt,2035
+8,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,0,MUS$2010/Mt,2035
+9,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,0,MUS$2010/Mt,2035
+10,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,0,MUS$2010/Mt,2035
+11,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,0,MUS$2010/Mt,2035
+12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,1,MUS$2010/kt,2035
+13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,1,MUS$2010/kt,2035
+14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,1,MUS$2010/kt,2035
+15,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,1,MUS$2010/kt,2035
+16,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,1,MUS$2010/kt,2035
+17,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,1,MUS$2010/kt,2035
+18,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,1,MUS$2010/Mt,2035
+19,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,1,MUS$2010/Mt,2035
+20,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2035
+21,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2035
+22,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2035
+23,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2035
+24,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,2,MUS$2010/kt,2035
+25,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,2,MUS$2010/kt,2035
+26,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,2,MUS$2010/kt,2035
+27,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,2,MUS$2010/kt,2035
+28,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,2,MUS$2010/kt,2035
+29,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,2,MUS$2010/kt,2035
+30,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,2,MUS$2010/Mt,2035
+31,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,2,MUS$2010/Mt,2035
+32,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,2,MUS$2010/Mt,2035
+33,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,2,MUS$2010/Mt,2035
+34,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,2,MUS$2010/Mt,2035
+35,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,2,MUS$2010/Mt,2035
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,0,MUS$2010/kt,2040
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,0,MUS$2010/kt,2040
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,0,MUS$2010/kt,2040
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,0,MUS$2010/kt,2040
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,0,MUS$2010/Mt,2040
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,0,MUS$2010/Mt,2040
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,0,MUS$2010/Mt,2040
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,0,MUS$2010/Mt,2040
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,1,MUS$2010/kt,2040
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,1,MUS$2010/kt,2040
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,1,MUS$2010/kt,2040
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,1,MUS$2010/kt,2040
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2040
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2040
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2040
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2040
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,2,MUS$2010/kt,2040
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,2,MUS$2010/kt,2040
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,2,MUS$2010/kt,2040
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,2,MUS$2010/kt,2040
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,2,MUS$2010/Mt,2040
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,2,MUS$2010/Mt,2040
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,2,MUS$2010/Mt,2040
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,2,MUS$2010/Mt,2040
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,0,MUS$2010/kt,2045
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,0,MUS$2010/kt,2045
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,0,MUS$2010/kt,2045
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,0,MUS$2010/kt,2045
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,0,MUS$2010/Mt,2045
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,0,MUS$2010/Mt,2045
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,0,MUS$2010/Mt,2045
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,0,MUS$2010/Mt,2045
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,1,MUS$2010/kt,2045
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,1,MUS$2010/kt,2045
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,1,MUS$2010/kt,2045
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,1,MUS$2010/kt,2045
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2045
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2045
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2045
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2045
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,2,MUS$2010/kt,2045
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,2,MUS$2010/kt,2045
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,2,MUS$2010/kt,2045
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,2,MUS$2010/kt,2045
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,2,MUS$2010/Mt,2045
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,2,MUS$2010/Mt,2045
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,2,MUS$2010/Mt,2045
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,2,MUS$2010/Mt,2045
+0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,0,MUS$2010/kt,2050
+1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,0,MUS$2010/kt,2050
+2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,0,MUS$2010/kt,2050
+3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,0,MUS$2010/kt,2050
+4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,0,MUS$2010/Mt,2050
+5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,0,MUS$2010/Mt,2050
+6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,0,MUS$2010/Mt,2050
+7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,0,MUS$2010/Mt,2050
+8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,1,MUS$2010/kt,2050
+9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,1,MUS$2010/kt,2050
+10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,1,MUS$2010/kt,2050
+11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,1,MUS$2010/kt,2050
+12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2050
+13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2050
+14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2050
+15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,1,MUS$2010/Mt,2050
+16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,2,MUS$2010/kt,2050
+17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,2,MUS$2010/kt,2050
+18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,2,MUS$2010/kt,2050
+19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,2,MUS$2010/kt,2050
+20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,2,MUS$2010/Mt,2050
+21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,2,MUS$2010/Mt,2050
+22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,2,MUS$2010/Mt,2050
+23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,2,MUS$2010/Mt,2050

From 525e62bb6427b00d56685c617f01af062a39eca2 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 12:31:32 +0100
Subject: [PATCH 359/419] Fix mimimum service test

---
 tests/test_minimum_service.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 4efe8a7e..17a2a9f2 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -55,15 +55,23 @@ def test_minimum_service_factor(check_mock, tmpdir, minimum_service_factors):
         MCA.factory(model_path / "settings.toml").run()
     check_mock.assert_called()
 
-    supply_timeslice = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
-
+    techno_out = pd.read_csv(model_path / "technodata" / sector / "CommOut.csv")
+    capacity = pd.read_csv(tmpdir / "Results/MCACapacity.csv")
+    capacity_summed = capacity.groupby(["year", "technology"]).sum().reset_index()
+    supply = pd.read_csv(tmpdir / "Results/MCAMetric_Supply.csv")
+    supply = supply[supply.commodity == "electricity"].merge(
+        capacity_summed[["year", "technology", "capacity"]],
+        on=["year", "technology"],
+        how="left",
+    )
     for process, service_factor in zip(processes, minimum_service_factors):
-        for i, factor in enumerate(service_factor):
-            assert (
-                supply_timeslice[
-                    (supply_timeslice.technology == process)
-                    & (supply_timeslice.commodity == "electricity")
-                    & (supply_timeslice.timeslice == i)
-                ].supply
-                >= factor
-            ).all()
+        supply_process = supply[supply.technology == process]
+        supply_process.loc[:, "min_supply"] = supply_process.apply(
+            lambda x: x.capacity
+            * service_factor[x.timeslice]
+            * float(
+                techno_out[techno_out.ProcessName == process]["electricity"].values[0]
+            ),
+            axis=1,
+        )
+        assert (supply_process["supply"] > supply_process["min_supply"]).all()

From f49718a5082da6cbd16ff00ff48c47e5b64a118b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 14:00:56 +0100
Subject: [PATCH 360/419] Fix TimeSlice typo

---
 docs/inputs/toml.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index 07ba53e2..0f0f8de2 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -668,15 +668,15 @@ The following attributes are accepted:
    The CSV format should follow the following format:
 
    .. csv-table:: Consumption
-      :header: " ", "RegionName", "ProcessName", "TimeSlice", "electricity", "diesel", "algae"
+      :header: " ", "RegionName", "ProcessName", "Timeslice", "electricity", "diesel", "algae"
       :stub-columns: 4
 
       0,USA,fluorescent light,1,1.9, 0, 0
       1,USA,fluorescent light,2,1.8, 0, 0
 
 
-   The index column as well as "RegionName", "ProcessName", and "TimeSlice" must be
-   present. Further columns are reserved for commodities. "TimeSlice" refers to the
+   The index column as well as "RegionName", "ProcessName", and "Timeslice" must be
+   present. Further columns are reserved for commodities. "Timeslice" refers to the
    index of the timeslice. Timeslices should be defined consistently to the sectoral
    level timeslices.
    The column "ProcessName" needs to be present and filled in, in order for the data

From 79954e3e64a1b3144886dcc674778e95e7908049 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 15:04:41 +0100
Subject: [PATCH 361/419] Change test comparison to >=

---
 tests/test_minimum_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 17a2a9f2..20a303fc 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -74,4 +74,4 @@ def test_minimum_service_factor(check_mock, tmpdir, minimum_service_factors):
             ),
             axis=1,
         )
-        assert (supply_process["supply"] > supply_process["min_supply"]).all()
+        assert (supply_process["supply"] >= supply_process["min_supply"]).all()

From 713cdce14150c405e0109701a5441c689db46a8d Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 3 Jul 2024 12:02:11 +0100
Subject: [PATCH 362/419] Remove stray files in docs folder

In the docs folder, there is a random empty file called "python", one called "objects.inv" (a Sphinx build artifact) and an unused "requirements.txt" file (we've since moved to pyproject.toml). Remove them.
---
 docs/objects.inv      | Bin 20988 -> 0 bytes
 docs/python           |   0
 docs/requirements.txt |  10 ----------
 3 files changed, 10 deletions(-)
 delete mode 100644 docs/objects.inv
 delete mode 100644 docs/python
 delete mode 100644 docs/requirements.txt

diff --git a/docs/objects.inv b/docs/objects.inv
deleted file mode 100644
index f511f596486ba7441aacd08b06e7aa2abcd89418..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20988
zcmZU(V{~Or*998ec1~<N9ox2zj%}yoj_su5q+{FmiEZ2No9F%Rk2}Wwb<WsTyLPRr
zx#n86YLWp|9j&bGJptDC?&kKc4$fWxcXMYKYX^G(D;ya>$=Ttjxv48JKwe!{93bXk
z>Sp)d%h>h1{kv7;|9bKQzW=LPnFE~7?ToGM&CHzv4i*4cD{B{kg|)3Y;QQCq!Oqdy
z+{MM*4B+NsZEp$iwzW24g!5dR>N>YSXia5&*;XX!g?yNdbDY|;oPMoiNtZ}wV+EGZ
zyQh-r;X|?mMp5B(Q{ZT1uuC_4jyR4Ur;`W_C{*^$8B|s`g$m|LsvrNxVTdy_ZYlU>
zQ5`=AWS@x|9*zA=X>{AZxX)8OcwLnBpk?wJKPxqJ>m#z5@mg%sAk4i`>CzEw(oeeV
z;P{jddNN;X9^0<sRtTgk%yJRYUgj85-9GHodas(uJ3sQnZ8TMO_e#QAY_ojjJKU7@
zg9)Rf4R)`dsG>Xji5sTwK8`IizMVR1nk2}S+E&eYPg(f{e^`4REy}FosD7;e;Rt9t
z;c(~x-rN>UcztNir)84+PTadF^Gk-fG0AUrcP^Ogo$3+Z`OOV?`UW|VR}7dG#kwV3
zH#F-)QTWX?P!{$oYA<t%KX+?ADR|vymlh>zGVFRrfx|n1rF(xqSax5-sZ8u!v3qH<
z^L#4JyQn5{a>oG{6S12Er19tD#OD)h1R!?9{N4{t5$z>iLo5CC=Su#T_5YZLC3VQf
z0)wxX&Y;gz+7A6hzb?QrBK^cbH>qkd>5qBRmdlU!WTf1|`8O1St$vI3Xf78qNAw$(
zeYghIGa(Q5{of>w@~hc#e_U;7TG1}UKHU__zK;VY+mge49oAj0+N>7wcqrzTbh#D$
zn=0M~t3e7J?m9EWf${f)S8dt@w5`-A?0pxfY|ojA(1y@|=7YcQ`(xsrIBMkMivFMq
zjMvpXO@ar8Tx4Z)^PKK1Lkc;9i4$Qq;0dLUEy1*yK~ZR>1Z-O#+iEM_wE=57b+MW*
zr2>*T!hb2HdD2;3`YrJ-s=qA|=iVb>%Pp$aR4*g<Y-|_z@cF+qt`-wJxOYqqq=FIE
zGiEV6DKYOCt!F8EoNw+AP~zRXH@y4)Gw#4pz+lsks|RLy2&Hlz_m6H*pSt9=*vaJN
zU3=Yr^sgT>SGAL-6pfC1h9;Lm7sfL+p%d8zx@)Tyo+D_)?l6L+dQ-^zlLt1clgG-`
z&4d`|MyJO9ZW^IsIO){JQhjJLPXBxr>WR><gb1lnEc#8$tLb5FKPE9$X><GhZYql>
zmjyKA;G64d@9tR_*s2bAt#{(#G-{pNJlX{k!wY}<-#Z3)bhNGi?V%6$?0N6>(t<cW
zANUL(Io~AJ8YvMd*6$7|KdbjobsIQ9StEI7di~N}o4^bD`&&~yOQohw&|J}+S;T;F
zFw`>QscvRMNuPCL5?`$}|9p89z9eNXWyVeWX%N`o2)<Z{E($A0*4v~-UBYWxRX#wH
zEL<+-8(njLp0!DQ8lI(_?@;(NNy6f}w!3Y8=)^=H7t`zo|9&j<A%LL*ym7AS)X>h~
zM=yY+xD6tslIi*1247LnhTxW;7R2@K`7$@(9Cw&{%4IiqPYv>__QQLtvqn?RlJ%FS
z77``%ClHKTaiZ2sCqjNxGu$0C{}T*nd=_QlTHC1GZzl7Y6RWrqm~=9Hv${vJ6<>nO
zEYN(OdhA-$<md#`C}<be;+T)cmaUYmxT-4?Lg$0WNh#V?m00%-D030@ZuG-O=p&sv
z<dJJDi&71cS?}}`M~udZaRT|{v1<iDeY2Au>(3Z1M=n}sF4I3eZl)firV0Iw2>xW0
zm|_i}dos&b{AhAn!eA)Givg7K!7Jk%<nRWC4xeQ5>X%^fERj;oV=cO5ln(exf<Pei
z9E2ywa5JB|B_*^6*2Ifk|Lj=3w7(Lt1D?-hof{fYN9q%v#?cCiURt?eNs<0x;tdqV
z7-Bh}K+;FiJ3kxnZlT;-9XRs#_;&*x-?^~qt0(BcTKpW>Q4`mpm0TcJ$8AfQ;;Q<N
z&Epb74JE${0p$xTSK~L9$rk|%Bo}w;=zfp47px)XJi#m8*;$ts&j`CdVOo+46{cp$
zHDL5C>n26gi+U(VfN>VcVrQ4C{rLT>Gl4jLp`8>q!e}^uI7H~8N!0B%ij-WjKnxuB
zn9@PFs;Sa%o84<MWkH&5#g!7?NPLI=m4zzcYOE4Yq<_i3T$A9$Ob9z)3)2;?;N_W*
z1L{V}$hjOsr*14VB&*c+P&Tms#pE@_@w1Np24LqtUY8&$pEitmOR<GjS~!_`+q66J
z<ulh+WHN<HbXZ*7Ln5eKLaM=YTL;^`<Pz!^d28Jk+pa`6OJB;zxFA+me-%kn;-+qb
zsOjb>QL%7H(w~24tUkDo<tC<IhXF>}U2nwQtiW#SJQ`K{vrtz@KBIfI`p8~Fhh&W&
z(VQBs*#w|IPkNhNx_j}GRdC^`?$_RqcIyo_RGHPW&9zRL!zTKcNGs*;S^m61GR&($
zJK0SiJF?K3h=^FyN%o2o<FaPiibesaNgRDv`&!8~zE@831{B>IM@<tXw_7eX&d^*#
zA=&|zfL^1q=|0>fRkG_&GqvGfx_rblAQgN0nWx;~3fDE6*YN36kq#+lM}fd-!e^C`
zUHY2tR^&aftOsDXt%M9F38TOg3T231{7A5zLbNM5N$cO{`uM9&5=@&%$WZom>*c`m
z@Z*WX+Cat@2oR!t1go;EP%|<|mHi`Y4HUtG!4WoeMsV1Y=&B@HQ}8xNtr+Hf<<*(1
zdm*)e5`rvK94tK*QM=!-TfsJic_k|Hqt(I7GFu1%kwWyGl3ANFS6_@4ff4TK)vEY;
zD*-jzSF9MWVnR6D7EOaNf170RPYnNcIXf1fr@T=hv4H6GGniG9pguW_&I&at@#-EW
zzVCN$c+GkDk7uN9xguQwo`e%;@q7@?^JB|I<avhplB84JO*F*$h{psZx>S%o&|SMX
zx6j({O>V4Zk%IYcqGgYctj#G4nj*nYfjVLqy62|K=@(S9Bz$OA|6*nCui@c1WeIFp
z7n?Qeh}!`RWMI$RB=!n;;Ji9oXI-S}NKO`e_Z>{W_*r~!RDhpdfI!-=UP(<XxA=B&
zpJ&P5npSL`T69Ul5a&;c+7);CKnYFS$OfTxcA++XTofr=d@7?CN2+dPRL5v8EikS-
z(;{NSqPPJ7W$e(AT^=$ADY1Wk##m-gSKB+s4SZ(*pg$i%T&&f^a~})5%O7qvSGPmz
zsu!R{a)8d#%*^yDF3d?i14l^FztRvzMI#h2aiynA8$Ou7x#oNbxHT8ZlI*eFR)_*+
z#E%DH8(Hr^%uuxYlr+WTcXfMJcp(vf6sfBzuHx%TVoMs8wK_3xHLEXU$n$!4%#?Xh
zn842MTR}R*yke+FWw@!62=RA{=KLLl@x+FM(N}OoQ^x0|iHy;)ma0?N2TckpLfJen
zu|Ks)J!*rQH)Omh43zK<gp;{RBV%_eD5IP~s#a$q-TZhQ8(hU}syW}Zlx3>`osNH6
zrD4(zZ5r=x6W~ThxZdb@5d&G-K1DH7{4o>8#6*T9^@WmDcU(o%mSU5*r<_uz%ZKyH
zy*7_-1G2}T_K0pMQ+ah7Gq6zdf<1_D`IGea45Lv35yoTuNj`@tbI&c|OoZ2~J@YqI
zbz0Rg(h<mz(QE?*xVa7ugeXcn4#Rhx*cXO?@mwpmp|wgQoTX7^oG@$z;9@Cjb=x19
z&WHona}d@A2ZGYW9f9l$p06@|F=9#^m*{4C%o@(OAlNTl!|1!W8!Cf;6OPlMDm5j=
z>K6kXEkpO^j7Y*D2MvSghl>T2n}(Y$T7qigeMm`ao5rDR0ucLUHq3I1az$B{S#rt8
zTXx|fRpl@o)W~5TDbR3}UJHr%r|`NJXh|%X#(LoUdf=g;3x4sCsM{l$RPgykQ9u<4
z>zERKIQr^bYbA>sW~>xKoOT!$?MfnWK@duGW!cpc@k|sa=eq1exAJk(XEl0=!yhXc
z;7xLs{a6HXs+#a9=%{O=b@V%=De-xm?F-B64~uQ(-)T5+4J6LE^^&=uX;4L+NE)ae
zwlC05vU{Ch-?)1Pd!$fBl9%$`fNL8If^dQb;f79M3FEM#3?_j;5~`T+JbSpwAJ0+m
zyj1j8i$5Nc?$V-o=WseUH8-_p&5lb$&P={!el5jbPQ+TwlsLgpy~Sj}xb?s;H86*o
z<(k0%g9k=F`PF6#gPj#mn|M#4=_Sr~%T1ES`kktm)((IXeFl{NWmRR(&46SZq(FgA
zHq#2)B&Ka<W(OK=i)mYis;;q)g{B#Zm+VMrA1=k+jd1Cy*<;4AzJOw2NwBm02m5WJ
z_LrFxUDnynfb&g)D?S7N-F|p}fQhMnaq`l<$h+vp=A82z%Pevo85#6bY@;plzP@8P
zWH-#&$T|-}fEf?NsppT$Ny?to1{9$3$}Lu;Zu?GJgbCQqAJa@Ed?!=|Xh+*lASmH6
z7<V9c^e<jpF>wjPRzXUIGv-#kg#~l7+hN;;pjdcM5=G}%t4etPpp{DOFKD&5Bguz~
z2?=XLEUf6&H#;#&$1ch>Vhx|v$SYn1dd&03^a#SD^BbAJ($OL3C#ndvU4F%5D@SKs
zPs<{$4&YU_C@~XcHPHwy9A%JT=kA?SX+xl$Mc3EN=*#-;fdd_~&_7*04Hy+7D~-?&
ze@?_kZImEqDRQlE9vR>F)zf1S%kam#TpJWZg2xPL@7Z8nvmAjh0QQa~UCTzT6Jb~C
z8z^`^^+ehFqOyL>^`&Nruow-`6rJS5%a@(xJ6#?_&~=V21Ql9pyS7qL>Xt;nPqv-J
zPsnx2F=IPkh4n|<icw51YCs}b$s7x5vStI~(viypDOZ{qaw{Kb)*Jj%oTi#V^9Uyb
z;-@Y>okb6#Rp`Yy+o1+;kEW@6Z-3u{%j&u!3*vGIFT2Kh!$t1GNWB;f!o^;2H6fwH
zvl6W1!;>LDd6Dc1uaY4B3{V(Z0n-TB5Eot>5%l}YLIQe-<JL~ODD8J+@_R)Z@EYzS
zfvPHpWwK;TX6?lmYV;bM2iuqP9J><d-mu2wD9Yy$uKb!$R)PWhQGw+XUs7nWJXIjS
zn!;$ViLpo$03WzZ^;JT@L{L3F4S#h9Y{P(tFfx9tcF=m{vz#e#Bj1CHKqWsRHx&2t
z#I|if^^pW+UVtUv_8oh|o4eEo#W{OjB_T-v1h4ZS@6%lT$R;#k^PYb_Yhyxsof-T`
zzA3HDU-ME>di;DwW8E<zIDQf7+g{m2VGjwHZF|sg@Z{71y4pI4bOF0b*@VY6nXp}X
zMPVrIfi-sEJf-aM++s*jrbk<#5?QZZQ;ANR0z;$4`4Dc^EjsqsY77$d;DxzymXj?s
z0lI?u#L8mP{S|j+*IunSfbv2yU0uOxXnw^qu*pvlatAqaw=ZU-&f%o^H{HXssj`{j
zoMdk5!IjKTJws20?GTf`PMvI;#$LpykjdR2){rO%8d*=1{u-~nNbakHu?m6e_S~(P
zoD@6e?J0~1KB+TPR=(a_Rw}55cWznJye~8d!!VH7^|faPYkkeTy+4by9HFcMfqir)
zMLLdkX04GjQB%&8NZAfQs05uzKt2rwfP$CIX&;H;IO!;yqO1;m6EU(Z7B&fqwHQCP
zigQ6i^L|cM<-mh$-^IJUd$UF8jZ-9(wi_*^!<|+#NYV>PABfG1E$}p<{))TMTzEWs
ztn#JYwtaT47g{?UGMV@usLDLbq{`~qOWQ)-;Q8-VAf-#?mrCHv&iE`N0&`U86I?O`
z>LC^h3~%AR$&~sM-+_n+DEdhK7PjqJ^2ZtL6>sL$In}RsyYsu{3(bD)NF4;~hJ6rE
zaUE?#>kuNQvJj!T`F+U7OTo#Nef?1X1Lda>+gp3>h0-SD^XC9z`V&0jm(*+B*LAg-
z<Fk)o`dSV~Mmf7vWVSa)w-jP8l+6gi$%wmH8o~VJ4QI)Nf)<lZZzy!qw2s~5^jgI;
zvMyB$?FRffcTtE*Tk$N4TYTW)s-_%$T%0ZEu+0wurNn90EhW4qWU-~hdqVjF!)sXL
z`gs$sBoE^jaw*I<a)6HG?+_xgviJ|GSKgCwXF&wJi(1X;ugQYmcMcspBa4;3G#ENL
zf7yQyP#Q>+cYkR64Z{VeTF1+s{q@9OT6PuLs@-p*h_%rJ0D>p*#UUQu<Uk8i9z{qK
zQPh8BuKCyfLx<8Dx&xrJ0M(F(0ngB|izbHG1U6THUz#?|f4rR`9t{lUSG^7js9T5u
znNA}oO~mfWe#rqe`B7YhU${@ub%vZT8L6%gUho&v&{;ib!rcHY6<kWFW3m0u8P{sM
zn8kb~%uqI<$(Hd2J4_67c5$~ENlZy>P+}OmIUQF23yXRLN-$#FHDp~u1qul_e)k1;
ze4J8PWFL>4oAieOYYB1@$5{x)?!j9(H^iOEcONQzJr{eM;jSsJ_kaom{zx|7IY{YO
zSo3gEIL9}J;gU5W9uNk11~V~ZT#%hYCI3zM+bRQtvpbYQ1?6zKw+zG}Wr9D#Q&b?v
zy<snXzu1<cW#7gS&#|1cp*ZqDvOznj7~-Lp{~L1bJ#%0?9Tt=XK7aJ+WJK2_;eqmd
zbU}vf<J|{tqg<%>9>F`~AWe)<Qhy@fU`D$)v?(#wUofw$5We!$aih<dH&-#PSls`1
zB`Q`4VD&+!LD1@+aDV{jewb8~TN8kA0b;V~tcc$jx@oH78o->AeX=P6df@kgzkr5%
zM10&-_t@!O2kk$F7Ve^1?<>&2Xt3A1^OiVqYz4>Q!1zaH1h1qkO)GzowaJVxItnv=
zbRw6>^Tz?EXOB~+IAQ@i_tTLq!VY=_+6c?kd5WzCx=}J7+UJ2Cb(GH6`tu#MuFVU9
z?EsMEGL%8KXeMQ2Jk>%rOfH8no+jH0q-hn+dsuGV1Bc^>wi#W2g8t|1+>;Q`QVX}T
z{J2%eX`Zl|`~wB|HO5z#W1|L<txPaxtb42~7#MA;Axc3sjy0CZ5RKjii%bw)WXw7e
z;6jv%XPZ$i97)VjbBfk57*yqsnQiAjk=#NVVsh3z9(Gv--R65LH@E^L7N%z5L<OHQ
zjJXzLl~(}!`Vz43Xoy1p!aol{sk!{@u|Bf?$YjU~tA{bIs3(m%Z0FMA_3|JIhCblv
z&5+q%NTR8zxL5!BJ~i;Ud3j{t@|Bohv@2%Qtilnq^LcfDL;@<^2O9~A5R^Rl`xmUz
zv~Z=Bs_)Qp%Ep-ey00mqzgnr5s_l~Sy;DrfbgvnrrC3!08^aRECM1e(&JI(32HMLe
zYJH`RaiV*o0?F8M!Kq{#0XYGHn&^?0Ev=jTV-f^viPA|octFKVVI)t<r#<lp?$4~H
zx)M+LLV%mFih#)95n-+|T~&f%h1GRO4&QOkpYKOaAm8vpX88A$J1&)K)7byP&iK}#
zhEZx<xNH;q`1v9}$L|k{xTUPylE_HL8SCUR^a~V8zOnpB1}_U=)j;?7jGZ!C3!&DR
zy?9SV3UoefHhdPbt{o2NO7JA^LnoRBS}7lRrg>tRrN&7?g{Z}p{!al==#c7i;0~|3
zW;mR8`mZIBN=~I|nM#I=V^+oRNEw`*jPI%Z%pHlj6O|#bO1G9DNZ{nsZuo)Kl+^k%
z6-R^L=QH`<8074()2;_!#HJ_Y`|0KKdCqxT6f!knvgIxcRN@kImQYxi2H%VZSN;W)
zv09tMxrS^dO>;)f*>c{2eEM|%X3WM!U6UV;``d5cu!;l(eZGnBl<{6h_Hug!VgYKr
z&FXQH=33>S(RlTN!qa+cbi_#z3JLqso6#67Pg~u2RNmKKK1%{SUxP3mwy@|8rju^}
zVB(6LMEJskE5Oo*Cy7I#3HKz6vZg%|$pWtVD=<eByx#JAHeRa;;dF#xFLEiyCRhp}
zBVM#Wy{&|qkX%#$g7+cU50`R+`@S39UO(vVy%lZuAhMjzL(A%njxGA3kcL#<mJbDb
z4<imnP&&xh;h|48-}b^s^Xm_#oHX#J3Qjjx9H-RATQ#U6Mf}Sgw1Z`oWj9$5Ms%{C
zaLLNpQ%lzVlT8W5%C&q~q&wMgUqATM9s|6g(9o<ugjl}s*9)(v5Sx{zGZnsF190YJ
zsdeQc2vu3X9(g8Kc_PW4y@rtBh@<iwZTM5nnyD0}Zt7sH-0HPd8JCNXxJIEe^8Wa{
zCzlx1Z>o?!iF3L0!y4K&g7Bl`PVoX-^YRMpy{HeiFfgmI;*Y%`5lLprEhVinb3a!X
zeQQ%Su3|U;o?tuO;=sia8<!Ua;qrWw79e$8Rjphbbf=KfztewC&nru!G*{C^!eqrr
zg7^2HXAx7EmGfKZ^xya^R*xjmlMo8RgW(?I0vz?{qpRmBcS&q5xqW5<8fcP32IO#0
zkk@oI5)pLHQa{R6ib#;YIwonFQ~_EA{+iGfu`f--+4EgEkND*(BSqE~GQSZ}Q~Uo`
z8Ap{ov-48+8Cs@E0PXKo*(0El@6_mi@8anA14Tk?4qCQ<?DoDFECbd&9Va{KI2$RB
zqZ~1rZPuA!mrUHgW;yb0AcobTKmDgBSQCh6$G3Nh!0bFpnN96y@HG~Y3A%?_eeTGY
zV-3g~3fn5zor1%Yx))T5H8Lf*Ne4=KE?Z_XP)9cqf<Zx<Ovl?}By$liZJBV=wI%&+
zE?)r*=|bmyGN=}LtZzw)fAvxMqaq+14OlmE*!=KIq;~GL7`As=TJjX9`WXJ*JOC-;
znm&ItMaSQ~EqDk99vIF0ib<H2{ap1?f5xp!7<P`1TjH*iB(iq5VNWSY6z!Lw`R<WV
zA>NmJQ0qav;-p9au9TD+%eH8o{(xSiEj>c0t^T+NDTJH;4QF?SK%`}Wo!1q!YUd%e
z8lnaVfi+T+pFvd0(lOF&`&2uC<_8I@($uP3s`*zYa7A!NM2A@Q-xVYVlFooayUFt1
z&AFOX*O?1otSwiwU%>>YCs>294fB&!m1r+wSUKKsR5s4mb>8vRi-MkfZ7jzF<X!cf
zxJS;k7FohD85G-RI%^)8ze#Rm7;ssrJ&<t3Nwd}cPfQ`?>U00<e4p|2(#fx-V|CNE
z8CD8T^n?(L-X-(H6puYbMl_<i-1!+gb(izA-Ct|lez@z&fQ75{RFXj!wQmwG2-Use
zpyh>x8}=L8Q$+l0sYq$3N`Pa{)dPojf~`#Ez&L~*VGvs=kk+!Kym=5Zn;)v!iyl5M
z&y`Ju>yQPLYXA{l<hZ{;U#sKeS*URy>pE=lFqQ6d$nbBrv(7c(UhM8ig#RY_8Jtfe
znPi^oU8(yFa)Y%mN3m55+G?><bv$P3?eO>Go#uZ=QRl*QOsu;s_8{|1PiP*v&ATu~
z$f=D<;M`PD->%+~q57ne{e~`Z5A{vUIU_GrRmvJ_Ls;8c?;X}57pV0OxOg<Kb?NM&
ztnRd5TRx1o{(N;TZ~2;}Q7Ehy;`xBXOV@A^UFG83CKsgdRUP27jWC;YENYXhFJ7-*
zJ6X7wS&^RI#G^um{Bz#?ajV+HDmOVqlMf4h8bWb-U^a>}YL3!EvBJR5<tEED$~6PI
zkXf=P)2RC!&b`2K7SDaY6=~+%+w1OcTFzaJ?@jX%9h4Rdccrq@lev6Qo>M<_kTiWt
zbFS48|BFSE5g#O2fqi?>%pk4Qp?Sv|1U0#uU?TkimM~(Nqz9(=dP|DF9TnGKEM>fE
zvm<i4XOX5H-%KmK`a%`r_np8oW%2&HyuY&oGxJqbSnVzcimG;+2)gT|1NQ&0Zee1q
zeWjzK)C)uv>cRV$$NTJ@YJR7K+^;SA|3S}ysD5tGhc-d4WSp4=p32(`OEcc5fy4|!
zC-))a_4cmnR&ulTx2|h;xy!&^>fg#v-i0E=zwcPgPmXkN;(B~Wmf;n&S*K$KsbcAi
z7dMuHyBu?OML#CN_muw^uM_`ys;R$4J9D3Xv`xs#pX=2@<0sxNVFcDSdkQQLf!esx
zE%<`jLmdc)8q@ygTWo{P!{JI<l<E<)p})1@-67klw1Kk@(h3CDfTVcEVT76hetTRT
z%<a{8Ed2etcO+1Fa65(@%$*YJ@MiC8SFmJJAl@<y@g7cvkY@_WRxJry=#Xn;C=j;v
z>&j3&CjYLQk$d=jx50^8p-z0}n}$78U0G{?AJPap?s-;6Gy{z{S7P4|Z(W`G;6TuI
zUr41e^N9T^9L$IyU=#>unyMCe(FNTNrs;h)kU{8(-$b}yZ0|i|Hu`Sx*4?LfL@>df
zRfr2$Rll?I+~R8yjlkVo6ODXF5ZU}c$E<uVZ+zb$e25RC@D;{{sX^<_s?p}fnCp}T
zbjna)yQ9uCBsvL2PhW5SE~ZnCzw>PW$b<Y50B+R!)6w5ZRoGDh_*#H6H9Oe|@7qAD
z5~u+380%W*<DDwy`map*7xnIH!|N+qj{nPd9gFl;vA2Jr|E_kF3PtI;D<#*i>a>XQ
zALO-~+hxr~8cnZBnkcXz;q1a<DulO(FPHHL_Mu+dq_ARvK}AR;D6`(T-DS|{`7F;y
z{QaQxK}1y(H<KZcF#Fn3#0g>)a4K6On#043rX>YaLF(A#<|IXKeJEHWeG5p|(kMQA
z28xZ^<;N)?34s@TZ1{6r_ig4zYAa*(Ia;GEyy~C}wo;(HfU}5L(UzYVbTOpNM1fhC
z3>u9Smz%5r+Oq<EPu@&UB_sveC)J=%D7P{|L`IosjkfA6W(epnPEn!JU}}*cR+|f*
zin*l&li)sEupd<oIi(?!WWgBikfwV5)L?saPl|yJvXkx@`tca?D7v1qnwa6tc;8eG
zP?#;&wy?Q>)b{7WVOR*XGnr(SXpmlo8B6=|1-ZvsW(UoY*Bja=b@_8en=4oBj2<<Q
zR%~=y;^`BRHt=m#Z4wSrwIq<)8q7>j?VtdM$!)vQ2(SH{?Cf(9NZ!~8MV}}dVc5Uf
zd-JTdH-Visz`F-Nj#9`%r1&~Y#g@-B`d)f*H3?47iyyP4&~UKN^d%yUY)JJQk^taW
zTa>e5qd!|bc${tj?}j^rks~iKrB7AW68a38ZC>bImBOQbk@E)%VQugBH?1^eRh=Kr
z&hwv^c3;4G(;wo`HcF!dOpE)GyA)SL`C@`g{v%tnkqeL4Q$26@Uq1gMM*dA-x%C8>
zrx+_j1aAXaI@paI$N!}Y5DyQ2(P3m$_ReKFjn#KL@a%T;5Tjb<vrg!zE92SY^YZY_
zL@xhLDahLot`@`f+sH-QeRsg5LfbQ^);Hn%u_LFq&5BLBpeXnya073-PfXkQoUh-T
zD;34FYF=<RzKcK7%Xv~tWd}NZf3T-E1?;&jvL`;NhlzZGm@s!RA;WY`rf#E%0_NX-
zZ!qu1$)$hh)b=p>W2HI&eR)|^!$F7Dz`_5b-<_GHPJ0t&Iysa`Ygvtl=HvPcsS0N$
z7Y^Qn$efmB>A#WzHHtuBAcN#Ma#7<Ib}E`W7I(faks*8MV1soa-R@fFJ>8++yq9I6
zahE%&zQqol`5EYRzCr%bx<{Yz!|mWPhW>Hy__*GFy~-=^*iy<k<Bi<^6ff;AT+}TY
zmqja&g=>tM&F4Y&UD8>Xm}sI(`rzyNIkgpktQkOv{0zgnXfwBfDTo^&Wd8d!>UVy<
z#ZZc-p4TGMIJvP>^DT@JoT<WqwcvduifUWgSe5UR$+TICmvv@o2DnrmY;67Pkc?=`
z?(aIi>m1+FbwAYzAlGDk+Q6BkiZQfxJV`X|im%Q>yqq#iD$^FbVWmw#ResvcgS_S8
zS$e~OyG~h3+aA>yAOTrV!>h$qpZ1XX$Fi7t+B3LtDq_WRXA;Z0eWu<du;FU)7Oph0
z&>bnxoXqo}>+eK=@ts<8RoK?1^;#_IXrx^t=T)!!{p^E%3New-eo1YLU0&0AE$)u-
zM*Nfds?uc<D@2h-*tz{Cc}YbFi^14+Bj(w_VZJloiVpB7vA<(C?w6^Y!0x%R$g26i
zihzETh?9Blv3sUR0Z6)bhZ%*sHKyRtMYjvD=z(oM5V=8c6+$ZvXK}&wY32^A-fWwV
z8%fyDR$dlsZtD65#Z?O@n=oip$!c{RZW~0NsCK^<V-C*ota|doE?<YTVk<RVWzGvJ
z`1$%;7p88cQ_dAxCz#<V#q;W6vv}d~_Pi*qRNJW>IZGZNBS9D<L4YZe@!xA&1awx>
z-y;rMur#DGz}Qa%9wWvMWeBkHG5p;WZB+aT<<JK59!+PH8JK~!!xU@xIfVb3R?Fcz
z{n-;(RDEx5UBh4pDS9N$&3Pd#;J6dIEPBwqIwvsFuPJq3yVp@S^KT;g_X^Q_jB8CR
z)5w@pKvEzL)jC)e_GXl*`h8)mPuvk!N~_A!YcJP{6FBD9V{#`sUmKy-h_=C4b7Afs
zwdU7wS_rLE8je83@**9Ez&jw<i{24*Q8#FSCs72Ofj))j@PvlHl6UhiKQGfl1#3Zh
zDpTQxA*ce2xW`o__T?H~LFc+^!!vxB*<vP4H&On*aWI`X^a<yPDqspM$+Lbnt^)!>
zcH8L1Ednxx;VEoD^yKxJu&_$=T~IDwP(^?6V;YIS+kEBTP#?z|g|b3n%0&QcgJI8g
zzq&K|ph2=4dmn!N5u!rE*D2C|)%%v~ID_FdpTkk@>lBgOWSCGI+cL*chBu3FqFQjf
zW6zJfy2nAPtFGMTjX^sJ#EpgdX(!GFQ+5Nf@E2<q^uGKISi+M@uF^K5CEM2yWj}K?
zLEGPp-16lp1edpYnBT31F3;4NNFM~W)RXtzIX-)b76PFrVMeJKwe)Az!D__UEzRfd
z;zj%(SUKrFss-fF{zQI0r&Z}D?6NS8xG!oB8T#47I-E-QRs17Ag(ZwsZTL4&$>$g0
z@mU!Oi)ytB6NvDW4k=sx^11UCt<Hv(NYq&*(QEhKOytjLrA%`#9ScYN$0j?2X~IDW
zOm1rDvY+S%#~UaNY|Ag%_63*k3UnJJen%(1+ttgP>RstbtP|y+`GGMn$zB+CB>O+Q
z)PKSd_H(hQdYx-6prwTYd}~Y%!d8B;l?<S6kou~%j}XeTSY>3<%ki~upk;*PF$o0r
zQ}3cl@qRl$gIp1f?4UNlwX;aJ1DAdxa@RJk=KL0^3abLw$8WUhwQ1VJeOa?zh3?gm
zjSZ@uin0;1ZQ94hS+{M29@Vf3462_hwClBPGRNh<w~6yVqH~ZpEXkb~7)S3|H>&pH
zd7eZ#(~}v=|HHp7Rx4~_M8dU})9}f4SBiL(xNcZZi-J$trQ03oWvEF=>=Pt^7a)QN
zZ#RHmXN5N%;-Hy@=zyXp0WqP9Om!4rzfE_07N~|0Rpy<an#&!Aa<7pLeTOmdc+q4<
z<4LPo(&TL=p?P-4A1(wU*iQfH)trJh<Jfx}4N=?3Bs9#H!zBL{1<CAw;WMbpc@g|D
z0U4ir%{Ayk=s~QLB$__eObW$}&q=A11fG8DRj*|aHbjNeTT?mFIacBK5KR~a!U`((
z?(dDnnoBm|NHvfS=}vZk1-@l><IY!2ybpNVnv5rsVQjTzb7X#WaIZ5O-u26gjHw%O
zfrYw{J^z$TuJX%Q<mN_B_$-J_>(YFXfwm;83TMB~cue9faI6;gD@hn`JZ^-AbV0ln
zmls3uE7zw_cM|LQX<~Y%pOe_PFyO6&o~9jOgWm7RKl>xh;J*0>$?y|UzyoSOrB^BD
zEXS^kwVBJHq!D9(n$=}=R~qP_eI?^?@8IQMQgF$=<-*r$1$e(I9$QaKYv-fy(-#hb
zEA%4%PcGM3&l{x(2qf-Mb}0|e83>}7TbMc)GR8f(6ybpgel5Ok$Z{2tcBYQU$h?Z2
z{sTP6POX5a6bhvm0JpWdcf^n(e}%<SLXzhlH*|fA6#gQ45BMBR73?`m;Li%)#};m|
zy{opmL+{vYC_n8qB+vyX(!-eQrpP<_qOf~oZBFJOk3h+^@qItEZLa;h2<DG48lv6r
z5&5J8@+H$)igxvfyEDnC#|$(MVlR5ohh+CFeBd7DiHEccF)t7G*!ac?{?)w@%83hY
zh%*xi8T>j2K6Rqi9)Yuds>UuB<LF8BGV|*Mo;hES`xM8)N@Qpc3%3Zx75g^9c<UC;
z->FgZ;`x_p*G?~w#KeZl=#SsG?m7PUq2V2&4)AwBv2QH*`LyGZ@ejL(A3{@+P?oQo
z%5Nua9kV#k){}&6pX3#02oWy)IP7%6B1USvY1)0Oq)<r6ms{r>c3#B$wKQHm+JgdE
znt6%z*kkyuBdx#}7$gF~BH|Gz0`=nCwV)^iVYJPluwF1Ww*g=K@RX*7AZ!FbRGeaz
z!6c|;V`T%$5=ZMsMgE}tdm-~Zs2fcm;9BdAVO#r>roRrmRXS)H$m4D2{<+<Sr3d#r
zy6=$WYgoM(uB5qe)zdt1DpncTM!I48bk;c2FVA-Q3O=xBLyQQ-O{JzhbGipwlK4iQ
z>EerqpJoxgj@J5>e*^{CwNDQeMOCFIdGO@6%MZ`Um5RsD#V?_q8ViAq8kMEK^CFv%
zq)f%35==@;^;w@_Q)Z|zn@Jr5^QNyBZHNTmLg`TZ#?P}_ajl7>NI(ZdiL5aU>jYVG
zB>(2Z0B}-S)Z5uLPtmlChjO|C9<>*7rwKyu+X6QH{5Fbv_^YqoxjM3@IKN%@-dAyb
zug%0~J#F`0vc2oowPlN6z!t5QIx`?^4e4_LZM(#98TovD%KqMn!CD<k_;CXRbvt^t
znNM;Shw&z>^G(S_gRho6%=cUB_P{~+ev`PsoLvrMve&&=wxu@USh5#6<X)$WlLwM(
z+$J=aGF>>(y!&BMWhA4wen%i>`ZlKIz#SToIzk6Ze%g71HeAE8>1!=5Rv+bZj6j|1
zO5fFN^CzN7KTAv1(Tp^Ea>?<$ga=VldZPpfD6Jh2!pdC{-RcWAvH!SQWCA1k<}V?m
z@jOFCn3$kNrL=GM4F1=Ids?>LSU@U<nGt(ezX-`lG5D^)xUdXL4!o9X_obG_mKJ)#
zT3b-?SRR6(jYx|%uv2Vw`^n3bX&mGc_0s|*G`jGGE>_MAIJ_gK+w`rDSzN1Fg%r(b
ziALG-_Ow@iNOhJWv=ZXMu+u<o=XI;Gy`5WB;yb1Ge$c6Z;>b>)Z7DGtn?>%9DI7p0
zu-1}M-?~H|p;iFvPl+%QUp`8{7VQ+wUMEJdf;s#yp8Zf9-N+q=W^P+PSPkOVxEkZ9
zVOO|{q&nikfK<&wN|XWokdQw<$Q`*zxo3OG=*ANexePM?8kY<qQX%XMDaX%!NuNDs
zzU>uEDrsOYC$$OEa2(8FvesSGSmi>1#SbP!l!-L35dKnVsJ4kJ&E2Y$b?Aa2wHyGG
zHik_Se1RjJrH1WYgMq<D+`Z0ufSym~Hi$$?Tq66r;VXTf_X(}FeXUC^e>9;dHw7n9
zLz&Rqs7QQMC;_d_6%q~=S;bT2Ml_|%2Z&fTyYU*dqe*IrenYyvexhGxpTShBf)`B)
zO4hB@z_$EpIVK{0$U?ZYG?;KFv#pRG<cW<rT?@w&_!mUj7c$-uVoH^BkEY{<A@Ljo
zffDM#cQj7hF!8p9yEJv7?201vI(%y6aX(GJee=Sd%OlT<+U=R=HX6jse<H7*%6*l~
z?Lh=a0foR?NM;gPBqR4DbRMEF0jg-Q=B{8-xO)ag2MR;6J%`Bbrh+91!9YJ`$+-3>
zZtlqd8&@plDN(3`gx`nQ{X@AR-!b9FsMyTIDEm$pUU+Mu3s6;2(FcT8m$0K#++4Fl
z&cCnf6}vtQ;Y@a^2^yrqnTvP$q>SwomQ9N*W0%h*PQ0A`9kG6l7cyJCfb|u!ewcF>
z89UT8<}C9l+z~De-+<()Epr#Px4v}%RCOU_`~bTbPY?~wRPN`AAV`V9*&F^aN}A?B
z2pr>ZQHzf-g-{0hsT&A0Tu1k;zMF%1&P&kVDwop!$&FgJzGgDx<~!or1h4LmfO-$@
zPsCa;`_Z^AA4X>jRprc2sFl#Fv-DN9WQ!h9&es^tBodd3a@^cr`siDeXf{5pDPoXG
z5fMwaN+2NP4d1BYItuOGKr-i4F-sT^_ZbQ}0%*tM^YAQYvsC<-LKKZO?>S@q|I;e(
zv*H9AajTB<@kiaemJk)A#mA{`buEOSp!NK}*Ke&T2$t=7k?^$XXnEzmcO*}Q_*Waj
zwM&bBU;v5NbsoPfY1uRt%_|=Rz8+Ulw_XHr%urVI7Nhy-5z!aK@hda>w1*W<WnY{?
zLx{oXX7NDfU;1;o5cP&wDfbAdSzZN}^1?XCKEzSgY?z{EK{Mk~q4AK)_IG5;rBo_K
zwwg$}X9%DG@FGeq#f<h%lw3ycDiJv(Pp)PyBnScx(BzOW-~3NF+F58Z(D7BPSmTb$
zPucE&sZR`(%1ssRXe9K5+t<Qk)x}SLGNN;1OUO8VTGRZ5()IPXx9x}>mV10x$sLvX
zwmZkOj-REfv%baKrGjYbS}-Hah2?a3%OLHPj7UA(d>h-F_E+xbOt3O|iXSTrR6Fcs
z5g!D|e}iVkHoHJNK!5yx-#nfY1xxHl$C%5MiZUd=667<uM$0D%w3sW|{Toz$p%CUY
zRtattHC}C{7`!U@<b`XLQ@)C3l&bhp`<oQLPN1wE&6qy8`;YKUCK#K4^+f%3eFZ##
z`HWZfuh<JaK?h?I@4&@5ZArMhjWd}23VJ3{6ngC;VM@)i;qtQU`f7OAy4{{am?Q3&
z1UfDUp*1z!Xlv}xcu%~J@W-i5d#v$WsR9^(x(ZQGo==%3{!=Sn%~!(*xQ8qL*yY8e
zmXSwn6(_VZK(4iR0F`J0mA8g4`Re~iQ7wg1?>YYY+KF;FQe)VcjH!)r$obK*+TM*N
zCE8yaS_cuDddSmT<#AuMTHS0u9}iNimkYcZR@HQ;GHsi^>Y>>xq?SgA$4EAcuE`I{
z<$yH$NbW+E^ey^EQKe4r0XYgJHFObd9>tTD&pe6iiuB<juDsZpwklvax`O+$v~em+
z(@JT+;0hgt8O<E~pdqp#W5`@p6;y0E-N3WMVGu+b6sGxo?<1G6o{e3m^2EOUO6P=E
zH9@Sp{`+tcHno@u_9A}M`Bo}r@Tt0o-FN35#ZW^P;KdJ_ysT>L#s4~SPE*ub7Pm6Y
zvX6p7Lf_$sQP&j?B$B0?wE@QH=yNAwr0%p_Yu^(*b3#Ih!Aw+F0@1n6Eb8c4gj7(1
zKaL_(xdp6DGOO7ZMa;Bpd{gq)3#;gCk58a(qCLGxetzhUeXQ6tOm0W<Z#Q^OXBPhA
zNm1~t2~As|nTcml58KUHUfAh*sj*{Q&8d8c0EuZYQTTISMhHa<V}_?2QbjGq!!*@g
zmOH^mxU{!-GS$d`YQXEeEAB6~{uTPC(3*Gt0%LGGyiNnjXLE&}Gd>m>lKQx`e4<6l
zdtj^mTLy09r4r9iC=ZPt*^Hkn@rNW)qu#e+40F>}F04R4_Cz`KEd0@4emDa;>wNQb
zfH;zFZbIau3<DY;@(xv(VyIj}!vc$idSv%-xQ<{eJ?>a<c3f?JFl3VqA}A21ZM9Bc
zU=8_VxuDl~Wuy99plE&OJbdb7{{~JZy-<(gza2Npu6F#>qZJocl5g|h9%Eobc0a;L
zfF*~_UR0`X72nW6bkzUAofhBPmhs-C)^Q=IE&5fp0qfybfn56w9vyLjEsth&6%Wb>
z7{ZPKi#1^aPm}``1a5MpG_VowtLF7}Ti;dCS)X(pEu+<`%TT{#!9<{>>n9Pr+#L%D
zirr)d_YU$ApiW(@4L!`7{^dT%MYlRWg8J`OVSfer+iNep#wesv@b9W}O4^=D1S0Qn
zDN%^L|H(6tpfilA8nB_n^LO-BxM1(<vbuhx64t&C{GY-z9}2#rwTomjthI~<TUe9{
zS82Uy&dDbF89$3?Rb`8*m%99J(2!=TP0{0Tx%mw*!RRQ$4tCv*iO)<;D|23|IQzQ0
zxkr7{L^lK!l=|%{c<HaS%#TlonVH50am(ehOKFe!UGe=N2=+3fz<NH9Omk5f%G4$G
zNb11yLjEzkp6VHxKWg50>#&At;k6g?n3vKD?=ptUV-3%M=W)eTPsiRw=K3||AZ1rO
zDHv^d^T!Lgm?Z0kh7zF|;MvxqFN#8(p+rME=!-a@Gc5RUB$d|MDh!D_hB>O~j=fCn
zuaKiMjG=*|wSAv_i|RI=F$G6<xpNAk!5KgDF-bor5kw$D;M%uXT~a45no_V1=z2P}
zTkA&!AgCn|ym;Ya94t54*!b*Ty*in$vi1d1K?2Iu^j=XWW*|UO>uXJ0LhAhzNlV-=
zWL4HEk~6=*uuGBhZxP%4b^)UnmZ#y{M&mr!k#LlIHh!C^kyg^x1BQcqw(`#eD+h^7
z=z>dWNnk-GpF#PycLZ6<P9VjtnIAMsNP2}Nz-Q=&;FUrw;o3_GbezWuZ2C5_ux0sN
z>~mM5Yt1qlVUynAXlC_`U)&-`tJXBIhz|mlsG_lmr!*;Cz$WN7VuO*Lqg*)=DdGhJ
zQsmaCDOWNy5qtp^niTv~1B@OTwaQKi`y^J1Dmwufl7z`7T-Omraf`9}EK8vNYR<)>
z$Pl#kmX7eNEiOox#E}Hp4HWflbm)x;=Yz(2L-Q6Dt{B$p#VXI_nm|q2uWL`nz1F!D
z1Fe1!9Y7crGoY0^!eOos(yI5bjE24?ZJ?AN?~;6YF`$ut=F{ST`gyOW07)GUj7w>d
z_tN0JXT@k(Sz(}C$@h`!>xzT!l$*J-!l09zo{SAfZgK{7*9hnPRZxrQmJgJNUuBuG
z>>$4cm{bq%_Ttk_he5t|MX5t9rBvQ%akm_$Ko>q6Yd^W&k+uArS-dYfHJ;zu2MmAH
zFD$&sPusdR`xSq7Dxx;*EhGL1WxN*EpYUf=+WXB;!QW`}ua8I_$T#=8;_?~aTFIT*
z>1P3X5&!5M7IYF8gcPye?QHAG8vfuD@pl)sLtx}Y2NN1robrgPPx$Taad%NSbmR%~
zm~ujDil+gAr?RCOaH9}S3t2tn_#GQSU5Bd?WyR-Qi-f6bDdJk!E*G9<UZm&D->7z3
z=U;ta@`sSY&_f(!PMn3fjid#&PXox>5Pvp9^c?=DJ&)9yatUgxE^kNsq{q62QTDV#
z44~}ib>s>(9GrpQLY_*Qj4R;mBSVfZA)68r?!q+wP!7?+(Q(TucPG8e4E^ukZpKUf
znW3=Q75qPkafA-9tjId8+f5ZCi2lB}gZM5tJ{5tV06GJbG8sUPaQ!7(D;~vpNPNEt
zOqxsF+E)G`%JSR5^>gEDXP@n%j2qJ}_<=D?9Q1&Ys!iMx7`fvZ#~{}c$bAPP_>SA@
zlu9`RMZszjaPb!3??-|^1gtlIdl-_IPd#>_`Kt_+#2e{QetTeOW(;i?${3cs?DA95
z`)Q-sa-ORH1X5yj$(hVU0}hh{MfGByEflo$a41N8of7^Par<5+lr-i>67nCg8TEG1
z4^j|=fe~K%QpLWktN$(Cs^<J#66bZcswSEvWUAsO)sFeY!oq5hy_H#p@LdLNM^cyG
z$`Qz5u>60ErC3m%C7M+a?lxYXf9|mruO<frg3H9w9YoGh;j+C;ZT$^6YRKka#S@Ch
ziM|lRYOWB0F?l+Q;QfvKKP+cJ|0W6l=lPiK%+dd&fM1()Cf~dKN`ugptM4+^4MmRm
zA5LWd7ILjTA17|Q%QJ<K+-82q%FdXDzbT_C^WU6ofE9Belv|k*GGp%c4VGh9fTjmo
z^+k!v-km7O4xo+j-xA4?3I4O)j*3+)rmxntX=k`{-$Hf710$u%B@RbUOSsRZfw?04
zLF0A*WgJRsDU{{vh>Y$duCV-w69r_vnP?(oZc*&M3><(a{0Q{}3T6TbqA_P~L0c7}
zLi$&PuNZXTX+<)|;Dnaw<vMWjTS}5(mw38Q_|=;di~5t{YXuK(j1*&JiP%lNVTr6>
zXm?ak?NztM3=4-y3r$*}Gq<%uQtfX<4MIF`?Pz73@BS7x;g^5YmP*$n6$6q3iQZ<Q
z;~e1YBh6uoC;0>W>0CqG>nbg}#P2b=$=2zu{-eg9q&5J-MG)rK3jvM8Qp*52waqfw
z7t=UWGRoA;BvI@_kn=D?2&)&j0E}Lvgm1~+*$sHbK?!gE&!YIa86<wf>f(`J#_WPP
za7G<60o57v&*YTxmQ*)=RlZ04Zddh>L3*0)Y465H5D8!9T5ynQx3T^J`lB94SR91V
z%HiYZ<jX8xe)b`oE&9)Tw+q1E7X*#QM{Qn9j{s(+Y)@YUf4S$tO9HHOyc6=nx-o^<
z=l0iT#}apl_x(V^BFsEtoyYNK;*2T5^k21;c&=pi1Onr1${TNmE}44lmrgFP#;XKn
zy`CwMcN|ZNvX*kfNVD3EHrL&DTgt0GnjS&>k9!TL-N*FQ4hU#u1bNXPcGrCT+|<Ni
z7*s@gX%S@!Avr9;2Wj7?dVB$imsS36)@cl(TD)=p*Qb6OX+NqnHAk8Wn~A5?F@*KB
zp&3QNx6bidmMHqR-F2He1X*1VPzsNv)B;B?!7YI8IyTtfW)zRJ3+arCQ|N)3_3NC!
z|F$hZyz1*abV3eS(#O~A`ezs4bAauur;cmBi?S|~x-<&KH9JO_R{kM9#2!^J%*o1p
z%jtGIHh#_Q52qbIPX2cfz9|(F<hVF=_oJOfkg@~LzxGHa!!AJRyqpyJgg(A0w$;R^
z9ofoBQ6>aQIckP*-MZ8B#>oZ(Syh)ZPVfL7;pK@`u>CBaLw<N#&c`%h=-3J=5*2BD
zXdQ&~X3vEsd=Tc3GwRjHn&@(0-<fznFhB4CjpW2Uc)FJPo;2w2P-N_8=hkF*Zxp1C
ziktu&A{Oc08@#KoVDrVOTF@7tuvVX4EE;Z{5jX5NQm41*-@3j<Vr&IO<ovJN_|srv
z6)`Q>HX$ps6CnCU47`H`6gxl3WNW^;S^7MBdJMccBbqP7FZ?tZW=1p>2uRd482n*q
zxX*&V6C)$vml@)lXrx;PoCVR)+f?`s2D}PU$m3Lm5eD4AfzS;sgn9;ajS$FrEZ7_d
z40`aekyO|S1}rde=&n>a7Y4KyuwV6i!J2CtYPWQq?@M#t^@h6JP+IbgneLO0vkDV@
z+z%5YmX;Zd7f2=Dix<?3FCSrVn@E{1OdDjKLX2SiuGn=MJy)o)GrwNy93{wURftk@
zZYU?WtRT5mZxNGvXrk<WvFz-X5GNDmWz5L-tU34aqDD*lfH;GGU$?}a|Ip)J$_~ph
z_7jqKiCZz@$$wGMce%X+Y~L&c*X^r4o{`rdjPFk^I@bAY1;~|z$?qX$R<vtd?+~a=
ze~z_y0zXy;IJ1Kw{wsft!o!i`Afi-@k<&T7l}8|fPqRHXGzy!9I<-Zdl<WJsDqYjl
zEXpe=TF2~?ljucqYn<t?qfWBp<OzX@o+=Ki5IA<CaVHiwcU#CO@TYjmDNldbez=<p
zrc)OG_Ww{zs7_vt?C(&#P4Lo`6QIVc5vLTzferlo$XuO|#NJN4Xp7&Wnk0rYmOiac
zWqf5i#cHgEec?paC`8C4M@4Oex>-9tzJiZ0-tQ^#Folja%(zC6F2>P3uvEVCZr7p5
zeVJ~s(L1t{@dF|xooTM=JbQz`Q<sw(zTmS<!F=m-1~_m6$qR~p&t_<pOC-kB&o+yT
zLkRIl3T0+jXacf~Rtr!r)PE67<=wG}79;sxe?mFlWehfnOcfFZAOAHMn>mynUngg}
zRumul=Vx8%+wjtQE8KZyd7V0Yv%NQ+xvO1FWmxVTw%)Cool-Ty_gNej_Fap>QAwEH
z<$-6+BK_}i*?}@3yC8A>t`kL{5S@ZBDIwJ$AzQ%w-N7|acCdA2a1Ms31S?_W<8rcw
z$K0NJow!a5>-UPV4k~U8ZXw=E26TmcAIuRXZW%O^Hli;Cp3<}ezH><E@TBwq6WkCZ
z?~??PYgW&Famatp4u=)1$XCVry?WAdjdJYjhxOr5RL@CPCG4RK@-kzxtE}QrfhI23
z6E%!UIv!cIU4Cw%*6v1)J3eG0f6i<?AI__N-84BL^RD;>p@5>ZC~9Sy5S3RNK@vBU
zKD{T33X026<|~0IQddv!s!k~7;oW%Pe^k!s)2v(_i`kce%!39rK1kRD9Iv9<H+k05
zVv!Nc6}_LlYqDb2bs=cpcyPz`WQe9J>9|Y)zZ)0d_z&r_>8px=`iIqP(e_zcu>6x&
zZdK*qS54mbWkiua0P%%fLaVGImk_yx$R$D!m$|M!@d_7Ae|LZTg(J|vSY4e_;EVqO
z4U-Vm8zTPD2|Bhg{3+DP*mMXzlu=;)RPDj)V_TP511K&or<WG33gb13F6gn)Xf+#k
zfF{SXo2Z9UVO6U>^5?7bD~5-z`}Oys`Aq6#!X74He|Iw2zhu>OE{)IkCEM*^bImO`
z%{2L=WXlcnt;P=9e8cC;v}4n5_LHW>e<gA=ro$K$0rXaisT-#9k*To1laIzONi_rf
zI20@BZ)0ehX;ZoHThf>nZB9grQx9+{6w?o0AldrT)^?OgMhPcT{uLauE?XI{o3!)V
zje5M?#|QjHOs(<{LHC3F4T(|9<qg8k+I+ttIyO&lA)2xg+1K?qY9^Mc1y607MA9;R
zVNE!W^Q2v$^0qhc4(_m~!Oqj)P_RoX=XVFrBv>847N0ZC&+X%Olk9pjW-YSPf_b?g
z71;e_t4=Ba%(=ADOr$DlRp_Pa?lw>1VAPYwNXs%j)a=sjgU9z(SDaXFCXJA%X)!3U
z62GO-i+v_*6Ak2oEM1-yO<GN<Cf5ArtqCNO6HCZfFQf$jouE=@o;^6{O;I1(FpfS@
zF2txNLWm6y*aIPi&I668(+U{DSVAcL#3L9RKm%c8VQw4NRYpdkhm65>d2^y@#OrF?
zta%ro1bMppDOruOUz_@L?tCgzd?mzJ7r*4y{)GlDlkqML2f!e{;^M1|4SCNbtBKP8
zIP`_I>|I9nNp}E%P&61!{hU{I-zI<cS=GrUR&E@jvKmw<P~K1uqHFeIP-)rjE9&p$
zRi2>QT$m{T)fe<^rJ_GU-u>nco#i(}j&Dxn<2&a2E}6E=4x~XzYm`?PU-H+yWX|Tk
zCLJ1Sn(~rJkwFE3-k`jq%Cxall?gcce(2d$`aMf7K(4SF6;>Db=bUuZEb0p><gcWf
zW-UlE@3KE@7BK!lzW&eu)2A|uufG0IqQ2edRYn>?(k5o*ds}#IN`=*+KtS^BsctF=
z-K{?E@JR2p)qfsg*X54cx!}@2C6ikkGxJFNM-A{ZJ$SNM5GEVF`>ff&B<(pPrN(cy
zpA^O6HLLcddU8X@zUf|wS<(^Y)j>L3v!Mh9T`|y=09`vQs&uqC@_)#PCIbbr|BHmu
zGkua|sks&bOJkSGIip+tJ9^_)S106cC&oowlZxS}5G<ZKqOQ7nMNn4~Rd8XkPOI&U
z%sRyTj~q>A&H>wh#uzc1Mdf}(m@k`5o&3N_8CkCq2I#DF%J551A*d?Ig|n_Q6Nh>a
ztJKLxK4as_3sC#$FyUxWlaD+t$(<%&NTp~U7Faq5{7nD6FqNW1Um4fCi?z$!j)(ll
z=E4j)k>ue2Pes1?qAT<N_kuT4_SM=$|EykFu8FT1!i~D}+O))kMGN+1lu=hSap?5<
z$`7GI+k~ub>wUov9X<Bdp4V8z$wNkF97n8Lpekz!@CCur%1}Tj>#sLMn$s|o+-J=b
z`I=3a&l<^c`BcbXb8T@!tiUqfF+6x`q>=0B+ZCnBbyh;>T1B|vGX%2TT7HJWdO(yh
z=RYONm7Ig_J8ApdeN&w0UI3pO_*t<cvMg0ss_OLs_+fl{p-koe1M+s1nc-_i^+NR}
zL_cO|sRzb`aLS}4?`fkg8tH2b_{9*npEYxOia9KJp#<)d0bn3&fVfm3RxF<9$NUcn
zB_8rUc~0wf-o4CXQ^pr5Ra#OTgz_y{9?&?L@db(&MKo8d3-MCO2zUR&9J}(FQ0rb!
zASNfiCQRsl;8?fv_gZ2}EA30x<ZxgvE>O4h#|7!lSU}MHW)MRT8fKy4#sO$ELB7b}
zveUVgexz<lq={}wAZpK&jix@J8CNJsIFZQlCJzU|2eGz5=b(N;26h%Y+JcFRwo1lk
z9M(7rWvW%M?mOW_XX3e;Hw=opD#cSNB@2c>UP+W;`3tcm3~Z%=Yq>{obcN>a1z<!n
zIB&f1nD}xdc<6{{#Fq%0Ddxp7`%8UM<friV*1xgDiB*|SzH=^7H>3@I&CB{cyYRRm
z9YR)?IwzvAQWQRF`V5XXg-|3e`%!9Ls7}j!!jHFT3?pV^rP9PdYDf=C(#3J+2z%eY
ztJU~8OJlXc;%<|sHm7y)m}gzzSbNmL2S|&Wn-PkuLGjZBi9(Ow_W&uM@@jEI|Gaos
z79*HCcB}iPE`$)h`KK9{2EWL12^n-#Yq}PQqw?&RE;<&17Pb3n6d#8>wpTw6c!(Y!
z^1RgFd6l6j8BVn8S2`%qzjF;D$vb{7`I#uP%E5jzoUW#2VyJ<0psr?<08I4rsLHBU
zkx>6SOQv0S-Zay2<j@2ZE26W?q;n>9R$S-Cg?Lf8*Af1wtzVoCKb5*q3+f+q&g+r-
z^tm=|p@fDv)oamEf2ryy99s&{ChZJ+PQ~}i|4H}lt0-Bn#wP^1+RY4!fRitrRC4YB
z)0hPrzL7E~d8t}D!vN_?c?G^vpguCFHG|p>P=hrwbUHWnpZVT83K^4InI)z!MqVpL
zUE1c?Xwz9ak#fP?1naQL(b(|@M%CoYYt$i?we`ZUld>+k8s6{V(*HD9Y*(gWfYG-W
zp#Y(VC>aT09`*^m!3hfSpnh^WO2R-v8NuJ;Pqw#4kZLT{th*CP{D|0<Z9kj99Frv;
zo!(iA-Dv^}&FP-I*@paKKd+yBpHaIS*Ql9uI3y1_WKY=K`-N5;_4aXEP4!Cp^R$xc
zdebWEte}%pbi>JFw$`C}+`$NFicQ!<5K^suHGzrtT@5bUJ}QH{`NQ*nc0U_BwMnyN
zXq1#r$*8LJSSEd?jv4@_HP~B!e^$@3*Rezj$9Z5s2#{KDCv{&}pVWL)y`QuW6MemH
zFtiLmv#BhDCV9+t)Tw3RF{`?CbKFTxhRz{Gs<6&xuGoVMF>cCC?TBGSMH`V(LDQyV
zwiX028PQFo^c>6qrVQu~HR?$rVp*dS?W6|)8PEEb^DTYJ7-$DX;fdC2l92pLka*N@
zcy_^ilf=C5-8L!`U654bhlq>MSweai252{;ow9vXADZITFpzddTz?`T->6AoiYhtn
zGeDVBsaq<3d%fm*t*Q62mH<^*NtIhg|3bK%`!dfOM=a6!(uA)mbyuUVXk@M>>KIi#
z741GJ^{>k5Dj{2O->Om<C&SXhAGm1o1XvaLpST|JG+Pw-gO(an?RmW7Og>bRFf2x;
zcYyH7g}4xe4EZ|D7H_4h%dhlSN4l7gz$F~t2RnwxnWP+^y9Vv7QV)Wxsks-wI0)(H
zzh%#k1A#^uDay^SCXJtHkxgHbv6*9n=6J0!?)=j%*sDxM`m>=9f|zOkV3H{*#^-B&
zcgbj&^XX9zq63dprjg(ykTAffCI3y%bNb*t)1;<H{B|2LYp2{QgSMn7OY(Jf?AVTT
zJebfNk%mZ32-u)3@WyE^G}@>-ViD(>A4C%XCUpn2W5y;)0<eVUfJBEM|2EE;1t98E
zZsvzd1(GKDTw16-p*?@1SQ?rbw2?tm6cb<D7XTy`1rCpwp;5S+z|fEC!$N7=1LElO
z1^|xA0+0H0XdJ2}^y?=!czX?bbBeA+6SG&|enMTrBYIE%WZF|mK}bGzP?e|xGQpKc
z@5Dk2oGE%y0qUS1oWTfedPY^x{crReQ*;HISSugY!zj7}t;w?k{RF-5UkEDiUp$$<
ze<?_V8$N<Ms5W0Xf=qDPct0ALp$y2%<RrRGHSH0R_-KLMqpB?Mq+{%TOS98#<j8mW
zmZYFu9G~Fs2b??YBhthIA7lSp3jA)pcC-uB6IYVb+3B}{EJsGW&L?pt8OX>hBI0Qb
zNRzT(Dw}#+IXn1h0Rsb+u%RAbhy8#QU4hnjMH$#+j;b8%9~@#fOR4O4&&OHHX^3c;
zt76}#Kw9PM&MRf-{7OX%m?E8@Xlq$jRt?+z7TPpO91SY+H<0zgD?y6?9Vh<ZaN@AF
zQul*6)okmg17?CxPlZgta#d}H(lFU246r3G?R=4re}xmrT#W$t6T}NG&LYAbT9joH
zSK%!pGJwmKh5+tY4MRY(WeEN0jEIWTcOaBan@b>iEEJ4a8@qS3t|w5fUEHQPj*xo%
zbr8Q$qI{n4-`Dr<g$9+?D4^nELhSxFh+k0GjO}@O$&KriEDOsNf9_$1aM7q!R>n_E
zo#DEa;;ez2%y-GObQvhxU-OM%d?|7=tSy!+?ShxRJ&f?HOdQIxlJKhm{sF||LaDIw
z8SKrBZtQ~rLd8{fgCXWrMgV2gnQH6n@btpCj#r+6qlR3QzsoWdM~8`^Y6Ck$?7z%W
zW{vOAo&U)5eI%K8Dsn97;UcoQ;V(p_QH&MC7$hF7@E1lzrN1(zi^*;z=-+*?A|ozf
zxn)-C7uYi~mCe(?5^qAvHa%=vw~Vz3hzE9lD931K9<jw~@$^5U=iyTH956cX_m1f0
zgl6}C&e2+QeS>*1x2ZHHL7?pbaWB?x8=Vx(CNepjEOi{az1{)bB+M27cj4McZKONd
zE4>x^eAmWBJ6|gSd=rKQ<H`$@obut=@KIQhdSk|`zF}$)MIjm&`fQ|@o%uW^do35r
znA0Rbtl3cKA}{9CU^ZQK&6r_2@WK$xv_WZGH%&3)3q#<|2Bya45>o*3!VosFfvHi2
z#1tpHXghjdMsq-pIi%V!>ex<jF3{&U|D+z<Otb~V))R?fYEt&Xa(=zq1P>?AcjHQ{
zfHjHAqOOGx-Lqf6U};@<>OBhGxc)0(Eva&8*nDT3+t(aaS6p?cLtR+!Y_PXLyYUK!
zQ9B)$v(2(57qpFB=m`sAQJe&#zZXA~mY)_eE|W7+Qy0qdqj80Tx@e9)&zdHChvCrf
zUBv<_X(r{#Y(MOnw?T4W6Nta9XbJ15zL1AS)eR%;pQYbEEJ!kJ>st<Wwk{R`{r6QX
z&hz=1pBEv222%Cnc}V_!HJo!o43JN%E7*=n8GRcvpEJu$&>&`Ky^sM!Hb{|>*1&6H
zDg?_yAh?JAe_M^m4^8ltV~dRBys944|MzMhfTk}>U(J@c3bv5s6>P;%AaK;%r7VPG
z<nOAP)saRm=r%Onl#&pbn@}^JEd6)(ZuNnMf;l-3X*kEm$~_FvL-Kzx(0Q+?0M8Tc
z9E0FI6dx=0*kM&l%z#V>La8wD`#(Ugf&+Si`!S5iojFXpPQEv}stzc?sqp^Op6vMe
z!=k6oi3J;WB(HNi&w`9PhjyGSg~a|JrSyg7y1+w%ziVpRuL&d}=-b9SbDx;P?^77I
zrT6<w)+KU@-M_R+Ulo7#`LO@(UtM;nF7bhRDXiKR*B$qc|5IX9OaJTt`~T<Y+&p>I
z@>u*n<CnXVkGTDwH-77b>WZjx9$b|h*O6Hr637?do1(KHo8X9*B>xneGQjq~0n#jx
ExNK;|8UO$Q

diff --git a/docs/python b/docs/python
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index 1e975dc8..00000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-setuptools
-wheel
-pip
-sphinx==5.0.2
-ipykernel
-nbsphinx
-myst-parser
-sphinxcontrib-bibtex
-ipython
-pandoc

From 0a752bf23310e4906e4cecfcd58c9f68bbd33f3b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 3 Jul 2024 17:34:00 +0100
Subject: [PATCH 363/419] Mark test as xfail

---
 tests/test_minimum_service.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_minimum_service.py b/tests/test_minimum_service.py
index 20a303fc..04862e07 100644
--- a/tests/test_minimum_service.py
+++ b/tests/test_minimum_service.py
@@ -22,12 +22,14 @@ def modify_minimum_service_factors(
     return technodata_timeslices
 
 
+@mark.xfail
 @mark.parametrize(
     "minimum_service_factors",
     permutations((np.linspace(0, 1, 6), [0] * 6)),
 )
 @patch("muse.readers.csv.check_utilization_and_minimum_service_factors")
 def test_minimum_service_factor(check_mock, tmpdir, minimum_service_factors):
+    """NOTE: Failing due to incorrect supply output (#335)."""
     import pandas as pd
     from muse import examples
     from muse.mca import MCA

From fca34c2c6501f730034474b77afd00926e243058 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 2 Jul 2024 15:35:34 +0100
Subject: [PATCH 364/419] Update copyright holder and year

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 58af920d..e3babe0f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -6,7 +6,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "MUSE"
-copyright = "2022, Sustainable Gas Institute"
+copyright = "2024, Imperial College London"
 author = "Imperial College London"
 release = "1.1.0"
 version = ".".join(release.split(".")[:2])

From fc7ab11910d8b4324689094825bc430210efd572 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Tue, 2 Jul 2024 15:40:44 +0100
Subject: [PATCH 365/419] Remove reference to SGI in CITATION.cff

---
 CITATION.cff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CITATION.cff b/CITATION.cff
index 5bd98db8..36f78d16 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -8,6 +8,6 @@ authors:
     - family-names: Hawkes
       given-names: Adam
 
-title: SGIModel/MUSE_OS
+title: MUSE_OS
 version: v1.0.1
 date-released: 2022-03-25

From 11f33470df2238568f53e11027cc7e183bc89565 Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Wed, 3 Jul 2024 17:34:57 +0100
Subject: [PATCH 366/419] pyproject.toml: Update broken homepage URL

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 3500fe72..b2edc923 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -67,7 +67,7 @@ excel = ["openpyxl"]
 gui = ["gooey"]
 
 [project.urls]
-Homepage = "http://www.sustainablegasinstitute.org/home/muse-energy-model/"
+Homepage = "https://www.imperial.ac.uk/muse-energy/what-is-muse-/"
 
 [project.scripts]
 muse = "muse.__main__:run"

From 8914bd526b58d17c8efcf72bad49f7755f792d0d Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 4 Jul 2024 08:57:24 +0100
Subject: [PATCH 367/419] Remove generator expressions

---
 src/muse/outputs/mca.py | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 950ed1ed..eae54be2 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -403,7 +403,7 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
                 data_sector.append(a[a["supply"] != 0])
 
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True).reset_index()
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
     return output
@@ -563,12 +563,9 @@ def capacity(agents):
                     data_sector.append(b)
 
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True)
-
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
-    output = output.reset_index()
-
     return output
 
 
@@ -643,7 +640,7 @@ def sector_consumption(
                 data_sector.append(a[a["consumption"] != 0])
 
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True).reset_index()
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
     return output
@@ -713,12 +710,9 @@ def sectory_consumption(
                 b = b[b["consumption"] != 0]
                 data_sector.append(b)
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True)
-
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
-    output = output.reset_index()
-
     return output
 
 
@@ -832,12 +826,9 @@ def sector_capital_costs(
                 b = b[b["capital_costs"] != 0]
                 data_sector.append(b)
     if len(data_sector) > 0:
-        output = pd.concat([u for u in data_sector], sort=True)
-        output = output.reset_index()
-
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
-
     return output
 
 

From e830cd37b1af16cc7f421ef6f4835029df5da36d Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 4 Jul 2024 11:42:50 +0100
Subject: [PATCH 368/419] Regenerate results files

---
 .../Results/MCAMetric_Consumption.csv         | 570 ++++++------
 .../Results/MCAMetric_Supply.csv              | 816 ++++++++----------
 .../0-new-decision-metric/settings.toml       |   2 +
 .../Results/MCAMetric_Consumption.csv         | 432 +++++-----
 .../Results/MCAMetric_Supply.csv              | 558 +++++-------
 .../Results/MCAMetric_Consumption.csv         | 402 ++++-----
 .../Results/MCAMetric_Supply.csv              | 528 +++++-------
 .../MCAMetric_Consumption.csv                 | 432 +++++-----
 .../default_timeslice/MCAMetric_Supply.csv    | 558 +++++-------
 .../minimum_service/MCAMetric_Supply.csv      | 408 ++++-----
 10 files changed, 2114 insertions(+), 2592 deletions(-)

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 747a6ae3..de548ddb 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,295 +1,277 @@
 ,agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
-1,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
-2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
-4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
-5,A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
-2,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
-3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
-4,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
-5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
-8,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
-9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
-10,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
-11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
-2,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-4,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
-5,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-7,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
-8,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-10,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
-11,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-13,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
-14,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-16,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
-17,A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
-0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-4,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-5,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-6,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
-7,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-8,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-9,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-10,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
-11,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
-15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-16,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-17,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-18,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
-19,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
-23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
-4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
-10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
-13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
-16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-5,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-6,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-7,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
-8,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-9,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-10,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-11,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-12,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
-13,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-14,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-15,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-16,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-17,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
-18,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-19,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-20,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-21,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-22,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
-23,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-24,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-25,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-26,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-27,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
-28,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-29,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-1,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-3,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-4,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-7,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-9,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-10,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-12,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-13,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-15,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-16,A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-6,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-7,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-8,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
-9,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-10,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-11,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-12,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-13,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-14,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
-15,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-16,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-17,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-18,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-19,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-20,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
-21,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-22,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-23,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-24,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-25,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-26,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
-27,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-28,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-29,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-30,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-31,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-32,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
-33,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-34,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-35,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-2,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-3,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
-4,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-5,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-6,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-8,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-9,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
-10,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-11,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-12,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
-13,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-14,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-15,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
-16,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-17,A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-0,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-1,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-2,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-6,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-7,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-8,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-9,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
-10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-13,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-14,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-15,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-16,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
-17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-20,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-21,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-22,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-23,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
-24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-27,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-28,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-29,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-30,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
-31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-34,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-35,A1,0,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-36,A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-37,A1,2,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
-38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-41,A1,6,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-0,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-1,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-2,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-3,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-4,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-5,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-6,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-7,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-8,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-9,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-10,A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-11,A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-0,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-1,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-2,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-3,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-4,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-5,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-6,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-7,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-8,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-9,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-10,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-11,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-12,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-13,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-14,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-15,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-16,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-17,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-18,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-19,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-20,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-21,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-22,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-23,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-24,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-25,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-26,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-27,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-28,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-29,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-30,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-31,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-32,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-33,A1,5,retrofit,CONSUMABLE|ENERGY,solar,1.12733333333,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-34,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-35,A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-36,A1,1,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-37,A1,2,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-38,A1,3,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-39,A1,4,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-40,A1,5,retrofit,CONSUMABLE|ENERGY,solar,0.75155555556,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-41,A1,6,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+1,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+2,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+3,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+4,A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+5,A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+1,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+2,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+3,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+4,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+5,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+7,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+8,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+9,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+10,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+11,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08693150685,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23135464231,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
+2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13881278539,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+3,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13039726027,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+4,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34703196347,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
+5,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20821917808,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08693150685,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23135464231,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
+8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13881278539,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+9,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13039726027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+10,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34703196347,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
+11,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20821917808,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+12,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.26079452055,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+13,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.69406392694,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
+14,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.41643835616,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+15,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17386301370,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.46270928463,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
+17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27762557078,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+0,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+1,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+2,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+3,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+4,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+5,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+6,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+7,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+8,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+9,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+10,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+11,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22598870056,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13559322034,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16983050847,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
+3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20338983051,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+4,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33898305085,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+5,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20338983051,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+6,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25474576271,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
+7,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30508474576,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+8,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22598870056,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+9,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13559322034,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+10,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16983050847,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
+11,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20338983051,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+12,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33898305085,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+13,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20338983051,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+14,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25474576271,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
+15,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30508474576,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67796610169,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40677966102,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+18,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50949152542,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
+19,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.61016949153,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+20,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45197740113,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+21,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27118644068,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+22,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33966101695,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
+23,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40677966102,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+0,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+1,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+2,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+3,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+4,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+5,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+6,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+7,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+8,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+9,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+10,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+11,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22535211268,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13521126761,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16935211268,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
+3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+4,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13521126761,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+5,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33802816901,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+6,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20281690141,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+7,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25402816901,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
+8,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30422535211,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+9,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+10,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22535211268,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+11,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13521126761,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+12,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16935211268,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
+13,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+14,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13521126761,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+15,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33802816901,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+16,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20281690141,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+17,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25402816901,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
+18,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30422535211,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+19,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+20,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67605633803,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+21,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40563380282,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+22,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50805633803,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
+23,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60845070423,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+24,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40563380282,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+25,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45070422535,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+26,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27042253521,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+27,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33870422535,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
+28,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40563380282,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+29,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27042253521,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+0,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+1,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+2,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+3,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+4,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+5,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+6,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+7,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+8,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+9,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+10,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+11,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22489959839,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13493975904,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16901204819,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
+3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+4,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+5,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+6,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33734939759,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+7,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20240963855,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+8,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25351807229,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
+9,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30361445783,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+10,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+11,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+12,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22489959839,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+13,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13493975904,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+14,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16901204819,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
+15,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+16,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+17,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+18,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33734939759,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+19,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20240963855,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+20,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25351807229,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
+21,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30361445783,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+22,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+23,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+24,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67469879518,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+25,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40481927711,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+26,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50703614458,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
+27,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60722891566,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+28,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+29,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+30,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44979919679,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+31,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26987951807,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+32,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33802409639,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
+33,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+34,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26987951807,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+35,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.26987951807,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+0,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+1,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+2,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+3,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+4,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+5,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+6,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+7,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+8,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+9,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+10,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+11,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22456140351,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13473684211,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16875789474,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
+3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+4,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+5,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+6,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33684210526,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20210526316,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+9,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25313684211,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
+10,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30315789474,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+11,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+12,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+13,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+14,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22456140351,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+15,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13473684211,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+16,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16875789474,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
+17,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+18,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+19,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+20,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+21,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33684210526,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+22,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20210526316,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+23,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25313684211,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
+24,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30315789474,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+25,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+26,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+27,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+28,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67368421053,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+29,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40421052632,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+30,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50627368421,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
+31,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60631578947,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+32,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+33,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+34,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+35,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44912280702,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+36,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26947368421,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+37,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33751578947,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
+38,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+39,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+40,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+41,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+0,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+1,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+2,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+3,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+4,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+5,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+6,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+7,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+8,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+9,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+10,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+11,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+0,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+1,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+2,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+3,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+4,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+5,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.08388837209,all-week,R1,night,2045,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+6,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.22325581395,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+7,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.22325581395,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+8,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+9,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30139534884,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+10,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+11,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+12,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+13,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.12583255814,all-week,R1,morning,2045,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+14,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.33488372093,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+15,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.33488372093,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+16,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+17,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+18,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+19,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+20,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+21,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.08388837209,all-week,R1,afternoon,2045,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+22,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.22325581395,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+23,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.22325581395,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+24,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+25,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30139534884,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+26,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+27,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+28,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+29,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.12583255814,all-week,R1,early-peak,2045,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+30,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.33488372093,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+31,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.33488372093,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+32,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50333023256,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+33,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60279069767,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+34,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+35,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+36,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+37,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,all-week,R1,late-peak,2045,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+38,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.66976744186,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+39,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.66976744186,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+40,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33555348837,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+41,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+42,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+43,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+44,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+45,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,all-week,R1,evening,2045,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+46,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.44651162791,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+47,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.44651162791,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
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 f2fe9d06..2e4794bd 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,439 +1,379 @@
 ,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
-1,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
-2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
-5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
-6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
-9,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
-10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
-1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
-3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
-5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
-2,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
-3,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
-4,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
-5,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
-6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
-7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
-9,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
-10,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
-14,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
-15,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
-16,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
-17,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2025
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2025
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2025
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2025
-4,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2025
-5,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2025
-6,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2025
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2025
-8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2025
-9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2025
-10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2025
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2025
-12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2025
-13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2025
-14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2025
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2025
-16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2025
-17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2025
-18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2025
-19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2025
-20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2025
-21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2025
-22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2025
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2025
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.40572222222,gassupply1,0,MUS$2010/PJ,2025
-1,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.60858333333,gassupply1,1,MUS$2010/PJ,2025
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.40572222222,gassupply1,2,MUS$2010/PJ,2025
-3,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.60858333333,gassupply1,3,MUS$2010/PJ,2025
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.21716666667,gassupply1,4,MUS$2010/PJ,2025
-5,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.81144444444,gassupply1,5,MUS$2010/PJ,2025
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
-3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
-7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
-11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
-15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
-19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
-23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2030
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2030
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2030
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2030
-4,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2030
-5,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2030
-6,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2030
-7,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2030
-8,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2030
-9,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2030
-10,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2030
-11,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2030
-12,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2030
-13,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2030
-14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2030
-15,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2030
-16,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2030
-17,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2030
-18,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2030
-19,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2030
-20,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030
-21,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2030
-22,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030
-23,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2030
-24,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030
-25,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2030
-26,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2030
-27,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2030
-28,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2030
-29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2030
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.37500000000,gassupply1,0,MUS$2010/PJ,2030
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,0,MUS$2010/PJ,2030
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.56250000000,gassupply1,1,MUS$2010/PJ,2030
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,1,MUS$2010/PJ,2030
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.37500000000,gassupply1,2,MUS$2010/PJ,2030
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,2,MUS$2010/PJ,2030
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.56250000000,gassupply1,3,MUS$2010/PJ,2030
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,3,MUS$2010/PJ,2030
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.12500000000,gassupply1,4,MUS$2010/PJ,2030
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,4,MUS$2010/PJ,2030
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.75000000000,gassupply1,5,MUS$2010/PJ,2030
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,5,MUS$2010/PJ,2030
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
-19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2035
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2035
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2035
-5,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035
-6,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035
-7,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2035
-8,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035
-9,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2035
-10,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2035
-11,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035
-12,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035
-13,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2035
-14,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035
-15,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2035
-16,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2035
-17,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035
-18,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035
-19,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2035
-20,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035
-21,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2035
-22,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2035
-23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035
-24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035
-25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2035
-26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035
-27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2035
-28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2035
-29,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035
-30,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035
-31,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2035
-32,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035
-33,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2035
-34,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2035
-35,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.13972222222,gassupply1,0,MUS$2010/PJ,2035
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.37500000000,gassupply1,0,MUS$2010/PJ,2035
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.20958333333,gassupply1,1,MUS$2010/PJ,2035
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.56250000000,gassupply1,1,MUS$2010/PJ,2035
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.13972222222,gassupply1,2,MUS$2010/PJ,2035
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.37500000000,gassupply1,2,MUS$2010/PJ,2035
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.20958333333,gassupply1,3,MUS$2010/PJ,2035
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.56250000000,gassupply1,3,MUS$2010/PJ,2035
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.41916666667,gassupply1,4,MUS$2010/PJ,2035
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.12500000000,gassupply1,4,MUS$2010/PJ,2035
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.27944444444,gassupply1,5,MUS$2010/PJ,2035
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.75000000000,gassupply1,5,MUS$2010/PJ,2035
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
-3,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
-7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
-11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
-15,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
-19,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
-23,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2040
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2040
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2040
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2040
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2040
-5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,0,MUS$2010/PJ,2040
-6,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2040
-7,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2040
-8,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2040
-9,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2040
-10,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2040
-11,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2040
-12,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,1,MUS$2010/PJ,2040
-13,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2040
-14,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2040
-15,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2040
-16,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2040
-17,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2040
-18,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2040
-19,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,2,MUS$2010/PJ,2040
-20,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2040
-21,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2040
-22,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2040
-23,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2040
-24,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2040
-25,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2040
-26,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,3,MUS$2010/PJ,2040
-27,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2040
-28,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2040
-29,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2040
-30,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2040
-31,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2040
-32,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2040
-33,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,4,MUS$2010/PJ,2040
-34,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2040
-35,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2040
-36,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2040
-37,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2040
-38,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2040
-39,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2040
-40,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,5,MUS$2010/PJ,2040
-41,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2040
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,0,MUS$2010/PJ,2040
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,0,MUS$2010/PJ,2040
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,1,MUS$2010/PJ,2040
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,1,MUS$2010/PJ,2040
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,2,MUS$2010/PJ,2040
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,2,MUS$2010/PJ,2040
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,3,MUS$2010/PJ,2040
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,3,MUS$2010/PJ,2040
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,4,MUS$2010/PJ,2040
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,4,MUS$2010/PJ,2040
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,5,MUS$2010/PJ,2040
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,5,MUS$2010/PJ,2040
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
-2,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
-3,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
-6,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
-10,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
-11,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
-12,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
-13,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
-14,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
-16,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
-17,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
-18,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
-19,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
-20,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
-21,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
-22,A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2045
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2045
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
-5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,0,MUS$2010/PJ,2045
-6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
-7,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045
-8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045
-9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2045
-10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045
-11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2045
-12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
-13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,1,MUS$2010/PJ,2045
-14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
-15,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045
-16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045
-17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2045
-18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045
-19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2045
-20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
-21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,2,MUS$2010/PJ,2045
-22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
-23,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045
-24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045
-25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2045
-26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045
-27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2045
-28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
-29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,3,MUS$2010/PJ,2045
-30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
-31,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045
-32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045
-33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2045
-34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045
-35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2045
-36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
-37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,4,MUS$2010/PJ,2045
-38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
-39,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045
-40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045
-41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2045
-42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045
-43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2045
-44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
-45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,5,MUS$2010/PJ,2045
-46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
-47,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.08391778497,gassupply1,0,MUS$2010/PJ,2045
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.22522665947,gassupply1,0,MUS$2010/PJ,2045
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.12587667746,gassupply1,1,MUS$2010/PJ,2045
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.33783998921,gassupply1,1,MUS$2010/PJ,2045
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.08391778497,gassupply1,2,MUS$2010/PJ,2045
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.22522665947,gassupply1,2,MUS$2010/PJ,2045
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.12587667746,gassupply1,3,MUS$2010/PJ,2045
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.33783998921,gassupply1,3,MUS$2010/PJ,2045
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.25175335492,gassupply1,4,MUS$2010/PJ,2045
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.67567997841,gassupply1,4,MUS$2010/PJ,2045
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.16783556995,gassupply1,5,MUS$2010/PJ,2045
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.45045331894,gassupply1,5,MUS$2010/PJ,2045
-0,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
-1,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
-2,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
-3,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
-4,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
-5,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
-6,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
-7,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
-8,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
-9,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
-10,A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
-11,A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
-0,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2050
-1,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.05333333333,solarPV,0,MUS$2010/PJ,2050
-2,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2050
-3,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.20422222222,solarPV,0,MUS$2010/PJ,2050
-4,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2050
-5,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.37577777778,solarPV,0,MUS$2010/PJ,2050
-6,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.15000000000,windturbine,0,MUS$2010/PJ,2050
-7,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2050
-8,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2050
-9,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.08000000000,solarPV,1,MUS$2010/PJ,2050
-10,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2050
-11,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.30633333333,solarPV,1,MUS$2010/PJ,2050
-12,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2050
-13,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.56366666667,solarPV,1,MUS$2010/PJ,2050
-14,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.22500000000,windturbine,1,MUS$2010/PJ,2050
-15,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2050
-16,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2050
-17,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.05333333333,solarPV,2,MUS$2010/PJ,2050
-18,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2050
-19,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.20422222222,solarPV,2,MUS$2010/PJ,2050
-20,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2050
-21,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.37577777778,solarPV,2,MUS$2010/PJ,2050
-22,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.15000000000,windturbine,2,MUS$2010/PJ,2050
-23,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2050
-24,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2050
-25,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.08000000000,solarPV,3,MUS$2010/PJ,2050
-26,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2050
-27,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.30633333333,solarPV,3,MUS$2010/PJ,2050
-28,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2050
-29,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.56366666667,solarPV,3,MUS$2010/PJ,2050
-30,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.22500000000,windturbine,3,MUS$2010/PJ,2050
-31,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2050
-32,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2050
-33,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.16000000000,solarPV,4,MUS$2010/PJ,2050
-34,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2050
-35,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.61266666667,solarPV,4,MUS$2010/PJ,2050
-36,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2050
-37,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,1.12733333333,solarPV,4,MUS$2010/PJ,2050
-38,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.45000000000,windturbine,4,MUS$2010/PJ,2050
-39,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2050
-40,A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2050
-41,A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.10666666667,solarPV,5,MUS$2010/PJ,2050
-42,A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2050
-43,A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.40844444444,solarPV,5,MUS$2010/PJ,2050
-44,A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2050
-45,A1,5,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.75155555556,solarPV,5,MUS$2010/PJ,2050
-46,A1,6,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.30000000000,windturbine,5,MUS$2010/PJ,2050
-47,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2050
-0,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2025,all-year,R1,gas,0.06799865084,gassupply1,0,MUS$2010/PJ,2050
-1,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.18250134916,gassupply1,0,MUS$2010/PJ,2050
-2,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2025,all-year,R1,gas,0.10199797625,gassupply1,1,MUS$2010/PJ,2050
-3,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.27375202375,gassupply1,1,MUS$2010/PJ,2050
-4,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2025,all-year,R1,gas,0.06799865084,gassupply1,2,MUS$2010/PJ,2050
-5,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.18250134916,gassupply1,2,MUS$2010/PJ,2050
-6,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2025,all-year,R1,gas,0.10199797625,gassupply1,3,MUS$2010/PJ,2050
-7,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.27375202375,gassupply1,3,MUS$2010/PJ,2050
-8,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2025,all-year,R1,gas,0.20399595251,gassupply1,4,MUS$2010/PJ,2050
-9,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.54750404749,gassupply1,4,MUS$2010/PJ,2050
-10,A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2025,all-year,R1,gas,0.13599730167,gassupply1,5,MUS$2010/PJ,2050
-11,A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.36500269833,gassupply1,5,MUS$2010/PJ,2050
+0,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+1,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+2,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+3,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+4,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+5,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+6,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+8,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+9,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+10,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
+1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
+2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
+3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
+4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
+5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
+0,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+1,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+2,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+3,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+4,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+5,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+6,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+7,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+9,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+10,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+12,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+13,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+14,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+15,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+16,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+17,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05205479452,gasCCGT,0,MUS$2010/PJ,2025
+1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23135464231,solarPV,0,MUS$2010/PJ,2025
+2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13881278539,windturbine,0,MUS$2010/PJ,2025
+3,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.77186301370,gasCCGT,0,MUS$2010/kt,2025
+4,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07808219178,gasCCGT,1,MUS$2010/PJ,2025
+5,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34703196347,solarPV,1,MUS$2010/PJ,2025
+6,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20821917808,windturbine,1,MUS$2010/PJ,2025
+7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.15779452055,gasCCGT,1,MUS$2010/kt,2025
+8,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05205479452,gasCCGT,2,MUS$2010/PJ,2025
+9,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23135464231,solarPV,2,MUS$2010/PJ,2025
+10,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13881278539,windturbine,2,MUS$2010/PJ,2025
+11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.77186301370,gasCCGT,2,MUS$2010/kt,2025
+12,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07808219178,gasCCGT,3,MUS$2010/PJ,2025
+13,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34703196347,solarPV,3,MUS$2010/PJ,2025
+14,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20821917808,windturbine,3,MUS$2010/PJ,2025
+15,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.15779452055,gasCCGT,3,MUS$2010/kt,2025
+16,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15616438356,gasCCGT,4,MUS$2010/PJ,2025
+17,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.69406392694,solarPV,4,MUS$2010/PJ,2025
+18,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.41643835616,windturbine,4,MUS$2010/PJ,2025
+19,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.31558904110,gasCCGT,4,MUS$2010/kt,2025
+20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10410958904,gasCCGT,5,MUS$2010/PJ,2025
+21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.46270928463,solarPV,5,MUS$2010/PJ,2025
+22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27762557078,windturbine,5,MUS$2010/PJ,2025
+23,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.54372602740,gasCCGT,5,MUS$2010/kt,2025
+0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.40915372907,gassupply1,0,MUS$2010/PJ,2025
+1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.61373059361,gassupply1,1,MUS$2010/PJ,2025
+2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.40915372907,gassupply1,2,MUS$2010/PJ,2025
+3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.61373059361,gassupply1,3,MUS$2010/PJ,2025
+4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.22746118721,gassupply1,4,MUS$2010/PJ,2025
+5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.81830745814,gassupply1,5,MUS$2010/PJ,2025
+0,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
+1,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
+2,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
+3,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
+4,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
+5,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
+6,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
+7,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
+8,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030
+9,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
+10,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
+11,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
+0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22598870056,solarPV,0,MUS$2010/PJ,2030
+1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13559322034,windturbine,0,MUS$2010/PJ,2030
+2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10169491525,gasCCGT,0,MUS$2010/PJ,2030
+3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20338983051,solarPV,0,MUS$2010/PJ,2030
+4,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.32237288136,gasCCGT,0,MUS$2010/kt,2030
+5,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33898305085,solarPV,1,MUS$2010/PJ,2030
+6,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20338983051,windturbine,1,MUS$2010/PJ,2030
+7,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15254237288,gasCCGT,1,MUS$2010/PJ,2030
+8,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30508474576,solarPV,1,MUS$2010/PJ,2030
+9,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.98355932203,gasCCGT,1,MUS$2010/kt,2030
+10,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22598870056,solarPV,2,MUS$2010/PJ,2030
+11,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13559322034,windturbine,2,MUS$2010/PJ,2030
+12,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10169491525,gasCCGT,2,MUS$2010/PJ,2030
+13,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20338983051,solarPV,2,MUS$2010/PJ,2030
+14,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.32237288136,gasCCGT,2,MUS$2010/kt,2030
+15,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33898305085,solarPV,3,MUS$2010/PJ,2030
+16,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20338983051,windturbine,3,MUS$2010/PJ,2030
+17,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15254237288,gasCCGT,3,MUS$2010/PJ,2030
+18,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30508474576,solarPV,3,MUS$2010/PJ,2030
+19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.98355932203,gasCCGT,3,MUS$2010/kt,2030
+20,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67796610169,solarPV,4,MUS$2010/PJ,2030
+21,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40677966102,windturbine,4,MUS$2010/PJ,2030
+22,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30508474576,gasCCGT,4,MUS$2010/PJ,2030
+23,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.61016949153,solarPV,4,MUS$2010/PJ,2030
+24,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.96711864407,gasCCGT,4,MUS$2010/kt,2030
+25,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45197740113,solarPV,5,MUS$2010/PJ,2030
+26,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27118644068,windturbine,5,MUS$2010/PJ,2030
+27,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20338983051,gasCCGT,5,MUS$2010/PJ,2030
+28,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40677966102,solarPV,5,MUS$2010/PJ,2030
+29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.64474576271,gasCCGT,5,MUS$2010/kt,2030
+0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.16983050847,gassupply1,0,MUS$2010/PJ,2030
+1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.25474576271,gassupply1,1,MUS$2010/PJ,2030
+2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.16983050847,gassupply1,2,MUS$2010/PJ,2030
+3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.25474576271,gassupply1,3,MUS$2010/PJ,2030
+4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.50949152542,gassupply1,4,MUS$2010/PJ,2030
+5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.33966101695,gassupply1,5,MUS$2010/PJ,2030
+0,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
+1,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
+2,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
+3,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
+4,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
+5,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
+6,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
+7,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
+8,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
+9,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
+10,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
+11,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
+0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22535211268,solarPV,0,MUS$2010/PJ,2035
+1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13521126761,windturbine,0,MUS$2010/PJ,2035
+2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10140845070,gasCCGT,0,MUS$2010/PJ,2035
+3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20281690141,solarPV,0,MUS$2010/PJ,2035
+4,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13521126761,solarPV,0,MUS$2010/PJ,2035
+5,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.29611267606,gasCCGT,0,MUS$2010/kt,2035
+6,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33802816901,solarPV,1,MUS$2010/PJ,2035
+7,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20281690141,windturbine,1,MUS$2010/PJ,2035
+8,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15211267606,gasCCGT,1,MUS$2010/PJ,2035
+9,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30422535211,solarPV,1,MUS$2010/PJ,2035
+10,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20281690141,solarPV,1,MUS$2010/PJ,2035
+11,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.94416901408,gasCCGT,1,MUS$2010/kt,2035
+12,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22535211268,solarPV,2,MUS$2010/PJ,2035
+13,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13521126761,windturbine,2,MUS$2010/PJ,2035
+14,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10140845070,gasCCGT,2,MUS$2010/PJ,2035
+15,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20281690141,solarPV,2,MUS$2010/PJ,2035
+16,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13521126761,solarPV,2,MUS$2010/PJ,2035
+17,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.29611267606,gasCCGT,2,MUS$2010/kt,2035
+18,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33802816901,solarPV,3,MUS$2010/PJ,2035
+19,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20281690141,windturbine,3,MUS$2010/PJ,2035
+20,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15211267606,gasCCGT,3,MUS$2010/PJ,2035
+21,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30422535211,solarPV,3,MUS$2010/PJ,2035
+22,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20281690141,solarPV,3,MUS$2010/PJ,2035
+23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.94416901408,gasCCGT,3,MUS$2010/kt,2035
+24,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67605633803,solarPV,4,MUS$2010/PJ,2035
+25,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40563380282,windturbine,4,MUS$2010/PJ,2035
+26,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30422535211,gasCCGT,4,MUS$2010/PJ,2035
+27,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60845070423,solarPV,4,MUS$2010/PJ,2035
+28,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40563380282,solarPV,4,MUS$2010/PJ,2035
+29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.88833802817,gasCCGT,4,MUS$2010/kt,2035
+30,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45070422535,solarPV,5,MUS$2010/PJ,2035
+31,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27042253521,windturbine,5,MUS$2010/PJ,2035
+32,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20281690141,gasCCGT,5,MUS$2010/PJ,2035
+33,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40563380282,solarPV,5,MUS$2010/PJ,2035
+34,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27042253521,solarPV,5,MUS$2010/PJ,2035
+35,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.59222535211,gasCCGT,5,MUS$2010/kt,2035
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16935211268,gassupply1,0,MUS$2010/PJ,2035
+1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25402816901,gassupply1,1,MUS$2010/PJ,2035
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16935211268,gassupply1,2,MUS$2010/PJ,2035
+3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25402816901,gassupply1,3,MUS$2010/PJ,2035
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50805633803,gassupply1,4,MUS$2010/PJ,2035
+5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33870422535,gassupply1,5,MUS$2010/PJ,2035
+0,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
+1,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
+2,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
+3,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
+4,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
+5,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
+6,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
+7,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
+8,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
+9,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
+10,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
+11,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
+0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22489959839,solarPV,0,MUS$2010/PJ,2040
+1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13493975904,windturbine,0,MUS$2010/PJ,2040
+2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10120481928,gasCCGT,0,MUS$2010/PJ,2040
+3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20240963855,solarPV,0,MUS$2010/PJ,2040
+4,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13493975904,solarPV,0,MUS$2010/PJ,2040
+5,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.13493975904,solarPV,0,MUS$2010/PJ,2040
+6,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.27744578313,gasCCGT,0,MUS$2010/kt,2040
+7,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33734939759,solarPV,1,MUS$2010/PJ,2040
+8,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20240963855,windturbine,1,MUS$2010/PJ,2040
+9,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15180722892,gasCCGT,1,MUS$2010/PJ,2040
+10,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30361445783,solarPV,1,MUS$2010/PJ,2040
+11,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20240963855,solarPV,1,MUS$2010/PJ,2040
+12,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.20240963855,solarPV,1,MUS$2010/PJ,2040
+13,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.91616867470,gasCCGT,1,MUS$2010/kt,2040
+14,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22489959839,solarPV,2,MUS$2010/PJ,2040
+15,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13493975904,windturbine,2,MUS$2010/PJ,2040
+16,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10120481928,gasCCGT,2,MUS$2010/PJ,2040
+17,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20240963855,solarPV,2,MUS$2010/PJ,2040
+18,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13493975904,solarPV,2,MUS$2010/PJ,2040
+19,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.13493975904,solarPV,2,MUS$2010/PJ,2040
+20,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.27744578313,gasCCGT,2,MUS$2010/kt,2040
+21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33734939759,solarPV,3,MUS$2010/PJ,2040
+22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20240963855,windturbine,3,MUS$2010/PJ,2040
+23,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15180722892,gasCCGT,3,MUS$2010/PJ,2040
+24,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30361445783,solarPV,3,MUS$2010/PJ,2040
+25,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20240963855,solarPV,3,MUS$2010/PJ,2040
+26,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.20240963855,solarPV,3,MUS$2010/PJ,2040
+27,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.91616867470,gasCCGT,3,MUS$2010/kt,2040
+28,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67469879518,solarPV,4,MUS$2010/PJ,2040
+29,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40481927711,windturbine,4,MUS$2010/PJ,2040
+30,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30361445783,gasCCGT,4,MUS$2010/PJ,2040
+31,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60722891566,solarPV,4,MUS$2010/PJ,2040
+32,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40481927711,solarPV,4,MUS$2010/PJ,2040
+33,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.40481927711,solarPV,4,MUS$2010/PJ,2040
+34,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.83233734940,gasCCGT,4,MUS$2010/kt,2040
+35,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44979919679,solarPV,5,MUS$2010/PJ,2040
+36,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26987951807,windturbine,5,MUS$2010/PJ,2040
+37,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20240963855,gasCCGT,5,MUS$2010/PJ,2040
+38,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40481927711,solarPV,5,MUS$2010/PJ,2040
+39,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26987951807,solarPV,5,MUS$2010/PJ,2040
+40,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.26987951807,solarPV,5,MUS$2010/PJ,2040
+41,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.55489156627,gasCCGT,5,MUS$2010/kt,2040
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16901204819,gassupply1,0,MUS$2010/PJ,2040
+1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25351807229,gassupply1,1,MUS$2010/PJ,2040
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16901204819,gassupply1,2,MUS$2010/PJ,2040
+3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25351807229,gassupply1,3,MUS$2010/PJ,2040
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50703614458,gassupply1,4,MUS$2010/PJ,2040
+5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33802409639,gassupply1,5,MUS$2010/PJ,2040
+0,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
+1,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
+2,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
+3,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
+4,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
+5,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
+6,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
+7,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
+8,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
+9,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
+10,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
+11,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
+0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22456140351,solarPV,0,MUS$2010/PJ,2045
+1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13473684211,windturbine,0,MUS$2010/PJ,2045
+2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10105263158,gasCCGT,0,MUS$2010/PJ,2045
+3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20210526316,solarPV,0,MUS$2010/PJ,2045
+4,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13473684211,solarPV,0,MUS$2010/PJ,2045
+5,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.13473684211,solarPV,0,MUS$2010/PJ,2045
+6,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13473684211,solarPV,0,MUS$2010/PJ,2045
+7,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.26349473684,gasCCGT,0,MUS$2010/kt,2045
+8,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33684210526,solarPV,1,MUS$2010/PJ,2045
+9,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20210526316,windturbine,1,MUS$2010/PJ,2045
+10,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15157894737,gasCCGT,1,MUS$2010/PJ,2045
+11,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30315789474,solarPV,1,MUS$2010/PJ,2045
+12,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20210526316,solarPV,1,MUS$2010/PJ,2045
+13,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.20210526316,solarPV,1,MUS$2010/PJ,2045
+14,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20210526316,solarPV,1,MUS$2010/PJ,2045
+15,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.89524210526,gasCCGT,1,MUS$2010/kt,2045
+16,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22456140351,solarPV,2,MUS$2010/PJ,2045
+17,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13473684211,windturbine,2,MUS$2010/PJ,2045
+18,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10105263158,gasCCGT,2,MUS$2010/PJ,2045
+19,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20210526316,solarPV,2,MUS$2010/PJ,2045
+20,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13473684211,solarPV,2,MUS$2010/PJ,2045
+21,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.13473684211,solarPV,2,MUS$2010/PJ,2045
+22,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13473684211,solarPV,2,MUS$2010/PJ,2045
+23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.26349473684,gasCCGT,2,MUS$2010/kt,2045
+24,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33684210526,solarPV,3,MUS$2010/PJ,2045
+25,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20210526316,windturbine,3,MUS$2010/PJ,2045
+26,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15157894737,gasCCGT,3,MUS$2010/PJ,2045
+27,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30315789474,solarPV,3,MUS$2010/PJ,2045
+28,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20210526316,solarPV,3,MUS$2010/PJ,2045
+29,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.20210526316,solarPV,3,MUS$2010/PJ,2045
+30,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20210526316,solarPV,3,MUS$2010/PJ,2045
+31,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.89524210526,gasCCGT,3,MUS$2010/kt,2045
+32,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67368421053,solarPV,4,MUS$2010/PJ,2045
+33,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40421052632,windturbine,4,MUS$2010/PJ,2045
+34,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30315789474,gasCCGT,4,MUS$2010/PJ,2045
+35,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60631578947,solarPV,4,MUS$2010/PJ,2045
+36,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40421052632,solarPV,4,MUS$2010/PJ,2045
+37,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.40421052632,solarPV,4,MUS$2010/PJ,2045
+38,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40421052632,solarPV,4,MUS$2010/PJ,2045
+39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.79048421053,gasCCGT,4,MUS$2010/kt,2045
+40,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44912280702,solarPV,5,MUS$2010/PJ,2045
+41,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26947368421,windturbine,5,MUS$2010/PJ,2045
+42,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20210526316,gasCCGT,5,MUS$2010/PJ,2045
+43,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40421052632,solarPV,5,MUS$2010/PJ,2045
+44,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26947368421,solarPV,5,MUS$2010/PJ,2045
+45,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.26947368421,solarPV,5,MUS$2010/PJ,2045
+46,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26947368421,solarPV,5,MUS$2010/PJ,2045
+47,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.52698947368,gasCCGT,5,MUS$2010/kt,2045
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16875789474,gassupply1,0,MUS$2010/PJ,2045
+1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25313684211,gassupply1,1,MUS$2010/PJ,2045
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16875789474,gassupply1,2,MUS$2010/PJ,2045
+3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25313684211,gassupply1,3,MUS$2010/PJ,2045
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50627368421,gassupply1,4,MUS$2010/PJ,2045
+5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33751578947,gassupply1,5,MUS$2010/PJ,2045
+0,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
+1,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
+2,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
+3,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
+4,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
+5,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
+6,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
+7,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
+8,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
+9,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
+10,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
+11,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
+0,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10046511628,gasCCGT,0,MUS$2010/PJ,2050
+1,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20093023256,solarPV,0,MUS$2010/PJ,2050
+2,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13395348837,solarPV,0,MUS$2010/PJ,2050
+3,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.13395348837,solarPV,0,MUS$2010/PJ,2050
+4,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13395348837,solarPV,0,MUS$2010/PJ,2050
+5,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.05023255814,gasCCGT,0,MUS$2010/PJ,2050
+6,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.22325581395,solarPV,0,MUS$2010/PJ,2050
+7,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.22325581395,windturbine,0,MUS$2010/PJ,2050
+8,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.20963720930,gasCCGT,0,MUS$2010/kt,2050
+9,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2045,all-year,R1,power,4.60481860465,gasCCGT,0,MUS$2010/kt,2050
+10,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15069767442,gasCCGT,1,MUS$2010/PJ,2050
+11,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30139534884,solarPV,1,MUS$2010/PJ,2050
+12,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20093023256,solarPV,1,MUS$2010/PJ,2050
+13,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.20093023256,solarPV,1,MUS$2010/PJ,2050
+14,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20093023256,solarPV,1,MUS$2010/PJ,2050
+15,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.07534883721,gasCCGT,1,MUS$2010/PJ,2050
+16,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.33488372093,solarPV,1,MUS$2010/PJ,2050
+17,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.33488372093,windturbine,1,MUS$2010/PJ,2050
+18,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.81445581395,gasCCGT,1,MUS$2010/kt,2050
+19,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2045,all-year,R1,power,6.90722790698,gasCCGT,1,MUS$2010/kt,2050
+20,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10046511628,gasCCGT,2,MUS$2010/PJ,2050
+21,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20093023256,solarPV,2,MUS$2010/PJ,2050
+22,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13395348837,solarPV,2,MUS$2010/PJ,2050
+23,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.13395348837,solarPV,2,MUS$2010/PJ,2050
+24,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13395348837,solarPV,2,MUS$2010/PJ,2050
+25,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.05023255814,gasCCGT,2,MUS$2010/PJ,2050
+26,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.22325581395,solarPV,2,MUS$2010/PJ,2050
+27,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.22325581395,windturbine,2,MUS$2010/PJ,2050
+28,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.20963720930,gasCCGT,2,MUS$2010/kt,2050
+29,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2045,all-year,R1,power,4.60481860465,gasCCGT,2,MUS$2010/kt,2050
+30,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15069767442,gasCCGT,3,MUS$2010/PJ,2050
+31,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30139534884,solarPV,3,MUS$2010/PJ,2050
+32,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20093023256,solarPV,3,MUS$2010/PJ,2050
+33,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.20093023256,solarPV,3,MUS$2010/PJ,2050
+34,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20093023256,solarPV,3,MUS$2010/PJ,2050
+35,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.07534883721,gasCCGT,3,MUS$2010/PJ,2050
+36,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.33488372093,solarPV,3,MUS$2010/PJ,2050
+37,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.33488372093,windturbine,3,MUS$2010/PJ,2050
+38,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.81445581395,gasCCGT,3,MUS$2010/kt,2050
+39,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2045,all-year,R1,power,6.90722790698,gasCCGT,3,MUS$2010/kt,2050
+40,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30139534884,gasCCGT,4,MUS$2010/PJ,2050
+41,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60279069767,solarPV,4,MUS$2010/PJ,2050
+42,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40186046512,solarPV,4,MUS$2010/PJ,2050
+43,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.40186046512,solarPV,4,MUS$2010/PJ,2050
+44,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40186046512,solarPV,4,MUS$2010/PJ,2050
+45,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.15069767442,gasCCGT,4,MUS$2010/PJ,2050
+46,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66976744186,solarPV,4,MUS$2010/PJ,2050
+47,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66976744186,windturbine,4,MUS$2010/PJ,2050
+48,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.62891162791,gasCCGT,4,MUS$2010/kt,2050
+49,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2045,all-year,R1,power,13.81445581395,gasCCGT,4,MUS$2010/kt,2050
+50,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20093023256,gasCCGT,5,MUS$2010/PJ,2050
+51,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40186046512,solarPV,5,MUS$2010/PJ,2050
+52,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26790697674,solarPV,5,MUS$2010/PJ,2050
+53,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.26790697674,solarPV,5,MUS$2010/PJ,2050
+54,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26790697674,solarPV,5,MUS$2010/PJ,2050
+55,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.10046511628,gasCCGT,5,MUS$2010/PJ,2050
+56,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.44651162791,solarPV,5,MUS$2010/PJ,2050
+57,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.44651162791,windturbine,5,MUS$2010/PJ,2050
+58,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.41927441860,gasCCGT,5,MUS$2010/kt,2050
+59,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2045,all-year,R1,power,9.20963720930,gasCCGT,5,MUS$2010/kt,2050
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16935211268,gassupply1,0,MUS$2010/PJ,2050
+1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2045,all-year,R1,gas,0.08231300360,gassupply1,0,MUS$2010/PJ,2050
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25402816901,gassupply1,1,MUS$2010/PJ,2050
+3,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2045,all-year,R1,gas,0.12346950540,gassupply1,1,MUS$2010/PJ,2050
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16935211268,gassupply1,2,MUS$2010/PJ,2050
+5,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2045,all-year,R1,gas,0.08231300360,gassupply1,2,MUS$2010/PJ,2050
+6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25402816901,gassupply1,3,MUS$2010/PJ,2050
+7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2045,all-year,R1,gas,0.12346950540,gassupply1,3,MUS$2010/PJ,2050
+8,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50805633803,gassupply1,4,MUS$2010/PJ,2050
+9,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2045,all-year,R1,gas,0.24693901081,gassupply1,4,MUS$2010/PJ,2050
+10,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33870422535,gassupply1,5,MUS$2010/PJ,2050
+11,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2045,all-year,R1,gas,0.16462600721,gassupply1,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index a7805a7a..3576f13f 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -76,6 +76,7 @@ commodities_out = '{path}/technodata/power/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [sectors.gas]
 type = 'default'
@@ -89,6 +90,7 @@ commodities_out = '{path}/technodata/gas/CommOut.csv'
 agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
+demand_share = "standard_demand"
 
 [sectors.residential_presets]
 type = 'presets'
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 4e06e1ae..42d2f554 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,205 @@
 agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.20000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
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 ba9bb550..f55b1db2 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,235 @@
 agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,0,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,1,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,2,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,3,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,4,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,5,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,0,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,2,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,3,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,4,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,5,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,0,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,2,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,3,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,4,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,5,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,0,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,1,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,2,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,3,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,4,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,5,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,0,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,0,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,0,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,1,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,1,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,2,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,2,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,2,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,3,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,3,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,3,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,4,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,4,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,4,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,5,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,5,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,5,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,0,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,0,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,0,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,1,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,1,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,1,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,2,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,2,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,2,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,3,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,3,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,3,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,4,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,4,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,4,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,5,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,5,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,5,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,0,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,0,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,0,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,0,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,0,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,1,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,1,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,1,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,1,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,1,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,2,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,2,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,2,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,2,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,2,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,3,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,3,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,3,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,3,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,3,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,4,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,4,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,4,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,4,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,4,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,5,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,5,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,5,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,5,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,5,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,windturbine,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,19.35255555556,gasCCGT,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,windturbine,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,29.02883333333,gasCCGT,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,windturbine,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,19.35255555556,gasCCGT,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,windturbine,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,29.02883333333,gasCCGT,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,windturbine,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,58.05766666667,gasCCGT,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.60000000000,windturbine,1,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,1.20000000000,windturbine,4,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,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 06d0d943..88964aa2 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,175 @@
 agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.29933962264,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.24297693920,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.63039735099,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25584988962,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.42026490066,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.17056659308,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.44900943396,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.36446540881,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.89801886792,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.72893081761,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.59867924528,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.48595387841,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.73008317930,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.99658348737,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.48672211953,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66438899158,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57971201589,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.79132274081,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.75563190996,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38647467726,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.52754849388,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.50375460664,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.52391847105,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.71516302770,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.68290720926,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.81734462532,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.34927898070,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.47677535180,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.45527147284,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.54489641688,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.46361751743,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.63285057844,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.60430727773,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.72327147640,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.71528648334,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.30907834495,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.42190038562,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.40287151849,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48218098427,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.47685765556,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.64842582327,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.61918003621,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74107209271,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.73289057897,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.85843146883,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.43228388218,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41278669081,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49404806181,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.48859371932,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.57228764589,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.67000000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.41022222222,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.21333333333,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.32000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.64000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,1.28000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.42666666667,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.85333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.17142857143,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.25714285714,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.51428571429,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,1.02857142857,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,11,newcapa,CONSUMABLE|ENERGY,wind,1.02857142857,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,wind,0.34285714286,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,wind,0.68571428571,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,11,newcapa,CONSUMABLE|ENERGY,wind,0.68571428571,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
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 1b999426..42026959 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,205 @@
 agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17924528302,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24297693920,windturbine,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,16.43141509434,gasCCGT,0,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.37748344371,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.25584988962,windturbine,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,34.60390728477,gasCCGT,1,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.25165562914,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17056659308,windturbine,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,23.06927152318,gasCCGT,2,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26886792453,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36446540881,windturbine,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,24.64712264151,gasCCGT,3,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.53773584906,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.72893081761,windturbine,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,49.29424528302,gasCCGT,4,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.35849056604,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48595387841,windturbine,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,32.86283018868,gasCCGT,5,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.65622222222,gassupply1,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.15133333333,gassupply1,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.15133333333,gassupply1,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.30266666667,gassupply1,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.24336105977,windturbine,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33219449579,windturbine,0,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.36504158965,windturbine,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.49829174368,windturbine,1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.24336105977,windturbine,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33219449579,windturbine,2,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.36504158965,windturbine,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.49829174368,windturbine,3,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.73008317930,windturbine,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.99658348737,windturbine,4,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.48672211953,windturbine,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66438899158,windturbine,5,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,0,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,2,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,3,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,4,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,5,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.19323733863,windturbine,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.26377424694,windturbine,0,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.25187730332,windturbine,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.28985600794,windturbine,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.39566137041,windturbine,1,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.37781595498,windturbine,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.19323733863,windturbine,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.26377424694,windturbine,2,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.25187730332,windturbine,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.28985600794,windturbine,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.39566137041,windturbine,3,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.37781595498,windturbine,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.57971201589,windturbine,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.79132274081,windturbine,4,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.75563190996,windturbine,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.38647467726,windturbine,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.52754849388,windturbine,5,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.50375460664,windturbine,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02148148148,gassupply1,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.24274074074,gassupply1,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.03222222222,gassupply1,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.36411111111,gassupply1,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02148148148,gassupply1,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.24274074074,gassupply1,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.03222222222,gassupply1,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.36411111111,gassupply1,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.06444444444,gassupply1,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.72822222222,gassupply1,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.04296296296,gassupply1,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.48548148148,gassupply1,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.17463949035,windturbine,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.23838767590,windturbine,0,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.22763573642,windturbine,0,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.27244820844,windturbine,0,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.26195923553,windturbine,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.35758151385,windturbine,1,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.34145360463,windturbine,1,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40867231266,windturbine,1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.17463949035,windturbine,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.23838767590,windturbine,2,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.22763573642,windturbine,2,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.27244820844,windturbine,2,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.26195923553,windturbine,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.35758151385,windturbine,3,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.34145360463,windturbine,3,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40867231266,windturbine,3,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.52391847105,windturbine,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.71516302770,windturbine,4,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.68290720926,windturbine,4,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.81734462532,windturbine,4,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.34927898070,windturbine,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.47677535180,windturbine,5,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.45527147284,windturbine,5,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.54489641688,windturbine,5,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15453917248,windturbine,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21095019281,windturbine,0,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20143575924,windturbine,0,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24109049213,windturbine,0,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.23842882778,windturbine,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23180875871,windturbine,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.31642528922,windturbine,1,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30215363886,windturbine,1,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.36163573820,windturbine,1,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.35764324167,windturbine,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15453917248,windturbine,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21095019281,windturbine,2,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20143575924,windturbine,2,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24109049213,windturbine,2,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.23842882778,windturbine,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23180875871,windturbine,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.31642528922,windturbine,3,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30215363886,windturbine,3,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.36163573820,windturbine,3,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.35764324167,windturbine,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46361751743,windturbine,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.63285057844,windturbine,4,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.60430727773,windturbine,4,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.72327147640,windturbine,4,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.71528648334,windturbine,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.30907834495,windturbine,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.42190038562,windturbine,5,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.40287151849,windturbine,5,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.48218098427,windturbine,5,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.47685765556,windturbine,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.00476784101,gassupply1,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.05387660343,gassupply1,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.00715176152,gassupply1,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.08081490515,gassupply1,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.00476784101,gassupply1,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.05387660343,gassupply1,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.00715176152,gassupply1,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.08081490515,gassupply1,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.01430352304,gassupply1,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.16162981030,gassupply1,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.00953568202,gassupply1,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.10775320687,gassupply1,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21614194109,windturbine,0,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20639334540,windturbine,0,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24702403090,windturbine,0,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.24429685966,windturbine,0,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.28614382294,windturbine,0,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.32421291164,windturbine,1,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.30959001810,windturbine,1,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37053604636,windturbine,1,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.36644528949,windturbine,1,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.42921573441,windturbine,1,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21614194109,windturbine,2,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20639334540,windturbine,2,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24702403090,windturbine,2,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.24429685966,windturbine,2,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.28614382294,windturbine,2,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.32421291164,windturbine,3,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.30959001810,windturbine,3,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37053604636,windturbine,3,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.36644528949,windturbine,3,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.42921573441,windturbine,3,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.64842582327,windturbine,4,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.61918003621,windturbine,4,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74107209271,windturbine,4,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.73289057897,windturbine,4,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.85843146883,windturbine,4,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.43228388218,windturbine,5,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41278669081,windturbine,5,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49404806181,windturbine,5,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.48859371932,windturbine,5,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.57228764589,windturbine,5,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16732260678,gassupply1,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.88146776247,gassupply1,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.68925801597,gassupply1,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.88146776247,gassupply1,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.76293552495,gassupply1,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,3.11754832735,gassupply1,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.42222222222,gasCCGT,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,38.70511111111,gasCCGT,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.63333333333,gasCCGT,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,58.05766666667,gasCCGT,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.42222222222,gasCCGT,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,38.70511111111,gasCCGT,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.63333333333,gasCCGT,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,58.05766666667,gasCCGT,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,1.00000000000,gasCCGT,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,91.67000000000,gasCCGT,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.84444444444,gasCCGT,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,77.41022222222,gasCCGT,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.02733333333,gassupply1,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.54100000000,gassupply1,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.32422222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.54100000000,gassupply1,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.08200000000,gassupply1,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.66666666667,windturbine,0,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.50000000000,windturbine,2,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,1.00000000000,windturbine,3,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,1.00000000000,windturbine,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.21333333333,windturbine,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.21333333333,windturbine,0,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.21333333333,windturbine,0,MUS$2010/PJ,2045
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.42666666667,windturbine,0,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.32000000000,windturbine,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.32000000000,windturbine,1,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.32000000000,windturbine,1,MUS$2010/PJ,2045
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.64000000000,windturbine,1,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.21333333333,windturbine,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.21333333333,windturbine,2,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.21333333333,windturbine,2,MUS$2010/PJ,2045
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.42666666667,windturbine,2,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.32000000000,windturbine,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.32000000000,windturbine,3,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.32000000000,windturbine,3,MUS$2010/PJ,2045
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.64000000000,windturbine,3,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.64000000000,windturbine,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.64000000000,windturbine,4,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.64000000000,windturbine,4,MUS$2010/PJ,2045
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,1.28000000000,windturbine,4,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.42666666667,windturbine,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.42666666667,windturbine,5,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.42666666667,windturbine,5,MUS$2010/PJ,2045
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.85333333333,windturbine,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.17142857143,windturbine,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17142857143,windturbine,0,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.17142857143,windturbine,0,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.34285714286,windturbine,0,MUS$2010/PJ,2050
+A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.34285714286,windturbine,0,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.25714285714,windturbine,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.25714285714,windturbine,1,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.25714285714,windturbine,1,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.51428571429,windturbine,1,MUS$2010/PJ,2050
+A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.51428571429,windturbine,1,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.17142857143,windturbine,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17142857143,windturbine,2,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.17142857143,windturbine,2,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.34285714286,windturbine,2,MUS$2010/PJ,2050
+A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.34285714286,windturbine,2,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.25714285714,windturbine,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.25714285714,windturbine,3,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.25714285714,windturbine,3,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.51428571429,windturbine,3,MUS$2010/PJ,2050
+A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.51428571429,windturbine,3,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.51428571429,windturbine,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.51428571429,windturbine,4,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.51428571429,windturbine,4,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,1.02857142857,windturbine,4,MUS$2010/PJ,2050
+A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,1.02857142857,windturbine,4,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.34285714286,windturbine,5,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.34285714286,windturbine,5,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.34285714286,windturbine,5,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.68571428571,windturbine,5,MUS$2010/PJ,2050
+A1,11,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.68571428571,windturbine,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
index 4e06e1ae..42d2f554 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
@@ -1,229 +1,205 @@
 agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2030
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,night,2025,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,morning,2025,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,all-week,R1,afternoon,2025,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,all-week,R1,early-peak,2025,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,all-week,R1,late-peak,2025,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,all-week,R1,evening,2025,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,night,2035,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,morning,2035,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,all-week,R1,afternoon,2035,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,all-week,R1,early-peak,2035,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,all-week,R1,late-peak,2035,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,all-week,R1,evening,2035,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,0,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,1,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,2,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,3,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
-A1,4,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.35255555556,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.21111111111,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.52883333333,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31666666667,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.05766666667,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.63333333333,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.70511111111,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.42222222222,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.33333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.50000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,1.00000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.66666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.30000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.60000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,1.20000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.93333333333,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.62222222222,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,night,2025,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2030,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2035,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2040,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,morning,2025,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2030,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2035,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2040,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,afternoon,2025,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2030,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2035,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2040,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20000000000,all-week,R1,early-peak,2025,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2030,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2035,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2040,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40000000000,all-week,R1,late-peak,2025,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2030,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2035,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2040,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.80000000000,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,evening,2025,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2030,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2035,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2040,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
index 5bd01ac0..94b202c6 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
@@ -1,325 +1,235 @@
 agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20105820106,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22116402116,windturbine,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,18.43100529101,gasCCGT,0,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30158730159,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33174603175,windturbine,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,27.64650793651,gasCCGT,1,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20105820106,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22116402116,windturbine,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,18.43100529101,gasCCGT,2,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30158730159,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33174603175,windturbine,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,27.64650793651,gasCCGT,3,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60317460317,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66349206349,windturbine,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,55.29301587302,gasCCGT,4,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40211640212,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44232804233,windturbine,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,36.86201058201,gasCCGT,5,MUS$2010/kt,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2030
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23951240017,windturbine,0,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33604315539,windturbine,0,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35926860025,windturbine,1,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50406473308,windturbine,1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23951240017,windturbine,2,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33604315539,windturbine,2,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35926860025,windturbine,3,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50406473308,windturbine,3,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.71853720050,windturbine,4,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00812946616,windturbine,4,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47902480034,windturbine,5,MUS$2010/PJ,2030
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.67208631077,windturbine,5,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.26422222222,gassupply1,0,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.39633333333,gassupply1,1,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.26422222222,gassupply1,2,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.39633333333,gassupply1,3,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.79266666667,gassupply1,4,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.52844444444,gassupply1,5,MUS$2010/PJ,2030
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.22777777778,gasboiler,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.38333333333,heatpump,0,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,residential,14.73950000000,gasboiler,0,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.34166666667,gasboiler,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.57500000000,heatpump,1,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,residential,22.10925000000,gasboiler,1,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.22777777778,gasboiler,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.38333333333,heatpump,2,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,residential,14.73950000000,gasboiler,2,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.34166666667,gasboiler,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.57500000000,heatpump,3,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,residential,22.10925000000,gasboiler,3,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,0.68333333333,gasboiler,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.15000000000,heatpump,4,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,residential,44.21850000000,gasboiler,4,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.45555555556,gasboiler,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,0.76666666667,heatpump,5,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,residential,29.47900000000,gasboiler,5,MUS$2010/kt,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.18011035545,windturbine,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.25270028658,windturbine,0,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.27607824686,windturbine,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.27016553317,windturbine,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.37905042987,windturbine,1,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.41411737029,windturbine,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.18011035545,windturbine,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.25270028658,windturbine,2,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.27607824686,windturbine,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.27016553317,windturbine,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.37905042987,windturbine,3,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.41411737029,windturbine,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.54033106634,windturbine,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.75810085975,windturbine,4,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.82823474058,windturbine,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.36022071089,windturbine,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.50540057316,windturbine,5,MUS$2010/PJ,2035
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.55215649372,windturbine,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.12888888889,gassupply1,0,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.13533333333,gassupply1,0,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.19333333333,gassupply1,1,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.20300000000,gassupply1,1,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.12888888889,gassupply1,2,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.13533333333,gassupply1,2,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.19333333333,gassupply1,3,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.20300000000,gassupply1,3,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.38666666667,gassupply1,4,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.40600000000,gassupply1,4,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.25777777778,gassupply1,5,MUS$2010/PJ,2035
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.27066666667,gassupply1,5,MUS$2010/PJ,2035
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.38888888889,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.08333333333,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.38888888889,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.08333333333,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.16666666667,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.77777777778,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15824641356,windturbine,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.22202451357,windturbine,0,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.24256457836,windturbine,0,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.29027560563,windturbine,0,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23736962033,windturbine,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.33303677035,windturbine,1,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.36384686753,windturbine,1,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.43541340845,windturbine,1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15824641356,windturbine,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.22202451357,windturbine,2,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.24256457836,windturbine,2,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.29027560563,windturbine,2,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23736962033,windturbine,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.33303677035,windturbine,3,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.36384686753,windturbine,3,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.43541340845,windturbine,3,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.47473924067,windturbine,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.66607354070,windturbine,4,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.72769373507,windturbine,4,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.87082681690,windturbine,4,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31649282711,windturbine,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.44404902713,windturbine,5,MUS$2010/PJ,2040
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.48512915671,windturbine,5,MUS$2010/PJ,2040
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.58055121127,windturbine,5,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,0,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,0,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,1,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,1,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,2,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,2,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,3,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,3,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,4,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,4,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,5,MUS$2010/PJ,2040
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,5,MUS$2010/PJ,2040
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.05055555556,gasboiler,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.89388888889,heatpump,0,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2035,all-year,R1,residential,3.27145000000,gasboiler,0,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,0.07583333333,gasboiler,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.34083333333,heatpump,1,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2035,all-year,R1,residential,4.90717500000,gasboiler,1,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.05055555556,gasboiler,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.89388888889,heatpump,2,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2035,all-year,R1,residential,3.27145000000,gasboiler,2,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,0.07583333333,gasboiler,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.34083333333,heatpump,3,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2035,all-year,R1,residential,4.90717500000,gasboiler,3,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,0.15166666667,gasboiler,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.68166666667,heatpump,4,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2035,all-year,R1,residential,9.81435000000,gasboiler,4,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,0.10111111111,gasboiler,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.78777777778,heatpump,5,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2035,all-year,R1,residential,6.54290000000,gasboiler,5,MUS$2010/kt,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13656827502,windturbine,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19160942829,windturbine,0,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20933571449,windturbine,0,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.25051081949,windturbine,0,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25842020716,windturbine,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20485241253,windturbine,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28741414243,windturbine,1,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31400357173,windturbine,1,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37576622924,windturbine,1,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38763031074,windturbine,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13656827502,windturbine,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19160942829,windturbine,2,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20933571449,windturbine,2,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.25051081949,windturbine,2,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25842020716,windturbine,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20485241253,windturbine,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28741414243,windturbine,3,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31400357173,windturbine,3,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37576622924,windturbine,3,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38763031074,windturbine,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40970482506,windturbine,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57482828486,windturbine,4,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62800714346,windturbine,4,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.75153245848,windturbine,4,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77526062148,windturbine,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27313655004,windturbine,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38321885657,windturbine,5,MUS$2010/PJ,2045
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41867142897,windturbine,5,MUS$2010/PJ,2045
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.50102163899,windturbine,5,MUS$2010/PJ,2045
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51684041432,windturbine,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.02860704607,gassupply1,0,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.03003739837,gassupply1,0,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.04291056911,gassupply1,1,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.04505609756,gassupply1,1,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.02860704607,gassupply1,2,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.03003739837,gassupply1,2,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.04291056911,gassupply1,3,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.04505609756,gassupply1,3,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.08582113821,gassupply1,4,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.09011219512,gassupply1,4,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.05721409214,gassupply1,5,MUS$2010/PJ,2045
-A1,1,retrofit,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.06007479675,gassupply1,5,MUS$2010/PJ,2045
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.72222222222,heatpump,0,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.27777777778,heatpump,0,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.58333333333,heatpump,1,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.91666666667,heatpump,1,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.72222222222,heatpump,2,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.27777777778,heatpump,2,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.58333333333,heatpump,3,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.91666666667,heatpump,3,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.16666666667,heatpump,4,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.83333333333,heatpump,4,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.44444444444,heatpump,5,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.55555555556,heatpump,5,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.19078573323,windturbine,0,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.20843581726,windturbine,0,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.24943391777,windturbine,0,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.25730930438,windturbine,0,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.29403522736,windturbine,0,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.28617859985,windturbine,1,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.31265372589,windturbine,1,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.37415087666,windturbine,1,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.38596395657,windturbine,1,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.44105284104,windturbine,1,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.19078573323,windturbine,2,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.20843581726,windturbine,2,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.24943391777,windturbine,2,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.25730930438,windturbine,2,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.29403522736,windturbine,2,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.28617859985,windturbine,3,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.31265372589,windturbine,3,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.37415087666,windturbine,3,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.38596395657,windturbine,3,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.44105284104,windturbine,3,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.57235719969,windturbine,4,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.62530745179,windturbine,4,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.74830175331,windturbine,4,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.77192791314,windturbine,4,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.88210568207,windturbine,4,MUS$2010/PJ,2050
-A1,0,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.38157146646,windturbine,5,MUS$2010/PJ,2050
-A1,1,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.41687163452,windturbine,5,MUS$2010/PJ,2050
-A1,2,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.49886783554,windturbine,5,MUS$2010/PJ,2050
-A1,3,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.51461860876,windturbine,5,MUS$2010/PJ,2050
-A1,4,retrofit,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.58807045471,windturbine,5,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.21111111111,windturbine,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,19.35255555556,gasCCGT,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.31666666667,windturbine,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,29.02883333333,gasCCGT,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.21111111111,windturbine,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,19.35255555556,gasCCGT,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.31666666667,windturbine,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,29.02883333333,gasCCGT,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.63333333333,windturbine,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,58.05766666667,gasCCGT,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.33333333333,windturbine,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.33333333333,windturbine,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.50000000000,windturbine,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,1.00000000000,windturbine,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.66666666667,windturbine,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.40000000000,windturbine,0,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.60000000000,windturbine,1,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20000000000,windturbine,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30000000000,windturbine,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60000000000,windturbine,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,1.20000000000,windturbine,4,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40000000000,windturbine,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.80000000000,windturbine,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,windturbine,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.31111111111,windturbine,0,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,windturbine,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.46666666667,windturbine,1,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,windturbine,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.31111111111,windturbine,2,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,windturbine,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.46666666667,windturbine,3,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,windturbine,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.93333333333,windturbine,4,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,windturbine,5,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.62222222222,windturbine,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.13333333333,windturbine,0,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.26666666667,windturbine,0,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.13333333333,windturbine,2,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.26666666667,windturbine,2,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.80000000000,windturbine,4,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.26666666667,windturbine,5,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.53333333333,windturbine,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
index aca57bbe..23b15445 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,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,0,MUS$2010/kt,2010
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,0,MUS$2010/kt,2010
-2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,0,MUS$2010/Mt,2010
-3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,0,MUS$2010/Mt,2010
-4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,1,MUS$2010/kt,2010
-5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,1,MUS$2010/kt,2010
-6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,1,MUS$2010/Mt,2010
-7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,1,MUS$2010/Mt,2010
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,2,MUS$2010/kt,2010
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,2,MUS$2010/kt,2010
-10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,2,MUS$2010/Mt,2010
-11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,2,MUS$2010/Mt,2010
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,0,MUS$2010/kt,2015
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,0,MUS$2010/kt,2015
-2,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,0,MUS$2010/Mt,2015
-3,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,0,MUS$2010/Mt,2015
-4,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,1,MUS$2010/kt,2015
-5,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,1,MUS$2010/kt,2015
-6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,1,MUS$2010/Mt,2015
-7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,1,MUS$2010/Mt,2015
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,2,MUS$2010/kt,2015
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,2,MUS$2010/kt,2015
-10,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,2,MUS$2010/Mt,2015
-11,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,2,MUS$2010/Mt,2015
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,0,MUS$2010/kt,2020
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,0,MUS$2010/kt,2020
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,0,MUS$2010/kt,2020
-3,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,0,MUS$2010/Mt,2020
-4,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,0,MUS$2010/Mt,2020
-5,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,0,MUS$2010/Mt,2020
-6,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,1,MUS$2010/kt,2020
-7,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,1,MUS$2010/kt,2020
-8,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,1,MUS$2010/kt,2020
-9,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,1,MUS$2010/Mt,2020
-10,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,1,MUS$2010/Mt,2020
-11,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2020
-12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,2,MUS$2010/kt,2020
-13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,2,MUS$2010/kt,2020
-14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,2,MUS$2010/kt,2020
-15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,2,MUS$2010/Mt,2020
-16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,2,MUS$2010/Mt,2020
-17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,2,MUS$2010/Mt,2020
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,0,MUS$2010/kt,2025
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,0,MUS$2010/kt,2025
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,0,MUS$2010/kt,2025
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,0,MUS$2010/kt,2025
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,0,MUS$2010/Mt,2025
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,0,MUS$2010/Mt,2025
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,0,MUS$2010/Mt,2025
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,0,MUS$2010/Mt,2025
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,1,MUS$2010/kt,2025
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,1,MUS$2010/kt,2025
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,1,MUS$2010/kt,2025
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,1,MUS$2010/kt,2025
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,1,MUS$2010/Mt,2025
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,1,MUS$2010/Mt,2025
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2025
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2025
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,2,MUS$2010/kt,2025
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,2,MUS$2010/kt,2025
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,2,MUS$2010/kt,2025
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,2,MUS$2010/kt,2025
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,2,MUS$2010/Mt,2025
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,2,MUS$2010/Mt,2025
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,2,MUS$2010/Mt,2025
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,2,MUS$2010/Mt,2025
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,0,MUS$2010/kt,2030
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,0,MUS$2010/kt,2030
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,0,MUS$2010/kt,2030
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,0,MUS$2010/kt,2030
-4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,0,MUS$2010/kt,2030
-5,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,0,MUS$2010/Mt,2030
-6,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,0,MUS$2010/Mt,2030
-7,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,0,MUS$2010/Mt,2030
-8,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,0,MUS$2010/Mt,2030
-9,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,0,MUS$2010/Mt,2030
-10,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,1,MUS$2010/kt,2030
-11,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,1,MUS$2010/kt,2030
-12,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,1,MUS$2010/kt,2030
-13,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,1,MUS$2010/kt,2030
-14,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,1,MUS$2010/kt,2030
-15,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,1,MUS$2010/Mt,2030
-16,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,1,MUS$2010/Mt,2030
-17,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2030
-18,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2030
-19,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2030
-20,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,2,MUS$2010/kt,2030
-21,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,2,MUS$2010/kt,2030
-22,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,2,MUS$2010/kt,2030
-23,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,2,MUS$2010/kt,2030
-24,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,2,MUS$2010/kt,2030
-25,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,2,MUS$2010/Mt,2030
-26,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,2,MUS$2010/Mt,2030
-27,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,2,MUS$2010/Mt,2030
-28,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,2,MUS$2010/Mt,2030
-29,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,2,MUS$2010/Mt,2030
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,0,MUS$2010/kt,2035
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,0,MUS$2010/kt,2035
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,0,MUS$2010/kt,2035
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,0,MUS$2010/kt,2035
-4,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,0,MUS$2010/kt,2035
-5,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,0,MUS$2010/kt,2035
-6,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,0,MUS$2010/Mt,2035
-7,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,0,MUS$2010/Mt,2035
-8,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,0,MUS$2010/Mt,2035
-9,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,0,MUS$2010/Mt,2035
-10,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,0,MUS$2010/Mt,2035
-11,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,0,MUS$2010/Mt,2035
-12,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,1,MUS$2010/kt,2035
-13,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,1,MUS$2010/kt,2035
-14,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,1,MUS$2010/kt,2035
-15,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,1,MUS$2010/kt,2035
-16,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,1,MUS$2010/kt,2035
-17,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,1,MUS$2010/kt,2035
-18,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,1,MUS$2010/Mt,2035
-19,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,1,MUS$2010/Mt,2035
-20,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2035
-21,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2035
-22,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2035
-23,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2035
-24,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,2,MUS$2010/kt,2035
-25,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,2,MUS$2010/kt,2035
-26,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,2,MUS$2010/kt,2035
-27,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,2,MUS$2010/kt,2035
-28,A1,4,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,2,MUS$2010/kt,2035
-29,A1,5,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,2,MUS$2010/kt,2035
-30,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,2,MUS$2010/Mt,2035
-31,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,2,MUS$2010/Mt,2035
-32,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,2,MUS$2010/Mt,2035
-33,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,2,MUS$2010/Mt,2035
-34,A1,4,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,2,MUS$2010/Mt,2035
-35,A1,5,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,2,MUS$2010/Mt,2035
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,0,MUS$2010/kt,2040
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,0,MUS$2010/kt,2040
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,0,MUS$2010/kt,2040
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,0,MUS$2010/kt,2040
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,0,MUS$2010/Mt,2040
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,0,MUS$2010/Mt,2040
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,0,MUS$2010/Mt,2040
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,0,MUS$2010/Mt,2040
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,1,MUS$2010/kt,2040
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,1,MUS$2010/kt,2040
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,1,MUS$2010/kt,2040
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,1,MUS$2010/kt,2040
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2040
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2040
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2040
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2040
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,2,MUS$2010/kt,2040
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,2,MUS$2010/kt,2040
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,2,MUS$2010/kt,2040
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,2,MUS$2010/kt,2040
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,2,MUS$2010/Mt,2040
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,2,MUS$2010/Mt,2040
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,2,MUS$2010/Mt,2040
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,2,MUS$2010/Mt,2040
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,0,MUS$2010/kt,2045
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,0,MUS$2010/kt,2045
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,0,MUS$2010/kt,2045
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,0,MUS$2010/kt,2045
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,0,MUS$2010/Mt,2045
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,0,MUS$2010/Mt,2045
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,0,MUS$2010/Mt,2045
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,0,MUS$2010/Mt,2045
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,1,MUS$2010/kt,2045
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,1,MUS$2010/kt,2045
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,1,MUS$2010/kt,2045
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,1,MUS$2010/kt,2045
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2045
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2045
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2045
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2045
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,2,MUS$2010/kt,2045
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,2,MUS$2010/kt,2045
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,2,MUS$2010/kt,2045
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,2,MUS$2010/kt,2045
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,2,MUS$2010/Mt,2045
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,2,MUS$2010/Mt,2045
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,2,MUS$2010/Mt,2045
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,2,MUS$2010/Mt,2045
-0,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,0,MUS$2010/kt,2050
-1,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,0,MUS$2010/kt,2050
-2,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,0,MUS$2010/kt,2050
-3,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,0,MUS$2010/kt,2050
-4,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,0,MUS$2010/Mt,2050
-5,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,0,MUS$2010/Mt,2050
-6,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,0,MUS$2010/Mt,2050
-7,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,0,MUS$2010/Mt,2050
-8,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,1,MUS$2010/kt,2050
-9,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,1,MUS$2010/kt,2050
-10,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,1,MUS$2010/kt,2050
-11,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,1,MUS$2010/kt,2050
-12,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2050
-13,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2050
-14,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2050
-15,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,1,MUS$2010/Mt,2050
-16,A1,0,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,2,MUS$2010/kt,2050
-17,A1,1,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,2,MUS$2010/kt,2050
-18,A1,2,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,2,MUS$2010/kt,2050
-19,A1,3,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,2,MUS$2010/kt,2050
-20,A1,0,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,2,MUS$2010/Mt,2050
-21,A1,1,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,2,MUS$2010/Mt,2050
-22,A1,2,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,2,MUS$2010/Mt,2050
-23,A1,3,retrofit,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,2,MUS$2010/Mt,2050
+0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,0,MUS$2010/kt,2010
+1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,0,MUS$2010/kt,2010
+2,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,0,MUS$2010/Mt,2010
+3,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,0,MUS$2010/Mt,2010
+4,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,1,MUS$2010/kt,2010
+5,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,1,MUS$2010/kt,2010
+6,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,1,MUS$2010/Mt,2010
+7,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,1,MUS$2010/Mt,2010
+8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,2,MUS$2010/kt,2010
+9,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,2,MUS$2010/kt,2010
+10,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,2,MUS$2010/Mt,2010
+11,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,2,MUS$2010/Mt,2010
+0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,0,MUS$2010/kt,2015
+1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,0,MUS$2010/kt,2015
+2,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,0,MUS$2010/Mt,2015
+3,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,0,MUS$2010/Mt,2015
+4,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,1,MUS$2010/kt,2015
+5,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,1,MUS$2010/kt,2015
+6,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,1,MUS$2010/Mt,2015
+7,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,1,MUS$2010/Mt,2015
+8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,2,MUS$2010/kt,2015
+9,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,2,MUS$2010/kt,2015
+10,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,2,MUS$2010/Mt,2015
+11,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,2,MUS$2010/Mt,2015
+0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,0,MUS$2010/kt,2020
+1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,0,MUS$2010/kt,2020
+2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,0,MUS$2010/kt,2020
+3,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,0,MUS$2010/Mt,2020
+4,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,0,MUS$2010/Mt,2020
+5,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,0,MUS$2010/Mt,2020
+6,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,1,MUS$2010/kt,2020
+7,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,1,MUS$2010/kt,2020
+8,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,1,MUS$2010/kt,2020
+9,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,1,MUS$2010/Mt,2020
+10,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,1,MUS$2010/Mt,2020
+11,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2020
+12,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,2,MUS$2010/kt,2020
+13,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,2,MUS$2010/kt,2020
+14,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,2,MUS$2010/kt,2020
+15,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,2,MUS$2010/Mt,2020
+16,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,2,MUS$2010/Mt,2020
+17,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,2,MUS$2010/Mt,2020
+0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,0,MUS$2010/kt,2025
+1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,0,MUS$2010/kt,2025
+2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,0,MUS$2010/kt,2025
+3,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,0,MUS$2010/kt,2025
+4,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,0,MUS$2010/Mt,2025
+5,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,0,MUS$2010/Mt,2025
+6,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,0,MUS$2010/Mt,2025
+7,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,0,MUS$2010/Mt,2025
+8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,1,MUS$2010/kt,2025
+9,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,1,MUS$2010/kt,2025
+10,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,1,MUS$2010/kt,2025
+11,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,1,MUS$2010/kt,2025
+12,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,1,MUS$2010/Mt,2025
+13,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,1,MUS$2010/Mt,2025
+14,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2025
+15,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2025
+16,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,2,MUS$2010/kt,2025
+17,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,2,MUS$2010/kt,2025
+18,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,2,MUS$2010/kt,2025
+19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,2,MUS$2010/kt,2025
+20,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,2,MUS$2010/Mt,2025
+21,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,2,MUS$2010/Mt,2025
+22,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,2,MUS$2010/Mt,2025
+23,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,2,MUS$2010/Mt,2025
+0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,0,MUS$2010/kt,2030
+1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,0,MUS$2010/kt,2030
+2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,0,MUS$2010/kt,2030
+3,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,0,MUS$2010/kt,2030
+4,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,0,MUS$2010/kt,2030
+5,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,0,MUS$2010/Mt,2030
+6,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,0,MUS$2010/Mt,2030
+7,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,0,MUS$2010/Mt,2030
+8,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,0,MUS$2010/Mt,2030
+9,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,0,MUS$2010/Mt,2030
+10,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,1,MUS$2010/kt,2030
+11,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,1,MUS$2010/kt,2030
+12,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,1,MUS$2010/kt,2030
+13,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,1,MUS$2010/kt,2030
+14,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,1,MUS$2010/kt,2030
+15,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,1,MUS$2010/Mt,2030
+16,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,1,MUS$2010/Mt,2030
+17,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2030
+18,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2030
+19,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2030
+20,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,2,MUS$2010/kt,2030
+21,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,2,MUS$2010/kt,2030
+22,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,2,MUS$2010/kt,2030
+23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,2,MUS$2010/kt,2030
+24,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,2,MUS$2010/kt,2030
+25,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,2,MUS$2010/Mt,2030
+26,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,2,MUS$2010/Mt,2030
+27,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,2,MUS$2010/Mt,2030
+28,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,2,MUS$2010/Mt,2030
+29,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,2,MUS$2010/Mt,2030
+0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,0,MUS$2010/kt,2035
+1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,0,MUS$2010/kt,2035
+2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,0,MUS$2010/kt,2035
+3,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,0,MUS$2010/kt,2035
+4,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,0,MUS$2010/kt,2035
+5,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,0,MUS$2010/kt,2035
+6,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,0,MUS$2010/Mt,2035
+7,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,0,MUS$2010/Mt,2035
+8,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,0,MUS$2010/Mt,2035
+9,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,0,MUS$2010/Mt,2035
+10,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,0,MUS$2010/Mt,2035
+11,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,0,MUS$2010/Mt,2035
+12,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,1,MUS$2010/kt,2035
+13,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,1,MUS$2010/kt,2035
+14,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,1,MUS$2010/kt,2035
+15,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,1,MUS$2010/kt,2035
+16,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,1,MUS$2010/kt,2035
+17,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,1,MUS$2010/kt,2035
+18,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,1,MUS$2010/Mt,2035
+19,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,1,MUS$2010/Mt,2035
+20,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2035
+21,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2035
+22,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2035
+23,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2035
+24,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,2,MUS$2010/kt,2035
+25,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,2,MUS$2010/kt,2035
+26,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,2,MUS$2010/kt,2035
+27,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,2,MUS$2010/kt,2035
+28,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,2,MUS$2010/kt,2035
+29,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,2,MUS$2010/kt,2035
+30,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,2,MUS$2010/Mt,2035
+31,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,2,MUS$2010/Mt,2035
+32,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,2,MUS$2010/Mt,2035
+33,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,2,MUS$2010/Mt,2035
+34,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,2,MUS$2010/Mt,2035
+35,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,2,MUS$2010/Mt,2035
+0,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,0,MUS$2010/kt,2040
+1,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,0,MUS$2010/kt,2040
+2,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,0,MUS$2010/kt,2040
+3,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,0,MUS$2010/kt,2040
+4,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,0,MUS$2010/Mt,2040
+5,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,0,MUS$2010/Mt,2040
+6,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,0,MUS$2010/Mt,2040
+7,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,0,MUS$2010/Mt,2040
+8,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,1,MUS$2010/kt,2040
+9,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,1,MUS$2010/kt,2040
+10,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,1,MUS$2010/kt,2040
+11,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,1,MUS$2010/kt,2040
+12,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2040
+13,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2040
+14,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2040
+15,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2040
+16,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,2,MUS$2010/kt,2040
+17,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,2,MUS$2010/kt,2040
+18,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,2,MUS$2010/kt,2040
+19,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,2,MUS$2010/kt,2040
+20,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,2,MUS$2010/Mt,2040
+21,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,2,MUS$2010/Mt,2040
+22,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,2,MUS$2010/Mt,2040
+23,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,2,MUS$2010/Mt,2040
+0,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,0,MUS$2010/kt,2045
+1,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,0,MUS$2010/kt,2045
+2,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,0,MUS$2010/kt,2045
+3,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,0,MUS$2010/kt,2045
+4,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,0,MUS$2010/Mt,2045
+5,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,0,MUS$2010/Mt,2045
+6,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,0,MUS$2010/Mt,2045
+7,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,0,MUS$2010/Mt,2045
+8,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,1,MUS$2010/kt,2045
+9,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,1,MUS$2010/kt,2045
+10,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,1,MUS$2010/kt,2045
+11,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,1,MUS$2010/kt,2045
+12,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2045
+13,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2045
+14,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2045
+15,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2045
+16,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,2,MUS$2010/kt,2045
+17,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,2,MUS$2010/kt,2045
+18,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,2,MUS$2010/kt,2045
+19,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,2,MUS$2010/kt,2045
+20,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,2,MUS$2010/Mt,2045
+21,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,2,MUS$2010/Mt,2045
+22,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,2,MUS$2010/Mt,2045
+23,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,2,MUS$2010/Mt,2045
+0,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,0,MUS$2010/kt,2050
+1,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,0,MUS$2010/kt,2050
+2,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,0,MUS$2010/kt,2050
+3,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,0,MUS$2010/kt,2050
+4,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,0,MUS$2010/Mt,2050
+5,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,0,MUS$2010/Mt,2050
+6,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,0,MUS$2010/Mt,2050
+7,A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,0,MUS$2010/Mt,2050
+8,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,1,MUS$2010/kt,2050
+9,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,1,MUS$2010/kt,2050
+10,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,1,MUS$2010/kt,2050
+11,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,1,MUS$2010/kt,2050
+12,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2050
+13,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2050
+14,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2050
+15,A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,1,MUS$2010/Mt,2050
+16,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,2,MUS$2010/kt,2050
+17,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,2,MUS$2010/kt,2050
+18,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,2,MUS$2010/kt,2050
+19,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,2,MUS$2010/kt,2050
+20,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,2,MUS$2010/Mt,2050
+21,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,2,MUS$2010/Mt,2050
+22,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,2,MUS$2010/Mt,2050
+23,A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,2,MUS$2010/Mt,2050

From 53cd16785d357847bc154ecacb7d642208002672 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 4 Jul 2024 21:11:27 +0100
Subject: [PATCH 369/419] Add reset_index

---
 src/muse/investments.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/investments.py b/src/muse/investments.py
index 9c40ef19..a42fd543 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -310,7 +310,7 @@ def scipy_match_demand(
 
     from muse.constraints import ScipyAdapter
 
-    df_technologies = technologies.to_dataframe()
+    df_technologies = technologies.to_dataframe().reset_index()
 
     if "timeslice" in costs.dims and timeslice_op is not None:
         costs = timeslice_op(costs)

From ebb816a4fca22ece3f3f512b90e8311ff8263b44 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 5 Jul 2024 09:15:49 +0100
Subject: [PATCH 370/419] Second attempt to fix error message

---
 src/muse/investments.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/muse/investments.py b/src/muse/investments.py
index a42fd543..7d92e5c7 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -310,8 +310,6 @@ def scipy_match_demand(
 
     from muse.constraints import ScipyAdapter
 
-    df_technologies = technologies.to_dataframe().reset_index()
-
     if "timeslice" in costs.dims and timeslice_op is not None:
         costs = timeslice_op(costs)
     if "year" in technologies.dims and year is None:
@@ -342,7 +340,7 @@ def scipy_match_demand(
             msg = (
                 res.message
                 + "\n"
-                + f"Error in sector containing {df_technologies.technology.unique()}"
+                + f"Error in sector containing {technologies.technology.values}"
             )
             getLogger(__name__).critical(msg)
             raise GrowthOfCapacityTooConstrained

From e16cf54768cea78411fed58d5d84d9e446b3c603 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 15:04:10 +0100
Subject: [PATCH 371/419] Split markdown cell while executing default model to
 create capacity file that is required for the notebook tests.

---
 docs/running-muse-example.ipynb | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index 537cc66d..b03c1ba3 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -48,13 +48,26 @@
     "\n",
     "### Programmatic use of MUSE\n",
     "\n",
-    "It is also possible to run one of the built-in MUSE models directly in Python using the following code:\n",
-    "\n",
-    "```python\n",
+    "It is also possible to run one of the built-in MUSE models directly in Python using the following code:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%%capture\n",
     "from muse import examples\n",
+    "\n",
     "model = examples.model(\"default\")\n",
-    "model.run()\n",
-    "```\n",
+    "model.run()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
     "\n",
     "The output will be produced in the current working directory, within a `Results` folder. For the case of a custom settings file:\n",
     "\n",

From 4cc1e8e45dfabb74131ca7114cb9021e4ca76cb8 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 15:11:03 +0100
Subject: [PATCH 372/419] Deleted instructions to run the default model of muse
 as part of the installation procedure as required file creation to run
 notebook tests is now fixed.

---
 docs/installation/developers.rst | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 96897037..65ea92f3 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -30,7 +30,6 @@ Once you have your environment created, **activate it** and install MUSE within
     # 1 - Create a virtual environment
     # 2 - Activate that virtual environment
     # 3 - Install MUSE in editable mode with: python -m pip install -e .[dev,doc]
-    # 4 - Invoke `muse --model default`
 
 .. note::
 
@@ -39,8 +38,6 @@ Once you have your environment created, **activate it** and install MUSE within
     For example on ``Windows``, the command will read `python -m pip install -e .[dev,doc]`. On Ubuntu Linux, it will be `python -m pip install -e ."[dev,doc]"`.
     This will install MUSE including its dependencies for development. The downloaded code can be modified and the changes will be automatically reflected in the virtual environment.
 
-Finally, in the activated virtual environment, run `muse --model default` to generate output data that are used to make `pytest` run without failures.
-
 .. note::
 
     The source-code installation will only be accessible whilst the virtual environment is active, and can be called from the command line using the ``muse`` command with the relevant input arguments.
@@ -66,15 +63,10 @@ Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/),
 
 To run tests, within the ``MUSE-OS`` directory, activate the virtual environment where you installed ``MUSE`` and run a model as shown in Step 1 below.
 This can be your own model or, for simplicity, the default one.
-Although this was the final step when installing ``MUSE``, it is mentioned here again because running a model creates a set of files
-needed for the tests themselves. In Step 2, you can then run the actual tests, which should all pass before continuing code development.
 
 .. code-block:: bash
 
-    # Step 1: Run a model
-    muse --model default
-
-    # Step 2: Run the test scripts
+    # Run the test scripts
     python -m pytest
 
 Building the documentation

From 9b087066ad4f065031197ffdfdc44dc10017b564 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 15:20:24 +0100
Subject: [PATCH 373/419] Improved user documentation.

---
 docs/running-muse-example.ipynb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index b03c1ba3..cb1597bb 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -20,7 +20,7 @@
    "source": [
     "## Running MUSE\n",
     "\n",
-    "Once MUSE have been installed, we can run an example. To start with, we will run one of the built-in MUSE examples. We will focus on the terminal version of MUSE as the GUI version should be largely self-explanatory. If you are using MUSE within a virtual environment, make sure you have it activated.\n",
+    "Once MUSE have been installed, we can run an example. To start with, we will run one of the built-in MUSE examples. We will focus on the terminal version of MUSE as the GUI version should be largely self-explanatory. If you are using MUSE within a virtual environment, make sure you have it activated. \n",
     "\n",
     "In all cases, if the installation instructions were followed, you should be able to run the default `muse` example running the following command in the terminal:\n",
     "\n",
@@ -53,23 +53,29 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-07-08T14:12:40.418913Z",
+     "start_time": "2024-07-08T14:12:14.259550Z"
+    }
+   },
    "source": [
     "%%capture\n",
     "from muse import examples\n",
     "\n",
     "model = examples.model(\"default\")\n",
     "model.run()"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 9
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+    "Note: `%%capture` is a Jupyter magic method that suppresses the output of a cell. Otherwise, one would see an output [like this](example-output.ipynb).\n",
     "\n",
-    "The output will be produced in the current working directory, within a `Results` folder. For the case of a custom settings file:\n",
+    "The results files will be produced in the current working directory, within a `Results` folder. For the case of a custom settings file:\n",
     "\n",
     "```python\n",
     "from logging import getLogger\n",

From eca80f19fe3f652f19f9e71281a9974822dbd859 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 14:21:53 +0000
Subject: [PATCH 374/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/running-muse-example.ipynb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/docs/running-muse-example.ipynb b/docs/running-muse-example.ipynb
index cb1597bb..1339d259 100644
--- a/docs/running-muse-example.ipynb
+++ b/docs/running-muse-example.ipynb
@@ -53,21 +53,16 @@
   },
   {
    "cell_type": "code",
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2024-07-08T14:12:40.418913Z",
-     "start_time": "2024-07-08T14:12:14.259550Z"
-    }
-   },
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "%%capture\n",
     "from muse import examples\n",
     "\n",
     "model = examples.model(\"default\")\n",
     "model.run()"
-   ],
-   "outputs": [],
-   "execution_count": 9
+   ]
   },
   {
    "cell_type": "markdown",

From d6ae3a27c08366afee9b24336a6e935694f54905 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 15:41:46 +0100
Subject: [PATCH 375/419] Set MinimumServiceFactor to 0 for relevant file and
 removed TechnodataTimeslices.csv for residential sector. Also, reworked
 relevant part of the notebook documentation.

---
 .../residential/TechnodataTimeslices.csv      | 14 --------
 .../residential/TechnodataTimeslices.csv      | 14 --------
 .../min-max-timeslice-constraints.ipynb       | 34 +++++++++----------
 .../technodata/power/TechnodataTimeslices.csv | 24 ++++++-------
 .../residential/TechnodataTimeslices.csv      | 14 --------
 5 files changed, 29 insertions(+), 71 deletions(-)
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv
 delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv
 delete mode 100644 src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv

diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv
deleted file mode 100644
index 847fd495..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor
-Unit,-,Year,-,-,-,-,-
-heatpump,R1,2020,upper,all-year,all-week,night,0.9
-heatpump,R1,2020,upper,all-year,all-week,morning,0.9
-heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9
-heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9
-heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9
-heatpump,R1,2020,upper,all-year,all-week,evening,0.9
-gasboiler,R1,2020,upper,all-year,all-week,night,0.9
-gasboiler,R1,2020,upper,all-year,all-week,morning,0.9
-gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9
-gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv
deleted file mode 100644
index a21c49c0..00000000
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor
-Unit,-,Year,-,-,-,-,-
-heatpump,R1,2020,upper,all-year,all-week,night,0.9
-heatpump,R1,2020,upper,all-year,all-week,morning,0.9
-heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9
-heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9
-heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9
-heatpump,R1,2020,upper,all-year,all-week,evening,0.9
-gasboiler,R1,2020,upper,all-year,all-week,night,0.9
-gasboiler,R1,2020,upper,all-year,all-week,morning,0.9
-gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9
-gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,evening,0.9
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 6bd38654..abb60fbd 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -30,28 +30,28 @@
     "python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n",
     "```\n",
     "\n",
-    "You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` and `residential` sectors, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n",
-    "The majority of these columns are self explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
+    "You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` sector, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n",
+    "The majority of these columns are self-explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
     "The `UtilizationFactor` column specifies the maximum utilization factor for the respective technologies in the respective timeslices, and the `MinimumServiceFactor` specifies the minimum service factor of a technology.\n",
     "The timeslice based columns, however, are dynamic and will match the levels as defined in the `toml` file. \n",
     "\n",
     "We will modify the minimum service factor for `gasCCGT` in the `power` sector as follows.\n",
     "\n",
-    "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
-    "|-|-|-|-|-|-|-|-|\n",
-    "|Unit|-|Year|-|-|-|-|-|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|night|1|**0.2**|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|morning|1|**0.4**|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|**0.6**|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|**0.4**|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|**0.8**|\n",
-    "|gasCCGT|R1|2020|all-year|all-week|evening|1|**1**|\n",
-    "|windturbine|R1|2020|all-year|all-week|night|1|1|\n",
-    "|windturbine|R1|2020|all-year|all-week|morning|1|1|\n",
-    "|windturbine|R1|2020|all-year|all-week|afternoon|1|1|\n",
-    "|windturbine|R1|2020|all-year|all-week|early-peak|1|1|\n",
-    "|windturbine|R1|2020|all-year|all-week|late-peak|1|1|\n",
-    "|windturbine|R1|2020|all-year|all-week|evening|1|1|\n"
+    "| ProcessName | RegionName | Time | month    | day      | hour       | UtilizationFactor | MinimumServiceFactor |\n",
+    "|-------------|------------|------|----------|----------|------------|-------------------|----------------------|\n",
+    "| Unit        | -          | Year | -        | -        | -          | -                 | -                    |\n",
+    "| gasCCGT     | R1         | 2020 | all-year | all-week | night      | 1                 | **0.2**              |\n",
+    "| gasCCGT     | R1         | 2020 | all-year | all-week | morning    | 1                 | **0.4**              |\n",
+    "| gasCCGT     | R1         | 2020 | all-year | all-week | afternoon  | 1                 | **0.6**              |\n",
+    "| gasCCGT     | R1         | 2020 | all-year | all-week | early-peak | 1                 | **0.4**              |\n",
+    "| gasCCGT     | R1         | 2020 | all-year | all-week | late-peak  | 1                 | **0.8**              |\n",
+    "| gasCCGT     | R1         | 2020 | all-year | all-week | evening    | 1                 | **1**                |\n",
+    "| windturbine | R1         | 2020 | all-year | all-week | night      | 1                 | 0                    |\n",
+    "| windturbine | R1         | 2020 | all-year | all-week | morning    | 1                 | 0                    |\n",
+    "| windturbine | R1         | 2020 | all-year | all-week | afternoon  | 1                 | 0                    |\n",
+    "| windturbine | R1         | 2020 | all-year | all-week | early-peak | 1                 | 0                    |\n",
+    "| windturbine | R1         | 2020 | all-year | all-week | late-peak  | 1                 | 0                    |\n",
+    "| windturbine | R1         | 2020 | all-year | all-week | evening    | 1                 | 0                    |\n"
    ]
   },
   {
diff --git a/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv b/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv
index 824ff170..a9b9e06b 100644
--- a/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv
+++ b/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv
@@ -1,14 +1,14 @@
 ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
 Unit,-,Year,-,-,-,-,-,-
-gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
-gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
-windturbine,R1,2020,upper,all-year,all-week,night,1,1
-windturbine,R1,2020,upper,all-year,all-week,morning,1,1
-windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1
-windturbine,R1,2020,upper,all-year,all-week,early-peak,1,1
-windturbine,R1,2020,upper,all-year,all-week,late-peak,1,1
-windturbine,R1,2020,upper,all-year,all-week,evening,1,1
+gasCCGT,R1,2020,upper,all-year,all-week,night,1,0
+gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0
+gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0
+gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0
+gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0
+gasCCGT,R1,2020,upper,all-year,all-week,evening,1,0
+windturbine,R1,2020,upper,all-year,all-week,night,1,0
+windturbine,R1,2020,upper,all-year,all-week,morning,1,0
+windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0
+windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
+windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
+windturbine,R1,2020,upper,all-year,all-week,evening,1,0
diff --git a/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv b/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv
deleted file mode 100644
index a21c49c0..00000000
--- a/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor
-Unit,-,Year,-,-,-,-,-
-heatpump,R1,2020,upper,all-year,all-week,night,0.9
-heatpump,R1,2020,upper,all-year,all-week,morning,0.9
-heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9
-heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9
-heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9
-heatpump,R1,2020,upper,all-year,all-week,evening,0.9
-gasboiler,R1,2020,upper,all-year,all-week,night,0.9
-gasboiler,R1,2020,upper,all-year,all-week,morning,0.9
-gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9
-gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9
-gasboiler,R1,2020,upper,all-year,all-week,evening,0.9

From ec75afb611616d60c7dc673126f7c92e87e7d417 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 15:47:17 +0100
Subject: [PATCH 376/419] Updated results files for default_timeslice model for
 MinimumServiceFactor set to zero.

---
 .../default_timeslice/Gas/Capacity/2020.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2025.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2030.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2035.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2040.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2045.csv   |   9 +-
 .../default_timeslice/Gas/Capacity/2050.csv   |   9 +-
 .../default_timeslice/MCACapacity.csv         |   8 +-
 .../default_timeslice/MCAMetric_Supply.csv    |  24 +--
 .../default_timeslice/MCAPrices.csv           | 204 +++++++++---------
 .../default_timeslice/Power/Supply/2020.csv   |  36 +---
 .../default_timeslice/Power/Supply/2025.csv   |  44 ++--
 .../default_timeslice/Power/Supply/2030.csv   |  56 ++---
 .../default_timeslice/Power/Supply/2035.csv   |  84 ++++----
 .../default_timeslice/Power/Supply/2040.csv   | 108 +++++-----
 .../default_timeslice/Power/Supply/2045.csv   | 120 +++++------
 .../default_timeslice/Power/Supply/2050.csv   | 120 +++++------
 17 files changed, 398 insertions(+), 469 deletions(-)

diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
index c62b307b..d1ee882b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
@@ -1,9 +1,4 @@
 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
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default_timeslice/MCACapacity.csv b/tests/example_outputs/default_timeslice/MCACapacity.csv
index bfe7b553..238432c7 100644
--- a/tests/example_outputs/default_timeslice/MCACapacity.csv
+++ b/tests/example_outputs/default_timeslice/MCACapacity.csv
@@ -6,25 +6,23 @@ A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
 A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
 A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
-A1,17.57780000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
 A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
 A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
 A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
 A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
-A1,10.07780000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
+A1,7.50000000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
 A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
 A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
 A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
 A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
 A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
-A1,2.57780000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
 A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
 A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
 A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
 A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
 A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
 A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
-A1,2.57780000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
 A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
 A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
 A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
@@ -32,7 +30,6 @@ A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
 A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
 A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
 A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
-A1,2.57780000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
 A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
 A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
 A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
@@ -40,4 +37,3 @@ A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
 A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
 A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
 A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
-A1,2.57780000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
index 94b202c6..235684be 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
@@ -11,12 +11,12 @@ A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,resident
 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
@@ -53,12 +53,12 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,p
 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025
 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025
 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.32222222222,gassupply1,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.48333333333,gassupply1,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.32222222222,gassupply1,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.48333333333,gassupply1,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.41200000000,gassupply1,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.64444444444,gassupply1,5,MUS$2010/PJ,2025
 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 8d469cac..6300a67e 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,2.13520000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2025
 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.13520000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2025
 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.13520000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2025
 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.13520000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2025
 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.13520000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73400000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2025
 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.13520000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2025
 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.10950000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.16420000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10950000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16420000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32840000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28020000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.21890000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
index 6eacdc73..00b3f810 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
@@ -1,31 +1,9 @@
 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.00000000000
-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.00000000000
-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.00000000000
-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.00000000000
-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
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
 4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-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.00000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
index 3283ad74..51182e94 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
@@ -1,31 +1,21 @@
 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.00000000000
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-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.00000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-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.00000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-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.00000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-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
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
 4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
 4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
 4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-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.00000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
index 82a474a7..4a52d7f1 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,month,day,hour,region,technology,installed,supply
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
 4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
 4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
index 76dec2c1..def4be3b 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,month,day,hour,region,technology,installed,supply
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
index d663c1a8..f5d07646 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,month,day,hour,region,technology,installed,supply
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
index 156ac116..dce17b90 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,month,day,hour,region,technology,installed,supply
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
index 7e6a6761..df173a2f 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,month,day,hour,region,technology,installed,supply
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000
-0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,2.00000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000
-1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,2.00000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000
-2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,2.00000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000
-3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,2.00000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000
-4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,2.00000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000
-5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,2.00000000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000

From f00917d7096eb37abdf896fd229ac8eacb4c2d19 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 16:31:58 +0100
Subject: [PATCH 377/419] Update docs/installation/developers.rst

Co-authored-by: Tom Bland <t.bland@imperial.ac.uk>
---
 docs/installation/developers.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 65ea92f3..190d953c 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -62,7 +62,6 @@ These tests ensure that a model produces reproducible results for a defined set
 Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/), using the testing framework of the same name.
 
 To run tests, within the ``MUSE-OS`` directory, activate the virtual environment where you installed ``MUSE`` and run a model as shown in Step 1 below.
-This can be your own model or, for simplicity, the default one.
 
 .. code-block:: bash
 

From f5ead555f1f61c4b5d36c22f1ea4533f7d4ead4c Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 16:32:40 +0100
Subject: [PATCH 378/419] Update docs/installation/developers.rst

Co-authored-by: Tom Bland <t.bland@imperial.ac.uk>
---
 docs/installation/developers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 190d953c..4ceee661 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -61,7 +61,7 @@ If you followed the **Installation for developers** guide, you are likely develo
 These tests ensure that a model produces reproducible results for a defined set of input data.
 Tests can be run with the command [pytest](https://docs.pytest.org/en/latest/), using the testing framework of the same name.
 
-To run tests, within the ``MUSE-OS`` directory, activate the virtual environment where you installed ``MUSE`` and run a model as shown in Step 1 below.
+To run tests, within the ``MUSE-OS`` directory, activate the virtual environment where you installed ``MUSE`` and run:
 
 .. code-block:: bash
 

From 20d3e5e6e02091bb9aa6fcd51de9b5c5ea717f7f Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 8 Jul 2024 16:33:03 +0100
Subject: [PATCH 379/419] Update docs/installation/developers.rst

Co-authored-by: Tom Bland <t.bland@imperial.ac.uk>
---
 docs/installation/developers.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/installation/developers.rst b/docs/installation/developers.rst
index 4ceee661..03f4c401 100644
--- a/docs/installation/developers.rst
+++ b/docs/installation/developers.rst
@@ -65,7 +65,6 @@ To run tests, within the ``MUSE-OS`` directory, activate the virtual environment
 
 .. code-block:: bash
 
-    # Run the test scripts
     python -m pytest
 
 Building the documentation

From a2992f2164a95cf9e9cee480aab9675c3649d04d Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 9 Jul 2024 14:20:28 +0100
Subject: [PATCH 380/419] Tidy find_equilibrium function

---
 src/muse/mca.py | 83 ++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index 8af0954a..d24378d2 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -548,18 +548,24 @@ def find_equilibrium(
 
     market["updated_prices"] = drop_timeslice(market.prices.copy())
     prior_market = market.copy(deep=True)
-    converged = False
     equilibrium_sectors = sectors
-    for i in range(maxiter):
-        market["prices"] = drop_timeslice(market.updated_prices)
+
+    converged = False
+    iteration = 0
+    while iteration < maxiter and not converged:
+        market["prices"] = drop_timeslice(market["updated_prices"])
         prior_market, market = market, prior_market
         market.consumption[:] = 0.0
         market.supply[:] = 0.0
         market, equilibrium_sectors = single_year_iteration(market, sectors)
 
-        check_demand_fulfillment(market.sel(commodity=included), tol_unmet_demand)
+        if maxiter == 1 or not equilibrium:
+            converged = True
+            break
 
-        equilibrium_reached = check_equilibrium(
+        # Check convergence criteria
+        check_demand_fulfillment(market.sel(commodity=included), tol_unmet_demand)
+        converged = check_equilibrium(
             market.sel(commodity=included),
             prior_market.sel(commodity=included),
             tol,
@@ -567,65 +573,28 @@ def find_equilibrium(
             market.year[1],
         )
 
-        if equilibrium_reached:
-            converged = True
-            new_price = prior_market["prices"].sel(year=market.year[1]).copy()
-            new_price.loc[dict(commodity=included)] = market.updated_prices.sel(
-                commodity=included, year=market.year[1]
-            )
-            market["prices"] = drop_timeslice(
-                future_propagation(  # type: ignore
-                    market["prices"], new_price
-                )
-            )
-
-            break
-
-        if equilibrium and not converged:
-            new_price = prior_market["prices"].sel(year=market.year[1]).copy()
-            new_price.loc[dict(commodity=included)] = (  # type: ignore
-                0.8 * new_price.loc[dict(commodity=included)]  # type: ignore
-            )
-            new_price.loc[dict(commodity=included)] += (
-                0.2
-                * market.updated_prices.loc[
-                    dict(year=market.year[1], commodity=included)
-                ]
+        new_price = prior_market["prices"].sel(year=market.year[-1]).copy()
+        if converged:
+            # Save prices for the equilibrium market
+            new_price.loc[dict(commodity=included)] = market["updated_prices"].sel(
+                commodity=included, year=market.year[-1]
             )
-            market["prices"] = drop_timeslice(
-                future_propagation(  # type: ignore
-                    market["prices"], new_price
-                )
-            )
-        if not equilibrium:
-            equilibrium_reached = True
-            converged = True
-            break
+        else:
+            # Update prices for next iteration
+            new_price.loc[{"commodity": included}] *= 0.8
+            new_price.loc[{"commodity": included}] += 0.2 * market[
+                "updated_prices"
+            ].sel(commodity=included, year=market.year[-1])
 
-        if maxiter == 1:
-            equilibrium_reached = True
-            converged = True
-            break
+        market["prices"] = drop_timeslice(
+            future_propagation(market["prices"], new_price)
+        )
 
-    else:
-        # We didn't reached convergence and the loop is over: the simulation failed!
+    if not converged:
         msg = (
             f"CONVERGENCE ERROR: Maximum number of iterations ({maxiter}) reached "
             f"in year {int(market.year[0])}"
         )
-        new_price = prior_market["prices"].sel(year=market.year[1]).copy()
-        new_price.loc[dict(commodity=included)] = (
-            0.8 * new_price.loc[dict(commodity=included)]  # type: ignore
-        )
-        new_price.loc[dict(commodity=included)] += (
-            0.2
-            * market.updated_prices.loc[dict(year=market.year[1], commodity=included)]
-        )
-        market["prices"] = drop_timeslice(
-            future_propagation(  # type: ignore
-                market["prices"], new_price
-            )
-        )
         getLogger(__name__).critical(msg)
 
     return FindEquilibriumResults(

From dc1f22f1e5fce5a0b3d886ff764342f0376a50ca Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 9 Jul 2024 14:40:06 +0100
Subject: [PATCH 381/419] Add iteration += 1 to while loop

---
 src/muse/mca.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index d24378d2..406a3096 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -589,6 +589,7 @@ def find_equilibrium(
         market["prices"] = drop_timeslice(
             future_propagation(market["prices"], new_price)
         )
+        iteration += 1
 
     if not converged:
         msg = (

From c963227bcb9abbe829979cfbb0bea4b2b25adb01 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 9 Jul 2024 15:18:24 +0100
Subject: [PATCH 382/419] Remove more redundant code

---
 src/muse/mca.py | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index 406a3096..68f79f67 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -538,8 +538,6 @@ def find_equilibrium(
 
     from numpy import ones
 
-    from muse.utilities import future_propagation
-
     market = market.copy(deep=True)
     if excluded_commodities:
         included = ~market.commodity.isin(excluded_commodities)
@@ -548,12 +546,10 @@ def find_equilibrium(
 
     market["updated_prices"] = drop_timeslice(market.prices.copy())
     prior_market = market.copy(deep=True)
-    equilibrium_sectors = sectors
 
     converged = False
     iteration = 0
     while iteration < maxiter and not converged:
-        market["prices"] = drop_timeslice(market["updated_prices"])
         prior_market, market = market, prior_market
         market.consumption[:] = 0.0
         market.supply[:] = 0.0
@@ -573,22 +569,8 @@ def find_equilibrium(
             market.year[1],
         )
 
-        new_price = prior_market["prices"].sel(year=market.year[-1]).copy()
-        if converged:
-            # Save prices for the equilibrium market
-            new_price.loc[dict(commodity=included)] = market["updated_prices"].sel(
-                commodity=included, year=market.year[-1]
-            )
-        else:
-            # Update prices for next iteration
-            new_price.loc[{"commodity": included}] *= 0.8
-            new_price.loc[{"commodity": included}] += 0.2 * market[
-                "updated_prices"
-            ].sel(commodity=included, year=market.year[-1])
-
-        market["prices"] = drop_timeslice(
-            future_propagation(market["prices"], new_price)
-        )
+        # Update prices
+        market["prices"] = drop_timeslice(market["updated_prices"])
         iteration += 1
 
     if not converged:

From 512f9cd594e13dc7ee674735680579847b4cafdb Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 9 Jul 2024 15:31:31 +0100
Subject: [PATCH 383/419] One more line deleted

---
 src/muse/mca.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index 68f79f67..0dff37b8 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -544,9 +544,7 @@ def find_equilibrium(
     else:
         included = ones(len(market.commodity), dtype=bool)
 
-    market["updated_prices"] = drop_timeslice(market.prices.copy())
     prior_market = market.copy(deep=True)
-
     converged = False
     iteration = 0
     while iteration < maxiter and not converged:

From 68928cf3a88e63354504055bf33745545c9e2de9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 10 Jul 2024 14:22:22 +0100
Subject: [PATCH 384/419] Fix find_equilibrium loop

---
 src/muse/mca.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index 0dff37b8..91bc7cf5 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -548,7 +548,7 @@ def find_equilibrium(
     converged = False
     iteration = 0
     while iteration < maxiter and not converged:
-        prior_market, market = market, prior_market
+        prior_market = market.copy(deep=True)
         market.consumption[:] = 0.0
         market.supply[:] = 0.0
         market, equilibrium_sectors = single_year_iteration(market, sectors)
@@ -557,6 +557,9 @@ def find_equilibrium(
             converged = True
             break
 
+        # Update prices
+        market["prices"] = drop_timeslice(market["updated_prices"])
+
         # Check convergence criteria
         check_demand_fulfillment(market.sel(commodity=included), tol_unmet_demand)
         converged = check_equilibrium(
@@ -566,9 +569,6 @@ def find_equilibrium(
             equilibrium_variable,
             market.year[1],
         )
-
-        # Update prices
-        market["prices"] = drop_timeslice(market["updated_prices"])
         iteration += 1
 
     if not converged:

From 4cec767a8a4657af1001568cf05eb46642ea9d93 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 10 Jul 2024 14:28:28 +0100
Subject: [PATCH 385/419] Re-run tutorials

---
 .../Results/MCACapacity.csv                   |  83 ++-
 .../Results/MCAMetric_Consumption.csv         | 420 +++++------
 .../Results/MCAMetric_Supply.csv              | 630 ++++++++--------
 .../Results/MCAPrices.csv                     | 144 ++--
 .../Results/Gas/Capacity/2020.csv             |   9 +-
 .../Results/Gas/Capacity/2025.csv             |  23 +-
 .../Results/Gas/Capacity/2030.csv             |  39 +-
 .../Results/Gas/Capacity/2035.csv             |  39 +-
 .../Results/Gas/Capacity/2040.csv             |  39 +-
 .../Results/Gas/Capacity/2045.csv             |  45 +-
 .../Results/Gas/Capacity/2050.csv             |  45 +-
 .../1-introduction/Results/MCACapacity.csv    |  52 +-
 .../1-introduction/Results/MCAPrices.csv      | 144 ++--
 .../Results/Power/Capacity/2020.csv           |  27 +-
 .../Results/Power/Capacity/2025.csv           |  31 +-
 .../Results/Power/Capacity/2030.csv           |  43 +-
 .../Results/Power/Capacity/2035.csv           |  59 +-
 .../Results/Power/Capacity/2040.csv           |  77 +-
 .../Results/Power/Capacity/2045.csv           | 125 ++--
 .../Results/Power/Capacity/2050.csv           | 132 ++--
 .../2-scenario/Results/Gas/Capacity/2020.csv  |   9 +-
 .../2-scenario/Results/Gas/Capacity/2025.csv  |  23 +-
 .../2-scenario/Results/Gas/Capacity/2030.csv  |  25 +-
 .../2-scenario/Results/Gas/Capacity/2035.csv  |  25 +-
 .../2-scenario/Results/Gas/Capacity/2040.csv  |  25 +-
 .../2-scenario/Results/Gas/Capacity/2045.csv  |  31 +-
 .../2-scenario/Results/Gas/Capacity/2050.csv  |  31 +-
 .../2-scenario/Results/MCACapacity.csv        |  44 +-
 .../2-scenario/Results/MCAPrices.csv          | 144 ++--
 .../Results/Power/Capacity/2020.csv           |  27 +-
 .../Results/Power/Capacity/2025.csv           |  29 +-
 .../Results/Power/Capacity/2030.csv           |  39 +-
 .../Results/Power/Capacity/2035.csv           |  53 +-
 .../Results/Power/Capacity/2040.csv           |  69 +-
 .../Results/Power/Capacity/2045.csv           | 111 ++-
 .../Results/Power/Capacity/2050.csv           | 111 ++-
 .../Results/Gas/Capacity/2020.csv             |   9 +-
 .../Results/Gas/Capacity/2025.csv             |  23 +-
 .../Results/Gas/Capacity/2030.csv             |  39 +-
 .../Results/Gas/Capacity/2035.csv             |  39 +-
 .../Results/Gas/Capacity/2040.csv             |  39 +-
 .../Results/Gas/Capacity/2045.csv             |  39 +-
 .../Results/Gas/Capacity/2050.csv             |  39 +-
 .../Results/MCACapacity.csv                   | 110 ++-
 .../1-single-objective/Results/MCAPrices.csv  | 144 ++--
 .../Results/Power/Capacity/2020.csv           |  14 +-
 .../Results/Power/Capacity/2025.csv           |  38 +-
 .../Results/Power/Capacity/2030.csv           |  53 +-
 .../Results/Power/Capacity/2035.csv           |  68 +-
 .../Results/Power/Capacity/2040.csv           |  85 +--
 .../Results/Power/Capacity/2045.csv           | 103 ++-
 .../Results/Power/Capacity/2050.csv           | 129 ++--
 .../Results/Gas/Capacity/2025.csv             |   6 +
 .../Results/Gas/Capacity/2030.csv             |  18 +-
 .../Results/Gas/Capacity/2035.csv             |  18 +-
 .../Results/Gas/Capacity/2040.csv             |  18 +-
 .../Results/Gas/Capacity/2045.csv             |  18 +-
 .../Results/Gas/Capacity/2050.csv             |  26 +-
 .../Results/MCACapacity.csv                   |  86 ++-
 .../Results/MCAPrices.csv                     | 144 ++--
 .../Results/Power/Capacity/2020.csv           |  21 +-
 .../Results/Power/Capacity/2025.csv           |  57 +-
 .../Results/Power/Capacity/2030.csv           |  75 +-
 .../Results/Power/Capacity/2035.csv           |  84 ++-
 .../Results/Power/Capacity/2040.csv           | 104 +--
 .../Results/Power/Capacity/2045.csv           | 125 ++--
 .../Results/Power/Capacity/2050.csv           | 199 ++++--
 .../Results/Gas/Capacity/2020.csv             |  18 +-
 .../Results/Gas/Capacity/2025.csv             |  46 +-
 .../Results/Gas/Capacity/2030.csv             |  50 +-
 .../Results/Gas/Capacity/2035.csv             |  50 +-
 .../Results/Gas/Capacity/2040.csv             |  50 +-
 .../Results/Gas/Capacity/2045.csv             |  78 +-
 .../Results/Gas/Capacity/2050.csv             |  78 +-
 .../1-new-region/Results/MCACapacity.csv      |  82 ++-
 .../1-new-region/Results/MCAPrices.csv        | 288 ++++----
 .../Results/Power/Capacity/2020.csv           |  50 +-
 .../Results/Power/Capacity/2025.csv           |  68 +-
 .../Results/Power/Capacity/2030.csv           |  92 +--
 .../Results/Power/Capacity/2035.csv           | 120 ++--
 .../Results/Power/Capacity/2040.csv           | 152 ++--
 .../Results/Power/Capacity/2045.csv           | 226 +++---
 .../Results/Power/Capacity/2050.csv           | 226 +++---
 .../Results/Gas/Capacity/2020.csv             |  18 +-
 .../Results/Gas/Capacity/2025.csv             |  46 +-
 .../Results/Gas/Capacity/2030.csv             |  50 +-
 .../Results/Gas/Capacity/2035.csv             |  50 +-
 .../Results/Gas/Capacity/2040.csv             |  50 +-
 .../Results/Gas/Capacity/2045.csv             |  78 +-
 .../Results/Gas/Capacity/2050.csv             |  78 +-
 .../Results/MCACapacity.csv                   |  84 ++-
 .../1-modify-timeslices/Results/MCAPrices.csv | 384 +++++-----
 .../Results/Power/Capacity/2020.csv           |  50 +-
 .../Results/Power/Capacity/2025.csv           |  68 +-
 .../Results/Power/Capacity/2030.csv           |  92 +--
 .../Results/Power/Capacity/2035.csv           | 120 ++--
 .../Results/Power/Capacity/2040.csv           | 152 ++--
 .../Results/Power/Capacity/2045.csv           | 210 +++---
 .../Results/Power/Capacity/2050.csv           | 210 +++---
 .../Results/Gas/Capacity/2020.csv             |  20 +-
 .../Results/Gas/Capacity/2022.csv             |  44 +-
 .../Results/Gas/Capacity/2024.csv             |  70 +-
 .../Results/Gas/Capacity/2026.csv             | 118 ++-
 .../Results/Gas/Capacity/2028.csv             | 162 ++++-
 .../Results/Gas/Capacity/2030.csv             | 230 ++++--
 .../Results/Gas/Capacity/2032.csv             | 310 +++++---
 .../Results/Gas/Capacity/2034.csv             | 396 +++++++----
 .../Results/Gas/Capacity/2036.csv             | 396 +++++++----
 .../Results/Gas/Capacity/2038.csv             | 396 +++++++----
 .../Results/Gas/Capacity/2040.csv             | 396 +++++++----
 .../Results/MCACapacity.csv                   | 187 +++--
 .../Results/MCAPrices.csv                     | 640 ++++++++---------
 .../Results/Power/Capacity/2020.csv           |  60 +-
 .../Results/Power/Capacity/2022.csv           |  68 +-
 .../Results/Power/Capacity/2024.csv           |  76 +-
 .../Results/Power/Capacity/2026.csv           |  84 ++-
 .../Results/Power/Capacity/2028.csv           |  84 ++-
 .../Results/Power/Capacity/2030.csv           |  91 +--
 .../Results/Power/Capacity/2032.csv           | 356 ++++-----
 .../Results/Power/Capacity/2034.csv           | 435 ++++++-----
 .../Results/Power/Capacity/2036.csv           | 516 ++++++++------
 .../Results/Power/Capacity/2038.csv           | 572 ++++++++-------
 .../Results/Power/Capacity/2040.csv           | 673 ++++++++++--------
 .../Results/Gas/Capacity/2020.csv             |  18 +-
 .../Results/Gas/Capacity/2025.csv             |  46 +-
 .../Results/Gas/Capacity/2030.csv             |  78 +-
 .../Results/Gas/Capacity/2035.csv             | 100 ++-
 .../Results/Gas/Capacity/2040.csv             | 100 ++-
 .../Results/Gas/Capacity/2045.csv             | 110 +--
 .../Results/Gas/Capacity/2050.csv             | 110 +--
 .../Results/MCACapacity.csv                   | 134 ++--
 .../1-exogenous-demand/Results/MCAPrices.csv  | 576 +++++++--------
 .../Results/Power/Capacity/2020.csv           |  50 +-
 .../Results/Power/Capacity/2025.csv           |  68 +-
 .../Results/Power/Capacity/2030.csv           |  84 ++-
 .../Results/Power/Capacity/2035.csv           | 118 +--
 .../Results/Power/Capacity/2040.csv           | 150 ++--
 .../Results/Power/Capacity/2045.csv           | 224 +++---
 .../Results/Power/Capacity/2050.csv           | 224 +++---
 .../Results/Gas/Capacity/2020.csv             |   9 +-
 .../Results/Gas/Capacity/2025.csv             |  17 +-
 .../Results/Gas/Capacity/2030.csv             |  31 +-
 .../Results/Gas/Capacity/2035.csv             |  47 +-
 .../Results/Gas/Capacity/2040.csv             |  47 +-
 .../Results/Gas/Capacity/2045.csv             |  47 +-
 .../Results/Gas/Capacity/2050.csv             |  47 +-
 .../1-correlation/Results/MCACapacity.csv     |  40 +-
 .../1-correlation/Results/MCAPrices.csv       | 144 ++--
 .../Results/Power/Capacity/2020.csv           |  14 +-
 .../Results/Power/Capacity/2025.csv           |  17 +-
 .../Results/Power/Capacity/2030.csv           |  26 +-
 .../Results/Power/Capacity/2035.csv           |  26 +-
 .../Results/Power/Capacity/2040.csv           |  41 +-
 .../Results/Power/Capacity/2045.csv           |  49 +-
 .../Results/Power/Capacity/2050.csv           |  55 +-
 .../1-min-constraint/Results/MCAPrices.csv    |  36 +-
 .../2-max-constraint/Results/MCAPrices.csv    |  46 +-
 src/muse/mca.py                               |   1 -
 158 files changed, 9954 insertions(+), 7742 deletions(-)

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 f768aa6c..70fe0b8b 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -4,53 +4,60 @@
 0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
 1,A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
 2,A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-1,A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
-11,A1,10.00000000000,R1,26,2020,R1,power,solarPV,newcapa,2025
-24,A1,6.00000000000,R1,49,2020,R1,power,windturbine,newcapa,2025
+1,A1,2.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
+22,A1,10.00000000000,R1,30,2020,R1,power,solarPV,newcapa,2025
+35,A1,4.00000000000,R1,57,2020,R1,power,windturbine,newcapa,2025
 1,A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
 3,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
 4,A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-2,A1,2.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
-14,A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
-15,A1,9.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
-35,A1,6.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
+2,A1,1.00000000000,R1,4,2020,R1,power,gasCCGT,newcapa,2030
+3,A1,3.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
+23,A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
+24,A1,7.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
+44,A1,4.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
 2,A1,7.50000000000,R1,4,2020,R1,gas,gassupply1,newcapa,2030
 7,A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
 8,A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-3,A1,2.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
-16,A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
-17,A1,9.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
-18,A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
-45,A1,6.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
-3,A1,3.38700000000,R1,7,2030,R1,gas,gassupply1,newcapa,2035
+4,A1,1.00000000000,R1,6,2020,R1,power,gasCCGT,newcapa,2035
+5,A1,3.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
+25,A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
+26,A1,7.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
+27,A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
+54,A1,4.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
+3,A1,6.68000000000,R1,10,2030,R1,gas,gassupply1,newcapa,2035
 11,A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
 12,A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-4,A1,2.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
-19,A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
-20,A1,9.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
-21,A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
-22,A1,6.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
-56,A1,6.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
-4,A1,3.38700000000,R1,9,2030,R1,gas,gassupply1,newcapa,2040
+6,A1,1.00000000000,R1,8,2020,R1,power,gasCCGT,newcapa,2040
+7,A1,3.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
+28,A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
+29,A1,7.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
+30,A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
+31,A1,5.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
+65,A1,4.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
+4,A1,6.68000000000,R1,13,2030,R1,gas,gassupply1,newcapa,2040
+5,A1,0.16290000000,R1,14,2035,R1,gas,gassupply1,newcapa,2040
 15,A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
 16,A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-5,A1,2.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
-35,A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
-36,A1,9.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
-37,A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
-38,A1,6.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
-39,A1,6.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
-79,A1,6.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
-5,A1,3.38700000000,R1,16,2030,R1,gas,gassupply1,newcapa,2045
+8,A1,1.00000000000,R1,15,2020,R1,power,gasCCGT,newcapa,2045
+9,A1,3.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
+32,A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
+33,A1,7.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
+34,A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
+35,A1,5.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
+36,A1,7.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
+76,A1,4.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
+6,A1,6.68000000000,R1,21,2030,R1,gas,gassupply1,newcapa,2045
+7,A1,0.16290000000,R1,22,2035,R1,gas,gassupply1,newcapa,2045
 19,A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
 20,A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-7,A1,2.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
-8,A1,1.00000000000,R1,23,2045,R1,power,gasCCGT,newcapa,2050
-47,A1,9.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
-48,A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
-49,A1,6.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
-50,A1,6.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
-51,A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
-93,A1,10.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
-6,A1,3.38700000000,R1,19,2030,R1,gas,gassupply1,newcapa,2050
-7,A1,1.64630000000,R1,20,2045,R1,gas,gassupply1,newcapa,2050
+12,A1,1.00000000000,R1,21,2020,R1,power,gasCCGT,newcapa,2050
+13,A1,3.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
+42,A1,7.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
+43,A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
+44,A1,5.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
+45,A1,7.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
+46,A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
+88,A1,8.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
+8,A1,6.68000000000,R1,25,2030,R1,gas,gassupply1,newcapa,2050
+9,A1,0.16290000000,R1,26,2035,R1,gas,gassupply1,newcapa,2050
+10,A1,0.09400000000,R1,27,2045,R1,gas,gassupply1,newcapa,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 de548ddb..09d858bd 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
@@ -17,24 +17,24 @@
 9,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
 10,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
 11,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08693150685,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23135464231,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
-2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13881278539,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-3,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13039726027,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-4,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34703196347,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
-5,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20821917808,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08693150685,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23135464231,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
-8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13881278539,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-9,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13039726027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-10,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34703196347,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
-11,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20821917808,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-12,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.26079452055,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-13,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.69406392694,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
-14,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.41643835616,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-15,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17386301370,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.46270928463,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
-17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27762557078,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
+2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+3,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+4,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
+5,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
+8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+9,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+10,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
+11,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+12,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.51454054054,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+13,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68468468468,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
+14,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27387387387,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+15,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.34302702703,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45645645646,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
+17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18258258258,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
 0,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
 1,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
 2,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
@@ -47,30 +47,36 @@
 9,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
 10,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
 11,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22598870056,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13559322034,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16983050847,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
-3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20338983051,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-4,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33898305085,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-5,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20338983051,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-6,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25474576271,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
-7,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30508474576,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-8,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22598870056,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-9,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13559322034,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-10,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16983050847,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
-11,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20338983051,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-12,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33898305085,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-13,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20338983051,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-14,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25474576271,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
-15,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30508474576,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67796610169,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40677966102,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-18,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50949152542,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
-19,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.61016949153,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-20,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45197740113,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-21,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27118644068,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-22,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33966101695,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
-23,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40677966102,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
+1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
+4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+5,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
+6,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+7,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+8,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
+9,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+10,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
+11,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+12,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+13,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
+14,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+15,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
+16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+18,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
+19,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+20,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
+21,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+22,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+23,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
+24,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+25,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
+26,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+27,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+28,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
+29,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
 0,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
 1,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
 2,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
@@ -83,36 +89,42 @@
 9,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
 10,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
 11,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22535211268,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13521126761,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16935211268,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
-3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-4,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13521126761,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-5,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33802816901,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-6,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20281690141,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-7,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25402816901,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
-8,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30422535211,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-9,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-10,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22535211268,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-11,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13521126761,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-12,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16935211268,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
-13,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-14,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13521126761,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-15,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33802816901,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-16,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20281690141,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-17,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25402816901,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
-18,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30422535211,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-19,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20281690141,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-20,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67605633803,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-21,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40563380282,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-22,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50805633803,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
-23,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60845070423,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-24,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40563380282,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-25,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45070422535,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-26,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27042253521,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-27,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33870422535,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
-28,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40563380282,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-29,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27042253521,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
+1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
+4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+5,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
+7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+9,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
+10,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+11,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+12,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
+13,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+14,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+15,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
+16,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+17,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+18,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
+19,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+20,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+21,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
+22,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+23,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+24,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
+25,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+26,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+27,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
+28,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+29,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+30,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
+31,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+32,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+33,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
+34,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+35,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
 0,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
 1,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
 2,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
@@ -125,42 +137,48 @@
 9,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
 10,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
 11,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22489959839,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13493975904,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16901204819,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
-3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-4,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-5,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-6,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33734939759,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-7,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20240963855,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-8,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25351807229,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
-9,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30361445783,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-10,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-11,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-12,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22489959839,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-13,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13493975904,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-14,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16901204819,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
-15,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-16,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-17,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13493975904,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-18,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33734939759,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-19,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20240963855,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-20,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25351807229,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
-21,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30361445783,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-22,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-23,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20240963855,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-24,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67469879518,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-25,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40481927711,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-26,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50703614458,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
-27,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60722891566,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-28,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-29,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-30,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44979919679,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-31,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26987951807,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-32,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33802409639,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
-33,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40481927711,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-34,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26987951807,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-35,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.26987951807,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
+1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
+4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+5,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+6,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+7,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
+8,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+9,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+10,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
+11,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+12,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+13,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+14,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
+15,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+16,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+17,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
+18,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+19,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+20,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+21,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
+22,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+23,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+24,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
+25,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+26,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+27,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+28,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
+29,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68292682927,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+30,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27317073171,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+31,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.76982926829,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
+32,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.47804878049,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+33,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40975609756,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+34,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+35,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17107317073,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
+36,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45528455285,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+37,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18211382114,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+38,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.51321951220,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
+39,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31869918699,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+40,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+41,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
 0,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
 1,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
 2,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
@@ -173,48 +191,54 @@
 9,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
 10,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
 11,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-0,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22456140351,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-1,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13473684211,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-2,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16875789474,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
-3,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-4,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-5,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-6,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33684210526,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20210526316,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-9,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25313684211,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
-10,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30315789474,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-11,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-12,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-13,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-14,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22456140351,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-15,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13473684211,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-16,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16875789474,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
-17,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-18,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-19,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-20,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13473684211,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-21,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33684210526,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-22,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.20210526316,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-23,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25313684211,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
-24,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30315789474,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-25,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-26,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-27,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20210526316,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-28,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.67368421053,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-29,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.40421052632,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-30,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50627368421,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
-31,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60631578947,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-32,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-33,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-34,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-35,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44912280702,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-36,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26947368421,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-37,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33751578947,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
-38,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40421052632,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-39,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-40,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-41,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.26947368421,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
+1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
+4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+5,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+6,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+7,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+8,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
+9,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+10,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+11,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
+12,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+13,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+14,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+15,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+16,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
+17,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+18,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+19,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
+20,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+21,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+22,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+23,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+24,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
+25,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+26,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+27,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
+28,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+29,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+30,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+31,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+32,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
+33,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+34,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+35,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
+36,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+37,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+38,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+39,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+40,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
+41,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+42,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+43,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
+44,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+45,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+46,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+47,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
 0,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
 1,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
 2,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
@@ -227,51 +251,51 @@
 9,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
 10,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
 11,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-0,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-1,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-2,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-3,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-4,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-5,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.08388837209,all-week,R1,night,2045,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-6,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.22325581395,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-7,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.22325581395,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-8,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-9,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30139534884,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-10,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-11,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-12,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-13,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.12583255814,all-week,R1,morning,2045,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-14,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.33488372093,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-15,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.33488372093,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-16,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-17,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-18,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-19,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-20,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.13395348837,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-21,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.08388837209,all-week,R1,afternoon,2045,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-22,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.22325581395,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-23,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.22325581395,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-24,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-25,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.30139534884,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-26,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-27,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-28,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.20093023256,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-29,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.12583255814,all-week,R1,early-peak,2045,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-30,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.33488372093,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-31,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.33488372093,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-32,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50333023256,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-33,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.60279069767,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-34,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-35,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-36,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-37,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.25166511628,all-week,R1,late-peak,2045,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-38,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.66976744186,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-39,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.66976744186,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-40,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.33555348837,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-41,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.40186046512,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-42,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-43,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-44,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.26790697674,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-45,A1,8,newcapa,CONSUMABLE|ENERGY,gas,0.16777674419,all-week,R1,evening,2045,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-46,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.44651162791,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-47,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.44651162791,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+1,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+2,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+3,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+4,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+5,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+6,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+7,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+8,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+9,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+10,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+11,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+12,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+13,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+14,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+15,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+16,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+17,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+18,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+19,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+20,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+21,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+22,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+23,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+24,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+25,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+26,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+27,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+28,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+29,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+30,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+31,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+32,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+33,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.78040384615,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+34,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+35,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.41538461538,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+36,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+37,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+38,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.69230769231,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+39,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.55384615385,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+40,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17342307692,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+41,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.52026923077,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+42,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+43,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+44,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+45,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+46,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.46153846154,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+47,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.36923076923,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
index 2e4794bd..87653e04 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
@@ -35,36 +35,36 @@
 15,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
 16,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
 17,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05205479452,gasCCGT,0,MUS$2010/PJ,2025
-1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23135464231,solarPV,0,MUS$2010/PJ,2025
-2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13881278539,windturbine,0,MUS$2010/PJ,2025
-3,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.77186301370,gasCCGT,0,MUS$2010/kt,2025
-4,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07808219178,gasCCGT,1,MUS$2010/PJ,2025
-5,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34703196347,solarPV,1,MUS$2010/PJ,2025
-6,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20821917808,windturbine,1,MUS$2010/PJ,2025
-7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.15779452055,gasCCGT,1,MUS$2010/kt,2025
-8,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05205479452,gasCCGT,2,MUS$2010/PJ,2025
-9,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23135464231,solarPV,2,MUS$2010/PJ,2025
-10,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13881278539,windturbine,2,MUS$2010/PJ,2025
-11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.77186301370,gasCCGT,2,MUS$2010/kt,2025
-12,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07808219178,gasCCGT,3,MUS$2010/PJ,2025
-13,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34703196347,solarPV,3,MUS$2010/PJ,2025
-14,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20821917808,windturbine,3,MUS$2010/PJ,2025
-15,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.15779452055,gasCCGT,3,MUS$2010/kt,2025
-16,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15616438356,gasCCGT,4,MUS$2010/PJ,2025
-17,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.69406392694,solarPV,4,MUS$2010/PJ,2025
-18,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.41643835616,windturbine,4,MUS$2010/PJ,2025
-19,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.31558904110,gasCCGT,4,MUS$2010/kt,2025
-20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10410958904,gasCCGT,5,MUS$2010/PJ,2025
-21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.46270928463,solarPV,5,MUS$2010/PJ,2025
-22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27762557078,windturbine,5,MUS$2010/PJ,2025
-23,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.54372602740,gasCCGT,5,MUS$2010/kt,2025
-0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.40915372907,gassupply1,0,MUS$2010/PJ,2025
-1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.61373059361,gassupply1,1,MUS$2010/PJ,2025
-2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.40915372907,gassupply1,2,MUS$2010/PJ,2025
-3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.61373059361,gassupply1,3,MUS$2010/PJ,2025
-4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.22746118721,gassupply1,4,MUS$2010/PJ,2025
-5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.81830745814,gassupply1,5,MUS$2010/PJ,2025
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.10270270270,gasCCGT,0,MUS$2010/PJ,2025
+1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22822822823,solarPV,0,MUS$2010/PJ,2025
+2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09129129129,windturbine,0,MUS$2010/PJ,2025
+3,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,9.41475675676,gasCCGT,0,MUS$2010/kt,2025
+4,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.15405405405,gasCCGT,1,MUS$2010/PJ,2025
+5,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34234234234,solarPV,1,MUS$2010/PJ,2025
+6,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13693693694,windturbine,1,MUS$2010/PJ,2025
+7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,14.12213513514,gasCCGT,1,MUS$2010/kt,2025
+8,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.10270270270,gasCCGT,2,MUS$2010/PJ,2025
+9,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22822822823,solarPV,2,MUS$2010/PJ,2025
+10,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09129129129,windturbine,2,MUS$2010/PJ,2025
+11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,9.41475675676,gasCCGT,2,MUS$2010/kt,2025
+12,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.15405405405,gasCCGT,3,MUS$2010/PJ,2025
+13,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34234234234,solarPV,3,MUS$2010/PJ,2025
+14,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13693693694,windturbine,3,MUS$2010/PJ,2025
+15,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,14.12213513514,gasCCGT,3,MUS$2010/kt,2025
+16,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30810810811,gasCCGT,4,MUS$2010/PJ,2025
+17,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68468468468,solarPV,4,MUS$2010/PJ,2025
+18,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27387387387,windturbine,4,MUS$2010/PJ,2025
+19,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,28.24427027027,gasCCGT,4,MUS$2010/kt,2025
+20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.20540540541,gasCCGT,5,MUS$2010/PJ,2025
+21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45645645646,solarPV,5,MUS$2010/PJ,2025
+22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18258258258,windturbine,5,MUS$2010/PJ,2025
+23,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,18.82951351351,gasCCGT,5,MUS$2010/kt,2025
+0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.49373573574,gassupply1,0,MUS$2010/PJ,2025
+1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.74060360360,gassupply1,1,MUS$2010/PJ,2025
+2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.49373573574,gassupply1,2,MUS$2010/PJ,2025
+3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.74060360360,gassupply1,3,MUS$2010/PJ,2025
+4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.48120720721,gassupply1,4,MUS$2010/PJ,2025
+5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.98747147147,gassupply1,5,MUS$2010/PJ,2025
 0,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
 1,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
 2,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
@@ -77,42 +77,54 @@
 9,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
 10,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
 11,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
-0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22598870056,solarPV,0,MUS$2010/PJ,2030
-1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13559322034,windturbine,0,MUS$2010/PJ,2030
-2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10169491525,gasCCGT,0,MUS$2010/PJ,2030
-3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20338983051,solarPV,0,MUS$2010/PJ,2030
-4,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.32237288136,gasCCGT,0,MUS$2010/kt,2030
-5,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33898305085,solarPV,1,MUS$2010/PJ,2030
-6,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20338983051,windturbine,1,MUS$2010/PJ,2030
-7,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15254237288,gasCCGT,1,MUS$2010/PJ,2030
-8,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30508474576,solarPV,1,MUS$2010/PJ,2030
-9,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.98355932203,gasCCGT,1,MUS$2010/kt,2030
-10,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22598870056,solarPV,2,MUS$2010/PJ,2030
-11,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13559322034,windturbine,2,MUS$2010/PJ,2030
-12,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10169491525,gasCCGT,2,MUS$2010/PJ,2030
-13,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20338983051,solarPV,2,MUS$2010/PJ,2030
-14,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.32237288136,gasCCGT,2,MUS$2010/kt,2030
-15,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33898305085,solarPV,3,MUS$2010/PJ,2030
-16,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20338983051,windturbine,3,MUS$2010/PJ,2030
-17,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15254237288,gasCCGT,3,MUS$2010/PJ,2030
-18,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30508474576,solarPV,3,MUS$2010/PJ,2030
-19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.98355932203,gasCCGT,3,MUS$2010/kt,2030
-20,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67796610169,solarPV,4,MUS$2010/PJ,2030
-21,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40677966102,windturbine,4,MUS$2010/PJ,2030
-22,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30508474576,gasCCGT,4,MUS$2010/PJ,2030
-23,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.61016949153,solarPV,4,MUS$2010/PJ,2030
-24,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.96711864407,gasCCGT,4,MUS$2010/kt,2030
-25,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45197740113,solarPV,5,MUS$2010/PJ,2030
-26,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27118644068,windturbine,5,MUS$2010/PJ,2030
-27,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20338983051,gasCCGT,5,MUS$2010/PJ,2030
-28,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40677966102,solarPV,5,MUS$2010/PJ,2030
-29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.64474576271,gasCCGT,5,MUS$2010/kt,2030
-0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.16983050847,gassupply1,0,MUS$2010/PJ,2030
-1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.25474576271,gassupply1,1,MUS$2010/PJ,2030
-2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.16983050847,gassupply1,2,MUS$2010/PJ,2030
-3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.25474576271,gassupply1,3,MUS$2010/PJ,2030
-4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,0.50949152542,gassupply1,4,MUS$2010/PJ,2030
-5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.33966101695,gassupply1,5,MUS$2010/PJ,2030
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2030
+1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2030
+2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2030
+3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2030
+4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2030
+5,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2030
+6,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2030
+7,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2030
+8,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2030
+9,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2030
+10,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2030
+11,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2030
+12,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2030
+13,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2030
+14,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2030
+15,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2030
+16,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2030
+17,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2030
+18,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2030
+19,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2030
+20,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2030
+21,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2030
+22,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2030
+23,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2030
+24,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2030
+25,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2030
+26,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2030
+27,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2030
+28,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2030
+29,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030
+30,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2030
+31,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030
+32,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2030
+33,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2030
+34,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030
+35,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2030
+36,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2030
+37,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2030
+38,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2030
+39,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2030
+40,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2030
+41,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2030
+0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2030
+1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2030
+2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2030
+3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2030
+4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2030
+5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2030
 0,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
 1,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
 2,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
@@ -125,48 +137,60 @@
 9,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
 10,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
 11,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
-0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22535211268,solarPV,0,MUS$2010/PJ,2035
-1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13521126761,windturbine,0,MUS$2010/PJ,2035
-2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10140845070,gasCCGT,0,MUS$2010/PJ,2035
-3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20281690141,solarPV,0,MUS$2010/PJ,2035
-4,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13521126761,solarPV,0,MUS$2010/PJ,2035
-5,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.29611267606,gasCCGT,0,MUS$2010/kt,2035
-6,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33802816901,solarPV,1,MUS$2010/PJ,2035
-7,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20281690141,windturbine,1,MUS$2010/PJ,2035
-8,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15211267606,gasCCGT,1,MUS$2010/PJ,2035
-9,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30422535211,solarPV,1,MUS$2010/PJ,2035
-10,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20281690141,solarPV,1,MUS$2010/PJ,2035
-11,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.94416901408,gasCCGT,1,MUS$2010/kt,2035
-12,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22535211268,solarPV,2,MUS$2010/PJ,2035
-13,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13521126761,windturbine,2,MUS$2010/PJ,2035
-14,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10140845070,gasCCGT,2,MUS$2010/PJ,2035
-15,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20281690141,solarPV,2,MUS$2010/PJ,2035
-16,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13521126761,solarPV,2,MUS$2010/PJ,2035
-17,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.29611267606,gasCCGT,2,MUS$2010/kt,2035
-18,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33802816901,solarPV,3,MUS$2010/PJ,2035
-19,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20281690141,windturbine,3,MUS$2010/PJ,2035
-20,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15211267606,gasCCGT,3,MUS$2010/PJ,2035
-21,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30422535211,solarPV,3,MUS$2010/PJ,2035
-22,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20281690141,solarPV,3,MUS$2010/PJ,2035
-23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.94416901408,gasCCGT,3,MUS$2010/kt,2035
-24,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67605633803,solarPV,4,MUS$2010/PJ,2035
-25,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40563380282,windturbine,4,MUS$2010/PJ,2035
-26,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30422535211,gasCCGT,4,MUS$2010/PJ,2035
-27,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60845070423,solarPV,4,MUS$2010/PJ,2035
-28,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40563380282,solarPV,4,MUS$2010/PJ,2035
-29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.88833802817,gasCCGT,4,MUS$2010/kt,2035
-30,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45070422535,solarPV,5,MUS$2010/PJ,2035
-31,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.27042253521,windturbine,5,MUS$2010/PJ,2035
-32,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20281690141,gasCCGT,5,MUS$2010/PJ,2035
-33,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40563380282,solarPV,5,MUS$2010/PJ,2035
-34,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27042253521,solarPV,5,MUS$2010/PJ,2035
-35,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.59222535211,gasCCGT,5,MUS$2010/kt,2035
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16935211268,gassupply1,0,MUS$2010/PJ,2035
-1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25402816901,gassupply1,1,MUS$2010/PJ,2035
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16935211268,gassupply1,2,MUS$2010/PJ,2035
-3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25402816901,gassupply1,3,MUS$2010/PJ,2035
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50805633803,gassupply1,4,MUS$2010/PJ,2035
-5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33870422535,gassupply1,5,MUS$2010/PJ,2035
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2035
+1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035
+2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2035
+3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035
+4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2035
+5,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2035
+6,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2035
+7,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035
+8,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2035
+9,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035
+10,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2035
+11,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035
+12,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2035
+13,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2035
+14,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2035
+15,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035
+16,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2035
+17,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035
+18,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2035
+19,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035
+20,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2035
+21,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2035
+22,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2035
+23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035
+24,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2035
+25,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035
+26,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2035
+27,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035
+28,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2035
+29,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2035
+30,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2035
+31,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035
+32,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2035
+33,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035
+34,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2035
+35,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035
+36,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2035
+37,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2035
+38,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2035
+39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035
+40,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2035
+41,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035
+42,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2035
+43,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035
+44,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2035
+45,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2035
+46,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2035
+47,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2035
+1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2035
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2035
+3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2035
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2035
+5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2035
 0,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
 1,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
 2,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
@@ -179,54 +203,72 @@
 9,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
 10,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
 11,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
-0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22489959839,solarPV,0,MUS$2010/PJ,2040
-1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13493975904,windturbine,0,MUS$2010/PJ,2040
-2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10120481928,gasCCGT,0,MUS$2010/PJ,2040
-3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20240963855,solarPV,0,MUS$2010/PJ,2040
-4,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13493975904,solarPV,0,MUS$2010/PJ,2040
-5,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.13493975904,solarPV,0,MUS$2010/PJ,2040
-6,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.27744578313,gasCCGT,0,MUS$2010/kt,2040
-7,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33734939759,solarPV,1,MUS$2010/PJ,2040
-8,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20240963855,windturbine,1,MUS$2010/PJ,2040
-9,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15180722892,gasCCGT,1,MUS$2010/PJ,2040
-10,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30361445783,solarPV,1,MUS$2010/PJ,2040
-11,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20240963855,solarPV,1,MUS$2010/PJ,2040
-12,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.20240963855,solarPV,1,MUS$2010/PJ,2040
-13,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.91616867470,gasCCGT,1,MUS$2010/kt,2040
-14,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22489959839,solarPV,2,MUS$2010/PJ,2040
-15,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13493975904,windturbine,2,MUS$2010/PJ,2040
-16,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10120481928,gasCCGT,2,MUS$2010/PJ,2040
-17,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20240963855,solarPV,2,MUS$2010/PJ,2040
-18,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13493975904,solarPV,2,MUS$2010/PJ,2040
-19,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.13493975904,solarPV,2,MUS$2010/PJ,2040
-20,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.27744578313,gasCCGT,2,MUS$2010/kt,2040
-21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33734939759,solarPV,3,MUS$2010/PJ,2040
-22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20240963855,windturbine,3,MUS$2010/PJ,2040
-23,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15180722892,gasCCGT,3,MUS$2010/PJ,2040
-24,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30361445783,solarPV,3,MUS$2010/PJ,2040
-25,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20240963855,solarPV,3,MUS$2010/PJ,2040
-26,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.20240963855,solarPV,3,MUS$2010/PJ,2040
-27,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.91616867470,gasCCGT,3,MUS$2010/kt,2040
-28,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67469879518,solarPV,4,MUS$2010/PJ,2040
-29,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40481927711,windturbine,4,MUS$2010/PJ,2040
-30,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30361445783,gasCCGT,4,MUS$2010/PJ,2040
-31,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60722891566,solarPV,4,MUS$2010/PJ,2040
-32,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40481927711,solarPV,4,MUS$2010/PJ,2040
-33,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.40481927711,solarPV,4,MUS$2010/PJ,2040
-34,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.83233734940,gasCCGT,4,MUS$2010/kt,2040
-35,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44979919679,solarPV,5,MUS$2010/PJ,2040
-36,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26987951807,windturbine,5,MUS$2010/PJ,2040
-37,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20240963855,gasCCGT,5,MUS$2010/PJ,2040
-38,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40481927711,solarPV,5,MUS$2010/PJ,2040
-39,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26987951807,solarPV,5,MUS$2010/PJ,2040
-40,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.26987951807,solarPV,5,MUS$2010/PJ,2040
-41,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.55489156627,gasCCGT,5,MUS$2010/kt,2040
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16901204819,gassupply1,0,MUS$2010/PJ,2040
-1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25351807229,gassupply1,1,MUS$2010/PJ,2040
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16901204819,gassupply1,2,MUS$2010/PJ,2040
-3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25351807229,gassupply1,3,MUS$2010/PJ,2040
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50703614458,gassupply1,4,MUS$2010/PJ,2040
-5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33802409639,gassupply1,5,MUS$2010/PJ,2040
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05121951220,gasCCGT,0,MUS$2010/PJ,2040
+1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22764227642,solarPV,0,MUS$2010/PJ,2040
+2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09105691057,windturbine,0,MUS$2010/PJ,2040
+3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15365853659,gasCCGT,0,MUS$2010/PJ,2040
+4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15934959350,solarPV,0,MUS$2010/PJ,2040
+5,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13658536585,solarPV,0,MUS$2010/PJ,2040
+6,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040
+7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.69529268293,gasCCGT,0,MUS$2010/kt,2040
+8,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.08587804878,gasCCGT,0,MUS$2010/kt,2040
+9,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07682926829,gasCCGT,1,MUS$2010/PJ,2040
+10,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34146341463,solarPV,1,MUS$2010/PJ,2040
+11,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13658536585,windturbine,1,MUS$2010/PJ,2040
+12,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23048780488,gasCCGT,1,MUS$2010/PJ,2040
+13,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23902439024,solarPV,1,MUS$2010/PJ,2040
+14,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20487804878,solarPV,1,MUS$2010/PJ,2040
+15,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040
+16,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.04293902439,gasCCGT,1,MUS$2010/kt,2040
+17,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.12881707317,gasCCGT,1,MUS$2010/kt,2040
+18,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05121951220,gasCCGT,2,MUS$2010/PJ,2040
+19,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22764227642,solarPV,2,MUS$2010/PJ,2040
+20,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09105691057,windturbine,2,MUS$2010/PJ,2040
+21,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15365853659,gasCCGT,2,MUS$2010/PJ,2040
+22,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15934959350,solarPV,2,MUS$2010/PJ,2040
+23,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13658536585,solarPV,2,MUS$2010/PJ,2040
+24,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040
+25,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.69529268293,gasCCGT,2,MUS$2010/kt,2040
+26,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.08587804878,gasCCGT,2,MUS$2010/kt,2040
+27,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07682926829,gasCCGT,3,MUS$2010/PJ,2040
+28,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34146341463,solarPV,3,MUS$2010/PJ,2040
+29,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13658536585,windturbine,3,MUS$2010/PJ,2040
+30,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23048780488,gasCCGT,3,MUS$2010/PJ,2040
+31,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23902439024,solarPV,3,MUS$2010/PJ,2040
+32,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20487804878,solarPV,3,MUS$2010/PJ,2040
+33,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040
+34,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.04293902439,gasCCGT,3,MUS$2010/kt,2040
+35,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.12881707317,gasCCGT,3,MUS$2010/kt,2040
+36,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15365853659,gasCCGT,4,MUS$2010/PJ,2040
+37,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68292682927,solarPV,4,MUS$2010/PJ,2040
+38,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27317073171,windturbine,4,MUS$2010/PJ,2040
+39,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46097560976,gasCCGT,4,MUS$2010/PJ,2040
+40,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.47804878049,solarPV,4,MUS$2010/PJ,2040
+41,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40975609756,solarPV,4,MUS$2010/PJ,2040
+42,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34146341463,solarPV,4,MUS$2010/PJ,2040
+43,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.08587804878,gasCCGT,4,MUS$2010/kt,2040
+44,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.25763414634,gasCCGT,4,MUS$2010/kt,2040
+45,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10243902439,gasCCGT,5,MUS$2010/PJ,2040
+46,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45528455285,solarPV,5,MUS$2010/PJ,2040
+47,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18211382114,windturbine,5,MUS$2010/PJ,2040
+48,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30731707317,gasCCGT,5,MUS$2010/PJ,2040
+49,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31869918699,solarPV,5,MUS$2010/PJ,2040
+50,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27317073171,solarPV,5,MUS$2010/PJ,2040
+51,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040
+52,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.39058536585,gasCCGT,5,MUS$2010/kt,2040
+53,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.17175609756,gasCCGT,5,MUS$2010/kt,2040
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2040
+1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2040
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2040
+3,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2040
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2040
+5,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2040
+6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2040
+7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2040
+8,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2040
+9,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2040
+10,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2040
+11,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2040
 0,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
 1,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
 2,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
@@ -239,60 +281,78 @@
 9,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
 10,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
 11,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
-0,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22456140351,solarPV,0,MUS$2010/PJ,2045
-1,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.13473684211,windturbine,0,MUS$2010/PJ,2045
-2,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10105263158,gasCCGT,0,MUS$2010/PJ,2045
-3,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20210526316,solarPV,0,MUS$2010/PJ,2045
-4,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13473684211,solarPV,0,MUS$2010/PJ,2045
-5,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.13473684211,solarPV,0,MUS$2010/PJ,2045
-6,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13473684211,solarPV,0,MUS$2010/PJ,2045
-7,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.26349473684,gasCCGT,0,MUS$2010/kt,2045
-8,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33684210526,solarPV,1,MUS$2010/PJ,2045
-9,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.20210526316,windturbine,1,MUS$2010/PJ,2045
-10,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15157894737,gasCCGT,1,MUS$2010/PJ,2045
-11,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30315789474,solarPV,1,MUS$2010/PJ,2045
-12,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20210526316,solarPV,1,MUS$2010/PJ,2045
-13,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.20210526316,solarPV,1,MUS$2010/PJ,2045
-14,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20210526316,solarPV,1,MUS$2010/PJ,2045
-15,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.89524210526,gasCCGT,1,MUS$2010/kt,2045
-16,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22456140351,solarPV,2,MUS$2010/PJ,2045
-17,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.13473684211,windturbine,2,MUS$2010/PJ,2045
-18,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10105263158,gasCCGT,2,MUS$2010/PJ,2045
-19,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20210526316,solarPV,2,MUS$2010/PJ,2045
-20,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13473684211,solarPV,2,MUS$2010/PJ,2045
-21,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.13473684211,solarPV,2,MUS$2010/PJ,2045
-22,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13473684211,solarPV,2,MUS$2010/PJ,2045
-23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.26349473684,gasCCGT,2,MUS$2010/kt,2045
-24,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33684210526,solarPV,3,MUS$2010/PJ,2045
-25,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.20210526316,windturbine,3,MUS$2010/PJ,2045
-26,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15157894737,gasCCGT,3,MUS$2010/PJ,2045
-27,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30315789474,solarPV,3,MUS$2010/PJ,2045
-28,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20210526316,solarPV,3,MUS$2010/PJ,2045
-29,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.20210526316,solarPV,3,MUS$2010/PJ,2045
-30,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20210526316,solarPV,3,MUS$2010/PJ,2045
-31,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.89524210526,gasCCGT,3,MUS$2010/kt,2045
-32,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.67368421053,solarPV,4,MUS$2010/PJ,2045
-33,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.40421052632,windturbine,4,MUS$2010/PJ,2045
-34,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30315789474,gasCCGT,4,MUS$2010/PJ,2045
-35,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60631578947,solarPV,4,MUS$2010/PJ,2045
-36,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40421052632,solarPV,4,MUS$2010/PJ,2045
-37,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.40421052632,solarPV,4,MUS$2010/PJ,2045
-38,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40421052632,solarPV,4,MUS$2010/PJ,2045
-39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.79048421053,gasCCGT,4,MUS$2010/kt,2045
-40,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44912280702,solarPV,5,MUS$2010/PJ,2045
-41,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.26947368421,windturbine,5,MUS$2010/PJ,2045
-42,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20210526316,gasCCGT,5,MUS$2010/PJ,2045
-43,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40421052632,solarPV,5,MUS$2010/PJ,2045
-44,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26947368421,solarPV,5,MUS$2010/PJ,2045
-45,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.26947368421,solarPV,5,MUS$2010/PJ,2045
-46,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26947368421,solarPV,5,MUS$2010/PJ,2045
-47,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.52698947368,gasCCGT,5,MUS$2010/kt,2045
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16875789474,gassupply1,0,MUS$2010/PJ,2045
-1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25313684211,gassupply1,1,MUS$2010/PJ,2045
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16875789474,gassupply1,2,MUS$2010/PJ,2045
-3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25313684211,gassupply1,3,MUS$2010/PJ,2045
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50627368421,gassupply1,4,MUS$2010/PJ,2045
-5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33751578947,gassupply1,5,MUS$2010/PJ,2045
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2045
+1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045
+2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2045
+3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045
+4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
+5,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
+6,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045
+7,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
+8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2045
+9,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045
+10,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2045
+11,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045
+12,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2045
+13,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045
+14,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
+15,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
+16,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045
+17,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
+18,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2045
+19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045
+20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2045
+21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045
+22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2045
+23,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045
+24,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
+25,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
+26,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045
+27,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
+28,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2045
+29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045
+30,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2045
+31,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045
+32,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2045
+33,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045
+34,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
+35,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
+36,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045
+37,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
+38,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2045
+39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045
+40,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2045
+41,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045
+42,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2045
+43,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045
+44,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
+45,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
+46,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045
+47,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
+48,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2045
+49,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045
+50,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2045
+51,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045
+52,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2045
+53,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045
+54,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
+55,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
+56,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045
+57,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
+58,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2045
+59,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.32604761905,gassupply1,0,MUS$2010/PJ,2045
+1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00795238095,gassupply1,0,MUS$2010/PJ,2045
+2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.48907142857,gassupply1,1,MUS$2010/PJ,2045
+3,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01192857143,gassupply1,1,MUS$2010/PJ,2045
+4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.32604761905,gassupply1,2,MUS$2010/PJ,2045
+5,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00795238095,gassupply1,2,MUS$2010/PJ,2045
+6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.48907142857,gassupply1,3,MUS$2010/PJ,2045
+7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01192857143,gassupply1,3,MUS$2010/PJ,2045
+8,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.97814285714,gassupply1,4,MUS$2010/PJ,2045
+9,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02385714286,gassupply1,4,MUS$2010/PJ,2045
+10,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.65209523810,gassupply1,5,MUS$2010/PJ,2045
+11,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01590476190,gassupply1,5,MUS$2010/PJ,2045
 0,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
 1,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
 2,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
@@ -305,75 +365,81 @@
 9,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
 10,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
 11,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
-0,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.10046511628,gasCCGT,0,MUS$2010/PJ,2050
-1,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.20093023256,solarPV,0,MUS$2010/PJ,2050
-2,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13395348837,solarPV,0,MUS$2010/PJ,2050
-3,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.13395348837,solarPV,0,MUS$2010/PJ,2050
-4,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.13395348837,solarPV,0,MUS$2010/PJ,2050
-5,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.05023255814,gasCCGT,0,MUS$2010/PJ,2050
-6,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.22325581395,solarPV,0,MUS$2010/PJ,2050
-7,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.22325581395,windturbine,0,MUS$2010/PJ,2050
-8,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,9.20963720930,gasCCGT,0,MUS$2010/kt,2050
-9,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2045,all-year,R1,power,4.60481860465,gasCCGT,0,MUS$2010/kt,2050
-10,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.15069767442,gasCCGT,1,MUS$2010/PJ,2050
-11,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.30139534884,solarPV,1,MUS$2010/PJ,2050
-12,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20093023256,solarPV,1,MUS$2010/PJ,2050
-13,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.20093023256,solarPV,1,MUS$2010/PJ,2050
-14,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.20093023256,solarPV,1,MUS$2010/PJ,2050
-15,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.07534883721,gasCCGT,1,MUS$2010/PJ,2050
-16,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.33488372093,solarPV,1,MUS$2010/PJ,2050
-17,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.33488372093,windturbine,1,MUS$2010/PJ,2050
-18,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,13.81445581395,gasCCGT,1,MUS$2010/kt,2050
-19,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2045,all-year,R1,power,6.90722790698,gasCCGT,1,MUS$2010/kt,2050
-20,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.10046511628,gasCCGT,2,MUS$2010/PJ,2050
-21,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.20093023256,solarPV,2,MUS$2010/PJ,2050
-22,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13395348837,solarPV,2,MUS$2010/PJ,2050
-23,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.13395348837,solarPV,2,MUS$2010/PJ,2050
-24,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.13395348837,solarPV,2,MUS$2010/PJ,2050
-25,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.05023255814,gasCCGT,2,MUS$2010/PJ,2050
-26,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.22325581395,solarPV,2,MUS$2010/PJ,2050
-27,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.22325581395,windturbine,2,MUS$2010/PJ,2050
-28,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,9.20963720930,gasCCGT,2,MUS$2010/kt,2050
-29,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2045,all-year,R1,power,4.60481860465,gasCCGT,2,MUS$2010/kt,2050
-30,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.15069767442,gasCCGT,3,MUS$2010/PJ,2050
-31,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.30139534884,solarPV,3,MUS$2010/PJ,2050
-32,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20093023256,solarPV,3,MUS$2010/PJ,2050
-33,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.20093023256,solarPV,3,MUS$2010/PJ,2050
-34,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.20093023256,solarPV,3,MUS$2010/PJ,2050
-35,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.07534883721,gasCCGT,3,MUS$2010/PJ,2050
-36,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.33488372093,solarPV,3,MUS$2010/PJ,2050
-37,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.33488372093,windturbine,3,MUS$2010/PJ,2050
-38,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,13.81445581395,gasCCGT,3,MUS$2010/kt,2050
-39,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2045,all-year,R1,power,6.90722790698,gasCCGT,3,MUS$2010/kt,2050
-40,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.30139534884,gasCCGT,4,MUS$2010/PJ,2050
-41,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.60279069767,solarPV,4,MUS$2010/PJ,2050
-42,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40186046512,solarPV,4,MUS$2010/PJ,2050
-43,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.40186046512,solarPV,4,MUS$2010/PJ,2050
-44,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.40186046512,solarPV,4,MUS$2010/PJ,2050
-45,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.15069767442,gasCCGT,4,MUS$2010/PJ,2050
-46,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66976744186,solarPV,4,MUS$2010/PJ,2050
-47,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66976744186,windturbine,4,MUS$2010/PJ,2050
-48,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,27.62891162791,gasCCGT,4,MUS$2010/kt,2050
-49,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2045,all-year,R1,power,13.81445581395,gasCCGT,4,MUS$2010/kt,2050
-50,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.20093023256,gasCCGT,5,MUS$2010/PJ,2050
-51,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.40186046512,solarPV,5,MUS$2010/PJ,2050
-52,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26790697674,solarPV,5,MUS$2010/PJ,2050
-53,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.26790697674,solarPV,5,MUS$2010/PJ,2050
-54,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.26790697674,solarPV,5,MUS$2010/PJ,2050
-55,A1,8,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.10046511628,gasCCGT,5,MUS$2010/PJ,2050
-56,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.44651162791,solarPV,5,MUS$2010/PJ,2050
-57,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.44651162791,windturbine,5,MUS$2010/PJ,2050
-58,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,18.41927441860,gasCCGT,5,MUS$2010/kt,2050
-59,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2045,all-year,R1,power,9.20963720930,gasCCGT,5,MUS$2010/kt,2050
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.16935211268,gassupply1,0,MUS$2010/PJ,2050
-1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2045,all-year,R1,gas,0.08231300360,gassupply1,0,MUS$2010/PJ,2050
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.25402816901,gassupply1,1,MUS$2010/PJ,2050
-3,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2045,all-year,R1,gas,0.12346950540,gassupply1,1,MUS$2010/PJ,2050
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.16935211268,gassupply1,2,MUS$2010/PJ,2050
-5,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2045,all-year,R1,gas,0.08231300360,gassupply1,2,MUS$2010/PJ,2050
-6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.25402816901,gassupply1,3,MUS$2010/PJ,2050
-7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2045,all-year,R1,gas,0.12346950540,gassupply1,3,MUS$2010/PJ,2050
-8,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.50805633803,gassupply1,4,MUS$2010/PJ,2050
-9,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2045,all-year,R1,gas,0.24693901081,gassupply1,4,MUS$2010/PJ,2050
-10,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.33870422535,gassupply1,5,MUS$2010/PJ,2050
-11,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2045,all-year,R1,gas,0.16462600721,gassupply1,5,MUS$2010/PJ,2050
+0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05192307692,gasCCGT,0,MUS$2010/PJ,2050
+1,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15576923077,gasCCGT,0,MUS$2010/PJ,2050
+2,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
+3,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13846153846,solarPV,0,MUS$2010/PJ,2050
+4,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050
+5,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
+6,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.23076923077,solarPV,0,MUS$2010/PJ,2050
+7,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.18461538462,windturbine,0,MUS$2010/PJ,2050
+8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.75978846154,gasCCGT,0,MUS$2010/kt,2050
+9,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.27936538462,gasCCGT,0,MUS$2010/kt,2050
+10,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07788461538,gasCCGT,1,MUS$2010/PJ,2050
+11,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23365384615,gasCCGT,1,MUS$2010/PJ,2050
+12,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
+13,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20769230769,solarPV,1,MUS$2010/PJ,2050
+14,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050
+15,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
+16,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.34615384615,solarPV,1,MUS$2010/PJ,2050
+17,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.27692307692,windturbine,1,MUS$2010/PJ,2050
+18,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.13968269231,gasCCGT,1,MUS$2010/kt,2050
+19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.41904807692,gasCCGT,1,MUS$2010/kt,2050
+20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05192307692,gasCCGT,2,MUS$2010/PJ,2050
+21,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15576923077,gasCCGT,2,MUS$2010/PJ,2050
+22,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
+23,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13846153846,solarPV,2,MUS$2010/PJ,2050
+24,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050
+25,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
+26,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.23076923077,solarPV,2,MUS$2010/PJ,2050
+27,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.18461538462,windturbine,2,MUS$2010/PJ,2050
+28,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.75978846154,gasCCGT,2,MUS$2010/kt,2050
+29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.27936538462,gasCCGT,2,MUS$2010/kt,2050
+30,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07788461538,gasCCGT,3,MUS$2010/PJ,2050
+31,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23365384615,gasCCGT,3,MUS$2010/PJ,2050
+32,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
+33,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20769230769,solarPV,3,MUS$2010/PJ,2050
+34,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050
+35,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
+36,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.34615384615,solarPV,3,MUS$2010/PJ,2050
+37,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.27692307692,windturbine,3,MUS$2010/PJ,2050
+38,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.13968269231,gasCCGT,3,MUS$2010/kt,2050
+39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.41904807692,gasCCGT,3,MUS$2010/kt,2050
+40,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15576923077,gasCCGT,4,MUS$2010/PJ,2050
+41,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46730769231,gasCCGT,4,MUS$2010/PJ,2050
+42,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050
+43,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.41538461538,solarPV,4,MUS$2010/PJ,2050
+44,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34615384615,solarPV,4,MUS$2010/PJ,2050
+45,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050
+46,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.69230769231,solarPV,4,MUS$2010/PJ,2050
+47,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.55384615385,windturbine,4,MUS$2010/PJ,2050
+48,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.27936538462,gasCCGT,4,MUS$2010/kt,2050
+49,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.83809615385,gasCCGT,4,MUS$2010/kt,2050
+50,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10384615385,gasCCGT,5,MUS$2010/PJ,2050
+51,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31153846154,gasCCGT,5,MUS$2010/PJ,2050
+52,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
+53,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27692307692,solarPV,5,MUS$2010/PJ,2050
+54,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050
+55,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
+56,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.46153846154,solarPV,5,MUS$2010/PJ,2050
+57,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.36923076923,windturbine,5,MUS$2010/PJ,2050
+58,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.51957692308,gasCCGT,5,MUS$2010/kt,2050
+59,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.55873076923,gasCCGT,5,MUS$2010/kt,2050
+0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2050
+1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2050
+2,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2045,all-year,R1,gas,0.00469981238,gassupply1,0,MUS$2010/PJ,2050
+3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2050
+4,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2050
+5,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2045,all-year,R1,gas,0.00704971857,gassupply1,1,MUS$2010/PJ,2050
+6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2050
+7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2050
+8,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2045,all-year,R1,gas,0.00469981238,gassupply1,2,MUS$2010/PJ,2050
+9,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2050
+10,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2050
+11,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2045,all-year,R1,gas,0.00704971857,gassupply1,3,MUS$2010/PJ,2050
+12,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2050
+13,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2050
+14,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2045,all-year,R1,gas,0.01409943715,gassupply1,4,MUS$2010/PJ,2050
+15,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2050
+16,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2050
+17,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2045,all-year,R1,gas,0.00939962477,gassupply1,5,MUS$2010/PJ,2050
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 3abd17db..1aaa9a19 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.43850000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.39120000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.19660000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.65770000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.58830000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.30510000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43850000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.39120000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.19660000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65770000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.58830000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.30510000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31550000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18520000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.67200000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.87700000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.78630000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.42050000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.35030000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.54810000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04160000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.52640000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.82390000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07550000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.08550000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.35030000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54810000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04160000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.52640000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82390000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07550000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08550000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.05810000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65840000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23000000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27120000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.70300000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.10090000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11830000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.13620000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.38160000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.61230000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03810000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.04850000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.57320000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.92000000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.06770000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.09130000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38160000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.61230000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03810000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04850000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57320000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.92000000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06770000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09130000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.15090000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84880000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.29400000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.76530000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.22860000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.10430000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.14640000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.40390000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.67090000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03930000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.60650000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.00770000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.07050000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.09650000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.40390000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.67090000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03930000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.60650000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00770000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07050000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09650000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.21680000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.02310000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21030000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31490000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.80950000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.34530000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.10930000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.15570000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.44080000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.73270000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04020000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.05340000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66170000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.10020000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.07250000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.10210000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44080000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73270000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04020000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05340000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66170000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10020000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07250000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10210000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.32680000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.20700000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21820000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.33700000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.88310000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.46840000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.11290000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.16560000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63350000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.81800000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04170000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.05680000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95090000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.22800000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.07580000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.10980000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63350000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.81800000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04170000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05680000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95090000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.22800000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07580000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10980000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90630000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.46220000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23140000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.36760000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.26890000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.63870000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.11870000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.17920000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 d1ee882b..d37dcfe1 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,9 @@
 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
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
index f94eb68b..5e2e13dc 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv
@@ -1,10 +1,17 @@
 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,2030,R1,gassupply1,2025,2.68980000000
-1,2035,R1,gassupply1,2025,2.68980000000
-1,2040,R1,gassupply1,2025,2.68980000000
-1,2045,R1,gassupply1,2025,2.68980000000
-1,2050,R1,gassupply1,2025,2.68980000000
-1,2064,R1,gassupply1,2025,2.68980000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
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 8c75b113..a8ae6a42 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,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.68980000000
-1,2035,R1,gassupply1,2025,2.68980000000
-1,2040,R1,gassupply1,2025,2.68980000000
-1,2045,R1,gassupply1,2025,2.68980000000
-1,2050,R1,gassupply1,2025,2.68980000000
-1,2064,R1,gassupply1,2025,2.68980000000
-2,2035,R1,gassupply1,2030,7.47130000000
-2,2040,R1,gassupply1,2030,7.47130000000
-2,2045,R1,gassupply1,2030,7.47130000000
-2,2050,R1,gassupply1,2030,7.47130000000
-2,2064,R1,gassupply1,2030,7.47130000000
-2,2065,R1,gassupply1,2030,7.47130000000
-2,2069,R1,gassupply1,2030,7.47130000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
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 8c75b113..a8ae6a42 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,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.68980000000
-1,2035,R1,gassupply1,2025,2.68980000000
-1,2040,R1,gassupply1,2025,2.68980000000
-1,2045,R1,gassupply1,2025,2.68980000000
-1,2050,R1,gassupply1,2025,2.68980000000
-1,2064,R1,gassupply1,2025,2.68980000000
-2,2035,R1,gassupply1,2030,7.47130000000
-2,2040,R1,gassupply1,2030,7.47130000000
-2,2045,R1,gassupply1,2030,7.47130000000
-2,2050,R1,gassupply1,2030,7.47130000000
-2,2064,R1,gassupply1,2030,7.47130000000
-2,2065,R1,gassupply1,2030,7.47130000000
-2,2069,R1,gassupply1,2030,7.47130000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
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 8c75b113..a8ae6a42 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,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.68980000000
-1,2035,R1,gassupply1,2025,2.68980000000
-1,2040,R1,gassupply1,2025,2.68980000000
-1,2045,R1,gassupply1,2025,2.68980000000
-1,2050,R1,gassupply1,2025,2.68980000000
-1,2064,R1,gassupply1,2025,2.68980000000
-2,2035,R1,gassupply1,2030,7.47130000000
-2,2040,R1,gassupply1,2030,7.47130000000
-2,2045,R1,gassupply1,2030,7.47130000000
-2,2050,R1,gassupply1,2030,7.47130000000
-2,2064,R1,gassupply1,2030,7.47130000000
-2,2065,R1,gassupply1,2030,7.47130000000
-2,2069,R1,gassupply1,2030,7.47130000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
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 a4314e3b..a8ae6a42 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,23 +1,26 @@
 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,2030,R1,gassupply1,2025,2.68980000000
-1,2035,R1,gassupply1,2025,2.68980000000
-1,2040,R1,gassupply1,2025,2.68980000000
-1,2045,R1,gassupply1,2025,2.68980000000
-1,2050,R1,gassupply1,2025,2.68980000000
-1,2064,R1,gassupply1,2025,2.68980000000
-2,2035,R1,gassupply1,2030,7.47130000000
-2,2040,R1,gassupply1,2030,7.47130000000
-2,2045,R1,gassupply1,2030,7.47130000000
-2,2050,R1,gassupply1,2030,7.47130000000
-2,2064,R1,gassupply1,2030,7.47130000000
-2,2065,R1,gassupply1,2030,7.47130000000
-2,2069,R1,gassupply1,2030,7.47130000000
-3,2050,R1,gassupply1,2045,1.58320000000
-3,2064,R1,gassupply1,2045,1.58320000000
-3,2065,R1,gassupply1,2045,1.58320000000
-3,2069,R1,gassupply1,2045,1.58320000000
-3,2070,R1,gassupply1,2045,1.58320000000
-3,2084,R1,gassupply1,2045,1.58320000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
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 a4314e3b..a8ae6a42 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,23 +1,26 @@
 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,2030,R1,gassupply1,2025,2.68980000000
-1,2035,R1,gassupply1,2025,2.68980000000
-1,2040,R1,gassupply1,2025,2.68980000000
-1,2045,R1,gassupply1,2025,2.68980000000
-1,2050,R1,gassupply1,2025,2.68980000000
-1,2064,R1,gassupply1,2025,2.68980000000
-2,2035,R1,gassupply1,2030,7.47130000000
-2,2040,R1,gassupply1,2030,7.47130000000
-2,2045,R1,gassupply1,2030,7.47130000000
-2,2050,R1,gassupply1,2030,7.47130000000
-2,2064,R1,gassupply1,2030,7.47130000000
-2,2065,R1,gassupply1,2030,7.47130000000
-2,2069,R1,gassupply1,2030,7.47130000000
-3,2050,R1,gassupply1,2045,1.58320000000
-3,2064,R1,gassupply1,2045,1.58320000000
-3,2065,R1,gassupply1,2045,1.58320000000
-3,2069,R1,gassupply1,2045,1.58320000000
-3,2070,R1,gassupply1,2045,1.58320000000
-3,2084,R1,gassupply1,2045,1.58320000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
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 87f657af..5f625671 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
@@ -4,53 +4,55 @@ gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
+solarPV,R1,R1,A1,power,newcapa,2025,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,16.73530000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.68980000000
+solarPV,R1,R1,A1,power,newcapa,2030,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.23530000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.28910000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,5.00000000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.47130000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,5.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.47130000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2045,5.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.47130000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.47130000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.58320000000
+windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.47410000000
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 764d2557..b3d7635c 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.43850000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.87950000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21200000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.65770000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.32360000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.34000000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43850000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.87950000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21200000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65770000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.32360000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34000000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31550000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.67300000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.81340000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.87700000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.77050000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.48280000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.76370000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.26500000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04160000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07470000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.14830000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.90240000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07550000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.15020000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76370000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.26500000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04160000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07470000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.14830000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90240000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07550000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15020000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31280000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.83440000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23000000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.53230000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.53460000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.54320000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11830000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.85970000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.44310000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08180000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.29180000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.16880000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.16620000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85970000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.44310000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08180000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.29180000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.16880000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10500000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16620000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.59700000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.36220000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34970000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.59560000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.72530000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.89720000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17090000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.27990000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.92790000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.57010000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05840000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.08690000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.39380000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,2.35860000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11360000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.17760000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.92790000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.57010000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05840000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08690000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39380000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.35860000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11360000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17760000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.79910000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.73830000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38380000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.64070000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.86090000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,3.14950000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18610000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.30010000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.03960000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.77590000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06120000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.09510000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.56110000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.66690000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.11970000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.19610000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.03960000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.77590000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06120000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09510000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.56110000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.66690000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11970000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19610000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.13230000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.35210000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40800000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.08370000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.55990000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.19700000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.33290000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.28730000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.93630000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06560000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.10150000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.93270000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.90710000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.12970000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.21050000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.28730000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.93630000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06560000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10150000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.93270000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.90710000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12970000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.21050000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.87570000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.83060000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44800000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.77180000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.57920000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.87980000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.21480000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.35850000000,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 995294d2..97dc61df 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,16 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,solarPV,2020,10
-1,2030,R1,solarPV,2020,10
-1,2035,R1,solarPV,2020,10
-1,2040,R1,solarPV,2020,10
-1,2045,R1,solarPV,2020,10
-1,2049,R1,solarPV,2020,10
-2,2025,R1,windturbine,2020,6
-2,2030,R1,windturbine,2020,6
-2,2035,R1,windturbine,2020,6
-2,2040,R1,windturbine,2020,6
-2,2045,R1,windturbine,2020,6
-2,2049,R1,windturbine,2020,6
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2025,R1,solarPV,2020,5
+1,2030,R1,solarPV,2020,5
+1,2035,R1,solarPV,2020,5
+1,2040,R1,solarPV,2020,5
+1,2045,R1,solarPV,2020,5
+1,2049,R1,solarPV,2020,5
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
index 90541c9d..feb9e3e8 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2025.csv
@@ -1,24 +1,25 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
 1,2030,R1,gasCCGT,2025,6
 1,2035,R1,gasCCGT,2025,6
 1,2040,R1,gasCCGT,2025,6
 1,2045,R1,gasCCGT,2025,6
 1,2049,R1,gasCCGT,2025,6
 1,2050,R1,gasCCGT,2025,6
-1,2054,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
 1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,10
-2,2030,R1,solarPV,2020,10
-2,2035,R1,solarPV,2020,10
-2,2040,R1,solarPV,2020,10
-2,2045,R1,solarPV,2020,10
-2,2049,R1,solarPV,2020,10
-4,2025,R1,windturbine,2020,6
-4,2030,R1,windturbine,2020,6
-4,2035,R1,windturbine,2020,6
-4,2040,R1,windturbine,2020,6
-4,2045,R1,windturbine,2020,6
-4,2049,R1,windturbine,2020,6
+2,2025,R1,solarPV,2020,5
+2,2030,R1,solarPV,2020,5
+2,2035,R1,solarPV,2020,5
+2,2040,R1,solarPV,2020,5
+2,2045,R1,solarPV,2020,5
+2,2049,R1,solarPV,2020,5
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 e4de90f2..1d70a0b9 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,34 +1,31 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
 1,2030,R1,gasCCGT,2025,6
 1,2035,R1,gasCCGT,2025,6
 1,2040,R1,gasCCGT,2025,6
 1,2045,R1,gasCCGT,2025,6
 1,2049,R1,gasCCGT,2025,6
 1,2050,R1,gasCCGT,2025,6
-1,2054,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
 1,2059,R1,gasCCGT,2025,6
 1,2060,R1,gasCCGT,2025,6
 1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,10
-2,2030,R1,solarPV,2020,10
-2,2035,R1,solarPV,2020,10
-2,2040,R1,solarPV,2020,10
-2,2045,R1,solarPV,2020,10
-2,2049,R1,solarPV,2020,10
-4,2035,R1,solarPV,2030,6
-4,2040,R1,solarPV,2030,6
-4,2045,R1,solarPV,2030,6
-4,2049,R1,solarPV,2030,6
-4,2050,R1,solarPV,2030,6
-4,2054,R1,solarPV,2030,6
-4,2055,R1,solarPV,2030,6
-4,2059,R1,solarPV,2030,6
-5,2025,R1,windturbine,2020,6
-5,2030,R1,windturbine,2020,6
-5,2035,R1,windturbine,2020,6
-5,2040,R1,windturbine,2020,6
-5,2045,R1,windturbine,2020,6
-5,2049,R1,windturbine,2020,6
+2,2025,R1,solarPV,2020,5
+2,2030,R1,solarPV,2020,5
+2,2035,R1,solarPV,2020,5
+2,2040,R1,solarPV,2020,5
+2,2045,R1,solarPV,2020,5
+2,2049,R1,solarPV,2020,5
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
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 f3af614a..2d686a88 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,43 +1,38 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
 1,2030,R1,gasCCGT,2025,6
 1,2035,R1,gasCCGT,2025,6
 1,2040,R1,gasCCGT,2025,6
 1,2045,R1,gasCCGT,2025,6
 1,2049,R1,gasCCGT,2025,6
 1,2050,R1,gasCCGT,2025,6
-1,2054,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
 1,2059,R1,gasCCGT,2025,6
 1,2060,R1,gasCCGT,2025,6
 1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,10
-2,2030,R1,solarPV,2020,10
-2,2035,R1,solarPV,2020,10
-2,2040,R1,solarPV,2020,10
-2,2045,R1,solarPV,2020,10
-2,2049,R1,solarPV,2020,10
-4,2035,R1,solarPV,2030,6
-4,2040,R1,solarPV,2030,6
-4,2045,R1,solarPV,2030,6
-4,2049,R1,solarPV,2030,6
-4,2050,R1,solarPV,2030,6
-4,2054,R1,solarPV,2030,6
-4,2055,R1,solarPV,2030,6
-4,2059,R1,solarPV,2030,6
-5,2040,R1,solarPV,2035,6
-5,2045,R1,solarPV,2035,6
-5,2049,R1,solarPV,2035,6
-5,2050,R1,solarPV,2035,6
-5,2054,R1,solarPV,2035,6
-5,2055,R1,solarPV,2035,6
-5,2059,R1,solarPV,2035,6
-5,2060,R1,solarPV,2035,6
-5,2064,R1,solarPV,2035,6
-6,2025,R1,windturbine,2020,6
-6,2030,R1,windturbine,2020,6
-6,2035,R1,windturbine,2020,6
-6,2040,R1,windturbine,2020,6
-6,2045,R1,windturbine,2020,6
-6,2049,R1,windturbine,2020,6
+2,2025,R1,solarPV,2020,5
+2,2030,R1,solarPV,2020,5
+2,2035,R1,solarPV,2020,5
+2,2040,R1,solarPV,2020,5
+2,2045,R1,solarPV,2020,5
+2,2049,R1,solarPV,2020,5
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2040,R1,solarPV,2035,6
+4,2045,R1,solarPV,2035,6
+4,2049,R1,solarPV,2035,6
+4,2050,R1,solarPV,2035,6
+4,2059,R1,solarPV,2035,6
+4,2060,R1,solarPV,2035,6
+4,2064,R1,solarPV,2035,6
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 ab1876be..9c0ab67c 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,53 +1,46 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
 1,2030,R1,gasCCGT,2025,6
 1,2035,R1,gasCCGT,2025,6
 1,2040,R1,gasCCGT,2025,6
 1,2045,R1,gasCCGT,2025,6
 1,2049,R1,gasCCGT,2025,6
 1,2050,R1,gasCCGT,2025,6
-1,2054,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
 1,2059,R1,gasCCGT,2025,6
 1,2060,R1,gasCCGT,2025,6
 1,2064,R1,gasCCGT,2025,6
-2,2025,R1,solarPV,2020,10
-2,2030,R1,solarPV,2020,10
-2,2035,R1,solarPV,2020,10
-2,2040,R1,solarPV,2020,10
-2,2045,R1,solarPV,2020,10
-2,2049,R1,solarPV,2020,10
-4,2035,R1,solarPV,2030,6
-4,2040,R1,solarPV,2030,6
-4,2045,R1,solarPV,2030,6
-4,2049,R1,solarPV,2030,6
-4,2050,R1,solarPV,2030,6
-4,2054,R1,solarPV,2030,6
-4,2055,R1,solarPV,2030,6
-4,2059,R1,solarPV,2030,6
-5,2040,R1,solarPV,2035,6
-5,2045,R1,solarPV,2035,6
-5,2049,R1,solarPV,2035,6
-5,2050,R1,solarPV,2035,6
-5,2054,R1,solarPV,2035,6
-5,2055,R1,solarPV,2035,6
-5,2059,R1,solarPV,2035,6
-5,2060,R1,solarPV,2035,6
-5,2064,R1,solarPV,2035,6
-6,2045,R1,solarPV,2040,6
-6,2049,R1,solarPV,2040,6
-6,2050,R1,solarPV,2040,6
-6,2054,R1,solarPV,2040,6
-6,2055,R1,solarPV,2040,6
-6,2059,R1,solarPV,2040,6
-6,2060,R1,solarPV,2040,6
-6,2064,R1,solarPV,2040,6
-6,2065,R1,solarPV,2040,6
-6,2069,R1,solarPV,2040,6
-7,2025,R1,windturbine,2020,6
-7,2030,R1,windturbine,2020,6
-7,2035,R1,windturbine,2020,6
-7,2040,R1,windturbine,2020,6
-7,2045,R1,windturbine,2020,6
-7,2049,R1,windturbine,2020,6
+2,2025,R1,solarPV,2020,5
+2,2030,R1,solarPV,2020,5
+2,2035,R1,solarPV,2020,5
+2,2040,R1,solarPV,2020,5
+2,2045,R1,solarPV,2020,5
+2,2049,R1,solarPV,2020,5
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2040,R1,solarPV,2035,6
+4,2045,R1,solarPV,2035,6
+4,2049,R1,solarPV,2035,6
+4,2050,R1,solarPV,2035,6
+4,2059,R1,solarPV,2035,6
+4,2060,R1,solarPV,2035,6
+4,2064,R1,solarPV,2035,6
+5,2045,R1,solarPV,2040,6
+5,2049,R1,solarPV,2040,6
+5,2050,R1,solarPV,2040,6
+5,2059,R1,solarPV,2040,6
+5,2060,R1,solarPV,2040,6
+5,2064,R1,solarPV,2040,6
+5,2065,R1,solarPV,2040,6
+5,2069,R1,solarPV,2040,6
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 f59c2e5c..6a9b28f5 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
@@ -1,85 +1,62 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
 1,2030,R1,gasCCGT,2025,6
 1,2035,R1,gasCCGT,2025,6
 1,2040,R1,gasCCGT,2025,6
 1,2045,R1,gasCCGT,2025,6
 1,2049,R1,gasCCGT,2025,6
 1,2050,R1,gasCCGT,2025,6
-1,2054,R1,gasCCGT,2025,6
-1,2055,R1,gasCCGT,2025,6
 1,2059,R1,gasCCGT,2025,6
 1,2060,R1,gasCCGT,2025,6
 1,2064,R1,gasCCGT,2025,6
-2,2050,R1,gasCCGT,2045,1
-2,2054,R1,gasCCGT,2045,1
-2,2055,R1,gasCCGT,2045,1
-2,2059,R1,gasCCGT,2045,1
-2,2060,R1,gasCCGT,2045,1
-2,2064,R1,gasCCGT,2045,1
-2,2065,R1,gasCCGT,2045,1
-2,2069,R1,gasCCGT,2045,1
-2,2070,R1,gasCCGT,2045,1
-2,2074,R1,gasCCGT,2045,1
-2,2075,R1,gasCCGT,2045,1
-2,2084,R1,gasCCGT,2045,1
-3,2025,R1,solarPV,2020,10
-3,2030,R1,solarPV,2020,10
-3,2035,R1,solarPV,2020,10
-3,2040,R1,solarPV,2020,10
-3,2045,R1,solarPV,2020,10
-3,2049,R1,solarPV,2020,10
-5,2035,R1,solarPV,2030,6
-5,2040,R1,solarPV,2030,6
-5,2045,R1,solarPV,2030,6
-5,2049,R1,solarPV,2030,6
-5,2050,R1,solarPV,2030,6
-5,2054,R1,solarPV,2030,6
-5,2055,R1,solarPV,2030,6
-5,2059,R1,solarPV,2030,6
-6,2040,R1,solarPV,2035,6
-6,2045,R1,solarPV,2035,6
-6,2049,R1,solarPV,2035,6
-6,2050,R1,solarPV,2035,6
-6,2054,R1,solarPV,2035,6
-6,2055,R1,solarPV,2035,6
-6,2059,R1,solarPV,2035,6
-6,2060,R1,solarPV,2035,6
-6,2064,R1,solarPV,2035,6
-7,2045,R1,solarPV,2040,6
-7,2049,R1,solarPV,2040,6
-7,2050,R1,solarPV,2040,6
-7,2054,R1,solarPV,2040,6
-7,2055,R1,solarPV,2040,6
-7,2059,R1,solarPV,2040,6
-7,2060,R1,solarPV,2040,6
-7,2064,R1,solarPV,2040,6
-7,2065,R1,solarPV,2040,6
-7,2069,R1,solarPV,2040,6
-8,2050,R1,solarPV,2045,10
-8,2054,R1,solarPV,2045,10
-8,2055,R1,solarPV,2045,10
-8,2059,R1,solarPV,2045,10
-8,2060,R1,solarPV,2045,10
-8,2064,R1,solarPV,2045,10
-8,2065,R1,solarPV,2045,10
-8,2069,R1,solarPV,2045,10
-8,2070,R1,solarPV,2045,10
-8,2074,R1,solarPV,2045,10
-9,2025,R1,windturbine,2020,6
-9,2030,R1,windturbine,2020,6
-9,2035,R1,windturbine,2020,6
-9,2040,R1,windturbine,2020,6
-9,2045,R1,windturbine,2020,6
-9,2049,R1,windturbine,2020,6
-10,2050,R1,windturbine,2045,10
-10,2054,R1,windturbine,2045,10
-10,2055,R1,windturbine,2045,10
-10,2059,R1,windturbine,2045,10
-10,2060,R1,windturbine,2045,10
-10,2064,R1,windturbine,2045,10
-10,2065,R1,windturbine,2045,10
-10,2069,R1,windturbine,2045,10
-10,2070,R1,windturbine,2045,10
-10,2074,R1,windturbine,2045,10
+2,2025,R1,solarPV,2020,5
+2,2030,R1,solarPV,2020,5
+2,2035,R1,solarPV,2020,5
+2,2040,R1,solarPV,2020,5
+2,2045,R1,solarPV,2020,5
+2,2049,R1,solarPV,2020,5
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2040,R1,solarPV,2035,6
+4,2045,R1,solarPV,2035,6
+4,2049,R1,solarPV,2035,6
+4,2050,R1,solarPV,2035,6
+4,2059,R1,solarPV,2035,6
+4,2060,R1,solarPV,2035,6
+4,2064,R1,solarPV,2035,6
+5,2045,R1,solarPV,2040,6
+5,2049,R1,solarPV,2040,6
+5,2050,R1,solarPV,2040,6
+5,2059,R1,solarPV,2040,6
+5,2060,R1,solarPV,2040,6
+5,2064,R1,solarPV,2040,6
+5,2065,R1,solarPV,2040,6
+5,2069,R1,solarPV,2040,6
+6,2050,R1,solarPV,2045,10
+6,2059,R1,solarPV,2045,10
+6,2060,R1,solarPV,2045,10
+6,2064,R1,solarPV,2045,10
+6,2065,R1,solarPV,2045,10
+6,2069,R1,solarPV,2045,10
+6,2070,R1,solarPV,2045,10
+6,2074,R1,solarPV,2045,10
+7,2050,R1,windturbine,2045,1
+7,2059,R1,windturbine,2045,1
+7,2060,R1,windturbine,2045,1
+7,2064,R1,windturbine,2045,1
+7,2065,R1,windturbine,2045,1
+7,2069,R1,windturbine,2045,1
+7,2070,R1,windturbine,2045,1
+7,2074,R1,windturbine,2045,1
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 534dd8e5..54bd140d 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,87 +1,69 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2055,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
 1,2030,R1,gasCCGT,2025,6
 1,2035,R1,gasCCGT,2025,6
 1,2040,R1,gasCCGT,2025,6
 1,2045,R1,gasCCGT,2025,6
 1,2049,R1,gasCCGT,2025,6
 1,2050,R1,gasCCGT,2025,6
-1,2054,R1,gasCCGT,2025,6
 1,2055,R1,gasCCGT,2025,6
 1,2059,R1,gasCCGT,2025,6
 1,2060,R1,gasCCGT,2025,6
 1,2064,R1,gasCCGT,2025,6
-2,2050,R1,gasCCGT,2045,1
-2,2054,R1,gasCCGT,2045,1
-2,2055,R1,gasCCGT,2045,1
-2,2059,R1,gasCCGT,2045,1
-2,2060,R1,gasCCGT,2045,1
-2,2064,R1,gasCCGT,2045,1
-2,2065,R1,gasCCGT,2045,1
-2,2069,R1,gasCCGT,2045,1
-2,2070,R1,gasCCGT,2045,1
-2,2074,R1,gasCCGT,2045,1
-2,2075,R1,gasCCGT,2045,1
-2,2079,R1,gasCCGT,2045,1
-2,2080,R1,gasCCGT,2045,1
-2,2084,R1,gasCCGT,2045,1
-3,2025,R1,solarPV,2020,10
-3,2030,R1,solarPV,2020,10
-3,2035,R1,solarPV,2020,10
-3,2040,R1,solarPV,2020,10
-3,2045,R1,solarPV,2020,10
-3,2049,R1,solarPV,2020,10
-5,2035,R1,solarPV,2030,6
-5,2040,R1,solarPV,2030,6
-5,2045,R1,solarPV,2030,6
-5,2049,R1,solarPV,2030,6
-5,2050,R1,solarPV,2030,6
-5,2054,R1,solarPV,2030,6
-5,2055,R1,solarPV,2030,6
-5,2059,R1,solarPV,2030,6
-6,2040,R1,solarPV,2035,6
-6,2045,R1,solarPV,2035,6
-6,2049,R1,solarPV,2035,6
-6,2050,R1,solarPV,2035,6
-6,2054,R1,solarPV,2035,6
-6,2055,R1,solarPV,2035,6
-6,2059,R1,solarPV,2035,6
-6,2060,R1,solarPV,2035,6
-6,2064,R1,solarPV,2035,6
-7,2045,R1,solarPV,2040,6
-7,2049,R1,solarPV,2040,6
-7,2050,R1,solarPV,2040,6
-7,2054,R1,solarPV,2040,6
-7,2055,R1,solarPV,2040,6
-7,2059,R1,solarPV,2040,6
-7,2060,R1,solarPV,2040,6
-7,2064,R1,solarPV,2040,6
-7,2065,R1,solarPV,2040,6
-7,2069,R1,solarPV,2040,6
-8,2050,R1,solarPV,2045,10
-8,2054,R1,solarPV,2045,10
-8,2055,R1,solarPV,2045,10
-8,2059,R1,solarPV,2045,10
-8,2060,R1,solarPV,2045,10
-8,2064,R1,solarPV,2045,10
-8,2065,R1,solarPV,2045,10
-8,2069,R1,solarPV,2045,10
-8,2070,R1,solarPV,2045,10
-8,2074,R1,solarPV,2045,10
-10,2025,R1,windturbine,2020,6
-10,2030,R1,windturbine,2020,6
-10,2035,R1,windturbine,2020,6
-10,2040,R1,windturbine,2020,6
-10,2045,R1,windturbine,2020,6
-10,2049,R1,windturbine,2020,6
-11,2050,R1,windturbine,2045,10
-11,2054,R1,windturbine,2045,10
-11,2055,R1,windturbine,2045,10
-11,2059,R1,windturbine,2045,10
-11,2060,R1,windturbine,2045,10
-11,2064,R1,windturbine,2045,10
-11,2065,R1,windturbine,2045,10
-11,2069,R1,windturbine,2045,10
-11,2070,R1,windturbine,2045,10
-11,2074,R1,windturbine,2045,10
+2,2025,R1,solarPV,2020,5
+2,2030,R1,solarPV,2020,5
+2,2035,R1,solarPV,2020,5
+2,2040,R1,solarPV,2020,5
+2,2045,R1,solarPV,2020,5
+2,2049,R1,solarPV,2020,5
+3,2035,R1,solarPV,2030,6
+3,2040,R1,solarPV,2030,6
+3,2045,R1,solarPV,2030,6
+3,2049,R1,solarPV,2030,6
+3,2050,R1,solarPV,2030,6
+3,2055,R1,solarPV,2030,6
+3,2059,R1,solarPV,2030,6
+4,2040,R1,solarPV,2035,6
+4,2045,R1,solarPV,2035,6
+4,2049,R1,solarPV,2035,6
+4,2050,R1,solarPV,2035,6
+4,2055,R1,solarPV,2035,6
+4,2059,R1,solarPV,2035,6
+4,2060,R1,solarPV,2035,6
+4,2064,R1,solarPV,2035,6
+5,2045,R1,solarPV,2040,6
+5,2049,R1,solarPV,2040,6
+5,2050,R1,solarPV,2040,6
+5,2055,R1,solarPV,2040,6
+5,2059,R1,solarPV,2040,6
+5,2060,R1,solarPV,2040,6
+5,2064,R1,solarPV,2040,6
+5,2065,R1,solarPV,2040,6
+5,2069,R1,solarPV,2040,6
+6,2050,R1,solarPV,2045,10
+6,2055,R1,solarPV,2045,10
+6,2059,R1,solarPV,2045,10
+6,2060,R1,solarPV,2045,10
+6,2064,R1,solarPV,2045,10
+6,2065,R1,solarPV,2045,10
+6,2069,R1,solarPV,2045,10
+6,2070,R1,solarPV,2045,10
+6,2074,R1,solarPV,2045,10
+8,2050,R1,windturbine,2045,1
+8,2055,R1,windturbine,2045,1
+8,2059,R1,windturbine,2045,1
+8,2060,R1,windturbine,2045,1
+8,2064,R1,windturbine,2045,1
+8,2065,R1,windturbine,2045,1
+8,2069,R1,windturbine,2045,1
+8,2070,R1,windturbine,2045,1
+8,2074,R1,windturbine,2045,1
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 d1ee882b..4346aa17 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,9 @@
 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
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
index deed70ac..ebf9e0aa 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2025.csv
@@ -1,10 +1,17 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
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 a6dc3401..a40493af 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,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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 a6dc3401..a40493af 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,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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 a6dc3401..a40493af 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,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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 90db8083..a40493af 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,23 +1,26 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2050,R1,gassupply1,2045,2.04110000000
-3,2064,R1,gassupply1,2045,2.04110000000
-3,2065,R1,gassupply1,2045,2.04110000000
-3,2069,R1,gassupply1,2045,2.04110000000
-3,2070,R1,gassupply1,2045,2.04110000000
-3,2084,R1,gassupply1,2045,2.04110000000
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 90db8083..a40493af 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,23 +1,26 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2050,R1,gassupply1,2045,2.04110000000
-3,2064,R1,gassupply1,2045,2.04110000000
-3,2065,R1,gassupply1,2045,2.04110000000
-3,2069,R1,gassupply1,2045,2.04110000000
-3,2070,R1,gassupply1,2045,2.04110000000
-3,2084,R1,gassupply1,2045,2.04110000000
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 26af66e8..0d0a8edf 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
@@ -4,53 +4,55 @@ gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,16.46440000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.33440000000
+windturbine,R1,R1,A1,power,newcapa,2030,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,8.96440000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.22000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.33440000000
+windturbine,R1,R1,A1,power,newcapa,2035,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.33440000000
+windturbine,R1,R1,A1,power,newcapa,2040,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.33440000000
+windturbine,R1,R1,A1,power,newcapa,2045,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.33440000000
+windturbine,R1,R1,A1,power,newcapa,2050,1.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.04110000000
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 0056a57b..3cb531a2 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.86840000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21170000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.30670000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.33920000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86840000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21170000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.30670000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.33920000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63870000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.81010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.48140000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.75620000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.24960000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04200000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07400000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13690000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.87930000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07650000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.14880000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75620000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.24960000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04200000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07400000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13690000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.87930000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07650000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14880000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.28940000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.78760000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23380000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.52670000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.51930000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.51220000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11990000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.24910000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.85220000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.42920000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05430000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08120000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.28050000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.14790000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10430000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.16490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85220000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.42920000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05430000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08120000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28050000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.14790000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10430000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57400000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.31990000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34690000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.59050000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.71020000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.86920000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.16960000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.27760000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.91920000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.55590000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05810000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.08630000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.38060000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,2.33730000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11290000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.17630000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.91920000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.55590000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05810000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08630000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.38060000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.33730000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11290000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17630000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.77240000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.69520000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38100000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.63560000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.84330000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,3.12090000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18490000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.29780000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.02690000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.75850000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06080000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.09440000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.54200000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.64080000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.11890000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.19450000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.02690000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.75850000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06080000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09440000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.54200000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.64080000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11890000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19450000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09380000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.29960000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40480000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70810000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.05820000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.52500000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.19560000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.33010000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.30390000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.91390000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06510000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.10060000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.95750000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.87360000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.12860000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.20850000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30390000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.91390000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06510000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10060000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.95750000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.87360000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12860000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20850000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.92560000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.76330000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44340000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.76370000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.61240000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.83500000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.21280000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.35490000000,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 32dbf0a5..4d6c24fb 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,16 @@
 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
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
+1,2025,R1,windturbine,2020,5.50000000000
+1,2030,R1,windturbine,2020,5.50000000000
+1,2035,R1,windturbine,2020,5.50000000000
+1,2040,R1,windturbine,2020,5.50000000000
+1,2045,R1,windturbine,2020,5.50000000000
+1,2049,R1,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
index 3cff37a1..08d038a7 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2025.csv
@@ -1,22 +1,25 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
 1,2045,R1,gasCCGT,2025,5.88890000000
 1,2049,R1,gasCCGT,2025,5.88890000000
 1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2025,R1,windturbine,2020,10.00000000000
-3,2030,R1,windturbine,2020,10.00000000000
-3,2035,R1,windturbine,2020,10.00000000000
-3,2040,R1,windturbine,2020,10.00000000000
-3,2045,R1,windturbine,2020,10.00000000000
-3,2049,R1,windturbine,2020,10.00000000000
+2,2025,R1,windturbine,2020,5.50000000000
+2,2030,R1,windturbine,2020,5.50000000000
+2,2035,R1,windturbine,2020,5.50000000000
+2,2040,R1,windturbine,2020,5.50000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
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 5f560a34..ff594937 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,21 +17,15 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2025,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2020,10.00000000000
-4,2035,R1,windturbine,2020,10.00000000000
-4,2040,R1,windturbine,2020,10.00000000000
-4,2045,R1,windturbine,2020,10.00000000000
-4,2049,R1,windturbine,2020,10.00000000000
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2025,R1,windturbine,2020,5.50000000000
+3,2030,R1,windturbine,2020,5.50000000000
+3,2035,R1,windturbine,2020,5.50000000000
+3,2040,R1,windturbine,2020,5.50000000000
+3,2045,R1,windturbine,2020,5.50000000000
+3,2049,R1,windturbine,2020,5.50000000000
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 8eedd23e..b63e5100 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,28 +17,22 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-5,2025,R1,windturbine,2020,10.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
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2025,R1,windturbine,2020,5.50000000000
+4,2030,R1,windturbine,2020,5.50000000000
+4,2035,R1,windturbine,2020,5.50000000000
+4,2040,R1,windturbine,2020,5.50000000000
+4,2045,R1,windturbine,2020,5.50000000000
+4,2049,R1,windturbine,2020,5.50000000000
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 919a536e..0949065f 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,36 +17,30 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2040,6.00000000000
-5,2049,R1,solarPV,2040,6.00000000000
-5,2050,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,2025,R1,windturbine,2020,10.00000000000
-6,2030,R1,windturbine,2020,10.00000000000
-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
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2025,R1,windturbine,2020,5.50000000000
+5,2030,R1,windturbine,2020,5.50000000000
+5,2035,R1,windturbine,2020,5.50000000000
+5,2040,R1,windturbine,2020,5.50000000000
+5,2045,R1,windturbine,2020,5.50000000000
+5,2049,R1,windturbine,2020,5.50000000000
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 8bbb8655..dd5872c7 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
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,62 +17,46 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2050,R1,gasCCGT,2045,1.22220000000
-2,2059,R1,gasCCGT,2045,1.22220000000
-2,2060,R1,gasCCGT,2045,1.22220000000
-2,2064,R1,gasCCGT,2045,1.22220000000
-2,2065,R1,gasCCGT,2045,1.22220000000
-2,2069,R1,gasCCGT,2045,1.22220000000
-2,2070,R1,gasCCGT,2045,1.22220000000
-2,2074,R1,gasCCGT,2045,1.22220000000
-2,2075,R1,gasCCGT,2045,1.22220000000
-2,2084,R1,gasCCGT,2045,1.22220000000
-3,2025,R1,solarPV,2020,6.75000000000
-3,2030,R1,solarPV,2020,6.75000000000
-3,2035,R1,solarPV,2020,6.75000000000
-3,2040,R1,solarPV,2020,6.75000000000
-3,2045,R1,solarPV,2020,6.75000000000
-3,2049,R1,solarPV,2020,6.75000000000
-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,2059,R1,solarPV,2030,6.00000000000
-5,2040,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2035,6.00000000000
-5,2049,R1,solarPV,2035,6.00000000000
-5,2050,R1,solarPV,2035,6.00000000000
-5,2059,R1,solarPV,2035,6.00000000000
-5,2060,R1,solarPV,2035,6.00000000000
-5,2064,R1,solarPV,2035,6.00000000000
-6,2045,R1,solarPV,2040,6.00000000000
-6,2049,R1,solarPV,2040,6.00000000000
-6,2050,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,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,10.00000000000
+5,2059,R1,solarPV,2045,10.00000000000
+5,2060,R1,solarPV,2045,10.00000000000
+5,2064,R1,solarPV,2045,10.00000000000
+5,2065,R1,solarPV,2045,10.00000000000
+5,2069,R1,solarPV,2045,10.00000000000
+5,2070,R1,solarPV,2045,10.00000000000
+5,2074,R1,solarPV,2045,10.00000000000
+6,2025,R1,windturbine,2020,5.50000000000
+6,2030,R1,windturbine,2020,5.50000000000
+6,2035,R1,windturbine,2020,5.50000000000
+6,2040,R1,windturbine,2020,5.50000000000
+6,2045,R1,windturbine,2020,5.50000000000
+6,2049,R1,windturbine,2020,5.50000000000
+7,2050,R1,windturbine,2045,1.50000000000
+7,2059,R1,windturbine,2045,1.50000000000
+7,2060,R1,windturbine,2045,1.50000000000
+7,2064,R1,windturbine,2045,1.50000000000
+7,2065,R1,windturbine,2045,1.50000000000
+7,2069,R1,windturbine,2045,1.50000000000
+7,2070,R1,windturbine,2045,1.50000000000
+7,2074,R1,windturbine,2045,1.50000000000
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 8bbb8655..dd5872c7 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,62 +17,46 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2050,R1,gasCCGT,2045,1.22220000000
-2,2059,R1,gasCCGT,2045,1.22220000000
-2,2060,R1,gasCCGT,2045,1.22220000000
-2,2064,R1,gasCCGT,2045,1.22220000000
-2,2065,R1,gasCCGT,2045,1.22220000000
-2,2069,R1,gasCCGT,2045,1.22220000000
-2,2070,R1,gasCCGT,2045,1.22220000000
-2,2074,R1,gasCCGT,2045,1.22220000000
-2,2075,R1,gasCCGT,2045,1.22220000000
-2,2084,R1,gasCCGT,2045,1.22220000000
-3,2025,R1,solarPV,2020,6.75000000000
-3,2030,R1,solarPV,2020,6.75000000000
-3,2035,R1,solarPV,2020,6.75000000000
-3,2040,R1,solarPV,2020,6.75000000000
-3,2045,R1,solarPV,2020,6.75000000000
-3,2049,R1,solarPV,2020,6.75000000000
-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,2059,R1,solarPV,2030,6.00000000000
-5,2040,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2035,6.00000000000
-5,2049,R1,solarPV,2035,6.00000000000
-5,2050,R1,solarPV,2035,6.00000000000
-5,2059,R1,solarPV,2035,6.00000000000
-5,2060,R1,solarPV,2035,6.00000000000
-5,2064,R1,solarPV,2035,6.00000000000
-6,2045,R1,solarPV,2040,6.00000000000
-6,2049,R1,solarPV,2040,6.00000000000
-6,2050,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,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,10.00000000000
+5,2059,R1,solarPV,2045,10.00000000000
+5,2060,R1,solarPV,2045,10.00000000000
+5,2064,R1,solarPV,2045,10.00000000000
+5,2065,R1,solarPV,2045,10.00000000000
+5,2069,R1,solarPV,2045,10.00000000000
+5,2070,R1,solarPV,2045,10.00000000000
+5,2074,R1,solarPV,2045,10.00000000000
+6,2025,R1,windturbine,2020,5.50000000000
+6,2030,R1,windturbine,2020,5.50000000000
+6,2035,R1,windturbine,2020,5.50000000000
+6,2040,R1,windturbine,2020,5.50000000000
+6,2045,R1,windturbine,2020,5.50000000000
+6,2049,R1,windturbine,2020,5.50000000000
+7,2050,R1,windturbine,2045,1.50000000000
+7,2059,R1,windturbine,2045,1.50000000000
+7,2060,R1,windturbine,2045,1.50000000000
+7,2064,R1,windturbine,2045,1.50000000000
+7,2065,R1,windturbine,2045,1.50000000000
+7,2069,R1,windturbine,2045,1.50000000000
+7,2070,R1,windturbine,2045,1.50000000000
+7,2074,R1,windturbine,2045,1.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
index d1ee882b..291295ec 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv
@@ -1,4 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
index e658e4eb..36a596a7 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv
@@ -1,10 +1,17 @@
 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,2030,R1,gassupply1,2025,2.52000000000
-1,2035,R1,gassupply1,2025,2.52000000000
-1,2040,R1,gassupply1,2025,2.52000000000
-1,2045,R1,gassupply1,2025,2.52000000000
-1,2050,R1,gassupply1,2025,2.52000000000
-1,2064,R1,gassupply1,2025,2.52000000000
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
+1,2030,R1,gassupply1,2025,11.99330000000
+1,2035,R1,gassupply1,2025,11.99330000000
+1,2040,R1,gassupply1,2025,11.99330000000
+1,2045,R1,gassupply1,2025,11.99330000000
+1,2050,R1,gassupply1,2025,11.99330000000
+1,2059,R1,gassupply1,2025,11.99330000000
+1,2060,R1,gassupply1,2025,11.99330000000
+1,2064,R1,gassupply1,2025,11.99330000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
index c211647a..f022295a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.52000000000
-1,2035,R1,gassupply1,2025,2.52000000000
-1,2040,R1,gassupply1,2025,2.52000000000
-1,2045,R1,gassupply1,2025,2.52000000000
-1,2050,R1,gassupply1,2025,2.52000000000
-1,2064,R1,gassupply1,2025,2.52000000000
-2,2035,R1,gassupply1,2030,8.41090000000
-2,2040,R1,gassupply1,2030,8.41090000000
-2,2045,R1,gassupply1,2030,8.41090000000
-2,2050,R1,gassupply1,2030,8.41090000000
-2,2064,R1,gassupply1,2030,8.41090000000
-2,2065,R1,gassupply1,2030,8.41090000000
-2,2069,R1,gassupply1,2030,8.41090000000
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
+1,2030,R1,gassupply1,2025,11.99330000000
+1,2035,R1,gassupply1,2025,11.99330000000
+1,2040,R1,gassupply1,2025,11.99330000000
+1,2045,R1,gassupply1,2025,11.99330000000
+1,2050,R1,gassupply1,2025,11.99330000000
+1,2059,R1,gassupply1,2025,11.99330000000
+1,2060,R1,gassupply1,2025,11.99330000000
+1,2064,R1,gassupply1,2025,11.99330000000
+2,2035,R1,gassupply1,2030,9.52420000000
+2,2040,R1,gassupply1,2030,9.52420000000
+2,2045,R1,gassupply1,2030,9.52420000000
+2,2050,R1,gassupply1,2030,9.52420000000
+2,2059,R1,gassupply1,2030,9.52420000000
+2,2060,R1,gassupply1,2030,9.52420000000
+2,2064,R1,gassupply1,2030,9.52420000000
+2,2065,R1,gassupply1,2030,9.52420000000
+2,2069,R1,gassupply1,2030,9.52420000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
index c211647a..f022295a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.52000000000
-1,2035,R1,gassupply1,2025,2.52000000000
-1,2040,R1,gassupply1,2025,2.52000000000
-1,2045,R1,gassupply1,2025,2.52000000000
-1,2050,R1,gassupply1,2025,2.52000000000
-1,2064,R1,gassupply1,2025,2.52000000000
-2,2035,R1,gassupply1,2030,8.41090000000
-2,2040,R1,gassupply1,2030,8.41090000000
-2,2045,R1,gassupply1,2030,8.41090000000
-2,2050,R1,gassupply1,2030,8.41090000000
-2,2064,R1,gassupply1,2030,8.41090000000
-2,2065,R1,gassupply1,2030,8.41090000000
-2,2069,R1,gassupply1,2030,8.41090000000
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
+1,2030,R1,gassupply1,2025,11.99330000000
+1,2035,R1,gassupply1,2025,11.99330000000
+1,2040,R1,gassupply1,2025,11.99330000000
+1,2045,R1,gassupply1,2025,11.99330000000
+1,2050,R1,gassupply1,2025,11.99330000000
+1,2059,R1,gassupply1,2025,11.99330000000
+1,2060,R1,gassupply1,2025,11.99330000000
+1,2064,R1,gassupply1,2025,11.99330000000
+2,2035,R1,gassupply1,2030,9.52420000000
+2,2040,R1,gassupply1,2030,9.52420000000
+2,2045,R1,gassupply1,2030,9.52420000000
+2,2050,R1,gassupply1,2030,9.52420000000
+2,2059,R1,gassupply1,2030,9.52420000000
+2,2060,R1,gassupply1,2030,9.52420000000
+2,2064,R1,gassupply1,2030,9.52420000000
+2,2065,R1,gassupply1,2030,9.52420000000
+2,2069,R1,gassupply1,2030,9.52420000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
index c211647a..f022295a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2040.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.52000000000
-1,2035,R1,gassupply1,2025,2.52000000000
-1,2040,R1,gassupply1,2025,2.52000000000
-1,2045,R1,gassupply1,2025,2.52000000000
-1,2050,R1,gassupply1,2025,2.52000000000
-1,2064,R1,gassupply1,2025,2.52000000000
-2,2035,R1,gassupply1,2030,8.41090000000
-2,2040,R1,gassupply1,2030,8.41090000000
-2,2045,R1,gassupply1,2030,8.41090000000
-2,2050,R1,gassupply1,2030,8.41090000000
-2,2064,R1,gassupply1,2030,8.41090000000
-2,2065,R1,gassupply1,2030,8.41090000000
-2,2069,R1,gassupply1,2030,8.41090000000
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
+1,2030,R1,gassupply1,2025,11.99330000000
+1,2035,R1,gassupply1,2025,11.99330000000
+1,2040,R1,gassupply1,2025,11.99330000000
+1,2045,R1,gassupply1,2025,11.99330000000
+1,2050,R1,gassupply1,2025,11.99330000000
+1,2059,R1,gassupply1,2025,11.99330000000
+1,2060,R1,gassupply1,2025,11.99330000000
+1,2064,R1,gassupply1,2025,11.99330000000
+2,2035,R1,gassupply1,2030,9.52420000000
+2,2040,R1,gassupply1,2030,9.52420000000
+2,2045,R1,gassupply1,2030,9.52420000000
+2,2050,R1,gassupply1,2030,9.52420000000
+2,2059,R1,gassupply1,2030,9.52420000000
+2,2060,R1,gassupply1,2030,9.52420000000
+2,2064,R1,gassupply1,2030,9.52420000000
+2,2065,R1,gassupply1,2030,9.52420000000
+2,2069,R1,gassupply1,2030,9.52420000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
index c211647a..f022295a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2045.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.52000000000
-1,2035,R1,gassupply1,2025,2.52000000000
-1,2040,R1,gassupply1,2025,2.52000000000
-1,2045,R1,gassupply1,2025,2.52000000000
-1,2050,R1,gassupply1,2025,2.52000000000
-1,2064,R1,gassupply1,2025,2.52000000000
-2,2035,R1,gassupply1,2030,8.41090000000
-2,2040,R1,gassupply1,2030,8.41090000000
-2,2045,R1,gassupply1,2030,8.41090000000
-2,2050,R1,gassupply1,2030,8.41090000000
-2,2064,R1,gassupply1,2030,8.41090000000
-2,2065,R1,gassupply1,2030,8.41090000000
-2,2069,R1,gassupply1,2030,8.41090000000
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
+1,2030,R1,gassupply1,2025,11.99330000000
+1,2035,R1,gassupply1,2025,11.99330000000
+1,2040,R1,gassupply1,2025,11.99330000000
+1,2045,R1,gassupply1,2025,11.99330000000
+1,2050,R1,gassupply1,2025,11.99330000000
+1,2059,R1,gassupply1,2025,11.99330000000
+1,2060,R1,gassupply1,2025,11.99330000000
+1,2064,R1,gassupply1,2025,11.99330000000
+2,2035,R1,gassupply1,2030,9.52420000000
+2,2040,R1,gassupply1,2030,9.52420000000
+2,2045,R1,gassupply1,2030,9.52420000000
+2,2050,R1,gassupply1,2030,9.52420000000
+2,2059,R1,gassupply1,2030,9.52420000000
+2,2060,R1,gassupply1,2030,9.52420000000
+2,2064,R1,gassupply1,2030,9.52420000000
+2,2065,R1,gassupply1,2030,9.52420000000
+2,2069,R1,gassupply1,2030,9.52420000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
index c211647a..f022295a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2050.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,2.52000000000
-1,2035,R1,gassupply1,2025,2.52000000000
-1,2040,R1,gassupply1,2025,2.52000000000
-1,2045,R1,gassupply1,2025,2.52000000000
-1,2050,R1,gassupply1,2025,2.52000000000
-1,2064,R1,gassupply1,2025,2.52000000000
-2,2035,R1,gassupply1,2030,8.41090000000
-2,2040,R1,gassupply1,2030,8.41090000000
-2,2045,R1,gassupply1,2030,8.41090000000
-2,2050,R1,gassupply1,2030,8.41090000000
-2,2064,R1,gassupply1,2030,8.41090000000
-2,2065,R1,gassupply1,2030,8.41090000000
-2,2069,R1,gassupply1,2030,8.41090000000
+0,2025,R1,gassupply1,2020,17.77330000000
+0,2030,R1,gassupply1,2020,10.27330000000
+0,2035,R1,gassupply1,2020,2.77330000000
+0,2040,R1,gassupply1,2020,2.77330000000
+0,2045,R1,gassupply1,2020,2.77330000000
+0,2050,R1,gassupply1,2020,2.77330000000
+0,2059,R1,gassupply1,2020,2.77330000000
+1,2030,R1,gassupply1,2025,11.99330000000
+1,2035,R1,gassupply1,2025,11.99330000000
+1,2040,R1,gassupply1,2025,11.99330000000
+1,2045,R1,gassupply1,2025,11.99330000000
+1,2050,R1,gassupply1,2025,11.99330000000
+1,2059,R1,gassupply1,2025,11.99330000000
+1,2060,R1,gassupply1,2025,11.99330000000
+1,2064,R1,gassupply1,2025,11.99330000000
+2,2035,R1,gassupply1,2030,9.52420000000
+2,2040,R1,gassupply1,2030,9.52420000000
+2,2045,R1,gassupply1,2030,9.52420000000
+2,2050,R1,gassupply1,2030,9.52420000000
+2,2059,R1,gassupply1,2030,9.52420000000
+2,2060,R1,gassupply1,2030,9.52420000000
+2,2064,R1,gassupply1,2030,9.52420000000
+2,2065,R1,gassupply1,2030,9.52420000000
+2,2069,R1,gassupply1,2030,9.52420000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
index 80cbbaad..ee9ef91d 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -9,97 +9,95 @@ gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A1,power,newcapa,2025,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,2.36110000000
+gasCCGT,R1,R1,A2,power,newcapa,2025,2.36110000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,8.88670000000
+gassupply1,R1,R1,A2,gas,newcapa,2025,8.88670000000
 heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,4.06250000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2030,4.06250000000
-windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,1.26000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,4.80560000000
+gasCCGT,R1,R1,A2,power,newcapa,2030,1.86110000000
+gasCCGT,R1,R1,A2,power,newcapa,2030,4.80560000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,5.13670000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,5.99670000000
+gassupply1,R1,R1,A2,gas,newcapa,2030,5.13670000000
+gassupply1,R1,R1,A2,gas,newcapa,2030,5.99670000000
 heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,4.06250000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,4.80560000000
 solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2035,4.06250000000
+gasCCGT,R1,R1,A2,power,newcapa,2035,1.86110000000
+gasCCGT,R1,R1,A2,power,newcapa,2035,4.80560000000
 solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,4.20550000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.38670000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,5.99670000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,4.76210000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,1.38670000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,5.99670000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,4.76210000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,4.06250000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,4.80560000000
 solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2040,4.06250000000
+gasCCGT,R1,R1,A2,power,newcapa,2040,1.86110000000
+gasCCGT,R1,R1,A2,power,newcapa,2040,4.80560000000
 solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,4.20550000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.38670000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,5.99670000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,4.76210000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,1.38670000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,5.99670000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,4.76210000000
 heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,4.06250000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,4.80560000000
 solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,4.06250000000
+gasCCGT,R1,R1,A2,power,newcapa,2045,1.86110000000
+gasCCGT,R1,R1,A2,power,newcapa,2045,4.80560000000
 solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,4.20550000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.38670000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,5.99670000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,4.76210000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,1.38670000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,5.99670000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,4.76210000000
 heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,4.06250000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,4.80560000000
 solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
-gasCCGT,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,4.06250000000
+solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
+gasCCGT,R1,R1,A2,power,newcapa,2050,1.86110000000
+gasCCGT,R1,R1,A2,power,newcapa,2050,4.80560000000
 solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
 solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
 solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,4.20550000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.38670000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,5.99670000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,4.76210000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,1.38670000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,5.99670000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,4.76210000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index 313fcb8f..c65b1fa2 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.66080000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.15420000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.22070000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.99120000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.73730000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.35970000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66080000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.15420000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.22070000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99120000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.73730000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.35970000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98240000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.51000000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.89290000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32160000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.32420000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.51790000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.76490000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.49280000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.05050000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.08380000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.15000000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,2.24500000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09550000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.17080000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76490000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.49280000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05050000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08380000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15000000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.24500000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09550000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17080000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31600000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.52560000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31000000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.61520000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.53690000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,3.00130000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15380000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.28820000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.92700000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.85400000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05460000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.09820000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.39290000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.78640000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10510000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.20330000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.92700000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.85400000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05460000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09820000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39290000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.78640000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10510000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20330000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.80040000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.60500000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.35010000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.74480000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.86050000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,3.72230000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17110000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.34590000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.99100000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.99990000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06110000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.10400000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.48860000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,3.00430000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11970000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.21630000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.99100000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.99990000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06110000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10400000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.48860000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,3.00430000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11970000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.21630000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.98940000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.03600000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40820000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.79650000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.98750000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,4.01190000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.19690000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.36900000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.10050000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,2.24780000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06370000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.11400000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.65260000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,3.37560000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.12540000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.23860000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.10050000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.24780000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06370000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.11400000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.65260000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,3.37560000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12540000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.23860000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.31580000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.77480000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43090000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.88510000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.20580000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,4.50600000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.20710000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.40860000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.12160000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,2.43730000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06810000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.12150000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.68390000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,3.65950000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.13520000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.25560000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.12160000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.43730000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06810000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.12150000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.68390000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,3.65950000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13520000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.25560000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.37670000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.33980000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.47000000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.95290000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.24720000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,4.88390000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.22460000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.43880000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
index b3996630..e66df085 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
 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,8.37500000000
-1,2030,R1,windturbine,2020,8.37500000000
-1,2035,R1,windturbine,2020,8.37500000000
-1,2040,R1,windturbine,2020,8.37500000000
-1,2045,R1,windturbine,2020,8.37500000000
-1,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
index 4187ecc4..ab71e6e2 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2025.csv
@@ -1,25 +1,17 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,6.00000000000
-1,2035,R1,gasCCGT,2025,6.00000000000
-1,2040,R1,gasCCGT,2025,6.00000000000
-1,2045,R1,gasCCGT,2025,6.00000000000
-1,2049,R1,gasCCGT,2025,6.00000000000
-1,2050,R1,gasCCGT,2025,6.00000000000
-1,2054,R1,gasCCGT,2025,6.00000000000
-1,2055,R1,gasCCGT,2025,6.00000000000
-1,2064,R1,gasCCGT,2025,6.00000000000
-2,2030,R1,solarPV,2025,8.12500000000
-2,2035,R1,solarPV,2025,8.12500000000
-2,2040,R1,solarPV,2025,8.12500000000
-2,2045,R1,solarPV,2025,8.12500000000
-2,2049,R1,solarPV,2025,8.12500000000
-2,2050,R1,solarPV,2025,8.12500000000
-2,2054,R1,solarPV,2025,8.12500000000
-3,2025,R1,windturbine,2020,8.37500000000
-3,2030,R1,windturbine,2020,8.37500000000
-3,2035,R1,windturbine,2020,8.37500000000
-3,2040,R1,windturbine,2020,8.37500000000
-3,2045,R1,windturbine,2020,8.37500000000
-3,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
+1,2030,R1,gasCCGT,2025,9.61110000000
+1,2035,R1,gasCCGT,2025,9.61110000000
+1,2040,R1,gasCCGT,2025,9.61110000000
+1,2045,R1,gasCCGT,2025,9.61110000000
+1,2050,R1,gasCCGT,2025,9.61110000000
+1,2059,R1,gasCCGT,2025,9.61110000000
+1,2060,R1,gasCCGT,2025,9.61110000000
+1,2064,R1,gasCCGT,2025,9.61110000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
index cff8e055..e417cf58 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2030.csv
@@ -1,35 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,6.00000000000
-1,2035,R1,gasCCGT,2025,6.00000000000
-1,2040,R1,gasCCGT,2025,6.00000000000
-1,2045,R1,gasCCGT,2025,6.00000000000
-1,2049,R1,gasCCGT,2025,6.00000000000
-1,2050,R1,gasCCGT,2025,6.00000000000
-1,2054,R1,gasCCGT,2025,6.00000000000
-1,2055,R1,gasCCGT,2025,6.00000000000
-1,2059,R1,gasCCGT,2025,6.00000000000
-1,2060,R1,gasCCGT,2025,6.00000000000
-1,2064,R1,gasCCGT,2025,6.00000000000
-2,2030,R1,solarPV,2025,8.12500000000
-2,2035,R1,solarPV,2025,8.12500000000
-2,2040,R1,solarPV,2025,8.12500000000
-2,2045,R1,solarPV,2025,8.12500000000
-2,2049,R1,solarPV,2025,8.12500000000
-2,2050,R1,solarPV,2025,8.12500000000
-2,2054,R1,solarPV,2025,8.12500000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2025,R1,windturbine,2020,8.37500000000
-4,2030,R1,windturbine,2020,8.37500000000
-4,2035,R1,windturbine,2020,8.37500000000
-4,2040,R1,windturbine,2020,8.37500000000
-4,2045,R1,windturbine,2020,8.37500000000
-4,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
+1,2030,R1,gasCCGT,2025,9.61110000000
+1,2035,R1,gasCCGT,2025,9.61110000000
+1,2040,R1,gasCCGT,2025,9.61110000000
+1,2045,R1,gasCCGT,2025,9.61110000000
+1,2050,R1,gasCCGT,2025,9.61110000000
+1,2059,R1,gasCCGT,2025,9.61110000000
+1,2060,R1,gasCCGT,2025,9.61110000000
+1,2064,R1,gasCCGT,2025,9.61110000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
index 7595000f..d28669d1 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2035.csv
@@ -1,44 +1,28 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,6.00000000000
-1,2035,R1,gasCCGT,2025,6.00000000000
-1,2040,R1,gasCCGT,2025,6.00000000000
-1,2045,R1,gasCCGT,2025,6.00000000000
-1,2049,R1,gasCCGT,2025,6.00000000000
-1,2050,R1,gasCCGT,2025,6.00000000000
-1,2054,R1,gasCCGT,2025,6.00000000000
-1,2055,R1,gasCCGT,2025,6.00000000000
-1,2059,R1,gasCCGT,2025,6.00000000000
-1,2060,R1,gasCCGT,2025,6.00000000000
-1,2064,R1,gasCCGT,2025,6.00000000000
-2,2030,R1,solarPV,2025,8.12500000000
-2,2035,R1,solarPV,2025,8.12500000000
-2,2040,R1,solarPV,2025,8.12500000000
-2,2045,R1,solarPV,2025,8.12500000000
-2,2049,R1,solarPV,2025,8.12500000000
-2,2050,R1,solarPV,2025,8.12500000000
-2,2054,R1,solarPV,2025,8.12500000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2054,R1,solarPV,2035,6.00000000000
-4,2055,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-5,2025,R1,windturbine,2020,8.37500000000
-5,2030,R1,windturbine,2020,8.37500000000
-5,2035,R1,windturbine,2020,8.37500000000
-5,2040,R1,windturbine,2020,8.37500000000
-5,2045,R1,windturbine,2020,8.37500000000
-5,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
+1,2030,R1,gasCCGT,2025,9.61110000000
+1,2035,R1,gasCCGT,2025,9.61110000000
+1,2040,R1,gasCCGT,2025,9.61110000000
+1,2045,R1,gasCCGT,2025,9.61110000000
+1,2050,R1,gasCCGT,2025,9.61110000000
+1,2059,R1,gasCCGT,2025,9.61110000000
+1,2060,R1,gasCCGT,2025,9.61110000000
+1,2064,R1,gasCCGT,2025,9.61110000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
index c38e42cd..f987efb5 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2040.csv
@@ -1,54 +1,35 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,6.00000000000
-1,2035,R1,gasCCGT,2025,6.00000000000
-1,2040,R1,gasCCGT,2025,6.00000000000
-1,2045,R1,gasCCGT,2025,6.00000000000
-1,2049,R1,gasCCGT,2025,6.00000000000
-1,2050,R1,gasCCGT,2025,6.00000000000
-1,2054,R1,gasCCGT,2025,6.00000000000
-1,2055,R1,gasCCGT,2025,6.00000000000
-1,2059,R1,gasCCGT,2025,6.00000000000
-1,2060,R1,gasCCGT,2025,6.00000000000
-1,2064,R1,gasCCGT,2025,6.00000000000
-2,2030,R1,solarPV,2025,8.12500000000
-2,2035,R1,solarPV,2025,8.12500000000
-2,2040,R1,solarPV,2025,8.12500000000
-2,2045,R1,solarPV,2025,8.12500000000
-2,2049,R1,solarPV,2025,8.12500000000
-2,2050,R1,solarPV,2025,8.12500000000
-2,2054,R1,solarPV,2025,8.12500000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2054,R1,solarPV,2035,6.00000000000
-4,2055,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-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,2025,R1,windturbine,2020,8.37500000000
-6,2030,R1,windturbine,2020,8.37500000000
-6,2035,R1,windturbine,2020,8.37500000000
-6,2040,R1,windturbine,2020,8.37500000000
-6,2045,R1,windturbine,2020,8.37500000000
-6,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
+1,2030,R1,gasCCGT,2025,9.61110000000
+1,2035,R1,gasCCGT,2025,9.61110000000
+1,2040,R1,gasCCGT,2025,9.61110000000
+1,2045,R1,gasCCGT,2025,9.61110000000
+1,2050,R1,gasCCGT,2025,9.61110000000
+1,2059,R1,gasCCGT,2025,9.61110000000
+1,2060,R1,gasCCGT,2025,9.61110000000
+1,2064,R1,gasCCGT,2025,9.61110000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
index a1fb5aff..e95d3ea3 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2045.csv
@@ -1,64 +1,43 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,6.00000000000
-1,2035,R1,gasCCGT,2025,6.00000000000
-1,2040,R1,gasCCGT,2025,6.00000000000
-1,2045,R1,gasCCGT,2025,6.00000000000
-1,2049,R1,gasCCGT,2025,6.00000000000
-1,2050,R1,gasCCGT,2025,6.00000000000
-1,2054,R1,gasCCGT,2025,6.00000000000
-1,2055,R1,gasCCGT,2025,6.00000000000
-1,2059,R1,gasCCGT,2025,6.00000000000
-1,2060,R1,gasCCGT,2025,6.00000000000
-1,2064,R1,gasCCGT,2025,6.00000000000
-2,2030,R1,solarPV,2025,8.12500000000
-2,2035,R1,solarPV,2025,8.12500000000
-2,2040,R1,solarPV,2025,8.12500000000
-2,2045,R1,solarPV,2025,8.12500000000
-2,2049,R1,solarPV,2025,8.12500000000
-2,2050,R1,solarPV,2025,8.12500000000
-2,2054,R1,solarPV,2025,8.12500000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2054,R1,solarPV,2035,6.00000000000
-4,2055,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-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,17.37500000000
-6,2054,R1,solarPV,2045,17.37500000000
-6,2055,R1,solarPV,2045,17.37500000000
-6,2059,R1,solarPV,2045,17.37500000000
-6,2060,R1,solarPV,2045,17.37500000000
-6,2064,R1,solarPV,2045,17.37500000000
-6,2065,R1,solarPV,2045,17.37500000000
-6,2069,R1,solarPV,2045,17.37500000000
-6,2070,R1,solarPV,2045,17.37500000000
-6,2074,R1,solarPV,2045,17.37500000000
-7,2025,R1,windturbine,2020,8.37500000000
-7,2030,R1,windturbine,2020,8.37500000000
-7,2035,R1,windturbine,2020,8.37500000000
-7,2040,R1,windturbine,2020,8.37500000000
-7,2045,R1,windturbine,2020,8.37500000000
-7,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
+1,2030,R1,gasCCGT,2025,9.61110000000
+1,2035,R1,gasCCGT,2025,9.61110000000
+1,2040,R1,gasCCGT,2025,9.61110000000
+1,2045,R1,gasCCGT,2025,9.61110000000
+1,2050,R1,gasCCGT,2025,9.61110000000
+1,2059,R1,gasCCGT,2025,9.61110000000
+1,2060,R1,gasCCGT,2025,9.61110000000
+1,2064,R1,gasCCGT,2025,9.61110000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,6.00000000000
+5,2059,R1,solarPV,2045,6.00000000000
+5,2060,R1,solarPV,2045,6.00000000000
+5,2064,R1,solarPV,2045,6.00000000000
+5,2065,R1,solarPV,2045,6.00000000000
+5,2069,R1,solarPV,2045,6.00000000000
+5,2070,R1,solarPV,2045,6.00000000000
+5,2074,R1,solarPV,2045,6.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
index c5b2cb18..f8d940ee 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Power/Capacity/2050.csv
@@ -1,74 +1,59 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-1,2030,R1,gasCCGT,2025,6.00000000000
-1,2035,R1,gasCCGT,2025,6.00000000000
-1,2040,R1,gasCCGT,2025,6.00000000000
-1,2045,R1,gasCCGT,2025,6.00000000000
-1,2049,R1,gasCCGT,2025,6.00000000000
-1,2050,R1,gasCCGT,2025,6.00000000000
-1,2054,R1,gasCCGT,2025,6.00000000000
-1,2055,R1,gasCCGT,2025,6.00000000000
-1,2059,R1,gasCCGT,2025,6.00000000000
-1,2060,R1,gasCCGT,2025,6.00000000000
-1,2064,R1,gasCCGT,2025,6.00000000000
-2,2030,R1,solarPV,2025,8.12500000000
-2,2035,R1,solarPV,2025,8.12500000000
-2,2040,R1,solarPV,2025,8.12500000000
-2,2045,R1,solarPV,2025,8.12500000000
-2,2049,R1,solarPV,2025,8.12500000000
-2,2050,R1,solarPV,2025,8.12500000000
-2,2054,R1,solarPV,2025,8.12500000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2054,R1,solarPV,2035,6.00000000000
-4,2055,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-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,17.37500000000
-6,2054,R1,solarPV,2045,17.37500000000
-6,2055,R1,solarPV,2045,17.37500000000
-6,2059,R1,solarPV,2045,17.37500000000
-6,2060,R1,solarPV,2045,17.37500000000
-6,2064,R1,solarPV,2045,17.37500000000
-6,2065,R1,solarPV,2045,17.37500000000
-6,2069,R1,solarPV,2045,17.37500000000
-6,2070,R1,solarPV,2045,17.37500000000
-6,2074,R1,solarPV,2045,17.37500000000
-7,2055,R1,solarPV,2050,8.12500000000
-7,2059,R1,solarPV,2050,8.12500000000
-7,2060,R1,solarPV,2050,8.12500000000
-7,2064,R1,solarPV,2050,8.12500000000
-7,2065,R1,solarPV,2050,8.12500000000
-7,2069,R1,solarPV,2050,8.12500000000
-7,2070,R1,solarPV,2050,8.12500000000
-7,2074,R1,solarPV,2050,8.12500000000
-7,2075,R1,solarPV,2050,8.12500000000
-7,2079,R1,solarPV,2050,8.12500000000
-8,2025,R1,windturbine,2020,8.37500000000
-8,2030,R1,windturbine,2020,8.37500000000
-8,2035,R1,windturbine,2020,8.37500000000
-8,2040,R1,windturbine,2020,8.37500000000
-8,2045,R1,windturbine,2020,8.37500000000
-8,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,4.72220000000
+0,2030,R1,gasCCGT,2020,3.72220000000
+0,2035,R1,gasCCGT,2020,3.72220000000
+0,2040,R1,gasCCGT,2020,3.72220000000
+0,2045,R1,gasCCGT,2020,3.72220000000
+0,2050,R1,gasCCGT,2020,3.72220000000
+0,2055,R1,gasCCGT,2020,3.72220000000
+0,2059,R1,gasCCGT,2020,3.72220000000
+1,2030,R1,gasCCGT,2025,9.61110000000
+1,2035,R1,gasCCGT,2025,9.61110000000
+1,2040,R1,gasCCGT,2025,9.61110000000
+1,2045,R1,gasCCGT,2025,9.61110000000
+1,2050,R1,gasCCGT,2025,9.61110000000
+1,2055,R1,gasCCGT,2025,9.61110000000
+1,2059,R1,gasCCGT,2025,9.61110000000
+1,2060,R1,gasCCGT,2025,9.61110000000
+1,2064,R1,gasCCGT,2025,9.61110000000
+2,2035,R1,solarPV,2030,3.00000000000
+2,2040,R1,solarPV,2030,3.00000000000
+2,2045,R1,solarPV,2030,3.00000000000
+2,2050,R1,solarPV,2030,3.00000000000
+2,2055,R1,solarPV,2030,3.00000000000
+2,2059,R1,solarPV,2030,3.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2055,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2055,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,6.00000000000
+5,2055,R1,solarPV,2045,6.00000000000
+5,2059,R1,solarPV,2045,6.00000000000
+5,2060,R1,solarPV,2045,6.00000000000
+5,2064,R1,solarPV,2045,6.00000000000
+5,2065,R1,solarPV,2045,6.00000000000
+5,2069,R1,solarPV,2045,6.00000000000
+5,2070,R1,solarPV,2045,6.00000000000
+5,2074,R1,solarPV,2045,6.00000000000
+6,2055,R1,solarPV,2050,1.50000000000
+6,2059,R1,solarPV,2050,1.50000000000
+6,2060,R1,solarPV,2050,1.50000000000
+6,2064,R1,solarPV,2050,1.50000000000
+6,2065,R1,solarPV,2050,1.50000000000
+6,2069,R1,solarPV,2050,1.50000000000
+6,2070,R1,solarPV,2050,1.50000000000
+6,2074,R1,solarPV,2050,1.50000000000
+6,2075,R1,solarPV,2050,1.50000000000
+6,2079,R1,solarPV,2050,1.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
index d1ee882b..4261765d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2025.csv
@@ -2,3 +2,9 @@ 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,2030,R1,gassupply1,2025,3.63330000000
+1,2035,R1,gassupply1,2025,3.63330000000
+1,2040,R1,gassupply1,2025,3.63330000000
+1,2045,R1,gassupply1,2025,3.63330000000
+1,2050,R1,gassupply1,2025,3.63330000000
+1,2064,R1,gassupply1,2025,3.63330000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
index 7837213d..235026ca 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2030.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,5.46550000000
-1,2040,R1,gassupply1,2030,5.46550000000
-1,2045,R1,gassupply1,2030,5.46550000000
-1,2050,R1,gassupply1,2030,5.46550000000
-1,2069,R1,gassupply1,2030,5.46550000000
+1,2030,R1,gassupply1,2025,3.63330000000
+1,2035,R1,gassupply1,2025,3.63330000000
+1,2040,R1,gassupply1,2025,3.63330000000
+1,2045,R1,gassupply1,2025,3.63330000000
+1,2050,R1,gassupply1,2025,3.63330000000
+1,2064,R1,gassupply1,2025,3.63330000000
+2,2035,R1,gassupply1,2030,8.89170000000
+2,2040,R1,gassupply1,2030,8.89170000000
+2,2045,R1,gassupply1,2030,8.89170000000
+2,2050,R1,gassupply1,2030,8.89170000000
+2,2064,R1,gassupply1,2030,8.89170000000
+2,2065,R1,gassupply1,2030,8.89170000000
+2,2069,R1,gassupply1,2030,8.89170000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
index 7837213d..235026ca 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,5.46550000000
-1,2040,R1,gassupply1,2030,5.46550000000
-1,2045,R1,gassupply1,2030,5.46550000000
-1,2050,R1,gassupply1,2030,5.46550000000
-1,2069,R1,gassupply1,2030,5.46550000000
+1,2030,R1,gassupply1,2025,3.63330000000
+1,2035,R1,gassupply1,2025,3.63330000000
+1,2040,R1,gassupply1,2025,3.63330000000
+1,2045,R1,gassupply1,2025,3.63330000000
+1,2050,R1,gassupply1,2025,3.63330000000
+1,2064,R1,gassupply1,2025,3.63330000000
+2,2035,R1,gassupply1,2030,8.89170000000
+2,2040,R1,gassupply1,2030,8.89170000000
+2,2045,R1,gassupply1,2030,8.89170000000
+2,2050,R1,gassupply1,2030,8.89170000000
+2,2064,R1,gassupply1,2030,8.89170000000
+2,2065,R1,gassupply1,2030,8.89170000000
+2,2069,R1,gassupply1,2030,8.89170000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
index 7837213d..235026ca 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,5.46550000000
-1,2040,R1,gassupply1,2030,5.46550000000
-1,2045,R1,gassupply1,2030,5.46550000000
-1,2050,R1,gassupply1,2030,5.46550000000
-1,2069,R1,gassupply1,2030,5.46550000000
+1,2030,R1,gassupply1,2025,3.63330000000
+1,2035,R1,gassupply1,2025,3.63330000000
+1,2040,R1,gassupply1,2025,3.63330000000
+1,2045,R1,gassupply1,2025,3.63330000000
+1,2050,R1,gassupply1,2025,3.63330000000
+1,2064,R1,gassupply1,2025,3.63330000000
+2,2035,R1,gassupply1,2030,8.89170000000
+2,2040,R1,gassupply1,2030,8.89170000000
+2,2045,R1,gassupply1,2030,8.89170000000
+2,2050,R1,gassupply1,2030,8.89170000000
+2,2064,R1,gassupply1,2030,8.89170000000
+2,2065,R1,gassupply1,2030,8.89170000000
+2,2069,R1,gassupply1,2030,8.89170000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
index 7837213d..235026ca 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -2,8 +2,16 @@ 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,2035,R1,gassupply1,2030,5.46550000000
-1,2040,R1,gassupply1,2030,5.46550000000
-1,2045,R1,gassupply1,2030,5.46550000000
-1,2050,R1,gassupply1,2030,5.46550000000
-1,2069,R1,gassupply1,2030,5.46550000000
+1,2030,R1,gassupply1,2025,3.63330000000
+1,2035,R1,gassupply1,2025,3.63330000000
+1,2040,R1,gassupply1,2025,3.63330000000
+1,2045,R1,gassupply1,2025,3.63330000000
+1,2050,R1,gassupply1,2025,3.63330000000
+1,2064,R1,gassupply1,2025,3.63330000000
+2,2035,R1,gassupply1,2030,8.89170000000
+2,2040,R1,gassupply1,2030,8.89170000000
+2,2045,R1,gassupply1,2030,8.89170000000
+2,2050,R1,gassupply1,2030,8.89170000000
+2,2064,R1,gassupply1,2030,8.89170000000
+2,2065,R1,gassupply1,2030,8.89170000000
+2,2069,R1,gassupply1,2030,8.89170000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
index 7837213d..28aff26e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -2,8 +2,24 @@ 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,2035,R1,gassupply1,2030,5.46550000000
-1,2040,R1,gassupply1,2030,5.46550000000
-1,2045,R1,gassupply1,2030,5.46550000000
-1,2050,R1,gassupply1,2030,5.46550000000
-1,2069,R1,gassupply1,2030,5.46550000000
+1,2030,R1,gassupply1,2025,3.63330000000
+1,2035,R1,gassupply1,2025,3.63330000000
+1,2040,R1,gassupply1,2025,3.63330000000
+1,2045,R1,gassupply1,2025,3.63330000000
+1,2050,R1,gassupply1,2025,3.63330000000
+1,2055,R1,gassupply1,2025,3.63330000000
+1,2064,R1,gassupply1,2025,3.63330000000
+2,2035,R1,gassupply1,2030,8.89170000000
+2,2040,R1,gassupply1,2030,8.89170000000
+2,2045,R1,gassupply1,2030,8.89170000000
+2,2050,R1,gassupply1,2030,8.89170000000
+2,2055,R1,gassupply1,2030,8.89170000000
+2,2064,R1,gassupply1,2030,8.89170000000
+2,2065,R1,gassupply1,2030,8.89170000000
+2,2069,R1,gassupply1,2030,8.89170000000
+3,2055,R1,gassupply1,2050,0.41040000000
+3,2064,R1,gassupply1,2050,0.41040000000
+3,2065,R1,gassupply1,2050,0.41040000000
+3,2069,R1,gassupply1,2050,0.41040000000
+3,2070,R1,gassupply1,2050,0.41040000000
+3,2089,R1,gassupply1,2050,0.41040000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 1e2906cd..dc56109f 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -9,8 +9,7 @@ gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A1,power,newcapa,2025,4.18750000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,2.36110000000
 gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
 windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
 gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
@@ -19,77 +18,86 @@ heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,4.06250000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,4.80560000000
 solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
 windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
 windturbine,R1,R1,A2,power,newcapa,2030,0.81250000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,1.81670000000
 gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
+gassupply1,R1,R1,A2,gas,newcapa,2030,1.81670000000
 heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,4.80560000000
+solarPV,R1,R1,A1,power,newcapa,2035,0.50000000000
 solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
 solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
 windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
 windturbine,R1,R1,A2,power,newcapa,2035,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,2.73270000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.81670000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,4.44580000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,1.81670000000
+gassupply1,R1,R1,A2,gas,newcapa,2035,4.44580000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,4.80560000000
+solarPV,R1,R1,A1,power,newcapa,2040,0.50000000000
+solarPV,R1,R1,A1,power,newcapa,2040,2.50000000000
+windturbine,R1,R1,A1,power,newcapa,2040,0.50000000000
 solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
 solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2040,3.50000000000
 windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
 windturbine,R1,R1,A2,power,newcapa,2040,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,2.73270000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.81670000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,4.44580000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,1.81670000000
+gassupply1,R1,R1,A2,gas,newcapa,2040,4.44580000000
 heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,4.80560000000
+solarPV,R1,R1,A1,power,newcapa,2045,0.50000000000
+solarPV,R1,R1,A1,power,newcapa,2045,2.50000000000
+solarPV,R1,R1,A1,power,newcapa,2045,3.25000000000
+windturbine,R1,R1,A1,power,newcapa,2045,0.50000000000
 solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
 solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
+solarPV,R1,R1,A2,power,newcapa,2045,3.50000000000
+solarPV,R1,R1,A2,power,newcapa,2045,3.25000000000
 windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
 windturbine,R1,R1,A2,power,newcapa,2045,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,2.73270000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.81670000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,4.44580000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,1.81670000000
+gassupply1,R1,R1,A2,gas,newcapa,2045,4.44580000000
 heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,1.86110000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,4.80560000000
+solarPV,R1,R1,A1,power,newcapa,2050,0.50000000000
+solarPV,R1,R1,A1,power,newcapa,2050,2.50000000000
+solarPV,R1,R1,A1,power,newcapa,2050,3.25000000000
 solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
+windturbine,R1,R1,A1,power,newcapa,2050,0.50000000000
 solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
 solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.50000000000
+solarPV,R1,R1,A2,power,newcapa,2050,3.25000000000
+solarPV,R1,R1,A2,power,newcapa,2050,6.59370000000
 windturbine,R1,R1,A2,power,newcapa,2050,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,2.73270000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.81670000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,4.44580000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,1.81670000000
+gassupply1,R1,R1,A2,gas,newcapa,2050,4.44580000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 2c421efe..873be068 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.66080000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.76500000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.20840000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.99120000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.15110000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.33180000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66080000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76500000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.20840000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99120000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15110000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.33180000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98240000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.32370000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.78020000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32160000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.53960000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.46820000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.46760000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.83150000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.05050000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.05730000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.70270000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.25030000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09550000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.11110000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.46760000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.83150000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05050000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.05730000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70270000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.25030000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09550000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.11110000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.41340000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.51830000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31000000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.37430000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.93880000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.67100000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15380000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.18180000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54820000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.03830000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.04280000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.06560000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.82350000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.56020000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.07820000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.12970000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54820000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.03830000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04280000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06560000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82350000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.56020000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07820000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12970000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65440000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.13710000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24180000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.44860000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.09970000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.08400000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.12320000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.21480000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.57870000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.09510000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.86900000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.64500000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08550000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57870000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09510000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86900000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64500000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08550000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.74420000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30390000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27070000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.46860000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.16010000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.19640000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13610000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.22380000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.63150000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.20490000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04720000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.07220000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94820000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.80940000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.08820000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14460000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63150000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.20490000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04720000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07220000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94820000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.80940000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08820000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14460000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90160000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.63060000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28150000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50780000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.26540000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.41510000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14090000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.24130000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63780000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.30960000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04930000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.07640000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95740000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.96610000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09300000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.15400000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63780000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30960000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04930000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07640000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95740000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96610000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09300000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15400000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91920000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.94280000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30030000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.54530000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27750000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.62380000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14930000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.25800000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
index b3996630..56b5af9d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,16 @@
 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,8.37500000000
-1,2030,R1,windturbine,2020,8.37500000000
-1,2035,R1,windturbine,2020,8.37500000000
-1,2040,R1,windturbine,2020,8.37500000000
-1,2045,R1,windturbine,2020,8.37500000000
-1,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2025,R1,windturbine,2020,4.18750000000
+1,2030,R1,windturbine,2020,4.18750000000
+1,2035,R1,windturbine,2020,4.18750000000
+1,2040,R1,windturbine,2020,4.18750000000
+1,2045,R1,windturbine,2020,4.18750000000
+1,2049,R1,windturbine,2020,4.18750000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
index c1c8bb2b..0904cf42 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2025.csv
@@ -1,28 +1,39 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2064,R1,gasCCGT,2025,3.00000000000
-2,2030,R1,solarPV,2025,14.06250000000
-2,2035,R1,solarPV,2025,14.06250000000
-2,2040,R1,solarPV,2025,14.06250000000
-2,2045,R1,solarPV,2025,14.06250000000
-2,2049,R1,solarPV,2025,14.06250000000
-2,2050,R1,solarPV,2025,14.06250000000
-2,2054,R1,solarPV,2025,14.06250000000
-3,2025,R1,windturbine,2020,8.37500000000
-3,2030,R1,windturbine,2020,8.37500000000
-3,2035,R1,windturbine,2020,8.37500000000
-3,2040,R1,windturbine,2020,8.37500000000
-3,2045,R1,windturbine,2020,8.37500000000
-3,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2054,R1,gasCCGT,2020,1.86110000000
+0,2055,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2030,R1,gasCCGT,2025,4.80560000000
+1,2035,R1,gasCCGT,2025,4.80560000000
+1,2040,R1,gasCCGT,2025,4.80560000000
+1,2045,R1,gasCCGT,2025,4.80560000000
+1,2049,R1,gasCCGT,2025,4.80560000000
+1,2050,R1,gasCCGT,2025,4.80560000000
+1,2054,R1,gasCCGT,2025,4.80560000000
+1,2055,R1,gasCCGT,2025,4.80560000000
+1,2059,R1,gasCCGT,2025,4.80560000000
+1,2060,R1,gasCCGT,2025,4.80560000000
+1,2064,R1,gasCCGT,2025,4.80560000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2025,R1,windturbine,2020,4.18750000000
+3,2030,R1,windturbine,2020,4.18750000000
+3,2035,R1,windturbine,2020,4.18750000000
+3,2040,R1,windturbine,2020,4.18750000000
+3,2045,R1,windturbine,2020,4.18750000000
+3,2049,R1,windturbine,2020,4.18750000000
 4,2030,R1,windturbine,2025,0.81250000000
 4,2035,R1,windturbine,2025,0.81250000000
 4,2040,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
index 900647f7..79140747 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,38 +1,47 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,14.06250000000
-2,2035,R1,solarPV,2025,14.06250000000
-2,2040,R1,solarPV,2025,14.06250000000
-2,2045,R1,solarPV,2025,14.06250000000
-2,2049,R1,solarPV,2025,14.06250000000
-2,2050,R1,solarPV,2025,14.06250000000
-2,2054,R1,solarPV,2025,14.06250000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2025,R1,windturbine,2020,8.37500000000
-4,2030,R1,windturbine,2020,8.37500000000
-4,2035,R1,windturbine,2020,8.37500000000
-4,2040,R1,windturbine,2020,8.37500000000
-4,2045,R1,windturbine,2020,8.37500000000
-4,2049,R1,windturbine,2020,8.37500000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2054,R1,gasCCGT,2020,1.86110000000
+0,2055,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2030,R1,gasCCGT,2025,4.80560000000
+1,2035,R1,gasCCGT,2025,4.80560000000
+1,2040,R1,gasCCGT,2025,4.80560000000
+1,2045,R1,gasCCGT,2025,4.80560000000
+1,2049,R1,gasCCGT,2025,4.80560000000
+1,2050,R1,gasCCGT,2025,4.80560000000
+1,2054,R1,gasCCGT,2025,4.80560000000
+1,2055,R1,gasCCGT,2025,4.80560000000
+1,2059,R1,gasCCGT,2025,4.80560000000
+1,2060,R1,gasCCGT,2025,4.80560000000
+1,2064,R1,gasCCGT,2025,4.80560000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,2.00000000000
+3,2040,R1,solarPV,2030,2.00000000000
+3,2045,R1,solarPV,2030,2.00000000000
+3,2049,R1,solarPV,2030,2.00000000000
+3,2050,R1,solarPV,2030,2.00000000000
+3,2054,R1,solarPV,2030,2.00000000000
+3,2055,R1,solarPV,2030,2.00000000000
+3,2059,R1,solarPV,2030,2.00000000000
+4,2025,R1,windturbine,2020,4.18750000000
+4,2030,R1,windturbine,2020,4.18750000000
+4,2035,R1,windturbine,2020,4.18750000000
+4,2040,R1,windturbine,2020,4.18750000000
+4,2045,R1,windturbine,2020,4.18750000000
+4,2049,R1,windturbine,2020,4.18750000000
 5,2030,R1,windturbine,2025,0.81250000000
 5,2035,R1,windturbine,2025,0.81250000000
 5,2040,R1,windturbine,2025,0.81250000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
index 9cc10830..edc23870 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,32 +1,41 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,14.06250000000
-2,2035,R1,solarPV,2025,14.06250000000
-2,2040,R1,solarPV,2025,14.06250000000
-2,2045,R1,solarPV,2025,14.06250000000
-2,2049,R1,solarPV,2025,14.06250000000
-2,2050,R1,solarPV,2025,14.06250000000
-2,2054,R1,solarPV,2025,14.06250000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2054,R1,gasCCGT,2020,1.86110000000
+0,2055,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2030,R1,gasCCGT,2025,4.80560000000
+1,2035,R1,gasCCGT,2025,4.80560000000
+1,2040,R1,gasCCGT,2025,4.80560000000
+1,2045,R1,gasCCGT,2025,4.80560000000
+1,2049,R1,gasCCGT,2025,4.80560000000
+1,2050,R1,gasCCGT,2025,4.80560000000
+1,2054,R1,gasCCGT,2025,4.80560000000
+1,2055,R1,gasCCGT,2025,4.80560000000
+1,2059,R1,gasCCGT,2025,4.80560000000
+1,2060,R1,gasCCGT,2025,4.80560000000
+1,2064,R1,gasCCGT,2025,4.80560000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,2.00000000000
+3,2040,R1,solarPV,2030,2.00000000000
+3,2045,R1,solarPV,2030,2.00000000000
+3,2049,R1,solarPV,2030,2.00000000000
+3,2050,R1,solarPV,2030,2.00000000000
+3,2054,R1,solarPV,2030,2.00000000000
+3,2055,R1,solarPV,2030,2.00000000000
+3,2059,R1,solarPV,2030,2.00000000000
 4,2040,R1,solarPV,2035,6.00000000000
 4,2045,R1,solarPV,2035,6.00000000000
 4,2049,R1,solarPV,2035,6.00000000000
@@ -36,12 +45,12 @@ asset,year,region,technology,installed,capacity
 4,2059,R1,solarPV,2035,6.00000000000
 4,2060,R1,solarPV,2035,6.00000000000
 4,2064,R1,solarPV,2035,6.00000000000
-5,2025,R1,windturbine,2020,8.37500000000
-5,2030,R1,windturbine,2020,8.37500000000
-5,2035,R1,windturbine,2020,8.37500000000
-5,2040,R1,windturbine,2020,8.37500000000
-5,2045,R1,windturbine,2020,8.37500000000
-5,2049,R1,windturbine,2020,8.37500000000
+5,2025,R1,windturbine,2020,4.18750000000
+5,2030,R1,windturbine,2020,4.18750000000
+5,2035,R1,windturbine,2020,4.18750000000
+5,2040,R1,windturbine,2020,4.18750000000
+5,2045,R1,windturbine,2020,4.18750000000
+5,2049,R1,windturbine,2020,4.18750000000
 6,2030,R1,windturbine,2025,0.81250000000
 6,2035,R1,windturbine,2025,0.81250000000
 6,2040,R1,windturbine,2025,0.81250000000
@@ -49,3 +58,12 @@ asset,year,region,technology,installed,capacity
 6,2049,R1,windturbine,2025,0.81250000000
 6,2050,R1,windturbine,2025,0.81250000000
 6,2054,R1,windturbine,2025,0.81250000000
+7,2040,R1,windturbine,2035,0.50000000000
+7,2045,R1,windturbine,2035,0.50000000000
+7,2049,R1,windturbine,2035,0.50000000000
+7,2050,R1,windturbine,2035,0.50000000000
+7,2054,R1,windturbine,2035,0.50000000000
+7,2055,R1,windturbine,2035,0.50000000000
+7,2059,R1,windturbine,2035,0.50000000000
+7,2060,R1,windturbine,2035,0.50000000000
+7,2064,R1,windturbine,2035,0.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
index 073749d1..a7d7b331 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,32 +1,41 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,14.06250000000
-2,2035,R1,solarPV,2025,14.06250000000
-2,2040,R1,solarPV,2025,14.06250000000
-2,2045,R1,solarPV,2025,14.06250000000
-2,2049,R1,solarPV,2025,14.06250000000
-2,2050,R1,solarPV,2025,14.06250000000
-2,2054,R1,solarPV,2025,14.06250000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2054,R1,gasCCGT,2020,1.86110000000
+0,2055,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2030,R1,gasCCGT,2025,4.80560000000
+1,2035,R1,gasCCGT,2025,4.80560000000
+1,2040,R1,gasCCGT,2025,4.80560000000
+1,2045,R1,gasCCGT,2025,4.80560000000
+1,2049,R1,gasCCGT,2025,4.80560000000
+1,2050,R1,gasCCGT,2025,4.80560000000
+1,2054,R1,gasCCGT,2025,4.80560000000
+1,2055,R1,gasCCGT,2025,4.80560000000
+1,2059,R1,gasCCGT,2025,4.80560000000
+1,2060,R1,gasCCGT,2025,4.80560000000
+1,2064,R1,gasCCGT,2025,4.80560000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,2.00000000000
+3,2040,R1,solarPV,2030,2.00000000000
+3,2045,R1,solarPV,2030,2.00000000000
+3,2049,R1,solarPV,2030,2.00000000000
+3,2050,R1,solarPV,2030,2.00000000000
+3,2054,R1,solarPV,2030,2.00000000000
+3,2055,R1,solarPV,2030,2.00000000000
+3,2059,R1,solarPV,2030,2.00000000000
 4,2040,R1,solarPV,2035,6.00000000000
 4,2045,R1,solarPV,2035,6.00000000000
 4,2049,R1,solarPV,2035,6.00000000000
@@ -36,22 +45,22 @@ asset,year,region,technology,installed,capacity
 4,2059,R1,solarPV,2035,6.00000000000
 4,2060,R1,solarPV,2035,6.00000000000
 4,2064,R1,solarPV,2035,6.00000000000
-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,2025,R1,windturbine,2020,8.37500000000
-6,2030,R1,windturbine,2020,8.37500000000
-6,2035,R1,windturbine,2020,8.37500000000
-6,2040,R1,windturbine,2020,8.37500000000
-6,2045,R1,windturbine,2020,8.37500000000
-6,2049,R1,windturbine,2020,8.37500000000
+5,2045,R1,solarPV,2040,6.50000000000
+5,2049,R1,solarPV,2040,6.50000000000
+5,2050,R1,solarPV,2040,6.50000000000
+5,2054,R1,solarPV,2040,6.50000000000
+5,2055,R1,solarPV,2040,6.50000000000
+5,2059,R1,solarPV,2040,6.50000000000
+5,2060,R1,solarPV,2040,6.50000000000
+5,2064,R1,solarPV,2040,6.50000000000
+5,2065,R1,solarPV,2040,6.50000000000
+5,2069,R1,solarPV,2040,6.50000000000
+6,2025,R1,windturbine,2020,4.18750000000
+6,2030,R1,windturbine,2020,4.18750000000
+6,2035,R1,windturbine,2020,4.18750000000
+6,2040,R1,windturbine,2020,4.18750000000
+6,2045,R1,windturbine,2020,4.18750000000
+6,2049,R1,windturbine,2020,4.18750000000
 7,2030,R1,windturbine,2025,0.81250000000
 7,2035,R1,windturbine,2025,0.81250000000
 7,2040,R1,windturbine,2025,0.81250000000
@@ -59,3 +68,12 @@ asset,year,region,technology,installed,capacity
 7,2049,R1,windturbine,2025,0.81250000000
 7,2050,R1,windturbine,2025,0.81250000000
 7,2054,R1,windturbine,2025,0.81250000000
+8,2040,R1,windturbine,2035,0.50000000000
+8,2045,R1,windturbine,2035,0.50000000000
+8,2049,R1,windturbine,2035,0.50000000000
+8,2050,R1,windturbine,2035,0.50000000000
+8,2054,R1,windturbine,2035,0.50000000000
+8,2055,R1,windturbine,2035,0.50000000000
+8,2059,R1,windturbine,2035,0.50000000000
+8,2060,R1,windturbine,2035,0.50000000000
+8,2064,R1,windturbine,2035,0.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
index 60bb36ed..a1ea9d79 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2045.csv
@@ -1,32 +1,41 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,14.06250000000
-2,2035,R1,solarPV,2025,14.06250000000
-2,2040,R1,solarPV,2025,14.06250000000
-2,2045,R1,solarPV,2025,14.06250000000
-2,2049,R1,solarPV,2025,14.06250000000
-2,2050,R1,solarPV,2025,14.06250000000
-2,2054,R1,solarPV,2025,14.06250000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2054,R1,gasCCGT,2020,1.86110000000
+0,2055,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2030,R1,gasCCGT,2025,4.80560000000
+1,2035,R1,gasCCGT,2025,4.80560000000
+1,2040,R1,gasCCGT,2025,4.80560000000
+1,2045,R1,gasCCGT,2025,4.80560000000
+1,2049,R1,gasCCGT,2025,4.80560000000
+1,2050,R1,gasCCGT,2025,4.80560000000
+1,2054,R1,gasCCGT,2025,4.80560000000
+1,2055,R1,gasCCGT,2025,4.80560000000
+1,2059,R1,gasCCGT,2025,4.80560000000
+1,2060,R1,gasCCGT,2025,4.80560000000
+1,2064,R1,gasCCGT,2025,4.80560000000
+2,2030,R1,solarPV,2025,10.00000000000
+2,2035,R1,solarPV,2025,10.00000000000
+2,2040,R1,solarPV,2025,10.00000000000
+2,2045,R1,solarPV,2025,10.00000000000
+2,2049,R1,solarPV,2025,10.00000000000
+2,2050,R1,solarPV,2025,10.00000000000
+2,2054,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2030,2.00000000000
+3,2040,R1,solarPV,2030,2.00000000000
+3,2045,R1,solarPV,2030,2.00000000000
+3,2049,R1,solarPV,2030,2.00000000000
+3,2050,R1,solarPV,2030,2.00000000000
+3,2054,R1,solarPV,2030,2.00000000000
+3,2055,R1,solarPV,2030,2.00000000000
+3,2059,R1,solarPV,2030,2.00000000000
 4,2040,R1,solarPV,2035,6.00000000000
 4,2045,R1,solarPV,2035,6.00000000000
 4,2049,R1,solarPV,2035,6.00000000000
@@ -36,32 +45,33 @@ asset,year,region,technology,installed,capacity
 4,2059,R1,solarPV,2035,6.00000000000
 4,2060,R1,solarPV,2035,6.00000000000
 4,2064,R1,solarPV,2035,6.00000000000
-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,17.37500000000
-6,2054,R1,solarPV,2045,17.37500000000
-6,2055,R1,solarPV,2045,17.37500000000
-6,2059,R1,solarPV,2045,17.37500000000
-6,2060,R1,solarPV,2045,17.37500000000
-6,2064,R1,solarPV,2045,17.37500000000
-6,2065,R1,solarPV,2045,17.37500000000
-6,2069,R1,solarPV,2045,17.37500000000
-6,2070,R1,solarPV,2045,17.37500000000
-6,2074,R1,solarPV,2045,17.37500000000
-7,2025,R1,windturbine,2020,8.37500000000
-7,2030,R1,windturbine,2020,8.37500000000
-7,2035,R1,windturbine,2020,8.37500000000
-7,2040,R1,windturbine,2020,8.37500000000
-7,2045,R1,windturbine,2020,8.37500000000
-7,2049,R1,windturbine,2020,8.37500000000
+5,2045,R1,solarPV,2040,6.50000000000
+5,2049,R1,solarPV,2040,6.50000000000
+5,2050,R1,solarPV,2040,6.50000000000
+5,2054,R1,solarPV,2040,6.50000000000
+5,2055,R1,solarPV,2040,6.50000000000
+5,2059,R1,solarPV,2040,6.50000000000
+5,2060,R1,solarPV,2040,6.50000000000
+5,2064,R1,solarPV,2040,6.50000000000
+5,2065,R1,solarPV,2040,6.50000000000
+5,2069,R1,solarPV,2040,6.50000000000
+6,2049,R1,solarPV,2045,2.40000000000
+6,2050,R1,solarPV,2045,9.59380000000
+6,2054,R1,solarPV,2045,9.59380000000
+6,2055,R1,solarPV,2045,9.59380000000
+6,2059,R1,solarPV,2045,9.59380000000
+6,2060,R1,solarPV,2045,9.59380000000
+6,2064,R1,solarPV,2045,9.59380000000
+6,2065,R1,solarPV,2045,9.59380000000
+6,2069,R1,solarPV,2045,9.59380000000
+6,2070,R1,solarPV,2045,9.59380000000
+6,2074,R1,solarPV,2045,9.59380000000
+7,2025,R1,windturbine,2020,4.18750000000
+7,2030,R1,windturbine,2020,4.18750000000
+7,2035,R1,windturbine,2020,4.18750000000
+7,2040,R1,windturbine,2020,4.18750000000
+7,2045,R1,windturbine,2020,4.18750000000
+7,2049,R1,windturbine,2020,4.18750000000
 8,2030,R1,windturbine,2025,0.81250000000
 8,2035,R1,windturbine,2025,0.81250000000
 8,2040,R1,windturbine,2025,0.81250000000
@@ -69,3 +79,12 @@ asset,year,region,technology,installed,capacity
 8,2049,R1,windturbine,2025,0.81250000000
 8,2050,R1,windturbine,2025,0.81250000000
 8,2054,R1,windturbine,2025,0.81250000000
+9,2040,R1,windturbine,2035,0.50000000000
+9,2045,R1,windturbine,2035,0.50000000000
+9,2049,R1,windturbine,2035,0.50000000000
+9,2050,R1,windturbine,2035,0.50000000000
+9,2054,R1,windturbine,2035,0.50000000000
+9,2055,R1,windturbine,2035,0.50000000000
+9,2059,R1,windturbine,2035,0.50000000000
+9,2060,R1,windturbine,2035,0.50000000000
+9,2064,R1,windturbine,2035,0.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
index d2ea0694..73e8eaa4 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,81 +1,122 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
-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,2025,14.06250000000
-2,2035,R1,solarPV,2025,14.06250000000
-2,2040,R1,solarPV,2025,14.06250000000
-2,2045,R1,solarPV,2025,14.06250000000
-2,2049,R1,solarPV,2025,14.06250000000
-2,2050,R1,solarPV,2025,14.06250000000
-2,2054,R1,solarPV,2025,14.06250000000
-3,2035,R1,solarPV,2030,3.00000000000
-3,2040,R1,solarPV,2030,3.00000000000
-3,2045,R1,solarPV,2030,3.00000000000
-3,2049,R1,solarPV,2030,3.00000000000
-3,2050,R1,solarPV,2030,3.00000000000
-3,2054,R1,solarPV,2030,3.00000000000
-3,2055,R1,solarPV,2030,3.00000000000
-3,2059,R1,solarPV,2030,3.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2054,R1,solarPV,2035,6.00000000000
-4,2055,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-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,17.37500000000
-6,2054,R1,solarPV,2045,17.37500000000
-6,2055,R1,solarPV,2045,17.37500000000
-6,2059,R1,solarPV,2045,17.37500000000
-6,2060,R1,solarPV,2045,17.37500000000
-6,2064,R1,solarPV,2045,17.37500000000
-6,2065,R1,solarPV,2045,17.37500000000
-6,2069,R1,solarPV,2045,17.37500000000
-6,2070,R1,solarPV,2045,17.37500000000
-6,2074,R1,solarPV,2045,17.37500000000
-7,2055,R1,solarPV,2050,14.87500000000
-7,2059,R1,solarPV,2050,14.87500000000
-7,2060,R1,solarPV,2050,14.87500000000
-7,2064,R1,solarPV,2050,14.87500000000
-7,2065,R1,solarPV,2050,14.87500000000
-7,2069,R1,solarPV,2050,14.87500000000
-7,2070,R1,solarPV,2050,14.87500000000
-7,2074,R1,solarPV,2050,14.87500000000
-7,2075,R1,solarPV,2050,14.87500000000
-7,2079,R1,solarPV,2050,14.87500000000
-8,2025,R1,windturbine,2020,8.37500000000
-8,2030,R1,windturbine,2020,8.37500000000
-8,2035,R1,windturbine,2020,8.37500000000
-8,2040,R1,windturbine,2020,8.37500000000
-8,2045,R1,windturbine,2020,8.37500000000
-8,2049,R1,windturbine,2020,8.37500000000
-9,2030,R1,windturbine,2025,0.81250000000
-9,2035,R1,windturbine,2025,0.81250000000
-9,2040,R1,windturbine,2025,0.81250000000
-9,2045,R1,windturbine,2025,0.81250000000
-9,2049,R1,windturbine,2025,0.81250000000
-9,2050,R1,windturbine,2025,0.81250000000
-9,2054,R1,windturbine,2025,0.81250000000
+0,2025,R1,gasCCGT,2020,2.86110000000
+0,2030,R1,gasCCGT,2020,1.86110000000
+0,2035,R1,gasCCGT,2020,1.86110000000
+0,2040,R1,gasCCGT,2020,1.86110000000
+0,2045,R1,gasCCGT,2020,1.86110000000
+0,2049,R1,gasCCGT,2020,1.86110000000
+0,2050,R1,gasCCGT,2020,1.86110000000
+0,2054,R1,gasCCGT,2020,1.86110000000
+0,2055,R1,gasCCGT,2020,1.86110000000
+0,2059,R1,gasCCGT,2020,1.86110000000
+1,2030,R1,gasCCGT,2025,4.80560000000
+1,2035,R1,gasCCGT,2025,4.80560000000
+1,2040,R1,gasCCGT,2025,4.80560000000
+1,2045,R1,gasCCGT,2025,4.80560000000
+1,2049,R1,gasCCGT,2025,4.80560000000
+1,2050,R1,gasCCGT,2025,4.80560000000
+1,2054,R1,gasCCGT,2025,4.80560000000
+1,2055,R1,gasCCGT,2025,4.80560000000
+1,2059,R1,gasCCGT,2025,4.80560000000
+1,2060,R1,gasCCGT,2025,4.80560000000
+1,2064,R1,gasCCGT,2025,4.80560000000
+2,2055,R1,gasCCGT,2050,2.09030000000
+2,2059,R1,gasCCGT,2050,2.09030000000
+2,2060,R1,gasCCGT,2050,2.09030000000
+2,2064,R1,gasCCGT,2050,2.09030000000
+2,2065,R1,gasCCGT,2050,2.09030000000
+2,2069,R1,gasCCGT,2050,2.09030000000
+2,2070,R1,gasCCGT,2050,2.09030000000
+2,2074,R1,gasCCGT,2050,2.09030000000
+2,2075,R1,gasCCGT,2050,2.09030000000
+2,2079,R1,gasCCGT,2050,2.09030000000
+2,2080,R1,gasCCGT,2050,2.09030000000
+2,2089,R1,gasCCGT,2050,2.09030000000
+3,2030,R1,solarPV,2025,10.00000000000
+3,2035,R1,solarPV,2025,10.00000000000
+3,2040,R1,solarPV,2025,10.00000000000
+3,2045,R1,solarPV,2025,10.00000000000
+3,2049,R1,solarPV,2025,10.00000000000
+3,2050,R1,solarPV,2025,10.00000000000
+3,2054,R1,solarPV,2025,10.00000000000
+4,2035,R1,solarPV,2030,2.00000000000
+4,2040,R1,solarPV,2030,2.00000000000
+4,2045,R1,solarPV,2030,2.00000000000
+4,2049,R1,solarPV,2030,2.00000000000
+4,2050,R1,solarPV,2030,2.00000000000
+4,2054,R1,solarPV,2030,2.00000000000
+4,2055,R1,solarPV,2030,2.00000000000
+4,2059,R1,solarPV,2030,2.00000000000
+5,2040,R1,solarPV,2035,6.00000000000
+5,2045,R1,solarPV,2035,6.00000000000
+5,2049,R1,solarPV,2035,6.00000000000
+5,2050,R1,solarPV,2035,6.00000000000
+5,2054,R1,solarPV,2035,6.00000000000
+5,2055,R1,solarPV,2035,6.00000000000
+5,2059,R1,solarPV,2035,6.00000000000
+5,2060,R1,solarPV,2035,6.00000000000
+5,2064,R1,solarPV,2035,6.00000000000
+6,2045,R1,solarPV,2040,6.50000000000
+6,2049,R1,solarPV,2040,6.50000000000
+6,2050,R1,solarPV,2040,6.50000000000
+6,2054,R1,solarPV,2040,6.50000000000
+6,2055,R1,solarPV,2040,6.50000000000
+6,2059,R1,solarPV,2040,6.50000000000
+6,2060,R1,solarPV,2040,6.50000000000
+6,2064,R1,solarPV,2040,6.50000000000
+6,2065,R1,solarPV,2040,6.50000000000
+6,2069,R1,solarPV,2040,6.50000000000
+7,2049,R1,solarPV,2045,2.40000000000
+7,2050,R1,solarPV,2045,9.59380000000
+7,2054,R1,solarPV,2045,9.59380000000
+7,2055,R1,solarPV,2045,9.59380000000
+7,2059,R1,solarPV,2045,9.59380000000
+7,2060,R1,solarPV,2045,9.59380000000
+7,2064,R1,solarPV,2045,9.59380000000
+7,2065,R1,solarPV,2045,9.59380000000
+7,2069,R1,solarPV,2045,9.59380000000
+7,2070,R1,solarPV,2045,9.59380000000
+7,2074,R1,solarPV,2045,9.59380000000
+8,2055,R1,solarPV,2050,10.00000000000
+8,2059,R1,solarPV,2050,10.00000000000
+8,2060,R1,solarPV,2050,10.00000000000
+8,2064,R1,solarPV,2050,10.00000000000
+8,2065,R1,solarPV,2050,10.00000000000
+8,2069,R1,solarPV,2050,10.00000000000
+8,2070,R1,solarPV,2050,10.00000000000
+8,2074,R1,solarPV,2050,10.00000000000
+8,2075,R1,solarPV,2050,10.00000000000
+8,2079,R1,solarPV,2050,10.00000000000
+9,2025,R1,windturbine,2020,4.18750000000
+9,2030,R1,windturbine,2020,4.18750000000
+9,2035,R1,windturbine,2020,4.18750000000
+9,2040,R1,windturbine,2020,4.18750000000
+9,2045,R1,windturbine,2020,4.18750000000
+9,2049,R1,windturbine,2020,4.18750000000
+10,2030,R1,windturbine,2025,0.81250000000
+10,2035,R1,windturbine,2025,0.81250000000
+10,2040,R1,windturbine,2025,0.81250000000
+10,2045,R1,windturbine,2025,0.81250000000
+10,2049,R1,windturbine,2025,0.81250000000
+10,2050,R1,windturbine,2025,0.81250000000
+10,2054,R1,windturbine,2025,0.81250000000
+11,2040,R1,windturbine,2035,0.50000000000
+11,2045,R1,windturbine,2035,0.50000000000
+11,2049,R1,windturbine,2035,0.50000000000
+11,2050,R1,windturbine,2035,0.50000000000
+11,2054,R1,windturbine,2035,0.50000000000
+11,2055,R1,windturbine,2035,0.50000000000
+11,2059,R1,windturbine,2035,0.50000000000
+11,2060,R1,windturbine,2035,0.50000000000
+11,2064,R1,windturbine,2035,0.50000000000
+12,2055,R1,windturbine,2050,4.87500000000
+12,2059,R1,windturbine,2050,4.87500000000
+12,2060,R1,windturbine,2050,4.87500000000
+12,2064,R1,windturbine,2050,4.87500000000
+12,2065,R1,windturbine,2050,4.87500000000
+12,2069,R1,windturbine,2050,4.87500000000
+12,2070,R1,windturbine,2050,4.87500000000
+12,2074,R1,windturbine,2050,4.87500000000
+12,2075,R1,windturbine,2050,4.87500000000
+12,2079,R1,windturbine,2050,4.87500000000
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 1d028468..a9f8dab3 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,17 @@
 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
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
 1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,15.00000000000
-1,2030,R2,gassupply1,2020,7.50000000000
+1,2025,R2,gassupply1,2020,16.46440000000
+1,2030,R2,gassupply1,2020,8.96440000000
+1,2035,R2,gassupply1,2020,1.46440000000
+1,2040,R2,gassupply1,2020,1.46440000000
+1,2045,R2,gassupply1,2020,1.46440000000
+1,2050,R2,gassupply1,2020,1.46440000000
+1,2059,R2,gassupply1,2020,1.46440000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
index 71e5a914..0435bbe2 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2025.csv
@@ -1,19 +1,33 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2030,R2,gassupply1,2025,2.33440000000
-3,2035,R2,gassupply1,2025,2.33440000000
-3,2040,R2,gassupply1,2025,2.33440000000
-3,2045,R2,gassupply1,2025,2.33440000000
-3,2050,R2,gassupply1,2025,2.33440000000
-3,2064,R2,gassupply1,2025,2.33440000000
+2,2025,R2,gassupply1,2020,16.46440000000
+2,2030,R2,gassupply1,2020,8.96440000000
+2,2035,R2,gassupply1,2020,1.46440000000
+2,2040,R2,gassupply1,2020,1.46440000000
+2,2045,R2,gassupply1,2020,1.46440000000
+2,2050,R2,gassupply1,2020,1.46440000000
+2,2059,R2,gassupply1,2020,1.46440000000
+3,2030,R2,gassupply1,2025,9.22000000000
+3,2035,R2,gassupply1,2025,9.22000000000
+3,2040,R2,gassupply1,2025,9.22000000000
+3,2045,R2,gassupply1,2025,9.22000000000
+3,2050,R2,gassupply1,2025,9.22000000000
+3,2059,R2,gassupply1,2025,9.22000000000
+3,2060,R2,gassupply1,2025,9.22000000000
+3,2064,R2,gassupply1,2025,9.22000000000
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 00107563..0fc96ab8 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,33 +1,51 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.33440000000
-4,2035,R2,gassupply1,2025,2.33440000000
-4,2040,R2,gassupply1,2025,2.33440000000
-4,2045,R2,gassupply1,2025,2.33440000000
-4,2050,R2,gassupply1,2025,2.33440000000
-4,2064,R2,gassupply1,2025,2.33440000000
+3,2025,R2,gassupply1,2020,16.46440000000
+3,2030,R2,gassupply1,2020,8.96440000000
+3,2035,R2,gassupply1,2020,1.46440000000
+3,2040,R2,gassupply1,2020,1.46440000000
+3,2045,R2,gassupply1,2020,1.46440000000
+3,2050,R2,gassupply1,2020,1.46440000000
+3,2059,R2,gassupply1,2020,1.46440000000
+4,2030,R2,gassupply1,2025,9.22000000000
+4,2035,R2,gassupply1,2025,9.22000000000
+4,2040,R2,gassupply1,2025,9.22000000000
+4,2045,R2,gassupply1,2025,9.22000000000
+4,2050,R2,gassupply1,2025,9.22000000000
+4,2059,R2,gassupply1,2025,9.22000000000
+4,2060,R2,gassupply1,2025,9.22000000000
+4,2064,R2,gassupply1,2025,9.22000000000
 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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 00107563..0fc96ab8 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,33 +1,51 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.33440000000
-4,2035,R2,gassupply1,2025,2.33440000000
-4,2040,R2,gassupply1,2025,2.33440000000
-4,2045,R2,gassupply1,2025,2.33440000000
-4,2050,R2,gassupply1,2025,2.33440000000
-4,2064,R2,gassupply1,2025,2.33440000000
+3,2025,R2,gassupply1,2020,16.46440000000
+3,2030,R2,gassupply1,2020,8.96440000000
+3,2035,R2,gassupply1,2020,1.46440000000
+3,2040,R2,gassupply1,2020,1.46440000000
+3,2045,R2,gassupply1,2020,1.46440000000
+3,2050,R2,gassupply1,2020,1.46440000000
+3,2059,R2,gassupply1,2020,1.46440000000
+4,2030,R2,gassupply1,2025,9.22000000000
+4,2035,R2,gassupply1,2025,9.22000000000
+4,2040,R2,gassupply1,2025,9.22000000000
+4,2045,R2,gassupply1,2025,9.22000000000
+4,2050,R2,gassupply1,2025,9.22000000000
+4,2059,R2,gassupply1,2025,9.22000000000
+4,2060,R2,gassupply1,2025,9.22000000000
+4,2064,R2,gassupply1,2025,9.22000000000
 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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 00107563..0fc96ab8 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,33 +1,51 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.33440000000
-4,2035,R2,gassupply1,2025,2.33440000000
-4,2040,R2,gassupply1,2025,2.33440000000
-4,2045,R2,gassupply1,2025,2.33440000000
-4,2050,R2,gassupply1,2025,2.33440000000
-4,2064,R2,gassupply1,2025,2.33440000000
+3,2025,R2,gassupply1,2020,16.46440000000
+3,2030,R2,gassupply1,2020,8.96440000000
+3,2035,R2,gassupply1,2020,1.46440000000
+3,2040,R2,gassupply1,2020,1.46440000000
+3,2045,R2,gassupply1,2020,1.46440000000
+3,2050,R2,gassupply1,2020,1.46440000000
+3,2059,R2,gassupply1,2020,1.46440000000
+4,2030,R2,gassupply1,2025,9.22000000000
+4,2035,R2,gassupply1,2025,9.22000000000
+4,2040,R2,gassupply1,2025,9.22000000000
+4,2045,R2,gassupply1,2025,9.22000000000
+4,2050,R2,gassupply1,2025,9.22000000000
+4,2059,R2,gassupply1,2025,9.22000000000
+4,2060,R2,gassupply1,2025,9.22000000000
+4,2064,R2,gassupply1,2025,9.22000000000
 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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 a585b562..0fc96ab8 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,45 +1,51 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2050,R1,gassupply1,2045,1.02060000000
-3,2064,R1,gassupply1,2045,1.02060000000
-3,2065,R1,gassupply1,2045,1.02060000000
-3,2069,R1,gassupply1,2045,1.02060000000
-3,2070,R1,gassupply1,2045,1.02060000000
-3,2084,R1,gassupply1,2045,1.02060000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,2.33440000000
-5,2035,R2,gassupply1,2025,2.33440000000
-5,2040,R2,gassupply1,2025,2.33440000000
-5,2045,R2,gassupply1,2025,2.33440000000
-5,2050,R2,gassupply1,2025,2.33440000000
-5,2064,R2,gassupply1,2025,2.33440000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,1.02060000000
-7,2064,R2,gassupply1,2045,1.02060000000
-7,2065,R2,gassupply1,2045,1.02060000000
-7,2069,R2,gassupply1,2045,1.02060000000
-7,2070,R2,gassupply1,2045,1.02060000000
-7,2084,R2,gassupply1,2045,1.02060000000
+3,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,16.46440000000
+3,2030,R2,gassupply1,2020,8.96440000000
+3,2035,R2,gassupply1,2020,1.46440000000
+3,2040,R2,gassupply1,2020,1.46440000000
+3,2045,R2,gassupply1,2020,1.46440000000
+3,2050,R2,gassupply1,2020,1.46440000000
+3,2059,R2,gassupply1,2020,1.46440000000
+4,2030,R2,gassupply1,2025,9.22000000000
+4,2035,R2,gassupply1,2025,9.22000000000
+4,2040,R2,gassupply1,2025,9.22000000000
+4,2045,R2,gassupply1,2025,9.22000000000
+4,2050,R2,gassupply1,2025,9.22000000000
+4,2059,R2,gassupply1,2025,9.22000000000
+4,2060,R2,gassupply1,2025,9.22000000000
+4,2064,R2,gassupply1,2025,9.22000000000
+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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 a585b562..0fc96ab8 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,45 +1,51 @@
 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,2030,R1,gassupply1,2025,2.33440000000
-1,2035,R1,gassupply1,2025,2.33440000000
-1,2040,R1,gassupply1,2025,2.33440000000
-1,2045,R1,gassupply1,2025,2.33440000000
-1,2050,R1,gassupply1,2025,2.33440000000
-1,2064,R1,gassupply1,2025,2.33440000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,9.22000000000
+1,2035,R1,gassupply1,2025,9.22000000000
+1,2040,R1,gassupply1,2025,9.22000000000
+1,2045,R1,gassupply1,2025,9.22000000000
+1,2050,R1,gassupply1,2025,9.22000000000
+1,2059,R1,gassupply1,2025,9.22000000000
+1,2060,R1,gassupply1,2025,9.22000000000
+1,2064,R1,gassupply1,2025,9.22000000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2050,R1,gassupply1,2045,1.02060000000
-3,2064,R1,gassupply1,2045,1.02060000000
-3,2065,R1,gassupply1,2045,1.02060000000
-3,2069,R1,gassupply1,2045,1.02060000000
-3,2070,R1,gassupply1,2045,1.02060000000
-3,2084,R1,gassupply1,2045,1.02060000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,2.33440000000
-5,2035,R2,gassupply1,2025,2.33440000000
-5,2040,R2,gassupply1,2025,2.33440000000
-5,2045,R2,gassupply1,2025,2.33440000000
-5,2050,R2,gassupply1,2025,2.33440000000
-5,2064,R2,gassupply1,2025,2.33440000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,1.02060000000
-7,2064,R2,gassupply1,2045,1.02060000000
-7,2065,R2,gassupply1,2045,1.02060000000
-7,2069,R2,gassupply1,2045,1.02060000000
-7,2070,R2,gassupply1,2045,1.02060000000
-7,2084,R2,gassupply1,2045,1.02060000000
+3,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,16.46440000000
+3,2030,R2,gassupply1,2020,8.96440000000
+3,2035,R2,gassupply1,2020,1.46440000000
+3,2040,R2,gassupply1,2020,1.46440000000
+3,2045,R2,gassupply1,2020,1.46440000000
+3,2050,R2,gassupply1,2020,1.46440000000
+3,2059,R2,gassupply1,2020,1.46440000000
+4,2030,R2,gassupply1,2025,9.22000000000
+4,2035,R2,gassupply1,2025,9.22000000000
+4,2040,R2,gassupply1,2025,9.22000000000
+4,2045,R2,gassupply1,2025,9.22000000000
+4,2050,R2,gassupply1,2025,9.22000000000
+4,2059,R2,gassupply1,2025,9.22000000000
+4,2060,R2,gassupply1,2025,9.22000000000
+4,2064,R2,gassupply1,2025,9.22000000000
+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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 19cab0f3..40ae2eea 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
@@ -9,97 +9,107 @@ gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,5.50000000000
+gasCCGT,R2,R2,A1,power,newcapa,2025,6.00000000000
+windturbine,R2,R2,A1,power,newcapa,2025,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,16.46440000000
+gassupply1,R2,R2,A1,gas,newcapa,2025,16.46440000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,19.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,10.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,5.50000000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,5.88890000000
-windturbine,R2,R2,A1,power,newcapa,2030,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.33440000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,2.33440000000
+windturbine,R2,R2,A1,power,newcapa,2030,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,8.96440000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.22000000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,8.96440000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,9.22000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,10.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,26.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
 solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,5.50000000000
+gasCCGT,R2,R2,A1,power,newcapa,2035,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2035,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2035,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2035,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.33440000000
+windturbine,R2,R2,A1,power,newcapa,2035,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,1.46440000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,9.22000000000
 gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,26.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,16.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,5.50000000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2040,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.33440000000
+windturbine,R2,R2,A1,power,newcapa,2040,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,1.46440000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,9.22000000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,16.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,32.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,5.50000000000
+gasCCGT,R2,R2,A1,power,newcapa,2045,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2045,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2045,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.33440000000
+windturbine,R2,R2,A1,power,newcapa,2045,5.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,1.46440000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,9.22000000000
 gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,32.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,1.50000000000
+gasCCGT,R2,R2,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2050,5.88890000000
 solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,12.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.33440000000
+windturbine,R2,R2,A1,power,newcapa,2050,1.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.46440000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,9.22000000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.02060000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,2.33440000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,1.46440000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,9.22000000000
 gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,1.02060000000
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 075509a8..1360cbb7 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
@@ -47,291 +47,291 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.86840000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.86840000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21170000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.21170000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.30670000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,1.30670000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.33920000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,0.33920000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86840000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.86840000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21170000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.21170000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.30670000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.30670000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.33920000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.33920000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63870000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.63870000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.81010000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.81010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,1.74790000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.48140000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,0.48140000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.75430000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.75430000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.24960000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,1.24960000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04190000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.04190000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07400000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.07400000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13400000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.13400000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.87930000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.87930000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07620000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.07620000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.14880000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.14880000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75430000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.75430000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.24960000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.24960000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04190000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.04190000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07400000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.07400000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13400000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.13400000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.87930000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.87930000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07620000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07620000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14880000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.14880000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.28370000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.28370000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.78760000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.78760000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23270000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23270000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.52670000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.52670000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.51550000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.51550000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.51220000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,2.51220000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11950000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.11950000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.24910000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.24910000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.85060000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.85060000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.42920000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,1.42920000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05420000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.05420000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08120000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.08120000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.27810000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,1.27810000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.14790000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,2.14790000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10410000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.10410000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.16490000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.16490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85060000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.85060000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.42920000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.42920000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05420000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.05420000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08120000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.08120000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27810000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27810000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.14790000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,2.14790000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10410000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.10410000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16490000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.16490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.56920000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.56920000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.31990000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.31990000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34620000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.34620000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.59050000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.59050000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.70700000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.70700000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.86920000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,2.86920000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.16930000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.16930000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.27760000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.27760000000,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.91780000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.91780000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.55590000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,1.55590000000,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.05810000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.05810000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.08630000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.08630000000,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,1.37860000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.37860000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,2.33730000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,2.33730000000,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.11280000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.11280000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.17630000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.17630000000,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.91780000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.91780000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.55590000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.55590000000,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.05810000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.05810000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08630000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.08630000000,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,1.37860000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.37860000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.33730000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,2.33730000000,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.11280000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11280000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17630000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.17630000000,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,2.76830000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.76830000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.69520000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.69520000000,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.38050000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.38050000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.63560000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.63560000000,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.84060000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.84060000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,3.12090000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,3.12090000000,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.18470000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.18470000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.29780000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.29780000000,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,1.02570000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,1.02570000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.75850000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,1.75850000000,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.06080000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.06080000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.09440000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.09440000000,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,1.54020000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.54020000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.64080000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,2.64080000000,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.11880000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.11880000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.19450000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.19450000000,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,1.02570000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.02570000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.75850000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.75850000000,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.06080000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.06080000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09440000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.09440000000,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,1.54020000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.54020000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.64080000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,2.64080000000,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.11880000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11880000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19450000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.19450000000,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,3.09030000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.09030000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.29960000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,5.29960000000,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.40430000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.40430000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.70810000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.70810000000,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,2.05580000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,2.05580000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.52500000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,3.52500000000,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.19530000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.19530000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.33010000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.33010000000,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,1.20520000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,1.20520000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.91390000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,1.91390000000,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.06510000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.06510000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.10060000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.10060000000,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,1.80940000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.80940000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.87360000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,2.87360000000,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.12850000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.12850000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.20850000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.20850000000,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,1.20520000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.20520000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.91390000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,1.91390000000,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.06510000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.06510000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10060000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.10060000000,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,1.80940000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.80940000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.87360000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,2.87360000000,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.12850000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12850000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.20850000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.20850000000,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,3.62830000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.62830000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.76330000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,5.76330000000,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.44300000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.44300000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.76370000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.76370000000,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,2.41460000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,2.41460000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.83500000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,3.83500000000,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.21260000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.21260000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.35490000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.35490000000,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 7cbcccfb..230d1544 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,31 @@
 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
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
+1,2025,R1,windturbine,2020,5.50000000000
+1,2030,R1,windturbine,2020,5.50000000000
+1,2035,R1,windturbine,2020,5.50000000000
+1,2040,R1,windturbine,2020,5.50000000000
+1,2045,R1,windturbine,2020,5.50000000000
+1,2049,R1,windturbine,2020,5.50000000000
+2,2020,R2,gasCCGT,2020,1.00000000000
+2,2025,R2,gasCCGT,2020,6.00000000000
+2,2030,R2,gasCCGT,2020,5.00000000000
+2,2035,R2,gasCCGT,2020,5.00000000000
+2,2040,R2,gasCCGT,2020,5.00000000000
+2,2045,R2,gasCCGT,2020,5.00000000000
+2,2049,R2,gasCCGT,2020,5.00000000000
+2,2050,R2,gasCCGT,2020,5.00000000000
+2,2059,R2,gasCCGT,2020,5.00000000000
+3,2025,R2,windturbine,2020,5.50000000000
+3,2030,R2,windturbine,2020,5.50000000000
+3,2035,R2,windturbine,2020,5.50000000000
+3,2040,R2,windturbine,2020,5.50000000000
+3,2045,R2,windturbine,2020,5.50000000000
+3,2049,R2,windturbine,2020,5.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
index fedff132..d8d5ff9a 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2025.csv
@@ -1,37 +1,49 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
 1,2045,R1,gasCCGT,2025,5.88890000000
 1,2049,R1,gasCCGT,2025,5.88890000000
 1,2050,R1,gasCCGT,2025,5.88890000000
+1,2059,R1,gasCCGT,2025,5.88890000000
+1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2025,R1,windturbine,2020,10.00000000000
-3,2030,R1,windturbine,2020,10.00000000000
-3,2035,R1,windturbine,2020,10.00000000000
-3,2040,R1,windturbine,2020,10.00000000000
-3,2045,R1,windturbine,2020,10.00000000000
-3,2049,R1,windturbine,2020,10.00000000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
-5,2030,R2,gasCCGT,2025,5.88890000000
-5,2035,R2,gasCCGT,2025,5.88890000000
-5,2040,R2,gasCCGT,2025,5.88890000000
-5,2045,R2,gasCCGT,2025,5.88890000000
-5,2049,R2,gasCCGT,2025,5.88890000000
-5,2050,R2,gasCCGT,2025,5.88890000000
-5,2064,R2,gasCCGT,2025,5.88890000000
-6,2025,R2,windturbine,2020,16.75000000000
-6,2030,R2,windturbine,2020,16.75000000000
-6,2035,R2,windturbine,2020,16.75000000000
-6,2040,R2,windturbine,2020,16.75000000000
-6,2045,R2,windturbine,2020,16.75000000000
-6,2049,R2,windturbine,2020,16.75000000000
+2,2025,R1,windturbine,2020,5.50000000000
+2,2030,R1,windturbine,2020,5.50000000000
+2,2035,R1,windturbine,2020,5.50000000000
+2,2040,R1,windturbine,2020,5.50000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,6.00000000000
+3,2030,R2,gasCCGT,2020,5.00000000000
+3,2035,R2,gasCCGT,2020,5.00000000000
+3,2040,R2,gasCCGT,2020,5.00000000000
+3,2045,R2,gasCCGT,2020,5.00000000000
+3,2049,R2,gasCCGT,2020,5.00000000000
+3,2050,R2,gasCCGT,2020,5.00000000000
+3,2059,R2,gasCCGT,2020,5.00000000000
+4,2030,R2,gasCCGT,2025,5.88890000000
+4,2035,R2,gasCCGT,2025,5.88890000000
+4,2040,R2,gasCCGT,2025,5.88890000000
+4,2045,R2,gasCCGT,2025,5.88890000000
+4,2049,R2,gasCCGT,2025,5.88890000000
+4,2050,R2,gasCCGT,2025,5.88890000000
+4,2059,R2,gasCCGT,2025,5.88890000000
+4,2060,R2,gasCCGT,2025,5.88890000000
+4,2064,R2,gasCCGT,2025,5.88890000000
+5,2025,R2,windturbine,2020,5.50000000000
+5,2030,R2,windturbine,2020,5.50000000000
+5,2035,R2,windturbine,2020,5.50000000000
+5,2040,R2,windturbine,2020,5.50000000000
+5,2045,R2,windturbine,2020,5.50000000000
+5,2049,R2,windturbine,2020,5.50000000000
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 1ca9071a..a1f378b9 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,44 +17,45 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2025,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2020,10.00000000000
-4,2035,R1,windturbine,2020,10.00000000000
-4,2040,R1,windturbine,2020,10.00000000000
-4,2045,R1,windturbine,2020,10.00000000000
-4,2049,R1,windturbine,2020,10.00000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-6,2030,R2,gasCCGT,2025,5.88890000000
-6,2035,R2,gasCCGT,2025,5.88890000000
-6,2040,R2,gasCCGT,2025,5.88890000000
-6,2045,R2,gasCCGT,2025,5.88890000000
-6,2049,R2,gasCCGT,2025,5.88890000000
-6,2050,R2,gasCCGT,2025,5.88890000000
-6,2059,R2,gasCCGT,2025,5.88890000000
-6,2060,R2,gasCCGT,2025,5.88890000000
-6,2064,R2,gasCCGT,2025,5.88890000000
-7,2035,R2,solarPV,2030,6.00000000000
-7,2040,R2,solarPV,2030,6.00000000000
-7,2045,R2,solarPV,2030,6.00000000000
-7,2049,R2,solarPV,2030,6.00000000000
-7,2050,R2,solarPV,2030,6.00000000000
-7,2059,R2,solarPV,2030,6.00000000000
-8,2025,R2,windturbine,2020,16.75000000000
-8,2030,R2,windturbine,2020,16.75000000000
-8,2035,R2,windturbine,2020,16.75000000000
-8,2040,R2,windturbine,2020,16.75000000000
-8,2045,R2,windturbine,2020,16.75000000000
-8,2049,R2,windturbine,2020,16.75000000000
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2025,R1,windturbine,2020,5.50000000000
+3,2030,R1,windturbine,2020,5.50000000000
+3,2035,R1,windturbine,2020,5.50000000000
+3,2040,R1,windturbine,2020,5.50000000000
+3,2045,R1,windturbine,2020,5.50000000000
+3,2049,R1,windturbine,2020,5.50000000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,6.00000000000
+4,2030,R2,gasCCGT,2020,5.00000000000
+4,2035,R2,gasCCGT,2020,5.00000000000
+4,2040,R2,gasCCGT,2020,5.00000000000
+4,2045,R2,gasCCGT,2020,5.00000000000
+4,2049,R2,gasCCGT,2020,5.00000000000
+4,2050,R2,gasCCGT,2020,5.00000000000
+4,2059,R2,gasCCGT,2020,5.00000000000
+5,2030,R2,gasCCGT,2025,5.88890000000
+5,2035,R2,gasCCGT,2025,5.88890000000
+5,2040,R2,gasCCGT,2025,5.88890000000
+5,2045,R2,gasCCGT,2025,5.88890000000
+5,2049,R2,gasCCGT,2025,5.88890000000
+5,2050,R2,gasCCGT,2025,5.88890000000
+5,2059,R2,gasCCGT,2025,5.88890000000
+5,2060,R2,gasCCGT,2025,5.88890000000
+5,2064,R2,gasCCGT,2025,5.88890000000
+6,2035,R2,solarPV,2030,6.00000000000
+6,2040,R2,solarPV,2030,6.00000000000
+6,2045,R2,solarPV,2030,6.00000000000
+6,2049,R2,solarPV,2030,6.00000000000
+6,2050,R2,solarPV,2030,6.00000000000
+6,2059,R2,solarPV,2030,6.00000000000
+7,2025,R2,windturbine,2020,5.50000000000
+7,2030,R2,windturbine,2020,5.50000000000
+7,2035,R2,windturbine,2020,5.50000000000
+7,2040,R2,windturbine,2020,5.50000000000
+7,2045,R2,windturbine,2020,5.50000000000
+7,2049,R2,windturbine,2020,5.50000000000
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 7f59af05..22f75e3b 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,58 +17,59 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-5,2025,R1,windturbine,2020,10.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
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,gasCCGT,2025,5.88890000000
-7,2035,R2,gasCCGT,2025,5.88890000000
-7,2040,R2,gasCCGT,2025,5.88890000000
-7,2045,R2,gasCCGT,2025,5.88890000000
-7,2049,R2,gasCCGT,2025,5.88890000000
-7,2050,R2,gasCCGT,2025,5.88890000000
-7,2059,R2,gasCCGT,2025,5.88890000000
-7,2060,R2,gasCCGT,2025,5.88890000000
-7,2064,R2,gasCCGT,2025,5.88890000000
-8,2035,R2,solarPV,2030,6.00000000000
-8,2040,R2,solarPV,2030,6.00000000000
-8,2045,R2,solarPV,2030,6.00000000000
-8,2049,R2,solarPV,2030,6.00000000000
-8,2050,R2,solarPV,2030,6.00000000000
-8,2059,R2,solarPV,2030,6.00000000000
-9,2040,R2,solarPV,2035,6.00000000000
-9,2045,R2,solarPV,2035,6.00000000000
-9,2049,R2,solarPV,2035,6.00000000000
-9,2050,R2,solarPV,2035,6.00000000000
-9,2059,R2,solarPV,2035,6.00000000000
-9,2060,R2,solarPV,2035,6.00000000000
-9,2064,R2,solarPV,2035,6.00000000000
-10,2025,R2,windturbine,2020,16.75000000000
-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
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2025,R1,windturbine,2020,5.50000000000
+4,2030,R1,windturbine,2020,5.50000000000
+4,2035,R1,windturbine,2020,5.50000000000
+4,2040,R1,windturbine,2020,5.50000000000
+4,2045,R1,windturbine,2020,5.50000000000
+4,2049,R1,windturbine,2020,5.50000000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,6.00000000000
+5,2030,R2,gasCCGT,2020,5.00000000000
+5,2035,R2,gasCCGT,2020,5.00000000000
+5,2040,R2,gasCCGT,2020,5.00000000000
+5,2045,R2,gasCCGT,2020,5.00000000000
+5,2049,R2,gasCCGT,2020,5.00000000000
+5,2050,R2,gasCCGT,2020,5.00000000000
+5,2059,R2,gasCCGT,2020,5.00000000000
+6,2030,R2,gasCCGT,2025,5.88890000000
+6,2035,R2,gasCCGT,2025,5.88890000000
+6,2040,R2,gasCCGT,2025,5.88890000000
+6,2045,R2,gasCCGT,2025,5.88890000000
+6,2049,R2,gasCCGT,2025,5.88890000000
+6,2050,R2,gasCCGT,2025,5.88890000000
+6,2059,R2,gasCCGT,2025,5.88890000000
+6,2060,R2,gasCCGT,2025,5.88890000000
+6,2064,R2,gasCCGT,2025,5.88890000000
+7,2035,R2,solarPV,2030,6.00000000000
+7,2040,R2,solarPV,2030,6.00000000000
+7,2045,R2,solarPV,2030,6.00000000000
+7,2049,R2,solarPV,2030,6.00000000000
+7,2050,R2,solarPV,2030,6.00000000000
+7,2059,R2,solarPV,2030,6.00000000000
+8,2040,R2,solarPV,2035,6.00000000000
+8,2045,R2,solarPV,2035,6.00000000000
+8,2049,R2,solarPV,2035,6.00000000000
+8,2050,R2,solarPV,2035,6.00000000000
+8,2059,R2,solarPV,2035,6.00000000000
+8,2060,R2,solarPV,2035,6.00000000000
+8,2064,R2,solarPV,2035,6.00000000000
+9,2025,R2,windturbine,2020,5.50000000000
+9,2030,R2,windturbine,2020,5.50000000000
+9,2035,R2,windturbine,2020,5.50000000000
+9,2040,R2,windturbine,2020,5.50000000000
+9,2045,R2,windturbine,2020,5.50000000000
+9,2049,R2,windturbine,2020,5.50000000000
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 f5a4e19c..8dd1d23f 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,74 +17,75 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2025,R1,solarPV,2020,6.75000000000
-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,2035,R1,solarPV,2030,6.00000000000
-3,2040,R1,solarPV,2030,6.00000000000
-3,2045,R1,solarPV,2030,6.00000000000
-3,2049,R1,solarPV,2030,6.00000000000
-3,2050,R1,solarPV,2030,6.00000000000
-3,2059,R1,solarPV,2030,6.00000000000
-4,2040,R1,solarPV,2035,6.00000000000
-4,2045,R1,solarPV,2035,6.00000000000
-4,2049,R1,solarPV,2035,6.00000000000
-4,2050,R1,solarPV,2035,6.00000000000
-4,2059,R1,solarPV,2035,6.00000000000
-4,2060,R1,solarPV,2035,6.00000000000
-4,2064,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2040,6.00000000000
-5,2049,R1,solarPV,2040,6.00000000000
-5,2050,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,2025,R1,windturbine,2020,10.00000000000
-6,2030,R1,windturbine,2020,10.00000000000
-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
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-8,2030,R2,gasCCGT,2025,5.88890000000
-8,2035,R2,gasCCGT,2025,5.88890000000
-8,2040,R2,gasCCGT,2025,5.88890000000
-8,2045,R2,gasCCGT,2025,5.88890000000
-8,2049,R2,gasCCGT,2025,5.88890000000
-8,2050,R2,gasCCGT,2025,5.88890000000
-8,2059,R2,gasCCGT,2025,5.88890000000
-8,2060,R2,gasCCGT,2025,5.88890000000
-8,2064,R2,gasCCGT,2025,5.88890000000
-9,2035,R2,solarPV,2030,6.00000000000
-9,2040,R2,solarPV,2030,6.00000000000
-9,2045,R2,solarPV,2030,6.00000000000
-9,2049,R2,solarPV,2030,6.00000000000
-9,2050,R2,solarPV,2030,6.00000000000
-9,2059,R2,solarPV,2030,6.00000000000
-10,2040,R2,solarPV,2035,6.00000000000
-10,2045,R2,solarPV,2035,6.00000000000
-10,2049,R2,solarPV,2035,6.00000000000
-10,2050,R2,solarPV,2035,6.00000000000
-10,2059,R2,solarPV,2035,6.00000000000
-10,2060,R2,solarPV,2035,6.00000000000
-10,2064,R2,solarPV,2035,6.00000000000
-11,2045,R2,solarPV,2040,6.00000000000
-11,2049,R2,solarPV,2040,6.00000000000
-11,2050,R2,solarPV,2040,6.00000000000
-11,2059,R2,solarPV,2040,6.00000000000
-11,2060,R2,solarPV,2040,6.00000000000
-11,2064,R2,solarPV,2040,6.00000000000
-11,2065,R2,solarPV,2040,6.00000000000
-11,2069,R2,solarPV,2040,6.00000000000
-12,2025,R2,windturbine,2020,16.75000000000
-12,2030,R2,windturbine,2020,16.75000000000
-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
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2025,R1,windturbine,2020,5.50000000000
+5,2030,R1,windturbine,2020,5.50000000000
+5,2035,R1,windturbine,2020,5.50000000000
+5,2040,R1,windturbine,2020,5.50000000000
+5,2045,R1,windturbine,2020,5.50000000000
+5,2049,R1,windturbine,2020,5.50000000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,6.00000000000
+6,2030,R2,gasCCGT,2020,5.00000000000
+6,2035,R2,gasCCGT,2020,5.00000000000
+6,2040,R2,gasCCGT,2020,5.00000000000
+6,2045,R2,gasCCGT,2020,5.00000000000
+6,2049,R2,gasCCGT,2020,5.00000000000
+6,2050,R2,gasCCGT,2020,5.00000000000
+6,2059,R2,gasCCGT,2020,5.00000000000
+7,2030,R2,gasCCGT,2025,5.88890000000
+7,2035,R2,gasCCGT,2025,5.88890000000
+7,2040,R2,gasCCGT,2025,5.88890000000
+7,2045,R2,gasCCGT,2025,5.88890000000
+7,2049,R2,gasCCGT,2025,5.88890000000
+7,2050,R2,gasCCGT,2025,5.88890000000
+7,2059,R2,gasCCGT,2025,5.88890000000
+7,2060,R2,gasCCGT,2025,5.88890000000
+7,2064,R2,gasCCGT,2025,5.88890000000
+8,2035,R2,solarPV,2030,6.00000000000
+8,2040,R2,solarPV,2030,6.00000000000
+8,2045,R2,solarPV,2030,6.00000000000
+8,2049,R2,solarPV,2030,6.00000000000
+8,2050,R2,solarPV,2030,6.00000000000
+8,2059,R2,solarPV,2030,6.00000000000
+9,2040,R2,solarPV,2035,6.00000000000
+9,2045,R2,solarPV,2035,6.00000000000
+9,2049,R2,solarPV,2035,6.00000000000
+9,2050,R2,solarPV,2035,6.00000000000
+9,2059,R2,solarPV,2035,6.00000000000
+9,2060,R2,solarPV,2035,6.00000000000
+9,2064,R2,solarPV,2035,6.00000000000
+10,2045,R2,solarPV,2040,6.00000000000
+10,2049,R2,solarPV,2040,6.00000000000
+10,2050,R2,solarPV,2040,6.00000000000
+10,2059,R2,solarPV,2040,6.00000000000
+10,2060,R2,solarPV,2040,6.00000000000
+10,2064,R2,solarPV,2040,6.00000000000
+10,2065,R2,solarPV,2040,6.00000000000
+10,2069,R2,solarPV,2040,6.00000000000
+11,2025,R2,windturbine,2020,5.50000000000
+11,2030,R2,windturbine,2020,5.50000000000
+11,2035,R2,windturbine,2020,5.50000000000
+11,2040,R2,windturbine,2020,5.50000000000
+11,2045,R2,windturbine,2020,5.50000000000
+11,2049,R2,windturbine,2020,5.50000000000
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 3d9c3de1..aa854417 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
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,116 +17,107 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2050,R1,gasCCGT,2045,1.22220000000
-2,2059,R1,gasCCGT,2045,1.22220000000
-2,2060,R1,gasCCGT,2045,1.22220000000
-2,2064,R1,gasCCGT,2045,1.22220000000
-2,2065,R1,gasCCGT,2045,1.22220000000
-2,2069,R1,gasCCGT,2045,1.22220000000
-2,2070,R1,gasCCGT,2045,1.22220000000
-2,2074,R1,gasCCGT,2045,1.22220000000
-2,2075,R1,gasCCGT,2045,1.22220000000
-2,2084,R1,gasCCGT,2045,1.22220000000
-3,2025,R1,solarPV,2020,6.75000000000
-3,2030,R1,solarPV,2020,6.75000000000
-3,2035,R1,solarPV,2020,6.75000000000
-3,2040,R1,solarPV,2020,6.75000000000
-3,2045,R1,solarPV,2020,6.75000000000
-3,2049,R1,solarPV,2020,6.75000000000
-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,2059,R1,solarPV,2030,6.00000000000
-5,2040,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2035,6.00000000000
-5,2049,R1,solarPV,2035,6.00000000000
-5,2050,R1,solarPV,2035,6.00000000000
-5,2059,R1,solarPV,2035,6.00000000000
-5,2060,R1,solarPV,2035,6.00000000000
-5,2064,R1,solarPV,2035,6.00000000000
-6,2045,R1,solarPV,2040,6.00000000000
-6,2049,R1,solarPV,2040,6.00000000000
-6,2050,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,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,5.88890000000
-11,2035,R2,gasCCGT,2025,5.88890000000
-11,2040,R2,gasCCGT,2025,5.88890000000
-11,2045,R2,gasCCGT,2025,5.88890000000
-11,2049,R2,gasCCGT,2025,5.88890000000
-11,2050,R2,gasCCGT,2025,5.88890000000
-11,2059,R2,gasCCGT,2025,5.88890000000
-11,2060,R2,gasCCGT,2025,5.88890000000
-11,2064,R2,gasCCGT,2025,5.88890000000
-12,2035,R2,solarPV,2030,6.00000000000
-12,2040,R2,solarPV,2030,6.00000000000
-12,2045,R2,solarPV,2030,6.00000000000
-12,2049,R2,solarPV,2030,6.00000000000
-12,2050,R2,solarPV,2030,6.00000000000
-12,2059,R2,solarPV,2030,6.00000000000
-13,2040,R2,solarPV,2035,6.00000000000
-13,2045,R2,solarPV,2035,6.00000000000
-13,2049,R2,solarPV,2035,6.00000000000
-13,2050,R2,solarPV,2035,6.00000000000
-13,2059,R2,solarPV,2035,6.00000000000
-13,2060,R2,solarPV,2035,6.00000000000
-13,2064,R2,solarPV,2035,6.00000000000
-14,2045,R2,solarPV,2040,6.00000000000
-14,2049,R2,solarPV,2040,6.00000000000
-14,2050,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,10.00000000000
-15,2059,R2,solarPV,2045,10.00000000000
-15,2060,R2,solarPV,2045,10.00000000000
-15,2064,R2,solarPV,2045,10.00000000000
-15,2065,R2,solarPV,2045,10.00000000000
-15,2069,R2,solarPV,2045,10.00000000000
-15,2070,R2,solarPV,2045,10.00000000000
-15,2074,R2,solarPV,2045,10.00000000000
-16,2025,R2,windturbine,2020,16.75000000000
-16,2030,R2,windturbine,2020,16.75000000000
-16,2035,R2,windturbine,2020,16.75000000000
-16,2040,R2,windturbine,2020,16.75000000000
-16,2045,R2,windturbine,2020,16.75000000000
-16,2049,R2,windturbine,2020,16.75000000000
-17,2050,R2,windturbine,2045,12.75000000000
-17,2059,R2,windturbine,2045,12.75000000000
-17,2060,R2,windturbine,2045,12.75000000000
-17,2064,R2,windturbine,2045,12.75000000000
-17,2065,R2,windturbine,2045,12.75000000000
-17,2069,R2,windturbine,2045,12.75000000000
-17,2070,R2,windturbine,2045,12.75000000000
-17,2074,R2,windturbine,2045,12.75000000000
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,10.00000000000
+5,2059,R1,solarPV,2045,10.00000000000
+5,2060,R1,solarPV,2045,10.00000000000
+5,2064,R1,solarPV,2045,10.00000000000
+5,2065,R1,solarPV,2045,10.00000000000
+5,2069,R1,solarPV,2045,10.00000000000
+5,2070,R1,solarPV,2045,10.00000000000
+5,2074,R1,solarPV,2045,10.00000000000
+6,2025,R1,windturbine,2020,5.50000000000
+6,2030,R1,windturbine,2020,5.50000000000
+6,2035,R1,windturbine,2020,5.50000000000
+6,2040,R1,windturbine,2020,5.50000000000
+6,2045,R1,windturbine,2020,5.50000000000
+6,2049,R1,windturbine,2020,5.50000000000
+7,2050,R1,windturbine,2045,1.50000000000
+7,2059,R1,windturbine,2045,1.50000000000
+7,2060,R1,windturbine,2045,1.50000000000
+7,2064,R1,windturbine,2045,1.50000000000
+7,2065,R1,windturbine,2045,1.50000000000
+7,2069,R1,windturbine,2045,1.50000000000
+7,2070,R1,windturbine,2045,1.50000000000
+7,2074,R1,windturbine,2045,1.50000000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,6.00000000000
+8,2030,R2,gasCCGT,2020,5.00000000000
+8,2035,R2,gasCCGT,2020,5.00000000000
+8,2040,R2,gasCCGT,2020,5.00000000000
+8,2045,R2,gasCCGT,2020,5.00000000000
+8,2049,R2,gasCCGT,2020,5.00000000000
+8,2050,R2,gasCCGT,2020,5.00000000000
+8,2059,R2,gasCCGT,2020,5.00000000000
+9,2030,R2,gasCCGT,2025,5.88890000000
+9,2035,R2,gasCCGT,2025,5.88890000000
+9,2040,R2,gasCCGT,2025,5.88890000000
+9,2045,R2,gasCCGT,2025,5.88890000000
+9,2049,R2,gasCCGT,2025,5.88890000000
+9,2050,R2,gasCCGT,2025,5.88890000000
+9,2059,R2,gasCCGT,2025,5.88890000000
+9,2060,R2,gasCCGT,2025,5.88890000000
+9,2064,R2,gasCCGT,2025,5.88890000000
+10,2035,R2,solarPV,2030,6.00000000000
+10,2040,R2,solarPV,2030,6.00000000000
+10,2045,R2,solarPV,2030,6.00000000000
+10,2049,R2,solarPV,2030,6.00000000000
+10,2050,R2,solarPV,2030,6.00000000000
+10,2059,R2,solarPV,2030,6.00000000000
+11,2040,R2,solarPV,2035,6.00000000000
+11,2045,R2,solarPV,2035,6.00000000000
+11,2049,R2,solarPV,2035,6.00000000000
+11,2050,R2,solarPV,2035,6.00000000000
+11,2059,R2,solarPV,2035,6.00000000000
+11,2060,R2,solarPV,2035,6.00000000000
+11,2064,R2,solarPV,2035,6.00000000000
+12,2045,R2,solarPV,2040,6.00000000000
+12,2049,R2,solarPV,2040,6.00000000000
+12,2050,R2,solarPV,2040,6.00000000000
+12,2059,R2,solarPV,2040,6.00000000000
+12,2060,R2,solarPV,2040,6.00000000000
+12,2064,R2,solarPV,2040,6.00000000000
+12,2065,R2,solarPV,2040,6.00000000000
+12,2069,R2,solarPV,2040,6.00000000000
+13,2050,R2,solarPV,2045,10.00000000000
+13,2059,R2,solarPV,2045,10.00000000000
+13,2060,R2,solarPV,2045,10.00000000000
+13,2064,R2,solarPV,2045,10.00000000000
+13,2065,R2,solarPV,2045,10.00000000000
+13,2069,R2,solarPV,2045,10.00000000000
+13,2070,R2,solarPV,2045,10.00000000000
+13,2074,R2,solarPV,2045,10.00000000000
+14,2025,R2,windturbine,2020,5.50000000000
+14,2030,R2,windturbine,2020,5.50000000000
+14,2035,R2,windturbine,2020,5.50000000000
+14,2040,R2,windturbine,2020,5.50000000000
+14,2045,R2,windturbine,2020,5.50000000000
+14,2049,R2,windturbine,2020,5.50000000000
+15,2050,R2,windturbine,2045,1.50000000000
+15,2059,R2,windturbine,2045,1.50000000000
+15,2060,R2,windturbine,2045,1.50000000000
+15,2064,R2,windturbine,2045,1.50000000000
+15,2065,R2,windturbine,2045,1.50000000000
+15,2069,R2,windturbine,2045,1.50000000000
+15,2070,R2,windturbine,2045,1.50000000000
+15,2074,R2,windturbine,2045,1.50000000000
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 3d9c3de1..aa854417 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.88890000000
 1,2035,R1,gasCCGT,2025,5.88890000000
 1,2040,R1,gasCCGT,2025,5.88890000000
@@ -10,116 +17,107 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.88890000000
 1,2060,R1,gasCCGT,2025,5.88890000000
 1,2064,R1,gasCCGT,2025,5.88890000000
-2,2050,R1,gasCCGT,2045,1.22220000000
-2,2059,R1,gasCCGT,2045,1.22220000000
-2,2060,R1,gasCCGT,2045,1.22220000000
-2,2064,R1,gasCCGT,2045,1.22220000000
-2,2065,R1,gasCCGT,2045,1.22220000000
-2,2069,R1,gasCCGT,2045,1.22220000000
-2,2070,R1,gasCCGT,2045,1.22220000000
-2,2074,R1,gasCCGT,2045,1.22220000000
-2,2075,R1,gasCCGT,2045,1.22220000000
-2,2084,R1,gasCCGT,2045,1.22220000000
-3,2025,R1,solarPV,2020,6.75000000000
-3,2030,R1,solarPV,2020,6.75000000000
-3,2035,R1,solarPV,2020,6.75000000000
-3,2040,R1,solarPV,2020,6.75000000000
-3,2045,R1,solarPV,2020,6.75000000000
-3,2049,R1,solarPV,2020,6.75000000000
-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,2059,R1,solarPV,2030,6.00000000000
-5,2040,R1,solarPV,2035,6.00000000000
-5,2045,R1,solarPV,2035,6.00000000000
-5,2049,R1,solarPV,2035,6.00000000000
-5,2050,R1,solarPV,2035,6.00000000000
-5,2059,R1,solarPV,2035,6.00000000000
-5,2060,R1,solarPV,2035,6.00000000000
-5,2064,R1,solarPV,2035,6.00000000000
-6,2045,R1,solarPV,2040,6.00000000000
-6,2049,R1,solarPV,2040,6.00000000000
-6,2050,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,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,5.88890000000
-11,2035,R2,gasCCGT,2025,5.88890000000
-11,2040,R2,gasCCGT,2025,5.88890000000
-11,2045,R2,gasCCGT,2025,5.88890000000
-11,2049,R2,gasCCGT,2025,5.88890000000
-11,2050,R2,gasCCGT,2025,5.88890000000
-11,2059,R2,gasCCGT,2025,5.88890000000
-11,2060,R2,gasCCGT,2025,5.88890000000
-11,2064,R2,gasCCGT,2025,5.88890000000
-12,2035,R2,solarPV,2030,6.00000000000
-12,2040,R2,solarPV,2030,6.00000000000
-12,2045,R2,solarPV,2030,6.00000000000
-12,2049,R2,solarPV,2030,6.00000000000
-12,2050,R2,solarPV,2030,6.00000000000
-12,2059,R2,solarPV,2030,6.00000000000
-13,2040,R2,solarPV,2035,6.00000000000
-13,2045,R2,solarPV,2035,6.00000000000
-13,2049,R2,solarPV,2035,6.00000000000
-13,2050,R2,solarPV,2035,6.00000000000
-13,2059,R2,solarPV,2035,6.00000000000
-13,2060,R2,solarPV,2035,6.00000000000
-13,2064,R2,solarPV,2035,6.00000000000
-14,2045,R2,solarPV,2040,6.00000000000
-14,2049,R2,solarPV,2040,6.00000000000
-14,2050,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,10.00000000000
-15,2059,R2,solarPV,2045,10.00000000000
-15,2060,R2,solarPV,2045,10.00000000000
-15,2064,R2,solarPV,2045,10.00000000000
-15,2065,R2,solarPV,2045,10.00000000000
-15,2069,R2,solarPV,2045,10.00000000000
-15,2070,R2,solarPV,2045,10.00000000000
-15,2074,R2,solarPV,2045,10.00000000000
-16,2025,R2,windturbine,2020,16.75000000000
-16,2030,R2,windturbine,2020,16.75000000000
-16,2035,R2,windturbine,2020,16.75000000000
-16,2040,R2,windturbine,2020,16.75000000000
-16,2045,R2,windturbine,2020,16.75000000000
-16,2049,R2,windturbine,2020,16.75000000000
-17,2050,R2,windturbine,2045,12.75000000000
-17,2059,R2,windturbine,2045,12.75000000000
-17,2060,R2,windturbine,2045,12.75000000000
-17,2064,R2,windturbine,2045,12.75000000000
-17,2065,R2,windturbine,2045,12.75000000000
-17,2069,R2,windturbine,2045,12.75000000000
-17,2070,R2,windturbine,2045,12.75000000000
-17,2074,R2,windturbine,2045,12.75000000000
+2,2035,R1,solarPV,2030,6.00000000000
+2,2040,R1,solarPV,2030,6.00000000000
+2,2045,R1,solarPV,2030,6.00000000000
+2,2049,R1,solarPV,2030,6.00000000000
+2,2050,R1,solarPV,2030,6.00000000000
+2,2059,R1,solarPV,2030,6.00000000000
+3,2040,R1,solarPV,2035,6.00000000000
+3,2045,R1,solarPV,2035,6.00000000000
+3,2049,R1,solarPV,2035,6.00000000000
+3,2050,R1,solarPV,2035,6.00000000000
+3,2059,R1,solarPV,2035,6.00000000000
+3,2060,R1,solarPV,2035,6.00000000000
+3,2064,R1,solarPV,2035,6.00000000000
+4,2045,R1,solarPV,2040,6.00000000000
+4,2049,R1,solarPV,2040,6.00000000000
+4,2050,R1,solarPV,2040,6.00000000000
+4,2059,R1,solarPV,2040,6.00000000000
+4,2060,R1,solarPV,2040,6.00000000000
+4,2064,R1,solarPV,2040,6.00000000000
+4,2065,R1,solarPV,2040,6.00000000000
+4,2069,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2045,10.00000000000
+5,2059,R1,solarPV,2045,10.00000000000
+5,2060,R1,solarPV,2045,10.00000000000
+5,2064,R1,solarPV,2045,10.00000000000
+5,2065,R1,solarPV,2045,10.00000000000
+5,2069,R1,solarPV,2045,10.00000000000
+5,2070,R1,solarPV,2045,10.00000000000
+5,2074,R1,solarPV,2045,10.00000000000
+6,2025,R1,windturbine,2020,5.50000000000
+6,2030,R1,windturbine,2020,5.50000000000
+6,2035,R1,windturbine,2020,5.50000000000
+6,2040,R1,windturbine,2020,5.50000000000
+6,2045,R1,windturbine,2020,5.50000000000
+6,2049,R1,windturbine,2020,5.50000000000
+7,2050,R1,windturbine,2045,1.50000000000
+7,2059,R1,windturbine,2045,1.50000000000
+7,2060,R1,windturbine,2045,1.50000000000
+7,2064,R1,windturbine,2045,1.50000000000
+7,2065,R1,windturbine,2045,1.50000000000
+7,2069,R1,windturbine,2045,1.50000000000
+7,2070,R1,windturbine,2045,1.50000000000
+7,2074,R1,windturbine,2045,1.50000000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,6.00000000000
+8,2030,R2,gasCCGT,2020,5.00000000000
+8,2035,R2,gasCCGT,2020,5.00000000000
+8,2040,R2,gasCCGT,2020,5.00000000000
+8,2045,R2,gasCCGT,2020,5.00000000000
+8,2049,R2,gasCCGT,2020,5.00000000000
+8,2050,R2,gasCCGT,2020,5.00000000000
+8,2059,R2,gasCCGT,2020,5.00000000000
+9,2030,R2,gasCCGT,2025,5.88890000000
+9,2035,R2,gasCCGT,2025,5.88890000000
+9,2040,R2,gasCCGT,2025,5.88890000000
+9,2045,R2,gasCCGT,2025,5.88890000000
+9,2049,R2,gasCCGT,2025,5.88890000000
+9,2050,R2,gasCCGT,2025,5.88890000000
+9,2059,R2,gasCCGT,2025,5.88890000000
+9,2060,R2,gasCCGT,2025,5.88890000000
+9,2064,R2,gasCCGT,2025,5.88890000000
+10,2035,R2,solarPV,2030,6.00000000000
+10,2040,R2,solarPV,2030,6.00000000000
+10,2045,R2,solarPV,2030,6.00000000000
+10,2049,R2,solarPV,2030,6.00000000000
+10,2050,R2,solarPV,2030,6.00000000000
+10,2059,R2,solarPV,2030,6.00000000000
+11,2040,R2,solarPV,2035,6.00000000000
+11,2045,R2,solarPV,2035,6.00000000000
+11,2049,R2,solarPV,2035,6.00000000000
+11,2050,R2,solarPV,2035,6.00000000000
+11,2059,R2,solarPV,2035,6.00000000000
+11,2060,R2,solarPV,2035,6.00000000000
+11,2064,R2,solarPV,2035,6.00000000000
+12,2045,R2,solarPV,2040,6.00000000000
+12,2049,R2,solarPV,2040,6.00000000000
+12,2050,R2,solarPV,2040,6.00000000000
+12,2059,R2,solarPV,2040,6.00000000000
+12,2060,R2,solarPV,2040,6.00000000000
+12,2064,R2,solarPV,2040,6.00000000000
+12,2065,R2,solarPV,2040,6.00000000000
+12,2069,R2,solarPV,2040,6.00000000000
+13,2050,R2,solarPV,2045,10.00000000000
+13,2059,R2,solarPV,2045,10.00000000000
+13,2060,R2,solarPV,2045,10.00000000000
+13,2064,R2,solarPV,2045,10.00000000000
+13,2065,R2,solarPV,2045,10.00000000000
+13,2069,R2,solarPV,2045,10.00000000000
+13,2070,R2,solarPV,2045,10.00000000000
+13,2074,R2,solarPV,2045,10.00000000000
+14,2025,R2,windturbine,2020,5.50000000000
+14,2030,R2,windturbine,2020,5.50000000000
+14,2035,R2,windturbine,2020,5.50000000000
+14,2040,R2,windturbine,2020,5.50000000000
+14,2045,R2,windturbine,2020,5.50000000000
+14,2049,R2,windturbine,2020,5.50000000000
+15,2050,R2,windturbine,2045,1.50000000000
+15,2059,R2,windturbine,2045,1.50000000000
+15,2060,R2,windturbine,2045,1.50000000000
+15,2064,R2,windturbine,2045,1.50000000000
+15,2065,R2,windturbine,2045,1.50000000000
+15,2069,R2,windturbine,2045,1.50000000000
+15,2070,R2,windturbine,2045,1.50000000000
+15,2074,R2,windturbine,2045,1.50000000000
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 1d028468..b21dfd65 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,17 @@
 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
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
 1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,15.00000000000
-1,2030,R2,gassupply1,2020,7.50000000000
+1,2025,R2,gassupply1,2020,16.58160000000
+1,2030,R2,gassupply1,2020,9.08160000000
+1,2035,R2,gassupply1,2020,1.58160000000
+1,2040,R2,gassupply1,2020,1.58160000000
+1,2045,R2,gassupply1,2020,1.58160000000
+1,2050,R2,gassupply1,2020,1.58160000000
+1,2059,R2,gassupply1,2020,1.58160000000
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 eec33946..628decd5 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,19 +1,33 @@
 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,2030,R1,gassupply1,2025,2.10500000000
-1,2035,R1,gassupply1,2025,2.10500000000
-1,2040,R1,gassupply1,2025,2.10500000000
-1,2045,R1,gassupply1,2025,2.10500000000
-1,2050,R1,gassupply1,2025,2.10500000000
-1,2064,R1,gassupply1,2025,2.10500000000
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
+1,2030,R1,gassupply1,2025,8.87340000000
+1,2035,R1,gassupply1,2025,8.87340000000
+1,2040,R1,gassupply1,2025,8.87340000000
+1,2045,R1,gassupply1,2025,8.87340000000
+1,2050,R1,gassupply1,2025,8.87340000000
+1,2059,R1,gassupply1,2025,8.87340000000
+1,2060,R1,gassupply1,2025,8.87340000000
+1,2064,R1,gassupply1,2025,8.87340000000
 2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2030,R2,gassupply1,2025,2.10500000000
-3,2035,R2,gassupply1,2025,2.10500000000
-3,2040,R2,gassupply1,2025,2.10500000000
-3,2045,R2,gassupply1,2025,2.10500000000
-3,2050,R2,gassupply1,2025,2.10500000000
-3,2064,R2,gassupply1,2025,2.10500000000
+2,2025,R2,gassupply1,2020,16.58160000000
+2,2030,R2,gassupply1,2020,9.08160000000
+2,2035,R2,gassupply1,2020,1.58160000000
+2,2040,R2,gassupply1,2020,1.58160000000
+2,2045,R2,gassupply1,2020,1.58160000000
+2,2050,R2,gassupply1,2020,1.58160000000
+2,2059,R2,gassupply1,2020,1.58160000000
+3,2030,R2,gassupply1,2025,8.87340000000
+3,2035,R2,gassupply1,2025,8.87340000000
+3,2040,R2,gassupply1,2025,8.87340000000
+3,2045,R2,gassupply1,2025,8.87340000000
+3,2050,R2,gassupply1,2025,8.87340000000
+3,2059,R2,gassupply1,2025,8.87340000000
+3,2060,R2,gassupply1,2025,8.87340000000
+3,2064,R2,gassupply1,2025,8.87340000000
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 b41ec973..9d0e267f 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,33 +1,51 @@
 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,2030,R1,gassupply1,2025,2.10500000000
-1,2035,R1,gassupply1,2025,2.10500000000
-1,2040,R1,gassupply1,2025,2.10500000000
-1,2045,R1,gassupply1,2025,2.10500000000
-1,2050,R1,gassupply1,2025,2.10500000000
-1,2064,R1,gassupply1,2025,2.10500000000
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
+1,2030,R1,gassupply1,2025,8.87340000000
+1,2035,R1,gassupply1,2025,8.87340000000
+1,2040,R1,gassupply1,2025,8.87340000000
+1,2045,R1,gassupply1,2025,8.87340000000
+1,2050,R1,gassupply1,2025,8.87340000000
+1,2059,R1,gassupply1,2025,8.87340000000
+1,2060,R1,gassupply1,2025,8.87340000000
+1,2064,R1,gassupply1,2025,8.87340000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.10500000000
-4,2035,R2,gassupply1,2025,2.10500000000
-4,2040,R2,gassupply1,2025,2.10500000000
-4,2045,R2,gassupply1,2025,2.10500000000
-4,2050,R2,gassupply1,2025,2.10500000000
-4,2064,R2,gassupply1,2025,2.10500000000
+3,2025,R2,gassupply1,2020,16.58160000000
+3,2030,R2,gassupply1,2020,9.08160000000
+3,2035,R2,gassupply1,2020,1.58160000000
+3,2040,R2,gassupply1,2020,1.58160000000
+3,2045,R2,gassupply1,2020,1.58160000000
+3,2050,R2,gassupply1,2020,1.58160000000
+3,2059,R2,gassupply1,2020,1.58160000000
+4,2030,R2,gassupply1,2025,8.87340000000
+4,2035,R2,gassupply1,2025,8.87340000000
+4,2040,R2,gassupply1,2025,8.87340000000
+4,2045,R2,gassupply1,2025,8.87340000000
+4,2050,R2,gassupply1,2025,8.87340000000
+4,2059,R2,gassupply1,2025,8.87340000000
+4,2060,R2,gassupply1,2025,8.87340000000
+4,2064,R2,gassupply1,2025,8.87340000000
 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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 b41ec973..9d0e267f 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,33 +1,51 @@
 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,2030,R1,gassupply1,2025,2.10500000000
-1,2035,R1,gassupply1,2025,2.10500000000
-1,2040,R1,gassupply1,2025,2.10500000000
-1,2045,R1,gassupply1,2025,2.10500000000
-1,2050,R1,gassupply1,2025,2.10500000000
-1,2064,R1,gassupply1,2025,2.10500000000
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
+1,2030,R1,gassupply1,2025,8.87340000000
+1,2035,R1,gassupply1,2025,8.87340000000
+1,2040,R1,gassupply1,2025,8.87340000000
+1,2045,R1,gassupply1,2025,8.87340000000
+1,2050,R1,gassupply1,2025,8.87340000000
+1,2059,R1,gassupply1,2025,8.87340000000
+1,2060,R1,gassupply1,2025,8.87340000000
+1,2064,R1,gassupply1,2025,8.87340000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.10500000000
-4,2035,R2,gassupply1,2025,2.10500000000
-4,2040,R2,gassupply1,2025,2.10500000000
-4,2045,R2,gassupply1,2025,2.10500000000
-4,2050,R2,gassupply1,2025,2.10500000000
-4,2064,R2,gassupply1,2025,2.10500000000
+3,2025,R2,gassupply1,2020,16.58160000000
+3,2030,R2,gassupply1,2020,9.08160000000
+3,2035,R2,gassupply1,2020,1.58160000000
+3,2040,R2,gassupply1,2020,1.58160000000
+3,2045,R2,gassupply1,2020,1.58160000000
+3,2050,R2,gassupply1,2020,1.58160000000
+3,2059,R2,gassupply1,2020,1.58160000000
+4,2030,R2,gassupply1,2025,8.87340000000
+4,2035,R2,gassupply1,2025,8.87340000000
+4,2040,R2,gassupply1,2025,8.87340000000
+4,2045,R2,gassupply1,2025,8.87340000000
+4,2050,R2,gassupply1,2025,8.87340000000
+4,2059,R2,gassupply1,2025,8.87340000000
+4,2060,R2,gassupply1,2025,8.87340000000
+4,2064,R2,gassupply1,2025,8.87340000000
 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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 b41ec973..9d0e267f 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,33 +1,51 @@
 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,2030,R1,gassupply1,2025,2.10500000000
-1,2035,R1,gassupply1,2025,2.10500000000
-1,2040,R1,gassupply1,2025,2.10500000000
-1,2045,R1,gassupply1,2025,2.10500000000
-1,2050,R1,gassupply1,2025,2.10500000000
-1,2064,R1,gassupply1,2025,2.10500000000
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
+1,2030,R1,gassupply1,2025,8.87340000000
+1,2035,R1,gassupply1,2025,8.87340000000
+1,2040,R1,gassupply1,2025,8.87340000000
+1,2045,R1,gassupply1,2025,8.87340000000
+1,2050,R1,gassupply1,2025,8.87340000000
+1,2059,R1,gassupply1,2025,8.87340000000
+1,2060,R1,gassupply1,2025,8.87340000000
+1,2064,R1,gassupply1,2025,8.87340000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,2.10500000000
-4,2035,R2,gassupply1,2025,2.10500000000
-4,2040,R2,gassupply1,2025,2.10500000000
-4,2045,R2,gassupply1,2025,2.10500000000
-4,2050,R2,gassupply1,2025,2.10500000000
-4,2064,R2,gassupply1,2025,2.10500000000
+3,2025,R2,gassupply1,2020,16.58160000000
+3,2030,R2,gassupply1,2020,9.08160000000
+3,2035,R2,gassupply1,2020,1.58160000000
+3,2040,R2,gassupply1,2020,1.58160000000
+3,2045,R2,gassupply1,2020,1.58160000000
+3,2050,R2,gassupply1,2020,1.58160000000
+3,2059,R2,gassupply1,2020,1.58160000000
+4,2030,R2,gassupply1,2025,8.87340000000
+4,2035,R2,gassupply1,2025,8.87340000000
+4,2040,R2,gassupply1,2025,8.87340000000
+4,2045,R2,gassupply1,2025,8.87340000000
+4,2050,R2,gassupply1,2025,8.87340000000
+4,2059,R2,gassupply1,2025,8.87340000000
+4,2060,R2,gassupply1,2025,8.87340000000
+4,2064,R2,gassupply1,2025,8.87340000000
 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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 5e030fcb..9d0e267f 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,45 +1,51 @@
 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,2030,R1,gassupply1,2025,2.10500000000
-1,2035,R1,gassupply1,2025,2.10500000000
-1,2040,R1,gassupply1,2025,2.10500000000
-1,2045,R1,gassupply1,2025,2.10500000000
-1,2050,R1,gassupply1,2025,2.10500000000
-1,2064,R1,gassupply1,2025,2.10500000000
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
+1,2030,R1,gassupply1,2025,8.87340000000
+1,2035,R1,gassupply1,2025,8.87340000000
+1,2040,R1,gassupply1,2025,8.87340000000
+1,2045,R1,gassupply1,2025,8.87340000000
+1,2050,R1,gassupply1,2025,8.87340000000
+1,2059,R1,gassupply1,2025,8.87340000000
+1,2060,R1,gassupply1,2025,8.87340000000
+1,2064,R1,gassupply1,2025,8.87340000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2050,R1,gassupply1,2045,0.24460000000
-3,2064,R1,gassupply1,2045,0.24460000000
-3,2065,R1,gassupply1,2045,0.24460000000
-3,2069,R1,gassupply1,2045,0.24460000000
-3,2070,R1,gassupply1,2045,0.24460000000
-3,2084,R1,gassupply1,2045,0.24460000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,2.10500000000
-5,2035,R2,gassupply1,2025,2.10500000000
-5,2040,R2,gassupply1,2025,2.10500000000
-5,2045,R2,gassupply1,2025,2.10500000000
-5,2050,R2,gassupply1,2025,2.10500000000
-5,2064,R2,gassupply1,2025,2.10500000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,0.24460000000
-7,2064,R2,gassupply1,2045,0.24460000000
-7,2065,R2,gassupply1,2045,0.24460000000
-7,2069,R2,gassupply1,2045,0.24460000000
-7,2070,R2,gassupply1,2045,0.24460000000
-7,2084,R2,gassupply1,2045,0.24460000000
+3,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,16.58160000000
+3,2030,R2,gassupply1,2020,9.08160000000
+3,2035,R2,gassupply1,2020,1.58160000000
+3,2040,R2,gassupply1,2020,1.58160000000
+3,2045,R2,gassupply1,2020,1.58160000000
+3,2050,R2,gassupply1,2020,1.58160000000
+3,2059,R2,gassupply1,2020,1.58160000000
+4,2030,R2,gassupply1,2025,8.87340000000
+4,2035,R2,gassupply1,2025,8.87340000000
+4,2040,R2,gassupply1,2025,8.87340000000
+4,2045,R2,gassupply1,2025,8.87340000000
+4,2050,R2,gassupply1,2025,8.87340000000
+4,2059,R2,gassupply1,2025,8.87340000000
+4,2060,R2,gassupply1,2025,8.87340000000
+4,2064,R2,gassupply1,2025,8.87340000000
+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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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 5e030fcb..9d0e267f 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,45 +1,51 @@
 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,2030,R1,gassupply1,2025,2.10500000000
-1,2035,R1,gassupply1,2025,2.10500000000
-1,2040,R1,gassupply1,2025,2.10500000000
-1,2045,R1,gassupply1,2025,2.10500000000
-1,2050,R1,gassupply1,2025,2.10500000000
-1,2064,R1,gassupply1,2025,2.10500000000
+0,2025,R1,gassupply1,2020,16.58160000000
+0,2030,R1,gassupply1,2020,9.08160000000
+0,2035,R1,gassupply1,2020,1.58160000000
+0,2040,R1,gassupply1,2020,1.58160000000
+0,2045,R1,gassupply1,2020,1.58160000000
+0,2050,R1,gassupply1,2020,1.58160000000
+0,2059,R1,gassupply1,2020,1.58160000000
+1,2030,R1,gassupply1,2025,8.87340000000
+1,2035,R1,gassupply1,2025,8.87340000000
+1,2040,R1,gassupply1,2025,8.87340000000
+1,2045,R1,gassupply1,2025,8.87340000000
+1,2050,R1,gassupply1,2025,8.87340000000
+1,2059,R1,gassupply1,2025,8.87340000000
+1,2060,R1,gassupply1,2025,8.87340000000
+1,2064,R1,gassupply1,2025,8.87340000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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,2050,R1,gassupply1,2045,0.24460000000
-3,2064,R1,gassupply1,2045,0.24460000000
-3,2065,R1,gassupply1,2045,0.24460000000
-3,2069,R1,gassupply1,2045,0.24460000000
-3,2070,R1,gassupply1,2045,0.24460000000
-3,2084,R1,gassupply1,2045,0.24460000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,2.10500000000
-5,2035,R2,gassupply1,2025,2.10500000000
-5,2040,R2,gassupply1,2025,2.10500000000
-5,2045,R2,gassupply1,2025,2.10500000000
-5,2050,R2,gassupply1,2025,2.10500000000
-5,2064,R2,gassupply1,2025,2.10500000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,0.24460000000
-7,2064,R2,gassupply1,2045,0.24460000000
-7,2065,R2,gassupply1,2045,0.24460000000
-7,2069,R2,gassupply1,2045,0.24460000000
-7,2070,R2,gassupply1,2045,0.24460000000
-7,2084,R2,gassupply1,2045,0.24460000000
+3,2020,R2,gassupply1,2020,15.00000000000
+3,2025,R2,gassupply1,2020,16.58160000000
+3,2030,R2,gassupply1,2020,9.08160000000
+3,2035,R2,gassupply1,2020,1.58160000000
+3,2040,R2,gassupply1,2020,1.58160000000
+3,2045,R2,gassupply1,2020,1.58160000000
+3,2050,R2,gassupply1,2020,1.58160000000
+3,2059,R2,gassupply1,2020,1.58160000000
+4,2030,R2,gassupply1,2025,8.87340000000
+4,2035,R2,gassupply1,2025,8.87340000000
+4,2040,R2,gassupply1,2025,8.87340000000
+4,2045,R2,gassupply1,2025,8.87340000000
+4,2050,R2,gassupply1,2025,8.87340000000
+4,2059,R2,gassupply1,2025,8.87340000000
+4,2060,R2,gassupply1,2025,8.87340000000
+4,2064,R2,gassupply1,2025,8.87340000000
+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,2059,R2,gassupply1,2030,7.50000000000
+5,2060,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/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 209b3b0f..354cc21a 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -9,97 +9,105 @@ gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,5.05910000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,3.80910000000
+gasCCGT,R2,R2,A1,power,newcapa,2025,6.00000000000
+windturbine,R2,R2,A1,power,newcapa,2025,3.80910000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,16.58160000000
+gassupply1,R2,R2,A1,gas,newcapa,2025,16.58160000000
 heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2030,5.05910000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,3.80910000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,5.75150000000
-windturbine,R2,R2,A1,power,newcapa,2030,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.10500000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,2.10500000000
+windturbine,R2,R2,A1,power,newcapa,2030,3.80910000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.08160000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,8.87340000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,9.08160000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,8.87340000000
 heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2035,5.05910000000
 solarPV,R1,R1,A1,power,newcapa,2035,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,3.80910000000
+gasCCGT,R2,R2,A1,power,newcapa,2035,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2035,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2035,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2035,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.10500000000
+windturbine,R2,R2,A1,power,newcapa,2035,3.80910000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.58160000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,8.87340000000
 gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,1.58160000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,8.87340000000
 gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.05910000000
 solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,3.80910000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2040,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.10500000000
+windturbine,R2,R2,A1,power,newcapa,2040,3.80910000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.58160000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,8.87340000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,1.58160000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,8.87340000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.05910000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,3.80910000000
+gasCCGT,R2,R2,A1,power,newcapa,2045,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2045,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2045,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.10500000000
+windturbine,R2,R2,A1,power,newcapa,2045,3.80910000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.58160000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,8.87340000000
 gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,1.58160000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,8.87340000000
 gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,5.75150000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,0.29290000000
 solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
 solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
+solarPV,R1,R1,A1,power,newcapa,2050,9.40910000000
+gasCCGT,R2,R2,A1,power,newcapa,2050,5.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2050,5.75150000000
 solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
 solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,10.65910000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.10500000000
+solarPV,R2,R2,A1,power,newcapa,2050,9.40910000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.58160000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,8.87340000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.24460000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,2.10500000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,1.58160000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,8.87340000000
 gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,0.24460000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 123585bd..0701aeac 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,387 +63,387 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.31330000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.31330000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.66100000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.66100000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.78230000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.15400000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.15400000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.44750000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.44750000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94580000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.94580000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.11750000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.22940000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,0.22940000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.31330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.31330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.66100000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66100000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.78230000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15400000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.15400000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.44750000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.44750000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94580000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94580000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.11750000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.22940000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.22940000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.93980000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.93980000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.99750000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.99750000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.34680000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.34680000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.55430000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.55430000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.62660000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.62660000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.32690000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,1.32690000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.56450000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.33870000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,0.33870000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.62660000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.62660000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.32690000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.32690000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.56450000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.33870000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.33870000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.62660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.62660000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.32690000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.32690000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.56450000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.33870000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.33870000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.54220000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.54220000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.93360000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.93360000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.02210000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.02210000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04000000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.04000000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77550000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.77550000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33530000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.33530000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.03710000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.03710000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07370000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.07370000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.54220000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.54220000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.93360000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.93360000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02210000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02210000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04000000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04000000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77550000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77550000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.33530000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.33530000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03710000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03710000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07370000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07370000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63520000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.63520000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.81680000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.81680000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12040000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.12040000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28300000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.28300000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08730000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.08730000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.87250000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.87250000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.06220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.06220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.13410000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.13410000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.08730000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.08730000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.87250000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.87250000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06220000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06220000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.13410000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.13410000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.08730000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.08730000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.87250000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.87250000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06220000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06220000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13410000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13410000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.61380000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.61380000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.06820000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,1.06820000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02870000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.02870000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.04390000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.04390000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.87760000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.87760000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.52730000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,1.52730000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05060000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.05060000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.08160000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.08160000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61380000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61380000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.06820000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.06820000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02870000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02870000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04390000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04390000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87760000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87760000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.52730000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.52730000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05060000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05060000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08160000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.08160000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84850000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.84850000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.21780000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.21780000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.18070000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.18070000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31770000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.31770000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.23000000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.23000000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.14080000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,2.14080000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.08880000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.08880000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.14960000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.14960000000,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', 'early-morning')",electricity,R1,1.23000000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23000000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.14080000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.14080000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08880000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08880000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.14960000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.14960000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23000000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23000000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.14080000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.14080000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08880000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08880000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14960000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14960000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.66410000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.66410000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.16340000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,1.16340000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.04660000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.04660000000,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.94930000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.94930000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.66310000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.66310000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05480000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05480000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.08720000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.08720000000,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', 'mid-afternoon')",electricity,R1,0.66410000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66410000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.16340000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.16340000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03070000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03070000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04660000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04660000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94930000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94930000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.66310000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.66310000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05480000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05480000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08720000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.08720000000,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.99830000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.99830000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.50160000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.50160000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.19910000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.34230000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.34230000000,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.33010000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.33010000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.33060000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,2.33060000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.09700000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.09700000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.16060000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.16060000000,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', 'early-morning')",electricity,R1,1.33010000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.33010000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.33060000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.33060000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09700000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09700000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16060000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16060000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.33010000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.33010000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.33060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.33060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09700000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16060000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.74550000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.74550000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.31730000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,1.31730000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03220000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.03220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.05100000000,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,1.06560000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.06560000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.88290000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,1.88290000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05770000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05770000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.09620000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.09620000000,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', 'mid-afternoon')",electricity,R1,0.74550000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74550000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.31730000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.31730000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03220000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03220000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05100000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05100000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.06560000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.06560000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.88290000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.88290000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05770000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05770000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09620000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.09620000000,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,2.24190000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.24190000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.96190000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.96190000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21210000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.21210000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.38210000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.38210000000,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.49280000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.49280000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.63790000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,2.63790000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.10280000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.10280000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.17830000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.17830000000,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', 'early-morning')",electricity,R1,1.49280000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.49280000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.63790000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.63790000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10280000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10280000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.17830000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.17830000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.49280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.49280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.63790000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.63790000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10280000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17830000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17830000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.82550000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.82550000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.43580000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,1.43580000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03450000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.03450000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.05450000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.05450000000,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,1.17970000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.17970000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.05210000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,2.05210000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.06250000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.06250000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.10320000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.10320000000,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', 'mid-afternoon')",electricity,R1,0.82550000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.82550000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.43580000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.43580000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03450000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03450000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05450000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05450000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.17970000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.17970000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.05210000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,2.05210000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06250000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06250000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.10320000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.10320000000,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,2.48120000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.48120000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.31640000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.31640000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23320000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23320000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.41280000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.41280000000,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.65250000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.65250000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.87460000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,2.87460000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.11220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.11220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.19200000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.19200000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.65250000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.65250000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.87460000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.87460000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11220000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11220000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.19200000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.19200000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.65250000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.65250000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.87460000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.87460000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11220000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11220000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19200000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19200000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
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 a537a955..37e1d4d6 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,31 @@
 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.05910000000
-1,2030,R1,solarPV,2020,5.05910000000
-1,2035,R1,solarPV,2020,5.05910000000
-1,2040,R1,solarPV,2020,5.05910000000
-1,2045,R1,solarPV,2020,5.05910000000
-1,2049,R1,solarPV,2020,5.05910000000
-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.05910000000
-4,2030,R2,windturbine,2020,15.05910000000
-4,2035,R2,windturbine,2020,15.05910000000
-4,2040,R2,windturbine,2020,15.05910000000
-4,2045,R2,windturbine,2020,15.05910000000
-4,2049,R2,windturbine,2020,15.05910000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
+1,2025,R1,windturbine,2020,3.80910000000
+1,2030,R1,windturbine,2020,3.80910000000
+1,2035,R1,windturbine,2020,3.80910000000
+1,2040,R1,windturbine,2020,3.80910000000
+1,2045,R1,windturbine,2020,3.80910000000
+1,2049,R1,windturbine,2020,3.80910000000
+2,2020,R2,gasCCGT,2020,1.00000000000
+2,2025,R2,gasCCGT,2020,6.00000000000
+2,2030,R2,gasCCGT,2020,5.00000000000
+2,2035,R2,gasCCGT,2020,5.00000000000
+2,2040,R2,gasCCGT,2020,5.00000000000
+2,2045,R2,gasCCGT,2020,5.00000000000
+2,2049,R2,gasCCGT,2020,5.00000000000
+2,2050,R2,gasCCGT,2020,5.00000000000
+2,2059,R2,gasCCGT,2020,5.00000000000
+3,2025,R2,windturbine,2020,3.80910000000
+3,2030,R2,windturbine,2020,3.80910000000
+3,2035,R2,windturbine,2020,3.80910000000
+3,2040,R2,windturbine,2020,3.80910000000
+3,2045,R2,windturbine,2020,3.80910000000
+3,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
index 1b5a118e..c142f459 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2025.csv
@@ -1,37 +1,49 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.75150000000
 1,2035,R1,gasCCGT,2025,5.75150000000
 1,2040,R1,gasCCGT,2025,5.75150000000
 1,2045,R1,gasCCGT,2025,5.75150000000
 1,2049,R1,gasCCGT,2025,5.75150000000
 1,2050,R1,gasCCGT,2025,5.75150000000
+1,2059,R1,gasCCGT,2025,5.75150000000
+1,2060,R1,gasCCGT,2025,5.75150000000
 1,2064,R1,gasCCGT,2025,5.75150000000
-2,2025,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2020,5.05910000000
-2,2035,R1,solarPV,2020,5.05910000000
-2,2040,R1,solarPV,2020,5.05910000000
-2,2045,R1,solarPV,2020,5.05910000000
-2,2049,R1,solarPV,2020,5.05910000000
-3,2025,R1,windturbine,2020,10.00000000000
-3,2030,R1,windturbine,2020,10.00000000000
-3,2035,R1,windturbine,2020,10.00000000000
-3,2040,R1,windturbine,2020,10.00000000000
-3,2045,R1,windturbine,2020,10.00000000000
-3,2049,R1,windturbine,2020,10.00000000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
-5,2030,R2,gasCCGT,2025,5.75150000000
-5,2035,R2,gasCCGT,2025,5.75150000000
-5,2040,R2,gasCCGT,2025,5.75150000000
-5,2045,R2,gasCCGT,2025,5.75150000000
-5,2049,R2,gasCCGT,2025,5.75150000000
-5,2050,R2,gasCCGT,2025,5.75150000000
-5,2064,R2,gasCCGT,2025,5.75150000000
-6,2025,R2,windturbine,2020,15.05910000000
-6,2030,R2,windturbine,2020,15.05910000000
-6,2035,R2,windturbine,2020,15.05910000000
-6,2040,R2,windturbine,2020,15.05910000000
-6,2045,R2,windturbine,2020,15.05910000000
-6,2049,R2,windturbine,2020,15.05910000000
+2,2025,R1,windturbine,2020,3.80910000000
+2,2030,R1,windturbine,2020,3.80910000000
+2,2035,R1,windturbine,2020,3.80910000000
+2,2040,R1,windturbine,2020,3.80910000000
+2,2045,R1,windturbine,2020,3.80910000000
+2,2049,R1,windturbine,2020,3.80910000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,6.00000000000
+3,2030,R2,gasCCGT,2020,5.00000000000
+3,2035,R2,gasCCGT,2020,5.00000000000
+3,2040,R2,gasCCGT,2020,5.00000000000
+3,2045,R2,gasCCGT,2020,5.00000000000
+3,2049,R2,gasCCGT,2020,5.00000000000
+3,2050,R2,gasCCGT,2020,5.00000000000
+3,2059,R2,gasCCGT,2020,5.00000000000
+4,2030,R2,gasCCGT,2025,5.75150000000
+4,2035,R2,gasCCGT,2025,5.75150000000
+4,2040,R2,gasCCGT,2025,5.75150000000
+4,2045,R2,gasCCGT,2025,5.75150000000
+4,2049,R2,gasCCGT,2025,5.75150000000
+4,2050,R2,gasCCGT,2025,5.75150000000
+4,2059,R2,gasCCGT,2025,5.75150000000
+4,2060,R2,gasCCGT,2025,5.75150000000
+4,2064,R2,gasCCGT,2025,5.75150000000
+5,2025,R2,windturbine,2020,3.80910000000
+5,2030,R2,windturbine,2020,3.80910000000
+5,2035,R2,windturbine,2020,3.80910000000
+5,2040,R2,windturbine,2020,3.80910000000
+5,2045,R2,windturbine,2020,3.80910000000
+5,2049,R2,windturbine,2020,3.80910000000
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 65068351..8e89f626 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.75150000000
 1,2035,R1,gasCCGT,2025,5.75150000000
 1,2040,R1,gasCCGT,2025,5.75150000000
@@ -10,44 +17,45 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.75150000000
 1,2060,R1,gasCCGT,2025,5.75150000000
 1,2064,R1,gasCCGT,2025,5.75150000000
-2,2025,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2020,5.05910000000
-2,2035,R1,solarPV,2020,5.05910000000
-2,2040,R1,solarPV,2020,5.05910000000
-2,2045,R1,solarPV,2020,5.05910000000
-2,2049,R1,solarPV,2020,5.05910000000
-3,2035,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2030,5.60000000000
-3,2045,R1,solarPV,2030,5.60000000000
-3,2049,R1,solarPV,2030,5.60000000000
-3,2050,R1,solarPV,2030,5.60000000000
-3,2059,R1,solarPV,2030,5.60000000000
-4,2025,R1,windturbine,2020,10.00000000000
-4,2030,R1,windturbine,2020,10.00000000000
-4,2035,R1,windturbine,2020,10.00000000000
-4,2040,R1,windturbine,2020,10.00000000000
-4,2045,R1,windturbine,2020,10.00000000000
-4,2049,R1,windturbine,2020,10.00000000000
-5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-6,2030,R2,gasCCGT,2025,5.75150000000
-6,2035,R2,gasCCGT,2025,5.75150000000
-6,2040,R2,gasCCGT,2025,5.75150000000
-6,2045,R2,gasCCGT,2025,5.75150000000
-6,2049,R2,gasCCGT,2025,5.75150000000
-6,2050,R2,gasCCGT,2025,5.75150000000
-6,2059,R2,gasCCGT,2025,5.75150000000
-6,2060,R2,gasCCGT,2025,5.75150000000
-6,2064,R2,gasCCGT,2025,5.75150000000
-7,2035,R2,solarPV,2030,5.60000000000
-7,2040,R2,solarPV,2030,5.60000000000
-7,2045,R2,solarPV,2030,5.60000000000
-7,2049,R2,solarPV,2030,5.60000000000
-7,2050,R2,solarPV,2030,5.60000000000
-7,2059,R2,solarPV,2030,5.60000000000
-8,2025,R2,windturbine,2020,15.05910000000
-8,2030,R2,windturbine,2020,15.05910000000
-8,2035,R2,windturbine,2020,15.05910000000
-8,2040,R2,windturbine,2020,15.05910000000
-8,2045,R2,windturbine,2020,15.05910000000
-8,2049,R2,windturbine,2020,15.05910000000
+2,2035,R1,solarPV,2030,5.60000000000
+2,2040,R1,solarPV,2030,5.60000000000
+2,2045,R1,solarPV,2030,5.60000000000
+2,2049,R1,solarPV,2030,5.60000000000
+2,2050,R1,solarPV,2030,5.60000000000
+2,2059,R1,solarPV,2030,5.60000000000
+3,2025,R1,windturbine,2020,3.80910000000
+3,2030,R1,windturbine,2020,3.80910000000
+3,2035,R1,windturbine,2020,3.80910000000
+3,2040,R1,windturbine,2020,3.80910000000
+3,2045,R1,windturbine,2020,3.80910000000
+3,2049,R1,windturbine,2020,3.80910000000
+4,2020,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,gasCCGT,2020,6.00000000000
+4,2030,R2,gasCCGT,2020,5.00000000000
+4,2035,R2,gasCCGT,2020,5.00000000000
+4,2040,R2,gasCCGT,2020,5.00000000000
+4,2045,R2,gasCCGT,2020,5.00000000000
+4,2049,R2,gasCCGT,2020,5.00000000000
+4,2050,R2,gasCCGT,2020,5.00000000000
+4,2059,R2,gasCCGT,2020,5.00000000000
+5,2030,R2,gasCCGT,2025,5.75150000000
+5,2035,R2,gasCCGT,2025,5.75150000000
+5,2040,R2,gasCCGT,2025,5.75150000000
+5,2045,R2,gasCCGT,2025,5.75150000000
+5,2049,R2,gasCCGT,2025,5.75150000000
+5,2050,R2,gasCCGT,2025,5.75150000000
+5,2059,R2,gasCCGT,2025,5.75150000000
+5,2060,R2,gasCCGT,2025,5.75150000000
+5,2064,R2,gasCCGT,2025,5.75150000000
+6,2035,R2,solarPV,2030,5.60000000000
+6,2040,R2,solarPV,2030,5.60000000000
+6,2045,R2,solarPV,2030,5.60000000000
+6,2049,R2,solarPV,2030,5.60000000000
+6,2050,R2,solarPV,2030,5.60000000000
+6,2059,R2,solarPV,2030,5.60000000000
+7,2025,R2,windturbine,2020,3.80910000000
+7,2030,R2,windturbine,2020,3.80910000000
+7,2035,R2,windturbine,2020,3.80910000000
+7,2040,R2,windturbine,2020,3.80910000000
+7,2045,R2,windturbine,2020,3.80910000000
+7,2049,R2,windturbine,2020,3.80910000000
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 aa716523..3bf1bc02 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.75150000000
 1,2035,R1,gasCCGT,2025,5.75150000000
 1,2040,R1,gasCCGT,2025,5.75150000000
@@ -10,58 +17,59 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.75150000000
 1,2060,R1,gasCCGT,2025,5.75150000000
 1,2064,R1,gasCCGT,2025,5.75150000000
-2,2025,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2020,5.05910000000
-2,2035,R1,solarPV,2020,5.05910000000
-2,2040,R1,solarPV,2020,5.05910000000
-2,2045,R1,solarPV,2020,5.05910000000
-2,2049,R1,solarPV,2020,5.05910000000
-3,2035,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2030,5.60000000000
-3,2045,R1,solarPV,2030,5.60000000000
-3,2049,R1,solarPV,2030,5.60000000000
-3,2050,R1,solarPV,2030,5.60000000000
-3,2059,R1,solarPV,2030,5.60000000000
-4,2040,R1,solarPV,2035,5.60000000000
-4,2045,R1,solarPV,2035,5.60000000000
-4,2049,R1,solarPV,2035,5.60000000000
-4,2050,R1,solarPV,2035,5.60000000000
-4,2059,R1,solarPV,2035,5.60000000000
-4,2060,R1,solarPV,2035,5.60000000000
-4,2064,R1,solarPV,2035,5.60000000000
-5,2025,R1,windturbine,2020,10.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
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,gasCCGT,2025,5.75150000000
-7,2035,R2,gasCCGT,2025,5.75150000000
-7,2040,R2,gasCCGT,2025,5.75150000000
-7,2045,R2,gasCCGT,2025,5.75150000000
-7,2049,R2,gasCCGT,2025,5.75150000000
-7,2050,R2,gasCCGT,2025,5.75150000000
-7,2059,R2,gasCCGT,2025,5.75150000000
-7,2060,R2,gasCCGT,2025,5.75150000000
-7,2064,R2,gasCCGT,2025,5.75150000000
-8,2035,R2,solarPV,2030,5.60000000000
-8,2040,R2,solarPV,2030,5.60000000000
-8,2045,R2,solarPV,2030,5.60000000000
-8,2049,R2,solarPV,2030,5.60000000000
-8,2050,R2,solarPV,2030,5.60000000000
-8,2059,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2035,5.60000000000
-9,2045,R2,solarPV,2035,5.60000000000
-9,2049,R2,solarPV,2035,5.60000000000
-9,2050,R2,solarPV,2035,5.60000000000
-9,2059,R2,solarPV,2035,5.60000000000
-9,2060,R2,solarPV,2035,5.60000000000
-9,2064,R2,solarPV,2035,5.60000000000
-10,2025,R2,windturbine,2020,15.05910000000
-10,2030,R2,windturbine,2020,15.05910000000
-10,2035,R2,windturbine,2020,15.05910000000
-10,2040,R2,windturbine,2020,15.05910000000
-10,2045,R2,windturbine,2020,15.05910000000
-10,2049,R2,windturbine,2020,15.05910000000
+2,2035,R1,solarPV,2030,5.60000000000
+2,2040,R1,solarPV,2030,5.60000000000
+2,2045,R1,solarPV,2030,5.60000000000
+2,2049,R1,solarPV,2030,5.60000000000
+2,2050,R1,solarPV,2030,5.60000000000
+2,2059,R1,solarPV,2030,5.60000000000
+3,2040,R1,solarPV,2035,5.60000000000
+3,2045,R1,solarPV,2035,5.60000000000
+3,2049,R1,solarPV,2035,5.60000000000
+3,2050,R1,solarPV,2035,5.60000000000
+3,2059,R1,solarPV,2035,5.60000000000
+3,2060,R1,solarPV,2035,5.60000000000
+3,2064,R1,solarPV,2035,5.60000000000
+4,2025,R1,windturbine,2020,3.80910000000
+4,2030,R1,windturbine,2020,3.80910000000
+4,2035,R1,windturbine,2020,3.80910000000
+4,2040,R1,windturbine,2020,3.80910000000
+4,2045,R1,windturbine,2020,3.80910000000
+4,2049,R1,windturbine,2020,3.80910000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,6.00000000000
+5,2030,R2,gasCCGT,2020,5.00000000000
+5,2035,R2,gasCCGT,2020,5.00000000000
+5,2040,R2,gasCCGT,2020,5.00000000000
+5,2045,R2,gasCCGT,2020,5.00000000000
+5,2049,R2,gasCCGT,2020,5.00000000000
+5,2050,R2,gasCCGT,2020,5.00000000000
+5,2059,R2,gasCCGT,2020,5.00000000000
+6,2030,R2,gasCCGT,2025,5.75150000000
+6,2035,R2,gasCCGT,2025,5.75150000000
+6,2040,R2,gasCCGT,2025,5.75150000000
+6,2045,R2,gasCCGT,2025,5.75150000000
+6,2049,R2,gasCCGT,2025,5.75150000000
+6,2050,R2,gasCCGT,2025,5.75150000000
+6,2059,R2,gasCCGT,2025,5.75150000000
+6,2060,R2,gasCCGT,2025,5.75150000000
+6,2064,R2,gasCCGT,2025,5.75150000000
+7,2035,R2,solarPV,2030,5.60000000000
+7,2040,R2,solarPV,2030,5.60000000000
+7,2045,R2,solarPV,2030,5.60000000000
+7,2049,R2,solarPV,2030,5.60000000000
+7,2050,R2,solarPV,2030,5.60000000000
+7,2059,R2,solarPV,2030,5.60000000000
+8,2040,R2,solarPV,2035,5.60000000000
+8,2045,R2,solarPV,2035,5.60000000000
+8,2049,R2,solarPV,2035,5.60000000000
+8,2050,R2,solarPV,2035,5.60000000000
+8,2059,R2,solarPV,2035,5.60000000000
+8,2060,R2,solarPV,2035,5.60000000000
+8,2064,R2,solarPV,2035,5.60000000000
+9,2025,R2,windturbine,2020,3.80910000000
+9,2030,R2,windturbine,2020,3.80910000000
+9,2035,R2,windturbine,2020,3.80910000000
+9,2040,R2,windturbine,2020,3.80910000000
+9,2045,R2,windturbine,2020,3.80910000000
+9,2049,R2,windturbine,2020,3.80910000000
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 803ae01c..af661b19 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.75150000000
 1,2035,R1,gasCCGT,2025,5.75150000000
 1,2040,R1,gasCCGT,2025,5.75150000000
@@ -10,74 +17,75 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.75150000000
 1,2060,R1,gasCCGT,2025,5.75150000000
 1,2064,R1,gasCCGT,2025,5.75150000000
-2,2025,R1,solarPV,2020,5.05910000000
-2,2030,R1,solarPV,2020,5.05910000000
-2,2035,R1,solarPV,2020,5.05910000000
-2,2040,R1,solarPV,2020,5.05910000000
-2,2045,R1,solarPV,2020,5.05910000000
-2,2049,R1,solarPV,2020,5.05910000000
-3,2035,R1,solarPV,2030,5.60000000000
-3,2040,R1,solarPV,2030,5.60000000000
-3,2045,R1,solarPV,2030,5.60000000000
-3,2049,R1,solarPV,2030,5.60000000000
-3,2050,R1,solarPV,2030,5.60000000000
-3,2059,R1,solarPV,2030,5.60000000000
-4,2040,R1,solarPV,2035,5.60000000000
-4,2045,R1,solarPV,2035,5.60000000000
-4,2049,R1,solarPV,2035,5.60000000000
-4,2050,R1,solarPV,2035,5.60000000000
-4,2059,R1,solarPV,2035,5.60000000000
-4,2060,R1,solarPV,2035,5.60000000000
-4,2064,R1,solarPV,2035,5.60000000000
-5,2045,R1,solarPV,2040,5.60000000000
-5,2049,R1,solarPV,2040,5.60000000000
-5,2050,R1,solarPV,2040,5.60000000000
-5,2059,R1,solarPV,2040,5.60000000000
-5,2060,R1,solarPV,2040,5.60000000000
-5,2064,R1,solarPV,2040,5.60000000000
-5,2065,R1,solarPV,2040,5.60000000000
-5,2069,R1,solarPV,2040,5.60000000000
-6,2025,R1,windturbine,2020,10.00000000000
-6,2030,R1,windturbine,2020,10.00000000000
-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
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-8,2030,R2,gasCCGT,2025,5.75150000000
-8,2035,R2,gasCCGT,2025,5.75150000000
-8,2040,R2,gasCCGT,2025,5.75150000000
-8,2045,R2,gasCCGT,2025,5.75150000000
-8,2049,R2,gasCCGT,2025,5.75150000000
-8,2050,R2,gasCCGT,2025,5.75150000000
-8,2059,R2,gasCCGT,2025,5.75150000000
-8,2060,R2,gasCCGT,2025,5.75150000000
-8,2064,R2,gasCCGT,2025,5.75150000000
-9,2035,R2,solarPV,2030,5.60000000000
-9,2040,R2,solarPV,2030,5.60000000000
-9,2045,R2,solarPV,2030,5.60000000000
-9,2049,R2,solarPV,2030,5.60000000000
-9,2050,R2,solarPV,2030,5.60000000000
-9,2059,R2,solarPV,2030,5.60000000000
-10,2040,R2,solarPV,2035,5.60000000000
-10,2045,R2,solarPV,2035,5.60000000000
-10,2049,R2,solarPV,2035,5.60000000000
-10,2050,R2,solarPV,2035,5.60000000000
-10,2059,R2,solarPV,2035,5.60000000000
-10,2060,R2,solarPV,2035,5.60000000000
-10,2064,R2,solarPV,2035,5.60000000000
-11,2045,R2,solarPV,2040,5.60000000000
-11,2049,R2,solarPV,2040,5.60000000000
-11,2050,R2,solarPV,2040,5.60000000000
-11,2059,R2,solarPV,2040,5.60000000000
-11,2060,R2,solarPV,2040,5.60000000000
-11,2064,R2,solarPV,2040,5.60000000000
-11,2065,R2,solarPV,2040,5.60000000000
-11,2069,R2,solarPV,2040,5.60000000000
-12,2025,R2,windturbine,2020,15.05910000000
-12,2030,R2,windturbine,2020,15.05910000000
-12,2035,R2,windturbine,2020,15.05910000000
-12,2040,R2,windturbine,2020,15.05910000000
-12,2045,R2,windturbine,2020,15.05910000000
-12,2049,R2,windturbine,2020,15.05910000000
+2,2035,R1,solarPV,2030,5.60000000000
+2,2040,R1,solarPV,2030,5.60000000000
+2,2045,R1,solarPV,2030,5.60000000000
+2,2049,R1,solarPV,2030,5.60000000000
+2,2050,R1,solarPV,2030,5.60000000000
+2,2059,R1,solarPV,2030,5.60000000000
+3,2040,R1,solarPV,2035,5.60000000000
+3,2045,R1,solarPV,2035,5.60000000000
+3,2049,R1,solarPV,2035,5.60000000000
+3,2050,R1,solarPV,2035,5.60000000000
+3,2059,R1,solarPV,2035,5.60000000000
+3,2060,R1,solarPV,2035,5.60000000000
+3,2064,R1,solarPV,2035,5.60000000000
+4,2045,R1,solarPV,2040,5.60000000000
+4,2049,R1,solarPV,2040,5.60000000000
+4,2050,R1,solarPV,2040,5.60000000000
+4,2059,R1,solarPV,2040,5.60000000000
+4,2060,R1,solarPV,2040,5.60000000000
+4,2064,R1,solarPV,2040,5.60000000000
+4,2065,R1,solarPV,2040,5.60000000000
+4,2069,R1,solarPV,2040,5.60000000000
+5,2025,R1,windturbine,2020,3.80910000000
+5,2030,R1,windturbine,2020,3.80910000000
+5,2035,R1,windturbine,2020,3.80910000000
+5,2040,R1,windturbine,2020,3.80910000000
+5,2045,R1,windturbine,2020,3.80910000000
+5,2049,R1,windturbine,2020,3.80910000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,6.00000000000
+6,2030,R2,gasCCGT,2020,5.00000000000
+6,2035,R2,gasCCGT,2020,5.00000000000
+6,2040,R2,gasCCGT,2020,5.00000000000
+6,2045,R2,gasCCGT,2020,5.00000000000
+6,2049,R2,gasCCGT,2020,5.00000000000
+6,2050,R2,gasCCGT,2020,5.00000000000
+6,2059,R2,gasCCGT,2020,5.00000000000
+7,2030,R2,gasCCGT,2025,5.75150000000
+7,2035,R2,gasCCGT,2025,5.75150000000
+7,2040,R2,gasCCGT,2025,5.75150000000
+7,2045,R2,gasCCGT,2025,5.75150000000
+7,2049,R2,gasCCGT,2025,5.75150000000
+7,2050,R2,gasCCGT,2025,5.75150000000
+7,2059,R2,gasCCGT,2025,5.75150000000
+7,2060,R2,gasCCGT,2025,5.75150000000
+7,2064,R2,gasCCGT,2025,5.75150000000
+8,2035,R2,solarPV,2030,5.60000000000
+8,2040,R2,solarPV,2030,5.60000000000
+8,2045,R2,solarPV,2030,5.60000000000
+8,2049,R2,solarPV,2030,5.60000000000
+8,2050,R2,solarPV,2030,5.60000000000
+8,2059,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2035,5.60000000000
+9,2045,R2,solarPV,2035,5.60000000000
+9,2049,R2,solarPV,2035,5.60000000000
+9,2050,R2,solarPV,2035,5.60000000000
+9,2059,R2,solarPV,2035,5.60000000000
+9,2060,R2,solarPV,2035,5.60000000000
+9,2064,R2,solarPV,2035,5.60000000000
+10,2045,R2,solarPV,2040,5.60000000000
+10,2049,R2,solarPV,2040,5.60000000000
+10,2050,R2,solarPV,2040,5.60000000000
+10,2059,R2,solarPV,2040,5.60000000000
+10,2060,R2,solarPV,2040,5.60000000000
+10,2064,R2,solarPV,2040,5.60000000000
+10,2065,R2,solarPV,2040,5.60000000000
+10,2069,R2,solarPV,2040,5.60000000000
+11,2025,R2,windturbine,2020,3.80910000000
+11,2030,R2,windturbine,2020,3.80910000000
+11,2035,R2,windturbine,2020,3.80910000000
+11,2040,R2,windturbine,2020,3.80910000000
+11,2045,R2,windturbine,2020,3.80910000000
+11,2049,R2,windturbine,2020,3.80910000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
index d2a868b8..609d25b9 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2045.csv
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.75150000000
 1,2035,R1,gasCCGT,2025,5.75150000000
 1,2040,R1,gasCCGT,2025,5.75150000000
@@ -10,116 +17,91 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.75150000000
 1,2060,R1,gasCCGT,2025,5.75150000000
 1,2064,R1,gasCCGT,2025,5.75150000000
-2,2050,R1,gasCCGT,2045,0.29290000000
-2,2059,R1,gasCCGT,2045,0.29290000000
-2,2060,R1,gasCCGT,2045,0.29290000000
-2,2064,R1,gasCCGT,2045,0.29290000000
-2,2065,R1,gasCCGT,2045,0.29290000000
-2,2069,R1,gasCCGT,2045,0.29290000000
-2,2070,R1,gasCCGT,2045,0.29290000000
-2,2074,R1,gasCCGT,2045,0.29290000000
-2,2075,R1,gasCCGT,2045,0.29290000000
-2,2084,R1,gasCCGT,2045,0.29290000000
-3,2025,R1,solarPV,2020,5.05910000000
-3,2030,R1,solarPV,2020,5.05910000000
-3,2035,R1,solarPV,2020,5.05910000000
-3,2040,R1,solarPV,2020,5.05910000000
-3,2045,R1,solarPV,2020,5.05910000000
-3,2049,R1,solarPV,2020,5.05910000000
-4,2035,R1,solarPV,2030,5.60000000000
-4,2040,R1,solarPV,2030,5.60000000000
-4,2045,R1,solarPV,2030,5.60000000000
-4,2049,R1,solarPV,2030,5.60000000000
-4,2050,R1,solarPV,2030,5.60000000000
-4,2059,R1,solarPV,2030,5.60000000000
-5,2040,R1,solarPV,2035,5.60000000000
-5,2045,R1,solarPV,2035,5.60000000000
-5,2049,R1,solarPV,2035,5.60000000000
-5,2050,R1,solarPV,2035,5.60000000000
-5,2059,R1,solarPV,2035,5.60000000000
-5,2060,R1,solarPV,2035,5.60000000000
-5,2064,R1,solarPV,2035,5.60000000000
-6,2045,R1,solarPV,2040,5.60000000000
-6,2049,R1,solarPV,2040,5.60000000000
-6,2050,R1,solarPV,2040,5.60000000000
-6,2059,R1,solarPV,2040,5.60000000000
-6,2060,R1,solarPV,2040,5.60000000000
-6,2064,R1,solarPV,2040,5.60000000000
-6,2065,R1,solarPV,2040,5.60000000000
-6,2069,R1,solarPV,2040,5.60000000000
-7,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,5.75150000000
-11,2035,R2,gasCCGT,2025,5.75150000000
-11,2040,R2,gasCCGT,2025,5.75150000000
-11,2045,R2,gasCCGT,2025,5.75150000000
-11,2049,R2,gasCCGT,2025,5.75150000000
-11,2050,R2,gasCCGT,2025,5.75150000000
-11,2059,R2,gasCCGT,2025,5.75150000000
-11,2060,R2,gasCCGT,2025,5.75150000000
-11,2064,R2,gasCCGT,2025,5.75150000000
-12,2035,R2,solarPV,2030,5.60000000000
-12,2040,R2,solarPV,2030,5.60000000000
-12,2045,R2,solarPV,2030,5.60000000000
-12,2049,R2,solarPV,2030,5.60000000000
-12,2050,R2,solarPV,2030,5.60000000000
-12,2059,R2,solarPV,2030,5.60000000000
-13,2040,R2,solarPV,2035,5.60000000000
-13,2045,R2,solarPV,2035,5.60000000000
-13,2049,R2,solarPV,2035,5.60000000000
-13,2050,R2,solarPV,2035,5.60000000000
-13,2059,R2,solarPV,2035,5.60000000000
-13,2060,R2,solarPV,2035,5.60000000000
-13,2064,R2,solarPV,2035,5.60000000000
-14,2045,R2,solarPV,2040,5.60000000000
-14,2049,R2,solarPV,2040,5.60000000000
-14,2050,R2,solarPV,2040,5.60000000000
-14,2059,R2,solarPV,2040,5.60000000000
-14,2060,R2,solarPV,2040,5.60000000000
-14,2064,R2,solarPV,2040,5.60000000000
-14,2065,R2,solarPV,2040,5.60000000000
-14,2069,R2,solarPV,2040,5.60000000000
-15,2050,R2,solarPV,2045,10.00000000000
-15,2059,R2,solarPV,2045,10.00000000000
-15,2060,R2,solarPV,2045,10.00000000000
-15,2064,R2,solarPV,2045,10.00000000000
-15,2065,R2,solarPV,2045,10.00000000000
-15,2069,R2,solarPV,2045,10.00000000000
-15,2070,R2,solarPV,2045,10.00000000000
-15,2074,R2,solarPV,2045,10.00000000000
-16,2025,R2,windturbine,2020,15.05910000000
-16,2030,R2,windturbine,2020,15.05910000000
-16,2035,R2,windturbine,2020,15.05910000000
-16,2040,R2,windturbine,2020,15.05910000000
-16,2045,R2,windturbine,2020,15.05910000000
-16,2049,R2,windturbine,2020,15.05910000000
-17,2050,R2,windturbine,2045,10.65910000000
-17,2059,R2,windturbine,2045,10.65910000000
-17,2060,R2,windturbine,2045,10.65910000000
-17,2064,R2,windturbine,2045,10.65910000000
-17,2065,R2,windturbine,2045,10.65910000000
-17,2069,R2,windturbine,2045,10.65910000000
-17,2070,R2,windturbine,2045,10.65910000000
-17,2074,R2,windturbine,2045,10.65910000000
+2,2035,R1,solarPV,2030,5.60000000000
+2,2040,R1,solarPV,2030,5.60000000000
+2,2045,R1,solarPV,2030,5.60000000000
+2,2049,R1,solarPV,2030,5.60000000000
+2,2050,R1,solarPV,2030,5.60000000000
+2,2059,R1,solarPV,2030,5.60000000000
+3,2040,R1,solarPV,2035,5.60000000000
+3,2045,R1,solarPV,2035,5.60000000000
+3,2049,R1,solarPV,2035,5.60000000000
+3,2050,R1,solarPV,2035,5.60000000000
+3,2059,R1,solarPV,2035,5.60000000000
+3,2060,R1,solarPV,2035,5.60000000000
+3,2064,R1,solarPV,2035,5.60000000000
+4,2045,R1,solarPV,2040,5.60000000000
+4,2049,R1,solarPV,2040,5.60000000000
+4,2050,R1,solarPV,2040,5.60000000000
+4,2059,R1,solarPV,2040,5.60000000000
+4,2060,R1,solarPV,2040,5.60000000000
+4,2064,R1,solarPV,2040,5.60000000000
+4,2065,R1,solarPV,2040,5.60000000000
+4,2069,R1,solarPV,2040,5.60000000000
+5,2050,R1,solarPV,2045,9.40910000000
+5,2059,R1,solarPV,2045,9.40910000000
+5,2060,R1,solarPV,2045,9.40910000000
+5,2064,R1,solarPV,2045,9.40910000000
+5,2065,R1,solarPV,2045,9.40910000000
+5,2069,R1,solarPV,2045,9.40910000000
+5,2070,R1,solarPV,2045,9.40910000000
+5,2074,R1,solarPV,2045,9.40910000000
+6,2025,R1,windturbine,2020,3.80910000000
+6,2030,R1,windturbine,2020,3.80910000000
+6,2035,R1,windturbine,2020,3.80910000000
+6,2040,R1,windturbine,2020,3.80910000000
+6,2045,R1,windturbine,2020,3.80910000000
+6,2049,R1,windturbine,2020,3.80910000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,6.00000000000
+7,2030,R2,gasCCGT,2020,5.00000000000
+7,2035,R2,gasCCGT,2020,5.00000000000
+7,2040,R2,gasCCGT,2020,5.00000000000
+7,2045,R2,gasCCGT,2020,5.00000000000
+7,2049,R2,gasCCGT,2020,5.00000000000
+7,2050,R2,gasCCGT,2020,5.00000000000
+7,2059,R2,gasCCGT,2020,5.00000000000
+8,2030,R2,gasCCGT,2025,5.75150000000
+8,2035,R2,gasCCGT,2025,5.75150000000
+8,2040,R2,gasCCGT,2025,5.75150000000
+8,2045,R2,gasCCGT,2025,5.75150000000
+8,2049,R2,gasCCGT,2025,5.75150000000
+8,2050,R2,gasCCGT,2025,5.75150000000
+8,2059,R2,gasCCGT,2025,5.75150000000
+8,2060,R2,gasCCGT,2025,5.75150000000
+8,2064,R2,gasCCGT,2025,5.75150000000
+9,2035,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2030,5.60000000000
+9,2045,R2,solarPV,2030,5.60000000000
+9,2049,R2,solarPV,2030,5.60000000000
+9,2050,R2,solarPV,2030,5.60000000000
+9,2059,R2,solarPV,2030,5.60000000000
+10,2040,R2,solarPV,2035,5.60000000000
+10,2045,R2,solarPV,2035,5.60000000000
+10,2049,R2,solarPV,2035,5.60000000000
+10,2050,R2,solarPV,2035,5.60000000000
+10,2059,R2,solarPV,2035,5.60000000000
+10,2060,R2,solarPV,2035,5.60000000000
+10,2064,R2,solarPV,2035,5.60000000000
+11,2045,R2,solarPV,2040,5.60000000000
+11,2049,R2,solarPV,2040,5.60000000000
+11,2050,R2,solarPV,2040,5.60000000000
+11,2059,R2,solarPV,2040,5.60000000000
+11,2060,R2,solarPV,2040,5.60000000000
+11,2064,R2,solarPV,2040,5.60000000000
+11,2065,R2,solarPV,2040,5.60000000000
+11,2069,R2,solarPV,2040,5.60000000000
+12,2050,R2,solarPV,2045,9.40910000000
+12,2059,R2,solarPV,2045,9.40910000000
+12,2060,R2,solarPV,2045,9.40910000000
+12,2064,R2,solarPV,2045,9.40910000000
+12,2065,R2,solarPV,2045,9.40910000000
+12,2069,R2,solarPV,2045,9.40910000000
+12,2070,R2,solarPV,2045,9.40910000000
+12,2074,R2,solarPV,2045,9.40910000000
+13,2025,R2,windturbine,2020,3.80910000000
+13,2030,R2,windturbine,2020,3.80910000000
+13,2035,R2,windturbine,2020,3.80910000000
+13,2040,R2,windturbine,2020,3.80910000000
+13,2045,R2,windturbine,2020,3.80910000000
+13,2049,R2,windturbine,2020,3.80910000000
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 d2a868b8..609d25b9 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,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,5.75150000000
 1,2035,R1,gasCCGT,2025,5.75150000000
 1,2040,R1,gasCCGT,2025,5.75150000000
@@ -10,116 +17,91 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,5.75150000000
 1,2060,R1,gasCCGT,2025,5.75150000000
 1,2064,R1,gasCCGT,2025,5.75150000000
-2,2050,R1,gasCCGT,2045,0.29290000000
-2,2059,R1,gasCCGT,2045,0.29290000000
-2,2060,R1,gasCCGT,2045,0.29290000000
-2,2064,R1,gasCCGT,2045,0.29290000000
-2,2065,R1,gasCCGT,2045,0.29290000000
-2,2069,R1,gasCCGT,2045,0.29290000000
-2,2070,R1,gasCCGT,2045,0.29290000000
-2,2074,R1,gasCCGT,2045,0.29290000000
-2,2075,R1,gasCCGT,2045,0.29290000000
-2,2084,R1,gasCCGT,2045,0.29290000000
-3,2025,R1,solarPV,2020,5.05910000000
-3,2030,R1,solarPV,2020,5.05910000000
-3,2035,R1,solarPV,2020,5.05910000000
-3,2040,R1,solarPV,2020,5.05910000000
-3,2045,R1,solarPV,2020,5.05910000000
-3,2049,R1,solarPV,2020,5.05910000000
-4,2035,R1,solarPV,2030,5.60000000000
-4,2040,R1,solarPV,2030,5.60000000000
-4,2045,R1,solarPV,2030,5.60000000000
-4,2049,R1,solarPV,2030,5.60000000000
-4,2050,R1,solarPV,2030,5.60000000000
-4,2059,R1,solarPV,2030,5.60000000000
-5,2040,R1,solarPV,2035,5.60000000000
-5,2045,R1,solarPV,2035,5.60000000000
-5,2049,R1,solarPV,2035,5.60000000000
-5,2050,R1,solarPV,2035,5.60000000000
-5,2059,R1,solarPV,2035,5.60000000000
-5,2060,R1,solarPV,2035,5.60000000000
-5,2064,R1,solarPV,2035,5.60000000000
-6,2045,R1,solarPV,2040,5.60000000000
-6,2049,R1,solarPV,2040,5.60000000000
-6,2050,R1,solarPV,2040,5.60000000000
-6,2059,R1,solarPV,2040,5.60000000000
-6,2060,R1,solarPV,2040,5.60000000000
-6,2064,R1,solarPV,2040,5.60000000000
-6,2065,R1,solarPV,2040,5.60000000000
-6,2069,R1,solarPV,2040,5.60000000000
-7,2050,R1,solarPV,2045,10.00000000000
-7,2059,R1,solarPV,2045,10.00000000000
-7,2060,R1,solarPV,2045,10.00000000000
-7,2064,R1,solarPV,2045,10.00000000000
-7,2065,R1,solarPV,2045,10.00000000000
-7,2069,R1,solarPV,2045,10.00000000000
-7,2070,R1,solarPV,2045,10.00000000000
-7,2074,R1,solarPV,2045,10.00000000000
-8,2025,R1,windturbine,2020,10.00000000000
-8,2030,R1,windturbine,2020,10.00000000000
-8,2035,R1,windturbine,2020,10.00000000000
-8,2040,R1,windturbine,2020,10.00000000000
-8,2045,R1,windturbine,2020,10.00000000000
-8,2049,R1,windturbine,2020,10.00000000000
-9,2050,R1,windturbine,2045,10.00000000000
-9,2059,R1,windturbine,2045,10.00000000000
-9,2060,R1,windturbine,2045,10.00000000000
-9,2064,R1,windturbine,2045,10.00000000000
-9,2065,R1,windturbine,2045,10.00000000000
-9,2069,R1,windturbine,2045,10.00000000000
-9,2070,R1,windturbine,2045,10.00000000000
-9,2074,R1,windturbine,2045,10.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,5.75150000000
-11,2035,R2,gasCCGT,2025,5.75150000000
-11,2040,R2,gasCCGT,2025,5.75150000000
-11,2045,R2,gasCCGT,2025,5.75150000000
-11,2049,R2,gasCCGT,2025,5.75150000000
-11,2050,R2,gasCCGT,2025,5.75150000000
-11,2059,R2,gasCCGT,2025,5.75150000000
-11,2060,R2,gasCCGT,2025,5.75150000000
-11,2064,R2,gasCCGT,2025,5.75150000000
-12,2035,R2,solarPV,2030,5.60000000000
-12,2040,R2,solarPV,2030,5.60000000000
-12,2045,R2,solarPV,2030,5.60000000000
-12,2049,R2,solarPV,2030,5.60000000000
-12,2050,R2,solarPV,2030,5.60000000000
-12,2059,R2,solarPV,2030,5.60000000000
-13,2040,R2,solarPV,2035,5.60000000000
-13,2045,R2,solarPV,2035,5.60000000000
-13,2049,R2,solarPV,2035,5.60000000000
-13,2050,R2,solarPV,2035,5.60000000000
-13,2059,R2,solarPV,2035,5.60000000000
-13,2060,R2,solarPV,2035,5.60000000000
-13,2064,R2,solarPV,2035,5.60000000000
-14,2045,R2,solarPV,2040,5.60000000000
-14,2049,R2,solarPV,2040,5.60000000000
-14,2050,R2,solarPV,2040,5.60000000000
-14,2059,R2,solarPV,2040,5.60000000000
-14,2060,R2,solarPV,2040,5.60000000000
-14,2064,R2,solarPV,2040,5.60000000000
-14,2065,R2,solarPV,2040,5.60000000000
-14,2069,R2,solarPV,2040,5.60000000000
-15,2050,R2,solarPV,2045,10.00000000000
-15,2059,R2,solarPV,2045,10.00000000000
-15,2060,R2,solarPV,2045,10.00000000000
-15,2064,R2,solarPV,2045,10.00000000000
-15,2065,R2,solarPV,2045,10.00000000000
-15,2069,R2,solarPV,2045,10.00000000000
-15,2070,R2,solarPV,2045,10.00000000000
-15,2074,R2,solarPV,2045,10.00000000000
-16,2025,R2,windturbine,2020,15.05910000000
-16,2030,R2,windturbine,2020,15.05910000000
-16,2035,R2,windturbine,2020,15.05910000000
-16,2040,R2,windturbine,2020,15.05910000000
-16,2045,R2,windturbine,2020,15.05910000000
-16,2049,R2,windturbine,2020,15.05910000000
-17,2050,R2,windturbine,2045,10.65910000000
-17,2059,R2,windturbine,2045,10.65910000000
-17,2060,R2,windturbine,2045,10.65910000000
-17,2064,R2,windturbine,2045,10.65910000000
-17,2065,R2,windturbine,2045,10.65910000000
-17,2069,R2,windturbine,2045,10.65910000000
-17,2070,R2,windturbine,2045,10.65910000000
-17,2074,R2,windturbine,2045,10.65910000000
+2,2035,R1,solarPV,2030,5.60000000000
+2,2040,R1,solarPV,2030,5.60000000000
+2,2045,R1,solarPV,2030,5.60000000000
+2,2049,R1,solarPV,2030,5.60000000000
+2,2050,R1,solarPV,2030,5.60000000000
+2,2059,R1,solarPV,2030,5.60000000000
+3,2040,R1,solarPV,2035,5.60000000000
+3,2045,R1,solarPV,2035,5.60000000000
+3,2049,R1,solarPV,2035,5.60000000000
+3,2050,R1,solarPV,2035,5.60000000000
+3,2059,R1,solarPV,2035,5.60000000000
+3,2060,R1,solarPV,2035,5.60000000000
+3,2064,R1,solarPV,2035,5.60000000000
+4,2045,R1,solarPV,2040,5.60000000000
+4,2049,R1,solarPV,2040,5.60000000000
+4,2050,R1,solarPV,2040,5.60000000000
+4,2059,R1,solarPV,2040,5.60000000000
+4,2060,R1,solarPV,2040,5.60000000000
+4,2064,R1,solarPV,2040,5.60000000000
+4,2065,R1,solarPV,2040,5.60000000000
+4,2069,R1,solarPV,2040,5.60000000000
+5,2050,R1,solarPV,2045,9.40910000000
+5,2059,R1,solarPV,2045,9.40910000000
+5,2060,R1,solarPV,2045,9.40910000000
+5,2064,R1,solarPV,2045,9.40910000000
+5,2065,R1,solarPV,2045,9.40910000000
+5,2069,R1,solarPV,2045,9.40910000000
+5,2070,R1,solarPV,2045,9.40910000000
+5,2074,R1,solarPV,2045,9.40910000000
+6,2025,R1,windturbine,2020,3.80910000000
+6,2030,R1,windturbine,2020,3.80910000000
+6,2035,R1,windturbine,2020,3.80910000000
+6,2040,R1,windturbine,2020,3.80910000000
+6,2045,R1,windturbine,2020,3.80910000000
+6,2049,R1,windturbine,2020,3.80910000000
+7,2020,R2,gasCCGT,2020,1.00000000000
+7,2025,R2,gasCCGT,2020,6.00000000000
+7,2030,R2,gasCCGT,2020,5.00000000000
+7,2035,R2,gasCCGT,2020,5.00000000000
+7,2040,R2,gasCCGT,2020,5.00000000000
+7,2045,R2,gasCCGT,2020,5.00000000000
+7,2049,R2,gasCCGT,2020,5.00000000000
+7,2050,R2,gasCCGT,2020,5.00000000000
+7,2059,R2,gasCCGT,2020,5.00000000000
+8,2030,R2,gasCCGT,2025,5.75150000000
+8,2035,R2,gasCCGT,2025,5.75150000000
+8,2040,R2,gasCCGT,2025,5.75150000000
+8,2045,R2,gasCCGT,2025,5.75150000000
+8,2049,R2,gasCCGT,2025,5.75150000000
+8,2050,R2,gasCCGT,2025,5.75150000000
+8,2059,R2,gasCCGT,2025,5.75150000000
+8,2060,R2,gasCCGT,2025,5.75150000000
+8,2064,R2,gasCCGT,2025,5.75150000000
+9,2035,R2,solarPV,2030,5.60000000000
+9,2040,R2,solarPV,2030,5.60000000000
+9,2045,R2,solarPV,2030,5.60000000000
+9,2049,R2,solarPV,2030,5.60000000000
+9,2050,R2,solarPV,2030,5.60000000000
+9,2059,R2,solarPV,2030,5.60000000000
+10,2040,R2,solarPV,2035,5.60000000000
+10,2045,R2,solarPV,2035,5.60000000000
+10,2049,R2,solarPV,2035,5.60000000000
+10,2050,R2,solarPV,2035,5.60000000000
+10,2059,R2,solarPV,2035,5.60000000000
+10,2060,R2,solarPV,2035,5.60000000000
+10,2064,R2,solarPV,2035,5.60000000000
+11,2045,R2,solarPV,2040,5.60000000000
+11,2049,R2,solarPV,2040,5.60000000000
+11,2050,R2,solarPV,2040,5.60000000000
+11,2059,R2,solarPV,2040,5.60000000000
+11,2060,R2,solarPV,2040,5.60000000000
+11,2064,R2,solarPV,2040,5.60000000000
+11,2065,R2,solarPV,2040,5.60000000000
+11,2069,R2,solarPV,2040,5.60000000000
+12,2050,R2,solarPV,2045,9.40910000000
+12,2059,R2,solarPV,2045,9.40910000000
+12,2060,R2,solarPV,2045,9.40910000000
+12,2064,R2,solarPV,2045,9.40910000000
+12,2065,R2,solarPV,2045,9.40910000000
+12,2069,R2,solarPV,2045,9.40910000000
+12,2070,R2,solarPV,2045,9.40910000000
+12,2074,R2,solarPV,2045,9.40910000000
+13,2025,R2,windturbine,2020,3.80910000000
+13,2030,R2,windturbine,2020,3.80910000000
+13,2035,R2,windturbine,2020,3.80910000000
+13,2040,R2,windturbine,2020,3.80910000000
+13,2045,R2,windturbine,2020,3.80910000000
+13,2049,R2,windturbine,2020,3.80910000000
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 1d028468..3213f6b1 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,7 +1,19 @@
 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
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
 1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,15.00000000000
-1,2030,R2,gassupply1,2020,7.50000000000
+1,2022,R2,gassupply1,2020,15.34280000000
+1,2025,R2,gassupply1,2020,15.34280000000
+1,2030,R2,gassupply1,2020,7.84280000000
+1,2035,R2,gassupply1,2020,0.34280000000
+1,2040,R2,gassupply1,2020,0.34280000000
+1,2045,R2,gassupply1,2020,0.34280000000
+1,2050,R2,gassupply1,2020,0.34280000000
+1,2056,R2,gassupply1,2020,0.34280000000
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 1d028468..fe400f81 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,7 +1,41 @@
 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
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2020,R2,gassupply1,2020,15.00000000000
+2,2022,R2,gassupply1,2020,15.34280000000
+2,2024,R2,gassupply1,2020,15.34280000000
+2,2025,R2,gassupply1,2020,15.34280000000
+2,2030,R2,gassupply1,2020,7.84280000000
+2,2035,R2,gassupply1,2020,0.34280000000
+2,2040,R2,gassupply1,2020,0.34280000000
+2,2045,R2,gassupply1,2020,0.34280000000
+2,2050,R2,gassupply1,2020,0.34280000000
+2,2056,R2,gassupply1,2020,0.34280000000
+3,2024,R2,gassupply1,2022,0.60380000000
+3,2025,R2,gassupply1,2022,0.60380000000
+3,2030,R2,gassupply1,2022,0.60380000000
+3,2035,R2,gassupply1,2022,0.60380000000
+3,2040,R2,gassupply1,2022,0.60380000000
+3,2045,R2,gassupply1,2022,0.60380000000
+3,2050,R2,gassupply1,2022,0.60380000000
+3,2056,R2,gassupply1,2022,0.60380000000
+3,2057,R2,gassupply1,2022,0.60380000000
+3,2058,R2,gassupply1,2022,0.60380000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
index 1d028468..e25eb5ce 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2024.csv
@@ -1,7 +1,67 @@
 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
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2020,R2,gassupply1,2020,15.00000000000
+3,2022,R2,gassupply1,2020,15.34280000000
+3,2024,R2,gassupply1,2020,15.34280000000
+3,2025,R2,gassupply1,2020,15.34280000000
+3,2026,R2,gassupply1,2020,13.84280000000
+3,2030,R2,gassupply1,2020,7.84280000000
+3,2035,R2,gassupply1,2020,0.34280000000
+3,2040,R2,gassupply1,2020,0.34280000000
+3,2045,R2,gassupply1,2020,0.34280000000
+3,2050,R2,gassupply1,2020,0.34280000000
+3,2056,R2,gassupply1,2020,0.34280000000
+4,2024,R2,gassupply1,2022,0.60380000000
+4,2025,R2,gassupply1,2022,0.60380000000
+4,2026,R2,gassupply1,2022,0.60380000000
+4,2030,R2,gassupply1,2022,0.60380000000
+4,2035,R2,gassupply1,2022,0.60380000000
+4,2040,R2,gassupply1,2022,0.60380000000
+4,2045,R2,gassupply1,2022,0.60380000000
+4,2050,R2,gassupply1,2022,0.60380000000
+4,2056,R2,gassupply1,2022,0.60380000000
+4,2057,R2,gassupply1,2022,0.60380000000
+4,2058,R2,gassupply1,2022,0.60380000000
+5,2026,R2,gassupply1,2024,2.07490000000
+5,2030,R2,gassupply1,2024,2.07490000000
+5,2035,R2,gassupply1,2024,2.07490000000
+5,2040,R2,gassupply1,2024,2.07490000000
+5,2045,R2,gassupply1,2024,2.07490000000
+5,2050,R2,gassupply1,2024,2.07490000000
+5,2056,R2,gassupply1,2024,2.07490000000
+5,2057,R2,gassupply1,2024,2.07490000000
+5,2058,R2,gassupply1,2024,2.07490000000
+5,2059,R2,gassupply1,2024,2.07490000000
+5,2060,R2,gassupply1,2024,2.07490000000
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 81460746..61b66fd9 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,23 +1,99 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2028,R2,gassupply1,2020,10.50000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2028,R2,gassupply1,2026,3.52150000000
-3,2030,R2,gassupply1,2026,3.52150000000
-3,2035,R2,gassupply1,2026,3.52150000000
-3,2040,R2,gassupply1,2026,3.52150000000
-3,2045,R2,gassupply1,2026,3.52150000000
-3,2050,R2,gassupply1,2026,3.52150000000
-3,2062,R2,gassupply1,2026,3.52150000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2022,R2,gassupply1,2020,15.34280000000
+4,2024,R2,gassupply1,2020,15.34280000000
+4,2025,R2,gassupply1,2020,15.34280000000
+4,2026,R2,gassupply1,2020,13.84280000000
+4,2028,R2,gassupply1,2020,10.84280000000
+4,2030,R2,gassupply1,2020,7.84280000000
+4,2035,R2,gassupply1,2020,0.34280000000
+4,2040,R2,gassupply1,2020,0.34280000000
+4,2045,R2,gassupply1,2020,0.34280000000
+4,2050,R2,gassupply1,2020,0.34280000000
+4,2056,R2,gassupply1,2020,0.34280000000
+5,2024,R2,gassupply1,2022,0.60380000000
+5,2025,R2,gassupply1,2022,0.60380000000
+5,2026,R2,gassupply1,2022,0.60380000000
+5,2028,R2,gassupply1,2022,0.60380000000
+5,2030,R2,gassupply1,2022,0.60380000000
+5,2035,R2,gassupply1,2022,0.60380000000
+5,2040,R2,gassupply1,2022,0.60380000000
+5,2045,R2,gassupply1,2022,0.60380000000
+5,2050,R2,gassupply1,2022,0.60380000000
+5,2056,R2,gassupply1,2022,0.60380000000
+5,2057,R2,gassupply1,2022,0.60380000000
+5,2058,R2,gassupply1,2022,0.60380000000
+6,2026,R2,gassupply1,2024,2.07490000000
+6,2028,R2,gassupply1,2024,2.07490000000
+6,2030,R2,gassupply1,2024,2.07490000000
+6,2035,R2,gassupply1,2024,2.07490000000
+6,2040,R2,gassupply1,2024,2.07490000000
+6,2045,R2,gassupply1,2024,2.07490000000
+6,2050,R2,gassupply1,2024,2.07490000000
+6,2056,R2,gassupply1,2024,2.07490000000
+6,2057,R2,gassupply1,2024,2.07490000000
+6,2058,R2,gassupply1,2024,2.07490000000
+6,2059,R2,gassupply1,2024,2.07490000000
+6,2060,R2,gassupply1,2024,2.07490000000
+7,2028,R2,gassupply1,2026,3.55300000000
+7,2030,R2,gassupply1,2026,3.55300000000
+7,2035,R2,gassupply1,2026,3.55300000000
+7,2040,R2,gassupply1,2026,3.55300000000
+7,2045,R2,gassupply1,2026,3.55300000000
+7,2050,R2,gassupply1,2026,3.55300000000
+7,2056,R2,gassupply1,2026,3.55300000000
+7,2057,R2,gassupply1,2026,3.55300000000
+7,2058,R2,gassupply1,2026,3.55300000000
+7,2059,R2,gassupply1,2026,3.55300000000
+7,2060,R2,gassupply1,2026,3.55300000000
+7,2061,R2,gassupply1,2026,3.55300000000
+7,2062,R2,gassupply1,2026,3.55300000000
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 5a49d77f..1d3a800f 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,39 +1,127 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2028,R2,gassupply1,2020,10.50000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2028,R2,gassupply1,2026,3.52150000000
-4,2030,R2,gassupply1,2026,3.52150000000
-4,2035,R2,gassupply1,2026,3.52150000000
-4,2040,R2,gassupply1,2026,3.52150000000
-4,2045,R2,gassupply1,2026,3.52150000000
-4,2050,R2,gassupply1,2026,3.52150000000
-4,2062,R2,gassupply1,2026,3.52150000000
-5,2030,R2,gassupply1,2028,3.53600000000
-5,2035,R2,gassupply1,2028,3.53600000000
-5,2040,R2,gassupply1,2028,3.53600000000
-5,2045,R2,gassupply1,2028,3.53600000000
-5,2050,R2,gassupply1,2028,3.53600000000
-5,2062,R2,gassupply1,2028,3.53600000000
-5,2063,R2,gassupply1,2028,3.53600000000
-5,2064,R2,gassupply1,2028,3.53600000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2020,R2,gassupply1,2020,15.00000000000
+5,2022,R2,gassupply1,2020,15.34280000000
+5,2024,R2,gassupply1,2020,15.34280000000
+5,2025,R2,gassupply1,2020,15.34280000000
+5,2026,R2,gassupply1,2020,13.84280000000
+5,2028,R2,gassupply1,2020,10.84280000000
+5,2030,R2,gassupply1,2020,7.84280000000
+5,2035,R2,gassupply1,2020,0.34280000000
+5,2040,R2,gassupply1,2020,0.34280000000
+5,2045,R2,gassupply1,2020,0.34280000000
+5,2050,R2,gassupply1,2020,0.34280000000
+5,2056,R2,gassupply1,2020,0.34280000000
+6,2024,R2,gassupply1,2022,0.60380000000
+6,2025,R2,gassupply1,2022,0.60380000000
+6,2026,R2,gassupply1,2022,0.60380000000
+6,2028,R2,gassupply1,2022,0.60380000000
+6,2030,R2,gassupply1,2022,0.60380000000
+6,2035,R2,gassupply1,2022,0.60380000000
+6,2040,R2,gassupply1,2022,0.60380000000
+6,2045,R2,gassupply1,2022,0.60380000000
+6,2050,R2,gassupply1,2022,0.60380000000
+6,2056,R2,gassupply1,2022,0.60380000000
+6,2057,R2,gassupply1,2022,0.60380000000
+6,2058,R2,gassupply1,2022,0.60380000000
+7,2026,R2,gassupply1,2024,2.07490000000
+7,2028,R2,gassupply1,2024,2.07490000000
+7,2030,R2,gassupply1,2024,2.07490000000
+7,2035,R2,gassupply1,2024,2.07490000000
+7,2040,R2,gassupply1,2024,2.07490000000
+7,2045,R2,gassupply1,2024,2.07490000000
+7,2050,R2,gassupply1,2024,2.07490000000
+7,2056,R2,gassupply1,2024,2.07490000000
+7,2057,R2,gassupply1,2024,2.07490000000
+7,2058,R2,gassupply1,2024,2.07490000000
+7,2059,R2,gassupply1,2024,2.07490000000
+7,2060,R2,gassupply1,2024,2.07490000000
+8,2028,R2,gassupply1,2026,3.55300000000
+8,2030,R2,gassupply1,2026,3.55300000000
+8,2035,R2,gassupply1,2026,3.55300000000
+8,2040,R2,gassupply1,2026,3.55300000000
+8,2045,R2,gassupply1,2026,3.55300000000
+8,2050,R2,gassupply1,2026,3.55300000000
+8,2056,R2,gassupply1,2026,3.55300000000
+8,2057,R2,gassupply1,2026,3.55300000000
+8,2058,R2,gassupply1,2026,3.55300000000
+8,2059,R2,gassupply1,2026,3.55300000000
+8,2060,R2,gassupply1,2026,3.55300000000
+8,2061,R2,gassupply1,2026,3.55300000000
+8,2062,R2,gassupply1,2026,3.55300000000
+9,2030,R2,gassupply1,2028,3.53600000000
+9,2035,R2,gassupply1,2028,3.53600000000
+9,2040,R2,gassupply1,2028,3.53600000000
+9,2045,R2,gassupply1,2028,3.53600000000
+9,2050,R2,gassupply1,2028,3.53600000000
+9,2056,R2,gassupply1,2028,3.53600000000
+9,2057,R2,gassupply1,2028,3.53600000000
+9,2058,R2,gassupply1,2028,3.53600000000
+9,2059,R2,gassupply1,2028,3.53600000000
+9,2060,R2,gassupply1,2028,3.53600000000
+9,2061,R2,gassupply1,2028,3.53600000000
+9,2062,R2,gassupply1,2028,3.53600000000
+9,2063,R2,gassupply1,2028,3.53600000000
+9,2064,R2,gassupply1,2028,3.53600000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
index f62030d9..a560f88e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2030.csv
@@ -1,65 +1,169 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-0,2032,R1,gassupply1,2020,4.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2032,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2032,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2032,R1,gassupply1,2030,4.66260000000
-3,2035,R1,gassupply1,2030,4.66260000000
-3,2040,R1,gassupply1,2030,4.66260000000
-3,2045,R1,gassupply1,2030,4.66260000000
-3,2050,R1,gassupply1,2030,4.66260000000
-3,2062,R1,gassupply1,2030,4.66260000000
-3,2063,R1,gassupply1,2030,4.66260000000
-3,2064,R1,gassupply1,2030,4.66260000000
-3,2065,R1,gassupply1,2030,4.66260000000
-3,2066,R1,gassupply1,2030,4.66260000000
-4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2028,R2,gassupply1,2020,10.50000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-4,2032,R2,gassupply1,2020,4.50000000000
-5,2028,R2,gassupply1,2026,3.52150000000
-5,2030,R2,gassupply1,2026,3.52150000000
-5,2032,R2,gassupply1,2026,3.52150000000
-5,2035,R2,gassupply1,2026,3.52150000000
-5,2040,R2,gassupply1,2026,3.52150000000
-5,2045,R2,gassupply1,2026,3.52150000000
-5,2050,R2,gassupply1,2026,3.52150000000
-5,2062,R2,gassupply1,2026,3.52150000000
-6,2030,R2,gassupply1,2028,3.53600000000
-6,2032,R2,gassupply1,2028,3.53600000000
-6,2035,R2,gassupply1,2028,3.53600000000
-6,2040,R2,gassupply1,2028,3.53600000000
-6,2045,R2,gassupply1,2028,3.53600000000
-6,2050,R2,gassupply1,2028,3.53600000000
-6,2062,R2,gassupply1,2028,3.53600000000
-6,2063,R2,gassupply1,2028,3.53600000000
-6,2064,R2,gassupply1,2028,3.53600000000
-7,2032,R2,gassupply1,2030,4.66260000000
-7,2035,R2,gassupply1,2030,4.66260000000
-7,2040,R2,gassupply1,2030,4.66260000000
-7,2045,R2,gassupply1,2030,4.66260000000
-7,2050,R2,gassupply1,2030,4.66260000000
-7,2062,R2,gassupply1,2030,4.66260000000
-7,2063,R2,gassupply1,2030,4.66260000000
-7,2064,R2,gassupply1,2030,4.66260000000
-7,2065,R2,gassupply1,2030,4.66260000000
-7,2066,R2,gassupply1,2030,4.66260000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2032,R1,gassupply1,2020,4.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2032,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2032,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2032,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2032,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2032,R1,gassupply1,2030,4.66260000000
+5,2035,R1,gassupply1,2030,4.66260000000
+5,2040,R1,gassupply1,2030,4.66260000000
+5,2045,R1,gassupply1,2030,4.66260000000
+5,2050,R1,gassupply1,2030,4.66260000000
+5,2056,R1,gassupply1,2030,4.66260000000
+5,2057,R1,gassupply1,2030,4.66260000000
+5,2058,R1,gassupply1,2030,4.66260000000
+5,2059,R1,gassupply1,2030,4.66260000000
+5,2060,R1,gassupply1,2030,4.66260000000
+5,2061,R1,gassupply1,2030,4.66260000000
+5,2062,R1,gassupply1,2030,4.66260000000
+5,2063,R1,gassupply1,2030,4.66260000000
+5,2064,R1,gassupply1,2030,4.66260000000
+5,2065,R1,gassupply1,2030,4.66260000000
+5,2066,R1,gassupply1,2030,4.66260000000
+6,2020,R2,gassupply1,2020,15.00000000000
+6,2022,R2,gassupply1,2020,15.34280000000
+6,2024,R2,gassupply1,2020,15.34280000000
+6,2025,R2,gassupply1,2020,15.34280000000
+6,2026,R2,gassupply1,2020,13.84280000000
+6,2028,R2,gassupply1,2020,10.84280000000
+6,2030,R2,gassupply1,2020,7.84280000000
+6,2032,R2,gassupply1,2020,4.84280000000
+6,2035,R2,gassupply1,2020,0.34280000000
+6,2040,R2,gassupply1,2020,0.34280000000
+6,2045,R2,gassupply1,2020,0.34280000000
+6,2050,R2,gassupply1,2020,0.34280000000
+6,2056,R2,gassupply1,2020,0.34280000000
+7,2024,R2,gassupply1,2022,0.60380000000
+7,2025,R2,gassupply1,2022,0.60380000000
+7,2026,R2,gassupply1,2022,0.60380000000
+7,2028,R2,gassupply1,2022,0.60380000000
+7,2030,R2,gassupply1,2022,0.60380000000
+7,2032,R2,gassupply1,2022,0.60380000000
+7,2035,R2,gassupply1,2022,0.60380000000
+7,2040,R2,gassupply1,2022,0.60380000000
+7,2045,R2,gassupply1,2022,0.60380000000
+7,2050,R2,gassupply1,2022,0.60380000000
+7,2056,R2,gassupply1,2022,0.60380000000
+7,2057,R2,gassupply1,2022,0.60380000000
+7,2058,R2,gassupply1,2022,0.60380000000
+8,2026,R2,gassupply1,2024,2.07490000000
+8,2028,R2,gassupply1,2024,2.07490000000
+8,2030,R2,gassupply1,2024,2.07490000000
+8,2032,R2,gassupply1,2024,2.07490000000
+8,2035,R2,gassupply1,2024,2.07490000000
+8,2040,R2,gassupply1,2024,2.07490000000
+8,2045,R2,gassupply1,2024,2.07490000000
+8,2050,R2,gassupply1,2024,2.07490000000
+8,2056,R2,gassupply1,2024,2.07490000000
+8,2057,R2,gassupply1,2024,2.07490000000
+8,2058,R2,gassupply1,2024,2.07490000000
+8,2059,R2,gassupply1,2024,2.07490000000
+8,2060,R2,gassupply1,2024,2.07490000000
+9,2028,R2,gassupply1,2026,3.55300000000
+9,2030,R2,gassupply1,2026,3.55300000000
+9,2032,R2,gassupply1,2026,3.55300000000
+9,2035,R2,gassupply1,2026,3.55300000000
+9,2040,R2,gassupply1,2026,3.55300000000
+9,2045,R2,gassupply1,2026,3.55300000000
+9,2050,R2,gassupply1,2026,3.55300000000
+9,2056,R2,gassupply1,2026,3.55300000000
+9,2057,R2,gassupply1,2026,3.55300000000
+9,2058,R2,gassupply1,2026,3.55300000000
+9,2059,R2,gassupply1,2026,3.55300000000
+9,2060,R2,gassupply1,2026,3.55300000000
+9,2061,R2,gassupply1,2026,3.55300000000
+9,2062,R2,gassupply1,2026,3.55300000000
+10,2030,R2,gassupply1,2028,3.53600000000
+10,2032,R2,gassupply1,2028,3.53600000000
+10,2035,R2,gassupply1,2028,3.53600000000
+10,2040,R2,gassupply1,2028,3.53600000000
+10,2045,R2,gassupply1,2028,3.53600000000
+10,2050,R2,gassupply1,2028,3.53600000000
+10,2056,R2,gassupply1,2028,3.53600000000
+10,2057,R2,gassupply1,2028,3.53600000000
+10,2058,R2,gassupply1,2028,3.53600000000
+10,2059,R2,gassupply1,2028,3.53600000000
+10,2060,R2,gassupply1,2028,3.53600000000
+10,2061,R2,gassupply1,2028,3.53600000000
+10,2062,R2,gassupply1,2028,3.53600000000
+10,2063,R2,gassupply1,2028,3.53600000000
+10,2064,R2,gassupply1,2028,3.53600000000
+11,2032,R2,gassupply1,2030,4.66260000000
+11,2035,R2,gassupply1,2030,4.66260000000
+11,2040,R2,gassupply1,2030,4.66260000000
+11,2045,R2,gassupply1,2030,4.66260000000
+11,2050,R2,gassupply1,2030,4.66260000000
+11,2056,R2,gassupply1,2030,4.66260000000
+11,2057,R2,gassupply1,2030,4.66260000000
+11,2058,R2,gassupply1,2030,4.66260000000
+11,2059,R2,gassupply1,2030,4.66260000000
+11,2060,R2,gassupply1,2030,4.66260000000
+11,2061,R2,gassupply1,2030,4.66260000000
+11,2062,R2,gassupply1,2030,4.66260000000
+11,2063,R2,gassupply1,2030,4.66260000000
+11,2064,R2,gassupply1,2030,4.66260000000
+11,2065,R2,gassupply1,2030,4.66260000000
+11,2066,R2,gassupply1,2030,4.66260000000
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 e86e1f35..7bb6534a 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,97 +1,217 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-0,2032,R1,gassupply1,2020,4.50000000000
-0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2032,R1,gassupply1,2026,3.52150000000
-1,2034,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2032,R1,gassupply1,2028,3.53600000000
-2,2034,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2032,R1,gassupply1,2030,4.66260000000
-3,2034,R1,gassupply1,2030,4.66260000000
-3,2035,R1,gassupply1,2030,4.66260000000
-3,2040,R1,gassupply1,2030,4.66260000000
-3,2045,R1,gassupply1,2030,4.66260000000
-3,2050,R1,gassupply1,2030,4.66260000000
-3,2062,R1,gassupply1,2030,4.66260000000
-3,2063,R1,gassupply1,2030,4.66260000000
-3,2064,R1,gassupply1,2030,4.66260000000
-3,2065,R1,gassupply1,2030,4.66260000000
-3,2066,R1,gassupply1,2030,4.66260000000
-4,2034,R1,gassupply1,2032,3.00000000000
-4,2035,R1,gassupply1,2032,3.00000000000
-4,2040,R1,gassupply1,2032,3.00000000000
-4,2045,R1,gassupply1,2032,3.00000000000
-4,2050,R1,gassupply1,2032,3.00000000000
-4,2062,R1,gassupply1,2032,3.00000000000
-4,2063,R1,gassupply1,2032,3.00000000000
-4,2064,R1,gassupply1,2032,3.00000000000
-4,2065,R1,gassupply1,2032,3.00000000000
-4,2066,R1,gassupply1,2032,3.00000000000
-4,2067,R1,gassupply1,2032,3.00000000000
-4,2068,R1,gassupply1,2032,3.00000000000
-5,2020,R2,gassupply1,2020,15.00000000000
-5,2025,R2,gassupply1,2020,15.00000000000
-5,2028,R2,gassupply1,2020,10.50000000000
-5,2030,R2,gassupply1,2020,7.50000000000
-5,2032,R2,gassupply1,2020,4.50000000000
-5,2034,R2,gassupply1,2020,1.50000000000
-6,2028,R2,gassupply1,2026,3.52150000000
-6,2030,R2,gassupply1,2026,3.52150000000
-6,2032,R2,gassupply1,2026,3.52150000000
-6,2034,R2,gassupply1,2026,3.52150000000
-6,2035,R2,gassupply1,2026,3.52150000000
-6,2040,R2,gassupply1,2026,3.52150000000
-6,2045,R2,gassupply1,2026,3.52150000000
-6,2050,R2,gassupply1,2026,3.52150000000
-6,2062,R2,gassupply1,2026,3.52150000000
-7,2030,R2,gassupply1,2028,3.53600000000
-7,2032,R2,gassupply1,2028,3.53600000000
-7,2034,R2,gassupply1,2028,3.53600000000
-7,2035,R2,gassupply1,2028,3.53600000000
-7,2040,R2,gassupply1,2028,3.53600000000
-7,2045,R2,gassupply1,2028,3.53600000000
-7,2050,R2,gassupply1,2028,3.53600000000
-7,2062,R2,gassupply1,2028,3.53600000000
-7,2063,R2,gassupply1,2028,3.53600000000
-7,2064,R2,gassupply1,2028,3.53600000000
-8,2032,R2,gassupply1,2030,4.66260000000
-8,2034,R2,gassupply1,2030,4.66260000000
-8,2035,R2,gassupply1,2030,4.66260000000
-8,2040,R2,gassupply1,2030,4.66260000000
-8,2045,R2,gassupply1,2030,4.66260000000
-8,2050,R2,gassupply1,2030,4.66260000000
-8,2062,R2,gassupply1,2030,4.66260000000
-8,2063,R2,gassupply1,2030,4.66260000000
-8,2064,R2,gassupply1,2030,4.66260000000
-8,2065,R2,gassupply1,2030,4.66260000000
-8,2066,R2,gassupply1,2030,4.66260000000
-9,2034,R2,gassupply1,2032,3.00000000000
-9,2035,R2,gassupply1,2032,3.00000000000
-9,2040,R2,gassupply1,2032,3.00000000000
-9,2045,R2,gassupply1,2032,3.00000000000
-9,2050,R2,gassupply1,2032,3.00000000000
-9,2062,R2,gassupply1,2032,3.00000000000
-9,2063,R2,gassupply1,2032,3.00000000000
-9,2064,R2,gassupply1,2032,3.00000000000
-9,2065,R2,gassupply1,2032,3.00000000000
-9,2066,R2,gassupply1,2032,3.00000000000
-9,2067,R2,gassupply1,2032,3.00000000000
-9,2068,R2,gassupply1,2032,3.00000000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2032,R1,gassupply1,2020,4.84280000000
+0,2034,R1,gassupply1,2020,1.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2032,R1,gassupply1,2022,0.60380000000
+1,2034,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2032,R1,gassupply1,2024,2.07490000000
+2,2034,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2032,R1,gassupply1,2026,3.55300000000
+3,2034,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2032,R1,gassupply1,2028,3.53600000000
+4,2034,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2032,R1,gassupply1,2030,4.66260000000
+5,2034,R1,gassupply1,2030,4.66260000000
+5,2035,R1,gassupply1,2030,4.66260000000
+5,2040,R1,gassupply1,2030,4.66260000000
+5,2045,R1,gassupply1,2030,4.66260000000
+5,2050,R1,gassupply1,2030,4.66260000000
+5,2056,R1,gassupply1,2030,4.66260000000
+5,2057,R1,gassupply1,2030,4.66260000000
+5,2058,R1,gassupply1,2030,4.66260000000
+5,2059,R1,gassupply1,2030,4.66260000000
+5,2060,R1,gassupply1,2030,4.66260000000
+5,2061,R1,gassupply1,2030,4.66260000000
+5,2062,R1,gassupply1,2030,4.66260000000
+5,2063,R1,gassupply1,2030,4.66260000000
+5,2064,R1,gassupply1,2030,4.66260000000
+5,2065,R1,gassupply1,2030,4.66260000000
+5,2066,R1,gassupply1,2030,4.66260000000
+6,2034,R1,gassupply1,2032,3.62850000000
+6,2035,R1,gassupply1,2032,3.62850000000
+6,2040,R1,gassupply1,2032,3.62850000000
+6,2045,R1,gassupply1,2032,3.62850000000
+6,2050,R1,gassupply1,2032,3.62850000000
+6,2056,R1,gassupply1,2032,3.62850000000
+6,2057,R1,gassupply1,2032,3.62850000000
+6,2058,R1,gassupply1,2032,3.62850000000
+6,2059,R1,gassupply1,2032,3.62850000000
+6,2060,R1,gassupply1,2032,3.62850000000
+6,2061,R1,gassupply1,2032,3.62850000000
+6,2062,R1,gassupply1,2032,3.62850000000
+6,2063,R1,gassupply1,2032,3.62850000000
+6,2064,R1,gassupply1,2032,3.62850000000
+6,2065,R1,gassupply1,2032,3.62850000000
+6,2066,R1,gassupply1,2032,3.62850000000
+6,2067,R1,gassupply1,2032,3.62850000000
+6,2068,R1,gassupply1,2032,3.62850000000
+7,2020,R2,gassupply1,2020,15.00000000000
+7,2022,R2,gassupply1,2020,15.34280000000
+7,2024,R2,gassupply1,2020,15.34280000000
+7,2025,R2,gassupply1,2020,15.34280000000
+7,2026,R2,gassupply1,2020,13.84280000000
+7,2028,R2,gassupply1,2020,10.84280000000
+7,2030,R2,gassupply1,2020,7.84280000000
+7,2032,R2,gassupply1,2020,4.84280000000
+7,2034,R2,gassupply1,2020,1.84280000000
+7,2035,R2,gassupply1,2020,0.34280000000
+7,2040,R2,gassupply1,2020,0.34280000000
+7,2045,R2,gassupply1,2020,0.34280000000
+7,2050,R2,gassupply1,2020,0.34280000000
+7,2056,R2,gassupply1,2020,0.34280000000
+8,2024,R2,gassupply1,2022,0.60380000000
+8,2025,R2,gassupply1,2022,0.60380000000
+8,2026,R2,gassupply1,2022,0.60380000000
+8,2028,R2,gassupply1,2022,0.60380000000
+8,2030,R2,gassupply1,2022,0.60380000000
+8,2032,R2,gassupply1,2022,0.60380000000
+8,2034,R2,gassupply1,2022,0.60380000000
+8,2035,R2,gassupply1,2022,0.60380000000
+8,2040,R2,gassupply1,2022,0.60380000000
+8,2045,R2,gassupply1,2022,0.60380000000
+8,2050,R2,gassupply1,2022,0.60380000000
+8,2056,R2,gassupply1,2022,0.60380000000
+8,2057,R2,gassupply1,2022,0.60380000000
+8,2058,R2,gassupply1,2022,0.60380000000
+9,2026,R2,gassupply1,2024,2.07490000000
+9,2028,R2,gassupply1,2024,2.07490000000
+9,2030,R2,gassupply1,2024,2.07490000000
+9,2032,R2,gassupply1,2024,2.07490000000
+9,2034,R2,gassupply1,2024,2.07490000000
+9,2035,R2,gassupply1,2024,2.07490000000
+9,2040,R2,gassupply1,2024,2.07490000000
+9,2045,R2,gassupply1,2024,2.07490000000
+9,2050,R2,gassupply1,2024,2.07490000000
+9,2056,R2,gassupply1,2024,2.07490000000
+9,2057,R2,gassupply1,2024,2.07490000000
+9,2058,R2,gassupply1,2024,2.07490000000
+9,2059,R2,gassupply1,2024,2.07490000000
+9,2060,R2,gassupply1,2024,2.07490000000
+10,2028,R2,gassupply1,2026,3.55300000000
+10,2030,R2,gassupply1,2026,3.55300000000
+10,2032,R2,gassupply1,2026,3.55300000000
+10,2034,R2,gassupply1,2026,3.55300000000
+10,2035,R2,gassupply1,2026,3.55300000000
+10,2040,R2,gassupply1,2026,3.55300000000
+10,2045,R2,gassupply1,2026,3.55300000000
+10,2050,R2,gassupply1,2026,3.55300000000
+10,2056,R2,gassupply1,2026,3.55300000000
+10,2057,R2,gassupply1,2026,3.55300000000
+10,2058,R2,gassupply1,2026,3.55300000000
+10,2059,R2,gassupply1,2026,3.55300000000
+10,2060,R2,gassupply1,2026,3.55300000000
+10,2061,R2,gassupply1,2026,3.55300000000
+10,2062,R2,gassupply1,2026,3.55300000000
+11,2030,R2,gassupply1,2028,3.53600000000
+11,2032,R2,gassupply1,2028,3.53600000000
+11,2034,R2,gassupply1,2028,3.53600000000
+11,2035,R2,gassupply1,2028,3.53600000000
+11,2040,R2,gassupply1,2028,3.53600000000
+11,2045,R2,gassupply1,2028,3.53600000000
+11,2050,R2,gassupply1,2028,3.53600000000
+11,2056,R2,gassupply1,2028,3.53600000000
+11,2057,R2,gassupply1,2028,3.53600000000
+11,2058,R2,gassupply1,2028,3.53600000000
+11,2059,R2,gassupply1,2028,3.53600000000
+11,2060,R2,gassupply1,2028,3.53600000000
+11,2061,R2,gassupply1,2028,3.53600000000
+11,2062,R2,gassupply1,2028,3.53600000000
+11,2063,R2,gassupply1,2028,3.53600000000
+11,2064,R2,gassupply1,2028,3.53600000000
+12,2032,R2,gassupply1,2030,4.66260000000
+12,2034,R2,gassupply1,2030,4.66260000000
+12,2035,R2,gassupply1,2030,4.66260000000
+12,2040,R2,gassupply1,2030,4.66260000000
+12,2045,R2,gassupply1,2030,4.66260000000
+12,2050,R2,gassupply1,2030,4.66260000000
+12,2056,R2,gassupply1,2030,4.66260000000
+12,2057,R2,gassupply1,2030,4.66260000000
+12,2058,R2,gassupply1,2030,4.66260000000
+12,2059,R2,gassupply1,2030,4.66260000000
+12,2060,R2,gassupply1,2030,4.66260000000
+12,2061,R2,gassupply1,2030,4.66260000000
+12,2062,R2,gassupply1,2030,4.66260000000
+12,2063,R2,gassupply1,2030,4.66260000000
+12,2064,R2,gassupply1,2030,4.66260000000
+12,2065,R2,gassupply1,2030,4.66260000000
+12,2066,R2,gassupply1,2030,4.66260000000
+13,2034,R2,gassupply1,2032,3.62850000000
+13,2035,R2,gassupply1,2032,3.62850000000
+13,2040,R2,gassupply1,2032,3.62850000000
+13,2045,R2,gassupply1,2032,3.62850000000
+13,2050,R2,gassupply1,2032,3.62850000000
+13,2056,R2,gassupply1,2032,3.62850000000
+13,2057,R2,gassupply1,2032,3.62850000000
+13,2058,R2,gassupply1,2032,3.62850000000
+13,2059,R2,gassupply1,2032,3.62850000000
+13,2060,R2,gassupply1,2032,3.62850000000
+13,2061,R2,gassupply1,2032,3.62850000000
+13,2062,R2,gassupply1,2032,3.62850000000
+13,2063,R2,gassupply1,2032,3.62850000000
+13,2064,R2,gassupply1,2032,3.62850000000
+13,2065,R2,gassupply1,2032,3.62850000000
+13,2066,R2,gassupply1,2032,3.62850000000
+13,2067,R2,gassupply1,2032,3.62850000000
+13,2068,R2,gassupply1,2032,3.62850000000
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 904bb24d..37ffe197 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,131 +1,269 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-0,2032,R1,gassupply1,2020,4.50000000000
-0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2032,R1,gassupply1,2026,3.52150000000
-1,2034,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2036,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2032,R1,gassupply1,2028,3.53600000000
-2,2034,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2036,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2032,R1,gassupply1,2030,4.66260000000
-3,2034,R1,gassupply1,2030,4.66260000000
-3,2035,R1,gassupply1,2030,4.66260000000
-3,2036,R1,gassupply1,2030,4.66260000000
-3,2040,R1,gassupply1,2030,4.66260000000
-3,2045,R1,gassupply1,2030,4.66260000000
-3,2050,R1,gassupply1,2030,4.66260000000
-3,2062,R1,gassupply1,2030,4.66260000000
-3,2063,R1,gassupply1,2030,4.66260000000
-3,2064,R1,gassupply1,2030,4.66260000000
-3,2065,R1,gassupply1,2030,4.66260000000
-3,2066,R1,gassupply1,2030,4.66260000000
-4,2034,R1,gassupply1,2032,3.00000000000
-4,2035,R1,gassupply1,2032,3.00000000000
-4,2036,R1,gassupply1,2032,3.00000000000
-4,2040,R1,gassupply1,2032,3.00000000000
-4,2045,R1,gassupply1,2032,3.00000000000
-4,2050,R1,gassupply1,2032,3.00000000000
-4,2062,R1,gassupply1,2032,3.00000000000
-4,2063,R1,gassupply1,2032,3.00000000000
-4,2064,R1,gassupply1,2032,3.00000000000
-4,2065,R1,gassupply1,2032,3.00000000000
-4,2066,R1,gassupply1,2032,3.00000000000
-4,2067,R1,gassupply1,2032,3.00000000000
-4,2068,R1,gassupply1,2032,3.00000000000
-5,2036,R1,gassupply1,2034,1.50000000000
-5,2040,R1,gassupply1,2034,1.50000000000
-5,2045,R1,gassupply1,2034,1.50000000000
-5,2050,R1,gassupply1,2034,1.50000000000
-5,2062,R1,gassupply1,2034,1.50000000000
-5,2063,R1,gassupply1,2034,1.50000000000
-5,2064,R1,gassupply1,2034,1.50000000000
-5,2065,R1,gassupply1,2034,1.50000000000
-5,2066,R1,gassupply1,2034,1.50000000000
-5,2067,R1,gassupply1,2034,1.50000000000
-5,2068,R1,gassupply1,2034,1.50000000000
-5,2069,R1,gassupply1,2034,1.50000000000
-5,2070,R1,gassupply1,2034,1.50000000000
-6,2020,R2,gassupply1,2020,15.00000000000
-6,2025,R2,gassupply1,2020,15.00000000000
-6,2028,R2,gassupply1,2020,10.50000000000
-6,2030,R2,gassupply1,2020,7.50000000000
-6,2032,R2,gassupply1,2020,4.50000000000
-6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.52150000000
-7,2030,R2,gassupply1,2026,3.52150000000
-7,2032,R2,gassupply1,2026,3.52150000000
-7,2034,R2,gassupply1,2026,3.52150000000
-7,2035,R2,gassupply1,2026,3.52150000000
-7,2036,R2,gassupply1,2026,3.52150000000
-7,2040,R2,gassupply1,2026,3.52150000000
-7,2045,R2,gassupply1,2026,3.52150000000
-7,2050,R2,gassupply1,2026,3.52150000000
-7,2062,R2,gassupply1,2026,3.52150000000
-8,2030,R2,gassupply1,2028,3.53600000000
-8,2032,R2,gassupply1,2028,3.53600000000
-8,2034,R2,gassupply1,2028,3.53600000000
-8,2035,R2,gassupply1,2028,3.53600000000
-8,2036,R2,gassupply1,2028,3.53600000000
-8,2040,R2,gassupply1,2028,3.53600000000
-8,2045,R2,gassupply1,2028,3.53600000000
-8,2050,R2,gassupply1,2028,3.53600000000
-8,2062,R2,gassupply1,2028,3.53600000000
-8,2063,R2,gassupply1,2028,3.53600000000
-8,2064,R2,gassupply1,2028,3.53600000000
-9,2032,R2,gassupply1,2030,4.66260000000
-9,2034,R2,gassupply1,2030,4.66260000000
-9,2035,R2,gassupply1,2030,4.66260000000
-9,2036,R2,gassupply1,2030,4.66260000000
-9,2040,R2,gassupply1,2030,4.66260000000
-9,2045,R2,gassupply1,2030,4.66260000000
-9,2050,R2,gassupply1,2030,4.66260000000
-9,2062,R2,gassupply1,2030,4.66260000000
-9,2063,R2,gassupply1,2030,4.66260000000
-9,2064,R2,gassupply1,2030,4.66260000000
-9,2065,R2,gassupply1,2030,4.66260000000
-9,2066,R2,gassupply1,2030,4.66260000000
-10,2034,R2,gassupply1,2032,3.00000000000
-10,2035,R2,gassupply1,2032,3.00000000000
-10,2036,R2,gassupply1,2032,3.00000000000
-10,2040,R2,gassupply1,2032,3.00000000000
-10,2045,R2,gassupply1,2032,3.00000000000
-10,2050,R2,gassupply1,2032,3.00000000000
-10,2062,R2,gassupply1,2032,3.00000000000
-10,2063,R2,gassupply1,2032,3.00000000000
-10,2064,R2,gassupply1,2032,3.00000000000
-10,2065,R2,gassupply1,2032,3.00000000000
-10,2066,R2,gassupply1,2032,3.00000000000
-10,2067,R2,gassupply1,2032,3.00000000000
-10,2068,R2,gassupply1,2032,3.00000000000
-11,2036,R2,gassupply1,2034,1.50000000000
-11,2040,R2,gassupply1,2034,1.50000000000
-11,2045,R2,gassupply1,2034,1.50000000000
-11,2050,R2,gassupply1,2034,1.50000000000
-11,2062,R2,gassupply1,2034,1.50000000000
-11,2063,R2,gassupply1,2034,1.50000000000
-11,2064,R2,gassupply1,2034,1.50000000000
-11,2065,R2,gassupply1,2034,1.50000000000
-11,2066,R2,gassupply1,2034,1.50000000000
-11,2067,R2,gassupply1,2034,1.50000000000
-11,2068,R2,gassupply1,2034,1.50000000000
-11,2069,R2,gassupply1,2034,1.50000000000
-11,2070,R2,gassupply1,2034,1.50000000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2032,R1,gassupply1,2020,4.84280000000
+0,2034,R1,gassupply1,2020,1.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2036,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2032,R1,gassupply1,2022,0.60380000000
+1,2034,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2036,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2032,R1,gassupply1,2024,2.07490000000
+2,2034,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2036,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2032,R1,gassupply1,2026,3.55300000000
+3,2034,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2036,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2032,R1,gassupply1,2028,3.53600000000
+4,2034,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2036,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2032,R1,gassupply1,2030,4.66260000000
+5,2034,R1,gassupply1,2030,4.66260000000
+5,2035,R1,gassupply1,2030,4.66260000000
+5,2036,R1,gassupply1,2030,4.66260000000
+5,2040,R1,gassupply1,2030,4.66260000000
+5,2045,R1,gassupply1,2030,4.66260000000
+5,2050,R1,gassupply1,2030,4.66260000000
+5,2056,R1,gassupply1,2030,4.66260000000
+5,2057,R1,gassupply1,2030,4.66260000000
+5,2058,R1,gassupply1,2030,4.66260000000
+5,2059,R1,gassupply1,2030,4.66260000000
+5,2060,R1,gassupply1,2030,4.66260000000
+5,2061,R1,gassupply1,2030,4.66260000000
+5,2062,R1,gassupply1,2030,4.66260000000
+5,2063,R1,gassupply1,2030,4.66260000000
+5,2064,R1,gassupply1,2030,4.66260000000
+5,2065,R1,gassupply1,2030,4.66260000000
+5,2066,R1,gassupply1,2030,4.66260000000
+6,2034,R1,gassupply1,2032,3.62850000000
+6,2035,R1,gassupply1,2032,3.62850000000
+6,2036,R1,gassupply1,2032,3.62850000000
+6,2040,R1,gassupply1,2032,3.62850000000
+6,2045,R1,gassupply1,2032,3.62850000000
+6,2050,R1,gassupply1,2032,3.62850000000
+6,2056,R1,gassupply1,2032,3.62850000000
+6,2057,R1,gassupply1,2032,3.62850000000
+6,2058,R1,gassupply1,2032,3.62850000000
+6,2059,R1,gassupply1,2032,3.62850000000
+6,2060,R1,gassupply1,2032,3.62850000000
+6,2061,R1,gassupply1,2032,3.62850000000
+6,2062,R1,gassupply1,2032,3.62850000000
+6,2063,R1,gassupply1,2032,3.62850000000
+6,2064,R1,gassupply1,2032,3.62850000000
+6,2065,R1,gassupply1,2032,3.62850000000
+6,2066,R1,gassupply1,2032,3.62850000000
+6,2067,R1,gassupply1,2032,3.62850000000
+6,2068,R1,gassupply1,2032,3.62850000000
+7,2036,R1,gassupply1,2034,1.50000000000
+7,2040,R1,gassupply1,2034,1.50000000000
+7,2045,R1,gassupply1,2034,1.50000000000
+7,2050,R1,gassupply1,2034,1.50000000000
+7,2056,R1,gassupply1,2034,1.50000000000
+7,2057,R1,gassupply1,2034,1.50000000000
+7,2058,R1,gassupply1,2034,1.50000000000
+7,2059,R1,gassupply1,2034,1.50000000000
+7,2060,R1,gassupply1,2034,1.50000000000
+7,2061,R1,gassupply1,2034,1.50000000000
+7,2062,R1,gassupply1,2034,1.50000000000
+7,2063,R1,gassupply1,2034,1.50000000000
+7,2064,R1,gassupply1,2034,1.50000000000
+7,2065,R1,gassupply1,2034,1.50000000000
+7,2066,R1,gassupply1,2034,1.50000000000
+7,2067,R1,gassupply1,2034,1.50000000000
+7,2068,R1,gassupply1,2034,1.50000000000
+7,2069,R1,gassupply1,2034,1.50000000000
+7,2070,R1,gassupply1,2034,1.50000000000
+8,2020,R2,gassupply1,2020,15.00000000000
+8,2022,R2,gassupply1,2020,15.34280000000
+8,2024,R2,gassupply1,2020,15.34280000000
+8,2025,R2,gassupply1,2020,15.34280000000
+8,2026,R2,gassupply1,2020,13.84280000000
+8,2028,R2,gassupply1,2020,10.84280000000
+8,2030,R2,gassupply1,2020,7.84280000000
+8,2032,R2,gassupply1,2020,4.84280000000
+8,2034,R2,gassupply1,2020,1.84280000000
+8,2035,R2,gassupply1,2020,0.34280000000
+8,2036,R2,gassupply1,2020,0.34280000000
+8,2040,R2,gassupply1,2020,0.34280000000
+8,2045,R2,gassupply1,2020,0.34280000000
+8,2050,R2,gassupply1,2020,0.34280000000
+8,2056,R2,gassupply1,2020,0.34280000000
+9,2024,R2,gassupply1,2022,0.60380000000
+9,2025,R2,gassupply1,2022,0.60380000000
+9,2026,R2,gassupply1,2022,0.60380000000
+9,2028,R2,gassupply1,2022,0.60380000000
+9,2030,R2,gassupply1,2022,0.60380000000
+9,2032,R2,gassupply1,2022,0.60380000000
+9,2034,R2,gassupply1,2022,0.60380000000
+9,2035,R2,gassupply1,2022,0.60380000000
+9,2036,R2,gassupply1,2022,0.60380000000
+9,2040,R2,gassupply1,2022,0.60380000000
+9,2045,R2,gassupply1,2022,0.60380000000
+9,2050,R2,gassupply1,2022,0.60380000000
+9,2056,R2,gassupply1,2022,0.60380000000
+9,2057,R2,gassupply1,2022,0.60380000000
+9,2058,R2,gassupply1,2022,0.60380000000
+10,2026,R2,gassupply1,2024,2.07490000000
+10,2028,R2,gassupply1,2024,2.07490000000
+10,2030,R2,gassupply1,2024,2.07490000000
+10,2032,R2,gassupply1,2024,2.07490000000
+10,2034,R2,gassupply1,2024,2.07490000000
+10,2035,R2,gassupply1,2024,2.07490000000
+10,2036,R2,gassupply1,2024,2.07490000000
+10,2040,R2,gassupply1,2024,2.07490000000
+10,2045,R2,gassupply1,2024,2.07490000000
+10,2050,R2,gassupply1,2024,2.07490000000
+10,2056,R2,gassupply1,2024,2.07490000000
+10,2057,R2,gassupply1,2024,2.07490000000
+10,2058,R2,gassupply1,2024,2.07490000000
+10,2059,R2,gassupply1,2024,2.07490000000
+10,2060,R2,gassupply1,2024,2.07490000000
+11,2028,R2,gassupply1,2026,3.55300000000
+11,2030,R2,gassupply1,2026,3.55300000000
+11,2032,R2,gassupply1,2026,3.55300000000
+11,2034,R2,gassupply1,2026,3.55300000000
+11,2035,R2,gassupply1,2026,3.55300000000
+11,2036,R2,gassupply1,2026,3.55300000000
+11,2040,R2,gassupply1,2026,3.55300000000
+11,2045,R2,gassupply1,2026,3.55300000000
+11,2050,R2,gassupply1,2026,3.55300000000
+11,2056,R2,gassupply1,2026,3.55300000000
+11,2057,R2,gassupply1,2026,3.55300000000
+11,2058,R2,gassupply1,2026,3.55300000000
+11,2059,R2,gassupply1,2026,3.55300000000
+11,2060,R2,gassupply1,2026,3.55300000000
+11,2061,R2,gassupply1,2026,3.55300000000
+11,2062,R2,gassupply1,2026,3.55300000000
+12,2030,R2,gassupply1,2028,3.53600000000
+12,2032,R2,gassupply1,2028,3.53600000000
+12,2034,R2,gassupply1,2028,3.53600000000
+12,2035,R2,gassupply1,2028,3.53600000000
+12,2036,R2,gassupply1,2028,3.53600000000
+12,2040,R2,gassupply1,2028,3.53600000000
+12,2045,R2,gassupply1,2028,3.53600000000
+12,2050,R2,gassupply1,2028,3.53600000000
+12,2056,R2,gassupply1,2028,3.53600000000
+12,2057,R2,gassupply1,2028,3.53600000000
+12,2058,R2,gassupply1,2028,3.53600000000
+12,2059,R2,gassupply1,2028,3.53600000000
+12,2060,R2,gassupply1,2028,3.53600000000
+12,2061,R2,gassupply1,2028,3.53600000000
+12,2062,R2,gassupply1,2028,3.53600000000
+12,2063,R2,gassupply1,2028,3.53600000000
+12,2064,R2,gassupply1,2028,3.53600000000
+13,2032,R2,gassupply1,2030,4.66260000000
+13,2034,R2,gassupply1,2030,4.66260000000
+13,2035,R2,gassupply1,2030,4.66260000000
+13,2036,R2,gassupply1,2030,4.66260000000
+13,2040,R2,gassupply1,2030,4.66260000000
+13,2045,R2,gassupply1,2030,4.66260000000
+13,2050,R2,gassupply1,2030,4.66260000000
+13,2056,R2,gassupply1,2030,4.66260000000
+13,2057,R2,gassupply1,2030,4.66260000000
+13,2058,R2,gassupply1,2030,4.66260000000
+13,2059,R2,gassupply1,2030,4.66260000000
+13,2060,R2,gassupply1,2030,4.66260000000
+13,2061,R2,gassupply1,2030,4.66260000000
+13,2062,R2,gassupply1,2030,4.66260000000
+13,2063,R2,gassupply1,2030,4.66260000000
+13,2064,R2,gassupply1,2030,4.66260000000
+13,2065,R2,gassupply1,2030,4.66260000000
+13,2066,R2,gassupply1,2030,4.66260000000
+14,2034,R2,gassupply1,2032,3.62850000000
+14,2035,R2,gassupply1,2032,3.62850000000
+14,2036,R2,gassupply1,2032,3.62850000000
+14,2040,R2,gassupply1,2032,3.62850000000
+14,2045,R2,gassupply1,2032,3.62850000000
+14,2050,R2,gassupply1,2032,3.62850000000
+14,2056,R2,gassupply1,2032,3.62850000000
+14,2057,R2,gassupply1,2032,3.62850000000
+14,2058,R2,gassupply1,2032,3.62850000000
+14,2059,R2,gassupply1,2032,3.62850000000
+14,2060,R2,gassupply1,2032,3.62850000000
+14,2061,R2,gassupply1,2032,3.62850000000
+14,2062,R2,gassupply1,2032,3.62850000000
+14,2063,R2,gassupply1,2032,3.62850000000
+14,2064,R2,gassupply1,2032,3.62850000000
+14,2065,R2,gassupply1,2032,3.62850000000
+14,2066,R2,gassupply1,2032,3.62850000000
+14,2067,R2,gassupply1,2032,3.62850000000
+14,2068,R2,gassupply1,2032,3.62850000000
+15,2036,R2,gassupply1,2034,1.50000000000
+15,2040,R2,gassupply1,2034,1.50000000000
+15,2045,R2,gassupply1,2034,1.50000000000
+15,2050,R2,gassupply1,2034,1.50000000000
+15,2056,R2,gassupply1,2034,1.50000000000
+15,2057,R2,gassupply1,2034,1.50000000000
+15,2058,R2,gassupply1,2034,1.50000000000
+15,2059,R2,gassupply1,2034,1.50000000000
+15,2060,R2,gassupply1,2034,1.50000000000
+15,2061,R2,gassupply1,2034,1.50000000000
+15,2062,R2,gassupply1,2034,1.50000000000
+15,2063,R2,gassupply1,2034,1.50000000000
+15,2064,R2,gassupply1,2034,1.50000000000
+15,2065,R2,gassupply1,2034,1.50000000000
+15,2066,R2,gassupply1,2034,1.50000000000
+15,2067,R2,gassupply1,2034,1.50000000000
+15,2068,R2,gassupply1,2034,1.50000000000
+15,2069,R2,gassupply1,2034,1.50000000000
+15,2070,R2,gassupply1,2034,1.50000000000
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 904bb24d..37ffe197 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,131 +1,269 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-0,2032,R1,gassupply1,2020,4.50000000000
-0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2032,R1,gassupply1,2026,3.52150000000
-1,2034,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2036,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2032,R1,gassupply1,2028,3.53600000000
-2,2034,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2036,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2032,R1,gassupply1,2030,4.66260000000
-3,2034,R1,gassupply1,2030,4.66260000000
-3,2035,R1,gassupply1,2030,4.66260000000
-3,2036,R1,gassupply1,2030,4.66260000000
-3,2040,R1,gassupply1,2030,4.66260000000
-3,2045,R1,gassupply1,2030,4.66260000000
-3,2050,R1,gassupply1,2030,4.66260000000
-3,2062,R1,gassupply1,2030,4.66260000000
-3,2063,R1,gassupply1,2030,4.66260000000
-3,2064,R1,gassupply1,2030,4.66260000000
-3,2065,R1,gassupply1,2030,4.66260000000
-3,2066,R1,gassupply1,2030,4.66260000000
-4,2034,R1,gassupply1,2032,3.00000000000
-4,2035,R1,gassupply1,2032,3.00000000000
-4,2036,R1,gassupply1,2032,3.00000000000
-4,2040,R1,gassupply1,2032,3.00000000000
-4,2045,R1,gassupply1,2032,3.00000000000
-4,2050,R1,gassupply1,2032,3.00000000000
-4,2062,R1,gassupply1,2032,3.00000000000
-4,2063,R1,gassupply1,2032,3.00000000000
-4,2064,R1,gassupply1,2032,3.00000000000
-4,2065,R1,gassupply1,2032,3.00000000000
-4,2066,R1,gassupply1,2032,3.00000000000
-4,2067,R1,gassupply1,2032,3.00000000000
-4,2068,R1,gassupply1,2032,3.00000000000
-5,2036,R1,gassupply1,2034,1.50000000000
-5,2040,R1,gassupply1,2034,1.50000000000
-5,2045,R1,gassupply1,2034,1.50000000000
-5,2050,R1,gassupply1,2034,1.50000000000
-5,2062,R1,gassupply1,2034,1.50000000000
-5,2063,R1,gassupply1,2034,1.50000000000
-5,2064,R1,gassupply1,2034,1.50000000000
-5,2065,R1,gassupply1,2034,1.50000000000
-5,2066,R1,gassupply1,2034,1.50000000000
-5,2067,R1,gassupply1,2034,1.50000000000
-5,2068,R1,gassupply1,2034,1.50000000000
-5,2069,R1,gassupply1,2034,1.50000000000
-5,2070,R1,gassupply1,2034,1.50000000000
-6,2020,R2,gassupply1,2020,15.00000000000
-6,2025,R2,gassupply1,2020,15.00000000000
-6,2028,R2,gassupply1,2020,10.50000000000
-6,2030,R2,gassupply1,2020,7.50000000000
-6,2032,R2,gassupply1,2020,4.50000000000
-6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.52150000000
-7,2030,R2,gassupply1,2026,3.52150000000
-7,2032,R2,gassupply1,2026,3.52150000000
-7,2034,R2,gassupply1,2026,3.52150000000
-7,2035,R2,gassupply1,2026,3.52150000000
-7,2036,R2,gassupply1,2026,3.52150000000
-7,2040,R2,gassupply1,2026,3.52150000000
-7,2045,R2,gassupply1,2026,3.52150000000
-7,2050,R2,gassupply1,2026,3.52150000000
-7,2062,R2,gassupply1,2026,3.52150000000
-8,2030,R2,gassupply1,2028,3.53600000000
-8,2032,R2,gassupply1,2028,3.53600000000
-8,2034,R2,gassupply1,2028,3.53600000000
-8,2035,R2,gassupply1,2028,3.53600000000
-8,2036,R2,gassupply1,2028,3.53600000000
-8,2040,R2,gassupply1,2028,3.53600000000
-8,2045,R2,gassupply1,2028,3.53600000000
-8,2050,R2,gassupply1,2028,3.53600000000
-8,2062,R2,gassupply1,2028,3.53600000000
-8,2063,R2,gassupply1,2028,3.53600000000
-8,2064,R2,gassupply1,2028,3.53600000000
-9,2032,R2,gassupply1,2030,4.66260000000
-9,2034,R2,gassupply1,2030,4.66260000000
-9,2035,R2,gassupply1,2030,4.66260000000
-9,2036,R2,gassupply1,2030,4.66260000000
-9,2040,R2,gassupply1,2030,4.66260000000
-9,2045,R2,gassupply1,2030,4.66260000000
-9,2050,R2,gassupply1,2030,4.66260000000
-9,2062,R2,gassupply1,2030,4.66260000000
-9,2063,R2,gassupply1,2030,4.66260000000
-9,2064,R2,gassupply1,2030,4.66260000000
-9,2065,R2,gassupply1,2030,4.66260000000
-9,2066,R2,gassupply1,2030,4.66260000000
-10,2034,R2,gassupply1,2032,3.00000000000
-10,2035,R2,gassupply1,2032,3.00000000000
-10,2036,R2,gassupply1,2032,3.00000000000
-10,2040,R2,gassupply1,2032,3.00000000000
-10,2045,R2,gassupply1,2032,3.00000000000
-10,2050,R2,gassupply1,2032,3.00000000000
-10,2062,R2,gassupply1,2032,3.00000000000
-10,2063,R2,gassupply1,2032,3.00000000000
-10,2064,R2,gassupply1,2032,3.00000000000
-10,2065,R2,gassupply1,2032,3.00000000000
-10,2066,R2,gassupply1,2032,3.00000000000
-10,2067,R2,gassupply1,2032,3.00000000000
-10,2068,R2,gassupply1,2032,3.00000000000
-11,2036,R2,gassupply1,2034,1.50000000000
-11,2040,R2,gassupply1,2034,1.50000000000
-11,2045,R2,gassupply1,2034,1.50000000000
-11,2050,R2,gassupply1,2034,1.50000000000
-11,2062,R2,gassupply1,2034,1.50000000000
-11,2063,R2,gassupply1,2034,1.50000000000
-11,2064,R2,gassupply1,2034,1.50000000000
-11,2065,R2,gassupply1,2034,1.50000000000
-11,2066,R2,gassupply1,2034,1.50000000000
-11,2067,R2,gassupply1,2034,1.50000000000
-11,2068,R2,gassupply1,2034,1.50000000000
-11,2069,R2,gassupply1,2034,1.50000000000
-11,2070,R2,gassupply1,2034,1.50000000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2032,R1,gassupply1,2020,4.84280000000
+0,2034,R1,gassupply1,2020,1.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2036,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2032,R1,gassupply1,2022,0.60380000000
+1,2034,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2036,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2032,R1,gassupply1,2024,2.07490000000
+2,2034,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2036,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2032,R1,gassupply1,2026,3.55300000000
+3,2034,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2036,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2032,R1,gassupply1,2028,3.53600000000
+4,2034,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2036,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2032,R1,gassupply1,2030,4.66260000000
+5,2034,R1,gassupply1,2030,4.66260000000
+5,2035,R1,gassupply1,2030,4.66260000000
+5,2036,R1,gassupply1,2030,4.66260000000
+5,2040,R1,gassupply1,2030,4.66260000000
+5,2045,R1,gassupply1,2030,4.66260000000
+5,2050,R1,gassupply1,2030,4.66260000000
+5,2056,R1,gassupply1,2030,4.66260000000
+5,2057,R1,gassupply1,2030,4.66260000000
+5,2058,R1,gassupply1,2030,4.66260000000
+5,2059,R1,gassupply1,2030,4.66260000000
+5,2060,R1,gassupply1,2030,4.66260000000
+5,2061,R1,gassupply1,2030,4.66260000000
+5,2062,R1,gassupply1,2030,4.66260000000
+5,2063,R1,gassupply1,2030,4.66260000000
+5,2064,R1,gassupply1,2030,4.66260000000
+5,2065,R1,gassupply1,2030,4.66260000000
+5,2066,R1,gassupply1,2030,4.66260000000
+6,2034,R1,gassupply1,2032,3.62850000000
+6,2035,R1,gassupply1,2032,3.62850000000
+6,2036,R1,gassupply1,2032,3.62850000000
+6,2040,R1,gassupply1,2032,3.62850000000
+6,2045,R1,gassupply1,2032,3.62850000000
+6,2050,R1,gassupply1,2032,3.62850000000
+6,2056,R1,gassupply1,2032,3.62850000000
+6,2057,R1,gassupply1,2032,3.62850000000
+6,2058,R1,gassupply1,2032,3.62850000000
+6,2059,R1,gassupply1,2032,3.62850000000
+6,2060,R1,gassupply1,2032,3.62850000000
+6,2061,R1,gassupply1,2032,3.62850000000
+6,2062,R1,gassupply1,2032,3.62850000000
+6,2063,R1,gassupply1,2032,3.62850000000
+6,2064,R1,gassupply1,2032,3.62850000000
+6,2065,R1,gassupply1,2032,3.62850000000
+6,2066,R1,gassupply1,2032,3.62850000000
+6,2067,R1,gassupply1,2032,3.62850000000
+6,2068,R1,gassupply1,2032,3.62850000000
+7,2036,R1,gassupply1,2034,1.50000000000
+7,2040,R1,gassupply1,2034,1.50000000000
+7,2045,R1,gassupply1,2034,1.50000000000
+7,2050,R1,gassupply1,2034,1.50000000000
+7,2056,R1,gassupply1,2034,1.50000000000
+7,2057,R1,gassupply1,2034,1.50000000000
+7,2058,R1,gassupply1,2034,1.50000000000
+7,2059,R1,gassupply1,2034,1.50000000000
+7,2060,R1,gassupply1,2034,1.50000000000
+7,2061,R1,gassupply1,2034,1.50000000000
+7,2062,R1,gassupply1,2034,1.50000000000
+7,2063,R1,gassupply1,2034,1.50000000000
+7,2064,R1,gassupply1,2034,1.50000000000
+7,2065,R1,gassupply1,2034,1.50000000000
+7,2066,R1,gassupply1,2034,1.50000000000
+7,2067,R1,gassupply1,2034,1.50000000000
+7,2068,R1,gassupply1,2034,1.50000000000
+7,2069,R1,gassupply1,2034,1.50000000000
+7,2070,R1,gassupply1,2034,1.50000000000
+8,2020,R2,gassupply1,2020,15.00000000000
+8,2022,R2,gassupply1,2020,15.34280000000
+8,2024,R2,gassupply1,2020,15.34280000000
+8,2025,R2,gassupply1,2020,15.34280000000
+8,2026,R2,gassupply1,2020,13.84280000000
+8,2028,R2,gassupply1,2020,10.84280000000
+8,2030,R2,gassupply1,2020,7.84280000000
+8,2032,R2,gassupply1,2020,4.84280000000
+8,2034,R2,gassupply1,2020,1.84280000000
+8,2035,R2,gassupply1,2020,0.34280000000
+8,2036,R2,gassupply1,2020,0.34280000000
+8,2040,R2,gassupply1,2020,0.34280000000
+8,2045,R2,gassupply1,2020,0.34280000000
+8,2050,R2,gassupply1,2020,0.34280000000
+8,2056,R2,gassupply1,2020,0.34280000000
+9,2024,R2,gassupply1,2022,0.60380000000
+9,2025,R2,gassupply1,2022,0.60380000000
+9,2026,R2,gassupply1,2022,0.60380000000
+9,2028,R2,gassupply1,2022,0.60380000000
+9,2030,R2,gassupply1,2022,0.60380000000
+9,2032,R2,gassupply1,2022,0.60380000000
+9,2034,R2,gassupply1,2022,0.60380000000
+9,2035,R2,gassupply1,2022,0.60380000000
+9,2036,R2,gassupply1,2022,0.60380000000
+9,2040,R2,gassupply1,2022,0.60380000000
+9,2045,R2,gassupply1,2022,0.60380000000
+9,2050,R2,gassupply1,2022,0.60380000000
+9,2056,R2,gassupply1,2022,0.60380000000
+9,2057,R2,gassupply1,2022,0.60380000000
+9,2058,R2,gassupply1,2022,0.60380000000
+10,2026,R2,gassupply1,2024,2.07490000000
+10,2028,R2,gassupply1,2024,2.07490000000
+10,2030,R2,gassupply1,2024,2.07490000000
+10,2032,R2,gassupply1,2024,2.07490000000
+10,2034,R2,gassupply1,2024,2.07490000000
+10,2035,R2,gassupply1,2024,2.07490000000
+10,2036,R2,gassupply1,2024,2.07490000000
+10,2040,R2,gassupply1,2024,2.07490000000
+10,2045,R2,gassupply1,2024,2.07490000000
+10,2050,R2,gassupply1,2024,2.07490000000
+10,2056,R2,gassupply1,2024,2.07490000000
+10,2057,R2,gassupply1,2024,2.07490000000
+10,2058,R2,gassupply1,2024,2.07490000000
+10,2059,R2,gassupply1,2024,2.07490000000
+10,2060,R2,gassupply1,2024,2.07490000000
+11,2028,R2,gassupply1,2026,3.55300000000
+11,2030,R2,gassupply1,2026,3.55300000000
+11,2032,R2,gassupply1,2026,3.55300000000
+11,2034,R2,gassupply1,2026,3.55300000000
+11,2035,R2,gassupply1,2026,3.55300000000
+11,2036,R2,gassupply1,2026,3.55300000000
+11,2040,R2,gassupply1,2026,3.55300000000
+11,2045,R2,gassupply1,2026,3.55300000000
+11,2050,R2,gassupply1,2026,3.55300000000
+11,2056,R2,gassupply1,2026,3.55300000000
+11,2057,R2,gassupply1,2026,3.55300000000
+11,2058,R2,gassupply1,2026,3.55300000000
+11,2059,R2,gassupply1,2026,3.55300000000
+11,2060,R2,gassupply1,2026,3.55300000000
+11,2061,R2,gassupply1,2026,3.55300000000
+11,2062,R2,gassupply1,2026,3.55300000000
+12,2030,R2,gassupply1,2028,3.53600000000
+12,2032,R2,gassupply1,2028,3.53600000000
+12,2034,R2,gassupply1,2028,3.53600000000
+12,2035,R2,gassupply1,2028,3.53600000000
+12,2036,R2,gassupply1,2028,3.53600000000
+12,2040,R2,gassupply1,2028,3.53600000000
+12,2045,R2,gassupply1,2028,3.53600000000
+12,2050,R2,gassupply1,2028,3.53600000000
+12,2056,R2,gassupply1,2028,3.53600000000
+12,2057,R2,gassupply1,2028,3.53600000000
+12,2058,R2,gassupply1,2028,3.53600000000
+12,2059,R2,gassupply1,2028,3.53600000000
+12,2060,R2,gassupply1,2028,3.53600000000
+12,2061,R2,gassupply1,2028,3.53600000000
+12,2062,R2,gassupply1,2028,3.53600000000
+12,2063,R2,gassupply1,2028,3.53600000000
+12,2064,R2,gassupply1,2028,3.53600000000
+13,2032,R2,gassupply1,2030,4.66260000000
+13,2034,R2,gassupply1,2030,4.66260000000
+13,2035,R2,gassupply1,2030,4.66260000000
+13,2036,R2,gassupply1,2030,4.66260000000
+13,2040,R2,gassupply1,2030,4.66260000000
+13,2045,R2,gassupply1,2030,4.66260000000
+13,2050,R2,gassupply1,2030,4.66260000000
+13,2056,R2,gassupply1,2030,4.66260000000
+13,2057,R2,gassupply1,2030,4.66260000000
+13,2058,R2,gassupply1,2030,4.66260000000
+13,2059,R2,gassupply1,2030,4.66260000000
+13,2060,R2,gassupply1,2030,4.66260000000
+13,2061,R2,gassupply1,2030,4.66260000000
+13,2062,R2,gassupply1,2030,4.66260000000
+13,2063,R2,gassupply1,2030,4.66260000000
+13,2064,R2,gassupply1,2030,4.66260000000
+13,2065,R2,gassupply1,2030,4.66260000000
+13,2066,R2,gassupply1,2030,4.66260000000
+14,2034,R2,gassupply1,2032,3.62850000000
+14,2035,R2,gassupply1,2032,3.62850000000
+14,2036,R2,gassupply1,2032,3.62850000000
+14,2040,R2,gassupply1,2032,3.62850000000
+14,2045,R2,gassupply1,2032,3.62850000000
+14,2050,R2,gassupply1,2032,3.62850000000
+14,2056,R2,gassupply1,2032,3.62850000000
+14,2057,R2,gassupply1,2032,3.62850000000
+14,2058,R2,gassupply1,2032,3.62850000000
+14,2059,R2,gassupply1,2032,3.62850000000
+14,2060,R2,gassupply1,2032,3.62850000000
+14,2061,R2,gassupply1,2032,3.62850000000
+14,2062,R2,gassupply1,2032,3.62850000000
+14,2063,R2,gassupply1,2032,3.62850000000
+14,2064,R2,gassupply1,2032,3.62850000000
+14,2065,R2,gassupply1,2032,3.62850000000
+14,2066,R2,gassupply1,2032,3.62850000000
+14,2067,R2,gassupply1,2032,3.62850000000
+14,2068,R2,gassupply1,2032,3.62850000000
+15,2036,R2,gassupply1,2034,1.50000000000
+15,2040,R2,gassupply1,2034,1.50000000000
+15,2045,R2,gassupply1,2034,1.50000000000
+15,2050,R2,gassupply1,2034,1.50000000000
+15,2056,R2,gassupply1,2034,1.50000000000
+15,2057,R2,gassupply1,2034,1.50000000000
+15,2058,R2,gassupply1,2034,1.50000000000
+15,2059,R2,gassupply1,2034,1.50000000000
+15,2060,R2,gassupply1,2034,1.50000000000
+15,2061,R2,gassupply1,2034,1.50000000000
+15,2062,R2,gassupply1,2034,1.50000000000
+15,2063,R2,gassupply1,2034,1.50000000000
+15,2064,R2,gassupply1,2034,1.50000000000
+15,2065,R2,gassupply1,2034,1.50000000000
+15,2066,R2,gassupply1,2034,1.50000000000
+15,2067,R2,gassupply1,2034,1.50000000000
+15,2068,R2,gassupply1,2034,1.50000000000
+15,2069,R2,gassupply1,2034,1.50000000000
+15,2070,R2,gassupply1,2034,1.50000000000
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 904bb24d..37ffe197 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,131 +1,269 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-0,2032,R1,gassupply1,2020,4.50000000000
-0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2032,R1,gassupply1,2026,3.52150000000
-1,2034,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2036,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2032,R1,gassupply1,2028,3.53600000000
-2,2034,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2036,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2032,R1,gassupply1,2030,4.66260000000
-3,2034,R1,gassupply1,2030,4.66260000000
-3,2035,R1,gassupply1,2030,4.66260000000
-3,2036,R1,gassupply1,2030,4.66260000000
-3,2040,R1,gassupply1,2030,4.66260000000
-3,2045,R1,gassupply1,2030,4.66260000000
-3,2050,R1,gassupply1,2030,4.66260000000
-3,2062,R1,gassupply1,2030,4.66260000000
-3,2063,R1,gassupply1,2030,4.66260000000
-3,2064,R1,gassupply1,2030,4.66260000000
-3,2065,R1,gassupply1,2030,4.66260000000
-3,2066,R1,gassupply1,2030,4.66260000000
-4,2034,R1,gassupply1,2032,3.00000000000
-4,2035,R1,gassupply1,2032,3.00000000000
-4,2036,R1,gassupply1,2032,3.00000000000
-4,2040,R1,gassupply1,2032,3.00000000000
-4,2045,R1,gassupply1,2032,3.00000000000
-4,2050,R1,gassupply1,2032,3.00000000000
-4,2062,R1,gassupply1,2032,3.00000000000
-4,2063,R1,gassupply1,2032,3.00000000000
-4,2064,R1,gassupply1,2032,3.00000000000
-4,2065,R1,gassupply1,2032,3.00000000000
-4,2066,R1,gassupply1,2032,3.00000000000
-4,2067,R1,gassupply1,2032,3.00000000000
-4,2068,R1,gassupply1,2032,3.00000000000
-5,2036,R1,gassupply1,2034,1.50000000000
-5,2040,R1,gassupply1,2034,1.50000000000
-5,2045,R1,gassupply1,2034,1.50000000000
-5,2050,R1,gassupply1,2034,1.50000000000
-5,2062,R1,gassupply1,2034,1.50000000000
-5,2063,R1,gassupply1,2034,1.50000000000
-5,2064,R1,gassupply1,2034,1.50000000000
-5,2065,R1,gassupply1,2034,1.50000000000
-5,2066,R1,gassupply1,2034,1.50000000000
-5,2067,R1,gassupply1,2034,1.50000000000
-5,2068,R1,gassupply1,2034,1.50000000000
-5,2069,R1,gassupply1,2034,1.50000000000
-5,2070,R1,gassupply1,2034,1.50000000000
-6,2020,R2,gassupply1,2020,15.00000000000
-6,2025,R2,gassupply1,2020,15.00000000000
-6,2028,R2,gassupply1,2020,10.50000000000
-6,2030,R2,gassupply1,2020,7.50000000000
-6,2032,R2,gassupply1,2020,4.50000000000
-6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.52150000000
-7,2030,R2,gassupply1,2026,3.52150000000
-7,2032,R2,gassupply1,2026,3.52150000000
-7,2034,R2,gassupply1,2026,3.52150000000
-7,2035,R2,gassupply1,2026,3.52150000000
-7,2036,R2,gassupply1,2026,3.52150000000
-7,2040,R2,gassupply1,2026,3.52150000000
-7,2045,R2,gassupply1,2026,3.52150000000
-7,2050,R2,gassupply1,2026,3.52150000000
-7,2062,R2,gassupply1,2026,3.52150000000
-8,2030,R2,gassupply1,2028,3.53600000000
-8,2032,R2,gassupply1,2028,3.53600000000
-8,2034,R2,gassupply1,2028,3.53600000000
-8,2035,R2,gassupply1,2028,3.53600000000
-8,2036,R2,gassupply1,2028,3.53600000000
-8,2040,R2,gassupply1,2028,3.53600000000
-8,2045,R2,gassupply1,2028,3.53600000000
-8,2050,R2,gassupply1,2028,3.53600000000
-8,2062,R2,gassupply1,2028,3.53600000000
-8,2063,R2,gassupply1,2028,3.53600000000
-8,2064,R2,gassupply1,2028,3.53600000000
-9,2032,R2,gassupply1,2030,4.66260000000
-9,2034,R2,gassupply1,2030,4.66260000000
-9,2035,R2,gassupply1,2030,4.66260000000
-9,2036,R2,gassupply1,2030,4.66260000000
-9,2040,R2,gassupply1,2030,4.66260000000
-9,2045,R2,gassupply1,2030,4.66260000000
-9,2050,R2,gassupply1,2030,4.66260000000
-9,2062,R2,gassupply1,2030,4.66260000000
-9,2063,R2,gassupply1,2030,4.66260000000
-9,2064,R2,gassupply1,2030,4.66260000000
-9,2065,R2,gassupply1,2030,4.66260000000
-9,2066,R2,gassupply1,2030,4.66260000000
-10,2034,R2,gassupply1,2032,3.00000000000
-10,2035,R2,gassupply1,2032,3.00000000000
-10,2036,R2,gassupply1,2032,3.00000000000
-10,2040,R2,gassupply1,2032,3.00000000000
-10,2045,R2,gassupply1,2032,3.00000000000
-10,2050,R2,gassupply1,2032,3.00000000000
-10,2062,R2,gassupply1,2032,3.00000000000
-10,2063,R2,gassupply1,2032,3.00000000000
-10,2064,R2,gassupply1,2032,3.00000000000
-10,2065,R2,gassupply1,2032,3.00000000000
-10,2066,R2,gassupply1,2032,3.00000000000
-10,2067,R2,gassupply1,2032,3.00000000000
-10,2068,R2,gassupply1,2032,3.00000000000
-11,2036,R2,gassupply1,2034,1.50000000000
-11,2040,R2,gassupply1,2034,1.50000000000
-11,2045,R2,gassupply1,2034,1.50000000000
-11,2050,R2,gassupply1,2034,1.50000000000
-11,2062,R2,gassupply1,2034,1.50000000000
-11,2063,R2,gassupply1,2034,1.50000000000
-11,2064,R2,gassupply1,2034,1.50000000000
-11,2065,R2,gassupply1,2034,1.50000000000
-11,2066,R2,gassupply1,2034,1.50000000000
-11,2067,R2,gassupply1,2034,1.50000000000
-11,2068,R2,gassupply1,2034,1.50000000000
-11,2069,R2,gassupply1,2034,1.50000000000
-11,2070,R2,gassupply1,2034,1.50000000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2032,R1,gassupply1,2020,4.84280000000
+0,2034,R1,gassupply1,2020,1.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2036,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2032,R1,gassupply1,2022,0.60380000000
+1,2034,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2036,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2032,R1,gassupply1,2024,2.07490000000
+2,2034,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2036,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2032,R1,gassupply1,2026,3.55300000000
+3,2034,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2036,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2032,R1,gassupply1,2028,3.53600000000
+4,2034,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2036,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2032,R1,gassupply1,2030,4.66260000000
+5,2034,R1,gassupply1,2030,4.66260000000
+5,2035,R1,gassupply1,2030,4.66260000000
+5,2036,R1,gassupply1,2030,4.66260000000
+5,2040,R1,gassupply1,2030,4.66260000000
+5,2045,R1,gassupply1,2030,4.66260000000
+5,2050,R1,gassupply1,2030,4.66260000000
+5,2056,R1,gassupply1,2030,4.66260000000
+5,2057,R1,gassupply1,2030,4.66260000000
+5,2058,R1,gassupply1,2030,4.66260000000
+5,2059,R1,gassupply1,2030,4.66260000000
+5,2060,R1,gassupply1,2030,4.66260000000
+5,2061,R1,gassupply1,2030,4.66260000000
+5,2062,R1,gassupply1,2030,4.66260000000
+5,2063,R1,gassupply1,2030,4.66260000000
+5,2064,R1,gassupply1,2030,4.66260000000
+5,2065,R1,gassupply1,2030,4.66260000000
+5,2066,R1,gassupply1,2030,4.66260000000
+6,2034,R1,gassupply1,2032,3.62850000000
+6,2035,R1,gassupply1,2032,3.62850000000
+6,2036,R1,gassupply1,2032,3.62850000000
+6,2040,R1,gassupply1,2032,3.62850000000
+6,2045,R1,gassupply1,2032,3.62850000000
+6,2050,R1,gassupply1,2032,3.62850000000
+6,2056,R1,gassupply1,2032,3.62850000000
+6,2057,R1,gassupply1,2032,3.62850000000
+6,2058,R1,gassupply1,2032,3.62850000000
+6,2059,R1,gassupply1,2032,3.62850000000
+6,2060,R1,gassupply1,2032,3.62850000000
+6,2061,R1,gassupply1,2032,3.62850000000
+6,2062,R1,gassupply1,2032,3.62850000000
+6,2063,R1,gassupply1,2032,3.62850000000
+6,2064,R1,gassupply1,2032,3.62850000000
+6,2065,R1,gassupply1,2032,3.62850000000
+6,2066,R1,gassupply1,2032,3.62850000000
+6,2067,R1,gassupply1,2032,3.62850000000
+6,2068,R1,gassupply1,2032,3.62850000000
+7,2036,R1,gassupply1,2034,1.50000000000
+7,2040,R1,gassupply1,2034,1.50000000000
+7,2045,R1,gassupply1,2034,1.50000000000
+7,2050,R1,gassupply1,2034,1.50000000000
+7,2056,R1,gassupply1,2034,1.50000000000
+7,2057,R1,gassupply1,2034,1.50000000000
+7,2058,R1,gassupply1,2034,1.50000000000
+7,2059,R1,gassupply1,2034,1.50000000000
+7,2060,R1,gassupply1,2034,1.50000000000
+7,2061,R1,gassupply1,2034,1.50000000000
+7,2062,R1,gassupply1,2034,1.50000000000
+7,2063,R1,gassupply1,2034,1.50000000000
+7,2064,R1,gassupply1,2034,1.50000000000
+7,2065,R1,gassupply1,2034,1.50000000000
+7,2066,R1,gassupply1,2034,1.50000000000
+7,2067,R1,gassupply1,2034,1.50000000000
+7,2068,R1,gassupply1,2034,1.50000000000
+7,2069,R1,gassupply1,2034,1.50000000000
+7,2070,R1,gassupply1,2034,1.50000000000
+8,2020,R2,gassupply1,2020,15.00000000000
+8,2022,R2,gassupply1,2020,15.34280000000
+8,2024,R2,gassupply1,2020,15.34280000000
+8,2025,R2,gassupply1,2020,15.34280000000
+8,2026,R2,gassupply1,2020,13.84280000000
+8,2028,R2,gassupply1,2020,10.84280000000
+8,2030,R2,gassupply1,2020,7.84280000000
+8,2032,R2,gassupply1,2020,4.84280000000
+8,2034,R2,gassupply1,2020,1.84280000000
+8,2035,R2,gassupply1,2020,0.34280000000
+8,2036,R2,gassupply1,2020,0.34280000000
+8,2040,R2,gassupply1,2020,0.34280000000
+8,2045,R2,gassupply1,2020,0.34280000000
+8,2050,R2,gassupply1,2020,0.34280000000
+8,2056,R2,gassupply1,2020,0.34280000000
+9,2024,R2,gassupply1,2022,0.60380000000
+9,2025,R2,gassupply1,2022,0.60380000000
+9,2026,R2,gassupply1,2022,0.60380000000
+9,2028,R2,gassupply1,2022,0.60380000000
+9,2030,R2,gassupply1,2022,0.60380000000
+9,2032,R2,gassupply1,2022,0.60380000000
+9,2034,R2,gassupply1,2022,0.60380000000
+9,2035,R2,gassupply1,2022,0.60380000000
+9,2036,R2,gassupply1,2022,0.60380000000
+9,2040,R2,gassupply1,2022,0.60380000000
+9,2045,R2,gassupply1,2022,0.60380000000
+9,2050,R2,gassupply1,2022,0.60380000000
+9,2056,R2,gassupply1,2022,0.60380000000
+9,2057,R2,gassupply1,2022,0.60380000000
+9,2058,R2,gassupply1,2022,0.60380000000
+10,2026,R2,gassupply1,2024,2.07490000000
+10,2028,R2,gassupply1,2024,2.07490000000
+10,2030,R2,gassupply1,2024,2.07490000000
+10,2032,R2,gassupply1,2024,2.07490000000
+10,2034,R2,gassupply1,2024,2.07490000000
+10,2035,R2,gassupply1,2024,2.07490000000
+10,2036,R2,gassupply1,2024,2.07490000000
+10,2040,R2,gassupply1,2024,2.07490000000
+10,2045,R2,gassupply1,2024,2.07490000000
+10,2050,R2,gassupply1,2024,2.07490000000
+10,2056,R2,gassupply1,2024,2.07490000000
+10,2057,R2,gassupply1,2024,2.07490000000
+10,2058,R2,gassupply1,2024,2.07490000000
+10,2059,R2,gassupply1,2024,2.07490000000
+10,2060,R2,gassupply1,2024,2.07490000000
+11,2028,R2,gassupply1,2026,3.55300000000
+11,2030,R2,gassupply1,2026,3.55300000000
+11,2032,R2,gassupply1,2026,3.55300000000
+11,2034,R2,gassupply1,2026,3.55300000000
+11,2035,R2,gassupply1,2026,3.55300000000
+11,2036,R2,gassupply1,2026,3.55300000000
+11,2040,R2,gassupply1,2026,3.55300000000
+11,2045,R2,gassupply1,2026,3.55300000000
+11,2050,R2,gassupply1,2026,3.55300000000
+11,2056,R2,gassupply1,2026,3.55300000000
+11,2057,R2,gassupply1,2026,3.55300000000
+11,2058,R2,gassupply1,2026,3.55300000000
+11,2059,R2,gassupply1,2026,3.55300000000
+11,2060,R2,gassupply1,2026,3.55300000000
+11,2061,R2,gassupply1,2026,3.55300000000
+11,2062,R2,gassupply1,2026,3.55300000000
+12,2030,R2,gassupply1,2028,3.53600000000
+12,2032,R2,gassupply1,2028,3.53600000000
+12,2034,R2,gassupply1,2028,3.53600000000
+12,2035,R2,gassupply1,2028,3.53600000000
+12,2036,R2,gassupply1,2028,3.53600000000
+12,2040,R2,gassupply1,2028,3.53600000000
+12,2045,R2,gassupply1,2028,3.53600000000
+12,2050,R2,gassupply1,2028,3.53600000000
+12,2056,R2,gassupply1,2028,3.53600000000
+12,2057,R2,gassupply1,2028,3.53600000000
+12,2058,R2,gassupply1,2028,3.53600000000
+12,2059,R2,gassupply1,2028,3.53600000000
+12,2060,R2,gassupply1,2028,3.53600000000
+12,2061,R2,gassupply1,2028,3.53600000000
+12,2062,R2,gassupply1,2028,3.53600000000
+12,2063,R2,gassupply1,2028,3.53600000000
+12,2064,R2,gassupply1,2028,3.53600000000
+13,2032,R2,gassupply1,2030,4.66260000000
+13,2034,R2,gassupply1,2030,4.66260000000
+13,2035,R2,gassupply1,2030,4.66260000000
+13,2036,R2,gassupply1,2030,4.66260000000
+13,2040,R2,gassupply1,2030,4.66260000000
+13,2045,R2,gassupply1,2030,4.66260000000
+13,2050,R2,gassupply1,2030,4.66260000000
+13,2056,R2,gassupply1,2030,4.66260000000
+13,2057,R2,gassupply1,2030,4.66260000000
+13,2058,R2,gassupply1,2030,4.66260000000
+13,2059,R2,gassupply1,2030,4.66260000000
+13,2060,R2,gassupply1,2030,4.66260000000
+13,2061,R2,gassupply1,2030,4.66260000000
+13,2062,R2,gassupply1,2030,4.66260000000
+13,2063,R2,gassupply1,2030,4.66260000000
+13,2064,R2,gassupply1,2030,4.66260000000
+13,2065,R2,gassupply1,2030,4.66260000000
+13,2066,R2,gassupply1,2030,4.66260000000
+14,2034,R2,gassupply1,2032,3.62850000000
+14,2035,R2,gassupply1,2032,3.62850000000
+14,2036,R2,gassupply1,2032,3.62850000000
+14,2040,R2,gassupply1,2032,3.62850000000
+14,2045,R2,gassupply1,2032,3.62850000000
+14,2050,R2,gassupply1,2032,3.62850000000
+14,2056,R2,gassupply1,2032,3.62850000000
+14,2057,R2,gassupply1,2032,3.62850000000
+14,2058,R2,gassupply1,2032,3.62850000000
+14,2059,R2,gassupply1,2032,3.62850000000
+14,2060,R2,gassupply1,2032,3.62850000000
+14,2061,R2,gassupply1,2032,3.62850000000
+14,2062,R2,gassupply1,2032,3.62850000000
+14,2063,R2,gassupply1,2032,3.62850000000
+14,2064,R2,gassupply1,2032,3.62850000000
+14,2065,R2,gassupply1,2032,3.62850000000
+14,2066,R2,gassupply1,2032,3.62850000000
+14,2067,R2,gassupply1,2032,3.62850000000
+14,2068,R2,gassupply1,2032,3.62850000000
+15,2036,R2,gassupply1,2034,1.50000000000
+15,2040,R2,gassupply1,2034,1.50000000000
+15,2045,R2,gassupply1,2034,1.50000000000
+15,2050,R2,gassupply1,2034,1.50000000000
+15,2056,R2,gassupply1,2034,1.50000000000
+15,2057,R2,gassupply1,2034,1.50000000000
+15,2058,R2,gassupply1,2034,1.50000000000
+15,2059,R2,gassupply1,2034,1.50000000000
+15,2060,R2,gassupply1,2034,1.50000000000
+15,2061,R2,gassupply1,2034,1.50000000000
+15,2062,R2,gassupply1,2034,1.50000000000
+15,2063,R2,gassupply1,2034,1.50000000000
+15,2064,R2,gassupply1,2034,1.50000000000
+15,2065,R2,gassupply1,2034,1.50000000000
+15,2066,R2,gassupply1,2034,1.50000000000
+15,2067,R2,gassupply1,2034,1.50000000000
+15,2068,R2,gassupply1,2034,1.50000000000
+15,2069,R2,gassupply1,2034,1.50000000000
+15,2070,R2,gassupply1,2034,1.50000000000
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 904bb24d..37ffe197 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,131 +1,269 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,15.00000000000
-0,2028,R1,gassupply1,2020,10.50000000000
-0,2030,R1,gassupply1,2020,7.50000000000
-0,2032,R1,gassupply1,2020,4.50000000000
-0,2034,R1,gassupply1,2020,1.50000000000
-1,2028,R1,gassupply1,2026,3.52150000000
-1,2030,R1,gassupply1,2026,3.52150000000
-1,2032,R1,gassupply1,2026,3.52150000000
-1,2034,R1,gassupply1,2026,3.52150000000
-1,2035,R1,gassupply1,2026,3.52150000000
-1,2036,R1,gassupply1,2026,3.52150000000
-1,2040,R1,gassupply1,2026,3.52150000000
-1,2045,R1,gassupply1,2026,3.52150000000
-1,2050,R1,gassupply1,2026,3.52150000000
-1,2062,R1,gassupply1,2026,3.52150000000
-2,2030,R1,gassupply1,2028,3.53600000000
-2,2032,R1,gassupply1,2028,3.53600000000
-2,2034,R1,gassupply1,2028,3.53600000000
-2,2035,R1,gassupply1,2028,3.53600000000
-2,2036,R1,gassupply1,2028,3.53600000000
-2,2040,R1,gassupply1,2028,3.53600000000
-2,2045,R1,gassupply1,2028,3.53600000000
-2,2050,R1,gassupply1,2028,3.53600000000
-2,2062,R1,gassupply1,2028,3.53600000000
-2,2063,R1,gassupply1,2028,3.53600000000
-2,2064,R1,gassupply1,2028,3.53600000000
-3,2032,R1,gassupply1,2030,4.66260000000
-3,2034,R1,gassupply1,2030,4.66260000000
-3,2035,R1,gassupply1,2030,4.66260000000
-3,2036,R1,gassupply1,2030,4.66260000000
-3,2040,R1,gassupply1,2030,4.66260000000
-3,2045,R1,gassupply1,2030,4.66260000000
-3,2050,R1,gassupply1,2030,4.66260000000
-3,2062,R1,gassupply1,2030,4.66260000000
-3,2063,R1,gassupply1,2030,4.66260000000
-3,2064,R1,gassupply1,2030,4.66260000000
-3,2065,R1,gassupply1,2030,4.66260000000
-3,2066,R1,gassupply1,2030,4.66260000000
-4,2034,R1,gassupply1,2032,3.00000000000
-4,2035,R1,gassupply1,2032,3.00000000000
-4,2036,R1,gassupply1,2032,3.00000000000
-4,2040,R1,gassupply1,2032,3.00000000000
-4,2045,R1,gassupply1,2032,3.00000000000
-4,2050,R1,gassupply1,2032,3.00000000000
-4,2062,R1,gassupply1,2032,3.00000000000
-4,2063,R1,gassupply1,2032,3.00000000000
-4,2064,R1,gassupply1,2032,3.00000000000
-4,2065,R1,gassupply1,2032,3.00000000000
-4,2066,R1,gassupply1,2032,3.00000000000
-4,2067,R1,gassupply1,2032,3.00000000000
-4,2068,R1,gassupply1,2032,3.00000000000
-5,2036,R1,gassupply1,2034,1.50000000000
-5,2040,R1,gassupply1,2034,1.50000000000
-5,2045,R1,gassupply1,2034,1.50000000000
-5,2050,R1,gassupply1,2034,1.50000000000
-5,2062,R1,gassupply1,2034,1.50000000000
-5,2063,R1,gassupply1,2034,1.50000000000
-5,2064,R1,gassupply1,2034,1.50000000000
-5,2065,R1,gassupply1,2034,1.50000000000
-5,2066,R1,gassupply1,2034,1.50000000000
-5,2067,R1,gassupply1,2034,1.50000000000
-5,2068,R1,gassupply1,2034,1.50000000000
-5,2069,R1,gassupply1,2034,1.50000000000
-5,2070,R1,gassupply1,2034,1.50000000000
-6,2020,R2,gassupply1,2020,15.00000000000
-6,2025,R2,gassupply1,2020,15.00000000000
-6,2028,R2,gassupply1,2020,10.50000000000
-6,2030,R2,gassupply1,2020,7.50000000000
-6,2032,R2,gassupply1,2020,4.50000000000
-6,2034,R2,gassupply1,2020,1.50000000000
-7,2028,R2,gassupply1,2026,3.52150000000
-7,2030,R2,gassupply1,2026,3.52150000000
-7,2032,R2,gassupply1,2026,3.52150000000
-7,2034,R2,gassupply1,2026,3.52150000000
-7,2035,R2,gassupply1,2026,3.52150000000
-7,2036,R2,gassupply1,2026,3.52150000000
-7,2040,R2,gassupply1,2026,3.52150000000
-7,2045,R2,gassupply1,2026,3.52150000000
-7,2050,R2,gassupply1,2026,3.52150000000
-7,2062,R2,gassupply1,2026,3.52150000000
-8,2030,R2,gassupply1,2028,3.53600000000
-8,2032,R2,gassupply1,2028,3.53600000000
-8,2034,R2,gassupply1,2028,3.53600000000
-8,2035,R2,gassupply1,2028,3.53600000000
-8,2036,R2,gassupply1,2028,3.53600000000
-8,2040,R2,gassupply1,2028,3.53600000000
-8,2045,R2,gassupply1,2028,3.53600000000
-8,2050,R2,gassupply1,2028,3.53600000000
-8,2062,R2,gassupply1,2028,3.53600000000
-8,2063,R2,gassupply1,2028,3.53600000000
-8,2064,R2,gassupply1,2028,3.53600000000
-9,2032,R2,gassupply1,2030,4.66260000000
-9,2034,R2,gassupply1,2030,4.66260000000
-9,2035,R2,gassupply1,2030,4.66260000000
-9,2036,R2,gassupply1,2030,4.66260000000
-9,2040,R2,gassupply1,2030,4.66260000000
-9,2045,R2,gassupply1,2030,4.66260000000
-9,2050,R2,gassupply1,2030,4.66260000000
-9,2062,R2,gassupply1,2030,4.66260000000
-9,2063,R2,gassupply1,2030,4.66260000000
-9,2064,R2,gassupply1,2030,4.66260000000
-9,2065,R2,gassupply1,2030,4.66260000000
-9,2066,R2,gassupply1,2030,4.66260000000
-10,2034,R2,gassupply1,2032,3.00000000000
-10,2035,R2,gassupply1,2032,3.00000000000
-10,2036,R2,gassupply1,2032,3.00000000000
-10,2040,R2,gassupply1,2032,3.00000000000
-10,2045,R2,gassupply1,2032,3.00000000000
-10,2050,R2,gassupply1,2032,3.00000000000
-10,2062,R2,gassupply1,2032,3.00000000000
-10,2063,R2,gassupply1,2032,3.00000000000
-10,2064,R2,gassupply1,2032,3.00000000000
-10,2065,R2,gassupply1,2032,3.00000000000
-10,2066,R2,gassupply1,2032,3.00000000000
-10,2067,R2,gassupply1,2032,3.00000000000
-10,2068,R2,gassupply1,2032,3.00000000000
-11,2036,R2,gassupply1,2034,1.50000000000
-11,2040,R2,gassupply1,2034,1.50000000000
-11,2045,R2,gassupply1,2034,1.50000000000
-11,2050,R2,gassupply1,2034,1.50000000000
-11,2062,R2,gassupply1,2034,1.50000000000
-11,2063,R2,gassupply1,2034,1.50000000000
-11,2064,R2,gassupply1,2034,1.50000000000
-11,2065,R2,gassupply1,2034,1.50000000000
-11,2066,R2,gassupply1,2034,1.50000000000
-11,2067,R2,gassupply1,2034,1.50000000000
-11,2068,R2,gassupply1,2034,1.50000000000
-11,2069,R2,gassupply1,2034,1.50000000000
-11,2070,R2,gassupply1,2034,1.50000000000
+0,2022,R1,gassupply1,2020,15.34280000000
+0,2024,R1,gassupply1,2020,15.34280000000
+0,2025,R1,gassupply1,2020,15.34280000000
+0,2026,R1,gassupply1,2020,13.84280000000
+0,2028,R1,gassupply1,2020,10.84280000000
+0,2030,R1,gassupply1,2020,7.84280000000
+0,2032,R1,gassupply1,2020,4.84280000000
+0,2034,R1,gassupply1,2020,1.84280000000
+0,2035,R1,gassupply1,2020,0.34280000000
+0,2036,R1,gassupply1,2020,0.34280000000
+0,2040,R1,gassupply1,2020,0.34280000000
+0,2045,R1,gassupply1,2020,0.34280000000
+0,2050,R1,gassupply1,2020,0.34280000000
+0,2056,R1,gassupply1,2020,0.34280000000
+1,2024,R1,gassupply1,2022,0.60380000000
+1,2025,R1,gassupply1,2022,0.60380000000
+1,2026,R1,gassupply1,2022,0.60380000000
+1,2028,R1,gassupply1,2022,0.60380000000
+1,2030,R1,gassupply1,2022,0.60380000000
+1,2032,R1,gassupply1,2022,0.60380000000
+1,2034,R1,gassupply1,2022,0.60380000000
+1,2035,R1,gassupply1,2022,0.60380000000
+1,2036,R1,gassupply1,2022,0.60380000000
+1,2040,R1,gassupply1,2022,0.60380000000
+1,2045,R1,gassupply1,2022,0.60380000000
+1,2050,R1,gassupply1,2022,0.60380000000
+1,2056,R1,gassupply1,2022,0.60380000000
+1,2057,R1,gassupply1,2022,0.60380000000
+1,2058,R1,gassupply1,2022,0.60380000000
+2,2026,R1,gassupply1,2024,2.07490000000
+2,2028,R1,gassupply1,2024,2.07490000000
+2,2030,R1,gassupply1,2024,2.07490000000
+2,2032,R1,gassupply1,2024,2.07490000000
+2,2034,R1,gassupply1,2024,2.07490000000
+2,2035,R1,gassupply1,2024,2.07490000000
+2,2036,R1,gassupply1,2024,2.07490000000
+2,2040,R1,gassupply1,2024,2.07490000000
+2,2045,R1,gassupply1,2024,2.07490000000
+2,2050,R1,gassupply1,2024,2.07490000000
+2,2056,R1,gassupply1,2024,2.07490000000
+2,2057,R1,gassupply1,2024,2.07490000000
+2,2058,R1,gassupply1,2024,2.07490000000
+2,2059,R1,gassupply1,2024,2.07490000000
+2,2060,R1,gassupply1,2024,2.07490000000
+3,2028,R1,gassupply1,2026,3.55300000000
+3,2030,R1,gassupply1,2026,3.55300000000
+3,2032,R1,gassupply1,2026,3.55300000000
+3,2034,R1,gassupply1,2026,3.55300000000
+3,2035,R1,gassupply1,2026,3.55300000000
+3,2036,R1,gassupply1,2026,3.55300000000
+3,2040,R1,gassupply1,2026,3.55300000000
+3,2045,R1,gassupply1,2026,3.55300000000
+3,2050,R1,gassupply1,2026,3.55300000000
+3,2056,R1,gassupply1,2026,3.55300000000
+3,2057,R1,gassupply1,2026,3.55300000000
+3,2058,R1,gassupply1,2026,3.55300000000
+3,2059,R1,gassupply1,2026,3.55300000000
+3,2060,R1,gassupply1,2026,3.55300000000
+3,2061,R1,gassupply1,2026,3.55300000000
+3,2062,R1,gassupply1,2026,3.55300000000
+4,2030,R1,gassupply1,2028,3.53600000000
+4,2032,R1,gassupply1,2028,3.53600000000
+4,2034,R1,gassupply1,2028,3.53600000000
+4,2035,R1,gassupply1,2028,3.53600000000
+4,2036,R1,gassupply1,2028,3.53600000000
+4,2040,R1,gassupply1,2028,3.53600000000
+4,2045,R1,gassupply1,2028,3.53600000000
+4,2050,R1,gassupply1,2028,3.53600000000
+4,2056,R1,gassupply1,2028,3.53600000000
+4,2057,R1,gassupply1,2028,3.53600000000
+4,2058,R1,gassupply1,2028,3.53600000000
+4,2059,R1,gassupply1,2028,3.53600000000
+4,2060,R1,gassupply1,2028,3.53600000000
+4,2061,R1,gassupply1,2028,3.53600000000
+4,2062,R1,gassupply1,2028,3.53600000000
+4,2063,R1,gassupply1,2028,3.53600000000
+4,2064,R1,gassupply1,2028,3.53600000000
+5,2032,R1,gassupply1,2030,4.66260000000
+5,2034,R1,gassupply1,2030,4.66260000000
+5,2035,R1,gassupply1,2030,4.66260000000
+5,2036,R1,gassupply1,2030,4.66260000000
+5,2040,R1,gassupply1,2030,4.66260000000
+5,2045,R1,gassupply1,2030,4.66260000000
+5,2050,R1,gassupply1,2030,4.66260000000
+5,2056,R1,gassupply1,2030,4.66260000000
+5,2057,R1,gassupply1,2030,4.66260000000
+5,2058,R1,gassupply1,2030,4.66260000000
+5,2059,R1,gassupply1,2030,4.66260000000
+5,2060,R1,gassupply1,2030,4.66260000000
+5,2061,R1,gassupply1,2030,4.66260000000
+5,2062,R1,gassupply1,2030,4.66260000000
+5,2063,R1,gassupply1,2030,4.66260000000
+5,2064,R1,gassupply1,2030,4.66260000000
+5,2065,R1,gassupply1,2030,4.66260000000
+5,2066,R1,gassupply1,2030,4.66260000000
+6,2034,R1,gassupply1,2032,3.62850000000
+6,2035,R1,gassupply1,2032,3.62850000000
+6,2036,R1,gassupply1,2032,3.62850000000
+6,2040,R1,gassupply1,2032,3.62850000000
+6,2045,R1,gassupply1,2032,3.62850000000
+6,2050,R1,gassupply1,2032,3.62850000000
+6,2056,R1,gassupply1,2032,3.62850000000
+6,2057,R1,gassupply1,2032,3.62850000000
+6,2058,R1,gassupply1,2032,3.62850000000
+6,2059,R1,gassupply1,2032,3.62850000000
+6,2060,R1,gassupply1,2032,3.62850000000
+6,2061,R1,gassupply1,2032,3.62850000000
+6,2062,R1,gassupply1,2032,3.62850000000
+6,2063,R1,gassupply1,2032,3.62850000000
+6,2064,R1,gassupply1,2032,3.62850000000
+6,2065,R1,gassupply1,2032,3.62850000000
+6,2066,R1,gassupply1,2032,3.62850000000
+6,2067,R1,gassupply1,2032,3.62850000000
+6,2068,R1,gassupply1,2032,3.62850000000
+7,2036,R1,gassupply1,2034,1.50000000000
+7,2040,R1,gassupply1,2034,1.50000000000
+7,2045,R1,gassupply1,2034,1.50000000000
+7,2050,R1,gassupply1,2034,1.50000000000
+7,2056,R1,gassupply1,2034,1.50000000000
+7,2057,R1,gassupply1,2034,1.50000000000
+7,2058,R1,gassupply1,2034,1.50000000000
+7,2059,R1,gassupply1,2034,1.50000000000
+7,2060,R1,gassupply1,2034,1.50000000000
+7,2061,R1,gassupply1,2034,1.50000000000
+7,2062,R1,gassupply1,2034,1.50000000000
+7,2063,R1,gassupply1,2034,1.50000000000
+7,2064,R1,gassupply1,2034,1.50000000000
+7,2065,R1,gassupply1,2034,1.50000000000
+7,2066,R1,gassupply1,2034,1.50000000000
+7,2067,R1,gassupply1,2034,1.50000000000
+7,2068,R1,gassupply1,2034,1.50000000000
+7,2069,R1,gassupply1,2034,1.50000000000
+7,2070,R1,gassupply1,2034,1.50000000000
+8,2020,R2,gassupply1,2020,15.00000000000
+8,2022,R2,gassupply1,2020,15.34280000000
+8,2024,R2,gassupply1,2020,15.34280000000
+8,2025,R2,gassupply1,2020,15.34280000000
+8,2026,R2,gassupply1,2020,13.84280000000
+8,2028,R2,gassupply1,2020,10.84280000000
+8,2030,R2,gassupply1,2020,7.84280000000
+8,2032,R2,gassupply1,2020,4.84280000000
+8,2034,R2,gassupply1,2020,1.84280000000
+8,2035,R2,gassupply1,2020,0.34280000000
+8,2036,R2,gassupply1,2020,0.34280000000
+8,2040,R2,gassupply1,2020,0.34280000000
+8,2045,R2,gassupply1,2020,0.34280000000
+8,2050,R2,gassupply1,2020,0.34280000000
+8,2056,R2,gassupply1,2020,0.34280000000
+9,2024,R2,gassupply1,2022,0.60380000000
+9,2025,R2,gassupply1,2022,0.60380000000
+9,2026,R2,gassupply1,2022,0.60380000000
+9,2028,R2,gassupply1,2022,0.60380000000
+9,2030,R2,gassupply1,2022,0.60380000000
+9,2032,R2,gassupply1,2022,0.60380000000
+9,2034,R2,gassupply1,2022,0.60380000000
+9,2035,R2,gassupply1,2022,0.60380000000
+9,2036,R2,gassupply1,2022,0.60380000000
+9,2040,R2,gassupply1,2022,0.60380000000
+9,2045,R2,gassupply1,2022,0.60380000000
+9,2050,R2,gassupply1,2022,0.60380000000
+9,2056,R2,gassupply1,2022,0.60380000000
+9,2057,R2,gassupply1,2022,0.60380000000
+9,2058,R2,gassupply1,2022,0.60380000000
+10,2026,R2,gassupply1,2024,2.07490000000
+10,2028,R2,gassupply1,2024,2.07490000000
+10,2030,R2,gassupply1,2024,2.07490000000
+10,2032,R2,gassupply1,2024,2.07490000000
+10,2034,R2,gassupply1,2024,2.07490000000
+10,2035,R2,gassupply1,2024,2.07490000000
+10,2036,R2,gassupply1,2024,2.07490000000
+10,2040,R2,gassupply1,2024,2.07490000000
+10,2045,R2,gassupply1,2024,2.07490000000
+10,2050,R2,gassupply1,2024,2.07490000000
+10,2056,R2,gassupply1,2024,2.07490000000
+10,2057,R2,gassupply1,2024,2.07490000000
+10,2058,R2,gassupply1,2024,2.07490000000
+10,2059,R2,gassupply1,2024,2.07490000000
+10,2060,R2,gassupply1,2024,2.07490000000
+11,2028,R2,gassupply1,2026,3.55300000000
+11,2030,R2,gassupply1,2026,3.55300000000
+11,2032,R2,gassupply1,2026,3.55300000000
+11,2034,R2,gassupply1,2026,3.55300000000
+11,2035,R2,gassupply1,2026,3.55300000000
+11,2036,R2,gassupply1,2026,3.55300000000
+11,2040,R2,gassupply1,2026,3.55300000000
+11,2045,R2,gassupply1,2026,3.55300000000
+11,2050,R2,gassupply1,2026,3.55300000000
+11,2056,R2,gassupply1,2026,3.55300000000
+11,2057,R2,gassupply1,2026,3.55300000000
+11,2058,R2,gassupply1,2026,3.55300000000
+11,2059,R2,gassupply1,2026,3.55300000000
+11,2060,R2,gassupply1,2026,3.55300000000
+11,2061,R2,gassupply1,2026,3.55300000000
+11,2062,R2,gassupply1,2026,3.55300000000
+12,2030,R2,gassupply1,2028,3.53600000000
+12,2032,R2,gassupply1,2028,3.53600000000
+12,2034,R2,gassupply1,2028,3.53600000000
+12,2035,R2,gassupply1,2028,3.53600000000
+12,2036,R2,gassupply1,2028,3.53600000000
+12,2040,R2,gassupply1,2028,3.53600000000
+12,2045,R2,gassupply1,2028,3.53600000000
+12,2050,R2,gassupply1,2028,3.53600000000
+12,2056,R2,gassupply1,2028,3.53600000000
+12,2057,R2,gassupply1,2028,3.53600000000
+12,2058,R2,gassupply1,2028,3.53600000000
+12,2059,R2,gassupply1,2028,3.53600000000
+12,2060,R2,gassupply1,2028,3.53600000000
+12,2061,R2,gassupply1,2028,3.53600000000
+12,2062,R2,gassupply1,2028,3.53600000000
+12,2063,R2,gassupply1,2028,3.53600000000
+12,2064,R2,gassupply1,2028,3.53600000000
+13,2032,R2,gassupply1,2030,4.66260000000
+13,2034,R2,gassupply1,2030,4.66260000000
+13,2035,R2,gassupply1,2030,4.66260000000
+13,2036,R2,gassupply1,2030,4.66260000000
+13,2040,R2,gassupply1,2030,4.66260000000
+13,2045,R2,gassupply1,2030,4.66260000000
+13,2050,R2,gassupply1,2030,4.66260000000
+13,2056,R2,gassupply1,2030,4.66260000000
+13,2057,R2,gassupply1,2030,4.66260000000
+13,2058,R2,gassupply1,2030,4.66260000000
+13,2059,R2,gassupply1,2030,4.66260000000
+13,2060,R2,gassupply1,2030,4.66260000000
+13,2061,R2,gassupply1,2030,4.66260000000
+13,2062,R2,gassupply1,2030,4.66260000000
+13,2063,R2,gassupply1,2030,4.66260000000
+13,2064,R2,gassupply1,2030,4.66260000000
+13,2065,R2,gassupply1,2030,4.66260000000
+13,2066,R2,gassupply1,2030,4.66260000000
+14,2034,R2,gassupply1,2032,3.62850000000
+14,2035,R2,gassupply1,2032,3.62850000000
+14,2036,R2,gassupply1,2032,3.62850000000
+14,2040,R2,gassupply1,2032,3.62850000000
+14,2045,R2,gassupply1,2032,3.62850000000
+14,2050,R2,gassupply1,2032,3.62850000000
+14,2056,R2,gassupply1,2032,3.62850000000
+14,2057,R2,gassupply1,2032,3.62850000000
+14,2058,R2,gassupply1,2032,3.62850000000
+14,2059,R2,gassupply1,2032,3.62850000000
+14,2060,R2,gassupply1,2032,3.62850000000
+14,2061,R2,gassupply1,2032,3.62850000000
+14,2062,R2,gassupply1,2032,3.62850000000
+14,2063,R2,gassupply1,2032,3.62850000000
+14,2064,R2,gassupply1,2032,3.62850000000
+14,2065,R2,gassupply1,2032,3.62850000000
+14,2066,R2,gassupply1,2032,3.62850000000
+14,2067,R2,gassupply1,2032,3.62850000000
+14,2068,R2,gassupply1,2032,3.62850000000
+15,2036,R2,gassupply1,2034,1.50000000000
+15,2040,R2,gassupply1,2034,1.50000000000
+15,2045,R2,gassupply1,2034,1.50000000000
+15,2050,R2,gassupply1,2034,1.50000000000
+15,2056,R2,gassupply1,2034,1.50000000000
+15,2057,R2,gassupply1,2034,1.50000000000
+15,2058,R2,gassupply1,2034,1.50000000000
+15,2059,R2,gassupply1,2034,1.50000000000
+15,2060,R2,gassupply1,2034,1.50000000000
+15,2061,R2,gassupply1,2034,1.50000000000
+15,2062,R2,gassupply1,2034,1.50000000000
+15,2063,R2,gassupply1,2034,1.50000000000
+15,2064,R2,gassupply1,2034,1.50000000000
+15,2065,R2,gassupply1,2034,1.50000000000
+15,2066,R2,gassupply1,2034,1.50000000000
+15,2067,R2,gassupply1,2034,1.50000000000
+15,2068,R2,gassupply1,2034,1.50000000000
+15,2069,R2,gassupply1,2034,1.50000000000
+15,2070,R2,gassupply1,2034,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 3ea7214c..8e38e00f 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -9,24 +9,30 @@ gasboiler,R1,R1,A1,residential,newcapa,2022,8.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2022,11.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2022,8.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2022,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2022,1.34360000000
-solarPV,R1,R1,A1,power,newcapa,2022,4.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2022,3.00000000000
+solarPV,R1,R1,A1,power,newcapa,2022,0.27320000000
 windturbine,R1,R1,A1,power,newcapa,2022,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2022,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2022,8.77320000000
+gasCCGT,R2,R2,A1,power,newcapa,2022,3.00000000000
+windturbine,R2,R2,A1,power,newcapa,2022,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2022,15.34280000000
+gassupply1,R2,R2,A1,gas,newcapa,2022,15.34280000000
 gasboiler,R1,R1,A1,residential,newcapa,2024,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2024,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2024,4.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2024,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2024,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2024,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2024,1.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2024,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2024,1.85640000000
-solarPV,R1,R1,A1,power,newcapa,2024,4.00000000000
+solarPV,R1,R1,A1,power,newcapa,2024,0.27320000000
 windturbine,R1,R1,A1,power,newcapa,2024,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2024,1.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2024,3.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2024,1.85640000000
-windturbine,R2,R2,A1,power,newcapa,2024,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2024,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2024,15.34280000000
+gassupply1,R1,R1,A1,gas,newcapa,2024,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2024,15.34280000000
+gassupply1,R2,R2,A1,gas,newcapa,2024,0.60380000000
 gasboiler,R1,R1,A1,residential,newcapa,2026,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2026,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
@@ -35,15 +41,21 @@ gasboiler,R2,R2,A1,residential,newcapa,2026,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,1.14360000000
+gasCCGT,R1,R1,A1,power,newcapa,2026,2.80000000000
 gasCCGT,R1,R1,A1,power,newcapa,2026,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2026,2.07980000000
-solarPV,R1,R1,A1,power,newcapa,2026,4.00000000000
+solarPV,R1,R1,A1,power,newcapa,2026,0.27320000000
 windturbine,R1,R1,A1,power,newcapa,2026,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,0.80000000000
+gasCCGT,R2,R2,A1,power,newcapa,2026,2.80000000000
 gasCCGT,R2,R2,A1,power,newcapa,2026,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2026,2.07980000000
-windturbine,R2,R2,A1,power,newcapa,2026,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2026,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2026,13.84280000000
+gassupply1,R1,R1,A1,gas,newcapa,2026,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2026,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2026,13.84280000000
+gassupply1,R2,R2,A1,gas,newcapa,2026,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2026,2.07490000000
 gasboiler,R1,R1,A1,residential,newcapa,2028,2.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2028,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
@@ -54,21 +66,25 @@ heatpump,R2,R2,A1,residential,newcapa,2028,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,0.74360000000
+gasCCGT,R1,R1,A1,power,newcapa,2028,2.40000000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2028,2.29760000000
-solarPV,R1,R1,A1,power,newcapa,2028,4.00000000000
+solarPV,R1,R1,A1,power,newcapa,2028,0.27320000000
 windturbine,R1,R1,A1,power,newcapa,2028,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,0.40000000000
+gasCCGT,R2,R2,A1,power,newcapa,2028,2.40000000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2028,2.29760000000
-windturbine,R2,R2,A1,power,newcapa,2028,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,10.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,10.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,3.52150000000
+windturbine,R2,R2,A1,power,newcapa,2028,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,10.84280000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,2.07490000000
+gassupply1,R1,R1,A1,gas,newcapa,2028,3.55300000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,10.84280000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2028,3.55300000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
@@ -79,23 +95,28 @@ heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,0.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,2.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,2.31150000000
-solarPV,R1,R1,A1,power,newcapa,2030,4.00000000000
+solarPV,R1,R1,A1,power,newcapa,2030,0.27320000000
 windturbine,R1,R1,A1,power,newcapa,2030,4.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,2.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,2.29760000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,2.31150000000
-windturbine,R2,R2,A1,power,newcapa,2030,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.52150000000
+windturbine,R2,R2,A1,power,newcapa,2030,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.84280000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,2.07490000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,3.55300000000
 gassupply1,R1,R1,A1,gas,newcapa,2030,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,3.52150000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,7.84280000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,3.55300000000
 gassupply1,R2,R2,A1,gas,newcapa,2030,3.53600000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
@@ -107,26 +128,31 @@ heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2032,13.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,0.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2032,2.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2032,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2032,4.00000000000
+solarPV,R1,R1,A1,power,newcapa,2032,0.27320000000
 windturbine,R1,R1,A1,power,newcapa,2032,4.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2032,2.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,2.29760000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,2.31150000000
 gasCCGT,R2,R2,A1,power,newcapa,2032,0.99560000000
-windturbine,R2,R2,A1,power,newcapa,2032,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,4.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,3.52150000000
+windturbine,R2,R2,A1,power,newcapa,2032,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,4.84280000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,2.07490000000
+gassupply1,R1,R1,A1,gas,newcapa,2032,3.55300000000
 gassupply1,R1,R1,A1,gas,newcapa,2032,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2032,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,4.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,3.52150000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,4.84280000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2032,3.55300000000
 gassupply1,R2,R2,A1,gas,newcapa,2032,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2032,4.66260000000
 heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
@@ -139,32 +165,38 @@ heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2034,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,0.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,2.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2034,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2034,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2034,0.75270000000
+solarPV,R1,R1,A1,power,newcapa,2034,0.27320000000
+solarPV,R1,R1,A1,power,newcapa,2034,0.54630000000
 windturbine,R1,R1,A1,power,newcapa,2034,4.00000000000
+gasCCGT,R2,R2,A1,power,newcapa,2034,2.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,2.29760000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,2.31150000000
 gasCCGT,R2,R2,A1,power,newcapa,2034,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2034,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,1.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.52150000000
+windturbine,R2,R2,A1,power,newcapa,2034,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,1.84280000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,2.07490000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,3.55300000000
 gassupply1,R1,R1,A1,gas,newcapa,2034,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2034,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.52150000000
+gassupply1,R1,R1,A1,gas,newcapa,2034,3.62850000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,1.84280000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,3.55300000000
 gassupply1,R2,R2,A1,gas,newcapa,2034,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2034,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2034,3.62850000000
 heatpump,R1,R1,A1,residential,newcapa,2036,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2036,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2036,13.00000000000
@@ -175,16 +207,19 @@ heatpump,R2,R2,A1,residential,newcapa,2036,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,0.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,2.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2036,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2036,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2036,0.75270000000
+solarPV,R1,R1,A1,power,newcapa,2036,0.27320000000
+solarPV,R1,R1,A1,power,newcapa,2036,0.54630000000
+solarPV,R1,R1,A1,power,newcapa,2036,1.63890000000
 windturbine,R1,R1,A1,power,newcapa,2036,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2036,0.60110000000
+gasCCGT,R2,R2,A1,power,newcapa,2036,2.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,2.29760000000
@@ -192,16 +227,22 @@ gasCCGT,R2,R2,A1,power,newcapa,2036,2.31150000000
 gasCCGT,R2,R2,A1,power,newcapa,2036,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2036,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.52150000000
+windturbine,R2,R2,A1,power,newcapa,2036,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,0.34280000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,2.07490000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,3.55300000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2036,3.62850000000
 gassupply1,R1,R1,A1,gas,newcapa,2036,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.52150000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,0.34280000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,3.55300000000
 gassupply1,R2,R2,A1,gas,newcapa,2036,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2036,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2036,3.62850000000
 gassupply1,R2,R2,A1,gas,newcapa,2036,1.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2038,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2038,13.00000000000
@@ -213,17 +254,20 @@ heatpump,R2,R2,A1,residential,newcapa,2038,13.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,0.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,2.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2038,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2038,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2038,0.75270000000
+solarPV,R1,R1,A1,power,newcapa,2038,0.27320000000
+solarPV,R1,R1,A1,power,newcapa,2038,0.54630000000
+solarPV,R1,R1,A1,power,newcapa,2038,1.63890000000
 solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
 windturbine,R1,R1,A1,power,newcapa,2038,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2038,0.60110000000
+gasCCGT,R2,R2,A1,power,newcapa,2038,2.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2038,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2038,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2038,2.29760000000
@@ -232,7 +276,7 @@ gasCCGT,R2,R2,A1,power,newcapa,2038,0.99560000000
 solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2038,8.77320000000
+windturbine,R2,R2,A1,power,newcapa,2038,4.27320000000
 heatpump,R1,R1,A1,residential,newcapa,2040,13.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
@@ -243,18 +287,21 @@ heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,8.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,0.34360000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,2.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,1.85640000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,2.07980000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,2.29760000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,2.31150000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2040,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,0.75270000000
+solarPV,R1,R1,A1,power,newcapa,2040,0.27320000000
+solarPV,R1,R1,A1,power,newcapa,2040,0.54630000000
+solarPV,R1,R1,A1,power,newcapa,2040,1.63890000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
 windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,0.60110000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,2.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,1.85640000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,2.07980000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,2.29760000000
@@ -264,14 +311,20 @@ solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
 solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2040,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.52150000000
+windturbine,R2,R2,A1,power,newcapa,2040,4.27320000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.34280000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.60380000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.07490000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,3.55300000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,3.53600000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,3.62850000000
 gassupply1,R1,R1,A1,gas,newcapa,2040,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.52150000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,0.34280000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,0.60380000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,2.07490000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,3.55300000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,3.53600000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.00000000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,3.62850000000
 gassupply1,R2,R2,A1,gas,newcapa,2040,1.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 97cf6a87..697c208e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44830000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,0.44830000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,0.44870000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,0.44870000000,2022
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2022
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,0.81010000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,0.81010000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,0.21080000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,0.21080000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64040000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,0.64040000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,0.64220000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,0.64220000000,2022
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2022
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,1.15730000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,1.15730000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,0.30630000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,0.30630000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44830000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44830000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44870000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44870000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.81010000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.81010000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.21080000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.21080000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64040000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64040000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64220000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64220000000,2022
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2022
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15730000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.15730000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.30630000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.30630000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34490000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34490000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.35750000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.35750000000,2022
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2022
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.43040000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.43040000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.68340000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.68340000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89660000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89660000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,0.90120000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,0.90120000000,2022
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2022
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,1.62020000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,1.62020000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,0.43850000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,0.43850000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89660000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89660000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,0.90120000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,0.90120000000,2022
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2022
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.62020000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.62020000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.43850000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.43850000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89660000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89660000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.90120000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.90120000000,2022
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2022
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.62020000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.62020000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.43850000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.43850000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.39760000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.39760000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,0.58130000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,0.58130000000,2024
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2024
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,0.17110000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,0.17110000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,0.17380000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,0.17380000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.56880000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56880000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,0.83180000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,0.83180000000,2024
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2024
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,0.25050000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,0.25050000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,0.25610000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,0.25610000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.39760000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.39760000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.58130000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.58130000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17110000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17380000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17380000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56880000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56880000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.83180000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.83180000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2024
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.25050000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.25050000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.25610000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.25610000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.20100000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.20100000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.75720000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.75720000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2024
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.57240000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.57240000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.59790000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.59790000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,0.79790000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,0.79790000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,1.16700000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,1.16700000000,2024
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2024
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,0.36190000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,0.36190000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,0.37300000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,0.37300000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.79790000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.79790000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.16700000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.16700000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2024
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.36190000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.36190000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.37300000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.37300000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.79790000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.79790000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.16700000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.16700000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2024
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.36190000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.36190000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.37300000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.37300000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.53490000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.53490000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,0.69930000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,0.69930000000,2026
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2026
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.12510000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.12510000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,0.13230000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,0.13230000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,0.76520000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,0.76520000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,1.00050000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,1.00050000000,2026
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2026
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.18480000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.18480000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,0.19950000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,0.19950000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.53490000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.53490000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.69930000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.69930000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.12510000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.12510000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13230000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13230000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.76520000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.76520000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00050000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.00050000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2026
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18480000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.18480000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19950000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.19950000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.61520000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.61520000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.11240000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.11240000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2026
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43500000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43500000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50020000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.50020000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,1.07330000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,1.07330000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,1.40340000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,1.40340000000,2026
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2026
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.27000000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.27000000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,0.29890000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,0.29890000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.07330000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.07330000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.40340000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.40340000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2026
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.27000000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.27000000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.29890000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.29890000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.07330000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.07330000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.40340000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.40340000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2026
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.27000000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.27000000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.29890000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.29890000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.65860000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.65860000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,0.81030000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,0.81030000000,2028
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2028
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.07990000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.07990000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,0.08720000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,0.08720000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94210000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,0.94210000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,1.15920000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,1.15920000000,2028
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2028
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.12300000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.12300000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,0.13800000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,0.13800000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.65860000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.65860000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.81030000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.81030000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07990000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07990000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08720000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08720000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94210000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94210000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15920000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15920000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2028
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12300000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12300000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13800000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.13800000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98770000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.98770000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.44620000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.44620000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2028
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32690000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.32690000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.39310000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.39310000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32110000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,1.32110000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,1.62570000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,1.62570000000,2028
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2028
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.18880000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.18880000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,0.21810000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,0.21810000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.32110000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.32110000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.62570000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.62570000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2028
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18880000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18880000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.21810000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.21810000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.32110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.32110000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.62570000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.62570000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2028
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18880000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18880000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.21810000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.21810000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.77470000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.77470000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.91750000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.91750000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03200000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.03200000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.03950000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.03950000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.10800000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.10800000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.31230000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.31230000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.05740000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.05740000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07270000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.07270000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.77470000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.77470000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.91750000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.91750000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03200000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03200000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03950000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03950000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10800000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.10800000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.31230000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.31230000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05740000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05740000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07270000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07270000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.33690000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.33690000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.76800000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.76800000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21120000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.21120000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27880000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27880000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.55360000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.55360000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.84010000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.84010000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.10230000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.10230000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.13230000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.13230000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.55360000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.55360000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.84010000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.84010000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10230000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10230000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.13230000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.13230000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.55360000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.55360000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.84010000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.84010000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10230000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10230000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13230000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13230000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.90700000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.90700000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,1.06000000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,1.06000000000,2032
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2032
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.03540000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.03540000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,0.04360000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,0.04360000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,1.29700000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,1.29700000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,1.51590000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,1.51590000000,2032
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2032
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.06430000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.06430000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,0.08110000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,0.08110000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.90700000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.90700000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.06000000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.06000000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03540000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03540000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04360000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04360000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.29700000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.29700000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.51590000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.51590000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2032
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06430000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06430000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08110000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.08110000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.73420000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.73420000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.19590000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.19590000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2032
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24140000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.24140000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.31580000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.31580000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,1.81840000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,1.81840000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,2.12530000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,2.12530000000,2032
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2032
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.11570000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.11570000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,0.14870000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,0.14870000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.81840000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.81840000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.12530000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.12530000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2032
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11570000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11570000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.14870000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.14870000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.81840000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.81840000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.12530000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.12530000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2032
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11570000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11570000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14870000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14870000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.95330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.95330000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,1.14880000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,1.14880000000,2034
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2034
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.03920000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.03920000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,0.04620000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,0.04620000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.36310000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.36310000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,1.64260000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,1.64260000000,2034
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2034
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.07210000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.07210000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,0.08630000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,0.08630000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.95330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.95330000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.14880000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.14880000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03920000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03920000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04620000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04620000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.36310000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.36310000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64260000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.64260000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2034
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07210000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07210000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08630000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.08630000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.87230000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.87230000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.46150000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.46150000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2034
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27580000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27580000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.33880000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.33880000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,1.91070000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,1.91070000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,2.30260000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,2.30260000000,2034
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2034
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.13100000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.13100000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,0.15900000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,0.15900000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.91070000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.91070000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.30260000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.30260000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2034
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13100000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13100000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.15900000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.15900000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.91070000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.91070000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.30260000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.30260000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2034
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13100000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13100000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15900000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15900000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.99350000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.99350000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,1.19830000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,1.19830000000,2036
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2036
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.04050000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.04050000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,0.04760000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,0.04760000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,1.42040000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,1.42040000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,1.71330000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,1.71330000000,2036
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2036
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.07480000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.07480000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,0.08920000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,0.08920000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.99350000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.99350000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.19830000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.19830000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04050000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04050000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04760000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04760000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.42040000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.42040000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.71330000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.71330000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2036
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07480000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07480000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08920000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.08920000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.99200000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.99200000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.60910000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.60910000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2036
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28780000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28780000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.35160000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.35160000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,1.99080000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,1.99080000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,2.40130000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,2.40130000000,2036
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2036
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.13630000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.13630000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,0.16470000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,0.16470000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.99080000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.99080000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.40130000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.40130000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2036
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13630000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13630000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16470000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16470000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.99080000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.99080000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.40130000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.40130000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2036
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13630000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13630000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16470000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16470000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,1.02860000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,1.02860000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,1.24160000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,1.24160000000,2038
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2038
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.04170000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.04170000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,0.04890000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,0.04890000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.47060000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.47060000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,1.77510000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,1.77510000000,2038
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2038
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.07720000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.07720000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,0.09180000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,0.09180000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.02860000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.02860000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.24160000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.24160000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04170000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04170000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04890000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04890000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47060000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.47060000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.77510000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.77510000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2038
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07720000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07720000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09180000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.09180000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09680000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.09680000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.73820000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.73820000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2038
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.29820000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.29820000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.36280000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.36280000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,2.06090000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,2.06090000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,2.48770000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,2.48770000000,2038
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2038
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.14100000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.14100000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,0.16970000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,0.16970000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.06090000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.06090000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.48770000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.48770000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2038
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14100000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14100000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.16970000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.16970000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.06090000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.06090000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.48770000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.48770000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2038
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14100000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14100000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16970000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16970000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,1.05960000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.05960000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.27980000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,1.27980000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04270000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.04270000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.05000000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.05000000000,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,1.51480000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.51480000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.82960000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.82960000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.07920000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.07920000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.09400000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.09400000000,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', 'mid-afternoon')",electricity,R1,1.05960000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.05960000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.27980000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.27980000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04270000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04270000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05000000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05000000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.51480000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.51480000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82960000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.82960000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07920000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07920000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09400000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.09400000000,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,3.18920000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.18920000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.85210000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.85210000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30720000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30720000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.37260000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.37260000000,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,2.12270000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,2.12270000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.56380000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,2.56380000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.14500000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.14500000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.17400000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.17400000000,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', 'early-morning')",electricity,R1,2.12270000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.12270000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.56380000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.56380000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14500000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14500000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.17400000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.17400000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.12270000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.12270000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.56380000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.56380000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14500000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14500000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17400000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17400000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
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 1ec7ed69..8c8851c4 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,22 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
-1,2022,R1,solarPV,2020,4.00000000000
-1,2025,R1,solarPV,2020,4.00000000000
-1,2030,R1,solarPV,2020,4.00000000000
-1,2035,R1,solarPV,2020,4.00000000000
-1,2040,R1,solarPV,2020,4.00000000000
-1,2045,R1,solarPV,2020,4.00000000000
-1,2046,R1,solarPV,2020,4.00000000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
+1,2022,R1,solarPV,2020,0.27320000000
+1,2025,R1,solarPV,2020,0.27320000000
+1,2030,R1,solarPV,2020,0.27320000000
+1,2035,R1,solarPV,2020,0.27320000000
+1,2040,R1,solarPV,2020,0.27320000000
+1,2045,R1,solarPV,2020,0.27320000000
+1,2046,R1,solarPV,2020,0.27320000000
 2,2022,R1,windturbine,2020,4.00000000000
 2,2025,R1,windturbine,2020,4.00000000000
 2,2030,R1,windturbine,2020,4.00000000000
@@ -25,12 +25,20 @@ asset,year,region,technology,installed,capacity
 2,2045,R1,windturbine,2020,4.00000000000
 2,2046,R1,windturbine,2020,4.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,8.77320000000
-4,2025,R2,windturbine,2020,8.77320000000
-4,2030,R2,windturbine,2020,8.77320000000
-4,2035,R2,windturbine,2020,8.77320000000
-4,2040,R2,windturbine,2020,8.77320000000
-4,2045,R2,windturbine,2020,8.77320000000
-4,2046,R2,windturbine,2020,8.77320000000
+3,2022,R2,gasCCGT,2020,3.00000000000
+3,2025,R2,gasCCGT,2020,3.00000000000
+3,2030,R2,gasCCGT,2020,2.00000000000
+3,2035,R2,gasCCGT,2020,2.00000000000
+3,2040,R2,gasCCGT,2020,2.00000000000
+3,2045,R2,gasCCGT,2020,2.00000000000
+3,2046,R2,gasCCGT,2020,2.00000000000
+3,2047,R2,gasCCGT,2020,2.00000000000
+3,2050,R2,gasCCGT,2020,2.00000000000
+3,2056,R2,gasCCGT,2020,2.00000000000
+4,2022,R2,windturbine,2020,4.27320000000
+4,2025,R2,windturbine,2020,4.27320000000
+4,2030,R2,windturbine,2020,4.27320000000
+4,2035,R2,windturbine,2020,4.27320000000
+4,2040,R2,windturbine,2020,4.27320000000
+4,2045,R2,windturbine,2020,4.27320000000
+4,2046,R2,windturbine,2020,4.27320000000
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 3f3404b9..b46df902 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,16 +1,16 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2030,R1,gasCCGT,2022,1.85640000000
@@ -23,14 +23,14 @@ asset,year,region,technology,installed,capacity
 1,2056,R1,gasCCGT,2022,1.85640000000
 1,2057,R1,gasCCGT,2022,1.85640000000
 1,2058,R1,gasCCGT,2022,1.85640000000
-2,2022,R1,solarPV,2020,4.00000000000
-2,2024,R1,solarPV,2020,4.00000000000
-2,2025,R1,solarPV,2020,4.00000000000
-2,2030,R1,solarPV,2020,4.00000000000
-2,2035,R1,solarPV,2020,4.00000000000
-2,2040,R1,solarPV,2020,4.00000000000
-2,2045,R1,solarPV,2020,4.00000000000
-2,2046,R1,solarPV,2020,4.00000000000
+2,2022,R1,solarPV,2020,0.27320000000
+2,2024,R1,solarPV,2020,0.27320000000
+2,2025,R1,solarPV,2020,0.27320000000
+2,2030,R1,solarPV,2020,0.27320000000
+2,2035,R1,solarPV,2020,0.27320000000
+2,2040,R1,solarPV,2020,0.27320000000
+2,2045,R1,solarPV,2020,0.27320000000
+2,2046,R1,solarPV,2020,0.27320000000
 3,2022,R1,windturbine,2020,4.00000000000
 3,2024,R1,windturbine,2020,4.00000000000
 3,2025,R1,windturbine,2020,4.00000000000
@@ -40,9 +40,17 @@ asset,year,region,technology,installed,capacity
 3,2045,R1,windturbine,2020,4.00000000000
 3,2046,R1,windturbine,2020,4.00000000000
 4,2020,R2,gasCCGT,2020,1.00000000000
-4,2022,R2,gasCCGT,2020,1.00000000000
-4,2024,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
+4,2022,R2,gasCCGT,2020,3.00000000000
+4,2024,R2,gasCCGT,2020,3.00000000000
+4,2025,R2,gasCCGT,2020,3.00000000000
+4,2030,R2,gasCCGT,2020,2.00000000000
+4,2035,R2,gasCCGT,2020,2.00000000000
+4,2040,R2,gasCCGT,2020,2.00000000000
+4,2045,R2,gasCCGT,2020,2.00000000000
+4,2046,R2,gasCCGT,2020,2.00000000000
+4,2047,R2,gasCCGT,2020,2.00000000000
+4,2050,R2,gasCCGT,2020,2.00000000000
+4,2056,R2,gasCCGT,2020,2.00000000000
 5,2024,R2,gasCCGT,2022,1.85640000000
 5,2025,R2,gasCCGT,2022,1.85640000000
 5,2030,R2,gasCCGT,2022,1.85640000000
@@ -55,11 +63,11 @@ asset,year,region,technology,installed,capacity
 5,2056,R2,gasCCGT,2022,1.85640000000
 5,2057,R2,gasCCGT,2022,1.85640000000
 5,2058,R2,gasCCGT,2022,1.85640000000
-6,2022,R2,windturbine,2020,8.77320000000
-6,2024,R2,windturbine,2020,8.77320000000
-6,2025,R2,windturbine,2020,8.77320000000
-6,2030,R2,windturbine,2020,8.77320000000
-6,2035,R2,windturbine,2020,8.77320000000
-6,2040,R2,windturbine,2020,8.77320000000
-6,2045,R2,windturbine,2020,8.77320000000
-6,2046,R2,windturbine,2020,8.77320000000
+6,2022,R2,windturbine,2020,4.27320000000
+6,2024,R2,windturbine,2020,4.27320000000
+6,2025,R2,windturbine,2020,4.27320000000
+6,2030,R2,windturbine,2020,4.27320000000
+6,2035,R2,windturbine,2020,4.27320000000
+6,2040,R2,windturbine,2020,4.27320000000
+6,2045,R2,windturbine,2020,4.27320000000
+6,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
index 0c12ad7e..87e3adb1 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2024.csv
@@ -1,17 +1,17 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -38,15 +38,15 @@ asset,year,region,technology,installed,capacity
 2,2058,R1,gasCCGT,2024,2.07980000000
 2,2059,R1,gasCCGT,2024,2.07980000000
 2,2060,R1,gasCCGT,2024,2.07980000000
-3,2022,R1,solarPV,2020,4.00000000000
-3,2024,R1,solarPV,2020,4.00000000000
-3,2025,R1,solarPV,2020,4.00000000000
-3,2026,R1,solarPV,2020,4.00000000000
-3,2030,R1,solarPV,2020,4.00000000000
-3,2035,R1,solarPV,2020,4.00000000000
-3,2040,R1,solarPV,2020,4.00000000000
-3,2045,R1,solarPV,2020,4.00000000000
-3,2046,R1,solarPV,2020,4.00000000000
+3,2022,R1,solarPV,2020,0.27320000000
+3,2024,R1,solarPV,2020,0.27320000000
+3,2025,R1,solarPV,2020,0.27320000000
+3,2026,R1,solarPV,2020,0.27320000000
+3,2030,R1,solarPV,2020,0.27320000000
+3,2035,R1,solarPV,2020,0.27320000000
+3,2040,R1,solarPV,2020,0.27320000000
+3,2045,R1,solarPV,2020,0.27320000000
+3,2046,R1,solarPV,2020,0.27320000000
 4,2022,R1,windturbine,2020,4.00000000000
 4,2024,R1,windturbine,2020,4.00000000000
 4,2025,R1,windturbine,2020,4.00000000000
@@ -57,10 +57,18 @@ asset,year,region,technology,installed,capacity
 4,2045,R1,windturbine,2020,4.00000000000
 4,2046,R1,windturbine,2020,4.00000000000
 5,2020,R2,gasCCGT,2020,1.00000000000
-5,2022,R2,gasCCGT,2020,1.00000000000
-5,2024,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
-5,2026,R2,gasCCGT,2020,0.80000000000
+5,2022,R2,gasCCGT,2020,3.00000000000
+5,2024,R2,gasCCGT,2020,3.00000000000
+5,2025,R2,gasCCGT,2020,3.00000000000
+5,2026,R2,gasCCGT,2020,2.80000000000
+5,2030,R2,gasCCGT,2020,2.00000000000
+5,2035,R2,gasCCGT,2020,2.00000000000
+5,2040,R2,gasCCGT,2020,2.00000000000
+5,2045,R2,gasCCGT,2020,2.00000000000
+5,2046,R2,gasCCGT,2020,2.00000000000
+5,2047,R2,gasCCGT,2020,2.00000000000
+5,2050,R2,gasCCGT,2020,2.00000000000
+5,2056,R2,gasCCGT,2020,2.00000000000
 6,2024,R2,gasCCGT,2022,1.85640000000
 6,2025,R2,gasCCGT,2022,1.85640000000
 6,2026,R2,gasCCGT,2022,1.85640000000
@@ -87,12 +95,12 @@ asset,year,region,technology,installed,capacity
 7,2058,R2,gasCCGT,2024,2.07980000000
 7,2059,R2,gasCCGT,2024,2.07980000000
 7,2060,R2,gasCCGT,2024,2.07980000000
-8,2022,R2,windturbine,2020,8.77320000000
-8,2024,R2,windturbine,2020,8.77320000000
-8,2025,R2,windturbine,2020,8.77320000000
-8,2026,R2,windturbine,2020,8.77320000000
-8,2030,R2,windturbine,2020,8.77320000000
-8,2035,R2,windturbine,2020,8.77320000000
-8,2040,R2,windturbine,2020,8.77320000000
-8,2045,R2,windturbine,2020,8.77320000000
-8,2046,R2,windturbine,2020,8.77320000000
+8,2022,R2,windturbine,2020,4.27320000000
+8,2024,R2,windturbine,2020,4.27320000000
+8,2025,R2,windturbine,2020,4.27320000000
+8,2026,R2,windturbine,2020,4.27320000000
+8,2030,R2,windturbine,2020,4.27320000000
+8,2035,R2,windturbine,2020,4.27320000000
+8,2040,R2,windturbine,2020,4.27320000000
+8,2045,R2,windturbine,2020,4.27320000000
+8,2046,R2,windturbine,2020,4.27320000000
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 b4388905..3670ced1 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,18 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -56,16 +56,16 @@ asset,year,region,technology,installed,capacity
 3,2060,R1,gasCCGT,2026,2.29760000000
 3,2061,R1,gasCCGT,2026,2.29760000000
 3,2062,R1,gasCCGT,2026,2.29760000000
-4,2022,R1,solarPV,2020,4.00000000000
-4,2024,R1,solarPV,2020,4.00000000000
-4,2025,R1,solarPV,2020,4.00000000000
-4,2026,R1,solarPV,2020,4.00000000000
-4,2028,R1,solarPV,2020,4.00000000000
-4,2030,R1,solarPV,2020,4.00000000000
-4,2035,R1,solarPV,2020,4.00000000000
-4,2040,R1,solarPV,2020,4.00000000000
-4,2045,R1,solarPV,2020,4.00000000000
-4,2046,R1,solarPV,2020,4.00000000000
+4,2022,R1,solarPV,2020,0.27320000000
+4,2024,R1,solarPV,2020,0.27320000000
+4,2025,R1,solarPV,2020,0.27320000000
+4,2026,R1,solarPV,2020,0.27320000000
+4,2028,R1,solarPV,2020,0.27320000000
+4,2030,R1,solarPV,2020,0.27320000000
+4,2035,R1,solarPV,2020,0.27320000000
+4,2040,R1,solarPV,2020,0.27320000000
+4,2045,R1,solarPV,2020,0.27320000000
+4,2046,R1,solarPV,2020,0.27320000000
 5,2022,R1,windturbine,2020,4.00000000000
 5,2024,R1,windturbine,2020,4.00000000000
 5,2025,R1,windturbine,2020,4.00000000000
@@ -77,11 +77,19 @@ asset,year,region,technology,installed,capacity
 5,2045,R1,windturbine,2020,4.00000000000
 5,2046,R1,windturbine,2020,4.00000000000
 6,2020,R2,gasCCGT,2020,1.00000000000
-6,2022,R2,gasCCGT,2020,1.00000000000
-6,2024,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-6,2026,R2,gasCCGT,2020,0.80000000000
-6,2028,R2,gasCCGT,2020,0.40000000000
+6,2022,R2,gasCCGT,2020,3.00000000000
+6,2024,R2,gasCCGT,2020,3.00000000000
+6,2025,R2,gasCCGT,2020,3.00000000000
+6,2026,R2,gasCCGT,2020,2.80000000000
+6,2028,R2,gasCCGT,2020,2.40000000000
+6,2030,R2,gasCCGT,2020,2.00000000000
+6,2035,R2,gasCCGT,2020,2.00000000000
+6,2040,R2,gasCCGT,2020,2.00000000000
+6,2045,R2,gasCCGT,2020,2.00000000000
+6,2046,R2,gasCCGT,2020,2.00000000000
+6,2047,R2,gasCCGT,2020,2.00000000000
+6,2050,R2,gasCCGT,2020,2.00000000000
+6,2056,R2,gasCCGT,2020,2.00000000000
 7,2024,R2,gasCCGT,2022,1.85640000000
 7,2025,R2,gasCCGT,2022,1.85640000000
 7,2026,R2,gasCCGT,2022,1.85640000000
@@ -125,13 +133,13 @@ asset,year,region,technology,installed,capacity
 9,2060,R2,gasCCGT,2026,2.29760000000
 9,2061,R2,gasCCGT,2026,2.29760000000
 9,2062,R2,gasCCGT,2026,2.29760000000
-10,2022,R2,windturbine,2020,8.77320000000
-10,2024,R2,windturbine,2020,8.77320000000
-10,2025,R2,windturbine,2020,8.77320000000
-10,2026,R2,windturbine,2020,8.77320000000
-10,2028,R2,windturbine,2020,8.77320000000
-10,2030,R2,windturbine,2020,8.77320000000
-10,2035,R2,windturbine,2020,8.77320000000
-10,2040,R2,windturbine,2020,8.77320000000
-10,2045,R2,windturbine,2020,8.77320000000
-10,2046,R2,windturbine,2020,8.77320000000
+10,2022,R2,windturbine,2020,4.27320000000
+10,2024,R2,windturbine,2020,4.27320000000
+10,2025,R2,windturbine,2020,4.27320000000
+10,2026,R2,windturbine,2020,4.27320000000
+10,2028,R2,windturbine,2020,4.27320000000
+10,2030,R2,windturbine,2020,4.27320000000
+10,2035,R2,windturbine,2020,4.27320000000
+10,2040,R2,windturbine,2020,4.27320000000
+10,2045,R2,windturbine,2020,4.27320000000
+10,2046,R2,windturbine,2020,4.27320000000
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 ea5c54f8..08327c28 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,18 +1,18 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -72,16 +72,16 @@ asset,year,region,technology,installed,capacity
 4,2062,R1,gasCCGT,2028,2.31150000000
 4,2063,R1,gasCCGT,2028,2.31150000000
 4,2064,R1,gasCCGT,2028,2.31150000000
-5,2022,R1,solarPV,2020,4.00000000000
-5,2024,R1,solarPV,2020,4.00000000000
-5,2025,R1,solarPV,2020,4.00000000000
-5,2026,R1,solarPV,2020,4.00000000000
-5,2028,R1,solarPV,2020,4.00000000000
-5,2030,R1,solarPV,2020,4.00000000000
-5,2035,R1,solarPV,2020,4.00000000000
-5,2040,R1,solarPV,2020,4.00000000000
-5,2045,R1,solarPV,2020,4.00000000000
-5,2046,R1,solarPV,2020,4.00000000000
+5,2022,R1,solarPV,2020,0.27320000000
+5,2024,R1,solarPV,2020,0.27320000000
+5,2025,R1,solarPV,2020,0.27320000000
+5,2026,R1,solarPV,2020,0.27320000000
+5,2028,R1,solarPV,2020,0.27320000000
+5,2030,R1,solarPV,2020,0.27320000000
+5,2035,R1,solarPV,2020,0.27320000000
+5,2040,R1,solarPV,2020,0.27320000000
+5,2045,R1,solarPV,2020,0.27320000000
+5,2046,R1,solarPV,2020,0.27320000000
 6,2022,R1,windturbine,2020,4.00000000000
 6,2024,R1,windturbine,2020,4.00000000000
 6,2025,R1,windturbine,2020,4.00000000000
@@ -93,11 +93,19 @@ asset,year,region,technology,installed,capacity
 6,2045,R1,windturbine,2020,4.00000000000
 6,2046,R1,windturbine,2020,4.00000000000
 7,2020,R2,gasCCGT,2020,1.00000000000
-7,2022,R2,gasCCGT,2020,1.00000000000
-7,2024,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-7,2026,R2,gasCCGT,2020,0.80000000000
-7,2028,R2,gasCCGT,2020,0.40000000000
+7,2022,R2,gasCCGT,2020,3.00000000000
+7,2024,R2,gasCCGT,2020,3.00000000000
+7,2025,R2,gasCCGT,2020,3.00000000000
+7,2026,R2,gasCCGT,2020,2.80000000000
+7,2028,R2,gasCCGT,2020,2.40000000000
+7,2030,R2,gasCCGT,2020,2.00000000000
+7,2035,R2,gasCCGT,2020,2.00000000000
+7,2040,R2,gasCCGT,2020,2.00000000000
+7,2045,R2,gasCCGT,2020,2.00000000000
+7,2046,R2,gasCCGT,2020,2.00000000000
+7,2047,R2,gasCCGT,2020,2.00000000000
+7,2050,R2,gasCCGT,2020,2.00000000000
+7,2056,R2,gasCCGT,2020,2.00000000000
 8,2024,R2,gasCCGT,2022,1.85640000000
 8,2025,R2,gasCCGT,2022,1.85640000000
 8,2026,R2,gasCCGT,2022,1.85640000000
@@ -157,13 +165,13 @@ asset,year,region,technology,installed,capacity
 11,2062,R2,gasCCGT,2028,2.31150000000
 11,2063,R2,gasCCGT,2028,2.31150000000
 11,2064,R2,gasCCGT,2028,2.31150000000
-12,2022,R2,windturbine,2020,8.77320000000
-12,2024,R2,windturbine,2020,8.77320000000
-12,2025,R2,windturbine,2020,8.77320000000
-12,2026,R2,windturbine,2020,8.77320000000
-12,2028,R2,windturbine,2020,8.77320000000
-12,2030,R2,windturbine,2020,8.77320000000
-12,2035,R2,windturbine,2020,8.77320000000
-12,2040,R2,windturbine,2020,8.77320000000
-12,2045,R2,windturbine,2020,8.77320000000
-12,2046,R2,windturbine,2020,8.77320000000
+12,2022,R2,windturbine,2020,4.27320000000
+12,2024,R2,windturbine,2020,4.27320000000
+12,2025,R2,windturbine,2020,4.27320000000
+12,2026,R2,windturbine,2020,4.27320000000
+12,2028,R2,windturbine,2020,4.27320000000
+12,2030,R2,windturbine,2020,4.27320000000
+12,2035,R2,windturbine,2020,4.27320000000
+12,2040,R2,windturbine,2020,4.27320000000
+12,2045,R2,windturbine,2020,4.27320000000
+12,2046,R2,windturbine,2020,4.27320000000
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 66e96fec..4c131c37 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,19 +1,19 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2032,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2032,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -95,17 +95,17 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,4.00000000000
-6,2024,R1,solarPV,2020,4.00000000000
-6,2025,R1,solarPV,2020,4.00000000000
-6,2026,R1,solarPV,2020,4.00000000000
-6,2028,R1,solarPV,2020,4.00000000000
-6,2030,R1,solarPV,2020,4.00000000000
-6,2032,R1,solarPV,2020,4.00000000000
-6,2035,R1,solarPV,2020,4.00000000000
-6,2040,R1,solarPV,2020,4.00000000000
-6,2045,R1,solarPV,2020,4.00000000000
-6,2046,R1,solarPV,2020,4.00000000000
+6,2022,R1,solarPV,2020,0.27320000000
+6,2024,R1,solarPV,2020,0.27320000000
+6,2025,R1,solarPV,2020,0.27320000000
+6,2026,R1,solarPV,2020,0.27320000000
+6,2028,R1,solarPV,2020,0.27320000000
+6,2030,R1,solarPV,2020,0.27320000000
+6,2032,R1,solarPV,2020,0.27320000000
+6,2035,R1,solarPV,2020,0.27320000000
+6,2040,R1,solarPV,2020,0.27320000000
+6,2045,R1,solarPV,2020,0.27320000000
+6,2046,R1,solarPV,2020,0.27320000000
 7,2022,R1,windturbine,2020,4.00000000000
 7,2024,R1,windturbine,2020,4.00000000000
 7,2025,R1,windturbine,2020,4.00000000000
@@ -118,11 +118,20 @@ asset,year,region,technology,installed,capacity
 7,2045,R1,windturbine,2020,4.00000000000
 7,2046,R1,windturbine,2020,4.00000000000
 8,2020,R2,gasCCGT,2020,1.00000000000
-8,2022,R2,gasCCGT,2020,1.00000000000
-8,2024,R2,gasCCGT,2020,1.00000000000
-8,2025,R2,gasCCGT,2020,1.00000000000
-8,2026,R2,gasCCGT,2020,0.80000000000
-8,2028,R2,gasCCGT,2020,0.40000000000
+8,2022,R2,gasCCGT,2020,3.00000000000
+8,2024,R2,gasCCGT,2020,3.00000000000
+8,2025,R2,gasCCGT,2020,3.00000000000
+8,2026,R2,gasCCGT,2020,2.80000000000
+8,2028,R2,gasCCGT,2020,2.40000000000
+8,2030,R2,gasCCGT,2020,2.00000000000
+8,2032,R2,gasCCGT,2020,2.00000000000
+8,2035,R2,gasCCGT,2020,2.00000000000
+8,2040,R2,gasCCGT,2020,2.00000000000
+8,2045,R2,gasCCGT,2020,2.00000000000
+8,2046,R2,gasCCGT,2020,2.00000000000
+8,2047,R2,gasCCGT,2020,2.00000000000
+8,2050,R2,gasCCGT,2020,2.00000000000
+8,2056,R2,gasCCGT,2020,2.00000000000
 9,2024,R2,gasCCGT,2022,1.85640000000
 9,2025,R2,gasCCGT,2022,1.85640000000
 9,2026,R2,gasCCGT,2022,1.85640000000
@@ -204,14 +213,14 @@ asset,year,region,technology,installed,capacity
 13,2064,R2,gasCCGT,2030,0.99560000000
 13,2065,R2,gasCCGT,2030,0.99560000000
 13,2066,R2,gasCCGT,2030,0.99560000000
-14,2022,R2,windturbine,2020,8.77320000000
-14,2024,R2,windturbine,2020,8.77320000000
-14,2025,R2,windturbine,2020,8.77320000000
-14,2026,R2,windturbine,2020,8.77320000000
-14,2028,R2,windturbine,2020,8.77320000000
-14,2030,R2,windturbine,2020,8.77320000000
-14,2032,R2,windturbine,2020,8.77320000000
-14,2035,R2,windturbine,2020,8.77320000000
-14,2040,R2,windturbine,2020,8.77320000000
-14,2045,R2,windturbine,2020,8.77320000000
-14,2046,R2,windturbine,2020,8.77320000000
+14,2022,R2,windturbine,2020,4.27320000000
+14,2024,R2,windturbine,2020,4.27320000000
+14,2025,R2,windturbine,2020,4.27320000000
+14,2026,R2,windturbine,2020,4.27320000000
+14,2028,R2,windturbine,2020,4.27320000000
+14,2030,R2,windturbine,2020,4.27320000000
+14,2032,R2,windturbine,2020,4.27320000000
+14,2035,R2,windturbine,2020,4.27320000000
+14,2040,R2,windturbine,2020,4.27320000000
+14,2045,R2,windturbine,2020,4.27320000000
+14,2046,R2,windturbine,2020,4.27320000000
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 f3c4b502..69f30791 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,20 +1,20 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2032,R1,gasCCGT,2020,0.34360000000
-0,2034,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2032,R1,gasCCGT,2020,2.00000000000
+0,2034,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -101,151 +101,181 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,4.00000000000
-6,2024,R1,solarPV,2020,4.00000000000
-6,2025,R1,solarPV,2020,4.00000000000
-6,2026,R1,solarPV,2020,4.00000000000
-6,2028,R1,solarPV,2020,4.00000000000
-6,2030,R1,solarPV,2020,4.00000000000
-6,2032,R1,solarPV,2020,4.00000000000
-6,2034,R1,solarPV,2020,4.00000000000
-6,2035,R1,solarPV,2020,4.00000000000
-6,2040,R1,solarPV,2020,4.00000000000
-6,2045,R1,solarPV,2020,4.00000000000
-6,2046,R1,solarPV,2020,4.00000000000
-7,2034,R1,solarPV,2032,2.24000000000
-7,2035,R1,solarPV,2032,2.24000000000
-7,2040,R1,solarPV,2032,2.24000000000
-7,2045,R1,solarPV,2032,2.24000000000
-7,2046,R1,solarPV,2032,2.24000000000
-7,2047,R1,solarPV,2032,2.24000000000
-7,2050,R1,solarPV,2032,2.24000000000
-7,2056,R1,solarPV,2032,2.24000000000
-7,2057,R1,solarPV,2032,2.24000000000
-7,2058,R1,solarPV,2032,2.24000000000
-8,2022,R1,windturbine,2020,4.00000000000
-8,2024,R1,windturbine,2020,4.00000000000
-8,2025,R1,windturbine,2020,4.00000000000
-8,2026,R1,windturbine,2020,4.00000000000
-8,2028,R1,windturbine,2020,4.00000000000
-8,2030,R1,windturbine,2020,4.00000000000
-8,2032,R1,windturbine,2020,4.00000000000
-8,2034,R1,windturbine,2020,4.00000000000
-8,2035,R1,windturbine,2020,4.00000000000
-8,2040,R1,windturbine,2020,4.00000000000
-8,2045,R1,windturbine,2020,4.00000000000
-8,2046,R1,windturbine,2020,4.00000000000
-9,2020,R2,gasCCGT,2020,1.00000000000
-9,2022,R2,gasCCGT,2020,1.00000000000
-9,2024,R2,gasCCGT,2020,1.00000000000
-9,2025,R2,gasCCGT,2020,1.00000000000
-9,2026,R2,gasCCGT,2020,0.80000000000
-9,2028,R2,gasCCGT,2020,0.40000000000
-10,2024,R2,gasCCGT,2022,1.85640000000
-10,2025,R2,gasCCGT,2022,1.85640000000
-10,2026,R2,gasCCGT,2022,1.85640000000
-10,2028,R2,gasCCGT,2022,1.85640000000
-10,2030,R2,gasCCGT,2022,1.85640000000
-10,2032,R2,gasCCGT,2022,1.85640000000
-10,2034,R2,gasCCGT,2022,1.85640000000
-10,2035,R2,gasCCGT,2022,1.85640000000
-10,2040,R2,gasCCGT,2022,1.85640000000
-10,2045,R2,gasCCGT,2022,1.85640000000
-10,2046,R2,gasCCGT,2022,1.85640000000
-10,2047,R2,gasCCGT,2022,1.85640000000
-10,2050,R2,gasCCGT,2022,1.85640000000
-10,2056,R2,gasCCGT,2022,1.85640000000
-10,2057,R2,gasCCGT,2022,1.85640000000
-10,2058,R2,gasCCGT,2022,1.85640000000
-11,2026,R2,gasCCGT,2024,2.07980000000
-11,2028,R2,gasCCGT,2024,2.07980000000
-11,2030,R2,gasCCGT,2024,2.07980000000
-11,2032,R2,gasCCGT,2024,2.07980000000
-11,2034,R2,gasCCGT,2024,2.07980000000
-11,2035,R2,gasCCGT,2024,2.07980000000
-11,2040,R2,gasCCGT,2024,2.07980000000
-11,2045,R2,gasCCGT,2024,2.07980000000
-11,2046,R2,gasCCGT,2024,2.07980000000
-11,2047,R2,gasCCGT,2024,2.07980000000
-11,2050,R2,gasCCGT,2024,2.07980000000
-11,2056,R2,gasCCGT,2024,2.07980000000
-11,2057,R2,gasCCGT,2024,2.07980000000
-11,2058,R2,gasCCGT,2024,2.07980000000
-11,2059,R2,gasCCGT,2024,2.07980000000
-11,2060,R2,gasCCGT,2024,2.07980000000
-12,2028,R2,gasCCGT,2026,2.29760000000
-12,2030,R2,gasCCGT,2026,2.29760000000
-12,2032,R2,gasCCGT,2026,2.29760000000
-12,2034,R2,gasCCGT,2026,2.29760000000
-12,2035,R2,gasCCGT,2026,2.29760000000
-12,2040,R2,gasCCGT,2026,2.29760000000
-12,2045,R2,gasCCGT,2026,2.29760000000
-12,2046,R2,gasCCGT,2026,2.29760000000
-12,2047,R2,gasCCGT,2026,2.29760000000
-12,2050,R2,gasCCGT,2026,2.29760000000
-12,2056,R2,gasCCGT,2026,2.29760000000
-12,2057,R2,gasCCGT,2026,2.29760000000
-12,2058,R2,gasCCGT,2026,2.29760000000
-12,2059,R2,gasCCGT,2026,2.29760000000
-12,2060,R2,gasCCGT,2026,2.29760000000
-12,2061,R2,gasCCGT,2026,2.29760000000
-12,2062,R2,gasCCGT,2026,2.29760000000
-13,2030,R2,gasCCGT,2028,2.31150000000
-13,2032,R2,gasCCGT,2028,2.31150000000
-13,2034,R2,gasCCGT,2028,2.31150000000
-13,2035,R2,gasCCGT,2028,2.31150000000
-13,2040,R2,gasCCGT,2028,2.31150000000
-13,2045,R2,gasCCGT,2028,2.31150000000
-13,2046,R2,gasCCGT,2028,2.31150000000
-13,2047,R2,gasCCGT,2028,2.31150000000
-13,2050,R2,gasCCGT,2028,2.31150000000
-13,2056,R2,gasCCGT,2028,2.31150000000
-13,2057,R2,gasCCGT,2028,2.31150000000
-13,2058,R2,gasCCGT,2028,2.31150000000
-13,2059,R2,gasCCGT,2028,2.31150000000
-13,2060,R2,gasCCGT,2028,2.31150000000
-13,2061,R2,gasCCGT,2028,2.31150000000
-13,2062,R2,gasCCGT,2028,2.31150000000
-13,2063,R2,gasCCGT,2028,2.31150000000
-13,2064,R2,gasCCGT,2028,2.31150000000
-14,2032,R2,gasCCGT,2030,0.99560000000
-14,2034,R2,gasCCGT,2030,0.99560000000
-14,2035,R2,gasCCGT,2030,0.99560000000
-14,2040,R2,gasCCGT,2030,0.99560000000
-14,2045,R2,gasCCGT,2030,0.99560000000
-14,2046,R2,gasCCGT,2030,0.99560000000
-14,2047,R2,gasCCGT,2030,0.99560000000
-14,2050,R2,gasCCGT,2030,0.99560000000
-14,2056,R2,gasCCGT,2030,0.99560000000
-14,2057,R2,gasCCGT,2030,0.99560000000
-14,2058,R2,gasCCGT,2030,0.99560000000
-14,2059,R2,gasCCGT,2030,0.99560000000
-14,2060,R2,gasCCGT,2030,0.99560000000
-14,2061,R2,gasCCGT,2030,0.99560000000
-14,2062,R2,gasCCGT,2030,0.99560000000
-14,2063,R2,gasCCGT,2030,0.99560000000
-14,2064,R2,gasCCGT,2030,0.99560000000
-14,2065,R2,gasCCGT,2030,0.99560000000
-14,2066,R2,gasCCGT,2030,0.99560000000
-15,2034,R2,solarPV,2032,2.24000000000
-15,2035,R2,solarPV,2032,2.24000000000
-15,2040,R2,solarPV,2032,2.24000000000
-15,2045,R2,solarPV,2032,2.24000000000
-15,2046,R2,solarPV,2032,2.24000000000
-15,2047,R2,solarPV,2032,2.24000000000
-15,2050,R2,solarPV,2032,2.24000000000
-15,2056,R2,solarPV,2032,2.24000000000
-15,2057,R2,solarPV,2032,2.24000000000
-15,2058,R2,solarPV,2032,2.24000000000
-16,2022,R2,windturbine,2020,8.77320000000
-16,2024,R2,windturbine,2020,8.77320000000
-16,2025,R2,windturbine,2020,8.77320000000
-16,2026,R2,windturbine,2020,8.77320000000
-16,2028,R2,windturbine,2020,8.77320000000
-16,2030,R2,windturbine,2020,8.77320000000
-16,2032,R2,windturbine,2020,8.77320000000
-16,2034,R2,windturbine,2020,8.77320000000
-16,2035,R2,windturbine,2020,8.77320000000
-16,2040,R2,windturbine,2020,8.77320000000
-16,2045,R2,windturbine,2020,8.77320000000
-16,2046,R2,windturbine,2020,8.77320000000
+6,2034,R1,gasCCGT,2032,0.75270000000
+6,2035,R1,gasCCGT,2032,0.75270000000
+6,2040,R1,gasCCGT,2032,0.75270000000
+6,2045,R1,gasCCGT,2032,0.75270000000
+6,2046,R1,gasCCGT,2032,0.75270000000
+6,2047,R1,gasCCGT,2032,0.75270000000
+6,2050,R1,gasCCGT,2032,0.75270000000
+6,2056,R1,gasCCGT,2032,0.75270000000
+6,2057,R1,gasCCGT,2032,0.75270000000
+6,2058,R1,gasCCGT,2032,0.75270000000
+6,2059,R1,gasCCGT,2032,0.75270000000
+6,2060,R1,gasCCGT,2032,0.75270000000
+6,2061,R1,gasCCGT,2032,0.75270000000
+6,2062,R1,gasCCGT,2032,0.75270000000
+6,2063,R1,gasCCGT,2032,0.75270000000
+6,2064,R1,gasCCGT,2032,0.75270000000
+6,2065,R1,gasCCGT,2032,0.75270000000
+6,2066,R1,gasCCGT,2032,0.75270000000
+6,2067,R1,gasCCGT,2032,0.75270000000
+6,2068,R1,gasCCGT,2032,0.75270000000
+7,2022,R1,solarPV,2020,0.27320000000
+7,2024,R1,solarPV,2020,0.27320000000
+7,2025,R1,solarPV,2020,0.27320000000
+7,2026,R1,solarPV,2020,0.27320000000
+7,2028,R1,solarPV,2020,0.27320000000
+7,2030,R1,solarPV,2020,0.27320000000
+7,2032,R1,solarPV,2020,0.27320000000
+7,2034,R1,solarPV,2020,0.27320000000
+7,2035,R1,solarPV,2020,0.27320000000
+7,2040,R1,solarPV,2020,0.27320000000
+7,2045,R1,solarPV,2020,0.27320000000
+7,2046,R1,solarPV,2020,0.27320000000
+8,2034,R1,solarPV,2032,0.54630000000
+8,2035,R1,solarPV,2032,0.54630000000
+8,2040,R1,solarPV,2032,0.54630000000
+8,2045,R1,solarPV,2032,0.54630000000
+8,2046,R1,solarPV,2032,0.54630000000
+8,2047,R1,solarPV,2032,0.54630000000
+8,2050,R1,solarPV,2032,0.54630000000
+8,2056,R1,solarPV,2032,0.54630000000
+8,2057,R1,solarPV,2032,0.54630000000
+8,2058,R1,solarPV,2032,0.54630000000
+9,2022,R1,windturbine,2020,4.00000000000
+9,2024,R1,windturbine,2020,4.00000000000
+9,2025,R1,windturbine,2020,4.00000000000
+9,2026,R1,windturbine,2020,4.00000000000
+9,2028,R1,windturbine,2020,4.00000000000
+9,2030,R1,windturbine,2020,4.00000000000
+9,2032,R1,windturbine,2020,4.00000000000
+9,2034,R1,windturbine,2020,4.00000000000
+9,2035,R1,windturbine,2020,4.00000000000
+9,2040,R1,windturbine,2020,4.00000000000
+9,2045,R1,windturbine,2020,4.00000000000
+9,2046,R1,windturbine,2020,4.00000000000
+10,2020,R2,gasCCGT,2020,1.00000000000
+10,2022,R2,gasCCGT,2020,3.00000000000
+10,2024,R2,gasCCGT,2020,3.00000000000
+10,2025,R2,gasCCGT,2020,3.00000000000
+10,2026,R2,gasCCGT,2020,2.80000000000
+10,2028,R2,gasCCGT,2020,2.40000000000
+10,2030,R2,gasCCGT,2020,2.00000000000
+10,2032,R2,gasCCGT,2020,2.00000000000
+10,2034,R2,gasCCGT,2020,2.00000000000
+10,2035,R2,gasCCGT,2020,2.00000000000
+10,2040,R2,gasCCGT,2020,2.00000000000
+10,2045,R2,gasCCGT,2020,2.00000000000
+10,2046,R2,gasCCGT,2020,2.00000000000
+10,2047,R2,gasCCGT,2020,2.00000000000
+10,2050,R2,gasCCGT,2020,2.00000000000
+10,2056,R2,gasCCGT,2020,2.00000000000
+11,2024,R2,gasCCGT,2022,1.85640000000
+11,2025,R2,gasCCGT,2022,1.85640000000
+11,2026,R2,gasCCGT,2022,1.85640000000
+11,2028,R2,gasCCGT,2022,1.85640000000
+11,2030,R2,gasCCGT,2022,1.85640000000
+11,2032,R2,gasCCGT,2022,1.85640000000
+11,2034,R2,gasCCGT,2022,1.85640000000
+11,2035,R2,gasCCGT,2022,1.85640000000
+11,2040,R2,gasCCGT,2022,1.85640000000
+11,2045,R2,gasCCGT,2022,1.85640000000
+11,2046,R2,gasCCGT,2022,1.85640000000
+11,2047,R2,gasCCGT,2022,1.85640000000
+11,2050,R2,gasCCGT,2022,1.85640000000
+11,2056,R2,gasCCGT,2022,1.85640000000
+11,2057,R2,gasCCGT,2022,1.85640000000
+11,2058,R2,gasCCGT,2022,1.85640000000
+12,2026,R2,gasCCGT,2024,2.07980000000
+12,2028,R2,gasCCGT,2024,2.07980000000
+12,2030,R2,gasCCGT,2024,2.07980000000
+12,2032,R2,gasCCGT,2024,2.07980000000
+12,2034,R2,gasCCGT,2024,2.07980000000
+12,2035,R2,gasCCGT,2024,2.07980000000
+12,2040,R2,gasCCGT,2024,2.07980000000
+12,2045,R2,gasCCGT,2024,2.07980000000
+12,2046,R2,gasCCGT,2024,2.07980000000
+12,2047,R2,gasCCGT,2024,2.07980000000
+12,2050,R2,gasCCGT,2024,2.07980000000
+12,2056,R2,gasCCGT,2024,2.07980000000
+12,2057,R2,gasCCGT,2024,2.07980000000
+12,2058,R2,gasCCGT,2024,2.07980000000
+12,2059,R2,gasCCGT,2024,2.07980000000
+12,2060,R2,gasCCGT,2024,2.07980000000
+13,2028,R2,gasCCGT,2026,2.29760000000
+13,2030,R2,gasCCGT,2026,2.29760000000
+13,2032,R2,gasCCGT,2026,2.29760000000
+13,2034,R2,gasCCGT,2026,2.29760000000
+13,2035,R2,gasCCGT,2026,2.29760000000
+13,2040,R2,gasCCGT,2026,2.29760000000
+13,2045,R2,gasCCGT,2026,2.29760000000
+13,2046,R2,gasCCGT,2026,2.29760000000
+13,2047,R2,gasCCGT,2026,2.29760000000
+13,2050,R2,gasCCGT,2026,2.29760000000
+13,2056,R2,gasCCGT,2026,2.29760000000
+13,2057,R2,gasCCGT,2026,2.29760000000
+13,2058,R2,gasCCGT,2026,2.29760000000
+13,2059,R2,gasCCGT,2026,2.29760000000
+13,2060,R2,gasCCGT,2026,2.29760000000
+13,2061,R2,gasCCGT,2026,2.29760000000
+13,2062,R2,gasCCGT,2026,2.29760000000
+14,2030,R2,gasCCGT,2028,2.31150000000
+14,2032,R2,gasCCGT,2028,2.31150000000
+14,2034,R2,gasCCGT,2028,2.31150000000
+14,2035,R2,gasCCGT,2028,2.31150000000
+14,2040,R2,gasCCGT,2028,2.31150000000
+14,2045,R2,gasCCGT,2028,2.31150000000
+14,2046,R2,gasCCGT,2028,2.31150000000
+14,2047,R2,gasCCGT,2028,2.31150000000
+14,2050,R2,gasCCGT,2028,2.31150000000
+14,2056,R2,gasCCGT,2028,2.31150000000
+14,2057,R2,gasCCGT,2028,2.31150000000
+14,2058,R2,gasCCGT,2028,2.31150000000
+14,2059,R2,gasCCGT,2028,2.31150000000
+14,2060,R2,gasCCGT,2028,2.31150000000
+14,2061,R2,gasCCGT,2028,2.31150000000
+14,2062,R2,gasCCGT,2028,2.31150000000
+14,2063,R2,gasCCGT,2028,2.31150000000
+14,2064,R2,gasCCGT,2028,2.31150000000
+15,2032,R2,gasCCGT,2030,0.99560000000
+15,2034,R2,gasCCGT,2030,0.99560000000
+15,2035,R2,gasCCGT,2030,0.99560000000
+15,2040,R2,gasCCGT,2030,0.99560000000
+15,2045,R2,gasCCGT,2030,0.99560000000
+15,2046,R2,gasCCGT,2030,0.99560000000
+15,2047,R2,gasCCGT,2030,0.99560000000
+15,2050,R2,gasCCGT,2030,0.99560000000
+15,2056,R2,gasCCGT,2030,0.99560000000
+15,2057,R2,gasCCGT,2030,0.99560000000
+15,2058,R2,gasCCGT,2030,0.99560000000
+15,2059,R2,gasCCGT,2030,0.99560000000
+15,2060,R2,gasCCGT,2030,0.99560000000
+15,2061,R2,gasCCGT,2030,0.99560000000
+15,2062,R2,gasCCGT,2030,0.99560000000
+15,2063,R2,gasCCGT,2030,0.99560000000
+15,2064,R2,gasCCGT,2030,0.99560000000
+15,2065,R2,gasCCGT,2030,0.99560000000
+15,2066,R2,gasCCGT,2030,0.99560000000
+16,2034,R2,solarPV,2032,2.24000000000
+16,2035,R2,solarPV,2032,2.24000000000
+16,2040,R2,solarPV,2032,2.24000000000
+16,2045,R2,solarPV,2032,2.24000000000
+16,2046,R2,solarPV,2032,2.24000000000
+16,2047,R2,solarPV,2032,2.24000000000
+16,2050,R2,solarPV,2032,2.24000000000
+16,2056,R2,solarPV,2032,2.24000000000
+16,2057,R2,solarPV,2032,2.24000000000
+16,2058,R2,solarPV,2032,2.24000000000
+17,2022,R2,windturbine,2020,4.27320000000
+17,2024,R2,windturbine,2020,4.27320000000
+17,2025,R2,windturbine,2020,4.27320000000
+17,2026,R2,windturbine,2020,4.27320000000
+17,2028,R2,windturbine,2020,4.27320000000
+17,2030,R2,windturbine,2020,4.27320000000
+17,2032,R2,windturbine,2020,4.27320000000
+17,2034,R2,windturbine,2020,4.27320000000
+17,2035,R2,windturbine,2020,4.27320000000
+17,2040,R2,windturbine,2020,4.27320000000
+17,2045,R2,windturbine,2020,4.27320000000
+17,2046,R2,windturbine,2020,4.27320000000
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 4bbea51e..08c696ee 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,21 +1,21 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2032,R1,gasCCGT,2020,0.34360000000
-0,2034,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2036,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2032,R1,gasCCGT,2020,2.00000000000
+0,2034,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2036,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -107,183 +107,226 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,4.00000000000
-6,2024,R1,solarPV,2020,4.00000000000
-6,2025,R1,solarPV,2020,4.00000000000
-6,2026,R1,solarPV,2020,4.00000000000
-6,2028,R1,solarPV,2020,4.00000000000
-6,2030,R1,solarPV,2020,4.00000000000
-6,2032,R1,solarPV,2020,4.00000000000
-6,2034,R1,solarPV,2020,4.00000000000
-6,2035,R1,solarPV,2020,4.00000000000
-6,2036,R1,solarPV,2020,4.00000000000
-6,2040,R1,solarPV,2020,4.00000000000
-6,2045,R1,solarPV,2020,4.00000000000
-6,2046,R1,solarPV,2020,4.00000000000
-7,2034,R1,solarPV,2032,2.24000000000
-7,2035,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2032,2.24000000000
-7,2040,R1,solarPV,2032,2.24000000000
-7,2045,R1,solarPV,2032,2.24000000000
-7,2046,R1,solarPV,2032,2.24000000000
-7,2047,R1,solarPV,2032,2.24000000000
-7,2050,R1,solarPV,2032,2.24000000000
-7,2056,R1,solarPV,2032,2.24000000000
-7,2057,R1,solarPV,2032,2.24000000000
-7,2058,R1,solarPV,2032,2.24000000000
-8,2036,R1,solarPV,2034,2.24000000000
-8,2040,R1,solarPV,2034,2.24000000000
-8,2045,R1,solarPV,2034,2.24000000000
-8,2046,R1,solarPV,2034,2.24000000000
-8,2047,R1,solarPV,2034,2.24000000000
-8,2050,R1,solarPV,2034,2.24000000000
-8,2056,R1,solarPV,2034,2.24000000000
-8,2057,R1,solarPV,2034,2.24000000000
-8,2058,R1,solarPV,2034,2.24000000000
-8,2059,R1,solarPV,2034,2.24000000000
-8,2060,R1,solarPV,2034,2.24000000000
-9,2022,R1,windturbine,2020,4.00000000000
-9,2024,R1,windturbine,2020,4.00000000000
-9,2025,R1,windturbine,2020,4.00000000000
-9,2026,R1,windturbine,2020,4.00000000000
-9,2028,R1,windturbine,2020,4.00000000000
-9,2030,R1,windturbine,2020,4.00000000000
-9,2032,R1,windturbine,2020,4.00000000000
-9,2034,R1,windturbine,2020,4.00000000000
-9,2035,R1,windturbine,2020,4.00000000000
-9,2036,R1,windturbine,2020,4.00000000000
-9,2040,R1,windturbine,2020,4.00000000000
-9,2045,R1,windturbine,2020,4.00000000000
-9,2046,R1,windturbine,2020,4.00000000000
-10,2020,R2,gasCCGT,2020,1.00000000000
-10,2022,R2,gasCCGT,2020,1.00000000000
-10,2024,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-10,2026,R2,gasCCGT,2020,0.80000000000
-10,2028,R2,gasCCGT,2020,0.40000000000
-11,2024,R2,gasCCGT,2022,1.85640000000
-11,2025,R2,gasCCGT,2022,1.85640000000
-11,2026,R2,gasCCGT,2022,1.85640000000
-11,2028,R2,gasCCGT,2022,1.85640000000
-11,2030,R2,gasCCGT,2022,1.85640000000
-11,2032,R2,gasCCGT,2022,1.85640000000
-11,2034,R2,gasCCGT,2022,1.85640000000
-11,2035,R2,gasCCGT,2022,1.85640000000
-11,2036,R2,gasCCGT,2022,1.85640000000
-11,2040,R2,gasCCGT,2022,1.85640000000
-11,2045,R2,gasCCGT,2022,1.85640000000
-11,2046,R2,gasCCGT,2022,1.85640000000
-11,2047,R2,gasCCGT,2022,1.85640000000
-11,2050,R2,gasCCGT,2022,1.85640000000
-11,2056,R2,gasCCGT,2022,1.85640000000
-11,2057,R2,gasCCGT,2022,1.85640000000
-11,2058,R2,gasCCGT,2022,1.85640000000
-12,2026,R2,gasCCGT,2024,2.07980000000
-12,2028,R2,gasCCGT,2024,2.07980000000
-12,2030,R2,gasCCGT,2024,2.07980000000
-12,2032,R2,gasCCGT,2024,2.07980000000
-12,2034,R2,gasCCGT,2024,2.07980000000
-12,2035,R2,gasCCGT,2024,2.07980000000
-12,2036,R2,gasCCGT,2024,2.07980000000
-12,2040,R2,gasCCGT,2024,2.07980000000
-12,2045,R2,gasCCGT,2024,2.07980000000
-12,2046,R2,gasCCGT,2024,2.07980000000
-12,2047,R2,gasCCGT,2024,2.07980000000
-12,2050,R2,gasCCGT,2024,2.07980000000
-12,2056,R2,gasCCGT,2024,2.07980000000
-12,2057,R2,gasCCGT,2024,2.07980000000
-12,2058,R2,gasCCGT,2024,2.07980000000
-12,2059,R2,gasCCGT,2024,2.07980000000
-12,2060,R2,gasCCGT,2024,2.07980000000
-13,2028,R2,gasCCGT,2026,2.29760000000
-13,2030,R2,gasCCGT,2026,2.29760000000
-13,2032,R2,gasCCGT,2026,2.29760000000
-13,2034,R2,gasCCGT,2026,2.29760000000
-13,2035,R2,gasCCGT,2026,2.29760000000
-13,2036,R2,gasCCGT,2026,2.29760000000
-13,2040,R2,gasCCGT,2026,2.29760000000
-13,2045,R2,gasCCGT,2026,2.29760000000
-13,2046,R2,gasCCGT,2026,2.29760000000
-13,2047,R2,gasCCGT,2026,2.29760000000
-13,2050,R2,gasCCGT,2026,2.29760000000
-13,2056,R2,gasCCGT,2026,2.29760000000
-13,2057,R2,gasCCGT,2026,2.29760000000
-13,2058,R2,gasCCGT,2026,2.29760000000
-13,2059,R2,gasCCGT,2026,2.29760000000
-13,2060,R2,gasCCGT,2026,2.29760000000
-13,2061,R2,gasCCGT,2026,2.29760000000
-13,2062,R2,gasCCGT,2026,2.29760000000
-14,2030,R2,gasCCGT,2028,2.31150000000
-14,2032,R2,gasCCGT,2028,2.31150000000
-14,2034,R2,gasCCGT,2028,2.31150000000
-14,2035,R2,gasCCGT,2028,2.31150000000
-14,2036,R2,gasCCGT,2028,2.31150000000
-14,2040,R2,gasCCGT,2028,2.31150000000
-14,2045,R2,gasCCGT,2028,2.31150000000
-14,2046,R2,gasCCGT,2028,2.31150000000
-14,2047,R2,gasCCGT,2028,2.31150000000
-14,2050,R2,gasCCGT,2028,2.31150000000
-14,2056,R2,gasCCGT,2028,2.31150000000
-14,2057,R2,gasCCGT,2028,2.31150000000
-14,2058,R2,gasCCGT,2028,2.31150000000
-14,2059,R2,gasCCGT,2028,2.31150000000
-14,2060,R2,gasCCGT,2028,2.31150000000
-14,2061,R2,gasCCGT,2028,2.31150000000
-14,2062,R2,gasCCGT,2028,2.31150000000
-14,2063,R2,gasCCGT,2028,2.31150000000
-14,2064,R2,gasCCGT,2028,2.31150000000
-15,2032,R2,gasCCGT,2030,0.99560000000
-15,2034,R2,gasCCGT,2030,0.99560000000
-15,2035,R2,gasCCGT,2030,0.99560000000
-15,2036,R2,gasCCGT,2030,0.99560000000
-15,2040,R2,gasCCGT,2030,0.99560000000
-15,2045,R2,gasCCGT,2030,0.99560000000
-15,2046,R2,gasCCGT,2030,0.99560000000
-15,2047,R2,gasCCGT,2030,0.99560000000
-15,2050,R2,gasCCGT,2030,0.99560000000
-15,2056,R2,gasCCGT,2030,0.99560000000
-15,2057,R2,gasCCGT,2030,0.99560000000
-15,2058,R2,gasCCGT,2030,0.99560000000
-15,2059,R2,gasCCGT,2030,0.99560000000
-15,2060,R2,gasCCGT,2030,0.99560000000
-15,2061,R2,gasCCGT,2030,0.99560000000
-15,2062,R2,gasCCGT,2030,0.99560000000
-15,2063,R2,gasCCGT,2030,0.99560000000
-15,2064,R2,gasCCGT,2030,0.99560000000
-15,2065,R2,gasCCGT,2030,0.99560000000
-15,2066,R2,gasCCGT,2030,0.99560000000
-16,2034,R2,solarPV,2032,2.24000000000
-16,2035,R2,solarPV,2032,2.24000000000
-16,2036,R2,solarPV,2032,2.24000000000
-16,2040,R2,solarPV,2032,2.24000000000
-16,2045,R2,solarPV,2032,2.24000000000
-16,2046,R2,solarPV,2032,2.24000000000
-16,2047,R2,solarPV,2032,2.24000000000
-16,2050,R2,solarPV,2032,2.24000000000
-16,2056,R2,solarPV,2032,2.24000000000
-16,2057,R2,solarPV,2032,2.24000000000
-16,2058,R2,solarPV,2032,2.24000000000
-17,2036,R2,solarPV,2034,2.24000000000
-17,2040,R2,solarPV,2034,2.24000000000
-17,2045,R2,solarPV,2034,2.24000000000
-17,2046,R2,solarPV,2034,2.24000000000
-17,2047,R2,solarPV,2034,2.24000000000
-17,2050,R2,solarPV,2034,2.24000000000
-17,2056,R2,solarPV,2034,2.24000000000
-17,2057,R2,solarPV,2034,2.24000000000
-17,2058,R2,solarPV,2034,2.24000000000
-17,2059,R2,solarPV,2034,2.24000000000
-17,2060,R2,solarPV,2034,2.24000000000
-18,2022,R2,windturbine,2020,8.77320000000
-18,2024,R2,windturbine,2020,8.77320000000
-18,2025,R2,windturbine,2020,8.77320000000
-18,2026,R2,windturbine,2020,8.77320000000
-18,2028,R2,windturbine,2020,8.77320000000
-18,2030,R2,windturbine,2020,8.77320000000
-18,2032,R2,windturbine,2020,8.77320000000
-18,2034,R2,windturbine,2020,8.77320000000
-18,2035,R2,windturbine,2020,8.77320000000
-18,2036,R2,windturbine,2020,8.77320000000
-18,2040,R2,windturbine,2020,8.77320000000
-18,2045,R2,windturbine,2020,8.77320000000
-18,2046,R2,windturbine,2020,8.77320000000
+6,2034,R1,gasCCGT,2032,0.75270000000
+6,2035,R1,gasCCGT,2032,0.75270000000
+6,2036,R1,gasCCGT,2032,0.75270000000
+6,2040,R1,gasCCGT,2032,0.75270000000
+6,2045,R1,gasCCGT,2032,0.75270000000
+6,2046,R1,gasCCGT,2032,0.75270000000
+6,2047,R1,gasCCGT,2032,0.75270000000
+6,2050,R1,gasCCGT,2032,0.75270000000
+6,2056,R1,gasCCGT,2032,0.75270000000
+6,2057,R1,gasCCGT,2032,0.75270000000
+6,2058,R1,gasCCGT,2032,0.75270000000
+6,2059,R1,gasCCGT,2032,0.75270000000
+6,2060,R1,gasCCGT,2032,0.75270000000
+6,2061,R1,gasCCGT,2032,0.75270000000
+6,2062,R1,gasCCGT,2032,0.75270000000
+6,2063,R1,gasCCGT,2032,0.75270000000
+6,2064,R1,gasCCGT,2032,0.75270000000
+6,2065,R1,gasCCGT,2032,0.75270000000
+6,2066,R1,gasCCGT,2032,0.75270000000
+6,2067,R1,gasCCGT,2032,0.75270000000
+6,2068,R1,gasCCGT,2032,0.75270000000
+7,2022,R1,solarPV,2020,0.27320000000
+7,2024,R1,solarPV,2020,0.27320000000
+7,2025,R1,solarPV,2020,0.27320000000
+7,2026,R1,solarPV,2020,0.27320000000
+7,2028,R1,solarPV,2020,0.27320000000
+7,2030,R1,solarPV,2020,0.27320000000
+7,2032,R1,solarPV,2020,0.27320000000
+7,2034,R1,solarPV,2020,0.27320000000
+7,2035,R1,solarPV,2020,0.27320000000
+7,2036,R1,solarPV,2020,0.27320000000
+7,2040,R1,solarPV,2020,0.27320000000
+7,2045,R1,solarPV,2020,0.27320000000
+7,2046,R1,solarPV,2020,0.27320000000
+8,2034,R1,solarPV,2032,0.54630000000
+8,2035,R1,solarPV,2032,0.54630000000
+8,2036,R1,solarPV,2032,0.54630000000
+8,2040,R1,solarPV,2032,0.54630000000
+8,2045,R1,solarPV,2032,0.54630000000
+8,2046,R1,solarPV,2032,0.54630000000
+8,2047,R1,solarPV,2032,0.54630000000
+8,2050,R1,solarPV,2032,0.54630000000
+8,2056,R1,solarPV,2032,0.54630000000
+8,2057,R1,solarPV,2032,0.54630000000
+8,2058,R1,solarPV,2032,0.54630000000
+9,2036,R1,solarPV,2034,1.63890000000
+9,2040,R1,solarPV,2034,1.63890000000
+9,2045,R1,solarPV,2034,1.63890000000
+9,2046,R1,solarPV,2034,1.63890000000
+9,2047,R1,solarPV,2034,1.63890000000
+9,2050,R1,solarPV,2034,1.63890000000
+9,2056,R1,solarPV,2034,1.63890000000
+9,2057,R1,solarPV,2034,1.63890000000
+9,2058,R1,solarPV,2034,1.63890000000
+9,2059,R1,solarPV,2034,1.63890000000
+9,2060,R1,solarPV,2034,1.63890000000
+10,2022,R1,windturbine,2020,4.00000000000
+10,2024,R1,windturbine,2020,4.00000000000
+10,2025,R1,windturbine,2020,4.00000000000
+10,2026,R1,windturbine,2020,4.00000000000
+10,2028,R1,windturbine,2020,4.00000000000
+10,2030,R1,windturbine,2020,4.00000000000
+10,2032,R1,windturbine,2020,4.00000000000
+10,2034,R1,windturbine,2020,4.00000000000
+10,2035,R1,windturbine,2020,4.00000000000
+10,2036,R1,windturbine,2020,4.00000000000
+10,2040,R1,windturbine,2020,4.00000000000
+10,2045,R1,windturbine,2020,4.00000000000
+10,2046,R1,windturbine,2020,4.00000000000
+11,2036,R1,windturbine,2034,0.60110000000
+11,2040,R1,windturbine,2034,0.60110000000
+11,2045,R1,windturbine,2034,0.60110000000
+11,2046,R1,windturbine,2034,0.60110000000
+11,2047,R1,windturbine,2034,0.60110000000
+11,2050,R1,windturbine,2034,0.60110000000
+11,2056,R1,windturbine,2034,0.60110000000
+11,2057,R1,windturbine,2034,0.60110000000
+11,2058,R1,windturbine,2034,0.60110000000
+11,2059,R1,windturbine,2034,0.60110000000
+11,2060,R1,windturbine,2034,0.60110000000
+12,2020,R2,gasCCGT,2020,1.00000000000
+12,2022,R2,gasCCGT,2020,3.00000000000
+12,2024,R2,gasCCGT,2020,3.00000000000
+12,2025,R2,gasCCGT,2020,3.00000000000
+12,2026,R2,gasCCGT,2020,2.80000000000
+12,2028,R2,gasCCGT,2020,2.40000000000
+12,2030,R2,gasCCGT,2020,2.00000000000
+12,2032,R2,gasCCGT,2020,2.00000000000
+12,2034,R2,gasCCGT,2020,2.00000000000
+12,2035,R2,gasCCGT,2020,2.00000000000
+12,2036,R2,gasCCGT,2020,2.00000000000
+12,2040,R2,gasCCGT,2020,2.00000000000
+12,2045,R2,gasCCGT,2020,2.00000000000
+12,2046,R2,gasCCGT,2020,2.00000000000
+12,2047,R2,gasCCGT,2020,2.00000000000
+12,2050,R2,gasCCGT,2020,2.00000000000
+12,2056,R2,gasCCGT,2020,2.00000000000
+13,2024,R2,gasCCGT,2022,1.85640000000
+13,2025,R2,gasCCGT,2022,1.85640000000
+13,2026,R2,gasCCGT,2022,1.85640000000
+13,2028,R2,gasCCGT,2022,1.85640000000
+13,2030,R2,gasCCGT,2022,1.85640000000
+13,2032,R2,gasCCGT,2022,1.85640000000
+13,2034,R2,gasCCGT,2022,1.85640000000
+13,2035,R2,gasCCGT,2022,1.85640000000
+13,2036,R2,gasCCGT,2022,1.85640000000
+13,2040,R2,gasCCGT,2022,1.85640000000
+13,2045,R2,gasCCGT,2022,1.85640000000
+13,2046,R2,gasCCGT,2022,1.85640000000
+13,2047,R2,gasCCGT,2022,1.85640000000
+13,2050,R2,gasCCGT,2022,1.85640000000
+13,2056,R2,gasCCGT,2022,1.85640000000
+13,2057,R2,gasCCGT,2022,1.85640000000
+13,2058,R2,gasCCGT,2022,1.85640000000
+14,2026,R2,gasCCGT,2024,2.07980000000
+14,2028,R2,gasCCGT,2024,2.07980000000
+14,2030,R2,gasCCGT,2024,2.07980000000
+14,2032,R2,gasCCGT,2024,2.07980000000
+14,2034,R2,gasCCGT,2024,2.07980000000
+14,2035,R2,gasCCGT,2024,2.07980000000
+14,2036,R2,gasCCGT,2024,2.07980000000
+14,2040,R2,gasCCGT,2024,2.07980000000
+14,2045,R2,gasCCGT,2024,2.07980000000
+14,2046,R2,gasCCGT,2024,2.07980000000
+14,2047,R2,gasCCGT,2024,2.07980000000
+14,2050,R2,gasCCGT,2024,2.07980000000
+14,2056,R2,gasCCGT,2024,2.07980000000
+14,2057,R2,gasCCGT,2024,2.07980000000
+14,2058,R2,gasCCGT,2024,2.07980000000
+14,2059,R2,gasCCGT,2024,2.07980000000
+14,2060,R2,gasCCGT,2024,2.07980000000
+15,2028,R2,gasCCGT,2026,2.29760000000
+15,2030,R2,gasCCGT,2026,2.29760000000
+15,2032,R2,gasCCGT,2026,2.29760000000
+15,2034,R2,gasCCGT,2026,2.29760000000
+15,2035,R2,gasCCGT,2026,2.29760000000
+15,2036,R2,gasCCGT,2026,2.29760000000
+15,2040,R2,gasCCGT,2026,2.29760000000
+15,2045,R2,gasCCGT,2026,2.29760000000
+15,2046,R2,gasCCGT,2026,2.29760000000
+15,2047,R2,gasCCGT,2026,2.29760000000
+15,2050,R2,gasCCGT,2026,2.29760000000
+15,2056,R2,gasCCGT,2026,2.29760000000
+15,2057,R2,gasCCGT,2026,2.29760000000
+15,2058,R2,gasCCGT,2026,2.29760000000
+15,2059,R2,gasCCGT,2026,2.29760000000
+15,2060,R2,gasCCGT,2026,2.29760000000
+15,2061,R2,gasCCGT,2026,2.29760000000
+15,2062,R2,gasCCGT,2026,2.29760000000
+16,2030,R2,gasCCGT,2028,2.31150000000
+16,2032,R2,gasCCGT,2028,2.31150000000
+16,2034,R2,gasCCGT,2028,2.31150000000
+16,2035,R2,gasCCGT,2028,2.31150000000
+16,2036,R2,gasCCGT,2028,2.31150000000
+16,2040,R2,gasCCGT,2028,2.31150000000
+16,2045,R2,gasCCGT,2028,2.31150000000
+16,2046,R2,gasCCGT,2028,2.31150000000
+16,2047,R2,gasCCGT,2028,2.31150000000
+16,2050,R2,gasCCGT,2028,2.31150000000
+16,2056,R2,gasCCGT,2028,2.31150000000
+16,2057,R2,gasCCGT,2028,2.31150000000
+16,2058,R2,gasCCGT,2028,2.31150000000
+16,2059,R2,gasCCGT,2028,2.31150000000
+16,2060,R2,gasCCGT,2028,2.31150000000
+16,2061,R2,gasCCGT,2028,2.31150000000
+16,2062,R2,gasCCGT,2028,2.31150000000
+16,2063,R2,gasCCGT,2028,2.31150000000
+16,2064,R2,gasCCGT,2028,2.31150000000
+17,2032,R2,gasCCGT,2030,0.99560000000
+17,2034,R2,gasCCGT,2030,0.99560000000
+17,2035,R2,gasCCGT,2030,0.99560000000
+17,2036,R2,gasCCGT,2030,0.99560000000
+17,2040,R2,gasCCGT,2030,0.99560000000
+17,2045,R2,gasCCGT,2030,0.99560000000
+17,2046,R2,gasCCGT,2030,0.99560000000
+17,2047,R2,gasCCGT,2030,0.99560000000
+17,2050,R2,gasCCGT,2030,0.99560000000
+17,2056,R2,gasCCGT,2030,0.99560000000
+17,2057,R2,gasCCGT,2030,0.99560000000
+17,2058,R2,gasCCGT,2030,0.99560000000
+17,2059,R2,gasCCGT,2030,0.99560000000
+17,2060,R2,gasCCGT,2030,0.99560000000
+17,2061,R2,gasCCGT,2030,0.99560000000
+17,2062,R2,gasCCGT,2030,0.99560000000
+17,2063,R2,gasCCGT,2030,0.99560000000
+17,2064,R2,gasCCGT,2030,0.99560000000
+17,2065,R2,gasCCGT,2030,0.99560000000
+17,2066,R2,gasCCGT,2030,0.99560000000
+18,2034,R2,solarPV,2032,2.24000000000
+18,2035,R2,solarPV,2032,2.24000000000
+18,2036,R2,solarPV,2032,2.24000000000
+18,2040,R2,solarPV,2032,2.24000000000
+18,2045,R2,solarPV,2032,2.24000000000
+18,2046,R2,solarPV,2032,2.24000000000
+18,2047,R2,solarPV,2032,2.24000000000
+18,2050,R2,solarPV,2032,2.24000000000
+18,2056,R2,solarPV,2032,2.24000000000
+18,2057,R2,solarPV,2032,2.24000000000
+18,2058,R2,solarPV,2032,2.24000000000
+19,2036,R2,solarPV,2034,2.24000000000
+19,2040,R2,solarPV,2034,2.24000000000
+19,2045,R2,solarPV,2034,2.24000000000
+19,2046,R2,solarPV,2034,2.24000000000
+19,2047,R2,solarPV,2034,2.24000000000
+19,2050,R2,solarPV,2034,2.24000000000
+19,2056,R2,solarPV,2034,2.24000000000
+19,2057,R2,solarPV,2034,2.24000000000
+19,2058,R2,solarPV,2034,2.24000000000
+19,2059,R2,solarPV,2034,2.24000000000
+19,2060,R2,solarPV,2034,2.24000000000
+20,2022,R2,windturbine,2020,4.27320000000
+20,2024,R2,windturbine,2020,4.27320000000
+20,2025,R2,windturbine,2020,4.27320000000
+20,2026,R2,windturbine,2020,4.27320000000
+20,2028,R2,windturbine,2020,4.27320000000
+20,2030,R2,windturbine,2020,4.27320000000
+20,2032,R2,windturbine,2020,4.27320000000
+20,2034,R2,windturbine,2020,4.27320000000
+20,2035,R2,windturbine,2020,4.27320000000
+20,2036,R2,windturbine,2020,4.27320000000
+20,2040,R2,windturbine,2020,4.27320000000
+20,2045,R2,windturbine,2020,4.27320000000
+20,2046,R2,windturbine,2020,4.27320000000
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 e5409877..df7cf5aa 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,22 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2032,R1,gasCCGT,2020,0.34360000000
-0,2034,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2036,R1,gasCCGT,2020,0.34360000000
-0,2038,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2032,R1,gasCCGT,2020,2.00000000000
+0,2034,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2036,R1,gasCCGT,2020,2.00000000000
+0,2038,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -113,221 +113,267 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,4.00000000000
-6,2024,R1,solarPV,2020,4.00000000000
-6,2025,R1,solarPV,2020,4.00000000000
-6,2026,R1,solarPV,2020,4.00000000000
-6,2028,R1,solarPV,2020,4.00000000000
-6,2030,R1,solarPV,2020,4.00000000000
-6,2032,R1,solarPV,2020,4.00000000000
-6,2034,R1,solarPV,2020,4.00000000000
-6,2035,R1,solarPV,2020,4.00000000000
-6,2036,R1,solarPV,2020,4.00000000000
-6,2038,R1,solarPV,2020,4.00000000000
-6,2040,R1,solarPV,2020,4.00000000000
-6,2045,R1,solarPV,2020,4.00000000000
-6,2046,R1,solarPV,2020,4.00000000000
-7,2034,R1,solarPV,2032,2.24000000000
-7,2035,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2032,2.24000000000
-7,2038,R1,solarPV,2032,2.24000000000
-7,2040,R1,solarPV,2032,2.24000000000
-7,2045,R1,solarPV,2032,2.24000000000
-7,2046,R1,solarPV,2032,2.24000000000
-7,2047,R1,solarPV,2032,2.24000000000
-7,2050,R1,solarPV,2032,2.24000000000
-7,2056,R1,solarPV,2032,2.24000000000
-7,2057,R1,solarPV,2032,2.24000000000
-7,2058,R1,solarPV,2032,2.24000000000
-8,2036,R1,solarPV,2034,2.24000000000
-8,2038,R1,solarPV,2034,2.24000000000
-8,2040,R1,solarPV,2034,2.24000000000
-8,2045,R1,solarPV,2034,2.24000000000
-8,2046,R1,solarPV,2034,2.24000000000
-8,2047,R1,solarPV,2034,2.24000000000
-8,2050,R1,solarPV,2034,2.24000000000
-8,2056,R1,solarPV,2034,2.24000000000
-8,2057,R1,solarPV,2034,2.24000000000
-8,2058,R1,solarPV,2034,2.24000000000
-8,2059,R1,solarPV,2034,2.24000000000
-8,2060,R1,solarPV,2034,2.24000000000
-9,2038,R1,solarPV,2036,2.24000000000
-9,2040,R1,solarPV,2036,2.24000000000
-9,2045,R1,solarPV,2036,2.24000000000
-9,2046,R1,solarPV,2036,2.24000000000
-9,2047,R1,solarPV,2036,2.24000000000
-9,2050,R1,solarPV,2036,2.24000000000
-9,2056,R1,solarPV,2036,2.24000000000
-9,2057,R1,solarPV,2036,2.24000000000
-9,2058,R1,solarPV,2036,2.24000000000
-9,2059,R1,solarPV,2036,2.24000000000
-9,2060,R1,solarPV,2036,2.24000000000
-9,2061,R1,solarPV,2036,2.24000000000
-9,2062,R1,solarPV,2036,2.24000000000
-10,2022,R1,windturbine,2020,4.00000000000
-10,2024,R1,windturbine,2020,4.00000000000
-10,2025,R1,windturbine,2020,4.00000000000
-10,2026,R1,windturbine,2020,4.00000000000
-10,2028,R1,windturbine,2020,4.00000000000
-10,2030,R1,windturbine,2020,4.00000000000
-10,2032,R1,windturbine,2020,4.00000000000
-10,2034,R1,windturbine,2020,4.00000000000
-10,2035,R1,windturbine,2020,4.00000000000
-10,2036,R1,windturbine,2020,4.00000000000
-10,2038,R1,windturbine,2020,4.00000000000
-10,2040,R1,windturbine,2020,4.00000000000
-10,2045,R1,windturbine,2020,4.00000000000
-10,2046,R1,windturbine,2020,4.00000000000
-11,2020,R2,gasCCGT,2020,1.00000000000
-11,2022,R2,gasCCGT,2020,1.00000000000
-11,2024,R2,gasCCGT,2020,1.00000000000
-11,2025,R2,gasCCGT,2020,1.00000000000
-11,2026,R2,gasCCGT,2020,0.80000000000
-11,2028,R2,gasCCGT,2020,0.40000000000
-12,2024,R2,gasCCGT,2022,1.85640000000
-12,2025,R2,gasCCGT,2022,1.85640000000
-12,2026,R2,gasCCGT,2022,1.85640000000
-12,2028,R2,gasCCGT,2022,1.85640000000
-12,2030,R2,gasCCGT,2022,1.85640000000
-12,2032,R2,gasCCGT,2022,1.85640000000
-12,2034,R2,gasCCGT,2022,1.85640000000
-12,2035,R2,gasCCGT,2022,1.85640000000
-12,2036,R2,gasCCGT,2022,1.85640000000
-12,2038,R2,gasCCGT,2022,1.85640000000
-12,2040,R2,gasCCGT,2022,1.85640000000
-12,2045,R2,gasCCGT,2022,1.85640000000
-12,2046,R2,gasCCGT,2022,1.85640000000
-12,2047,R2,gasCCGT,2022,1.85640000000
-12,2050,R2,gasCCGT,2022,1.85640000000
-12,2056,R2,gasCCGT,2022,1.85640000000
-12,2057,R2,gasCCGT,2022,1.85640000000
-12,2058,R2,gasCCGT,2022,1.85640000000
-13,2026,R2,gasCCGT,2024,2.07980000000
-13,2028,R2,gasCCGT,2024,2.07980000000
-13,2030,R2,gasCCGT,2024,2.07980000000
-13,2032,R2,gasCCGT,2024,2.07980000000
-13,2034,R2,gasCCGT,2024,2.07980000000
-13,2035,R2,gasCCGT,2024,2.07980000000
-13,2036,R2,gasCCGT,2024,2.07980000000
-13,2038,R2,gasCCGT,2024,2.07980000000
-13,2040,R2,gasCCGT,2024,2.07980000000
-13,2045,R2,gasCCGT,2024,2.07980000000
-13,2046,R2,gasCCGT,2024,2.07980000000
-13,2047,R2,gasCCGT,2024,2.07980000000
-13,2050,R2,gasCCGT,2024,2.07980000000
-13,2056,R2,gasCCGT,2024,2.07980000000
-13,2057,R2,gasCCGT,2024,2.07980000000
-13,2058,R2,gasCCGT,2024,2.07980000000
-13,2059,R2,gasCCGT,2024,2.07980000000
-13,2060,R2,gasCCGT,2024,2.07980000000
-14,2028,R2,gasCCGT,2026,2.29760000000
-14,2030,R2,gasCCGT,2026,2.29760000000
-14,2032,R2,gasCCGT,2026,2.29760000000
-14,2034,R2,gasCCGT,2026,2.29760000000
-14,2035,R2,gasCCGT,2026,2.29760000000
-14,2036,R2,gasCCGT,2026,2.29760000000
-14,2038,R2,gasCCGT,2026,2.29760000000
-14,2040,R2,gasCCGT,2026,2.29760000000
-14,2045,R2,gasCCGT,2026,2.29760000000
-14,2046,R2,gasCCGT,2026,2.29760000000
-14,2047,R2,gasCCGT,2026,2.29760000000
-14,2050,R2,gasCCGT,2026,2.29760000000
-14,2056,R2,gasCCGT,2026,2.29760000000
-14,2057,R2,gasCCGT,2026,2.29760000000
-14,2058,R2,gasCCGT,2026,2.29760000000
-14,2059,R2,gasCCGT,2026,2.29760000000
-14,2060,R2,gasCCGT,2026,2.29760000000
-14,2061,R2,gasCCGT,2026,2.29760000000
-14,2062,R2,gasCCGT,2026,2.29760000000
-15,2030,R2,gasCCGT,2028,2.31150000000
-15,2032,R2,gasCCGT,2028,2.31150000000
-15,2034,R2,gasCCGT,2028,2.31150000000
-15,2035,R2,gasCCGT,2028,2.31150000000
-15,2036,R2,gasCCGT,2028,2.31150000000
-15,2038,R2,gasCCGT,2028,2.31150000000
-15,2040,R2,gasCCGT,2028,2.31150000000
-15,2045,R2,gasCCGT,2028,2.31150000000
-15,2046,R2,gasCCGT,2028,2.31150000000
-15,2047,R2,gasCCGT,2028,2.31150000000
-15,2050,R2,gasCCGT,2028,2.31150000000
-15,2056,R2,gasCCGT,2028,2.31150000000
-15,2057,R2,gasCCGT,2028,2.31150000000
-15,2058,R2,gasCCGT,2028,2.31150000000
-15,2059,R2,gasCCGT,2028,2.31150000000
-15,2060,R2,gasCCGT,2028,2.31150000000
-15,2061,R2,gasCCGT,2028,2.31150000000
-15,2062,R2,gasCCGT,2028,2.31150000000
-15,2063,R2,gasCCGT,2028,2.31150000000
-15,2064,R2,gasCCGT,2028,2.31150000000
-16,2032,R2,gasCCGT,2030,0.99560000000
-16,2034,R2,gasCCGT,2030,0.99560000000
-16,2035,R2,gasCCGT,2030,0.99560000000
-16,2036,R2,gasCCGT,2030,0.99560000000
-16,2038,R2,gasCCGT,2030,0.99560000000
-16,2040,R2,gasCCGT,2030,0.99560000000
-16,2045,R2,gasCCGT,2030,0.99560000000
-16,2046,R2,gasCCGT,2030,0.99560000000
-16,2047,R2,gasCCGT,2030,0.99560000000
-16,2050,R2,gasCCGT,2030,0.99560000000
-16,2056,R2,gasCCGT,2030,0.99560000000
-16,2057,R2,gasCCGT,2030,0.99560000000
-16,2058,R2,gasCCGT,2030,0.99560000000
-16,2059,R2,gasCCGT,2030,0.99560000000
-16,2060,R2,gasCCGT,2030,0.99560000000
-16,2061,R2,gasCCGT,2030,0.99560000000
-16,2062,R2,gasCCGT,2030,0.99560000000
-16,2063,R2,gasCCGT,2030,0.99560000000
-16,2064,R2,gasCCGT,2030,0.99560000000
-16,2065,R2,gasCCGT,2030,0.99560000000
-16,2066,R2,gasCCGT,2030,0.99560000000
-17,2034,R2,solarPV,2032,2.24000000000
-17,2035,R2,solarPV,2032,2.24000000000
-17,2036,R2,solarPV,2032,2.24000000000
-17,2038,R2,solarPV,2032,2.24000000000
-17,2040,R2,solarPV,2032,2.24000000000
-17,2045,R2,solarPV,2032,2.24000000000
-17,2046,R2,solarPV,2032,2.24000000000
-17,2047,R2,solarPV,2032,2.24000000000
-17,2050,R2,solarPV,2032,2.24000000000
-17,2056,R2,solarPV,2032,2.24000000000
-17,2057,R2,solarPV,2032,2.24000000000
-17,2058,R2,solarPV,2032,2.24000000000
-18,2036,R2,solarPV,2034,2.24000000000
-18,2038,R2,solarPV,2034,2.24000000000
-18,2040,R2,solarPV,2034,2.24000000000
-18,2045,R2,solarPV,2034,2.24000000000
-18,2046,R2,solarPV,2034,2.24000000000
-18,2047,R2,solarPV,2034,2.24000000000
-18,2050,R2,solarPV,2034,2.24000000000
-18,2056,R2,solarPV,2034,2.24000000000
-18,2057,R2,solarPV,2034,2.24000000000
-18,2058,R2,solarPV,2034,2.24000000000
-18,2059,R2,solarPV,2034,2.24000000000
-18,2060,R2,solarPV,2034,2.24000000000
-19,2038,R2,solarPV,2036,2.24000000000
-19,2040,R2,solarPV,2036,2.24000000000
-19,2045,R2,solarPV,2036,2.24000000000
-19,2046,R2,solarPV,2036,2.24000000000
-19,2047,R2,solarPV,2036,2.24000000000
-19,2050,R2,solarPV,2036,2.24000000000
-19,2056,R2,solarPV,2036,2.24000000000
-19,2057,R2,solarPV,2036,2.24000000000
-19,2058,R2,solarPV,2036,2.24000000000
-19,2059,R2,solarPV,2036,2.24000000000
-19,2060,R2,solarPV,2036,2.24000000000
-19,2061,R2,solarPV,2036,2.24000000000
-19,2062,R2,solarPV,2036,2.24000000000
-20,2022,R2,windturbine,2020,8.77320000000
-20,2024,R2,windturbine,2020,8.77320000000
-20,2025,R2,windturbine,2020,8.77320000000
-20,2026,R2,windturbine,2020,8.77320000000
-20,2028,R2,windturbine,2020,8.77320000000
-20,2030,R2,windturbine,2020,8.77320000000
-20,2032,R2,windturbine,2020,8.77320000000
-20,2034,R2,windturbine,2020,8.77320000000
-20,2035,R2,windturbine,2020,8.77320000000
-20,2036,R2,windturbine,2020,8.77320000000
-20,2038,R2,windturbine,2020,8.77320000000
-20,2040,R2,windturbine,2020,8.77320000000
-20,2045,R2,windturbine,2020,8.77320000000
-20,2046,R2,windturbine,2020,8.77320000000
+6,2034,R1,gasCCGT,2032,0.75270000000
+6,2035,R1,gasCCGT,2032,0.75270000000
+6,2036,R1,gasCCGT,2032,0.75270000000
+6,2038,R1,gasCCGT,2032,0.75270000000
+6,2040,R1,gasCCGT,2032,0.75270000000
+6,2045,R1,gasCCGT,2032,0.75270000000
+6,2046,R1,gasCCGT,2032,0.75270000000
+6,2047,R1,gasCCGT,2032,0.75270000000
+6,2050,R1,gasCCGT,2032,0.75270000000
+6,2056,R1,gasCCGT,2032,0.75270000000
+6,2057,R1,gasCCGT,2032,0.75270000000
+6,2058,R1,gasCCGT,2032,0.75270000000
+6,2059,R1,gasCCGT,2032,0.75270000000
+6,2060,R1,gasCCGT,2032,0.75270000000
+6,2061,R1,gasCCGT,2032,0.75270000000
+6,2062,R1,gasCCGT,2032,0.75270000000
+6,2063,R1,gasCCGT,2032,0.75270000000
+6,2064,R1,gasCCGT,2032,0.75270000000
+6,2065,R1,gasCCGT,2032,0.75270000000
+6,2066,R1,gasCCGT,2032,0.75270000000
+6,2067,R1,gasCCGT,2032,0.75270000000
+6,2068,R1,gasCCGT,2032,0.75270000000
+7,2022,R1,solarPV,2020,0.27320000000
+7,2024,R1,solarPV,2020,0.27320000000
+7,2025,R1,solarPV,2020,0.27320000000
+7,2026,R1,solarPV,2020,0.27320000000
+7,2028,R1,solarPV,2020,0.27320000000
+7,2030,R1,solarPV,2020,0.27320000000
+7,2032,R1,solarPV,2020,0.27320000000
+7,2034,R1,solarPV,2020,0.27320000000
+7,2035,R1,solarPV,2020,0.27320000000
+7,2036,R1,solarPV,2020,0.27320000000
+7,2038,R1,solarPV,2020,0.27320000000
+7,2040,R1,solarPV,2020,0.27320000000
+7,2045,R1,solarPV,2020,0.27320000000
+7,2046,R1,solarPV,2020,0.27320000000
+8,2034,R1,solarPV,2032,0.54630000000
+8,2035,R1,solarPV,2032,0.54630000000
+8,2036,R1,solarPV,2032,0.54630000000
+8,2038,R1,solarPV,2032,0.54630000000
+8,2040,R1,solarPV,2032,0.54630000000
+8,2045,R1,solarPV,2032,0.54630000000
+8,2046,R1,solarPV,2032,0.54630000000
+8,2047,R1,solarPV,2032,0.54630000000
+8,2050,R1,solarPV,2032,0.54630000000
+8,2056,R1,solarPV,2032,0.54630000000
+8,2057,R1,solarPV,2032,0.54630000000
+8,2058,R1,solarPV,2032,0.54630000000
+9,2036,R1,solarPV,2034,1.63890000000
+9,2038,R1,solarPV,2034,1.63890000000
+9,2040,R1,solarPV,2034,1.63890000000
+9,2045,R1,solarPV,2034,1.63890000000
+9,2046,R1,solarPV,2034,1.63890000000
+9,2047,R1,solarPV,2034,1.63890000000
+9,2050,R1,solarPV,2034,1.63890000000
+9,2056,R1,solarPV,2034,1.63890000000
+9,2057,R1,solarPV,2034,1.63890000000
+9,2058,R1,solarPV,2034,1.63890000000
+9,2059,R1,solarPV,2034,1.63890000000
+9,2060,R1,solarPV,2034,1.63890000000
+10,2038,R1,solarPV,2036,2.24000000000
+10,2040,R1,solarPV,2036,2.24000000000
+10,2045,R1,solarPV,2036,2.24000000000
+10,2046,R1,solarPV,2036,2.24000000000
+10,2047,R1,solarPV,2036,2.24000000000
+10,2050,R1,solarPV,2036,2.24000000000
+10,2056,R1,solarPV,2036,2.24000000000
+10,2057,R1,solarPV,2036,2.24000000000
+10,2058,R1,solarPV,2036,2.24000000000
+10,2059,R1,solarPV,2036,2.24000000000
+10,2060,R1,solarPV,2036,2.24000000000
+10,2061,R1,solarPV,2036,2.24000000000
+10,2062,R1,solarPV,2036,2.24000000000
+11,2022,R1,windturbine,2020,4.00000000000
+11,2024,R1,windturbine,2020,4.00000000000
+11,2025,R1,windturbine,2020,4.00000000000
+11,2026,R1,windturbine,2020,4.00000000000
+11,2028,R1,windturbine,2020,4.00000000000
+11,2030,R1,windturbine,2020,4.00000000000
+11,2032,R1,windturbine,2020,4.00000000000
+11,2034,R1,windturbine,2020,4.00000000000
+11,2035,R1,windturbine,2020,4.00000000000
+11,2036,R1,windturbine,2020,4.00000000000
+11,2038,R1,windturbine,2020,4.00000000000
+11,2040,R1,windturbine,2020,4.00000000000
+11,2045,R1,windturbine,2020,4.00000000000
+11,2046,R1,windturbine,2020,4.00000000000
+12,2036,R1,windturbine,2034,0.60110000000
+12,2038,R1,windturbine,2034,0.60110000000
+12,2040,R1,windturbine,2034,0.60110000000
+12,2045,R1,windturbine,2034,0.60110000000
+12,2046,R1,windturbine,2034,0.60110000000
+12,2047,R1,windturbine,2034,0.60110000000
+12,2050,R1,windturbine,2034,0.60110000000
+12,2056,R1,windturbine,2034,0.60110000000
+12,2057,R1,windturbine,2034,0.60110000000
+12,2058,R1,windturbine,2034,0.60110000000
+12,2059,R1,windturbine,2034,0.60110000000
+12,2060,R1,windturbine,2034,0.60110000000
+13,2020,R2,gasCCGT,2020,1.00000000000
+13,2022,R2,gasCCGT,2020,3.00000000000
+13,2024,R2,gasCCGT,2020,3.00000000000
+13,2025,R2,gasCCGT,2020,3.00000000000
+13,2026,R2,gasCCGT,2020,2.80000000000
+13,2028,R2,gasCCGT,2020,2.40000000000
+13,2030,R2,gasCCGT,2020,2.00000000000
+13,2032,R2,gasCCGT,2020,2.00000000000
+13,2034,R2,gasCCGT,2020,2.00000000000
+13,2035,R2,gasCCGT,2020,2.00000000000
+13,2036,R2,gasCCGT,2020,2.00000000000
+13,2038,R2,gasCCGT,2020,2.00000000000
+13,2040,R2,gasCCGT,2020,2.00000000000
+13,2045,R2,gasCCGT,2020,2.00000000000
+13,2046,R2,gasCCGT,2020,2.00000000000
+13,2047,R2,gasCCGT,2020,2.00000000000
+13,2050,R2,gasCCGT,2020,2.00000000000
+13,2056,R2,gasCCGT,2020,2.00000000000
+14,2024,R2,gasCCGT,2022,1.85640000000
+14,2025,R2,gasCCGT,2022,1.85640000000
+14,2026,R2,gasCCGT,2022,1.85640000000
+14,2028,R2,gasCCGT,2022,1.85640000000
+14,2030,R2,gasCCGT,2022,1.85640000000
+14,2032,R2,gasCCGT,2022,1.85640000000
+14,2034,R2,gasCCGT,2022,1.85640000000
+14,2035,R2,gasCCGT,2022,1.85640000000
+14,2036,R2,gasCCGT,2022,1.85640000000
+14,2038,R2,gasCCGT,2022,1.85640000000
+14,2040,R2,gasCCGT,2022,1.85640000000
+14,2045,R2,gasCCGT,2022,1.85640000000
+14,2046,R2,gasCCGT,2022,1.85640000000
+14,2047,R2,gasCCGT,2022,1.85640000000
+14,2050,R2,gasCCGT,2022,1.85640000000
+14,2056,R2,gasCCGT,2022,1.85640000000
+14,2057,R2,gasCCGT,2022,1.85640000000
+14,2058,R2,gasCCGT,2022,1.85640000000
+15,2026,R2,gasCCGT,2024,2.07980000000
+15,2028,R2,gasCCGT,2024,2.07980000000
+15,2030,R2,gasCCGT,2024,2.07980000000
+15,2032,R2,gasCCGT,2024,2.07980000000
+15,2034,R2,gasCCGT,2024,2.07980000000
+15,2035,R2,gasCCGT,2024,2.07980000000
+15,2036,R2,gasCCGT,2024,2.07980000000
+15,2038,R2,gasCCGT,2024,2.07980000000
+15,2040,R2,gasCCGT,2024,2.07980000000
+15,2045,R2,gasCCGT,2024,2.07980000000
+15,2046,R2,gasCCGT,2024,2.07980000000
+15,2047,R2,gasCCGT,2024,2.07980000000
+15,2050,R2,gasCCGT,2024,2.07980000000
+15,2056,R2,gasCCGT,2024,2.07980000000
+15,2057,R2,gasCCGT,2024,2.07980000000
+15,2058,R2,gasCCGT,2024,2.07980000000
+15,2059,R2,gasCCGT,2024,2.07980000000
+15,2060,R2,gasCCGT,2024,2.07980000000
+16,2028,R2,gasCCGT,2026,2.29760000000
+16,2030,R2,gasCCGT,2026,2.29760000000
+16,2032,R2,gasCCGT,2026,2.29760000000
+16,2034,R2,gasCCGT,2026,2.29760000000
+16,2035,R2,gasCCGT,2026,2.29760000000
+16,2036,R2,gasCCGT,2026,2.29760000000
+16,2038,R2,gasCCGT,2026,2.29760000000
+16,2040,R2,gasCCGT,2026,2.29760000000
+16,2045,R2,gasCCGT,2026,2.29760000000
+16,2046,R2,gasCCGT,2026,2.29760000000
+16,2047,R2,gasCCGT,2026,2.29760000000
+16,2050,R2,gasCCGT,2026,2.29760000000
+16,2056,R2,gasCCGT,2026,2.29760000000
+16,2057,R2,gasCCGT,2026,2.29760000000
+16,2058,R2,gasCCGT,2026,2.29760000000
+16,2059,R2,gasCCGT,2026,2.29760000000
+16,2060,R2,gasCCGT,2026,2.29760000000
+16,2061,R2,gasCCGT,2026,2.29760000000
+16,2062,R2,gasCCGT,2026,2.29760000000
+17,2030,R2,gasCCGT,2028,2.31150000000
+17,2032,R2,gasCCGT,2028,2.31150000000
+17,2034,R2,gasCCGT,2028,2.31150000000
+17,2035,R2,gasCCGT,2028,2.31150000000
+17,2036,R2,gasCCGT,2028,2.31150000000
+17,2038,R2,gasCCGT,2028,2.31150000000
+17,2040,R2,gasCCGT,2028,2.31150000000
+17,2045,R2,gasCCGT,2028,2.31150000000
+17,2046,R2,gasCCGT,2028,2.31150000000
+17,2047,R2,gasCCGT,2028,2.31150000000
+17,2050,R2,gasCCGT,2028,2.31150000000
+17,2056,R2,gasCCGT,2028,2.31150000000
+17,2057,R2,gasCCGT,2028,2.31150000000
+17,2058,R2,gasCCGT,2028,2.31150000000
+17,2059,R2,gasCCGT,2028,2.31150000000
+17,2060,R2,gasCCGT,2028,2.31150000000
+17,2061,R2,gasCCGT,2028,2.31150000000
+17,2062,R2,gasCCGT,2028,2.31150000000
+17,2063,R2,gasCCGT,2028,2.31150000000
+17,2064,R2,gasCCGT,2028,2.31150000000
+18,2032,R2,gasCCGT,2030,0.99560000000
+18,2034,R2,gasCCGT,2030,0.99560000000
+18,2035,R2,gasCCGT,2030,0.99560000000
+18,2036,R2,gasCCGT,2030,0.99560000000
+18,2038,R2,gasCCGT,2030,0.99560000000
+18,2040,R2,gasCCGT,2030,0.99560000000
+18,2045,R2,gasCCGT,2030,0.99560000000
+18,2046,R2,gasCCGT,2030,0.99560000000
+18,2047,R2,gasCCGT,2030,0.99560000000
+18,2050,R2,gasCCGT,2030,0.99560000000
+18,2056,R2,gasCCGT,2030,0.99560000000
+18,2057,R2,gasCCGT,2030,0.99560000000
+18,2058,R2,gasCCGT,2030,0.99560000000
+18,2059,R2,gasCCGT,2030,0.99560000000
+18,2060,R2,gasCCGT,2030,0.99560000000
+18,2061,R2,gasCCGT,2030,0.99560000000
+18,2062,R2,gasCCGT,2030,0.99560000000
+18,2063,R2,gasCCGT,2030,0.99560000000
+18,2064,R2,gasCCGT,2030,0.99560000000
+18,2065,R2,gasCCGT,2030,0.99560000000
+18,2066,R2,gasCCGT,2030,0.99560000000
+19,2034,R2,solarPV,2032,2.24000000000
+19,2035,R2,solarPV,2032,2.24000000000
+19,2036,R2,solarPV,2032,2.24000000000
+19,2038,R2,solarPV,2032,2.24000000000
+19,2040,R2,solarPV,2032,2.24000000000
+19,2045,R2,solarPV,2032,2.24000000000
+19,2046,R2,solarPV,2032,2.24000000000
+19,2047,R2,solarPV,2032,2.24000000000
+19,2050,R2,solarPV,2032,2.24000000000
+19,2056,R2,solarPV,2032,2.24000000000
+19,2057,R2,solarPV,2032,2.24000000000
+19,2058,R2,solarPV,2032,2.24000000000
+20,2036,R2,solarPV,2034,2.24000000000
+20,2038,R2,solarPV,2034,2.24000000000
+20,2040,R2,solarPV,2034,2.24000000000
+20,2045,R2,solarPV,2034,2.24000000000
+20,2046,R2,solarPV,2034,2.24000000000
+20,2047,R2,solarPV,2034,2.24000000000
+20,2050,R2,solarPV,2034,2.24000000000
+20,2056,R2,solarPV,2034,2.24000000000
+20,2057,R2,solarPV,2034,2.24000000000
+20,2058,R2,solarPV,2034,2.24000000000
+20,2059,R2,solarPV,2034,2.24000000000
+20,2060,R2,solarPV,2034,2.24000000000
+21,2038,R2,solarPV,2036,2.24000000000
+21,2040,R2,solarPV,2036,2.24000000000
+21,2045,R2,solarPV,2036,2.24000000000
+21,2046,R2,solarPV,2036,2.24000000000
+21,2047,R2,solarPV,2036,2.24000000000
+21,2050,R2,solarPV,2036,2.24000000000
+21,2056,R2,solarPV,2036,2.24000000000
+21,2057,R2,solarPV,2036,2.24000000000
+21,2058,R2,solarPV,2036,2.24000000000
+21,2059,R2,solarPV,2036,2.24000000000
+21,2060,R2,solarPV,2036,2.24000000000
+21,2061,R2,solarPV,2036,2.24000000000
+21,2062,R2,solarPV,2036,2.24000000000
+22,2022,R2,windturbine,2020,4.27320000000
+22,2024,R2,windturbine,2020,4.27320000000
+22,2025,R2,windturbine,2020,4.27320000000
+22,2026,R2,windturbine,2020,4.27320000000
+22,2028,R2,windturbine,2020,4.27320000000
+22,2030,R2,windturbine,2020,4.27320000000
+22,2032,R2,windturbine,2020,4.27320000000
+22,2034,R2,windturbine,2020,4.27320000000
+22,2035,R2,windturbine,2020,4.27320000000
+22,2036,R2,windturbine,2020,4.27320000000
+22,2038,R2,windturbine,2020,4.27320000000
+22,2040,R2,windturbine,2020,4.27320000000
+22,2045,R2,windturbine,2020,4.27320000000
+22,2046,R2,windturbine,2020,4.27320000000
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 a09b4c30..a1960823 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,22 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2032,R1,gasCCGT,2020,0.34360000000
-0,2034,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2036,R1,gasCCGT,2020,0.34360000000
-0,2038,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2032,R1,gasCCGT,2020,2.00000000000
+0,2034,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2036,R1,gasCCGT,2020,2.00000000000
+0,2038,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -113,249 +113,295 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,4.00000000000
-6,2024,R1,solarPV,2020,4.00000000000
-6,2025,R1,solarPV,2020,4.00000000000
-6,2026,R1,solarPV,2020,4.00000000000
-6,2028,R1,solarPV,2020,4.00000000000
-6,2030,R1,solarPV,2020,4.00000000000
-6,2032,R1,solarPV,2020,4.00000000000
-6,2034,R1,solarPV,2020,4.00000000000
-6,2035,R1,solarPV,2020,4.00000000000
-6,2036,R1,solarPV,2020,4.00000000000
-6,2038,R1,solarPV,2020,4.00000000000
-6,2040,R1,solarPV,2020,4.00000000000
-6,2045,R1,solarPV,2020,4.00000000000
-6,2046,R1,solarPV,2020,4.00000000000
-7,2034,R1,solarPV,2032,2.24000000000
-7,2035,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2032,2.24000000000
-7,2038,R1,solarPV,2032,2.24000000000
-7,2040,R1,solarPV,2032,2.24000000000
-7,2045,R1,solarPV,2032,2.24000000000
-7,2046,R1,solarPV,2032,2.24000000000
-7,2047,R1,solarPV,2032,2.24000000000
-7,2050,R1,solarPV,2032,2.24000000000
-7,2056,R1,solarPV,2032,2.24000000000
-7,2057,R1,solarPV,2032,2.24000000000
-7,2058,R1,solarPV,2032,2.24000000000
-8,2036,R1,solarPV,2034,2.24000000000
-8,2038,R1,solarPV,2034,2.24000000000
-8,2040,R1,solarPV,2034,2.24000000000
-8,2045,R1,solarPV,2034,2.24000000000
-8,2046,R1,solarPV,2034,2.24000000000
-8,2047,R1,solarPV,2034,2.24000000000
-8,2050,R1,solarPV,2034,2.24000000000
-8,2056,R1,solarPV,2034,2.24000000000
-8,2057,R1,solarPV,2034,2.24000000000
-8,2058,R1,solarPV,2034,2.24000000000
-8,2059,R1,solarPV,2034,2.24000000000
-8,2060,R1,solarPV,2034,2.24000000000
-9,2038,R1,solarPV,2036,2.24000000000
-9,2040,R1,solarPV,2036,2.24000000000
-9,2045,R1,solarPV,2036,2.24000000000
-9,2046,R1,solarPV,2036,2.24000000000
-9,2047,R1,solarPV,2036,2.24000000000
-9,2050,R1,solarPV,2036,2.24000000000
-9,2056,R1,solarPV,2036,2.24000000000
-9,2057,R1,solarPV,2036,2.24000000000
-9,2058,R1,solarPV,2036,2.24000000000
-9,2059,R1,solarPV,2036,2.24000000000
-9,2060,R1,solarPV,2036,2.24000000000
-9,2061,R1,solarPV,2036,2.24000000000
-9,2062,R1,solarPV,2036,2.24000000000
-10,2040,R1,solarPV,2038,2.24000000000
-10,2045,R1,solarPV,2038,2.24000000000
-10,2046,R1,solarPV,2038,2.24000000000
-10,2047,R1,solarPV,2038,2.24000000000
-10,2050,R1,solarPV,2038,2.24000000000
-10,2056,R1,solarPV,2038,2.24000000000
-10,2057,R1,solarPV,2038,2.24000000000
-10,2058,R1,solarPV,2038,2.24000000000
-10,2059,R1,solarPV,2038,2.24000000000
-10,2060,R1,solarPV,2038,2.24000000000
-10,2061,R1,solarPV,2038,2.24000000000
-10,2062,R1,solarPV,2038,2.24000000000
-10,2063,R1,solarPV,2038,2.24000000000
-10,2064,R1,solarPV,2038,2.24000000000
-11,2022,R1,windturbine,2020,4.00000000000
-11,2024,R1,windturbine,2020,4.00000000000
-11,2025,R1,windturbine,2020,4.00000000000
-11,2026,R1,windturbine,2020,4.00000000000
-11,2028,R1,windturbine,2020,4.00000000000
-11,2030,R1,windturbine,2020,4.00000000000
-11,2032,R1,windturbine,2020,4.00000000000
-11,2034,R1,windturbine,2020,4.00000000000
-11,2035,R1,windturbine,2020,4.00000000000
-11,2036,R1,windturbine,2020,4.00000000000
-11,2038,R1,windturbine,2020,4.00000000000
-11,2040,R1,windturbine,2020,4.00000000000
-11,2045,R1,windturbine,2020,4.00000000000
-11,2046,R1,windturbine,2020,4.00000000000
-12,2020,R2,gasCCGT,2020,1.00000000000
-12,2022,R2,gasCCGT,2020,1.00000000000
-12,2024,R2,gasCCGT,2020,1.00000000000
-12,2025,R2,gasCCGT,2020,1.00000000000
-12,2026,R2,gasCCGT,2020,0.80000000000
-12,2028,R2,gasCCGT,2020,0.40000000000
-13,2024,R2,gasCCGT,2022,1.85640000000
-13,2025,R2,gasCCGT,2022,1.85640000000
-13,2026,R2,gasCCGT,2022,1.85640000000
-13,2028,R2,gasCCGT,2022,1.85640000000
-13,2030,R2,gasCCGT,2022,1.85640000000
-13,2032,R2,gasCCGT,2022,1.85640000000
-13,2034,R2,gasCCGT,2022,1.85640000000
-13,2035,R2,gasCCGT,2022,1.85640000000
-13,2036,R2,gasCCGT,2022,1.85640000000
-13,2038,R2,gasCCGT,2022,1.85640000000
-13,2040,R2,gasCCGT,2022,1.85640000000
-13,2045,R2,gasCCGT,2022,1.85640000000
-13,2046,R2,gasCCGT,2022,1.85640000000
-13,2047,R2,gasCCGT,2022,1.85640000000
-13,2050,R2,gasCCGT,2022,1.85640000000
-13,2056,R2,gasCCGT,2022,1.85640000000
-13,2057,R2,gasCCGT,2022,1.85640000000
-13,2058,R2,gasCCGT,2022,1.85640000000
-14,2026,R2,gasCCGT,2024,2.07980000000
-14,2028,R2,gasCCGT,2024,2.07980000000
-14,2030,R2,gasCCGT,2024,2.07980000000
-14,2032,R2,gasCCGT,2024,2.07980000000
-14,2034,R2,gasCCGT,2024,2.07980000000
-14,2035,R2,gasCCGT,2024,2.07980000000
-14,2036,R2,gasCCGT,2024,2.07980000000
-14,2038,R2,gasCCGT,2024,2.07980000000
-14,2040,R2,gasCCGT,2024,2.07980000000
-14,2045,R2,gasCCGT,2024,2.07980000000
-14,2046,R2,gasCCGT,2024,2.07980000000
-14,2047,R2,gasCCGT,2024,2.07980000000
-14,2050,R2,gasCCGT,2024,2.07980000000
-14,2056,R2,gasCCGT,2024,2.07980000000
-14,2057,R2,gasCCGT,2024,2.07980000000
-14,2058,R2,gasCCGT,2024,2.07980000000
-14,2059,R2,gasCCGT,2024,2.07980000000
-14,2060,R2,gasCCGT,2024,2.07980000000
-15,2028,R2,gasCCGT,2026,2.29760000000
-15,2030,R2,gasCCGT,2026,2.29760000000
-15,2032,R2,gasCCGT,2026,2.29760000000
-15,2034,R2,gasCCGT,2026,2.29760000000
-15,2035,R2,gasCCGT,2026,2.29760000000
-15,2036,R2,gasCCGT,2026,2.29760000000
-15,2038,R2,gasCCGT,2026,2.29760000000
-15,2040,R2,gasCCGT,2026,2.29760000000
-15,2045,R2,gasCCGT,2026,2.29760000000
-15,2046,R2,gasCCGT,2026,2.29760000000
-15,2047,R2,gasCCGT,2026,2.29760000000
-15,2050,R2,gasCCGT,2026,2.29760000000
-15,2056,R2,gasCCGT,2026,2.29760000000
-15,2057,R2,gasCCGT,2026,2.29760000000
-15,2058,R2,gasCCGT,2026,2.29760000000
-15,2059,R2,gasCCGT,2026,2.29760000000
-15,2060,R2,gasCCGT,2026,2.29760000000
-15,2061,R2,gasCCGT,2026,2.29760000000
-15,2062,R2,gasCCGT,2026,2.29760000000
-16,2030,R2,gasCCGT,2028,2.31150000000
-16,2032,R2,gasCCGT,2028,2.31150000000
-16,2034,R2,gasCCGT,2028,2.31150000000
-16,2035,R2,gasCCGT,2028,2.31150000000
-16,2036,R2,gasCCGT,2028,2.31150000000
-16,2038,R2,gasCCGT,2028,2.31150000000
-16,2040,R2,gasCCGT,2028,2.31150000000
-16,2045,R2,gasCCGT,2028,2.31150000000
-16,2046,R2,gasCCGT,2028,2.31150000000
-16,2047,R2,gasCCGT,2028,2.31150000000
-16,2050,R2,gasCCGT,2028,2.31150000000
-16,2056,R2,gasCCGT,2028,2.31150000000
-16,2057,R2,gasCCGT,2028,2.31150000000
-16,2058,R2,gasCCGT,2028,2.31150000000
-16,2059,R2,gasCCGT,2028,2.31150000000
-16,2060,R2,gasCCGT,2028,2.31150000000
-16,2061,R2,gasCCGT,2028,2.31150000000
-16,2062,R2,gasCCGT,2028,2.31150000000
-16,2063,R2,gasCCGT,2028,2.31150000000
-16,2064,R2,gasCCGT,2028,2.31150000000
-17,2032,R2,gasCCGT,2030,0.99560000000
-17,2034,R2,gasCCGT,2030,0.99560000000
-17,2035,R2,gasCCGT,2030,0.99560000000
-17,2036,R2,gasCCGT,2030,0.99560000000
-17,2038,R2,gasCCGT,2030,0.99560000000
-17,2040,R2,gasCCGT,2030,0.99560000000
-17,2045,R2,gasCCGT,2030,0.99560000000
-17,2046,R2,gasCCGT,2030,0.99560000000
-17,2047,R2,gasCCGT,2030,0.99560000000
-17,2050,R2,gasCCGT,2030,0.99560000000
-17,2056,R2,gasCCGT,2030,0.99560000000
-17,2057,R2,gasCCGT,2030,0.99560000000
-17,2058,R2,gasCCGT,2030,0.99560000000
-17,2059,R2,gasCCGT,2030,0.99560000000
-17,2060,R2,gasCCGT,2030,0.99560000000
-17,2061,R2,gasCCGT,2030,0.99560000000
-17,2062,R2,gasCCGT,2030,0.99560000000
-17,2063,R2,gasCCGT,2030,0.99560000000
-17,2064,R2,gasCCGT,2030,0.99560000000
-17,2065,R2,gasCCGT,2030,0.99560000000
-17,2066,R2,gasCCGT,2030,0.99560000000
-18,2034,R2,solarPV,2032,2.24000000000
-18,2035,R2,solarPV,2032,2.24000000000
-18,2036,R2,solarPV,2032,2.24000000000
-18,2038,R2,solarPV,2032,2.24000000000
-18,2040,R2,solarPV,2032,2.24000000000
-18,2045,R2,solarPV,2032,2.24000000000
-18,2046,R2,solarPV,2032,2.24000000000
-18,2047,R2,solarPV,2032,2.24000000000
-18,2050,R2,solarPV,2032,2.24000000000
-18,2056,R2,solarPV,2032,2.24000000000
-18,2057,R2,solarPV,2032,2.24000000000
-18,2058,R2,solarPV,2032,2.24000000000
-19,2036,R2,solarPV,2034,2.24000000000
-19,2038,R2,solarPV,2034,2.24000000000
-19,2040,R2,solarPV,2034,2.24000000000
-19,2045,R2,solarPV,2034,2.24000000000
-19,2046,R2,solarPV,2034,2.24000000000
-19,2047,R2,solarPV,2034,2.24000000000
-19,2050,R2,solarPV,2034,2.24000000000
-19,2056,R2,solarPV,2034,2.24000000000
-19,2057,R2,solarPV,2034,2.24000000000
-19,2058,R2,solarPV,2034,2.24000000000
-19,2059,R2,solarPV,2034,2.24000000000
-19,2060,R2,solarPV,2034,2.24000000000
-20,2038,R2,solarPV,2036,2.24000000000
-20,2040,R2,solarPV,2036,2.24000000000
-20,2045,R2,solarPV,2036,2.24000000000
-20,2046,R2,solarPV,2036,2.24000000000
-20,2047,R2,solarPV,2036,2.24000000000
-20,2050,R2,solarPV,2036,2.24000000000
-20,2056,R2,solarPV,2036,2.24000000000
-20,2057,R2,solarPV,2036,2.24000000000
-20,2058,R2,solarPV,2036,2.24000000000
-20,2059,R2,solarPV,2036,2.24000000000
-20,2060,R2,solarPV,2036,2.24000000000
-20,2061,R2,solarPV,2036,2.24000000000
-20,2062,R2,solarPV,2036,2.24000000000
-21,2040,R2,solarPV,2038,2.24000000000
-21,2045,R2,solarPV,2038,2.24000000000
-21,2046,R2,solarPV,2038,2.24000000000
-21,2047,R2,solarPV,2038,2.24000000000
-21,2050,R2,solarPV,2038,2.24000000000
-21,2056,R2,solarPV,2038,2.24000000000
-21,2057,R2,solarPV,2038,2.24000000000
-21,2058,R2,solarPV,2038,2.24000000000
-21,2059,R2,solarPV,2038,2.24000000000
-21,2060,R2,solarPV,2038,2.24000000000
-21,2061,R2,solarPV,2038,2.24000000000
-21,2062,R2,solarPV,2038,2.24000000000
-21,2063,R2,solarPV,2038,2.24000000000
-21,2064,R2,solarPV,2038,2.24000000000
-22,2022,R2,windturbine,2020,8.77320000000
-22,2024,R2,windturbine,2020,8.77320000000
-22,2025,R2,windturbine,2020,8.77320000000
-22,2026,R2,windturbine,2020,8.77320000000
-22,2028,R2,windturbine,2020,8.77320000000
-22,2030,R2,windturbine,2020,8.77320000000
-22,2032,R2,windturbine,2020,8.77320000000
-22,2034,R2,windturbine,2020,8.77320000000
-22,2035,R2,windturbine,2020,8.77320000000
-22,2036,R2,windturbine,2020,8.77320000000
-22,2038,R2,windturbine,2020,8.77320000000
-22,2040,R2,windturbine,2020,8.77320000000
-22,2045,R2,windturbine,2020,8.77320000000
-22,2046,R2,windturbine,2020,8.77320000000
+6,2034,R1,gasCCGT,2032,0.75270000000
+6,2035,R1,gasCCGT,2032,0.75270000000
+6,2036,R1,gasCCGT,2032,0.75270000000
+6,2038,R1,gasCCGT,2032,0.75270000000
+6,2040,R1,gasCCGT,2032,0.75270000000
+6,2045,R1,gasCCGT,2032,0.75270000000
+6,2046,R1,gasCCGT,2032,0.75270000000
+6,2047,R1,gasCCGT,2032,0.75270000000
+6,2050,R1,gasCCGT,2032,0.75270000000
+6,2056,R1,gasCCGT,2032,0.75270000000
+6,2057,R1,gasCCGT,2032,0.75270000000
+6,2058,R1,gasCCGT,2032,0.75270000000
+6,2059,R1,gasCCGT,2032,0.75270000000
+6,2060,R1,gasCCGT,2032,0.75270000000
+6,2061,R1,gasCCGT,2032,0.75270000000
+6,2062,R1,gasCCGT,2032,0.75270000000
+6,2063,R1,gasCCGT,2032,0.75270000000
+6,2064,R1,gasCCGT,2032,0.75270000000
+6,2065,R1,gasCCGT,2032,0.75270000000
+6,2066,R1,gasCCGT,2032,0.75270000000
+6,2067,R1,gasCCGT,2032,0.75270000000
+6,2068,R1,gasCCGT,2032,0.75270000000
+7,2022,R1,solarPV,2020,0.27320000000
+7,2024,R1,solarPV,2020,0.27320000000
+7,2025,R1,solarPV,2020,0.27320000000
+7,2026,R1,solarPV,2020,0.27320000000
+7,2028,R1,solarPV,2020,0.27320000000
+7,2030,R1,solarPV,2020,0.27320000000
+7,2032,R1,solarPV,2020,0.27320000000
+7,2034,R1,solarPV,2020,0.27320000000
+7,2035,R1,solarPV,2020,0.27320000000
+7,2036,R1,solarPV,2020,0.27320000000
+7,2038,R1,solarPV,2020,0.27320000000
+7,2040,R1,solarPV,2020,0.27320000000
+7,2045,R1,solarPV,2020,0.27320000000
+7,2046,R1,solarPV,2020,0.27320000000
+8,2034,R1,solarPV,2032,0.54630000000
+8,2035,R1,solarPV,2032,0.54630000000
+8,2036,R1,solarPV,2032,0.54630000000
+8,2038,R1,solarPV,2032,0.54630000000
+8,2040,R1,solarPV,2032,0.54630000000
+8,2045,R1,solarPV,2032,0.54630000000
+8,2046,R1,solarPV,2032,0.54630000000
+8,2047,R1,solarPV,2032,0.54630000000
+8,2050,R1,solarPV,2032,0.54630000000
+8,2056,R1,solarPV,2032,0.54630000000
+8,2057,R1,solarPV,2032,0.54630000000
+8,2058,R1,solarPV,2032,0.54630000000
+9,2036,R1,solarPV,2034,1.63890000000
+9,2038,R1,solarPV,2034,1.63890000000
+9,2040,R1,solarPV,2034,1.63890000000
+9,2045,R1,solarPV,2034,1.63890000000
+9,2046,R1,solarPV,2034,1.63890000000
+9,2047,R1,solarPV,2034,1.63890000000
+9,2050,R1,solarPV,2034,1.63890000000
+9,2056,R1,solarPV,2034,1.63890000000
+9,2057,R1,solarPV,2034,1.63890000000
+9,2058,R1,solarPV,2034,1.63890000000
+9,2059,R1,solarPV,2034,1.63890000000
+9,2060,R1,solarPV,2034,1.63890000000
+10,2038,R1,solarPV,2036,2.24000000000
+10,2040,R1,solarPV,2036,2.24000000000
+10,2045,R1,solarPV,2036,2.24000000000
+10,2046,R1,solarPV,2036,2.24000000000
+10,2047,R1,solarPV,2036,2.24000000000
+10,2050,R1,solarPV,2036,2.24000000000
+10,2056,R1,solarPV,2036,2.24000000000
+10,2057,R1,solarPV,2036,2.24000000000
+10,2058,R1,solarPV,2036,2.24000000000
+10,2059,R1,solarPV,2036,2.24000000000
+10,2060,R1,solarPV,2036,2.24000000000
+10,2061,R1,solarPV,2036,2.24000000000
+10,2062,R1,solarPV,2036,2.24000000000
+11,2040,R1,solarPV,2038,2.24000000000
+11,2045,R1,solarPV,2038,2.24000000000
+11,2046,R1,solarPV,2038,2.24000000000
+11,2047,R1,solarPV,2038,2.24000000000
+11,2050,R1,solarPV,2038,2.24000000000
+11,2056,R1,solarPV,2038,2.24000000000
+11,2057,R1,solarPV,2038,2.24000000000
+11,2058,R1,solarPV,2038,2.24000000000
+11,2059,R1,solarPV,2038,2.24000000000
+11,2060,R1,solarPV,2038,2.24000000000
+11,2061,R1,solarPV,2038,2.24000000000
+11,2062,R1,solarPV,2038,2.24000000000
+11,2063,R1,solarPV,2038,2.24000000000
+11,2064,R1,solarPV,2038,2.24000000000
+12,2022,R1,windturbine,2020,4.00000000000
+12,2024,R1,windturbine,2020,4.00000000000
+12,2025,R1,windturbine,2020,4.00000000000
+12,2026,R1,windturbine,2020,4.00000000000
+12,2028,R1,windturbine,2020,4.00000000000
+12,2030,R1,windturbine,2020,4.00000000000
+12,2032,R1,windturbine,2020,4.00000000000
+12,2034,R1,windturbine,2020,4.00000000000
+12,2035,R1,windturbine,2020,4.00000000000
+12,2036,R1,windturbine,2020,4.00000000000
+12,2038,R1,windturbine,2020,4.00000000000
+12,2040,R1,windturbine,2020,4.00000000000
+12,2045,R1,windturbine,2020,4.00000000000
+12,2046,R1,windturbine,2020,4.00000000000
+13,2036,R1,windturbine,2034,0.60110000000
+13,2038,R1,windturbine,2034,0.60110000000
+13,2040,R1,windturbine,2034,0.60110000000
+13,2045,R1,windturbine,2034,0.60110000000
+13,2046,R1,windturbine,2034,0.60110000000
+13,2047,R1,windturbine,2034,0.60110000000
+13,2050,R1,windturbine,2034,0.60110000000
+13,2056,R1,windturbine,2034,0.60110000000
+13,2057,R1,windturbine,2034,0.60110000000
+13,2058,R1,windturbine,2034,0.60110000000
+13,2059,R1,windturbine,2034,0.60110000000
+13,2060,R1,windturbine,2034,0.60110000000
+14,2020,R2,gasCCGT,2020,1.00000000000
+14,2022,R2,gasCCGT,2020,3.00000000000
+14,2024,R2,gasCCGT,2020,3.00000000000
+14,2025,R2,gasCCGT,2020,3.00000000000
+14,2026,R2,gasCCGT,2020,2.80000000000
+14,2028,R2,gasCCGT,2020,2.40000000000
+14,2030,R2,gasCCGT,2020,2.00000000000
+14,2032,R2,gasCCGT,2020,2.00000000000
+14,2034,R2,gasCCGT,2020,2.00000000000
+14,2035,R2,gasCCGT,2020,2.00000000000
+14,2036,R2,gasCCGT,2020,2.00000000000
+14,2038,R2,gasCCGT,2020,2.00000000000
+14,2040,R2,gasCCGT,2020,2.00000000000
+14,2045,R2,gasCCGT,2020,2.00000000000
+14,2046,R2,gasCCGT,2020,2.00000000000
+14,2047,R2,gasCCGT,2020,2.00000000000
+14,2050,R2,gasCCGT,2020,2.00000000000
+14,2056,R2,gasCCGT,2020,2.00000000000
+15,2024,R2,gasCCGT,2022,1.85640000000
+15,2025,R2,gasCCGT,2022,1.85640000000
+15,2026,R2,gasCCGT,2022,1.85640000000
+15,2028,R2,gasCCGT,2022,1.85640000000
+15,2030,R2,gasCCGT,2022,1.85640000000
+15,2032,R2,gasCCGT,2022,1.85640000000
+15,2034,R2,gasCCGT,2022,1.85640000000
+15,2035,R2,gasCCGT,2022,1.85640000000
+15,2036,R2,gasCCGT,2022,1.85640000000
+15,2038,R2,gasCCGT,2022,1.85640000000
+15,2040,R2,gasCCGT,2022,1.85640000000
+15,2045,R2,gasCCGT,2022,1.85640000000
+15,2046,R2,gasCCGT,2022,1.85640000000
+15,2047,R2,gasCCGT,2022,1.85640000000
+15,2050,R2,gasCCGT,2022,1.85640000000
+15,2056,R2,gasCCGT,2022,1.85640000000
+15,2057,R2,gasCCGT,2022,1.85640000000
+15,2058,R2,gasCCGT,2022,1.85640000000
+16,2026,R2,gasCCGT,2024,2.07980000000
+16,2028,R2,gasCCGT,2024,2.07980000000
+16,2030,R2,gasCCGT,2024,2.07980000000
+16,2032,R2,gasCCGT,2024,2.07980000000
+16,2034,R2,gasCCGT,2024,2.07980000000
+16,2035,R2,gasCCGT,2024,2.07980000000
+16,2036,R2,gasCCGT,2024,2.07980000000
+16,2038,R2,gasCCGT,2024,2.07980000000
+16,2040,R2,gasCCGT,2024,2.07980000000
+16,2045,R2,gasCCGT,2024,2.07980000000
+16,2046,R2,gasCCGT,2024,2.07980000000
+16,2047,R2,gasCCGT,2024,2.07980000000
+16,2050,R2,gasCCGT,2024,2.07980000000
+16,2056,R2,gasCCGT,2024,2.07980000000
+16,2057,R2,gasCCGT,2024,2.07980000000
+16,2058,R2,gasCCGT,2024,2.07980000000
+16,2059,R2,gasCCGT,2024,2.07980000000
+16,2060,R2,gasCCGT,2024,2.07980000000
+17,2028,R2,gasCCGT,2026,2.29760000000
+17,2030,R2,gasCCGT,2026,2.29760000000
+17,2032,R2,gasCCGT,2026,2.29760000000
+17,2034,R2,gasCCGT,2026,2.29760000000
+17,2035,R2,gasCCGT,2026,2.29760000000
+17,2036,R2,gasCCGT,2026,2.29760000000
+17,2038,R2,gasCCGT,2026,2.29760000000
+17,2040,R2,gasCCGT,2026,2.29760000000
+17,2045,R2,gasCCGT,2026,2.29760000000
+17,2046,R2,gasCCGT,2026,2.29760000000
+17,2047,R2,gasCCGT,2026,2.29760000000
+17,2050,R2,gasCCGT,2026,2.29760000000
+17,2056,R2,gasCCGT,2026,2.29760000000
+17,2057,R2,gasCCGT,2026,2.29760000000
+17,2058,R2,gasCCGT,2026,2.29760000000
+17,2059,R2,gasCCGT,2026,2.29760000000
+17,2060,R2,gasCCGT,2026,2.29760000000
+17,2061,R2,gasCCGT,2026,2.29760000000
+17,2062,R2,gasCCGT,2026,2.29760000000
+18,2030,R2,gasCCGT,2028,2.31150000000
+18,2032,R2,gasCCGT,2028,2.31150000000
+18,2034,R2,gasCCGT,2028,2.31150000000
+18,2035,R2,gasCCGT,2028,2.31150000000
+18,2036,R2,gasCCGT,2028,2.31150000000
+18,2038,R2,gasCCGT,2028,2.31150000000
+18,2040,R2,gasCCGT,2028,2.31150000000
+18,2045,R2,gasCCGT,2028,2.31150000000
+18,2046,R2,gasCCGT,2028,2.31150000000
+18,2047,R2,gasCCGT,2028,2.31150000000
+18,2050,R2,gasCCGT,2028,2.31150000000
+18,2056,R2,gasCCGT,2028,2.31150000000
+18,2057,R2,gasCCGT,2028,2.31150000000
+18,2058,R2,gasCCGT,2028,2.31150000000
+18,2059,R2,gasCCGT,2028,2.31150000000
+18,2060,R2,gasCCGT,2028,2.31150000000
+18,2061,R2,gasCCGT,2028,2.31150000000
+18,2062,R2,gasCCGT,2028,2.31150000000
+18,2063,R2,gasCCGT,2028,2.31150000000
+18,2064,R2,gasCCGT,2028,2.31150000000
+19,2032,R2,gasCCGT,2030,0.99560000000
+19,2034,R2,gasCCGT,2030,0.99560000000
+19,2035,R2,gasCCGT,2030,0.99560000000
+19,2036,R2,gasCCGT,2030,0.99560000000
+19,2038,R2,gasCCGT,2030,0.99560000000
+19,2040,R2,gasCCGT,2030,0.99560000000
+19,2045,R2,gasCCGT,2030,0.99560000000
+19,2046,R2,gasCCGT,2030,0.99560000000
+19,2047,R2,gasCCGT,2030,0.99560000000
+19,2050,R2,gasCCGT,2030,0.99560000000
+19,2056,R2,gasCCGT,2030,0.99560000000
+19,2057,R2,gasCCGT,2030,0.99560000000
+19,2058,R2,gasCCGT,2030,0.99560000000
+19,2059,R2,gasCCGT,2030,0.99560000000
+19,2060,R2,gasCCGT,2030,0.99560000000
+19,2061,R2,gasCCGT,2030,0.99560000000
+19,2062,R2,gasCCGT,2030,0.99560000000
+19,2063,R2,gasCCGT,2030,0.99560000000
+19,2064,R2,gasCCGT,2030,0.99560000000
+19,2065,R2,gasCCGT,2030,0.99560000000
+19,2066,R2,gasCCGT,2030,0.99560000000
+20,2034,R2,solarPV,2032,2.24000000000
+20,2035,R2,solarPV,2032,2.24000000000
+20,2036,R2,solarPV,2032,2.24000000000
+20,2038,R2,solarPV,2032,2.24000000000
+20,2040,R2,solarPV,2032,2.24000000000
+20,2045,R2,solarPV,2032,2.24000000000
+20,2046,R2,solarPV,2032,2.24000000000
+20,2047,R2,solarPV,2032,2.24000000000
+20,2050,R2,solarPV,2032,2.24000000000
+20,2056,R2,solarPV,2032,2.24000000000
+20,2057,R2,solarPV,2032,2.24000000000
+20,2058,R2,solarPV,2032,2.24000000000
+21,2036,R2,solarPV,2034,2.24000000000
+21,2038,R2,solarPV,2034,2.24000000000
+21,2040,R2,solarPV,2034,2.24000000000
+21,2045,R2,solarPV,2034,2.24000000000
+21,2046,R2,solarPV,2034,2.24000000000
+21,2047,R2,solarPV,2034,2.24000000000
+21,2050,R2,solarPV,2034,2.24000000000
+21,2056,R2,solarPV,2034,2.24000000000
+21,2057,R2,solarPV,2034,2.24000000000
+21,2058,R2,solarPV,2034,2.24000000000
+21,2059,R2,solarPV,2034,2.24000000000
+21,2060,R2,solarPV,2034,2.24000000000
+22,2038,R2,solarPV,2036,2.24000000000
+22,2040,R2,solarPV,2036,2.24000000000
+22,2045,R2,solarPV,2036,2.24000000000
+22,2046,R2,solarPV,2036,2.24000000000
+22,2047,R2,solarPV,2036,2.24000000000
+22,2050,R2,solarPV,2036,2.24000000000
+22,2056,R2,solarPV,2036,2.24000000000
+22,2057,R2,solarPV,2036,2.24000000000
+22,2058,R2,solarPV,2036,2.24000000000
+22,2059,R2,solarPV,2036,2.24000000000
+22,2060,R2,solarPV,2036,2.24000000000
+22,2061,R2,solarPV,2036,2.24000000000
+22,2062,R2,solarPV,2036,2.24000000000
+23,2040,R2,solarPV,2038,2.24000000000
+23,2045,R2,solarPV,2038,2.24000000000
+23,2046,R2,solarPV,2038,2.24000000000
+23,2047,R2,solarPV,2038,2.24000000000
+23,2050,R2,solarPV,2038,2.24000000000
+23,2056,R2,solarPV,2038,2.24000000000
+23,2057,R2,solarPV,2038,2.24000000000
+23,2058,R2,solarPV,2038,2.24000000000
+23,2059,R2,solarPV,2038,2.24000000000
+23,2060,R2,solarPV,2038,2.24000000000
+23,2061,R2,solarPV,2038,2.24000000000
+23,2062,R2,solarPV,2038,2.24000000000
+23,2063,R2,solarPV,2038,2.24000000000
+23,2064,R2,solarPV,2038,2.24000000000
+24,2022,R2,windturbine,2020,4.27320000000
+24,2024,R2,windturbine,2020,4.27320000000
+24,2025,R2,windturbine,2020,4.27320000000
+24,2026,R2,windturbine,2020,4.27320000000
+24,2028,R2,windturbine,2020,4.27320000000
+24,2030,R2,windturbine,2020,4.27320000000
+24,2032,R2,windturbine,2020,4.27320000000
+24,2034,R2,windturbine,2020,4.27320000000
+24,2035,R2,windturbine,2020,4.27320000000
+24,2036,R2,windturbine,2020,4.27320000000
+24,2038,R2,windturbine,2020,4.27320000000
+24,2040,R2,windturbine,2020,4.27320000000
+24,2045,R2,windturbine,2020,4.27320000000
+24,2046,R2,windturbine,2020,4.27320000000
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 57788586..e41711ae 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,23 +1,23 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2022,R1,gasCCGT,2020,1.34360000000
-0,2024,R1,gasCCGT,2020,1.34360000000
-0,2025,R1,gasCCGT,2020,1.34360000000
-0,2026,R1,gasCCGT,2020,1.14360000000
-0,2028,R1,gasCCGT,2020,0.74360000000
-0,2030,R1,gasCCGT,2020,0.34360000000
-0,2032,R1,gasCCGT,2020,0.34360000000
-0,2034,R1,gasCCGT,2020,0.34360000000
-0,2035,R1,gasCCGT,2020,0.34360000000
-0,2036,R1,gasCCGT,2020,0.34360000000
-0,2038,R1,gasCCGT,2020,0.34360000000
-0,2040,R1,gasCCGT,2020,0.34360000000
-0,2042,R1,gasCCGT,2020,0.34360000000
-0,2045,R1,gasCCGT,2020,0.34360000000
-0,2046,R1,gasCCGT,2020,0.34360000000
-0,2047,R1,gasCCGT,2020,0.34360000000
-0,2050,R1,gasCCGT,2020,0.34360000000
-0,2056,R1,gasCCGT,2020,0.34360000000
+0,2022,R1,gasCCGT,2020,3.00000000000
+0,2024,R1,gasCCGT,2020,3.00000000000
+0,2025,R1,gasCCGT,2020,3.00000000000
+0,2026,R1,gasCCGT,2020,2.80000000000
+0,2028,R1,gasCCGT,2020,2.40000000000
+0,2030,R1,gasCCGT,2020,2.00000000000
+0,2032,R1,gasCCGT,2020,2.00000000000
+0,2034,R1,gasCCGT,2020,2.00000000000
+0,2035,R1,gasCCGT,2020,2.00000000000
+0,2036,R1,gasCCGT,2020,2.00000000000
+0,2038,R1,gasCCGT,2020,2.00000000000
+0,2040,R1,gasCCGT,2020,2.00000000000
+0,2042,R1,gasCCGT,2020,2.00000000000
+0,2045,R1,gasCCGT,2020,2.00000000000
+0,2046,R1,gasCCGT,2020,2.00000000000
+0,2047,R1,gasCCGT,2020,2.00000000000
+0,2050,R1,gasCCGT,2020,2.00000000000
+0,2056,R1,gasCCGT,2020,2.00000000000
 1,2024,R1,gasCCGT,2022,1.85640000000
 1,2025,R1,gasCCGT,2022,1.85640000000
 1,2026,R1,gasCCGT,2022,1.85640000000
@@ -119,297 +119,346 @@ asset,year,region,technology,installed,capacity
 5,2064,R1,gasCCGT,2030,0.99560000000
 5,2065,R1,gasCCGT,2030,0.99560000000
 5,2066,R1,gasCCGT,2030,0.99560000000
-6,2022,R1,solarPV,2020,4.00000000000
-6,2024,R1,solarPV,2020,4.00000000000
-6,2025,R1,solarPV,2020,4.00000000000
-6,2026,R1,solarPV,2020,4.00000000000
-6,2028,R1,solarPV,2020,4.00000000000
-6,2030,R1,solarPV,2020,4.00000000000
-6,2032,R1,solarPV,2020,4.00000000000
-6,2034,R1,solarPV,2020,4.00000000000
-6,2035,R1,solarPV,2020,4.00000000000
-6,2036,R1,solarPV,2020,4.00000000000
-6,2038,R1,solarPV,2020,4.00000000000
-6,2040,R1,solarPV,2020,4.00000000000
-6,2042,R1,solarPV,2020,4.00000000000
-6,2045,R1,solarPV,2020,4.00000000000
-6,2046,R1,solarPV,2020,4.00000000000
-7,2034,R1,solarPV,2032,2.24000000000
-7,2035,R1,solarPV,2032,2.24000000000
-7,2036,R1,solarPV,2032,2.24000000000
-7,2038,R1,solarPV,2032,2.24000000000
-7,2040,R1,solarPV,2032,2.24000000000
-7,2042,R1,solarPV,2032,2.24000000000
-7,2045,R1,solarPV,2032,2.24000000000
-7,2046,R1,solarPV,2032,2.24000000000
-7,2047,R1,solarPV,2032,2.24000000000
-7,2050,R1,solarPV,2032,2.24000000000
-7,2056,R1,solarPV,2032,2.24000000000
-7,2057,R1,solarPV,2032,2.24000000000
-7,2058,R1,solarPV,2032,2.24000000000
-8,2036,R1,solarPV,2034,2.24000000000
-8,2038,R1,solarPV,2034,2.24000000000
-8,2040,R1,solarPV,2034,2.24000000000
-8,2042,R1,solarPV,2034,2.24000000000
-8,2045,R1,solarPV,2034,2.24000000000
-8,2046,R1,solarPV,2034,2.24000000000
-8,2047,R1,solarPV,2034,2.24000000000
-8,2050,R1,solarPV,2034,2.24000000000
-8,2056,R1,solarPV,2034,2.24000000000
-8,2057,R1,solarPV,2034,2.24000000000
-8,2058,R1,solarPV,2034,2.24000000000
-8,2059,R1,solarPV,2034,2.24000000000
-8,2060,R1,solarPV,2034,2.24000000000
-9,2038,R1,solarPV,2036,2.24000000000
-9,2040,R1,solarPV,2036,2.24000000000
-9,2042,R1,solarPV,2036,2.24000000000
-9,2045,R1,solarPV,2036,2.24000000000
-9,2046,R1,solarPV,2036,2.24000000000
-9,2047,R1,solarPV,2036,2.24000000000
-9,2050,R1,solarPV,2036,2.24000000000
-9,2056,R1,solarPV,2036,2.24000000000
-9,2057,R1,solarPV,2036,2.24000000000
-9,2058,R1,solarPV,2036,2.24000000000
-9,2059,R1,solarPV,2036,2.24000000000
-9,2060,R1,solarPV,2036,2.24000000000
-9,2061,R1,solarPV,2036,2.24000000000
-9,2062,R1,solarPV,2036,2.24000000000
-10,2040,R1,solarPV,2038,2.24000000000
-10,2042,R1,solarPV,2038,2.24000000000
-10,2045,R1,solarPV,2038,2.24000000000
-10,2046,R1,solarPV,2038,2.24000000000
-10,2047,R1,solarPV,2038,2.24000000000
-10,2050,R1,solarPV,2038,2.24000000000
-10,2056,R1,solarPV,2038,2.24000000000
-10,2057,R1,solarPV,2038,2.24000000000
-10,2058,R1,solarPV,2038,2.24000000000
-10,2059,R1,solarPV,2038,2.24000000000
-10,2060,R1,solarPV,2038,2.24000000000
-10,2061,R1,solarPV,2038,2.24000000000
-10,2062,R1,solarPV,2038,2.24000000000
-10,2063,R1,solarPV,2038,2.24000000000
-10,2064,R1,solarPV,2038,2.24000000000
-11,2042,R1,solarPV,2040,2.24000000000
-11,2045,R1,solarPV,2040,2.24000000000
-11,2046,R1,solarPV,2040,2.24000000000
-11,2047,R1,solarPV,2040,2.24000000000
-11,2050,R1,solarPV,2040,2.24000000000
-11,2056,R1,solarPV,2040,2.24000000000
-11,2057,R1,solarPV,2040,2.24000000000
-11,2058,R1,solarPV,2040,2.24000000000
-11,2059,R1,solarPV,2040,2.24000000000
-11,2060,R1,solarPV,2040,2.24000000000
-11,2061,R1,solarPV,2040,2.24000000000
-11,2062,R1,solarPV,2040,2.24000000000
-11,2063,R1,solarPV,2040,2.24000000000
-11,2064,R1,solarPV,2040,2.24000000000
-11,2065,R1,solarPV,2040,2.24000000000
-11,2066,R1,solarPV,2040,2.24000000000
-12,2022,R1,windturbine,2020,4.00000000000
-12,2024,R1,windturbine,2020,4.00000000000
-12,2025,R1,windturbine,2020,4.00000000000
-12,2026,R1,windturbine,2020,4.00000000000
-12,2028,R1,windturbine,2020,4.00000000000
-12,2030,R1,windturbine,2020,4.00000000000
-12,2032,R1,windturbine,2020,4.00000000000
-12,2034,R1,windturbine,2020,4.00000000000
-12,2035,R1,windturbine,2020,4.00000000000
-12,2036,R1,windturbine,2020,4.00000000000
-12,2038,R1,windturbine,2020,4.00000000000
-12,2040,R1,windturbine,2020,4.00000000000
-12,2042,R1,windturbine,2020,4.00000000000
-12,2045,R1,windturbine,2020,4.00000000000
-12,2046,R1,windturbine,2020,4.00000000000
-13,2020,R2,gasCCGT,2020,1.00000000000
-13,2022,R2,gasCCGT,2020,1.00000000000
-13,2024,R2,gasCCGT,2020,1.00000000000
-13,2025,R2,gasCCGT,2020,1.00000000000
-13,2026,R2,gasCCGT,2020,0.80000000000
-13,2028,R2,gasCCGT,2020,0.40000000000
-14,2024,R2,gasCCGT,2022,1.85640000000
-14,2025,R2,gasCCGT,2022,1.85640000000
-14,2026,R2,gasCCGT,2022,1.85640000000
-14,2028,R2,gasCCGT,2022,1.85640000000
-14,2030,R2,gasCCGT,2022,1.85640000000
-14,2032,R2,gasCCGT,2022,1.85640000000
-14,2034,R2,gasCCGT,2022,1.85640000000
-14,2035,R2,gasCCGT,2022,1.85640000000
-14,2036,R2,gasCCGT,2022,1.85640000000
-14,2038,R2,gasCCGT,2022,1.85640000000
-14,2040,R2,gasCCGT,2022,1.85640000000
-14,2042,R2,gasCCGT,2022,1.85640000000
-14,2045,R2,gasCCGT,2022,1.85640000000
-14,2046,R2,gasCCGT,2022,1.85640000000
-14,2047,R2,gasCCGT,2022,1.85640000000
-14,2050,R2,gasCCGT,2022,1.85640000000
-14,2056,R2,gasCCGT,2022,1.85640000000
-14,2057,R2,gasCCGT,2022,1.85640000000
-14,2058,R2,gasCCGT,2022,1.85640000000
-15,2026,R2,gasCCGT,2024,2.07980000000
-15,2028,R2,gasCCGT,2024,2.07980000000
-15,2030,R2,gasCCGT,2024,2.07980000000
-15,2032,R2,gasCCGT,2024,2.07980000000
-15,2034,R2,gasCCGT,2024,2.07980000000
-15,2035,R2,gasCCGT,2024,2.07980000000
-15,2036,R2,gasCCGT,2024,2.07980000000
-15,2038,R2,gasCCGT,2024,2.07980000000
-15,2040,R2,gasCCGT,2024,2.07980000000
-15,2042,R2,gasCCGT,2024,2.07980000000
-15,2045,R2,gasCCGT,2024,2.07980000000
-15,2046,R2,gasCCGT,2024,2.07980000000
-15,2047,R2,gasCCGT,2024,2.07980000000
-15,2050,R2,gasCCGT,2024,2.07980000000
-15,2056,R2,gasCCGT,2024,2.07980000000
-15,2057,R2,gasCCGT,2024,2.07980000000
-15,2058,R2,gasCCGT,2024,2.07980000000
-15,2059,R2,gasCCGT,2024,2.07980000000
-15,2060,R2,gasCCGT,2024,2.07980000000
-16,2028,R2,gasCCGT,2026,2.29760000000
-16,2030,R2,gasCCGT,2026,2.29760000000
-16,2032,R2,gasCCGT,2026,2.29760000000
-16,2034,R2,gasCCGT,2026,2.29760000000
-16,2035,R2,gasCCGT,2026,2.29760000000
-16,2036,R2,gasCCGT,2026,2.29760000000
-16,2038,R2,gasCCGT,2026,2.29760000000
-16,2040,R2,gasCCGT,2026,2.29760000000
-16,2042,R2,gasCCGT,2026,2.29760000000
-16,2045,R2,gasCCGT,2026,2.29760000000
-16,2046,R2,gasCCGT,2026,2.29760000000
-16,2047,R2,gasCCGT,2026,2.29760000000
-16,2050,R2,gasCCGT,2026,2.29760000000
-16,2056,R2,gasCCGT,2026,2.29760000000
-16,2057,R2,gasCCGT,2026,2.29760000000
-16,2058,R2,gasCCGT,2026,2.29760000000
-16,2059,R2,gasCCGT,2026,2.29760000000
-16,2060,R2,gasCCGT,2026,2.29760000000
-16,2061,R2,gasCCGT,2026,2.29760000000
-16,2062,R2,gasCCGT,2026,2.29760000000
-17,2030,R2,gasCCGT,2028,2.31150000000
-17,2032,R2,gasCCGT,2028,2.31150000000
-17,2034,R2,gasCCGT,2028,2.31150000000
-17,2035,R2,gasCCGT,2028,2.31150000000
-17,2036,R2,gasCCGT,2028,2.31150000000
-17,2038,R2,gasCCGT,2028,2.31150000000
-17,2040,R2,gasCCGT,2028,2.31150000000
-17,2042,R2,gasCCGT,2028,2.31150000000
-17,2045,R2,gasCCGT,2028,2.31150000000
-17,2046,R2,gasCCGT,2028,2.31150000000
-17,2047,R2,gasCCGT,2028,2.31150000000
-17,2050,R2,gasCCGT,2028,2.31150000000
-17,2056,R2,gasCCGT,2028,2.31150000000
-17,2057,R2,gasCCGT,2028,2.31150000000
-17,2058,R2,gasCCGT,2028,2.31150000000
-17,2059,R2,gasCCGT,2028,2.31150000000
-17,2060,R2,gasCCGT,2028,2.31150000000
-17,2061,R2,gasCCGT,2028,2.31150000000
-17,2062,R2,gasCCGT,2028,2.31150000000
-17,2063,R2,gasCCGT,2028,2.31150000000
-17,2064,R2,gasCCGT,2028,2.31150000000
-18,2032,R2,gasCCGT,2030,0.99560000000
-18,2034,R2,gasCCGT,2030,0.99560000000
-18,2035,R2,gasCCGT,2030,0.99560000000
-18,2036,R2,gasCCGT,2030,0.99560000000
-18,2038,R2,gasCCGT,2030,0.99560000000
-18,2040,R2,gasCCGT,2030,0.99560000000
-18,2042,R2,gasCCGT,2030,0.99560000000
-18,2045,R2,gasCCGT,2030,0.99560000000
-18,2046,R2,gasCCGT,2030,0.99560000000
-18,2047,R2,gasCCGT,2030,0.99560000000
-18,2050,R2,gasCCGT,2030,0.99560000000
-18,2056,R2,gasCCGT,2030,0.99560000000
-18,2057,R2,gasCCGT,2030,0.99560000000
-18,2058,R2,gasCCGT,2030,0.99560000000
-18,2059,R2,gasCCGT,2030,0.99560000000
-18,2060,R2,gasCCGT,2030,0.99560000000
-18,2061,R2,gasCCGT,2030,0.99560000000
-18,2062,R2,gasCCGT,2030,0.99560000000
-18,2063,R2,gasCCGT,2030,0.99560000000
-18,2064,R2,gasCCGT,2030,0.99560000000
-18,2065,R2,gasCCGT,2030,0.99560000000
-18,2066,R2,gasCCGT,2030,0.99560000000
-19,2034,R2,solarPV,2032,2.24000000000
-19,2035,R2,solarPV,2032,2.24000000000
-19,2036,R2,solarPV,2032,2.24000000000
-19,2038,R2,solarPV,2032,2.24000000000
-19,2040,R2,solarPV,2032,2.24000000000
-19,2042,R2,solarPV,2032,2.24000000000
-19,2045,R2,solarPV,2032,2.24000000000
-19,2046,R2,solarPV,2032,2.24000000000
-19,2047,R2,solarPV,2032,2.24000000000
-19,2050,R2,solarPV,2032,2.24000000000
-19,2056,R2,solarPV,2032,2.24000000000
-19,2057,R2,solarPV,2032,2.24000000000
-19,2058,R2,solarPV,2032,2.24000000000
-20,2036,R2,solarPV,2034,2.24000000000
-20,2038,R2,solarPV,2034,2.24000000000
-20,2040,R2,solarPV,2034,2.24000000000
-20,2042,R2,solarPV,2034,2.24000000000
-20,2045,R2,solarPV,2034,2.24000000000
-20,2046,R2,solarPV,2034,2.24000000000
-20,2047,R2,solarPV,2034,2.24000000000
-20,2050,R2,solarPV,2034,2.24000000000
-20,2056,R2,solarPV,2034,2.24000000000
-20,2057,R2,solarPV,2034,2.24000000000
-20,2058,R2,solarPV,2034,2.24000000000
-20,2059,R2,solarPV,2034,2.24000000000
-20,2060,R2,solarPV,2034,2.24000000000
-21,2038,R2,solarPV,2036,2.24000000000
-21,2040,R2,solarPV,2036,2.24000000000
-21,2042,R2,solarPV,2036,2.24000000000
-21,2045,R2,solarPV,2036,2.24000000000
-21,2046,R2,solarPV,2036,2.24000000000
-21,2047,R2,solarPV,2036,2.24000000000
-21,2050,R2,solarPV,2036,2.24000000000
-21,2056,R2,solarPV,2036,2.24000000000
-21,2057,R2,solarPV,2036,2.24000000000
-21,2058,R2,solarPV,2036,2.24000000000
-21,2059,R2,solarPV,2036,2.24000000000
-21,2060,R2,solarPV,2036,2.24000000000
-21,2061,R2,solarPV,2036,2.24000000000
-21,2062,R2,solarPV,2036,2.24000000000
-22,2040,R2,solarPV,2038,2.24000000000
-22,2042,R2,solarPV,2038,2.24000000000
-22,2045,R2,solarPV,2038,2.24000000000
-22,2046,R2,solarPV,2038,2.24000000000
-22,2047,R2,solarPV,2038,2.24000000000
-22,2050,R2,solarPV,2038,2.24000000000
-22,2056,R2,solarPV,2038,2.24000000000
-22,2057,R2,solarPV,2038,2.24000000000
-22,2058,R2,solarPV,2038,2.24000000000
-22,2059,R2,solarPV,2038,2.24000000000
-22,2060,R2,solarPV,2038,2.24000000000
-22,2061,R2,solarPV,2038,2.24000000000
-22,2062,R2,solarPV,2038,2.24000000000
-22,2063,R2,solarPV,2038,2.24000000000
-22,2064,R2,solarPV,2038,2.24000000000
-23,2042,R2,solarPV,2040,2.24000000000
-23,2045,R2,solarPV,2040,2.24000000000
-23,2046,R2,solarPV,2040,2.24000000000
-23,2047,R2,solarPV,2040,2.24000000000
-23,2050,R2,solarPV,2040,2.24000000000
-23,2056,R2,solarPV,2040,2.24000000000
-23,2057,R2,solarPV,2040,2.24000000000
-23,2058,R2,solarPV,2040,2.24000000000
-23,2059,R2,solarPV,2040,2.24000000000
-23,2060,R2,solarPV,2040,2.24000000000
-23,2061,R2,solarPV,2040,2.24000000000
-23,2062,R2,solarPV,2040,2.24000000000
-23,2063,R2,solarPV,2040,2.24000000000
-23,2064,R2,solarPV,2040,2.24000000000
-23,2065,R2,solarPV,2040,2.24000000000
-23,2066,R2,solarPV,2040,2.24000000000
-24,2022,R2,windturbine,2020,8.77320000000
-24,2024,R2,windturbine,2020,8.77320000000
-24,2025,R2,windturbine,2020,8.77320000000
-24,2026,R2,windturbine,2020,8.77320000000
-24,2028,R2,windturbine,2020,8.77320000000
-24,2030,R2,windturbine,2020,8.77320000000
-24,2032,R2,windturbine,2020,8.77320000000
-24,2034,R2,windturbine,2020,8.77320000000
-24,2035,R2,windturbine,2020,8.77320000000
-24,2036,R2,windturbine,2020,8.77320000000
-24,2038,R2,windturbine,2020,8.77320000000
-24,2040,R2,windturbine,2020,8.77320000000
-24,2042,R2,windturbine,2020,8.77320000000
-24,2045,R2,windturbine,2020,8.77320000000
-24,2046,R2,windturbine,2020,8.77320000000
+6,2034,R1,gasCCGT,2032,0.75270000000
+6,2035,R1,gasCCGT,2032,0.75270000000
+6,2036,R1,gasCCGT,2032,0.75270000000
+6,2038,R1,gasCCGT,2032,0.75270000000
+6,2040,R1,gasCCGT,2032,0.75270000000
+6,2042,R1,gasCCGT,2032,0.75270000000
+6,2045,R1,gasCCGT,2032,0.75270000000
+6,2046,R1,gasCCGT,2032,0.75270000000
+6,2047,R1,gasCCGT,2032,0.75270000000
+6,2050,R1,gasCCGT,2032,0.75270000000
+6,2056,R1,gasCCGT,2032,0.75270000000
+6,2057,R1,gasCCGT,2032,0.75270000000
+6,2058,R1,gasCCGT,2032,0.75270000000
+6,2059,R1,gasCCGT,2032,0.75270000000
+6,2060,R1,gasCCGT,2032,0.75270000000
+6,2061,R1,gasCCGT,2032,0.75270000000
+6,2062,R1,gasCCGT,2032,0.75270000000
+6,2063,R1,gasCCGT,2032,0.75270000000
+6,2064,R1,gasCCGT,2032,0.75270000000
+6,2065,R1,gasCCGT,2032,0.75270000000
+6,2066,R1,gasCCGT,2032,0.75270000000
+6,2067,R1,gasCCGT,2032,0.75270000000
+6,2068,R1,gasCCGT,2032,0.75270000000
+7,2022,R1,solarPV,2020,0.27320000000
+7,2024,R1,solarPV,2020,0.27320000000
+7,2025,R1,solarPV,2020,0.27320000000
+7,2026,R1,solarPV,2020,0.27320000000
+7,2028,R1,solarPV,2020,0.27320000000
+7,2030,R1,solarPV,2020,0.27320000000
+7,2032,R1,solarPV,2020,0.27320000000
+7,2034,R1,solarPV,2020,0.27320000000
+7,2035,R1,solarPV,2020,0.27320000000
+7,2036,R1,solarPV,2020,0.27320000000
+7,2038,R1,solarPV,2020,0.27320000000
+7,2040,R1,solarPV,2020,0.27320000000
+7,2042,R1,solarPV,2020,0.27320000000
+7,2045,R1,solarPV,2020,0.27320000000
+7,2046,R1,solarPV,2020,0.27320000000
+8,2034,R1,solarPV,2032,0.54630000000
+8,2035,R1,solarPV,2032,0.54630000000
+8,2036,R1,solarPV,2032,0.54630000000
+8,2038,R1,solarPV,2032,0.54630000000
+8,2040,R1,solarPV,2032,0.54630000000
+8,2042,R1,solarPV,2032,0.54630000000
+8,2045,R1,solarPV,2032,0.54630000000
+8,2046,R1,solarPV,2032,0.54630000000
+8,2047,R1,solarPV,2032,0.54630000000
+8,2050,R1,solarPV,2032,0.54630000000
+8,2056,R1,solarPV,2032,0.54630000000
+8,2057,R1,solarPV,2032,0.54630000000
+8,2058,R1,solarPV,2032,0.54630000000
+9,2036,R1,solarPV,2034,1.63890000000
+9,2038,R1,solarPV,2034,1.63890000000
+9,2040,R1,solarPV,2034,1.63890000000
+9,2042,R1,solarPV,2034,1.63890000000
+9,2045,R1,solarPV,2034,1.63890000000
+9,2046,R1,solarPV,2034,1.63890000000
+9,2047,R1,solarPV,2034,1.63890000000
+9,2050,R1,solarPV,2034,1.63890000000
+9,2056,R1,solarPV,2034,1.63890000000
+9,2057,R1,solarPV,2034,1.63890000000
+9,2058,R1,solarPV,2034,1.63890000000
+9,2059,R1,solarPV,2034,1.63890000000
+9,2060,R1,solarPV,2034,1.63890000000
+10,2038,R1,solarPV,2036,2.24000000000
+10,2040,R1,solarPV,2036,2.24000000000
+10,2042,R1,solarPV,2036,2.24000000000
+10,2045,R1,solarPV,2036,2.24000000000
+10,2046,R1,solarPV,2036,2.24000000000
+10,2047,R1,solarPV,2036,2.24000000000
+10,2050,R1,solarPV,2036,2.24000000000
+10,2056,R1,solarPV,2036,2.24000000000
+10,2057,R1,solarPV,2036,2.24000000000
+10,2058,R1,solarPV,2036,2.24000000000
+10,2059,R1,solarPV,2036,2.24000000000
+10,2060,R1,solarPV,2036,2.24000000000
+10,2061,R1,solarPV,2036,2.24000000000
+10,2062,R1,solarPV,2036,2.24000000000
+11,2040,R1,solarPV,2038,2.24000000000
+11,2042,R1,solarPV,2038,2.24000000000
+11,2045,R1,solarPV,2038,2.24000000000
+11,2046,R1,solarPV,2038,2.24000000000
+11,2047,R1,solarPV,2038,2.24000000000
+11,2050,R1,solarPV,2038,2.24000000000
+11,2056,R1,solarPV,2038,2.24000000000
+11,2057,R1,solarPV,2038,2.24000000000
+11,2058,R1,solarPV,2038,2.24000000000
+11,2059,R1,solarPV,2038,2.24000000000
+11,2060,R1,solarPV,2038,2.24000000000
+11,2061,R1,solarPV,2038,2.24000000000
+11,2062,R1,solarPV,2038,2.24000000000
+11,2063,R1,solarPV,2038,2.24000000000
+11,2064,R1,solarPV,2038,2.24000000000
+12,2042,R1,solarPV,2040,2.24000000000
+12,2045,R1,solarPV,2040,2.24000000000
+12,2046,R1,solarPV,2040,2.24000000000
+12,2047,R1,solarPV,2040,2.24000000000
+12,2050,R1,solarPV,2040,2.24000000000
+12,2056,R1,solarPV,2040,2.24000000000
+12,2057,R1,solarPV,2040,2.24000000000
+12,2058,R1,solarPV,2040,2.24000000000
+12,2059,R1,solarPV,2040,2.24000000000
+12,2060,R1,solarPV,2040,2.24000000000
+12,2061,R1,solarPV,2040,2.24000000000
+12,2062,R1,solarPV,2040,2.24000000000
+12,2063,R1,solarPV,2040,2.24000000000
+12,2064,R1,solarPV,2040,2.24000000000
+12,2065,R1,solarPV,2040,2.24000000000
+12,2066,R1,solarPV,2040,2.24000000000
+13,2022,R1,windturbine,2020,4.00000000000
+13,2024,R1,windturbine,2020,4.00000000000
+13,2025,R1,windturbine,2020,4.00000000000
+13,2026,R1,windturbine,2020,4.00000000000
+13,2028,R1,windturbine,2020,4.00000000000
+13,2030,R1,windturbine,2020,4.00000000000
+13,2032,R1,windturbine,2020,4.00000000000
+13,2034,R1,windturbine,2020,4.00000000000
+13,2035,R1,windturbine,2020,4.00000000000
+13,2036,R1,windturbine,2020,4.00000000000
+13,2038,R1,windturbine,2020,4.00000000000
+13,2040,R1,windturbine,2020,4.00000000000
+13,2042,R1,windturbine,2020,4.00000000000
+13,2045,R1,windturbine,2020,4.00000000000
+13,2046,R1,windturbine,2020,4.00000000000
+14,2036,R1,windturbine,2034,0.60110000000
+14,2038,R1,windturbine,2034,0.60110000000
+14,2040,R1,windturbine,2034,0.60110000000
+14,2042,R1,windturbine,2034,0.60110000000
+14,2045,R1,windturbine,2034,0.60110000000
+14,2046,R1,windturbine,2034,0.60110000000
+14,2047,R1,windturbine,2034,0.60110000000
+14,2050,R1,windturbine,2034,0.60110000000
+14,2056,R1,windturbine,2034,0.60110000000
+14,2057,R1,windturbine,2034,0.60110000000
+14,2058,R1,windturbine,2034,0.60110000000
+14,2059,R1,windturbine,2034,0.60110000000
+14,2060,R1,windturbine,2034,0.60110000000
+15,2020,R2,gasCCGT,2020,1.00000000000
+15,2022,R2,gasCCGT,2020,3.00000000000
+15,2024,R2,gasCCGT,2020,3.00000000000
+15,2025,R2,gasCCGT,2020,3.00000000000
+15,2026,R2,gasCCGT,2020,2.80000000000
+15,2028,R2,gasCCGT,2020,2.40000000000
+15,2030,R2,gasCCGT,2020,2.00000000000
+15,2032,R2,gasCCGT,2020,2.00000000000
+15,2034,R2,gasCCGT,2020,2.00000000000
+15,2035,R2,gasCCGT,2020,2.00000000000
+15,2036,R2,gasCCGT,2020,2.00000000000
+15,2038,R2,gasCCGT,2020,2.00000000000
+15,2040,R2,gasCCGT,2020,2.00000000000
+15,2042,R2,gasCCGT,2020,2.00000000000
+15,2045,R2,gasCCGT,2020,2.00000000000
+15,2046,R2,gasCCGT,2020,2.00000000000
+15,2047,R2,gasCCGT,2020,2.00000000000
+15,2050,R2,gasCCGT,2020,2.00000000000
+15,2056,R2,gasCCGT,2020,2.00000000000
+16,2024,R2,gasCCGT,2022,1.85640000000
+16,2025,R2,gasCCGT,2022,1.85640000000
+16,2026,R2,gasCCGT,2022,1.85640000000
+16,2028,R2,gasCCGT,2022,1.85640000000
+16,2030,R2,gasCCGT,2022,1.85640000000
+16,2032,R2,gasCCGT,2022,1.85640000000
+16,2034,R2,gasCCGT,2022,1.85640000000
+16,2035,R2,gasCCGT,2022,1.85640000000
+16,2036,R2,gasCCGT,2022,1.85640000000
+16,2038,R2,gasCCGT,2022,1.85640000000
+16,2040,R2,gasCCGT,2022,1.85640000000
+16,2042,R2,gasCCGT,2022,1.85640000000
+16,2045,R2,gasCCGT,2022,1.85640000000
+16,2046,R2,gasCCGT,2022,1.85640000000
+16,2047,R2,gasCCGT,2022,1.85640000000
+16,2050,R2,gasCCGT,2022,1.85640000000
+16,2056,R2,gasCCGT,2022,1.85640000000
+16,2057,R2,gasCCGT,2022,1.85640000000
+16,2058,R2,gasCCGT,2022,1.85640000000
+17,2026,R2,gasCCGT,2024,2.07980000000
+17,2028,R2,gasCCGT,2024,2.07980000000
+17,2030,R2,gasCCGT,2024,2.07980000000
+17,2032,R2,gasCCGT,2024,2.07980000000
+17,2034,R2,gasCCGT,2024,2.07980000000
+17,2035,R2,gasCCGT,2024,2.07980000000
+17,2036,R2,gasCCGT,2024,2.07980000000
+17,2038,R2,gasCCGT,2024,2.07980000000
+17,2040,R2,gasCCGT,2024,2.07980000000
+17,2042,R2,gasCCGT,2024,2.07980000000
+17,2045,R2,gasCCGT,2024,2.07980000000
+17,2046,R2,gasCCGT,2024,2.07980000000
+17,2047,R2,gasCCGT,2024,2.07980000000
+17,2050,R2,gasCCGT,2024,2.07980000000
+17,2056,R2,gasCCGT,2024,2.07980000000
+17,2057,R2,gasCCGT,2024,2.07980000000
+17,2058,R2,gasCCGT,2024,2.07980000000
+17,2059,R2,gasCCGT,2024,2.07980000000
+17,2060,R2,gasCCGT,2024,2.07980000000
+18,2028,R2,gasCCGT,2026,2.29760000000
+18,2030,R2,gasCCGT,2026,2.29760000000
+18,2032,R2,gasCCGT,2026,2.29760000000
+18,2034,R2,gasCCGT,2026,2.29760000000
+18,2035,R2,gasCCGT,2026,2.29760000000
+18,2036,R2,gasCCGT,2026,2.29760000000
+18,2038,R2,gasCCGT,2026,2.29760000000
+18,2040,R2,gasCCGT,2026,2.29760000000
+18,2042,R2,gasCCGT,2026,2.29760000000
+18,2045,R2,gasCCGT,2026,2.29760000000
+18,2046,R2,gasCCGT,2026,2.29760000000
+18,2047,R2,gasCCGT,2026,2.29760000000
+18,2050,R2,gasCCGT,2026,2.29760000000
+18,2056,R2,gasCCGT,2026,2.29760000000
+18,2057,R2,gasCCGT,2026,2.29760000000
+18,2058,R2,gasCCGT,2026,2.29760000000
+18,2059,R2,gasCCGT,2026,2.29760000000
+18,2060,R2,gasCCGT,2026,2.29760000000
+18,2061,R2,gasCCGT,2026,2.29760000000
+18,2062,R2,gasCCGT,2026,2.29760000000
+19,2030,R2,gasCCGT,2028,2.31150000000
+19,2032,R2,gasCCGT,2028,2.31150000000
+19,2034,R2,gasCCGT,2028,2.31150000000
+19,2035,R2,gasCCGT,2028,2.31150000000
+19,2036,R2,gasCCGT,2028,2.31150000000
+19,2038,R2,gasCCGT,2028,2.31150000000
+19,2040,R2,gasCCGT,2028,2.31150000000
+19,2042,R2,gasCCGT,2028,2.31150000000
+19,2045,R2,gasCCGT,2028,2.31150000000
+19,2046,R2,gasCCGT,2028,2.31150000000
+19,2047,R2,gasCCGT,2028,2.31150000000
+19,2050,R2,gasCCGT,2028,2.31150000000
+19,2056,R2,gasCCGT,2028,2.31150000000
+19,2057,R2,gasCCGT,2028,2.31150000000
+19,2058,R2,gasCCGT,2028,2.31150000000
+19,2059,R2,gasCCGT,2028,2.31150000000
+19,2060,R2,gasCCGT,2028,2.31150000000
+19,2061,R2,gasCCGT,2028,2.31150000000
+19,2062,R2,gasCCGT,2028,2.31150000000
+19,2063,R2,gasCCGT,2028,2.31150000000
+19,2064,R2,gasCCGT,2028,2.31150000000
+20,2032,R2,gasCCGT,2030,0.99560000000
+20,2034,R2,gasCCGT,2030,0.99560000000
+20,2035,R2,gasCCGT,2030,0.99560000000
+20,2036,R2,gasCCGT,2030,0.99560000000
+20,2038,R2,gasCCGT,2030,0.99560000000
+20,2040,R2,gasCCGT,2030,0.99560000000
+20,2042,R2,gasCCGT,2030,0.99560000000
+20,2045,R2,gasCCGT,2030,0.99560000000
+20,2046,R2,gasCCGT,2030,0.99560000000
+20,2047,R2,gasCCGT,2030,0.99560000000
+20,2050,R2,gasCCGT,2030,0.99560000000
+20,2056,R2,gasCCGT,2030,0.99560000000
+20,2057,R2,gasCCGT,2030,0.99560000000
+20,2058,R2,gasCCGT,2030,0.99560000000
+20,2059,R2,gasCCGT,2030,0.99560000000
+20,2060,R2,gasCCGT,2030,0.99560000000
+20,2061,R2,gasCCGT,2030,0.99560000000
+20,2062,R2,gasCCGT,2030,0.99560000000
+20,2063,R2,gasCCGT,2030,0.99560000000
+20,2064,R2,gasCCGT,2030,0.99560000000
+20,2065,R2,gasCCGT,2030,0.99560000000
+20,2066,R2,gasCCGT,2030,0.99560000000
+21,2034,R2,solarPV,2032,2.24000000000
+21,2035,R2,solarPV,2032,2.24000000000
+21,2036,R2,solarPV,2032,2.24000000000
+21,2038,R2,solarPV,2032,2.24000000000
+21,2040,R2,solarPV,2032,2.24000000000
+21,2042,R2,solarPV,2032,2.24000000000
+21,2045,R2,solarPV,2032,2.24000000000
+21,2046,R2,solarPV,2032,2.24000000000
+21,2047,R2,solarPV,2032,2.24000000000
+21,2050,R2,solarPV,2032,2.24000000000
+21,2056,R2,solarPV,2032,2.24000000000
+21,2057,R2,solarPV,2032,2.24000000000
+21,2058,R2,solarPV,2032,2.24000000000
+22,2036,R2,solarPV,2034,2.24000000000
+22,2038,R2,solarPV,2034,2.24000000000
+22,2040,R2,solarPV,2034,2.24000000000
+22,2042,R2,solarPV,2034,2.24000000000
+22,2045,R2,solarPV,2034,2.24000000000
+22,2046,R2,solarPV,2034,2.24000000000
+22,2047,R2,solarPV,2034,2.24000000000
+22,2050,R2,solarPV,2034,2.24000000000
+22,2056,R2,solarPV,2034,2.24000000000
+22,2057,R2,solarPV,2034,2.24000000000
+22,2058,R2,solarPV,2034,2.24000000000
+22,2059,R2,solarPV,2034,2.24000000000
+22,2060,R2,solarPV,2034,2.24000000000
+23,2038,R2,solarPV,2036,2.24000000000
+23,2040,R2,solarPV,2036,2.24000000000
+23,2042,R2,solarPV,2036,2.24000000000
+23,2045,R2,solarPV,2036,2.24000000000
+23,2046,R2,solarPV,2036,2.24000000000
+23,2047,R2,solarPV,2036,2.24000000000
+23,2050,R2,solarPV,2036,2.24000000000
+23,2056,R2,solarPV,2036,2.24000000000
+23,2057,R2,solarPV,2036,2.24000000000
+23,2058,R2,solarPV,2036,2.24000000000
+23,2059,R2,solarPV,2036,2.24000000000
+23,2060,R2,solarPV,2036,2.24000000000
+23,2061,R2,solarPV,2036,2.24000000000
+23,2062,R2,solarPV,2036,2.24000000000
+24,2040,R2,solarPV,2038,2.24000000000
+24,2042,R2,solarPV,2038,2.24000000000
+24,2045,R2,solarPV,2038,2.24000000000
+24,2046,R2,solarPV,2038,2.24000000000
+24,2047,R2,solarPV,2038,2.24000000000
+24,2050,R2,solarPV,2038,2.24000000000
+24,2056,R2,solarPV,2038,2.24000000000
+24,2057,R2,solarPV,2038,2.24000000000
+24,2058,R2,solarPV,2038,2.24000000000
+24,2059,R2,solarPV,2038,2.24000000000
+24,2060,R2,solarPV,2038,2.24000000000
+24,2061,R2,solarPV,2038,2.24000000000
+24,2062,R2,solarPV,2038,2.24000000000
+24,2063,R2,solarPV,2038,2.24000000000
+24,2064,R2,solarPV,2038,2.24000000000
+25,2042,R2,solarPV,2040,2.24000000000
+25,2045,R2,solarPV,2040,2.24000000000
+25,2046,R2,solarPV,2040,2.24000000000
+25,2047,R2,solarPV,2040,2.24000000000
+25,2050,R2,solarPV,2040,2.24000000000
+25,2056,R2,solarPV,2040,2.24000000000
+25,2057,R2,solarPV,2040,2.24000000000
+25,2058,R2,solarPV,2040,2.24000000000
+25,2059,R2,solarPV,2040,2.24000000000
+25,2060,R2,solarPV,2040,2.24000000000
+25,2061,R2,solarPV,2040,2.24000000000
+25,2062,R2,solarPV,2040,2.24000000000
+25,2063,R2,solarPV,2040,2.24000000000
+25,2064,R2,solarPV,2040,2.24000000000
+25,2065,R2,solarPV,2040,2.24000000000
+25,2066,R2,solarPV,2040,2.24000000000
+26,2022,R2,windturbine,2020,4.27320000000
+26,2024,R2,windturbine,2020,4.27320000000
+26,2025,R2,windturbine,2020,4.27320000000
+26,2026,R2,windturbine,2020,4.27320000000
+26,2028,R2,windturbine,2020,4.27320000000
+26,2030,R2,windturbine,2020,4.27320000000
+26,2032,R2,windturbine,2020,4.27320000000
+26,2034,R2,windturbine,2020,4.27320000000
+26,2035,R2,windturbine,2020,4.27320000000
+26,2036,R2,windturbine,2020,4.27320000000
+26,2038,R2,windturbine,2020,4.27320000000
+26,2040,R2,windturbine,2020,4.27320000000
+26,2042,R2,windturbine,2020,4.27320000000
+26,2045,R2,windturbine,2020,4.27320000000
+26,2046,R2,windturbine,2020,4.27320000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
index 1d028468..814ce3ed 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2020.csv
@@ -1,7 +1,17 @@
 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
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
 1,2020,R2,gassupply1,2020,15.00000000000
-1,2025,R2,gassupply1,2020,15.00000000000
-1,2030,R2,gassupply1,2020,7.50000000000
+1,2025,R2,gassupply1,2020,31.49320000000
+1,2030,R2,gassupply1,2020,23.99320000000
+1,2035,R2,gassupply1,2020,16.49320000000
+1,2040,R2,gassupply1,2020,16.49320000000
+1,2045,R2,gassupply1,2020,16.49320000000
+1,2050,R2,gassupply1,2020,16.49320000000
+1,2059,R2,gassupply1,2020,16.49320000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
index f6828ce3..e9d28446 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2025.csv
@@ -1,19 +1,33 @@
 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,2030,R1,gassupply1,2025,10.04010000000
-1,2035,R1,gassupply1,2025,10.04010000000
-1,2040,R1,gassupply1,2025,10.04010000000
-1,2045,R1,gassupply1,2025,10.04010000000
-1,2050,R1,gassupply1,2025,10.04010000000
-1,2064,R1,gassupply1,2025,10.04010000000
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
+1,2030,R1,gassupply1,2025,10.24680000000
+1,2035,R1,gassupply1,2025,10.24680000000
+1,2040,R1,gassupply1,2025,10.24680000000
+1,2045,R1,gassupply1,2025,10.24680000000
+1,2050,R1,gassupply1,2025,10.24680000000
+1,2059,R1,gassupply1,2025,10.24680000000
+1,2060,R1,gassupply1,2025,10.24680000000
+1,2064,R1,gassupply1,2025,10.24680000000
 2,2020,R2,gassupply1,2020,15.00000000000
-2,2025,R2,gassupply1,2020,15.00000000000
-2,2030,R2,gassupply1,2020,7.50000000000
-3,2030,R2,gassupply1,2025,10.04010000000
-3,2035,R2,gassupply1,2025,10.04010000000
-3,2040,R2,gassupply1,2025,10.04010000000
-3,2045,R2,gassupply1,2025,10.04010000000
-3,2050,R2,gassupply1,2025,10.04010000000
-3,2064,R2,gassupply1,2025,10.04010000000
+2,2025,R2,gassupply1,2020,31.49320000000
+2,2030,R2,gassupply1,2020,23.99320000000
+2,2035,R2,gassupply1,2020,16.49320000000
+2,2040,R2,gassupply1,2020,16.49320000000
+2,2045,R2,gassupply1,2020,16.49320000000
+2,2050,R2,gassupply1,2020,16.49320000000
+2,2059,R2,gassupply1,2020,16.49320000000
+3,2030,R2,gassupply1,2025,10.24680000000
+3,2035,R2,gassupply1,2025,10.24680000000
+3,2040,R2,gassupply1,2025,10.24680000000
+3,2045,R2,gassupply1,2025,10.24680000000
+3,2050,R2,gassupply1,2025,10.24680000000
+3,2059,R2,gassupply1,2025,10.24680000000
+3,2060,R2,gassupply1,2025,10.24680000000
+3,2064,R2,gassupply1,2025,10.24680000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
index 05e9d3e6..75cf372b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2030.csv
@@ -1,33 +1,51 @@
 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,2030,R1,gassupply1,2025,10.04010000000
-1,2035,R1,gassupply1,2025,10.04010000000
-1,2040,R1,gassupply1,2025,10.04010000000
-1,2045,R1,gassupply1,2025,10.04010000000
-1,2050,R1,gassupply1,2025,10.04010000000
-1,2064,R1,gassupply1,2025,10.04010000000
-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
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
+1,2030,R1,gassupply1,2025,10.24680000000
+1,2035,R1,gassupply1,2025,10.24680000000
+1,2040,R1,gassupply1,2025,10.24680000000
+1,2045,R1,gassupply1,2025,10.24680000000
+1,2050,R1,gassupply1,2025,10.24680000000
+1,2059,R1,gassupply1,2025,10.24680000000
+1,2060,R1,gassupply1,2025,10.24680000000
+1,2064,R1,gassupply1,2025,10.24680000000
+2,2035,R1,gassupply1,2030,2.60860000000
+2,2040,R1,gassupply1,2030,2.60860000000
+2,2045,R1,gassupply1,2030,2.60860000000
+2,2050,R1,gassupply1,2030,2.60860000000
+2,2059,R1,gassupply1,2030,2.60860000000
+2,2060,R1,gassupply1,2030,2.60860000000
+2,2064,R1,gassupply1,2030,2.60860000000
+2,2065,R1,gassupply1,2030,2.60860000000
+2,2069,R1,gassupply1,2030,2.60860000000
 3,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,10.04010000000
-4,2035,R2,gassupply1,2025,10.04010000000
-4,2040,R2,gassupply1,2025,10.04010000000
-4,2045,R2,gassupply1,2025,10.04010000000
-4,2050,R2,gassupply1,2025,10.04010000000
-4,2064,R2,gassupply1,2025,10.04010000000
-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
+3,2025,R2,gassupply1,2020,31.49320000000
+3,2030,R2,gassupply1,2020,23.99320000000
+3,2035,R2,gassupply1,2020,16.49320000000
+3,2040,R2,gassupply1,2020,16.49320000000
+3,2045,R2,gassupply1,2020,16.49320000000
+3,2050,R2,gassupply1,2020,16.49320000000
+3,2059,R2,gassupply1,2020,16.49320000000
+4,2030,R2,gassupply1,2025,10.24680000000
+4,2035,R2,gassupply1,2025,10.24680000000
+4,2040,R2,gassupply1,2025,10.24680000000
+4,2045,R2,gassupply1,2025,10.24680000000
+4,2050,R2,gassupply1,2025,10.24680000000
+4,2059,R2,gassupply1,2025,10.24680000000
+4,2060,R2,gassupply1,2025,10.24680000000
+4,2064,R2,gassupply1,2025,10.24680000000
+5,2035,R2,gassupply1,2030,2.60860000000
+5,2040,R2,gassupply1,2030,2.60860000000
+5,2045,R2,gassupply1,2030,2.60860000000
+5,2050,R2,gassupply1,2030,2.60860000000
+5,2059,R2,gassupply1,2030,2.60860000000
+5,2060,R2,gassupply1,2030,2.60860000000
+5,2064,R2,gassupply1,2030,2.60860000000
+5,2065,R2,gassupply1,2030,2.60860000000
+5,2069,R2,gassupply1,2030,2.60860000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
index 05e9d3e6..5cf3cb27 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2035.csv
@@ -1,33 +1,71 @@
 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,2030,R1,gassupply1,2025,10.04010000000
-1,2035,R1,gassupply1,2025,10.04010000000
-1,2040,R1,gassupply1,2025,10.04010000000
-1,2045,R1,gassupply1,2025,10.04010000000
-1,2050,R1,gassupply1,2025,10.04010000000
-1,2064,R1,gassupply1,2025,10.04010000000
-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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,10.04010000000
-4,2035,R2,gassupply1,2025,10.04010000000
-4,2040,R2,gassupply1,2025,10.04010000000
-4,2045,R2,gassupply1,2025,10.04010000000
-4,2050,R2,gassupply1,2025,10.04010000000
-4,2064,R2,gassupply1,2025,10.04010000000
-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
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
+1,2030,R1,gassupply1,2025,10.24680000000
+1,2035,R1,gassupply1,2025,10.24680000000
+1,2040,R1,gassupply1,2025,10.24680000000
+1,2045,R1,gassupply1,2025,10.24680000000
+1,2050,R1,gassupply1,2025,10.24680000000
+1,2059,R1,gassupply1,2025,10.24680000000
+1,2060,R1,gassupply1,2025,10.24680000000
+1,2064,R1,gassupply1,2025,10.24680000000
+2,2035,R1,gassupply1,2030,2.60860000000
+2,2040,R1,gassupply1,2030,2.60860000000
+2,2045,R1,gassupply1,2030,2.60860000000
+2,2050,R1,gassupply1,2030,2.60860000000
+2,2059,R1,gassupply1,2030,2.60860000000
+2,2060,R1,gassupply1,2030,2.60860000000
+2,2064,R1,gassupply1,2030,2.60860000000
+2,2065,R1,gassupply1,2030,2.60860000000
+2,2069,R1,gassupply1,2030,2.60860000000
+3,2040,R1,gassupply1,2035,4.89140000000
+3,2045,R1,gassupply1,2035,4.89140000000
+3,2050,R1,gassupply1,2035,4.89140000000
+3,2059,R1,gassupply1,2035,4.89140000000
+3,2060,R1,gassupply1,2035,4.89140000000
+3,2064,R1,gassupply1,2035,4.89140000000
+3,2065,R1,gassupply1,2035,4.89140000000
+3,2069,R1,gassupply1,2035,4.89140000000
+3,2070,R1,gassupply1,2035,4.89140000000
+3,2074,R1,gassupply1,2035,4.89140000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,31.49320000000
+4,2030,R2,gassupply1,2020,23.99320000000
+4,2035,R2,gassupply1,2020,16.49320000000
+4,2040,R2,gassupply1,2020,16.49320000000
+4,2045,R2,gassupply1,2020,16.49320000000
+4,2050,R2,gassupply1,2020,16.49320000000
+4,2059,R2,gassupply1,2020,16.49320000000
+5,2030,R2,gassupply1,2025,10.24680000000
+5,2035,R2,gassupply1,2025,10.24680000000
+5,2040,R2,gassupply1,2025,10.24680000000
+5,2045,R2,gassupply1,2025,10.24680000000
+5,2050,R2,gassupply1,2025,10.24680000000
+5,2059,R2,gassupply1,2025,10.24680000000
+5,2060,R2,gassupply1,2025,10.24680000000
+5,2064,R2,gassupply1,2025,10.24680000000
+6,2035,R2,gassupply1,2030,2.60860000000
+6,2040,R2,gassupply1,2030,2.60860000000
+6,2045,R2,gassupply1,2030,2.60860000000
+6,2050,R2,gassupply1,2030,2.60860000000
+6,2059,R2,gassupply1,2030,2.60860000000
+6,2060,R2,gassupply1,2030,2.60860000000
+6,2064,R2,gassupply1,2030,2.60860000000
+6,2065,R2,gassupply1,2030,2.60860000000
+6,2069,R2,gassupply1,2030,2.60860000000
+7,2040,R2,gassupply1,2035,4.89140000000
+7,2045,R2,gassupply1,2035,4.89140000000
+7,2050,R2,gassupply1,2035,4.89140000000
+7,2059,R2,gassupply1,2035,4.89140000000
+7,2060,R2,gassupply1,2035,4.89140000000
+7,2064,R2,gassupply1,2035,4.89140000000
+7,2065,R2,gassupply1,2035,4.89140000000
+7,2069,R2,gassupply1,2035,4.89140000000
+7,2070,R2,gassupply1,2035,4.89140000000
+7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
index 05e9d3e6..5cf3cb27 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2040.csv
@@ -1,33 +1,71 @@
 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,2030,R1,gassupply1,2025,10.04010000000
-1,2035,R1,gassupply1,2025,10.04010000000
-1,2040,R1,gassupply1,2025,10.04010000000
-1,2045,R1,gassupply1,2025,10.04010000000
-1,2050,R1,gassupply1,2025,10.04010000000
-1,2064,R1,gassupply1,2025,10.04010000000
-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,2020,R2,gassupply1,2020,15.00000000000
-3,2025,R2,gassupply1,2020,15.00000000000
-3,2030,R2,gassupply1,2020,7.50000000000
-4,2030,R2,gassupply1,2025,10.04010000000
-4,2035,R2,gassupply1,2025,10.04010000000
-4,2040,R2,gassupply1,2025,10.04010000000
-4,2045,R2,gassupply1,2025,10.04010000000
-4,2050,R2,gassupply1,2025,10.04010000000
-4,2064,R2,gassupply1,2025,10.04010000000
-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
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
+1,2030,R1,gassupply1,2025,10.24680000000
+1,2035,R1,gassupply1,2025,10.24680000000
+1,2040,R1,gassupply1,2025,10.24680000000
+1,2045,R1,gassupply1,2025,10.24680000000
+1,2050,R1,gassupply1,2025,10.24680000000
+1,2059,R1,gassupply1,2025,10.24680000000
+1,2060,R1,gassupply1,2025,10.24680000000
+1,2064,R1,gassupply1,2025,10.24680000000
+2,2035,R1,gassupply1,2030,2.60860000000
+2,2040,R1,gassupply1,2030,2.60860000000
+2,2045,R1,gassupply1,2030,2.60860000000
+2,2050,R1,gassupply1,2030,2.60860000000
+2,2059,R1,gassupply1,2030,2.60860000000
+2,2060,R1,gassupply1,2030,2.60860000000
+2,2064,R1,gassupply1,2030,2.60860000000
+2,2065,R1,gassupply1,2030,2.60860000000
+2,2069,R1,gassupply1,2030,2.60860000000
+3,2040,R1,gassupply1,2035,4.89140000000
+3,2045,R1,gassupply1,2035,4.89140000000
+3,2050,R1,gassupply1,2035,4.89140000000
+3,2059,R1,gassupply1,2035,4.89140000000
+3,2060,R1,gassupply1,2035,4.89140000000
+3,2064,R1,gassupply1,2035,4.89140000000
+3,2065,R1,gassupply1,2035,4.89140000000
+3,2069,R1,gassupply1,2035,4.89140000000
+3,2070,R1,gassupply1,2035,4.89140000000
+3,2074,R1,gassupply1,2035,4.89140000000
+4,2020,R2,gassupply1,2020,15.00000000000
+4,2025,R2,gassupply1,2020,31.49320000000
+4,2030,R2,gassupply1,2020,23.99320000000
+4,2035,R2,gassupply1,2020,16.49320000000
+4,2040,R2,gassupply1,2020,16.49320000000
+4,2045,R2,gassupply1,2020,16.49320000000
+4,2050,R2,gassupply1,2020,16.49320000000
+4,2059,R2,gassupply1,2020,16.49320000000
+5,2030,R2,gassupply1,2025,10.24680000000
+5,2035,R2,gassupply1,2025,10.24680000000
+5,2040,R2,gassupply1,2025,10.24680000000
+5,2045,R2,gassupply1,2025,10.24680000000
+5,2050,R2,gassupply1,2025,10.24680000000
+5,2059,R2,gassupply1,2025,10.24680000000
+5,2060,R2,gassupply1,2025,10.24680000000
+5,2064,R2,gassupply1,2025,10.24680000000
+6,2035,R2,gassupply1,2030,2.60860000000
+6,2040,R2,gassupply1,2030,2.60860000000
+6,2045,R2,gassupply1,2030,2.60860000000
+6,2050,R2,gassupply1,2030,2.60860000000
+6,2059,R2,gassupply1,2030,2.60860000000
+6,2060,R2,gassupply1,2030,2.60860000000
+6,2064,R2,gassupply1,2030,2.60860000000
+6,2065,R2,gassupply1,2030,2.60860000000
+6,2069,R2,gassupply1,2030,2.60860000000
+7,2040,R2,gassupply1,2035,4.89140000000
+7,2045,R2,gassupply1,2035,4.89140000000
+7,2050,R2,gassupply1,2035,4.89140000000
+7,2059,R2,gassupply1,2035,4.89140000000
+7,2060,R2,gassupply1,2035,4.89140000000
+7,2064,R2,gassupply1,2035,4.89140000000
+7,2065,R2,gassupply1,2035,4.89140000000
+7,2069,R2,gassupply1,2035,4.89140000000
+7,2070,R2,gassupply1,2035,4.89140000000
+7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
index 67aea911..5cf3cb27 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2045.csv
@@ -1,45 +1,71 @@
 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,2030,R1,gassupply1,2025,10.04010000000
-1,2035,R1,gassupply1,2025,10.04010000000
-1,2040,R1,gassupply1,2025,10.04010000000
-1,2045,R1,gassupply1,2025,10.04010000000
-1,2050,R1,gassupply1,2025,10.04010000000
-1,2064,R1,gassupply1,2025,10.04010000000
-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,2050,R1,gassupply1,2045,1.32420000000
-3,2064,R1,gassupply1,2045,1.32420000000
-3,2065,R1,gassupply1,2045,1.32420000000
-3,2069,R1,gassupply1,2045,1.32420000000
-3,2070,R1,gassupply1,2045,1.32420000000
-3,2084,R1,gassupply1,2045,1.32420000000
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
+1,2030,R1,gassupply1,2025,10.24680000000
+1,2035,R1,gassupply1,2025,10.24680000000
+1,2040,R1,gassupply1,2025,10.24680000000
+1,2045,R1,gassupply1,2025,10.24680000000
+1,2050,R1,gassupply1,2025,10.24680000000
+1,2059,R1,gassupply1,2025,10.24680000000
+1,2060,R1,gassupply1,2025,10.24680000000
+1,2064,R1,gassupply1,2025,10.24680000000
+2,2035,R1,gassupply1,2030,2.60860000000
+2,2040,R1,gassupply1,2030,2.60860000000
+2,2045,R1,gassupply1,2030,2.60860000000
+2,2050,R1,gassupply1,2030,2.60860000000
+2,2059,R1,gassupply1,2030,2.60860000000
+2,2060,R1,gassupply1,2030,2.60860000000
+2,2064,R1,gassupply1,2030,2.60860000000
+2,2065,R1,gassupply1,2030,2.60860000000
+2,2069,R1,gassupply1,2030,2.60860000000
+3,2040,R1,gassupply1,2035,4.89140000000
+3,2045,R1,gassupply1,2035,4.89140000000
+3,2050,R1,gassupply1,2035,4.89140000000
+3,2059,R1,gassupply1,2035,4.89140000000
+3,2060,R1,gassupply1,2035,4.89140000000
+3,2064,R1,gassupply1,2035,4.89140000000
+3,2065,R1,gassupply1,2035,4.89140000000
+3,2069,R1,gassupply1,2035,4.89140000000
+3,2070,R1,gassupply1,2035,4.89140000000
+3,2074,R1,gassupply1,2035,4.89140000000
 4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,10.04010000000
-5,2035,R2,gassupply1,2025,10.04010000000
-5,2040,R2,gassupply1,2025,10.04010000000
-5,2045,R2,gassupply1,2025,10.04010000000
-5,2050,R2,gassupply1,2025,10.04010000000
-5,2064,R2,gassupply1,2025,10.04010000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,1.32420000000
-7,2064,R2,gassupply1,2045,1.32420000000
-7,2065,R2,gassupply1,2045,1.32420000000
-7,2069,R2,gassupply1,2045,1.32420000000
-7,2070,R2,gassupply1,2045,1.32420000000
-7,2084,R2,gassupply1,2045,1.32420000000
+4,2025,R2,gassupply1,2020,31.49320000000
+4,2030,R2,gassupply1,2020,23.99320000000
+4,2035,R2,gassupply1,2020,16.49320000000
+4,2040,R2,gassupply1,2020,16.49320000000
+4,2045,R2,gassupply1,2020,16.49320000000
+4,2050,R2,gassupply1,2020,16.49320000000
+4,2059,R2,gassupply1,2020,16.49320000000
+5,2030,R2,gassupply1,2025,10.24680000000
+5,2035,R2,gassupply1,2025,10.24680000000
+5,2040,R2,gassupply1,2025,10.24680000000
+5,2045,R2,gassupply1,2025,10.24680000000
+5,2050,R2,gassupply1,2025,10.24680000000
+5,2059,R2,gassupply1,2025,10.24680000000
+5,2060,R2,gassupply1,2025,10.24680000000
+5,2064,R2,gassupply1,2025,10.24680000000
+6,2035,R2,gassupply1,2030,2.60860000000
+6,2040,R2,gassupply1,2030,2.60860000000
+6,2045,R2,gassupply1,2030,2.60860000000
+6,2050,R2,gassupply1,2030,2.60860000000
+6,2059,R2,gassupply1,2030,2.60860000000
+6,2060,R2,gassupply1,2030,2.60860000000
+6,2064,R2,gassupply1,2030,2.60860000000
+6,2065,R2,gassupply1,2030,2.60860000000
+6,2069,R2,gassupply1,2030,2.60860000000
+7,2040,R2,gassupply1,2035,4.89140000000
+7,2045,R2,gassupply1,2035,4.89140000000
+7,2050,R2,gassupply1,2035,4.89140000000
+7,2059,R2,gassupply1,2035,4.89140000000
+7,2060,R2,gassupply1,2035,4.89140000000
+7,2064,R2,gassupply1,2035,4.89140000000
+7,2065,R2,gassupply1,2035,4.89140000000
+7,2069,R2,gassupply1,2035,4.89140000000
+7,2070,R2,gassupply1,2035,4.89140000000
+7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
index 67aea911..5cf3cb27 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Gas/Capacity/2050.csv
@@ -1,45 +1,71 @@
 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,2030,R1,gassupply1,2025,10.04010000000
-1,2035,R1,gassupply1,2025,10.04010000000
-1,2040,R1,gassupply1,2025,10.04010000000
-1,2045,R1,gassupply1,2025,10.04010000000
-1,2050,R1,gassupply1,2025,10.04010000000
-1,2064,R1,gassupply1,2025,10.04010000000
-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,2050,R1,gassupply1,2045,1.32420000000
-3,2064,R1,gassupply1,2045,1.32420000000
-3,2065,R1,gassupply1,2045,1.32420000000
-3,2069,R1,gassupply1,2045,1.32420000000
-3,2070,R1,gassupply1,2045,1.32420000000
-3,2084,R1,gassupply1,2045,1.32420000000
+0,2025,R1,gassupply1,2020,31.49320000000
+0,2030,R1,gassupply1,2020,23.99320000000
+0,2035,R1,gassupply1,2020,16.49320000000
+0,2040,R1,gassupply1,2020,16.49320000000
+0,2045,R1,gassupply1,2020,16.49320000000
+0,2050,R1,gassupply1,2020,16.49320000000
+0,2059,R1,gassupply1,2020,16.49320000000
+1,2030,R1,gassupply1,2025,10.24680000000
+1,2035,R1,gassupply1,2025,10.24680000000
+1,2040,R1,gassupply1,2025,10.24680000000
+1,2045,R1,gassupply1,2025,10.24680000000
+1,2050,R1,gassupply1,2025,10.24680000000
+1,2059,R1,gassupply1,2025,10.24680000000
+1,2060,R1,gassupply1,2025,10.24680000000
+1,2064,R1,gassupply1,2025,10.24680000000
+2,2035,R1,gassupply1,2030,2.60860000000
+2,2040,R1,gassupply1,2030,2.60860000000
+2,2045,R1,gassupply1,2030,2.60860000000
+2,2050,R1,gassupply1,2030,2.60860000000
+2,2059,R1,gassupply1,2030,2.60860000000
+2,2060,R1,gassupply1,2030,2.60860000000
+2,2064,R1,gassupply1,2030,2.60860000000
+2,2065,R1,gassupply1,2030,2.60860000000
+2,2069,R1,gassupply1,2030,2.60860000000
+3,2040,R1,gassupply1,2035,4.89140000000
+3,2045,R1,gassupply1,2035,4.89140000000
+3,2050,R1,gassupply1,2035,4.89140000000
+3,2059,R1,gassupply1,2035,4.89140000000
+3,2060,R1,gassupply1,2035,4.89140000000
+3,2064,R1,gassupply1,2035,4.89140000000
+3,2065,R1,gassupply1,2035,4.89140000000
+3,2069,R1,gassupply1,2035,4.89140000000
+3,2070,R1,gassupply1,2035,4.89140000000
+3,2074,R1,gassupply1,2035,4.89140000000
 4,2020,R2,gassupply1,2020,15.00000000000
-4,2025,R2,gassupply1,2020,15.00000000000
-4,2030,R2,gassupply1,2020,7.50000000000
-5,2030,R2,gassupply1,2025,10.04010000000
-5,2035,R2,gassupply1,2025,10.04010000000
-5,2040,R2,gassupply1,2025,10.04010000000
-5,2045,R2,gassupply1,2025,10.04010000000
-5,2050,R2,gassupply1,2025,10.04010000000
-5,2064,R2,gassupply1,2025,10.04010000000
-6,2035,R2,gassupply1,2030,7.50000000000
-6,2040,R2,gassupply1,2030,7.50000000000
-6,2045,R2,gassupply1,2030,7.50000000000
-6,2050,R2,gassupply1,2030,7.50000000000
-6,2064,R2,gassupply1,2030,7.50000000000
-6,2065,R2,gassupply1,2030,7.50000000000
-6,2069,R2,gassupply1,2030,7.50000000000
-7,2050,R2,gassupply1,2045,1.32420000000
-7,2064,R2,gassupply1,2045,1.32420000000
-7,2065,R2,gassupply1,2045,1.32420000000
-7,2069,R2,gassupply1,2045,1.32420000000
-7,2070,R2,gassupply1,2045,1.32420000000
-7,2084,R2,gassupply1,2045,1.32420000000
+4,2025,R2,gassupply1,2020,31.49320000000
+4,2030,R2,gassupply1,2020,23.99320000000
+4,2035,R2,gassupply1,2020,16.49320000000
+4,2040,R2,gassupply1,2020,16.49320000000
+4,2045,R2,gassupply1,2020,16.49320000000
+4,2050,R2,gassupply1,2020,16.49320000000
+4,2059,R2,gassupply1,2020,16.49320000000
+5,2030,R2,gassupply1,2025,10.24680000000
+5,2035,R2,gassupply1,2025,10.24680000000
+5,2040,R2,gassupply1,2025,10.24680000000
+5,2045,R2,gassupply1,2025,10.24680000000
+5,2050,R2,gassupply1,2025,10.24680000000
+5,2059,R2,gassupply1,2025,10.24680000000
+5,2060,R2,gassupply1,2025,10.24680000000
+5,2064,R2,gassupply1,2025,10.24680000000
+6,2035,R2,gassupply1,2030,2.60860000000
+6,2040,R2,gassupply1,2030,2.60860000000
+6,2045,R2,gassupply1,2030,2.60860000000
+6,2050,R2,gassupply1,2030,2.60860000000
+6,2059,R2,gassupply1,2030,2.60860000000
+6,2060,R2,gassupply1,2030,2.60860000000
+6,2064,R2,gassupply1,2030,2.60860000000
+6,2065,R2,gassupply1,2030,2.60860000000
+6,2069,R2,gassupply1,2030,2.60860000000
+7,2040,R2,gassupply1,2035,4.89140000000
+7,2045,R2,gassupply1,2035,4.89140000000
+7,2050,R2,gassupply1,2035,4.89140000000
+7,2059,R2,gassupply1,2035,4.89140000000
+7,2060,R2,gassupply1,2035,4.89140000000
+7,2064,R2,gassupply1,2035,4.89140000000
+7,2065,R2,gassupply1,2035,4.89140000000
+7,2069,R2,gassupply1,2035,4.89140000000
+7,2070,R2,gassupply1,2035,4.89140000000
+7,2074,R2,gassupply1,2035,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 73ab4b14..f2a09a7f 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -15,13 +15,12 @@ electric_stove,R2,R2,A1,residential,newcapa,2025,17.00000000000
 gas_stove,R2,R2,A1,residential,newcapa,2025,5.00000000000
 gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,12.36820000000
-windturbine,R1,R1,A1,power,newcapa,2025,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,11.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,9.86820000000
+gasCCGT,R2,R2,A1,power,newcapa,2025,11.00000000000
+windturbine,R2,R2,A1,power,newcapa,2025,9.86820000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,31.49320000000
+gassupply1,R2,R2,A1,gas,newcapa,2025,31.49320000000
 electric_stove,R1,R1,A1,residential,newcapa,2030,17.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
@@ -30,15 +29,16 @@ electric_stove,R2,R2,A1,residential,newcapa,2030,17.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2030,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2030,12.36820000000
-windturbine,R1,R1,A1,power,newcapa,2030,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,9.86820000000
+gasCCGT,R2,R2,A1,power,newcapa,2030,10.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2030,10.50300000000
-windturbine,R2,R2,A1,power,newcapa,2030,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,10.04010000000
+windturbine,R2,R2,A1,power,newcapa,2030,9.86820000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,23.99320000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,10.24680000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,23.99320000000
+gassupply1,R2,R2,A1,gas,newcapa,2030,10.24680000000
 electric_stove,R1,R1,A1,residential,newcapa,2035,11.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2035,22.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
@@ -47,17 +47,22 @@ electric_stove,R2,R2,A1,residential,newcapa,2035,11.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2035,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2035,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2035,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2035,20.00000000000
+solarPV,R1,R1,A1,power,newcapa,2035,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,9.86820000000
+windturbine,R1,R1,A1,power,newcapa,2035,2.40000000000
+gasCCGT,R2,R2,A1,power,newcapa,2035,10.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2035,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2035,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2035,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
+solarPV,R2,R2,A1,power,newcapa,2035,20.00000000000
+windturbine,R2,R2,A1,power,newcapa,2035,9.86820000000
+windturbine,R2,R2,A1,power,newcapa,2035,2.40000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,16.49320000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,10.24680000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,2.60860000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,16.49320000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,10.24680000000
+gassupply1,R2,R2,A1,gas,newcapa,2035,2.60860000000
 electric_stove,R1,R1,A1,residential,newcapa,2040,22.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2040,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
@@ -66,19 +71,24 @@ electric_stove,R2,R2,A1,residential,newcapa,2040,22.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2040,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2040,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2040,20.00000000000
+solarPV,R1,R1,A1,power,newcapa,2040,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,9.86820000000
+windturbine,R1,R1,A1,power,newcapa,2040,2.40000000000
+gasCCGT,R2,R2,A1,power,newcapa,2040,10.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2040,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2040,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
+solarPV,R2,R2,A1,power,newcapa,2040,20.00000000000
+windturbine,R2,R2,A1,power,newcapa,2040,9.86820000000
+windturbine,R2,R2,A1,power,newcapa,2040,2.40000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,16.49320000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,10.24680000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,2.60860000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,4.89140000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,16.49320000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,10.24680000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,2.60860000000
+gassupply1,R2,R2,A1,gas,newcapa,2040,4.89140000000
 electric_stove,R1,R1,A1,residential,newcapa,2045,17.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2045,27.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
@@ -87,21 +97,26 @@ electric_stove,R2,R2,A1,residential,newcapa,2045,17.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2045,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2045,12.36820000000
+solarPV,R1,R1,A1,power,newcapa,2045,20.00000000000
 solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2045,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,9.86820000000
+windturbine,R1,R1,A1,power,newcapa,2045,2.40000000000
+gasCCGT,R2,R2,A1,power,newcapa,2045,10.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2045,10.50300000000
+solarPV,R2,R2,A1,power,newcapa,2045,20.00000000000
 solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2045,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
+windturbine,R2,R2,A1,power,newcapa,2045,9.86820000000
+windturbine,R2,R2,A1,power,newcapa,2045,2.40000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,16.49320000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,10.24680000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,2.60860000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,4.89140000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,16.49320000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,10.24680000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,2.60860000000
+gassupply1,R2,R2,A1,gas,newcapa,2045,4.89140000000
 electric_stove,R1,R1,A1,residential,newcapa,2050,27.00000000000
 electric_stove,R1,R1,A1,residential,newcapa,2050,23.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
@@ -110,22 +125,25 @@ electric_stove,R2,R2,A1,residential,newcapa,2050,27.00000000000
 electric_stove,R2,R2,A1,residential,newcapa,2050,23.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
 heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,10.50300000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.58590000000
-solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
+solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
 solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
 solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,20.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,2.40000000000
+windturbine,R1,R1,A1,power,newcapa,2050,1.06820000000
+gasCCGT,R2,R2,A1,power,newcapa,2050,10.00000000000
 gasCCGT,R2,R2,A1,power,newcapa,2050,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
+solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
 solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
 solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,23.56820000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.32420000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,1.32420000000
+windturbine,R2,R2,A1,power,newcapa,2050,2.40000000000
+windturbine,R2,R2,A1,power,newcapa,2050,1.06820000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,16.49320000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,10.24680000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,2.60860000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,4.89140000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,16.49320000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,10.24680000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,2.60860000000
+gassupply1,R2,R2,A1,gas,newcapa,2050,4.89140000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index 01a32a81..77e155a1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,483 +79,483 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.20270000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.20270000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.61350000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,0.61350000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.78230000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.15290000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,0.15290000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.75330000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,0.75330000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.28960000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.28960000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.12400000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,0.12400000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.87770000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,0.87770000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.11750000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.22720000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,0.22720000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.07610000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,1.07610000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.20270000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.20270000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,0.18580000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,0.18580000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61350000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61350000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.78230000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15290000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.15290000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.75330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.75330000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.28960000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.28960000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.12400000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.12400000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87770000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87770000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.11750000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.22720000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.22720000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.07610000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,1.07610000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.60810000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.60810000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.18580000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.18580000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.85360000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.85360000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.34680000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.34680000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.54470000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.54470000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.25990000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,2.25990000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.40540000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.40540000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.45780000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.45780000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.23130000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,1.23130000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.56450000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.33440000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,0.33440000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.50660000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,1.50660000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.40540000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.40540000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,0.27650000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,0.27650000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.23130000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23130000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.56450000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.33440000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.33440000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,1.50660000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,1.50660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.40540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.40540000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.27650000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.27650000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23130000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23130000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.56450000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.33440000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.33440000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.50660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.50660000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.50320000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.50320000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.27650000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.27650000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.89440000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,0.89440000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.01890000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.01890000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.03880000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,0.03880000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.01890000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.01890000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.71960000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.71960000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.03880000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,0.03880000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.27920000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,1.27920000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.03050000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.03050000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.07130000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,0.07130000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.03050000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.03050000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.50320000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.50320000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.07130000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,0.07130000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.89440000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.89440000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01890000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01890000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03880000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03880000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01890000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01890000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.71960000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.71960000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03880000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03880000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27920000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27920000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03050000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03050000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07130000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07130000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.03050000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03050000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.51730000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.51730000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.07130000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.07130000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.69840000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.69840000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.09170000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27270000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27270000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.09170000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.09170000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00890000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.00890000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.27270000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.27270000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,1.79380000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,1.79380000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.04940000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.04940000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.12960000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,0.12960000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.04940000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.00890000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.00890000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,0.12960000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,0.12960000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.79380000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.79380000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.04940000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.12960000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.12960000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.00890000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.00890000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.12960000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.12960000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.79380000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.79380000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.04940000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.12960000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.12960000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.04940000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56840000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.56840000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.12960000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.12960000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.88910000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,0.88910000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02750000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.02750000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.03870000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,0.03870000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.02750000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.02750000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81270000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.81270000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.03870000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,0.03870000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.27120000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,1.27120000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04830000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.04830000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.07100000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,0.07100000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.04830000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.04830000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.56840000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.56840000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.07100000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,0.07100000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.88910000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.88910000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02750000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02750000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03870000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03870000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02750000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02750000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81270000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.81270000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03870000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03870000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27120000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27120000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04830000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04830000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.07100000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.07100000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04830000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.04830000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.71180000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.71180000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.07100000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.07100000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.67810000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,2.67810000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.17040000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.17040000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.27100000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.27100000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.17040000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.17040000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.13910000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.13910000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.27100000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.27100000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,1.78180000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,1.78180000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.08430000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.08430000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.12890000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,0.12890000000,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', 'evening')",cook,R1,0.08430000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.13910000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.13910000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.12890000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,0.12890000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,1.78180000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,1.78180000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08430000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.12890000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.12890000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.13910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.13910000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.12890000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.12890000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.78180000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.78180000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08430000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.12890000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.12890000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08430000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.61420000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.61420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.12890000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.12890000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.11440000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,1.11440000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02940000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02940000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.04520000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,0.04520000000,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', 'night')",cook,R1,0.02940000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.02940000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.87800000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.87800000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.04520000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,0.04520000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.59310000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,1.59310000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05210000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05210000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.08430000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,0.08430000000,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', 'morning')",cook,R1,0.05210000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.05210000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61420000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.08430000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,0.08430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.11440000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.11440000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02940000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02940000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04520000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04520000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02940000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02940000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87800000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87800000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.04520000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.04520000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.59310000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.59310000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05210000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05210000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08430000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.08430000000,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', 'early-peak')",cook,R1,0.05210000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05210000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84810000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.84810000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.08430000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.08430000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.35400000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.35400000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.18730000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.18730000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.32950000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.32950000000,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', 'late-peak')",cook,R1,0.18730000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.18730000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.23020000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.23020000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.32950000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.32950000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.23240000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,2.23240000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.09180000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.09180000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.15490000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,0.15490000000,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', 'evening')",cook,R1,0.09180000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.23020000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23020000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.15490000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,0.15490000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.23240000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.23240000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09180000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.15490000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.15490000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23020000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23020000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.15490000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.15490000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.23240000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.23240000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09180000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15490000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15490000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09180000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.68840000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.68840000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.15490000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.15490000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.26090000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,1.26090000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.04940000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.04940000000,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', 'night')",cook,R1,0.03070000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.03070000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.98390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.98390000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.04940000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,0.04940000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.80230000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,1.80230000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05480000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05480000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.09290000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.09290000000,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', 'morning')",cook,R1,0.05480000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.05480000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.68840000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.68840000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.09290000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,0.09290000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.26090000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.26090000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03070000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03070000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04940000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04940000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03070000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03070000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.98390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.98390000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.04940000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.04940000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.80230000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.80230000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05480000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05480000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09290000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.09290000000,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', 'early-peak')",cook,R1,0.05480000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05480000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.07010000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.07010000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.09290000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.09290000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.79230000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,3.79230000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.19910000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.36750000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.36750000000,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', 'late-peak')",cook,R1,0.19910000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.19910000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.37840000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.37840000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.36750000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.36750000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,2.52510000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,2.52510000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.09710000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.09710000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.17180000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.17180000000,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', 'evening')",cook,R1,0.09710000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.37840000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.37840000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.17180000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,0.17180000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.52510000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.52510000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09710000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.17180000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.17180000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.37840000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.37840000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.17180000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.17180000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.52510000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.52510000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09710000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17180000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17180000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09710000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.79400000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.79400000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.17180000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.17180000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.37360000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,1.37360000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03290000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.03290000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.05270000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.05270000000,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', 'night')",cook,R1,0.03290000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.03290000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13480000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.13480000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.05270000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,0.05270000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.96310000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,1.96310000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05920000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.05920000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.09950000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.09950000000,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', 'morning')",cook,R1,0.05920000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.05920000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.79400000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.79400000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.09950000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,0.09950000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.37360000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.37360000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03290000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03290000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05270000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05270000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03290000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03290000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13480000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.13480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05270000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05270000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96310000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,1.96310000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05920000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05920000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09950000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.09950000000,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', 'early-peak')",cook,R1,0.05920000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05920000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.38670000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.38670000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.09950000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,0.09950000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.12910000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,4.12910000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21830000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.21830000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.39660000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.39660000000,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', 'late-peak')",cook,R1,0.21830000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.21830000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.58960000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.58960000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.39660000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,0.39660000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,2.74990000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,2.74990000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.10560000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.10560000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.18480000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.18480000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.10560000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.58960000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.58960000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.18480000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,0.18480000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,2.74990000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,2.74990000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
 "('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10560000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,0.18480000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,0.18480000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.58960000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.58960000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,0.18480000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,0.18480000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.74990000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.74990000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
 "('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10560000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18480000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18480000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.10560000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.18480000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.18480000000,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
index 09406e26..f547e359 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2020.csv
@@ -1,23 +1,31 @@
 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,12.36820000000
-1,2030,R1,solarPV,2020,12.36820000000
-1,2035,R1,solarPV,2020,12.36820000000
-1,2040,R1,solarPV,2020,12.36820000000
-1,2045,R1,solarPV,2020,12.36820000000
-1,2049,R1,solarPV,2020,12.36820000000
-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,windturbine,2020,32.36820000000
-4,2030,R2,windturbine,2020,32.36820000000
-4,2035,R2,windturbine,2020,32.36820000000
-4,2040,R2,windturbine,2020,32.36820000000
-4,2045,R2,windturbine,2020,32.36820000000
-4,2049,R2,windturbine,2020,32.36820000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
+1,2025,R1,windturbine,2020,9.86820000000
+1,2030,R1,windturbine,2020,9.86820000000
+1,2035,R1,windturbine,2020,9.86820000000
+1,2040,R1,windturbine,2020,9.86820000000
+1,2045,R1,windturbine,2020,9.86820000000
+1,2049,R1,windturbine,2020,9.86820000000
+2,2020,R2,gasCCGT,2020,1.00000000000
+2,2025,R2,gasCCGT,2020,11.00000000000
+2,2030,R2,gasCCGT,2020,10.00000000000
+2,2035,R2,gasCCGT,2020,10.00000000000
+2,2040,R2,gasCCGT,2020,10.00000000000
+2,2045,R2,gasCCGT,2020,10.00000000000
+2,2049,R2,gasCCGT,2020,10.00000000000
+2,2050,R2,gasCCGT,2020,10.00000000000
+2,2059,R2,gasCCGT,2020,10.00000000000
+3,2025,R2,windturbine,2020,9.86820000000
+3,2030,R2,windturbine,2020,9.86820000000
+3,2035,R2,windturbine,2020,9.86820000000
+3,2040,R2,windturbine,2020,9.86820000000
+3,2045,R2,windturbine,2020,9.86820000000
+3,2049,R2,windturbine,2020,9.86820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
index 700763c4..e7ac503f 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2025.csv
@@ -1,37 +1,49 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
 1,2030,R1,gasCCGT,2025,10.50300000000
 1,2035,R1,gasCCGT,2025,10.50300000000
 1,2040,R1,gasCCGT,2025,10.50300000000
 1,2045,R1,gasCCGT,2025,10.50300000000
 1,2049,R1,gasCCGT,2025,10.50300000000
 1,2050,R1,gasCCGT,2025,10.50300000000
+1,2059,R1,gasCCGT,2025,10.50300000000
+1,2060,R1,gasCCGT,2025,10.50300000000
 1,2064,R1,gasCCGT,2025,10.50300000000
-2,2025,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2020,12.36820000000
-2,2035,R1,solarPV,2020,12.36820000000
-2,2040,R1,solarPV,2020,12.36820000000
-2,2045,R1,solarPV,2020,12.36820000000
-2,2049,R1,solarPV,2020,12.36820000000
-3,2025,R1,windturbine,2020,20.00000000000
-3,2030,R1,windturbine,2020,20.00000000000
-3,2035,R1,windturbine,2020,20.00000000000
-3,2040,R1,windturbine,2020,20.00000000000
-3,2045,R1,windturbine,2020,20.00000000000
-3,2049,R1,windturbine,2020,20.00000000000
-4,2020,R2,gasCCGT,2020,1.00000000000
-4,2025,R2,gasCCGT,2020,1.00000000000
-5,2030,R2,gasCCGT,2025,10.50300000000
-5,2035,R2,gasCCGT,2025,10.50300000000
-5,2040,R2,gasCCGT,2025,10.50300000000
-5,2045,R2,gasCCGT,2025,10.50300000000
-5,2049,R2,gasCCGT,2025,10.50300000000
-5,2050,R2,gasCCGT,2025,10.50300000000
-5,2064,R2,gasCCGT,2025,10.50300000000
-6,2025,R2,windturbine,2020,32.36820000000
-6,2030,R2,windturbine,2020,32.36820000000
-6,2035,R2,windturbine,2020,32.36820000000
-6,2040,R2,windturbine,2020,32.36820000000
-6,2045,R2,windturbine,2020,32.36820000000
-6,2049,R2,windturbine,2020,32.36820000000
+2,2025,R1,windturbine,2020,9.86820000000
+2,2030,R1,windturbine,2020,9.86820000000
+2,2035,R1,windturbine,2020,9.86820000000
+2,2040,R1,windturbine,2020,9.86820000000
+2,2045,R1,windturbine,2020,9.86820000000
+2,2049,R1,windturbine,2020,9.86820000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,11.00000000000
+3,2030,R2,gasCCGT,2020,10.00000000000
+3,2035,R2,gasCCGT,2020,10.00000000000
+3,2040,R2,gasCCGT,2020,10.00000000000
+3,2045,R2,gasCCGT,2020,10.00000000000
+3,2049,R2,gasCCGT,2020,10.00000000000
+3,2050,R2,gasCCGT,2020,10.00000000000
+3,2059,R2,gasCCGT,2020,10.00000000000
+4,2030,R2,gasCCGT,2025,10.50300000000
+4,2035,R2,gasCCGT,2025,10.50300000000
+4,2040,R2,gasCCGT,2025,10.50300000000
+4,2045,R2,gasCCGT,2025,10.50300000000
+4,2049,R2,gasCCGT,2025,10.50300000000
+4,2050,R2,gasCCGT,2025,10.50300000000
+4,2059,R2,gasCCGT,2025,10.50300000000
+4,2060,R2,gasCCGT,2025,10.50300000000
+4,2064,R2,gasCCGT,2025,10.50300000000
+5,2025,R2,windturbine,2020,9.86820000000
+5,2030,R2,windturbine,2020,9.86820000000
+5,2035,R2,windturbine,2020,9.86820000000
+5,2040,R2,windturbine,2020,9.86820000000
+5,2045,R2,windturbine,2020,9.86820000000
+5,2049,R2,windturbine,2020,9.86820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
index 37225d0a..c6a30a36 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2030.csv
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
 1,2030,R1,gasCCGT,2025,10.50300000000
 1,2035,R1,gasCCGT,2025,10.50300000000
 1,2040,R1,gasCCGT,2025,10.50300000000
@@ -10,26 +17,33 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,10.50300000000
 1,2060,R1,gasCCGT,2025,10.50300000000
 1,2064,R1,gasCCGT,2025,10.50300000000
-2,2025,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2020,12.36820000000
-2,2035,R1,solarPV,2020,12.36820000000
-2,2040,R1,solarPV,2020,12.36820000000
-2,2045,R1,solarPV,2020,12.36820000000
-2,2049,R1,solarPV,2020,12.36820000000
-3,2035,R1,solarPV,2030,11.20000000000
-3,2040,R1,solarPV,2030,11.20000000000
-3,2045,R1,solarPV,2030,11.20000000000
-3,2049,R1,solarPV,2030,11.20000000000
-3,2050,R1,solarPV,2030,11.20000000000
-3,2059,R1,solarPV,2030,11.20000000000
-4,2025,R1,windturbine,2020,20.00000000000
-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
+2,2035,R1,solarPV,2030,20.00000000000
+2,2040,R1,solarPV,2030,20.00000000000
+2,2045,R1,solarPV,2030,20.00000000000
+2,2049,R1,solarPV,2030,20.00000000000
+2,2050,R1,solarPV,2030,20.00000000000
+2,2059,R1,solarPV,2030,20.00000000000
+3,2025,R1,windturbine,2020,9.86820000000
+3,2030,R1,windturbine,2020,9.86820000000
+3,2035,R1,windturbine,2020,9.86820000000
+3,2040,R1,windturbine,2020,9.86820000000
+3,2045,R1,windturbine,2020,9.86820000000
+3,2049,R1,windturbine,2020,9.86820000000
+4,2035,R1,windturbine,2030,2.40000000000
+4,2040,R1,windturbine,2030,2.40000000000
+4,2045,R1,windturbine,2030,2.40000000000
+4,2049,R1,windturbine,2030,2.40000000000
+4,2050,R1,windturbine,2030,2.40000000000
+4,2059,R1,windturbine,2030,2.40000000000
 5,2020,R2,gasCCGT,2020,1.00000000000
-5,2025,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,11.00000000000
+5,2030,R2,gasCCGT,2020,10.00000000000
+5,2035,R2,gasCCGT,2020,10.00000000000
+5,2040,R2,gasCCGT,2020,10.00000000000
+5,2045,R2,gasCCGT,2020,10.00000000000
+5,2049,R2,gasCCGT,2020,10.00000000000
+5,2050,R2,gasCCGT,2020,10.00000000000
+5,2059,R2,gasCCGT,2020,10.00000000000
 6,2030,R2,gasCCGT,2025,10.50300000000
 6,2035,R2,gasCCGT,2025,10.50300000000
 6,2040,R2,gasCCGT,2025,10.50300000000
@@ -39,15 +53,21 @@ asset,year,region,technology,installed,capacity
 6,2059,R2,gasCCGT,2025,10.50300000000
 6,2060,R2,gasCCGT,2025,10.50300000000
 6,2064,R2,gasCCGT,2025,10.50300000000
-7,2035,R2,solarPV,2030,11.20000000000
-7,2040,R2,solarPV,2030,11.20000000000
-7,2045,R2,solarPV,2030,11.20000000000
-7,2049,R2,solarPV,2030,11.20000000000
-7,2050,R2,solarPV,2030,11.20000000000
-7,2059,R2,solarPV,2030,11.20000000000
-8,2025,R2,windturbine,2020,32.36820000000
-8,2030,R2,windturbine,2020,32.36820000000
-8,2035,R2,windturbine,2020,32.36820000000
-8,2040,R2,windturbine,2020,32.36820000000
-8,2045,R2,windturbine,2020,32.36820000000
-8,2049,R2,windturbine,2020,32.36820000000
+7,2035,R2,solarPV,2030,20.00000000000
+7,2040,R2,solarPV,2030,20.00000000000
+7,2045,R2,solarPV,2030,20.00000000000
+7,2049,R2,solarPV,2030,20.00000000000
+7,2050,R2,solarPV,2030,20.00000000000
+7,2059,R2,solarPV,2030,20.00000000000
+8,2025,R2,windturbine,2020,9.86820000000
+8,2030,R2,windturbine,2020,9.86820000000
+8,2035,R2,windturbine,2020,9.86820000000
+8,2040,R2,windturbine,2020,9.86820000000
+8,2045,R2,windturbine,2020,9.86820000000
+8,2049,R2,windturbine,2020,9.86820000000
+9,2035,R2,windturbine,2030,2.40000000000
+9,2040,R2,windturbine,2030,2.40000000000
+9,2045,R2,windturbine,2030,2.40000000000
+9,2049,R2,windturbine,2030,2.40000000000
+9,2050,R2,windturbine,2030,2.40000000000
+9,2059,R2,windturbine,2030,2.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
index fbb7d82a..c6a30a36 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2035.csv
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
 1,2030,R1,gasCCGT,2025,10.50300000000
 1,2035,R1,gasCCGT,2025,10.50300000000
 1,2040,R1,gasCCGT,2025,10.50300000000
@@ -10,58 +17,57 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,10.50300000000
 1,2060,R1,gasCCGT,2025,10.50300000000
 1,2064,R1,gasCCGT,2025,10.50300000000
-2,2025,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2020,12.36820000000
-2,2035,R1,solarPV,2020,12.36820000000
-2,2040,R1,solarPV,2020,12.36820000000
-2,2045,R1,solarPV,2020,12.36820000000
-2,2049,R1,solarPV,2020,12.36820000000
-3,2035,R1,solarPV,2030,11.20000000000
-3,2040,R1,solarPV,2030,11.20000000000
-3,2045,R1,solarPV,2030,11.20000000000
-3,2049,R1,solarPV,2030,11.20000000000
-3,2050,R1,solarPV,2030,11.20000000000
-3,2059,R1,solarPV,2030,11.20000000000
-4,2040,R1,solarPV,2035,11.20000000000
-4,2045,R1,solarPV,2035,11.20000000000
-4,2049,R1,solarPV,2035,11.20000000000
-4,2050,R1,solarPV,2035,11.20000000000
-4,2059,R1,solarPV,2035,11.20000000000
-4,2060,R1,solarPV,2035,11.20000000000
-4,2064,R1,solarPV,2035,11.20000000000
-5,2025,R1,windturbine,2020,20.00000000000
-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
-6,2020,R2,gasCCGT,2020,1.00000000000
-6,2025,R2,gasCCGT,2020,1.00000000000
-7,2030,R2,gasCCGT,2025,10.50300000000
-7,2035,R2,gasCCGT,2025,10.50300000000
-7,2040,R2,gasCCGT,2025,10.50300000000
-7,2045,R2,gasCCGT,2025,10.50300000000
-7,2049,R2,gasCCGT,2025,10.50300000000
-7,2050,R2,gasCCGT,2025,10.50300000000
-7,2059,R2,gasCCGT,2025,10.50300000000
-7,2060,R2,gasCCGT,2025,10.50300000000
-7,2064,R2,gasCCGT,2025,10.50300000000
-8,2035,R2,solarPV,2030,11.20000000000
-8,2040,R2,solarPV,2030,11.20000000000
-8,2045,R2,solarPV,2030,11.20000000000
-8,2049,R2,solarPV,2030,11.20000000000
-8,2050,R2,solarPV,2030,11.20000000000
-8,2059,R2,solarPV,2030,11.20000000000
-9,2040,R2,solarPV,2035,11.20000000000
-9,2045,R2,solarPV,2035,11.20000000000
-9,2049,R2,solarPV,2035,11.20000000000
-9,2050,R2,solarPV,2035,11.20000000000
-9,2059,R2,solarPV,2035,11.20000000000
-9,2060,R2,solarPV,2035,11.20000000000
-9,2064,R2,solarPV,2035,11.20000000000
-10,2025,R2,windturbine,2020,32.36820000000
-10,2030,R2,windturbine,2020,32.36820000000
-10,2035,R2,windturbine,2020,32.36820000000
-10,2040,R2,windturbine,2020,32.36820000000
-10,2045,R2,windturbine,2020,32.36820000000
-10,2049,R2,windturbine,2020,32.36820000000
+2,2035,R1,solarPV,2030,20.00000000000
+2,2040,R1,solarPV,2030,20.00000000000
+2,2045,R1,solarPV,2030,20.00000000000
+2,2049,R1,solarPV,2030,20.00000000000
+2,2050,R1,solarPV,2030,20.00000000000
+2,2059,R1,solarPV,2030,20.00000000000
+3,2025,R1,windturbine,2020,9.86820000000
+3,2030,R1,windturbine,2020,9.86820000000
+3,2035,R1,windturbine,2020,9.86820000000
+3,2040,R1,windturbine,2020,9.86820000000
+3,2045,R1,windturbine,2020,9.86820000000
+3,2049,R1,windturbine,2020,9.86820000000
+4,2035,R1,windturbine,2030,2.40000000000
+4,2040,R1,windturbine,2030,2.40000000000
+4,2045,R1,windturbine,2030,2.40000000000
+4,2049,R1,windturbine,2030,2.40000000000
+4,2050,R1,windturbine,2030,2.40000000000
+4,2059,R1,windturbine,2030,2.40000000000
+5,2020,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,11.00000000000
+5,2030,R2,gasCCGT,2020,10.00000000000
+5,2035,R2,gasCCGT,2020,10.00000000000
+5,2040,R2,gasCCGT,2020,10.00000000000
+5,2045,R2,gasCCGT,2020,10.00000000000
+5,2049,R2,gasCCGT,2020,10.00000000000
+5,2050,R2,gasCCGT,2020,10.00000000000
+5,2059,R2,gasCCGT,2020,10.00000000000
+6,2030,R2,gasCCGT,2025,10.50300000000
+6,2035,R2,gasCCGT,2025,10.50300000000
+6,2040,R2,gasCCGT,2025,10.50300000000
+6,2045,R2,gasCCGT,2025,10.50300000000
+6,2049,R2,gasCCGT,2025,10.50300000000
+6,2050,R2,gasCCGT,2025,10.50300000000
+6,2059,R2,gasCCGT,2025,10.50300000000
+6,2060,R2,gasCCGT,2025,10.50300000000
+6,2064,R2,gasCCGT,2025,10.50300000000
+7,2035,R2,solarPV,2030,20.00000000000
+7,2040,R2,solarPV,2030,20.00000000000
+7,2045,R2,solarPV,2030,20.00000000000
+7,2049,R2,solarPV,2030,20.00000000000
+7,2050,R2,solarPV,2030,20.00000000000
+7,2059,R2,solarPV,2030,20.00000000000
+8,2025,R2,windturbine,2020,9.86820000000
+8,2030,R2,windturbine,2020,9.86820000000
+8,2035,R2,windturbine,2020,9.86820000000
+8,2040,R2,windturbine,2020,9.86820000000
+8,2045,R2,windturbine,2020,9.86820000000
+8,2049,R2,windturbine,2020,9.86820000000
+9,2035,R2,windturbine,2030,2.40000000000
+9,2040,R2,windturbine,2030,2.40000000000
+9,2045,R2,windturbine,2030,2.40000000000
+9,2049,R2,windturbine,2030,2.40000000000
+9,2050,R2,windturbine,2030,2.40000000000
+9,2059,R2,windturbine,2030,2.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
index dc49ed92..a18b8bbd 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2040.csv
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
 1,2030,R1,gasCCGT,2025,10.50300000000
 1,2035,R1,gasCCGT,2025,10.50300000000
 1,2040,R1,gasCCGT,2025,10.50300000000
@@ -10,74 +17,73 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,10.50300000000
 1,2060,R1,gasCCGT,2025,10.50300000000
 1,2064,R1,gasCCGT,2025,10.50300000000
-2,2025,R1,solarPV,2020,12.36820000000
-2,2030,R1,solarPV,2020,12.36820000000
-2,2035,R1,solarPV,2020,12.36820000000
-2,2040,R1,solarPV,2020,12.36820000000
-2,2045,R1,solarPV,2020,12.36820000000
-2,2049,R1,solarPV,2020,12.36820000000
-3,2035,R1,solarPV,2030,11.20000000000
-3,2040,R1,solarPV,2030,11.20000000000
-3,2045,R1,solarPV,2030,11.20000000000
-3,2049,R1,solarPV,2030,11.20000000000
-3,2050,R1,solarPV,2030,11.20000000000
-3,2059,R1,solarPV,2030,11.20000000000
-4,2040,R1,solarPV,2035,11.20000000000
-4,2045,R1,solarPV,2035,11.20000000000
-4,2049,R1,solarPV,2035,11.20000000000
-4,2050,R1,solarPV,2035,11.20000000000
-4,2059,R1,solarPV,2035,11.20000000000
-4,2060,R1,solarPV,2035,11.20000000000
-4,2064,R1,solarPV,2035,11.20000000000
-5,2045,R1,solarPV,2040,11.20000000000
-5,2049,R1,solarPV,2040,11.20000000000
-5,2050,R1,solarPV,2040,11.20000000000
-5,2059,R1,solarPV,2040,11.20000000000
-5,2060,R1,solarPV,2040,11.20000000000
-5,2064,R1,solarPV,2040,11.20000000000
-5,2065,R1,solarPV,2040,11.20000000000
-5,2069,R1,solarPV,2040,11.20000000000
-6,2025,R1,windturbine,2020,20.00000000000
-6,2030,R1,windturbine,2020,20.00000000000
-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
-7,2020,R2,gasCCGT,2020,1.00000000000
-7,2025,R2,gasCCGT,2020,1.00000000000
-8,2030,R2,gasCCGT,2025,10.50300000000
-8,2035,R2,gasCCGT,2025,10.50300000000
-8,2040,R2,gasCCGT,2025,10.50300000000
-8,2045,R2,gasCCGT,2025,10.50300000000
-8,2049,R2,gasCCGT,2025,10.50300000000
-8,2050,R2,gasCCGT,2025,10.50300000000
-8,2059,R2,gasCCGT,2025,10.50300000000
-8,2060,R2,gasCCGT,2025,10.50300000000
-8,2064,R2,gasCCGT,2025,10.50300000000
-9,2035,R2,solarPV,2030,11.20000000000
-9,2040,R2,solarPV,2030,11.20000000000
-9,2045,R2,solarPV,2030,11.20000000000
-9,2049,R2,solarPV,2030,11.20000000000
-9,2050,R2,solarPV,2030,11.20000000000
-9,2059,R2,solarPV,2030,11.20000000000
-10,2040,R2,solarPV,2035,11.20000000000
-10,2045,R2,solarPV,2035,11.20000000000
-10,2049,R2,solarPV,2035,11.20000000000
-10,2050,R2,solarPV,2035,11.20000000000
-10,2059,R2,solarPV,2035,11.20000000000
-10,2060,R2,solarPV,2035,11.20000000000
-10,2064,R2,solarPV,2035,11.20000000000
-11,2045,R2,solarPV,2040,11.20000000000
-11,2049,R2,solarPV,2040,11.20000000000
-11,2050,R2,solarPV,2040,11.20000000000
-11,2059,R2,solarPV,2040,11.20000000000
-11,2060,R2,solarPV,2040,11.20000000000
-11,2064,R2,solarPV,2040,11.20000000000
-11,2065,R2,solarPV,2040,11.20000000000
-11,2069,R2,solarPV,2040,11.20000000000
-12,2025,R2,windturbine,2020,32.36820000000
-12,2030,R2,windturbine,2020,32.36820000000
-12,2035,R2,windturbine,2020,32.36820000000
-12,2040,R2,windturbine,2020,32.36820000000
-12,2045,R2,windturbine,2020,32.36820000000
-12,2049,R2,windturbine,2020,32.36820000000
+2,2035,R1,solarPV,2030,20.00000000000
+2,2040,R1,solarPV,2030,20.00000000000
+2,2045,R1,solarPV,2030,20.00000000000
+2,2049,R1,solarPV,2030,20.00000000000
+2,2050,R1,solarPV,2030,20.00000000000
+2,2059,R1,solarPV,2030,20.00000000000
+3,2045,R1,solarPV,2040,11.20000000000
+3,2049,R1,solarPV,2040,11.20000000000
+3,2050,R1,solarPV,2040,11.20000000000
+3,2059,R1,solarPV,2040,11.20000000000
+3,2060,R1,solarPV,2040,11.20000000000
+3,2064,R1,solarPV,2040,11.20000000000
+3,2065,R1,solarPV,2040,11.20000000000
+3,2069,R1,solarPV,2040,11.20000000000
+4,2025,R1,windturbine,2020,9.86820000000
+4,2030,R1,windturbine,2020,9.86820000000
+4,2035,R1,windturbine,2020,9.86820000000
+4,2040,R1,windturbine,2020,9.86820000000
+4,2045,R1,windturbine,2020,9.86820000000
+4,2049,R1,windturbine,2020,9.86820000000
+5,2035,R1,windturbine,2030,2.40000000000
+5,2040,R1,windturbine,2030,2.40000000000
+5,2045,R1,windturbine,2030,2.40000000000
+5,2049,R1,windturbine,2030,2.40000000000
+5,2050,R1,windturbine,2030,2.40000000000
+5,2059,R1,windturbine,2030,2.40000000000
+6,2020,R2,gasCCGT,2020,1.00000000000
+6,2025,R2,gasCCGT,2020,11.00000000000
+6,2030,R2,gasCCGT,2020,10.00000000000
+6,2035,R2,gasCCGT,2020,10.00000000000
+6,2040,R2,gasCCGT,2020,10.00000000000
+6,2045,R2,gasCCGT,2020,10.00000000000
+6,2049,R2,gasCCGT,2020,10.00000000000
+6,2050,R2,gasCCGT,2020,10.00000000000
+6,2059,R2,gasCCGT,2020,10.00000000000
+7,2030,R2,gasCCGT,2025,10.50300000000
+7,2035,R2,gasCCGT,2025,10.50300000000
+7,2040,R2,gasCCGT,2025,10.50300000000
+7,2045,R2,gasCCGT,2025,10.50300000000
+7,2049,R2,gasCCGT,2025,10.50300000000
+7,2050,R2,gasCCGT,2025,10.50300000000
+7,2059,R2,gasCCGT,2025,10.50300000000
+7,2060,R2,gasCCGT,2025,10.50300000000
+7,2064,R2,gasCCGT,2025,10.50300000000
+8,2035,R2,solarPV,2030,20.00000000000
+8,2040,R2,solarPV,2030,20.00000000000
+8,2045,R2,solarPV,2030,20.00000000000
+8,2049,R2,solarPV,2030,20.00000000000
+8,2050,R2,solarPV,2030,20.00000000000
+8,2059,R2,solarPV,2030,20.00000000000
+9,2045,R2,solarPV,2040,11.20000000000
+9,2049,R2,solarPV,2040,11.20000000000
+9,2050,R2,solarPV,2040,11.20000000000
+9,2059,R2,solarPV,2040,11.20000000000
+9,2060,R2,solarPV,2040,11.20000000000
+9,2064,R2,solarPV,2040,11.20000000000
+9,2065,R2,solarPV,2040,11.20000000000
+9,2069,R2,solarPV,2040,11.20000000000
+10,2025,R2,windturbine,2020,9.86820000000
+10,2030,R2,windturbine,2020,9.86820000000
+10,2035,R2,windturbine,2020,9.86820000000
+10,2040,R2,windturbine,2020,9.86820000000
+10,2045,R2,windturbine,2020,9.86820000000
+10,2049,R2,windturbine,2020,9.86820000000
+11,2035,R2,windturbine,2030,2.40000000000
+11,2040,R2,windturbine,2030,2.40000000000
+11,2045,R2,windturbine,2030,2.40000000000
+11,2049,R2,windturbine,2030,2.40000000000
+11,2050,R2,windturbine,2030,2.40000000000
+11,2059,R2,windturbine,2030,2.40000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
index f127abcc..d90d3e8d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2045.csv
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
 1,2030,R1,gasCCGT,2025,10.50300000000
 1,2035,R1,gasCCGT,2025,10.50300000000
 1,2040,R1,gasCCGT,2025,10.50300000000
@@ -10,116 +17,105 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,10.50300000000
 1,2060,R1,gasCCGT,2025,10.50300000000
 1,2064,R1,gasCCGT,2025,10.50300000000
-2,2050,R1,gasCCGT,2045,1.58590000000
-2,2059,R1,gasCCGT,2045,1.58590000000
-2,2060,R1,gasCCGT,2045,1.58590000000
-2,2064,R1,gasCCGT,2045,1.58590000000
-2,2065,R1,gasCCGT,2045,1.58590000000
-2,2069,R1,gasCCGT,2045,1.58590000000
-2,2070,R1,gasCCGT,2045,1.58590000000
-2,2074,R1,gasCCGT,2045,1.58590000000
-2,2075,R1,gasCCGT,2045,1.58590000000
-2,2084,R1,gasCCGT,2045,1.58590000000
-3,2025,R1,solarPV,2020,12.36820000000
-3,2030,R1,solarPV,2020,12.36820000000
-3,2035,R1,solarPV,2020,12.36820000000
-3,2040,R1,solarPV,2020,12.36820000000
-3,2045,R1,solarPV,2020,12.36820000000
-3,2049,R1,solarPV,2020,12.36820000000
-4,2035,R1,solarPV,2030,11.20000000000
-4,2040,R1,solarPV,2030,11.20000000000
-4,2045,R1,solarPV,2030,11.20000000000
-4,2049,R1,solarPV,2030,11.20000000000
-4,2050,R1,solarPV,2030,11.20000000000
-4,2059,R1,solarPV,2030,11.20000000000
-5,2040,R1,solarPV,2035,11.20000000000
-5,2045,R1,solarPV,2035,11.20000000000
-5,2049,R1,solarPV,2035,11.20000000000
-5,2050,R1,solarPV,2035,11.20000000000
-5,2059,R1,solarPV,2035,11.20000000000
-5,2060,R1,solarPV,2035,11.20000000000
-5,2064,R1,solarPV,2035,11.20000000000
-6,2045,R1,solarPV,2040,11.20000000000
-6,2049,R1,solarPV,2040,11.20000000000
-6,2050,R1,solarPV,2040,11.20000000000
-6,2059,R1,solarPV,2040,11.20000000000
-6,2060,R1,solarPV,2040,11.20000000000
-6,2064,R1,solarPV,2040,11.20000000000
-6,2065,R1,solarPV,2040,11.20000000000
-6,2069,R1,solarPV,2040,11.20000000000
-7,2050,R1,solarPV,2045,20.00000000000
-7,2059,R1,solarPV,2045,20.00000000000
-7,2060,R1,solarPV,2045,20.00000000000
-7,2064,R1,solarPV,2045,20.00000000000
-7,2065,R1,solarPV,2045,20.00000000000
-7,2069,R1,solarPV,2045,20.00000000000
-7,2070,R1,solarPV,2045,20.00000000000
-7,2074,R1,solarPV,2045,20.00000000000
-8,2025,R1,windturbine,2020,20.00000000000
-8,2030,R1,windturbine,2020,20.00000000000
-8,2035,R1,windturbine,2020,20.00000000000
-8,2040,R1,windturbine,2020,20.00000000000
-8,2045,R1,windturbine,2020,20.00000000000
-8,2049,R1,windturbine,2020,20.00000000000
-9,2050,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,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,10.50300000000
-11,2035,R2,gasCCGT,2025,10.50300000000
-11,2040,R2,gasCCGT,2025,10.50300000000
-11,2045,R2,gasCCGT,2025,10.50300000000
-11,2049,R2,gasCCGT,2025,10.50300000000
-11,2050,R2,gasCCGT,2025,10.50300000000
-11,2059,R2,gasCCGT,2025,10.50300000000
-11,2060,R2,gasCCGT,2025,10.50300000000
-11,2064,R2,gasCCGT,2025,10.50300000000
-12,2035,R2,solarPV,2030,11.20000000000
-12,2040,R2,solarPV,2030,11.20000000000
-12,2045,R2,solarPV,2030,11.20000000000
-12,2049,R2,solarPV,2030,11.20000000000
-12,2050,R2,solarPV,2030,11.20000000000
-12,2059,R2,solarPV,2030,11.20000000000
-13,2040,R2,solarPV,2035,11.20000000000
-13,2045,R2,solarPV,2035,11.20000000000
-13,2049,R2,solarPV,2035,11.20000000000
-13,2050,R2,solarPV,2035,11.20000000000
-13,2059,R2,solarPV,2035,11.20000000000
-13,2060,R2,solarPV,2035,11.20000000000
-13,2064,R2,solarPV,2035,11.20000000000
-14,2045,R2,solarPV,2040,11.20000000000
-14,2049,R2,solarPV,2040,11.20000000000
-14,2050,R2,solarPV,2040,11.20000000000
-14,2059,R2,solarPV,2040,11.20000000000
-14,2060,R2,solarPV,2040,11.20000000000
-14,2064,R2,solarPV,2040,11.20000000000
-14,2065,R2,solarPV,2040,11.20000000000
-14,2069,R2,solarPV,2040,11.20000000000
-15,2050,R2,solarPV,2045,20.00000000000
-15,2059,R2,solarPV,2045,20.00000000000
-15,2060,R2,solarPV,2045,20.00000000000
-15,2064,R2,solarPV,2045,20.00000000000
-15,2065,R2,solarPV,2045,20.00000000000
-15,2069,R2,solarPV,2045,20.00000000000
-15,2070,R2,solarPV,2045,20.00000000000
-15,2074,R2,solarPV,2045,20.00000000000
-16,2025,R2,windturbine,2020,32.36820000000
-16,2030,R2,windturbine,2020,32.36820000000
-16,2035,R2,windturbine,2020,32.36820000000
-16,2040,R2,windturbine,2020,32.36820000000
-16,2045,R2,windturbine,2020,32.36820000000
-16,2049,R2,windturbine,2020,32.36820000000
-17,2050,R2,windturbine,2045,23.56820000000
-17,2059,R2,windturbine,2045,23.56820000000
-17,2060,R2,windturbine,2045,23.56820000000
-17,2064,R2,windturbine,2045,23.56820000000
-17,2065,R2,windturbine,2045,23.56820000000
-17,2069,R2,windturbine,2045,23.56820000000
-17,2070,R2,windturbine,2045,23.56820000000
-17,2074,R2,windturbine,2045,23.56820000000
+2,2035,R1,solarPV,2030,20.00000000000
+2,2040,R1,solarPV,2030,20.00000000000
+2,2045,R1,solarPV,2030,20.00000000000
+2,2049,R1,solarPV,2030,20.00000000000
+2,2050,R1,solarPV,2030,20.00000000000
+2,2059,R1,solarPV,2030,20.00000000000
+3,2045,R1,solarPV,2040,11.20000000000
+3,2049,R1,solarPV,2040,11.20000000000
+3,2050,R1,solarPV,2040,11.20000000000
+3,2059,R1,solarPV,2040,11.20000000000
+3,2060,R1,solarPV,2040,11.20000000000
+3,2064,R1,solarPV,2040,11.20000000000
+3,2065,R1,solarPV,2040,11.20000000000
+3,2069,R1,solarPV,2040,11.20000000000
+4,2050,R1,solarPV,2045,20.00000000000
+4,2059,R1,solarPV,2045,20.00000000000
+4,2060,R1,solarPV,2045,20.00000000000
+4,2064,R1,solarPV,2045,20.00000000000
+4,2065,R1,solarPV,2045,20.00000000000
+4,2069,R1,solarPV,2045,20.00000000000
+4,2070,R1,solarPV,2045,20.00000000000
+4,2074,R1,solarPV,2045,20.00000000000
+5,2025,R1,windturbine,2020,9.86820000000
+5,2030,R1,windturbine,2020,9.86820000000
+5,2035,R1,windturbine,2020,9.86820000000
+5,2040,R1,windturbine,2020,9.86820000000
+5,2045,R1,windturbine,2020,9.86820000000
+5,2049,R1,windturbine,2020,9.86820000000
+6,2035,R1,windturbine,2030,2.40000000000
+6,2040,R1,windturbine,2030,2.40000000000
+6,2045,R1,windturbine,2030,2.40000000000
+6,2049,R1,windturbine,2030,2.40000000000
+6,2050,R1,windturbine,2030,2.40000000000
+6,2059,R1,windturbine,2030,2.40000000000
+7,2050,R1,windturbine,2045,1.06820000000
+7,2059,R1,windturbine,2045,1.06820000000
+7,2060,R1,windturbine,2045,1.06820000000
+7,2064,R1,windturbine,2045,1.06820000000
+7,2065,R1,windturbine,2045,1.06820000000
+7,2069,R1,windturbine,2045,1.06820000000
+7,2070,R1,windturbine,2045,1.06820000000
+7,2074,R1,windturbine,2045,1.06820000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,11.00000000000
+8,2030,R2,gasCCGT,2020,10.00000000000
+8,2035,R2,gasCCGT,2020,10.00000000000
+8,2040,R2,gasCCGT,2020,10.00000000000
+8,2045,R2,gasCCGT,2020,10.00000000000
+8,2049,R2,gasCCGT,2020,10.00000000000
+8,2050,R2,gasCCGT,2020,10.00000000000
+8,2059,R2,gasCCGT,2020,10.00000000000
+9,2030,R2,gasCCGT,2025,10.50300000000
+9,2035,R2,gasCCGT,2025,10.50300000000
+9,2040,R2,gasCCGT,2025,10.50300000000
+9,2045,R2,gasCCGT,2025,10.50300000000
+9,2049,R2,gasCCGT,2025,10.50300000000
+9,2050,R2,gasCCGT,2025,10.50300000000
+9,2059,R2,gasCCGT,2025,10.50300000000
+9,2060,R2,gasCCGT,2025,10.50300000000
+9,2064,R2,gasCCGT,2025,10.50300000000
+10,2035,R2,solarPV,2030,20.00000000000
+10,2040,R2,solarPV,2030,20.00000000000
+10,2045,R2,solarPV,2030,20.00000000000
+10,2049,R2,solarPV,2030,20.00000000000
+10,2050,R2,solarPV,2030,20.00000000000
+10,2059,R2,solarPV,2030,20.00000000000
+11,2045,R2,solarPV,2040,11.20000000000
+11,2049,R2,solarPV,2040,11.20000000000
+11,2050,R2,solarPV,2040,11.20000000000
+11,2059,R2,solarPV,2040,11.20000000000
+11,2060,R2,solarPV,2040,11.20000000000
+11,2064,R2,solarPV,2040,11.20000000000
+11,2065,R2,solarPV,2040,11.20000000000
+11,2069,R2,solarPV,2040,11.20000000000
+12,2050,R2,solarPV,2045,20.00000000000
+12,2059,R2,solarPV,2045,20.00000000000
+12,2060,R2,solarPV,2045,20.00000000000
+12,2064,R2,solarPV,2045,20.00000000000
+12,2065,R2,solarPV,2045,20.00000000000
+12,2069,R2,solarPV,2045,20.00000000000
+12,2070,R2,solarPV,2045,20.00000000000
+12,2074,R2,solarPV,2045,20.00000000000
+13,2025,R2,windturbine,2020,9.86820000000
+13,2030,R2,windturbine,2020,9.86820000000
+13,2035,R2,windturbine,2020,9.86820000000
+13,2040,R2,windturbine,2020,9.86820000000
+13,2045,R2,windturbine,2020,9.86820000000
+13,2049,R2,windturbine,2020,9.86820000000
+14,2035,R2,windturbine,2030,2.40000000000
+14,2040,R2,windturbine,2030,2.40000000000
+14,2045,R2,windturbine,2030,2.40000000000
+14,2049,R2,windturbine,2030,2.40000000000
+14,2050,R2,windturbine,2030,2.40000000000
+14,2059,R2,windturbine,2030,2.40000000000
+15,2050,R2,windturbine,2045,1.06820000000
+15,2059,R2,windturbine,2045,1.06820000000
+15,2060,R2,windturbine,2045,1.06820000000
+15,2064,R2,windturbine,2045,1.06820000000
+15,2065,R2,windturbine,2045,1.06820000000
+15,2069,R2,windturbine,2045,1.06820000000
+15,2070,R2,windturbine,2045,1.06820000000
+15,2074,R2,windturbine,2045,1.06820000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
index f127abcc..d90d3e8d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Power/Capacity/2050.csv
@@ -1,6 +1,13 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1.00000000000
-0,2025,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,11.00000000000
+0,2030,R1,gasCCGT,2020,10.00000000000
+0,2035,R1,gasCCGT,2020,10.00000000000
+0,2040,R1,gasCCGT,2020,10.00000000000
+0,2045,R1,gasCCGT,2020,10.00000000000
+0,2049,R1,gasCCGT,2020,10.00000000000
+0,2050,R1,gasCCGT,2020,10.00000000000
+0,2059,R1,gasCCGT,2020,10.00000000000
 1,2030,R1,gasCCGT,2025,10.50300000000
 1,2035,R1,gasCCGT,2025,10.50300000000
 1,2040,R1,gasCCGT,2025,10.50300000000
@@ -10,116 +17,105 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,10.50300000000
 1,2060,R1,gasCCGT,2025,10.50300000000
 1,2064,R1,gasCCGT,2025,10.50300000000
-2,2050,R1,gasCCGT,2045,1.58590000000
-2,2059,R1,gasCCGT,2045,1.58590000000
-2,2060,R1,gasCCGT,2045,1.58590000000
-2,2064,R1,gasCCGT,2045,1.58590000000
-2,2065,R1,gasCCGT,2045,1.58590000000
-2,2069,R1,gasCCGT,2045,1.58590000000
-2,2070,R1,gasCCGT,2045,1.58590000000
-2,2074,R1,gasCCGT,2045,1.58590000000
-2,2075,R1,gasCCGT,2045,1.58590000000
-2,2084,R1,gasCCGT,2045,1.58590000000
-3,2025,R1,solarPV,2020,12.36820000000
-3,2030,R1,solarPV,2020,12.36820000000
-3,2035,R1,solarPV,2020,12.36820000000
-3,2040,R1,solarPV,2020,12.36820000000
-3,2045,R1,solarPV,2020,12.36820000000
-3,2049,R1,solarPV,2020,12.36820000000
-4,2035,R1,solarPV,2030,11.20000000000
-4,2040,R1,solarPV,2030,11.20000000000
-4,2045,R1,solarPV,2030,11.20000000000
-4,2049,R1,solarPV,2030,11.20000000000
-4,2050,R1,solarPV,2030,11.20000000000
-4,2059,R1,solarPV,2030,11.20000000000
-5,2040,R1,solarPV,2035,11.20000000000
-5,2045,R1,solarPV,2035,11.20000000000
-5,2049,R1,solarPV,2035,11.20000000000
-5,2050,R1,solarPV,2035,11.20000000000
-5,2059,R1,solarPV,2035,11.20000000000
-5,2060,R1,solarPV,2035,11.20000000000
-5,2064,R1,solarPV,2035,11.20000000000
-6,2045,R1,solarPV,2040,11.20000000000
-6,2049,R1,solarPV,2040,11.20000000000
-6,2050,R1,solarPV,2040,11.20000000000
-6,2059,R1,solarPV,2040,11.20000000000
-6,2060,R1,solarPV,2040,11.20000000000
-6,2064,R1,solarPV,2040,11.20000000000
-6,2065,R1,solarPV,2040,11.20000000000
-6,2069,R1,solarPV,2040,11.20000000000
-7,2050,R1,solarPV,2045,20.00000000000
-7,2059,R1,solarPV,2045,20.00000000000
-7,2060,R1,solarPV,2045,20.00000000000
-7,2064,R1,solarPV,2045,20.00000000000
-7,2065,R1,solarPV,2045,20.00000000000
-7,2069,R1,solarPV,2045,20.00000000000
-7,2070,R1,solarPV,2045,20.00000000000
-7,2074,R1,solarPV,2045,20.00000000000
-8,2025,R1,windturbine,2020,20.00000000000
-8,2030,R1,windturbine,2020,20.00000000000
-8,2035,R1,windturbine,2020,20.00000000000
-8,2040,R1,windturbine,2020,20.00000000000
-8,2045,R1,windturbine,2020,20.00000000000
-8,2049,R1,windturbine,2020,20.00000000000
-9,2050,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,2020,R2,gasCCGT,2020,1.00000000000
-10,2025,R2,gasCCGT,2020,1.00000000000
-11,2030,R2,gasCCGT,2025,10.50300000000
-11,2035,R2,gasCCGT,2025,10.50300000000
-11,2040,R2,gasCCGT,2025,10.50300000000
-11,2045,R2,gasCCGT,2025,10.50300000000
-11,2049,R2,gasCCGT,2025,10.50300000000
-11,2050,R2,gasCCGT,2025,10.50300000000
-11,2059,R2,gasCCGT,2025,10.50300000000
-11,2060,R2,gasCCGT,2025,10.50300000000
-11,2064,R2,gasCCGT,2025,10.50300000000
-12,2035,R2,solarPV,2030,11.20000000000
-12,2040,R2,solarPV,2030,11.20000000000
-12,2045,R2,solarPV,2030,11.20000000000
-12,2049,R2,solarPV,2030,11.20000000000
-12,2050,R2,solarPV,2030,11.20000000000
-12,2059,R2,solarPV,2030,11.20000000000
-13,2040,R2,solarPV,2035,11.20000000000
-13,2045,R2,solarPV,2035,11.20000000000
-13,2049,R2,solarPV,2035,11.20000000000
-13,2050,R2,solarPV,2035,11.20000000000
-13,2059,R2,solarPV,2035,11.20000000000
-13,2060,R2,solarPV,2035,11.20000000000
-13,2064,R2,solarPV,2035,11.20000000000
-14,2045,R2,solarPV,2040,11.20000000000
-14,2049,R2,solarPV,2040,11.20000000000
-14,2050,R2,solarPV,2040,11.20000000000
-14,2059,R2,solarPV,2040,11.20000000000
-14,2060,R2,solarPV,2040,11.20000000000
-14,2064,R2,solarPV,2040,11.20000000000
-14,2065,R2,solarPV,2040,11.20000000000
-14,2069,R2,solarPV,2040,11.20000000000
-15,2050,R2,solarPV,2045,20.00000000000
-15,2059,R2,solarPV,2045,20.00000000000
-15,2060,R2,solarPV,2045,20.00000000000
-15,2064,R2,solarPV,2045,20.00000000000
-15,2065,R2,solarPV,2045,20.00000000000
-15,2069,R2,solarPV,2045,20.00000000000
-15,2070,R2,solarPV,2045,20.00000000000
-15,2074,R2,solarPV,2045,20.00000000000
-16,2025,R2,windturbine,2020,32.36820000000
-16,2030,R2,windturbine,2020,32.36820000000
-16,2035,R2,windturbine,2020,32.36820000000
-16,2040,R2,windturbine,2020,32.36820000000
-16,2045,R2,windturbine,2020,32.36820000000
-16,2049,R2,windturbine,2020,32.36820000000
-17,2050,R2,windturbine,2045,23.56820000000
-17,2059,R2,windturbine,2045,23.56820000000
-17,2060,R2,windturbine,2045,23.56820000000
-17,2064,R2,windturbine,2045,23.56820000000
-17,2065,R2,windturbine,2045,23.56820000000
-17,2069,R2,windturbine,2045,23.56820000000
-17,2070,R2,windturbine,2045,23.56820000000
-17,2074,R2,windturbine,2045,23.56820000000
+2,2035,R1,solarPV,2030,20.00000000000
+2,2040,R1,solarPV,2030,20.00000000000
+2,2045,R1,solarPV,2030,20.00000000000
+2,2049,R1,solarPV,2030,20.00000000000
+2,2050,R1,solarPV,2030,20.00000000000
+2,2059,R1,solarPV,2030,20.00000000000
+3,2045,R1,solarPV,2040,11.20000000000
+3,2049,R1,solarPV,2040,11.20000000000
+3,2050,R1,solarPV,2040,11.20000000000
+3,2059,R1,solarPV,2040,11.20000000000
+3,2060,R1,solarPV,2040,11.20000000000
+3,2064,R1,solarPV,2040,11.20000000000
+3,2065,R1,solarPV,2040,11.20000000000
+3,2069,R1,solarPV,2040,11.20000000000
+4,2050,R1,solarPV,2045,20.00000000000
+4,2059,R1,solarPV,2045,20.00000000000
+4,2060,R1,solarPV,2045,20.00000000000
+4,2064,R1,solarPV,2045,20.00000000000
+4,2065,R1,solarPV,2045,20.00000000000
+4,2069,R1,solarPV,2045,20.00000000000
+4,2070,R1,solarPV,2045,20.00000000000
+4,2074,R1,solarPV,2045,20.00000000000
+5,2025,R1,windturbine,2020,9.86820000000
+5,2030,R1,windturbine,2020,9.86820000000
+5,2035,R1,windturbine,2020,9.86820000000
+5,2040,R1,windturbine,2020,9.86820000000
+5,2045,R1,windturbine,2020,9.86820000000
+5,2049,R1,windturbine,2020,9.86820000000
+6,2035,R1,windturbine,2030,2.40000000000
+6,2040,R1,windturbine,2030,2.40000000000
+6,2045,R1,windturbine,2030,2.40000000000
+6,2049,R1,windturbine,2030,2.40000000000
+6,2050,R1,windturbine,2030,2.40000000000
+6,2059,R1,windturbine,2030,2.40000000000
+7,2050,R1,windturbine,2045,1.06820000000
+7,2059,R1,windturbine,2045,1.06820000000
+7,2060,R1,windturbine,2045,1.06820000000
+7,2064,R1,windturbine,2045,1.06820000000
+7,2065,R1,windturbine,2045,1.06820000000
+7,2069,R1,windturbine,2045,1.06820000000
+7,2070,R1,windturbine,2045,1.06820000000
+7,2074,R1,windturbine,2045,1.06820000000
+8,2020,R2,gasCCGT,2020,1.00000000000
+8,2025,R2,gasCCGT,2020,11.00000000000
+8,2030,R2,gasCCGT,2020,10.00000000000
+8,2035,R2,gasCCGT,2020,10.00000000000
+8,2040,R2,gasCCGT,2020,10.00000000000
+8,2045,R2,gasCCGT,2020,10.00000000000
+8,2049,R2,gasCCGT,2020,10.00000000000
+8,2050,R2,gasCCGT,2020,10.00000000000
+8,2059,R2,gasCCGT,2020,10.00000000000
+9,2030,R2,gasCCGT,2025,10.50300000000
+9,2035,R2,gasCCGT,2025,10.50300000000
+9,2040,R2,gasCCGT,2025,10.50300000000
+9,2045,R2,gasCCGT,2025,10.50300000000
+9,2049,R2,gasCCGT,2025,10.50300000000
+9,2050,R2,gasCCGT,2025,10.50300000000
+9,2059,R2,gasCCGT,2025,10.50300000000
+9,2060,R2,gasCCGT,2025,10.50300000000
+9,2064,R2,gasCCGT,2025,10.50300000000
+10,2035,R2,solarPV,2030,20.00000000000
+10,2040,R2,solarPV,2030,20.00000000000
+10,2045,R2,solarPV,2030,20.00000000000
+10,2049,R2,solarPV,2030,20.00000000000
+10,2050,R2,solarPV,2030,20.00000000000
+10,2059,R2,solarPV,2030,20.00000000000
+11,2045,R2,solarPV,2040,11.20000000000
+11,2049,R2,solarPV,2040,11.20000000000
+11,2050,R2,solarPV,2040,11.20000000000
+11,2059,R2,solarPV,2040,11.20000000000
+11,2060,R2,solarPV,2040,11.20000000000
+11,2064,R2,solarPV,2040,11.20000000000
+11,2065,R2,solarPV,2040,11.20000000000
+11,2069,R2,solarPV,2040,11.20000000000
+12,2050,R2,solarPV,2045,20.00000000000
+12,2059,R2,solarPV,2045,20.00000000000
+12,2060,R2,solarPV,2045,20.00000000000
+12,2064,R2,solarPV,2045,20.00000000000
+12,2065,R2,solarPV,2045,20.00000000000
+12,2069,R2,solarPV,2045,20.00000000000
+12,2070,R2,solarPV,2045,20.00000000000
+12,2074,R2,solarPV,2045,20.00000000000
+13,2025,R2,windturbine,2020,9.86820000000
+13,2030,R2,windturbine,2020,9.86820000000
+13,2035,R2,windturbine,2020,9.86820000000
+13,2040,R2,windturbine,2020,9.86820000000
+13,2045,R2,windturbine,2020,9.86820000000
+13,2049,R2,windturbine,2020,9.86820000000
+14,2035,R2,windturbine,2030,2.40000000000
+14,2040,R2,windturbine,2030,2.40000000000
+14,2045,R2,windturbine,2030,2.40000000000
+14,2049,R2,windturbine,2030,2.40000000000
+14,2050,R2,windturbine,2030,2.40000000000
+14,2059,R2,windturbine,2030,2.40000000000
+15,2050,R2,windturbine,2045,1.06820000000
+15,2059,R2,windturbine,2045,1.06820000000
+15,2060,R2,windturbine,2045,1.06820000000
+15,2064,R2,windturbine,2045,1.06820000000
+15,2065,R2,windturbine,2045,1.06820000000
+15,2069,R2,windturbine,2045,1.06820000000
+15,2070,R2,windturbine,2045,1.06820000000
+15,2074,R2,windturbine,2045,1.06820000000
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 d1ee882b..29275546 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,9 @@
 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
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
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 d1ee882b..066741d4 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,4 +1,17 @@
 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
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
+1,2030,R1,gassupply1,2025,5.10950000000
+1,2035,R1,gassupply1,2025,5.10950000000
+1,2040,R1,gassupply1,2025,5.10950000000
+1,2045,R1,gassupply1,2025,5.10950000000
+1,2050,R1,gassupply1,2025,5.10950000000
+1,2059,R1,gassupply1,2025,5.10950000000
+1,2060,R1,gassupply1,2025,5.10950000000
+1,2064,R1,gassupply1,2025,5.10950000000
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 5340a31b..6ef49801 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,9 +1,26 @@
 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,2035,R1,gassupply1,2030,5.08550000000
-1,2040,R1,gassupply1,2030,5.08550000000
-1,2045,R1,gassupply1,2030,5.08550000000
-1,2050,R1,gassupply1,2030,5.08550000000
-1,2069,R1,gassupply1,2030,5.08550000000
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
+1,2030,R1,gassupply1,2025,5.10950000000
+1,2035,R1,gassupply1,2025,5.10950000000
+1,2040,R1,gassupply1,2025,5.10950000000
+1,2045,R1,gassupply1,2025,5.10950000000
+1,2050,R1,gassupply1,2025,5.10950000000
+1,2059,R1,gassupply1,2025,5.10950000000
+1,2060,R1,gassupply1,2025,5.10950000000
+1,2064,R1,gassupply1,2025,5.10950000000
+2,2035,R1,gassupply1,2030,6.35960000000
+2,2040,R1,gassupply1,2030,6.35960000000
+2,2045,R1,gassupply1,2030,6.35960000000
+2,2050,R1,gassupply1,2030,6.35960000000
+2,2059,R1,gassupply1,2030,6.35960000000
+2,2060,R1,gassupply1,2030,6.35960000000
+2,2064,R1,gassupply1,2030,6.35960000000
+2,2065,R1,gassupply1,2030,6.35960000000
+2,2069,R1,gassupply1,2030,6.35960000000
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 a19926e7..1dff8001 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,15 +1,36 @@
 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,2035,R1,gassupply1,2030,5.08550000000
-1,2040,R1,gassupply1,2030,5.08550000000
-1,2045,R1,gassupply1,2030,5.08550000000
-1,2050,R1,gassupply1,2030,5.08550000000
-1,2069,R1,gassupply1,2030,5.08550000000
-2,2040,R1,gassupply1,2035,0.13890000000
-2,2045,R1,gassupply1,2035,0.13890000000
-2,2050,R1,gassupply1,2035,0.13890000000
-2,2069,R1,gassupply1,2035,0.13890000000
-2,2070,R1,gassupply1,2035,0.13890000000
-2,2074,R1,gassupply1,2035,0.13890000000
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
+1,2030,R1,gassupply1,2025,5.10950000000
+1,2035,R1,gassupply1,2025,5.10950000000
+1,2040,R1,gassupply1,2025,5.10950000000
+1,2045,R1,gassupply1,2025,5.10950000000
+1,2050,R1,gassupply1,2025,5.10950000000
+1,2059,R1,gassupply1,2025,5.10950000000
+1,2060,R1,gassupply1,2025,5.10950000000
+1,2064,R1,gassupply1,2025,5.10950000000
+2,2035,R1,gassupply1,2030,6.35960000000
+2,2040,R1,gassupply1,2030,6.35960000000
+2,2045,R1,gassupply1,2030,6.35960000000
+2,2050,R1,gassupply1,2030,6.35960000000
+2,2059,R1,gassupply1,2030,6.35960000000
+2,2060,R1,gassupply1,2030,6.35960000000
+2,2064,R1,gassupply1,2030,6.35960000000
+2,2065,R1,gassupply1,2030,6.35960000000
+2,2069,R1,gassupply1,2030,6.35960000000
+3,2040,R1,gassupply1,2035,0.32400000000
+3,2045,R1,gassupply1,2035,0.32400000000
+3,2050,R1,gassupply1,2035,0.32400000000
+3,2059,R1,gassupply1,2035,0.32400000000
+3,2060,R1,gassupply1,2035,0.32400000000
+3,2064,R1,gassupply1,2035,0.32400000000
+3,2065,R1,gassupply1,2035,0.32400000000
+3,2069,R1,gassupply1,2035,0.32400000000
+3,2070,R1,gassupply1,2035,0.32400000000
+3,2074,R1,gassupply1,2035,0.32400000000
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 a19926e7..1dff8001 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,15 +1,36 @@
 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,2035,R1,gassupply1,2030,5.08550000000
-1,2040,R1,gassupply1,2030,5.08550000000
-1,2045,R1,gassupply1,2030,5.08550000000
-1,2050,R1,gassupply1,2030,5.08550000000
-1,2069,R1,gassupply1,2030,5.08550000000
-2,2040,R1,gassupply1,2035,0.13890000000
-2,2045,R1,gassupply1,2035,0.13890000000
-2,2050,R1,gassupply1,2035,0.13890000000
-2,2069,R1,gassupply1,2035,0.13890000000
-2,2070,R1,gassupply1,2035,0.13890000000
-2,2074,R1,gassupply1,2035,0.13890000000
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
+1,2030,R1,gassupply1,2025,5.10950000000
+1,2035,R1,gassupply1,2025,5.10950000000
+1,2040,R1,gassupply1,2025,5.10950000000
+1,2045,R1,gassupply1,2025,5.10950000000
+1,2050,R1,gassupply1,2025,5.10950000000
+1,2059,R1,gassupply1,2025,5.10950000000
+1,2060,R1,gassupply1,2025,5.10950000000
+1,2064,R1,gassupply1,2025,5.10950000000
+2,2035,R1,gassupply1,2030,6.35960000000
+2,2040,R1,gassupply1,2030,6.35960000000
+2,2045,R1,gassupply1,2030,6.35960000000
+2,2050,R1,gassupply1,2030,6.35960000000
+2,2059,R1,gassupply1,2030,6.35960000000
+2,2060,R1,gassupply1,2030,6.35960000000
+2,2064,R1,gassupply1,2030,6.35960000000
+2,2065,R1,gassupply1,2030,6.35960000000
+2,2069,R1,gassupply1,2030,6.35960000000
+3,2040,R1,gassupply1,2035,0.32400000000
+3,2045,R1,gassupply1,2035,0.32400000000
+3,2050,R1,gassupply1,2035,0.32400000000
+3,2059,R1,gassupply1,2035,0.32400000000
+3,2060,R1,gassupply1,2035,0.32400000000
+3,2064,R1,gassupply1,2035,0.32400000000
+3,2065,R1,gassupply1,2035,0.32400000000
+3,2069,R1,gassupply1,2035,0.32400000000
+3,2070,R1,gassupply1,2035,0.32400000000
+3,2074,R1,gassupply1,2035,0.32400000000
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 a19926e7..1dff8001 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,15 +1,36 @@
 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,2035,R1,gassupply1,2030,5.08550000000
-1,2040,R1,gassupply1,2030,5.08550000000
-1,2045,R1,gassupply1,2030,5.08550000000
-1,2050,R1,gassupply1,2030,5.08550000000
-1,2069,R1,gassupply1,2030,5.08550000000
-2,2040,R1,gassupply1,2035,0.13890000000
-2,2045,R1,gassupply1,2035,0.13890000000
-2,2050,R1,gassupply1,2035,0.13890000000
-2,2069,R1,gassupply1,2035,0.13890000000
-2,2070,R1,gassupply1,2035,0.13890000000
-2,2074,R1,gassupply1,2035,0.13890000000
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
+1,2030,R1,gassupply1,2025,5.10950000000
+1,2035,R1,gassupply1,2025,5.10950000000
+1,2040,R1,gassupply1,2025,5.10950000000
+1,2045,R1,gassupply1,2025,5.10950000000
+1,2050,R1,gassupply1,2025,5.10950000000
+1,2059,R1,gassupply1,2025,5.10950000000
+1,2060,R1,gassupply1,2025,5.10950000000
+1,2064,R1,gassupply1,2025,5.10950000000
+2,2035,R1,gassupply1,2030,6.35960000000
+2,2040,R1,gassupply1,2030,6.35960000000
+2,2045,R1,gassupply1,2030,6.35960000000
+2,2050,R1,gassupply1,2030,6.35960000000
+2,2059,R1,gassupply1,2030,6.35960000000
+2,2060,R1,gassupply1,2030,6.35960000000
+2,2064,R1,gassupply1,2030,6.35960000000
+2,2065,R1,gassupply1,2030,6.35960000000
+2,2069,R1,gassupply1,2030,6.35960000000
+3,2040,R1,gassupply1,2035,0.32400000000
+3,2045,R1,gassupply1,2035,0.32400000000
+3,2050,R1,gassupply1,2035,0.32400000000
+3,2059,R1,gassupply1,2035,0.32400000000
+3,2060,R1,gassupply1,2035,0.32400000000
+3,2064,R1,gassupply1,2035,0.32400000000
+3,2065,R1,gassupply1,2035,0.32400000000
+3,2069,R1,gassupply1,2035,0.32400000000
+3,2070,R1,gassupply1,2035,0.32400000000
+3,2074,R1,gassupply1,2035,0.32400000000
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 a19926e7..1dff8001 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,15 +1,36 @@
 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,2035,R1,gassupply1,2030,5.08550000000
-1,2040,R1,gassupply1,2030,5.08550000000
-1,2045,R1,gassupply1,2030,5.08550000000
-1,2050,R1,gassupply1,2030,5.08550000000
-1,2069,R1,gassupply1,2030,5.08550000000
-2,2040,R1,gassupply1,2035,0.13890000000
-2,2045,R1,gassupply1,2035,0.13890000000
-2,2050,R1,gassupply1,2035,0.13890000000
-2,2069,R1,gassupply1,2035,0.13890000000
-2,2070,R1,gassupply1,2035,0.13890000000
-2,2074,R1,gassupply1,2035,0.13890000000
+0,2025,R1,gassupply1,2020,15.39710000000
+0,2030,R1,gassupply1,2020,7.89710000000
+0,2035,R1,gassupply1,2020,0.39710000000
+0,2040,R1,gassupply1,2020,0.39710000000
+0,2045,R1,gassupply1,2020,0.39710000000
+0,2050,R1,gassupply1,2020,0.39710000000
+0,2059,R1,gassupply1,2020,0.39710000000
+1,2030,R1,gassupply1,2025,5.10950000000
+1,2035,R1,gassupply1,2025,5.10950000000
+1,2040,R1,gassupply1,2025,5.10950000000
+1,2045,R1,gassupply1,2025,5.10950000000
+1,2050,R1,gassupply1,2025,5.10950000000
+1,2059,R1,gassupply1,2025,5.10950000000
+1,2060,R1,gassupply1,2025,5.10950000000
+1,2064,R1,gassupply1,2025,5.10950000000
+2,2035,R1,gassupply1,2030,6.35960000000
+2,2040,R1,gassupply1,2030,6.35960000000
+2,2045,R1,gassupply1,2030,6.35960000000
+2,2050,R1,gassupply1,2030,6.35960000000
+2,2059,R1,gassupply1,2030,6.35960000000
+2,2060,R1,gassupply1,2030,6.35960000000
+2,2064,R1,gassupply1,2030,6.35960000000
+2,2065,R1,gassupply1,2030,6.35960000000
+2,2069,R1,gassupply1,2030,6.35960000000
+3,2040,R1,gassupply1,2035,0.32400000000
+3,2045,R1,gassupply1,2035,0.32400000000
+3,2050,R1,gassupply1,2035,0.32400000000
+3,2059,R1,gassupply1,2035,0.32400000000
+3,2060,R1,gassupply1,2035,0.32400000000
+3,2064,R1,gassupply1,2035,0.32400000000
+3,2065,R1,gassupply1,2035,0.32400000000
+3,2069,R1,gassupply1,2035,0.32400000000
+3,2070,R1,gassupply1,2035,0.32400000000
+3,2074,R1,gassupply1,2035,0.32400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
index 46094120..595423bc 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -4,40 +4,48 @@ gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,9.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,15.39710000000
 heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,9.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,7.89710000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,5.10950000000
 heatpump,R1,R1,A1,residential,newcapa,2035,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,9.00000000000
 windturbine,R1,R1,A1,power,newcapa,2035,2.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,5.08550000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,0.39710000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,5.10950000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,6.35960000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,9.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,5.08550000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.13890000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.39710000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,5.10950000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,6.35960000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,0.32400000000
 heatpump,R1,R1,A1,residential,newcapa,2045,6.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,12.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,9.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,5.08550000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.13890000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,0.39710000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,5.10950000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,6.35960000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,0.32400000000
 heatpump,R1,R1,A1,residential,newcapa,2050,12.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,7.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,9.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,5.08550000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.13890000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.39710000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,5.10950000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,6.35960000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.32400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
index 1356533a..34be0652 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.63070000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.14930000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.15480000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.29460000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95050000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.73810000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.74030000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.46960000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63070000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.14930000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.15480000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.29460000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95050000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.73810000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.74030000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.46960000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90100000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.51170000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.48050000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.09330000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27030000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.33080000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.32580000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.66200000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.73190000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.48640000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04910000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.08320000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.10550000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,2.24610000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09310000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.17090000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73190000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.48640000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04910000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08320000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10550000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.24610000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09310000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17090000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.22630000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.52770000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30040000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.61580000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.48090000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,3.00980000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15010000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.28970000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.86900000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.80650000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05310000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.09590000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.31190000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.72770000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10250000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.19980000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86900000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.80650000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05310000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09590000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.31190000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.72770000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10250000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19980000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63740000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.48700000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33950000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.73090000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.75640000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,3.65260000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.16700000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.34130000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.07000000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,2.27530000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05860000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.11460000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.61470000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,3.43430000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11480000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.24220000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.07000000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.27530000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05860000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.11460000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.61470000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,3.43430000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11480000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.24220000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.24300000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.90000000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38880000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.90060000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.16110000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,4.59680000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18910000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.41700000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.28860000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,2.78540000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06660000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.13490000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.94410000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,4.20270000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.13300000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.28840000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.28860000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,2.78540000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06660000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.13490000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.94410000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,4.20270000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13300000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.28840000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.90090000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.43520000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46150000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.08490000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.60100000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,5.62340000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22160000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.49940000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.55540000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,3.40790000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07530000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.15970000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.34620000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,5.14090000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15280000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.34470000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.55540000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,3.40790000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07530000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.15970000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.34620000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.14090000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15280000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34470000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.70510000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.31160000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.54050000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.31020000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.13840000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,6.87720000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.25690000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.60000000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 98fba282..56e18bbd 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,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,9
-1,2030,R1,windturbine,2020,9
-1,2035,R1,windturbine,2020,9
-1,2040,R1,windturbine,2020,9
-1,2045,R1,windturbine,2020,9
-1,2049,R1,windturbine,2020,9
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
index 385f51c2..88f1fab6 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2025.csv
@@ -1,16 +1,17 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
 1,2030,R1,gasCCGT,2025,3
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,9
-2,2030,R1,windturbine,2020,9
-2,2035,R1,windturbine,2020,9
-2,2040,R1,windturbine,2020,9
-2,2045,R1,windturbine,2020,9
-2,2049,R1,windturbine,2020,9
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 1b734399..40480d35 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,24 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
 1,2030,R1,gasCCGT,2025,3
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,9
-2,2030,R1,windturbine,2020,9
-2,2035,R1,windturbine,2020,9
-2,2040,R1,windturbine,2020,9
-2,2045,R1,windturbine,2020,9
-2,2049,R1,windturbine,2020,9
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
+2,2035,R1,windturbine,2030,2
+2,2040,R1,windturbine,2030,2
+2,2045,R1,windturbine,2030,2
+2,2050,R1,windturbine,2030,2
+2,2059,R1,windturbine,2030,2
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 1b734399..40480d35 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,24 +1,22 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
 1,2030,R1,gasCCGT,2025,3
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,9
-2,2030,R1,windturbine,2020,9
-2,2035,R1,windturbine,2020,9
-2,2040,R1,windturbine,2020,9
-2,2045,R1,windturbine,2020,9
-2,2049,R1,windturbine,2020,9
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
+2,2035,R1,windturbine,2030,2
+2,2040,R1,windturbine,2030,2
+2,2045,R1,windturbine,2030,2
+2,2050,R1,windturbine,2030,2
+2,2059,R1,windturbine,2030,2
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 4eff0b6e..72462f6d 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,32 +1,29 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
 1,2030,R1,gasCCGT,2025,3
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,9
-2,2030,R1,windturbine,2020,9
-2,2035,R1,windturbine,2020,9
-2,2040,R1,windturbine,2020,9
-2,2045,R1,windturbine,2020,9
-2,2049,R1,windturbine,2020,9
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-5,2045,R1,windturbine,2040,1
-5,2049,R1,windturbine,2040,1
-5,2050,R1,windturbine,2040,1
-5,2059,R1,windturbine,2040,1
-5,2060,R1,windturbine,2040,1
-5,2064,R1,windturbine,2040,1
-5,2065,R1,windturbine,2040,1
-5,2069,R1,windturbine,2040,1
+2,2035,R1,windturbine,2030,2
+2,2040,R1,windturbine,2030,2
+2,2045,R1,windturbine,2030,2
+2,2050,R1,windturbine,2030,2
+2,2059,R1,windturbine,2030,2
+4,2045,R1,windturbine,2040,1
+4,2050,R1,windturbine,2040,1
+4,2059,R1,windturbine,2040,1
+4,2060,R1,windturbine,2040,1
+4,2064,R1,windturbine,2040,1
+4,2065,R1,windturbine,2040,1
+4,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
index abd03451..72462f6d 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2045.csv
@@ -1,40 +1,29 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
 1,2030,R1,gasCCGT,2025,3
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,9
-2,2030,R1,windturbine,2020,9
-2,2035,R1,windturbine,2020,9
-2,2040,R1,windturbine,2020,9
-2,2045,R1,windturbine,2020,9
-2,2049,R1,windturbine,2020,9
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-5,2045,R1,windturbine,2040,1
-5,2049,R1,windturbine,2040,1
-5,2050,R1,windturbine,2040,1
-5,2059,R1,windturbine,2040,1
-5,2060,R1,windturbine,2040,1
-5,2064,R1,windturbine,2040,1
-5,2065,R1,windturbine,2040,1
-5,2069,R1,windturbine,2040,1
-6,2050,R1,windturbine,2045,9
-6,2059,R1,windturbine,2045,9
-6,2060,R1,windturbine,2045,9
-6,2064,R1,windturbine,2045,9
-6,2065,R1,windturbine,2045,9
-6,2069,R1,windturbine,2045,9
-6,2070,R1,windturbine,2045,9
-6,2074,R1,windturbine,2045,9
+2,2035,R1,windturbine,2030,2
+2,2040,R1,windturbine,2030,2
+2,2045,R1,windturbine,2030,2
+2,2050,R1,windturbine,2030,2
+2,2059,R1,windturbine,2030,2
+4,2045,R1,windturbine,2040,1
+4,2050,R1,windturbine,2040,1
+4,2059,R1,windturbine,2040,1
+4,2060,R1,windturbine,2040,1
+4,2064,R1,windturbine,2040,1
+4,2065,R1,windturbine,2040,1
+4,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
index 8ac237f5..a07c6d24 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2050.csv
@@ -1,44 +1,33 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,1
+0,2025,R1,gasCCGT,2020,5
+0,2030,R1,gasCCGT,2020,4
+0,2035,R1,gasCCGT,2020,4
+0,2040,R1,gasCCGT,2020,4
+0,2045,R1,gasCCGT,2020,4
+0,2050,R1,gasCCGT,2020,4
+0,2055,R1,gasCCGT,2020,4
+0,2059,R1,gasCCGT,2020,4
 1,2030,R1,gasCCGT,2025,3
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2055,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,9
-2,2030,R1,windturbine,2020,9
-2,2035,R1,windturbine,2020,9
-2,2040,R1,windturbine,2020,9
-2,2045,R1,windturbine,2020,9
-2,2049,R1,windturbine,2020,9
-3,2035,R1,windturbine,2030,2
-3,2040,R1,windturbine,2030,2
-3,2045,R1,windturbine,2030,2
-3,2049,R1,windturbine,2030,2
-3,2050,R1,windturbine,2030,2
-3,2055,R1,windturbine,2030,2
-3,2059,R1,windturbine,2030,2
-5,2045,R1,windturbine,2040,1
-5,2049,R1,windturbine,2040,1
-5,2050,R1,windturbine,2040,1
-5,2055,R1,windturbine,2040,1
-5,2059,R1,windturbine,2040,1
-5,2060,R1,windturbine,2040,1
-5,2064,R1,windturbine,2040,1
-5,2065,R1,windturbine,2040,1
-5,2069,R1,windturbine,2040,1
-6,2050,R1,windturbine,2045,9
-6,2055,R1,windturbine,2045,9
-6,2059,R1,windturbine,2045,9
-6,2060,R1,windturbine,2045,9
-6,2064,R1,windturbine,2045,9
-6,2065,R1,windturbine,2045,9
-6,2069,R1,windturbine,2045,9
-6,2070,R1,windturbine,2045,9
-6,2074,R1,windturbine,2045,9
+2,2035,R1,windturbine,2030,2
+2,2040,R1,windturbine,2030,2
+2,2045,R1,windturbine,2030,2
+2,2050,R1,windturbine,2030,2
+2,2055,R1,windturbine,2030,2
+2,2059,R1,windturbine,2030,2
+4,2045,R1,windturbine,2040,1
+4,2050,R1,windturbine,2040,1
+4,2055,R1,windturbine,2040,1
+4,2059,R1,windturbine,2040,1
+4,2060,R1,windturbine,2040,1
+4,2064,R1,windturbine,2040,1
+4,2065,R1,windturbine,2040,1
+4,2069,R1,windturbine,2040,1
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index 3cae8f09..aa21ff1b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.53630000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21960000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.22540000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.04560000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.38250000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.51930000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.28880000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.04560000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.38250000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.10920000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98080000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.55140000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.71900000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.06920000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.04550000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.16960000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.09880000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08480000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16960000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09880000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.60620000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.32530000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.25220000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2035
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index 29ec2b0b..c6932ee1 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -23,61 +23,61 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,2.31300000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.06520000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.25740000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,3.46940000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.60300000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.44180000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.51650000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.28850000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.46940000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.60300000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.44180000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.93890000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.23710000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.21810000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.54330000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.71790000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.09520000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.11660000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.02790000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.14290000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.24420000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.04460000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.14290000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.14290000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24420000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04460000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.14290000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.90480000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08930000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.14290000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.05950000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.07210000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02790000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.02690000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R1,0.18020000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04460000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.04690000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.14410000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2035
@@ -85,15 +85,15 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.10810000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04460000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04260000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.18020000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08930000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.09380000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R1,0.14410000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05950000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.05960000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2040
diff --git a/src/muse/mca.py b/src/muse/mca.py
index 91bc7cf5..0f43c1cb 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -544,7 +544,6 @@ def find_equilibrium(
     else:
         included = ones(len(market.commodity), dtype=bool)
 
-    prior_market = market.copy(deep=True)
     converged = False
     iteration = 0
     while iteration < maxiter and not converged:

From 1cf3f1c4c74aca71b14b9715b56fccbffe37423a Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Wed, 10 Jul 2024 14:50:45 +0100
Subject: [PATCH 386/419] Re-run example models

---
 .../default/Gas/Capacity/2020.csv             |   9 +-
 .../default/Gas/Capacity/2025.csv             |  23 ++-
 .../default/Gas/Capacity/2030.csv             |  39 +++--
 .../default/Gas/Capacity/2035.csv             |  47 +++---
 .../default/Gas/Capacity/2040.csv             |  47 +++---
 .../default/Gas/Capacity/2045.csv             |  63 ++++----
 .../default/Gas/Capacity/2050.csv             |  63 ++++----
 tests/example_outputs/default/MCACapacity.csv |  68 ++++-----
 tests/example_outputs/default/MCAPrices.csv   | 144 +++++++++---------
 .../default/Power/Capacity/2020.csv           |  28 ++--
 .../default/Power/Capacity/2025.csv           |  46 +++---
 .../default/Power/Capacity/2030.csv           |  58 +++----
 .../default/Power/Capacity/2035.csv           |  72 ++++-----
 .../default/Power/Capacity/2040.csv           |  88 +++++------
 .../default/Power/Capacity/2045.csv           |  98 ++++++------
 .../default/Power/Capacity/2050.csv           | 111 ++++++--------
 .../default_retro/Gas/Capacity/2020.csv       |   9 +-
 .../default_retro/Gas/Capacity/2025.csv       |  23 ++-
 .../default_retro/Gas/Capacity/2030.csv       |  23 ++-
 .../default_retro/Gas/Capacity/2035.csv       |  19 ++-
 .../default_retro/Gas/Capacity/2040.csv       |  16 +-
 .../default_retro/Gas/Capacity/2045.csv       |  13 +-
 .../default_retro/Gas/Capacity/2050.csv       |  13 +-
 .../default_retro/MCACapacity.csv             |  42 ++---
 .../default_retro/MCAPrices.csv               | 144 +++++++++---------
 .../default_retro/Power/Capacity/2020.csv     |  28 ++--
 .../default_retro/Power/Capacity/2025.csv     |  28 ++--
 .../default_retro/Power/Capacity/2030.csv     |  24 +--
 .../default_retro/Power/Capacity/2035.csv     |  20 +--
 .../default_retro/Power/Capacity/2040.csv     |  16 +-
 .../default_retro/Power/Capacity/2045.csv     |  28 ++--
 .../default_retro/Power/Capacity/2050.csv     |  24 +--
 .../default_timeslice/MCAPrices.csv           |  36 ++---
 .../medium/Gas/Capacity/2020.csv              |  14 +-
 .../medium/Gas/Capacity/2025.csv              |  30 ++--
 .../medium/Gas/Capacity/2030.csv              |  48 +++---
 .../medium/Gas/Capacity/2035.csv              |  48 +++---
 .../medium/Gas/Capacity/2040.csv              |  48 +++---
 .../medium/Gas/Capacity/2045.csv              |  48 +++---
 .../medium/Gas/Capacity/2050.csv              |  48 +++---
 tests/example_outputs/medium/MCACapacity.csv  |  45 +++---
 tests/example_outputs/medium/MCAPrices.csv    | 108 ++++++-------
 .../medium/Power/Capacity/2020.csv            |   6 -
 .../medium/Power/Capacity/2025.csv            |   9 +-
 .../medium/Power/Capacity/2030.csv            |  18 +--
 .../medium/Power/Capacity/2035.csv            |  31 ++--
 .../medium/Power/Capacity/2040.csv            |  46 +++---
 .../medium/Power/Capacity/2045.csv            |  62 ++++----
 .../medium/Power/Capacity/2050.csv            |  70 ++++-----
 .../multiple_agents/Gas/Capacity/2020.csv     |   9 +-
 .../multiple_agents/Gas/Capacity/2025.csv     |  23 ++-
 .../multiple_agents/Gas/Capacity/2030.csv     |  39 +++--
 .../multiple_agents/Gas/Capacity/2035.csv     |  39 +++--
 .../multiple_agents/Gas/Capacity/2040.csv     |  39 +++--
 .../multiple_agents/Gas/Capacity/2045.csv     |  53 ++++---
 .../multiple_agents/Gas/Capacity/2050.csv     |  53 ++++---
 .../multiple_agents/MCACapacity.csv           |  59 +++----
 .../multiple_agents/MCAPrices.csv             | 144 +++++++++---------
 .../multiple_agents/Power/Capacity/2020.csv   |  28 ++--
 .../multiple_agents/Power/Capacity/2025.csv   |  46 +++---
 .../multiple_agents/Power/Capacity/2030.csv   |  58 +++----
 .../multiple_agents/Power/Capacity/2035.csv   |  58 +++----
 .../multiple_agents/Power/Capacity/2040.csv   |  58 +++----
 .../multiple_agents/Power/Capacity/2045.csv   |  68 ++++-----
 .../multiple_agents/Power/Capacity/2050.csv   |  77 ++++------
 .../trade/Gas/Capacity/2020.csv               |   8 +-
 .../trade/Gas/Capacity/2025.csv               |   6 +-
 .../trade/Gas/Capacity/2030.csv               |   6 +-
 .../trade/Gas/Capacity/2035.csv               |   4 +-
 .../trade/Power/Capacity/2020.csv             |  12 +-
 .../trade/Power/Capacity/2025.csv             |  10 +-
 .../trade/Power/Capacity/2030.csv             |   8 +-
 .../trade/Power/Capacity/2035.csv             |   6 +-
 tests/example_outputs/trade/Prices.csv        | 144 +++++++++---------
 74 files changed, 1640 insertions(+), 1604 deletions(-)

diff --git a/tests/example_outputs/default/Gas/Capacity/2020.csv b/tests/example_outputs/default/Gas/Capacity/2020.csv
index d1ee882b..d37dcfe1 100644
--- a/tests/example_outputs/default/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2020.csv
@@ -1,4 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2025.csv b/tests/example_outputs/default/Gas/Capacity/2025.csv
index f0d285df..5e2e13dc 100644
--- a/tests/example_outputs/default/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2025.csv
@@ -1,10 +1,17 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2030.csv b/tests/example_outputs/default/Gas/Capacity/2030.csv
index a06e32df..a8ae6a42 100644
--- a/tests/example_outputs/default/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2030.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2035.csv b/tests/example_outputs/default/Gas/Capacity/2035.csv
index df83ced5..a8ae6a42 100644
--- a/tests/example_outputs/default/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2035.csv
@@ -1,25 +1,26 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
-3,2040,R1,gassupply1,2035,0.32590000000
-3,2045,R1,gassupply1,2035,0.32590000000
-3,2050,R1,gassupply1,2035,0.32590000000
-3,2064,R1,gassupply1,2035,0.32590000000
-3,2065,R1,gassupply1,2035,0.32590000000
-3,2069,R1,gassupply1,2035,0.32590000000
-3,2070,R1,gassupply1,2035,0.32590000000
-3,2074,R1,gassupply1,2035,0.32590000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2040.csv b/tests/example_outputs/default/Gas/Capacity/2040.csv
index df83ced5..a8ae6a42 100644
--- a/tests/example_outputs/default/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2040.csv
@@ -1,25 +1,26 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
-3,2040,R1,gassupply1,2035,0.32590000000
-3,2045,R1,gassupply1,2035,0.32590000000
-3,2050,R1,gassupply1,2035,0.32590000000
-3,2064,R1,gassupply1,2035,0.32590000000
-3,2065,R1,gassupply1,2035,0.32590000000
-3,2069,R1,gassupply1,2035,0.32590000000
-3,2070,R1,gassupply1,2035,0.32590000000
-3,2074,R1,gassupply1,2035,0.32590000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2045.csv b/tests/example_outputs/default/Gas/Capacity/2045.csv
index e5543717..c102c566 100644
--- a/tests/example_outputs/default/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2045.csv
@@ -1,33 +1,34 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
-3,2040,R1,gassupply1,2035,0.32590000000
-3,2045,R1,gassupply1,2035,0.32590000000
-3,2050,R1,gassupply1,2035,0.32590000000
-3,2064,R1,gassupply1,2035,0.32590000000
-3,2065,R1,gassupply1,2035,0.32590000000
-3,2069,R1,gassupply1,2035,0.32590000000
-3,2070,R1,gassupply1,2035,0.32590000000
-3,2074,R1,gassupply1,2035,0.32590000000
-4,2050,R1,gassupply1,2045,3.49130000000
-4,2064,R1,gassupply1,2045,3.49130000000
-4,2065,R1,gassupply1,2045,3.49130000000
-4,2069,R1,gassupply1,2045,3.49130000000
-4,2070,R1,gassupply1,2045,3.49130000000
-4,2074,R1,gassupply1,2045,3.49130000000
-4,2075,R1,gassupply1,2045,3.49130000000
-4,2084,R1,gassupply1,2045,3.49130000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
+3,2050,R1,gassupply1,2045,0.30680000000
+3,2059,R1,gassupply1,2045,0.30680000000
+3,2060,R1,gassupply1,2045,0.30680000000
+3,2064,R1,gassupply1,2045,0.30680000000
+3,2065,R1,gassupply1,2045,0.30680000000
+3,2069,R1,gassupply1,2045,0.30680000000
+3,2070,R1,gassupply1,2045,0.30680000000
+3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2050.csv b/tests/example_outputs/default/Gas/Capacity/2050.csv
index e5543717..c102c566 100644
--- a/tests/example_outputs/default/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2050.csv
@@ -1,33 +1,34 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
-3,2040,R1,gassupply1,2035,0.32590000000
-3,2045,R1,gassupply1,2035,0.32590000000
-3,2050,R1,gassupply1,2035,0.32590000000
-3,2064,R1,gassupply1,2035,0.32590000000
-3,2065,R1,gassupply1,2035,0.32590000000
-3,2069,R1,gassupply1,2035,0.32590000000
-3,2070,R1,gassupply1,2035,0.32590000000
-3,2074,R1,gassupply1,2035,0.32590000000
-4,2050,R1,gassupply1,2045,3.49130000000
-4,2064,R1,gassupply1,2045,3.49130000000
-4,2065,R1,gassupply1,2045,3.49130000000
-4,2069,R1,gassupply1,2045,3.49130000000
-4,2070,R1,gassupply1,2045,3.49130000000
-4,2074,R1,gassupply1,2045,3.49130000000
-4,2075,R1,gassupply1,2045,3.49130000000
-4,2084,R1,gassupply1,2045,3.49130000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
+3,2050,R1,gassupply1,2045,0.30680000000
+3,2059,R1,gassupply1,2045,0.30680000000
+3,2060,R1,gassupply1,2045,0.30680000000
+3,2064,R1,gassupply1,2045,0.30680000000
+3,2065,R1,gassupply1,2045,0.30680000000
+3,2069,R1,gassupply1,2045,0.30680000000
+3,2070,R1,gassupply1,2045,0.30680000000
+3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv
index bff22f00..e5e0bc42 100644
--- a/tests/example_outputs/default/MCACapacity.csv
+++ b/tests/example_outputs/default/MCACapacity.csv
@@ -4,55 +4,55 @@ gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,16.73530000000
 heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,6.81430000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.23530000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.28910000000
 heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.54570000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.32590000000
+windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.32590000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.32590000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,3.49130000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.47410000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.30680000000
diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv
index 0769f75a..7c4372f2 100644
--- a/tests/example_outputs/default/MCAPrices.csv
+++ b/tests/example_outputs/default/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.88730000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21230000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33530000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.34060000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.88730000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21230000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.33530000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34060000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.69650000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.81560000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.78620000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.48380000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.26990000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07480000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.90970000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15060000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.15070000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.26990000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07490000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07480000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90970000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15060000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15070000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.08790000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.84900000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53010000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.53400000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.04840000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.55290000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.25230000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.45210000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.06480000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08210000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.18220000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12800000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.16700000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.45210000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06480000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08210000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.18220000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12800000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16700000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30870000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.38890000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44270000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.59880000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19790000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.91500000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.21200000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.28130000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.21470000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.58190000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.08730000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.82470000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,2.37630000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.17870000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21470000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.58190000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08730000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82470000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.37630000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17870000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.66490000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.77360000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46920000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.64500000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.43640000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,3.17310000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.22390000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.30190000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.78980000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07260000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.09560000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.68780000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14560000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.19730000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78980000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07260000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09560000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.68780000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14560000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19730000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.04070000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.39400000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.51190000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71940000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.68790000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.58780000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.24300000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.33510000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.98520000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07770000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.10350000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.98050000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15690000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.21490000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.98520000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07770000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10350000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.98050000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15690000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.21490000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.50350000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.97770000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55700000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.78950000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.66220000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.97770000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.26310000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.36630000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default/Power/Capacity/2020.csv b/tests/example_outputs/default/Power/Capacity/2020.csv
index 089b2630..36b5025e 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,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2025,R1,windturbine,2020,10
-1,2030,R1,windturbine,2020,10
-1,2035,R1,windturbine,2020,10
-1,2040,R1,windturbine,2020,10
-1,2045,R1,windturbine,2020,10
-1,2049,R1,windturbine,2020,10
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2025,R1,windturbine,2020,5
+1,2030,R1,windturbine,2020,5
+1,2035,R1,windturbine,2020,5
+1,2040,R1,windturbine,2020,5
+1,2045,R1,windturbine,2020,5
+1,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/default/Power/Capacity/2025.csv b/tests/example_outputs/default/Power/Capacity/2025.csv
index 64665258..b130fe08 100644
--- a/tests/example_outputs/default/Power/Capacity/2025.csv
+++ b/tests/example_outputs/default/Power/Capacity/2025.csv
@@ -1,25 +1,25 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/default/Power/Capacity/2030.csv b/tests/example_outputs/default/Power/Capacity/2030.csv
index e2ed2347..bfe65108 100644
--- a/tests/example_outputs/default/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default/Power/Capacity/2030.csv
@@ -1,31 +1,31 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
-3,2035,R1,windturbine,2030,8
-3,2040,R1,windturbine,2030,8
-3,2045,R1,windturbine,2030,8
-3,2049,R1,windturbine,2030,8
-3,2050,R1,windturbine,2030,8
-3,2059,R1,windturbine,2030,8
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
+3,2035,R1,windturbine,2030,6
+3,2040,R1,windturbine,2030,6
+3,2045,R1,windturbine,2030,6
+3,2049,R1,windturbine,2030,6
+3,2050,R1,windturbine,2030,6
+3,2059,R1,windturbine,2030,6
diff --git a/tests/example_outputs/default/Power/Capacity/2035.csv b/tests/example_outputs/default/Power/Capacity/2035.csv
index c5db9b61..a33320a7 100644
--- a/tests/example_outputs/default/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default/Power/Capacity/2035.csv
@@ -1,38 +1,38 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
-3,2035,R1,windturbine,2030,8
-3,2040,R1,windturbine,2030,8
-3,2045,R1,windturbine,2030,8
-3,2049,R1,windturbine,2030,8
-3,2050,R1,windturbine,2030,8
-3,2059,R1,windturbine,2030,8
-4,2040,R1,windturbine,2035,5
-4,2045,R1,windturbine,2035,5
-4,2049,R1,windturbine,2035,5
-4,2050,R1,windturbine,2035,5
-4,2059,R1,windturbine,2035,5
-4,2060,R1,windturbine,2035,5
-4,2064,R1,windturbine,2035,5
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
+3,2035,R1,windturbine,2030,6
+3,2040,R1,windturbine,2030,6
+3,2045,R1,windturbine,2030,6
+3,2049,R1,windturbine,2030,6
+3,2050,R1,windturbine,2030,6
+3,2059,R1,windturbine,2030,6
+4,2040,R1,windturbine,2035,6
+4,2045,R1,windturbine,2035,6
+4,2049,R1,windturbine,2035,6
+4,2050,R1,windturbine,2035,6
+4,2059,R1,windturbine,2035,6
+4,2060,R1,windturbine,2035,6
+4,2064,R1,windturbine,2035,6
diff --git a/tests/example_outputs/default/Power/Capacity/2040.csv b/tests/example_outputs/default/Power/Capacity/2040.csv
index 4d5eecd8..658cdb8e 100644
--- a/tests/example_outputs/default/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default/Power/Capacity/2040.csv
@@ -1,46 +1,46 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
-3,2035,R1,windturbine,2030,8
-3,2040,R1,windturbine,2030,8
-3,2045,R1,windturbine,2030,8
-3,2049,R1,windturbine,2030,8
-3,2050,R1,windturbine,2030,8
-3,2059,R1,windturbine,2030,8
-4,2040,R1,windturbine,2035,5
-4,2045,R1,windturbine,2035,5
-4,2049,R1,windturbine,2035,5
-4,2050,R1,windturbine,2035,5
-4,2059,R1,windturbine,2035,5
-4,2060,R1,windturbine,2035,5
-4,2064,R1,windturbine,2035,5
-5,2045,R1,windturbine,2040,7
-5,2049,R1,windturbine,2040,7
-5,2050,R1,windturbine,2040,7
-5,2059,R1,windturbine,2040,7
-5,2060,R1,windturbine,2040,7
-5,2064,R1,windturbine,2040,7
-5,2065,R1,windturbine,2040,7
-5,2069,R1,windturbine,2040,7
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
+3,2035,R1,windturbine,2030,6
+3,2040,R1,windturbine,2030,6
+3,2045,R1,windturbine,2030,6
+3,2049,R1,windturbine,2030,6
+3,2050,R1,windturbine,2030,6
+3,2059,R1,windturbine,2030,6
+4,2040,R1,windturbine,2035,6
+4,2045,R1,windturbine,2035,6
+4,2049,R1,windturbine,2035,6
+4,2050,R1,windturbine,2035,6
+4,2059,R1,windturbine,2035,6
+4,2060,R1,windturbine,2035,6
+4,2064,R1,windturbine,2035,6
+5,2045,R1,windturbine,2040,6
+5,2049,R1,windturbine,2040,6
+5,2050,R1,windturbine,2040,6
+5,2059,R1,windturbine,2040,6
+5,2060,R1,windturbine,2040,6
+5,2064,R1,windturbine,2040,6
+5,2065,R1,windturbine,2040,6
+5,2069,R1,windturbine,2040,6
diff --git a/tests/example_outputs/default/Power/Capacity/2045.csv b/tests/example_outputs/default/Power/Capacity/2045.csv
index 83bf2bdf..f021634a 100644
--- a/tests/example_outputs/default/Power/Capacity/2045.csv
+++ b/tests/example_outputs/default/Power/Capacity/2045.csv
@@ -1,59 +1,49 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2050,R1,gasCCGT,2045,2
-2,2059,R1,gasCCGT,2045,2
-2,2060,R1,gasCCGT,2045,2
-2,2064,R1,gasCCGT,2045,2
-2,2065,R1,gasCCGT,2045,2
-2,2069,R1,gasCCGT,2045,2
-2,2070,R1,gasCCGT,2045,2
-2,2074,R1,gasCCGT,2045,2
-2,2075,R1,gasCCGT,2045,2
-2,2084,R1,gasCCGT,2045,2
-3,2025,R1,windturbine,2020,10
-3,2030,R1,windturbine,2020,10
-3,2035,R1,windturbine,2020,10
-3,2040,R1,windturbine,2020,10
-3,2045,R1,windturbine,2020,10
-3,2049,R1,windturbine,2020,10
-4,2035,R1,windturbine,2030,8
-4,2040,R1,windturbine,2030,8
-4,2045,R1,windturbine,2030,8
-4,2049,R1,windturbine,2030,8
-4,2050,R1,windturbine,2030,8
-4,2059,R1,windturbine,2030,8
-5,2040,R1,windturbine,2035,5
-5,2045,R1,windturbine,2035,5
-5,2049,R1,windturbine,2035,5
-5,2050,R1,windturbine,2035,5
-5,2059,R1,windturbine,2035,5
-5,2060,R1,windturbine,2035,5
-5,2064,R1,windturbine,2035,5
-6,2045,R1,windturbine,2040,7
-6,2049,R1,windturbine,2040,7
-6,2050,R1,windturbine,2040,7
-6,2059,R1,windturbine,2040,7
-6,2060,R1,windturbine,2040,7
-6,2064,R1,windturbine,2040,7
-6,2065,R1,windturbine,2040,7
-6,2069,R1,windturbine,2040,7
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+3,2025,R1,windturbine,2020,5
+3,2030,R1,windturbine,2020,5
+3,2035,R1,windturbine,2020,5
+3,2040,R1,windturbine,2020,5
+3,2045,R1,windturbine,2020,5
+3,2049,R1,windturbine,2020,5
+4,2035,R1,windturbine,2030,6
+4,2040,R1,windturbine,2030,6
+4,2045,R1,windturbine,2030,6
+4,2049,R1,windturbine,2030,6
+4,2050,R1,windturbine,2030,6
+4,2059,R1,windturbine,2030,6
+5,2040,R1,windturbine,2035,6
+5,2045,R1,windturbine,2035,6
+5,2049,R1,windturbine,2035,6
+5,2050,R1,windturbine,2035,6
+5,2059,R1,windturbine,2035,6
+5,2060,R1,windturbine,2035,6
+5,2064,R1,windturbine,2035,6
+6,2045,R1,windturbine,2040,6
+6,2049,R1,windturbine,2040,6
+6,2050,R1,windturbine,2040,6
+6,2059,R1,windturbine,2040,6
+6,2060,R1,windturbine,2040,6
+6,2064,R1,windturbine,2040,6
+6,2065,R1,windturbine,2040,6
+6,2069,R1,windturbine,2040,6
 7,2050,R1,windturbine,2045,10
 7,2059,R1,windturbine,2045,10
 7,2060,R1,windturbine,2045,10
diff --git a/tests/example_outputs/default/Power/Capacity/2050.csv b/tests/example_outputs/default/Power/Capacity/2050.csv
index beb0cbad..54bbf73a 100644
--- a/tests/example_outputs/default/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default/Power/Capacity/2050.csv
@@ -1,67 +1,54 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2055,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2050,R1,gasCCGT,2045,2
-2,2055,R1,gasCCGT,2045,2
-2,2059,R1,gasCCGT,2045,2
-2,2060,R1,gasCCGT,2045,2
-2,2064,R1,gasCCGT,2045,2
-2,2065,R1,gasCCGT,2045,2
-2,2069,R1,gasCCGT,2045,2
-2,2070,R1,gasCCGT,2045,2
-2,2074,R1,gasCCGT,2045,2
-2,2075,R1,gasCCGT,2045,2
-2,2079,R1,gasCCGT,2045,2
-2,2080,R1,gasCCGT,2045,2
-2,2084,R1,gasCCGT,2045,2
-3,2025,R1,windturbine,2020,10
-3,2030,R1,windturbine,2020,10
-3,2035,R1,windturbine,2020,10
-3,2040,R1,windturbine,2020,10
-3,2045,R1,windturbine,2020,10
-3,2049,R1,windturbine,2020,10
-4,2035,R1,windturbine,2030,8
-4,2040,R1,windturbine,2030,8
-4,2045,R1,windturbine,2030,8
-4,2049,R1,windturbine,2030,8
-4,2050,R1,windturbine,2030,8
-4,2055,R1,windturbine,2030,8
-4,2059,R1,windturbine,2030,8
-5,2040,R1,windturbine,2035,5
-5,2045,R1,windturbine,2035,5
-5,2049,R1,windturbine,2035,5
-5,2050,R1,windturbine,2035,5
-5,2055,R1,windturbine,2035,5
-5,2059,R1,windturbine,2035,5
-5,2060,R1,windturbine,2035,5
-5,2064,R1,windturbine,2035,5
-6,2045,R1,windturbine,2040,7
-6,2049,R1,windturbine,2040,7
-6,2050,R1,windturbine,2040,7
-6,2055,R1,windturbine,2040,7
-6,2059,R1,windturbine,2040,7
-6,2060,R1,windturbine,2040,7
-6,2064,R1,windturbine,2040,7
-6,2065,R1,windturbine,2040,7
-6,2069,R1,windturbine,2040,7
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2055,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+3,2025,R1,windturbine,2020,5
+3,2030,R1,windturbine,2020,5
+3,2035,R1,windturbine,2020,5
+3,2040,R1,windturbine,2020,5
+3,2045,R1,windturbine,2020,5
+3,2049,R1,windturbine,2020,5
+4,2035,R1,windturbine,2030,6
+4,2040,R1,windturbine,2030,6
+4,2045,R1,windturbine,2030,6
+4,2049,R1,windturbine,2030,6
+4,2050,R1,windturbine,2030,6
+4,2055,R1,windturbine,2030,6
+4,2059,R1,windturbine,2030,6
+5,2040,R1,windturbine,2035,6
+5,2045,R1,windturbine,2035,6
+5,2049,R1,windturbine,2035,6
+5,2050,R1,windturbine,2035,6
+5,2055,R1,windturbine,2035,6
+5,2059,R1,windturbine,2035,6
+5,2060,R1,windturbine,2035,6
+5,2064,R1,windturbine,2035,6
+6,2045,R1,windturbine,2040,6
+6,2049,R1,windturbine,2040,6
+6,2050,R1,windturbine,2040,6
+6,2055,R1,windturbine,2040,6
+6,2059,R1,windturbine,2040,6
+6,2060,R1,windturbine,2040,6
+6,2064,R1,windturbine,2040,6
+6,2065,R1,windturbine,2040,6
+6,2069,R1,windturbine,2040,6
 7,2050,R1,windturbine,2045,10
 7,2055,R1,windturbine,2045,10
 7,2059,R1,windturbine,2045,10
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2020.csv b/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
index d1ee882b..4346aa17 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2020.csv
@@ -1,4 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2025.csv b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
index b130ea35..89b0e0fe 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2025.csv
@@ -1,9 +1,16 @@
 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,9.58580000000
-1,2035,R1,gassupply1,2025,9.58580000000
-1,2040,R1,gassupply1,2025,9.58580000000
-1,2045,R1,gassupply1,2025,9.58580000000
-1,2050,R1,gassupply1,2025,9.58580000000
-1,2064,R1,gassupply1,2025,9.58580000000
+0,2025,R1,gassupply1,2020,16.46440000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,11.46130000000
+1,2035,R1,gassupply1,2025,11.46130000000
+1,2040,R1,gassupply1,2025,11.46130000000
+1,2045,R1,gassupply1,2025,11.46130000000
+1,2050,R1,gassupply1,2025,11.46130000000
+1,2059,R1,gassupply1,2025,11.46130000000
+1,2060,R1,gassupply1,2025,11.46130000000
+1,2064,R1,gassupply1,2025,11.46130000000
diff --git a/tests/example_outputs/default_retro/Gas/Capacity/2030.csv b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
index 6022de35..9ea72517 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2030.csv
@@ -1,15 +1,24 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,gassupply1,2020,7.50000000000
-1,2030,R1,gassupply1,2025,9.58580000000
-1,2035,R1,gassupply1,2025,9.58580000000
-1,2040,R1,gassupply1,2025,9.58580000000
-1,2045,R1,gassupply1,2025,9.58580000000
-1,2050,R1,gassupply1,2025,9.58580000000
-1,2064,R1,gassupply1,2025,9.58580000000
+0,2030,R1,gassupply1,2020,8.96440000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2030,R1,gassupply1,2025,11.46130000000
+1,2035,R1,gassupply1,2025,11.46130000000
+1,2040,R1,gassupply1,2025,11.46130000000
+1,2045,R1,gassupply1,2025,11.46130000000
+1,2050,R1,gassupply1,2025,11.46130000000
+1,2059,R1,gassupply1,2025,11.46130000000
+1,2060,R1,gassupply1,2025,11.46130000000
+1,2064,R1,gassupply1,2025,11.46130000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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_retro/Gas/Capacity/2035.csv b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
index fc532dfe..0a85b356 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2035.csv
@@ -1,13 +1,22 @@
 asset,year,region,technology,installed,capacity
-1,2035,R1,gassupply1,2025,9.58580000000
-1,2040,R1,gassupply1,2025,9.58580000000
-1,2045,R1,gassupply1,2025,9.58580000000
-1,2050,R1,gassupply1,2025,9.58580000000
-1,2064,R1,gassupply1,2025,9.58580000000
+0,2035,R1,gassupply1,2020,1.46440000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2035,R1,gassupply1,2025,11.46130000000
+1,2040,R1,gassupply1,2025,11.46130000000
+1,2045,R1,gassupply1,2025,11.46130000000
+1,2050,R1,gassupply1,2025,11.46130000000
+1,2059,R1,gassupply1,2025,11.46130000000
+1,2060,R1,gassupply1,2025,11.46130000000
+1,2064,R1,gassupply1,2025,11.46130000000
 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,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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_retro/Gas/Capacity/2040.csv b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
index 01d270dd..4d449355 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2040.csv
@@ -1,11 +1,19 @@
 asset,year,region,technology,installed,capacity
-1,2040,R1,gassupply1,2025,9.58580000000
-1,2045,R1,gassupply1,2025,9.58580000000
-1,2050,R1,gassupply1,2025,9.58580000000
-1,2064,R1,gassupply1,2025,9.58580000000
+0,2040,R1,gassupply1,2020,1.46440000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2040,R1,gassupply1,2025,11.46130000000
+1,2045,R1,gassupply1,2025,11.46130000000
+1,2050,R1,gassupply1,2025,11.46130000000
+1,2059,R1,gassupply1,2025,11.46130000000
+1,2060,R1,gassupply1,2025,11.46130000000
+1,2064,R1,gassupply1,2025,11.46130000000
 2,2040,R1,gassupply1,2030,7.50000000000
 2,2045,R1,gassupply1,2030,7.50000000000
 2,2050,R1,gassupply1,2030,7.50000000000
+2,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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_retro/Gas/Capacity/2045.csv b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
index 0a3a5cc0..41ad0a7e 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2045.csv
@@ -1,9 +1,16 @@
 asset,year,region,technology,installed,capacity
-1,2045,R1,gassupply1,2025,9.58580000000
-1,2050,R1,gassupply1,2025,9.58580000000
-1,2064,R1,gassupply1,2025,9.58580000000
+0,2045,R1,gassupply1,2020,1.46440000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2045,R1,gassupply1,2025,11.46130000000
+1,2050,R1,gassupply1,2025,11.46130000000
+1,2059,R1,gassupply1,2025,11.46130000000
+1,2060,R1,gassupply1,2025,11.46130000000
+1,2064,R1,gassupply1,2025,11.46130000000
 2,2045,R1,gassupply1,2030,7.50000000000
 2,2050,R1,gassupply1,2030,7.50000000000
+2,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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_retro/Gas/Capacity/2050.csv b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
index ac0bf7c7..5716d7be 100644
--- a/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default_retro/Gas/Capacity/2050.csv
@@ -1,9 +1,16 @@
 asset,year,region,technology,installed,capacity
-1,2050,R1,gassupply1,2025,9.58580000000
-1,2055,R1,gassupply1,2025,9.58580000000
-1,2064,R1,gassupply1,2025,9.58580000000
+0,2050,R1,gassupply1,2020,1.46440000000
+0,2055,R1,gassupply1,2020,1.46440000000
+0,2059,R1,gassupply1,2020,1.46440000000
+1,2050,R1,gassupply1,2025,11.46130000000
+1,2055,R1,gassupply1,2025,11.46130000000
+1,2059,R1,gassupply1,2025,11.46130000000
+1,2060,R1,gassupply1,2025,11.46130000000
+1,2064,R1,gassupply1,2025,11.46130000000
 2,2050,R1,gassupply1,2030,7.50000000000
 2,2055,R1,gassupply1,2030,7.50000000000
+2,2059,R1,gassupply1,2030,7.50000000000
+2,2060,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_retro/MCACapacity.csv b/tests/example_outputs/default_retro/MCACapacity.csv
index 8af577d6..768716b3 100644
--- a/tests/example_outputs/default_retro/MCACapacity.csv
+++ b/tests/example_outputs/default_retro/MCACapacity.csv
@@ -4,54 +4,58 @@ gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
 gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2025,6.00000000000
+windturbine,R1,R1,A1,power,retrofit,2025,5.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2025,16.46440000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2030,5.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,9.58580000000
+windturbine,R1,R1,A1,power,retrofit,2030,5.50000000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,8.96440000000
+gassupply1,R1,R1,A1,gas,retrofit,2030,11.46130000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
 heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
+gasCCGT,R1,R1,A1,power,retrofit,2035,5.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2035,5.50000000000
 windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,9.58580000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,1.46440000000
+gassupply1,R1,R1,A1,gas,retrofit,2035,11.46130000000
 gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
 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,5.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2040,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2040,5.50000000000
 windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,9.58580000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,1.46440000000
+gassupply1,R1,R1,A1,gas,retrofit,2040,11.46130000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
 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,5.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2045,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
+windturbine,R1,R1,A1,power,retrofit,2045,5.50000000000
 windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,9.58580000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,1.46440000000
+gassupply1,R1,R1,A1,gas,retrofit,2045,11.46130000000
 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,5.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
 windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,9.58580000000
+windturbine,R1,R1,A1,power,retrofit,2050,12.41000000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,1.46440000000
+gassupply1,R1,R1,A1,gas,retrofit,2050,11.46130000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv
index be198817..b0de861c 100644
--- a/tests/example_outputs/default_retro/MCAPrices.csv
+++ b/tests/example_outputs/default_retro/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.86840000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21170000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.30670000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.33920000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86840000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21170000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.30670000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.33920000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63870000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.81010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.48140000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.98080000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.21120000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.20570000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.20360000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.47480000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.82140000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.34200000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.33760000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.98080000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21120000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20570000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.20360000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47480000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82140000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34200000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.33760000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.97130000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.67070000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.88510000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.87010000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.97120000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.43470000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.50070000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.49320000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.09210000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.35400000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.21620000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.22950000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64110000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.03480000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.35110000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.38090000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09210000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.35400000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21620000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.22950000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64110000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03480000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.35110000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.38090000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.29990000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.09230000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.86410000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.98330000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19200000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.71810000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.50390000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.55690000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.09040000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.35190000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.10490000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.11500000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.63790000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,2.03070000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.18960000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.21250000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09040000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.35190000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10490000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.11500000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.63790000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03070000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18960000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.21250000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.28960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.07910000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.57450000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.66590000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.18700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,2.71160000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.29600000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.33670000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.22400000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.52330000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.11010000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.12710000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.83800000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.28750000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19750000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.23570000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.22400000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.52330000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11010000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.12710000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.83800000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.28750000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19750000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.23570000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.68810000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.59030000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.58980000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.74300000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.45340000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.05340000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.30650000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.37450000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.30790000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.63090000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07300000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.08930000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.96360000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.44850000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.14640000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.18300000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30790000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.63090000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07300000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08930000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96360000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.44850000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14640000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.18300000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.93760000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.91050000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.51470000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.66140000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.62040000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.26770000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.24440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.30950000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2020.csv b/tests/example_outputs/default_retro/Power/Capacity/2020.csv
index bdc2b6a7..4d6c24fb 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2020.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2020.csv
@@ -1,16 +1,16 @@
 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
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
+1,2025,R1,windturbine,2020,5.50000000000
+1,2030,R1,windturbine,2020,5.50000000000
+1,2035,R1,windturbine,2020,5.50000000000
+1,2040,R1,windturbine,2020,5.50000000000
+1,2045,R1,windturbine,2020,5.50000000000
+1,2049,R1,windturbine,2020,5.50000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2025.csv b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
index 9a5639fc..b067ded0 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2025.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2025.csv
@@ -1,12 +1,12 @@
 asset,year,region,technology,installed,capacity
-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
+0,2025,R1,gasCCGT,2020,6.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,4.06670000000
 1,2035,R1,gasCCGT,2025,4.06670000000
 1,2040,R1,gasCCGT,2025,4.06670000000
@@ -16,9 +16,9 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,4.06670000000
 1,2060,R1,gasCCGT,2025,4.06670000000
 1,2064,R1,gasCCGT,2025,4.06670000000
-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
+2,2025,R1,windturbine,2020,5.50000000000
+2,2030,R1,windturbine,2020,5.50000000000
+2,2035,R1,windturbine,2020,5.50000000000
+2,2040,R1,windturbine,2020,5.50000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2030.csv b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
index f8563fa6..d36bb98e 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2030.csv
@@ -1,11 +1,11 @@
 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,2059,R1,gasCCGT,2020,3.00000000000
+0,2030,R1,gasCCGT,2020,5.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2030,R1,gasCCGT,2025,4.06670000000
 1,2035,R1,gasCCGT,2025,4.06670000000
 1,2040,R1,gasCCGT,2025,4.06670000000
@@ -15,11 +15,11 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,4.06670000000
 1,2060,R1,gasCCGT,2025,4.06670000000
 1,2064,R1,gasCCGT,2025,4.06670000000
-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
+2,2030,R1,windturbine,2020,5.50000000000
+2,2035,R1,windturbine,2020,5.50000000000
+2,2040,R1,windturbine,2020,5.50000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
 3,2035,R1,windturbine,2030,6.00000000000
 3,2040,R1,windturbine,2030,6.00000000000
 3,2045,R1,windturbine,2030,6.00000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2035.csv b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
index bf92ea4f..0dd90cd6 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2035.csv
@@ -1,10 +1,10 @@
 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,2059,R1,gasCCGT,2020,3.00000000000
+0,2035,R1,gasCCGT,2020,5.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2035,R1,gasCCGT,2025,4.06670000000
 1,2040,R1,gasCCGT,2025,4.06670000000
 1,2045,R1,gasCCGT,2025,4.06670000000
@@ -13,10 +13,10 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,4.06670000000
 1,2060,R1,gasCCGT,2025,4.06670000000
 1,2064,R1,gasCCGT,2025,4.06670000000
-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
+2,2035,R1,windturbine,2020,5.50000000000
+2,2040,R1,windturbine,2020,5.50000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
 3,2035,R1,windturbine,2030,6.00000000000
 3,2040,R1,windturbine,2030,6.00000000000
 3,2045,R1,windturbine,2030,6.00000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2040.csv b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
index bdcfc5bb..46153eb5 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2040.csv
@@ -1,9 +1,9 @@
 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,2059,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,5.00000000000
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2040,R1,gasCCGT,2025,4.06670000000
 1,2045,R1,gasCCGT,2025,4.06670000000
 1,2049,R1,gasCCGT,2025,4.06670000000
@@ -11,9 +11,9 @@ asset,year,region,technology,installed,capacity
 1,2059,R1,gasCCGT,2025,4.06670000000
 1,2060,R1,gasCCGT,2025,4.06670000000
 1,2064,R1,gasCCGT,2025,4.06670000000
-2,2040,R1,windturbine,2020,10.00000000000
-2,2045,R1,windturbine,2020,10.00000000000
-2,2049,R1,windturbine,2020,10.00000000000
+2,2040,R1,windturbine,2020,5.50000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
 3,2040,R1,windturbine,2030,6.00000000000
 3,2045,R1,windturbine,2030,6.00000000000
 3,2049,R1,windturbine,2030,6.00000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2045.csv b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
index 7fb6c692..d6eead3c 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2045.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2045.csv
@@ -1,16 +1,16 @@
 asset,year,region,technology,installed,capacity
-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
+0,2045,R1,gasCCGT,2020,5.00000000000
+0,2049,R1,gasCCGT,2020,5.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2045,R1,gasCCGT,2025,4.06670000000
 1,2049,R1,gasCCGT,2025,4.06670000000
 1,2050,R1,gasCCGT,2025,4.06670000000
 1,2059,R1,gasCCGT,2025,4.06670000000
 1,2060,R1,gasCCGT,2025,4.06670000000
 1,2064,R1,gasCCGT,2025,4.06670000000
-2,2045,R1,windturbine,2020,10.00000000000
-2,2049,R1,windturbine,2020,10.00000000000
+2,2045,R1,windturbine,2020,5.50000000000
+2,2049,R1,windturbine,2020,5.50000000000
 3,2045,R1,windturbine,2030,6.00000000000
 3,2049,R1,windturbine,2030,6.00000000000
 3,2050,R1,windturbine,2030,6.00000000000
@@ -29,11 +29,11 @@ asset,year,region,technology,installed,capacity
 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,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
+6,2050,R1,windturbine,2045,12.41000000000
+6,2059,R1,windturbine,2045,12.41000000000
+6,2060,R1,windturbine,2045,12.41000000000
+6,2064,R1,windturbine,2045,12.41000000000
+6,2065,R1,windturbine,2045,12.41000000000
+6,2069,R1,windturbine,2045,12.41000000000
+6,2070,R1,windturbine,2045,12.41000000000
+6,2074,R1,windturbine,2045,12.41000000000
diff --git a/tests/example_outputs/default_retro/Power/Capacity/2050.csv b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
index 74312e85..3169f2d7 100644
--- a/tests/example_outputs/default_retro/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default_retro/Power/Capacity/2050.csv
@@ -1,7 +1,7 @@
 asset,year,region,technology,installed,capacity
-0,2050,R1,gasCCGT,2020,3.00000000000
-0,2055,R1,gasCCGT,2020,3.00000000000
-0,2059,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,5.00000000000
+0,2055,R1,gasCCGT,2020,5.00000000000
+0,2059,R1,gasCCGT,2020,5.00000000000
 1,2050,R1,gasCCGT,2025,4.06670000000
 1,2055,R1,gasCCGT,2025,4.06670000000
 1,2059,R1,gasCCGT,2025,4.06670000000
@@ -22,12 +22,12 @@ asset,year,region,technology,installed,capacity
 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,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
+6,2050,R1,windturbine,2045,12.41000000000
+6,2055,R1,windturbine,2045,12.41000000000
+6,2059,R1,windturbine,2045,12.41000000000
+6,2060,R1,windturbine,2045,12.41000000000
+6,2064,R1,windturbine,2045,12.41000000000
+6,2065,R1,windturbine,2045,12.41000000000
+6,2069,R1,windturbine,2045,12.41000000000
+6,2070,R1,windturbine,2045,12.41000000000
+6,2074,R1,windturbine,2045,12.41000000000
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 8d469cac..e935a70d 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -23,53 +23,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,2.13520000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.01690000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.25240000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.13520000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.01770000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.37880000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.13520000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01690000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.25240000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.13520000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.01770000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.37880000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.13520000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.02010000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.75880000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.13520000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.01850000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.50530000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.10950000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.16420000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10950000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16420000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32840000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.21890000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2035
diff --git a/tests/example_outputs/medium/Gas/Capacity/2020.csv b/tests/example_outputs/medium/Gas/Capacity/2020.csv
index d41c9de1..8a8b3f8a 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2020.csv
@@ -1,9 +1,9 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2025.csv b/tests/example_outputs/medium/Gas/Capacity/2025.csv
index 10f872ff..db744d49 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2025.csv
@@ -1,17 +1,17 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,12.65760000000
-1,2035,R1,gassupply1,2025,12.65760000000
-1,2040,R1,gassupply1,2025,12.65760000000
-1,2045,R1,gassupply1,2025,12.65760000000
-1,2050,R1,gassupply1,2025,12.65760000000
-1,2059,R1,gassupply1,2025,12.65760000000
-1,2060,R1,gassupply1,2025,12.65760000000
-1,2064,R1,gassupply1,2025,12.65760000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
+1,2030,R1,gassupply1,2025,12.51020000000
+1,2035,R1,gassupply1,2025,12.51020000000
+1,2040,R1,gassupply1,2025,12.51020000000
+1,2045,R1,gassupply1,2025,12.51020000000
+1,2050,R1,gassupply1,2025,12.51020000000
+1,2059,R1,gassupply1,2025,12.51020000000
+1,2060,R1,gassupply1,2025,12.51020000000
+1,2064,R1,gassupply1,2025,12.51020000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2030.csv b/tests/example_outputs/medium/Gas/Capacity/2030.csv
index 8c4b7958..acc1a01a 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2030.csv
@@ -1,26 +1,26 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,12.65760000000
-1,2035,R1,gassupply1,2025,12.65760000000
-1,2040,R1,gassupply1,2025,12.65760000000
-1,2045,R1,gassupply1,2025,12.65760000000
-1,2050,R1,gassupply1,2025,12.65760000000
-1,2059,R1,gassupply1,2025,12.65760000000
-1,2060,R1,gassupply1,2025,12.65760000000
-1,2064,R1,gassupply1,2025,12.65760000000
-2,2035,R1,gassupply1,2030,10.78820000000
-2,2040,R1,gassupply1,2030,10.78820000000
-2,2045,R1,gassupply1,2030,10.78820000000
-2,2050,R1,gassupply1,2030,10.78820000000
-2,2059,R1,gassupply1,2030,10.78820000000
-2,2060,R1,gassupply1,2030,10.78820000000
-2,2064,R1,gassupply1,2030,10.78820000000
-2,2065,R1,gassupply1,2030,10.78820000000
-2,2069,R1,gassupply1,2030,10.78820000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
+1,2030,R1,gassupply1,2025,12.51020000000
+1,2035,R1,gassupply1,2025,12.51020000000
+1,2040,R1,gassupply1,2025,12.51020000000
+1,2045,R1,gassupply1,2025,12.51020000000
+1,2050,R1,gassupply1,2025,12.51020000000
+1,2059,R1,gassupply1,2025,12.51020000000
+1,2060,R1,gassupply1,2025,12.51020000000
+1,2064,R1,gassupply1,2025,12.51020000000
+2,2035,R1,gassupply1,2030,10.02210000000
+2,2040,R1,gassupply1,2030,10.02210000000
+2,2045,R1,gassupply1,2030,10.02210000000
+2,2050,R1,gassupply1,2030,10.02210000000
+2,2059,R1,gassupply1,2030,10.02210000000
+2,2060,R1,gassupply1,2030,10.02210000000
+2,2064,R1,gassupply1,2030,10.02210000000
+2,2065,R1,gassupply1,2030,10.02210000000
+2,2069,R1,gassupply1,2030,10.02210000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2035.csv b/tests/example_outputs/medium/Gas/Capacity/2035.csv
index 8c4b7958..acc1a01a 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2035.csv
@@ -1,26 +1,26 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,12.65760000000
-1,2035,R1,gassupply1,2025,12.65760000000
-1,2040,R1,gassupply1,2025,12.65760000000
-1,2045,R1,gassupply1,2025,12.65760000000
-1,2050,R1,gassupply1,2025,12.65760000000
-1,2059,R1,gassupply1,2025,12.65760000000
-1,2060,R1,gassupply1,2025,12.65760000000
-1,2064,R1,gassupply1,2025,12.65760000000
-2,2035,R1,gassupply1,2030,10.78820000000
-2,2040,R1,gassupply1,2030,10.78820000000
-2,2045,R1,gassupply1,2030,10.78820000000
-2,2050,R1,gassupply1,2030,10.78820000000
-2,2059,R1,gassupply1,2030,10.78820000000
-2,2060,R1,gassupply1,2030,10.78820000000
-2,2064,R1,gassupply1,2030,10.78820000000
-2,2065,R1,gassupply1,2030,10.78820000000
-2,2069,R1,gassupply1,2030,10.78820000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
+1,2030,R1,gassupply1,2025,12.51020000000
+1,2035,R1,gassupply1,2025,12.51020000000
+1,2040,R1,gassupply1,2025,12.51020000000
+1,2045,R1,gassupply1,2025,12.51020000000
+1,2050,R1,gassupply1,2025,12.51020000000
+1,2059,R1,gassupply1,2025,12.51020000000
+1,2060,R1,gassupply1,2025,12.51020000000
+1,2064,R1,gassupply1,2025,12.51020000000
+2,2035,R1,gassupply1,2030,10.02210000000
+2,2040,R1,gassupply1,2030,10.02210000000
+2,2045,R1,gassupply1,2030,10.02210000000
+2,2050,R1,gassupply1,2030,10.02210000000
+2,2059,R1,gassupply1,2030,10.02210000000
+2,2060,R1,gassupply1,2030,10.02210000000
+2,2064,R1,gassupply1,2030,10.02210000000
+2,2065,R1,gassupply1,2030,10.02210000000
+2,2069,R1,gassupply1,2030,10.02210000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2040.csv b/tests/example_outputs/medium/Gas/Capacity/2040.csv
index 8c4b7958..acc1a01a 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2040.csv
@@ -1,26 +1,26 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,12.65760000000
-1,2035,R1,gassupply1,2025,12.65760000000
-1,2040,R1,gassupply1,2025,12.65760000000
-1,2045,R1,gassupply1,2025,12.65760000000
-1,2050,R1,gassupply1,2025,12.65760000000
-1,2059,R1,gassupply1,2025,12.65760000000
-1,2060,R1,gassupply1,2025,12.65760000000
-1,2064,R1,gassupply1,2025,12.65760000000
-2,2035,R1,gassupply1,2030,10.78820000000
-2,2040,R1,gassupply1,2030,10.78820000000
-2,2045,R1,gassupply1,2030,10.78820000000
-2,2050,R1,gassupply1,2030,10.78820000000
-2,2059,R1,gassupply1,2030,10.78820000000
-2,2060,R1,gassupply1,2030,10.78820000000
-2,2064,R1,gassupply1,2030,10.78820000000
-2,2065,R1,gassupply1,2030,10.78820000000
-2,2069,R1,gassupply1,2030,10.78820000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
+1,2030,R1,gassupply1,2025,12.51020000000
+1,2035,R1,gassupply1,2025,12.51020000000
+1,2040,R1,gassupply1,2025,12.51020000000
+1,2045,R1,gassupply1,2025,12.51020000000
+1,2050,R1,gassupply1,2025,12.51020000000
+1,2059,R1,gassupply1,2025,12.51020000000
+1,2060,R1,gassupply1,2025,12.51020000000
+1,2064,R1,gassupply1,2025,12.51020000000
+2,2035,R1,gassupply1,2030,10.02210000000
+2,2040,R1,gassupply1,2030,10.02210000000
+2,2045,R1,gassupply1,2030,10.02210000000
+2,2050,R1,gassupply1,2030,10.02210000000
+2,2059,R1,gassupply1,2030,10.02210000000
+2,2060,R1,gassupply1,2030,10.02210000000
+2,2064,R1,gassupply1,2030,10.02210000000
+2,2065,R1,gassupply1,2030,10.02210000000
+2,2069,R1,gassupply1,2030,10.02210000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2045.csv b/tests/example_outputs/medium/Gas/Capacity/2045.csv
index d7f38468..8b2b6cb9 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2045.csv
@@ -1,29 +1,29 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,12.65760000000
-1,2035,R1,gassupply1,2025,12.65760000000
-1,2040,R1,gassupply1,2025,12.65760000000
-1,2045,R1,gassupply1,2025,12.65760000000
-1,2050,R1,gassupply1,2025,12.65760000000
-1,2059,R1,gassupply1,2025,12.65760000000
-1,2060,R1,gassupply1,2025,12.65760000000
-1,2064,R1,gassupply1,2025,12.65760000000
-2,2035,R1,gassupply1,2030,10.78820000000
-2,2040,R1,gassupply1,2030,10.78820000000
-2,2045,R1,gassupply1,2030,10.78820000000
-2,2050,R1,gassupply1,2030,10.78820000000
-2,2059,R1,gassupply1,2030,10.78820000000
-2,2060,R1,gassupply1,2030,10.78820000000
-2,2064,R1,gassupply1,2030,10.78820000000
-2,2065,R1,gassupply1,2030,10.78820000000
-2,2069,R1,gassupply1,2030,10.78820000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
+1,2030,R1,gassupply1,2025,12.51020000000
+1,2035,R1,gassupply1,2025,12.51020000000
+1,2040,R1,gassupply1,2025,12.51020000000
+1,2045,R1,gassupply1,2025,12.51020000000
+1,2050,R1,gassupply1,2025,12.51020000000
+1,2059,R1,gassupply1,2025,12.51020000000
+1,2060,R1,gassupply1,2025,12.51020000000
+1,2064,R1,gassupply1,2025,12.51020000000
+2,2035,R1,gassupply1,2030,10.02210000000
+2,2040,R1,gassupply1,2030,10.02210000000
+2,2045,R1,gassupply1,2030,10.02210000000
+2,2050,R1,gassupply1,2030,10.02210000000
+2,2059,R1,gassupply1,2030,10.02210000000
+2,2060,R1,gassupply1,2030,10.02210000000
+2,2064,R1,gassupply1,2030,10.02210000000
+2,2065,R1,gassupply1,2030,10.02210000000
+2,2069,R1,gassupply1,2030,10.02210000000
 3,2050,R1,gassupply1,2045,0.88640000000
 3,2059,R1,gassupply1,2045,0.88640000000
 3,2060,R1,gassupply1,2045,0.88640000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2050.csv b/tests/example_outputs/medium/Gas/Capacity/2050.csv
index d7f38468..8b2b6cb9 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2050.csv
@@ -1,29 +1,29 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gassupply1,2020,15.00000000000
-0,2025,R1,gassupply1,2020,25.72460000000
-0,2030,R1,gassupply1,2020,18.22460000000
-0,2035,R1,gassupply1,2020,10.72460000000
-0,2040,R1,gassupply1,2020,10.72460000000
-0,2045,R1,gassupply1,2020,10.72460000000
-0,2050,R1,gassupply1,2020,10.72460000000
-0,2059,R1,gassupply1,2020,10.72460000000
-1,2030,R1,gassupply1,2025,12.65760000000
-1,2035,R1,gassupply1,2025,12.65760000000
-1,2040,R1,gassupply1,2025,12.65760000000
-1,2045,R1,gassupply1,2025,12.65760000000
-1,2050,R1,gassupply1,2025,12.65760000000
-1,2059,R1,gassupply1,2025,12.65760000000
-1,2060,R1,gassupply1,2025,12.65760000000
-1,2064,R1,gassupply1,2025,12.65760000000
-2,2035,R1,gassupply1,2030,10.78820000000
-2,2040,R1,gassupply1,2030,10.78820000000
-2,2045,R1,gassupply1,2030,10.78820000000
-2,2050,R1,gassupply1,2030,10.78820000000
-2,2059,R1,gassupply1,2030,10.78820000000
-2,2060,R1,gassupply1,2030,10.78820000000
-2,2064,R1,gassupply1,2030,10.78820000000
-2,2065,R1,gassupply1,2030,10.78820000000
-2,2069,R1,gassupply1,2030,10.78820000000
+0,2025,R1,gassupply1,2020,26.63810000000
+0,2030,R1,gassupply1,2020,19.13810000000
+0,2035,R1,gassupply1,2020,11.63810000000
+0,2040,R1,gassupply1,2020,11.63810000000
+0,2045,R1,gassupply1,2020,11.63810000000
+0,2050,R1,gassupply1,2020,11.63810000000
+0,2059,R1,gassupply1,2020,11.63810000000
+1,2030,R1,gassupply1,2025,12.51020000000
+1,2035,R1,gassupply1,2025,12.51020000000
+1,2040,R1,gassupply1,2025,12.51020000000
+1,2045,R1,gassupply1,2025,12.51020000000
+1,2050,R1,gassupply1,2025,12.51020000000
+1,2059,R1,gassupply1,2025,12.51020000000
+1,2060,R1,gassupply1,2025,12.51020000000
+1,2064,R1,gassupply1,2025,12.51020000000
+2,2035,R1,gassupply1,2030,10.02210000000
+2,2040,R1,gassupply1,2030,10.02210000000
+2,2045,R1,gassupply1,2030,10.02210000000
+2,2050,R1,gassupply1,2030,10.02210000000
+2,2059,R1,gassupply1,2030,10.02210000000
+2,2060,R1,gassupply1,2030,10.02210000000
+2,2064,R1,gassupply1,2030,10.02210000000
+2,2065,R1,gassupply1,2030,10.02210000000
+2,2069,R1,gassupply1,2030,10.02210000000
 3,2050,R1,gassupply1,2045,0.88640000000
 3,2059,R1,gassupply1,2045,0.88640000000
 3,2060,R1,gassupply1,2045,0.88640000000
diff --git a/tests/example_outputs/medium/MCACapacity.csv b/tests/example_outputs/medium/MCACapacity.csv
index 26cc97a1..9a2be079 100644
--- a/tests/example_outputs/medium/MCACapacity.csv
+++ b/tests/example_outputs/medium/MCACapacity.csv
@@ -7,61 +7,56 @@ gasboiler,R1,R1,A1,residential,newcapa,2025,8.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2025,12.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,25.72460000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,26.63810000000
 gasboiler,R1,R1,A1,residential,newcapa,2030,7.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2030,4.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2030,11.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,18.22460000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,12.65760000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,19.13810000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,12.51020000000
 gasboiler,R1,R1,A1,residential,newcapa,2035,7.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2035,11.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2035,7.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,4.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,7.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.78820000000
+windturbine,R1,R1,A1,power,newcapa,2035,4.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,11.63810000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,12.51020000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,10.02210000000
 gasstove,R1,R1,A1,residential,newcapa,2040,7.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2040,14.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,7.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,14.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.78820000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,11.63810000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,12.51020000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,10.02210000000
 gasstove,R1,R1,A1,residential,newcapa,2045,14.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2045,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,14.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,10.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,4.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.78820000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,11.63810000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,12.51020000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,10.02210000000
 gasstove,R1,R1,A1,residential,newcapa,2050,10.00000000000
 gasstove,R1,R1,A1,residential,newcapa,2050,17.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,10.00000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,17.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.78820000000
+windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,11.63810000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,12.51020000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,10.02210000000
 gassupply1,R1,R1,A1,gas,newcapa,2050,0.88640000000
diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv
index 09c4ff9a..900a6a2f 100644
--- a/tests/example_outputs/medium/MCAPrices.csv
+++ b/tests/example_outputs/medium/MCAPrices.csv
@@ -29,183 +29,183 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.78210000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.15420000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.45370000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.55190000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.83470000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.67320000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.73730000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,2.18060000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.84220000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.25200000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78210000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.15420000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.45370000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.55190000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.83470000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.67320000000,2025
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.73730000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.18060000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.84220000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.25200000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.34640000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.51000000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.36110000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.77190000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.50410000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,3.56430000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,2.32420000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.90740000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,1.14230000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.66940000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.32160000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,1.49280000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.53230000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.52610000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.98760000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,2.24500000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.82890000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.81520000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.32160000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.49280000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.53230000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.52610000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.98760000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.24500000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.82890000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.81520000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.00620000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.52560000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.84040000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.78780000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.65700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,3.00130000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.14570000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,1.12170000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,1.33250000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.59390000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.59410000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2035
 "('all-year', 'all-week', 'morning')",electricity,R1,2.00240000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.91680000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.91730000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2035
 "('all-year', 'all-week', 'afternoon')",electricity,R1,1.33250000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.59390000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.59410000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2035
 "('all-year', 'all-week', 'early-peak')",electricity,R1,2.00240000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.91680000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.91730000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2035
 "('all-year', 'all-week', 'late-peak')",electricity,R1,4.02720000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.99120000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.99280000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2035
 "('all-year', 'all-week', 'evening')",electricity,R1,2.67490000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.25730000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,1.25810000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2035
 "('all-year', 'all-week', 'night')",electricity,R1,0.94320000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.07730000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.06180000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2040
 "('all-year', 'all-week', 'morning')",electricity,R1,1.41680000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.15620000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.12110000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2040
 "('all-year', 'all-week', 'afternoon')",electricity,R1,0.94320000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07730000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06180000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2040
 "('all-year', 'all-week', 'early-peak')",electricity,R1,1.41680000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15620000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.12110000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2040
 "('all-year', 'all-week', 'late-peak')",electricity,R1,2.84510000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55540000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.41360000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2040
 "('all-year', 'all-week', 'evening')",electricity,R1,1.89160000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.26210000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.19940000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2040
 "('all-year', 'all-week', 'night')",electricity,R1,1.05670000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06180000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.06630000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2045
 "('all-year', 'all-week', 'morning')",electricity,R1,1.58670000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.12110000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.13130000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2045
 "('all-year', 'all-week', 'afternoon')",electricity,R1,1.05670000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06180000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06630000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2045
 "('all-year', 'all-week', 'early-peak')",electricity,R1,1.58670000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12110000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13130000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2045
 "('all-year', 'all-week', 'late-peak')",electricity,R1,3.18350000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.41360000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.45420000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2045
 "('all-year', 'all-week', 'evening')",electricity,R1,2.11780000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.19940000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.21750000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2045
 "('all-year', 'all-week', 'night')",electricity,R1,1.14470000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06630000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.06980000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2050
 "('all-year', 'all-week', 'morning')",electricity,R1,1.71850000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.13130000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.13920000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2050
 "('all-year', 'all-week', 'afternoon')",electricity,R1,1.14470000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06630000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.06980000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2050
 "('all-year', 'all-week', 'early-peak')",electricity,R1,1.71850000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13130000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.13920000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2050
 "('all-year', 'all-week', 'late-peak')",electricity,R1,3.44600000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.45420000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.48570000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2050
 "('all-year', 'all-week', 'evening')",electricity,R1,2.29330000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.21750000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.23160000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2050
diff --git a/tests/example_outputs/medium/Power/Capacity/2020.csv b/tests/example_outputs/medium/Power/Capacity/2020.csv
index 1cdc9617..c4df69fe 100644
--- a/tests/example_outputs/medium/Power/Capacity/2020.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2020.csv
@@ -1,9 +1,3 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
 0,2025,R1,gasCCGT,2020,1
-1,2025,R1,windturbine,2020,1
-1,2030,R1,windturbine,2020,1
-1,2035,R1,windturbine,2020,1
-1,2040,R1,windturbine,2020,1
-1,2045,R1,windturbine,2020,1
-1,2049,R1,windturbine,2020,1
diff --git a/tests/example_outputs/medium/Power/Capacity/2025.csv b/tests/example_outputs/medium/Power/Capacity/2025.csv
index db1fb82a..d90c5212 100644
--- a/tests/example_outputs/medium/Power/Capacity/2025.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2025.csv
@@ -5,12 +5,7 @@ asset,year,region,technology,installed,capacity
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
+1,2059,R1,gasCCGT,2025,3
+1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,1
-2,2030,R1,windturbine,2020,1
-2,2035,R1,windturbine,2020,1
-2,2040,R1,windturbine,2020,1
-2,2045,R1,windturbine,2020,1
-2,2049,R1,windturbine,2020,1
diff --git a/tests/example_outputs/medium/Power/Capacity/2030.csv b/tests/example_outputs/medium/Power/Capacity/2030.csv
index e27dbf28..1e85f362 100644
--- a/tests/example_outputs/medium/Power/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2030.csv
@@ -5,20 +5,12 @@ asset,year,region,technology,installed,capacity
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-2,2025,R1,windturbine,2020,1
-2,2030,R1,windturbine,2020,1
-2,2035,R1,windturbine,2020,1
-2,2040,R1,windturbine,2020,1
-2,2045,R1,windturbine,2020,1
-2,2049,R1,windturbine,2020,1
-3,2035,R1,windturbine,2030,3
-3,2040,R1,windturbine,2030,3
-3,2045,R1,windturbine,2030,3
-3,2049,R1,windturbine,2030,3
-3,2050,R1,windturbine,2030,3
-3,2059,R1,windturbine,2030,3
+2,2035,R1,windturbine,2030,4
+2,2040,R1,windturbine,2030,4
+2,2045,R1,windturbine,2030,4
+2,2050,R1,windturbine,2030,4
+2,2059,R1,windturbine,2030,4
diff --git a/tests/example_outputs/medium/Power/Capacity/2035.csv b/tests/example_outputs/medium/Power/Capacity/2035.csv
index 321bfcae..d99ccb91 100644
--- a/tests/example_outputs/medium/Power/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2035.csv
@@ -5,27 +5,18 @@ asset,year,region,technology,installed,capacity
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-3,2025,R1,windturbine,2020,1
-3,2030,R1,windturbine,2020,1
-3,2035,R1,windturbine,2020,1
-3,2040,R1,windturbine,2020,1
-3,2045,R1,windturbine,2020,1
-3,2049,R1,windturbine,2020,1
-4,2035,R1,windturbine,2030,3
-4,2040,R1,windturbine,2030,3
-4,2045,R1,windturbine,2030,3
-4,2049,R1,windturbine,2030,3
-4,2050,R1,windturbine,2030,3
-4,2059,R1,windturbine,2030,3
-5,2040,R1,windturbine,2035,10
-5,2045,R1,windturbine,2035,10
-5,2049,R1,windturbine,2035,10
-5,2050,R1,windturbine,2035,10
-5,2059,R1,windturbine,2035,10
-5,2060,R1,windturbine,2035,10
-5,2064,R1,windturbine,2035,10
+3,2035,R1,windturbine,2030,4
+3,2040,R1,windturbine,2030,4
+3,2045,R1,windturbine,2030,4
+3,2050,R1,windturbine,2030,4
+3,2059,R1,windturbine,2030,4
+4,2040,R1,windturbine,2035,10
+4,2045,R1,windturbine,2035,10
+4,2050,R1,windturbine,2035,10
+4,2059,R1,windturbine,2035,10
+4,2060,R1,windturbine,2035,10
+4,2064,R1,windturbine,2035,10
diff --git a/tests/example_outputs/medium/Power/Capacity/2040.csv b/tests/example_outputs/medium/Power/Capacity/2040.csv
index 803b7b9b..7a731b84 100644
--- a/tests/example_outputs/medium/Power/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2040.csv
@@ -5,35 +5,25 @@ asset,year,region,technology,installed,capacity
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-3,2025,R1,windturbine,2020,1
-3,2030,R1,windturbine,2020,1
-3,2035,R1,windturbine,2020,1
-3,2040,R1,windturbine,2020,1
-3,2045,R1,windturbine,2020,1
-3,2049,R1,windturbine,2020,1
-4,2035,R1,windturbine,2030,3
-4,2040,R1,windturbine,2030,3
-4,2045,R1,windturbine,2030,3
-4,2049,R1,windturbine,2030,3
-4,2050,R1,windturbine,2030,3
-4,2059,R1,windturbine,2030,3
-5,2040,R1,windturbine,2035,10
-5,2045,R1,windturbine,2035,10
-5,2049,R1,windturbine,2035,10
-5,2050,R1,windturbine,2035,10
-5,2059,R1,windturbine,2035,10
-5,2060,R1,windturbine,2035,10
-5,2064,R1,windturbine,2035,10
-6,2045,R1,windturbine,2040,3
-6,2049,R1,windturbine,2040,3
-6,2050,R1,windturbine,2040,3
-6,2059,R1,windturbine,2040,3
-6,2060,R1,windturbine,2040,3
-6,2064,R1,windturbine,2040,3
-6,2065,R1,windturbine,2040,3
-6,2069,R1,windturbine,2040,3
+3,2035,R1,windturbine,2030,4
+3,2040,R1,windturbine,2030,4
+3,2045,R1,windturbine,2030,4
+3,2050,R1,windturbine,2030,4
+3,2059,R1,windturbine,2030,4
+4,2040,R1,windturbine,2035,10
+4,2045,R1,windturbine,2035,10
+4,2050,R1,windturbine,2035,10
+4,2059,R1,windturbine,2035,10
+4,2060,R1,windturbine,2035,10
+4,2064,R1,windturbine,2035,10
+5,2045,R1,windturbine,2040,3
+5,2050,R1,windturbine,2040,3
+5,2059,R1,windturbine,2040,3
+5,2060,R1,windturbine,2040,3
+5,2064,R1,windturbine,2040,3
+5,2065,R1,windturbine,2040,3
+5,2069,R1,windturbine,2040,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2045.csv b/tests/example_outputs/medium/Power/Capacity/2045.csv
index 3b9a469f..b298ac21 100644
--- a/tests/example_outputs/medium/Power/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2045.csv
@@ -5,43 +5,33 @@ asset,year,region,technology,installed,capacity
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-3,2025,R1,windturbine,2020,1
-3,2030,R1,windturbine,2020,1
-3,2035,R1,windturbine,2020,1
-3,2040,R1,windturbine,2020,1
-3,2045,R1,windturbine,2020,1
-3,2049,R1,windturbine,2020,1
-4,2035,R1,windturbine,2030,3
-4,2040,R1,windturbine,2030,3
-4,2045,R1,windturbine,2030,3
-4,2049,R1,windturbine,2030,3
-4,2050,R1,windturbine,2030,3
-4,2059,R1,windturbine,2030,3
-5,2040,R1,windturbine,2035,10
-5,2045,R1,windturbine,2035,10
-5,2049,R1,windturbine,2035,10
-5,2050,R1,windturbine,2035,10
-5,2059,R1,windturbine,2035,10
-5,2060,R1,windturbine,2035,10
-5,2064,R1,windturbine,2035,10
-6,2045,R1,windturbine,2040,3
-6,2049,R1,windturbine,2040,3
-6,2050,R1,windturbine,2040,3
-6,2059,R1,windturbine,2040,3
-6,2060,R1,windturbine,2040,3
-6,2064,R1,windturbine,2040,3
-6,2065,R1,windturbine,2040,3
-6,2069,R1,windturbine,2040,3
-7,2050,R1,windturbine,2045,4
-7,2059,R1,windturbine,2045,4
-7,2060,R1,windturbine,2045,4
-7,2064,R1,windturbine,2045,4
-7,2065,R1,windturbine,2045,4
-7,2069,R1,windturbine,2045,4
-7,2070,R1,windturbine,2045,4
-7,2074,R1,windturbine,2045,4
+3,2035,R1,windturbine,2030,4
+3,2040,R1,windturbine,2030,4
+3,2045,R1,windturbine,2030,4
+3,2050,R1,windturbine,2030,4
+3,2059,R1,windturbine,2030,4
+4,2040,R1,windturbine,2035,10
+4,2045,R1,windturbine,2035,10
+4,2050,R1,windturbine,2035,10
+4,2059,R1,windturbine,2035,10
+4,2060,R1,windturbine,2035,10
+4,2064,R1,windturbine,2035,10
+5,2045,R1,windturbine,2040,3
+5,2050,R1,windturbine,2040,3
+5,2059,R1,windturbine,2040,3
+5,2060,R1,windturbine,2040,3
+5,2064,R1,windturbine,2040,3
+5,2065,R1,windturbine,2040,3
+5,2069,R1,windturbine,2040,3
+6,2050,R1,windturbine,2045,3
+6,2059,R1,windturbine,2045,3
+6,2060,R1,windturbine,2045,3
+6,2064,R1,windturbine,2045,3
+6,2065,R1,windturbine,2045,3
+6,2069,R1,windturbine,2045,3
+6,2070,R1,windturbine,2045,3
+6,2074,R1,windturbine,2045,3
diff --git a/tests/example_outputs/medium/Power/Capacity/2050.csv b/tests/example_outputs/medium/Power/Capacity/2050.csv
index a90aff24..9a9abbdd 100644
--- a/tests/example_outputs/medium/Power/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2050.csv
@@ -5,48 +5,38 @@ asset,year,region,technology,installed,capacity
 1,2035,R1,gasCCGT,2025,3
 1,2040,R1,gasCCGT,2025,3
 1,2045,R1,gasCCGT,2025,3
-1,2049,R1,gasCCGT,2025,3
 1,2050,R1,gasCCGT,2025,3
 1,2055,R1,gasCCGT,2025,3
 1,2059,R1,gasCCGT,2025,3
 1,2060,R1,gasCCGT,2025,3
 1,2064,R1,gasCCGT,2025,3
-3,2025,R1,windturbine,2020,1
-3,2030,R1,windturbine,2020,1
-3,2035,R1,windturbine,2020,1
-3,2040,R1,windturbine,2020,1
-3,2045,R1,windturbine,2020,1
-3,2049,R1,windturbine,2020,1
-4,2035,R1,windturbine,2030,3
-4,2040,R1,windturbine,2030,3
-4,2045,R1,windturbine,2030,3
-4,2049,R1,windturbine,2030,3
-4,2050,R1,windturbine,2030,3
-4,2055,R1,windturbine,2030,3
-4,2059,R1,windturbine,2030,3
-5,2040,R1,windturbine,2035,10
-5,2045,R1,windturbine,2035,10
-5,2049,R1,windturbine,2035,10
-5,2050,R1,windturbine,2035,10
-5,2055,R1,windturbine,2035,10
-5,2059,R1,windturbine,2035,10
-5,2060,R1,windturbine,2035,10
-5,2064,R1,windturbine,2035,10
-6,2045,R1,windturbine,2040,3
-6,2049,R1,windturbine,2040,3
-6,2050,R1,windturbine,2040,3
-6,2055,R1,windturbine,2040,3
-6,2059,R1,windturbine,2040,3
-6,2060,R1,windturbine,2040,3
-6,2064,R1,windturbine,2040,3
-6,2065,R1,windturbine,2040,3
-6,2069,R1,windturbine,2040,3
-7,2050,R1,windturbine,2045,4
-7,2055,R1,windturbine,2045,4
-7,2059,R1,windturbine,2045,4
-7,2060,R1,windturbine,2045,4
-7,2064,R1,windturbine,2045,4
-7,2065,R1,windturbine,2045,4
-7,2069,R1,windturbine,2045,4
-7,2070,R1,windturbine,2045,4
-7,2074,R1,windturbine,2045,4
+3,2035,R1,windturbine,2030,4
+3,2040,R1,windturbine,2030,4
+3,2045,R1,windturbine,2030,4
+3,2050,R1,windturbine,2030,4
+3,2055,R1,windturbine,2030,4
+3,2059,R1,windturbine,2030,4
+4,2040,R1,windturbine,2035,10
+4,2045,R1,windturbine,2035,10
+4,2050,R1,windturbine,2035,10
+4,2055,R1,windturbine,2035,10
+4,2059,R1,windturbine,2035,10
+4,2060,R1,windturbine,2035,10
+4,2064,R1,windturbine,2035,10
+5,2045,R1,windturbine,2040,3
+5,2050,R1,windturbine,2040,3
+5,2055,R1,windturbine,2040,3
+5,2059,R1,windturbine,2040,3
+5,2060,R1,windturbine,2040,3
+5,2064,R1,windturbine,2040,3
+5,2065,R1,windturbine,2040,3
+5,2069,R1,windturbine,2040,3
+6,2050,R1,windturbine,2045,3
+6,2055,R1,windturbine,2045,3
+6,2059,R1,windturbine,2045,3
+6,2060,R1,windturbine,2045,3
+6,2064,R1,windturbine,2045,3
+6,2065,R1,windturbine,2045,3
+6,2069,R1,windturbine,2045,3
+6,2070,R1,windturbine,2045,3
+6,2074,R1,windturbine,2045,3
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
index d1ee882b..d37dcfe1 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
@@ -1,4 +1,9 @@
 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
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
index f0d285df..5e2e13dc 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
@@ -1,10 +1,17 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
index a06e32df..a8ae6a42 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
index a06e32df..a8ae6a42 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
index a06e32df..a8ae6a42 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
@@ -1,17 +1,26 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
index a5722dbd..c102c566 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
@@ -1,23 +1,34 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
-3,2050,R1,gassupply1,2045,3.81710000000
-3,2064,R1,gassupply1,2045,3.81710000000
-3,2065,R1,gassupply1,2045,3.81710000000
-3,2069,R1,gassupply1,2045,3.81710000000
-3,2070,R1,gassupply1,2045,3.81710000000
-3,2084,R1,gassupply1,2045,3.81710000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
+3,2050,R1,gassupply1,2045,0.30680000000
+3,2059,R1,gassupply1,2045,0.30680000000
+3,2060,R1,gassupply1,2045,0.30680000000
+3,2064,R1,gassupply1,2045,0.30680000000
+3,2065,R1,gassupply1,2045,0.30680000000
+3,2069,R1,gassupply1,2045,0.30680000000
+3,2070,R1,gassupply1,2045,0.30680000000
+3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
index a5722dbd..c102c566 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
@@ -1,23 +1,34 @@
 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,2030,R1,gassupply1,2025,6.81430000000
-1,2035,R1,gassupply1,2025,6.81430000000
-1,2040,R1,gassupply1,2025,6.81430000000
-1,2045,R1,gassupply1,2025,6.81430000000
-1,2050,R1,gassupply1,2025,6.81430000000
-1,2064,R1,gassupply1,2025,6.81430000000
-2,2035,R1,gassupply1,2030,6.54570000000
-2,2040,R1,gassupply1,2030,6.54570000000
-2,2045,R1,gassupply1,2030,6.54570000000
-2,2050,R1,gassupply1,2030,6.54570000000
-2,2064,R1,gassupply1,2030,6.54570000000
-2,2065,R1,gassupply1,2030,6.54570000000
-2,2069,R1,gassupply1,2030,6.54570000000
-3,2050,R1,gassupply1,2045,3.81710000000
-3,2064,R1,gassupply1,2045,3.81710000000
-3,2065,R1,gassupply1,2045,3.81710000000
-3,2069,R1,gassupply1,2045,3.81710000000
-3,2070,R1,gassupply1,2045,3.81710000000
-3,2084,R1,gassupply1,2045,3.81710000000
+0,2025,R1,gassupply1,2020,16.73530000000
+0,2030,R1,gassupply1,2020,9.23530000000
+0,2035,R1,gassupply1,2020,1.73530000000
+0,2040,R1,gassupply1,2020,1.73530000000
+0,2045,R1,gassupply1,2020,1.73530000000
+0,2050,R1,gassupply1,2020,1.73530000000
+0,2059,R1,gassupply1,2020,1.73530000000
+1,2030,R1,gassupply1,2025,9.28910000000
+1,2035,R1,gassupply1,2025,9.28910000000
+1,2040,R1,gassupply1,2025,9.28910000000
+1,2045,R1,gassupply1,2025,9.28910000000
+1,2050,R1,gassupply1,2025,9.28910000000
+1,2059,R1,gassupply1,2025,9.28910000000
+1,2060,R1,gassupply1,2025,9.28910000000
+1,2064,R1,gassupply1,2025,9.28910000000
+2,2035,R1,gassupply1,2030,7.47410000000
+2,2040,R1,gassupply1,2030,7.47410000000
+2,2045,R1,gassupply1,2030,7.47410000000
+2,2050,R1,gassupply1,2030,7.47410000000
+2,2059,R1,gassupply1,2030,7.47410000000
+2,2060,R1,gassupply1,2030,7.47410000000
+2,2064,R1,gassupply1,2030,7.47410000000
+2,2065,R1,gassupply1,2030,7.47410000000
+2,2069,R1,gassupply1,2030,7.47410000000
+3,2050,R1,gassupply1,2045,0.30680000000
+3,2059,R1,gassupply1,2045,0.30680000000
+3,2060,R1,gassupply1,2045,0.30680000000
+3,2064,R1,gassupply1,2045,0.30680000000
+3,2065,R1,gassupply1,2045,0.30680000000
+3,2069,R1,gassupply1,2045,0.30680000000
+3,2070,R1,gassupply1,2045,0.30680000000
+3,2084,R1,gassupply1,2045,0.30680000000
diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv
index 96e87da9..ee89c111 100644
--- a/tests/example_outputs/multiple_agents/MCACapacity.csv
+++ b/tests/example_outputs/multiple_agents/MCACapacity.csv
@@ -7,62 +7,65 @@ gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
 gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2025,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2025,16.73530000000
 heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,6.81430000000
+gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2030,5.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.23530000000
+gassupply1,R1,R1,A1,gas,newcapa,2030,9.28910000000
 heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.54570000000
+gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2035,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
 windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.54570000000
+windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2040,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
+windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.54570000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2045,7.47410000000
 heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
 heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
 gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
+gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
+windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
 windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,3.81710000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,1.73530000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,9.28910000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,7.47410000000
+gassupply1,R1,R1,A1,gas,newcapa,2050,0.30680000000
diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv
index 0db837fc..7c4372f2 100644
--- a/tests/example_outputs/multiple_agents/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.88730000000,2025
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.21230000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33530000000,2025
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.34060000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.88730000000,2025
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.21230000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.33530000000,2025
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.34060000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,2.69650000000,2025
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.81560000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,1.78620000000,2025
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.48380000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,1.26990000000,2030
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.07480000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.90970000000,2030
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15060000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.15070000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01920000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.26990000000,2030
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07490000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.07480000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.53250000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90970000000,2030
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15060000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15070000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.08790000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.84900000000,2030
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53010000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.53400000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.04840000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,2.55290000000,2030
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.25230000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,1.45210000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.06480000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.08210000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,2.18220000000,2035
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12800000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.16700000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09500000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.45210000000,2035
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06480000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08210000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64550000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.18220000000,2035
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12800000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.16700000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30870000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.38890000000,2035
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44270000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.59880000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19790000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,2.91500000000,2035
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.21200000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.28130000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.18980000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,1.58190000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.08730000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.78720000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,2.37630000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.17870000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.18980000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.58190000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08730000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.78720000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.37630000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.17870000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.58960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.77360000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46920000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.64500000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.38630000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,3.17310000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.22390000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.30190000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,1.78980000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07160000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.09560000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,2.68780000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14330000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.19730000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.34100000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78980000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07160000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.09560000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.01370000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.68780000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14330000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.19730000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.04070000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.39400000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50290000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.71940000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.68790000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,3.58780000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.23900000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.33510000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,1.98520000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07770000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.10350000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,2.98050000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15690000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.21490000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.82770000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.98520000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07770000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.10350000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.74410000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,2.98050000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15690000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.21490000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.50350000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.97770000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55700000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.78950000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.66220000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,3.97770000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.26310000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.36630000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
index 089b2630..36b5025e 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,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2025,R1,windturbine,2020,10
-1,2030,R1,windturbine,2020,10
-1,2035,R1,windturbine,2020,10
-1,2040,R1,windturbine,2020,10
-1,2045,R1,windturbine,2020,10
-1,2049,R1,windturbine,2020,10
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2025,R1,windturbine,2020,5
+1,2030,R1,windturbine,2020,5
+1,2035,R1,windturbine,2020,5
+1,2040,R1,windturbine,2020,5
+1,2045,R1,windturbine,2020,5
+1,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
index 64665258..b130fe08 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2025.csv
@@ -1,25 +1,25 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
index e2ed2347..bfe65108 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
@@ -1,31 +1,31 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
-3,2035,R1,windturbine,2030,8
-3,2040,R1,windturbine,2030,8
-3,2045,R1,windturbine,2030,8
-3,2049,R1,windturbine,2030,8
-3,2050,R1,windturbine,2030,8
-3,2059,R1,windturbine,2030,8
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
+3,2035,R1,windturbine,2030,6
+3,2040,R1,windturbine,2030,6
+3,2045,R1,windturbine,2030,6
+3,2049,R1,windturbine,2030,6
+3,2050,R1,windturbine,2030,6
+3,2059,R1,windturbine,2030,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
index fa5e3aaf..a33320a7 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
@@ -1,34 +1,34 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
-3,2035,R1,windturbine,2030,8
-3,2040,R1,windturbine,2030,8
-3,2045,R1,windturbine,2030,8
-3,2049,R1,windturbine,2030,8
-3,2050,R1,windturbine,2030,8
-3,2059,R1,windturbine,2030,8
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
+3,2035,R1,windturbine,2030,6
+3,2040,R1,windturbine,2030,6
+3,2045,R1,windturbine,2030,6
+3,2049,R1,windturbine,2030,6
+3,2050,R1,windturbine,2030,6
+3,2059,R1,windturbine,2030,6
 4,2040,R1,windturbine,2035,6
 4,2045,R1,windturbine,2035,6
 4,2049,R1,windturbine,2035,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
index 951d3e5e..658cdb8e 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
@@ -1,34 +1,34 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2025,R1,windturbine,2020,10
-2,2030,R1,windturbine,2020,10
-2,2035,R1,windturbine,2020,10
-2,2040,R1,windturbine,2020,10
-2,2045,R1,windturbine,2020,10
-2,2049,R1,windturbine,2020,10
-3,2035,R1,windturbine,2030,8
-3,2040,R1,windturbine,2030,8
-3,2045,R1,windturbine,2030,8
-3,2049,R1,windturbine,2030,8
-3,2050,R1,windturbine,2030,8
-3,2059,R1,windturbine,2030,8
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+2,2025,R1,windturbine,2020,5
+2,2030,R1,windturbine,2020,5
+2,2035,R1,windturbine,2020,5
+2,2040,R1,windturbine,2020,5
+2,2045,R1,windturbine,2020,5
+2,2049,R1,windturbine,2020,5
+3,2035,R1,windturbine,2030,6
+3,2040,R1,windturbine,2030,6
+3,2045,R1,windturbine,2030,6
+3,2049,R1,windturbine,2030,6
+3,2050,R1,windturbine,2030,6
+3,2059,R1,windturbine,2030,6
 4,2040,R1,windturbine,2035,6
 4,2045,R1,windturbine,2035,6
 4,2049,R1,windturbine,2035,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
index 04534bed..f021634a 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2045.csv
@@ -1,44 +1,34 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2050,R1,gasCCGT,2045,2
-2,2059,R1,gasCCGT,2045,2
-2,2060,R1,gasCCGT,2045,2
-2,2064,R1,gasCCGT,2045,2
-2,2065,R1,gasCCGT,2045,2
-2,2069,R1,gasCCGT,2045,2
-2,2070,R1,gasCCGT,2045,2
-2,2074,R1,gasCCGT,2045,2
-2,2075,R1,gasCCGT,2045,2
-2,2084,R1,gasCCGT,2045,2
-3,2025,R1,windturbine,2020,10
-3,2030,R1,windturbine,2020,10
-3,2035,R1,windturbine,2020,10
-3,2040,R1,windturbine,2020,10
-3,2045,R1,windturbine,2020,10
-3,2049,R1,windturbine,2020,10
-4,2035,R1,windturbine,2030,8
-4,2040,R1,windturbine,2030,8
-4,2045,R1,windturbine,2030,8
-4,2049,R1,windturbine,2030,8
-4,2050,R1,windturbine,2030,8
-4,2059,R1,windturbine,2030,8
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+3,2025,R1,windturbine,2020,5
+3,2030,R1,windturbine,2020,5
+3,2035,R1,windturbine,2020,5
+3,2040,R1,windturbine,2020,5
+3,2045,R1,windturbine,2020,5
+3,2049,R1,windturbine,2020,5
+4,2035,R1,windturbine,2030,6
+4,2040,R1,windturbine,2030,6
+4,2045,R1,windturbine,2030,6
+4,2049,R1,windturbine,2030,6
+4,2050,R1,windturbine,2030,6
+4,2059,R1,windturbine,2030,6
 5,2040,R1,windturbine,2035,6
 5,2045,R1,windturbine,2035,6
 5,2049,R1,windturbine,2035,6
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
index 9ca97e84..54bbf73a 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
@@ -1,50 +1,37 @@
 asset,year,region,technology,installed,capacity
 0,2020,R1,gasCCGT,2020,1
-0,2025,R1,gasCCGT,2020,4
-0,2030,R1,gasCCGT,2020,3
-0,2035,R1,gasCCGT,2020,3
-0,2040,R1,gasCCGT,2020,3
-0,2045,R1,gasCCGT,2020,3
-0,2049,R1,gasCCGT,2020,3
-0,2050,R1,gasCCGT,2020,3
-0,2055,R1,gasCCGT,2020,3
-0,2059,R1,gasCCGT,2020,3
-1,2030,R1,gasCCGT,2025,5
-1,2035,R1,gasCCGT,2025,5
-1,2040,R1,gasCCGT,2025,5
-1,2045,R1,gasCCGT,2025,5
-1,2049,R1,gasCCGT,2025,5
-1,2050,R1,gasCCGT,2025,5
-1,2055,R1,gasCCGT,2025,5
-1,2059,R1,gasCCGT,2025,5
-1,2060,R1,gasCCGT,2025,5
-1,2064,R1,gasCCGT,2025,5
-2,2050,R1,gasCCGT,2045,2
-2,2055,R1,gasCCGT,2045,2
-2,2059,R1,gasCCGT,2045,2
-2,2060,R1,gasCCGT,2045,2
-2,2064,R1,gasCCGT,2045,2
-2,2065,R1,gasCCGT,2045,2
-2,2069,R1,gasCCGT,2045,2
-2,2070,R1,gasCCGT,2045,2
-2,2074,R1,gasCCGT,2045,2
-2,2075,R1,gasCCGT,2045,2
-2,2079,R1,gasCCGT,2045,2
-2,2080,R1,gasCCGT,2045,2
-2,2084,R1,gasCCGT,2045,2
-3,2025,R1,windturbine,2020,10
-3,2030,R1,windturbine,2020,10
-3,2035,R1,windturbine,2020,10
-3,2040,R1,windturbine,2020,10
-3,2045,R1,windturbine,2020,10
-3,2049,R1,windturbine,2020,10
-4,2035,R1,windturbine,2030,8
-4,2040,R1,windturbine,2030,8
-4,2045,R1,windturbine,2030,8
-4,2049,R1,windturbine,2030,8
-4,2050,R1,windturbine,2030,8
-4,2055,R1,windturbine,2030,8
-4,2059,R1,windturbine,2030,8
+0,2025,R1,gasCCGT,2020,6
+0,2030,R1,gasCCGT,2020,5
+0,2035,R1,gasCCGT,2020,5
+0,2040,R1,gasCCGT,2020,5
+0,2045,R1,gasCCGT,2020,5
+0,2049,R1,gasCCGT,2020,5
+0,2050,R1,gasCCGT,2020,5
+0,2055,R1,gasCCGT,2020,5
+0,2059,R1,gasCCGT,2020,5
+1,2030,R1,gasCCGT,2025,6
+1,2035,R1,gasCCGT,2025,6
+1,2040,R1,gasCCGT,2025,6
+1,2045,R1,gasCCGT,2025,6
+1,2049,R1,gasCCGT,2025,6
+1,2050,R1,gasCCGT,2025,6
+1,2055,R1,gasCCGT,2025,6
+1,2059,R1,gasCCGT,2025,6
+1,2060,R1,gasCCGT,2025,6
+1,2064,R1,gasCCGT,2025,6
+3,2025,R1,windturbine,2020,5
+3,2030,R1,windturbine,2020,5
+3,2035,R1,windturbine,2020,5
+3,2040,R1,windturbine,2020,5
+3,2045,R1,windturbine,2020,5
+3,2049,R1,windturbine,2020,5
+4,2035,R1,windturbine,2030,6
+4,2040,R1,windturbine,2030,6
+4,2045,R1,windturbine,2030,6
+4,2049,R1,windturbine,2030,6
+4,2050,R1,windturbine,2030,6
+4,2055,R1,windturbine,2030,6
+4,2059,R1,windturbine,2030,6
 5,2040,R1,windturbine,2035,6
 5,2045,R1,windturbine,2035,6
 5,2049,R1,windturbine,2035,6
diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity/2020.csv
index a35c2ed5..a8ff7994 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -1,11 +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,2020,1,R2,gassupply1,2010,1200.00000000000
+R2,2025,1,R2,gassupply1,2010,700.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 9777d794..0389a29d 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -1,9 +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,2025,1,R2,gassupply1,2010,700.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 023078ee..52525599 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -1,9 +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,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2035,1,R2,gassupply1,2010,490.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index c232f077..10517be7 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -1,7 +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,2035,1,R2,gassupply1,2010,490.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 66b1b173..29c0c8bd 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -1,15 +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,2020,1,R2,gasCCGT,2010,200.00000000000
+R2,2025,1,R2,gasCCGT,2010,140.00000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index 2e29060b..16c86de5 100644
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -1,13 +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,2025,1,R2,gasCCGT,2010,140.00000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index bb6eddda..3325b247 100644
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -1,11 +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,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index 768699fc..4d46864b 100644
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -1,9 +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,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Prices.csv b/tests/example_outputs/trade/Prices.csv
index c395f7ec..9e8f9204 100644
--- a/tests/example_outputs/trade/Prices.csv
+++ b/tests/example_outputs/trade/Prices.csv
@@ -29,42 +29,42 @@ R1,gas,2020,"('all-year', 'all-week', 'evening')",4.71680000000
 R1,gas,2020,"('all-year', 'all-week', 'late-peak')",4.71680000000
 R1,gas,2020,"('all-year', 'all-week', 'morning')",4.71680000000
 R1,gas,2020,"('all-year', 'all-week', 'night')",4.71680000000
-R1,gas,2025,"('all-year', 'all-week', 'afternoon')",2.99700000000
-R1,gas,2025,"('all-year', 'all-week', 'early-peak')",2.99700000000
-R1,gas,2025,"('all-year', 'all-week', 'evening')",2.99590000000
-R1,gas,2025,"('all-year', 'all-week', 'late-peak')",3.18980000000
-R1,gas,2025,"('all-year', 'all-week', 'morning')",3.14160000000
-R1,gas,2025,"('all-year', 'all-week', 'night')",2.97240000000
-R1,gas,2030,"('all-year', 'all-week', 'afternoon')",1.77380000000
-R1,gas,2030,"('all-year', 'all-week', 'early-peak')",1.77380000000
-R1,gas,2030,"('all-year', 'all-week', 'evening')",1.77240000000
-R1,gas,2030,"('all-year', 'all-week', 'late-peak')",2.01320000000
-R1,gas,2030,"('all-year', 'all-week', 'morning')",1.95220000000
-R1,gas,2030,"('all-year', 'all-week', 'night')",1.74410000000
-R1,gas,2035,"('all-year', 'all-week', 'afternoon')",1.07110000000
-R1,gas,2035,"('all-year', 'all-week', 'early-peak')",1.07110000000
-R1,gas,2035,"('all-year', 'all-week', 'evening')",1.06990000000
-R1,gas,2035,"('all-year', 'all-week', 'late-peak')",1.29850000000
-R1,gas,2035,"('all-year', 'all-week', 'morning')",1.23940000000
-R1,gas,2035,"('all-year', 'all-week', 'night')",1.04370000000
-R1,heat,2025,"('all-year', 'all-week', 'afternoon')",0.90760000000
-R1,heat,2025,"('all-year', 'all-week', 'early-peak')",0.90760000000
-R1,heat,2025,"('all-year', 'all-week', 'evening')",0.90520000000
-R1,heat,2025,"('all-year', 'all-week', 'late-peak')",1.31090000000
-R1,heat,2025,"('all-year', 'all-week', 'morning')",1.21010000000
-R1,heat,2025,"('all-year', 'all-week', 'night')",0.85600000000
-R1,heat,2030,"('all-year', 'all-week', 'afternoon')",0.53900000000
-R1,heat,2030,"('all-year', 'all-week', 'early-peak')",0.53900000000
-R1,heat,2030,"('all-year', 'all-week', 'evening')",0.53740000000
-R1,heat,2030,"('all-year', 'all-week', 'late-peak')",0.82670000000
-R1,heat,2030,"('all-year', 'all-week', 'morning')",0.75200000000
-R1,heat,2030,"('all-year', 'all-week', 'night')",0.50430000000
-R1,heat,2035,"('all-year', 'all-week', 'afternoon')",0.32730000000
-R1,heat,2035,"('all-year', 'all-week', 'early-peak')",0.32730000000
-R1,heat,2035,"('all-year', 'all-week', 'evening')",0.32620000000
-R1,heat,2035,"('all-year', 'all-week', 'late-peak')",0.53260000000
-R1,heat,2035,"('all-year', 'all-week', 'morning')",0.47750000000
-R1,heat,2035,"('all-year', 'all-week', 'night')",0.30380000000
+R1,gas,2025,"('all-year', 'all-week', 'afternoon')",1.77380000000
+R1,gas,2025,"('all-year', 'all-week', 'early-peak')",1.77380000000
+R1,gas,2025,"('all-year', 'all-week', 'evening')",1.77240000000
+R1,gas,2025,"('all-year', 'all-week', 'late-peak')",2.01320000000
+R1,gas,2025,"('all-year', 'all-week', 'morning')",1.95220000000
+R1,gas,2025,"('all-year', 'all-week', 'night')",1.74410000000
+R1,gas,2030,"('all-year', 'all-week', 'afternoon')",0.66750000000
+R1,gas,2030,"('all-year', 'all-week', 'early-peak')",0.66750000000
+R1,gas,2030,"('all-year', 'all-week', 'evening')",0.66640000000
+R1,gas,2030,"('all-year', 'all-week', 'late-peak')",0.86420000000
+R1,gas,2030,"('all-year', 'all-week', 'morning')",0.81230000000
+R1,gas,2030,"('all-year', 'all-week', 'night')",0.64440000000
+R1,gas,2035,"('all-year', 'all-week', 'afternoon')",0.30240000000
+R1,gas,2035,"('all-year', 'all-week', 'early-peak')",0.30240000000
+R1,gas,2035,"('all-year', 'all-week', 'evening')",0.30170000000
+R1,gas,2035,"('all-year', 'all-week', 'late-peak')",0.44020000000
+R1,gas,2035,"('all-year', 'all-week', 'morning')",0.40300000000
+R1,gas,2035,"('all-year', 'all-week', 'night')",0.28680000000
+R1,heat,2025,"('all-year', 'all-week', 'afternoon')",0.53900000000
+R1,heat,2025,"('all-year', 'all-week', 'early-peak')",0.53900000000
+R1,heat,2025,"('all-year', 'all-week', 'evening')",0.53740000000
+R1,heat,2025,"('all-year', 'all-week', 'late-peak')",0.82670000000
+R1,heat,2025,"('all-year', 'all-week', 'morning')",0.75200000000
+R1,heat,2025,"('all-year', 'all-week', 'night')",0.50430000000
+R1,heat,2030,"('all-year', 'all-week', 'afternoon')",0.20570000000
+R1,heat,2030,"('all-year', 'all-week', 'early-peak')",0.20570000000
+R1,heat,2030,"('all-year', 'all-week', 'evening')",0.20490000000
+R1,heat,2030,"('all-year', 'all-week', 'late-peak')",0.35390000000
+R1,heat,2030,"('all-year', 'all-week', 'morning')",0.31310000000
+R1,heat,2030,"('all-year', 'all-week', 'night')",0.18950000000
+R1,heat,2035,"('all-year', 'all-week', 'afternoon')",0.09570000000
+R1,heat,2035,"('all-year', 'all-week', 'early-peak')",0.09570000000
+R1,heat,2035,"('all-year', 'all-week', 'evening')",0.09530000000
+R1,heat,2035,"('all-year', 'all-week', 'late-peak')",0.17940000000
+R1,heat,2035,"('all-year', 'all-week', 'morning')",0.15540000000
+R1,heat,2035,"('all-year', 'all-week', 'night')",0.08710000000
 R2,electricity,2020,"('all-year', 'all-week', 'afternoon')",19.13890000000
 R2,electricity,2020,"('all-year', 'all-week', 'early-peak')",19.13890000000
 R2,electricity,2020,"('all-year', 'all-week', 'evening')",19.13890000000
@@ -95,39 +95,39 @@ R2,gas,2020,"('all-year', 'all-week', 'evening')",4.71680000000
 R2,gas,2020,"('all-year', 'all-week', 'late-peak')",4.71680000000
 R2,gas,2020,"('all-year', 'all-week', 'morning')",4.71680000000
 R2,gas,2020,"('all-year', 'all-week', 'night')",4.71680000000
-R2,gas,2025,"('all-year', 'all-week', 'afternoon')",3.01140000000
-R2,gas,2025,"('all-year', 'all-week', 'early-peak')",3.01140000000
-R2,gas,2025,"('all-year', 'all-week', 'evening')",3.01140000000
-R2,gas,2025,"('all-year', 'all-week', 'late-peak')",3.13590000000
-R2,gas,2025,"('all-year', 'all-week', 'morning')",3.11100000000
-R2,gas,2025,"('all-year', 'all-week', 'night')",3.06120000000
-R2,gas,2030,"('all-year', 'all-week', 'afternoon')",1.79390000000
-R2,gas,2030,"('all-year', 'all-week', 'early-peak')",1.79390000000
-R2,gas,2030,"('all-year', 'all-week', 'evening')",1.79390000000
-R2,gas,2030,"('all-year', 'all-week', 'late-peak')",1.94820000000
-R2,gas,2030,"('all-year', 'all-week', 'morning')",1.91690000000
-R2,gas,2030,"('all-year', 'all-week', 'night')",1.85500000000
-R2,gas,2035,"('all-year', 'all-week', 'afternoon')",1.09300000000
-R2,gas,2035,"('all-year', 'all-week', 'early-peak')",1.09300000000
-R2,gas,2035,"('all-year', 'all-week', 'evening')",1.09300000000
-R2,gas,2035,"('all-year', 'all-week', 'late-peak')",1.23960000000
-R2,gas,2035,"('all-year', 'all-week', 'morning')",1.20950000000
-R2,gas,2035,"('all-year', 'all-week', 'night')",1.15050000000
-R2,heat,2025,"('all-year', 'all-week', 'afternoon')",1.10450000000
-R2,heat,2025,"('all-year', 'all-week', 'early-peak')",1.10450000000
-R2,heat,2025,"('all-year', 'all-week', 'evening')",1.10450000000
-R2,heat,2025,"('all-year', 'all-week', 'late-peak')",1.41140000000
-R2,heat,2025,"('all-year', 'all-week', 'morning')",1.35000000000
-R2,heat,2025,"('all-year', 'all-week', 'night')",1.22730000000
-R2,heat,2030,"('all-year', 'all-week', 'afternoon')",0.65810000000
-R2,heat,2030,"('all-year', 'all-week', 'early-peak')",0.65810000000
-R2,heat,2030,"('all-year', 'all-week', 'evening')",0.65810000000
-R2,heat,2030,"('all-year', 'all-week', 'late-peak')",0.87450000000
-R2,heat,2030,"('all-year', 'all-week', 'morning')",0.83010000000
-R2,heat,2030,"('all-year', 'all-week', 'night')",0.74290000000
-R2,heat,2035,"('all-year', 'all-week', 'afternoon')",0.40110000000
-R2,heat,2035,"('all-year', 'all-week', 'early-peak')",0.40110000000
-R2,heat,2035,"('all-year', 'all-week', 'evening')",0.40110000000
-R2,heat,2035,"('all-year', 'all-week', 'late-peak')",0.55420000000
-R2,heat,2035,"('all-year', 'all-week', 'morning')",0.52200000000
-R2,heat,2035,"('all-year', 'all-week', 'night')",0.46000000000
+R2,gas,2025,"('all-year', 'all-week', 'afternoon')",1.79390000000
+R2,gas,2025,"('all-year', 'all-week', 'early-peak')",1.79390000000
+R2,gas,2025,"('all-year', 'all-week', 'evening')",1.79390000000
+R2,gas,2025,"('all-year', 'all-week', 'late-peak')",1.94820000000
+R2,gas,2025,"('all-year', 'all-week', 'morning')",1.91690000000
+R2,gas,2025,"('all-year', 'all-week', 'night')",1.85500000000
+R2,gas,2030,"('all-year', 'all-week', 'afternoon')",0.68960000000
+R2,gas,2030,"('all-year', 'all-week', 'early-peak')",0.68960000000
+R2,gas,2030,"('all-year', 'all-week', 'evening')",0.68960000000
+R2,gas,2030,"('all-year', 'all-week', 'late-peak')",0.81680000000
+R2,gas,2030,"('all-year', 'all-week', 'morning')",0.79040000000
+R2,gas,2030,"('all-year', 'all-week', 'night')",0.73910000000
+R2,gas,2035,"('all-year', 'all-week', 'afternoon')",0.32370000000
+R2,gas,2035,"('all-year', 'all-week', 'early-peak')",0.32370000000
+R2,gas,2035,"('all-year', 'all-week', 'evening')",0.32370000000
+R2,gas,2035,"('all-year', 'all-week', 'late-peak')",0.41400000000
+R2,gas,2035,"('all-year', 'all-week', 'morning')",0.39500000000
+R2,gas,2035,"('all-year', 'all-week', 'night')",0.35840000000
+R2,heat,2025,"('all-year', 'all-week', 'afternoon')",0.65810000000
+R2,heat,2025,"('all-year', 'all-week', 'early-peak')",0.65810000000
+R2,heat,2025,"('all-year', 'all-week', 'evening')",0.65810000000
+R2,heat,2025,"('all-year', 'all-week', 'late-peak')",0.87450000000
+R2,heat,2025,"('all-year', 'all-week', 'morning')",0.83010000000
+R2,heat,2025,"('all-year', 'all-week', 'night')",0.74290000000
+R2,heat,2030,"('all-year', 'all-week', 'afternoon')",0.25320000000
+R2,heat,2030,"('all-year', 'all-week', 'early-peak')",0.25320000000
+R2,heat,2030,"('all-year', 'all-week', 'evening')",0.25320000000
+R2,heat,2030,"('all-year', 'all-week', 'late-peak')",0.36310000000
+R2,heat,2030,"('all-year', 'all-week', 'morning')",0.33950000000
+R2,heat,2030,"('all-year', 'all-week', 'night')",0.29480000000
+R2,heat,2035,"('all-year', 'all-week', 'afternoon')",0.11910000000
+R2,heat,2035,"('all-year', 'all-week', 'early-peak')",0.11910000000
+R2,heat,2035,"('all-year', 'all-week', 'evening')",0.11910000000
+R2,heat,2035,"('all-year', 'all-week', 'late-peak')",0.18100000000
+R2,heat,2035,"('all-year', 'all-week', 'morning')",0.16740000000
+R2,heat,2035,"('all-year', 'all-week', 'night')",0.14200000000

From 5d7462bd49fb9d4166adf0aba46fec4307ab009e Mon Sep 17 00:00:00 2001
From: martinstringer <116901130+martinstringer@users.noreply.github.com>
Date: Wed, 10 Jul 2024 15:22:56 +0100
Subject: [PATCH 387/419] Quick fix for float-integer error

---
 src/muse/timeslices.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 547d09be..90931523 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -549,7 +549,7 @@ def convert_timeslice(
         index = index.set_names(f"finest_{u}" for u in index.names)
         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*finest
         proj0 = proj0 / proj0.sum("finest_timeslice")
     elif quantity is QuantityType.INTENSIVE:
         proj1 = proj1 / proj1.sum("finest_timeslice")

From 1d2209b1802fe963ac2999ec340045b986e81981 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 14:26:58 +0000
Subject: [PATCH 388/419] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/muse/timeslices.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 90931523..001152bf 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -549,7 +549,7 @@ def convert_timeslice(
         index = index.set_names(f"finest_{u}" for u in index.names)
         mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "finest_timeslice")
         finest = finest.drop_vars(list(finest.coords)).assign_coords(mindex_coords)
-        proj0 = proj0*finest
+        proj0 = proj0 * finest
         proj0 = proj0 / proj0.sum("finest_timeslice")
     elif quantity is QuantityType.INTENSIVE:
         proj1 = proj1 / proj1.sum("finest_timeslice")

From 498f36e38ce5e09823ff98cf0992d94bf9324a5b Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 11 Jul 2024 10:47:29 +0100
Subject: [PATCH 389/419] Move demand fulfillment check

---
 src/muse/mca.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index 0f43c1cb..0c0f6168 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -559,8 +559,7 @@ def find_equilibrium(
         # Update prices
         market["prices"] = drop_timeslice(market["updated_prices"])
 
-        # Check convergence criteria
-        check_demand_fulfillment(market.sel(commodity=included), tol_unmet_demand)
+        # Check convergence
         converged = check_equilibrium(
             market.sel(commodity=included),
             prior_market.sel(commodity=included),
@@ -577,6 +576,9 @@ def find_equilibrium(
         )
         getLogger(__name__).critical(msg)
 
+    # Check that demand is fulfilled (raises a warning if not)
+    check_demand_fulfillment(market.sel(commodity=included), tol_unmet_demand)
+
     return FindEquilibriumResults(
         converged, market.drop_vars("updated_prices"), equilibrium_sectors
     )

From 19b17e21f34070b5167551bc982076da7f66ae86 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 12 Jul 2024 10:54:10 +0100
Subject: [PATCH 390/419] Simplfiy prices function, fix issues with
 `keep_columns` for supply and consumption

---
 src/muse/outputs/mca.py | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index eae54be2..1a6aa638 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -32,6 +32,7 @@ def quantity(
 import xarray as xr
 from mypy_extensions import KwArg
 
+from muse.outputs.sector import market_quantity
 from muse.registration import registrator
 from muse.sectors import AbstractSector
 from muse.timeslices import QuantityType, convert_timeslice, drop_timeslice
@@ -106,7 +107,7 @@ def factory(
     - any other parameter relevant to the sink, e.g. `pandas.to_csv` keyword
       arguments.
 
-    For simplicity, it is also possible to given lone strings as input.
+    For simplicity, it is also possible to give lone strings as input.
     They default to `{'quantity': string}` (and the sink will default to
     "csv").
     """
@@ -151,18 +152,14 @@ def consumption(
     market: xr.Dataset, sectors: list[AbstractSector], **kwargs
 ) -> xr.DataArray:
     """Current consumption."""
-    from muse.outputs.sector import market_quantity
-
-    return market_quantity(market.consumption, **kwargs)
+    return market_quantity(market.consumption, **kwargs).to_dataframe().reset_index()
 
 
 @register_output_quantity
 @round_values
 def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> xr.DataArray:
     """Current supply."""
-    from muse.outputs.sector import market_quantity
-
-    return market_quantity(market.supply, **kwargs)
+    return market_quantity(market.supply, **kwargs).to_dataframe().reset_index()
 
 
 @register_output_quantity
@@ -170,31 +167,10 @@ def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> xr.Da
 def prices(
     market: xr.Dataset,
     sectors: list[AbstractSector],
-    drop_empty: bool = True,
-    keep_columns: Optional[Union[Sequence[str], str]] = "prices",
     **kwargs,
 ) -> pd.DataFrame:
     """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, str):
-        result = result[[*ts_coords, keep_columns]]
-
-    elif keep_columns is not None and len(keep_columns) > 0:
-        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
+    return market_quantity(market.prices, **kwargs).to_dataframe().reset_index()
 
 
 @register_output_quantity

From 5b9dba818858d43d6f25b3ff5eb17adfdcaf821e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 12 Jul 2024 11:47:14 +0100
Subject: [PATCH 391/419] Update tutorial models

---
 .../Results/MCAPrices.csv                     |  338 ++--
 .../1-introduction/Results/MCAPrices.csv      |  338 ++--
 .../1-introduction/settings.toml              |    1 +
 .../2-scenario/Results/MCAPrices.csv          |  338 ++--
 .../2-scenario/settings.toml                  |    1 +
 .../1-single-objective/Results/MCAPrices.csv  |  338 ++--
 .../1-single-objective/settings.toml          |    1 +
 .../Results/MCAPrices.csv                     |  338 ++--
 .../2-multiple-objective/settings.toml        |    1 +
 .../1-new-region/Results/MCAPrices.csv        |  674 ++++----
 .../3-add-region/1-new-region/settings.toml   |    1 +
 .../1-modify-timeslices/Results/MCAPrices.csv |  898 +++++------
 .../1-modify-timeslices/settings.toml         |    1 +
 .../Results/MCAPrices.csv                     | 1410 ++++++++---------
 .../2-modify-time-framework/settings.toml     |    1 +
 .../1-exogenous-demand/Results/MCAPrices.csv  | 1122 ++++++-------
 .../1-exogenous-demand/settings.toml          |    1 +
 .../1-correlation/Results/MCAPrices.csv       |  338 ++--
 .../1-correlation/settings.toml               |    1 +
 .../1-min-constraint/Results/MCAPrices.csv    |  338 ++--
 .../1-min-constraint/settings.toml            |    1 +
 .../2-max-constraint/Results/MCAPrices.csv    |  338 ++--
 .../2-max-constraint/settings.toml            |    1 +
 src/muse/data/example/default/settings.toml   |    1 +
 .../data/example/default_retro/settings.toml  |    1 +
 .../example/default_timeslice/settings.toml   |    1 +
 26 files changed, 3418 insertions(+), 3404 deletions(-)

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 3abd17db..28ba7646 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.43850000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.65770000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43850000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65770000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31550000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.87700000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.35030000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04160000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.52640000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07550000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.35030000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04160000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.52640000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07550000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.05810000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23000000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.70300000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11830000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.38160000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03810000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.57320000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.06770000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.38160000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03810000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.57320000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06770000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.15090000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.76530000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.10430000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.40390000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03930000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.60650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.07050000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.40390000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.03930000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.60650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07050000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.21680000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21030000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.80950000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.10930000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.44080000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04020000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66170000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.07250000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44080000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04020000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66170000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07250000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.32680000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21820000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.88310000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.11290000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63350000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04170000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95090000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.07580000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63350000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04170000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95090000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07580000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90630000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23140000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.26890000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.11870000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+,commodity,day,hour,month,prices,region,timeslice,units_prices,year
+0,electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+8,gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+16,heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+24,CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+48,electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+56,gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+64,heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+72,CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+96,electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+104,gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+112,heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+120,CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+144,electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+152,gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+160,heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+168,CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+192,electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+200,gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+208,heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+216,CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+240,electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+248,gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+256,heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+264,CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+1,electricity,all-week,night,all-year,0.43850000000,R1,0,MUS$2010/PJ,2025
+9,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+17,heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+25,CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+49,electricity,all-week,morning,all-year,0.65770000000,R1,1,MUS$2010/PJ,2025
+57,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+65,heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+73,CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+97,electricity,all-week,afternoon,all-year,0.43850000000,R1,2,MUS$2010/PJ,2025
+105,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+113,heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+121,CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+145,electricity,all-week,early-peak,all-year,0.65770000000,R1,3,MUS$2010/PJ,2025
+153,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+161,heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+169,CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+193,electricity,all-week,late-peak,all-year,1.31550000000,R1,4,MUS$2010/PJ,2025
+201,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+209,heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+217,CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+241,electricity,all-week,evening,all-year,0.87700000000,R1,5,MUS$2010/PJ,2025
+249,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+257,heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+265,CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+2,electricity,all-week,night,all-year,0.35030000000,R1,0,MUS$2010/PJ,2030
+10,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+18,heat,all-week,night,all-year,0.04160000000,R1,0,MUS$2010/PJ,2030
+26,CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+50,electricity,all-week,morning,all-year,0.52640000000,R1,1,MUS$2010/PJ,2030
+58,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+66,heat,all-week,morning,all-year,0.07550000000,R1,1,MUS$2010/PJ,2030
+74,CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+98,electricity,all-week,afternoon,all-year,0.35030000000,R1,2,MUS$2010/PJ,2030
+106,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+114,heat,all-week,afternoon,all-year,0.04160000000,R1,2,MUS$2010/PJ,2030
+122,CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+146,electricity,all-week,early-peak,all-year,0.52640000000,R1,3,MUS$2010/PJ,2030
+154,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+162,heat,all-week,early-peak,all-year,0.07550000000,R1,3,MUS$2010/PJ,2030
+170,CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+194,electricity,all-week,late-peak,all-year,1.05810000000,R1,4,MUS$2010/PJ,2030
+202,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+210,heat,all-week,late-peak,all-year,0.23000000000,R1,4,MUS$2010/PJ,2030
+218,CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+242,electricity,all-week,evening,all-year,0.70300000000,R1,5,MUS$2010/PJ,2030
+250,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+258,heat,all-week,evening,all-year,0.11830000000,R1,5,MUS$2010/PJ,2030
+266,CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+3,electricity,all-week,night,all-year,0.38160000000,R1,0,MUS$2010/PJ,2035
+11,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+19,heat,all-week,night,all-year,0.03810000000,R1,0,MUS$2010/PJ,2035
+27,CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+51,electricity,all-week,morning,all-year,0.57320000000,R1,1,MUS$2010/PJ,2035
+59,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+67,heat,all-week,morning,all-year,0.06770000000,R1,1,MUS$2010/PJ,2035
+75,CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+99,electricity,all-week,afternoon,all-year,0.38160000000,R1,2,MUS$2010/PJ,2035
+107,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+115,heat,all-week,afternoon,all-year,0.03810000000,R1,2,MUS$2010/PJ,2035
+123,CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+147,electricity,all-week,early-peak,all-year,0.57320000000,R1,3,MUS$2010/PJ,2035
+155,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+163,heat,all-week,early-peak,all-year,0.06770000000,R1,3,MUS$2010/PJ,2035
+171,CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+195,electricity,all-week,late-peak,all-year,1.15090000000,R1,4,MUS$2010/PJ,2035
+203,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+211,heat,all-week,late-peak,all-year,0.19910000000,R1,4,MUS$2010/PJ,2035
+219,CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+243,electricity,all-week,evening,all-year,0.76530000000,R1,5,MUS$2010/PJ,2035
+251,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+259,heat,all-week,evening,all-year,0.10430000000,R1,5,MUS$2010/PJ,2035
+267,CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+4,electricity,all-week,night,all-year,0.40390000000,R1,0,MUS$2010/PJ,2040
+12,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+20,heat,all-week,night,all-year,0.03930000000,R1,0,MUS$2010/PJ,2040
+28,CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+52,electricity,all-week,morning,all-year,0.60650000000,R1,1,MUS$2010/PJ,2040
+60,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+68,heat,all-week,morning,all-year,0.07050000000,R1,1,MUS$2010/PJ,2040
+76,CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+100,electricity,all-week,afternoon,all-year,0.40390000000,R1,2,MUS$2010/PJ,2040
+108,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+116,heat,all-week,afternoon,all-year,0.03930000000,R1,2,MUS$2010/PJ,2040
+124,CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+148,electricity,all-week,early-peak,all-year,0.60650000000,R1,3,MUS$2010/PJ,2040
+156,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+164,heat,all-week,early-peak,all-year,0.07050000000,R1,3,MUS$2010/PJ,2040
+172,CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+196,electricity,all-week,late-peak,all-year,1.21680000000,R1,4,MUS$2010/PJ,2040
+204,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+212,heat,all-week,late-peak,all-year,0.21030000000,R1,4,MUS$2010/PJ,2040
+220,CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+244,electricity,all-week,evening,all-year,0.80950000000,R1,5,MUS$2010/PJ,2040
+252,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+260,heat,all-week,evening,all-year,0.10930000000,R1,5,MUS$2010/PJ,2040
+268,CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+5,electricity,all-week,night,all-year,0.44080000000,R1,0,MUS$2010/PJ,2045
+13,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+21,heat,all-week,night,all-year,0.04020000000,R1,0,MUS$2010/PJ,2045
+29,CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+53,electricity,all-week,morning,all-year,0.66170000000,R1,1,MUS$2010/PJ,2045
+61,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+69,heat,all-week,morning,all-year,0.07250000000,R1,1,MUS$2010/PJ,2045
+77,CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+101,electricity,all-week,afternoon,all-year,0.44080000000,R1,2,MUS$2010/PJ,2045
+109,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+117,heat,all-week,afternoon,all-year,0.04020000000,R1,2,MUS$2010/PJ,2045
+125,CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+149,electricity,all-week,early-peak,all-year,0.66170000000,R1,3,MUS$2010/PJ,2045
+157,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+165,heat,all-week,early-peak,all-year,0.07250000000,R1,3,MUS$2010/PJ,2045
+173,CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+197,electricity,all-week,late-peak,all-year,1.32680000000,R1,4,MUS$2010/PJ,2045
+205,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+213,heat,all-week,late-peak,all-year,0.21820000000,R1,4,MUS$2010/PJ,2045
+221,CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+245,electricity,all-week,evening,all-year,0.88310000000,R1,5,MUS$2010/PJ,2045
+253,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+261,heat,all-week,evening,all-year,0.11290000000,R1,5,MUS$2010/PJ,2045
+269,CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+6,electricity,all-week,night,all-year,0.63350000000,R1,0,MUS$2010/PJ,2050
+14,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+22,heat,all-week,night,all-year,0.04170000000,R1,0,MUS$2010/PJ,2050
+30,CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+54,electricity,all-week,morning,all-year,0.95090000000,R1,1,MUS$2010/PJ,2050
+62,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+70,heat,all-week,morning,all-year,0.07580000000,R1,1,MUS$2010/PJ,2050
+78,CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+102,electricity,all-week,afternoon,all-year,0.63350000000,R1,2,MUS$2010/PJ,2050
+110,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+118,heat,all-week,afternoon,all-year,0.04170000000,R1,2,MUS$2010/PJ,2050
+126,CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+150,electricity,all-week,early-peak,all-year,0.95090000000,R1,3,MUS$2010/PJ,2050
+158,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+166,heat,all-week,early-peak,all-year,0.07580000000,R1,3,MUS$2010/PJ,2050
+174,CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+198,electricity,all-week,late-peak,all-year,1.90630000000,R1,4,MUS$2010/PJ,2050
+206,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+214,heat,all-week,late-peak,all-year,0.23140000000,R1,4,MUS$2010/PJ,2050
+222,CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+246,electricity,all-week,evening,all-year,1.26890000000,R1,5,MUS$2010/PJ,2050
+254,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+262,heat,all-week,evening,all-year,0.11870000000,R1,5,MUS$2010/PJ,2050
+270,CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
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 764d2557..58802e52 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
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.43850000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.65770000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.43850000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.65770000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.31550000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.87700000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.76370000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04160000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.14830000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07550000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76370000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04160000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.14830000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07550000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31280000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23000000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.53460000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11830000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.85970000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05460000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.29180000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10500000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85970000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05460000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.29180000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10500000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.59700000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34970000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.72530000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17090000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.92790000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05840000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.39380000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11360000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.92790000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05840000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39380000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11360000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.79910000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38380000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.86090000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18610000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.03960000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06120000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.56110000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.11970000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.03960000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06120000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.56110000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11970000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.13230000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40800000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.08370000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.19700000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.28730000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06560000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.93270000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.12970000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.28730000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06560000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.93270000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12970000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.87570000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44800000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.57920000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.21480000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.43850000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.65770000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.43850000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.65770000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.31550000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.87700000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.76370000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.04160000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.14830000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.07550000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.76370000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.04160000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.14830000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.07550000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.31280000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.23000000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.53460000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.11830000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.85970000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.05460000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.29180000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.10500000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.85970000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.05460000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.29180000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.10500000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,2.59700000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.34970000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.72530000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.17090000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.92790000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.05840000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.39380000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.11360000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.92790000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.05840000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.39380000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.11360000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,2.79910000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.38380000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,1.86090000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.18610000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.03960000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06120000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.56110000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.11970000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.03960000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06120000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.56110000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.11970000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,3.13230000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.40800000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.08370000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.19700000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.28730000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.06560000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.93270000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.12970000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.28730000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.06560000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,1.93270000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.12970000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,3.87570000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.44800000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,2.57920000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.21480000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 145f1ecd..bdd1fc84 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
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 0056a57b..44d909ec 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
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44900000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.67350000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34700000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89800000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.75620000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04200000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13690000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07650000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75620000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04200000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13690000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07650000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.28940000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23380000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.51930000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11990000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.85220000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05430000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.28050000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10430000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85220000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05430000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.28050000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10430000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.57400000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34690000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.71020000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.16960000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.91920000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05810000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.38060000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11290000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.91920000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05810000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.38060000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11290000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.77240000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38100000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.84330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18490000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.02690000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06080000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.54200000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.11890000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.02690000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06080000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.54200000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11890000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09380000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40480000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.05820000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.19560000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.30390000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06510000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.95750000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.12860000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30390000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06510000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.95750000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12860000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.92560000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44340000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.61240000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.21280000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.44900000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.67350000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.44900000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.67350000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.34700000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.89800000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.75620000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.04200000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.13690000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.07650000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.75620000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.04200000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.13690000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.07650000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.28940000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.23380000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.51930000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.11990000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.85220000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.05430000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.28050000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.10430000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.85220000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.05430000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.28050000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.10430000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,2.57400000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.34690000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.71020000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.16960000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.91920000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.05810000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.38060000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.11290000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.91920000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.05810000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.38060000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.11290000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,2.77240000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.38100000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,1.84330000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.18490000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.02690000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06080000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.54200000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.11890000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.02690000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06080000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.54200000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.11890000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,3.09380000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.40480000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.05820000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.19560000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.30390000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.06510000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.95750000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.12860000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.30390000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.06510000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,1.95750000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.12860000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,3.92560000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.44340000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,2.61240000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.21280000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 145f1ecd..bdd1fc84 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index 313fcb8f..b62f5b69 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.66080000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.99120000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66080000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99120000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98240000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32160000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.76490000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.05050000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.15000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09550000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76490000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05050000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09550000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.31600000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31000000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.53690000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15380000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.92700000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05460000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.39290000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10510000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.92700000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05460000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.39290000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10510000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.80040000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.35010000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.86050000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.17110000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.99100000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06110000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.48860000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11970000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.99100000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06110000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.48860000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11970000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.98940000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.40820000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.98750000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.19690000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.10050000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06370000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.65260000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.12540000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.10050000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06370000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.65260000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12540000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.31580000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43090000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.20580000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.20710000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.12160000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06810000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.68390000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.13520000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.12160000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06810000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.68390000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13520000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.37670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.47000000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.24720000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.22460000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.66080000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.99120000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.66080000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.99120000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.98240000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,1.32160000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.76490000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.05050000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.15000000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.09550000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.76490000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.05050000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.15000000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.09550000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.31600000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.31000000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.53690000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.15380000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.92700000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.05460000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.39290000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.10510000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.92700000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.05460000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.39290000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.10510000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,2.80040000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.35010000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.86050000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.17110000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.99100000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.06110000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.48860000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.11970000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.99100000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.06110000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.48860000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.11970000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,2.98940000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.40820000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,1.98750000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.19690000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.10050000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06370000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.65260000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.12540000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.10050000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06370000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.65260000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.12540000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,3.31580000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.43090000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.20580000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.20710000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.12160000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.06810000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.68390000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.13520000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.12160000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.06810000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,1.68390000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.13520000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,3.37670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.47000000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,2.24720000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.22460000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 145f1ecd..bdd1fc84 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 2c421efe..ce0017dc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.66080000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.99120000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66080000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.99120000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98240000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32160000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.46760000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.05050000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.70270000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09550000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.46760000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05050000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.70270000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09550000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.41340000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31000000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.93880000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15380000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.54820000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.04280000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.82350000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.07820000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54820000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04280000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82350000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07820000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65440000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24180000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.09970000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.12320000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.57870000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.86900000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08550000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.57870000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.86900000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08550000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.74420000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27070000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.16010000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.13610000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.63150000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94820000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.08820000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63150000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94820000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08820000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90160000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28150000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.26540000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.14090000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63780000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04930000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95740000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09300000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63780000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04930000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95740000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09300000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91920000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30030000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27750000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14930000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.66080000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.99120000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.66080000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.99120000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.98240000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,1.32160000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.46760000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.05050000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.70270000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.09550000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.46760000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.05050000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.70270000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.09550000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,1.41340000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.31000000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.93880000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.15380000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.54820000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.04280000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.82350000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.07820000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.54820000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.04280000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.82350000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.07820000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,1.65440000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.24180000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.09970000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.12320000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.57870000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.04600000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.86900000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.08550000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.57870000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.04600000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.86900000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.08550000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,1.74420000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.27070000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,1.16010000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.13610000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.63150000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.94820000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.08820000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.63150000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.94820000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.08820000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,1.90160000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.28150000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,1.26540000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.14090000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.63780000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.04930000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.95740000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.09300000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.63780000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.04930000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.95740000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.09300000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,1.91920000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.30030000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,1.27750000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.14930000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 145f1ecd..bdd1fc84 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
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 075509a8..bf4111ed 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
@@ -1,337 +1,337 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.44600000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.66900000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.44600000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.66900000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.33800000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89200000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.75430000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.75430000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04190000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.04190000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13400000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.13400000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07620000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.07620000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.75430000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.75430000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04190000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.04190000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13400000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.13400000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07620000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07620000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.28370000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.28370000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23270000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23270000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.51550000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.51550000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.11950000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.11950000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.85060000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.85060000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05420000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.05420000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.27810000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,1.27810000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10410000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.10410000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.85060000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.85060000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05420000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.05420000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27810000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27810000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10410000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.10410000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.56920000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.56920000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34620000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.34620000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.70700000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.70700000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.16930000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.16930000000,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.91780000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.91780000000,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.05810000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.05810000000,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,1.37860000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.37860000000,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.11280000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.11280000000,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.91780000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.91780000000,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.05810000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.05810000000,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,1.37860000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.37860000000,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.11280000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11280000000,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,2.76830000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.76830000000,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.38050000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.38050000000,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.84060000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.84060000000,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.18470000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.18470000000,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,1.02570000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,1.02570000000,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.06080000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.06080000000,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,1.54020000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.54020000000,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.11880000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.11880000000,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,1.02570000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.02570000000,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.06080000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.06080000000,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,1.54020000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.54020000000,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.11880000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.11880000000,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,3.09030000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.09030000000,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.40430000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.40430000000,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,2.05580000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,2.05580000000,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.19530000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.19530000000,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,1.20520000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,1.20520000000,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.06510000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.06510000000,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,1.80940000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.80940000000,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.12850000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.12850000000,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,1.20520000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.20520000000,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.06510000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.06510000000,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,1.80940000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.80940000000,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.12850000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12850000000,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,3.62830000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.62830000000,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.44300000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.44300000000,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,2.41460000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,2.41460000000,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.21260000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.21260000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.44600000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,0.44600000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R2,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.66900000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,0.66900000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R2,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.44600000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,0.44600000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R2,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.66900000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,0.66900000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R2,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.33800000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,1.33800000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R2,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.89200000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,0.89200000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R2,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.75430000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,0.75430000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.04190000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.04190000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.13400000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,1.13400000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.07620000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.07620000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.75430000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,0.75430000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.04190000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.04190000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.13400000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,1.13400000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.07620000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.07620000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.28370000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,2.28370000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.23270000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.23270000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.51550000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,1.51550000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.11950000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.11950000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.85060000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,0.85060000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.05420000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.05420000000,R2,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.27810000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,1.27810000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.10410000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.10410000000,R2,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.85060000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,0.85060000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.05420000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.05420000000,R2,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.27810000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,1.27810000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.10410000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.10410000000,R2,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,2.56920000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,2.56920000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.34620000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.34620000000,R2,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.70700000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,1.70700000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.16930000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.16930000000,R2,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.91780000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,0.91780000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.05810000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.05810000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.37860000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,1.37860000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.11280000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.11280000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.91780000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,0.91780000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.05810000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.05810000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.37860000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,1.37860000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.11280000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.11280000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,2.76830000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,2.76830000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.38050000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.38050000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,1.84060000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,1.84060000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.18470000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.18470000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.02570000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,1.02570000000,R2,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06080000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06080000000,R2,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.54020000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,1.54020000000,R2,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.11880000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.11880000000,R2,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.02570000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,1.02570000000,R2,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06080000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06080000000,R2,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.54020000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,1.54020000000,R2,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.11880000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.11880000000,R2,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,3.09030000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,3.09030000000,R2,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.40430000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.40430000000,R2,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.05580000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,2.05580000000,R2,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.19530000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.19530000000,R2,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.20520000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,1.20520000000,R2,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.06510000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.06510000000,R2,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.80940000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,1.80940000000,R2,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.12850000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.12850000000,R2,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.20520000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,1.20520000000,R2,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.06510000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.06510000000,R2,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,1.80940000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,1.80940000000,R2,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.12850000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.12850000000,R2,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,3.62830000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,3.62830000000,R2,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.44300000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.44300000000,R2,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,2.41460000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,2.41460000000,R2,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.21260000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.21260000000,R2,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 89707c05..a5f4cc36 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 123585bd..b60b6a01 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -1,449 +1,449 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.31330000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.31330000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.78230000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.44750000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.44750000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.11750000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.31330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.31330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.78230000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.44750000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.44750000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.11750000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.93980000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.93980000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.34680000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.34680000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.62660000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.62660000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.56450000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.62660000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.62660000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.56450000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.62660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.62660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.56450000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.54220000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.54220000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.02210000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.02210000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77550000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.77550000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.03710000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.03710000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.54220000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.54220000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02210000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02210000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77550000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77550000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03710000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03710000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.63520000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.63520000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.12040000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.12040000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.08730000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.08730000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.06220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.06220000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.08730000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.08730000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.06220000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.06220000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.08730000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.08730000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.06220000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.06220000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.61380000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.61380000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02870000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.02870000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.87760000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.87760000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.05060000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.05060000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61380000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61380000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02870000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02870000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87760000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87760000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05060000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05060000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84850000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.84850000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.18070000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.18070000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.23000000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.23000000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.08880000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.08880000000,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', 'early-morning')",electricity,R1,1.23000000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23000000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08880000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08880000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23000000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23000000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08880000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08880000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.66410000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.66410000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,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.94930000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.94930000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05480000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05480000000,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', 'mid-afternoon')",electricity,R1,0.66410000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66410000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03070000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03070000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94930000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94930000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05480000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05480000000,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.99830000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.99830000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.19910000000,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.33010000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.33010000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.09700000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.09700000000,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', 'early-morning')",electricity,R1,1.33010000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.33010000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09700000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09700000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.33010000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.33010000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09700000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.74550000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.74550000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03220000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.03220000000,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,1.06560000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.06560000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05770000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05770000000,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', 'mid-afternoon')",electricity,R1,0.74550000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.74550000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03220000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03220000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.06560000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.06560000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05770000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05770000000,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,2.24190000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.24190000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21210000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.21210000000,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.49280000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.49280000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.10280000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.10280000000,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', 'early-morning')",electricity,R1,1.49280000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.49280000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10280000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10280000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.49280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.49280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10280000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.82550000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.82550000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03450000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.03450000000,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,1.17970000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.17970000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.06250000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.06250000000,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', 'mid-afternoon')",electricity,R1,0.82550000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.82550000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03450000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03450000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.17970000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.17970000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06250000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06250000000,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,2.48120000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.48120000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.23320000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.23320000000,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.65250000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.65250000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.11220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.11220000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.65250000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.65250000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11220000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11220000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.65250000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.65250000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11220000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11220000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.31330000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,0.31330000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,0.78230000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,0.78230000000,R2,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.44750000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,0.44750000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.11750000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.11750000000,R2,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
+electricity,all-week,mid-afternoon,all-year,0.31330000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,0.31330000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,0.78230000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,0.78230000000,R2,2,MUS$2010/PJ,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.44750000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,0.44750000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.11750000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.11750000000,R2,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,0.93980000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,0.93980000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,2.34680000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,2.34680000000,R2,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.62660000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,0.62660000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,1.56450000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,1.56450000000,R2,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
+electricity,all-week,early-morning,all-year,0.62660000000,R1,6,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,0.62660000000,R2,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,1.56450000000,R1,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,1.56450000000,R2,6,MUS$2010/PJ,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R2,6,MUS$2010/kt,2025
+electricity,all-week,late-afternoon,all-year,0.62660000000,R1,7,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,0.62660000000,R2,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,1.56450000000,R1,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,1.56450000000,R2,7,MUS$2010/PJ,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R2,7,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.54220000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,0.54220000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.02210000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.02210000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.77550000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,0.77550000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.03710000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.03710000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+electricity,all-week,mid-afternoon,all-year,0.54220000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,0.54220000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,0.02210000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,0.02210000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.77550000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,0.77550000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.03710000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.03710000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,1.63520000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,1.63520000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.12040000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.12040000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.08730000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,1.08730000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.06220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.06220000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+electricity,all-week,early-morning,all-year,1.08730000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,1.08730000000,R2,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,0.06220000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,0.06220000000,R2,6,MUS$2010/PJ,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030
+electricity,all-week,late-afternoon,all-year,1.08730000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,1.08730000000,R2,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,0.06220000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,0.06220000000,R2,7,MUS$2010/PJ,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.61380000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,0.61380000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02870000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02870000000,R2,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.87760000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,0.87760000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.05060000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.05060000000,R2,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
+electricity,all-week,mid-afternoon,all-year,0.61380000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,0.61380000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,0.02870000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,0.02870000000,R2,2,MUS$2010/PJ,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.87760000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,0.87760000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.05060000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.05060000000,R2,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,1.84850000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,1.84850000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.18070000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.18070000000,R2,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.23000000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,1.23000000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.08880000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.08880000000,R2,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
+electricity,all-week,early-morning,all-year,1.23000000000,R1,6,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,1.23000000000,R2,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,0.08880000000,R1,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,0.08880000000,R2,6,MUS$2010/PJ,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R2,6,MUS$2010/kt,2035
+electricity,all-week,late-afternoon,all-year,1.23000000000,R1,7,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,1.23000000000,R2,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,0.08880000000,R1,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,0.08880000000,R2,7,MUS$2010/PJ,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R2,7,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.66410000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,0.66410000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.03070000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.03070000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.94930000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,0.94930000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.05480000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.05480000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+electricity,all-week,mid-afternoon,all-year,0.66410000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,0.66410000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,0.03070000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,0.03070000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.94930000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,0.94930000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.05480000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.05480000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,1.99830000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,1.99830000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.19910000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.19910000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,1.33010000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,1.33010000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.09700000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.09700000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+electricity,all-week,early-morning,all-year,1.33010000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,1.33010000000,R2,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,0.09700000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,0.09700000000,R2,6,MUS$2010/PJ,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040
+electricity,all-week,late-afternoon,all-year,1.33010000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,1.33010000000,R2,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,0.09700000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,0.09700000000,R2,7,MUS$2010/PJ,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.74550000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,0.74550000000,R2,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.03220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.03220000000,R2,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.06560000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,1.06560000000,R2,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.05770000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.05770000000,R2,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
+electricity,all-week,mid-afternoon,all-year,0.74550000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,0.74550000000,R2,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,0.03220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,0.03220000000,R2,2,MUS$2010/PJ,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.06560000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,1.06560000000,R2,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.05770000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.05770000000,R2,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,2.24190000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,2.24190000000,R2,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.21210000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.21210000000,R2,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,1.49280000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,1.49280000000,R2,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.10280000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.10280000000,R2,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
+electricity,all-week,early-morning,all-year,1.49280000000,R1,6,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,1.49280000000,R2,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,0.10280000000,R1,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,0.10280000000,R2,6,MUS$2010/PJ,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R2,6,MUS$2010/kt,2045
+electricity,all-week,late-afternoon,all-year,1.49280000000,R1,7,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,1.49280000000,R2,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,0.10280000000,R1,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,0.10280000000,R2,7,MUS$2010/PJ,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R2,7,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.82550000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,0.82550000000,R2,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.03450000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.03450000000,R2,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.17970000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,1.17970000000,R2,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.06250000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.06250000000,R2,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
+electricity,all-week,mid-afternoon,all-year,0.82550000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,0.82550000000,R2,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,0.03450000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,0.03450000000,R2,2,MUS$2010/PJ,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,1.17970000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,1.17970000000,R2,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.06250000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.06250000000,R2,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,2.48120000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,2.48120000000,R2,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.23320000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.23320000000,R2,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,1.65250000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,1.65250000000,R2,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.11220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.11220000000,R2,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
+electricity,all-week,early-morning,all-year,1.65250000000,R1,6,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,1.65250000000,R2,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,0.11220000000,R1,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,0.11220000000,R2,6,MUS$2010/PJ,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R2,6,MUS$2010/kt,2050
+electricity,all-week,late-afternoon,all-year,1.65250000000,R1,7,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,1.65250000000,R2,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,0.11220000000,R1,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,0.11220000000,R2,7,MUS$2010/PJ,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R2,7,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index 13d0af16..ad68d381 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 97cf6a87..7a82dfa8 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -1,705 +1,705 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44830000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,0.44830000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,0.81010000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,0.81010000000,2022
-"('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64040000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,0.64040000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,1.15730000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,1.15730000000,2022
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44830000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44830000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.81010000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.81010000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64040000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64040000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.15730000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.15730000000,2022
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.34490000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.34490000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.43040000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.43040000000,2022
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,0.89660000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,0.89660000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,1.62020000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,1.62020000000,2022
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.89660000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.89660000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.62020000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.62020000000,2022
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.89660000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.89660000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.62020000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.62020000000,2022
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.39760000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.39760000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,0.17110000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,0.17110000000,2024
-"('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.56880000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.56880000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,0.25050000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,0.25050000000,2024
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.39760000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.39760000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17110000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.56880000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.56880000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.25050000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.25050000000,2024
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.20100000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.20100000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.57240000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.57240000000,2024
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,0.79790000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,0.79790000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,0.36190000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,0.36190000000,2024
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.79790000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.79790000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.36190000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.36190000000,2024
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.79790000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.79790000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.36190000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.36190000000,2024
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.53490000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.53490000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.12510000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.12510000000,2026
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,0.76520000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,0.76520000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.18480000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.18480000000,2026
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.53490000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.53490000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.12510000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.12510000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.76520000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.76520000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18480000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.18480000000,2026
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.61520000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.61520000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.43500000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.43500000000,2026
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,1.07330000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,1.07330000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.27000000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.27000000000,2026
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.07330000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.07330000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.27000000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.27000000000,2026
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.07330000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.07330000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.27000000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.27000000000,2026
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.65860000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.65860000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.07990000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.07990000000,2028
-"('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94210000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,0.94210000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.12300000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.12300000000,2028
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.65860000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.65860000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.07990000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.07990000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94210000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94210000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12300000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.12300000000,2028
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.98770000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.98770000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32690000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.32690000000,2028
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32110000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,1.32110000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.18880000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.18880000000,2028
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.32110000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.32110000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18880000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18880000000,2028
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.32110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.32110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18880000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18880000000,2028
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.77470000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.77470000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03200000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.03200000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.10800000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.10800000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.05740000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.05740000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.77470000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.77470000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03200000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03200000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10800000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.10800000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05740000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05740000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.33690000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.33690000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21120000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.21120000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.55360000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.55360000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.10230000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.10230000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.55360000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.55360000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10230000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10230000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.55360000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.55360000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10230000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10230000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.90700000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,0.90700000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.03540000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.03540000000,2032
-"('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,1.29700000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,1.29700000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.06430000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.06430000000,2032
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.90700000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.90700000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03540000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03540000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.29700000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.29700000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.06430000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.06430000000,2032
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.73420000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.73420000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.24140000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.24140000000,2032
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,1.81840000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,1.81840000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.11570000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.11570000000,2032
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.81840000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.81840000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.11570000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.11570000000,2032
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.81840000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.81840000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.11570000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.11570000000,2032
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,0.95330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,0.95330000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.03920000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.03920000000,2034
-"('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.36310000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.36310000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.07210000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.07210000000,2034
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.95330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.95330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03920000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03920000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.36310000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.36310000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07210000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07210000000,2034
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.87230000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.87230000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27580000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27580000000,2034
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,1.91070000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,1.91070000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.13100000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.13100000000,2034
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.91070000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.91070000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13100000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13100000000,2034
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.91070000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.91070000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13100000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13100000000,2034
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,0.99350000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,0.99350000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.04050000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.04050000000,2036
-"('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,1.42040000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,1.42040000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.07480000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.07480000000,2036
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.99350000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.99350000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04050000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04050000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.42040000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.42040000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07480000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07480000000,2036
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.99200000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.99200000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28780000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28780000000,2036
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,1.99080000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,1.99080000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.13630000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.13630000000,2036
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.99080000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.99080000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13630000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13630000000,2036
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.99080000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.99080000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13630000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13630000000,2036
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,1.02860000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,1.02860000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.04170000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.04170000000,2038
-"('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.47060000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.47060000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.07720000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.07720000000,2038
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.02860000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.02860000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04170000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04170000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47060000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.47060000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07720000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07720000000,2038
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09680000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.09680000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.29820000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.29820000000,2038
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,2.06090000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,2.06090000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.14100000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.14100000000,2038
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.06090000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.06090000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14100000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14100000000,2038
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.06090000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.06090000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14100000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14100000000,2038
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,1.05960000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.05960000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04270000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.04270000000,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,1.51480000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.51480000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.07920000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.07920000000,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', 'mid-afternoon')",electricity,R1,1.05960000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.05960000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04270000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04270000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.51480000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.51480000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07920000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07920000000,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,3.18920000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.18920000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30720000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.30720000000,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,2.12270000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,2.12270000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.14500000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.14500000000,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', 'early-morning')",electricity,R1,2.12270000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.12270000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14500000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14500000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.12270000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.12270000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14500000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14500000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.44830000000,R1,0,MUS$2010/PJ,2022
+electricity,all-week,night,all-year,0.44830000000,R2,0,MUS$2010/PJ,2022
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2022
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2022
+heat,all-week,night,all-year,0.81010000000,R1,0,MUS$2010/PJ,2022
+heat,all-week,night,all-year,0.81010000000,R2,0,MUS$2010/PJ,2022
+CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022
+CO2f,all-week,night,all-year,0.09790000000,R2,0,MUS$2010/kt,2022
+electricity,all-week,morning,all-year,0.64040000000,R1,1,MUS$2010/PJ,2022
+electricity,all-week,morning,all-year,0.64040000000,R2,1,MUS$2010/PJ,2022
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2022
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2022
+heat,all-week,morning,all-year,1.15730000000,R1,1,MUS$2010/PJ,2022
+heat,all-week,morning,all-year,1.15730000000,R2,1,MUS$2010/PJ,2022
+CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022
+CO2f,all-week,morning,all-year,0.09790000000,R2,1,MUS$2010/kt,2022
+electricity,all-week,mid-afternoon,all-year,0.44830000000,R1,2,MUS$2010/PJ,2022
+electricity,all-week,mid-afternoon,all-year,0.44830000000,R2,2,MUS$2010/PJ,2022
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2022
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2022
+heat,all-week,mid-afternoon,all-year,0.81010000000,R1,2,MUS$2010/PJ,2022
+heat,all-week,mid-afternoon,all-year,0.81010000000,R2,2,MUS$2010/PJ,2022
+CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022
+CO2f,all-week,mid-afternoon,all-year,0.09790000000,R2,2,MUS$2010/kt,2022
+electricity,all-week,early-peak,all-year,0.64040000000,R1,3,MUS$2010/PJ,2022
+electricity,all-week,early-peak,all-year,0.64040000000,R2,3,MUS$2010/PJ,2022
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2022
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2022
+heat,all-week,early-peak,all-year,1.15730000000,R1,3,MUS$2010/PJ,2022
+heat,all-week,early-peak,all-year,1.15730000000,R2,3,MUS$2010/PJ,2022
+CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022
+CO2f,all-week,early-peak,all-year,0.09790000000,R2,3,MUS$2010/kt,2022
+electricity,all-week,late-peak,all-year,1.34490000000,R1,4,MUS$2010/PJ,2022
+electricity,all-week,late-peak,all-year,1.34490000000,R2,4,MUS$2010/PJ,2022
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2022
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2022
+heat,all-week,late-peak,all-year,2.43040000000,R1,4,MUS$2010/PJ,2022
+heat,all-week,late-peak,all-year,2.43040000000,R2,4,MUS$2010/PJ,2022
+CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022
+CO2f,all-week,late-peak,all-year,0.09790000000,R2,4,MUS$2010/kt,2022
+electricity,all-week,evening,all-year,0.89660000000,R1,5,MUS$2010/PJ,2022
+electricity,all-week,evening,all-year,0.89660000000,R2,5,MUS$2010/PJ,2022
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2022
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2022
+heat,all-week,evening,all-year,1.62020000000,R1,5,MUS$2010/PJ,2022
+heat,all-week,evening,all-year,1.62020000000,R2,5,MUS$2010/PJ,2022
+CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022
+CO2f,all-week,evening,all-year,0.09790000000,R2,5,MUS$2010/kt,2022
+electricity,all-week,early-morning,all-year,0.89660000000,R1,6,MUS$2010/PJ,2022
+electricity,all-week,early-morning,all-year,0.89660000000,R2,6,MUS$2010/PJ,2022
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2022
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2022
+heat,all-week,early-morning,all-year,1.62020000000,R1,6,MUS$2010/PJ,2022
+heat,all-week,early-morning,all-year,1.62020000000,R2,6,MUS$2010/PJ,2022
+CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022
+CO2f,all-week,early-morning,all-year,0.09790000000,R2,6,MUS$2010/kt,2022
+electricity,all-week,late-afternoon,all-year,0.89660000000,R1,7,MUS$2010/PJ,2022
+electricity,all-week,late-afternoon,all-year,0.89660000000,R2,7,MUS$2010/PJ,2022
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2022
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2022
+heat,all-week,late-afternoon,all-year,1.62020000000,R1,7,MUS$2010/PJ,2022
+heat,all-week,late-afternoon,all-year,1.62020000000,R2,7,MUS$2010/PJ,2022
+CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022
+CO2f,all-week,late-afternoon,all-year,0.09790000000,R2,7,MUS$2010/kt,2022
+electricity,all-week,night,all-year,0.39760000000,R1,0,MUS$2010/PJ,2024
+electricity,all-week,night,all-year,0.39760000000,R2,0,MUS$2010/PJ,2024
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2024
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2024
+heat,all-week,night,all-year,0.17110000000,R1,0,MUS$2010/PJ,2024
+heat,all-week,night,all-year,0.17110000000,R2,0,MUS$2010/PJ,2024
+CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024
+CO2f,all-week,night,all-year,0.11270000000,R2,0,MUS$2010/kt,2024
+electricity,all-week,morning,all-year,0.56880000000,R1,1,MUS$2010/PJ,2024
+electricity,all-week,morning,all-year,0.56880000000,R2,1,MUS$2010/PJ,2024
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2024
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2024
+heat,all-week,morning,all-year,0.25050000000,R1,1,MUS$2010/PJ,2024
+heat,all-week,morning,all-year,0.25050000000,R2,1,MUS$2010/PJ,2024
+CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024
+CO2f,all-week,morning,all-year,0.11270000000,R2,1,MUS$2010/kt,2024
+electricity,all-week,mid-afternoon,all-year,0.39760000000,R1,2,MUS$2010/PJ,2024
+electricity,all-week,mid-afternoon,all-year,0.39760000000,R2,2,MUS$2010/PJ,2024
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2024
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2024
+heat,all-week,mid-afternoon,all-year,0.17110000000,R1,2,MUS$2010/PJ,2024
+heat,all-week,mid-afternoon,all-year,0.17110000000,R2,2,MUS$2010/PJ,2024
+CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024
+CO2f,all-week,mid-afternoon,all-year,0.11270000000,R2,2,MUS$2010/kt,2024
+electricity,all-week,early-peak,all-year,0.56880000000,R1,3,MUS$2010/PJ,2024
+electricity,all-week,early-peak,all-year,0.56880000000,R2,3,MUS$2010/PJ,2024
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2024
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2024
+heat,all-week,early-peak,all-year,0.25050000000,R1,3,MUS$2010/PJ,2024
+heat,all-week,early-peak,all-year,0.25050000000,R2,3,MUS$2010/PJ,2024
+CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024
+CO2f,all-week,early-peak,all-year,0.11270000000,R2,3,MUS$2010/kt,2024
+electricity,all-week,late-peak,all-year,1.20100000000,R1,4,MUS$2010/PJ,2024
+electricity,all-week,late-peak,all-year,1.20100000000,R2,4,MUS$2010/PJ,2024
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2024
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2024
+heat,all-week,late-peak,all-year,0.57240000000,R1,4,MUS$2010/PJ,2024
+heat,all-week,late-peak,all-year,0.57240000000,R2,4,MUS$2010/PJ,2024
+CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024
+CO2f,all-week,late-peak,all-year,0.11270000000,R2,4,MUS$2010/kt,2024
+electricity,all-week,evening,all-year,0.79790000000,R1,5,MUS$2010/PJ,2024
+electricity,all-week,evening,all-year,0.79790000000,R2,5,MUS$2010/PJ,2024
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2024
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2024
+heat,all-week,evening,all-year,0.36190000000,R1,5,MUS$2010/PJ,2024
+heat,all-week,evening,all-year,0.36190000000,R2,5,MUS$2010/PJ,2024
+CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024
+CO2f,all-week,evening,all-year,0.11270000000,R2,5,MUS$2010/kt,2024
+electricity,all-week,early-morning,all-year,0.79790000000,R1,6,MUS$2010/PJ,2024
+electricity,all-week,early-morning,all-year,0.79790000000,R2,6,MUS$2010/PJ,2024
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2024
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2024
+heat,all-week,early-morning,all-year,0.36190000000,R1,6,MUS$2010/PJ,2024
+heat,all-week,early-morning,all-year,0.36190000000,R2,6,MUS$2010/PJ,2024
+CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024
+CO2f,all-week,early-morning,all-year,0.11270000000,R2,6,MUS$2010/kt,2024
+electricity,all-week,late-afternoon,all-year,0.79790000000,R1,7,MUS$2010/PJ,2024
+electricity,all-week,late-afternoon,all-year,0.79790000000,R2,7,MUS$2010/PJ,2024
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2024
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2024
+heat,all-week,late-afternoon,all-year,0.36190000000,R1,7,MUS$2010/PJ,2024
+heat,all-week,late-afternoon,all-year,0.36190000000,R2,7,MUS$2010/PJ,2024
+CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024
+CO2f,all-week,late-afternoon,all-year,0.11270000000,R2,7,MUS$2010/kt,2024
+electricity,all-week,night,all-year,0.53490000000,R1,0,MUS$2010/PJ,2026
+electricity,all-week,night,all-year,0.53490000000,R2,0,MUS$2010/PJ,2026
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2026
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2026
+heat,all-week,night,all-year,0.12510000000,R1,0,MUS$2010/PJ,2026
+heat,all-week,night,all-year,0.12510000000,R2,0,MUS$2010/PJ,2026
+CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026
+CO2f,all-week,night,all-year,0.12750000000,R2,0,MUS$2010/kt,2026
+electricity,all-week,morning,all-year,0.76520000000,R1,1,MUS$2010/PJ,2026
+electricity,all-week,morning,all-year,0.76520000000,R2,1,MUS$2010/PJ,2026
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2026
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2026
+heat,all-week,morning,all-year,0.18480000000,R1,1,MUS$2010/PJ,2026
+heat,all-week,morning,all-year,0.18480000000,R2,1,MUS$2010/PJ,2026
+CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026
+CO2f,all-week,morning,all-year,0.12750000000,R2,1,MUS$2010/kt,2026
+electricity,all-week,mid-afternoon,all-year,0.53490000000,R1,2,MUS$2010/PJ,2026
+electricity,all-week,mid-afternoon,all-year,0.53490000000,R2,2,MUS$2010/PJ,2026
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2026
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2026
+heat,all-week,mid-afternoon,all-year,0.12510000000,R1,2,MUS$2010/PJ,2026
+heat,all-week,mid-afternoon,all-year,0.12510000000,R2,2,MUS$2010/PJ,2026
+CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026
+CO2f,all-week,mid-afternoon,all-year,0.12750000000,R2,2,MUS$2010/kt,2026
+electricity,all-week,early-peak,all-year,0.76520000000,R1,3,MUS$2010/PJ,2026
+electricity,all-week,early-peak,all-year,0.76520000000,R2,3,MUS$2010/PJ,2026
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2026
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2026
+heat,all-week,early-peak,all-year,0.18480000000,R1,3,MUS$2010/PJ,2026
+heat,all-week,early-peak,all-year,0.18480000000,R2,3,MUS$2010/PJ,2026
+CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026
+CO2f,all-week,early-peak,all-year,0.12750000000,R2,3,MUS$2010/kt,2026
+electricity,all-week,late-peak,all-year,1.61520000000,R1,4,MUS$2010/PJ,2026
+electricity,all-week,late-peak,all-year,1.61520000000,R2,4,MUS$2010/PJ,2026
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2026
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2026
+heat,all-week,late-peak,all-year,0.43500000000,R1,4,MUS$2010/PJ,2026
+heat,all-week,late-peak,all-year,0.43500000000,R2,4,MUS$2010/PJ,2026
+CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026
+CO2f,all-week,late-peak,all-year,0.12750000000,R2,4,MUS$2010/kt,2026
+electricity,all-week,evening,all-year,1.07330000000,R1,5,MUS$2010/PJ,2026
+electricity,all-week,evening,all-year,1.07330000000,R2,5,MUS$2010/PJ,2026
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2026
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2026
+heat,all-week,evening,all-year,0.27000000000,R1,5,MUS$2010/PJ,2026
+heat,all-week,evening,all-year,0.27000000000,R2,5,MUS$2010/PJ,2026
+CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026
+CO2f,all-week,evening,all-year,0.12750000000,R2,5,MUS$2010/kt,2026
+electricity,all-week,early-morning,all-year,1.07330000000,R1,6,MUS$2010/PJ,2026
+electricity,all-week,early-morning,all-year,1.07330000000,R2,6,MUS$2010/PJ,2026
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2026
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2026
+heat,all-week,early-morning,all-year,0.27000000000,R1,6,MUS$2010/PJ,2026
+heat,all-week,early-morning,all-year,0.27000000000,R2,6,MUS$2010/PJ,2026
+CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026
+CO2f,all-week,early-morning,all-year,0.12750000000,R2,6,MUS$2010/kt,2026
+electricity,all-week,late-afternoon,all-year,1.07330000000,R1,7,MUS$2010/PJ,2026
+electricity,all-week,late-afternoon,all-year,1.07330000000,R2,7,MUS$2010/PJ,2026
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2026
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2026
+heat,all-week,late-afternoon,all-year,0.27000000000,R1,7,MUS$2010/PJ,2026
+heat,all-week,late-afternoon,all-year,0.27000000000,R2,7,MUS$2010/PJ,2026
+CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026
+CO2f,all-week,late-afternoon,all-year,0.12750000000,R2,7,MUS$2010/kt,2026
+electricity,all-week,night,all-year,0.65860000000,R1,0,MUS$2010/PJ,2028
+electricity,all-week,night,all-year,0.65860000000,R2,0,MUS$2010/PJ,2028
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2028
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2028
+heat,all-week,night,all-year,0.07990000000,R1,0,MUS$2010/PJ,2028
+heat,all-week,night,all-year,0.07990000000,R2,0,MUS$2010/PJ,2028
+CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028
+CO2f,all-week,night,all-year,0.14220000000,R2,0,MUS$2010/kt,2028
+electricity,all-week,morning,all-year,0.94210000000,R1,1,MUS$2010/PJ,2028
+electricity,all-week,morning,all-year,0.94210000000,R2,1,MUS$2010/PJ,2028
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2028
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2028
+heat,all-week,morning,all-year,0.12300000000,R1,1,MUS$2010/PJ,2028
+heat,all-week,morning,all-year,0.12300000000,R2,1,MUS$2010/PJ,2028
+CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028
+CO2f,all-week,morning,all-year,0.14220000000,R2,1,MUS$2010/kt,2028
+electricity,all-week,mid-afternoon,all-year,0.65860000000,R1,2,MUS$2010/PJ,2028
+electricity,all-week,mid-afternoon,all-year,0.65860000000,R2,2,MUS$2010/PJ,2028
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2028
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2028
+heat,all-week,mid-afternoon,all-year,0.07990000000,R1,2,MUS$2010/PJ,2028
+heat,all-week,mid-afternoon,all-year,0.07990000000,R2,2,MUS$2010/PJ,2028
+CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028
+CO2f,all-week,mid-afternoon,all-year,0.14220000000,R2,2,MUS$2010/kt,2028
+electricity,all-week,early-peak,all-year,0.94210000000,R1,3,MUS$2010/PJ,2028
+electricity,all-week,early-peak,all-year,0.94210000000,R2,3,MUS$2010/PJ,2028
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2028
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2028
+heat,all-week,early-peak,all-year,0.12300000000,R1,3,MUS$2010/PJ,2028
+heat,all-week,early-peak,all-year,0.12300000000,R2,3,MUS$2010/PJ,2028
+CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028
+CO2f,all-week,early-peak,all-year,0.14220000000,R2,3,MUS$2010/kt,2028
+electricity,all-week,late-peak,all-year,1.98770000000,R1,4,MUS$2010/PJ,2028
+electricity,all-week,late-peak,all-year,1.98770000000,R2,4,MUS$2010/PJ,2028
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2028
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2028
+heat,all-week,late-peak,all-year,0.32690000000,R1,4,MUS$2010/PJ,2028
+heat,all-week,late-peak,all-year,0.32690000000,R2,4,MUS$2010/PJ,2028
+CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028
+CO2f,all-week,late-peak,all-year,0.14220000000,R2,4,MUS$2010/kt,2028
+electricity,all-week,evening,all-year,1.32110000000,R1,5,MUS$2010/PJ,2028
+electricity,all-week,evening,all-year,1.32110000000,R2,5,MUS$2010/PJ,2028
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2028
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2028
+heat,all-week,evening,all-year,0.18880000000,R1,5,MUS$2010/PJ,2028
+heat,all-week,evening,all-year,0.18880000000,R2,5,MUS$2010/PJ,2028
+CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028
+CO2f,all-week,evening,all-year,0.14220000000,R2,5,MUS$2010/kt,2028
+electricity,all-week,early-morning,all-year,1.32110000000,R1,6,MUS$2010/PJ,2028
+electricity,all-week,early-morning,all-year,1.32110000000,R2,6,MUS$2010/PJ,2028
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2028
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2028
+heat,all-week,early-morning,all-year,0.18880000000,R1,6,MUS$2010/PJ,2028
+heat,all-week,early-morning,all-year,0.18880000000,R2,6,MUS$2010/PJ,2028
+CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028
+CO2f,all-week,early-morning,all-year,0.14220000000,R2,6,MUS$2010/kt,2028
+electricity,all-week,late-afternoon,all-year,1.32110000000,R1,7,MUS$2010/PJ,2028
+electricity,all-week,late-afternoon,all-year,1.32110000000,R2,7,MUS$2010/PJ,2028
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2028
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2028
+heat,all-week,late-afternoon,all-year,0.18880000000,R1,7,MUS$2010/PJ,2028
+heat,all-week,late-afternoon,all-year,0.18880000000,R2,7,MUS$2010/PJ,2028
+CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028
+CO2f,all-week,late-afternoon,all-year,0.14220000000,R2,7,MUS$2010/kt,2028
+electricity,all-week,night,all-year,0.77470000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,0.77470000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.03200000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.03200000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.10800000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,1.10800000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.05740000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.05740000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+electricity,all-week,mid-afternoon,all-year,0.77470000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,0.77470000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,0.03200000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,0.03200000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.10800000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,1.10800000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.05740000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.05740000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.33690000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,2.33690000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.21120000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.21120000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.55360000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,1.55360000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.10230000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.10230000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+electricity,all-week,early-morning,all-year,1.55360000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,1.55360000000,R2,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,0.10230000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,0.10230000000,R2,6,MUS$2010/PJ,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030
+electricity,all-week,late-afternoon,all-year,1.55360000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,1.55360000000,R2,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,0.10230000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,0.10230000000,R2,7,MUS$2010/PJ,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.90700000000,R1,0,MUS$2010/PJ,2032
+electricity,all-week,night,all-year,0.90700000000,R2,0,MUS$2010/PJ,2032
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2032
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2032
+heat,all-week,night,all-year,0.03540000000,R1,0,MUS$2010/PJ,2032
+heat,all-week,night,all-year,0.03540000000,R2,0,MUS$2010/PJ,2032
+CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032
+CO2f,all-week,night,all-year,0.18020000000,R2,0,MUS$2010/kt,2032
+electricity,all-week,morning,all-year,1.29700000000,R1,1,MUS$2010/PJ,2032
+electricity,all-week,morning,all-year,1.29700000000,R2,1,MUS$2010/PJ,2032
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2032
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2032
+heat,all-week,morning,all-year,0.06430000000,R1,1,MUS$2010/PJ,2032
+heat,all-week,morning,all-year,0.06430000000,R2,1,MUS$2010/PJ,2032
+CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032
+CO2f,all-week,morning,all-year,0.18020000000,R2,1,MUS$2010/kt,2032
+electricity,all-week,mid-afternoon,all-year,0.90700000000,R1,2,MUS$2010/PJ,2032
+electricity,all-week,mid-afternoon,all-year,0.90700000000,R2,2,MUS$2010/PJ,2032
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2032
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2032
+heat,all-week,mid-afternoon,all-year,0.03540000000,R1,2,MUS$2010/PJ,2032
+heat,all-week,mid-afternoon,all-year,0.03540000000,R2,2,MUS$2010/PJ,2032
+CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032
+CO2f,all-week,mid-afternoon,all-year,0.18020000000,R2,2,MUS$2010/kt,2032
+electricity,all-week,early-peak,all-year,1.29700000000,R1,3,MUS$2010/PJ,2032
+electricity,all-week,early-peak,all-year,1.29700000000,R2,3,MUS$2010/PJ,2032
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2032
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2032
+heat,all-week,early-peak,all-year,0.06430000000,R1,3,MUS$2010/PJ,2032
+heat,all-week,early-peak,all-year,0.06430000000,R2,3,MUS$2010/PJ,2032
+CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032
+CO2f,all-week,early-peak,all-year,0.18020000000,R2,3,MUS$2010/kt,2032
+electricity,all-week,late-peak,all-year,2.73420000000,R1,4,MUS$2010/PJ,2032
+electricity,all-week,late-peak,all-year,2.73420000000,R2,4,MUS$2010/PJ,2032
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2032
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2032
+heat,all-week,late-peak,all-year,0.24140000000,R1,4,MUS$2010/PJ,2032
+heat,all-week,late-peak,all-year,0.24140000000,R2,4,MUS$2010/PJ,2032
+CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032
+CO2f,all-week,late-peak,all-year,0.18020000000,R2,4,MUS$2010/kt,2032
+electricity,all-week,evening,all-year,1.81840000000,R1,5,MUS$2010/PJ,2032
+electricity,all-week,evening,all-year,1.81840000000,R2,5,MUS$2010/PJ,2032
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2032
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2032
+heat,all-week,evening,all-year,0.11570000000,R1,5,MUS$2010/PJ,2032
+heat,all-week,evening,all-year,0.11570000000,R2,5,MUS$2010/PJ,2032
+CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032
+CO2f,all-week,evening,all-year,0.18020000000,R2,5,MUS$2010/kt,2032
+electricity,all-week,early-morning,all-year,1.81840000000,R1,6,MUS$2010/PJ,2032
+electricity,all-week,early-morning,all-year,1.81840000000,R2,6,MUS$2010/PJ,2032
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2032
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2032
+heat,all-week,early-morning,all-year,0.11570000000,R1,6,MUS$2010/PJ,2032
+heat,all-week,early-morning,all-year,0.11570000000,R2,6,MUS$2010/PJ,2032
+CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032
+CO2f,all-week,early-morning,all-year,0.18020000000,R2,6,MUS$2010/kt,2032
+electricity,all-week,late-afternoon,all-year,1.81840000000,R1,7,MUS$2010/PJ,2032
+electricity,all-week,late-afternoon,all-year,1.81840000000,R2,7,MUS$2010/PJ,2032
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2032
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2032
+heat,all-week,late-afternoon,all-year,0.11570000000,R1,7,MUS$2010/PJ,2032
+heat,all-week,late-afternoon,all-year,0.11570000000,R2,7,MUS$2010/PJ,2032
+CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032
+CO2f,all-week,late-afternoon,all-year,0.18020000000,R2,7,MUS$2010/kt,2032
+electricity,all-week,night,all-year,0.95330000000,R1,0,MUS$2010/PJ,2034
+electricity,all-week,night,all-year,0.95330000000,R2,0,MUS$2010/PJ,2034
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2034
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2034
+heat,all-week,night,all-year,0.03920000000,R1,0,MUS$2010/PJ,2034
+heat,all-week,night,all-year,0.03920000000,R2,0,MUS$2010/PJ,2034
+CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034
+CO2f,all-week,night,all-year,0.20330000000,R2,0,MUS$2010/kt,2034
+electricity,all-week,morning,all-year,1.36310000000,R1,1,MUS$2010/PJ,2034
+electricity,all-week,morning,all-year,1.36310000000,R2,1,MUS$2010/PJ,2034
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2034
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2034
+heat,all-week,morning,all-year,0.07210000000,R1,1,MUS$2010/PJ,2034
+heat,all-week,morning,all-year,0.07210000000,R2,1,MUS$2010/PJ,2034
+CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034
+CO2f,all-week,morning,all-year,0.20330000000,R2,1,MUS$2010/kt,2034
+electricity,all-week,mid-afternoon,all-year,0.95330000000,R1,2,MUS$2010/PJ,2034
+electricity,all-week,mid-afternoon,all-year,0.95330000000,R2,2,MUS$2010/PJ,2034
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2034
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2034
+heat,all-week,mid-afternoon,all-year,0.03920000000,R1,2,MUS$2010/PJ,2034
+heat,all-week,mid-afternoon,all-year,0.03920000000,R2,2,MUS$2010/PJ,2034
+CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034
+CO2f,all-week,mid-afternoon,all-year,0.20330000000,R2,2,MUS$2010/kt,2034
+electricity,all-week,early-peak,all-year,1.36310000000,R1,3,MUS$2010/PJ,2034
+electricity,all-week,early-peak,all-year,1.36310000000,R2,3,MUS$2010/PJ,2034
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2034
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2034
+heat,all-week,early-peak,all-year,0.07210000000,R1,3,MUS$2010/PJ,2034
+heat,all-week,early-peak,all-year,0.07210000000,R2,3,MUS$2010/PJ,2034
+CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034
+CO2f,all-week,early-peak,all-year,0.20330000000,R2,3,MUS$2010/kt,2034
+electricity,all-week,late-peak,all-year,2.87230000000,R1,4,MUS$2010/PJ,2034
+electricity,all-week,late-peak,all-year,2.87230000000,R2,4,MUS$2010/PJ,2034
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2034
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2034
+heat,all-week,late-peak,all-year,0.27580000000,R1,4,MUS$2010/PJ,2034
+heat,all-week,late-peak,all-year,0.27580000000,R2,4,MUS$2010/PJ,2034
+CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034
+CO2f,all-week,late-peak,all-year,0.20330000000,R2,4,MUS$2010/kt,2034
+electricity,all-week,evening,all-year,1.91070000000,R1,5,MUS$2010/PJ,2034
+electricity,all-week,evening,all-year,1.91070000000,R2,5,MUS$2010/PJ,2034
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2034
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2034
+heat,all-week,evening,all-year,0.13100000000,R1,5,MUS$2010/PJ,2034
+heat,all-week,evening,all-year,0.13100000000,R2,5,MUS$2010/PJ,2034
+CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034
+CO2f,all-week,evening,all-year,0.20330000000,R2,5,MUS$2010/kt,2034
+electricity,all-week,early-morning,all-year,1.91070000000,R1,6,MUS$2010/PJ,2034
+electricity,all-week,early-morning,all-year,1.91070000000,R2,6,MUS$2010/PJ,2034
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2034
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2034
+heat,all-week,early-morning,all-year,0.13100000000,R1,6,MUS$2010/PJ,2034
+heat,all-week,early-morning,all-year,0.13100000000,R2,6,MUS$2010/PJ,2034
+CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034
+CO2f,all-week,early-morning,all-year,0.20330000000,R2,6,MUS$2010/kt,2034
+electricity,all-week,late-afternoon,all-year,1.91070000000,R1,7,MUS$2010/PJ,2034
+electricity,all-week,late-afternoon,all-year,1.91070000000,R2,7,MUS$2010/PJ,2034
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2034
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2034
+heat,all-week,late-afternoon,all-year,0.13100000000,R1,7,MUS$2010/PJ,2034
+heat,all-week,late-afternoon,all-year,0.13100000000,R2,7,MUS$2010/PJ,2034
+CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034
+CO2f,all-week,late-afternoon,all-year,0.20330000000,R2,7,MUS$2010/kt,2034
+electricity,all-week,night,all-year,0.99350000000,R1,0,MUS$2010/PJ,2036
+electricity,all-week,night,all-year,0.99350000000,R2,0,MUS$2010/PJ,2036
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2036
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2036
+heat,all-week,night,all-year,0.04050000000,R1,0,MUS$2010/PJ,2036
+heat,all-week,night,all-year,0.04050000000,R2,0,MUS$2010/PJ,2036
+CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036
+CO2f,all-week,night,all-year,0.22650000000,R2,0,MUS$2010/kt,2036
+electricity,all-week,morning,all-year,1.42040000000,R1,1,MUS$2010/PJ,2036
+electricity,all-week,morning,all-year,1.42040000000,R2,1,MUS$2010/PJ,2036
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2036
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2036
+heat,all-week,morning,all-year,0.07480000000,R1,1,MUS$2010/PJ,2036
+heat,all-week,morning,all-year,0.07480000000,R2,1,MUS$2010/PJ,2036
+CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036
+CO2f,all-week,morning,all-year,0.22650000000,R2,1,MUS$2010/kt,2036
+electricity,all-week,mid-afternoon,all-year,0.99350000000,R1,2,MUS$2010/PJ,2036
+electricity,all-week,mid-afternoon,all-year,0.99350000000,R2,2,MUS$2010/PJ,2036
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2036
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2036
+heat,all-week,mid-afternoon,all-year,0.04050000000,R1,2,MUS$2010/PJ,2036
+heat,all-week,mid-afternoon,all-year,0.04050000000,R2,2,MUS$2010/PJ,2036
+CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036
+CO2f,all-week,mid-afternoon,all-year,0.22650000000,R2,2,MUS$2010/kt,2036
+electricity,all-week,early-peak,all-year,1.42040000000,R1,3,MUS$2010/PJ,2036
+electricity,all-week,early-peak,all-year,1.42040000000,R2,3,MUS$2010/PJ,2036
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2036
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2036
+heat,all-week,early-peak,all-year,0.07480000000,R1,3,MUS$2010/PJ,2036
+heat,all-week,early-peak,all-year,0.07480000000,R2,3,MUS$2010/PJ,2036
+CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036
+CO2f,all-week,early-peak,all-year,0.22650000000,R2,3,MUS$2010/kt,2036
+electricity,all-week,late-peak,all-year,2.99200000000,R1,4,MUS$2010/PJ,2036
+electricity,all-week,late-peak,all-year,2.99200000000,R2,4,MUS$2010/PJ,2036
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2036
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2036
+heat,all-week,late-peak,all-year,0.28780000000,R1,4,MUS$2010/PJ,2036
+heat,all-week,late-peak,all-year,0.28780000000,R2,4,MUS$2010/PJ,2036
+CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036
+CO2f,all-week,late-peak,all-year,0.22650000000,R2,4,MUS$2010/kt,2036
+electricity,all-week,evening,all-year,1.99080000000,R1,5,MUS$2010/PJ,2036
+electricity,all-week,evening,all-year,1.99080000000,R2,5,MUS$2010/PJ,2036
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2036
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2036
+heat,all-week,evening,all-year,0.13630000000,R1,5,MUS$2010/PJ,2036
+heat,all-week,evening,all-year,0.13630000000,R2,5,MUS$2010/PJ,2036
+CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036
+CO2f,all-week,evening,all-year,0.22650000000,R2,5,MUS$2010/kt,2036
+electricity,all-week,early-morning,all-year,1.99080000000,R1,6,MUS$2010/PJ,2036
+electricity,all-week,early-morning,all-year,1.99080000000,R2,6,MUS$2010/PJ,2036
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2036
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2036
+heat,all-week,early-morning,all-year,0.13630000000,R1,6,MUS$2010/PJ,2036
+heat,all-week,early-morning,all-year,0.13630000000,R2,6,MUS$2010/PJ,2036
+CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036
+CO2f,all-week,early-morning,all-year,0.22650000000,R2,6,MUS$2010/kt,2036
+electricity,all-week,late-afternoon,all-year,1.99080000000,R1,7,MUS$2010/PJ,2036
+electricity,all-week,late-afternoon,all-year,1.99080000000,R2,7,MUS$2010/PJ,2036
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2036
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2036
+heat,all-week,late-afternoon,all-year,0.13630000000,R1,7,MUS$2010/PJ,2036
+heat,all-week,late-afternoon,all-year,0.13630000000,R2,7,MUS$2010/PJ,2036
+CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036
+CO2f,all-week,late-afternoon,all-year,0.22650000000,R2,7,MUS$2010/kt,2036
+electricity,all-week,night,all-year,1.02860000000,R1,0,MUS$2010/PJ,2038
+electricity,all-week,night,all-year,1.02860000000,R2,0,MUS$2010/PJ,2038
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2038
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2038
+heat,all-week,night,all-year,0.04170000000,R1,0,MUS$2010/PJ,2038
+heat,all-week,night,all-year,0.04170000000,R2,0,MUS$2010/PJ,2038
+CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038
+CO2f,all-week,night,all-year,0.24960000000,R2,0,MUS$2010/kt,2038
+electricity,all-week,morning,all-year,1.47060000000,R1,1,MUS$2010/PJ,2038
+electricity,all-week,morning,all-year,1.47060000000,R2,1,MUS$2010/PJ,2038
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2038
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2038
+heat,all-week,morning,all-year,0.07720000000,R1,1,MUS$2010/PJ,2038
+heat,all-week,morning,all-year,0.07720000000,R2,1,MUS$2010/PJ,2038
+CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038
+CO2f,all-week,morning,all-year,0.24960000000,R2,1,MUS$2010/kt,2038
+electricity,all-week,mid-afternoon,all-year,1.02860000000,R1,2,MUS$2010/PJ,2038
+electricity,all-week,mid-afternoon,all-year,1.02860000000,R2,2,MUS$2010/PJ,2038
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2038
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2038
+heat,all-week,mid-afternoon,all-year,0.04170000000,R1,2,MUS$2010/PJ,2038
+heat,all-week,mid-afternoon,all-year,0.04170000000,R2,2,MUS$2010/PJ,2038
+CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038
+CO2f,all-week,mid-afternoon,all-year,0.24960000000,R2,2,MUS$2010/kt,2038
+electricity,all-week,early-peak,all-year,1.47060000000,R1,3,MUS$2010/PJ,2038
+electricity,all-week,early-peak,all-year,1.47060000000,R2,3,MUS$2010/PJ,2038
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2038
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2038
+heat,all-week,early-peak,all-year,0.07720000000,R1,3,MUS$2010/PJ,2038
+heat,all-week,early-peak,all-year,0.07720000000,R2,3,MUS$2010/PJ,2038
+CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038
+CO2f,all-week,early-peak,all-year,0.24960000000,R2,3,MUS$2010/kt,2038
+electricity,all-week,late-peak,all-year,3.09680000000,R1,4,MUS$2010/PJ,2038
+electricity,all-week,late-peak,all-year,3.09680000000,R2,4,MUS$2010/PJ,2038
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2038
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2038
+heat,all-week,late-peak,all-year,0.29820000000,R1,4,MUS$2010/PJ,2038
+heat,all-week,late-peak,all-year,0.29820000000,R2,4,MUS$2010/PJ,2038
+CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038
+CO2f,all-week,late-peak,all-year,0.24960000000,R2,4,MUS$2010/kt,2038
+electricity,all-week,evening,all-year,2.06090000000,R1,5,MUS$2010/PJ,2038
+electricity,all-week,evening,all-year,2.06090000000,R2,5,MUS$2010/PJ,2038
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2038
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2038
+heat,all-week,evening,all-year,0.14100000000,R1,5,MUS$2010/PJ,2038
+heat,all-week,evening,all-year,0.14100000000,R2,5,MUS$2010/PJ,2038
+CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038
+CO2f,all-week,evening,all-year,0.24960000000,R2,5,MUS$2010/kt,2038
+electricity,all-week,early-morning,all-year,2.06090000000,R1,6,MUS$2010/PJ,2038
+electricity,all-week,early-morning,all-year,2.06090000000,R2,6,MUS$2010/PJ,2038
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2038
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2038
+heat,all-week,early-morning,all-year,0.14100000000,R1,6,MUS$2010/PJ,2038
+heat,all-week,early-morning,all-year,0.14100000000,R2,6,MUS$2010/PJ,2038
+CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038
+CO2f,all-week,early-morning,all-year,0.24960000000,R2,6,MUS$2010/kt,2038
+electricity,all-week,late-afternoon,all-year,2.06090000000,R1,7,MUS$2010/PJ,2038
+electricity,all-week,late-afternoon,all-year,2.06090000000,R2,7,MUS$2010/PJ,2038
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2038
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2038
+heat,all-week,late-afternoon,all-year,0.14100000000,R1,7,MUS$2010/PJ,2038
+heat,all-week,late-afternoon,all-year,0.14100000000,R2,7,MUS$2010/PJ,2038
+CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038
+CO2f,all-week,late-afternoon,all-year,0.24960000000,R2,7,MUS$2010/kt,2038
+electricity,all-week,night,all-year,1.05960000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,1.05960000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.04270000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.04270000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.51480000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,1.51480000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.07920000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.07920000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+electricity,all-week,mid-afternoon,all-year,1.05960000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,1.05960000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,0.04270000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,0.04270000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.51480000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,1.51480000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.07920000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.07920000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,3.18920000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,3.18920000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.30720000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.30720000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,2.12270000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,2.12270000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.14500000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.14500000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+electricity,all-week,early-morning,all-year,2.12270000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,2.12270000000,R2,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,0.14500000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,0.14500000000,R2,6,MUS$2010/PJ,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040
+electricity,all-week,late-afternoon,all-year,2.12270000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,2.12270000000,R2,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,0.14500000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,0.14500000000,R2,7,MUS$2010/PJ,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index 7204788a..d9fc5065 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index 01a32a81..7662bd60 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -1,561 +1,561 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.20270000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.20270000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.78230000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.75330000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,0.75330000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.28960000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.28960000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,1.11750000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.07610000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,1.07610000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.20270000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.20270000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.78230000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.78230000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.75330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.75330000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.28960000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.28960000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.11750000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,1.11750000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.07610000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,1.07610000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.60810000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,0.60810000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.34680000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,2.34680000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.25990000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,2.25990000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.40540000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,0.40540000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,1.56450000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.50660000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,1.50660000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.40540000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.40540000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,1.56450000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,1.50660000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,1.50660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.40540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.40540000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,1.56450000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,1.56450000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,1.50660000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,1.50660000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.50320000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.50320000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.01890000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.01890000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.01890000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.01890000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.71960000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,0.71960000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.03050000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.03050000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.03050000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.03050000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.50320000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.50320000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.01890000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.01890000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.01890000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.01890000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.71960000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.71960000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.03050000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.03050000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.03050000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.03050000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.51730000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.51730000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.09170000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.09170000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.09170000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.00890000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.00890000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.04940000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.04940000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.04940000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.00890000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.00890000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.04940000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.00890000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.00890000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.04940000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.04940000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.56840000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.56840000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02750000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.02750000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.02750000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.02750000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.81270000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,0.81270000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04830000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.04830000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.04830000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.04830000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.56840000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.56840000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02750000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02750000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02750000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02750000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81270000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.81270000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04830000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.04830000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04830000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.04830000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.71180000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.71180000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.17040000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.17040000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.17040000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.17040000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.13910000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.13910000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.08430000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.08430000000,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', 'evening')",cook,R1,0.08430000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.13910000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.13910000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.08430000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.13910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.13910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.08430000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.08430000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.61420000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.61420000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02940000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.02940000000,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', 'night')",cook,R1,0.02940000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.02940000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.87800000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.87800000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.05210000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.05210000000,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', 'morning')",cook,R1,0.05210000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.05210000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.02940000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.02940000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.02940000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.02940000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87800000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87800000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05210000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05210000000,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', 'early-peak')",cook,R1,0.05210000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05210000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84810000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.84810000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.18730000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.18730000000,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', 'late-peak')",cook,R1,0.18730000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.18730000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.23020000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.23020000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.09180000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.09180000000,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', 'evening')",cook,R1,0.09180000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.23020000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23020000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.09180000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23020000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23020000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09180000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09180000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.68840000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.68840000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.03070000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.03070000000,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', 'night')",cook,R1,0.03070000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.03070000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.98390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.98390000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.05480000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.05480000000,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', 'morning')",cook,R1,0.05480000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.05480000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.68840000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.68840000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03070000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03070000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03070000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03070000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.98390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.98390000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05480000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05480000000,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', 'early-peak')",cook,R1,0.05480000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05480000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.07010000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.07010000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.19910000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.19910000000,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', 'late-peak')",cook,R1,0.19910000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.19910000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.37840000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.37840000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.09710000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.09710000000,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', 'evening')",cook,R1,0.09710000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.37840000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.37840000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.09710000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.37840000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.37840000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.09710000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.09710000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.79400000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.79400000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.03290000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.03290000000,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', 'night')",cook,R1,0.03290000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.03290000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.13480000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.13480000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.05920000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.05920000000,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', 'morning')",cook,R1,0.05920000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.05920000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.79400000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.79400000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03290000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03290000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03290000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03290000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.13480000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.13480000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.05920000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.05920000000,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', 'early-peak')",cook,R1,0.05920000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.05920000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.38670000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.38670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.21830000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.21830000000,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', 'late-peak')",cook,R1,0.21830000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.21830000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.58960000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.58960000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.10560000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.10560000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.10560000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.58960000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.58960000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.10560000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.58960000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.58960000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.10560000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.10560000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+cook,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+cook,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+cook,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+cook,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+cook,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+cook,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+cook,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020
+cook,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+cook,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020
+cook,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+cook,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,0.20270000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,0.20270000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,0.78230000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,0.78230000000,R2,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
+cook,all-week,night,all-year,0.75330000000,R1,0,MUS$2010/PJ,2025
+cook,all-week,night,all-year,0.75330000000,R2,0,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,0.28960000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,0.28960000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.11750000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.11750000000,R2,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
+cook,all-week,morning,all-year,1.07610000000,R1,1,MUS$2010/PJ,2025
+cook,all-week,morning,all-year,1.07610000000,R2,1,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,0.20270000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,0.20270000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,0.78230000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,0.78230000000,R2,2,MUS$2010/PJ,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
+cook,all-week,mid-afternoon,all-year,0.75330000000,R1,2,MUS$2010/PJ,2025
+cook,all-week,mid-afternoon,all-year,0.75330000000,R2,2,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,0.28960000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,0.28960000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.11750000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.11750000000,R2,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
+cook,all-week,early-peak,all-year,1.07610000000,R1,3,MUS$2010/PJ,2025
+cook,all-week,early-peak,all-year,1.07610000000,R2,3,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,0.60810000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,0.60810000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,2.34680000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,2.34680000000,R2,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
+cook,all-week,late-peak,all-year,2.25990000000,R1,4,MUS$2010/PJ,2025
+cook,all-week,late-peak,all-year,2.25990000000,R2,4,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,0.40540000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,0.40540000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,1.56450000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,1.56450000000,R2,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
+cook,all-week,evening,all-year,1.50660000000,R1,5,MUS$2010/PJ,2025
+cook,all-week,evening,all-year,1.50660000000,R2,5,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,0.40540000000,R1,6,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,0.40540000000,R2,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,1.56450000000,R1,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,1.56450000000,R2,6,MUS$2010/PJ,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R2,6,MUS$2010/kt,2025
+cook,all-week,early-morning,all-year,1.50660000000,R1,6,MUS$2010/PJ,2025
+cook,all-week,early-morning,all-year,1.50660000000,R2,6,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,0.40540000000,R1,7,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,0.40540000000,R2,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,1.56450000000,R1,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,1.56450000000,R2,7,MUS$2010/PJ,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R2,7,MUS$2010/kt,2025
+cook,all-week,late-afternoon,all-year,1.50660000000,R1,7,MUS$2010/PJ,2025
+cook,all-week,late-afternoon,all-year,1.50660000000,R2,7,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,0.50320000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,0.50320000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.01890000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.01890000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+cook,all-week,night,all-year,0.01890000000,R1,0,MUS$2010/PJ,2030
+cook,all-week,night,all-year,0.01890000000,R2,0,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,0.71960000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,0.71960000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.03050000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.03050000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+cook,all-week,morning,all-year,0.03050000000,R1,1,MUS$2010/PJ,2030
+cook,all-week,morning,all-year,0.03050000000,R2,1,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,0.50320000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,0.50320000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,0.01890000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,0.01890000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+cook,all-week,mid-afternoon,all-year,0.01890000000,R1,2,MUS$2010/PJ,2030
+cook,all-week,mid-afternoon,all-year,0.01890000000,R2,2,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,0.71960000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,0.71960000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.03050000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.03050000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+cook,all-week,early-peak,all-year,0.03050000000,R1,3,MUS$2010/PJ,2030
+cook,all-week,early-peak,all-year,0.03050000000,R2,3,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,1.51730000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,1.51730000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.09170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.09170000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+cook,all-week,late-peak,all-year,0.09170000000,R1,4,MUS$2010/PJ,2030
+cook,all-week,late-peak,all-year,0.09170000000,R2,4,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,1.00890000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,1.00890000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.04940000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.04940000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+cook,all-week,evening,all-year,0.04940000000,R1,5,MUS$2010/PJ,2030
+cook,all-week,evening,all-year,0.04940000000,R2,5,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,1.00890000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,1.00890000000,R2,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,0.04940000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,0.04940000000,R2,6,MUS$2010/PJ,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030
+cook,all-week,early-morning,all-year,0.04940000000,R1,6,MUS$2010/PJ,2030
+cook,all-week,early-morning,all-year,0.04940000000,R2,6,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,1.00890000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,1.00890000000,R2,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,0.04940000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,0.04940000000,R2,7,MUS$2010/PJ,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030
+cook,all-week,late-afternoon,all-year,0.04940000000,R1,7,MUS$2010/PJ,2030
+cook,all-week,late-afternoon,all-year,0.04940000000,R2,7,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,0.56840000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,0.56840000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02750000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02750000000,R2,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
+cook,all-week,night,all-year,0.02750000000,R1,0,MUS$2010/PJ,2035
+cook,all-week,night,all-year,0.02750000000,R2,0,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,0.81270000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,0.81270000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.04830000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.04830000000,R2,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
+cook,all-week,morning,all-year,0.04830000000,R1,1,MUS$2010/PJ,2035
+cook,all-week,morning,all-year,0.04830000000,R2,1,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,0.56840000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,0.56840000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,0.02750000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,0.02750000000,R2,2,MUS$2010/PJ,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
+cook,all-week,mid-afternoon,all-year,0.02750000000,R1,2,MUS$2010/PJ,2035
+cook,all-week,mid-afternoon,all-year,0.02750000000,R2,2,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,0.81270000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,0.81270000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.04830000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.04830000000,R2,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
+cook,all-week,early-peak,all-year,0.04830000000,R1,3,MUS$2010/PJ,2035
+cook,all-week,early-peak,all-year,0.04830000000,R2,3,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,1.71180000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,1.71180000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.17040000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.17040000000,R2,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
+cook,all-week,late-peak,all-year,0.17040000000,R1,4,MUS$2010/PJ,2035
+cook,all-week,late-peak,all-year,0.17040000000,R2,4,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,1.13910000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,1.13910000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.08430000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.08430000000,R2,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
+cook,all-week,evening,all-year,0.08430000000,R1,5,MUS$2010/PJ,2035
+cook,all-week,evening,all-year,0.08430000000,R2,5,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,1.13910000000,R1,6,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,1.13910000000,R2,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,0.08430000000,R1,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,0.08430000000,R2,6,MUS$2010/PJ,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R2,6,MUS$2010/kt,2035
+cook,all-week,early-morning,all-year,0.08430000000,R1,6,MUS$2010/PJ,2035
+cook,all-week,early-morning,all-year,0.08430000000,R2,6,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,1.13910000000,R1,7,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,1.13910000000,R2,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,0.08430000000,R1,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,0.08430000000,R2,7,MUS$2010/PJ,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R2,7,MUS$2010/kt,2035
+cook,all-week,late-afternoon,all-year,0.08430000000,R1,7,MUS$2010/PJ,2035
+cook,all-week,late-afternoon,all-year,0.08430000000,R2,7,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,0.61420000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,0.61420000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.02940000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.02940000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+cook,all-week,night,all-year,0.02940000000,R1,0,MUS$2010/PJ,2040
+cook,all-week,night,all-year,0.02940000000,R2,0,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,0.87800000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,0.87800000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.05210000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.05210000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+cook,all-week,morning,all-year,0.05210000000,R1,1,MUS$2010/PJ,2040
+cook,all-week,morning,all-year,0.05210000000,R2,1,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,0.61420000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,0.61420000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,0.02940000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,0.02940000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+cook,all-week,mid-afternoon,all-year,0.02940000000,R1,2,MUS$2010/PJ,2040
+cook,all-week,mid-afternoon,all-year,0.02940000000,R2,2,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,0.87800000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,0.87800000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.05210000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.05210000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+cook,all-week,early-peak,all-year,0.05210000000,R1,3,MUS$2010/PJ,2040
+cook,all-week,early-peak,all-year,0.05210000000,R2,3,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,1.84810000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,1.84810000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.18730000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.18730000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+cook,all-week,late-peak,all-year,0.18730000000,R1,4,MUS$2010/PJ,2040
+cook,all-week,late-peak,all-year,0.18730000000,R2,4,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,1.23020000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,1.23020000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.09180000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.09180000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+cook,all-week,evening,all-year,0.09180000000,R1,5,MUS$2010/PJ,2040
+cook,all-week,evening,all-year,0.09180000000,R2,5,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,1.23020000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,1.23020000000,R2,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,0.09180000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,0.09180000000,R2,6,MUS$2010/PJ,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040
+cook,all-week,early-morning,all-year,0.09180000000,R1,6,MUS$2010/PJ,2040
+cook,all-week,early-morning,all-year,0.09180000000,R2,6,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,1.23020000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,1.23020000000,R2,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,0.09180000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,0.09180000000,R2,7,MUS$2010/PJ,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040
+cook,all-week,late-afternoon,all-year,0.09180000000,R1,7,MUS$2010/PJ,2040
+cook,all-week,late-afternoon,all-year,0.09180000000,R2,7,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,0.68840000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,0.68840000000,R2,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.03070000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.03070000000,R2,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
+cook,all-week,night,all-year,0.03070000000,R1,0,MUS$2010/PJ,2045
+cook,all-week,night,all-year,0.03070000000,R2,0,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,0.98390000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,0.98390000000,R2,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.05480000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.05480000000,R2,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
+cook,all-week,morning,all-year,0.05480000000,R1,1,MUS$2010/PJ,2045
+cook,all-week,morning,all-year,0.05480000000,R2,1,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,0.68840000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,0.68840000000,R2,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,0.03070000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,0.03070000000,R2,2,MUS$2010/PJ,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
+cook,all-week,mid-afternoon,all-year,0.03070000000,R1,2,MUS$2010/PJ,2045
+cook,all-week,mid-afternoon,all-year,0.03070000000,R2,2,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,0.98390000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,0.98390000000,R2,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.05480000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.05480000000,R2,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
+cook,all-week,early-peak,all-year,0.05480000000,R1,3,MUS$2010/PJ,2045
+cook,all-week,early-peak,all-year,0.05480000000,R2,3,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,2.07010000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,2.07010000000,R2,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.19910000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.19910000000,R2,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
+cook,all-week,late-peak,all-year,0.19910000000,R1,4,MUS$2010/PJ,2045
+cook,all-week,late-peak,all-year,0.19910000000,R2,4,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,1.37840000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,1.37840000000,R2,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.09710000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.09710000000,R2,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
+cook,all-week,evening,all-year,0.09710000000,R1,5,MUS$2010/PJ,2045
+cook,all-week,evening,all-year,0.09710000000,R2,5,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,1.37840000000,R1,6,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,1.37840000000,R2,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,0.09710000000,R1,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,0.09710000000,R2,6,MUS$2010/PJ,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R2,6,MUS$2010/kt,2045
+cook,all-week,early-morning,all-year,0.09710000000,R1,6,MUS$2010/PJ,2045
+cook,all-week,early-morning,all-year,0.09710000000,R2,6,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,1.37840000000,R1,7,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,1.37840000000,R2,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,0.09710000000,R1,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,0.09710000000,R2,7,MUS$2010/PJ,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R2,7,MUS$2010/kt,2045
+cook,all-week,late-afternoon,all-year,0.09710000000,R1,7,MUS$2010/PJ,2045
+cook,all-week,late-afternoon,all-year,0.09710000000,R2,7,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,0.79400000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,0.79400000000,R2,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.02560000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.02560000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.03290000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.03290000000,R2,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
+cook,all-week,night,all-year,0.03290000000,R1,0,MUS$2010/PJ,2050
+cook,all-week,night,all-year,0.03290000000,R2,0,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,1.13480000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,1.13480000000,R2,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.03650000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.03650000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.05920000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.05920000000,R2,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
+cook,all-week,morning,all-year,0.05920000000,R1,1,MUS$2010/PJ,2050
+cook,all-week,morning,all-year,0.05920000000,R2,1,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,0.79400000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,0.79400000000,R2,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.02560000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.02560000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,0.03290000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,0.03290000000,R2,2,MUS$2010/PJ,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
+cook,all-week,mid-afternoon,all-year,0.03290000000,R1,2,MUS$2010/PJ,2050
+cook,all-week,mid-afternoon,all-year,0.03290000000,R2,2,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,1.13480000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,1.13480000000,R2,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.03650000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.03650000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.05920000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.05920000000,R2,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
+cook,all-week,early-peak,all-year,0.05920000000,R1,3,MUS$2010/PJ,2050
+cook,all-week,early-peak,all-year,0.05920000000,R2,3,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,2.38670000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,2.38670000000,R2,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.07670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.07670000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.21830000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.21830000000,R2,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
+cook,all-week,late-peak,all-year,0.21830000000,R1,4,MUS$2010/PJ,2050
+cook,all-week,late-peak,all-year,0.21830000000,R2,4,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,1.58960000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,1.58960000000,R2,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.05110000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.05110000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.10560000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.10560000000,R2,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
+cook,all-week,evening,all-year,0.10560000000,R1,5,MUS$2010/PJ,2050
+cook,all-week,evening,all-year,0.10560000000,R2,5,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,1.58960000000,R1,6,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,1.58960000000,R2,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.05110000000,R1,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.05110000000,R2,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,0.10560000000,R1,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,0.10560000000,R2,6,MUS$2010/PJ,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R2,6,MUS$2010/kt,2050
+cook,all-week,early-morning,all-year,0.10560000000,R1,6,MUS$2010/PJ,2050
+cook,all-week,early-morning,all-year,0.10560000000,R2,6,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,1.58960000000,R1,7,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,1.58960000000,R2,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.05110000000,R1,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.05110000000,R2,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,0.10560000000,R1,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,0.10560000000,R2,7,MUS$2010/PJ,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R2,7,MUS$2010/kt,2050
+cook,all-week,late-afternoon,all-year,0.10560000000,R1,7,MUS$2010/PJ,2050
+cook,all-week,late-afternoon,all-year,0.10560000000,R2,7,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index 13d0af16..ad68d381 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
index 1356533a..8d8383b6 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.63070000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.15480000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95050000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.74030000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63070000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.15480000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95050000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.74030000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.90100000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.48050000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27030000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.32580000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.73190000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04910000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.10550000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09310000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73190000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04910000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10550000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09310000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.22630000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.30040000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.48090000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.15010000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.86900000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.05310000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.31190000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.10250000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86900000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05310000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.31190000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10250000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63740000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33950000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.75640000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.16700000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.07000000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05860000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.61470000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.11480000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.07000000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05860000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.61470000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11480000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.24300000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38880000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.16110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.18910000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.28860000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06660000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.94410000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.13300000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.28860000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06660000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.94410000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13300000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.90090000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46150000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.60100000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22160000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.55540000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07530000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.34620000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15280000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.55540000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07530000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.34620000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15280000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.70510000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.54050000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.13840000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.25690000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.63070000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04700000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.15480000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.95050000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07090000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.74030000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.63070000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04700000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.15480000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.95050000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07090000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.74030000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.90100000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.48050000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,1.27030000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09470000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.32580000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.73190000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04700000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.04910000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.10550000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07090000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.09310000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.73190000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04700000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.04910000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.10550000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07090000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.09310000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.22630000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.30040000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.48090000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09470000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.15010000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.86900000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04700000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.05310000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.31190000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07090000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.10250000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.86900000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04700000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.05310000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.31190000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07090000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.10250000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,2.63740000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.33950000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,1.75640000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09470000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.16700000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,1.07000000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04700000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.05860000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.61470000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07090000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.11480000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,1.07000000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04700000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.05860000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.61470000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07090000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.11480000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,3.24300000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.38880000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,2.16110000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09470000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.18910000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.28860000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04700000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06660000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.94410000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07090000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.13300000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.28860000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04700000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06660000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.94410000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07090000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.13300000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,3.90090000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.46150000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.60100000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09470000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.22160000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.55540000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04700000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.07530000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,2.34620000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07090000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.15280000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.55540000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04700000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.07530000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,2.34620000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07090000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.15280000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,4.70510000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.54050000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,3.13840000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09470000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.25690000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index b1e4a3b5..667da2f5 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index 3cae8f09..77be7402 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.12810000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.22540000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.22540000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.45070000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.06920000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.16960000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16960000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.60620000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,1.12810000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.03480000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,2.22540000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.06110000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,3.28680000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.07030000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,2.22540000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.06110000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,4.45070000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.12220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,5.47810000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.12280000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.03480000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.06920000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.06110000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.16960000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.07030000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.15550000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.06110000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.16960000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.12220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.60620000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.12280000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.48630000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.03480000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.06110000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.07030000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.06110000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.12220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.12280000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.03480000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.06110000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.07030000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.06110000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.12220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.12280000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.03480000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.06110000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.07030000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.06110000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.12220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.12280000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.03480000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.06110000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.07030000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.06110000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.12220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.12280000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index dba9af19..266c0564 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index 29ec2b0b..eee5c755 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,2.31300000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,3.46940000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.28680000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.46940000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.93890000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,5.47810000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.09520000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.11660000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.24420000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15550000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24420000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.90480000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.48630000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.07210000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02790000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.18020000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04460000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14410000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10810000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04460000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.18020000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08930000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.14410000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05950000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02690000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04690000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04260000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09380000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05960000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,2.31300000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04480000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,3.46940000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.06720000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,3.28680000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.05770000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,3.46940000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.06720000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,6.93890000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.13440000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,5.47810000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.10090000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.09520000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04480000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.11660000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.14290000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.06720000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.24420000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.14290000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.05770000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.15550000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.14290000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.06720000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.24420000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,0.14290000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.13440000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.90480000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.14290000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.10090000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.48630000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.07210000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04480000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02790000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.06720000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.04460000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.14410000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.05770000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.02980000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.10810000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.06720000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.04460000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.13440000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.08930000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.14410000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.10090000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.05950000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04480000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.02690000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.20000000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.06720000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.04690000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.13330000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.05770000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.02980000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.06720000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.04260000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.13440000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.09380000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.10090000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.05960000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04480000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.20000000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.06720000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.04810000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.13330000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.05770000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.02940000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.06720000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.13440000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.10090000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04480000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.20000000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.06720000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.04810000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.13330000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.05770000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.02940000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.06720000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.13440000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.10090000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index dba9af19..266c0564 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 35e8627a..2881074a 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index 7ecc8ac8..a3f9c5dd 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index dba9af19..266c0564 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -17,6 +17,7 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"

From 3111ef9544b3e881c6ccafab46b1b8c3693c0d6a Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 12 Jul 2024 12:08:25 +0100
Subject: [PATCH 392/419] Update example models

---
 src/muse/data/example/trade/settings.toml     |  17 +-
 tests/example_outputs/default/MCAPrices.csv   | 338 +++++++-------
 .../default_retro/MCAPrices.csv               | 338 +++++++-------
 .../default_timeslice/MCAPrices.csv           | 338 +++++++-------
 tests/example_outputs/medium/MCAPrices.csv    | 422 +++++++++---------
 .../multiple_agents/MCAPrices.csv             | 338 +++++++-------
 .../trade/{Capacities.csv => MCACapacity.csv} |  36 +-
 tests/example_outputs/trade/MCAPrices.csv     | 133 ++++++
 tests/example_outputs/trade/Prices.csv        | 133 ------
 9 files changed, 1044 insertions(+), 1049 deletions(-)
 rename tests/example_outputs/trade/{Capacities.csv => MCACapacity.csv} (100%)
 create mode 100644 tests/example_outputs/trade/MCAPrices.csv
 delete mode 100644 tests/example_outputs/trade/Prices.csv

diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
index 0929d083..885c47d4 100644
--- a/src/muse/data/example/trade/settings.toml
+++ b/src/muse/data/example/trade/settings.toml
@@ -15,21 +15,16 @@ tolerance_unmet_demand = -0.1
 
 [[outputs]]
 quantity = "prices"
-filename = "{cwd}/Results/Prices.csv"
-sink.name = "aggregate"
-sink.sink.name = "csv"
-sink.sink.set_index = ["region", "commodity", "year", "timeslice"]
-sink.sink.sort_index = true
-sink.sink.keep_columns = ["prices"]
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
+sink = "aggregate"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-filename = "{cwd}/Results/Capacities.csv"
-sink.name = "aggregate"
-sink.sink.name = "csv"
-sink.sink.sort_index = true
-sink.sink.keep_columns = [
+keep_columns = [
     'technology',
     'dst_region',
     'region',
diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv
index 0769f75a..d436e533 100644
--- a/tests/example_outputs/default/MCAPrices.csv
+++ b/tests/example_outputs/default/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.01920000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.53250000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15060000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01920000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.53250000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15060000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.08790000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53010000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.04840000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.09500000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.06480000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64550000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12800000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09500000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06480000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64550000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12800000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30870000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44270000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19790000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.21200000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.21470000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.82470000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21470000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82470000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.66490000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46920000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.43640000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.22390000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.34100000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07260000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.01370000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14560000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.34100000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07260000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.01370000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14560000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.04070000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.51190000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.68790000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.24300000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.82770000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07770000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.74410000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15690000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.82770000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07770000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.74410000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15690000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.50350000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55700000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.66220000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.26310000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,1.27200000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,1.90800000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,1.27200000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,1.90800000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,3.81600000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,2.54400000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,1.01920000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.07490000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.53250000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.15060000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,1.01920000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.07490000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.53250000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.15060000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,3.08790000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.53010000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,2.04840000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.25160000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,1.09500000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.06480000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.64550000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.12800000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,1.09500000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.06480000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.64550000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.12800000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,3.30870000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.44270000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,2.19790000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.21200000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,1.21470000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.06790000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.82470000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.13480000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,1.21470000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.06790000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.82470000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.13480000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,3.66490000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.46920000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,2.43640000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.22390000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.34100000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.07260000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,2.01370000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.14560000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.34100000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.07260000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,2.01370000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.14560000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,4.04070000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.51190000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.68790000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.24300000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.82770000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.07770000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,2.74410000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.15690000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.82770000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.07770000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,2.74410000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.15690000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,5.50350000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.55700000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,3.66220000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.26310000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv
index be198817..6d5af76b 100644
--- a/tests/example_outputs/default_retro/MCAPrices.csv
+++ b/tests/example_outputs/default_retro/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.98080000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.20570000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.47480000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.34200000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.98080000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20570000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.47480000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34200000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.97130000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.88510000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.97120000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.50070000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.09210000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.21620000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64110000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.35110000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09210000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21620000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64110000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.35110000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.29990000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.86410000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19200000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.50390000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.09040000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.10490000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.63790000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.18960000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09040000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10490000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.63790000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18960000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.28960000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.57450000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.18700000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.29600000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.22400000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.11010000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.83800000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19750000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.22400000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11010000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.83800000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19750000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.68810000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.58980000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.45340000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.30650000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.30790000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07300000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.96360000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.14640000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30790000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07300000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96360000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14640000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.93760000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.51470000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.62040000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.24440000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,1.27200000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,1.90800000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,1.27200000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,1.90800000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,3.81600000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,2.54400000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.98080000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.20570000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.47480000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.34200000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.98080000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.20570000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.47480000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.34200000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,2.97130000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.88510000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,1.97120000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.50070000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,1.09210000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.21620000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.64110000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.35110000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,1.09210000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.21620000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.64110000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.35110000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,3.29990000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.86410000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,2.19200000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.50390000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,1.09040000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.10490000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.63790000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.18960000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,1.09040000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.10490000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.63790000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.18960000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,3.28960000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.57450000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,2.18700000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.29600000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.22400000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.11010000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.83800000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.19750000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.22400000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.11010000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,1.83800000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.19750000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,3.68810000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.58980000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.45340000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.30650000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.30790000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.07300000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.96360000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.14640000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.30790000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.07300000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,1.96360000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.14640000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,3.93760000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.51470000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,2.62040000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.24440000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 6300a67e..8c7ea0a5 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73400000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28020000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04150000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.06220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04150000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.06220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.73400000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.18180000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.08300000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04150000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.06220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04150000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.06220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.18180000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.28020000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.08300000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04150000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.06220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04150000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.06220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.18180000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.08300000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04150000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.06220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04150000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.06220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.18180000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.08300000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04150000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.06220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04150000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.06220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.18180000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.08300000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.06670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04150000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.02670000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.10000000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.06220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.04210000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.06670000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04150000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.02670000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.10000000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.06220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.04210000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,0.20000000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.18180000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.09620000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,0.13330000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.08300000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.05880000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv
index 09c4ff9a..99bcaf6c 100644
--- a/tests/example_outputs/medium/MCAPrices.csv
+++ b/tests/example_outputs/medium/MCAPrices.csv
@@ -1,211 +1,211 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.78210000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.45370000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.83470000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,2.67320000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,2.18060000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,1.25200000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78210000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.45370000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.83470000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.67320000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.18060000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,1.25200000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.34640000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.36110000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,2.50410000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,3.56430000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.90740000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,1.66940000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.32160000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.53230000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.98760000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.82890000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.32160000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.53230000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.98760000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.82890000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.00620000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.84040000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.65700000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.14570000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.33250000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.59390000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.00240000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.91680000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33250000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.59390000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.00240000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.91680000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.02720000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.99120000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.67490000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.25730000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.94320000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.07730000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.41680000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.15620000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.94320000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07730000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.41680000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15620000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.84510000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55540000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.89160000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.26210000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.05670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06180000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.58670000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.12110000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.05670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06180000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.58670000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12110000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.18350000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.41360000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.11780000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.19940000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.14470000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06630000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.71850000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.13130000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.14470000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06630000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.71850000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13130000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.44600000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.45420000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.29330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.21750000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,1.78210000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.45370000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+cook,all-week,night,all-year,0.83470000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,2.67320000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,2.18060000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+cook,all-week,morning,all-year,1.25200000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,1.78210000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.45370000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+cook,all-week,afternoon,all-year,0.83470000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,2.67320000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,2.18060000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+cook,all-week,early-peak,all-year,1.25200000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,5.34640000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.36110000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+cook,all-week,late-peak,all-year,2.50410000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,3.56430000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.90740000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+cook,all-week,evening,all-year,1.66940000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,1.32160000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.53230000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+cook,all-week,night,all-year,0.02880000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,1.98760000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.82890000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+cook,all-week,morning,all-year,0.04670000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,1.32160000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.53230000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+cook,all-week,afternoon,all-year,0.02880000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,1.98760000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.82890000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+cook,all-week,early-peak,all-year,0.04670000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,4.00620000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,1.84040000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+cook,all-week,late-peak,all-year,0.11470000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,2.65700000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,1.14570000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+cook,all-week,evening,all-year,0.06700000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,1.33250000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.59390000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+cook,all-week,night,all-year,0.02880000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,2.00240000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.91680000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+cook,all-week,morning,all-year,0.04670000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,1.33250000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.59390000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+cook,all-week,afternoon,all-year,0.02880000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,2.00240000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.91680000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+cook,all-week,early-peak,all-year,0.04670000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,4.02720000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,1.99120000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+cook,all-week,late-peak,all-year,0.11470000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,2.67490000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,1.25730000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+cook,all-week,evening,all-year,0.06700000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,0.94320000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.07730000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+cook,all-week,night,all-year,0.02880000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,1.41680000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.15620000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+cook,all-week,morning,all-year,0.04670000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,0.94320000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.07730000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+cook,all-week,afternoon,all-year,0.02880000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,1.41680000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.15620000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+cook,all-week,early-peak,all-year,0.04670000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,2.84510000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.55540000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+cook,all-week,late-peak,all-year,0.11470000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,1.89160000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.26210000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+cook,all-week,evening,all-year,0.06700000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,1.05670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.06180000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+cook,all-week,night,all-year,0.02880000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,1.58670000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.12110000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+cook,all-week,morning,all-year,0.04670000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,1.05670000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.06180000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+cook,all-week,afternoon,all-year,0.02880000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,1.58670000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.12110000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+cook,all-week,early-peak,all-year,0.04670000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,3.18350000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.41360000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+cook,all-week,late-peak,all-year,0.11470000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,2.11780000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.19940000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+cook,all-week,evening,all-year,0.06700000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,1.14470000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.06630000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+cook,all-week,night,all-year,0.02880000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,1.71850000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.13130000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+cook,all-week,morning,all-year,0.04670000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,1.14470000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.06630000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+cook,all-week,afternoon,all-year,0.02880000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,1.71850000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.13130000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+cook,all-week,early-peak,all-year,0.04670000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,3.44600000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.45420000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+cook,all-week,late-peak,all-year,0.11470000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,2.29330000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.21750000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+cook,all-week,evening,all-year,0.06700000000,R1,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv
index 0db837fc..0b869e7c 100644
--- a/tests/example_outputs/multiple_agents/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.27200000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90800000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.27200000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90800000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.81600000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54400000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.01920000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.53250000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15060000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01920000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07490000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.53250000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15060000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.08790000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53010000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.04840000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.09500000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.06480000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64550000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12800000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09500000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06480000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64550000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12800000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30870000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44270000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19790000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.21200000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.18980000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.78720000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.18980000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.78720000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.58960000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46920000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.38630000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.22390000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.34100000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07160000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.01370000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14330000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.34100000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07160000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.01370000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14330000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.04070000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50290000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.68790000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.23900000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.82770000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07770000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.74410000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15690000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.82770000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07770000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.74410000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15690000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.50350000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55700000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.66220000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.26310000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,1.27200000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,1.90800000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,1.27200000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,1.90800000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,3.81600000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,2.54400000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,1.01920000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.07490000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.53250000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.15060000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,1.01920000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.07490000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,1.53250000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.15060000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,3.08790000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.53010000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,2.04840000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.25160000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,1.09500000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.06480000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.64550000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.12800000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,1.09500000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.06480000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,1.64550000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.12800000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,3.30870000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.44270000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,2.19790000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.21200000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,1.18980000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.06790000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.78720000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.13480000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,1.18980000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.06790000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,1.78720000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.13480000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,3.58960000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.46920000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,2.38630000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.22390000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,1.34100000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.07160000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,2.01370000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.14330000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.34100000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.07160000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,2.01370000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.14330000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,4.04070000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.50290000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,2.68790000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.23900000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,1.82770000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.07770000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,2.74410000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.15690000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.82770000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.07770000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,2.74410000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.15690000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,5.50350000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.55700000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,3.66220000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.26310000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/trade/Capacities.csv b/tests/example_outputs/trade/MCACapacity.csv
similarity index 100%
rename from tests/example_outputs/trade/Capacities.csv
rename to tests/example_outputs/trade/MCACapacity.csv
index 8eeae883..e29ebaeb 100644
--- a/tests/example_outputs/trade/Capacities.csv
+++ b/tests/example_outputs/trade/MCACapacity.csv
@@ -1,31 +1,31 @@
 technology,dst_region,region,agent,sector,type,year,capacity
-gasCCGT,R1,R1,A1,power,agent,2035,122.88000000000
+gasboiler,R1,R1,A1,residential,retrofit,2020,662.76000000000
+gasboiler,R2,R2,A1,residential,retrofit,2020,35.00000000000
 gasCCGT,R1,R1,A1,power,agent,2020,240.00000000000
+gasCCGT,R2,R2,A1,power,agent,2020,200.00000000000
 gassupply1,R1,R1,A1,gas,agent,2020,3000.00000000000
+gassupply1,R2,R2,A1,gas,agent,2020,1200.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2025,463.93200000000
-gassupply1,R1,R1,A1,gas,agent,2030,2100.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2025,355.93470000000
+gasboiler,R2,R2,A1,residential,retrofit,2025,24.50000000000
 gasCCGT,R1,R1,A1,power,agent,2025,192.00000000000
-gasCCGT,R1,R1,A1,power,agent,2030,153.60000000000
+gasCCGT,R2,R2,A1,power,agent,2025,140.00000000000
 gassupply1,R1,R1,A1,gas,agent,2025,2100.00000000000
-gassupply1,R1,R1,A1,gas,agent,2035,1470.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,355.93470000000
-gasboiler,R1,R1,A1,residential,retrofit,2020,662.76000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,394.34220000000
+gassupply1,R2,R2,A1,gas,agent,2025,700.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,463.93200000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,74.53330000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,355.93470000000
-gassupply1,R2,R2,A1,gas,agent,2035,490.00000000000
 gasboiler,R1,R1,A1,residential,retrofit,2030,74.53330000000
+gasboiler,R2,R2,A1,residential,retrofit,2030,24.50000000000
+gasCCGT,R1,R1,A1,power,agent,2030,153.60000000000
+gasCCGT,R2,R2,A1,power,agent,2030,98.00000000000
+gassupply1,R1,R1,A1,gas,agent,2030,2100.00000000000
 gassupply1,R2,R2,A1,gas,agent,2030,700.00000000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,394.34220000000
+gasboiler,R1,R1,A1,residential,retrofit,2035,74.53330000000
 gasboiler,R1,R1,A1,residential,retrofit,2035,444.15780000000
-gasCCGT,R2,R2,A1,power,agent,2035,68.60000000000
-gassupply1,R2,R2,A1,gas,agent,2025,700.00000000000
-gasCCGT,R2,R2,A1,power,agent,2030,98.00000000000
-gassupply1,R2,R2,A1,gas,agent,2020,1200.00000000000
-gasCCGT,R2,R2,A1,power,agent,2025,140.00000000000
-gasCCGT,R2,R2,A1,power,agent,2020,200.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,35.00000000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,24.50000000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,17.15000000000
 gasboiler,R2,R2,A1,residential,retrofit,2035,1.63330000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,24.50000000000
+gasCCGT,R1,R1,A1,power,agent,2035,122.88000000000
+gasCCGT,R2,R2,A1,power,agent,2035,68.60000000000
+gassupply1,R1,R1,A1,gas,agent,2035,1470.00000000000
+gassupply1,R2,R2,A1,gas,agent,2035,490.00000000000
diff --git a/tests/example_outputs/trade/MCAPrices.csv b/tests/example_outputs/trade/MCAPrices.csv
new file mode 100644
index 00000000..91988fe1
--- /dev/null
+++ b/tests/example_outputs/trade/MCAPrices.csv
@@ -0,0 +1,133 @@
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,13.98150000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.13890000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,4.71680000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,4.71680000000,R2,0,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,13.98150000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.13890000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,4.71680000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,4.71680000000,R2,1,MUS$2010/PJ,2020
+electricity,all-week,afternoon,all-year,13.98150000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,afternoon,all-year,19.13890000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,4.71680000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,4.71680000000,R2,2,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,13.98150000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.13890000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,4.71680000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,4.71680000000,R2,3,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,13.98150000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.13890000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,4.71680000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,4.71680000000,R2,4,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,2.97240000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,3.06120000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,0.85600000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.22730000000,R2,0,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,3.14160000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,3.11100000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.21010000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.35000000000,R2,1,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,2.99700000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,3.01140000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,0.90760000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.10450000000,R2,2,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,2.99700000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,3.01140000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,0.90760000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.10450000000,R2,3,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,3.18980000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,3.13590000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,1.31090000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,1.41140000000,R2,4,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,2.99590000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,3.01140000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,0.90520000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,1.10450000000,R2,5,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,1.74410000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,1.85500000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.50430000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.74290000000,R2,0,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,1.95220000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,1.91690000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.75200000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.83010000000,R2,1,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,1.77380000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,1.79390000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.53900000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.65810000000,R2,2,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,1.77380000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,1.79390000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.53900000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.65810000000,R2,3,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,2.01320000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,1.94820000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.82670000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.87450000000,R2,4,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,1.77240000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,1.79390000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.53740000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.65810000000,R2,5,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,1.04370000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,1.15050000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.30380000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.46000000000,R2,0,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,1.23940000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,1.20950000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.47750000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.52200000000,R2,1,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,1.07110000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,1.09300000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.32730000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.40110000000,R2,2,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,1.07110000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,1.09300000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.32730000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.40110000000,R2,3,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,1.29850000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,1.23960000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.53260000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.55420000000,R2,4,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,1.06990000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,1.09300000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.32620000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.40110000000,R2,5,MUS$2010/PJ,2035
diff --git a/tests/example_outputs/trade/Prices.csv b/tests/example_outputs/trade/Prices.csv
deleted file mode 100644
index c395f7ec..00000000
--- a/tests/example_outputs/trade/Prices.csv
+++ /dev/null
@@ -1,133 +0,0 @@
-region,commodity,year,timeslice,prices
-R1,electricity,2020,"('all-year', 'all-week', 'afternoon')",13.98150000000
-R1,electricity,2020,"('all-year', 'all-week', 'early-peak')",13.98150000000
-R1,electricity,2020,"('all-year', 'all-week', 'evening')",13.98150000000
-R1,electricity,2020,"('all-year', 'all-week', 'late-peak')",13.98150000000
-R1,electricity,2020,"('all-year', 'all-week', 'morning')",13.98150000000
-R1,electricity,2020,"('all-year', 'all-week', 'night')",13.98150000000
-R1,electricity,2025,"('all-year', 'all-week', 'afternoon')",19.56940000000
-R1,electricity,2025,"('all-year', 'all-week', 'early-peak')",19.56940000000
-R1,electricity,2025,"('all-year', 'all-week', 'evening')",19.56940000000
-R1,electricity,2025,"('all-year', 'all-week', 'late-peak')",19.56940000000
-R1,electricity,2025,"('all-year', 'all-week', 'morning')",19.56940000000
-R1,electricity,2025,"('all-year', 'all-week', 'night')",19.56940000000
-R1,electricity,2030,"('all-year', 'all-week', 'afternoon')",19.56940000000
-R1,electricity,2030,"('all-year', 'all-week', 'early-peak')",19.56940000000
-R1,electricity,2030,"('all-year', 'all-week', 'evening')",19.56940000000
-R1,electricity,2030,"('all-year', 'all-week', 'late-peak')",19.56940000000
-R1,electricity,2030,"('all-year', 'all-week', 'morning')",19.56940000000
-R1,electricity,2030,"('all-year', 'all-week', 'night')",19.56940000000
-R1,electricity,2035,"('all-year', 'all-week', 'afternoon')",19.56940000000
-R1,electricity,2035,"('all-year', 'all-week', 'early-peak')",19.56940000000
-R1,electricity,2035,"('all-year', 'all-week', 'evening')",19.56940000000
-R1,electricity,2035,"('all-year', 'all-week', 'late-peak')",19.56940000000
-R1,electricity,2035,"('all-year', 'all-week', 'morning')",19.56940000000
-R1,electricity,2035,"('all-year', 'all-week', 'night')",19.56940000000
-R1,gas,2020,"('all-year', 'all-week', 'afternoon')",4.71680000000
-R1,gas,2020,"('all-year', 'all-week', 'early-peak')",4.71680000000
-R1,gas,2020,"('all-year', 'all-week', 'evening')",4.71680000000
-R1,gas,2020,"('all-year', 'all-week', 'late-peak')",4.71680000000
-R1,gas,2020,"('all-year', 'all-week', 'morning')",4.71680000000
-R1,gas,2020,"('all-year', 'all-week', 'night')",4.71680000000
-R1,gas,2025,"('all-year', 'all-week', 'afternoon')",2.99700000000
-R1,gas,2025,"('all-year', 'all-week', 'early-peak')",2.99700000000
-R1,gas,2025,"('all-year', 'all-week', 'evening')",2.99590000000
-R1,gas,2025,"('all-year', 'all-week', 'late-peak')",3.18980000000
-R1,gas,2025,"('all-year', 'all-week', 'morning')",3.14160000000
-R1,gas,2025,"('all-year', 'all-week', 'night')",2.97240000000
-R1,gas,2030,"('all-year', 'all-week', 'afternoon')",1.77380000000
-R1,gas,2030,"('all-year', 'all-week', 'early-peak')",1.77380000000
-R1,gas,2030,"('all-year', 'all-week', 'evening')",1.77240000000
-R1,gas,2030,"('all-year', 'all-week', 'late-peak')",2.01320000000
-R1,gas,2030,"('all-year', 'all-week', 'morning')",1.95220000000
-R1,gas,2030,"('all-year', 'all-week', 'night')",1.74410000000
-R1,gas,2035,"('all-year', 'all-week', 'afternoon')",1.07110000000
-R1,gas,2035,"('all-year', 'all-week', 'early-peak')",1.07110000000
-R1,gas,2035,"('all-year', 'all-week', 'evening')",1.06990000000
-R1,gas,2035,"('all-year', 'all-week', 'late-peak')",1.29850000000
-R1,gas,2035,"('all-year', 'all-week', 'morning')",1.23940000000
-R1,gas,2035,"('all-year', 'all-week', 'night')",1.04370000000
-R1,heat,2025,"('all-year', 'all-week', 'afternoon')",0.90760000000
-R1,heat,2025,"('all-year', 'all-week', 'early-peak')",0.90760000000
-R1,heat,2025,"('all-year', 'all-week', 'evening')",0.90520000000
-R1,heat,2025,"('all-year', 'all-week', 'late-peak')",1.31090000000
-R1,heat,2025,"('all-year', 'all-week', 'morning')",1.21010000000
-R1,heat,2025,"('all-year', 'all-week', 'night')",0.85600000000
-R1,heat,2030,"('all-year', 'all-week', 'afternoon')",0.53900000000
-R1,heat,2030,"('all-year', 'all-week', 'early-peak')",0.53900000000
-R1,heat,2030,"('all-year', 'all-week', 'evening')",0.53740000000
-R1,heat,2030,"('all-year', 'all-week', 'late-peak')",0.82670000000
-R1,heat,2030,"('all-year', 'all-week', 'morning')",0.75200000000
-R1,heat,2030,"('all-year', 'all-week', 'night')",0.50430000000
-R1,heat,2035,"('all-year', 'all-week', 'afternoon')",0.32730000000
-R1,heat,2035,"('all-year', 'all-week', 'early-peak')",0.32730000000
-R1,heat,2035,"('all-year', 'all-week', 'evening')",0.32620000000
-R1,heat,2035,"('all-year', 'all-week', 'late-peak')",0.53260000000
-R1,heat,2035,"('all-year', 'all-week', 'morning')",0.47750000000
-R1,heat,2035,"('all-year', 'all-week', 'night')",0.30380000000
-R2,electricity,2020,"('all-year', 'all-week', 'afternoon')",19.13890000000
-R2,electricity,2020,"('all-year', 'all-week', 'early-peak')",19.13890000000
-R2,electricity,2020,"('all-year', 'all-week', 'evening')",19.13890000000
-R2,electricity,2020,"('all-year', 'all-week', 'late-peak')",19.13890000000
-R2,electricity,2020,"('all-year', 'all-week', 'morning')",19.13890000000
-R2,electricity,2020,"('all-year', 'all-week', 'night')",19.13890000000
-R2,electricity,2025,"('all-year', 'all-week', 'afternoon')",19.56940000000
-R2,electricity,2025,"('all-year', 'all-week', 'early-peak')",19.56940000000
-R2,electricity,2025,"('all-year', 'all-week', 'evening')",19.56940000000
-R2,electricity,2025,"('all-year', 'all-week', 'late-peak')",19.56940000000
-R2,electricity,2025,"('all-year', 'all-week', 'morning')",19.56940000000
-R2,electricity,2025,"('all-year', 'all-week', 'night')",19.56940000000
-R2,electricity,2030,"('all-year', 'all-week', 'afternoon')",19.56940000000
-R2,electricity,2030,"('all-year', 'all-week', 'early-peak')",19.56940000000
-R2,electricity,2030,"('all-year', 'all-week', 'evening')",19.56940000000
-R2,electricity,2030,"('all-year', 'all-week', 'late-peak')",19.56940000000
-R2,electricity,2030,"('all-year', 'all-week', 'morning')",19.56940000000
-R2,electricity,2030,"('all-year', 'all-week', 'night')",19.56940000000
-R2,electricity,2035,"('all-year', 'all-week', 'afternoon')",19.56940000000
-R2,electricity,2035,"('all-year', 'all-week', 'early-peak')",19.56940000000
-R2,electricity,2035,"('all-year', 'all-week', 'evening')",19.56940000000
-R2,electricity,2035,"('all-year', 'all-week', 'late-peak')",19.56940000000
-R2,electricity,2035,"('all-year', 'all-week', 'morning')",19.56940000000
-R2,electricity,2035,"('all-year', 'all-week', 'night')",19.56940000000
-R2,gas,2020,"('all-year', 'all-week', 'afternoon')",4.71680000000
-R2,gas,2020,"('all-year', 'all-week', 'early-peak')",4.71680000000
-R2,gas,2020,"('all-year', 'all-week', 'evening')",4.71680000000
-R2,gas,2020,"('all-year', 'all-week', 'late-peak')",4.71680000000
-R2,gas,2020,"('all-year', 'all-week', 'morning')",4.71680000000
-R2,gas,2020,"('all-year', 'all-week', 'night')",4.71680000000
-R2,gas,2025,"('all-year', 'all-week', 'afternoon')",3.01140000000
-R2,gas,2025,"('all-year', 'all-week', 'early-peak')",3.01140000000
-R2,gas,2025,"('all-year', 'all-week', 'evening')",3.01140000000
-R2,gas,2025,"('all-year', 'all-week', 'late-peak')",3.13590000000
-R2,gas,2025,"('all-year', 'all-week', 'morning')",3.11100000000
-R2,gas,2025,"('all-year', 'all-week', 'night')",3.06120000000
-R2,gas,2030,"('all-year', 'all-week', 'afternoon')",1.79390000000
-R2,gas,2030,"('all-year', 'all-week', 'early-peak')",1.79390000000
-R2,gas,2030,"('all-year', 'all-week', 'evening')",1.79390000000
-R2,gas,2030,"('all-year', 'all-week', 'late-peak')",1.94820000000
-R2,gas,2030,"('all-year', 'all-week', 'morning')",1.91690000000
-R2,gas,2030,"('all-year', 'all-week', 'night')",1.85500000000
-R2,gas,2035,"('all-year', 'all-week', 'afternoon')",1.09300000000
-R2,gas,2035,"('all-year', 'all-week', 'early-peak')",1.09300000000
-R2,gas,2035,"('all-year', 'all-week', 'evening')",1.09300000000
-R2,gas,2035,"('all-year', 'all-week', 'late-peak')",1.23960000000
-R2,gas,2035,"('all-year', 'all-week', 'morning')",1.20950000000
-R2,gas,2035,"('all-year', 'all-week', 'night')",1.15050000000
-R2,heat,2025,"('all-year', 'all-week', 'afternoon')",1.10450000000
-R2,heat,2025,"('all-year', 'all-week', 'early-peak')",1.10450000000
-R2,heat,2025,"('all-year', 'all-week', 'evening')",1.10450000000
-R2,heat,2025,"('all-year', 'all-week', 'late-peak')",1.41140000000
-R2,heat,2025,"('all-year', 'all-week', 'morning')",1.35000000000
-R2,heat,2025,"('all-year', 'all-week', 'night')",1.22730000000
-R2,heat,2030,"('all-year', 'all-week', 'afternoon')",0.65810000000
-R2,heat,2030,"('all-year', 'all-week', 'early-peak')",0.65810000000
-R2,heat,2030,"('all-year', 'all-week', 'evening')",0.65810000000
-R2,heat,2030,"('all-year', 'all-week', 'late-peak')",0.87450000000
-R2,heat,2030,"('all-year', 'all-week', 'morning')",0.83010000000
-R2,heat,2030,"('all-year', 'all-week', 'night')",0.74290000000
-R2,heat,2035,"('all-year', 'all-week', 'afternoon')",0.40110000000
-R2,heat,2035,"('all-year', 'all-week', 'early-peak')",0.40110000000
-R2,heat,2035,"('all-year', 'all-week', 'evening')",0.40110000000
-R2,heat,2035,"('all-year', 'all-week', 'late-peak')",0.55420000000
-R2,heat,2035,"('all-year', 'all-week', 'morning')",0.52200000000
-R2,heat,2035,"('all-year', 'all-week', 'night')",0.46000000000

From f08b8951c4d47a0dd6326c88b5631853343ecd19 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 12 Jul 2024 12:14:12 +0100
Subject: [PATCH 393/419] Update tutorial 0

---
 .../Results/MCACapacity.csv                   | 112 +++---
 .../Results/MCAPrices.csv                     | 338 +++++++++---------
 .../0-new-decision-metric/settings.toml       |   2 +
 3 files changed, 227 insertions(+), 225 deletions(-)

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 f768aa6c..2e05bdb0 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -1,56 +1,56 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-0,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
-1,A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
-2,A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-1,A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
-11,A1,10.00000000000,R1,26,2020,R1,power,solarPV,newcapa,2025
-24,A1,6.00000000000,R1,49,2020,R1,power,windturbine,newcapa,2025
-1,A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
-3,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
-4,A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-2,A1,2.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
-14,A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
-15,A1,9.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
-35,A1,6.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
-2,A1,7.50000000000,R1,4,2020,R1,gas,gassupply1,newcapa,2030
-7,A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
-8,A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-3,A1,2.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
-16,A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
-17,A1,9.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
-18,A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
-45,A1,6.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
-3,A1,3.38700000000,R1,7,2030,R1,gas,gassupply1,newcapa,2035
-11,A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
-12,A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-4,A1,2.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
-19,A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
-20,A1,9.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
-21,A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
-22,A1,6.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
-56,A1,6.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
-4,A1,3.38700000000,R1,9,2030,R1,gas,gassupply1,newcapa,2040
-15,A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
-16,A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-5,A1,2.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
-35,A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
-36,A1,9.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
-37,A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
-38,A1,6.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
-39,A1,6.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
-79,A1,6.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
-5,A1,3.38700000000,R1,16,2030,R1,gas,gassupply1,newcapa,2045
-19,A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
-20,A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-7,A1,2.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
-8,A1,1.00000000000,R1,23,2045,R1,power,gasCCGT,newcapa,2050
-47,A1,9.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
-48,A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
-49,A1,6.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
-50,A1,6.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
-51,A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
-93,A1,10.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
-6,A1,3.38700000000,R1,19,2030,R1,gas,gassupply1,newcapa,2050
-7,A1,1.64630000000,R1,20,2045,R1,gas,gassupply1,newcapa,2050
+agent,capacity,dst_region,index,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
+A1,10.00000000000,R1,26,2020,R1,power,solarPV,newcapa,2025
+A1,6.00000000000,R1,49,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
+A1,2.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
+A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
+A1,9.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
+A1,6.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,4,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
+A1,2.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
+A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
+A1,9.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
+A1,3.38700000000,R1,7,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
+A1,2.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
+A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
+A1,9.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
+A1,3.38700000000,R1,9,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
+A1,2.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
+A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
+A1,9.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
+A1,3.38700000000,R1,16,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
+A1,2.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.00000000000,R1,23,2045,R1,power,gasCCGT,newcapa,2050
+A1,9.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
+A1,3.38700000000,R1,19,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.64630000000,R1,20,2045,R1,gas,gassupply1,newcapa,2050
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 28ba7646..6e965283 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-,commodity,day,hour,month,prices,region,timeslice,units_prices,year
-0,electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
-8,gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
-16,heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
-24,CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
-48,electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
-56,gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
-64,heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
-72,CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
-96,electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
-104,gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
-112,heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
-120,CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
-144,electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
-152,gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
-160,heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
-168,CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
-192,electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
-200,gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
-208,heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
-216,CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
-240,electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
-248,gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
-256,heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
-264,CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-1,electricity,all-week,night,all-year,0.43850000000,R1,0,MUS$2010/PJ,2025
-9,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
-17,heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
-25,CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-49,electricity,all-week,morning,all-year,0.65770000000,R1,1,MUS$2010/PJ,2025
-57,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
-65,heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
-73,CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-97,electricity,all-week,afternoon,all-year,0.43850000000,R1,2,MUS$2010/PJ,2025
-105,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
-113,heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
-121,CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-145,electricity,all-week,early-peak,all-year,0.65770000000,R1,3,MUS$2010/PJ,2025
-153,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
-161,heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
-169,CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-193,electricity,all-week,late-peak,all-year,1.31550000000,R1,4,MUS$2010/PJ,2025
-201,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
-209,heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
-217,CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-241,electricity,all-week,evening,all-year,0.87700000000,R1,5,MUS$2010/PJ,2025
-249,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
-257,heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
-265,CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-2,electricity,all-week,night,all-year,0.35030000000,R1,0,MUS$2010/PJ,2030
-10,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
-18,heat,all-week,night,all-year,0.04160000000,R1,0,MUS$2010/PJ,2030
-26,CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-50,electricity,all-week,morning,all-year,0.52640000000,R1,1,MUS$2010/PJ,2030
-58,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
-66,heat,all-week,morning,all-year,0.07550000000,R1,1,MUS$2010/PJ,2030
-74,CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-98,electricity,all-week,afternoon,all-year,0.35030000000,R1,2,MUS$2010/PJ,2030
-106,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
-114,heat,all-week,afternoon,all-year,0.04160000000,R1,2,MUS$2010/PJ,2030
-122,CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-146,electricity,all-week,early-peak,all-year,0.52640000000,R1,3,MUS$2010/PJ,2030
-154,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
-162,heat,all-week,early-peak,all-year,0.07550000000,R1,3,MUS$2010/PJ,2030
-170,CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-194,electricity,all-week,late-peak,all-year,1.05810000000,R1,4,MUS$2010/PJ,2030
-202,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
-210,heat,all-week,late-peak,all-year,0.23000000000,R1,4,MUS$2010/PJ,2030
-218,CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-242,electricity,all-week,evening,all-year,0.70300000000,R1,5,MUS$2010/PJ,2030
-250,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
-258,heat,all-week,evening,all-year,0.11830000000,R1,5,MUS$2010/PJ,2030
-266,CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-3,electricity,all-week,night,all-year,0.38160000000,R1,0,MUS$2010/PJ,2035
-11,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
-19,heat,all-week,night,all-year,0.03810000000,R1,0,MUS$2010/PJ,2035
-27,CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-51,electricity,all-week,morning,all-year,0.57320000000,R1,1,MUS$2010/PJ,2035
-59,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
-67,heat,all-week,morning,all-year,0.06770000000,R1,1,MUS$2010/PJ,2035
-75,CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-99,electricity,all-week,afternoon,all-year,0.38160000000,R1,2,MUS$2010/PJ,2035
-107,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
-115,heat,all-week,afternoon,all-year,0.03810000000,R1,2,MUS$2010/PJ,2035
-123,CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-147,electricity,all-week,early-peak,all-year,0.57320000000,R1,3,MUS$2010/PJ,2035
-155,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
-163,heat,all-week,early-peak,all-year,0.06770000000,R1,3,MUS$2010/PJ,2035
-171,CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-195,electricity,all-week,late-peak,all-year,1.15090000000,R1,4,MUS$2010/PJ,2035
-203,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
-211,heat,all-week,late-peak,all-year,0.19910000000,R1,4,MUS$2010/PJ,2035
-219,CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-243,electricity,all-week,evening,all-year,0.76530000000,R1,5,MUS$2010/PJ,2035
-251,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
-259,heat,all-week,evening,all-year,0.10430000000,R1,5,MUS$2010/PJ,2035
-267,CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-4,electricity,all-week,night,all-year,0.40390000000,R1,0,MUS$2010/PJ,2040
-12,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
-20,heat,all-week,night,all-year,0.03930000000,R1,0,MUS$2010/PJ,2040
-28,CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-52,electricity,all-week,morning,all-year,0.60650000000,R1,1,MUS$2010/PJ,2040
-60,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
-68,heat,all-week,morning,all-year,0.07050000000,R1,1,MUS$2010/PJ,2040
-76,CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-100,electricity,all-week,afternoon,all-year,0.40390000000,R1,2,MUS$2010/PJ,2040
-108,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
-116,heat,all-week,afternoon,all-year,0.03930000000,R1,2,MUS$2010/PJ,2040
-124,CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-148,electricity,all-week,early-peak,all-year,0.60650000000,R1,3,MUS$2010/PJ,2040
-156,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
-164,heat,all-week,early-peak,all-year,0.07050000000,R1,3,MUS$2010/PJ,2040
-172,CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-196,electricity,all-week,late-peak,all-year,1.21680000000,R1,4,MUS$2010/PJ,2040
-204,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
-212,heat,all-week,late-peak,all-year,0.21030000000,R1,4,MUS$2010/PJ,2040
-220,CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-244,electricity,all-week,evening,all-year,0.80950000000,R1,5,MUS$2010/PJ,2040
-252,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
-260,heat,all-week,evening,all-year,0.10930000000,R1,5,MUS$2010/PJ,2040
-268,CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-5,electricity,all-week,night,all-year,0.44080000000,R1,0,MUS$2010/PJ,2045
-13,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
-21,heat,all-week,night,all-year,0.04020000000,R1,0,MUS$2010/PJ,2045
-29,CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-53,electricity,all-week,morning,all-year,0.66170000000,R1,1,MUS$2010/PJ,2045
-61,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
-69,heat,all-week,morning,all-year,0.07250000000,R1,1,MUS$2010/PJ,2045
-77,CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-101,electricity,all-week,afternoon,all-year,0.44080000000,R1,2,MUS$2010/PJ,2045
-109,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
-117,heat,all-week,afternoon,all-year,0.04020000000,R1,2,MUS$2010/PJ,2045
-125,CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-149,electricity,all-week,early-peak,all-year,0.66170000000,R1,3,MUS$2010/PJ,2045
-157,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
-165,heat,all-week,early-peak,all-year,0.07250000000,R1,3,MUS$2010/PJ,2045
-173,CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-197,electricity,all-week,late-peak,all-year,1.32680000000,R1,4,MUS$2010/PJ,2045
-205,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
-213,heat,all-week,late-peak,all-year,0.21820000000,R1,4,MUS$2010/PJ,2045
-221,CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-245,electricity,all-week,evening,all-year,0.88310000000,R1,5,MUS$2010/PJ,2045
-253,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
-261,heat,all-week,evening,all-year,0.11290000000,R1,5,MUS$2010/PJ,2045
-269,CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-6,electricity,all-week,night,all-year,0.63350000000,R1,0,MUS$2010/PJ,2050
-14,gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
-22,heat,all-week,night,all-year,0.04170000000,R1,0,MUS$2010/PJ,2050
-30,CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-54,electricity,all-week,morning,all-year,0.95090000000,R1,1,MUS$2010/PJ,2050
-62,gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
-70,heat,all-week,morning,all-year,0.07580000000,R1,1,MUS$2010/PJ,2050
-78,CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-102,electricity,all-week,afternoon,all-year,0.63350000000,R1,2,MUS$2010/PJ,2050
-110,gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
-118,heat,all-week,afternoon,all-year,0.04170000000,R1,2,MUS$2010/PJ,2050
-126,CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-150,electricity,all-week,early-peak,all-year,0.95090000000,R1,3,MUS$2010/PJ,2050
-158,gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
-166,heat,all-week,early-peak,all-year,0.07580000000,R1,3,MUS$2010/PJ,2050
-174,CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-198,electricity,all-week,late-peak,all-year,1.90630000000,R1,4,MUS$2010/PJ,2050
-206,gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
-214,heat,all-week,late-peak,all-year,0.23140000000,R1,4,MUS$2010/PJ,2050
-222,CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-246,electricity,all-week,evening,all-year,1.26890000000,R1,5,MUS$2010/PJ,2050
-254,gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
-262,heat,all-week,evening,all-year,0.11870000000,R1,5,MUS$2010/PJ,2050
-270,CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.43850000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,1.07360000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.65770000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,1.61040000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.43850000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,1.07360000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.65770000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,1.61040000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,1.31550000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.22070000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.87700000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.14720000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.35030000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.04160000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.52640000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.07550000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.35030000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.04160000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.52640000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.07550000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,1.05810000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.23000000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.70300000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.11830000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.38160000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.03810000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.57320000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.06770000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.38160000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.03810000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.57320000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.06770000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,1.15090000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.19910000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.76530000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.10430000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.40390000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.03930000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.60650000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.07050000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.40390000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.03930000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.60650000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.07050000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,1.21680000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.21030000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.80950000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.10930000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.44080000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.04020000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.66170000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.07250000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.44080000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.04020000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.66170000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.07250000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,1.32680000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.21820000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.88310000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.11290000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.63350000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.04720000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.04170000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.95090000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.07080000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.07580000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.63350000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.04720000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.04170000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.95090000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.07080000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.07580000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,1.90630000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.14170000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.23140000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,1.26890000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.09440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.11870000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index 3576f13f..281840bf 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -17,11 +17,13 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
+index = false
 
 [[outputs]]
 quantity = "timeslice_consumption"

From 727ac9bcf1a3f41e65fe56d40ccbc14828d019fd Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 18 Jul 2024 13:31:35 +0100
Subject: [PATCH 394/419] Add back future_propagation

---
 src/muse/mca.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/muse/mca.py b/src/muse/mca.py
index 0c0f6168..6ecea14d 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -15,6 +15,7 @@
 from muse.readers import read_initial_market
 from muse.sectors import SECTORS_REGISTERED, AbstractSector
 from muse.timeslices import drop_timeslice
+from muse.utilities import future_propagation
 
 
 class MCA:
@@ -302,8 +303,6 @@ def run(self) -> None:
         from numpy import where
         from xarray import DataArray
 
-        from muse.utilities import future_propagation
-
         _, self.sectors, hist_years = self.calibrate_legacy_sectors()
         if len(hist_years) > 0:
             hist = where(self.time_framework <= hist_years[-1])[0]
@@ -557,7 +556,11 @@ def find_equilibrium(
             break
 
         # Update prices
-        market["prices"] = drop_timeslice(market["updated_prices"])
+        market["prices"] = drop_timeslice(
+            future_propagation(
+                market["prices"], market["updated_prices"].sel(year=market.year[1])
+            )
+        )
 
         # Check convergence
         converged = check_equilibrium(

From 68be515e0542d3a47c6d892dbdf3a79006667770 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 18 Jul 2024 17:14:39 +0100
Subject: [PATCH 395/419] Remove index column from capacity files

---
 .../Results/MCACapacity.csv                   | 112 ++--
 .../1-introduction/Results/MCACapacity.csv    | 112 ++--
 .../1-introduction/settings.toml              |  10 -
 .../2-scenario/Results/MCACapacity.csv        | 112 ++--
 .../2-scenario/settings.toml                  |  10 -
 .../Results/MCACapacity.csv                   | 210 +++----
 .../1-single-objective/settings.toml          |  10 -
 .../Results/MCACapacity.csv                   | 190 +++---
 .../2-multiple-objective/settings.toml        |  10 -
 .../1-new-region/Results/MCACapacity.csv      | 210 +++----
 .../3-add-region/1-new-region/settings.toml   |  10 -
 .../Results/MCACapacity.csv                   | 210 +++----
 .../1-modify-timeslices/settings.toml         |  10 -
 .../Results/MCACapacity.csv                   | 554 +++++++++---------
 .../2-modify-time-framework/settings.toml     |  10 -
 .../Results/MCACapacity.csv                   | 262 ++++-----
 .../1-exogenous-demand/settings.toml          |  10 -
 .../1-correlation/Results/MCACapacity.csv     |  86 +--
 .../1-correlation/settings.toml               |  10 -
 .../1-min-constraint/Results/MCACapacity.csv  |  86 +--
 .../2-max-constraint/Results/MCACapacity.csv  |  76 +--
 src/muse/data/example/default/settings.toml   |  10 -
 .../data/example/default_retro/settings.toml  |  10 -
 .../example/minimum_service/settings.toml     |  10 -
 src/muse/data/example/trade/settings.toml     |  10 -
 src/muse/outputs/mca.py                       |   2 -
 tests/example_outputs/default/MCACapacity.csv | 116 ++--
 .../default_retro/MCACapacity.csv             | 114 ++--
 .../default_timeslice/MCACapacity.csv         |  78 +--
 tests/example_outputs/medium/MCACapacity.csv  | 134 ++---
 .../minimum_service/MCACapacity.csv           |  70 +--
 .../multiple_agents/MCACapacity.csv           | 136 ++---
 .../trade/Gas/Capacity/2020.csv               |   8 +-
 .../trade/Gas/Capacity/2025.csv               |   6 +-
 .../trade/Gas/Capacity/2030.csv               |   6 +-
 .../trade/Gas/Capacity/2035.csv               |   4 +-
 tests/example_outputs/trade/MCACapacity.csv   |  62 +-
 .../trade/Power/Capacity/2020.csv             |  12 +-
 .../trade/Power/Capacity/2025.csv             |  10 +-
 .../trade/Power/Capacity/2030.csv             |   8 +-
 .../trade/Power/Capacity/2035.csv             |   6 +-
 41 files changed, 1495 insertions(+), 1627 deletions(-)

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 2e05bdb0..0dd0fb61 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -1,56 +1,56 @@
-agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
-A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
-A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
-A1,10.00000000000,R1,26,2020,R1,power,solarPV,newcapa,2025
-A1,6.00000000000,R1,49,2020,R1,power,windturbine,newcapa,2025
-A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
-A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-A1,2.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
-A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
-A1,9.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
-A1,6.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
-A1,7.50000000000,R1,4,2020,R1,gas,gassupply1,newcapa,2030
-A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
-A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-A1,2.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
-A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
-A1,9.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
-A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
-A1,6.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
-A1,3.38700000000,R1,7,2030,R1,gas,gassupply1,newcapa,2035
-A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
-A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-A1,2.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
-A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
-A1,9.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
-A1,3.38700000000,R1,9,2030,R1,gas,gassupply1,newcapa,2040
-A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
-A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-A1,2.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
-A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
-A1,9.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
-A1,3.38700000000,R1,16,2030,R1,gas,gassupply1,newcapa,2045
-A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
-A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-A1,2.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
-A1,1.00000000000,R1,23,2045,R1,power,gasCCGT,newcapa,2050
-A1,9.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
-A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
-A1,10.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
-A1,3.38700000000,R1,19,2030,R1,gas,gassupply1,newcapa,2050
-A1,1.64630000000,R1,20,2045,R1,gas,gassupply1,newcapa,2050
+,agent,capacity,dst_region,installed,region,sector,technology,type,year
+0,A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+0,A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+0,A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+1,A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+11,A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+2,A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+26,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2025
+49,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+1,A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+16,A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+17,A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+5,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+34,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
+35,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
+72,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+4,A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+28,A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+29,A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+7,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+40,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035
+41,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
+42,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+87,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+7,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+45,A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+46,A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+9,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+52,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
+53,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
+54,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+55,A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+116,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+9,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+66,A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+67,A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+16,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+90,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045
+91,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
+92,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+93,A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+94,A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+190,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+16,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+91,A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+92,A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+22,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+23,A1,1.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+116,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2050
+117,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+118,A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+119,A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+120,A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+235,A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+19,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+20,A1,1.64630000000,R1,2045,R1,gas,gassupply1,newcapa,2050
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 87f657af..9512dc3d 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
@@ -1,56 +1,56 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.68980000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,10.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.47130000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,10.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.47130000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,10.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.47130000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.68980000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.47130000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.58320000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.47130000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.47130000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.47130000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,2.68980000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.47130000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.58320000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index bdd1fc84..5ee06b3d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
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 26af66e8..79c05ebd 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
@@ -1,56 +1,56 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.33440000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.04110000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.22220000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,2.04110000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index bdd1fc84..5ee06b3d 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
index 80cbbaad..18c7514d 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -1,105 +1,105 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,newcapa,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A1,power,newcapa,2025,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,4.06250000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2030,4.06250000000
-windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,1.26000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2035,4.06250000000
-solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,4.20550000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2040,4.06250000000
-solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,4.20550000000
-heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,4.06250000000
-solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,4.20550000000
-heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
-gasCCGT,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,4.06250000000
-solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.26000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,4.20550000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,1.26000000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,4.20550000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2030
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030
+A2,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A2,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2030
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A2,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2035
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035
+A2,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A2,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2035
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A2,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A2,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2040
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040
+A2,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A2,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2040
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A2,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A2,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2045
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045
+A2,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A2,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2045
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A2,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2050
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,8.68750000000,R1,2045,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A2,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2050
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A2,8.68750000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A2,1.26000000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,4.20550000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index bdd1fc84..5ee06b3d 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index 1e2906cd..b15237f9 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -1,95 +1,95 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,newcapa,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A1,power,newcapa,2025,4.18750000000
-gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,4.06250000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.18750000000
-solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2030,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.18750000000
-solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2035,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,2.73270000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.18750000000
-solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2040,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,2.73270000000
-heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.18750000000
-solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2045,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,2.73270000000
-heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,4.06250000000
-solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,8.68750000000
-solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,8.68750000000
-windturbine,R1,R1,A2,power,newcapa,2050,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.73270000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,2.73270000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2030
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2035
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A2,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2040
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A2,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2045
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A2,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,4.06250000000,R1,2025,R1,power,solarPV,newcapa,2050
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,8.68750000000,R1,2045,R1,power,solarPV,newcapa,2050
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A2,8.68750000000,R1,2045,R1,power,solarPV,newcapa,2050
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2050
+A1,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A2,2.73270000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index bdd1fc84..5ee06b3d 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
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 19cab0f3..e96ad543 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
@@ -1,105 +1,105 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,19.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2030,6.75000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,5.88890000000
-windturbine,R2,R2,A1,power,newcapa,2030,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.33440000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,2.33440000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,10.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2035,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2035,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,2.33440000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,26.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2040,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,2.33440000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,16.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.75000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2045,16.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,2.33440000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,32.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.22220000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,12.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.33440000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.02060000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,2.33440000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,1.02060000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
+A1,16.75000000000,R2,2020,R2,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,10.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,16.75000000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,2.33440000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,10.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035
+A1,26.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2035
+A1,16.75000000000,R2,2020,R2,power,windturbine,newcapa,2035
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,2.33440000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,26.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,16.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2040
+A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2040
+A1,16.75000000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,2.33440000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,16.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045
+A1,32.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,6.75000000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2045
+A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2045
+A1,6.00000000000,R2,2040,R2,power,solarPV,newcapa,2045
+A1,16.75000000000,R2,2020,R2,power,windturbine,newcapa,2045
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,2.33440000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,32.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050
+A1,22.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.22220000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2050
+A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2050
+A1,6.00000000000,R2,2040,R2,power,solarPV,newcapa,2050
+A1,10.00000000000,R2,2045,R2,power,solarPV,newcapa,2050
+A1,12.75000000000,R2,2045,R2,power,windturbine,newcapa,2050
+A1,2.33440000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.02060000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+A1,2.33440000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050
+A1,1.02060000000,R2,2045,R2,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index a5f4cc36..7e3cc760 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 209b3b0f..aa848c23 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -1,105 +1,105 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,5.05910000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2030,5.05910000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,5.75150000000
-windturbine,R2,R2,A1,power,newcapa,2030,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.10500000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,2.10500000000
-heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2035,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2035,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2035,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2035,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.10500000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,2.10500000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2040,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.10500000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,2.10500000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.05910000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2045,15.05910000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.10500000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,2.10500000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.75150000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,0.29290000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,10.65910000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.10500000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.24460000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,2.10500000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,0.24460000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,5.05910000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
+A1,15.05910000000,R2,2020,R2,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.05910000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,15.05910000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,2.10500000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,2.10500000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,5.05910000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2035
+A1,15.05910000000,R2,2020,R2,power,windturbine,newcapa,2035
+A1,2.10500000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,2.10500000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,5.05910000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2040
+A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2040
+A1,15.05910000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,2.10500000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,2.10500000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,5.05910000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,5.60000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2045
+A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2045
+A1,5.60000000000,R2,2040,R2,power,solarPV,newcapa,2045
+A1,15.05910000000,R2,2020,R2,power,windturbine,newcapa,2045
+A1,2.10500000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,2.10500000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050
+A1,23.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,0.29290000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,5.60000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2050
+A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2050
+A1,5.60000000000,R2,2040,R2,power,solarPV,newcapa,2050
+A1,10.00000000000,R2,2045,R2,power,solarPV,newcapa,2050
+A1,10.65910000000,R2,2045,R2,power,windturbine,newcapa,2050
+A1,2.10500000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.24460000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+A1,2.10500000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050
+A1,0.24460000000,R2,2045,R2,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index ad68d381..aa1218cf 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 3ea7214c..afe8db8e 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -1,277 +1,277 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2022,8.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2022,11.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2022,8.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2022,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2022,1.34360000000
-solarPV,R1,R1,A1,power,newcapa,2022,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2022,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2022,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2022,8.77320000000
-gasboiler,R1,R1,A1,residential,newcapa,2024,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2024,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2024,4.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2024,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2024,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2024,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2024,1.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2024,1.85640000000
-solarPV,R1,R1,A1,power,newcapa,2024,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2024,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2024,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2024,1.85640000000
-windturbine,R2,R2,A1,power,newcapa,2024,8.77320000000
-gasboiler,R1,R1,A1,residential,newcapa,2026,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2026,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2026,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2026,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,1.14360000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,2.07980000000
-solarPV,R1,R1,A1,power,newcapa,2026,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2026,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,0.80000000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,2.07980000000
-windturbine,R2,R2,A1,power,newcapa,2026,8.77320000000
-gasboiler,R1,R1,A1,residential,newcapa,2028,2.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2028,2.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,0.74360000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,2.29760000000
-solarPV,R1,R1,A1,power,newcapa,2028,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2028,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,0.40000000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,2.29760000000
-windturbine,R2,R2,A1,power,newcapa,2028,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,10.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,10.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,3.52150000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,0.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.31150000000
-solarPV,R1,R1,A1,power,newcapa,2030,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.31150000000
-windturbine,R2,R2,A1,power,newcapa,2030,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.52150000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,3.53600000000
-heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,13.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,0.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2032,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2032,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,0.99560000000
-windturbine,R2,R2,A1,power,newcapa,2032,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,4.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,3.52150000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,4.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,4.66260000000
-heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,0.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2034,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2034,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2034,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2034,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,1.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.52150000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,0.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2036,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2036,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2036,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2036,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.52150000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,1.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,0.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2038,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2038,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2038,8.77320000000
-heatpump,R1,R1,A1,residential,newcapa,2040,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,8.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,0.34360000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2040,4.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2040,8.77320000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.52150000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.52150000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,1.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022
+A1,8.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2022
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2022
+A1,1.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2022
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2022
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2022
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2022
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2022
+A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024
+A1,6.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2024
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2024
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2024
+A1,1.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2024
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2024
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2024
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2024
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2024
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2024
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2024
+A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026
+A1,4.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2026
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2026
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2026
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2026
+A1,1.14360000000,R1,2020,R1,power,gasCCGT,newcapa,2026
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2026
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2026
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2026
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2026
+A1,0.80000000000,R2,2020,R2,power,gasCCGT,newcapa,2026
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2026
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2026
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2026
+A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028
+A1,2.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2028
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2028
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2028
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2028
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2028
+A1,0.74360000000,R1,2020,R1,power,gasCCGT,newcapa,2028
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2028
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2028
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2028
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2028
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2028
+A1,0.40000000000,R2,2020,R2,power,gasCCGT,newcapa,2028
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2028
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2028
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2028
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2028
+A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028
+A1,3.52150000000,R1,2026,R1,gas,gassupply1,newcapa,2028
+A1,10.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2028
+A1,3.52150000000,R2,2026,R2,gas,gassupply1,newcapa,2028
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2030
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2030
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2030
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2030
+A1,0.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2030
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2030
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2030
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2030
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2030
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2030
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2030
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2030
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,3.52150000000,R1,2026,R1,gas,gassupply1,newcapa,2030
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2030
+A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,3.52150000000,R2,2026,R2,gas,gassupply1,newcapa,2030
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2030
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2032
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2032
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2032
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2032
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2032
+A1,0.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2032
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2032
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2032
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2032
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2032
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2032
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2032
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2032
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2032
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2032
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2032
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2032
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2032
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2032
+A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032
+A1,3.52150000000,R1,2026,R1,gas,gassupply1,newcapa,2032
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2032
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2032
+A1,4.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2032
+A1,3.52150000000,R2,2026,R2,gas,gassupply1,newcapa,2032
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2032
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2032
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2034
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2034
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2034
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2034
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2034
+A1,0.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2034
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2034
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2034
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2034
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2034
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2034
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2034
+A1,2.24000000000,R1,2032,R1,power,solarPV,newcapa,2034
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2034
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2034
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2034
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2034
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2034
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2034
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2034
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2034
+A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034
+A1,3.52150000000,R1,2026,R1,gas,gassupply1,newcapa,2034
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2034
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2034
+A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034
+A1,1.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2034
+A1,3.52150000000,R2,2026,R2,gas,gassupply1,newcapa,2034
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2034
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2034
+A1,3.00000000000,R2,2032,R2,gas,gassupply1,newcapa,2034
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036
+A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2036
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2036
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2036
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2036
+A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2036
+A1,0.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2036
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2036
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2036
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2036
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2036
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2036
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2036
+A1,2.24000000000,R1,2032,R1,power,solarPV,newcapa,2036
+A1,2.24000000000,R1,2034,R1,power,solarPV,newcapa,2036
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2036
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2036
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2036
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2036
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2036
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2036
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2036
+A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2036
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2036
+A1,3.52150000000,R1,2026,R1,gas,gassupply1,newcapa,2036
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2036
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2036
+A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036
+A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036
+A1,3.52150000000,R2,2026,R2,gas,gassupply1,newcapa,2036
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2036
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2036
+A1,3.00000000000,R2,2032,R2,gas,gassupply1,newcapa,2036
+A1,1.50000000000,R2,2034,R2,gas,gassupply1,newcapa,2036
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038
+A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038
+A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2038
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2038
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2038
+A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2038
+A1,6.00000000000,R2,2036,R2,residential,heatpump,newcapa,2038
+A1,0.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2038
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2038
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2038
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2038
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2038
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2038
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2038
+A1,2.24000000000,R1,2032,R1,power,solarPV,newcapa,2038
+A1,2.24000000000,R1,2034,R1,power,solarPV,newcapa,2038
+A1,2.24000000000,R1,2036,R1,power,solarPV,newcapa,2038
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2038
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2038
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2038
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2038
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2038
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2038
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2038
+A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2038
+A1,2.24000000000,R2,2036,R2,power,solarPV,newcapa,2038
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2038
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040
+A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2040
+A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2040
+A1,6.00000000000,R2,2036,R2,residential,heatpump,newcapa,2040
+A1,8.00000000000,R2,2038,R2,residential,heatpump,newcapa,2040
+A1,0.34360000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2040
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2040
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2040
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2040
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,4.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,2.24000000000,R1,2032,R1,power,solarPV,newcapa,2040
+A1,2.24000000000,R1,2034,R1,power,solarPV,newcapa,2040
+A1,2.24000000000,R1,2036,R1,power,solarPV,newcapa,2040
+A1,2.24000000000,R1,2038,R1,power,solarPV,newcapa,2040
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2040
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2040
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2040
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2040
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2040
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2040
+A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2040
+A1,2.24000000000,R2,2036,R2,power,solarPV,newcapa,2040
+A1,2.24000000000,R2,2038,R2,power,solarPV,newcapa,2040
+A1,8.77320000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,3.52150000000,R1,2026,R1,gas,gassupply1,newcapa,2040
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2040
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040
+A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040
+A1,3.52150000000,R2,2026,R2,gas,gassupply1,newcapa,2040
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2040
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,3.00000000000,R2,2032,R2,gas,gassupply1,newcapa,2040
+A1,1.50000000000,R2,2034,R2,gas,gassupply1,newcapa,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index d9fc5065..f51c479a 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 73ab4b14..0d38b6c1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -1,131 +1,131 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gas_stove,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gas_stove,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2025,17.00000000000
-gas_stove,R1,R1,A1,residential,newcapa,2025,5.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gas_stove,R2,R2,A1,residential,newcapa,2025,5.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,12.36820000000
-windturbine,R1,R1,A1,power,newcapa,2025,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,1.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,15.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2030,17.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2030,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2030,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2030,12.36820000000
-windturbine,R1,R1,A1,power,newcapa,2030,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,10.50300000000
-windturbine,R2,R2,A1,power,newcapa,2030,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,10.04010000000
-electric_stove,R1,R1,A1,residential,newcapa,2035,11.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2035,22.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2035,11.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2035,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2035,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2035,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2035,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2035,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2035,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
-electric_stove,R1,R1,A1,residential,newcapa,2040,22.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2040,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2040,22.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2040,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2040,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2040,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2040,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2040,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2040,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
-electric_stove,R1,R1,A1,residential,newcapa,2045,17.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2045,27.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2045,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2045,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2045,12.36820000000
-solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2045,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2045,32.36820000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
-electric_stove,R1,R1,A1,residential,newcapa,2050,27.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2050,23.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2050,27.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2050,23.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,10.50300000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.58590000000
-solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,20.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,23.56820000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.04010000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.32420000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,10.04010000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,1.32420000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gas_stove,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,17.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025
+A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,17.00000000000,R2,2020,R2,residential,electric_stove,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gas_stove,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,12.36820000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
+A1,32.36820000000,R2,2020,R2,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,17.00000000000,R2,2020,R2,residential,electric_stove,newcapa,2030
+A1,11.00000000000,R2,2025,R2,residential,electric_stove,newcapa,2030
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,12.36820000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,32.36820000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.04010000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,10.04010000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,11.00000000000,R2,2025,R2,residential,electric_stove,newcapa,2035
+A1,22.00000000000,R2,2030,R2,residential,electric_stove,newcapa,2035
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,12.36820000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,11.20000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,11.20000000000,R2,2030,R2,power,solarPV,newcapa,2035
+A1,32.36820000000,R2,2020,R2,power,windturbine,newcapa,2035
+A1,10.04010000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,10.04010000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,22.00000000000,R2,2030,R2,residential,electric_stove,newcapa,2040
+A1,17.00000000000,R2,2035,R2,residential,electric_stove,newcapa,2040
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,12.36820000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,11.20000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,11.20000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,11.20000000000,R2,2030,R2,power,solarPV,newcapa,2040
+A1,11.20000000000,R2,2035,R2,power,solarPV,newcapa,2040
+A1,32.36820000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,10.04010000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,10.04010000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,17.00000000000,R2,2035,R2,residential,electric_stove,newcapa,2045
+A1,27.00000000000,R2,2040,R2,residential,electric_stove,newcapa,2045
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,12.36820000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,11.20000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,11.20000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,11.20000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,11.20000000000,R2,2030,R2,power,solarPV,newcapa,2045
+A1,11.20000000000,R2,2035,R2,power,solarPV,newcapa,2045
+A1,11.20000000000,R2,2040,R2,power,solarPV,newcapa,2045
+A1,32.36820000000,R2,2020,R2,power,windturbine,newcapa,2045
+A1,10.04010000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,10.04010000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050
+A1,23.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,27.00000000000,R2,2040,R2,residential,electric_stove,newcapa,2050
+A1,23.00000000000,R2,2045,R2,residential,electric_stove,newcapa,2050
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050
+A1,23.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.58590000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,11.20000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,11.20000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,11.20000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,20.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,20.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,11.20000000000,R2,2030,R2,power,solarPV,newcapa,2050
+A1,11.20000000000,R2,2035,R2,power,solarPV,newcapa,2050
+A1,11.20000000000,R2,2040,R2,power,solarPV,newcapa,2050
+A1,20.00000000000,R2,2045,R2,power,solarPV,newcapa,2050
+A1,23.56820000000,R2,2045,R2,power,windturbine,newcapa,2050
+A1,10.04010000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.32420000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+A1,10.04010000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050
+A1,1.32420000000,R2,2045,R2,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index ad68d381..aa1218cf 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
index 46094120..3645b93e 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -1,43 +1,43 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,9.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,9.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,2.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,5.08550000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,5.08550000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.13890000000
-heatpump,R1,R1,A1,residential,newcapa,2045,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,12.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,9.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,5.08550000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.13890000000
-heatpump,R1,R1,A1,residential,newcapa,2050,12.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,7.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,9.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,5.08550000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.13890000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,9.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,9.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,9.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,5.08550000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,9.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,5.08550000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,0.13890000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,9.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,5.08550000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,0.13890000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,9.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.08550000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.13890000000,R1,2035,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 667da2f5..3a86cfd2 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
index b254f42d..5e4f2472 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
@@ -1,43 +1,43 @@
-agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
-A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
-A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
-A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
-A1,15.42960000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
-A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
-A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
-A1,7.92960000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
-A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
-A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
-A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
-A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
-A1,0.42960000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
-A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
-A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
-A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
-A1,0.42960000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
-A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
-A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
-A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
-A1,0.42960000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
-A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
-A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
-A1,0.42960000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,7.92960000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,0.42960000000,R1,2020,R1,gas,gassupply1,newcapa,2050
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 1fa3b0b5..aada2b7b 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
@@ -1,38 +1,38 @@
-agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
-A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
-A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-A1,1.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
-A1,20.54670000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
-A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-A1,1.00000000000,R1,55,2025,R1,power,windturbine,newcapa,2030
-A1,13.04670000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
-A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
-A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-A1,1.00000000000,R1,85,2025,R1,power,windturbine,newcapa,2035
-A1,1.00000000000,R1,86,2030,R1,power,windturbine,newcapa,2035
-A1,5.54670000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
-A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
-A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-A1,1.00000000000,R1,121,2025,R1,power,windturbine,newcapa,2040
-A1,1.00000000000,R1,122,2030,R1,power,windturbine,newcapa,2040
-A1,1.00000000000,R1,123,2035,R1,power,windturbine,newcapa,2040
-A1,5.54670000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
-A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
-A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-A1,1.00000000000,R1,163,2025,R1,power,windturbine,newcapa,2045
-A1,1.00000000000,R1,164,2030,R1,power,windturbine,newcapa,2045
-A1,1.00000000000,R1,165,2035,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,166,2040,R1,power,windturbine,newcapa,2045
-A1,5.54670000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
-A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
-A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-A1,1.00000000000,R1,218,2025,R1,power,windturbine,newcapa,2050
-A1,1.00000000000,R1,219,2030,R1,power,windturbine,newcapa,2050
-A1,1.00000000000,R1,220,2035,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,221,2040,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,222,2045,R1,power,windturbine,newcapa,2050
-A1,5.54670000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,20.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,13.04670000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050
+A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2050
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index 2881074a..a9c2ed60 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index a3f9c5dd..c3ec0db9 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 25ec0459..0dada7ad 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -31,16 +31,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 [sectors.industry]
 type = 'default'
diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
index 885c47d4..05dc09d5 100644
--- a/src/muse/data/example/trade/settings.toml
+++ b/src/muse/data/example/trade/settings.toml
@@ -24,16 +24,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 index = false
-keep_columns = [
-    'technology',
-    'dst_region',
-    'region',
-    'agent',
-    'sector',
-    'type',
-    'year',
-    'capacity'
-]
 
 [carbon_budget_control]
 budget = []
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 1a6aa638..6f049e57 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -219,8 +219,6 @@ def sector_capacity(sector: AbstractSector) -> pd.DataFrame:
 
     capacity = pd.concat([u for u in capa_sector])
     capacity = capacity[capacity.capacity != 0]
-
-    capacity = capacity.reset_index()
     return capacity
 
 
diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv
index bff22f00..3ea324e1 100644
--- a/tests/example_outputs/default/MCACapacity.csv
+++ b/tests/example_outputs/default/MCACapacity.csv
@@ -1,58 +1,58 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,6.81430000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.54570000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.32590000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,7.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.32590000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,7.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.32590000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,3.49130000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,0.32590000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,0.32590000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.32590000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,3.49130000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default_retro/MCACapacity.csv b/tests/example_outputs/default_retro/MCACapacity.csv
index 8af577d6..89f28e26 100644
--- a/tests/example_outputs/default_retro/MCACapacity.csv
+++ b/tests/example_outputs/default_retro/MCACapacity.csv
@@ -1,57 +1,57 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,4.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,9.58580000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2035,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,9.58580000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,9.58580000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-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,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,9.58580000000
-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,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,16.91000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,9.58580000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2025
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025
+A1,10.00000000000,R1,2020,R1,power,windturbine,retrofit,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2025
+A1,4.10000000000,R1,2025,R1,residential,gasboiler,retrofit,2030
+A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030
+A1,6.90000000000,R1,2025,R1,residential,heatpump,retrofit,2030
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2030
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2030
+A1,10.00000000000,R1,2020,R1,power,windturbine,retrofit,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,retrofit,2030
+A1,9.58580000000,R1,2025,R1,gas,gassupply1,retrofit,2030
+A1,4.10000000000,R1,2025,R1,residential,gasboiler,retrofit,2035
+A1,6.90000000000,R1,2025,R1,residential,heatpump,retrofit,2035
+A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2035
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2035
+A1,10.00000000000,R1,2020,R1,power,windturbine,retrofit,2035
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2035
+A1,9.58580000000,R1,2025,R1,gas,gassupply1,retrofit,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2035
+A1,0.91000000000,R1,2035,R1,residential,gasboiler,retrofit,2040
+A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040
+A1,16.09000000000,R1,2035,R1,residential,heatpump,retrofit,2040
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2040
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2040
+A1,10.00000000000,R1,2020,R1,power,windturbine,retrofit,2040
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2040
+A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2040
+A1,9.58580000000,R1,2025,R1,gas,gassupply1,retrofit,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2040
+A1,0.91000000000,R1,2035,R1,residential,gasboiler,retrofit,2045
+A1,16.09000000000,R1,2035,R1,residential,heatpump,retrofit,2045
+A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2045
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2045
+A1,10.00000000000,R1,2020,R1,power,windturbine,retrofit,2045
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2045
+A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2045
+A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045
+A1,9.58580000000,R1,2025,R1,gas,gassupply1,retrofit,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2045
+A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050
+A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2050
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2050
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2050
+A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2050
+A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050
+A1,16.91000000000,R1,2045,R1,power,windturbine,retrofit,2050
+A1,9.58580000000,R1,2025,R1,gas,gassupply1,retrofit,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2050
diff --git a/tests/example_outputs/default_timeslice/MCACapacity.csv b/tests/example_outputs/default_timeslice/MCACapacity.csv
index 238432c7..c36c539e 100644
--- a/tests/example_outputs/default_timeslice/MCACapacity.csv
+++ b/tests/example_outputs/default_timeslice/MCACapacity.csv
@@ -1,39 +1,39 @@
-agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
-A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
-A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
-A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
-A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
-A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
-A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
-A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
-A1,7.50000000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
-A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
-A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
-A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
-A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
-A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
-A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
-A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
-A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
-A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
-A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
-A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
-A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
-A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
-A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
-A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
diff --git a/tests/example_outputs/medium/MCACapacity.csv b/tests/example_outputs/medium/MCACapacity.csv
index 26cc97a1..9623ef34 100644
--- a/tests/example_outputs/medium/MCACapacity.csv
+++ b/tests/example_outputs/medium/MCACapacity.csv
@@ -1,67 +1,67 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,8.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2025,12.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,25.72460000000
-gasboiler,R1,R1,A1,residential,newcapa,2030,7.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2030,4.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,18.22460000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,12.65760000000
-gasboiler,R1,R1,A1,residential,newcapa,2035,7.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2035,11.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2035,7.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,7.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.78820000000
-gasstove,R1,R1,A1,residential,newcapa,2040,7.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2040,14.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,7.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,14.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.78820000000
-gasstove,R1,R1,A1,residential,newcapa,2045,14.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2045,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,14.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.78820000000
-gasstove,R1,R1,A1,residential,newcapa,2050,10.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2050,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.72460000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,12.65760000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.78820000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.88640000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,12.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025
+A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,25.72460000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,7.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030
+A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,18.22460000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,12.65760000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,7.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035
+A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035
+A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035
+A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,10.72460000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,12.65760000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,10.78820000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040
+A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040
+A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,10.72460000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,12.65760000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,10.78820000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045
+A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045
+A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,10.72460000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,12.65760000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,10.78820000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050
+A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050
+A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,17.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,4.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,10.72460000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,12.65760000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,10.78820000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.88640000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/minimum_service/MCACapacity.csv b/tests/example_outputs/minimum_service/MCACapacity.csv
index 96ee586b..683ada9f 100644
--- a/tests/example_outputs/minimum_service/MCACapacity.csv
+++ b/tests/example_outputs/minimum_service/MCACapacity.csv
@@ -1,35 +1,35 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-procammonia_1,R1,R1,A1,industry,newcapa,2010,26.00000000000
-procammonia_2,R1,R1,A1,industry,newcapa,2010,26.00000000000
-procammonia_1,R1,R1,A1,industry,newcapa,2015,29.90000000000
-procammonia_2,R1,R1,A1,industry,newcapa,2015,24.35470000000
-procammonia_1,R1,R1,A1,industry,newcapa,2020,25.56670000000
-procammonia_1,R1,R1,A1,industry,newcapa,2020,8.66670000000
-procammonia_2,R1,R1,A1,industry,newcapa,2020,20.02140000000
-procammonia_1,R1,R1,A1,industry,newcapa,2025,21.23330000000
-procammonia_1,R1,R1,A1,industry,newcapa,2025,8.66670000000
-procammonia_1,R1,R1,A1,industry,newcapa,2025,8.70630000000
-procammonia_2,R1,R1,A1,industry,newcapa,2025,15.68800000000
-procammonia_1,R1,R1,A1,industry,newcapa,2030,16.90000000000
-procammonia_1,R1,R1,A1,industry,newcapa,2030,8.66670000000
-procammonia_1,R1,R1,A1,industry,newcapa,2030,8.70630000000
-procammonia_1,R1,R1,A1,industry,newcapa,2030,8.70630000000
-procammonia_2,R1,R1,A1,industry,newcapa,2030,11.35470000000
-procammonia_1,R1,R1,A1,industry,newcapa,2035,4.33330000000
-procammonia_1,R1,R1,A1,industry,newcapa,2035,8.66670000000
-procammonia_1,R1,R1,A1,industry,newcapa,2035,8.70630000000
-procammonia_1,R1,R1,A1,industry,newcapa,2035,8.70630000000
-procammonia_1,R1,R1,A1,industry,newcapa,2035,18.79580000000
-procammonia_2,R1,R1,A1,industry,newcapa,2035,4.33330000000
-procammonia_1,R1,R1,A1,industry,newcapa,2040,8.70630000000
-procammonia_1,R1,R1,A1,industry,newcapa,2040,8.70630000000
-procammonia_1,R1,R1,A1,industry,newcapa,2040,18.79580000000
-procammonia_1,R1,R1,A1,industry,newcapa,2040,16.54120000000
-procammonia_1,R1,R1,A1,industry,newcapa,2045,8.70630000000
-procammonia_1,R1,R1,A1,industry,newcapa,2045,18.79580000000
-procammonia_1,R1,R1,A1,industry,newcapa,2045,16.54120000000
-procammonia_1,R1,R1,A1,industry,newcapa,2045,7.21970000000
-procammonia_1,R1,R1,A1,industry,newcapa,2050,18.79580000000
-procammonia_1,R1,R1,A1,industry,newcapa,2050,16.54120000000
-procammonia_1,R1,R1,A1,industry,newcapa,2050,7.21970000000
-procammonia_1,R1,R1,A1,industry,newcapa,2050,7.21970000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,26.00000000000,R1,2010,R1,industry,procammonia_1,newcapa,2010
+A1,26.00000000000,R1,2010,R1,industry,procammonia_2,newcapa,2010
+A1,29.90000000000,R1,2010,R1,industry,procammonia_1,newcapa,2015
+A1,24.35470000000,R1,2010,R1,industry,procammonia_2,newcapa,2015
+A1,25.56670000000,R1,2010,R1,industry,procammonia_1,newcapa,2020
+A1,8.66670000000,R1,2015,R1,industry,procammonia_1,newcapa,2020
+A1,20.02140000000,R1,2010,R1,industry,procammonia_2,newcapa,2020
+A1,21.23330000000,R1,2010,R1,industry,procammonia_1,newcapa,2025
+A1,8.66670000000,R1,2015,R1,industry,procammonia_1,newcapa,2025
+A1,8.70630000000,R1,2020,R1,industry,procammonia_1,newcapa,2025
+A1,15.68800000000,R1,2010,R1,industry,procammonia_2,newcapa,2025
+A1,16.90000000000,R1,2010,R1,industry,procammonia_1,newcapa,2030
+A1,8.66670000000,R1,2015,R1,industry,procammonia_1,newcapa,2030
+A1,8.70630000000,R1,2020,R1,industry,procammonia_1,newcapa,2030
+A1,8.70630000000,R1,2025,R1,industry,procammonia_1,newcapa,2030
+A1,11.35470000000,R1,2010,R1,industry,procammonia_2,newcapa,2030
+A1,4.33330000000,R1,2010,R1,industry,procammonia_1,newcapa,2035
+A1,8.66670000000,R1,2015,R1,industry,procammonia_1,newcapa,2035
+A1,8.70630000000,R1,2020,R1,industry,procammonia_1,newcapa,2035
+A1,8.70630000000,R1,2025,R1,industry,procammonia_1,newcapa,2035
+A1,18.79580000000,R1,2030,R1,industry,procammonia_1,newcapa,2035
+A1,4.33330000000,R1,2010,R1,industry,procammonia_2,newcapa,2035
+A1,8.70630000000,R1,2020,R1,industry,procammonia_1,newcapa,2040
+A1,8.70630000000,R1,2025,R1,industry,procammonia_1,newcapa,2040
+A1,18.79580000000,R1,2030,R1,industry,procammonia_1,newcapa,2040
+A1,16.54120000000,R1,2035,R1,industry,procammonia_1,newcapa,2040
+A1,8.70630000000,R1,2025,R1,industry,procammonia_1,newcapa,2045
+A1,18.79580000000,R1,2030,R1,industry,procammonia_1,newcapa,2045
+A1,16.54120000000,R1,2035,R1,industry,procammonia_1,newcapa,2045
+A1,7.21970000000,R1,2040,R1,industry,procammonia_1,newcapa,2045
+A1,18.79580000000,R1,2030,R1,industry,procammonia_1,newcapa,2050
+A1,16.54120000000,R1,2035,R1,industry,procammonia_1,newcapa,2050
+A1,7.21970000000,R1,2040,R1,industry,procammonia_1,newcapa,2050
+A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2050
diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv
index 96e87da9..36871fac 100644
--- a/tests/example_outputs/multiple_agents/MCACapacity.csv
+++ b/tests/example_outputs/multiple_agents/MCACapacity.csv
@@ -1,68 +1,68 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,6.81430000000
-heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,8.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.54570000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.54570000000
-heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.54570000000
-heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,8.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.81430000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.54570000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,3.81710000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,5.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,6.81430000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,6.54570000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,3.81710000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity/2020.csv
index a35c2ed5..a8ff7994 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -1,11 +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,2020,1,R2,gassupply1,2010,1200.00000000000
+R2,2025,1,R2,gassupply1,2010,700.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 9777d794..0389a29d 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -1,9 +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,2025,1,R2,gassupply1,2010,700.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 023078ee..52525599 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -1,9 +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,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2035,1,R2,gassupply1,2010,490.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index c232f077..10517be7 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -1,7 +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,2035,1,R2,gassupply1,2010,490.00000000000
+R2,2040,1,R2,gassupply1,2010,490.00000000000
 R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/MCACapacity.csv b/tests/example_outputs/trade/MCACapacity.csv
index e29ebaeb..e02186ec 100644
--- a/tests/example_outputs/trade/MCACapacity.csv
+++ b/tests/example_outputs/trade/MCACapacity.csv
@@ -1,31 +1,31 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,662.76000000000
-gasboiler,R2,R2,A1,residential,retrofit,2020,35.00000000000
-gasCCGT,R1,R1,A1,power,agent,2020,240.00000000000
-gasCCGT,R2,R2,A1,power,agent,2020,200.00000000000
-gassupply1,R1,R1,A1,gas,agent,2020,3000.00000000000
-gassupply1,R2,R2,A1,gas,agent,2020,1200.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,463.93200000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,355.93470000000
-gasboiler,R2,R2,A1,residential,retrofit,2025,24.50000000000
-gasCCGT,R1,R1,A1,power,agent,2025,192.00000000000
-gasCCGT,R2,R2,A1,power,agent,2025,140.00000000000
-gassupply1,R1,R1,A1,gas,agent,2025,2100.00000000000
-gassupply1,R2,R2,A1,gas,agent,2025,700.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,463.93200000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,355.93470000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,74.53330000000
-gasboiler,R2,R2,A1,residential,retrofit,2030,24.50000000000
-gasCCGT,R1,R1,A1,power,agent,2030,153.60000000000
-gasCCGT,R2,R2,A1,power,agent,2030,98.00000000000
-gassupply1,R1,R1,A1,gas,agent,2030,2100.00000000000
-gassupply1,R2,R2,A1,gas,agent,2030,700.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,394.34220000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,74.53330000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,444.15780000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,17.15000000000
-gasboiler,R2,R2,A1,residential,retrofit,2035,1.63330000000
-gasCCGT,R1,R1,A1,power,agent,2035,122.88000000000
-gasCCGT,R2,R2,A1,power,agent,2035,68.60000000000
-gassupply1,R1,R1,A1,gas,agent,2035,1470.00000000000
-gassupply1,R2,R2,A1,gas,agent,2035,490.00000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,662.76000000000,R1,2010,R1,residential,gasboiler,retrofit,2020
+A1,35.00000000000,R2,2010,R2,residential,gasboiler,retrofit,2020
+A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020
+A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020
+A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020
+A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020
+A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2025
+A1,355.93470000000,R1,2020,R1,residential,gasboiler,retrofit,2025
+A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2025
+A1,192.00000000000,R1,2010,R1,power,gasCCGT,agent,2025
+A1,140.00000000000,R2,2010,R2,power,gasCCGT,agent,2025
+A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2025
+A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2025
+A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2030
+A1,355.93470000000,R1,2020,R1,residential,gasboiler,retrofit,2030
+A1,74.53330000000,R1,2025,R1,residential,gasboiler,retrofit,2030
+A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2030
+A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030
+A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030
+A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030
+A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030
+A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035
+A1,74.53330000000,R1,2025,R1,residential,gasboiler,retrofit,2035
+A1,444.15780000000,R1,2030,R1,residential,gasboiler,retrofit,2035
+A1,17.15000000000,R2,2010,R2,residential,gasboiler,retrofit,2035
+A1,1.63330000000,R2,2030,R2,residential,gasboiler,retrofit,2035
+A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035
+A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035
+A1,1470.00000000000,R1,2010,R1,gas,gassupply1,agent,2035
+A1,490.00000000000,R2,2010,R2,gas,gassupply1,agent,2035
diff --git a/tests/example_outputs/trade/Power/Capacity/2020.csv b/tests/example_outputs/trade/Power/Capacity/2020.csv
index 66b1b173..29c0c8bd 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -1,15 +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,2020,1,R2,gasCCGT,2010,200.00000000000
+R2,2025,1,R2,gasCCGT,2010,140.00000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index 2e29060b..16c86de5 100644
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -1,13 +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,2025,1,R2,gasCCGT,2010,140.00000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index bb6eddda..3325b247 100644
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -1,11 +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,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index 768699fc..4d46864b 100644
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -1,9 +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,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 R2,2050,1,R2,gasCCGT,2010,23.52980000000

From 8c06e0160889a8ca87a166ec3c7095b981de1321 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 18 Jul 2024 17:22:40 +0100
Subject: [PATCH 396/419] Re-run tutorial 0

---
 .../Results/MCACapacity.csv                   | 112 +++++++++---------
 1 file changed, 56 insertions(+), 56 deletions(-)

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 0dd0fb61..b5687cac 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -1,56 +1,56 @@
-,agent,capacity,dst_region,installed,region,sector,technology,type,year
-0,A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
-0,A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
-0,A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
-1,A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-11,A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
-2,A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-26,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2025
-49,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
-1,A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-16,A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
-17,A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
-5,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-34,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
-35,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
-72,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
-4,A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-28,A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
-29,A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
-7,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-40,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035
-41,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
-42,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
-87,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
-7,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-45,A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
-46,A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
-9,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-52,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
-53,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
-54,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
-55,A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
-116,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
-9,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-66,A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
-67,A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
-16,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-90,A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045
-91,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
-92,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
-93,A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
-94,A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
-190,A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
-16,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-91,A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
-92,A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
-22,A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-23,A1,1.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050
-116,A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2050
-117,A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
-118,A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
-119,A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
-120,A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
-235,A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-19,A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-20,A1,1.64630000000,R1,2045,R1,gas,gassupply1,newcapa,2050
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,2.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,9.00000000000,R1,2025,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,3.38700000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.64630000000,R1,2045,R1,gas,gassupply1,newcapa,2050

From c56c3ce933fc5f63659703ca5b7212f803cef9af Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 19 Jul 2024 09:11:56 +0100
Subject: [PATCH 397/419] Fix error in supply_cost function

---
 src/muse/quantities.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/muse/quantities.py b/src/muse/quantities.py
index 162e1fcf..d81d1647 100644
--- a/src/muse/quantities.py
+++ b/src/muse/quantities.py
@@ -571,14 +571,10 @@ def supply_cost(
     if asset_dim is not None:
         if "region" not in data.coords or len(data.region.dims) == 0:
             data = data.sum(asset_dim)
-
         else:
             data = data.groupby("region").sum(asset_dim)
 
-    total = data.production.where(np.abs(data.production) > 1e-15, np.infty).sum(
-        "timeslice"
-    )
-    return data.prices / total
+    return data.prices / data.production.where(np.abs(data.production) > 1e-15, np.inf)
 
 
 def costed_production(

From 75ea324f667a47fe3a928545cbc51d9710b27637 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 19 Jul 2024 09:13:12 +0100
Subject: [PATCH 398/419] Update tutorial model results

---
 .../Results/MCAPrices.csv                     | 216 ++--
 .../1-introduction/Results/MCAPrices.csv      | 216 ++--
 .../2-scenario/Results/MCAPrices.csv          | 216 ++--
 .../1-single-objective/Results/MCAPrices.csv  | 216 ++--
 .../Results/MCAPrices.csv                     | 216 ++--
 .../1-new-region/Results/MCAPrices.csv        | 432 ++++----
 .../1-modify-timeslices/Results/MCAPrices.csv | 576 +++++------
 .../Results/MCAPrices.csv                     | 960 +++++++++---------
 .../1-exogenous-demand/Results/MCAPrices.csv  | 768 +++++++-------
 .../1-correlation/Results/MCAPrices.csv       | 216 ++--
 .../1-min-constraint/Results/MCAPrices.csv    | 216 ++--
 .../2-max-constraint/Results/MCAPrices.csv    | 216 ++--
 12 files changed, 2232 insertions(+), 2232 deletions(-)

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 1aaa9a19..ff7e8374 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.39120000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.19660000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,4.08500000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,3.23830000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.58830000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.30510000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,4.08500000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,3.23830000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.39120000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.19660000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,4.08500000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,3.23830000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.58830000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.30510000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,4.08500000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,3.23830000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.18520000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.67200000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,4.08500000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.23830000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.78630000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.42050000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,4.08500000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,3.23830000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.54810000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04600000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,5.69380000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,2.51800000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.82390000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.08550000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,5.69380000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,2.51800000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54810000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04600000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,5.69380000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,2.51800000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82390000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08550000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,5.69380000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,2.51800000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65840000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27120000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,5.69380000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.51800000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.10090000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.13620000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,5.69380000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,2.51800000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.61230000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.04850000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,6.30080000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,2.76080000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.92000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.09130000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,6.30080000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,2.76080000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.61230000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04850000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,6.30080000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,2.76080000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.92000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09130000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.30080000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,2.76080000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.84880000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.29400000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.30080000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.76080000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.22860000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.14640000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,6.30080000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,2.76080000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.67090000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,6.86500000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,2.98650000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.00770000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.09650000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,6.86500000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,2.98650000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.67090000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,6.86500000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,2.98650000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00770000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09650000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.86500000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,2.98650000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.02310000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31490000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.86500000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,2.98650000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.34530000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.15570000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,6.86500000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,2.98650000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.73270000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.05340000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,7.46020000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,3.22460000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.10020000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.10210000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,7.46020000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,3.22460000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.73270000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05340000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,7.46020000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,3.22460000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.10020000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10210000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.46020000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,3.22460000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.20700000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33700000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.46020000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.22460000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.46840000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.16560000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,7.46020000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,3.22460000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.81800000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05680000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,8.30270000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,3.56160000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.22800000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.10980000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,8.30270000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,3.56160000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.81800000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05680000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,8.30270000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,3.56160000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.22800000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10980000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.30270000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,3.56160000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.46220000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.36760000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.30270000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.56160000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.63870000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.17920000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,8.30270000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,3.56160000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 b3d7635c..43f5d2a9 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.87950000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21200000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.31290000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.89380000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.32360000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.34000000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.31290000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.89380000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.87950000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21200000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.31290000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.89380000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.32360000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34000000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.31290000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.89380000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.67300000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.81340000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.31290000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.89380000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.77050000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.48280000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.31290000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.89380000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.26500000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07470000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.24060000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.53680000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90240000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15020000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.24060000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.53680000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.26500000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07470000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.24060000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.53680000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90240000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15020000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.24060000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.53680000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.83440000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53230000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.24060000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.53680000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54320000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25160000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.24060000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.53680000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.44310000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08180000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,14.92280000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.20960000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.16880000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.16620000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,14.92280000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.20960000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.44310000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08180000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.92280000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.20960000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.16880000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16620000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.92280000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.20960000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.36220000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59560000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.92280000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.20960000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.89720000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.27990000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,14.92280000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.20960000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.57010000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08690000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,16.12150000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.68910000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,2.35860000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.17760000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,16.12150000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.68910000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.57010000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08690000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,16.12150000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.68910000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.35860000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17760000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.12150000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.68910000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.73830000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.64070000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.12150000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.68910000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,3.14950000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.30010000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,16.12150000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.68910000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.77590000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.09510000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,18.12650000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.49110000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.66690000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19610000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,18.12650000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.49110000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.77590000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09510000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,18.12650000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.49110000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.66690000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19610000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.12650000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.49110000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.35210000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71440000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.12650000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.49110000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,3.55990000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.33290000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,18.12650000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.49110000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.93630000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.10150000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,19.68940000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,8.11630000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.90710000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.21050000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,19.68940000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,8.11630000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.93630000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10150000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.68940000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.11630000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.90710000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21050000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.68940000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.11630000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.83060000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.77180000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.68940000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.11630000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.87980000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.35850000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,19.68940000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,8.11630000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 3cb531a2..8b6fc5f5 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
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.86840000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21170000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.30670000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.33920000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86840000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21170000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.30670000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.33920000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63870000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.81010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.48140000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.24960000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07400000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.47090000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.87930000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.14880000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.47090000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.24960000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07400000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.47090000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.87930000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14880000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.47090000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.78760000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.52670000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.47090000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.51220000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.24910000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.47090000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.42920000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08120000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.15060000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.14790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.16490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.15060000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.42920000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08120000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.15060000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.14790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.15060000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.31990000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59050000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.15060000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.86920000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.27760000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.15060000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.55590000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08630000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.62960000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,2.33730000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.17630000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.62960000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.55590000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08630000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.62960000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.33730000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17630000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.62960000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.69520000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.63560000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.62960000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,3.12090000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.29780000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.62960000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.75850000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.09440000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.41940000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.64080000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19450000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.41940000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.75850000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09440000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.41940000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.64080000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19450000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.41940000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.29960000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.70810000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.41940000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,3.52500000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.33010000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.41940000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.91390000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.10060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,8.02510000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.87360000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.20850000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,8.02510000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.91390000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10060000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.02510000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.87360000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20850000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.02510000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.76330000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.76370000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.02510000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.83500000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.35490000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,8.02510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index c65b1fa2..a89d6f24 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.15420000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.22070000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,5.82450000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.73730000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.35970000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,5.82450000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.15420000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.22070000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.82450000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.73730000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.35970000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.82450000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.51000000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.89290000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.82450000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.32420000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.51790000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,5.82450000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.49280000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.08380000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,2.24500000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.17080000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.49280000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08380000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.24500000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17080000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.52560000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.61520000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,3.00130000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.28820000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.85400000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.09820000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,19.18520000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,7.91460000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.78640000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.20330000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,19.18520000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,7.91460000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.85400000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09820000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.18520000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.91460000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.78640000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.20330000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.18520000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.91460000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.60500000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.74480000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.18520000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.91460000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,3.72230000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.34590000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,19.18520000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,7.91460000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.99990000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.10400000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,20.54460000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,8.45830000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,3.00430000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.21630000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,20.54460000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,8.45830000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.99990000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10400000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,20.54460000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.45830000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.00430000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21630000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,20.54460000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.45830000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.03600000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.79650000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,20.54460000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.45830000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,4.01190000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.36900000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,20.54460000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,8.45830000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,2.24780000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.11400000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,22.95080000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,9.42080000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,3.37560000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.23860000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,22.95080000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,9.42080000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.24780000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11400000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,22.95080000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,9.42080000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.37560000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.23860000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,22.95080000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,9.42080000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.77480000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.88510000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,22.95080000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,9.42080000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,4.50600000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.40860000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,22.95080000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,9.42080000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,2.43730000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.12150000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,24.79080000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,10.15680000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,3.65950000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.25560000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,24.79080000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,10.15680000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.43730000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.12150000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,24.79080000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,10.15680000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.65950000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.25560000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,24.79080000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,10.15680000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.33980000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.95290000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,24.79080000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,10.15680000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,4.88390000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.43880000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,24.79080000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,10.15680000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 873be068..24c15fe0 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.76500000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.20840000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,8.08020000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.50340000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.15110000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.33180000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,8.08020000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.50340000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.76500000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20840000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,8.08020000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.50340000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15110000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.33180000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.08020000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.50340000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.32370000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.78020000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.08020000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.50340000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.53960000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.46820000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,8.08020000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.50340000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.83150000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.05730000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,8.67020000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,3.70860000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.25030000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.11110000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,8.67020000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,3.70860000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.83150000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05730000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,8.67020000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,3.70860000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.25030000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.11110000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.67020000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,3.70860000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.51830000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37430000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.67020000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.70860000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.67100000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.18180000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,8.67020000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,3.70860000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.03830000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.06560000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,10.71580000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,4.52680000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.56020000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.12970000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,10.71580000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,4.52680000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.03830000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06560000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,10.71580000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.52680000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.56020000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12970000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.71580000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.52680000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.13710000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.44860000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.71580000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.52680000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.08400000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.21480000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,10.71580000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,4.52680000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.09510000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06790000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,11.22800000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,4.73170000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64500000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,11.22800000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,4.73170000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.09510000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06790000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.22800000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.73170000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64500000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13480000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.22800000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.73170000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.30390000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.46860000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.22800000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.73170000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.19640000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.22380000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,11.22800000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,4.73170000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.20490000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.07220000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,12.28600000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,5.15490000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.80940000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14460000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,12.28600000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,5.15490000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.20490000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07220000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.28600000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.15490000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.80940000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14460000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.28600000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.15490000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.63060000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50780000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.28600000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.15490000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.41510000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.24130000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,12.28600000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,5.15490000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.30960000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.07640000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,13.30680000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,5.56320000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.96610000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.15400000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,13.30680000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,5.56320000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.30960000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07640000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.30680000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.56320000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96610000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15400000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.30680000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.56320000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.94280000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.54530000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.30680000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.56320000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.62380000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.25800000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,13.30680000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,5.56320000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
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 1360cbb7..ca540915 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
@@ -47,291 +47,291 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.86840000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.86840000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21170000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.21170000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,9.18790000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.85420000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,4.85420000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.30670000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,1.30670000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.33920000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,0.33920000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,9.18790000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.85420000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,4.85420000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86840000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.86840000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21170000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.21170000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R2,9.18790000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.85420000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R2,4.85420000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.30670000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.30670000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.33920000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.33920000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.18790000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.85420000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,4.85420000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63870000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.63870000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.81010000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.81010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.18790000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.85420000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,4.85420000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,1.74790000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.48140000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,0.48140000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,9.18790000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.85420000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,4.85420000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.24960000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,1.24960000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07400000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.07400000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,13.07600000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.47090000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,5.47090000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.87930000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.87930000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.14880000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.14880000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,13.07600000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.47090000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,5.47090000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.24960000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.24960000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07400000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.07400000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R2,13.07600000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.47090000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R2,5.47090000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.87930000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.87930000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14880000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.14880000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.07600000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.47090000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.47090000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.78760000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.78760000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.52670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.52670000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.07600000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.47090000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.47090000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.51220000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,2.51220000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.24910000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.24910000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.07600000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,13.07600000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.47090000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,5.47090000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.42920000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,1.42920000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08120000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.08120000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,14.77530000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.15060000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,6.15060000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.14790000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,2.14790000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.16490000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.16490000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,14.77530000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.15060000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,6.15060000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.42920000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.42920000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08120000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.08120000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R2,14.77530000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.15060000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R2,6.15060000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.14790000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,2.14790000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16490000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.16490000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,14.77530000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.15060000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.15060000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.31990000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.31990000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59050000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.59050000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,14.77530000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.15060000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.15060000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.86920000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,2.86920000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.27760000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.27760000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,14.77530000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,14.77530000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.15060000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,6.15060000000,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,1.55590000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.55590000000,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.08630000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.08630000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,15.97270000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.62960000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,6.62960000000,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,2.33730000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,2.33730000000,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.17630000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.17630000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,15.97270000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.62960000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,6.62960000000,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,1.55590000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.55590000000,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.08630000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.08630000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,15.97270000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.62960000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R2,6.62960000000,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,2.33730000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,2.33730000000,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.17630000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.17630000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,15.97270000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.62960000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.62960000000,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,4.69520000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.69520000000,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.63560000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.63560000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,15.97270000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.62960000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.62960000000,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,3.12090000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,3.12090000000,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.29780000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.29780000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,15.97270000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,15.97270000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.62960000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,6.62960000000,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,1.75850000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,1.75850000000,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.09440000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.09440000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,17.94720000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.41940000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,7.41940000000,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,2.64080000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,2.64080000000,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.19450000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.19450000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,17.94720000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.41940000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,7.41940000000,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,1.75850000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.75850000000,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.09440000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.09440000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,17.94720000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.41940000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,7.41940000000,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,2.64080000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,2.64080000000,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.19450000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.19450000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.94720000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.41940000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,7.41940000000,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,5.29960000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,5.29960000000,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.70810000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.70810000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.94720000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.41940000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,7.41940000000,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,3.52500000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,3.52500000000,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.33010000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.33010000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,17.94720000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,17.94720000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.41940000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,7.41940000000,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,1.91390000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,1.91390000000,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.10060000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.10060000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,19.46150000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,8.02510000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,8.02510000000,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,2.87360000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,2.87360000000,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.20850000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.20850000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,19.46150000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,8.02510000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,8.02510000000,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,1.91390000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,1.91390000000,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.10060000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.10060000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,19.46150000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.02510000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,8.02510000000,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,2.87360000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,2.87360000000,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.20850000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.20850000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.46150000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.02510000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,8.02510000000,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,5.76330000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,5.76330000000,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.76370000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.76370000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.46150000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.02510000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,8.02510000000,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,3.83500000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,3.83500000000,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.35490000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.35490000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,19.46150000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,19.46150000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,8.02510000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,8.02510000000,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/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 0701aeac..cd87ed66 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -63,387 +63,387 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.66100000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.66100000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.15400000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.15400000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.94580000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.94580000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.22940000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,0.22940000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.66100000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.66100000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15400000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.15400000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94580000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.94580000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.22940000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.22940000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.99750000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.99750000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.55430000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.55430000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.32690000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,1.32690000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.33870000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,0.33870000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.32690000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.32690000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.33870000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.33870000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.32690000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.32690000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.33870000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.33870000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.58810000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.58810000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.97980000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.97980000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.93360000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.93360000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04000000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.04000000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33530000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.33530000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07370000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.07370000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.93360000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.93360000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04000000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04000000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.33530000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.33530000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07370000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07370000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.81680000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.81680000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28300000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28300000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.87250000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.87250000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.13410000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.13410000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.87250000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.87250000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13410000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13410000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.87250000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.87250000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13410000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13410000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.41110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.41110000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.54480000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.54480000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.06820000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,1.06820000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.04390000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.04390000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.52730000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,1.52730000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.08160000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.08160000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.06820000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.06820000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04390000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04390000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.52730000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.52730000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08160000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08160000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.21780000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.21780000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31770000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.31770000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.14080000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,2.14080000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.14960000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.14960000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,6.25910000000,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', 'early-morning')",electricity,R1,2.14080000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.14080000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14960000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14960000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.14080000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.14080000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14960000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14960000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,15.19670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,15.19670000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.25910000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.25910000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.16340000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.16340000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04660000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.04660000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,6.76430000000,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,1.66310000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.66310000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08720000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.08720000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,6.76430000000,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', 'mid-afternoon')",electricity,R1,1.16340000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.16340000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04660000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04660000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.76430000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.66310000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.66310000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08720000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08720000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.76430000000,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,3.50160000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.50160000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.34230000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.34230000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.76430000000,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,2.33060000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,2.33060000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.16060000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.16060000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,6.76430000000,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', 'early-morning')",electricity,R1,2.33060000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.33060000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16060000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16060000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,6.76430000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.33060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.33060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16060000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16060000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.45990000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.45990000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.76430000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.76430000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.31730000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,1.31730000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.05100000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.05100000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,7.60060000000,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,1.88290000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.88290000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.09620000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.09620000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,7.60060000000,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', 'mid-afternoon')",electricity,R1,1.31730000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.31730000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05100000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05100000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.60060000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.88290000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.88290000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09620000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.09620000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,7.60060000000,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,3.96190000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.96190000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38210000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.38210000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,7.60060000000,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,2.63790000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,2.63790000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.17830000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.17830000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,7.60060000000,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', 'early-morning')",electricity,R1,2.63790000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.63790000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.17830000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.17830000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,7.60060000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.63790000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.63790000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17830000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17830000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,18.55050000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,18.55050000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.60060000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.60060000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.43580000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,1.43580000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05450000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.05450000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,8.24440000000,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,2.05210000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,2.05210000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.10320000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.10320000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,8.24440000000,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', 'mid-afternoon')",electricity,R1,1.43580000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.43580000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05450000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05450000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,8.24440000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.05210000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,2.05210000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.10320000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.10320000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,8.24440000000,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,4.31640000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.31640000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.41280000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.41280000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,8.24440000000,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,2.87460000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,2.87460000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.19200000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.19200000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,8.24440000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.87460000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.87460000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.19200000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.19200000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,8.24440000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.87460000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.87460000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.19200000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.19200000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,20.16000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,20.16000000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,8.24440000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,8.24440000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index 697c208e..c46bb206 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -63,643 +63,643 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.44870000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,0.44870000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,0.21080000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,0.21080000000,2022
+"('all-year', 'all-week', 'night')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'night')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'night')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'night')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,0.64220000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,0.64220000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,0.30630000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,0.30630000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'morning')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'morning')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'morning')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.44870000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.44870000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.21080000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.21080000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.64220000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.64220000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.30630000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.30630000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'early-peak')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'early-peak')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.35750000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.35750000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.68340000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.68340000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'late-peak')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'late-peak')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,0.90120000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,0.90120000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,0.43850000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,0.43850000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'evening')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'evening')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'evening')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,0.90120000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,0.90120000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.43850000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.43850000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'early-morning')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'early-morning')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,0.90120000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,0.90120000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.43850000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.43850000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.55430000000,2022
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.55430000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2022
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.49550000000,2022
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.49550000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,0.58130000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,0.58130000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,0.17380000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,0.17380000000,2024
+"('all-year', 'all-week', 'night')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'night')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'night')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'night')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,0.83180000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,0.83180000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,0.25610000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,0.25610000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'morning')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'morning')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'morning')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.58130000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.58130000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.17380000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.17380000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.83180000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.83180000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.25610000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.25610000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'early-peak')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.75720000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.75720000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59790000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.59790000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'late-peak')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,1.16700000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,1.16700000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,0.37300000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,0.37300000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'evening')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'evening')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'evening')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.16700000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.16700000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.37300000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.37300000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'early-morning')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.16700000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.16700000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.37300000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.37300000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.44970000000,2024
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.44970000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2024
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.76590000000,2024
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.76590000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,0.69930000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,0.69930000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,0.13230000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,0.13230000000,2026
+"('all-year', 'all-week', 'night')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'night')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'night')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'night')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,1.00050000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,1.00050000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,0.19950000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,0.19950000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'morning')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'morning')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'morning')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.69930000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.69930000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.13230000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.13230000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00050000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.00050000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19950000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.19950000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'early-peak')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.11240000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.11240000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50020000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.50020000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'late-peak')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,1.40340000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,1.40340000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,0.29890000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,0.29890000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'evening')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'evening')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'evening')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.40340000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.40340000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.29890000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.29890000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'early-morning')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'early-morning')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.40340000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.40340000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.29890000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.29890000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.11860000000,2026
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.11860000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2026
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.01180000000,2026
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.01180000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,0.81030000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,0.81030000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,0.08720000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,0.08720000000,2028
+"('all-year', 'all-week', 'night')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'night')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'night')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'night')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,1.15920000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,1.15920000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,0.13800000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,0.13800000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'morning')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'morning')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'morning')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.81030000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.81030000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.08720000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.08720000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.15920000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.15920000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13800000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.13800000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'early-peak')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.44620000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.44620000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39310000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.39310000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'late-peak')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,1.62570000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,1.62570000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,0.21810000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,0.21810000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'evening')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'evening')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'evening')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.62570000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.62570000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.21810000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.21810000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'early-morning')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'early-morning')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.62570000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.62570000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.21810000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.21810000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.67880000000,2028
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.67880000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2028
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.23910000000,2028
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.23910000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,0.91750000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.91750000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03950000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.03950000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.31230000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.31230000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07270000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.07270000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.91750000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.91750000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03950000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03950000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.31230000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.31230000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07270000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07270000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.76800000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.76800000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27880000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27880000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.84010000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.84010000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.13230000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.13230000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.84010000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.84010000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.13230000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.13230000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.84010000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.84010000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.13230000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.13230000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.17840000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.17840000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.45180000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.45180000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.06000000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,1.06000000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,0.04360000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,0.04360000000,2032
+"('all-year', 'all-week', 'night')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'night')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'night')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'night')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,1.51590000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,1.51590000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,0.08110000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,0.08110000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'morning')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'morning')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'morning')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.06000000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.06000000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04360000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04360000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.51590000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.51590000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08110000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08110000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'early-peak')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.19590000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.19590000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31580000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.31580000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'late-peak')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,2.12530000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,2.12530000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,0.14870000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,0.14870000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'evening')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'evening')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'evening')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.12530000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.12530000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.14870000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.14870000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'early-morning')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'early-morning')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.12530000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.12530000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.14870000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.14870000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,15.15990000000,2032
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,15.15990000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2032
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.24430000000,2032
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.24430000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,1.14880000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,1.14880000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,0.04620000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,0.04620000000,2034
+"('all-year', 'all-week', 'night')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'night')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'night')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'night')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,1.64260000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,1.64260000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,0.08630000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,0.08630000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'morning')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'morning')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'morning')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.14880000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.14880000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04620000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04620000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.64260000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.64260000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08630000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08630000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'early-peak')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.46150000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.46150000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.33880000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.33880000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'late-peak')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,2.30260000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,2.30260000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,0.15900000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,0.15900000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'evening')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'evening')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'evening')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.30260000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.30260000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.15900000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.15900000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'early-morning')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'early-morning')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.30260000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.30260000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15900000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15900000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.37160000000,2034
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.37160000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2034
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.72900000000,2034
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.72900000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,1.19830000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,1.19830000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,0.04760000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,0.04760000000,2036
+"('all-year', 'all-week', 'night')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'night')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'night')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'night')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,1.71330000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,1.71330000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,0.08920000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,0.08920000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'morning')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'morning')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'morning')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.19830000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.19830000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04760000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04760000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.71330000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.71330000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08920000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08920000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.60910000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.60910000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.35160000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.35160000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,2.40130000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,2.40130000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,0.16470000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,0.16470000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'evening')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'evening')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'evening')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.40130000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.40130000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16470000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16470000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'early-morning')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.40130000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.40130000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16470000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16470000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.02870000000,2036
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.02870000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2036
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.99190000000,2036
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.99190000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,1.24160000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,1.24160000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,0.04890000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,0.04890000000,2038
+"('all-year', 'all-week', 'night')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'night')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'night')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'night')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,1.77510000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,1.77510000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,0.09180000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,0.09180000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'morning')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'morning')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'morning')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.24160000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.24160000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04890000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04890000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.77510000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.77510000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09180000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.09180000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'early-peak')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.73820000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.73820000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.36280000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.36280000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'late-peak')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,2.48770000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,2.48770000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,0.16970000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,0.16970000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'evening')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'evening')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'evening')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.48770000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.48770000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.16970000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.16970000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'early-morning')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.48770000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.48770000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.16970000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.16970000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.60310000000,2038
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.60310000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2038
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.22160000000,2038
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.22160000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,1.27980000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.27980000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.05000000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.05000000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,7.42430000000,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,1.82960000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.82960000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.09400000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.09400000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,7.42430000000,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', 'mid-afternoon')",electricity,R1,1.27980000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.27980000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05000000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05000000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.42430000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82960000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.82960000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09400000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.09400000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,7.42430000000,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,3.85210000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.85210000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37260000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.37260000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,7.42430000000,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,2.56380000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,2.56380000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.17400000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.17400000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,7.42430000000,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', 'early-morning')",electricity,R1,2.56380000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.56380000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.17400000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.17400000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,7.42430000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.56380000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.56380000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17400000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17400000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,18.10990000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,18.10990000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.42430000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.42430000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index 77e155a1..02af4971 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -79,483 +79,483 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
 "('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.61350000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,0.61350000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.15290000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,0.15290000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'night')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'night')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.12400000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,0.12400000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.87770000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,0.87770000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.22720000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,0.22720000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'night')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'morning')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,0.18580000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,0.18580000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.61350000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.61350000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.15290000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.15290000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'morning')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.12400000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.12400000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87770000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.87770000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.22720000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.22720000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.18580000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.18580000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.85360000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.85360000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.54470000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.54470000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.45780000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.45780000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.23130000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,1.23130000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.33440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,0.33440000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'evening')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,0.27650000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,0.27650000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.23130000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.23130000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.33440000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.33440000000,2025
+"('all-year', 'all-week', 'evening')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'evening')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'early-morning')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'early-morning')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.27650000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.27650000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.23130000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.23130000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.33440000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.33440000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'early-morning')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.89330000000,2025
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.89330000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2025
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.76500000000,2025
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.76500000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.27650000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.27650000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.89440000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,0.89440000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.03880000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,0.03880000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,4.36360000000,2025
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,4.36360000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'night')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'night')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.03880000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,0.03880000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.27920000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,1.27920000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.07130000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,0.07130000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'night')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'morning')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.07130000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,0.07130000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.89440000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.89440000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03880000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03880000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'morning')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03880000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03880000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27920000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27920000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07130000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07130000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.07130000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.07130000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.69840000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.69840000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27270000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27270000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.27270000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.27270000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,1.79380000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,1.79380000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.12960000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,0.12960000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'evening')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.12960000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,0.12960000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.79380000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.79380000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.12960000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.12960000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'evening')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'early-morning')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'early-morning')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.12960000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.12960000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.79380000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.79380000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.12960000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.12960000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'early-morning')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,12.84560000000,2030
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,12.84560000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.31860000000,2030
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.31860000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.12960000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.12960000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.88910000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,0.88910000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.03870000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,0.03870000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,5.31860000000,2030
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,5.31860000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'night')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'night')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.03870000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,0.03870000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.27120000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,1.27120000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.07100000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,0.07100000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'night')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'morning')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.07100000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,0.07100000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,0.88910000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,0.88910000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.03870000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.03870000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'morning')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.03870000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.03870000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.27120000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.27120000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.07100000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.07100000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.07100000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.07100000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.67810000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,2.67810000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.27100000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.27100000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.27100000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.27100000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,1.78180000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,1.78180000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.12890000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,0.12890000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'evening')",heat,R2,5.23760000000,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', 'evening')",cook,R1,0.12890000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,0.12890000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,1.78180000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,1.78180000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.12890000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.12890000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'evening')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'early-morning')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'early-morning')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.12890000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.12890000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,1.78180000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,1.78180000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.12890000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.12890000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'early-morning')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,12.64310000000,2035
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,12.64310000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2035
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.23760000000,2035
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.23760000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.12890000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.12890000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.11440000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,1.11440000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.04520000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,0.04520000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,5.23760000000,2035
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,5.23760000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'night')",heat,R2,6.48640000000,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', 'night')",cook,R1,0.04520000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,0.04520000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.59310000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,1.59310000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.08430000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,0.08430000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'night')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'morning')",heat,R2,6.48640000000,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', 'morning')",cook,R1,0.08430000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,0.08430000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.11440000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.11440000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04520000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04520000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'morning')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.48640000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.04520000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.04520000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.59310000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.59310000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08430000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08430000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R2,6.48640000000,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', 'early-peak')",cook,R1,0.08430000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.08430000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.35400000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.35400000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32950000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.32950000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R2,6.48640000000,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', 'late-peak')",cook,R1,0.32950000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.32950000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.23240000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,2.23240000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.15490000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,0.15490000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'evening')",heat,R2,6.48640000000,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', 'evening')",cook,R1,0.15490000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,0.15490000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.23240000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.23240000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.15490000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.15490000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'evening')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'early-morning')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'early-morning')",heat,R2,6.48640000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.15490000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.15490000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.23240000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.23240000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.15490000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.15490000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'early-morning')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,15.76510000000,2040
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,15.76510000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.48640000000,2040
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.48640000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.15490000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.15490000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.26090000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,1.26090000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.04940000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.04940000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,6.48640000000,2040
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,6.48640000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,7.28260000000,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', 'night')",cook,R1,0.04940000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,0.04940000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.80230000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,1.80230000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.09290000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.09290000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'night')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,7.28260000000,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', 'morning')",cook,R1,0.09290000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,0.09290000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.26090000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.26090000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.04940000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.04940000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'morning')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.28260000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.04940000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.04940000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.80230000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.80230000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09290000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.09290000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,7.28260000000,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', 'early-peak')",cook,R1,0.09290000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.09290000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.79230000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,3.79230000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.36750000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.36750000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,7.28260000000,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', 'late-peak')",cook,R1,0.36750000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.36750000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.52510000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,2.52510000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.17180000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.17180000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,7.28260000000,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', 'evening')",cook,R1,0.17180000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,0.17180000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.52510000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.52510000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.17180000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.17180000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'evening')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'early-morning')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'early-morning')",heat,R2,7.28260000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.17180000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.17180000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.52510000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.52510000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.17180000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.17180000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'early-morning')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.75560000000,2045
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.75560000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2045
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.28260000000,2045
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.28260000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.17180000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.17180000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.37360000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,1.37360000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05270000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.05270000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,7.28260000000,2045
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,7.28260000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,7.89430000000,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', 'night')",cook,R1,0.05270000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,0.05270000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.96310000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,1.96310000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09950000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.09950000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'night')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,7.89430000000,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', 'morning')",cook,R1,0.09950000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,0.09950000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,1.37360000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,1.37360000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.02560000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,0.05270000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,0.05270000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'morning')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.89430000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,0.05270000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,0.05270000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.96310000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,1.96310000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.03650000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09950000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.09950000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'mid-afternoon')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,7.89430000000,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', 'early-peak')",cook,R1,0.09950000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,0.09950000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.12910000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,4.12910000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.07670000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39660000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.39660000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,7.89430000000,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', 'late-peak')",cook,R1,0.39660000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,0.39660000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.74990000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,2.74990000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.18480000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.18480000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,7.89430000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.18480000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,0.18480000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,2.74990000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,2.74990000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,0.18480000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,0.18480000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'evening')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'early-morning')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'early-morning')",heat,R2,7.89430000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,0.18480000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,0.18480000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,2.74990000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,2.74990000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.05110000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,0.18480000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,0.18480000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'early-morning')",cook,R2,7.89430000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.28480000000,2050
+"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.28480000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2050
+"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.89430000000,2050
+"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.89430000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,0.18480000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,0.18480000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R1,7.89430000000,2050
+"('all-year', 'all-week', 'late-afternoon')",cook,R2,7.89430000000,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
index 34be0652..ffcab18b 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.14930000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.29460000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,6.16610000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.73810000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.46960000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,6.16610000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.14930000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.29460000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.16610000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.73810000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.46960000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.16610000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.51170000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.09330000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.16610000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.33080000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.66200000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,6.16610000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.48640000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.08320000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,2.24610000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.17090000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.48640000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08320000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.24610000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17090000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.52770000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.61580000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,3.00980000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.28970000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,6.49540000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.80650000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.09590000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,18.77110000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,7.74890000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.72770000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,18.77110000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,7.74890000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.80650000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09590000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,18.77110000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.74890000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.72770000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19980000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.77110000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.74890000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.48700000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.73090000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.77110000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.74890000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,3.65260000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.34130000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,18.77110000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,7.74890000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,2.27530000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.11460000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,23.47910000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,9.63210000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,3.43430000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.24220000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,23.47910000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,9.63210000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.27530000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11460000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,23.47910000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,9.63210000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,3.43430000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.24220000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,23.47910000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,9.63210000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.90000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.90060000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,23.47910000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,9.63210000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,4.59680000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.41700000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,23.47910000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,9.63210000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,2.78540000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.13490000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,28.56770000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,11.66760000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,4.20270000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.28840000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,28.56770000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,11.66760000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,2.78540000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.13490000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,28.56770000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,11.66760000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,4.20270000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.28840000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,28.56770000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,11.66760000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.43520000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.08490000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,28.56770000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,11.66760000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,5.62340000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.49940000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,28.56770000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,11.66760000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,3.40790000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04700000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.15970000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,34.81960000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,14.16840000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,5.14090000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07090000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.34470000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,34.81960000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,14.16840000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,3.40790000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04700000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.15970000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,34.81960000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,14.16840000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.14090000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07090000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34470000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,34.81960000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,14.16840000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.31160000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.31020000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,34.81960000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,14.16840000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,6.87720000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09470000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.60000000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,34.81960000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,14.16840000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index aa21ff1b..5511d58f 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.53630000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21960000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,6.13290000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,3.88680000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.04560000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.38250000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,7.95490000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.46370000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.51930000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.28880000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.04560000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.38250000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,7.95490000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.46370000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.10920000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.98080000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,7.95490000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.46370000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.55140000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.71900000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.04550000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,2.69360000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.09880000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,3.42250000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08480000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.12310000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09880000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,3.42250000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.32530000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.42250000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25220000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.12310000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.03480000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06110000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07030000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06110000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.12220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.12280000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index c6932ee1..74345014 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.06520000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.25740000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.60300000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.44180000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.51650000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.28850000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.60300000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.44180000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.23710000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.21810000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.54330000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.71790000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,12.20640000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,5.81000000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.09520000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.02790000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.04460000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04460000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08930000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.14290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.05950000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.07210000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02690000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.18020000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04690000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.14410000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10810000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04260000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.18020000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09380000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.14410000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05960000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02690000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04690000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02980000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04260000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09380000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05960000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04480000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06720000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04810000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.05770000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02940000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06720000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.13440000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.10090000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050

From 7df6d52f3635cacaa0f0c33ee4ee89109f305bee Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 19 Jul 2024 09:27:14 +0100
Subject: [PATCH 399/419] Fix test_supply_cost

---
 tests/test_quantities.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index 686a2c14..4fc9f9fb 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -352,23 +352,11 @@ def test_supply_cost(production: xr.DataArray, timeslice: xr.Dataset):
     for region in set(production.region.values):
         expected = average(
             lcoe.sel(asset=production.region == region),
-            weights=production.sel(asset=production.region == region)
-            / production.sel(asset=production.region == region).sum("asset"),
+            weights=production.sel(asset=production.region == region),
             axis=production.get_axis_num("asset"),
         )
 
-    for region in set(production.region.values):
-        weight = production / production.sel(asset=production.region == region).sum(
-            "asset"
-        ).sum("timeslice")
-
-        expected = lcoe * weight
-
-        assert actual.sel(region=region).values == approx(
-            expected.sel(asset=production.region == region).sum(
-                axis=production.get_axis_num("asset")
-            )
-        )
+        assert actual.sel(region=region).values == approx(expected)
 
 
 def test_supply_cost_zero_prod(production: xr.DataArray, timeslice: xr.Dataset):

From b2c83b9d9eecd1486465dbc8e70bd69ccdf4701a Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 19 Jul 2024 12:44:53 +0100
Subject: [PATCH 400/419] Use multiindex_to_coords to fix pandas error. Fix new
 -> newcapa

---
 src/muse/outputs/mca.py | 64 ++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index eae54be2..2942c601 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -770,14 +770,13 @@ def sector_fuel_costs(
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
             data_agent["year"] = output_year
-            if len(data_agent) > 0 and len(data_agent.technology.values) > 0:
-                data_sector.append(data_agent.groupby("technology").fillna(0))
+            data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
+                "fuel_consumption_costs"
+            )
+            if not data_agent.empty:
+                data_sector.append(data_agent)
     if len(data_sector) > 0:
-        output = pd.concat(
-            [u.to_dataframe("fuel_consumption_costs") for u in data_sector], sort=True
-        )
-        output = output.reset_index()
-
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
 
@@ -820,11 +819,12 @@ def sector_capital_costs(
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
             data_agent["year"] = output_year
-            a = data_agent.to_dataframe("capital_costs")
-            if len(a) > 0 and len(a.technology.values) > 0:
-                b = a.reset_index()
-                b = b[b["capital_costs"] != 0]
-                data_sector.append(b)
+            data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
+                "capital_costs"
+            )
+            if not data_agent.empty:
+                data_sector.append(data_agent)
+
     if len(data_sector) > 0:
         output = pd.concat(data_sector, sort=True).reset_index()
     else:
@@ -886,14 +886,14 @@ def sector_emission_costs(
             data_agent["category"] = a.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
             data_agent["year"] = output_year
-            if len(data_agent) > 0 and len(data_agent.technology.values) > 0:
-                data_sector.append(data_agent.groupby("technology").fillna(0))
-    if len(data_sector) > 0:
-        output = pd.concat(
-            [u.to_dataframe("emission_costs") for u in data_sector], sort=True
-        )
-        output = output.reset_index()
+            data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
+                "emission_costs"
+            )
+            if not data_agent.empty:
+                data_sector.append(data_agent)
 
+    if len(data_sector) > 0:
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
 
@@ -935,7 +935,7 @@ def capacity_to_service_demand(demand, technologies):
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
     retro = [a for a in agents if a.category == "retrofit"]
-    new = [a for a in agents if a.category == "new"]
+    new = [a for a in agents if a.category == "newcapa"]
     agents = retro if len(retro) > 0 else new
     if len(technologies) > 0:
         for agent in agents:
@@ -1091,12 +1091,15 @@ def capacity_to_service_demand(demand, technologies):
             data_agent["category"] = agent.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
             data_agent["year"] = output_year
-            if len(data_agent) > 0 and len(data_agent.technology.values) > 0:
-                data_sector.append(data_agent.groupby("technology").fillna(0))
-    if len(data_sector) > 0:
-        output = pd.concat([u.to_dataframe("LCOE") for u in data_sector], sort=True)
-        output = output.reset_index()
+            data_agent = data_agent.fillna(0)
+            data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
+                "LCOE"
+            )
+            if not data_agent.empty:
+                data_sector.append(data_agent)
 
+    if len(data_sector) > 0:
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
     return output
@@ -1137,7 +1140,7 @@ def capacity_to_service_demand(demand, technologies):
     technologies = getattr(sector, "technologies", [])
     agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
     retro = [a for a in agents if a.category == "retrofit"]
-    new = [a for a in agents if a.category == "new"]
+    new = [a for a in agents if a.category == "newcapa"]
     agents = retro if len(retro) > 0 else new
     if len(technologies) > 0:
         for agent in agents:
@@ -1301,10 +1304,13 @@ def capacity_to_service_demand(demand, technologies):
             data_agent["category"] = agent.category
             data_agent["sector"] = getattr(sector, "name", "unnamed")
             data_agent["year"] = output_year
-            if len(data_agent) > 0 and len(data_agent.technology.values) > 0:
-                data_sector.append(data_agent.groupby("technology").fillna(0))
+            data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
+                "capital_costs"
+            )
+            if not data_agent.empty:
+                data_sector.append(data_agent)
     if len(data_sector) > 0:
-        output = pd.concat([u.to_dataframe("EAC") for u in data_sector], sort=True)
+        output = pd.concat(data_sector, sort=True)
         output = output.reset_index()
 
     else:

From a85748117677eeb1c20f52e7b7d9172a698d2196 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:03:47 +0000
Subject: [PATCH 401/419] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.5.0 → v0.5.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.0...v0.5.2)
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.13.0 → v2.14.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.13.0...v2.14.0)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0f078380..0d17aae0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.0
+    rev: v0.5.2
     hooks:
       - id: ruff-format
         types_or: [python, pyi, jupyter]
@@ -31,7 +31,7 @@ repos:
       - id: prettier
         types_or: [yaml, json]
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.13.0
+    rev: v2.14.0
     hooks:
       - id: pretty-format-toml
         args: [--autofix, --indent, "4", --no-sort]

From 51981aa70984d0bb831eda288b8bd969552b44ff Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 10:14:45 +0100
Subject: [PATCH 402/419] Update results file

---
 .../default_timeslice/MCAPrices.csv           | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 577ccb7f..4725bdbc 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -23,53 +23,53 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.01690000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.25240000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,0.18620000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.01770000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.37880000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,0.28160000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.01690000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.25240000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.18620000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.01770000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.37880000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.28160000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.02010000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.75880000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.89820000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.72710000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.01850000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.50530000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,0.37860000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.17990000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
 "('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
 "('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2035

From c9661deadeb3362ca1985e60895a6eab1cbe05b3 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 10:51:52 +0100
Subject: [PATCH 403/419] Update more results files

---
 tests/example_outputs/default/MCAPrices.csv   | 216 ++++++-------
 .../default_retro/MCAPrices.csv               | 216 ++++++-------
 .../default_timeslice/MCAPrices.csv           | 216 ++++++-------
 tests/example_outputs/medium/MCAPrices.csv    | 288 +++++++++---------
 .../multiple_agents/MCAPrices.csv             | 216 ++++++-------
 .../trade/Gas/Capacity/2020.csv               |   8 +-
 .../trade/Gas/Capacity/2025.csv               |   6 +-
 .../trade/Gas/Capacity/2030.csv               |   6 +-
 .../trade/Gas/Capacity/2035.csv               |   4 +-
 .../trade/Power/Capacity/2020.csv             |  12 +-
 .../trade/Power/Capacity/2025.csv             |  10 +-
 .../trade/Power/Capacity/2030.csv             |   8 +-
 .../trade/Power/Capacity/2035.csv             |   6 +-
 tests/example_outputs/trade/Prices.csv        | 144 ++++-----
 .../trade/Residential/Capacity/2035.csv       |  40 +--
 15 files changed, 698 insertions(+), 698 deletions(-)

diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv
index 7c4372f2..bc95744d 100644
--- a/tests/example_outputs/default/MCAPrices.csv
+++ b/tests/example_outputs/default/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.88730000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21230000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33530000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.34060000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.88730000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21230000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.33530000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34060000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.69650000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.81560000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.78620000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.48380000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.26990000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07480000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90970000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15070000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.26990000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07480000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90970000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15070000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.84900000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53400000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.55290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25230000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.45210000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08210000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.18220000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.16700000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.45210000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08210000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.18220000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16700000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.38890000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59880000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.91500000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.28130000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.58190000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08730000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,2.37630000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.17870000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.58190000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08730000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.37630000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17870000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.77360000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.64500000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,3.17310000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.30190000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.78980000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.09560000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.68780000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19730000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78980000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09560000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.68780000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19730000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.39400000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71940000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,3.58780000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.33510000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.98520000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.10350000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.98050000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.21490000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.98520000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10350000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.98050000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21490000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.97770000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.78950000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.97770000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.36630000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv
index b0de861c..9925a16e 100644
--- a/tests/example_outputs/default_retro/MCAPrices.csv
+++ b/tests/example_outputs/default_retro/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.86840000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21170000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.30670000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.33920000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.86840000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21170000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.30670000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.33920000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.63870000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.81010000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.74790000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.48140000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.18790000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.85420000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.21120000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.20360000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,12.67060000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,6.06060000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.82140000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.33760000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,12.67060000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,6.06060000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.21120000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.20360000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.67060000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.06060000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.82140000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.33760000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.67060000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.06060000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.67070000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.87010000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.67060000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.06060000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.43470000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.49320000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,12.67060000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,6.06060000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.35400000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.22950000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,13.99390000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.83090000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.03480000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.38090000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,13.99390000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.83090000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.35400000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.22950000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.99390000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.83090000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03480000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.38090000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.99390000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.83090000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.09230000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.98330000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.99390000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.83090000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.71810000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.55690000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,13.99390000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.83090000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.35190000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.11500000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,13.87100000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.06000000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,2.03070000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.21250000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,13.87100000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.06000000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.35190000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.11500000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.87100000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.06000000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.03070000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21250000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.87100000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.06000000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.07910000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.66590000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.87100000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.06000000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,2.71160000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.33670000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,13.87100000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.06000000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.52330000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.12710000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,15.54030000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,6.78080000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.28750000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.23570000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,15.54030000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,6.78080000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.52330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.12710000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.54030000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.78080000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.28750000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.23570000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.54030000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.78080000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.59030000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.74300000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.54030000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.78080000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,3.05340000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.37450000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,15.54030000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,6.78080000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.63090000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.08930000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,16.57670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,6.87120000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.44850000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.18300000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,16.57670000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,6.87120000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.63090000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08930000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,16.57670000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.87120000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.44850000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.18300000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.57670000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.87120000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.91050000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.66140000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.87120000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.26770000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.30950000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,16.57670000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,6.87120000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 4725bdbc..c27e01ed 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.18620000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,2.15580000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.28160000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,2.15580000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.18620000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,2.15580000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.28160000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,2.15580000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.89820000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.72710000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09610000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,3.77510000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.37860000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,2.15580000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.17990000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,1.47890000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv
index 900a6a2f..d56c9e6b 100644
--- a/tests/example_outputs/medium/MCAPrices.csv
+++ b/tests/example_outputs/medium/MCAPrices.csv
@@ -29,183 +29,183 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
 "('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,1.15420000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.55190000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,7.32800000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.73730000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.84220000000,2025
+"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,7.32800000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.15420000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.55190000000,2025
+"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.32800000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.73730000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.84220000000,2025
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.32800000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.51000000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.77190000000,2025
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.32800000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,2.32420000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,1.14230000000,2025
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,12.25210000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,7.32800000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.49280000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.52610000000,2030
+"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,8.50930000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,2.24500000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.81520000000,2030
+"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,8.50930000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.49280000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.52610000000,2030
+"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.50930000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.24500000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.81520000000,2030
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.50930000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.52560000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.78780000000,2030
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.50930000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,3.00130000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,1.12170000000,2030
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,15.63730000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,8.50930000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.33250000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.59410000000,2035
+"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.77050000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,9.17380000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.00240000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.91730000000,2035
+"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,13.77050000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,9.17380000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33250000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.59410000000,2035
+"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.77050000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,9.17380000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.00240000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.91730000000,2035
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.77050000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,9.17380000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.02720000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.99280000000,2035
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.77050000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,9.17380000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.67490000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,1.25810000000,2035
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,13.77050000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,9.17380000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.94320000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.06180000000,2040
+"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,9.66330000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,4.10580000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.41680000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.12110000000,2040
+"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,9.66330000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,4.10580000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.94320000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06180000000,2040
+"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.66330000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.10580000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.41680000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.12110000000,2040
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.66330000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.10580000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.84510000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.41360000000,2040
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.66330000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.10580000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.89160000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.19940000000,2040
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,9.66330000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,4.10580000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.05670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.06630000000,2045
+"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,10.76850000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,4.54790000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.58670000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.13130000000,2045
+"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,10.76850000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,4.54790000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.05670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06630000000,2045
+"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,10.76850000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.54790000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.58670000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13130000000,2045
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,10.76850000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.54790000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.18350000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.45420000000,2045
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,10.76850000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.54790000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,2.11780000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.21750000000,2045
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,10.76850000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,4.54790000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.14470000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.06980000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,11.62580000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,4.89080000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'night')",cook,R1,0.02880000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.71850000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.13920000000,2050
+"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,11.62580000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,4.89080000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",cook,R1,0.04670000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.14470000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.06980000000,2050
+"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,11.62580000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.89080000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.02880000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.71850000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.13920000000,2050
+"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,11.62580000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.89080000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.04670000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.44600000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.48570000000,2050
+"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,11.62580000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.89080000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.11470000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,2.29330000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.23160000000,2050
+"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,11.62580000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,4.89080000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.06700000000,2050
+"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2050
diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv
index 7c4372f2..bc95744d 100644
--- a/tests/example_outputs/multiple_agents/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/MCAPrices.csv
@@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.88730000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,0.21230000000,2025
+"('all-year', 'all-week', 'night')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'night')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33530000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,0.34060000000,2025
+"('all-year', 'all-week', 'morning')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'morning')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.88730000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.21230000000,2025
+"('all-year', 'all-week', 'afternoon')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'afternoon')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.33530000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.34060000000,2025
+"('all-year', 'all-week', 'early-peak')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'early-peak')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.69650000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.81560000000,2025
+"('all-year', 'all-week', 'late-peak')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'late-peak')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,1.78620000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,0.48380000000,2025
+"('all-year', 'all-week', 'evening')",electricity,R1,9.39110000000,2025
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
+"('all-year', 'all-week', 'evening')",heat,R1,4.91850000000,2025
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,1.26990000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.07480000000,2030
+"('all-year', 'all-week', 'night')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'night')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.90970000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.15070000000,2030
+"('all-year', 'all-week', 'morning')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'morning')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.26990000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.07480000000,2030
+"('all-year', 'all-week', 'afternoon')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'afternoon')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.90970000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.15070000000,2030
+"('all-year', 'all-week', 'early-peak')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'early-peak')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.84900000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.53400000000,2030
+"('all-year', 'all-week', 'late-peak')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'late-peak')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,2.55290000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.25230000000,2030
+"('all-year', 'all-week', 'evening')",electricity,R1,13.28930000000,2030
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
+"('all-year', 'all-week', 'evening')",heat,R1,5.55620000000,2030
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,1.45210000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.08210000000,2035
+"('all-year', 'all-week', 'night')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'night')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,2.18220000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.16700000000,2035
+"('all-year', 'all-week', 'morning')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'morning')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.45210000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08210000000,2035
+"('all-year', 'all-week', 'afternoon')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.18220000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.16700000000,2035
+"('all-year', 'all-week', 'early-peak')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.38890000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.59880000000,2035
+"('all-year', 'all-week', 'late-peak')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,2.91500000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.28130000000,2035
+"('all-year', 'all-week', 'evening')",electricity,R1,15.01190000000,2035
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
+"('all-year', 'all-week', 'evening')",heat,R1,6.24530000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,1.58190000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.08730000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'night')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,2.37630000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.17870000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'morning')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.58190000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08730000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'afternoon')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.37630000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.17870000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'early-peak')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.77360000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.64500000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'late-peak')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,3.17310000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.30190000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,16.23940000000,2040
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
+"('all-year', 'all-week', 'evening')",heat,R1,6.73620000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,1.78980000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.09560000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,2.68780000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.19730000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.78980000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.09560000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.68780000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.19730000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.39400000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.71940000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,3.58780000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.33510000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,18.26600000000,2045
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,7.54690000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,1.98520000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.10350000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,2.98050000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.21490000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.98520000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.10350000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,2.98050000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.21490000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.97770000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.78950000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,3.97770000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.36630000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,20.18470000000,2050
+"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,8.31440000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity/2020.csv
index a8ff7994..a35c2ed5 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -1,11 +1,11 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2020,0,R1,gassupply1,2010,3000.00000000000
-R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 0389a29d..9777d794 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 52525599..023078ee 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 10517be7..c232f077 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -1,7 +1,7 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 29c0c8bd..66b1b173 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -1,15 +1,15 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2020,0,R1,gasCCGT,2010,240.00000000000
-R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 16c86de5..2e29060b 100644
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -1,13 +1,13 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 3325b247..bb6eddda 100644
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -1,11 +1,11 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 4d46864b..768699fc 100644
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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/Prices.csv b/tests/example_outputs/trade/Prices.csv
index 9e8f9204..399a34d6 100644
--- a/tests/example_outputs/trade/Prices.csv
+++ b/tests/example_outputs/trade/Prices.csv
@@ -29,42 +29,42 @@ R1,gas,2020,"('all-year', 'all-week', 'evening')",4.71680000000
 R1,gas,2020,"('all-year', 'all-week', 'late-peak')",4.71680000000
 R1,gas,2020,"('all-year', 'all-week', 'morning')",4.71680000000
 R1,gas,2020,"('all-year', 'all-week', 'night')",4.71680000000
-R1,gas,2025,"('all-year', 'all-week', 'afternoon')",1.77380000000
-R1,gas,2025,"('all-year', 'all-week', 'early-peak')",1.77380000000
-R1,gas,2025,"('all-year', 'all-week', 'evening')",1.77240000000
-R1,gas,2025,"('all-year', 'all-week', 'late-peak')",2.01320000000
-R1,gas,2025,"('all-year', 'all-week', 'morning')",1.95220000000
-R1,gas,2025,"('all-year', 'all-week', 'night')",1.74410000000
-R1,gas,2030,"('all-year', 'all-week', 'afternoon')",0.66750000000
-R1,gas,2030,"('all-year', 'all-week', 'early-peak')",0.66750000000
-R1,gas,2030,"('all-year', 'all-week', 'evening')",0.66640000000
-R1,gas,2030,"('all-year', 'all-week', 'late-peak')",0.86420000000
-R1,gas,2030,"('all-year', 'all-week', 'morning')",0.81230000000
-R1,gas,2030,"('all-year', 'all-week', 'night')",0.64440000000
-R1,gas,2035,"('all-year', 'all-week', 'afternoon')",0.30240000000
-R1,gas,2035,"('all-year', 'all-week', 'early-peak')",0.30240000000
-R1,gas,2035,"('all-year', 'all-week', 'evening')",0.30170000000
-R1,gas,2035,"('all-year', 'all-week', 'late-peak')",0.44020000000
-R1,gas,2035,"('all-year', 'all-week', 'morning')",0.40300000000
-R1,gas,2035,"('all-year', 'all-week', 'night')",0.28680000000
-R1,heat,2025,"('all-year', 'all-week', 'afternoon')",0.53900000000
-R1,heat,2025,"('all-year', 'all-week', 'early-peak')",0.53900000000
-R1,heat,2025,"('all-year', 'all-week', 'evening')",0.53740000000
-R1,heat,2025,"('all-year', 'all-week', 'late-peak')",0.82670000000
-R1,heat,2025,"('all-year', 'all-week', 'morning')",0.75200000000
-R1,heat,2025,"('all-year', 'all-week', 'night')",0.50430000000
-R1,heat,2030,"('all-year', 'all-week', 'afternoon')",0.20570000000
-R1,heat,2030,"('all-year', 'all-week', 'early-peak')",0.20570000000
-R1,heat,2030,"('all-year', 'all-week', 'evening')",0.20490000000
-R1,heat,2030,"('all-year', 'all-week', 'late-peak')",0.35390000000
-R1,heat,2030,"('all-year', 'all-week', 'morning')",0.31310000000
-R1,heat,2030,"('all-year', 'all-week', 'night')",0.18950000000
-R1,heat,2035,"('all-year', 'all-week', 'afternoon')",0.09570000000
-R1,heat,2035,"('all-year', 'all-week', 'early-peak')",0.09570000000
-R1,heat,2035,"('all-year', 'all-week', 'evening')",0.09530000000
-R1,heat,2035,"('all-year', 'all-week', 'late-peak')",0.17940000000
-R1,heat,2035,"('all-year', 'all-week', 'morning')",0.15540000000
-R1,heat,2035,"('all-year', 'all-week', 'night')",0.08710000000
+R1,gas,2025,"('all-year', 'all-week', 'afternoon')",5.82810000000
+R1,gas,2025,"('all-year', 'all-week', 'early-peak')",5.82810000000
+R1,gas,2025,"('all-year', 'all-week', 'evening')",5.82810000000
+R1,gas,2025,"('all-year', 'all-week', 'late-peak')",5.82810000000
+R1,gas,2025,"('all-year', 'all-week', 'morning')",5.82810000000
+R1,gas,2025,"('all-year', 'all-week', 'night')",5.82810000000
+R1,gas,2030,"('all-year', 'all-week', 'afternoon')",6.52970000000
+R1,gas,2030,"('all-year', 'all-week', 'early-peak')",6.52970000000
+R1,gas,2030,"('all-year', 'all-week', 'evening')",6.52970000000
+R1,gas,2030,"('all-year', 'all-week', 'late-peak')",6.52970000000
+R1,gas,2030,"('all-year', 'all-week', 'morning')",6.52970000000
+R1,gas,2030,"('all-year', 'all-week', 'night')",6.52970000000
+R1,gas,2035,"('all-year', 'all-week', 'afternoon')",7.23120000000
+R1,gas,2035,"('all-year', 'all-week', 'early-peak')",7.23120000000
+R1,gas,2035,"('all-year', 'all-week', 'evening')",7.23120000000
+R1,gas,2035,"('all-year', 'all-week', 'late-peak')",7.23120000000
+R1,gas,2035,"('all-year', 'all-week', 'morning')",7.23120000000
+R1,gas,2035,"('all-year', 'all-week', 'night')",7.23120000000
+R1,heat,2025,"('all-year', 'all-week', 'afternoon')",6.50530000000
+R1,heat,2025,"('all-year', 'all-week', 'early-peak')",6.50530000000
+R1,heat,2025,"('all-year', 'all-week', 'evening')",6.50530000000
+R1,heat,2025,"('all-year', 'all-week', 'late-peak')",6.50530000000
+R1,heat,2025,"('all-year', 'all-week', 'morning')",6.50530000000
+R1,heat,2025,"('all-year', 'all-week', 'night')",6.50530000000
+R1,heat,2030,"('all-year', 'all-week', 'afternoon')",7.32100000000
+R1,heat,2030,"('all-year', 'all-week', 'early-peak')",7.32100000000
+R1,heat,2030,"('all-year', 'all-week', 'evening')",7.32100000000
+R1,heat,2030,"('all-year', 'all-week', 'late-peak')",7.32100000000
+R1,heat,2030,"('all-year', 'all-week', 'morning')",7.32100000000
+R1,heat,2030,"('all-year', 'all-week', 'night')",7.32100000000
+R1,heat,2035,"('all-year', 'all-week', 'afternoon')",8.13670000000
+R1,heat,2035,"('all-year', 'all-week', 'early-peak')",8.13670000000
+R1,heat,2035,"('all-year', 'all-week', 'evening')",8.13670000000
+R1,heat,2035,"('all-year', 'all-week', 'late-peak')",8.13670000000
+R1,heat,2035,"('all-year', 'all-week', 'morning')",8.13670000000
+R1,heat,2035,"('all-year', 'all-week', 'night')",8.13670000000
 R2,electricity,2020,"('all-year', 'all-week', 'afternoon')",19.13890000000
 R2,electricity,2020,"('all-year', 'all-week', 'early-peak')",19.13890000000
 R2,electricity,2020,"('all-year', 'all-week', 'evening')",19.13890000000
@@ -95,39 +95,39 @@ R2,gas,2020,"('all-year', 'all-week', 'evening')",4.71680000000
 R2,gas,2020,"('all-year', 'all-week', 'late-peak')",4.71680000000
 R2,gas,2020,"('all-year', 'all-week', 'morning')",4.71680000000
 R2,gas,2020,"('all-year', 'all-week', 'night')",4.71680000000
-R2,gas,2025,"('all-year', 'all-week', 'afternoon')",1.79390000000
-R2,gas,2025,"('all-year', 'all-week', 'early-peak')",1.79390000000
-R2,gas,2025,"('all-year', 'all-week', 'evening')",1.79390000000
-R2,gas,2025,"('all-year', 'all-week', 'late-peak')",1.94820000000
-R2,gas,2025,"('all-year', 'all-week', 'morning')",1.91690000000
-R2,gas,2025,"('all-year', 'all-week', 'night')",1.85500000000
-R2,gas,2030,"('all-year', 'all-week', 'afternoon')",0.68960000000
-R2,gas,2030,"('all-year', 'all-week', 'early-peak')",0.68960000000
-R2,gas,2030,"('all-year', 'all-week', 'evening')",0.68960000000
-R2,gas,2030,"('all-year', 'all-week', 'late-peak')",0.81680000000
-R2,gas,2030,"('all-year', 'all-week', 'morning')",0.79040000000
-R2,gas,2030,"('all-year', 'all-week', 'night')",0.73910000000
-R2,gas,2035,"('all-year', 'all-week', 'afternoon')",0.32370000000
-R2,gas,2035,"('all-year', 'all-week', 'early-peak')",0.32370000000
-R2,gas,2035,"('all-year', 'all-week', 'evening')",0.32370000000
-R2,gas,2035,"('all-year', 'all-week', 'late-peak')",0.41400000000
-R2,gas,2035,"('all-year', 'all-week', 'morning')",0.39500000000
-R2,gas,2035,"('all-year', 'all-week', 'night')",0.35840000000
-R2,heat,2025,"('all-year', 'all-week', 'afternoon')",0.65810000000
-R2,heat,2025,"('all-year', 'all-week', 'early-peak')",0.65810000000
-R2,heat,2025,"('all-year', 'all-week', 'evening')",0.65810000000
-R2,heat,2025,"('all-year', 'all-week', 'late-peak')",0.87450000000
-R2,heat,2025,"('all-year', 'all-week', 'morning')",0.83010000000
-R2,heat,2025,"('all-year', 'all-week', 'night')",0.74290000000
-R2,heat,2030,"('all-year', 'all-week', 'afternoon')",0.25320000000
-R2,heat,2030,"('all-year', 'all-week', 'early-peak')",0.25320000000
-R2,heat,2030,"('all-year', 'all-week', 'evening')",0.25320000000
-R2,heat,2030,"('all-year', 'all-week', 'late-peak')",0.36310000000
-R2,heat,2030,"('all-year', 'all-week', 'morning')",0.33950000000
-R2,heat,2030,"('all-year', 'all-week', 'night')",0.29480000000
-R2,heat,2035,"('all-year', 'all-week', 'afternoon')",0.11910000000
-R2,heat,2035,"('all-year', 'all-week', 'early-peak')",0.11910000000
-R2,heat,2035,"('all-year', 'all-week', 'evening')",0.11910000000
-R2,heat,2035,"('all-year', 'all-week', 'late-peak')",0.18100000000
-R2,heat,2035,"('all-year', 'all-week', 'morning')",0.16740000000
-R2,heat,2035,"('all-year', 'all-week', 'night')",0.14200000000
+R2,gas,2025,"('all-year', 'all-week', 'afternoon')",5.92540000000
+R2,gas,2025,"('all-year', 'all-week', 'early-peak')",5.92540000000
+R2,gas,2025,"('all-year', 'all-week', 'evening')",5.92540000000
+R2,gas,2025,"('all-year', 'all-week', 'late-peak')",5.92540000000
+R2,gas,2025,"('all-year', 'all-week', 'morning')",5.92540000000
+R2,gas,2025,"('all-year', 'all-week', 'night')",5.92540000000
+R2,gas,2030,"('all-year', 'all-week', 'afternoon')",6.72430000000
+R2,gas,2030,"('all-year', 'all-week', 'early-peak')",6.72430000000
+R2,gas,2030,"('all-year', 'all-week', 'evening')",6.72430000000
+R2,gas,2030,"('all-year', 'all-week', 'late-peak')",6.72430000000
+R2,gas,2030,"('all-year', 'all-week', 'morning')",6.72430000000
+R2,gas,2030,"('all-year', 'all-week', 'night')",6.72430000000
+R2,gas,2035,"('all-year', 'all-week', 'afternoon')",7.52310000000
+R2,gas,2035,"('all-year', 'all-week', 'early-peak')",7.52310000000
+R2,gas,2035,"('all-year', 'all-week', 'evening')",7.52310000000
+R2,gas,2035,"('all-year', 'all-week', 'late-peak')",7.52310000000
+R2,gas,2035,"('all-year', 'all-week', 'morning')",7.52310000000
+R2,gas,2035,"('all-year', 'all-week', 'night')",7.52310000000
+R2,heat,2025,"('all-year', 'all-week', 'afternoon')",7.85960000000
+R2,heat,2025,"('all-year', 'all-week', 'early-peak')",7.85960000000
+R2,heat,2025,"('all-year', 'all-week', 'evening')",7.85960000000
+R2,heat,2025,"('all-year', 'all-week', 'late-peak')",7.85960000000
+R2,heat,2025,"('all-year', 'all-week', 'morning')",7.85960000000
+R2,heat,2025,"('all-year', 'all-week', 'night')",7.85960000000
+R2,heat,2030,"('all-year', 'all-week', 'afternoon')",8.97430000000
+R2,heat,2030,"('all-year', 'all-week', 'early-peak')",8.97430000000
+R2,heat,2030,"('all-year', 'all-week', 'evening')",8.97430000000
+R2,heat,2030,"('all-year', 'all-week', 'late-peak')",8.97430000000
+R2,heat,2030,"('all-year', 'all-week', 'morning')",8.97430000000
+R2,heat,2030,"('all-year', 'all-week', 'night')",8.97430000000
+R2,heat,2035,"('all-year', 'all-week', 'afternoon')",10.08890000000
+R2,heat,2035,"('all-year', 'all-week', 'early-peak')",10.08890000000
+R2,heat,2035,"('all-year', 'all-week', 'evening')",10.08890000000
+R2,heat,2035,"('all-year', 'all-week', 'late-peak')",10.08890000000
+R2,heat,2035,"('all-year', 'all-week', 'morning')",10.08890000000
+R2,heat,2035,"('all-year', 'all-week', 'night')",10.08890000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2035.csv b/tests/example_outputs/trade/Residential/Capacity/2035.csv
index ab3a3848..9473ea08 100644
--- a/tests/example_outputs/trade/Residential/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Residential/Capacity/2035.csv
@@ -12,23 +12,23 @@ asset,year,region,technology,installed,capacity
 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
+3,2035,R2,gasboiler,2010,17.15000000000
+3,2039,R2,gasboiler,2010,17.15000000000
+3,2040,R2,gasboiler,2010,17.15000000000
+3,2044,R2,gasboiler,2010,15.09200000000
+3,2045,R2,gasboiler,2010,14.57750000000
+3,2049,R2,gasboiler,2010,12.51950000000
+3,2050,R2,gasboiler,2010,12.00500000000
+4,2035,R2,gasboiler,2030,1.63330000000
+4,2039,R2,gasboiler,2030,1.63330000000
+4,2040,R2,gasboiler,2030,1.63330000000
+4,2044,R2,gasboiler,2030,1.63330000000
+5,2040,R1,heatpump,2035,162.75650000000
+5,2044,R1,heatpump,2035,162.75650000000
+5,2045,R1,heatpump,2035,162.75650000000
+5,2049,R1,heatpump,2035,162.75650000000
+6,2039,R2,heatpump,2035,0.30670000000
+6,2040,R2,heatpump,2035,0.38330000000
+6,2044,R2,heatpump,2035,0.38330000000
+6,2045,R2,heatpump,2035,0.38330000000
+6,2049,R2,heatpump,2035,0.38330000000

From 0ca2ac0f21fce86b45f442990364cbf10a5c381f Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 15:19:14 +0100
Subject: [PATCH 404/419] Regenerate results files

---
 .../Results/MCACapacity.csv                   |  126 +-
 .../Results/MCAPrices.csv                     |  338 ++--
 .../1-introduction/Results/MCACapacity.csv    |  116 +-
 .../1-introduction/Results/MCAPrices.csv      |  338 ++--
 .../2-scenario/Results/MCACapacity.csv        |  116 +-
 .../2-scenario/Results/MCAPrices.csv          |  338 ++--
 .../Results/MCACapacity.csv                   |  206 +--
 .../1-single-objective/Results/MCAPrices.csv  |  338 ++--
 .../Results/MCACapacity.csv                   |  206 +--
 .../Results/MCAPrices.csv                     |  338 ++--
 .../1-new-region/Results/MCACapacity.csv      |  230 +--
 .../1-new-region/Results/MCAPrices.csv        |  674 ++++----
 .../Results/MCACapacity.csv                   |  226 +--
 .../1-modify-timeslices/Results/MCAPrices.csv |  898 +++++------
 .../Results/MCACapacity.csv                   |  660 ++++----
 .../Results/MCAPrices.csv                     | 1410 ++++++++---------
 .../Results/MCACapacity.csv                   |  298 ++--
 .../1-exogenous-demand/Results/MCAPrices.csv  | 1122 ++++++-------
 .../1-correlation/Results/MCACapacity.csv     |  102 +-
 .../1-correlation/Results/MCAPrices.csv       |  338 ++--
 .../1-min-constraint/Results/MCAPrices.csv    |  338 ++--
 .../2-max-constraint/Results/MCAPrices.csv    |  338 ++--
 tests/example_outputs/default/MCACapacity.csv |  116 +-
 tests/example_outputs/default/MCAPrices.csv   |  338 ++--
 .../default_retro/MCACapacity.csv             |  122 +-
 .../default_retro/MCAPrices.csv               |  338 ++--
 .../default_timeslice/MCAPrices.csv           |  338 ++--
 tests/example_outputs/medium/MCACapacity.csv  |  124 +-
 tests/example_outputs/medium/MCAPrices.csv    |  422 ++---
 .../multiple_agents/MCACapacity.csv           |  142 +-
 .../multiple_agents/MCAPrices.csv             |  338 ++--
 .../trade/Gas/Capacity/2020.csv               |    8 +-
 .../trade/Gas/Capacity/2025.csv               |    6 +-
 .../trade/Gas/Capacity/2030.csv               |    6 +-
 .../trade/Gas/Capacity/2035.csv               |    4 +-
 tests/example_outputs/trade/MCAPrices.csv     |  144 +-
 .../trade/Power/Capacity/2020.csv             |   12 +-
 .../trade/Power/Capacity/2025.csv             |   10 +-
 .../trade/Power/Capacity/2030.csv             |    8 +-
 .../trade/Power/Capacity/2035.csv             |    6 +-
 40 files changed, 5788 insertions(+), 5788 deletions(-)

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 70fe0b8b..8c4ad6fe 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -1,63 +1,63 @@
-,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
-0,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,newcapa,2020
-0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,newcapa,2020
-0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,newcapa,2020
-1,A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
-2,A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
-1,A1,2.00000000000,R1,2,2020,R1,power,gasCCGT,newcapa,2025
-22,A1,10.00000000000,R1,30,2020,R1,power,solarPV,newcapa,2025
-35,A1,4.00000000000,R1,57,2020,R1,power,windturbine,newcapa,2025
-1,A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
-3,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
-4,A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
-2,A1,1.00000000000,R1,4,2020,R1,power,gasCCGT,newcapa,2030
-3,A1,3.00000000000,R1,5,2025,R1,power,gasCCGT,newcapa,2030
-23,A1,10.00000000000,R1,34,2020,R1,power,solarPV,newcapa,2030
-24,A1,7.00000000000,R1,35,2025,R1,power,solarPV,newcapa,2030
-44,A1,4.00000000000,R1,72,2020,R1,power,windturbine,newcapa,2030
-2,A1,7.50000000000,R1,4,2020,R1,gas,gassupply1,newcapa,2030
-7,A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
-8,A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
-4,A1,1.00000000000,R1,6,2020,R1,power,gasCCGT,newcapa,2035
-5,A1,3.00000000000,R1,7,2025,R1,power,gasCCGT,newcapa,2035
-25,A1,10.00000000000,R1,40,2020,R1,power,solarPV,newcapa,2035
-26,A1,7.00000000000,R1,41,2025,R1,power,solarPV,newcapa,2035
-27,A1,6.00000000000,R1,42,2030,R1,power,solarPV,newcapa,2035
-54,A1,4.00000000000,R1,87,2020,R1,power,windturbine,newcapa,2035
-3,A1,6.68000000000,R1,10,2030,R1,gas,gassupply1,newcapa,2035
-11,A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
-12,A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
-6,A1,1.00000000000,R1,8,2020,R1,power,gasCCGT,newcapa,2040
-7,A1,3.00000000000,R1,9,2025,R1,power,gasCCGT,newcapa,2040
-28,A1,10.00000000000,R1,52,2020,R1,power,solarPV,newcapa,2040
-29,A1,7.00000000000,R1,53,2025,R1,power,solarPV,newcapa,2040
-30,A1,6.00000000000,R1,54,2030,R1,power,solarPV,newcapa,2040
-31,A1,5.00000000000,R1,55,2035,R1,power,solarPV,newcapa,2040
-65,A1,4.00000000000,R1,116,2020,R1,power,windturbine,newcapa,2040
-4,A1,6.68000000000,R1,13,2030,R1,gas,gassupply1,newcapa,2040
-5,A1,0.16290000000,R1,14,2035,R1,gas,gassupply1,newcapa,2040
-15,A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
-16,A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
-8,A1,1.00000000000,R1,15,2020,R1,power,gasCCGT,newcapa,2045
-9,A1,3.00000000000,R1,16,2025,R1,power,gasCCGT,newcapa,2045
-32,A1,10.00000000000,R1,90,2020,R1,power,solarPV,newcapa,2045
-33,A1,7.00000000000,R1,91,2025,R1,power,solarPV,newcapa,2045
-34,A1,6.00000000000,R1,92,2030,R1,power,solarPV,newcapa,2045
-35,A1,5.00000000000,R1,93,2035,R1,power,solarPV,newcapa,2045
-36,A1,7.00000000000,R1,94,2040,R1,power,solarPV,newcapa,2045
-76,A1,4.00000000000,R1,190,2020,R1,power,windturbine,newcapa,2045
-6,A1,6.68000000000,R1,21,2030,R1,gas,gassupply1,newcapa,2045
-7,A1,0.16290000000,R1,22,2035,R1,gas,gassupply1,newcapa,2045
-19,A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
-20,A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
-12,A1,1.00000000000,R1,21,2020,R1,power,gasCCGT,newcapa,2050
-13,A1,3.00000000000,R1,22,2025,R1,power,gasCCGT,newcapa,2050
-42,A1,7.00000000000,R1,116,2025,R1,power,solarPV,newcapa,2050
-43,A1,6.00000000000,R1,117,2030,R1,power,solarPV,newcapa,2050
-44,A1,5.00000000000,R1,118,2035,R1,power,solarPV,newcapa,2050
-45,A1,7.00000000000,R1,119,2040,R1,power,solarPV,newcapa,2050
-46,A1,10.00000000000,R1,120,2045,R1,power,solarPV,newcapa,2050
-88,A1,8.00000000000,R1,235,2045,R1,power,windturbine,newcapa,2050
-8,A1,6.68000000000,R1,25,2030,R1,gas,gassupply1,newcapa,2050
-9,A1,0.16290000000,R1,26,2035,R1,gas,gassupply1,newcapa,2050
-10,A1,0.09400000000,R1,27,2045,R1,gas,gassupply1,newcapa,2050
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,0.16290000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,0.16290000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,7.00000000000,R1,2025,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,8.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.16290000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,0.09400000000,R1,2045,R1,gas,gassupply1,newcapa,2050
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 ff7e8374..de955c5d 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,4.08500000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,3.23830000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,4.08500000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,3.23830000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,4.08500000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,3.23830000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,4.08500000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,3.23830000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,4.08500000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.23830000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,4.08500000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,3.23830000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,5.69380000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,2.51800000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,5.69380000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,2.51800000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,5.69380000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,2.51800000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,5.69380000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.51800000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,5.69380000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.51800000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,5.69380000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,2.51800000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,6.30080000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,2.76080000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,6.30080000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,2.76080000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.30080000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,2.76080000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.30080000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.76080000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.30080000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.76080000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,6.30080000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,2.76080000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,6.86500000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,2.98650000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,6.86500000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,2.98650000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,6.86500000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,2.98650000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.86500000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.98650000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.86500000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,2.98650000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,6.86500000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,2.98650000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,7.46020000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,3.22460000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,7.46020000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,3.22460000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,7.46020000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,3.22460000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.46020000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,3.22460000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.46020000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.22460000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,7.46020000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,3.22460000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,8.30270000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,3.56160000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,8.30270000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,3.56160000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,8.30270000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,3.56160000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.30270000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,3.56160000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.30270000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.56160000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,8.30270000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,3.56160000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,4.08500000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,3.23830000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,4.08500000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,3.23830000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,4.08500000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,3.23830000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,4.08500000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,3.23830000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,4.08500000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.23830000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,4.08500000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,3.23830000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,5.69380000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,2.51800000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,5.69380000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,2.51800000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,5.69380000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,2.51800000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,5.69380000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,2.51800000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,5.69380000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,2.51800000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,5.69380000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,2.51800000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,6.30080000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,2.76080000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,6.30080000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,2.76080000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,6.30080000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,2.76080000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,6.30080000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,2.76080000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,6.30080000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,2.76080000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,6.30080000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,2.76080000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,6.86500000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,2.98650000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,6.86500000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,2.98650000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,6.86500000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,2.98650000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,6.86500000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,2.98650000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,6.86500000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,2.98650000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,6.86500000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,2.98650000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,7.46020000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,3.22460000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,7.46020000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,3.22460000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,7.46020000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,3.22460000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,7.46020000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,3.22460000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,7.46020000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,3.22460000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,7.46020000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,3.22460000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,8.30270000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,3.56160000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,8.30270000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,3.56160000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,8.30270000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,3.56160000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,8.30270000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,3.56160000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,8.30270000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,3.56160000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,8.30270000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,3.56160000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
index 5f625671..fe48b2f1 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
@@ -1,58 +1,58 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2025,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,16.73530000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2030,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.23530000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.28910000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,5.00000000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.47410000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2025
+A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050
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 43f5d2a9..88277e7c 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
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.31290000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.89380000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.31290000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.89380000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.31290000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.89380000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.31290000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.89380000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.31290000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.89380000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.31290000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.89380000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,13.24060000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.53680000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.24060000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.53680000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.24060000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.53680000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.24060000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.53680000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.24060000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.53680000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.24060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.53680000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,14.92280000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.20960000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,14.92280000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.20960000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.92280000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.20960000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.92280000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.20960000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.92280000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.20960000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,14.92280000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.20960000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,16.12150000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.68910000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,16.12150000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.68910000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,16.12150000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.68910000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.12150000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.68910000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.12150000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.68910000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,16.12150000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.68910000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,18.12650000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.49110000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,18.12650000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.49110000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,18.12650000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.49110000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.12650000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.49110000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.12650000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.49110000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,18.12650000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.49110000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,19.68940000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,8.11630000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,19.68940000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,8.11630000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.68940000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.11630000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.68940000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.11630000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.68940000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.11630000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,19.68940000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,8.11630000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.31290000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.89380000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.31290000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.89380000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,9.31290000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.89380000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.31290000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.89380000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.31290000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.89380000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.31290000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.89380000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,13.24060000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.53680000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.24060000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.53680000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,13.24060000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.53680000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.24060000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.53680000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.24060000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.53680000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.24060000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.53680000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,14.92280000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.20960000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,14.92280000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.20960000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,14.92280000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.20960000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,14.92280000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.20960000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,14.92280000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.20960000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,14.92280000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.20960000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,16.12150000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.68910000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,16.12150000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.68910000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,16.12150000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.68910000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,16.12150000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.68910000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,16.12150000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.68910000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,16.12150000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.68910000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,18.12650000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.49110000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,18.12650000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.49110000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,18.12650000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,7.49110000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,18.12650000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.49110000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,18.12650000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.49110000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,18.12650000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.49110000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,19.68940000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.11630000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,19.68940000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.11630000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,19.68940000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.11630000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,19.68940000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.11630000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,19.68940000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.11630000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,19.68940000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.11630000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
index 0d0a8edf..ec93f2b6 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
@@ -1,58 +1,58 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,16.46440000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
-windturbine,R1,R1,A1,power,newcapa,2030,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,8.96440000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.22000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
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 8b6fc5f5..4afb878d 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
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,15.97270000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,15.97270000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.97270000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.97270000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.97270000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,15.97270000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,17.94720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,17.94720000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,17.94720000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.94720000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.94720000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,17.94720000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,19.46150000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,19.46150000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.46150000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.46150000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.46150000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,19.46150000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.18790000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.85420000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.18790000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.85420000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,9.18790000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.85420000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.18790000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.85420000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.18790000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.85420000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.18790000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,13.07600000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.47090000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.07600000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.47090000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,13.07600000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.47090000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.07600000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.47090000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.07600000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.47090000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.07600000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.47090000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,14.77530000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.15060000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,14.77530000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.15060000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,14.77530000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.15060000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,14.77530000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.15060000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,14.77530000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.15060000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,14.77530000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.15060000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,15.97270000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.62960000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,15.97270000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.62960000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,15.97270000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.62960000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,15.97270000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.62960000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,15.97270000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.62960000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,15.97270000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.62960000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,17.94720000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.41940000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,17.94720000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.41940000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,17.94720000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,7.41940000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,17.94720000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.41940000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,17.94720000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.41940000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,17.94720000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.41940000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,19.46150000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.02510000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,19.46150000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.02510000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,19.46150000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.02510000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,19.46150000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.02510000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,19.46150000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.02510000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,19.46150000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.02510000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
index ee9ef91d..efe1d980 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCACapacity.csv
@@ -1,103 +1,103 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,newcapa,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,2.36110000000
-gasCCGT,R1,R1,A2,power,newcapa,2025,2.36110000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,8.88670000000
-gassupply1,R1,R1,A2,gas,newcapa,2025,8.88670000000
-heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,4.80560000000
-gasCCGT,R1,R1,A2,power,newcapa,2030,1.86110000000
-gasCCGT,R1,R1,A2,power,newcapa,2030,4.80560000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,5.13670000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,5.99670000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,5.13670000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,5.99670000000
-heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2035,1.50000000000
-gasCCGT,R1,R1,A2,power,newcapa,2035,1.86110000000
-gasCCGT,R1,R1,A2,power,newcapa,2035,4.80560000000
-solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.38670000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,5.99670000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,4.76210000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,1.38670000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,5.99670000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,4.76210000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2040,3.00000000000
-gasCCGT,R1,R1,A2,power,newcapa,2040,1.86110000000
-gasCCGT,R1,R1,A2,power,newcapa,2040,4.80560000000
-solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2040,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.38670000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,5.99670000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.76210000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,1.38670000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,5.99670000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,4.76210000000
-heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.00000000000
-gasCCGT,R1,R1,A2,power,newcapa,2045,1.86110000000
-gasCCGT,R1,R1,A2,power,newcapa,2045,4.80560000000
-solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.38670000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,5.99670000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,4.76210000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,1.38670000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,5.99670000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,4.76210000000
-heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-gasCCGT,R1,R1,A2,power,newcapa,2050,1.86110000000
-gasCCGT,R1,R1,A2,power,newcapa,2050,4.80560000000
-solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.38670000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,5.99670000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,4.76210000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,1.38670000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,5.99670000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,4.76210000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A2,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,8.88670000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A2,8.88670000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.13670000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A2,5.13670000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A2,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A2,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A2,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A2,1.38670000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A2,5.99670000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,4.76210000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
index a89d6f24..68d19067 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,5.82450000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,5.82450000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.82450000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.82450000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.82450000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,5.82450000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,19.18520000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,7.91460000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,19.18520000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,7.91460000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.18520000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.91460000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.18520000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.91460000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.18520000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.91460000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,19.18520000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,7.91460000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,20.54460000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,8.45830000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,20.54460000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,8.45830000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,20.54460000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.45830000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,20.54460000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.45830000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,20.54460000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.45830000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,20.54460000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,8.45830000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,22.95080000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,9.42080000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,22.95080000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,9.42080000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,22.95080000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,9.42080000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,22.95080000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,9.42080000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,22.95080000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,9.42080000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,22.95080000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,9.42080000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,24.79080000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,10.15680000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,24.79080000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,10.15680000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,24.79080000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,10.15680000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,24.79080000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,10.15680000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,24.79080000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,10.15680000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,24.79080000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,10.15680000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,12.25210000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,5.82450000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,12.25210000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,5.82450000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,12.25210000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,5.82450000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,12.25210000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,5.82450000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,12.25210000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,5.82450000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,12.25210000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,5.82450000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,15.63730000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,6.49540000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,15.63730000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,6.49540000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,15.63730000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,6.49540000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,15.63730000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,6.49540000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,15.63730000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,6.49540000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,15.63730000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,6.49540000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,19.18520000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,7.91460000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,19.18520000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,7.91460000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,19.18520000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,7.91460000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,19.18520000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,7.91460000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,19.18520000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,7.91460000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,19.18520000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,7.91460000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,20.54460000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,8.45830000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,20.54460000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,8.45830000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,20.54460000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,8.45830000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,20.54460000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,8.45830000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,20.54460000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,8.45830000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,20.54460000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,8.45830000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,22.95080000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,9.42080000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,22.95080000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,9.42080000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,22.95080000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,9.42080000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,22.95080000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,9.42080000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,22.95080000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,9.42080000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,22.95080000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,9.42080000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,24.79080000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,10.15680000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,24.79080000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,10.15680000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,24.79080000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,10.15680000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,24.79080000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,10.15680000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,24.79080000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,10.15680000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,24.79080000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,10.15680000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
index dc56109f..e3731c7f 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -1,103 +1,103 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,0.50000000000
-gasCCGT,R1,R1,A2,power,newcapa,2020,0.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2020,7.50000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,2.36110000000
-gasCCGT,R1,R1,A2,power,newcapa,2025,0.50000000000
-windturbine,R1,R1,A2,power,newcapa,2025,4.18750000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,7.50000000000
-gassupply1,R1,R1,A2,gas,newcapa,2025,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,4.80560000000
-solarPV,R1,R1,A2,power,newcapa,2030,10.00000000000
-windturbine,R1,R1,A2,power,newcapa,2030,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2030,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,1.81670000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,3.75000000000
-gassupply1,R1,R1,A2,gas,newcapa,2030,1.81670000000
-heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2035,0.50000000000
-solarPV,R1,R1,A2,power,newcapa,2035,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2035,1.50000000000
-windturbine,R1,R1,A2,power,newcapa,2035,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2035,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.81670000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,4.44580000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,1.81670000000
-gassupply1,R1,R1,A2,gas,newcapa,2035,4.44580000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2040,0.50000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.50000000000
-windturbine,R1,R1,A1,power,newcapa,2040,0.50000000000
-solarPV,R1,R1,A2,power,newcapa,2040,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2040,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2040,3.50000000000
-windturbine,R1,R1,A2,power,newcapa,2040,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2040,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.81670000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.44580000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,1.81670000000
-gassupply1,R1,R1,A2,gas,newcapa,2040,4.44580000000
-heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2045,0.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,2.50000000000
-solarPV,R1,R1,A1,power,newcapa,2045,3.25000000000
-windturbine,R1,R1,A1,power,newcapa,2045,0.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2045,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.50000000000
-solarPV,R1,R1,A2,power,newcapa,2045,3.25000000000
-windturbine,R1,R1,A2,power,newcapa,2045,4.18750000000
-windturbine,R1,R1,A2,power,newcapa,2045,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.81670000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,4.44580000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,1.81670000000
-gassupply1,R1,R1,A2,gas,newcapa,2045,4.44580000000
-heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,1.86110000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,4.80560000000
-solarPV,R1,R1,A1,power,newcapa,2050,0.50000000000
-solarPV,R1,R1,A1,power,newcapa,2050,2.50000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.25000000000
-solarPV,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,0.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,10.00000000000
-solarPV,R1,R1,A2,power,newcapa,2050,1.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.50000000000
-solarPV,R1,R1,A2,power,newcapa,2050,3.25000000000
-solarPV,R1,R1,A2,power,newcapa,2050,6.59370000000
-windturbine,R1,R1,A2,power,newcapa,2050,0.81250000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.81670000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,4.44580000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,1.81670000000
-gassupply1,R1,R1,A2,gas,newcapa,2050,4.44580000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,2.50000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,0.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A2,3.50000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,2.50000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,0.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A2,3.50000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A2,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,0.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,2.50000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,3.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,0.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A2,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050
+A2,1.50000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A2,3.50000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A2,3.25000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A2,6.59370000000,R1,2045,R1,power,solarPV,newcapa,2050
+A2,0.81250000000,R1,2025,R1,power,windturbine,newcapa,2050
+A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,4.44580000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
index 24c15fe0..dda5e11e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,8.08020000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.50340000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,8.08020000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.50340000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,8.08020000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.50340000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.08020000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.50340000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.08020000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.50340000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,8.08020000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.50340000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,8.67020000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,3.70860000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,8.67020000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,3.70860000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,8.67020000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,3.70860000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.67020000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,3.70860000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.67020000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.70860000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,8.67020000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,3.70860000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,10.71580000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,4.52680000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,10.71580000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,4.52680000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,10.71580000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.52680000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.71580000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.52680000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.71580000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.52680000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,10.71580000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,4.52680000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,11.22800000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,4.73170000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,11.22800000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,4.73170000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.22800000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.73170000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.22800000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.73170000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.22800000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.73170000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,11.22800000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,4.73170000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,12.28600000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,5.15490000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,12.28600000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,5.15490000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.28600000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.15490000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.28600000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.15490000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.28600000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.15490000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,12.28600000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,5.15490000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,13.30680000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,5.56320000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,13.30680000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,5.56320000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.30680000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.56320000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.30680000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.56320000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.30680000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.56320000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,13.30680000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,5.56320000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,8.08020000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.50340000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,8.08020000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.50340000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,8.08020000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.50340000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,8.08020000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.50340000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,8.08020000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.50340000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,8.08020000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.50340000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,8.67020000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,3.70860000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,8.67020000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,3.70860000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,8.67020000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,3.70860000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,8.67020000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,3.70860000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,8.67020000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,3.70860000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,8.67020000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,3.70860000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,10.71580000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,4.52680000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,10.71580000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,4.52680000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,10.71580000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,4.52680000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,10.71580000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,4.52680000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,10.71580000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,4.52680000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,10.71580000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,4.52680000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,11.22800000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,4.73170000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,11.22800000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,4.73170000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,11.22800000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,4.73170000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,11.22800000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,4.73170000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,11.22800000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,4.73170000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,11.22800000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,4.73170000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,12.28600000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,5.15490000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,12.28600000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,5.15490000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,12.28600000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,5.15490000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,12.28600000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,5.15490000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,12.28600000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,5.15490000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,12.28600000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,5.15490000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,13.30680000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,5.56320000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,13.30680000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,5.56320000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,13.30680000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,5.56320000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,13.30680000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,5.56320000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,13.30680000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,5.56320000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,13.30680000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,5.56320000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
index 40ae2eea..7526a701 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
@@ -1,115 +1,115 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,5.50000000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,16.46440000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,16.46440000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,19.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.88890000000
-windturbine,R1,R1,A1,power,newcapa,2030,5.50000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,5.88890000000
-windturbine,R2,R2,A1,power,newcapa,2030,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,8.96440000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.22000000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,8.96440000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,9.22000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,10.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,5.50000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2035,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2035,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,1.46440000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,9.22000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,26.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.50000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2040,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2040,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,1.46440000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,9.22000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,16.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.50000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2045,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2045,5.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,1.46440000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,9.22000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,32.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.88890000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,6.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.50000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,5.88890000000
-solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,6.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,10.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,1.50000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.46440000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,9.22000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,1.46440000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,9.22000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
+A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2025
+A1,16.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,16.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,10.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,8.96440000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,8.96440000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,10.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035
+A1,26.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2035
+A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2035
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2035
+A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,26.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,16.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2040
+A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2040
+A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2040
+A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,16.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045
+A1,32.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,5.50000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2045
+A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2045
+A1,6.00000000000,R2,2040,R2,power,solarPV,newcapa,2045
+A1,5.50000000000,R2,2020,R2,power,windturbine,newcapa,2045
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2045
+A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,32.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050
+A1,22.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,5.88890000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050
+A1,5.88890000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R2,2030,R2,power,solarPV,newcapa,2050
+A1,6.00000000000,R2,2035,R2,power,solarPV,newcapa,2050
+A1,6.00000000000,R2,2040,R2,power,solarPV,newcapa,2050
+A1,10.00000000000,R2,2045,R2,power,solarPV,newcapa,2050
+A1,1.50000000000,R2,2045,R2,power,windturbine,newcapa,2050
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,9.22000000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.46440000000,R2,2020,R2,gas,gassupply1,newcapa,2050
+A1,9.22000000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050
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 ca540915..96119f8d 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
@@ -1,337 +1,337 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,9.18790000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,4.85420000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,9.18790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,4.85420000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R2,9.18790000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R2,4.85420000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,9.18790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,4.85420000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,9.18790000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,4.85420000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,9.18790000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,4.85420000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,13.07600000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,5.47090000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,13.07600000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,5.47090000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R2,13.07600000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R2,5.47090000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.07600000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.47090000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.07600000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.47090000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.07600000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,13.07600000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.47090000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,5.47090000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,14.77530000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,6.15060000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,14.77530000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,6.15060000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R2,14.77530000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R2,6.15060000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,14.77530000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.15060000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,14.77530000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.15060000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,14.77530000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,14.77530000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.15060000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,6.15060000000,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,15.97270000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,15.97270000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,6.62960000000,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,15.97270000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,15.97270000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,6.62960000000,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,15.97270000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,15.97270000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R2,6.62960000000,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,15.97270000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,15.97270000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.62960000000,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,15.97270000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,15.97270000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.62960000000,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,15.97270000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,15.97270000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.62960000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,6.62960000000,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,17.94720000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,17.94720000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,7.41940000000,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,17.94720000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,17.94720000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,7.41940000000,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,17.94720000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,17.94720000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,7.41940000000,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,17.94720000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.94720000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,7.41940000000,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,17.94720000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.94720000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,7.41940000000,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,17.94720000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,17.94720000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.41940000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,7.41940000000,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,19.46150000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,19.46150000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,8.02510000000,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,19.46150000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,19.46150000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,8.02510000000,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,19.46150000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,19.46150000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R2,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,8.02510000000,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,19.46150000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.46150000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,8.02510000000,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,19.46150000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.46150000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,8.02510000000,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,19.46150000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,19.46150000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,8.02510000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,8.02510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.18790000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,9.18790000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.85420000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.85420000000,R2,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.18790000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,9.18790000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.85420000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.85420000000,R2,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,9.18790000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,9.18790000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.85420000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.85420000000,R2,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.18790000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,9.18790000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.85420000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.85420000000,R2,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.18790000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,9.18790000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.85420000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.85420000000,R2,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.18790000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,9.18790000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.85420000000,R2,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,13.07600000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,13.07600000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.47090000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.47090000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.07600000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,13.07600000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.47090000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.47090000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,13.07600000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,13.07600000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.47090000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.47090000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.07600000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,13.07600000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.47090000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.47090000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.07600000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,13.07600000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.47090000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.47090000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.07600000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,13.07600000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.47090000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.47090000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,14.77530000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,14.77530000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.15060000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.15060000000,R2,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,14.77530000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,14.77530000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.15060000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.15060000000,R2,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,14.77530000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,14.77530000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.15060000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.15060000000,R2,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,14.77530000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,14.77530000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.15060000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.15060000000,R2,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,14.77530000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,14.77530000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.15060000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.15060000000,R2,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,14.77530000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,14.77530000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.15060000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.15060000000,R2,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,15.97270000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,15.97270000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.62960000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.62960000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,15.97270000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,15.97270000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.62960000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.62960000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,15.97270000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,15.97270000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.62960000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.62960000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,15.97270000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,15.97270000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.62960000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.62960000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,15.97270000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,15.97270000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.62960000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.62960000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,15.97270000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,15.97270000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.62960000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.62960000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,17.94720000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,17.94720000000,R2,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.41940000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.41940000000,R2,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,17.94720000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,17.94720000000,R2,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.41940000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.41940000000,R2,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,17.94720000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,17.94720000000,R2,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,7.41940000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,7.41940000000,R2,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,17.94720000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,17.94720000000,R2,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.41940000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.41940000000,R2,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,17.94720000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,17.94720000000,R2,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.41940000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.41940000000,R2,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,17.94720000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,17.94720000000,R2,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.41940000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.41940000000,R2,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,19.46150000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,19.46150000000,R2,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.02510000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.02510000000,R2,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,19.46150000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,19.46150000000,R2,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.02510000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.02510000000,R2,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,19.46150000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,19.46150000000,R2,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.02510000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.02510000000,R2,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,19.46150000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,19.46150000000,R2,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.02510000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.02510000000,R2,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,19.46150000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,19.46150000000,R2,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.02510000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.02510000000,R2,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,19.46150000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,19.46150000000,R2,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.02510000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.02510000000,R2,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index 354cc21a..20bfff60 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -1,113 +1,113 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,3.80910000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,6.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,3.80910000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,16.58160000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,16.58160000000
-heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.75150000000
-windturbine,R1,R1,A1,power,newcapa,2030,3.80910000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,5.75150000000
-windturbine,R2,R2,A1,power,newcapa,2030,3.80910000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.08160000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,8.87340000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,9.08160000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,8.87340000000
-heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2035,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2035,3.80910000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2035,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2035,3.80910000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.58160000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,8.87340000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,1.58160000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,8.87340000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2040,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2040,3.80910000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2040,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2040,3.80910000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.58160000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,8.87340000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,1.58160000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,8.87340000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2045,5.60000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.80910000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2045,5.60000000000
-windturbine,R2,R2,A1,power,newcapa,2045,3.80910000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.58160000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,8.87340000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,1.58160000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,8.87340000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,7.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.75150000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,5.60000000000
-solarPV,R1,R1,A1,power,newcapa,2050,9.40910000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,5.75150000000
-solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,5.60000000000
-solarPV,R2,R2,A1,power,newcapa,2050,9.40910000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.58160000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,8.87340000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,1.58160000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,8.87340000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,7.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
+A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2025
+A1,16.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,16.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,9.08160000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,9.08160000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2035
+A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2035
+A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2035
+A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2040
+A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2040
+A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2040
+A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,5.60000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,3.80910000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2045
+A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2045
+A1,5.60000000000,R2,2040,R2,power,solarPV,newcapa,2045
+A1,3.80910000000,R2,2020,R2,power,windturbine,newcapa,2045
+A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2045
+A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050
+A1,23.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,5.75150000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,5.60000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,5.60000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,5.60000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,9.40910000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,5.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050
+A1,5.75150000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,5.60000000000,R2,2030,R2,power,solarPV,newcapa,2050
+A1,5.60000000000,R2,2035,R2,power,solarPV,newcapa,2050
+A1,5.60000000000,R2,2040,R2,power,solarPV,newcapa,2050
+A1,9.40910000000,R2,2045,R2,power,solarPV,newcapa,2050
+A1,1.58160000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,8.87340000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,1.58160000000,R2,2020,R2,gas,gassupply1,newcapa,2050
+A1,8.87340000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,7.50000000000,R2,2030,R2,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index cd87ed66..7b65d615 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -1,449 +1,449 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,9.58810000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,9.58810000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.97980000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.97980000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.41110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.41110000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.54480000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.54480000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,6.25910000000,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', 'early-morning')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,15.19670000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,15.19670000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.25910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.25910000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,16.45990000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,6.76430000000,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,16.45990000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,6.76430000000,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', 'mid-afternoon')",electricity,R1,16.45990000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.76430000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.45990000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.76430000000,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,16.45990000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.76430000000,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,16.45990000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,6.76430000000,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', 'early-morning')",electricity,R1,16.45990000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,6.76430000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.45990000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.45990000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.76430000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.76430000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,18.55050000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,7.60060000000,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,18.55050000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,7.60060000000,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', 'mid-afternoon')",electricity,R1,18.55050000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.60060000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.55050000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,7.60060000000,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,18.55050000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,7.60060000000,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,18.55050000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,7.60060000000,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', 'early-morning')",electricity,R1,18.55050000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,7.60060000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,18.55050000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,18.55050000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.60060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.60060000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,20.16000000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,8.24440000000,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,20.16000000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,8.24440000000,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', 'mid-afternoon')",electricity,R1,20.16000000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,8.24440000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,20.16000000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,8.24440000000,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,20.16000000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,8.24440000000,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,20.16000000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,8.24440000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,20.16000000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,8.24440000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,20.16000000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,20.16000000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,8.24440000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,8.24440000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.58810000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,9.58810000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.97980000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.97980000000,R2,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.58810000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,9.58810000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.97980000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.97980000000,R2,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
+electricity,all-week,mid-afternoon,all-year,9.58810000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,9.58810000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,4.97980000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,4.97980000000,R2,2,MUS$2010/PJ,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.58810000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,9.58810000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.97980000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.97980000000,R2,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.58810000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,9.58810000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.97980000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.97980000000,R2,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.58810000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,9.58810000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.97980000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.97980000000,R2,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
+electricity,all-week,early-morning,all-year,9.58810000000,R1,6,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,9.58810000000,R2,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,4.97980000000,R1,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,4.97980000000,R2,6,MUS$2010/PJ,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R2,6,MUS$2010/kt,2025
+electricity,all-week,late-afternoon,all-year,9.58810000000,R1,7,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,9.58810000000,R2,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,4.97980000000,R1,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,4.97980000000,R2,7,MUS$2010/PJ,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R2,7,MUS$2010/kt,2025
+electricity,all-week,night,all-year,13.41110000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,13.41110000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.54480000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.54480000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.41110000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,13.41110000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.54480000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.54480000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+electricity,all-week,mid-afternoon,all-year,13.41110000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,13.41110000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,5.54480000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,5.54480000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.41110000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,13.41110000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.54480000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.54480000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.41110000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,13.41110000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.54480000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.54480000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.41110000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,13.41110000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.54480000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.54480000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+electricity,all-week,early-morning,all-year,13.41110000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,13.41110000000,R2,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,5.54480000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,5.54480000000,R2,6,MUS$2010/PJ,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030
+electricity,all-week,late-afternoon,all-year,13.41110000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,13.41110000000,R2,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,5.54480000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,5.54480000000,R2,7,MUS$2010/PJ,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030
+electricity,all-week,night,all-year,15.19670000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,15.19670000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.25910000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.25910000000,R2,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,15.19670000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,15.19670000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.25910000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.25910000000,R2,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
+electricity,all-week,mid-afternoon,all-year,15.19670000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,15.19670000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,6.25910000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,6.25910000000,R2,2,MUS$2010/PJ,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,15.19670000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,15.19670000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.25910000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.25910000000,R2,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,15.19670000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,15.19670000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.25910000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.25910000000,R2,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,15.19670000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,15.19670000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.25910000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.25910000000,R2,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
+electricity,all-week,early-morning,all-year,15.19670000000,R1,6,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,15.19670000000,R2,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,6.25910000000,R1,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,6.25910000000,R2,6,MUS$2010/PJ,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R2,6,MUS$2010/kt,2035
+electricity,all-week,late-afternoon,all-year,15.19670000000,R1,7,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,15.19670000000,R2,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,6.25910000000,R1,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,6.25910000000,R2,7,MUS$2010/PJ,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R2,7,MUS$2010/kt,2035
+electricity,all-week,night,all-year,16.45990000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,16.45990000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.76430000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.76430000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,16.45990000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,16.45990000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.76430000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.76430000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+electricity,all-week,mid-afternoon,all-year,16.45990000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,16.45990000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,6.76430000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,6.76430000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,16.45990000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,16.45990000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.76430000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.76430000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,16.45990000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,16.45990000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.76430000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.76430000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,16.45990000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,16.45990000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.76430000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.76430000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+electricity,all-week,early-morning,all-year,16.45990000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,16.45990000000,R2,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,6.76430000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,6.76430000000,R2,6,MUS$2010/PJ,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040
+electricity,all-week,late-afternoon,all-year,16.45990000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,16.45990000000,R2,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,6.76430000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,6.76430000000,R2,7,MUS$2010/PJ,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040
+electricity,all-week,night,all-year,18.55050000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,18.55050000000,R2,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.60060000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.60060000000,R2,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,18.55050000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,18.55050000000,R2,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.60060000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.60060000000,R2,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
+electricity,all-week,mid-afternoon,all-year,18.55050000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,18.55050000000,R2,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,7.60060000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,7.60060000000,R2,2,MUS$2010/PJ,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,18.55050000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,18.55050000000,R2,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.60060000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.60060000000,R2,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,18.55050000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,18.55050000000,R2,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.60060000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.60060000000,R2,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,18.55050000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,18.55050000000,R2,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.60060000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.60060000000,R2,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
+electricity,all-week,early-morning,all-year,18.55050000000,R1,6,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,18.55050000000,R2,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,7.60060000000,R1,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,7.60060000000,R2,6,MUS$2010/PJ,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R2,6,MUS$2010/kt,2045
+electricity,all-week,late-afternoon,all-year,18.55050000000,R1,7,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,18.55050000000,R2,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,7.60060000000,R1,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,7.60060000000,R2,7,MUS$2010/PJ,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R2,7,MUS$2010/kt,2045
+electricity,all-week,night,all-year,20.16000000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,20.16000000000,R2,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.24440000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.24440000000,R2,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,20.16000000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,20.16000000000,R2,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.24440000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.24440000000,R2,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
+electricity,all-week,mid-afternoon,all-year,20.16000000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,20.16000000000,R2,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,8.24440000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,8.24440000000,R2,2,MUS$2010/PJ,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,20.16000000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,20.16000000000,R2,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.24440000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.24440000000,R2,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,20.16000000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,20.16000000000,R2,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.24440000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.24440000000,R2,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,20.16000000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,20.16000000000,R2,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.24440000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.24440000000,R2,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
+electricity,all-week,early-morning,all-year,20.16000000000,R1,6,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,20.16000000000,R2,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,8.24440000000,R1,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,8.24440000000,R2,6,MUS$2010/PJ,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R2,6,MUS$2010/kt,2050
+electricity,all-week,late-afternoon,all-year,20.16000000000,R1,7,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,20.16000000000,R2,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,8.24440000000,R1,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,8.24440000000,R2,7,MUS$2010/PJ,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R2,7,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 8e38e00f..b565c055 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -1,330 +1,330 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2022,8.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2022,11.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2022,8.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2022,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2022,3.00000000000
-solarPV,R1,R1,A1,power,newcapa,2022,0.27320000000
-windturbine,R1,R1,A1,power,newcapa,2022,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2022,3.00000000000
-windturbine,R2,R2,A1,power,newcapa,2022,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2022,15.34280000000
-gassupply1,R2,R2,A1,gas,newcapa,2022,15.34280000000
-gasboiler,R1,R1,A1,residential,newcapa,2024,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2024,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2024,4.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2024,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2024,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2024,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2024,3.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2024,1.85640000000
-solarPV,R1,R1,A1,power,newcapa,2024,0.27320000000
-windturbine,R1,R1,A1,power,newcapa,2024,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2024,3.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2024,1.85640000000
-windturbine,R2,R2,A1,power,newcapa,2024,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2024,15.34280000000
-gassupply1,R1,R1,A1,gas,newcapa,2024,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2024,15.34280000000
-gassupply1,R2,R2,A1,gas,newcapa,2024,0.60380000000
-gasboiler,R1,R1,A1,residential,newcapa,2026,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2026,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2026,4.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2026,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2026,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2026,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,2.80000000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2026,2.07980000000
-solarPV,R1,R1,A1,power,newcapa,2026,0.27320000000
-windturbine,R1,R1,A1,power,newcapa,2026,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,2.80000000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2026,2.07980000000
-windturbine,R2,R2,A1,power,newcapa,2026,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2026,13.84280000000
-gassupply1,R1,R1,A1,gas,newcapa,2026,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2026,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2026,13.84280000000
-gassupply1,R2,R2,A1,gas,newcapa,2026,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2026,2.07490000000
-gasboiler,R1,R1,A1,residential,newcapa,2028,2.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2028,4.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2028,2.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2028,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,2.40000000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2028,2.29760000000
-solarPV,R1,R1,A1,power,newcapa,2028,0.27320000000
-windturbine,R1,R1,A1,power,newcapa,2028,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,2.40000000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2028,2.29760000000
-windturbine,R2,R2,A1,power,newcapa,2028,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,10.84280000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,2.07490000000
-gassupply1,R1,R1,A1,gas,newcapa,2028,3.55300000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,10.84280000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2028,3.55300000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,2.31150000000
-solarPV,R1,R1,A1,power,newcapa,2030,0.27320000000
-windturbine,R1,R1,A1,power,newcapa,2030,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,2.31150000000
-windturbine,R2,R2,A1,power,newcapa,2030,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.84280000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,2.07490000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.55300000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,7.84280000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,3.55300000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,3.53600000000
-heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2032,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2032,13.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2032,0.99560000000
-solarPV,R1,R1,A1,power,newcapa,2032,0.27320000000
-windturbine,R1,R1,A1,power,newcapa,2032,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2032,0.99560000000
-windturbine,R2,R2,A1,power,newcapa,2032,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,4.84280000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,2.07490000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,3.55300000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2032,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,4.84280000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,3.55300000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2032,4.66260000000
-heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2034,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2034,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,0.99560000000
-gasCCGT,R1,R1,A1,power,newcapa,2034,0.75270000000
-solarPV,R1,R1,A1,power,newcapa,2034,0.27320000000
-solarPV,R1,R1,A1,power,newcapa,2034,0.54630000000
-windturbine,R1,R1,A1,power,newcapa,2034,4.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2034,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2034,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2034,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,1.84280000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,2.07490000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.55300000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2034,3.62850000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,1.84280000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.55300000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2034,3.62850000000
-heatpump,R1,R1,A1,residential,newcapa,2036,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2036,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,4.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2036,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,0.99560000000
-gasCCGT,R1,R1,A1,power,newcapa,2036,0.75270000000
-solarPV,R1,R1,A1,power,newcapa,2036,0.27320000000
-solarPV,R1,R1,A1,power,newcapa,2036,0.54630000000
-solarPV,R1,R1,A1,power,newcapa,2036,1.63890000000
-windturbine,R1,R1,A1,power,newcapa,2036,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2036,0.60110000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2036,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2036,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2036,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,0.34280000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,2.07490000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.55300000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,3.62850000000
-gassupply1,R1,R1,A1,gas,newcapa,2036,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,0.34280000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.55300000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,3.62850000000
-gassupply1,R2,R2,A1,gas,newcapa,2036,1.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2038,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2038,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,0.99560000000
-gasCCGT,R1,R1,A1,power,newcapa,2038,0.75270000000
-solarPV,R1,R1,A1,power,newcapa,2038,0.27320000000
-solarPV,R1,R1,A1,power,newcapa,2038,0.54630000000
-solarPV,R1,R1,A1,power,newcapa,2038,1.63890000000
-solarPV,R1,R1,A1,power,newcapa,2038,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2038,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2038,0.60110000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2038,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2038,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2038,4.27320000000
-heatpump,R1,R1,A1,residential,newcapa,2040,13.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,13.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,6.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,8.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,1.85640000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.07980000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.29760000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,2.31150000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,0.99560000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,0.75270000000
-solarPV,R1,R1,A1,power,newcapa,2040,0.27320000000
-solarPV,R1,R1,A1,power,newcapa,2040,0.54630000000
-solarPV,R1,R1,A1,power,newcapa,2040,1.63890000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-solarPV,R1,R1,A1,power,newcapa,2040,2.24000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,0.60110000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,1.85640000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.07980000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.29760000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,2.31150000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,0.99560000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-solarPV,R2,R2,A1,power,newcapa,2040,2.24000000000
-windturbine,R2,R2,A1,power,newcapa,2040,4.27320000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.34280000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.60380000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.07490000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.55300000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.53600000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.66260000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,3.62850000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.50000000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,0.34280000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,0.60380000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,2.07490000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.55300000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.53600000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,4.66260000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,3.62850000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,1.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022
+A1,8.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2022
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2022
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2022
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2022
+A1,3.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2022
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2022
+A1,15.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2022
+A1,15.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2022
+A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024
+A1,6.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2024
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2024
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2024
+A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2024
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2024
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2024
+A1,3.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2024
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2024
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2024
+A1,15.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2024
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2024
+A1,15.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2024
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2024
+A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026
+A1,4.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2026
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2026
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2026
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2026
+A1,2.80000000000,R1,2020,R1,power,gasCCGT,newcapa,2026
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2026
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2026
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2026
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2026
+A1,2.80000000000,R2,2020,R2,power,gasCCGT,newcapa,2026
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2026
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2026
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2026
+A1,13.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2026
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2026
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2026
+A1,13.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2026
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2026
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2026
+A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028
+A1,2.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2028
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2028
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2028
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2028
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2028
+A1,2.40000000000,R1,2020,R1,power,gasCCGT,newcapa,2028
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2028
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2028
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2028
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2028
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2028
+A1,2.40000000000,R2,2020,R2,power,gasCCGT,newcapa,2028
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2028
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2028
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2028
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2028
+A1,10.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2028
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2028
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2028
+A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2028
+A1,10.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2028
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2028
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2028
+A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2028
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2030
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2030
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2030
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2030
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2030
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2030
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2030
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2030
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2030
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2030
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2030
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2030
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2030
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,7.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2030
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2030
+A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2030
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2030
+A1,7.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2030
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2030
+A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2030
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2030
+A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032
+A1,4.00000000000,R2,2022,R2,residential,heatpump,newcapa,2032
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2032
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2032
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2032
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2032
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2032
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2032
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2032
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2032
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2032
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2032
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2032
+A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2032
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2032
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2032
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2032
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2032
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2032
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2032
+A1,4.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2032
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2032
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2032
+A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2032
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2032
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2032
+A1,4.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2032
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2032
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2032
+A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2032
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2032
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2032
+A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034
+A1,4.00000000000,R2,2024,R2,residential,heatpump,newcapa,2034
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2034
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2034
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2034
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2034
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2034
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2034
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2034
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2034
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2034
+A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2034
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2034
+A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2034
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2034
+A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2034
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2034
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2034
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2034
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2034
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2034
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2034
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2034
+A1,1.84280000000,R1,2020,R1,gas,gassupply1,newcapa,2034
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2034
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2034
+A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2034
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2034
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2034
+A1,3.62850000000,R1,2032,R1,gas,gassupply1,newcapa,2034
+A1,1.84280000000,R2,2020,R2,gas,gassupply1,newcapa,2034
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2034
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2034
+A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2034
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2034
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2034
+A1,3.62850000000,R2,2032,R2,gas,gassupply1,newcapa,2034
+A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036
+A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036
+A1,4.00000000000,R2,2026,R2,residential,heatpump,newcapa,2036
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2036
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2036
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2036
+A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2036
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2036
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2036
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2036
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2036
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2036
+A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2036
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2036
+A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2036
+A1,1.63890000000,R1,2034,R1,power,solarPV,newcapa,2036
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2036
+A1,0.60110000000,R1,2034,R1,power,windturbine,newcapa,2036
+A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2036
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2036
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2036
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2036
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2036
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2036
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2036
+A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2036
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2036
+A1,0.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2036
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2036
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2036
+A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2036
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2036
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2036
+A1,3.62850000000,R1,2032,R1,gas,gassupply1,newcapa,2036
+A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036
+A1,0.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2036
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2036
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2036
+A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2036
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2036
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2036
+A1,3.62850000000,R2,2032,R2,gas,gassupply1,newcapa,2036
+A1,1.50000000000,R2,2034,R2,gas,gassupply1,newcapa,2036
+A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038
+A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038
+A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038
+A1,5.00000000000,R2,2028,R2,residential,heatpump,newcapa,2038
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2038
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2038
+A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2038
+A1,6.00000000000,R2,2036,R2,residential,heatpump,newcapa,2038
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2038
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2038
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2038
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2038
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2038
+A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2038
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2038
+A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2038
+A1,1.63890000000,R1,2034,R1,power,solarPV,newcapa,2038
+A1,2.24000000000,R1,2036,R1,power,solarPV,newcapa,2038
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2038
+A1,0.60110000000,R1,2034,R1,power,windturbine,newcapa,2038
+A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2038
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2038
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2038
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2038
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2038
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2038
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2038
+A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2038
+A1,2.24000000000,R2,2036,R2,power,solarPV,newcapa,2038
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2038
+A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040
+A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040
+A1,13.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,6.00000000000,R2,2032,R2,residential,heatpump,newcapa,2040
+A1,6.00000000000,R2,2034,R2,residential,heatpump,newcapa,2040
+A1,6.00000000000,R2,2036,R2,residential,heatpump,newcapa,2040
+A1,8.00000000000,R2,2038,R2,residential,heatpump,newcapa,2040
+A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,1.85640000000,R1,2022,R1,power,gasCCGT,newcapa,2040
+A1,2.07980000000,R1,2024,R1,power,gasCCGT,newcapa,2040
+A1,2.29760000000,R1,2026,R1,power,gasCCGT,newcapa,2040
+A1,2.31150000000,R1,2028,R1,power,gasCCGT,newcapa,2040
+A1,0.99560000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,0.75270000000,R1,2032,R1,power,gasCCGT,newcapa,2040
+A1,0.27320000000,R1,2020,R1,power,solarPV,newcapa,2040
+A1,0.54630000000,R1,2032,R1,power,solarPV,newcapa,2040
+A1,1.63890000000,R1,2034,R1,power,solarPV,newcapa,2040
+A1,2.24000000000,R1,2036,R1,power,solarPV,newcapa,2040
+A1,2.24000000000,R1,2038,R1,power,solarPV,newcapa,2040
+A1,4.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,0.60110000000,R1,2034,R1,power,windturbine,newcapa,2040
+A1,2.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040
+A1,1.85640000000,R2,2022,R2,power,gasCCGT,newcapa,2040
+A1,2.07980000000,R2,2024,R2,power,gasCCGT,newcapa,2040
+A1,2.29760000000,R2,2026,R2,power,gasCCGT,newcapa,2040
+A1,2.31150000000,R2,2028,R2,power,gasCCGT,newcapa,2040
+A1,0.99560000000,R2,2030,R2,power,gasCCGT,newcapa,2040
+A1,2.24000000000,R2,2032,R2,power,solarPV,newcapa,2040
+A1,2.24000000000,R2,2034,R2,power,solarPV,newcapa,2040
+A1,2.24000000000,R2,2036,R2,power,solarPV,newcapa,2040
+A1,2.24000000000,R2,2038,R2,power,solarPV,newcapa,2040
+A1,4.27320000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,0.34280000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,0.60380000000,R1,2022,R1,gas,gassupply1,newcapa,2040
+A1,2.07490000000,R1,2024,R1,gas,gassupply1,newcapa,2040
+A1,3.55300000000,R1,2026,R1,gas,gassupply1,newcapa,2040
+A1,3.53600000000,R1,2028,R1,gas,gassupply1,newcapa,2040
+A1,4.66260000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,3.62850000000,R1,2032,R1,gas,gassupply1,newcapa,2040
+A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040
+A1,0.34280000000,R2,2020,R2,gas,gassupply1,newcapa,2040
+A1,0.60380000000,R2,2022,R2,gas,gassupply1,newcapa,2040
+A1,2.07490000000,R2,2024,R2,gas,gassupply1,newcapa,2040
+A1,3.55300000000,R2,2026,R2,gas,gassupply1,newcapa,2040
+A1,3.53600000000,R2,2028,R2,gas,gassupply1,newcapa,2040
+A1,4.66260000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,3.62850000000,R2,2032,R2,gas,gassupply1,newcapa,2040
+A1,1.50000000000,R2,2034,R2,gas,gassupply1,newcapa,2040
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index c46bb206..433b1b5b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -1,705 +1,705 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'night')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'night')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'night')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'night')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'night')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'morning')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'morning')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'morning')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'early-peak')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'early-peak')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'late-peak')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'late-peak')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'evening')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'evening')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'evening')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'early-morning')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'early-morning')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,6.55430000000,2022
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,6.55430000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2022
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.49550000000,2022
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.49550000000,2022
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.09790000000,2022
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.09790000000,2022
-"('all-year', 'all-week', 'night')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'night')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'night')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'night')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'night')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'night')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'morning')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'morning')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'morning')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'early-peak')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'early-peak')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'late-peak')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'late-peak')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'evening')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'evening')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'evening')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'early-morning')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'early-morning')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.44970000000,2024
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.44970000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2024
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.76590000000,2024
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.76590000000,2024
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.11270000000,2024
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.11270000000,2024
-"('all-year', 'all-week', 'night')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'night')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'night')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'night')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'morning')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'morning')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'morning')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'early-peak')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'late-peak')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'evening')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'evening')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'evening')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'early-morning')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'early-morning')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,10.11860000000,2026
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,10.11860000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2026
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.01180000000,2026
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.01180000000,2026
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12750000000,2026
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12750000000,2026
-"('all-year', 'all-week', 'night')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'night')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'night')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'night')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'night')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'night')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'morning')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'morning')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'morning')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'early-peak')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'late-peak')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'evening')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'evening')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'evening')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'early-morning')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'early-morning')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,11.67880000000,2028
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,11.67880000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2028
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.23910000000,2028
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.23910000000,2028
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.14220000000,2028
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.14220000000,2028
-"('all-year', 'all-week', 'night')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,13.17840000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,13.17840000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.45180000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.45180000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'night')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'night')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'night')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'night')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'night')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'morning')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'morning')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'morning')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'early-peak')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'late-peak')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'evening')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'evening')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'evening')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'early-morning')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'early-morning')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,15.15990000000,2032
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,15.15990000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2032
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.24430000000,2032
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.24430000000,2032
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.18020000000,2032
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.18020000000,2032
-"('all-year', 'all-week', 'night')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'night')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'night')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'night')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'night')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'night')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'morning')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'morning')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'morning')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'early-peak')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'late-peak')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'evening')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'evening')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'evening')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'early-morning')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'early-morning')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,16.37160000000,2034
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,16.37160000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2034
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.72900000000,2034
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.72900000000,2034
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.20330000000,2034
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.20330000000,2034
-"('all-year', 'all-week', 'night')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'night')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'night')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'night')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'night')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'night')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'morning')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'morning')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'morning')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'evening')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'evening')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'evening')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'early-morning')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.02870000000,2036
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.02870000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2036
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.99190000000,2036
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.99190000000,2036
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.22650000000,2036
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.22650000000,2036
-"('all-year', 'all-week', 'night')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'night')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'night')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'night')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'night')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'night')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'morning')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'morning')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'morning')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'early-peak')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'late-peak')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'evening')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'evening')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'evening')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'early-morning')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.60310000000,2038
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.60310000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2038
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.22160000000,2038
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.22160000000,2038
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.24960000000,2038
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.24960000000,2038
-"('all-year', 'all-week', 'night')",electricity,R1,18.10990000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,7.42430000000,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,18.10990000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,7.42430000000,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', 'mid-afternoon')",electricity,R1,18.10990000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.42430000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.10990000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,7.42430000000,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,18.10990000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,7.42430000000,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,18.10990000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,7.42430000000,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', 'early-morning')",electricity,R1,18.10990000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,7.42430000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,18.10990000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,18.10990000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.42430000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.42430000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020
+electricity,all-week,night,all-year,6.55430000000,R1,0,MUS$2010/PJ,2022
+electricity,all-week,night,all-year,6.55430000000,R2,0,MUS$2010/PJ,2022
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2022
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2022
+heat,all-week,night,all-year,4.49550000000,R1,0,MUS$2010/PJ,2022
+heat,all-week,night,all-year,4.49550000000,R2,0,MUS$2010/PJ,2022
+CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022
+CO2f,all-week,night,all-year,0.09790000000,R2,0,MUS$2010/kt,2022
+electricity,all-week,morning,all-year,6.55430000000,R1,1,MUS$2010/PJ,2022
+electricity,all-week,morning,all-year,6.55430000000,R2,1,MUS$2010/PJ,2022
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2022
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2022
+heat,all-week,morning,all-year,4.49550000000,R1,1,MUS$2010/PJ,2022
+heat,all-week,morning,all-year,4.49550000000,R2,1,MUS$2010/PJ,2022
+CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022
+CO2f,all-week,morning,all-year,0.09790000000,R2,1,MUS$2010/kt,2022
+electricity,all-week,mid-afternoon,all-year,6.55430000000,R1,2,MUS$2010/PJ,2022
+electricity,all-week,mid-afternoon,all-year,6.55430000000,R2,2,MUS$2010/PJ,2022
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2022
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2022
+heat,all-week,mid-afternoon,all-year,4.49550000000,R1,2,MUS$2010/PJ,2022
+heat,all-week,mid-afternoon,all-year,4.49550000000,R2,2,MUS$2010/PJ,2022
+CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022
+CO2f,all-week,mid-afternoon,all-year,0.09790000000,R2,2,MUS$2010/kt,2022
+electricity,all-week,early-peak,all-year,6.55430000000,R1,3,MUS$2010/PJ,2022
+electricity,all-week,early-peak,all-year,6.55430000000,R2,3,MUS$2010/PJ,2022
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2022
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2022
+heat,all-week,early-peak,all-year,4.49550000000,R1,3,MUS$2010/PJ,2022
+heat,all-week,early-peak,all-year,4.49550000000,R2,3,MUS$2010/PJ,2022
+CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022
+CO2f,all-week,early-peak,all-year,0.09790000000,R2,3,MUS$2010/kt,2022
+electricity,all-week,late-peak,all-year,6.55430000000,R1,4,MUS$2010/PJ,2022
+electricity,all-week,late-peak,all-year,6.55430000000,R2,4,MUS$2010/PJ,2022
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2022
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2022
+heat,all-week,late-peak,all-year,4.49550000000,R1,4,MUS$2010/PJ,2022
+heat,all-week,late-peak,all-year,4.49550000000,R2,4,MUS$2010/PJ,2022
+CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022
+CO2f,all-week,late-peak,all-year,0.09790000000,R2,4,MUS$2010/kt,2022
+electricity,all-week,evening,all-year,6.55430000000,R1,5,MUS$2010/PJ,2022
+electricity,all-week,evening,all-year,6.55430000000,R2,5,MUS$2010/PJ,2022
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2022
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2022
+heat,all-week,evening,all-year,4.49550000000,R1,5,MUS$2010/PJ,2022
+heat,all-week,evening,all-year,4.49550000000,R2,5,MUS$2010/PJ,2022
+CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022
+CO2f,all-week,evening,all-year,0.09790000000,R2,5,MUS$2010/kt,2022
+electricity,all-week,early-morning,all-year,6.55430000000,R1,6,MUS$2010/PJ,2022
+electricity,all-week,early-morning,all-year,6.55430000000,R2,6,MUS$2010/PJ,2022
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2022
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2022
+heat,all-week,early-morning,all-year,4.49550000000,R1,6,MUS$2010/PJ,2022
+heat,all-week,early-morning,all-year,4.49550000000,R2,6,MUS$2010/PJ,2022
+CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022
+CO2f,all-week,early-morning,all-year,0.09790000000,R2,6,MUS$2010/kt,2022
+electricity,all-week,late-afternoon,all-year,6.55430000000,R1,7,MUS$2010/PJ,2022
+electricity,all-week,late-afternoon,all-year,6.55430000000,R2,7,MUS$2010/PJ,2022
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2022
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2022
+heat,all-week,late-afternoon,all-year,4.49550000000,R1,7,MUS$2010/PJ,2022
+heat,all-week,late-afternoon,all-year,4.49550000000,R2,7,MUS$2010/PJ,2022
+CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022
+CO2f,all-week,late-afternoon,all-year,0.09790000000,R2,7,MUS$2010/kt,2022
+electricity,all-week,night,all-year,8.44970000000,R1,0,MUS$2010/PJ,2024
+electricity,all-week,night,all-year,8.44970000000,R2,0,MUS$2010/PJ,2024
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2024
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2024
+heat,all-week,night,all-year,4.76590000000,R1,0,MUS$2010/PJ,2024
+heat,all-week,night,all-year,4.76590000000,R2,0,MUS$2010/PJ,2024
+CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024
+CO2f,all-week,night,all-year,0.11270000000,R2,0,MUS$2010/kt,2024
+electricity,all-week,morning,all-year,8.44970000000,R1,1,MUS$2010/PJ,2024
+electricity,all-week,morning,all-year,8.44970000000,R2,1,MUS$2010/PJ,2024
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2024
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2024
+heat,all-week,morning,all-year,4.76590000000,R1,1,MUS$2010/PJ,2024
+heat,all-week,morning,all-year,4.76590000000,R2,1,MUS$2010/PJ,2024
+CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024
+CO2f,all-week,morning,all-year,0.11270000000,R2,1,MUS$2010/kt,2024
+electricity,all-week,mid-afternoon,all-year,8.44970000000,R1,2,MUS$2010/PJ,2024
+electricity,all-week,mid-afternoon,all-year,8.44970000000,R2,2,MUS$2010/PJ,2024
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2024
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2024
+heat,all-week,mid-afternoon,all-year,4.76590000000,R1,2,MUS$2010/PJ,2024
+heat,all-week,mid-afternoon,all-year,4.76590000000,R2,2,MUS$2010/PJ,2024
+CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024
+CO2f,all-week,mid-afternoon,all-year,0.11270000000,R2,2,MUS$2010/kt,2024
+electricity,all-week,early-peak,all-year,8.44970000000,R1,3,MUS$2010/PJ,2024
+electricity,all-week,early-peak,all-year,8.44970000000,R2,3,MUS$2010/PJ,2024
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2024
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2024
+heat,all-week,early-peak,all-year,4.76590000000,R1,3,MUS$2010/PJ,2024
+heat,all-week,early-peak,all-year,4.76590000000,R2,3,MUS$2010/PJ,2024
+CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024
+CO2f,all-week,early-peak,all-year,0.11270000000,R2,3,MUS$2010/kt,2024
+electricity,all-week,late-peak,all-year,8.44970000000,R1,4,MUS$2010/PJ,2024
+electricity,all-week,late-peak,all-year,8.44970000000,R2,4,MUS$2010/PJ,2024
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2024
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2024
+heat,all-week,late-peak,all-year,4.76590000000,R1,4,MUS$2010/PJ,2024
+heat,all-week,late-peak,all-year,4.76590000000,R2,4,MUS$2010/PJ,2024
+CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024
+CO2f,all-week,late-peak,all-year,0.11270000000,R2,4,MUS$2010/kt,2024
+electricity,all-week,evening,all-year,8.44970000000,R1,5,MUS$2010/PJ,2024
+electricity,all-week,evening,all-year,8.44970000000,R2,5,MUS$2010/PJ,2024
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2024
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2024
+heat,all-week,evening,all-year,4.76590000000,R1,5,MUS$2010/PJ,2024
+heat,all-week,evening,all-year,4.76590000000,R2,5,MUS$2010/PJ,2024
+CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024
+CO2f,all-week,evening,all-year,0.11270000000,R2,5,MUS$2010/kt,2024
+electricity,all-week,early-morning,all-year,8.44970000000,R1,6,MUS$2010/PJ,2024
+electricity,all-week,early-morning,all-year,8.44970000000,R2,6,MUS$2010/PJ,2024
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2024
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2024
+heat,all-week,early-morning,all-year,4.76590000000,R1,6,MUS$2010/PJ,2024
+heat,all-week,early-morning,all-year,4.76590000000,R2,6,MUS$2010/PJ,2024
+CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024
+CO2f,all-week,early-morning,all-year,0.11270000000,R2,6,MUS$2010/kt,2024
+electricity,all-week,late-afternoon,all-year,8.44970000000,R1,7,MUS$2010/PJ,2024
+electricity,all-week,late-afternoon,all-year,8.44970000000,R2,7,MUS$2010/PJ,2024
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2024
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2024
+heat,all-week,late-afternoon,all-year,4.76590000000,R1,7,MUS$2010/PJ,2024
+heat,all-week,late-afternoon,all-year,4.76590000000,R2,7,MUS$2010/PJ,2024
+CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024
+CO2f,all-week,late-afternoon,all-year,0.11270000000,R2,7,MUS$2010/kt,2024
+electricity,all-week,night,all-year,10.11860000000,R1,0,MUS$2010/PJ,2026
+electricity,all-week,night,all-year,10.11860000000,R2,0,MUS$2010/PJ,2026
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2026
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2026
+heat,all-week,night,all-year,5.01180000000,R1,0,MUS$2010/PJ,2026
+heat,all-week,night,all-year,5.01180000000,R2,0,MUS$2010/PJ,2026
+CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026
+CO2f,all-week,night,all-year,0.12750000000,R2,0,MUS$2010/kt,2026
+electricity,all-week,morning,all-year,10.11860000000,R1,1,MUS$2010/PJ,2026
+electricity,all-week,morning,all-year,10.11860000000,R2,1,MUS$2010/PJ,2026
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2026
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2026
+heat,all-week,morning,all-year,5.01180000000,R1,1,MUS$2010/PJ,2026
+heat,all-week,morning,all-year,5.01180000000,R2,1,MUS$2010/PJ,2026
+CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026
+CO2f,all-week,morning,all-year,0.12750000000,R2,1,MUS$2010/kt,2026
+electricity,all-week,mid-afternoon,all-year,10.11860000000,R1,2,MUS$2010/PJ,2026
+electricity,all-week,mid-afternoon,all-year,10.11860000000,R2,2,MUS$2010/PJ,2026
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2026
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2026
+heat,all-week,mid-afternoon,all-year,5.01180000000,R1,2,MUS$2010/PJ,2026
+heat,all-week,mid-afternoon,all-year,5.01180000000,R2,2,MUS$2010/PJ,2026
+CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026
+CO2f,all-week,mid-afternoon,all-year,0.12750000000,R2,2,MUS$2010/kt,2026
+electricity,all-week,early-peak,all-year,10.11860000000,R1,3,MUS$2010/PJ,2026
+electricity,all-week,early-peak,all-year,10.11860000000,R2,3,MUS$2010/PJ,2026
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2026
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2026
+heat,all-week,early-peak,all-year,5.01180000000,R1,3,MUS$2010/PJ,2026
+heat,all-week,early-peak,all-year,5.01180000000,R2,3,MUS$2010/PJ,2026
+CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026
+CO2f,all-week,early-peak,all-year,0.12750000000,R2,3,MUS$2010/kt,2026
+electricity,all-week,late-peak,all-year,10.11860000000,R1,4,MUS$2010/PJ,2026
+electricity,all-week,late-peak,all-year,10.11860000000,R2,4,MUS$2010/PJ,2026
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2026
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2026
+heat,all-week,late-peak,all-year,5.01180000000,R1,4,MUS$2010/PJ,2026
+heat,all-week,late-peak,all-year,5.01180000000,R2,4,MUS$2010/PJ,2026
+CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026
+CO2f,all-week,late-peak,all-year,0.12750000000,R2,4,MUS$2010/kt,2026
+electricity,all-week,evening,all-year,10.11860000000,R1,5,MUS$2010/PJ,2026
+electricity,all-week,evening,all-year,10.11860000000,R2,5,MUS$2010/PJ,2026
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2026
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2026
+heat,all-week,evening,all-year,5.01180000000,R1,5,MUS$2010/PJ,2026
+heat,all-week,evening,all-year,5.01180000000,R2,5,MUS$2010/PJ,2026
+CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026
+CO2f,all-week,evening,all-year,0.12750000000,R2,5,MUS$2010/kt,2026
+electricity,all-week,early-morning,all-year,10.11860000000,R1,6,MUS$2010/PJ,2026
+electricity,all-week,early-morning,all-year,10.11860000000,R2,6,MUS$2010/PJ,2026
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2026
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2026
+heat,all-week,early-morning,all-year,5.01180000000,R1,6,MUS$2010/PJ,2026
+heat,all-week,early-morning,all-year,5.01180000000,R2,6,MUS$2010/PJ,2026
+CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026
+CO2f,all-week,early-morning,all-year,0.12750000000,R2,6,MUS$2010/kt,2026
+electricity,all-week,late-afternoon,all-year,10.11860000000,R1,7,MUS$2010/PJ,2026
+electricity,all-week,late-afternoon,all-year,10.11860000000,R2,7,MUS$2010/PJ,2026
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2026
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2026
+heat,all-week,late-afternoon,all-year,5.01180000000,R1,7,MUS$2010/PJ,2026
+heat,all-week,late-afternoon,all-year,5.01180000000,R2,7,MUS$2010/PJ,2026
+CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026
+CO2f,all-week,late-afternoon,all-year,0.12750000000,R2,7,MUS$2010/kt,2026
+electricity,all-week,night,all-year,11.67880000000,R1,0,MUS$2010/PJ,2028
+electricity,all-week,night,all-year,11.67880000000,R2,0,MUS$2010/PJ,2028
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2028
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2028
+heat,all-week,night,all-year,5.23910000000,R1,0,MUS$2010/PJ,2028
+heat,all-week,night,all-year,5.23910000000,R2,0,MUS$2010/PJ,2028
+CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028
+CO2f,all-week,night,all-year,0.14220000000,R2,0,MUS$2010/kt,2028
+electricity,all-week,morning,all-year,11.67880000000,R1,1,MUS$2010/PJ,2028
+electricity,all-week,morning,all-year,11.67880000000,R2,1,MUS$2010/PJ,2028
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2028
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2028
+heat,all-week,morning,all-year,5.23910000000,R1,1,MUS$2010/PJ,2028
+heat,all-week,morning,all-year,5.23910000000,R2,1,MUS$2010/PJ,2028
+CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028
+CO2f,all-week,morning,all-year,0.14220000000,R2,1,MUS$2010/kt,2028
+electricity,all-week,mid-afternoon,all-year,11.67880000000,R1,2,MUS$2010/PJ,2028
+electricity,all-week,mid-afternoon,all-year,11.67880000000,R2,2,MUS$2010/PJ,2028
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2028
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2028
+heat,all-week,mid-afternoon,all-year,5.23910000000,R1,2,MUS$2010/PJ,2028
+heat,all-week,mid-afternoon,all-year,5.23910000000,R2,2,MUS$2010/PJ,2028
+CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028
+CO2f,all-week,mid-afternoon,all-year,0.14220000000,R2,2,MUS$2010/kt,2028
+electricity,all-week,early-peak,all-year,11.67880000000,R1,3,MUS$2010/PJ,2028
+electricity,all-week,early-peak,all-year,11.67880000000,R2,3,MUS$2010/PJ,2028
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2028
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2028
+heat,all-week,early-peak,all-year,5.23910000000,R1,3,MUS$2010/PJ,2028
+heat,all-week,early-peak,all-year,5.23910000000,R2,3,MUS$2010/PJ,2028
+CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028
+CO2f,all-week,early-peak,all-year,0.14220000000,R2,3,MUS$2010/kt,2028
+electricity,all-week,late-peak,all-year,11.67880000000,R1,4,MUS$2010/PJ,2028
+electricity,all-week,late-peak,all-year,11.67880000000,R2,4,MUS$2010/PJ,2028
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2028
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2028
+heat,all-week,late-peak,all-year,5.23910000000,R1,4,MUS$2010/PJ,2028
+heat,all-week,late-peak,all-year,5.23910000000,R2,4,MUS$2010/PJ,2028
+CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028
+CO2f,all-week,late-peak,all-year,0.14220000000,R2,4,MUS$2010/kt,2028
+electricity,all-week,evening,all-year,11.67880000000,R1,5,MUS$2010/PJ,2028
+electricity,all-week,evening,all-year,11.67880000000,R2,5,MUS$2010/PJ,2028
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2028
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2028
+heat,all-week,evening,all-year,5.23910000000,R1,5,MUS$2010/PJ,2028
+heat,all-week,evening,all-year,5.23910000000,R2,5,MUS$2010/PJ,2028
+CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028
+CO2f,all-week,evening,all-year,0.14220000000,R2,5,MUS$2010/kt,2028
+electricity,all-week,early-morning,all-year,11.67880000000,R1,6,MUS$2010/PJ,2028
+electricity,all-week,early-morning,all-year,11.67880000000,R2,6,MUS$2010/PJ,2028
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2028
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2028
+heat,all-week,early-morning,all-year,5.23910000000,R1,6,MUS$2010/PJ,2028
+heat,all-week,early-morning,all-year,5.23910000000,R2,6,MUS$2010/PJ,2028
+CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028
+CO2f,all-week,early-morning,all-year,0.14220000000,R2,6,MUS$2010/kt,2028
+electricity,all-week,late-afternoon,all-year,11.67880000000,R1,7,MUS$2010/PJ,2028
+electricity,all-week,late-afternoon,all-year,11.67880000000,R2,7,MUS$2010/PJ,2028
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2028
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2028
+heat,all-week,late-afternoon,all-year,5.23910000000,R1,7,MUS$2010/PJ,2028
+heat,all-week,late-afternoon,all-year,5.23910000000,R2,7,MUS$2010/PJ,2028
+CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028
+CO2f,all-week,late-afternoon,all-year,0.14220000000,R2,7,MUS$2010/kt,2028
+electricity,all-week,night,all-year,13.17840000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,13.17840000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.45180000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.45180000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.17840000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,13.17840000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.45180000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.45180000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+electricity,all-week,mid-afternoon,all-year,13.17840000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,13.17840000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,5.45180000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,5.45180000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.17840000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,13.17840000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.45180000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.45180000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.17840000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,13.17840000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.45180000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.45180000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.17840000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,13.17840000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.45180000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.45180000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+electricity,all-week,early-morning,all-year,13.17840000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,13.17840000000,R2,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,5.45180000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,5.45180000000,R2,6,MUS$2010/PJ,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030
+electricity,all-week,late-afternoon,all-year,13.17840000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,13.17840000000,R2,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,5.45180000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,5.45180000000,R2,7,MUS$2010/PJ,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030
+electricity,all-week,night,all-year,15.15990000000,R1,0,MUS$2010/PJ,2032
+electricity,all-week,night,all-year,15.15990000000,R2,0,MUS$2010/PJ,2032
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2032
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2032
+heat,all-week,night,all-year,6.24430000000,R1,0,MUS$2010/PJ,2032
+heat,all-week,night,all-year,6.24430000000,R2,0,MUS$2010/PJ,2032
+CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032
+CO2f,all-week,night,all-year,0.18020000000,R2,0,MUS$2010/kt,2032
+electricity,all-week,morning,all-year,15.15990000000,R1,1,MUS$2010/PJ,2032
+electricity,all-week,morning,all-year,15.15990000000,R2,1,MUS$2010/PJ,2032
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2032
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2032
+heat,all-week,morning,all-year,6.24430000000,R1,1,MUS$2010/PJ,2032
+heat,all-week,morning,all-year,6.24430000000,R2,1,MUS$2010/PJ,2032
+CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032
+CO2f,all-week,morning,all-year,0.18020000000,R2,1,MUS$2010/kt,2032
+electricity,all-week,mid-afternoon,all-year,15.15990000000,R1,2,MUS$2010/PJ,2032
+electricity,all-week,mid-afternoon,all-year,15.15990000000,R2,2,MUS$2010/PJ,2032
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2032
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2032
+heat,all-week,mid-afternoon,all-year,6.24430000000,R1,2,MUS$2010/PJ,2032
+heat,all-week,mid-afternoon,all-year,6.24430000000,R2,2,MUS$2010/PJ,2032
+CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032
+CO2f,all-week,mid-afternoon,all-year,0.18020000000,R2,2,MUS$2010/kt,2032
+electricity,all-week,early-peak,all-year,15.15990000000,R1,3,MUS$2010/PJ,2032
+electricity,all-week,early-peak,all-year,15.15990000000,R2,3,MUS$2010/PJ,2032
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2032
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2032
+heat,all-week,early-peak,all-year,6.24430000000,R1,3,MUS$2010/PJ,2032
+heat,all-week,early-peak,all-year,6.24430000000,R2,3,MUS$2010/PJ,2032
+CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032
+CO2f,all-week,early-peak,all-year,0.18020000000,R2,3,MUS$2010/kt,2032
+electricity,all-week,late-peak,all-year,15.15990000000,R1,4,MUS$2010/PJ,2032
+electricity,all-week,late-peak,all-year,15.15990000000,R2,4,MUS$2010/PJ,2032
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2032
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2032
+heat,all-week,late-peak,all-year,6.24430000000,R1,4,MUS$2010/PJ,2032
+heat,all-week,late-peak,all-year,6.24430000000,R2,4,MUS$2010/PJ,2032
+CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032
+CO2f,all-week,late-peak,all-year,0.18020000000,R2,4,MUS$2010/kt,2032
+electricity,all-week,evening,all-year,15.15990000000,R1,5,MUS$2010/PJ,2032
+electricity,all-week,evening,all-year,15.15990000000,R2,5,MUS$2010/PJ,2032
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2032
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2032
+heat,all-week,evening,all-year,6.24430000000,R1,5,MUS$2010/PJ,2032
+heat,all-week,evening,all-year,6.24430000000,R2,5,MUS$2010/PJ,2032
+CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032
+CO2f,all-week,evening,all-year,0.18020000000,R2,5,MUS$2010/kt,2032
+electricity,all-week,early-morning,all-year,15.15990000000,R1,6,MUS$2010/PJ,2032
+electricity,all-week,early-morning,all-year,15.15990000000,R2,6,MUS$2010/PJ,2032
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2032
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2032
+heat,all-week,early-morning,all-year,6.24430000000,R1,6,MUS$2010/PJ,2032
+heat,all-week,early-morning,all-year,6.24430000000,R2,6,MUS$2010/PJ,2032
+CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032
+CO2f,all-week,early-morning,all-year,0.18020000000,R2,6,MUS$2010/kt,2032
+electricity,all-week,late-afternoon,all-year,15.15990000000,R1,7,MUS$2010/PJ,2032
+electricity,all-week,late-afternoon,all-year,15.15990000000,R2,7,MUS$2010/PJ,2032
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2032
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2032
+heat,all-week,late-afternoon,all-year,6.24430000000,R1,7,MUS$2010/PJ,2032
+heat,all-week,late-afternoon,all-year,6.24430000000,R2,7,MUS$2010/PJ,2032
+CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032
+CO2f,all-week,late-afternoon,all-year,0.18020000000,R2,7,MUS$2010/kt,2032
+electricity,all-week,night,all-year,16.37160000000,R1,0,MUS$2010/PJ,2034
+electricity,all-week,night,all-year,16.37160000000,R2,0,MUS$2010/PJ,2034
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2034
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2034
+heat,all-week,night,all-year,6.72900000000,R1,0,MUS$2010/PJ,2034
+heat,all-week,night,all-year,6.72900000000,R2,0,MUS$2010/PJ,2034
+CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034
+CO2f,all-week,night,all-year,0.20330000000,R2,0,MUS$2010/kt,2034
+electricity,all-week,morning,all-year,16.37160000000,R1,1,MUS$2010/PJ,2034
+electricity,all-week,morning,all-year,16.37160000000,R2,1,MUS$2010/PJ,2034
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2034
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2034
+heat,all-week,morning,all-year,6.72900000000,R1,1,MUS$2010/PJ,2034
+heat,all-week,morning,all-year,6.72900000000,R2,1,MUS$2010/PJ,2034
+CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034
+CO2f,all-week,morning,all-year,0.20330000000,R2,1,MUS$2010/kt,2034
+electricity,all-week,mid-afternoon,all-year,16.37160000000,R1,2,MUS$2010/PJ,2034
+electricity,all-week,mid-afternoon,all-year,16.37160000000,R2,2,MUS$2010/PJ,2034
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2034
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2034
+heat,all-week,mid-afternoon,all-year,6.72900000000,R1,2,MUS$2010/PJ,2034
+heat,all-week,mid-afternoon,all-year,6.72900000000,R2,2,MUS$2010/PJ,2034
+CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034
+CO2f,all-week,mid-afternoon,all-year,0.20330000000,R2,2,MUS$2010/kt,2034
+electricity,all-week,early-peak,all-year,16.37160000000,R1,3,MUS$2010/PJ,2034
+electricity,all-week,early-peak,all-year,16.37160000000,R2,3,MUS$2010/PJ,2034
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2034
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2034
+heat,all-week,early-peak,all-year,6.72900000000,R1,3,MUS$2010/PJ,2034
+heat,all-week,early-peak,all-year,6.72900000000,R2,3,MUS$2010/PJ,2034
+CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034
+CO2f,all-week,early-peak,all-year,0.20330000000,R2,3,MUS$2010/kt,2034
+electricity,all-week,late-peak,all-year,16.37160000000,R1,4,MUS$2010/PJ,2034
+electricity,all-week,late-peak,all-year,16.37160000000,R2,4,MUS$2010/PJ,2034
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2034
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2034
+heat,all-week,late-peak,all-year,6.72900000000,R1,4,MUS$2010/PJ,2034
+heat,all-week,late-peak,all-year,6.72900000000,R2,4,MUS$2010/PJ,2034
+CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034
+CO2f,all-week,late-peak,all-year,0.20330000000,R2,4,MUS$2010/kt,2034
+electricity,all-week,evening,all-year,16.37160000000,R1,5,MUS$2010/PJ,2034
+electricity,all-week,evening,all-year,16.37160000000,R2,5,MUS$2010/PJ,2034
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2034
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2034
+heat,all-week,evening,all-year,6.72900000000,R1,5,MUS$2010/PJ,2034
+heat,all-week,evening,all-year,6.72900000000,R2,5,MUS$2010/PJ,2034
+CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034
+CO2f,all-week,evening,all-year,0.20330000000,R2,5,MUS$2010/kt,2034
+electricity,all-week,early-morning,all-year,16.37160000000,R1,6,MUS$2010/PJ,2034
+electricity,all-week,early-morning,all-year,16.37160000000,R2,6,MUS$2010/PJ,2034
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2034
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2034
+heat,all-week,early-morning,all-year,6.72900000000,R1,6,MUS$2010/PJ,2034
+heat,all-week,early-morning,all-year,6.72900000000,R2,6,MUS$2010/PJ,2034
+CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034
+CO2f,all-week,early-morning,all-year,0.20330000000,R2,6,MUS$2010/kt,2034
+electricity,all-week,late-afternoon,all-year,16.37160000000,R1,7,MUS$2010/PJ,2034
+electricity,all-week,late-afternoon,all-year,16.37160000000,R2,7,MUS$2010/PJ,2034
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2034
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2034
+heat,all-week,late-afternoon,all-year,6.72900000000,R1,7,MUS$2010/PJ,2034
+heat,all-week,late-afternoon,all-year,6.72900000000,R2,7,MUS$2010/PJ,2034
+CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034
+CO2f,all-week,late-afternoon,all-year,0.20330000000,R2,7,MUS$2010/kt,2034
+electricity,all-week,night,all-year,17.02870000000,R1,0,MUS$2010/PJ,2036
+electricity,all-week,night,all-year,17.02870000000,R2,0,MUS$2010/PJ,2036
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2036
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2036
+heat,all-week,night,all-year,6.99190000000,R1,0,MUS$2010/PJ,2036
+heat,all-week,night,all-year,6.99190000000,R2,0,MUS$2010/PJ,2036
+CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036
+CO2f,all-week,night,all-year,0.22650000000,R2,0,MUS$2010/kt,2036
+electricity,all-week,morning,all-year,17.02870000000,R1,1,MUS$2010/PJ,2036
+electricity,all-week,morning,all-year,17.02870000000,R2,1,MUS$2010/PJ,2036
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2036
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2036
+heat,all-week,morning,all-year,6.99190000000,R1,1,MUS$2010/PJ,2036
+heat,all-week,morning,all-year,6.99190000000,R2,1,MUS$2010/PJ,2036
+CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036
+CO2f,all-week,morning,all-year,0.22650000000,R2,1,MUS$2010/kt,2036
+electricity,all-week,mid-afternoon,all-year,17.02870000000,R1,2,MUS$2010/PJ,2036
+electricity,all-week,mid-afternoon,all-year,17.02870000000,R2,2,MUS$2010/PJ,2036
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2036
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2036
+heat,all-week,mid-afternoon,all-year,6.99190000000,R1,2,MUS$2010/PJ,2036
+heat,all-week,mid-afternoon,all-year,6.99190000000,R2,2,MUS$2010/PJ,2036
+CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036
+CO2f,all-week,mid-afternoon,all-year,0.22650000000,R2,2,MUS$2010/kt,2036
+electricity,all-week,early-peak,all-year,17.02870000000,R1,3,MUS$2010/PJ,2036
+electricity,all-week,early-peak,all-year,17.02870000000,R2,3,MUS$2010/PJ,2036
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2036
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2036
+heat,all-week,early-peak,all-year,6.99190000000,R1,3,MUS$2010/PJ,2036
+heat,all-week,early-peak,all-year,6.99190000000,R2,3,MUS$2010/PJ,2036
+CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036
+CO2f,all-week,early-peak,all-year,0.22650000000,R2,3,MUS$2010/kt,2036
+electricity,all-week,late-peak,all-year,17.02870000000,R1,4,MUS$2010/PJ,2036
+electricity,all-week,late-peak,all-year,17.02870000000,R2,4,MUS$2010/PJ,2036
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2036
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2036
+heat,all-week,late-peak,all-year,6.99190000000,R1,4,MUS$2010/PJ,2036
+heat,all-week,late-peak,all-year,6.99190000000,R2,4,MUS$2010/PJ,2036
+CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036
+CO2f,all-week,late-peak,all-year,0.22650000000,R2,4,MUS$2010/kt,2036
+electricity,all-week,evening,all-year,17.02870000000,R1,5,MUS$2010/PJ,2036
+electricity,all-week,evening,all-year,17.02870000000,R2,5,MUS$2010/PJ,2036
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2036
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2036
+heat,all-week,evening,all-year,6.99190000000,R1,5,MUS$2010/PJ,2036
+heat,all-week,evening,all-year,6.99190000000,R2,5,MUS$2010/PJ,2036
+CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036
+CO2f,all-week,evening,all-year,0.22650000000,R2,5,MUS$2010/kt,2036
+electricity,all-week,early-morning,all-year,17.02870000000,R1,6,MUS$2010/PJ,2036
+electricity,all-week,early-morning,all-year,17.02870000000,R2,6,MUS$2010/PJ,2036
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2036
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2036
+heat,all-week,early-morning,all-year,6.99190000000,R1,6,MUS$2010/PJ,2036
+heat,all-week,early-morning,all-year,6.99190000000,R2,6,MUS$2010/PJ,2036
+CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036
+CO2f,all-week,early-morning,all-year,0.22650000000,R2,6,MUS$2010/kt,2036
+electricity,all-week,late-afternoon,all-year,17.02870000000,R1,7,MUS$2010/PJ,2036
+electricity,all-week,late-afternoon,all-year,17.02870000000,R2,7,MUS$2010/PJ,2036
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2036
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2036
+heat,all-week,late-afternoon,all-year,6.99190000000,R1,7,MUS$2010/PJ,2036
+heat,all-week,late-afternoon,all-year,6.99190000000,R2,7,MUS$2010/PJ,2036
+CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036
+CO2f,all-week,late-afternoon,all-year,0.22650000000,R2,7,MUS$2010/kt,2036
+electricity,all-week,night,all-year,17.60310000000,R1,0,MUS$2010/PJ,2038
+electricity,all-week,night,all-year,17.60310000000,R2,0,MUS$2010/PJ,2038
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2038
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2038
+heat,all-week,night,all-year,7.22160000000,R1,0,MUS$2010/PJ,2038
+heat,all-week,night,all-year,7.22160000000,R2,0,MUS$2010/PJ,2038
+CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038
+CO2f,all-week,night,all-year,0.24960000000,R2,0,MUS$2010/kt,2038
+electricity,all-week,morning,all-year,17.60310000000,R1,1,MUS$2010/PJ,2038
+electricity,all-week,morning,all-year,17.60310000000,R2,1,MUS$2010/PJ,2038
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2038
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2038
+heat,all-week,morning,all-year,7.22160000000,R1,1,MUS$2010/PJ,2038
+heat,all-week,morning,all-year,7.22160000000,R2,1,MUS$2010/PJ,2038
+CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038
+CO2f,all-week,morning,all-year,0.24960000000,R2,1,MUS$2010/kt,2038
+electricity,all-week,mid-afternoon,all-year,17.60310000000,R1,2,MUS$2010/PJ,2038
+electricity,all-week,mid-afternoon,all-year,17.60310000000,R2,2,MUS$2010/PJ,2038
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2038
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2038
+heat,all-week,mid-afternoon,all-year,7.22160000000,R1,2,MUS$2010/PJ,2038
+heat,all-week,mid-afternoon,all-year,7.22160000000,R2,2,MUS$2010/PJ,2038
+CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038
+CO2f,all-week,mid-afternoon,all-year,0.24960000000,R2,2,MUS$2010/kt,2038
+electricity,all-week,early-peak,all-year,17.60310000000,R1,3,MUS$2010/PJ,2038
+electricity,all-week,early-peak,all-year,17.60310000000,R2,3,MUS$2010/PJ,2038
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2038
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2038
+heat,all-week,early-peak,all-year,7.22160000000,R1,3,MUS$2010/PJ,2038
+heat,all-week,early-peak,all-year,7.22160000000,R2,3,MUS$2010/PJ,2038
+CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038
+CO2f,all-week,early-peak,all-year,0.24960000000,R2,3,MUS$2010/kt,2038
+electricity,all-week,late-peak,all-year,17.60310000000,R1,4,MUS$2010/PJ,2038
+electricity,all-week,late-peak,all-year,17.60310000000,R2,4,MUS$2010/PJ,2038
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2038
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2038
+heat,all-week,late-peak,all-year,7.22160000000,R1,4,MUS$2010/PJ,2038
+heat,all-week,late-peak,all-year,7.22160000000,R2,4,MUS$2010/PJ,2038
+CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038
+CO2f,all-week,late-peak,all-year,0.24960000000,R2,4,MUS$2010/kt,2038
+electricity,all-week,evening,all-year,17.60310000000,R1,5,MUS$2010/PJ,2038
+electricity,all-week,evening,all-year,17.60310000000,R2,5,MUS$2010/PJ,2038
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2038
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2038
+heat,all-week,evening,all-year,7.22160000000,R1,5,MUS$2010/PJ,2038
+heat,all-week,evening,all-year,7.22160000000,R2,5,MUS$2010/PJ,2038
+CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038
+CO2f,all-week,evening,all-year,0.24960000000,R2,5,MUS$2010/kt,2038
+electricity,all-week,early-morning,all-year,17.60310000000,R1,6,MUS$2010/PJ,2038
+electricity,all-week,early-morning,all-year,17.60310000000,R2,6,MUS$2010/PJ,2038
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2038
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2038
+heat,all-week,early-morning,all-year,7.22160000000,R1,6,MUS$2010/PJ,2038
+heat,all-week,early-morning,all-year,7.22160000000,R2,6,MUS$2010/PJ,2038
+CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038
+CO2f,all-week,early-morning,all-year,0.24960000000,R2,6,MUS$2010/kt,2038
+electricity,all-week,late-afternoon,all-year,17.60310000000,R1,7,MUS$2010/PJ,2038
+electricity,all-week,late-afternoon,all-year,17.60310000000,R2,7,MUS$2010/PJ,2038
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2038
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2038
+heat,all-week,late-afternoon,all-year,7.22160000000,R1,7,MUS$2010/PJ,2038
+heat,all-week,late-afternoon,all-year,7.22160000000,R2,7,MUS$2010/PJ,2038
+CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038
+CO2f,all-week,late-afternoon,all-year,0.24960000000,R2,7,MUS$2010/kt,2038
+electricity,all-week,night,all-year,18.10990000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,18.10990000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,7.42430000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,7.42430000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,18.10990000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,18.10990000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,7.42430000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,7.42430000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+electricity,all-week,mid-afternoon,all-year,18.10990000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,18.10990000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,7.42430000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,7.42430000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,18.10990000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,18.10990000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,7.42430000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,7.42430000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,18.10990000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,18.10990000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,7.42430000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,7.42430000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,18.10990000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,18.10990000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,7.42430000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,7.42430000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+electricity,all-week,early-morning,all-year,18.10990000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,18.10990000000,R2,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,7.42430000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,7.42430000000,R2,6,MUS$2010/PJ,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040
+electricity,all-week,late-afternoon,all-year,18.10990000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,18.10990000000,R2,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,7.42430000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,7.42430000000,R2,7,MUS$2010/PJ,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index f2a09a7f..a1d71b25 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -1,149 +1,149 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gas_stove,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gas_stove,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gassupply1,R2,R2,A1,gas,newcapa,2020,15.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2025,17.00000000000
-gas_stove,R1,R1,A1,residential,newcapa,2025,5.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gas_stove,R2,R2,A1,residential,newcapa,2025,5.00000000000
-gasboiler,R2,R2,A1,residential,newcapa,2025,5.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2025,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,11.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,9.86820000000
-gasCCGT,R2,R2,A1,power,newcapa,2025,11.00000000000
-windturbine,R2,R2,A1,power,newcapa,2025,9.86820000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,31.49320000000
-gassupply1,R2,R2,A1,gas,newcapa,2025,31.49320000000
-electric_stove,R1,R1,A1,residential,newcapa,2030,17.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2030,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2030,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2030,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,10.50300000000
-windturbine,R1,R1,A1,power,newcapa,2030,9.86820000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2030,10.50300000000
-windturbine,R2,R2,A1,power,newcapa,2030,9.86820000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,23.99320000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,10.24680000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,23.99320000000
-gassupply1,R2,R2,A1,gas,newcapa,2030,10.24680000000
-electric_stove,R1,R1,A1,residential,newcapa,2035,11.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2035,22.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,22.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2035,11.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2035,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,11.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2035,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2035,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,9.86820000000
-windturbine,R1,R1,A1,power,newcapa,2035,2.40000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2035,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2035,20.00000000000
-windturbine,R2,R2,A1,power,newcapa,2035,9.86820000000
-windturbine,R2,R2,A1,power,newcapa,2035,2.40000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,16.49320000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.24680000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,2.60860000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,16.49320000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,10.24680000000
-gassupply1,R2,R2,A1,gas,newcapa,2035,2.60860000000
-electric_stove,R1,R1,A1,residential,newcapa,2040,22.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2040,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,22.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2040,22.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2040,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,22.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2040,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2040,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,9.86820000000
-windturbine,R1,R1,A1,power,newcapa,2040,2.40000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2040,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2040,20.00000000000
-windturbine,R2,R2,A1,power,newcapa,2040,9.86820000000
-windturbine,R2,R2,A1,power,newcapa,2040,2.40000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,16.49320000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.24680000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,2.60860000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,4.89140000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,16.49320000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,10.24680000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,2.60860000000
-gassupply1,R2,R2,A1,gas,newcapa,2040,4.89140000000
-electric_stove,R1,R1,A1,residential,newcapa,2045,17.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2045,27.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,27.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2045,17.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2045,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,17.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2045,27.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2045,20.00000000000
-solarPV,R1,R1,A1,power,newcapa,2045,11.20000000000
-windturbine,R1,R1,A1,power,newcapa,2045,9.86820000000
-windturbine,R1,R1,A1,power,newcapa,2045,2.40000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2045,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2045,20.00000000000
-solarPV,R2,R2,A1,power,newcapa,2045,11.20000000000
-windturbine,R2,R2,A1,power,newcapa,2045,9.86820000000
-windturbine,R2,R2,A1,power,newcapa,2045,2.40000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,16.49320000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.24680000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,2.60860000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,4.89140000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,16.49320000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,10.24680000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,2.60860000000
-gassupply1,R2,R2,A1,gas,newcapa,2045,4.89140000000
-electric_stove,R1,R1,A1,residential,newcapa,2050,27.00000000000
-electric_stove,R1,R1,A1,residential,newcapa,2050,23.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,27.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,23.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2050,27.00000000000
-electric_stove,R2,R2,A1,residential,newcapa,2050,23.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,27.00000000000
-heatpump,R2,R2,A1,residential,newcapa,2050,23.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,10.50300000000
-solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
-solarPV,R1,R1,A1,power,newcapa,2050,11.20000000000
-solarPV,R1,R1,A1,power,newcapa,2050,20.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,2.40000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.06820000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,10.00000000000
-gasCCGT,R2,R2,A1,power,newcapa,2050,10.50300000000
-solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
-solarPV,R2,R2,A1,power,newcapa,2050,11.20000000000
-solarPV,R2,R2,A1,power,newcapa,2050,20.00000000000
-windturbine,R2,R2,A1,power,newcapa,2050,2.40000000000
-windturbine,R2,R2,A1,power,newcapa,2050,1.06820000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,16.49320000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.24680000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,2.60860000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,4.89140000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,16.49320000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,10.24680000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,2.60860000000
-gassupply1,R2,R2,A1,gas,newcapa,2050,4.89140000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gas_stove,newcapa,2020
+A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
+A1,17.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025
+A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,17.00000000000,R2,2020,R2,residential,electric_stove,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gas_stove,newcapa,2025
+A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025
+A1,11.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,11.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
+A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2025
+A1,31.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,31.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2025
+A1,17.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030
+A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,17.00000000000,R2,2020,R2,residential,electric_stove,newcapa,2030
+A1,11.00000000000,R2,2025,R2,residential,electric_stove,newcapa,2030
+A1,17.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2030
+A1,23.99320000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,23.99320000000,R2,2020,R2,gas,gassupply1,newcapa,2030
+A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035
+A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,11.00000000000,R2,2025,R2,residential,electric_stove,newcapa,2035
+A1,22.00000000000,R2,2030,R2,residential,electric_stove,newcapa,2035
+A1,11.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2035
+A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2035
+A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2035
+A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2035
+A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,22.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040
+A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,22.00000000000,R2,2030,R2,residential,electric_stove,newcapa,2040
+A1,17.00000000000,R2,2035,R2,residential,electric_stove,newcapa,2040
+A1,22.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2040
+A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2040
+A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2040
+A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,4.89140000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2040
+A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,4.89140000000,R2,2035,R2,gas,gassupply1,newcapa,2040
+A1,17.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045
+A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,17.00000000000,R2,2035,R2,residential,electric_stove,newcapa,2045
+A1,27.00000000000,R2,2040,R2,residential,electric_stove,newcapa,2045
+A1,17.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,11.20000000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,9.86820000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2045
+A1,11.20000000000,R2,2040,R2,power,solarPV,newcapa,2045
+A1,9.86820000000,R2,2020,R2,power,windturbine,newcapa,2045
+A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2045
+A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,4.89140000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2045
+A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,4.89140000000,R2,2035,R2,gas,gassupply1,newcapa,2045
+A1,27.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050
+A1,23.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050
+A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,27.00000000000,R2,2040,R2,residential,electric_stove,newcapa,2050
+A1,23.00000000000,R2,2045,R2,residential,electric_stove,newcapa,2050
+A1,27.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050
+A1,23.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,10.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,10.50300000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,20.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,11.20000000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,20.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,2.40000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.06820000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050
+A1,10.50300000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,20.00000000000,R2,2030,R2,power,solarPV,newcapa,2050
+A1,11.20000000000,R2,2040,R2,power,solarPV,newcapa,2050
+A1,20.00000000000,R2,2045,R2,power,solarPV,newcapa,2050
+A1,2.40000000000,R2,2030,R2,power,windturbine,newcapa,2050
+A1,1.06820000000,R2,2045,R2,power,windturbine,newcapa,2050
+A1,16.49320000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,10.24680000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,2.60860000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,4.89140000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,16.49320000000,R2,2020,R2,gas,gassupply1,newcapa,2050
+A1,10.24680000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,2.60860000000,R2,2030,R2,gas,gassupply1,newcapa,2050
+A1,4.89140000000,R2,2035,R2,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index 02af4971..8771c886 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -1,561 +1,561 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'early-morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-morning')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.50000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,7.15280000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.08310000000,2020
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'night')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'night')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'night')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'morning')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'morning')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'evening')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'evening')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'early-morning')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'early-morning')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'early-morning')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,8.89330000000,2025
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,8.89330000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2025
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,4.76500000000,2025
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,4.76500000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.12010000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,4.36360000000,2025
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,4.36360000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'night')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'night')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'night')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'morning')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'morning')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'evening')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'evening')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'early-morning')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'early-morning')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'early-morning')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,12.84560000000,2030
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,12.84560000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.31860000000,2030
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.31860000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.15700000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,5.31860000000,2030
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,5.31860000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'night')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'night')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'night')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'morning')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'morning')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'evening')",heat,R2,5.23760000000,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', 'evening')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'evening')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'early-morning')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'early-morning')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'early-morning')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,12.64310000000,2035
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,12.64310000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2035
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,5.23760000000,2035
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,5.23760000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,5.23760000000,2035
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,5.23760000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'night')",heat,R2,6.48640000000,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', 'night')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'night')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'morning')",heat,R2,6.48640000000,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', 'morning')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'morning')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,6.48640000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R2,6.48640000000,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', 'early-peak')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R2,6.48640000000,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', 'late-peak')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'evening')",heat,R2,6.48640000000,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', 'evening')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'evening')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'early-morning')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'early-morning')",heat,R2,6.48640000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'early-morning')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,15.76510000000,2040
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,15.76510000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2040
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,6.48640000000,2040
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,6.48640000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,6.48640000000,2040
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,6.48640000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,7.28260000000,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', 'night')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'night')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,7.28260000000,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', 'morning')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'morning')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.28260000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,7.28260000000,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', 'early-peak')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,7.28260000000,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', 'late-peak')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,7.28260000000,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', 'evening')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'evening')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'early-morning')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'early-morning')",heat,R2,7.28260000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'early-morning')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,17.75560000000,2045
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,17.75560000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2045
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.28260000000,2045
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.28260000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,7.28260000000,2045
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,7.28260000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'night')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,7.89430000000,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', 'night')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'night')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'morning')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,7.89430000000,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', 'morning')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'morning')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",heat,R2,7.89430000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'mid-afternoon')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,7.89430000000,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', 'early-peak')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,7.89430000000,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', 'late-peak')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'evening')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,7.89430000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'evening')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'early-morning')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'early-morning')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'early-morning')",heat,R2,7.89430000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'early-morning')",cook,R2,7.89430000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R1,19.28480000000,2050
-"('all-year', 'all-week', 'late-afternoon')",electricity,R2,19.28480000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R1,0.35420000000,2050
-"('all-year', 'all-week', 'late-afternoon')",gas,R2,0.35420000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R1,7.89430000000,2050
-"('all-year', 'all-week', 'late-afternoon')",heat,R2,7.89430000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R1,7.89430000000,2050
-"('all-year', 'all-week', 'late-afternoon')",cook,R2,7.89430000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020
+cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+cook,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020
+cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+cook,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,mid-afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,mid-afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+CO2f,all-week,mid-afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020
+cook,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+cook,all-week,mid-afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020
+cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+cook,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020
+cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+cook,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
+cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+cook,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020
+electricity,all-week,early-morning,all-year,19.50000000000,R2,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020
+gas,all-week,early-morning,all-year,7.15280000000,R2,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+heat,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020
+CO2f,all-week,early-morning,all-year,0.08310000000,R2,6,MUS$2010/kt,2020
+cook,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020
+cook,all-week,early-morning,all-year,100.00000000000,R2,6,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020
+electricity,all-week,late-afternoon,all-year,19.50000000000,R2,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
+gas,all-week,late-afternoon,all-year,7.15280000000,R2,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+heat,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
+CO2f,all-week,late-afternoon,all-year,0.08310000000,R2,7,MUS$2010/kt,2020
+cook,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
+cook,all-week,late-afternoon,all-year,100.00000000000,R2,7,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,8.89330000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,8.89330000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.76500000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.76500000000,R2,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
+cook,all-week,night,all-year,4.36360000000,R1,0,MUS$2010/PJ,2025
+cook,all-week,night,all-year,4.36360000000,R2,0,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,8.89330000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,8.89330000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.76500000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.76500000000,R2,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
+cook,all-week,morning,all-year,4.36360000000,R1,1,MUS$2010/PJ,2025
+cook,all-week,morning,all-year,4.36360000000,R2,1,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,8.89330000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,8.89330000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,4.76500000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,4.76500000000,R2,2,MUS$2010/PJ,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+CO2f,all-week,mid-afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
+cook,all-week,mid-afternoon,all-year,4.36360000000,R1,2,MUS$2010/PJ,2025
+cook,all-week,mid-afternoon,all-year,4.36360000000,R2,2,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,8.89330000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,8.89330000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.76500000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.76500000000,R2,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
+cook,all-week,early-peak,all-year,4.36360000000,R1,3,MUS$2010/PJ,2025
+cook,all-week,early-peak,all-year,4.36360000000,R2,3,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,8.89330000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,8.89330000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.76500000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.76500000000,R2,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
+cook,all-week,late-peak,all-year,4.36360000000,R1,4,MUS$2010/PJ,2025
+cook,all-week,late-peak,all-year,4.36360000000,R2,4,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,8.89330000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,8.89330000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.76500000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.76500000000,R2,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
+cook,all-week,evening,all-year,4.36360000000,R1,5,MUS$2010/PJ,2025
+cook,all-week,evening,all-year,4.36360000000,R2,5,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,8.89330000000,R1,6,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,8.89330000000,R2,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,4.76500000000,R1,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,4.76500000000,R2,6,MUS$2010/PJ,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025
+CO2f,all-week,early-morning,all-year,0.12010000000,R2,6,MUS$2010/kt,2025
+cook,all-week,early-morning,all-year,4.36360000000,R1,6,MUS$2010/PJ,2025
+cook,all-week,early-morning,all-year,4.36360000000,R2,6,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,8.89330000000,R1,7,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,8.89330000000,R2,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,4.76500000000,R1,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,4.76500000000,R2,7,MUS$2010/PJ,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025
+CO2f,all-week,late-afternoon,all-year,0.12010000000,R2,7,MUS$2010/kt,2025
+cook,all-week,late-afternoon,all-year,4.36360000000,R1,7,MUS$2010/PJ,2025
+cook,all-week,late-afternoon,all-year,4.36360000000,R2,7,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,12.84560000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,12.84560000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.31860000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.31860000000,R2,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
+cook,all-week,night,all-year,5.31860000000,R1,0,MUS$2010/PJ,2030
+cook,all-week,night,all-year,5.31860000000,R2,0,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,12.84560000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,12.84560000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.31860000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.31860000000,R2,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
+cook,all-week,morning,all-year,5.31860000000,R1,1,MUS$2010/PJ,2030
+cook,all-week,morning,all-year,5.31860000000,R2,1,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,12.84560000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,12.84560000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,5.31860000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,5.31860000000,R2,2,MUS$2010/PJ,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+CO2f,all-week,mid-afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
+cook,all-week,mid-afternoon,all-year,5.31860000000,R1,2,MUS$2010/PJ,2030
+cook,all-week,mid-afternoon,all-year,5.31860000000,R2,2,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,12.84560000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,12.84560000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.31860000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.31860000000,R2,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
+cook,all-week,early-peak,all-year,5.31860000000,R1,3,MUS$2010/PJ,2030
+cook,all-week,early-peak,all-year,5.31860000000,R2,3,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,12.84560000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,12.84560000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.31860000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.31860000000,R2,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
+cook,all-week,late-peak,all-year,5.31860000000,R1,4,MUS$2010/PJ,2030
+cook,all-week,late-peak,all-year,5.31860000000,R2,4,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,12.84560000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,12.84560000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.31860000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.31860000000,R2,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
+cook,all-week,evening,all-year,5.31860000000,R1,5,MUS$2010/PJ,2030
+cook,all-week,evening,all-year,5.31860000000,R2,5,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,12.84560000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,12.84560000000,R2,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,5.31860000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,5.31860000000,R2,6,MUS$2010/PJ,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
+CO2f,all-week,early-morning,all-year,0.15700000000,R2,6,MUS$2010/kt,2030
+cook,all-week,early-morning,all-year,5.31860000000,R1,6,MUS$2010/PJ,2030
+cook,all-week,early-morning,all-year,5.31860000000,R2,6,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,12.84560000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,12.84560000000,R2,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,5.31860000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,5.31860000000,R2,7,MUS$2010/PJ,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
+CO2f,all-week,late-afternoon,all-year,0.15700000000,R2,7,MUS$2010/kt,2030
+cook,all-week,late-afternoon,all-year,5.31860000000,R1,7,MUS$2010/PJ,2030
+cook,all-week,late-afternoon,all-year,5.31860000000,R2,7,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,12.64310000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,12.64310000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,5.23760000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,5.23760000000,R2,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
+cook,all-week,night,all-year,5.23760000000,R1,0,MUS$2010/PJ,2035
+cook,all-week,night,all-year,5.23760000000,R2,0,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,12.64310000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,12.64310000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,5.23760000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,5.23760000000,R2,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
+cook,all-week,morning,all-year,5.23760000000,R1,1,MUS$2010/PJ,2035
+cook,all-week,morning,all-year,5.23760000000,R2,1,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,12.64310000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,12.64310000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,5.23760000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,5.23760000000,R2,2,MUS$2010/PJ,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+CO2f,all-week,mid-afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
+cook,all-week,mid-afternoon,all-year,5.23760000000,R1,2,MUS$2010/PJ,2035
+cook,all-week,mid-afternoon,all-year,5.23760000000,R2,2,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,12.64310000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,12.64310000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,5.23760000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,5.23760000000,R2,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
+cook,all-week,early-peak,all-year,5.23760000000,R1,3,MUS$2010/PJ,2035
+cook,all-week,early-peak,all-year,5.23760000000,R2,3,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,12.64310000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,12.64310000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,5.23760000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,5.23760000000,R2,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
+cook,all-week,late-peak,all-year,5.23760000000,R1,4,MUS$2010/PJ,2035
+cook,all-week,late-peak,all-year,5.23760000000,R2,4,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,12.64310000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,12.64310000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,5.23760000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,5.23760000000,R2,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
+cook,all-week,evening,all-year,5.23760000000,R1,5,MUS$2010/PJ,2035
+cook,all-week,evening,all-year,5.23760000000,R2,5,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,12.64310000000,R1,6,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,12.64310000000,R2,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,5.23760000000,R1,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,5.23760000000,R2,6,MUS$2010/PJ,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035
+CO2f,all-week,early-morning,all-year,0.21490000000,R2,6,MUS$2010/kt,2035
+cook,all-week,early-morning,all-year,5.23760000000,R1,6,MUS$2010/PJ,2035
+cook,all-week,early-morning,all-year,5.23760000000,R2,6,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,12.64310000000,R1,7,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,12.64310000000,R2,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,5.23760000000,R1,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,5.23760000000,R2,7,MUS$2010/PJ,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035
+CO2f,all-week,late-afternoon,all-year,0.21490000000,R2,7,MUS$2010/kt,2035
+cook,all-week,late-afternoon,all-year,5.23760000000,R1,7,MUS$2010/PJ,2035
+cook,all-week,late-afternoon,all-year,5.23760000000,R2,7,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,15.76510000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,15.76510000000,R2,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.48640000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.48640000000,R2,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
+cook,all-week,night,all-year,6.48640000000,R1,0,MUS$2010/PJ,2040
+cook,all-week,night,all-year,6.48640000000,R2,0,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,15.76510000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,15.76510000000,R2,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.48640000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.48640000000,R2,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
+cook,all-week,morning,all-year,6.48640000000,R1,1,MUS$2010/PJ,2040
+cook,all-week,morning,all-year,6.48640000000,R2,1,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,15.76510000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,15.76510000000,R2,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,6.48640000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,6.48640000000,R2,2,MUS$2010/PJ,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+CO2f,all-week,mid-afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
+cook,all-week,mid-afternoon,all-year,6.48640000000,R1,2,MUS$2010/PJ,2040
+cook,all-week,mid-afternoon,all-year,6.48640000000,R2,2,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,15.76510000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,15.76510000000,R2,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.48640000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.48640000000,R2,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
+cook,all-week,early-peak,all-year,6.48640000000,R1,3,MUS$2010/PJ,2040
+cook,all-week,early-peak,all-year,6.48640000000,R2,3,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,15.76510000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,15.76510000000,R2,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.48640000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.48640000000,R2,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
+cook,all-week,late-peak,all-year,6.48640000000,R1,4,MUS$2010/PJ,2040
+cook,all-week,late-peak,all-year,6.48640000000,R2,4,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,15.76510000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,15.76510000000,R2,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.48640000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.48640000000,R2,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
+cook,all-week,evening,all-year,6.48640000000,R1,5,MUS$2010/PJ,2040
+cook,all-week,evening,all-year,6.48640000000,R2,5,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,15.76510000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,15.76510000000,R2,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,6.48640000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,6.48640000000,R2,6,MUS$2010/PJ,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
+CO2f,all-week,early-morning,all-year,0.27280000000,R2,6,MUS$2010/kt,2040
+cook,all-week,early-morning,all-year,6.48640000000,R1,6,MUS$2010/PJ,2040
+cook,all-week,early-morning,all-year,6.48640000000,R2,6,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,15.76510000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,15.76510000000,R2,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,6.48640000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,6.48640000000,R2,7,MUS$2010/PJ,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
+CO2f,all-week,late-afternoon,all-year,0.27280000000,R2,7,MUS$2010/kt,2040
+cook,all-week,late-afternoon,all-year,6.48640000000,R1,7,MUS$2010/PJ,2040
+cook,all-week,late-afternoon,all-year,6.48640000000,R2,7,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,17.75560000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,17.75560000000,R2,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.28260000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.28260000000,R2,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
+cook,all-week,night,all-year,7.28260000000,R1,0,MUS$2010/PJ,2045
+cook,all-week,night,all-year,7.28260000000,R2,0,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,17.75560000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,17.75560000000,R2,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.28260000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.28260000000,R2,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
+cook,all-week,morning,all-year,7.28260000000,R1,1,MUS$2010/PJ,2045
+cook,all-week,morning,all-year,7.28260000000,R2,1,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,17.75560000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,17.75560000000,R2,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,7.28260000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,7.28260000000,R2,2,MUS$2010/PJ,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+CO2f,all-week,mid-afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
+cook,all-week,mid-afternoon,all-year,7.28260000000,R1,2,MUS$2010/PJ,2045
+cook,all-week,mid-afternoon,all-year,7.28260000000,R2,2,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,17.75560000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,17.75560000000,R2,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.28260000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.28260000000,R2,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
+cook,all-week,early-peak,all-year,7.28260000000,R1,3,MUS$2010/PJ,2045
+cook,all-week,early-peak,all-year,7.28260000000,R2,3,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,17.75560000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,17.75560000000,R2,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.28260000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.28260000000,R2,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
+cook,all-week,late-peak,all-year,7.28260000000,R1,4,MUS$2010/PJ,2045
+cook,all-week,late-peak,all-year,7.28260000000,R2,4,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,17.75560000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,17.75560000000,R2,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.28260000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.28260000000,R2,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
+cook,all-week,evening,all-year,7.28260000000,R1,5,MUS$2010/PJ,2045
+cook,all-week,evening,all-year,7.28260000000,R2,5,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,17.75560000000,R1,6,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,17.75560000000,R2,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,7.28260000000,R1,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,7.28260000000,R2,6,MUS$2010/PJ,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045
+CO2f,all-week,early-morning,all-year,0.35390000000,R2,6,MUS$2010/kt,2045
+cook,all-week,early-morning,all-year,7.28260000000,R1,6,MUS$2010/PJ,2045
+cook,all-week,early-morning,all-year,7.28260000000,R2,6,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,17.75560000000,R1,7,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,17.75560000000,R2,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,7.28260000000,R1,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,7.28260000000,R2,7,MUS$2010/PJ,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045
+CO2f,all-week,late-afternoon,all-year,0.35390000000,R2,7,MUS$2010/kt,2045
+cook,all-week,late-afternoon,all-year,7.28260000000,R1,7,MUS$2010/PJ,2045
+cook,all-week,late-afternoon,all-year,7.28260000000,R2,7,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,19.28480000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,19.28480000000,R2,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.35420000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,7.89430000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,7.89430000000,R2,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
+cook,all-week,night,all-year,7.89430000000,R1,0,MUS$2010/PJ,2050
+cook,all-week,night,all-year,7.89430000000,R2,0,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,19.28480000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,19.28480000000,R2,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.35420000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,7.89430000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,7.89430000000,R2,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
+cook,all-week,morning,all-year,7.89430000000,R1,1,MUS$2010/PJ,2050
+cook,all-week,morning,all-year,7.89430000000,R2,1,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,19.28480000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,19.28480000000,R2,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,mid-afternoon,all-year,0.35420000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,7.89430000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,7.89430000000,R2,2,MUS$2010/PJ,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+CO2f,all-week,mid-afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
+cook,all-week,mid-afternoon,all-year,7.89430000000,R1,2,MUS$2010/PJ,2050
+cook,all-week,mid-afternoon,all-year,7.89430000000,R2,2,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,19.28480000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,19.28480000000,R2,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.35420000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,7.89430000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,7.89430000000,R2,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
+cook,all-week,early-peak,all-year,7.89430000000,R1,3,MUS$2010/PJ,2050
+cook,all-week,early-peak,all-year,7.89430000000,R2,3,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,19.28480000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,19.28480000000,R2,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.35420000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,7.89430000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,7.89430000000,R2,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
+cook,all-week,late-peak,all-year,7.89430000000,R1,4,MUS$2010/PJ,2050
+cook,all-week,late-peak,all-year,7.89430000000,R2,4,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,19.28480000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,19.28480000000,R2,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.35420000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,7.89430000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,7.89430000000,R2,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
+cook,all-week,evening,all-year,7.89430000000,R1,5,MUS$2010/PJ,2050
+cook,all-week,evening,all-year,7.89430000000,R2,5,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,19.28480000000,R1,6,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,19.28480000000,R2,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050
+gas,all-week,early-morning,all-year,0.35420000000,R2,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,7.89430000000,R1,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,7.89430000000,R2,6,MUS$2010/PJ,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050
+CO2f,all-week,early-morning,all-year,0.43510000000,R2,6,MUS$2010/kt,2050
+cook,all-week,early-morning,all-year,7.89430000000,R1,6,MUS$2010/PJ,2050
+cook,all-week,early-morning,all-year,7.89430000000,R2,6,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,19.28480000000,R1,7,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,19.28480000000,R2,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050
+gas,all-week,late-afternoon,all-year,0.35420000000,R2,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,7.89430000000,R1,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,7.89430000000,R2,7,MUS$2010/PJ,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050
+CO2f,all-week,late-afternoon,all-year,0.43510000000,R2,7,MUS$2010/kt,2050
+cook,all-week,late-afternoon,all-year,7.89430000000,R1,7,MUS$2010/PJ,2050
+cook,all-week,late-afternoon,all-year,7.89430000000,R2,7,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
index 595423bc..91324c57 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -1,51 +1,51 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,11.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,15.39710000000
-heatpump,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,7.89710000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,5.10950000000
-heatpump,R1,R1,A1,residential,newcapa,2035,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,2.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,0.39710000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,5.10950000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,6.35960000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,6.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,2.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.39710000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,5.10950000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,6.35960000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,0.32400000000
-heatpump,R1,R1,A1,residential,newcapa,2045,6.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,12.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.39710000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,5.10950000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,6.35960000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,0.32400000000
-heatpump,R1,R1,A1,residential,newcapa,2050,12.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,7.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,2.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.39710000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,5.10950000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,6.35960000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.32400000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,15.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,7.89710000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,0.32400000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,1.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,0.32400000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,0.39710000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,5.10950000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,6.35960000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.32400000000,R1,2035,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
index ffcab18b..69423d7f 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,6.16610000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,6.16610000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.16610000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.16610000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.16610000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,6.16610000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,6.49540000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,18.77110000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,7.74890000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,18.77110000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,7.74890000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,18.77110000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.74890000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.77110000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.74890000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.77110000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.74890000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,18.77110000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,7.74890000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,23.47910000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,9.63210000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,23.47910000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,9.63210000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,23.47910000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,9.63210000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,23.47910000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,9.63210000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,23.47910000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,9.63210000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,23.47910000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,9.63210000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,28.56770000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,11.66760000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,28.56770000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,11.66760000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,28.56770000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,11.66760000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,28.56770000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,11.66760000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,28.56770000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,11.66760000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,28.56770000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,11.66760000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,34.81960000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,14.16840000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,34.81960000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,14.16840000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,34.81960000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,14.16840000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,34.81960000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,14.16840000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,34.81960000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,14.16840000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,34.81960000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,14.16840000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,12.25210000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,6.16610000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,12.25210000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,6.16610000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,12.25210000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,6.16610000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,12.25210000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,6.16610000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,12.25210000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,6.16610000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,12.25210000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,6.16610000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,15.63730000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,6.49540000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,15.63730000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,6.49540000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,15.63730000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,6.49540000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,15.63730000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,6.49540000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,15.63730000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,6.49540000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,15.63730000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,6.49540000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,18.77110000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,7.74890000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,18.77110000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,7.74890000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,18.77110000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,7.74890000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,18.77110000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,7.74890000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,18.77110000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,7.74890000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,18.77110000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,7.74890000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,23.47910000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,9.63210000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,23.47910000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,9.63210000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,23.47910000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,9.63210000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,23.47910000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,9.63210000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,23.47910000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,9.63210000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,23.47910000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,9.63210000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,28.56770000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,11.66760000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,28.56770000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,11.66760000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,28.56770000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,11.66760000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,28.56770000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,11.66760000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,28.56770000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,11.66760000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,28.56770000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,11.66760000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,34.81960000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,14.16840000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,34.81960000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,14.16840000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,34.81960000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,14.16840000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,34.81960000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,14.16840000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,34.81960000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,14.16840000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,34.81960000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,14.16840000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index 5511d58f..cb4249e0 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,6.13290000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,3.88680000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,7.95490000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.46370000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,7.95490000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.46370000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,7.95490000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.46370000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,2.69360000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,3.42250000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.12310000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,3.42250000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.42250000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.12310000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,6.13290000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,3.88680000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,7.95490000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.46370000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,12.20640000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,7.95490000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.46370000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,7.95490000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.46370000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,12.20640000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,2.69360000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,3.42250000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.12310000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,3.42250000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,3.42250000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.12310000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index 74345014..1994c078 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,12.20640000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,5.81000000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.33330000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.77380000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,1.33330000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.77380000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,12.20640000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,5.81000000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,12.20640000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,5.81000000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,12.20640000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,12.20640000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,5.81000000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,12.20640000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,5.81000000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,12.20640000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,1.33330000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,1.33330000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default/MCACapacity.csv b/tests/example_outputs/default/MCACapacity.csv
index e5e0bc42..f554b21f 100644
--- a/tests/example_outputs/default/MCACapacity.csv
+++ b/tests/example_outputs/default/MCACapacity.csv
@@ -1,58 +1,58 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,5.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,16.73530000000
-heatpump,R1,R1,A1,residential,newcapa,2030,19.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.23530000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.28910000000
-heatpump,R1,R1,A1,residential,newcapa,2035,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,26.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2040,26.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,16.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2045,16.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,32.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2050,32.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,22.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.47410000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.30680000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.30680000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv
index bc95744d..e692a751 100644
--- a/tests/example_outputs/default/MCAPrices.csv
+++ b/tests/example_outputs/default/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.39110000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.91850000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.39110000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.91850000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,9.39110000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.91850000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.39110000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.91850000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.39110000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.91850000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.39110000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,13.28930000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.55620000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.28930000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.55620000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,13.28930000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.55620000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.28930000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.55620000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.28930000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.55620000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.28930000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.55620000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,15.01190000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.24530000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,15.01190000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.24530000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,15.01190000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.24530000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,15.01190000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.24530000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,15.01190000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.24530000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,15.01190000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.24530000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,16.23940000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.73620000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,16.23940000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.73620000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,16.23940000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.73620000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,16.23940000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.73620000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,16.23940000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.73620000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,16.23940000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.73620000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,18.26600000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.54690000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,18.26600000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.54690000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,18.26600000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,7.54690000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,18.26600000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.54690000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,18.26600000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.54690000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,18.26600000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.54690000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,20.18470000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.31440000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,20.18470000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.31440000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,20.18470000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.31440000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,20.18470000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.31440000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,20.18470000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.31440000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,20.18470000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.31440000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_retro/MCACapacity.csv b/tests/example_outputs/default_retro/MCACapacity.csv
index 768716b3..7a9f6161 100644
--- a/tests/example_outputs/default_retro/MCACapacity.csv
+++ b/tests/example_outputs/default_retro/MCACapacity.csv
@@ -1,61 +1,61 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2025,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2025,5.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2025,16.46440000000
-gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
-heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2030,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2030,5.50000000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,8.96440000000
-gassupply1,R1,R1,A1,gas,retrofit,2030,11.46130000000
-gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
-heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2035,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2035,5.50000000000
-windturbine,R1,R1,A1,power,retrofit,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,1.46440000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,11.46130000000
-gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
-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,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2040,5.50000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,9.19000000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,1.46440000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,11.46130000000
-gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
-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,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2045,5.50000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,1.46440000000
-gassupply1,R1,R1,A1,gas,retrofit,2045,11.46130000000
-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,5.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,4.06670000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,9.19000000000
-windturbine,R1,R1,A1,power,retrofit,2050,6.00000000000
-windturbine,R1,R1,A1,power,retrofit,2050,12.41000000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,1.46440000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,11.46130000000
-gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025
+A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025
+A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2025
+A1,16.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2025
+A1,4.10000000000,R1,2025,R1,residential,gasboiler,retrofit,2030
+A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030
+A1,6.90000000000,R1,2025,R1,residential,heatpump,retrofit,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2030
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2030
+A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2030
+A1,8.96440000000,R1,2020,R1,gas,gassupply1,retrofit,2030
+A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2030
+A1,4.10000000000,R1,2025,R1,residential,gasboiler,retrofit,2035
+A1,6.90000000000,R1,2025,R1,residential,heatpump,retrofit,2035
+A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2035
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2035
+A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2035
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2035
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2035
+A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2035
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2035
+A1,0.91000000000,R1,2035,R1,residential,gasboiler,retrofit,2040
+A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040
+A1,16.09000000000,R1,2035,R1,residential,heatpump,retrofit,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2040
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2040
+A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2040
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2040
+A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2040
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2040
+A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2040
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2040
+A1,0.91000000000,R1,2035,R1,residential,gasboiler,retrofit,2045
+A1,16.09000000000,R1,2035,R1,residential,heatpump,retrofit,2045
+A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2045
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2045
+A1,5.50000000000,R1,2020,R1,power,windturbine,retrofit,2045
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2045
+A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2045
+A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2045
+A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2045
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2045
+A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050
+A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2050
+A1,4.06670000000,R1,2025,R1,power,gasCCGT,retrofit,2050
+A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2050
+A1,9.19000000000,R1,2035,R1,power,windturbine,retrofit,2050
+A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050
+A1,12.41000000000,R1,2045,R1,power,windturbine,retrofit,2050
+A1,1.46440000000,R1,2020,R1,gas,gassupply1,retrofit,2050
+A1,11.46130000000,R1,2025,R1,gas,gassupply1,retrofit,2050
+A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2050
diff --git a/tests/example_outputs/default_retro/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv
index 9925a16e..21411393 100644
--- a/tests/example_outputs/default_retro/MCAPrices.csv
+++ b/tests/example_outputs/default_retro/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.18790000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.85420000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,12.67060000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,6.06060000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,12.67060000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,6.06060000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.67060000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.06060000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.67060000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.06060000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.67060000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.06060000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,12.67060000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,6.06060000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,13.99390000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.83090000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,13.99390000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.83090000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.99390000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.83090000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.99390000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.83090000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.99390000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.83090000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,13.99390000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.83090000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,13.87100000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.06000000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,13.87100000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.06000000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.87100000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.06000000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.87100000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.06000000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.87100000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.06000000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,13.87100000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.06000000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,15.54030000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,6.78080000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,15.54030000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,6.78080000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.54030000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.78080000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.54030000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.78080000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.54030000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.78080000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,15.54030000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,6.78080000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,16.57670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,6.87120000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,16.57670000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,6.87120000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,16.57670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.87120000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.57670000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.87120000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.57670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.87120000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,16.57670000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,6.87120000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.18790000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.85420000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.18790000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.85420000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,9.18790000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.85420000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.18790000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.85420000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.18790000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.85420000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.18790000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,12.67060000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,6.06060000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,12.67060000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,6.06060000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,12.67060000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,6.06060000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,12.67060000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,6.06060000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,12.67060000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,6.06060000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,12.67060000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,6.06060000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,13.99390000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.83090000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,13.99390000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.83090000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,13.99390000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.83090000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,13.99390000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.83090000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,13.99390000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.83090000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,13.99390000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.83090000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,13.87100000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.06000000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,13.87100000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.06000000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,13.87100000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.06000000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,13.87100000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.06000000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,13.87100000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.06000000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,13.87100000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.06000000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,15.54030000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,6.78080000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,15.54030000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,6.78080000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,15.54030000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,6.78080000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,15.54030000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,6.78080000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,15.54030000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,6.78080000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,15.54030000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,6.78080000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,16.57670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,6.87120000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,16.57670000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,6.87120000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,16.57670000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,6.87120000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,16.57670000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,6.87120000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,16.57670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,6.87120000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,16.57670000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,6.87120000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index c27e01ed..557f6061 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,2.15580000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,2.15580000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,2.15580000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,2.15580000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,3.09610000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,3.77510000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,2.15580000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,1.47890000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,0.66670000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.50720000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,2.15580000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,2.15580000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,2.15580000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,2.15580000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,3.09610000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,3.77510000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,2.15580000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,1.47890000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/medium/MCACapacity.csv b/tests/example_outputs/medium/MCACapacity.csv
index 9a2be079..ea849e50 100644
--- a/tests/example_outputs/medium/MCACapacity.csv
+++ b/tests/example_outputs/medium/MCACapacity.csv
@@ -1,62 +1,62 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2020,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,8.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2025,12.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,26.63810000000
-gasboiler,R1,R1,A1,residential,newcapa,2030,7.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2030,4.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2030,11.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,4.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,19.13810000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,12.51020000000
-gasboiler,R1,R1,A1,residential,newcapa,2035,7.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2035,11.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2035,7.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,4.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,7.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,4.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,11.63810000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,12.51020000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,10.02210000000
-gasstove,R1,R1,A1,residential,newcapa,2040,7.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2040,14.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,7.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,14.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,11.63810000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,12.51020000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,10.02210000000
-gasstove,R1,R1,A1,residential,newcapa,2045,14.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2045,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,14.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,10.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,11.63810000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,12.51020000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,10.02210000000
-gasstove,R1,R1,A1,residential,newcapa,2050,10.00000000000
-gasstove,R1,R1,A1,residential,newcapa,2050,17.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,10.00000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,17.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,4.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,3.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,11.63810000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,12.51020000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,10.02210000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.88640000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,12.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025
+A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,26.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,7.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030
+A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030
+A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,19.13810000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,7.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035
+A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035
+A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035
+A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040
+A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040
+A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045
+A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045
+A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050
+A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050
+A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,17.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,11.63810000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,12.51020000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,10.02210000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.88640000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv
index d56c9e6b..f2a44ba2 100644
--- a/tests/example_outputs/medium/MCAPrices.csv
+++ b/tests/example_outputs/medium/MCAPrices.csv
@@ -1,211 +1,211 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",cook,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,7.32800000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,7.32800000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.32800000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.32800000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.32800000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,12.25210000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,7.32800000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,8.50930000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,8.50930000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.50930000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.50930000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.50930000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,15.63730000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,8.50930000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,13.77050000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,9.17380000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,13.77050000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,9.17380000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.77050000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,9.17380000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.77050000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,9.17380000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.77050000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,9.17380000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,13.77050000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,9.17380000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,9.66330000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,4.10580000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,9.66330000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,4.10580000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.66330000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.10580000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.66330000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.10580000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.66330000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.10580000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,9.66330000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,4.10580000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,10.76850000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,4.54790000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,10.76850000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,4.54790000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,10.76850000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.54790000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,10.76850000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.54790000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,10.76850000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.54790000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,10.76850000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,4.54790000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,11.62580000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,4.89080000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'night')",cook,R1,0.71270000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,11.62580000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,4.89080000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",cook,R1,0.71270000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,11.62580000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.89080000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",cook,R1,0.71270000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,11.62580000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.89080000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",cook,R1,0.71270000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,11.62580000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.89080000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",cook,R1,0.71270000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,11.62580000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,4.89080000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",cook,R1,0.71270000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+electricity,all-week,night,all-year,12.25210000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,7.32800000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+cook,all-week,night,all-year,0.71270000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,12.25210000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,7.32800000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+cook,all-week,morning,all-year,0.71270000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,12.25210000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,7.32800000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+cook,all-week,afternoon,all-year,0.71270000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,12.25210000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,7.32800000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+cook,all-week,early-peak,all-year,0.71270000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,12.25210000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,7.32800000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+cook,all-week,late-peak,all-year,0.71270000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,12.25210000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,7.32800000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+cook,all-week,evening,all-year,0.71270000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,15.63730000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,8.50930000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+cook,all-week,night,all-year,0.71270000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,15.63730000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,8.50930000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+cook,all-week,morning,all-year,0.71270000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,15.63730000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,8.50930000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+cook,all-week,afternoon,all-year,0.71270000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,15.63730000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,8.50930000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+cook,all-week,early-peak,all-year,0.71270000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,15.63730000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,8.50930000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+cook,all-week,late-peak,all-year,0.71270000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,15.63730000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,8.50930000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+cook,all-week,evening,all-year,0.71270000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,13.77050000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,9.17380000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+cook,all-week,night,all-year,0.71270000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,13.77050000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,9.17380000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+cook,all-week,morning,all-year,0.71270000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,13.77050000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,9.17380000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+cook,all-week,afternoon,all-year,0.71270000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,13.77050000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,9.17380000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+cook,all-week,early-peak,all-year,0.71270000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,13.77050000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,9.17380000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+cook,all-week,late-peak,all-year,0.71270000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,13.77050000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,9.17380000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+cook,all-week,evening,all-year,0.71270000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,9.66330000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,4.10580000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+cook,all-week,night,all-year,0.71270000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,9.66330000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,4.10580000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+cook,all-week,morning,all-year,0.71270000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,9.66330000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,4.10580000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+cook,all-week,afternoon,all-year,0.71270000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,9.66330000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,4.10580000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+cook,all-week,early-peak,all-year,0.71270000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,9.66330000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,4.10580000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+cook,all-week,late-peak,all-year,0.71270000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,9.66330000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,4.10580000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+cook,all-week,evening,all-year,0.71270000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,10.76850000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,4.54790000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+cook,all-week,night,all-year,0.71270000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,10.76850000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,4.54790000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+cook,all-week,morning,all-year,0.71270000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,10.76850000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,4.54790000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+cook,all-week,afternoon,all-year,0.71270000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,10.76850000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,4.54790000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+cook,all-week,early-peak,all-year,0.71270000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,10.76850000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,4.54790000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+cook,all-week,late-peak,all-year,0.71270000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,10.76850000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,4.54790000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+cook,all-week,evening,all-year,0.71270000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,11.62580000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,4.89080000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+cook,all-week,night,all-year,0.71270000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,11.62580000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,4.89080000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+cook,all-week,morning,all-year,0.71270000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,11.62580000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,4.89080000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+cook,all-week,afternoon,all-year,0.71270000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,11.62580000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,4.89080000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+cook,all-week,early-peak,all-year,0.71270000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,11.62580000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,4.89080000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+cook,all-week,late-peak,all-year,0.71270000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,11.62580000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,4.89080000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
+cook,all-week,evening,all-year,0.71270000000,R1,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/multiple_agents/MCACapacity.csv b/tests/example_outputs/multiple_agents/MCACapacity.csv
index ee89c111..fbdd171b 100644
--- a/tests/example_outputs/multiple_agents/MCACapacity.csv
+++ b/tests/example_outputs/multiple_agents/MCACapacity.csv
@@ -1,71 +1,71 @@
-technology,dst_region,region,agent,sector,type,year,capacity
-gasboiler,R1,R1,A1,residential,newcapa,2020,5.00000000000
-gasboiler,R1,R1,A2,residential,newcapa,2020,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2020,1.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2020,15.00000000000
-gasboiler,R1,R1,A1,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2025,9.50000000000
-gasboiler,R1,R1,A2,residential,newcapa,2025,2.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2025,9.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2025,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2025,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2025,16.73530000000
-heatpump,R1,R1,A1,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2030,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,9.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2030,5.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2030,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2030,5.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.23530000000
-gassupply1,R1,R1,A1,gas,newcapa,2030,9.28910000000
-heatpump,R1,R1,A1,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2035,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,5.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2035,12.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2035,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2035,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2035,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2040,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,12.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2040,8.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2040,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2040,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2045,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,8.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2045,15.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,5.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2045,6.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2045,7.47410000000
-heatpump,R1,R1,A1,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A1,residential,newcapa,2050,11.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,15.50000000000
-heatpump,R1,R1,A2,residential,newcapa,2050,11.50000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,5.00000000000
-gasCCGT,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,6.00000000000
-windturbine,R1,R1,A1,power,newcapa,2050,10.00000000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,1.73530000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,9.28910000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,7.47410000000
-gassupply1,R1,R1,A1,gas,newcapa,2050,0.30680000000
+agent,capacity,dst_region,installed,region,sector,technology,type,year
+A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
+A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
+A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025
+A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2025
+A1,16.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030
+A1,9.23530000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2035
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050
+A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,5.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,1.73530000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,9.28910000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,7.47410000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,0.30680000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv
index bc95744d..e692a751 100644
--- a/tests/example_outputs/multiple_agents/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/MCAPrices.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,prices,year
-"('all-year', 'all-week', 'night')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'night')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'night')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'night')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'morning')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'morning')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'morning')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'afternoon')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'afternoon')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'afternoon')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'early-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'early-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'early-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'late-peak')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'late-peak')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'late-peak')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'evening')",electricity,R1,19.50000000000,2020
-"('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020
-"('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020
-"('all-year', 'all-week', 'night')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'night')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'morning')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'morning')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'afternoon')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'afternoon')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'early-peak')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'early-peak')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'late-peak')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'late-peak')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'evening')",electricity,R1,9.39110000000,2025
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2025
-"('all-year', 'all-week', 'evening')",heat,R1,4.91850000000,2025
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025
-"('all-year', 'all-week', 'night')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'night')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'morning')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'morning')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'afternoon')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'afternoon')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'early-peak')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'early-peak')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'late-peak')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'late-peak')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'evening')",electricity,R1,13.28930000000,2030
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2030
-"('all-year', 'all-week', 'evening')",heat,R1,5.55620000000,2030
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030
-"('all-year', 'all-week', 'night')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'night')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'morning')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'morning')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'afternoon')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'early-peak')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'late-peak')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'evening')",electricity,R1,15.01190000000,2035
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2035
-"('all-year', 'all-week', 'evening')",heat,R1,6.24530000000,2035
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'night')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'morning')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'afternoon')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'early-peak')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'late-peak')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,16.23940000000,2040
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2040
-"('all-year', 'all-week', 'evening')",heat,R1,6.73620000000,2040
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,18.26600000000,2045
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,7.54690000000,2045
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'night')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'morning')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'afternoon')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'early-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'late-peak')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,20.18470000000,2050
-"('all-year', 'all-week', 'evening')",gas,R1,0.47220000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,8.31440000000,2050
-"('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
+commodity,day,hour,month,prices,region,timeslice,units_prices,year
+electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
+gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
+heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
+CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
+electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
+gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
+heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
+CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
+electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
+gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
+heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
+CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
+electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
+gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
+heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
+CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
+electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
+gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
+heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
+CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
+electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
+gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
+heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
+CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
+electricity,all-week,night,all-year,9.39110000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,4.91850000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,9.39110000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,4.91850000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,9.39110000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,4.91850000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,9.39110000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,4.91850000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,9.39110000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,4.91850000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,9.39110000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,13.28930000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,5.55620000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,13.28930000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,5.55620000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,13.28930000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,5.55620000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,13.28930000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,5.55620000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,13.28930000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,5.55620000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,13.28930000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,5.55620000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,15.01190000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,6.24530000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,15.01190000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,6.24530000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,15.01190000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,6.24530000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,15.01190000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,6.24530000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,15.01190000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,6.24530000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,15.01190000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,6.24530000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
+electricity,all-week,night,all-year,16.23940000000,R1,0,MUS$2010/PJ,2040
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,6.73620000000,R1,0,MUS$2010/PJ,2040
+CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
+electricity,all-week,morning,all-year,16.23940000000,R1,1,MUS$2010/PJ,2040
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,6.73620000000,R1,1,MUS$2010/PJ,2040
+CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
+electricity,all-week,afternoon,all-year,16.23940000000,R1,2,MUS$2010/PJ,2040
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,6.73620000000,R1,2,MUS$2010/PJ,2040
+CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
+electricity,all-week,early-peak,all-year,16.23940000000,R1,3,MUS$2010/PJ,2040
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,6.73620000000,R1,3,MUS$2010/PJ,2040
+CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
+electricity,all-week,late-peak,all-year,16.23940000000,R1,4,MUS$2010/PJ,2040
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,6.73620000000,R1,4,MUS$2010/PJ,2040
+CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
+electricity,all-week,evening,all-year,16.23940000000,R1,5,MUS$2010/PJ,2040
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,6.73620000000,R1,5,MUS$2010/PJ,2040
+CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
+electricity,all-week,night,all-year,18.26600000000,R1,0,MUS$2010/PJ,2045
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,7.54690000000,R1,0,MUS$2010/PJ,2045
+CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
+electricity,all-week,morning,all-year,18.26600000000,R1,1,MUS$2010/PJ,2045
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,7.54690000000,R1,1,MUS$2010/PJ,2045
+CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
+electricity,all-week,afternoon,all-year,18.26600000000,R1,2,MUS$2010/PJ,2045
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,7.54690000000,R1,2,MUS$2010/PJ,2045
+CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
+electricity,all-week,early-peak,all-year,18.26600000000,R1,3,MUS$2010/PJ,2045
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,7.54690000000,R1,3,MUS$2010/PJ,2045
+CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
+electricity,all-week,late-peak,all-year,18.26600000000,R1,4,MUS$2010/PJ,2045
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,7.54690000000,R1,4,MUS$2010/PJ,2045
+CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
+electricity,all-week,evening,all-year,18.26600000000,R1,5,MUS$2010/PJ,2045
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,7.54690000000,R1,5,MUS$2010/PJ,2045
+CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
+electricity,all-week,night,all-year,20.18470000000,R1,0,MUS$2010/PJ,2050
+gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,8.31440000000,R1,0,MUS$2010/PJ,2050
+CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
+electricity,all-week,morning,all-year,20.18470000000,R1,1,MUS$2010/PJ,2050
+gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,8.31440000000,R1,1,MUS$2010/PJ,2050
+CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
+electricity,all-week,afternoon,all-year,20.18470000000,R1,2,MUS$2010/PJ,2050
+gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,8.31440000000,R1,2,MUS$2010/PJ,2050
+CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
+electricity,all-week,early-peak,all-year,20.18470000000,R1,3,MUS$2010/PJ,2050
+gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,8.31440000000,R1,3,MUS$2010/PJ,2050
+CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
+electricity,all-week,late-peak,all-year,20.18470000000,R1,4,MUS$2010/PJ,2050
+gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,8.31440000000,R1,4,MUS$2010/PJ,2050
+CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
+electricity,all-week,evening,all-year,20.18470000000,R1,5,MUS$2010/PJ,2050
+gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,8.31440000000,R1,5,MUS$2010/PJ,2050
+CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity/2020.csv
index a8ff7994..a35c2ed5 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -1,11 +1,11 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2020,0,R1,gassupply1,2010,3000.00000000000
-R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 0389a29d..9777d794 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 52525599..023078ee 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 10517be7..c232f077 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -1,7 +1,7 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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/MCAPrices.csv b/tests/example_outputs/trade/MCAPrices.csv
index 91988fe1..821f77ce 100644
--- a/tests/example_outputs/trade/MCAPrices.csv
+++ b/tests/example_outputs/trade/MCAPrices.csv
@@ -25,109 +25,109 @@ gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020
 electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2025
 electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2025
-gas,all-week,night,all-year,2.97240000000,R1,0,MUS$2010/PJ,2025
-gas,all-week,night,all-year,3.06120000000,R2,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,0.85600000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,1.22730000000,R2,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,5.82810000000,R1,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,5.92540000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,6.50530000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,7.85960000000,R2,0,MUS$2010/PJ,2025
 electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2025
 electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2025
-gas,all-week,morning,all-year,3.14160000000,R1,1,MUS$2010/PJ,2025
-gas,all-week,morning,all-year,3.11100000000,R2,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,1.21010000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,1.35000000000,R2,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,5.82810000000,R1,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,5.92540000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,6.50530000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,7.85960000000,R2,1,MUS$2010/PJ,2025
 electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2025
 electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2025
-gas,all-week,afternoon,all-year,2.99700000000,R1,2,MUS$2010/PJ,2025
-gas,all-week,afternoon,all-year,3.01140000000,R2,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,0.90760000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,1.10450000000,R2,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,5.82810000000,R1,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,5.92540000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,6.50530000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,7.85960000000,R2,2,MUS$2010/PJ,2025
 electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2025
 electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2025
-gas,all-week,early-peak,all-year,2.99700000000,R1,3,MUS$2010/PJ,2025
-gas,all-week,early-peak,all-year,3.01140000000,R2,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,0.90760000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,1.10450000000,R2,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,5.82810000000,R1,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,5.92540000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,6.50530000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,7.85960000000,R2,3,MUS$2010/PJ,2025
 electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2025
 electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2025
-gas,all-week,late-peak,all-year,3.18980000000,R1,4,MUS$2010/PJ,2025
-gas,all-week,late-peak,all-year,3.13590000000,R2,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,1.31090000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,1.41140000000,R2,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,5.82810000000,R1,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,5.92540000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,6.50530000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,7.85960000000,R2,4,MUS$2010/PJ,2025
 electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2025
 electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2025
-gas,all-week,evening,all-year,2.99590000000,R1,5,MUS$2010/PJ,2025
-gas,all-week,evening,all-year,3.01140000000,R2,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,0.90520000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,1.10450000000,R2,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,5.82810000000,R1,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,5.92540000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,6.50530000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,7.85960000000,R2,5,MUS$2010/PJ,2025
 electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2030
 electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2030
-gas,all-week,night,all-year,1.74410000000,R1,0,MUS$2010/PJ,2030
-gas,all-week,night,all-year,1.85500000000,R2,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,0.50430000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,0.74290000000,R2,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,6.52970000000,R1,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,6.72430000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,7.32100000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,8.97430000000,R2,0,MUS$2010/PJ,2030
 electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2030
 electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2030
-gas,all-week,morning,all-year,1.95220000000,R1,1,MUS$2010/PJ,2030
-gas,all-week,morning,all-year,1.91690000000,R2,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,0.75200000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,0.83010000000,R2,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,6.52970000000,R1,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,6.72430000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,7.32100000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,8.97430000000,R2,1,MUS$2010/PJ,2030
 electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2030
 electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2030
-gas,all-week,afternoon,all-year,1.77380000000,R1,2,MUS$2010/PJ,2030
-gas,all-week,afternoon,all-year,1.79390000000,R2,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,0.53900000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,0.65810000000,R2,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,6.52970000000,R1,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,6.72430000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,7.32100000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,8.97430000000,R2,2,MUS$2010/PJ,2030
 electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2030
 electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2030
-gas,all-week,early-peak,all-year,1.77380000000,R1,3,MUS$2010/PJ,2030
-gas,all-week,early-peak,all-year,1.79390000000,R2,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,0.53900000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,0.65810000000,R2,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,6.52970000000,R1,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,6.72430000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,7.32100000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,8.97430000000,R2,3,MUS$2010/PJ,2030
 electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2030
 electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2030
-gas,all-week,late-peak,all-year,2.01320000000,R1,4,MUS$2010/PJ,2030
-gas,all-week,late-peak,all-year,1.94820000000,R2,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,0.82670000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,0.87450000000,R2,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,6.52970000000,R1,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,6.72430000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,7.32100000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,8.97430000000,R2,4,MUS$2010/PJ,2030
 electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2030
 electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2030
-gas,all-week,evening,all-year,1.77240000000,R1,5,MUS$2010/PJ,2030
-gas,all-week,evening,all-year,1.79390000000,R2,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,0.53740000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,0.65810000000,R2,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,6.52970000000,R1,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,6.72430000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,7.32100000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,8.97430000000,R2,5,MUS$2010/PJ,2030
 electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2035
 electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2035
-gas,all-week,night,all-year,1.04370000000,R1,0,MUS$2010/PJ,2035
-gas,all-week,night,all-year,1.15050000000,R2,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,0.30380000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,0.46000000000,R2,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,7.23120000000,R1,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,7.52310000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,8.13670000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,10.08890000000,R2,0,MUS$2010/PJ,2035
 electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2035
 electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2035
-gas,all-week,morning,all-year,1.23940000000,R1,1,MUS$2010/PJ,2035
-gas,all-week,morning,all-year,1.20950000000,R2,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,0.47750000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,0.52200000000,R2,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,7.23120000000,R1,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,7.52310000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,8.13670000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,10.08890000000,R2,1,MUS$2010/PJ,2035
 electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2035
 electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2035
-gas,all-week,afternoon,all-year,1.07110000000,R1,2,MUS$2010/PJ,2035
-gas,all-week,afternoon,all-year,1.09300000000,R2,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,0.32730000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,0.40110000000,R2,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,7.23120000000,R1,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,7.52310000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,8.13670000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,10.08890000000,R2,2,MUS$2010/PJ,2035
 electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2035
 electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2035
-gas,all-week,early-peak,all-year,1.07110000000,R1,3,MUS$2010/PJ,2035
-gas,all-week,early-peak,all-year,1.09300000000,R2,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,0.32730000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,0.40110000000,R2,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,7.23120000000,R1,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,7.52310000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,8.13670000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,10.08890000000,R2,3,MUS$2010/PJ,2035
 electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2035
 electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2035
-gas,all-week,late-peak,all-year,1.29850000000,R1,4,MUS$2010/PJ,2035
-gas,all-week,late-peak,all-year,1.23960000000,R2,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,0.53260000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,0.55420000000,R2,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,7.23120000000,R1,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,7.52310000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,8.13670000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,10.08890000000,R2,4,MUS$2010/PJ,2035
 electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2035
 electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2035
-gas,all-week,evening,all-year,1.06990000000,R1,5,MUS$2010/PJ,2035
-gas,all-week,evening,all-year,1.09300000000,R2,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,0.32620000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,0.40110000000,R2,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,7.23120000000,R1,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,7.52310000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,8.13670000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,10.08890000000,R2,5,MUS$2010/PJ,2035
diff --git a/tests/example_outputs/trade/Power/Capacity/2020.csv b/tests/example_outputs/trade/Power/Capacity/2020.csv
index 29c0c8bd..66b1b173 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -1,15 +1,15 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2020,0,R1,gasCCGT,2010,240.00000000000
-R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 16c86de5..2e29060b 100644
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -1,13 +1,13 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 3325b247..bb6eddda 100644
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -1,11 +1,11 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 4d46864b..768699fc 100644
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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

From dcb9903ed093dbc068e6741eaee0cfb9a7f9eaa7 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Mon, 22 Jul 2024 15:49:55 +0100
Subject: [PATCH 405/419] Specifying the minimum version requirements within
 pyproject.toml for the main packages that do the numerical lifting in MUSE.

---
 pyproject.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b2edc923..24e03829 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
     "numpy<2.0",
-    "scipy",
-    "pandas",
-    "xarray",
+    "scipy>=1.13",
+    "pandas>=2.2",
+    "xarray>=2024.6",
     "bottleneck",
     "coloredlogs",
     "toml",

From 9b727070824c1154eb9457bbb18e1c803078b27c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 16:21:16 +0100
Subject: [PATCH 406/419] Fix issue with numpy clip, and pin to >2

---
 pyproject.toml  |  3 +--
 src/muse/mca.py | 21 +++++++--------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b2edc923..b6bf059c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
 ]
 dependencies = [
-    "numpy<2.0",
+    "numpy>=2.0",
     "scipy",
     "pandas",
     "xarray",
@@ -47,7 +47,6 @@ dev = [
     "nbconvert",
     "nbformat",
     "mypy",
-    "numpy>=1.17",
     "pytest-xdist",
     "bump2version",
     "pyinstaller",
diff --git a/src/muse/mca.py b/src/muse/mca.py
index 6ecea14d..61202f4c 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -372,7 +372,7 @@ def calibrate_legacy_sectors(self):
         from copy import deepcopy
         from logging import getLogger
 
-        from numpy import clip, where
+        from numpy import where
 
         hist_years = []
         if len([s for s in self.sectors if "LegacySector" in str(type(s))]) == 0:
@@ -405,12 +405,9 @@ def calibrate_legacy_sectors(self):
 
                 dims = {i: sector_market[i] for i in sector_market.consumption.dims}
 
-                sector_market.consumption.loc[dims] = clip(
-                    sector_market.consumption.loc[dims]
-                    - sector_market.supply.loc[dims],
-                    0.0,
-                    None,
-                )
+                sector_market.consumption.loc[dims] = (
+                    sector_market.consumption.loc[dims] - sector_market.supply.loc[dims]
+                ).clip(min=0.0, max=None)
                 new_market.consumption.loc[dims] += sector_market.consumption
 
                 dims = {i: sector_market[i] for i in sector_market.supply.dims}
@@ -450,8 +447,6 @@ def single_year_iteration(
     """
     from copy import deepcopy
 
-    from numpy import clip
-
     from muse.commodities import is_enduse
 
     sectors = deepcopy(sectors)
@@ -469,11 +464,9 @@ def single_year_iteration(
 
         dims = {i: sector_market[i] for i in sector_market.consumption.dims}
 
-        sector_market.consumption.loc[dims] = clip(
-            sector_market.consumption.loc[dims] - sector_market.supply.loc[dims],
-            0.0,
-            None,
-        )
+        sector_market.consumption.loc[dims] = (
+            sector_market.consumption.loc[dims] - sector_market.supply.loc[dims]
+        ).clip(min=0.0, max=None)
 
         market.consumption.loc[dims] += sector_market.consumption
 

From 520221f1c9748676ea048d1ee819cd0b7733f43e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 16:51:21 +0100
Subject: [PATCH 407/419] Change index = False to default

---
 docs/advanced-guide/extending-muse.ipynb      |   1 -
 docs/inputs/toml.rst                          |   1 -
 .../Results/MCAMetric_Consumption.csv         | 602 ++++++------
 .../Results/MCAMetric_Supply.csv              | 890 +++++++++---------
 .../0-new-decision-metric/settings.toml       |   2 -
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../1-introduction/settings.toml              |   5 -
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../2-scenario/settings.toml                  |   5 -
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../1-single-objective/settings.toml          |   5 -
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../2-multiple-objective/settings.toml        |   5 -
 .../Results/Residential/Supply/2020.csv       | 242 ++---
 .../Results/Residential/Supply/2025.csv       | 242 ++---
 .../Results/Residential/Supply/2030.csv       | 194 ++--
 .../Results/Residential/Supply/2035.csv       | 194 ++--
 .../Results/Residential/Supply/2040.csv       | 194 ++--
 .../Results/Residential/Supply/2045.csv       | 194 ++--
 .../Results/Residential/Supply/2050.csv       | 194 ++--
 .../3-add-region/1-new-region/settings.toml   |   5 -
 .../Results/Residential/Supply/2020.csv       | 322 +++----
 .../Results/Residential/Supply/2025.csv       | 322 +++----
 .../Results/Residential/Supply/2030.csv       | 258 ++---
 .../Results/Residential/Supply/2035.csv       | 258 ++---
 .../Results/Residential/Supply/2040.csv       | 258 ++---
 .../Results/Residential/Supply/2045.csv       | 258 ++---
 .../Results/Residential/Supply/2050.csv       | 258 ++---
 .../1-modify-timeslices/settings.toml         |   5 -
 .../Results/Residential/Supply/2020.csv       | 322 +++----
 .../Results/Residential/Supply/2022.csv       | 450 ++++-----
 .../Results/Residential/Supply/2024.csv       | 578 ++++++------
 .../Results/Residential/Supply/2026.csv       | 706 +++++++-------
 .../Results/Residential/Supply/2028.csv       | 706 +++++++-------
 .../Results/Residential/Supply/2030.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2032.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2034.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2036.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2038.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2040.csv       | 642 ++++++-------
 .../2-modify-time-framework/settings.toml     |   5 -
 .../Results/Residential/Supply/2020.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2025.csv       | 642 ++++++-------
 .../Results/Residential/Supply/2030.csv       | 514 +++++-----
 .../Results/Residential/Supply/2035.csv       | 514 +++++-----
 .../Results/Residential/Supply/2040.csv       | 514 +++++-----
 .../Results/Residential/Supply/2045.csv       | 514 +++++-----
 .../Results/Residential/Supply/2050.csv       | 514 +++++-----
 .../1-exogenous-demand/settings.toml          |   5 -
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../1-correlation/settings.toml               |   5 -
 .../Results/Power/Supply/2020.csv             |  58 +-
 .../Results/Power/Supply/2025.csv             |  58 +-
 .../Results/Power/Supply/2030.csv             |  62 +-
 .../Results/Power/Supply/2035.csv             |  86 +-
 .../Results/Power/Supply/2040.csv             | 110 +--
 .../Results/Power/Supply/2045.csv             | 122 +--
 .../Results/Power/Supply/2050.csv             | 122 +--
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../1-min-constraint/settings.toml            |   7 -
 .../Results/Power/Supply/2020.csv             |  50 +-
 .../Results/Power/Supply/2025.csv             |  38 +-
 .../Results/Power/Supply/2030.csv             |  38 +-
 .../Results/Power/Supply/2035.csv             |  62 +-
 .../Results/Power/Supply/2040.csv             |  86 +-
 .../Results/Power/Supply/2045.csv             | 110 +--
 .../Results/Power/Supply/2050.csv             | 122 +--
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../2-max-constraint/settings.toml            |   7 -
 src/muse/data/example/default/settings.toml   |   5 -
 .../data/example/default_retro/settings.toml  |   5 -
 .../example/default_timeslice/settings.toml   |   7 -
 .../example/minimum_service/settings.toml     |   2 -
 src/muse/data/example/trade/settings.toml     |   5 -
 src/muse/outputs/sinks.py                     |   4 +
 .../default/Residential/Supply/2020.csv       |  62 +-
 .../default/Residential/Supply/2025.csv       |  62 +-
 .../default/Residential/Supply/2030.csv       |  50 +-
 .../default/Residential/Supply/2035.csv       |  50 +-
 .../default/Residential/Supply/2040.csv       |  50 +-
 .../default/Residential/Supply/2045.csv       |  50 +-
 .../default/Residential/Supply/2050.csv       |  50 +-
 .../default_retro/Residential/Supply/2020.csv |  62 +-
 .../default_retro/Residential/Supply/2025.csv |  86 +-
 .../default_retro/Residential/Supply/2030.csv |  98 +-
 .../default_retro/Residential/Supply/2035.csv |  98 +-
 .../default_retro/Residential/Supply/2040.csv |  98 +-
 .../default_retro/Residential/Supply/2045.csv |  74 +-
 .../default_retro/Residential/Supply/2050.csv |  50 +-
 .../default_timeslice/Power/Supply/2020.csv   |  18 +-
 .../default_timeslice/Power/Supply/2025.csv   |  42 +-
 .../default_timeslice/Power/Supply/2030.csv   |  62 +-
 .../default_timeslice/Power/Supply/2035.csv   |  86 +-
 .../default_timeslice/Power/Supply/2040.csv   | 110 +--
 .../default_timeslice/Power/Supply/2045.csv   | 122 +--
 .../default_timeslice/Power/Supply/2050.csv   | 122 +--
 .../Residential/Supply/2020.csv               |  62 +-
 .../Residential/Supply/2025.csv               |  62 +-
 .../Residential/Supply/2030.csv               |  50 +-
 .../Residential/Supply/2035.csv               |  50 +-
 .../Residential/Supply/2040.csv               |  50 +-
 .../Residential/Supply/2045.csv               |  50 +-
 .../Residential/Supply/2050.csv               |  50 +-
 .../medium/Residential/Supply/2020.csv        |  86 +-
 .../medium/Residential/Supply/2025.csv        | 122 +--
 .../medium/Residential/Supply/2030.csv        | 146 +--
 .../medium/Residential/Supply/2035.csv        | 122 +--
 .../medium/Residential/Supply/2040.csv        |  98 +-
 .../medium/Residential/Supply/2045.csv        |  98 +-
 .../medium/Residential/Supply/2050.csv        |  98 +-
 .../minimum_service/Industry/Supply/2010.csv  |  50 +-
 .../minimum_service/Industry/Supply/2015.csv  |  62 +-
 .../minimum_service/Industry/Supply/2020.csv  |  86 +-
 .../minimum_service/Industry/Supply/2025.csv  | 110 +--
 .../minimum_service/Industry/Supply/2030.csv  | 134 +--
 .../minimum_service/Industry/Supply/2035.csv  | 122 +--
 .../minimum_service/Industry/Supply/2040.csv  |  98 +-
 .../minimum_service/Industry/Supply/2045.csv  |  98 +-
 .../minimum_service/Industry/Supply/2050.csv  |  98 +-
 .../minimum_service/MCAMetric_Supply.csv      | 410 ++++----
 .../Residential/Supply/2020.csv               |  62 +-
 .../Residential/Supply/2025.csv               |  62 +-
 .../Residential/Supply/2030.csv               |  50 +-
 .../Residential/Supply/2035.csv               |  50 +-
 .../Residential/Supply/2040.csv               |  50 +-
 .../Residential/Supply/2045.csv               |  50 +-
 .../Residential/Supply/2050.csv               |  50 +-
 .../trade/Gas/Capacity/2020.csv               |   8 +-
 .../trade/Gas/Capacity/2025.csv               |   6 +-
 .../trade/Gas/Capacity/2030.csv               |   6 +-
 .../trade/Gas/Capacity/2035.csv               |   4 +-
 .../trade/Power/Capacity/2020.csv             |  12 +-
 .../trade/Power/Capacity/2025.csv             |  10 +-
 .../trade/Power/Capacity/2030.csv             |   8 +-
 .../trade/Power/Capacity/2035.csv             |   6 +-
 177 files changed, 11723 insertions(+), 11806 deletions(-)

diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb
index 89f2545e..2b1f96d9 100644
--- a/docs/advanced-guide/extending-muse.ipynb
+++ b/docs/advanced-guide/extending-muse.ipynb
@@ -340,7 +340,6 @@
     "quantity = \"capacity\"\n",
     "sink = \"aggregate\"\n",
     "filename = \"{cwd}/{default_output_dir}/Cache{Quantity}.csv\"\n",
-    "index = false\n",
     "```"
    ]
   },
diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index 1bcdaaeb..e018f830 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -270,7 +270,6 @@ See section on `Timeslices_`.
       quantity = "production"
       sink = "aggregate"
       filename = "{cwd}/{default_output_dir}/Cache{Quantity}.csv"
-      index = false
 
 ----------------
 Standard sectors
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 09d858bd..bdfe6e0e 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,301 +1,301 @@
-,agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
-1,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
-2,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
-3,A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
-4,A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
-5,A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
-1,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
-2,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
-3,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
-4,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
-5,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
-6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
-7,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
-8,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
-9,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
-10,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
-11,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
-2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-3,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-4,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
-5,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
-8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-9,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-10,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
-11,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-12,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.51454054054,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-13,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68468468468,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
-14,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27387387387,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-15,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.34302702703,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45645645646,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
-17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18258258258,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
-0,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-1,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-2,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-3,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-4,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-5,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-6,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-7,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-8,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-9,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-10,A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-11,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
-1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
-4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-5,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
-6,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-7,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-8,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
-9,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-10,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
-11,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-12,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-13,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
-14,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-15,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
-16,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-17,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-18,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
-19,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-20,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
-21,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-22,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-23,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
-24,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-25,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
-26,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-27,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-28,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
-29,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-0,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-1,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-2,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-3,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-4,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-5,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-6,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-7,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-8,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-9,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-10,A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-11,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
-1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
-4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-5,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-6,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
-7,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-8,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-9,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
-10,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-11,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-12,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
-13,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-14,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-15,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
-16,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-17,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-18,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
-19,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-20,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-21,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
-22,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-23,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-24,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
-25,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-26,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-27,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
-28,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-29,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-30,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
-31,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-32,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-33,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
-34,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-35,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-0,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-1,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-2,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-3,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-4,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-5,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-6,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-7,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-8,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-9,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-10,A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-11,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
-1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
-4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-5,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-6,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-7,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
-8,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-9,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-10,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
-11,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-12,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-13,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-14,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
-15,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-16,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-17,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
-18,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-19,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-20,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-21,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
-22,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-23,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-24,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
-25,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-26,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-27,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-28,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
-29,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68292682927,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-30,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27317073171,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-31,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.76982926829,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
-32,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.47804878049,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-33,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40975609756,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-34,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-35,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17107317073,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
-36,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45528455285,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-37,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18211382114,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-38,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.51321951220,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
-39,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31869918699,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-40,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-41,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-0,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-1,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-2,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-3,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-4,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-5,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-6,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-7,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-8,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-9,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-10,A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-11,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
-1,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-2,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-3,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
-4,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-5,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-6,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-7,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-8,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
-9,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-10,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-11,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
-12,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-13,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-14,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-15,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-16,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
-17,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-18,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-19,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
-20,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-21,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-22,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-23,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-24,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
-25,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-26,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-27,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
-28,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-29,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-30,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-31,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-32,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
-33,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-34,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-35,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
-36,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-37,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-38,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-39,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-40,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
-41,A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-42,A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-43,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
-44,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-45,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-46,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-47,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-0,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-1,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-2,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-3,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-4,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-5,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-6,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-7,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-8,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-9,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-10,A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-11,A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-0,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-1,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-2,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-3,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-4,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-5,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-6,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-7,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-8,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-9,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-10,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-11,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-12,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-13,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-14,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-15,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-16,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-17,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-18,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-19,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-20,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-21,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-22,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-23,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-24,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-25,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-26,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-27,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-28,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-29,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-30,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-31,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-32,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-33,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.78040384615,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-34,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-35,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.41538461538,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-36,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-37,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-38,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.69230769231,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-39,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.55384615385,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-40,A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17342307692,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-41,A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.52026923077,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-42,A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-43,A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-44,A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-45,A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-46,A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.46153846154,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-47,A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.36923076923,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
+agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,3.48000000000,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,2.32000000000,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.51454054054,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68468468468,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27387387387,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.34302702703,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45645645646,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18258258258,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.31034482759,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.68965517241,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15934959350,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13658536585,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23902439024,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20487804878,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.68292682927,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.27317073171,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.76982926829,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.47804878049,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40975609756,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17107317073,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45528455285,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18211382114,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.51321951220,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31869918699,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13333333333,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20000000000,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.40000000000,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
+A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
+A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
+A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.13846153846,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
+A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.20769230769,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
+A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.78040384615,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.41538461538,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.48461538462,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.69230769231,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
+A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.55384615385,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
+A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17342307692,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.52026923077,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
+A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.46153846154,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
+A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.36923076923,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
index 87653e04..5e70b8b8 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,445 +1,445 @@
-,agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-0,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
-1,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
-2,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
-3,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
-4,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
-5,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
-6,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
-7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
-8,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
-9,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
-10,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
-11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
-0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
-1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
-2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
-3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
-4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
-5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
-0,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
-1,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
-2,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
-3,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
-4,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
-5,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
-6,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
-7,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
-8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
-9,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
-10,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
-11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
-12,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
-13,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
-14,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
-15,A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
-16,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
-17,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.10270270270,gasCCGT,0,MUS$2010/PJ,2025
-1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22822822823,solarPV,0,MUS$2010/PJ,2025
-2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09129129129,windturbine,0,MUS$2010/PJ,2025
-3,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,9.41475675676,gasCCGT,0,MUS$2010/kt,2025
-4,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.15405405405,gasCCGT,1,MUS$2010/PJ,2025
-5,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34234234234,solarPV,1,MUS$2010/PJ,2025
-6,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13693693694,windturbine,1,MUS$2010/PJ,2025
-7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,14.12213513514,gasCCGT,1,MUS$2010/kt,2025
-8,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.10270270270,gasCCGT,2,MUS$2010/PJ,2025
-9,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22822822823,solarPV,2,MUS$2010/PJ,2025
-10,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09129129129,windturbine,2,MUS$2010/PJ,2025
-11,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,9.41475675676,gasCCGT,2,MUS$2010/kt,2025
-12,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.15405405405,gasCCGT,3,MUS$2010/PJ,2025
-13,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34234234234,solarPV,3,MUS$2010/PJ,2025
-14,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13693693694,windturbine,3,MUS$2010/PJ,2025
-15,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,14.12213513514,gasCCGT,3,MUS$2010/kt,2025
-16,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30810810811,gasCCGT,4,MUS$2010/PJ,2025
-17,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68468468468,solarPV,4,MUS$2010/PJ,2025
-18,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27387387387,windturbine,4,MUS$2010/PJ,2025
-19,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,28.24427027027,gasCCGT,4,MUS$2010/kt,2025
-20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.20540540541,gasCCGT,5,MUS$2010/PJ,2025
-21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45645645646,solarPV,5,MUS$2010/PJ,2025
-22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18258258258,windturbine,5,MUS$2010/PJ,2025
-23,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,18.82951351351,gasCCGT,5,MUS$2010/kt,2025
-0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.49373573574,gassupply1,0,MUS$2010/PJ,2025
-1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.74060360360,gassupply1,1,MUS$2010/PJ,2025
-2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.49373573574,gassupply1,2,MUS$2010/PJ,2025
-3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.74060360360,gassupply1,3,MUS$2010/PJ,2025
-4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.48120720721,gassupply1,4,MUS$2010/PJ,2025
-5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.98747147147,gassupply1,5,MUS$2010/PJ,2025
-0,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
-1,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
-2,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
-3,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
-4,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
-5,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
-6,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
-7,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
-8,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030
-9,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
-10,A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
-11,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2030
-1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2030
-2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2030
-3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2030
-4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2030
-5,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2030
-6,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2030
-7,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2030
-8,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2030
-9,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2030
-10,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2030
-11,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2030
-12,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2030
-13,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2030
-14,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2030
-15,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2030
-16,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2030
-17,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2030
-18,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2030
-19,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2030
-20,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2030
-21,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2030
-22,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2030
-23,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2030
-24,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2030
-25,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2030
-26,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2030
-27,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2030
-28,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2030
-29,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030
-30,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2030
-31,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030
-32,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2030
-33,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2030
-34,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030
-35,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2030
-36,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2030
-37,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2030
-38,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2030
-39,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2030
-40,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2030
-41,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2030
-0,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2030
-1,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2030
-2,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2030
-3,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2030
-4,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2030
-5,A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2030
-0,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
-1,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
-2,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
-3,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
-4,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
-5,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
-6,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
-7,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
-8,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
-9,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
-10,A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
-11,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2035
-1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035
-2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2035
-3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035
-4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2035
-5,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2035
-6,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2035
-7,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035
-8,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2035
-9,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035
-10,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2035
-11,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035
-12,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2035
-13,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2035
-14,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2035
-15,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035
-16,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2035
-17,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035
-18,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2035
-19,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035
-20,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2035
-21,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2035
-22,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2035
-23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035
-24,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2035
-25,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035
-26,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2035
-27,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035
-28,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2035
-29,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2035
-30,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2035
-31,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035
-32,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2035
-33,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035
-34,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2035
-35,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035
-36,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2035
-37,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2035
-38,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2035
-39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035
-40,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2035
-41,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035
-42,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2035
-43,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035
-44,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2035
-45,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2035
-46,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2035
-47,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2035
-1,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2035
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2035
-3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2035
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2035
-5,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2035
-0,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
-1,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
-2,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
-3,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
-4,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
-5,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
-6,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
-7,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
-8,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
-9,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
-10,A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
-11,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05121951220,gasCCGT,0,MUS$2010/PJ,2040
-1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22764227642,solarPV,0,MUS$2010/PJ,2040
-2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09105691057,windturbine,0,MUS$2010/PJ,2040
-3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15365853659,gasCCGT,0,MUS$2010/PJ,2040
-4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15934959350,solarPV,0,MUS$2010/PJ,2040
-5,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13658536585,solarPV,0,MUS$2010/PJ,2040
-6,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040
-7,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.69529268293,gasCCGT,0,MUS$2010/kt,2040
-8,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.08587804878,gasCCGT,0,MUS$2010/kt,2040
-9,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07682926829,gasCCGT,1,MUS$2010/PJ,2040
-10,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34146341463,solarPV,1,MUS$2010/PJ,2040
-11,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13658536585,windturbine,1,MUS$2010/PJ,2040
-12,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23048780488,gasCCGT,1,MUS$2010/PJ,2040
-13,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23902439024,solarPV,1,MUS$2010/PJ,2040
-14,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20487804878,solarPV,1,MUS$2010/PJ,2040
-15,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040
-16,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.04293902439,gasCCGT,1,MUS$2010/kt,2040
-17,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.12881707317,gasCCGT,1,MUS$2010/kt,2040
-18,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05121951220,gasCCGT,2,MUS$2010/PJ,2040
-19,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22764227642,solarPV,2,MUS$2010/PJ,2040
-20,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09105691057,windturbine,2,MUS$2010/PJ,2040
-21,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15365853659,gasCCGT,2,MUS$2010/PJ,2040
-22,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15934959350,solarPV,2,MUS$2010/PJ,2040
-23,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13658536585,solarPV,2,MUS$2010/PJ,2040
-24,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040
-25,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.69529268293,gasCCGT,2,MUS$2010/kt,2040
-26,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.08587804878,gasCCGT,2,MUS$2010/kt,2040
-27,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07682926829,gasCCGT,3,MUS$2010/PJ,2040
-28,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34146341463,solarPV,3,MUS$2010/PJ,2040
-29,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13658536585,windturbine,3,MUS$2010/PJ,2040
-30,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23048780488,gasCCGT,3,MUS$2010/PJ,2040
-31,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23902439024,solarPV,3,MUS$2010/PJ,2040
-32,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20487804878,solarPV,3,MUS$2010/PJ,2040
-33,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040
-34,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.04293902439,gasCCGT,3,MUS$2010/kt,2040
-35,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.12881707317,gasCCGT,3,MUS$2010/kt,2040
-36,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15365853659,gasCCGT,4,MUS$2010/PJ,2040
-37,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68292682927,solarPV,4,MUS$2010/PJ,2040
-38,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27317073171,windturbine,4,MUS$2010/PJ,2040
-39,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46097560976,gasCCGT,4,MUS$2010/PJ,2040
-40,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.47804878049,solarPV,4,MUS$2010/PJ,2040
-41,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40975609756,solarPV,4,MUS$2010/PJ,2040
-42,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34146341463,solarPV,4,MUS$2010/PJ,2040
-43,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.08587804878,gasCCGT,4,MUS$2010/kt,2040
-44,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.25763414634,gasCCGT,4,MUS$2010/kt,2040
-45,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10243902439,gasCCGT,5,MUS$2010/PJ,2040
-46,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45528455285,solarPV,5,MUS$2010/PJ,2040
-47,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18211382114,windturbine,5,MUS$2010/PJ,2040
-48,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30731707317,gasCCGT,5,MUS$2010/PJ,2040
-49,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31869918699,solarPV,5,MUS$2010/PJ,2040
-50,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27317073171,solarPV,5,MUS$2010/PJ,2040
-51,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040
-52,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.39058536585,gasCCGT,5,MUS$2010/kt,2040
-53,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.17175609756,gasCCGT,5,MUS$2010/kt,2040
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2040
-1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2040
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2040
-3,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2040
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2040
-5,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2040
-6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2040
-7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2040
-8,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2040
-9,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2040
-10,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2040
-11,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2040
-0,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
-1,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
-2,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
-3,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
-4,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
-5,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
-6,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
-7,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
-8,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
-9,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
-10,A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
-11,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2045
-1,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045
-2,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2045
-3,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045
-4,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
-5,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
-6,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045
-7,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
-8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2045
-9,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045
-10,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2045
-11,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045
-12,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2045
-13,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045
-14,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
-15,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
-16,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045
-17,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
-18,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2045
-19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045
-20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2045
-21,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045
-22,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2045
-23,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045
-24,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
-25,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
-26,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045
-27,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
-28,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2045
-29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045
-30,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2045
-31,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045
-32,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2045
-33,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045
-34,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
-35,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
-36,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045
-37,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
-38,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2045
-39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045
-40,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2045
-41,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045
-42,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2045
-43,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045
-44,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
-45,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
-46,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045
-47,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
-48,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2045
-49,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045
-50,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2045
-51,A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045
-52,A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2045
-53,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045
-54,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
-55,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
-56,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045
-57,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
-58,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2045
-59,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.32604761905,gassupply1,0,MUS$2010/PJ,2045
-1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00795238095,gassupply1,0,MUS$2010/PJ,2045
-2,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.48907142857,gassupply1,1,MUS$2010/PJ,2045
-3,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01192857143,gassupply1,1,MUS$2010/PJ,2045
-4,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.32604761905,gassupply1,2,MUS$2010/PJ,2045
-5,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00795238095,gassupply1,2,MUS$2010/PJ,2045
-6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.48907142857,gassupply1,3,MUS$2010/PJ,2045
-7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01192857143,gassupply1,3,MUS$2010/PJ,2045
-8,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.97814285714,gassupply1,4,MUS$2010/PJ,2045
-9,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02385714286,gassupply1,4,MUS$2010/PJ,2045
-10,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.65209523810,gassupply1,5,MUS$2010/PJ,2045
-11,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01590476190,gassupply1,5,MUS$2010/PJ,2045
-0,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
-1,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
-2,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
-3,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
-4,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
-5,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
-6,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
-7,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
-8,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
-9,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
-10,A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
-11,A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
-0,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05192307692,gasCCGT,0,MUS$2010/PJ,2050
-1,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15576923077,gasCCGT,0,MUS$2010/PJ,2050
-2,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
-3,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13846153846,solarPV,0,MUS$2010/PJ,2050
-4,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050
-5,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
-6,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.23076923077,solarPV,0,MUS$2010/PJ,2050
-7,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.18461538462,windturbine,0,MUS$2010/PJ,2050
-8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.75978846154,gasCCGT,0,MUS$2010/kt,2050
-9,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.27936538462,gasCCGT,0,MUS$2010/kt,2050
-10,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07788461538,gasCCGT,1,MUS$2010/PJ,2050
-11,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23365384615,gasCCGT,1,MUS$2010/PJ,2050
-12,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
-13,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20769230769,solarPV,1,MUS$2010/PJ,2050
-14,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050
-15,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
-16,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.34615384615,solarPV,1,MUS$2010/PJ,2050
-17,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.27692307692,windturbine,1,MUS$2010/PJ,2050
-18,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.13968269231,gasCCGT,1,MUS$2010/kt,2050
-19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.41904807692,gasCCGT,1,MUS$2010/kt,2050
-20,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05192307692,gasCCGT,2,MUS$2010/PJ,2050
-21,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15576923077,gasCCGT,2,MUS$2010/PJ,2050
-22,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
-23,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13846153846,solarPV,2,MUS$2010/PJ,2050
-24,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050
-25,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
-26,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.23076923077,solarPV,2,MUS$2010/PJ,2050
-27,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.18461538462,windturbine,2,MUS$2010/PJ,2050
-28,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.75978846154,gasCCGT,2,MUS$2010/kt,2050
-29,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.27936538462,gasCCGT,2,MUS$2010/kt,2050
-30,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07788461538,gasCCGT,3,MUS$2010/PJ,2050
-31,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23365384615,gasCCGT,3,MUS$2010/PJ,2050
-32,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
-33,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20769230769,solarPV,3,MUS$2010/PJ,2050
-34,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050
-35,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
-36,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.34615384615,solarPV,3,MUS$2010/PJ,2050
-37,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.27692307692,windturbine,3,MUS$2010/PJ,2050
-38,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.13968269231,gasCCGT,3,MUS$2010/kt,2050
-39,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.41904807692,gasCCGT,3,MUS$2010/kt,2050
-40,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15576923077,gasCCGT,4,MUS$2010/PJ,2050
-41,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46730769231,gasCCGT,4,MUS$2010/PJ,2050
-42,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050
-43,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.41538461538,solarPV,4,MUS$2010/PJ,2050
-44,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34615384615,solarPV,4,MUS$2010/PJ,2050
-45,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050
-46,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.69230769231,solarPV,4,MUS$2010/PJ,2050
-47,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.55384615385,windturbine,4,MUS$2010/PJ,2050
-48,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.27936538462,gasCCGT,4,MUS$2010/kt,2050
-49,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.83809615385,gasCCGT,4,MUS$2010/kt,2050
-50,A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10384615385,gasCCGT,5,MUS$2010/PJ,2050
-51,A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31153846154,gasCCGT,5,MUS$2010/PJ,2050
-52,A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
-53,A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27692307692,solarPV,5,MUS$2010/PJ,2050
-54,A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050
-55,A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
-56,A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.46153846154,solarPV,5,MUS$2010/PJ,2050
-57,A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.36923076923,windturbine,5,MUS$2010/PJ,2050
-58,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.51957692308,gasCCGT,5,MUS$2010/kt,2050
-59,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.55873076923,gasCCGT,5,MUS$2010/kt,2050
-0,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2050
-1,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2050
-2,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2045,all-year,R1,gas,0.00469981238,gassupply1,0,MUS$2010/PJ,2050
-3,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2050
-4,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2050
-5,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2045,all-year,R1,gas,0.00704971857,gassupply1,1,MUS$2010/PJ,2050
-6,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2050
-7,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2050
-8,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2045,all-year,R1,gas,0.00469981238,gassupply1,2,MUS$2010/PJ,2050
-9,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2050
-10,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2050
-11,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2045,all-year,R1,gas,0.00704971857,gassupply1,3,MUS$2010/PJ,2050
-12,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2050
-13,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2050
-14,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2045,all-year,R1,gas,0.01409943715,gassupply1,4,MUS$2010/PJ,2050
-15,A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2050
-16,A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2050
-17,A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2045,all-year,R1,gas,0.00939962477,gassupply1,5,MUS$2010/PJ,2050
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.00000000000,gasboiler,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.10270270270,gasCCGT,0,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22822822823,solarPV,0,MUS$2010/PJ,2025
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09129129129,windturbine,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,9.41475675676,gasCCGT,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.15405405405,gasCCGT,1,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34234234234,solarPV,1,MUS$2010/PJ,2025
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13693693694,windturbine,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,14.12213513514,gasCCGT,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.10270270270,gasCCGT,2,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22822822823,solarPV,2,MUS$2010/PJ,2025
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09129129129,windturbine,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,9.41475675676,gasCCGT,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.15405405405,gasCCGT,3,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34234234234,solarPV,3,MUS$2010/PJ,2025
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13693693694,windturbine,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,14.12213513514,gasCCGT,3,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30810810811,gasCCGT,4,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68468468468,solarPV,4,MUS$2010/PJ,2025
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27387387387,windturbine,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,28.24427027027,gasCCGT,4,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.20540540541,gasCCGT,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45645645646,solarPV,5,MUS$2010/PJ,2025
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18258258258,windturbine,5,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,18.82951351351,gasCCGT,5,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.49373573574,gassupply1,0,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.74060360360,gassupply1,1,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.49373573574,gassupply1,2,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.74060360360,gassupply1,3,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.48120720721,gassupply1,4,MUS$2010/PJ,2025
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.98747147147,gassupply1,5,MUS$2010/PJ,2025
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.27586206897,heatpump,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.72413793103,heatpump,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2030
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2030
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2030
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2030
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2030
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2030
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2030
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2030
+A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2030
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2035
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2035
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2035
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05121951220,gasCCGT,0,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22764227642,solarPV,0,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09105691057,windturbine,0,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15365853659,gasCCGT,0,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15934959350,solarPV,0,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13658536585,solarPV,0,MUS$2010/PJ,2040
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.69529268293,gasCCGT,0,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.08587804878,gasCCGT,0,MUS$2010/kt,2040
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07682926829,gasCCGT,1,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34146341463,solarPV,1,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13658536585,windturbine,1,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23048780488,gasCCGT,1,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23902439024,solarPV,1,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20487804878,solarPV,1,MUS$2010/PJ,2040
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.04293902439,gasCCGT,1,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.12881707317,gasCCGT,1,MUS$2010/kt,2040
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05121951220,gasCCGT,2,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22764227642,solarPV,2,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09105691057,windturbine,2,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15365853659,gasCCGT,2,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15934959350,solarPV,2,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13658536585,solarPV,2,MUS$2010/PJ,2040
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.69529268293,gasCCGT,2,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.08587804878,gasCCGT,2,MUS$2010/kt,2040
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07682926829,gasCCGT,3,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34146341463,solarPV,3,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13658536585,windturbine,3,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23048780488,gasCCGT,3,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23902439024,solarPV,3,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20487804878,solarPV,3,MUS$2010/PJ,2040
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.04293902439,gasCCGT,3,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.12881707317,gasCCGT,3,MUS$2010/kt,2040
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15365853659,gasCCGT,4,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.68292682927,solarPV,4,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.27317073171,windturbine,4,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46097560976,gasCCGT,4,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.47804878049,solarPV,4,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40975609756,solarPV,4,MUS$2010/PJ,2040
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34146341463,solarPV,4,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.08587804878,gasCCGT,4,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.25763414634,gasCCGT,4,MUS$2010/kt,2040
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10243902439,gasCCGT,5,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45528455285,solarPV,5,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18211382114,windturbine,5,MUS$2010/PJ,2040
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30731707317,gasCCGT,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31869918699,solarPV,5,MUS$2010/PJ,2040
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27317073171,solarPV,5,MUS$2010/PJ,2040
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.39058536585,gasCCGT,5,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.17175609756,gasCCGT,5,MUS$2010/kt,2040
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2040
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2040
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2040
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13333333333,solarPV,0,MUS$2010/PJ,2045
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2045
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20000000000,solarPV,1,MUS$2010/PJ,2045
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2045
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13333333333,solarPV,2,MUS$2010/PJ,2045
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2045
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20000000000,solarPV,3,MUS$2010/PJ,2045
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2045
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.40000000000,solarPV,4,MUS$2010/PJ,2045
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2045
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2045
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.26666666667,solarPV,5,MUS$2010/PJ,2045
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2045
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.32604761905,gassupply1,0,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00795238095,gassupply1,0,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.48907142857,gassupply1,1,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01192857143,gassupply1,1,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.32604761905,gassupply1,2,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00795238095,gassupply1,2,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.48907142857,gassupply1,3,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01192857143,gassupply1,3,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,0.97814285714,gassupply1,4,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02385714286,gassupply1,4,MUS$2010/PJ,2045
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.65209523810,gassupply1,5,MUS$2010/PJ,2045
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01590476190,gassupply1,5,MUS$2010/PJ,2045
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05192307692,gasCCGT,0,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15576923077,gasCCGT,0,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.13846153846,solarPV,0,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.23076923077,solarPV,0,MUS$2010/PJ,2050
+A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.18461538462,windturbine,0,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.75978846154,gasCCGT,0,MUS$2010/kt,2050
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.27936538462,gasCCGT,0,MUS$2010/kt,2050
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07788461538,gasCCGT,1,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23365384615,gasCCGT,1,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.20769230769,solarPV,1,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.34615384615,solarPV,1,MUS$2010/PJ,2050
+A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.27692307692,windturbine,1,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.13968269231,gasCCGT,1,MUS$2010/kt,2050
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.41904807692,gasCCGT,1,MUS$2010/kt,2050
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05192307692,gasCCGT,2,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15576923077,gasCCGT,2,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.13846153846,solarPV,2,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.23076923077,solarPV,2,MUS$2010/PJ,2050
+A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.18461538462,windturbine,2,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.75978846154,gasCCGT,2,MUS$2010/kt,2050
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.27936538462,gasCCGT,2,MUS$2010/kt,2050
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07788461538,gasCCGT,3,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23365384615,gasCCGT,3,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.20769230769,solarPV,3,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.34615384615,solarPV,3,MUS$2010/PJ,2050
+A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.27692307692,windturbine,3,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.13968269231,gasCCGT,3,MUS$2010/kt,2050
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.41904807692,gasCCGT,3,MUS$2010/kt,2050
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15576923077,gasCCGT,4,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.46730769231,gasCCGT,4,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.41538461538,solarPV,4,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.34615384615,solarPV,4,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.48461538462,solarPV,4,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.69230769231,solarPV,4,MUS$2010/PJ,2050
+A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.55384615385,windturbine,4,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,14.27936538462,gasCCGT,4,MUS$2010/kt,2050
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,42.83809615385,gasCCGT,4,MUS$2010/kt,2050
+A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10384615385,gasCCGT,5,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31153846154,gasCCGT,5,MUS$2010/PJ,2050
+A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
+A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.27692307692,solarPV,5,MUS$2010/PJ,2050
+A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050
+A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
+A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.46153846154,solarPV,5,MUS$2010/PJ,2050
+A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.36923076923,windturbine,5,MUS$2010/PJ,2050
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.51957692308,gasCCGT,5,MUS$2010/kt,2050
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.55873076923,gasCCGT,5,MUS$2010/kt,2050
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2035,all-year,R1,gas,0.00814634146,gassupply1,0,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2045,all-year,R1,gas,0.00469981238,gassupply1,0,MUS$2010/PJ,2050
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2035,all-year,R1,gas,0.01221951220,gassupply1,1,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2045,all-year,R1,gas,0.00704971857,gassupply1,1,MUS$2010/PJ,2050
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2035,all-year,R1,gas,0.00814634146,gassupply1,2,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2045,all-year,R1,gas,0.00469981238,gassupply1,2,MUS$2010/PJ,2050
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2035,all-year,R1,gas,0.01221951220,gassupply1,3,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2045,all-year,R1,gas,0.00704971857,gassupply1,3,MUS$2010/PJ,2050
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2035,all-year,R1,gas,0.02443902439,gassupply1,4,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2045,all-year,R1,gas,0.01409943715,gassupply1,4,MUS$2010/PJ,2050
+A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2050
+A1,2,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2035,all-year,R1,gas,0.01629268293,gassupply1,5,MUS$2010/PJ,2050
+A1,3,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2045,all-year,R1,gas,0.00939962477,gassupply1,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index 281840bf..3576f13f 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_consumption"
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 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 729d406d..0fcfe541 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,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
index afe86e12..780086c6 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 83daf7f1..4d84e893 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 7bda2463..2e6ddf59 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c535c679..8211320c 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 9abfcded..b621e872 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2050,1.77780000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
index 5ee06b3d..b297589a 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 729d406d..0fcfe541 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,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
index afe86e12..780086c6 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 83daf7f1..4d84e893 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 7bda2463..2e6ddf59 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c535c679..8211320c 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 9abfcded..b621e872 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2050,1.77780000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
index 5ee06b3d..b297589a 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
index 7b8c4061..68e3e122 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
index b07adde6..5fb53d24 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-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.61110000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,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.91670000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,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.61110000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,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.91670000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,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.83330000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,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,1.22220000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
index 33951ce2..0c048387 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-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.61110000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-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.91670000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-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.61110000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-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.91670000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-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.83330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-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,1.22220000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
index c606a299..3c78922e 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-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.94440000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-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.41670000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-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.94440000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-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.41670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-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.83330000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-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.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
index d66038bc..103b89e5 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-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.94440000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-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.41670000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-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.94440000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-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.41670000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-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.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-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.88890000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
index 2f0389d3..d7563a22 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
index 3b6658d8..711521d3 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2050,1.72220000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
index 5ee06b3d..b297589a 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index 7b8c4061..68e3e122 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index b07adde6..5fb53d24 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-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.61110000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,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.91670000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,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.61110000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,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.91670000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,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.83330000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,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,1.22220000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index 33951ce2..0c048387 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-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.61110000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-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.91670000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-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.61110000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-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.91670000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-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.83330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-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,1.22220000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index c606a299..3c78922e 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-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.94440000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-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.41670000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-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.94440000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-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.41670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-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.83330000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-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.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index d66038bc..103b89e5 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-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.94440000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-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.41670000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-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.94440000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-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.41670000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-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.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-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.88890000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index 2f0389d3..d7563a22 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 3b6658d8..711521d3 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2050,1.72220000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
index 5ee06b3d..b297589a 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 597d50b7..8880de8c 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,month,day,hour,technology,installed,supply
-0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.50000000000
-0,heat,R1,2020,2,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,heatpump,2020,0.52780000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
-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,2,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,heatpump,2020,0.52780000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
-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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,0.79170000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
-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,2,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,heatpump,2020,0.79170000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
-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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,0.52780000000
-2,heat,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-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,2,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,heatpump,2020,0.52780000000
-2,heat,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,0.79170000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-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,2,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,heatpump,2020,0.79170000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,1.58330000000
-4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-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,2,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,heatpump,2020,1.58330000000
-4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,1.05560000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
-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,2,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,heatpump,2020,1.05560000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
-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,2,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,2,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,2,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,2,all-year,all-week,evening,gasboiler,2020,17.97500000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.50000000000
+all-year,all-week,night,gasboiler,2020,0.50000000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,gasboiler,2020,0.50000000000
+all-year,all-week,night,gasboiler,2020,0.50000000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,gasboiler,2020,32.35500000000
+all-year,all-week,night,gasboiler,2020,32.35500000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,night,gasboiler,2020,32.35500000000
+all-year,all-week,night,gasboiler,2020,32.35500000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,morning,gasboiler,2020,0.75000000000
+all-year,all-week,morning,gasboiler,2020,0.75000000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,gasboiler,2020,0.75000000000
+all-year,all-week,morning,gasboiler,2020,0.75000000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,gasboiler,2020,48.53250000000
+all-year,all-week,morning,gasboiler,2020,48.53250000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,morning,gasboiler,2020,48.53250000000
+all-year,all-week,morning,gasboiler,2020,48.53250000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,evening,gasboiler,2020,1.00000000000
+all-year,all-week,evening,gasboiler,2020,1.00000000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,gasboiler,2020,1.00000000000
+all-year,all-week,evening,gasboiler,2020,1.00000000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,gasboiler,2020,64.71000000000
+all-year,all-week,evening,gasboiler,2020,64.71000000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
+all-year,all-week,evening,gasboiler,2020,64.71000000000
+all-year,all-week,evening,gasboiler,2020,64.71000000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
+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 8a6b5683..f6d48be8 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,121 +1,121 @@
-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,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R1,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
-0,heat,R2,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R1,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
-1,heat,R2,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
-2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R1,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R1,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-2,heat,R2,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
-2,heat,R2,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-2,CO2f,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-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,heatpump,2020,0.79170000000
-3,heat,R1,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-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,heatpump,2020,0.79170000000
-3,heat,R2,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-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,heatpump,2020,1.58330000000
-4,heat,R1,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-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,heatpump,2020,1.58330000000
-4,heat,R2,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R1,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
-5,heat,R2,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,gasboiler,2020,0.13890000000
+all-year,all-week,night,heatpump,2020,0.52780000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,night,gasboiler,2020,8.98750000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,gasboiler,2020,0.20830000000
+all-year,all-week,morning,heatpump,2020,0.79170000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,morning,gasboiler,2020,13.48120000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+all-year,all-week,afternoon,heatpump,2020,0.52780000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+all-year,all-week,early-peak,heatpump,2020,0.79170000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+all-year,all-week,late-peak,heatpump,2020,1.58330000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,gasboiler,2020,0.27780000000
+all-year,all-week,evening,heatpump,2020,1.05560000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
+all-year,all-week,evening,gasboiler,2020,17.97500000000
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 190d0953..4299cce0 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,97 +1,97 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
-2,heat,R1,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R1,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
-2,heat,R2,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
-2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,heatpump,2020,0.54600000000
+all-year,all-week,night,heatpump,2025,0.28740000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,heatpump,2020,0.81900000000
+all-year,all-week,morning,heatpump,2025,0.43100000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,heatpump,2020,0.54600000000
+all-year,all-week,afternoon,heatpump,2025,0.28740000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,heatpump,2020,0.81900000000
+all-year,all-week,early-peak,heatpump,2025,0.43100000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,heatpump,2020,1.63790000000
+all-year,all-week,late-peak,heatpump,2025,0.86210000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,heatpump,2020,1.09200000000
+all-year,all-week,evening,heatpump,2025,0.57470000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
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 f7f70781..4e5eebfe 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,97 +1,97 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
-2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
-2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2025,0.27780000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2025,0.41670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2025,0.27780000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2025,0.41670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2025,0.83330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2025,0.55560000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
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 7b22f170..529f1b0c 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,97 +1,97 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
-2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R1,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
-2,heat,R2,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2030,0.72220000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2030,1.08330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2030,0.72220000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,1.08330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2030,2.16670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2030,1.44440000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
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 383d0d54..3d157498 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,97 +1,97 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
-2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R1,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
-2,heat,R2,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2035,0.44440000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2035,0.66670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2035,0.44440000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2035,0.66670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2035,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2035,0.88890000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
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 803ba258..0855742a 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,month,day,hour,technology,installed,supply
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
-2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R1,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R1,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R1,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
-2,heat,R2,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-2,heat,R2,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
-2,heat,R2,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2050,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2050,0.88890000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2040,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2050,0.88890000000
+all-year,all-week,night,heatpump,2045,0.61110000000
+all-year,all-week,night,heatpump,2050,0.88890000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2050,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2050,1.33330000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2040,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2050,1.33330000000
+all-year,all-week,morning,heatpump,2045,0.91670000000
+all-year,all-week,morning,heatpump,2050,1.33330000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2050,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2050,0.88890000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2040,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2050,0.88890000000
+all-year,all-week,afternoon,heatpump,2045,0.61110000000
+all-year,all-week,afternoon,heatpump,2050,0.88890000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2050,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2050,1.33330000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2040,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2050,1.33330000000
+all-year,all-week,early-peak,heatpump,2045,0.91670000000
+all-year,all-week,early-peak,heatpump,2050,1.33330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2050,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2050,2.66670000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2040,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2050,2.66670000000
+all-year,all-week,late-peak,heatpump,2045,1.83330000000
+all-year,all-week,late-peak,heatpump,2050,2.66670000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2050,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2050,1.77780000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2040,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2050,1.77780000000
+all-year,all-week,evening,heatpump,2045,1.22220000000
+all-year,all-week,evening,heatpump,2050,1.77780000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
index 7e3cc760..176c4382 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml
+++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 3d4d9c15..563c9ec0 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,month,day,hour,technology,installed,supply
-0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
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 fa946f65..99541b9c 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,161 +1,161 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
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 c3a18f30..2615fee2 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,129 +1,129 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
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 a1ad7b71..fee9201a 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,129 +1,129 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
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 d8cce15a..c2ac68eb 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,month,day,hour,technology,installed,supply
-0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
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 498d5e24..931aa819 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,month,day,hour,technology,installed,supply
-0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
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 fe854b70..a4d6f8a2 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,month,day,hour,technology,installed,supply
-0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
index aa1218cf..95082ec6 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 4db35e5d..149c5372 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,month,day,hour,technology,installed,supply
-0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R1,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
-0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R1,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
-1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R1,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R1,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
-2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R1,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R1,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
-6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
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 32b8dacd..8a5f4814 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,month,day,hour,technology,installed,supply
-0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R1,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R1,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
-0,heat,R2,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
-0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
-0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R1,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
-0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
-1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R1,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R1,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
-1,heat,R2,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
-1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R1,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
-1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
-2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R1,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-2,heat,R2,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R1,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-3,heat,R2,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
-3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R1,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-4,heat,R2,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
-4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R1,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R1,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
-5,heat,R2,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
-5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R1,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
-5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
-6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R1,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-6,heat,R2,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
-6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R1,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-7,heat,R2,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.16700000000
+all-year,all-week,night,heatpump,2020,0.22960000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,10.80770000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.23860000000
+all-year,all-week,morning,heatpump,2020,0.32810000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,15.43960000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+all-year,all-week,early-peak,heatpump,2020,0.32810000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+all-year,all-week,late-peak,heatpump,2020,0.68890000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.33400000000
+all-year,all-week,evening,heatpump,2020,0.45930000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,21.61540000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+all-year,all-week,early-morning,heatpump,2020,0.45930000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
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 58246c6a..af467c19 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,month,day,hour,technology,installed,supply
-0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R1,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R1,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R1,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
-0,heat,R2,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
-0,heat,R2,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
-0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
-0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R1,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
-0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
-1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R1,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
-1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
-1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
-1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R1,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
-1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
-2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
-3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
-3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
-4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
-4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R1,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
-5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
-5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
-5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R1,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
-5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
-6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
-6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
-6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.12670000000
+all-year,all-week,night,heatpump,2020,0.23220000000
+all-year,all-week,night,heatpump,2022,0.08440000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,8.19660000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.18100000000
+all-year,all-week,morning,heatpump,2020,0.33170000000
+all-year,all-week,morning,heatpump,2022,0.12060000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,11.70940000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+all-year,all-week,early-peak,heatpump,2020,0.33170000000
+all-year,all-week,early-peak,heatpump,2022,0.12060000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+all-year,all-week,late-peak,heatpump,2020,0.69670000000
+all-year,all-week,late-peak,heatpump,2022,0.25330000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.25330000000
+all-year,all-week,evening,heatpump,2020,0.46440000000
+all-year,all-week,evening,heatpump,2022,0.16890000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,16.39320000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+all-year,all-week,early-morning,heatpump,2020,0.46440000000
+all-year,all-week,early-morning,heatpump,2022,0.16890000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
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 d85ab2ec..35861806 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,month,day,hour,technology,installed,supply
-0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R1,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R1,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R1,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R1,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R1,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
-0,heat,R2,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
-0,heat,R2,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
-0,heat,R2,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
-0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
-0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R1,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R1,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
-0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
-1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R1,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R1,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
-1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
-1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
-1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
-1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R1,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R1,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
-1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
-2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
-3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
-3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
-3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
-4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
-4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
-4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R1,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R1,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
-5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
-5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
-5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
-5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R1,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R1,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
-5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
-6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
-6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
-6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
-6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.08520000000
+all-year,all-week,night,heatpump,2020,0.23430000000
+all-year,all-week,night,heatpump,2022,0.08520000000
+all-year,all-week,night,heatpump,2024,0.08520000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,5.51440000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.12170000000
+all-year,all-week,morning,heatpump,2020,0.33480000000
+all-year,all-week,morning,heatpump,2022,0.12170000000
+all-year,all-week,morning,heatpump,2024,0.12170000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,7.87770000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+all-year,all-week,early-peak,heatpump,2020,0.33480000000
+all-year,all-week,early-peak,heatpump,2022,0.12170000000
+all-year,all-week,early-peak,heatpump,2024,0.12170000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+all-year,all-week,late-peak,heatpump,2020,0.70300000000
+all-year,all-week,late-peak,heatpump,2022,0.25570000000
+all-year,all-week,late-peak,heatpump,2024,0.25570000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.17040000000
+all-year,all-week,evening,heatpump,2020,0.46870000000
+all-year,all-week,evening,heatpump,2022,0.17040000000
+all-year,all-week,evening,heatpump,2024,0.17040000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,11.02880000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+all-year,all-week,early-morning,heatpump,2020,0.46870000000
+all-year,all-week,early-morning,heatpump,2022,0.17040000000
+all-year,all-week,early-morning,heatpump,2024,0.17040000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
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 0c2864a0..46e07f25 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,353 +1,353 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R1,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R1,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R1,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R1,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R1,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R1,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
-0,heat,R2,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
-0,heat,R2,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
-0,heat,R2,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
-0,heat,R2,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
-0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R1,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
-0,CO2f,R2,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
-1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R1,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
-1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
-1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
-1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
-1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R1,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
-1,CO2f,R2,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
-2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-2,CO2f,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
-3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
-3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
-3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-3,CO2f,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
-4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
-4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
-4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-4,CO2f,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R1,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
-5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
-5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
-5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
-5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R1,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
-5,CO2f,R2,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
-6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
-6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
-6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
-6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-6,CO2f,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-7,CO2f,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,gasboiler,2020,0.04290000000
+all-year,all-week,night,heatpump,2020,0.23610000000
+all-year,all-week,night,heatpump,2022,0.08590000000
+all-year,all-week,night,heatpump,2024,0.08590000000
+all-year,all-week,night,heatpump,2026,0.08590000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,night,gasboiler,2020,2.77820000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,gasboiler,2020,0.06130000000
+all-year,all-week,morning,heatpump,2020,0.33730000000
+all-year,all-week,morning,heatpump,2022,0.12270000000
+all-year,all-week,morning,heatpump,2024,0.12270000000
+all-year,all-week,morning,heatpump,2026,0.12270000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,morning,gasboiler,2020,3.96890000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+all-year,all-week,early-peak,heatpump,2020,0.33730000000
+all-year,all-week,early-peak,heatpump,2022,0.12270000000
+all-year,all-week,early-peak,heatpump,2024,0.12270000000
+all-year,all-week,early-peak,heatpump,2026,0.12270000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+all-year,all-week,late-peak,heatpump,2020,0.70840000000
+all-year,all-week,late-peak,heatpump,2022,0.25760000000
+all-year,all-week,late-peak,heatpump,2024,0.25760000000
+all-year,all-week,late-peak,heatpump,2026,0.25760000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,gasboiler,2020,0.08590000000
+all-year,all-week,evening,heatpump,2020,0.47230000000
+all-year,all-week,evening,heatpump,2022,0.17170000000
+all-year,all-week,evening,heatpump,2024,0.17170000000
+all-year,all-week,evening,heatpump,2026,0.17170000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,evening,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+all-year,all-week,early-morning,heatpump,2020,0.47230000000
+all-year,all-week,early-morning,heatpump,2022,0.17170000000
+all-year,all-week,early-morning,heatpump,2024,0.17170000000
+all-year,all-week,early-morning,heatpump,2026,0.17170000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
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 765376d6..5cc7f860 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,321 +1,321 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R1,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R1,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R1,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R1,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
-0,heat,R2,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
-0,heat,R2,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
-0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
-1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
-1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
-1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
-1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
-2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
-3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
-3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
-3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
-4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
-4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
-4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
-5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
-5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
-5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
-6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
-6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
-6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
-6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,heatpump,2020,0.22920000000
+all-year,all-week,night,heatpump,2022,0.08330000000
+all-year,all-week,night,heatpump,2024,0.08330000000
+all-year,all-week,night,heatpump,2026,0.08330000000
+all-year,all-week,night,heatpump,2028,0.10420000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,heatpump,2020,0.32740000000
+all-year,all-week,morning,heatpump,2022,0.11900000000
+all-year,all-week,morning,heatpump,2024,0.11900000000
+all-year,all-week,morning,heatpump,2026,0.11900000000
+all-year,all-week,morning,heatpump,2028,0.14880000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,heatpump,2020,0.32740000000
+all-year,all-week,early-peak,heatpump,2022,0.11900000000
+all-year,all-week,early-peak,heatpump,2024,0.11900000000
+all-year,all-week,early-peak,heatpump,2026,0.11900000000
+all-year,all-week,early-peak,heatpump,2028,0.14880000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,heatpump,2020,0.68750000000
+all-year,all-week,late-peak,heatpump,2022,0.25000000000
+all-year,all-week,late-peak,heatpump,2024,0.25000000000
+all-year,all-week,late-peak,heatpump,2026,0.25000000000
+all-year,all-week,late-peak,heatpump,2028,0.31250000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,heatpump,2020,0.45830000000
+all-year,all-week,evening,heatpump,2022,0.16670000000
+all-year,all-week,evening,heatpump,2024,0.16670000000
+all-year,all-week,evening,heatpump,2026,0.16670000000
+all-year,all-week,evening,heatpump,2028,0.20830000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,heatpump,2020,0.45830000000
+all-year,all-week,early-morning,heatpump,2022,0.16670000000
+all-year,all-week,early-morning,heatpump,2024,0.16670000000
+all-year,all-week,early-morning,heatpump,2026,0.16670000000
+all-year,all-week,early-morning,heatpump,2028,0.20830000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
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 6ef5e128..5019e799 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,321 +1,321 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R1,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R1,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R1,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R1,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R1,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R1,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
-0,heat,R2,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
-0,heat,R2,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
-0,heat,R2,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
-0,heat,R2,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
-0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
-1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
-1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
-1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
-1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
-1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
-1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
-2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
-3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
-3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
-3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
-3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
-3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
-4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
-4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
-4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
-4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
-4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
-5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
-5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
-5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
-5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
-5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
-6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
-6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
-6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
-6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
-6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
-6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2022,0.08400000000
+all-year,all-week,night,heatpump,2024,0.08400000000
+all-year,all-week,night,heatpump,2026,0.08400000000
+all-year,all-week,night,heatpump,2028,0.10500000000
+all-year,all-week,night,heatpump,2030,0.27300000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2022,0.12000000000
+all-year,all-week,morning,heatpump,2024,0.12000000000
+all-year,all-week,morning,heatpump,2026,0.12000000000
+all-year,all-week,morning,heatpump,2028,0.15000000000
+all-year,all-week,morning,heatpump,2030,0.39000000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2022,0.12000000000
+all-year,all-week,early-peak,heatpump,2024,0.12000000000
+all-year,all-week,early-peak,heatpump,2026,0.12000000000
+all-year,all-week,early-peak,heatpump,2028,0.15000000000
+all-year,all-week,early-peak,heatpump,2030,0.39000000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2022,0.25200000000
+all-year,all-week,late-peak,heatpump,2024,0.25200000000
+all-year,all-week,late-peak,heatpump,2026,0.25200000000
+all-year,all-week,late-peak,heatpump,2028,0.31500000000
+all-year,all-week,late-peak,heatpump,2030,0.81900000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2022,0.16800000000
+all-year,all-week,evening,heatpump,2024,0.16800000000
+all-year,all-week,evening,heatpump,2026,0.16800000000
+all-year,all-week,evening,heatpump,2028,0.21000000000
+all-year,all-week,evening,heatpump,2030,0.54600000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2022,0.16800000000
+all-year,all-week,early-morning,heatpump,2024,0.16800000000
+all-year,all-week,early-morning,heatpump,2026,0.16800000000
+all-year,all-week,early-morning,heatpump,2028,0.21000000000
+all-year,all-week,early-morning,heatpump,2030,0.54600000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
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 da5d538d..a3ea629a 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,321 +1,321 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R1,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R1,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R1,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R1,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R1,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R1,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
-0,heat,R2,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
-0,heat,R2,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
-0,heat,R2,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
-0,heat,R2,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
-0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
-1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R1,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
-1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
-1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
-1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
-1,heat,R2,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
-1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
-2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R1,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-2,heat,R2,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R1,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
-3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
-3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
-3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
-3,heat,R2,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
-3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R1,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
-4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
-4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
-4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
-4,heat,R2,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
-4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R1,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
-5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
-5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
-5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
-5,heat,R2,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
-5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
-6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R1,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
-6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
-6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
-6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
-6,heat,R2,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
-6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R1,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-7,heat,R2,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2024,0.08460000000
+all-year,all-week,night,heatpump,2026,0.08460000000
+all-year,all-week,night,heatpump,2028,0.10570000000
+all-year,all-week,night,heatpump,2030,0.27490000000
+all-year,all-week,night,heatpump,2032,0.12690000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2024,0.12080000000
+all-year,all-week,morning,heatpump,2026,0.12080000000
+all-year,all-week,morning,heatpump,2028,0.15100000000
+all-year,all-week,morning,heatpump,2030,0.39270000000
+all-year,all-week,morning,heatpump,2032,0.18120000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2024,0.12080000000
+all-year,all-week,early-peak,heatpump,2026,0.12080000000
+all-year,all-week,early-peak,heatpump,2028,0.15100000000
+all-year,all-week,early-peak,heatpump,2030,0.39270000000
+all-year,all-week,early-peak,heatpump,2032,0.18120000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2024,0.25370000000
+all-year,all-week,late-peak,heatpump,2026,0.25370000000
+all-year,all-week,late-peak,heatpump,2028,0.31720000000
+all-year,all-week,late-peak,heatpump,2030,0.82470000000
+all-year,all-week,late-peak,heatpump,2032,0.38060000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2024,0.16920000000
+all-year,all-week,evening,heatpump,2026,0.16920000000
+all-year,all-week,evening,heatpump,2028,0.21150000000
+all-year,all-week,evening,heatpump,2030,0.54980000000
+all-year,all-week,evening,heatpump,2032,0.25370000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2024,0.16920000000
+all-year,all-week,early-morning,heatpump,2026,0.16920000000
+all-year,all-week,early-morning,heatpump,2028,0.21150000000
+all-year,all-week,early-morning,heatpump,2030,0.54980000000
+all-year,all-week,early-morning,heatpump,2032,0.25370000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
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 e0448c28..bc568fe7 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,month,day,hour,technology,installed,supply
-0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R1,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R1,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R1,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R1,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R1,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R1,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
-0,heat,R2,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
-0,heat,R2,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
-0,heat,R2,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
-0,heat,R2,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
-0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
-1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R1,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R1,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
-1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
-1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
-1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
-1,heat,R2,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
-1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
-2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R1,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R1,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-2,heat,R2,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R1,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R1,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
-3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
-3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
-3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
-3,heat,R2,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
-3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R1,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R1,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
-4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
-4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
-4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
-4,heat,R2,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
-4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R1,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R1,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
-5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
-5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
-5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
-5,heat,R2,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
-5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
-6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R1,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R1,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
-6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
-6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
-6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
-6,heat,R2,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
-6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R1,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R1,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-7,heat,R2,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2026,0.08510000000
+all-year,all-week,night,heatpump,2028,0.10640000000
+all-year,all-week,night,heatpump,2030,0.27660000000
+all-year,all-week,night,heatpump,2032,0.12760000000
+all-year,all-week,night,heatpump,2034,0.12760000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2026,0.12160000000
+all-year,all-week,morning,heatpump,2028,0.15200000000
+all-year,all-week,morning,heatpump,2030,0.39510000000
+all-year,all-week,morning,heatpump,2032,0.18240000000
+all-year,all-week,morning,heatpump,2034,0.18240000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2026,0.12160000000
+all-year,all-week,early-peak,heatpump,2028,0.15200000000
+all-year,all-week,early-peak,heatpump,2030,0.39510000000
+all-year,all-week,early-peak,heatpump,2032,0.18240000000
+all-year,all-week,early-peak,heatpump,2034,0.18240000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2026,0.25530000000
+all-year,all-week,late-peak,heatpump,2028,0.31910000000
+all-year,all-week,late-peak,heatpump,2030,0.82970000000
+all-year,all-week,late-peak,heatpump,2032,0.38290000000
+all-year,all-week,late-peak,heatpump,2034,0.38290000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2026,0.17020000000
+all-year,all-week,evening,heatpump,2028,0.21270000000
+all-year,all-week,evening,heatpump,2030,0.55310000000
+all-year,all-week,evening,heatpump,2032,0.25530000000
+all-year,all-week,evening,heatpump,2034,0.25530000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2026,0.17020000000
+all-year,all-week,early-morning,heatpump,2028,0.21270000000
+all-year,all-week,early-morning,heatpump,2030,0.55310000000
+all-year,all-week,early-morning,heatpump,2032,0.25530000000
+all-year,all-week,early-morning,heatpump,2034,0.25530000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
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 f78f5302..2ab26445 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,month,day,hour,technology,installed,supply
-0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R1,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R1,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R1,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R1,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R1,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R1,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
-0,heat,R2,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
-0,heat,R2,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
-0,heat,R2,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
-0,heat,R2,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
-1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R1,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R1,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
-1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
-1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
-1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
-1,heat,R2,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
-2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R1,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R1,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-2,heat,R2,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R1,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R1,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
-3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
-3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
-3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
-3,heat,R2,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R1,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R1,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
-4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
-4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
-4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
-4,heat,R2,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R1,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R1,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
-5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
-5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
-5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
-5,heat,R2,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
-6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R1,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R1,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
-6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
-6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
-6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
-6,heat,R2,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R1,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R1,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-7,heat,R2,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2028,0.10690000000
+all-year,all-week,night,heatpump,2030,0.27810000000
+all-year,all-week,night,heatpump,2032,0.12830000000
+all-year,all-week,night,heatpump,2034,0.12830000000
+all-year,all-week,night,heatpump,2036,0.12830000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2028,0.15280000000
+all-year,all-week,morning,heatpump,2030,0.39720000000
+all-year,all-week,morning,heatpump,2032,0.18330000000
+all-year,all-week,morning,heatpump,2034,0.18330000000
+all-year,all-week,morning,heatpump,2036,0.18330000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2028,0.15280000000
+all-year,all-week,early-peak,heatpump,2030,0.39720000000
+all-year,all-week,early-peak,heatpump,2032,0.18330000000
+all-year,all-week,early-peak,heatpump,2034,0.18330000000
+all-year,all-week,early-peak,heatpump,2036,0.18330000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2028,0.32080000000
+all-year,all-week,late-peak,heatpump,2030,0.83420000000
+all-year,all-week,late-peak,heatpump,2032,0.38500000000
+all-year,all-week,late-peak,heatpump,2034,0.38500000000
+all-year,all-week,late-peak,heatpump,2036,0.38500000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2028,0.21390000000
+all-year,all-week,evening,heatpump,2030,0.55610000000
+all-year,all-week,evening,heatpump,2032,0.25670000000
+all-year,all-week,evening,heatpump,2034,0.25670000000
+all-year,all-week,evening,heatpump,2036,0.25670000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2028,0.21390000000
+all-year,all-week,early-morning,heatpump,2030,0.55610000000
+all-year,all-week,early-morning,heatpump,2032,0.25670000000
+all-year,all-week,early-morning,heatpump,2034,0.25670000000
+all-year,all-week,early-morning,heatpump,2036,0.25670000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
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 a196c0ff..f79163ce 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,month,day,hour,technology,installed,supply
-0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R1,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R1,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R1,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
-0,heat,R1,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R1,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R1,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R1,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R1,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
-0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
-0,heat,R2,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
-0,heat,R2,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
-0,heat,R2,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
-0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
-0,heat,R2,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
-0,heat,R2,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
-0,heat,R2,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
-0,heat,R2,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
-0,heat,R2,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
-1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
-1,heat,R1,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R1,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R1,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R1,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R1,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
-1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
-1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
-1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
-1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
-1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
-1,heat,R2,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
-1,heat,R2,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
-1,heat,R2,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
-1,heat,R2,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
-1,heat,R2,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
-2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-2,heat,R1,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R1,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R1,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R1,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R1,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-2,heat,R2,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-2,heat,R2,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-2,heat,R2,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-2,heat,R2,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-2,heat,R2,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-3,heat,R1,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R1,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R1,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R1,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R1,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
-3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
-3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
-3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
-3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-3,heat,R2,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
-3,heat,R2,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
-3,heat,R2,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
-3,heat,R2,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
-3,heat,R2,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
-4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-4,heat,R1,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R1,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R1,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R1,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R1,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
-4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
-4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
-4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
-4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-4,heat,R2,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
-4,heat,R2,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
-4,heat,R2,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
-4,heat,R2,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
-4,heat,R2,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
-5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
-5,heat,R1,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R1,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R1,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R1,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R1,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
-5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
-5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
-5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
-5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
-5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
-5,heat,R2,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
-5,heat,R2,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
-5,heat,R2,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
-5,heat,R2,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
-5,heat,R2,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
-6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-6,heat,R1,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R1,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R1,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R1,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R1,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
-6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
-6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
-6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
-6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-6,heat,R2,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
-6,heat,R2,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
-6,heat,R2,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
-6,heat,R2,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
-6,heat,R2,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
-7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-7,heat,R1,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R1,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R1,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R1,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R1,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-7,heat,R2,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-7,heat,R2,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-7,heat,R2,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-7,heat,R2,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-7,heat,R2,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2032,0.12630000000
+all-year,all-week,night,heatpump,2034,0.12630000000
+all-year,all-week,night,heatpump,2036,0.12630000000
+all-year,all-week,night,heatpump,2038,0.16850000000
+all-year,all-week,night,heatpump,2040,0.31590000000
+all-year,all-week,night,heatpump,2032,0.12630000000
+all-year,all-week,night,heatpump,2034,0.12630000000
+all-year,all-week,night,heatpump,2036,0.12630000000
+all-year,all-week,night,heatpump,2038,0.16850000000
+all-year,all-week,night,heatpump,2040,0.31590000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2030,0.27220000000
+all-year,all-week,night,heatpump,2032,0.12560000000
+all-year,all-week,night,heatpump,2034,0.12560000000
+all-year,all-week,night,heatpump,2036,0.12560000000
+all-year,all-week,night,heatpump,2038,0.16750000000
+all-year,all-week,night,heatpump,2032,0.12630000000
+all-year,all-week,night,heatpump,2034,0.12630000000
+all-year,all-week,night,heatpump,2036,0.12630000000
+all-year,all-week,night,heatpump,2038,0.16850000000
+all-year,all-week,night,heatpump,2040,0.31590000000
+all-year,all-week,night,heatpump,2032,0.12630000000
+all-year,all-week,night,heatpump,2034,0.12630000000
+all-year,all-week,night,heatpump,2036,0.12630000000
+all-year,all-week,night,heatpump,2038,0.16850000000
+all-year,all-week,night,heatpump,2040,0.31590000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2032,0.18050000000
+all-year,all-week,morning,heatpump,2034,0.18050000000
+all-year,all-week,morning,heatpump,2036,0.18050000000
+all-year,all-week,morning,heatpump,2038,0.24070000000
+all-year,all-week,morning,heatpump,2040,0.45120000000
+all-year,all-week,morning,heatpump,2032,0.18050000000
+all-year,all-week,morning,heatpump,2034,0.18050000000
+all-year,all-week,morning,heatpump,2036,0.18050000000
+all-year,all-week,morning,heatpump,2038,0.24070000000
+all-year,all-week,morning,heatpump,2040,0.45120000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2030,0.38890000000
+all-year,all-week,morning,heatpump,2032,0.17950000000
+all-year,all-week,morning,heatpump,2034,0.17950000000
+all-year,all-week,morning,heatpump,2036,0.17950000000
+all-year,all-week,morning,heatpump,2038,0.23930000000
+all-year,all-week,morning,heatpump,2032,0.18050000000
+all-year,all-week,morning,heatpump,2034,0.18050000000
+all-year,all-week,morning,heatpump,2036,0.18050000000
+all-year,all-week,morning,heatpump,2038,0.24070000000
+all-year,all-week,morning,heatpump,2040,0.45120000000
+all-year,all-week,morning,heatpump,2032,0.18050000000
+all-year,all-week,morning,heatpump,2034,0.18050000000
+all-year,all-week,morning,heatpump,2036,0.18050000000
+all-year,all-week,morning,heatpump,2038,0.24070000000
+all-year,all-week,morning,heatpump,2040,0.45120000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2032,0.18050000000
+all-year,all-week,early-peak,heatpump,2034,0.18050000000
+all-year,all-week,early-peak,heatpump,2036,0.18050000000
+all-year,all-week,early-peak,heatpump,2038,0.24070000000
+all-year,all-week,early-peak,heatpump,2040,0.45120000000
+all-year,all-week,early-peak,heatpump,2032,0.18050000000
+all-year,all-week,early-peak,heatpump,2034,0.18050000000
+all-year,all-week,early-peak,heatpump,2036,0.18050000000
+all-year,all-week,early-peak,heatpump,2038,0.24070000000
+all-year,all-week,early-peak,heatpump,2040,0.45120000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2030,0.38890000000
+all-year,all-week,early-peak,heatpump,2032,0.17950000000
+all-year,all-week,early-peak,heatpump,2034,0.17950000000
+all-year,all-week,early-peak,heatpump,2036,0.17950000000
+all-year,all-week,early-peak,heatpump,2038,0.23930000000
+all-year,all-week,early-peak,heatpump,2032,0.18050000000
+all-year,all-week,early-peak,heatpump,2034,0.18050000000
+all-year,all-week,early-peak,heatpump,2036,0.18050000000
+all-year,all-week,early-peak,heatpump,2038,0.24070000000
+all-year,all-week,early-peak,heatpump,2040,0.45120000000
+all-year,all-week,early-peak,heatpump,2032,0.18050000000
+all-year,all-week,early-peak,heatpump,2034,0.18050000000
+all-year,all-week,early-peak,heatpump,2036,0.18050000000
+all-year,all-week,early-peak,heatpump,2038,0.24070000000
+all-year,all-week,early-peak,heatpump,2040,0.45120000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2032,0.37900000000
+all-year,all-week,late-peak,heatpump,2034,0.37900000000
+all-year,all-week,late-peak,heatpump,2036,0.37900000000
+all-year,all-week,late-peak,heatpump,2038,0.50540000000
+all-year,all-week,late-peak,heatpump,2040,0.94760000000
+all-year,all-week,late-peak,heatpump,2032,0.37900000000
+all-year,all-week,late-peak,heatpump,2034,0.37900000000
+all-year,all-week,late-peak,heatpump,2036,0.37900000000
+all-year,all-week,late-peak,heatpump,2038,0.50540000000
+all-year,all-week,late-peak,heatpump,2040,0.94760000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2030,0.81670000000
+all-year,all-week,late-peak,heatpump,2032,0.37690000000
+all-year,all-week,late-peak,heatpump,2034,0.37690000000
+all-year,all-week,late-peak,heatpump,2036,0.37690000000
+all-year,all-week,late-peak,heatpump,2038,0.50260000000
+all-year,all-week,late-peak,heatpump,2032,0.37900000000
+all-year,all-week,late-peak,heatpump,2034,0.37900000000
+all-year,all-week,late-peak,heatpump,2036,0.37900000000
+all-year,all-week,late-peak,heatpump,2038,0.50540000000
+all-year,all-week,late-peak,heatpump,2040,0.94760000000
+all-year,all-week,late-peak,heatpump,2032,0.37900000000
+all-year,all-week,late-peak,heatpump,2034,0.37900000000
+all-year,all-week,late-peak,heatpump,2036,0.37900000000
+all-year,all-week,late-peak,heatpump,2038,0.50540000000
+all-year,all-week,late-peak,heatpump,2040,0.94760000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2032,0.25270000000
+all-year,all-week,evening,heatpump,2034,0.25270000000
+all-year,all-week,evening,heatpump,2036,0.25270000000
+all-year,all-week,evening,heatpump,2038,0.33690000000
+all-year,all-week,evening,heatpump,2040,0.63170000000
+all-year,all-week,evening,heatpump,2032,0.25270000000
+all-year,all-week,evening,heatpump,2034,0.25270000000
+all-year,all-week,evening,heatpump,2036,0.25270000000
+all-year,all-week,evening,heatpump,2038,0.33690000000
+all-year,all-week,evening,heatpump,2040,0.63170000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2030,0.54440000000
+all-year,all-week,evening,heatpump,2032,0.25130000000
+all-year,all-week,evening,heatpump,2034,0.25130000000
+all-year,all-week,evening,heatpump,2036,0.25130000000
+all-year,all-week,evening,heatpump,2038,0.33500000000
+all-year,all-week,evening,heatpump,2032,0.25270000000
+all-year,all-week,evening,heatpump,2034,0.25270000000
+all-year,all-week,evening,heatpump,2036,0.25270000000
+all-year,all-week,evening,heatpump,2038,0.33690000000
+all-year,all-week,evening,heatpump,2040,0.63170000000
+all-year,all-week,evening,heatpump,2032,0.25270000000
+all-year,all-week,evening,heatpump,2034,0.25270000000
+all-year,all-week,evening,heatpump,2036,0.25270000000
+all-year,all-week,evening,heatpump,2038,0.33690000000
+all-year,all-week,evening,heatpump,2040,0.63170000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2032,0.25270000000
+all-year,all-week,early-morning,heatpump,2034,0.25270000000
+all-year,all-week,early-morning,heatpump,2036,0.25270000000
+all-year,all-week,early-morning,heatpump,2038,0.33690000000
+all-year,all-week,early-morning,heatpump,2040,0.63170000000
+all-year,all-week,early-morning,heatpump,2032,0.25270000000
+all-year,all-week,early-morning,heatpump,2034,0.25270000000
+all-year,all-week,early-morning,heatpump,2036,0.25270000000
+all-year,all-week,early-morning,heatpump,2038,0.33690000000
+all-year,all-week,early-morning,heatpump,2040,0.63170000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2030,0.54440000000
+all-year,all-week,early-morning,heatpump,2032,0.25130000000
+all-year,all-week,early-morning,heatpump,2034,0.25130000000
+all-year,all-week,early-morning,heatpump,2036,0.25130000000
+all-year,all-week,early-morning,heatpump,2038,0.33500000000
+all-year,all-week,early-morning,heatpump,2032,0.25270000000
+all-year,all-week,early-morning,heatpump,2034,0.25270000000
+all-year,all-week,early-morning,heatpump,2036,0.25270000000
+all-year,all-week,early-morning,heatpump,2038,0.33690000000
+all-year,all-week,early-morning,heatpump,2040,0.63170000000
+all-year,all-week,early-morning,heatpump,2032,0.25270000000
+all-year,all-week,early-morning,heatpump,2034,0.25270000000
+all-year,all-week,early-morning,heatpump,2036,0.25270000000
+all-year,all-week,early-morning,heatpump,2038,0.33690000000
+all-year,all-week,early-morning,heatpump,2040,0.63170000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
index f51c479a..4f511315 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -92,7 +89,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -114,7 +110,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
index 429eef7e..0f2da1f1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
@@ -1,321 +1,321 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
-0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
-0,CO2f,R1,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R1,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R1,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
-0,CO2f,R2,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
-0,CO2f,R2,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,cook,R1,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R1,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R1,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R2,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
-0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
-1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
-1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,CO2f,R1,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R1,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R1,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
-1,CO2f,R2,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
-1,CO2f,R2,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,cook,R1,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R1,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R1,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R2,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
-1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
-2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-2,CO2f,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,cook,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R1,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,CO2f,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-3,CO2f,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-3,CO2f,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,cook,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R1,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,CO2f,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-4,CO2f,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-4,CO2f,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,cook,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R1,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
-5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,CO2f,R1,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R1,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R1,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
-5,CO2f,R2,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
-5,CO2f,R2,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,cook,R1,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R1,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R1,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R2,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
-5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
-6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,CO2f,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-6,CO2f,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-6,CO2f,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,cook,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R1,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-7,CO2f,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,cook,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R1,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.35000000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,17.50000000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gas_stove,2020,17.50000000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,17.50000000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gas_stove,2020,17.50000000000
+all-year,all-week,night,gasboiler,2020,22.64850000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,0.35000000000
+all-year,all-week,night,gas_stove,2020,0.35000000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,gas_stove,2020,0.35000000000
+all-year,all-week,night,gas_stove,2020,0.35000000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.50000000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,25.00000000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gas_stove,2020,25.00000000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,25.00000000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gas_stove,2020,25.00000000000
+all-year,all-week,morning,gasboiler,2020,32.35500000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,0.50000000000
+all-year,all-week,morning,gas_stove,2020,0.50000000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,gas_stove,2020,0.50000000000
+all-year,all-week,morning,gas_stove,2020,0.50000000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.70000000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,35.00000000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gas_stove,2020,35.00000000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,35.00000000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gas_stove,2020,35.00000000000
+all-year,all-week,evening,gasboiler,2020,45.29700000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,0.70000000000
+all-year,all-week,evening,gas_stove,2020,0.70000000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,gas_stove,2020,0.70000000000
+all-year,all-week,evening,gas_stove,2020,0.70000000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
index c58d9cfa..d1d88a58 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
@@ -1,321 +1,321 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R1,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
-0,heat,R2,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
-0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
-0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R1,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R1,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,CO2f,R2,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
-0,CO2f,R2,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
-0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R1,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R1,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R1,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
-0,cook,R2,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
-0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
-1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R1,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
-1,heat,R2,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
-1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R1,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R1,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,CO2f,R2,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
-1,CO2f,R2,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
-1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R1,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R1,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R1,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
-1,cook,R2,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
-1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
-2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R1,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-2,heat,R2,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-2,CO2f,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R1,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R1,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-2,cook,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R1,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-3,heat,R2,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
-3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,CO2f,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-3,CO2f,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R1,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R1,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-3,cook,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R1,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-4,heat,R2,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
-4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,CO2f,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,CO2f,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-4,CO2f,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R1,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R1,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-4,cook,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R1,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
-5,heat,R2,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
-5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R1,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R1,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,CO2f,R2,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
-5,CO2f,R2,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
-5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R1,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R1,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R1,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
-5,cook,R2,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
-5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
-6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R1,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-6,heat,R2,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
-6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,CO2f,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-6,CO2f,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R1,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R1,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-6,cook,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R1,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-7,heat,R2,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-7,CO2f,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R1,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R1,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-7,cook,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,gasboiler,2020,0.10610000000
+all-year,all-week,night,heatpump,2020,0.36060000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,gas_stove,2020,5.30300000000
+all-year,all-week,night,gasboiler,2020,6.86320000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,electric_stove,2020,0.36060000000
+all-year,all-week,night,gas_stove,2020,0.10610000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,gasboiler,2020,0.15150000000
+all-year,all-week,morning,heatpump,2020,0.51520000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,gas_stove,2020,7.57580000000
+all-year,all-week,morning,gasboiler,2020,9.80450000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,electric_stove,2020,0.51520000000
+all-year,all-week,morning,gas_stove,2020,0.15150000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+all-year,all-week,early-peak,heatpump,2020,0.51520000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+all-year,all-week,late-peak,heatpump,2020,1.08180000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,gasboiler,2020,0.21210000000
+all-year,all-week,evening,heatpump,2020,0.72120000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,gas_stove,2020,10.60610000000
+all-year,all-week,evening,gasboiler,2020,13.72640000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,electric_stove,2020,0.72120000000
+all-year,all-week,evening,gas_stove,2020,0.21210000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+all-year,all-week,early-morning,heatpump,2020,0.72120000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
index 06e46f15..43b44cf2 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
-0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
-0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
-0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R1,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R1,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R1,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
-0,cook,R2,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
-0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
-1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
-1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
-1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R1,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R1,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R1,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
-1,cook,R2,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
-1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
-2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R1,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R1,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R1,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-2,cook,R2,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
-3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
-3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R1,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R1,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R1,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-3,cook,R2,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
-4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
-4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R1,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R1,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R1,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-4,cook,R2,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
-5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
-5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R1,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R1,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R1,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
-5,cook,R2,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
-5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
-6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
-6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
-6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R1,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R1,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R1,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-6,cook,R2,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R1,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R1,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R1,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-7,cook,R2,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2020,0.35420000000
+all-year,all-week,night,heatpump,2025,0.22920000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2020,0.35420000000
+all-year,all-week,night,electric_stove,2025,0.22920000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2020,0.50600000000
+all-year,all-week,morning,heatpump,2025,0.32740000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2020,0.50600000000
+all-year,all-week,morning,electric_stove,2025,0.32740000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2020,0.50600000000
+all-year,all-week,early-peak,heatpump,2025,0.32740000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2020,1.06250000000
+all-year,all-week,late-peak,heatpump,2025,0.68750000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2020,0.70830000000
+all-year,all-week,evening,heatpump,2025,0.45830000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2020,0.70830000000
+all-year,all-week,evening,electric_stove,2025,0.45830000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2020,0.70830000000
+all-year,all-week,early-morning,heatpump,2025,0.45830000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
index 777ad44d..1d38bee6 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R1,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
-0,heat,R2,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
-0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
-0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R1,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R1,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R1,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
-0,cook,R2,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
-0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
-1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R1,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,R2,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
-1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R1,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R1,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R1,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
-1,cook,R2,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
-1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
-2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R1,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-2,heat,R2,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R1,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R1,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R1,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-2,cook,R2,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R1,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,R2,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
-3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R1,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R1,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R1,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-3,cook,R2,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R1,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
-4,heat,R2,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
-4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R1,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R1,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R1,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-4,cook,R2,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R1,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
-5,heat,R2,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
-5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R1,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R1,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R1,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
-5,cook,R2,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
-5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
-6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R1,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
-6,heat,R2,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
-6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R1,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R1,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R1,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-6,cook,R2,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R1,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-7,heat,R2,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R1,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R1,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R1,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-7,cook,R2,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2025,0.23330000000
+all-year,all-week,night,heatpump,2030,0.46670000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2025,0.23330000000
+all-year,all-week,night,electric_stove,2030,0.46670000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2025,0.33330000000
+all-year,all-week,morning,heatpump,2030,0.66670000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2025,0.33330000000
+all-year,all-week,morning,electric_stove,2030,0.66670000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2025,0.33330000000
+all-year,all-week,early-peak,heatpump,2030,0.66670000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2025,0.70000000000
+all-year,all-week,late-peak,heatpump,2030,1.40000000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2025,0.46670000000
+all-year,all-week,evening,heatpump,2030,0.93330000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2025,0.46670000000
+all-year,all-week,evening,electric_stove,2030,0.93330000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2025,0.46670000000
+all-year,all-week,early-morning,heatpump,2030,0.93330000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
index 65c91ff4..5e093971 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R1,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
-0,heat,R2,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
-0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
-0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R1,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R1,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R1,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
-0,cook,R2,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
-0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
-1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
-1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
-1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R1,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R1,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R1,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
-1,cook,R2,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
-1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
-2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R1,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R1,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R1,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-2,cook,R2,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
-3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
-3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R1,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R1,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R1,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-3,cook,R2,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
-4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
-4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R1,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R1,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R1,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-4,cook,R2,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
-5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
-5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R1,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R1,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R1,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
-5,cook,R2,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
-5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
-6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
-6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
-6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R1,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R1,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R1,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-6,cook,R2,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R1,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R1,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R1,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-7,cook,R2,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2030,0.46070000000
+all-year,all-week,night,heatpump,2035,0.35600000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2030,0.46070000000
+all-year,all-week,night,electric_stove,2035,0.35600000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2030,0.65810000000
+all-year,all-week,morning,heatpump,2035,0.50850000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2030,0.65810000000
+all-year,all-week,morning,electric_stove,2035,0.50850000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2030,0.65810000000
+all-year,all-week,early-peak,heatpump,2035,0.50850000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2030,1.38210000000
+all-year,all-week,late-peak,heatpump,2035,1.06790000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2030,0.92140000000
+all-year,all-week,evening,heatpump,2035,0.71200000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2030,0.92140000000
+all-year,all-week,evening,electric_stove,2035,0.71200000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2030,0.92140000000
+all-year,all-week,early-morning,heatpump,2035,0.71200000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
index 870f9f86..7a4fb79e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R1,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
-0,heat,R2,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
-0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
-0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R1,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R1,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
-0,cook,R2,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
-0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
-1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R1,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
-1,heat,R2,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
-1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R1,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R1,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
-1,cook,R2,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
-1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
-2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R1,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-2,heat,R2,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R1,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R1,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-2,cook,R2,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R1,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
-3,heat,R2,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
-3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R1,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R1,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-3,cook,R2,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R1,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
-4,heat,R2,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
-4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R1,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R1,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-4,cook,R2,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R1,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
-5,heat,R2,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
-5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R1,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R1,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
-5,cook,R2,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
-5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
-6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R1,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
-6,heat,R2,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
-6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R1,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R1,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-6,cook,R2,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R1,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-7,heat,R2,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R1,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R1,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-7,cook,R2,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2035,0.36060000000
+all-year,all-week,night,heatpump,2040,0.57270000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2035,0.36060000000
+all-year,all-week,night,electric_stove,2040,0.57270000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2035,0.51520000000
+all-year,all-week,morning,heatpump,2040,0.81820000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2035,0.51520000000
+all-year,all-week,morning,electric_stove,2040,0.81820000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2035,0.51520000000
+all-year,all-week,early-peak,heatpump,2040,0.81820000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2035,1.08180000000
+all-year,all-week,late-peak,heatpump,2040,1.71820000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2035,0.72120000000
+all-year,all-week,evening,heatpump,2040,1.14550000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2035,0.72120000000
+all-year,all-week,evening,electric_stove,2040,1.14550000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2035,0.72120000000
+all-year,all-week,early-morning,heatpump,2040,1.14550000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
index ab377708..afb661c9 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
-0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R1,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R1,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R1,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
-0,heat,R2,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
-0,heat,R2,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
-0,heat,R2,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
-0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R1,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
-0,cook,R1,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R1,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
-0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
-0,cook,R2,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
-0,cook,R2,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
-0,cook,R2,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
-1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R1,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R1,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R1,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
-1,heat,R2,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,heat,R2,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
-1,heat,R2,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
-1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R1,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
-1,cook,R1,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R1,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
-1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
-1,cook,R2,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
-1,cook,R2,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
-1,cook,R2,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
-2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R1,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R1,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R1,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-2,heat,R2,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,heat,R2,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-2,heat,R2,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R1,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-2,cook,R1,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R1,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-2,cook,R2,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-2,cook,R2,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-2,cook,R2,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R1,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R1,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R1,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
-3,heat,R2,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,heat,R2,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
-3,heat,R2,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
-3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R1,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-3,cook,R1,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R1,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-3,cook,R2,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-3,cook,R2,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-3,cook,R2,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R1,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R1,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R1,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
-4,heat,R2,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,heat,R2,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
-4,heat,R2,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
-4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R1,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-4,cook,R1,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R1,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-4,cook,R2,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-4,cook,R2,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-4,cook,R2,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R1,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R1,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R1,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
-5,heat,R2,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,heat,R2,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
-5,heat,R2,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
-5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R1,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
-5,cook,R1,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R1,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
-5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
-5,cook,R2,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
-5,cook,R2,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
-5,cook,R2,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
-6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R1,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R1,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R1,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
-6,heat,R2,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,heat,R2,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
-6,heat,R2,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
-6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R1,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-6,cook,R1,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R1,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-6,cook,R2,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-6,cook,R2,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-6,cook,R2,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R1,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R1,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R1,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-7,heat,R2,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,heat,R2,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-7,heat,R2,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R1,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-7,cook,R1,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R1,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-7,cook,R2,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-7,cook,R2,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-7,cook,R2,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+month,day,hour,technology,installed,supply
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2040,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,heatpump,2045,0.48300000000
+all-year,all-week,night,heatpump,2050,0.56700000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2050,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2050,0.56700000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2040,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2050,0.56700000000
+all-year,all-week,night,electric_stove,2045,0.48300000000
+all-year,all-week,night,electric_stove,2050,0.56700000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2040,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,heatpump,2045,0.69000000000
+all-year,all-week,morning,heatpump,2050,0.81000000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2050,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2050,0.81000000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2040,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2050,0.81000000000
+all-year,all-week,morning,electric_stove,2045,0.69000000000
+all-year,all-week,morning,electric_stove,2050,0.81000000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2040,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,heatpump,2045,0.69000000000
+all-year,all-week,early-peak,heatpump,2050,0.81000000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2040,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,heatpump,2045,1.44900000000
+all-year,all-week,late-peak,heatpump,2050,1.70100000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2040,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,heatpump,2045,0.96600000000
+all-year,all-week,evening,heatpump,2050,1.13400000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2050,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2050,1.13400000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2040,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2050,1.13400000000
+all-year,all-week,evening,electric_stove,2045,0.96600000000
+all-year,all-week,evening,electric_stove,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2040,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,heatpump,2045,0.96600000000
+all-year,all-week,early-morning,heatpump,2050,1.13400000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
index aa1218cf..95082ec6 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 64722c81..b19e188b 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,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.29140000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
-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,18.85620000000
-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.43910000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
-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,28.41710000000
-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.29140000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
-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,18.85620000000
-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.43910000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
-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,28.41710000000
-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.87830000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
-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,56.83430000000
-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.58690000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
-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,37.97810000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.89580000000
+R1,all-year,all-week,night,gasboiler,2020,0.29140000000
+R1,all-year,all-week,night,heatpump,2020,0.64110000000
+R1,all-year,all-week,night,gasboiler,2020,57.96670000000
+R1,all-year,all-week,night,gasboiler,2020,18.85620000000
+R1,all-year,all-week,morning,gasboiler,2020,1.35000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
+R1,all-year,all-week,morning,heatpump,2020,0.96610000000
+R1,all-year,all-week,morning,gasboiler,2020,87.35830000000
+R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.89580000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
+R1,all-year,all-week,afternoon,gasboiler,2020,57.96670000000
+R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.35000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
+R1,all-year,all-week,early-peak,gasboiler,2020,87.35830000000
+R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
+R1,all-year,all-week,late-peak,gasboiler,2020,2.70000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
+R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
+R1,all-year,all-week,late-peak,gasboiler,2020,174.71660000000
+R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
+R1,all-year,all-week,evening,gasboiler,2020,1.80420000000
+R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
+R1,all-year,all-week,evening,heatpump,2020,1.29120000000
+R1,all-year,all-week,evening,gasboiler,2020,116.74990000000
+R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
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 0a3b0552..b8cdff62 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,31 +1,31 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.29140000000
-0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,18.85620000000
-1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
-1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
-2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
-2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
-3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
-3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
-4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
-4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
-5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
-5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.29140000000
+R1,all-year,all-week,night,heatpump,2020,0.64110000000
+R1,all-year,all-week,night,heatpump,2020,0.62700000000
+R1,all-year,all-week,night,heatpump,2025,0.34200000000
+R1,all-year,all-week,night,gasboiler,2020,18.85620000000
+R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
+R1,all-year,all-week,morning,heatpump,2020,0.96610000000
+R1,all-year,all-week,morning,heatpump,2020,0.94490000000
+R1,all-year,all-week,morning,heatpump,2025,0.51540000000
+R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
+R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
+R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
+R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
+R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
+R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
+R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
+R1,all-year,all-week,evening,heatpump,2020,1.29120000000
+R1,all-year,all-week,evening,heatpump,2020,1.26280000000
+R1,all-year,all-week,evening,heatpump,2025,0.68880000000
+R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
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 c2562772..ab763d52 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,0.62700000000
+R1,all-year,all-week,night,heatpump,2025,0.34200000000
+R1,all-year,all-week,night,heatpump,2025,0.33210000000
+R1,all-year,all-week,night,heatpump,2030,0.66420000000
+R1,all-year,all-week,morning,heatpump,2020,0.94490000000
+R1,all-year,all-week,morning,heatpump,2025,0.51540000000
+R1,all-year,all-week,morning,heatpump,2025,0.50050000000
+R1,all-year,all-week,morning,heatpump,2030,1.00100000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
+R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
+R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
+R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
+R1,all-year,all-week,evening,heatpump,2020,1.26280000000
+R1,all-year,all-week,evening,heatpump,2025,0.68880000000
+R1,all-year,all-week,evening,heatpump,2025,0.66890000000
+R1,all-year,all-week,evening,heatpump,2030,1.33780000000
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 7198819b..df35bfe1 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.33210000000
+R1,all-year,all-week,night,heatpump,2030,0.66420000000
+R1,all-year,all-week,night,heatpump,2030,0.68230000000
+R1,all-year,all-week,night,heatpump,2035,0.34120000000
+R1,all-year,all-week,morning,heatpump,2025,0.50050000000
+R1,all-year,all-week,morning,heatpump,2030,1.00100000000
+R1,all-year,all-week,morning,heatpump,2030,1.02830000000
+R1,all-year,all-week,morning,heatpump,2035,0.51420000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
+R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
+R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
+R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
+R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
+R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
+R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
+R1,all-year,all-week,evening,heatpump,2025,0.66890000000
+R1,all-year,all-week,evening,heatpump,2030,1.33780000000
+R1,all-year,all-week,evening,heatpump,2030,1.37430000000
+R1,all-year,all-week,evening,heatpump,2035,0.68710000000
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 4e6318ce..5110dedb 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,0.68230000000
+R1,all-year,all-week,night,heatpump,2035,0.34120000000
+R1,all-year,all-week,night,heatpump,2035,0.34700000000
+R1,all-year,all-week,night,heatpump,2040,0.69400000000
+R1,all-year,all-week,morning,heatpump,2030,1.02830000000
+R1,all-year,all-week,morning,heatpump,2035,0.51420000000
+R1,all-year,all-week,morning,heatpump,2035,0.52300000000
+R1,all-year,all-week,morning,heatpump,2040,1.04590000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
+R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
+R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
+R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
+R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
+R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
+R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
+R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
+R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
+R1,all-year,all-week,evening,heatpump,2030,1.37430000000
+R1,all-year,all-week,evening,heatpump,2035,0.68710000000
+R1,all-year,all-week,evening,heatpump,2035,0.69890000000
+R1,all-year,all-week,evening,heatpump,2040,1.39780000000
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 07f99b3c..4f4789a9 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.34700000000
+R1,all-year,all-week,night,heatpump,2040,0.69400000000
+R1,all-year,all-week,night,heatpump,2040,0.66850000000
+R1,all-year,all-week,night,heatpump,2045,0.39000000000
+R1,all-year,all-week,morning,heatpump,2035,0.52300000000
+R1,all-year,all-week,morning,heatpump,2040,1.04590000000
+R1,all-year,all-week,morning,heatpump,2040,1.00750000000
+R1,all-year,all-week,morning,heatpump,2045,0.58770000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
+R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
+R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
+R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
+R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
+R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
+R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
+R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
+R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
+R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
+R1,all-year,all-week,evening,heatpump,2035,0.69890000000
+R1,all-year,all-week,evening,heatpump,2040,1.39780000000
+R1,all-year,all-week,evening,heatpump,2040,1.34650000000
+R1,all-year,all-week,evening,heatpump,2045,0.78540000000
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 c4b1a75d..4ba63417 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,0.39260000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,0.67300000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,0.59160000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,1.01420000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39260000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,0.67300000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,0.59160000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,1.01420000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,1.18330000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,2.02850000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,0.79070000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,1.35550000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,0.66850000000
+R1,all-year,all-week,night,heatpump,2045,0.39000000000
+R1,all-year,all-week,night,heatpump,2045,0.39260000000
+R1,all-year,all-week,night,heatpump,2050,0.67300000000
+R1,all-year,all-week,morning,heatpump,2040,1.00750000000
+R1,all-year,all-week,morning,heatpump,2045,0.58770000000
+R1,all-year,all-week,morning,heatpump,2045,0.59160000000
+R1,all-year,all-week,morning,heatpump,2050,1.01420000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
+R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
+R1,all-year,all-week,afternoon,heatpump,2045,0.39260000000
+R1,all-year,all-week,afternoon,heatpump,2050,0.67300000000
+R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
+R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
+R1,all-year,all-week,early-peak,heatpump,2045,0.59160000000
+R1,all-year,all-week,early-peak,heatpump,2050,1.01420000000
+R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
+R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
+R1,all-year,all-week,late-peak,heatpump,2045,1.18330000000
+R1,all-year,all-week,late-peak,heatpump,2050,2.02850000000
+R1,all-year,all-week,evening,heatpump,2040,1.34650000000
+R1,all-year,all-week,evening,heatpump,2045,0.78540000000
+R1,all-year,all-week,evening,heatpump,2045,0.79070000000
+R1,all-year,all-week,evening,heatpump,2050,1.35550000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
index 3a86cfd2..b8eef2fd 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 aa3821f8..2d5b5fd8 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,29 +1,29 @@
-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
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+all-year,all-week,night,R1,windturbine,2020,0.22220000000
+all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
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 03bd216b..51334117 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,29 +1,29 @@
-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.33330000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-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.50000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-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.33330000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-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.50000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-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,1.00000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-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.66670000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+all-year,all-week,night,R1,windturbine,2020,0.22220000000
+all-year,all-week,night,R1,windturbine,2020,0.33330000000
+all-year,all-week,night,R1,windturbine,2025,0.33330000000
+all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+all-year,all-week,evening,R1,windturbine,2025,0.66670000000
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 4a52d7f1..7a89277e 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,month,day,hour,region,technology,installed,supply
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.33330000000
+all-year,all-week,night,R1,windturbine,2020,0.20000000000
+all-year,all-week,night,R1,windturbine,2025,0.33330000000
+all-year,all-week,night,R1,windturbine,2025,0.20000000000
+all-year,all-week,night,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+all-year,all-week,evening,R1,windturbine,2030,0.80000000000
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 def4be3b..fc6b4ce3 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,month,day,hour,region,technology,installed,supply
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.20000000000
+all-year,all-week,night,R1,windturbine,2020,0.15560000000
+all-year,all-week,night,R1,windturbine,2025,0.20000000000
+all-year,all-week,night,R1,windturbine,2025,0.15560000000
+all-year,all-week,night,R1,windturbine,2030,0.40000000000
+all-year,all-week,night,R1,windturbine,2030,0.31110000000
+all-year,all-week,night,R1,windturbine,2035,0.31110000000
+all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+all-year,all-week,evening,R1,windturbine,2035,0.62220000000
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 f5d07646..6b28d88f 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,month,day,hour,region,technology,installed,supply
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.15560000000
+all-year,all-week,night,R1,windturbine,2020,0.13330000000
+all-year,all-week,night,R1,windturbine,2025,0.15560000000
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2030,0.31110000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.31110000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
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 dce17b90..44b4ffca 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,month,day,hour,region,technology,installed,supply
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.13330000000
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,night,R1,windturbine,2045,0.26670000000
+all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+all-year,all-week,evening,R1,windturbine,2045,0.53330000000
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 df173a2f..41aba6e7 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,month,day,hour,region,technology,installed,supply
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2030,0.24000000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.24000000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.24000000000
+all-year,all-week,night,R1,windturbine,2045,0.26670000000
+all-year,all-week,night,R1,windturbine,2045,0.24000000000
+all-year,all-week,night,R1,windturbine,2050,0.24000000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+all-year,all-week,evening,R1,windturbine,2050,0.48000000000
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 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 729d406d..0fcfe541 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,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
index afe86e12..780086c6 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 83daf7f1..4d84e893 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 7bda2463..2e6ddf59 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c535c679..8211320c 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 9abfcded..b621e872 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2050,1.77780000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
index 266c0564..945f522b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -17,25 +17,21 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_consumption"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -74,7 +70,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -104,7 +99,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -132,7 +126,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
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 ce642a34..197e2957 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,25 +1,25 @@
-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.42220000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
-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.63330000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
-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.63330000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
-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,1.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
-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
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
+all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
+all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
+all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
+all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+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 eb7cf766..c226f06e 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,19 +1,19 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
-0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
-0,3,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
-1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
-1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
-1,3,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-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,3,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
-3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
-3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
-3,3,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
-4,3,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-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,3,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
+all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
+all-year,all-week,night,R1,windturbine,2025,0.66670000000
+all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
+all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
+all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
+all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+all-year,all-week,evening,R1,windturbine,2025,1.00000000000
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 3b5b32fb..31e7544d 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,19 +1,19 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,4,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
-0,4,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
-0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-1,4,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,4,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
-2,4,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
-2,4,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
-2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-3,4,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-3,4,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
-3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-4,4,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,4,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
-5,4,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-5,4,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
-5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.66670000000
+all-year,all-week,night,R1,windturbine,2025,0.40000000000
+all-year,all-week,night,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,morning,R1,windturbine,2030,0.50000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
+all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+all-year,all-week,evening,R1,windturbine,2025,0.80000000000
+all-year,all-week,evening,R1,windturbine,2030,0.80000000000
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 eca7c9eb..7f5807bd 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,31 +1,31 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
-0,5,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
-0,6,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,5,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
-1,6,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
-1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
-2,5,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
-2,6,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
-3,5,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
-3,6,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,5,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
-4,6,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
-4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
-5,5,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
-5,6,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.40000000000
+all-year,all-week,night,R1,windturbine,2025,0.31110000000
+all-year,all-week,night,R1,windturbine,2030,0.40000000000
+all-year,all-week,night,R1,windturbine,2030,0.31110000000
+all-year,all-week,night,R1,windturbine,2035,0.31110000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,morning,R1,windturbine,2025,0.46670000000
+all-year,all-week,morning,R1,windturbine,2030,0.50000000000
+all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+all-year,all-week,evening,R1,windturbine,2025,0.80000000000
+all-year,all-week,evening,R1,windturbine,2025,0.62220000000
+all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+all-year,all-week,evening,R1,windturbine,2035,0.62220000000
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 b71f068d..9eede19b 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,43 +1,43 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
-0,6,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
-0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
-0,8,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
-0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
-1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
-1,6,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
-1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
-1,8,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
-1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
-2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
-2,6,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
-2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
-2,8,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
-2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
-3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
-3,6,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
-3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
-3,8,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
-3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
-4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
-4,6,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
-4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
-4,8,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
-4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
-5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
-5,6,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
-5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
-5,8,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
-5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.31110000000
+all-year,all-week,night,R1,windturbine,2025,0.21330000000
+all-year,all-week,night,R1,windturbine,2030,0.31110000000
+all-year,all-week,night,R1,windturbine,2030,0.21330000000
+all-year,all-week,night,R1,windturbine,2035,0.31110000000
+all-year,all-week,night,R1,windturbine,2035,0.21330000000
+all-year,all-week,night,R1,windturbine,2040,0.42670000000
+all-year,all-week,morning,R1,windturbine,2025,0.46670000000
+all-year,all-week,morning,R1,windturbine,2025,0.32000000000
+all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+all-year,all-week,morning,R1,windturbine,2030,0.32000000000
+all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+all-year,all-week,morning,R1,windturbine,2035,0.32000000000
+all-year,all-week,morning,R1,windturbine,2040,0.64000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
+all-year,all-week,evening,R1,windturbine,2025,0.62220000000
+all-year,all-week,evening,R1,windturbine,2025,0.42670000000
+all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+all-year,all-week,evening,R1,windturbine,2030,0.42670000000
+all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+all-year,all-week,evening,R1,windturbine,2035,0.42670000000
+all-year,all-week,evening,R1,windturbine,2040,0.85330000000
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 bbbec449..81ed1006 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,55 +1,55 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
-0,7,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
-0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
-0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
-0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
-0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
-0,10,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
-0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
-0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
-1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
-1,7,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
-1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
-1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
-1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
-1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
-1,10,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
-1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
-1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
-2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
-2,7,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
-2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
-2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
-2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
-2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
-2,10,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
-2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
-2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
-3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
-3,7,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
-3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
-3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
-3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
-3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
-3,10,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
-3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
-3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
-4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
-4,7,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
-4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
-4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
-4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
-4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
-4,10,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
-4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
-4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
-5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
-5,7,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
-5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
-5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
-5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
-5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
-5,10,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
-5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
-5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.21330000000
+all-year,all-week,night,R1,windturbine,2025,0.17140000000
+all-year,all-week,night,R1,windturbine,2030,0.21330000000
+all-year,all-week,night,R1,windturbine,2030,0.17140000000
+all-year,all-week,night,R1,windturbine,2035,0.21330000000
+all-year,all-week,night,R1,windturbine,2035,0.17140000000
+all-year,all-week,night,R1,windturbine,2040,0.42670000000
+all-year,all-week,night,R1,windturbine,2040,0.34290000000
+all-year,all-week,night,R1,windturbine,2045,0.34290000000
+all-year,all-week,morning,R1,windturbine,2025,0.32000000000
+all-year,all-week,morning,R1,windturbine,2025,0.25710000000
+all-year,all-week,morning,R1,windturbine,2030,0.32000000000
+all-year,all-week,morning,R1,windturbine,2030,0.25710000000
+all-year,all-week,morning,R1,windturbine,2035,0.32000000000
+all-year,all-week,morning,R1,windturbine,2035,0.25710000000
+all-year,all-week,morning,R1,windturbine,2040,0.64000000000
+all-year,all-week,morning,R1,windturbine,2040,0.51430000000
+all-year,all-week,morning,R1,windturbine,2045,0.51430000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
+all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
+all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
+all-year,all-week,evening,R1,windturbine,2025,0.42670000000
+all-year,all-week,evening,R1,windturbine,2025,0.34290000000
+all-year,all-week,evening,R1,windturbine,2030,0.42670000000
+all-year,all-week,evening,R1,windturbine,2030,0.34290000000
+all-year,all-week,evening,R1,windturbine,2035,0.42670000000
+all-year,all-week,evening,R1,windturbine,2035,0.34290000000
+all-year,all-week,evening,R1,windturbine,2040,0.85330000000
+all-year,all-week,evening,R1,windturbine,2040,0.68570000000
+all-year,all-week,evening,R1,windturbine,2045,0.68570000000
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 ceb22ad2..d7fad5a3 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,month,day,hour,region,technology,installed,supply
-0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
-0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
-0,9,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.15000000000
-0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
-0,10,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.15000000000
-0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
-0,11,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.30000000000
-0,12,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
-0,12,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.30000000000
-0,13,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.30000000000
-1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
-1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
-1,9,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.22500000000
-1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
-1,10,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.22500000000
-1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
-1,11,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.45000000000
-1,12,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
-1,12,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.45000000000
-1,13,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.45000000000
-2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
-2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
-2,9,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.15000000000
-2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
-2,10,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.15000000000
-2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
-2,11,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.30000000000
-2,12,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
-2,12,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.30000000000
-2,13,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.30000000000
-3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
-3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
-3,9,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.22500000000
-3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
-3,10,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.22500000000
-3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
-3,11,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.45000000000
-3,12,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
-3,12,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.45000000000
-3,13,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.45000000000
-4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
-4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
-4,9,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.45000000000
-4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
-4,10,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.45000000000
-4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
-4,11,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.90000000000
-4,12,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
-4,12,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.90000000000
-4,13,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.90000000000
-5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
-5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
-5,9,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.30000000000
-5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
-5,10,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.30000000000
-5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
-5,11,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.60000000000
-5,12,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
-5,12,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.60000000000
-5,13,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.60000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.17140000000
+all-year,all-week,night,R1,windturbine,2030,0.17140000000
+all-year,all-week,night,R1,windturbine,2030,0.15000000000
+all-year,all-week,night,R1,windturbine,2035,0.17140000000
+all-year,all-week,night,R1,windturbine,2035,0.15000000000
+all-year,all-week,night,R1,windturbine,2040,0.34290000000
+all-year,all-week,night,R1,windturbine,2040,0.30000000000
+all-year,all-week,night,R1,windturbine,2045,0.34290000000
+all-year,all-week,night,R1,windturbine,2045,0.30000000000
+all-year,all-week,night,R1,windturbine,2050,0.30000000000
+all-year,all-week,morning,R1,windturbine,2025,0.25710000000
+all-year,all-week,morning,R1,windturbine,2030,0.25710000000
+all-year,all-week,morning,R1,windturbine,2030,0.22500000000
+all-year,all-week,morning,R1,windturbine,2035,0.25710000000
+all-year,all-week,morning,R1,windturbine,2035,0.22500000000
+all-year,all-week,morning,R1,windturbine,2040,0.51430000000
+all-year,all-week,morning,R1,windturbine,2040,0.45000000000
+all-year,all-week,morning,R1,windturbine,2045,0.51430000000
+all-year,all-week,morning,R1,windturbine,2045,0.45000000000
+all-year,all-week,morning,R1,windturbine,2050,0.45000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.15000000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.15000000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.30000000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.30000000000
+all-year,all-week,afternoon,R1,windturbine,2050,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.22500000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.22500000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.45000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.45000000000
+all-year,all-week,early-peak,R1,windturbine,2050,0.45000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.45000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.45000000000
+all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.90000000000
+all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.90000000000
+all-year,all-week,late-peak,R1,windturbine,2050,0.90000000000
+all-year,all-week,evening,R1,windturbine,2025,0.34290000000
+all-year,all-week,evening,R1,windturbine,2030,0.34290000000
+all-year,all-week,evening,R1,windturbine,2030,0.30000000000
+all-year,all-week,evening,R1,windturbine,2035,0.34290000000
+all-year,all-week,evening,R1,windturbine,2035,0.30000000000
+all-year,all-week,evening,R1,windturbine,2040,0.68570000000
+all-year,all-week,evening,R1,windturbine,2040,0.60000000000
+all-year,all-week,evening,R1,windturbine,2045,0.68570000000
+all-year,all-week,evening,R1,windturbine,2045,0.60000000000
+all-year,all-week,evening,R1,windturbine,2050,0.60000000000
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 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 729d406d..0fcfe541 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,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
index afe86e12..780086c6 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 83daf7f1..4d84e893 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 7bda2463..2e6ddf59 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 c535c679..8211320c 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,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 9abfcded..b621e872 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2050,1.77780000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
index 266c0564..945f522b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -17,25 +17,21 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_consumption"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -74,7 +70,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -104,7 +99,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -132,7 +126,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
index a9c2ed60..29306d1c 100644
--- a/src/muse/data/example/default/settings.toml
+++ b/src/muse/data/example/default/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -62,7 +60,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -91,7 +88,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -112,7 +108,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index c3ec0db9..d888b70c 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -60,7 +58,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -93,7 +90,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.power.interactions]]
 net = 'new_to_retro'
@@ -118,7 +114,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.gas.interactions]]
 net = 'new_to_retro'
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index 266c0564..945f522b 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -17,25 +17,21 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_supply"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "timeslice_consumption"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 # Carbon budget control
 [carbon_budget_control]
@@ -74,7 +70,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.residential.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -104,7 +99,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.power.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
@@ -132,7 +126,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 0dada7ad..11c3d7b3 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -30,7 +30,6 @@ filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [sectors.industry]
 type = 'default'
@@ -60,7 +59,6 @@ filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
 quantity = "capacity"
 sink = 'csv'
 overwrite = true
-index = false
 
 [[sectors.industry.outputs]]
 filename = '{cwd}/{default_output_dir}/{Sector}/{Quantity}/{year}{suffix}'
diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
index 05dc09d5..e5a6770e 100644
--- a/src/muse/data/example/trade/settings.toml
+++ b/src/muse/data/example/trade/settings.toml
@@ -17,13 +17,11 @@ tolerance_unmet_demand = -0.1
 quantity = "prices"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-index = false
 
 [carbon_budget_control]
 budget = []
@@ -68,7 +66,6 @@ quantity = "capacity"
 sink = 'csv'
 overwrite = true
 columns = ["asset", "year", "region", "technology", "installed", "capacity"]
-index = false
 
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
@@ -113,7 +110,6 @@ columns = [
     "installed",
     "capacity"
 ]
-index = false
 
 [sectors.gas]
 type = 'default'
@@ -154,7 +150,6 @@ columns = [
     "installed",
     "capacity"
 ]
-index = false
 
 [timeslices]
 level_names = ["month", "day", "hour"]
diff --git a/src/muse/outputs/sinks.py b/src/muse/outputs/sinks.py
index 4d7325ee..6a0d57c1 100644
--- a/src/muse/outputs/sinks.py
+++ b/src/muse/outputs/sinks.py
@@ -237,8 +237,12 @@ def to_csv(
         params: A configuration dictionary accepting any argument to `pandas.to_csv`
     """
     params.update({"float_format": "%.11f"})
+    if "index" not in params:
+        params["index"] = False
+
     if isinstance(quantity, xr.DataArray):
         quantity = quantity.to_dataframe()
+
     par_list = [i for i in params.keys()]
     if len(par_list) > 0:
         if "columns" in par_list:
diff --git a/tests/example_outputs/default/Residential/Supply/2020.csv b/tests/example_outputs/default/Residential/Supply/2020.csv
index 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 729d406d..0fcfe541 100644
--- a/tests/example_outputs/default/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default/Residential/Supply/2030.csv b/tests/example_outputs/default/Residential/Supply/2030.csv
index afe86e12..780086c6 100644
--- a/tests/example_outputs/default/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default/Residential/Supply/2035.csv b/tests/example_outputs/default/Residential/Supply/2035.csv
index 83daf7f1..4d84e893 100644
--- a/tests/example_outputs/default/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default/Residential/Supply/2040.csv b/tests/example_outputs/default/Residential/Supply/2040.csv
index 7bda2463..2e6ddf59 100644
--- a/tests/example_outputs/default/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default/Residential/Supply/2045.csv b/tests/example_outputs/default/Residential/Supply/2045.csv
index c535c679..8211320c 100644
--- a/tests/example_outputs/default/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default/Residential/Supply/2050.csv b/tests/example_outputs/default/Residential/Supply/2050.csv
index 9abfcded..b621e872 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2050,1.77780000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2020.csv b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
index 7b8c4061..68e3e122 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2020.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2025.csv b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
index bfe116d0..40364479 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.38330000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2030.csv b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
index 82873caa..551b805a 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.38330000000
+R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+R1,all-year,all-week,night,heatpump,2025,0.38330000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2035.csv b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
index 741ea3c6..74cd3805 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+R1,all-year,all-week,night,heatpump,2025,0.38330000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.89390000000
+R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2040.csv b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
index c802f340..b70d3cbe 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.89390000000
+R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+R1,all-year,all-week,night,heatpump,2035,0.89390000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2045.csv b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
index c7be86b2..14af8770 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+R1,all-year,all-week,night,heatpump,2035,0.89390000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2050.csv b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
index 8c187153..711521d3 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2050.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2050,1.72220000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
index 00b3f810..d84c7cd6 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
@@ -1,9 +1,9 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
-2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.42220000000
+all-year,all-week,morning,R1,windturbine,2020,0.63330000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
+all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+all-year,all-week,evening,R1,windturbine,2020,0.84440000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
index 51182e94..69a8e9e9 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
@@ -1,21 +1,21 @@
-timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
-0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
-4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
-4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.42220000000
+all-year,all-week,night,R1,windturbine,2020,0.33330000000
+all-year,all-week,night,R1,windturbine,2025,0.33330000000
+all-year,all-week,morning,R1,windturbine,2020,0.63330000000
+all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
+all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
+all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,evening,R1,windturbine,2020,0.84440000000
+all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+all-year,all-week,evening,R1,windturbine,2025,0.66670000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
index 4a52d7f1..7a89277e 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,month,day,hour,region,technology,installed,supply
-0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.33330000000
+all-year,all-week,night,R1,windturbine,2020,0.20000000000
+all-year,all-week,night,R1,windturbine,2025,0.33330000000
+all-year,all-week,night,R1,windturbine,2025,0.20000000000
+all-year,all-week,night,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+all-year,all-week,evening,R1,windturbine,2030,0.80000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
index def4be3b..fc6b4ce3 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,month,day,hour,region,technology,installed,supply
-0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.20000000000
+all-year,all-week,night,R1,windturbine,2020,0.15560000000
+all-year,all-week,night,R1,windturbine,2025,0.20000000000
+all-year,all-week,night,R1,windturbine,2025,0.15560000000
+all-year,all-week,night,R1,windturbine,2030,0.40000000000
+all-year,all-week,night,R1,windturbine,2030,0.31110000000
+all-year,all-week,night,R1,windturbine,2035,0.31110000000
+all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+all-year,all-week,evening,R1,windturbine,2035,0.62220000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
index f5d07646..6b28d88f 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,month,day,hour,region,technology,installed,supply
-0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.15560000000
+all-year,all-week,night,R1,windturbine,2020,0.13330000000
+all-year,all-week,night,R1,windturbine,2025,0.15560000000
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2030,0.31110000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.31110000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
index dce17b90..44b4ffca 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,month,day,hour,region,technology,installed,supply
-0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
-0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2020,0.13330000000
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,night,R1,windturbine,2045,0.26670000000
+all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+all-year,all-week,evening,R1,windturbine,2045,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
index df173a2f..41aba6e7 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,month,day,hour,region,technology,installed,supply
-0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
-0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
-0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
-0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
-0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
-0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
-0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
-0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
-0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
-0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
-1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
-5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
+month,day,hour,region,technology,installed,supply
+all-year,all-week,night,R1,windturbine,2025,0.13330000000
+all-year,all-week,night,R1,windturbine,2030,0.26670000000
+all-year,all-week,night,R1,windturbine,2030,0.24000000000
+all-year,all-week,night,R1,windturbine,2035,0.26670000000
+all-year,all-week,night,R1,windturbine,2035,0.24000000000
+all-year,all-week,night,R1,windturbine,2040,0.26670000000
+all-year,all-week,night,R1,windturbine,2040,0.24000000000
+all-year,all-week,night,R1,windturbine,2045,0.26670000000
+all-year,all-week,night,R1,windturbine,2045,0.24000000000
+all-year,all-week,night,R1,windturbine,2050,0.24000000000
+all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+all-year,all-week,evening,R1,windturbine,2050,0.48000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
index 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 729d406d..0fcfe541 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
index afe86e12..780086c6 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
-0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.09200000000
+R1,all-year,all-week,night,heatpump,2025,0.57470000000
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
index 83daf7f1..4d84e893 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
index 7bda2463..2e6ddf59 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
-0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.44440000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
index c535c679..8211320c 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.88890000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
index 9abfcded..b621e872 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.77780000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2045,1.22220000000
+R1,all-year,all-week,night,heatpump,2050,1.77780000000
+R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2020.csv b/tests/example_outputs/medium/Residential/Supply/2020.csv
index c5696bda..31421f44 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,32.35290000000
+R1,all-year,all-week,night,gasboiler,2020,28.75820000000
+R1,all-year,all-week,night,gasstove,2020,0.50000000000
+R1,all-year,all-week,night,gasstove,2020,0.66670000000
+R1,all-year,all-week,night,gasboiler,2020,0.50000000000
+R1,all-year,all-week,night,gasboiler,2020,0.44440000000
+R1,all-year,all-week,night,heatpump,2020,0.22220000000
+R1,all-year,all-week,morning,gasboiler,2020,48.52940000000
+R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
+R1,all-year,all-week,morning,gasstove,2020,0.75000000000
+R1,all-year,all-week,morning,gasstove,2020,1.00000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.75000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
+R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+R1,all-year,all-week,afternoon,gasboiler,2020,32.35290000000
+R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
+R1,all-year,all-week,afternoon,gasstove,2020,0.50000000000
+R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+R1,all-year,all-week,early-peak,gasboiler,2020,48.52940000000
+R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
+R1,all-year,all-week,early-peak,gasstove,2020,0.75000000000
+R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+R1,all-year,all-week,late-peak,gasboiler,2020,97.05880000000
+R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
+R1,all-year,all-week,late-peak,gasstove,2020,1.50000000000
+R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+R1,all-year,all-week,evening,gasboiler,2020,64.70590000000
+R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
+R1,all-year,all-week,evening,gasstove,2020,1.00000000000
+R1,all-year,all-week,evening,gasstove,2020,1.33330000000
+R1,all-year,all-week,evening,gasboiler,2020,1.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
+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 6c0a8f6b..7b5df47e 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,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,25.16340000000
-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.38890000000
-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.22220000000
-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,37.74510000000
-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.58330000000
-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.33330000000
-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,25.16340000000
-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.38890000000
-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.22220000000
-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,37.74510000000
-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.58330000000
-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.33330000000
-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,75.49020000000
-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.16670000000
-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.66670000000
-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,50.32680000000
-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.77780000000
-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.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,28.75820000000
+R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+R1,all-year,all-week,night,gasstove,2020,0.66670000000
+R1,all-year,all-week,night,gasstove,2020,0.22220000000
+R1,all-year,all-week,night,gasstove,2025,0.61110000000
+R1,all-year,all-week,night,gasboiler,2020,0.44440000000
+R1,all-year,all-week,night,heatpump,2020,0.22220000000
+R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+R1,all-year,all-week,night,heatpump,2020,0.22220000000
+R1,all-year,all-week,night,heatpump,2025,0.22220000000
+R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
+R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+R1,all-year,all-week,morning,gasstove,2020,1.00000000000
+R1,all-year,all-week,morning,gasstove,2020,0.33330000000
+R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
+R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
+R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
+R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
+R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
+R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
+R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
+R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
+R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
+R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
+R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
+R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
+R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+R1,all-year,all-week,evening,gasstove,2020,1.33330000000
+R1,all-year,all-week,evening,gasstove,2020,0.44440000000
+R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
+R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+R1,all-year,all-week,evening,heatpump,2025,0.44440000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2030.csv b/tests/example_outputs/medium/Residential/Supply/2030.csv
index 434eea1a..21de9db1 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,month,day,hour,technology,installed,supply
-0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-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,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
-0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2030,5,R1,all-year,all-week,night,heatpump,2020,0.22220000000
-0,heat,2030,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2035,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-0,heat,2035,7,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-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,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-1,heat,2030,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-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,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-2,heat,2030,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-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,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-3,heat,2030,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-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,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-4,heat,2030,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-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,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-5,heat,2030,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-5,heat,2035,7,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+R1,all-year,all-week,night,gasstove,2020,0.22220000000
+R1,all-year,all-week,night,gasstove,2025,0.61110000000
+R1,all-year,all-week,night,gasstove,2025,0.61110000000
+R1,all-year,all-week,night,gasstove,2030,0.38890000000
+R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+R1,all-year,all-week,night,heatpump,2020,0.22220000000
+R1,all-year,all-week,night,heatpump,2025,0.22220000000
+R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+R1,all-year,all-week,night,heatpump,2025,0.22220000000
+R1,all-year,all-week,night,heatpump,2030,0.38890000000
+R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+R1,all-year,all-week,morning,gasstove,2020,0.33330000000
+R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
+R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
+R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
+R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+R1,all-year,all-week,evening,gasstove,2020,0.44440000000
+R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+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 152438f8..9d36866f 100644
--- a/tests/example_outputs/medium/Residential/Supply/2035.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2035.csv
@@ -1,61 +1,61 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-0,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
-0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-0,heat,2035,7,R1,all-year,all-week,night,heatpump,2025,0.22220000000
-0,heat,2035,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-0,heat,2040,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-0,heat,2040,9,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-1,heat,2035,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-2,heat,2035,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-3,heat,2035,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-4,heat,2035,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-5,heat,2035,7,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-5,heat,2035,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+R1,all-year,all-week,night,gasstove,2025,0.61110000000
+R1,all-year,all-week,night,gasstove,2030,0.38890000000
+R1,all-year,all-week,night,gasstove,2030,0.38890000000
+R1,all-year,all-week,night,gasstove,2035,0.77780000000
+R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+R1,all-year,all-week,night,heatpump,2025,0.22220000000
+R1,all-year,all-week,night,heatpump,2030,0.38890000000
+R1,all-year,all-week,night,heatpump,2030,0.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.77780000000
+R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.55560000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2040.csv b/tests/example_outputs/medium/Residential/Supply/2040.csv
index a92754ee..d08665af 100644
--- a/tests/example_outputs/medium/Residential/Supply/2040.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
-0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,heat,2040,9,R1,all-year,all-week,night,heatpump,2030,0.38890000000
-0,heat,2040,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-0,heat,2045,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-0,heat,2045,11,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-1,heat,2040,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-1,heat,2045,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-2,heat,2040,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-2,heat,2045,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-3,heat,2040,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-3,heat,2045,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-4,heat,2040,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-4,heat,2045,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-5,heat,2040,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-5,heat,2045,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-5,heat,2045,11,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasstove,2030,0.38890000000
+R1,all-year,all-week,night,gasstove,2035,0.77780000000
+R1,all-year,all-week,night,gasstove,2035,0.77780000000
+R1,all-year,all-week,night,gasstove,2040,0.55560000000
+R1,all-year,all-week,night,heatpump,2030,0.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.77780000000
+R1,all-year,all-week,night,heatpump,2035,0.77780000000
+R1,all-year,all-week,night,heatpump,2040,0.55560000000
+R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+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 58e9df29..8e927908 100644
--- a/tests/example_outputs/medium/Residential/Supply/2045.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2045.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
-0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
-0,heat,2045,11,R1,all-year,all-week,night,heatpump,2035,0.77780000000
-0,heat,2045,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-0,heat,2050,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-0,heat,2050,13,R1,all-year,all-week,night,heatpump,2045,0.94440000000
-1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-1,heat,2045,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-1,heat,2050,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-2,heat,2045,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-2,heat,2050,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-3,heat,2045,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-3,heat,2050,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-4,heat,2045,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-4,heat,2050,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-5,heat,2045,11,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-5,heat,2045,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-5,heat,2050,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasstove,2035,0.77780000000
+R1,all-year,all-week,night,gasstove,2040,0.55560000000
+R1,all-year,all-week,night,gasstove,2040,0.55560000000
+R1,all-year,all-week,night,gasstove,2045,0.94440000000
+R1,all-year,all-week,night,heatpump,2035,0.77780000000
+R1,all-year,all-week,night,heatpump,2040,0.55560000000
+R1,all-year,all-week,night,heatpump,2040,0.55560000000
+R1,all-year,all-week,night,heatpump,2045,0.94440000000
+R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+R1,all-year,all-week,evening,heatpump,2045,1.88890000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2050.csv b/tests/example_outputs/medium/Residential/Supply/2050.csv
index ea9a8628..0a2f1542 100644
--- a/tests/example_outputs/medium/Residential/Supply/2050.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2050.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
-0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
-0,cook,2055,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
-0,cook,2055,8,R1,all-year,all-week,night,gasstove,2050,0.55560000000
-0,heat,2050,13,R1,all-year,all-week,night,heatpump,2040,0.55560000000
-0,heat,2050,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
-0,heat,2055,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
-0,heat,2055,15,R1,all-year,all-week,night,heatpump,2050,0.55560000000
-1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-1,cook,2055,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-1,cook,2055,8,R1,all-year,all-week,morning,gasstove,2050,0.83330000000
-1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-1,heat,2050,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-1,heat,2055,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-1,heat,2055,15,R1,all-year,all-week,morning,heatpump,2050,0.83330000000
-2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-2,cook,2055,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-2,cook,2055,8,R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
-2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-2,heat,2050,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-2,heat,2055,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-2,heat,2055,15,R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
-3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-3,cook,2055,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-3,cook,2055,8,R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
-3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-3,heat,2050,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-3,heat,2055,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-3,heat,2055,15,R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
-4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-4,cook,2055,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-4,cook,2055,8,R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
-4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-4,heat,2050,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-4,heat,2055,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-4,heat,2055,15,R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
-5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-5,cook,2055,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-5,cook,2055,8,R1,all-year,all-week,evening,gasstove,2050,1.11110000000
-5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-5,heat,2050,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
-5,heat,2055,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
-5,heat,2055,15,R1,all-year,all-week,evening,heatpump,2050,1.11110000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasstove,2040,0.55560000000
+R1,all-year,all-week,night,gasstove,2045,0.94440000000
+R1,all-year,all-week,night,gasstove,2045,0.94440000000
+R1,all-year,all-week,night,gasstove,2050,0.55560000000
+R1,all-year,all-week,night,heatpump,2040,0.55560000000
+R1,all-year,all-week,night,heatpump,2045,0.94440000000
+R1,all-year,all-week,night,heatpump,2045,0.94440000000
+R1,all-year,all-week,night,heatpump,2050,0.55560000000
+R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+R1,all-year,all-week,morning,gasstove,2050,0.83330000000
+R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+R1,all-year,all-week,morning,heatpump,2050,0.83330000000
+R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
+R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
+R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
+R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+R1,all-year,all-week,evening,gasstove,2050,1.11110000000
+R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+R1,all-year,all-week,evening,heatpump,2050,1.11110000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2010.csv b/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
index d0e14abf..33831e4a 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2010,30397.66160000000
+R1,winter,all-week,all-day,procammonia_2,2010,22694.61780000000
+R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
+R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
+R1,winter,all-week,all-day,procammonia_1,2010,7.29300000000
+R1,winter,all-week,all-day,procammonia_2,2010,7.29300000000
+R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
+R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
+R1,summer,all-week,all-day,procammonia_1,2010,31318.80280000000
+R1,summer,all-week,all-day,procammonia_2,2010,23382.33350000000
+R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
+R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
+R1,summer,all-week,all-day,procammonia_1,2010,7.51400000000
+R1,summer,all-week,all-day,procammonia_2,2010,7.51400000000
+R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
+R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,30397.66160000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,22694.61780000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.29300000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,7.29300000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
+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 b7ce66c2..45778e79 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
+R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
+R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
+R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
+R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
+R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
+R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
+R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
+R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
+R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
+R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
+R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,6.69750000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+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 bc309292..cb0c9603 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
+R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
+R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
+R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
+R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
+R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
+R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
+R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+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 618f9819..f7e21cbe 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
+R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
+R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
+R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
+R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
+R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
+R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
+R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,4.31420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+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 971a1bc6..8c25e6cf 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
+R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
+R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
+R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
+R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
+R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
+R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
+R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,3.12250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+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 68b96dd6..8607cb3c 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
+R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
+R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
+R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
+R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+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 21e8b0e5..c9901561 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+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 91510f36..24f07608 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
+R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
+R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
+R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+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 5c1490c8..bba49293 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,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
+region,month,day,hour,technology,installed,supply
+R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
+R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
+R1,winter,all-week,all-day,procammonia_1,2050,20214.22470000000
+R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
+R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
+R1,winter,all-week,all-day,procammonia_1,2050,5.16890000000
+R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
+R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
+R1,summer,all-week,all-day,procammonia_1,2050,20826.77700000000
+R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
+R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
+R1,summer,all-week,all-day,procammonia_1,2050,5.32550000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2050,20214.22470000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
+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 23b15445..8b27272b 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,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,0,MUS$2010/kt,2010
-1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,0,MUS$2010/kt,2010
-2,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,0,MUS$2010/Mt,2010
-3,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,0,MUS$2010/Mt,2010
-4,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,1,MUS$2010/kt,2010
-5,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,1,MUS$2010/kt,2010
-6,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,1,MUS$2010/Mt,2010
-7,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,1,MUS$2010/Mt,2010
-8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,2,MUS$2010/kt,2010
-9,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,2,MUS$2010/kt,2010
-10,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,2,MUS$2010/Mt,2010
-11,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,2,MUS$2010/Mt,2010
-0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,0,MUS$2010/kt,2015
-1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,0,MUS$2010/kt,2015
-2,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,0,MUS$2010/Mt,2015
-3,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,0,MUS$2010/Mt,2015
-4,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,1,MUS$2010/kt,2015
-5,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,1,MUS$2010/kt,2015
-6,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,1,MUS$2010/Mt,2015
-7,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,1,MUS$2010/Mt,2015
-8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,2,MUS$2010/kt,2015
-9,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,2,MUS$2010/kt,2015
-10,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,2,MUS$2010/Mt,2015
-11,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,2,MUS$2010/Mt,2015
-0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,0,MUS$2010/kt,2020
-1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,0,MUS$2010/kt,2020
-2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,0,MUS$2010/kt,2020
-3,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,0,MUS$2010/Mt,2020
-4,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,0,MUS$2010/Mt,2020
-5,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,0,MUS$2010/Mt,2020
-6,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,1,MUS$2010/kt,2020
-7,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,1,MUS$2010/kt,2020
-8,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,1,MUS$2010/kt,2020
-9,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,1,MUS$2010/Mt,2020
-10,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,1,MUS$2010/Mt,2020
-11,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2020
-12,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,2,MUS$2010/kt,2020
-13,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,2,MUS$2010/kt,2020
-14,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,2,MUS$2010/kt,2020
-15,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,2,MUS$2010/Mt,2020
-16,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,2,MUS$2010/Mt,2020
-17,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,2,MUS$2010/Mt,2020
-0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,0,MUS$2010/kt,2025
-1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,0,MUS$2010/kt,2025
-2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,0,MUS$2010/kt,2025
-3,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,0,MUS$2010/kt,2025
-4,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,0,MUS$2010/Mt,2025
-5,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,0,MUS$2010/Mt,2025
-6,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,0,MUS$2010/Mt,2025
-7,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,0,MUS$2010/Mt,2025
-8,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,1,MUS$2010/kt,2025
-9,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,1,MUS$2010/kt,2025
-10,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,1,MUS$2010/kt,2025
-11,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,1,MUS$2010/kt,2025
-12,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,1,MUS$2010/Mt,2025
-13,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,1,MUS$2010/Mt,2025
-14,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2025
-15,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2025
-16,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,2,MUS$2010/kt,2025
-17,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,2,MUS$2010/kt,2025
-18,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,2,MUS$2010/kt,2025
-19,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,2,MUS$2010/kt,2025
-20,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,2,MUS$2010/Mt,2025
-21,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,2,MUS$2010/Mt,2025
-22,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,2,MUS$2010/Mt,2025
-23,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,2,MUS$2010/Mt,2025
-0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,0,MUS$2010/kt,2030
-1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,0,MUS$2010/kt,2030
-2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,0,MUS$2010/kt,2030
-3,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,0,MUS$2010/kt,2030
-4,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,0,MUS$2010/kt,2030
-5,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,0,MUS$2010/Mt,2030
-6,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,0,MUS$2010/Mt,2030
-7,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,0,MUS$2010/Mt,2030
-8,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,0,MUS$2010/Mt,2030
-9,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,0,MUS$2010/Mt,2030
-10,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,1,MUS$2010/kt,2030
-11,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,1,MUS$2010/kt,2030
-12,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,1,MUS$2010/kt,2030
-13,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,1,MUS$2010/kt,2030
-14,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,1,MUS$2010/kt,2030
-15,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,1,MUS$2010/Mt,2030
-16,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,1,MUS$2010/Mt,2030
-17,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2030
-18,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2030
-19,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2030
-20,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,2,MUS$2010/kt,2030
-21,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,2,MUS$2010/kt,2030
-22,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,2,MUS$2010/kt,2030
-23,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,2,MUS$2010/kt,2030
-24,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,2,MUS$2010/kt,2030
-25,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,2,MUS$2010/Mt,2030
-26,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,2,MUS$2010/Mt,2030
-27,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,2,MUS$2010/Mt,2030
-28,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,2,MUS$2010/Mt,2030
-29,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,2,MUS$2010/Mt,2030
-0,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,0,MUS$2010/kt,2035
-1,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,0,MUS$2010/kt,2035
-2,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,0,MUS$2010/kt,2035
-3,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,0,MUS$2010/kt,2035
-4,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,0,MUS$2010/kt,2035
-5,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,0,MUS$2010/kt,2035
-6,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,0,MUS$2010/Mt,2035
-7,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,0,MUS$2010/Mt,2035
-8,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,0,MUS$2010/Mt,2035
-9,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,0,MUS$2010/Mt,2035
-10,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,0,MUS$2010/Mt,2035
-11,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,0,MUS$2010/Mt,2035
-12,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,1,MUS$2010/kt,2035
-13,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,1,MUS$2010/kt,2035
-14,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,1,MUS$2010/kt,2035
-15,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,1,MUS$2010/kt,2035
-16,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,1,MUS$2010/kt,2035
-17,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,1,MUS$2010/kt,2035
-18,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,1,MUS$2010/Mt,2035
-19,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,1,MUS$2010/Mt,2035
-20,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2035
-21,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2035
-22,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2035
-23,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2035
-24,A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,2,MUS$2010/kt,2035
-25,A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,2,MUS$2010/kt,2035
-26,A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,2,MUS$2010/kt,2035
-27,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,2,MUS$2010/kt,2035
-28,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,2,MUS$2010/kt,2035
-29,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,2,MUS$2010/kt,2035
-30,A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,2,MUS$2010/Mt,2035
-31,A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,2,MUS$2010/Mt,2035
-32,A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,2,MUS$2010/Mt,2035
-33,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,2,MUS$2010/Mt,2035
-34,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,2,MUS$2010/Mt,2035
-35,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,2,MUS$2010/Mt,2035
-0,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,0,MUS$2010/kt,2040
-1,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,0,MUS$2010/kt,2040
-2,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,0,MUS$2010/kt,2040
-3,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,0,MUS$2010/kt,2040
-4,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,0,MUS$2010/Mt,2040
-5,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,0,MUS$2010/Mt,2040
-6,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,0,MUS$2010/Mt,2040
-7,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,0,MUS$2010/Mt,2040
-8,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,1,MUS$2010/kt,2040
-9,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,1,MUS$2010/kt,2040
-10,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,1,MUS$2010/kt,2040
-11,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,1,MUS$2010/kt,2040
-12,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2040
-13,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2040
-14,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2040
-15,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2040
-16,A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,2,MUS$2010/kt,2040
-17,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,2,MUS$2010/kt,2040
-18,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,2,MUS$2010/kt,2040
-19,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,2,MUS$2010/kt,2040
-20,A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,2,MUS$2010/Mt,2040
-21,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,2,MUS$2010/Mt,2040
-22,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,2,MUS$2010/Mt,2040
-23,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,2,MUS$2010/Mt,2040
-0,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,0,MUS$2010/kt,2045
-1,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,0,MUS$2010/kt,2045
-2,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,0,MUS$2010/kt,2045
-3,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,0,MUS$2010/kt,2045
-4,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,0,MUS$2010/Mt,2045
-5,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,0,MUS$2010/Mt,2045
-6,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,0,MUS$2010/Mt,2045
-7,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,0,MUS$2010/Mt,2045
-8,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,1,MUS$2010/kt,2045
-9,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,1,MUS$2010/kt,2045
-10,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,1,MUS$2010/kt,2045
-11,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,1,MUS$2010/kt,2045
-12,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2045
-13,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2045
-14,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2045
-15,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2045
-16,A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,2,MUS$2010/kt,2045
-17,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,2,MUS$2010/kt,2045
-18,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,2,MUS$2010/kt,2045
-19,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,2,MUS$2010/kt,2045
-20,A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,2,MUS$2010/Mt,2045
-21,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,2,MUS$2010/Mt,2045
-22,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,2,MUS$2010/Mt,2045
-23,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,2,MUS$2010/Mt,2045
-0,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,0,MUS$2010/kt,2050
-1,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,0,MUS$2010/kt,2050
-2,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,0,MUS$2010/kt,2050
-3,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,0,MUS$2010/kt,2050
-4,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,0,MUS$2010/Mt,2050
-5,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,0,MUS$2010/Mt,2050
-6,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,0,MUS$2010/Mt,2050
-7,A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,0,MUS$2010/Mt,2050
-8,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,1,MUS$2010/kt,2050
-9,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,1,MUS$2010/kt,2050
-10,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,1,MUS$2010/kt,2050
-11,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,1,MUS$2010/kt,2050
-12,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2050
-13,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2050
-14,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2050
-15,A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,1,MUS$2010/Mt,2050
-16,A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,2,MUS$2010/kt,2050
-17,A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,2,MUS$2010/kt,2050
-18,A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,2,MUS$2010/kt,2050
-19,A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,2,MUS$2010/kt,2050
-20,A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,2,MUS$2010/Mt,2050
-21,A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,2,MUS$2010/Mt,2050
-22,A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,2,MUS$2010/Mt,2050
-23,A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,2,MUS$2010/Mt,2050
+agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,30397.66158285232,procammonia_1,0,MUS$2010/kt,2010
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,22694.61779869451,procammonia_2,0,MUS$2010/kt,2010
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_1,0,MUS$2010/Mt,2010
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.29300000068,procammonia_2,0,MUS$2010/Mt,2010
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,31318.80283429535,procammonia_1,1,MUS$2010/kt,2010
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,23382.33348311096,procammonia_2,1,MUS$2010/kt,2010
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_1,1,MUS$2010/Mt,2010
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.51399999863,procammonia_2,1,MUS$2010/Mt,2010
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,30397.66158285232,procammonia_1,2,MUS$2010/kt,2010
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,22694.61779869451,procammonia_2,2,MUS$2010/kt,2010
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_1,2,MUS$2010/Mt,2010
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.29300000068,procammonia_2,2,MUS$2010/Mt,2010
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,34007.42989250853,procammonia_1,0,MUS$2010/kt,2015
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,20680.82894531053,procammonia_2,0,MUS$2010/kt,2015
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,8.22250000227,procammonia_1,0,MUS$2010/Mt,2015
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,6.69753999773,procammonia_2,0,MUS$2010/Mt,2015
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,35037.95806139958,procammonia_1,1,MUS$2010/kt,2015
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,21307.52072565159,procammonia_2,1,MUS$2010/kt,2015
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,8.47166666667,procammonia_1,1,MUS$2010/Mt,2015
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.90049575333,procammonia_2,1,MUS$2010/Mt,2015
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,34007.42989250853,procammonia_1,2,MUS$2010/kt,2015
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,20680.82894531053,procammonia_2,2,MUS$2010/kt,2015
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,8.22250000227,procammonia_1,2,MUS$2010/Mt,2015
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,6.69753999773,procammonia_2,2,MUS$2010/Mt,2015
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,28852.69853027302,procammonia_1,0,MUS$2010/kt,2020
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,16868.96930416728,procammonia_2,0,MUS$2010/kt,2020
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9780.57579057130,procammonia_1,0,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,7.03083333344,procammonia_1,0,MUS$2010/Mt,2020
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.50587332890,procammonia_2,0,MUS$2010/Mt,2020
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333766,procammonia_1,0,MUS$2010/Mt,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,29727.02271995599,procammonia_1,1,MUS$2010/kt,2020
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,17380.15018737576,procammonia_2,1,MUS$2010/kt,2020
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,10076.95687235302,procammonia_1,1,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,7.24388888700,procammonia_1,1,MUS$2010/Mt,2020
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,5.67271797367,procammonia_2,1,MUS$2010/Mt,2020
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,28852.69853027302,procammonia_1,2,MUS$2010/kt,2020
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,16868.96930416728,procammonia_2,2,MUS$2010/kt,2020
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9780.57579057130,procammonia_1,2,MUS$2010/kt,2020
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,7.03083333344,procammonia_1,2,MUS$2010/Mt,2020
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.50587332890,procammonia_2,2,MUS$2010/Mt,2020
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333766,procammonia_1,2,MUS$2010/Mt,2020
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,23774.61745868616,procammonia_1,0,MUS$2010/kt,2025
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,13114.33607353469,procammonia_2,0,MUS$2010/kt,2025
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9703.92550979379,procammonia_1,0,MUS$2010/kt,2025
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9748.27496047046,procammonia_1,0,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,5.83916666713,procammonia_1,0,MUS$2010/Mt,2025
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.31420666265,procammonia_2,0,MUS$2010/Mt,2025
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333756,procammonia_1,0,MUS$2010/Mt,2025
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578765,procammonia_1,0,MUS$2010/Mt,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,24495.06040618948,procammonia_1,1,MUS$2010/kt,2025
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,13511.74019378120,procammonia_2,1,MUS$2010/kt,2025
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9997.98385621208,procammonia_1,1,MUS$2010/kt,2025
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,10043.67722962572,procammonia_1,1,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,6.01611111017,procammonia_1,1,MUS$2010/Mt,2025
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.44494019683,procammonia_2,1,MUS$2010/Mt,2025
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2025
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,23774.61745868616,procammonia_1,2,MUS$2010/kt,2025
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,13114.33607353469,procammonia_2,2,MUS$2010/kt,2025
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9703.92550979379,procammonia_1,2,MUS$2010/kt,2025
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9748.27496047046,procammonia_1,2,MUS$2010/kt,2025
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,5.83916666713,procammonia_1,2,MUS$2010/Mt,2025
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.31420666265,procammonia_2,2,MUS$2010/Mt,2025
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333756,procammonia_1,2,MUS$2010/Mt,2025
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578765,procammonia_1,2,MUS$2010/Mt,2025
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,18773.18666438033,procammonia_1,0,MUS$2010/kt,2030
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,9416.92924324588,procammonia_2,0,MUS$2010/kt,2030
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9627.27522902292,procammonia_1,0,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9671.27436808157,procammonia_1,0,MUS$2010/kt,2030
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9671.27437474662,procammonia_1,0,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,4.64750000009,procammonia_1,0,MUS$2010/Mt,2030
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,3.12253999567,procammonia_2,0,MUS$2010/Mt,2030
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333747,procammonia_1,0,MUS$2010/Mt,2030
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578756,procammonia_1,0,MUS$2010/Mt,2030
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578921,procammonia_1,0,MUS$2010/Mt,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,19342.07110494816,procammonia_1,1,MUS$2010/kt,2030
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,9702.29073355563,procammonia_2,1,MUS$2010/kt,2030
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9919.01084007114,procammonia_1,1,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9964.34328636507,procammonia_1,1,MUS$2010/kt,2030
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9964.34329323209,procammonia_1,1,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,4.78833333248,procammonia_1,1,MUS$2010/Mt,2030
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,3.21716241915,procammonia_2,1,MUS$2010/Mt,2030
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2030
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2030
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,18773.18666438033,procammonia_1,2,MUS$2010/kt,2030
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,9416.92924324588,procammonia_2,2,MUS$2010/kt,2030
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9627.27522902292,procammonia_1,2,MUS$2010/kt,2030
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9671.27436808157,procammonia_1,2,MUS$2010/kt,2030
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9671.27437474662,procammonia_1,2,MUS$2010/kt,2030
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,4.64750000009,procammonia_1,2,MUS$2010/Mt,2030
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,3.12253999567,procammonia_2,2,MUS$2010/Mt,2030
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333747,procammonia_1,2,MUS$2010/Mt,2030
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578756,procammonia_1,2,MUS$2010/Mt,2030
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578921,procammonia_1,2,MUS$2010/Mt,2030
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,4775.31246614086,procammonia_1,0,MUS$2010/kt,2035
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,winter,R1,industry,3565.20487545684,procammonia_2,0,MUS$2010/kt,2035
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,winter,R1,industry,9550.62494770967,procammonia_1,0,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9594.27377514783,procammonia_1,0,MUS$2010/kt,2035
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9594.27378175981,procammonia_1,0,MUS$2010/kt,2035
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20712.93095079166,procammonia_1,0,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_1,0,MUS$2010/Mt,2035
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,winter,R1,industry,1.19166666669,procammonia_2,0,MUS$2010/Mt,2035
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,winter,R1,industry,2.38333333724,procammonia_1,0,MUS$2010/Mt,2035
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578733,procammonia_1,0,MUS$2010/Mt,2035
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578898,procammonia_1,0,MUS$2010/Mt,2035
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744307,procammonia_1,0,MUS$2010/Mt,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,4920.01890401737,procammonia_1,1,MUS$2010/kt,2035
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,summer,R1,industry,3673.24138646744,procammonia_2,1,MUS$2010/kt,2035
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,summer,R1,industry,9840.03782393019,procammonia_1,1,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9885.00934310442,procammonia_1,1,MUS$2010/kt,2035
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9885.00934991676,procammonia_1,1,MUS$2010/kt,2035
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21340.59552292663,procammonia_1,1,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_1,1,MUS$2010/Mt,2035
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,summer,R1,industry,1.22777777768,procammonia_2,1,MUS$2010/Mt,2035
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,summer,R1,industry,2.45555555933,procammonia_1,1,MUS$2010/Mt,2035
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2035
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2035
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2035
+A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,4775.31246614086,procammonia_1,2,MUS$2010/kt,2035
+A1,1,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2010,spring-autumn,R1,industry,3565.20487545684,procammonia_2,2,MUS$2010/kt,2035
+A1,2,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2015,spring-autumn,R1,industry,9550.62494770967,procammonia_1,2,MUS$2010/kt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9594.27377514783,procammonia_1,2,MUS$2010/kt,2035
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9594.27378175981,procammonia_1,2,MUS$2010/kt,2035
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20712.93095079166,procammonia_1,2,MUS$2010/kt,2035
+A1,0,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_1,2,MUS$2010/Mt,2035
+A1,1,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2010,spring-autumn,R1,industry,1.19166666669,procammonia_2,2,MUS$2010/Mt,2035
+A1,2,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2015,spring-autumn,R1,industry,2.38333333724,procammonia_1,2,MUS$2010/Mt,2035
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578733,procammonia_1,2,MUS$2010/Mt,2035
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578898,procammonia_1,2,MUS$2010/Mt,2035
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744307,procammonia_1,2,MUS$2010/Mt,2035
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,winter,R1,industry,9517.27318220130,procammonia_1,0,MUS$2010/kt,2040
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9517.27318876022,procammonia_1,0,MUS$2010/kt,2040
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20546.69554806604,procammonia_1,0,MUS$2010/kt,2040
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,18081.97813945043,procammonia_1,0,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,winter,R1,industry,2.39422578709,procammonia_1,0,MUS$2010/Mt,2040
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578874,procammonia_1,0,MUS$2010/Mt,2040
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744255,procammonia_1,0,MUS$2010/Mt,2040
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745162,procammonia_1,0,MUS$2010/Mt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,summer,R1,industry,9805.67539984377,procammonia_1,1,MUS$2010/kt,2040
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9805.67540660143,procammonia_1,1,MUS$2010/kt,2040
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,21169.32268588623,procammonia_1,1,MUS$2010/kt,2040
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18629.91687094893,procammonia_1,1,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,summer,R1,industry,2.46677808367,procammonia_1,1,MUS$2010/Mt,2040
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2040
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2040
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2040
+A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2020,spring-autumn,R1,industry,9517.27318220130,procammonia_1,2,MUS$2010/kt,2040
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9517.27318876022,procammonia_1,2,MUS$2010/kt,2040
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20546.69554806604,procammonia_1,2,MUS$2010/kt,2040
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,18081.97813945043,procammonia_1,2,MUS$2010/kt,2040
+A1,3,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2020,spring-autumn,R1,industry,2.39422578709,procammonia_1,2,MUS$2010/Mt,2040
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578874,procammonia_1,2,MUS$2010/Mt,2040
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744255,procammonia_1,2,MUS$2010/Mt,2040
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745162,procammonia_1,2,MUS$2010/Mt,2040
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,winter,R1,industry,9440.27259691583,procammonia_1,0,MUS$2010/kt,2045
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20380.46014783439,procammonia_1,0,MUS$2010/kt,2045
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17935.68381849941,procammonia_1,0,MUS$2010/kt,2045
+A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7828.40914377241,procammonia_1,0,MUS$2010/kt,2045
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,winter,R1,industry,2.39422578879,procammonia_1,0,MUS$2010/Mt,2045
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744266,procammonia_1,0,MUS$2010/Mt,2045
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745172,procammonia_1,0,MUS$2010/Mt,2045
+A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773684,procammonia_1,0,MUS$2010/Mt,2045
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,summer,R1,industry,9726.34146328611,procammonia_1,1,MUS$2010/kt,2045
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20998.04984884583,procammonia_1,1,MUS$2010/kt,2045
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18479.18938837144,procammonia_1,1,MUS$2010/kt,2045
+A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,8065.63366311239,procammonia_1,1,MUS$2010/kt,2045
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,summer,R1,industry,2.46677808537,procammonia_1,1,MUS$2010/Mt,2045
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2045
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2045
+A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2045
+A1,4,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2025,spring-autumn,R1,industry,9440.27259691583,procammonia_1,2,MUS$2010/kt,2045
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20380.46014783439,procammonia_1,2,MUS$2010/kt,2045
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17935.68381849941,procammonia_1,2,MUS$2010/kt,2045
+A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7828.40914377241,procammonia_1,2,MUS$2010/kt,2045
+A1,4,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2025,spring-autumn,R1,industry,2.39422578879,procammonia_1,2,MUS$2010/Mt,2045
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744266,procammonia_1,2,MUS$2010/Mt,2045
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745172,procammonia_1,2,MUS$2010/Mt,2045
+A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773684,procammonia_1,2,MUS$2010/Mt,2045
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,winter,R1,industry,20214.22474762099,procammonia_1,0,MUS$2010/kt,2050
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,winter,R1,industry,17789.38949756446,procammonia_1,0,MUS$2010/kt,2050
+A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,winter,R1,industry,7764.55588836946,procammonia_1,0,MUS$2010/kt,2050
+A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,winter,R1,industry,7764.55589482224,procammonia_1,0,MUS$2010/kt,2050
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,winter,R1,industry,5.16885744278,procammonia_1,0,MUS$2010/Mt,2050
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,winter,R1,industry,4.54881745182,procammonia_1,0,MUS$2010/Mt,2050
+A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,winter,R1,industry,1.98542773688,procammonia_1,0,MUS$2010/Mt,2050
+A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,winter,R1,industry,1.98542773853,procammonia_1,0,MUS$2010/Mt,2050
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,summer,R1,industry,20826.77701180542,procammonia_1,1,MUS$2010/kt,2050
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,summer,R1,industry,18328.46190579394,procammonia_1,1,MUS$2010/kt,2050
+A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,summer,R1,industry,7999.84546040052,procammonia_1,1,MUS$2010/kt,2050
+A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,summer,R1,industry,7999.84546704883,procammonia_1,1,MUS$2010/kt,2050
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,summer,R1,industry,5.32548948627,procammonia_1,1,MUS$2010/Mt,2050
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,summer,R1,industry,4.68666040470,procammonia_1,1,MUS$2010/Mt,2050
+A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,summer,R1,industry,2.04559221367,procammonia_1,1,MUS$2010/Mt,2050
+A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,summer,R1,industry,2.04559221537,procammonia_1,1,MUS$2010/Mt,2050
+A1,5,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2030,spring-autumn,R1,industry,20214.22474762099,procammonia_1,2,MUS$2010/kt,2050
+A1,6,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2035,spring-autumn,R1,industry,17789.38949756446,procammonia_1,2,MUS$2010/kt,2050
+A1,7,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2040,spring-autumn,R1,industry,7764.55588836946,procammonia_1,2,MUS$2010/kt,2050
+A1,8,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,all-day,2045,spring-autumn,R1,industry,7764.55589482224,procammonia_1,2,MUS$2010/kt,2050
+A1,5,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2030,spring-autumn,R1,industry,5.16885744278,procammonia_1,2,MUS$2010/Mt,2050
+A1,6,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2035,spring-autumn,R1,industry,4.54881745182,procammonia_1,2,MUS$2010/Mt,2050
+A1,7,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2040,spring-autumn,R1,industry,1.98542773688,procammonia_1,2,MUS$2010/Mt,2050
+A1,8,newcapa,PRODUCT,ammonia,all-week,R1,all-day,2045,spring-autumn,R1,industry,1.98542773853,procammonia_1,2,MUS$2010/Mt,2050
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
index 7b8c4061..68e3e122 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,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
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+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 b07adde6..5fb53d24 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
-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.61110000000
-0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-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,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.91670000000
-1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-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,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.61110000000
-2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-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,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.91670000000
-3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-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,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.83330000000
-4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-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,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,1.22220000000
-5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
index 33951ce2..0c048387 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-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.61110000000
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-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.91670000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-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.61110000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-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.91670000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-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.83330000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-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,1.22220000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2020,1.05560000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
index c606a299..3c78922e 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
-0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
-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.94440000000
-1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-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.41670000000
-2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-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.94440000000
-3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-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.41670000000
-4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-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.83330000000
-5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-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.88890000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2025,0.61110000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
index d66038bc..103b89e5 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-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.94440000000
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-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.41670000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-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.94440000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-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.41670000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-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.83330000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-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.88890000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2030,1.38890000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
index 2f0389d3..d7563a22 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
-0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
-0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2035,0.94440000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
index 3b6658d8..711521d3 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,month,day,hour,technology,installed,supply
-0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
-0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
-0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
-1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+region,month,day,hour,technology,installed,supply
+R1,all-year,all-week,night,heatpump,2040,1.72220000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2045,1.27780000000
+R1,all-year,all-week,night,heatpump,2050,1.72220000000
+R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+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
index a35c2ed5..a8ff7994 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -1,11 +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,2020,1,R2,gassupply1,2010,1200.00000000000
+R2,2025,1,R2,gassupply1,2010,700.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 9777d794..0389a29d 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -1,9 +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,2025,1,R2,gassupply1,2010,700.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 023078ee..52525599 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -1,9 +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,2030,1,R2,gassupply1,2010,700.00000000000
+R2,2035,1,R2,gassupply1,2010,490.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index c232f077..10517be7 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -1,7 +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,2035,1,R2,gassupply1,2010,490.00000000000
+R2,2040,1,R2,gassupply1,2010,490.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
index 66b1b173..29c0c8bd 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -1,15 +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,2020,1,R2,gasCCGT,2010,200.00000000000
+R2,2025,1,R2,gasCCGT,2010,140.00000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index 2e29060b..16c86de5 100644
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -1,13 +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,2025,1,R2,gasCCGT,2010,140.00000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index bb6eddda..3325b247 100644
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -1,11 +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,2030,1,R2,gasCCGT,2010,98.00000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 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
index 768699fc..4d46864b 100644
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -1,9 +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,2035,1,R2,gasCCGT,2010,68.60000000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
 R2,2050,1,R2,gasCCGT,2010,23.52980000000

From 95c43c235f3de8f52a49e1a3dd2b1acd0904b2fd Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 17:03:18 +0100
Subject: [PATCH 408/419] Fix return type annotation

---
 src/muse/outputs/mca.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 77318991..c73b97ac 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -150,14 +150,14 @@ def reformat_finite_resources(params):
 @round_values
 def consumption(
     market: xr.Dataset, sectors: list[AbstractSector], **kwargs
-) -> xr.DataArray:
+) -> pd.DataFrame:
     """Current consumption."""
     return market_quantity(market.consumption, **kwargs).to_dataframe().reset_index()
 
 
 @register_output_quantity
 @round_values
-def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> xr.DataArray:
+def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> pd.DataFrame:
     """Current supply."""
     return market_quantity(market.supply, **kwargs).to_dataframe().reset_index()
 
@@ -1284,9 +1284,7 @@ def capacity_to_service_demand(demand, technologies):
             if not data_agent.empty:
                 data_sector.append(data_agent)
     if len(data_sector) > 0:
-        output = pd.concat(data_sector, sort=True)
-        output = output.reset_index()
-
+        output = pd.concat(data_sector, sort=True).reset_index()
     else:
         output = pd.DataFrame()
     return output

From 40af4e670c93ca6c6554d3016ac89a0ad77c8a8e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 23 Jul 2024 07:29:20 +0100
Subject: [PATCH 409/419] Fix test

---
 tests/test_outputs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index 6f19d50e..78a5e008 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -256,14 +256,14 @@ def test_yearly_aggregate_file(tmpdir):
     data["year"] = 2010
     assert sink(data, 2010) == path
     dataframe = pd.read_csv(path)
-    assert set(dataframe.columns) == {"a", "year", "georges"}
+    assert set(dataframe.columns) == {"year", "georges"}
     assert dataframe.shape[0] == 2
 
     data = xr.DataArray([0, 1], coords=dict(a=[2, 4]), dims="a", name="georges")
     data["year"] = 2020
     assert sink(data, 2020) == path
     dataframe = pd.read_csv(path)
-    assert set(dataframe.columns) == {"a", "year", "georges"}
+    assert set(dataframe.columns) == {"year", "georges"}
     assert dataframe.shape[0] == 4
 
 

From e6c0853b42a21520c9f5ce2e5655cd2ab8facd76 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Tue, 23 Jul 2024 09:06:40 +0100
Subject: [PATCH 410/419] Fix index issue for sector files

---
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../Results/Residential/Supply/2020.csv       | 242 +++---
 .../Results/Residential/Supply/2025.csv       | 242 +++---
 .../Results/Residential/Supply/2030.csv       | 194 ++---
 .../Results/Residential/Supply/2035.csv       | 194 ++---
 .../Results/Residential/Supply/2040.csv       | 194 ++---
 .../Results/Residential/Supply/2045.csv       | 194 ++---
 .../Results/Residential/Supply/2050.csv       | 194 ++---
 .../Results/Residential/Supply/2020.csv       | 322 ++++----
 .../Results/Residential/Supply/2025.csv       | 322 ++++----
 .../Results/Residential/Supply/2030.csv       | 258 +++----
 .../Results/Residential/Supply/2035.csv       | 258 +++----
 .../Results/Residential/Supply/2040.csv       | 258 +++----
 .../Results/Residential/Supply/2045.csv       | 258 +++----
 .../Results/Residential/Supply/2050.csv       | 258 +++----
 .../Results/Residential/Supply/2020.csv       | 322 ++++----
 .../Results/Residential/Supply/2022.csv       | 450 +++++------
 .../Results/Residential/Supply/2024.csv       | 578 +++++++-------
 .../Results/Residential/Supply/2026.csv       | 706 +++++++++---------
 .../Results/Residential/Supply/2028.csv       | 706 +++++++++---------
 .../Results/Residential/Supply/2030.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2032.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2034.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2036.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2038.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2040.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2020.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2025.csv       | 642 ++++++++--------
 .../Results/Residential/Supply/2030.csv       | 514 ++++++-------
 .../Results/Residential/Supply/2035.csv       | 514 ++++++-------
 .../Results/Residential/Supply/2040.csv       | 514 ++++++-------
 .../Results/Residential/Supply/2045.csv       | 514 ++++++-------
 .../Results/Residential/Supply/2050.csv       | 514 ++++++-------
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../Results/Power/Supply/2020.csv             |  58 +-
 .../Results/Power/Supply/2025.csv             |  58 +-
 .../Results/Power/Supply/2030.csv             |  62 +-
 .../Results/Power/Supply/2035.csv             |  86 +--
 .../Results/Power/Supply/2040.csv             | 110 +--
 .../Results/Power/Supply/2045.csv             | 122 +--
 .../Results/Power/Supply/2050.csv             | 122 +--
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 .../Results/Power/Supply/2020.csv             |  50 +-
 .../Results/Power/Supply/2025.csv             |  38 +-
 .../Results/Power/Supply/2030.csv             |  38 +-
 .../Results/Power/Supply/2035.csv             |  62 +-
 .../Results/Power/Supply/2040.csv             |  86 +--
 .../Results/Power/Supply/2045.csv             | 110 +--
 .../Results/Power/Supply/2050.csv             | 122 +--
 .../Results/Residential/Supply/2020.csv       |  62 +-
 .../Results/Residential/Supply/2025.csv       |  62 +-
 .../Results/Residential/Supply/2030.csv       |  50 +-
 .../Results/Residential/Supply/2035.csv       |  50 +-
 .../Results/Residential/Supply/2040.csv       |  50 +-
 .../Results/Residential/Supply/2045.csv       |  50 +-
 .../Results/Residential/Supply/2050.csv       |  50 +-
 src/muse/outputs/sector.py                    |   3 +
 .../default/Residential/Supply/2020.csv       |  62 +-
 .../default/Residential/Supply/2025.csv       |  62 +-
 .../default/Residential/Supply/2030.csv       |  50 +-
 .../default/Residential/Supply/2035.csv       |  50 +-
 .../default/Residential/Supply/2040.csv       |  50 +-
 .../default/Residential/Supply/2045.csv       |  50 +-
 .../default/Residential/Supply/2050.csv       |  50 +-
 .../default_retro/Residential/Supply/2020.csv |  62 +-
 .../default_retro/Residential/Supply/2025.csv |  86 +--
 .../default_retro/Residential/Supply/2030.csv |  98 +--
 .../default_retro/Residential/Supply/2035.csv |  98 +--
 .../default_retro/Residential/Supply/2040.csv |  98 +--
 .../default_retro/Residential/Supply/2045.csv |  74 +-
 .../default_retro/Residential/Supply/2050.csv |  50 +-
 .../default_timeslice/Power/Supply/2020.csv   |  18 +-
 .../default_timeslice/Power/Supply/2025.csv   |  42 +-
 .../default_timeslice/Power/Supply/2030.csv   |  62 +-
 .../default_timeslice/Power/Supply/2035.csv   |  86 +--
 .../default_timeslice/Power/Supply/2040.csv   | 110 +--
 .../default_timeslice/Power/Supply/2045.csv   | 122 +--
 .../default_timeslice/Power/Supply/2050.csv   | 122 +--
 .../Residential/Supply/2020.csv               |  62 +-
 .../Residential/Supply/2025.csv               |  62 +-
 .../Residential/Supply/2030.csv               |  50 +-
 .../Residential/Supply/2035.csv               |  50 +-
 .../Residential/Supply/2040.csv               |  50 +-
 .../Residential/Supply/2045.csv               |  50 +-
 .../Residential/Supply/2050.csv               |  50 +-
 .../medium/Residential/Supply/2020.csv        |  86 +--
 .../medium/Residential/Supply/2025.csv        | 122 +--
 .../medium/Residential/Supply/2030.csv        | 146 ++--
 .../medium/Residential/Supply/2035.csv        | 122 +--
 .../medium/Residential/Supply/2040.csv        |  98 +--
 .../medium/Residential/Supply/2045.csv        |  98 +--
 .../medium/Residential/Supply/2050.csv        |  98 +--
 .../minimum_service/Industry/Supply/2010.csv  |  50 +-
 .../minimum_service/Industry/Supply/2015.csv  |  62 +-
 .../minimum_service/Industry/Supply/2020.csv  |  86 +--
 .../minimum_service/Industry/Supply/2025.csv  | 110 +--
 .../minimum_service/Industry/Supply/2030.csv  | 134 ++--
 .../minimum_service/Industry/Supply/2035.csv  | 122 +--
 .../minimum_service/Industry/Supply/2040.csv  |  98 +--
 .../minimum_service/Industry/Supply/2045.csv  |  98 +--
 .../minimum_service/Industry/Supply/2050.csv  |  98 +--
 .../Residential/Supply/2020.csv               |  62 +-
 .../Residential/Supply/2025.csv               |  62 +-
 .../Residential/Supply/2030.csv               |  50 +-
 .../Residential/Supply/2035.csv               |  50 +-
 .../Residential/Supply/2040.csv               |  50 +-
 .../Residential/Supply/2045.csv               |  50 +-
 .../Residential/Supply/2050.csv               |  50 +-
 147 files changed, 10741 insertions(+), 10738 deletions(-)

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 68e3e122..7b8c4061 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 0fcfe541..729d406d 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,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
index 780086c6..afe86e12 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 4d84e893..83daf7f1 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 2e6ddf59..7bda2463 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 8211320c..c535c679 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 b621e872..9abfcded 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2050,1.77780000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
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 68e3e122..7b8c4061 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 0fcfe541..729d406d 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,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
index 780086c6..afe86e12 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 4d84e893..83daf7f1 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 2e6ddf59..7bda2463 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 8211320c..c535c679 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 b621e872..9abfcded 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2050,1.77780000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
index 68e3e122..7b8c4061 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
index 5fb53d24..b07adde6 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+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.61110000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,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.91670000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,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.61110000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,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.91670000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,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.83330000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,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,1.22220000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
index 0c048387..33951ce2 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+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.61110000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.91670000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.61110000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.91670000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.83330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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,1.22220000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
index 3c78922e..c606a299 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.94440000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.41670000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.94440000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.41670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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.83330000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+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.88890000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
index 103b89e5..d66038bc 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+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.94440000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+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.41670000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+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.94440000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+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.41670000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+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.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+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.88890000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
index d7563a22..2f0389d3 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
index 711521d3..3b6658d8 100644
--- a/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-single-objective/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2050,1.72220000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
index 68e3e122..7b8c4061 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
index 5fb53d24..b07adde6 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+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.61110000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,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.91670000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,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.61110000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,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.91670000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,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.83330000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,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,1.22220000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
index 0c048387..33951ce2 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+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.61110000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.91670000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.61110000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.91670000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.83330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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,1.22220000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
index 3c78922e..c606a299 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.94440000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.41670000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.94440000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.41670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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.83330000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+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.88890000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
index 103b89e5..d66038bc 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+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.94440000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+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.41670000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+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.94440000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+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.41670000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+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.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+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.88890000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
index d7563a22..2f0389d3 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
index 711521d3..3b6658d8 100644
--- a/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2050,1.72220000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
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 8880de8c..597d50b7 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.50000000000
-all-year,all-week,night,gasboiler,2020,0.50000000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,gasboiler,2020,0.50000000000
-all-year,all-week,night,gasboiler,2020,0.50000000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,gasboiler,2020,32.35500000000
-all-year,all-week,night,gasboiler,2020,32.35500000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,night,gasboiler,2020,32.35500000000
-all-year,all-week,night,gasboiler,2020,32.35500000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,morning,gasboiler,2020,0.75000000000
-all-year,all-week,morning,gasboiler,2020,0.75000000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,gasboiler,2020,0.75000000000
-all-year,all-week,morning,gasboiler,2020,0.75000000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,gasboiler,2020,48.53250000000
-all-year,all-week,morning,gasboiler,2020,48.53250000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,morning,gasboiler,2020,48.53250000000
-all-year,all-week,morning,gasboiler,2020,48.53250000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-all-year,all-week,afternoon,gasboiler,2020,32.35500000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-all-year,all-week,early-peak,gasboiler,2020,48.53250000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-all-year,all-week,late-peak,gasboiler,2020,97.06500000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,evening,gasboiler,2020,1.00000000000
-all-year,all-week,evening,gasboiler,2020,1.00000000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,gasboiler,2020,1.00000000000
-all-year,all-week,evening,gasboiler,2020,1.00000000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,gasboiler,2020,64.71000000000
-all-year,all-week,evening,gasboiler,2020,64.71000000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
-all-year,all-week,evening,gasboiler,2020,64.71000000000
-all-year,all-week,evening,gasboiler,2020,64.71000000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
-all-year,all-week,evening,gasboiler,2020,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,2,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,heatpump,2020,0.52780000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
+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,2,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,heatpump,2020,0.52780000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
+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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,0.79170000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
+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,2,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,heatpump,2020,0.79170000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
+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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,0.52780000000
+2,heat,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+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,2,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,heatpump,2020,0.52780000000
+2,heat,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,0.79170000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+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,2,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,heatpump,2020,0.79170000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,1.58330000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+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,2,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,heatpump,2020,1.58330000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+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,2,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,2,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,2,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,2,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,2,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,heatpump,2020,1.05560000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
+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,2,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,heatpump,2020,1.05560000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
+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,2,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,2,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,2,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,2,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 f6d48be8..8a6b5683 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,121 +1,121 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,gasboiler,2020,0.13890000000
-all-year,all-week,night,heatpump,2020,0.52780000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,night,gasboiler,2020,8.98750000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,gasboiler,2020,0.20830000000
-all-year,all-week,morning,heatpump,2020,0.79170000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,morning,gasboiler,2020,13.48120000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,gasboiler,2020,0.13890000000
-all-year,all-week,afternoon,heatpump,2020,0.52780000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,afternoon,gasboiler,2020,8.98750000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,gasboiler,2020,0.20830000000
-all-year,all-week,early-peak,heatpump,2020,0.79170000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,early-peak,gasboiler,2020,13.48120000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,gasboiler,2020,0.41670000000
-all-year,all-week,late-peak,heatpump,2020,1.58330000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,late-peak,gasboiler,2020,26.96250000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,gasboiler,2020,0.27780000000
-all-year,all-week,evening,heatpump,2020,1.05560000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
-all-year,all-week,evening,gasboiler,2020,17.97500000000
+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,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2025,3,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,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.28740000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,8.98750000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2025,3,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,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,13.48120000000
+2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R1,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R2,2025,1,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2025,3,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,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R1,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2025,3,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+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,heatpump,2020,0.79170000000
+3,heat,R1,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+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,heatpump,2020,0.79170000000
+3,heat,R2,2025,3,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,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+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,heatpump,2020,1.58330000000
+4,heat,R1,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+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,heatpump,2020,1.58330000000
+4,heat,R2,2025,3,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,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2025,3,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,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,17.97500000000
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 4299cce0..190d0953 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,97 +1,97 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,heatpump,2020,0.54600000000
-all-year,all-week,night,heatpump,2025,0.28740000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,heatpump,2020,0.81900000000
-all-year,all-week,morning,heatpump,2025,0.43100000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,heatpump,2020,0.54600000000
-all-year,all-week,afternoon,heatpump,2025,0.28740000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,heatpump,2020,0.81900000000
-all-year,all-week,early-peak,heatpump,2025,0.43100000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,heatpump,2020,1.63790000000
-all-year,all-week,late-peak,heatpump,2025,0.86210000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,heatpump,2020,1.09200000000
-all-year,all-week,evening,heatpump,2025,0.57470000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.54600000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.28740000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.72220000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.81900000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.43100000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,1.08330000000
+2,heat,R1,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R1,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2030,1,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2020,0.54600000000
+2,heat,R2,2030,6,all-year,all-week,afternoon,heatpump,2025,0.28740000000
+2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2035,6,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.81900000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.43100000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.63790000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.86210000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,1.09200000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.57470000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,1.44440000000
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 4e5eebfe..f7f70781 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,97 +1,97 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2025,0.27780000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2025,0.41670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2025,0.27780000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2025,0.41670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2025,0.83330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2025,0.55560000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.27780000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44440000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.41670000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.66670000000
+2,heat,R1,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2035,2,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.27780000000
+2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.41670000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.83330000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.55560000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.88890000000
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 529f1b0c..7b22f170 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,97 +1,97 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2030,0.72220000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2030,1.08330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2030,0.72220000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,1.08330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2030,2.16670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2030,1.44440000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.72220000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.88890000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,1.08330000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,1.33330000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R1,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2030,0.72220000000
+2,heat,R2,2040,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2045,10,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,1.08330000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,2.16670000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,1.44440000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.77780000000
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 3d157498..383d0d54 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,97 +1,97 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2035,0.44440000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2035,0.66670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2035,0.44440000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2035,0.66670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2035,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2035,0.88890000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.44440000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.61110000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.66670000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.91670000000
+2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R1,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2045,11,all-year,all-week,afternoon,heatpump,2035,0.44440000000
+2,heat,R2,2045,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2050,12,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.66670000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.33330000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.88890000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,1.22220000000
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 0855742a..803ba258 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2050,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2050,0.88890000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2040,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2050,0.88890000000
-all-year,all-week,night,heatpump,2045,0.61110000000
-all-year,all-week,night,heatpump,2050,0.88890000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2050,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2050,1.33330000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2040,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2050,1.33330000000
-all-year,all-week,morning,heatpump,2045,0.91670000000
-all-year,all-week,morning,heatpump,2050,1.33330000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2050,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2050,0.88890000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2040,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2050,0.88890000000
-all-year,all-week,afternoon,heatpump,2045,0.61110000000
-all-year,all-week,afternoon,heatpump,2050,0.88890000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2050,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2050,1.33330000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2040,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2050,1.33330000000
-all-year,all-week,early-peak,heatpump,2045,0.91670000000
-all-year,all-week,early-peak,heatpump,2050,1.33330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2050,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2050,2.66670000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2040,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2050,2.66670000000
-all-year,all-week,late-peak,heatpump,2045,1.83330000000
-all-year,all-week,late-peak,heatpump,2050,2.66670000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2050,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2050,1.77780000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2040,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2050,1.77780000000
-all-year,all-week,evening,heatpump,2045,1.22220000000
-all-year,all-week,evening,heatpump,2050,1.77780000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.88890000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.88890000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.61110000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.88890000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,1.33330000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,1.33330000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.91670000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,1.33330000000
+2,heat,R1,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R1,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R1,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R1,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R2,2050,5,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2050,13,all-year,all-week,afternoon,heatpump,2040,0.88890000000
+2,heat,R2,2050,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,6,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,7,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+2,heat,R2,2055,14,all-year,all-week,afternoon,heatpump,2045,0.61110000000
+2,heat,R2,2055,15,all-year,all-week,afternoon,heatpump,2050,0.88890000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,1.33330000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.91670000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,1.33330000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,2.66670000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.83330000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,2.66670000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.77780000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.77780000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,1.22220000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.77780000000
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 563c9ec0..3d4d9c15 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
+2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
+6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
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 99541b9c..fa946f65 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,161 +1,161 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,1,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,1,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,1,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,1,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,1,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,1,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,1,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
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 2615fee2..c3a18f30 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,129 +1,129 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
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 fee9201a..a1ad7b71 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,129 +1,129 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
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 c2ac68eb..d8cce15a 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
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 931aa819..498d5e24 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
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 a4d6f8a2..fe854b70 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,6,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,7,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
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 149c5372..4db35e5d 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R1,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2022,2,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.22960000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R1,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2022,2,all-year,all-week,night,gasboiler,2020,10.80770000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R1,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2022,2,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R1,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2022,2,all-year,all-week,morning,gasboiler,2020,15.43960000000
+2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R1,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2022,2,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R1,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2022,2,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R1,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2022,2,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R1,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2022,2,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R1,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2022,2,all-year,all-week,evening,gasboiler,2020,21.61540000000
+6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R1,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2022,2,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R1,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2022,2,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
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 8a5f4814..32b8dacd 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.16700000000
-all-year,all-week,night,heatpump,2020,0.22960000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,10.80770000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.23860000000
-all-year,all-week,morning,heatpump,2020,0.32810000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,15.43960000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.23860000000
-all-year,all-week,early-peak,heatpump,2020,0.32810000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,15.43960000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,0.50110000000
-all-year,all-week,late-peak,heatpump,2020,0.68890000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,32.42310000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.33400000000
-all-year,all-week,evening,heatpump,2020,0.45930000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,21.61540000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.33400000000
-all-year,all-week,early-morning,heatpump,2020,0.45930000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,21.61540000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R1,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R1,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2022,3,all-year,all-week,night,gasboiler,2020,0.16700000000
+0,heat,R2,2022,4,all-year,all-week,night,heatpump,2020,0.22960000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,4,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,5,all-year,all-week,night,heatpump,2022,0.08440000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R1,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2022,3,all-year,all-week,night,gasboiler,2020,10.80770000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,8.19660000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R1,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R1,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2022,3,all-year,all-week,morning,gasboiler,2020,0.23860000000
+1,heat,R2,2022,4,all-year,all-week,morning,heatpump,2020,0.32810000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,4,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R1,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2022,3,all-year,all-week,morning,gasboiler,2020,15.43960000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,11.70940000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R1,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.16700000000
+2,heat,R2,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.22960000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,10.80770000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R1,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.23860000000
+3,heat,R2,2022,4,all-year,all-week,early-peak,heatpump,2020,0.32810000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,15.43960000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R1,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.50110000000
+4,heat,R2,2022,4,all-year,all-week,late-peak,heatpump,2020,0.68890000000
+4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,32.42310000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R1,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R1,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2022,3,all-year,all-week,evening,gasboiler,2020,0.33400000000
+5,heat,R2,2022,4,all-year,all-week,evening,heatpump,2020,0.45930000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,4,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R1,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2022,3,all-year,all-week,evening,gasboiler,2020,21.61540000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,16.39320000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R1,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.33400000000
+6,heat,R2,2022,4,all-year,all-week,early-morning,heatpump,2020,0.45930000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,21.61540000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R1,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.33400000000
+7,heat,R2,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.45930000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,21.61540000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
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 af467c19..58246c6a 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.12670000000
-all-year,all-week,night,heatpump,2020,0.23220000000
-all-year,all-week,night,heatpump,2022,0.08440000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,8.19660000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.18100000000
-all-year,all-week,morning,heatpump,2020,0.33170000000
-all-year,all-week,morning,heatpump,2022,0.12060000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,11.70940000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.18100000000
-all-year,all-week,early-peak,heatpump,2020,0.33170000000
-all-year,all-week,early-peak,heatpump,2022,0.12060000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,11.70940000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.38000000000
-all-year,all-week,late-peak,heatpump,2020,0.69670000000
-all-year,all-week,late-peak,heatpump,2022,0.25330000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,24.58980000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.25330000000
-all-year,all-week,evening,heatpump,2020,0.46440000000
-all-year,all-week,evening,heatpump,2022,0.16890000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,16.39320000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.25330000000
-all-year,all-week,early-morning,heatpump,2020,0.46440000000
-all-year,all-week,early-morning,heatpump,2022,0.16890000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,16.39320000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R1,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R1,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R1,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R1,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2024,4,all-year,all-week,night,gasboiler,2020,0.12670000000
+0,heat,R2,2024,5,all-year,all-week,night,heatpump,2020,0.23220000000
+0,heat,R2,2024,6,all-year,all-week,night,heatpump,2022,0.08440000000
+0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2026,4,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,5,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,6,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,7,all-year,all-week,night,heatpump,2024,0.08520000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R1,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R1,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2024,4,all-year,all-week,night,gasboiler,2020,8.19660000000
+0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2026,4,all-year,all-week,night,gasboiler,2020,5.51440000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R1,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R1,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R1,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2024,4,all-year,all-week,morning,gasboiler,2020,0.18100000000
+1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2020,0.33170000000
+1,heat,R2,2024,6,all-year,all-week,morning,heatpump,2022,0.12060000000
+1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2026,4,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R1,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R1,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2024,4,all-year,all-week,morning,gasboiler,2020,11.70940000000
+1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2026,4,all-year,all-week,morning,gasboiler,2020,7.87770000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R1,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.12670000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23220000000
+2,heat,R2,2024,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08440000000
+2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R1,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R1,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2024,4,all-year,all-week,mid-afternoon,gasboiler,2020,8.19660000000
+2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2026,4,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R1,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,0.18100000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2020,0.33170000000
+3,heat,R2,2024,6,all-year,all-week,early-peak,heatpump,2022,0.12060000000
+3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R1,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R1,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2024,4,all-year,all-week,early-peak,gasboiler,2020,11.70940000000
+3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2026,4,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R1,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,0.38000000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2020,0.69670000000
+4,heat,R2,2024,6,all-year,all-week,late-peak,heatpump,2022,0.25330000000
+4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R1,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R1,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2024,4,all-year,all-week,late-peak,gasboiler,2020,24.58980000000
+4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2026,4,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R1,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R1,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R1,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2024,4,all-year,all-week,evening,gasboiler,2020,0.25330000000
+5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2020,0.46440000000
+5,heat,R2,2024,6,all-year,all-week,evening,heatpump,2022,0.16890000000
+5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2026,4,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R1,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R1,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2024,4,all-year,all-week,evening,gasboiler,2020,16.39320000000
+5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2026,4,all-year,all-week,evening,gasboiler,2020,11.02880000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R1,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,0.25330000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2020,0.46440000000
+6,heat,R2,2024,6,all-year,all-week,early-morning,heatpump,2022,0.16890000000
+6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R1,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R1,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2024,4,all-year,all-week,early-morning,gasboiler,2020,16.39320000000
+6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2026,4,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R1,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,0.25330000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2020,0.46440000000
+7,heat,R2,2024,6,all-year,all-week,late-afternoon,heatpump,2022,0.16890000000
+7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R1,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R1,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2024,4,all-year,all-week,late-afternoon,gasboiler,2020,16.39320000000
+7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2026,4,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
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 35861806..d85ab2ec 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.08520000000
-all-year,all-week,night,heatpump,2020,0.23430000000
-all-year,all-week,night,heatpump,2022,0.08520000000
-all-year,all-week,night,heatpump,2024,0.08520000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,5.51440000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.12170000000
-all-year,all-week,morning,heatpump,2020,0.33480000000
-all-year,all-week,morning,heatpump,2022,0.12170000000
-all-year,all-week,morning,heatpump,2024,0.12170000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,7.87770000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.12170000000
-all-year,all-week,early-peak,heatpump,2020,0.33480000000
-all-year,all-week,early-peak,heatpump,2022,0.12170000000
-all-year,all-week,early-peak,heatpump,2024,0.12170000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,7.87770000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.25570000000
-all-year,all-week,late-peak,heatpump,2020,0.70300000000
-all-year,all-week,late-peak,heatpump,2022,0.25570000000
-all-year,all-week,late-peak,heatpump,2024,0.25570000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,16.54330000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.17040000000
-all-year,all-week,evening,heatpump,2020,0.46870000000
-all-year,all-week,evening,heatpump,2022,0.17040000000
-all-year,all-week,evening,heatpump,2024,0.17040000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,11.02880000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.17040000000
-all-year,all-week,early-morning,heatpump,2020,0.46870000000
-all-year,all-week,early-morning,heatpump,2022,0.17040000000
-all-year,all-week,early-morning,heatpump,2024,0.17040000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,11.02880000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R1,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R1,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R1,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R1,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R1,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2026,0,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,1,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,2,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,3,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2026,5,all-year,all-week,night,gasboiler,2020,0.08520000000
+0,heat,R2,2026,6,all-year,all-week,night,heatpump,2020,0.23430000000
+0,heat,R2,2026,7,all-year,all-week,night,heatpump,2022,0.08520000000
+0,heat,R2,2026,8,all-year,all-week,night,heatpump,2024,0.08520000000
+0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2028,5,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,6,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,7,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,8,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,9,all-year,all-week,night,heatpump,2026,0.08590000000
+0,CO2f,R1,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R1,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R1,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2026,0,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2026,5,all-year,all-week,night,gasboiler,2020,5.51440000000
+0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2028,5,all-year,all-week,night,gasboiler,2020,2.77820000000
+1,heat,R1,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R1,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R1,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2026,0,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,1,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2026,5,all-year,all-week,morning,gasboiler,2020,0.12170000000
+1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2020,0.33480000000
+1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2022,0.12170000000
+1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2024,0.12170000000
+1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2028,5,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,6,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,CO2f,R1,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R1,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R1,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2026,0,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2026,5,all-year,all-week,morning,gasboiler,2020,7.87770000000
+1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2028,5,all-year,all-week,morning,gasboiler,2020,3.96890000000
+2,heat,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.08520000000
+2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23430000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08520000000
+2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08520000000
+2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,6,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,CO2f,R1,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R1,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R1,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2026,0,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2026,5,all-year,all-week,mid-afternoon,gasboiler,2020,5.51440000000
+2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2028,5,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+3,heat,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,0.12170000000
+3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2020,0.33480000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2022,0.12170000000
+3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2024,0.12170000000
+3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,6,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,CO2f,R1,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R1,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R1,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2026,0,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2026,5,all-year,all-week,early-peak,gasboiler,2020,7.87770000000
+3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2028,5,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+4,heat,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,0.25570000000
+4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2020,0.70300000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2022,0.25570000000
+4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2024,0.25570000000
+4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,6,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,CO2f,R1,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R1,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R1,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2026,0,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2026,5,all-year,all-week,late-peak,gasboiler,2020,16.54330000000
+4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2028,5,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+5,heat,R1,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R1,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R1,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2026,0,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,1,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2026,5,all-year,all-week,evening,gasboiler,2020,0.17040000000
+5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2020,0.46870000000
+5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2022,0.17040000000
+5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2024,0.17040000000
+5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2028,5,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,6,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,CO2f,R1,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R1,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R1,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2026,0,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2026,5,all-year,all-week,evening,gasboiler,2020,11.02880000000
+5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2028,5,all-year,all-week,evening,gasboiler,2020,5.55640000000
+6,heat,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,0.17040000000
+6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2020,0.46870000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2022,0.17040000000
+6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2024,0.17040000000
+6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,6,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,CO2f,R1,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R1,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R1,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2026,0,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2026,5,all-year,all-week,early-morning,gasboiler,2020,11.02880000000
+6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2028,5,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+7,heat,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,0.17040000000
+7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2020,0.46870000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2022,0.17040000000
+7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2024,0.17040000000
+7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,6,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,CO2f,R1,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R1,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R1,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2026,0,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2026,5,all-year,all-week,late-afternoon,gasboiler,2020,11.02880000000
+7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2028,5,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
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 46e07f25..0c2864a0 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,353 +1,353 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,gasboiler,2020,0.04290000000
-all-year,all-week,night,heatpump,2020,0.23610000000
-all-year,all-week,night,heatpump,2022,0.08590000000
-all-year,all-week,night,heatpump,2024,0.08590000000
-all-year,all-week,night,heatpump,2026,0.08590000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,night,gasboiler,2020,2.77820000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,gasboiler,2020,0.06130000000
-all-year,all-week,morning,heatpump,2020,0.33730000000
-all-year,all-week,morning,heatpump,2022,0.12270000000
-all-year,all-week,morning,heatpump,2024,0.12270000000
-all-year,all-week,morning,heatpump,2026,0.12270000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,morning,gasboiler,2020,3.96890000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,gasboiler,2020,0.06130000000
-all-year,all-week,early-peak,heatpump,2020,0.33730000000
-all-year,all-week,early-peak,heatpump,2022,0.12270000000
-all-year,all-week,early-peak,heatpump,2024,0.12270000000
-all-year,all-week,early-peak,heatpump,2026,0.12270000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,early-peak,gasboiler,2020,3.96890000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,gasboiler,2020,0.12880000000
-all-year,all-week,late-peak,heatpump,2020,0.70840000000
-all-year,all-week,late-peak,heatpump,2022,0.25760000000
-all-year,all-week,late-peak,heatpump,2024,0.25760000000
-all-year,all-week,late-peak,heatpump,2026,0.25760000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,late-peak,gasboiler,2020,8.33460000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,gasboiler,2020,0.08590000000
-all-year,all-week,evening,heatpump,2020,0.47230000000
-all-year,all-week,evening,heatpump,2022,0.17170000000
-all-year,all-week,evening,heatpump,2024,0.17170000000
-all-year,all-week,evening,heatpump,2026,0.17170000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,evening,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,gasboiler,2020,0.08590000000
-all-year,all-week,early-morning,heatpump,2020,0.47230000000
-all-year,all-week,early-morning,heatpump,2022,0.17170000000
-all-year,all-week,early-morning,heatpump,2024,0.17170000000
-all-year,all-week,early-morning,heatpump,2026,0.17170000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,early-morning,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
-all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
-all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
-all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R1,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R1,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R1,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R1,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R1,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2028,0,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,1,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,2,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2028,6,all-year,all-week,night,gasboiler,2020,0.04290000000
+0,heat,R2,2028,7,all-year,all-week,night,heatpump,2020,0.23610000000
+0,heat,R2,2028,8,all-year,all-week,night,heatpump,2022,0.08590000000
+0,heat,R2,2028,9,all-year,all-week,night,heatpump,2024,0.08590000000
+0,heat,R2,2028,10,all-year,all-week,night,heatpump,2026,0.08590000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,8,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,9,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2028,0.10420000000
+0,CO2f,R1,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R1,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2028,0,all-year,all-week,night,gasboiler,2020,2.77820000000
+0,CO2f,R2,2028,6,all-year,all-week,night,gasboiler,2020,2.77820000000
+1,heat,R1,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R1,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R1,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2028,0,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,1,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2028,6,all-year,all-week,morning,gasboiler,2020,0.06130000000
+1,heat,R2,2028,7,all-year,all-week,morning,heatpump,2020,0.33730000000
+1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2022,0.12270000000
+1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2024,0.12270000000
+1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2026,0.12270000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,CO2f,R1,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R1,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2028,0,all-year,all-week,morning,gasboiler,2020,3.96890000000
+1,CO2f,R2,2028,6,all-year,all-week,morning,gasboiler,2020,3.96890000000
+2,heat,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R1,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.04290000000
+2,heat,R2,2028,7,all-year,all-week,mid-afternoon,heatpump,2020,0.23610000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08590000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08590000000
+2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08590000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,CO2f,R1,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R1,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2028,0,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+2,CO2f,R2,2028,6,all-year,all-week,mid-afternoon,gasboiler,2020,2.77820000000
+3,heat,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R1,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,0.06130000000
+3,heat,R2,2028,7,all-year,all-week,early-peak,heatpump,2020,0.33730000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2022,0.12270000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2024,0.12270000000
+3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2026,0.12270000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,CO2f,R1,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R1,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2028,0,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+3,CO2f,R2,2028,6,all-year,all-week,early-peak,gasboiler,2020,3.96890000000
+4,heat,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R1,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,0.12880000000
+4,heat,R2,2028,7,all-year,all-week,late-peak,heatpump,2020,0.70840000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2022,0.25760000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2024,0.25760000000
+4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2026,0.25760000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,CO2f,R1,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R1,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2028,0,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+4,CO2f,R2,2028,6,all-year,all-week,late-peak,gasboiler,2020,8.33460000000
+5,heat,R1,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R1,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R1,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2028,0,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,1,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2028,6,all-year,all-week,evening,gasboiler,2020,0.08590000000
+5,heat,R2,2028,7,all-year,all-week,evening,heatpump,2020,0.47230000000
+5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2022,0.17170000000
+5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2024,0.17170000000
+5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2026,0.17170000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,CO2f,R1,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R1,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2028,0,all-year,all-week,evening,gasboiler,2020,5.55640000000
+5,CO2f,R2,2028,6,all-year,all-week,evening,gasboiler,2020,5.55640000000
+6,heat,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R1,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,0.08590000000
+6,heat,R2,2028,7,all-year,all-week,early-morning,heatpump,2020,0.47230000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2022,0.17170000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2024,0.17170000000
+6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2026,0.17170000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,CO2f,R1,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R1,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2028,0,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+6,CO2f,R2,2028,6,all-year,all-week,early-morning,gasboiler,2020,5.55640000000
+7,heat,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R1,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,0.08590000000
+7,heat,R2,2028,7,all-year,all-week,late-afternoon,heatpump,2020,0.47230000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2022,0.17170000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2024,0.17170000000
+7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2026,0.17170000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,CO2f,R1,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R1,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2028,0,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
+7,CO2f,R2,2028,6,all-year,all-week,late-afternoon,gasboiler,2020,5.55640000000
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 5cc7f860..765376d6 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,321 +1,321 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,heatpump,2020,0.22920000000
-all-year,all-week,night,heatpump,2022,0.08330000000
-all-year,all-week,night,heatpump,2024,0.08330000000
-all-year,all-week,night,heatpump,2026,0.08330000000
-all-year,all-week,night,heatpump,2028,0.10420000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,heatpump,2020,0.32740000000
-all-year,all-week,morning,heatpump,2022,0.11900000000
-all-year,all-week,morning,heatpump,2024,0.11900000000
-all-year,all-week,morning,heatpump,2026,0.11900000000
-all-year,all-week,morning,heatpump,2028,0.14880000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,heatpump,2020,0.32740000000
-all-year,all-week,early-peak,heatpump,2022,0.11900000000
-all-year,all-week,early-peak,heatpump,2024,0.11900000000
-all-year,all-week,early-peak,heatpump,2026,0.11900000000
-all-year,all-week,early-peak,heatpump,2028,0.14880000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,heatpump,2020,0.68750000000
-all-year,all-week,late-peak,heatpump,2022,0.25000000000
-all-year,all-week,late-peak,heatpump,2024,0.25000000000
-all-year,all-week,late-peak,heatpump,2026,0.25000000000
-all-year,all-week,late-peak,heatpump,2028,0.31250000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,heatpump,2020,0.45830000000
-all-year,all-week,evening,heatpump,2022,0.16670000000
-all-year,all-week,evening,heatpump,2024,0.16670000000
-all-year,all-week,evening,heatpump,2026,0.16670000000
-all-year,all-week,evening,heatpump,2028,0.20830000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,heatpump,2020,0.45830000000
-all-year,all-week,early-morning,heatpump,2022,0.16670000000
-all-year,all-week,early-morning,heatpump,2024,0.16670000000
-all-year,all-week,early-morning,heatpump,2026,0.16670000000
-all-year,all-week,early-morning,heatpump,2028,0.20830000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R1,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R1,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R1,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2030,1,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2030,8,all-year,all-week,night,heatpump,2020,0.22920000000
+0,heat,R2,2030,9,all-year,all-week,night,heatpump,2022,0.08330000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2024,0.08330000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2026,0.08330000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2028,0.10420000000
+0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2032,9,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2030,0.27300000000
+1,heat,R1,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2030,1,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2020,0.32740000000
+1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2022,0.11900000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2024,0.11900000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2026,0.11900000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2028,0.14880000000
+1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2030,0.39000000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.22920000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08330000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08330000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08330000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10420000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2020,0.32740000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2022,0.11900000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2024,0.11900000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2026,0.11900000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2028,0.14880000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2020,0.68750000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2022,0.25000000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2024,0.25000000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2026,0.25000000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2028,0.31250000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+5,heat,R1,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2030,1,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2020,0.45830000000
+5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2022,0.16670000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2024,0.16670000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2026,0.16670000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2028,0.20830000000
+5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2030,0.54600000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2020,0.45830000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2022,0.16670000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2024,0.16670000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2026,0.16670000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2028,0.20830000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.45830000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.16670000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.16670000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.16670000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.20830000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
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 5019e799..6ef5e128 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,321 +1,321 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2022,0.08400000000
-all-year,all-week,night,heatpump,2024,0.08400000000
-all-year,all-week,night,heatpump,2026,0.08400000000
-all-year,all-week,night,heatpump,2028,0.10500000000
-all-year,all-week,night,heatpump,2030,0.27300000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2022,0.12000000000
-all-year,all-week,morning,heatpump,2024,0.12000000000
-all-year,all-week,morning,heatpump,2026,0.12000000000
-all-year,all-week,morning,heatpump,2028,0.15000000000
-all-year,all-week,morning,heatpump,2030,0.39000000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2022,0.12000000000
-all-year,all-week,early-peak,heatpump,2024,0.12000000000
-all-year,all-week,early-peak,heatpump,2026,0.12000000000
-all-year,all-week,early-peak,heatpump,2028,0.15000000000
-all-year,all-week,early-peak,heatpump,2030,0.39000000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2022,0.25200000000
-all-year,all-week,late-peak,heatpump,2024,0.25200000000
-all-year,all-week,late-peak,heatpump,2026,0.25200000000
-all-year,all-week,late-peak,heatpump,2028,0.31500000000
-all-year,all-week,late-peak,heatpump,2030,0.81900000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2022,0.16800000000
-all-year,all-week,evening,heatpump,2024,0.16800000000
-all-year,all-week,evening,heatpump,2026,0.16800000000
-all-year,all-week,evening,heatpump,2028,0.21000000000
-all-year,all-week,evening,heatpump,2030,0.54600000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2022,0.16800000000
-all-year,all-week,early-morning,heatpump,2024,0.16800000000
-all-year,all-week,early-morning,heatpump,2026,0.16800000000
-all-year,all-week,early-morning,heatpump,2028,0.21000000000
-all-year,all-week,early-morning,heatpump,2030,0.54600000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R1,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R1,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2022,0.08400000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2024,0.08400000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2026,0.08400000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2028,0.10500000000
+0,heat,R2,2032,14,all-year,all-week,night,heatpump,2030,0.27300000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2034,11,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,13,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,14,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,15,all-year,all-week,night,heatpump,2032,0.12690000000
+1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R1,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2022,0.12000000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2024,0.12000000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2026,0.12000000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2028,0.15000000000
+1,heat,R2,2032,14,all-year,all-week,morning,heatpump,2030,0.39000000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2032,0.18120000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R1,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2022,0.08400000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08400000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08400000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10500000000
+2,heat,R2,2032,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27300000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R1,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2022,0.12000000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2024,0.12000000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2026,0.12000000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2028,0.15000000000
+3,heat,R2,2032,14,all-year,all-week,early-peak,heatpump,2030,0.39000000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R1,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2022,0.25200000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2024,0.25200000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2026,0.25200000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2028,0.31500000000
+4,heat,R2,2032,14,all-year,all-week,late-peak,heatpump,2030,0.81900000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R1,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2022,0.16800000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2024,0.16800000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2026,0.16800000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2028,0.21000000000
+5,heat,R2,2032,14,all-year,all-week,evening,heatpump,2030,0.54600000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2032,0.25370000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R1,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2022,0.16800000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2024,0.16800000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2026,0.16800000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2028,0.21000000000
+6,heat,R2,2032,14,all-year,all-week,early-morning,heatpump,2030,0.54600000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R1,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2022,0.16800000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2024,0.16800000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2026,0.16800000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2028,0.21000000000
+7,heat,R2,2032,14,all-year,all-week,late-afternoon,heatpump,2030,0.54600000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
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 a3ea629a..da5d538d 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,321 +1,321 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2024,0.08460000000
-all-year,all-week,night,heatpump,2026,0.08460000000
-all-year,all-week,night,heatpump,2028,0.10570000000
-all-year,all-week,night,heatpump,2030,0.27490000000
-all-year,all-week,night,heatpump,2032,0.12690000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2024,0.12080000000
-all-year,all-week,morning,heatpump,2026,0.12080000000
-all-year,all-week,morning,heatpump,2028,0.15100000000
-all-year,all-week,morning,heatpump,2030,0.39270000000
-all-year,all-week,morning,heatpump,2032,0.18120000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2024,0.12080000000
-all-year,all-week,early-peak,heatpump,2026,0.12080000000
-all-year,all-week,early-peak,heatpump,2028,0.15100000000
-all-year,all-week,early-peak,heatpump,2030,0.39270000000
-all-year,all-week,early-peak,heatpump,2032,0.18120000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2024,0.25370000000
-all-year,all-week,late-peak,heatpump,2026,0.25370000000
-all-year,all-week,late-peak,heatpump,2028,0.31720000000
-all-year,all-week,late-peak,heatpump,2030,0.82470000000
-all-year,all-week,late-peak,heatpump,2032,0.38060000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2024,0.16920000000
-all-year,all-week,evening,heatpump,2026,0.16920000000
-all-year,all-week,evening,heatpump,2028,0.21150000000
-all-year,all-week,evening,heatpump,2030,0.54980000000
-all-year,all-week,evening,heatpump,2032,0.25370000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2024,0.16920000000
-all-year,all-week,early-morning,heatpump,2026,0.16920000000
-all-year,all-week,early-morning,heatpump,2028,0.21150000000
-all-year,all-week,early-morning,heatpump,2030,0.54980000000
-all-year,all-week,early-morning,heatpump,2032,0.25370000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R1,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R1,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R1,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R1,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R1,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2024,0.08460000000
+0,heat,R2,2034,13,all-year,all-week,night,heatpump,2026,0.08460000000
+0,heat,R2,2034,14,all-year,all-week,night,heatpump,2028,0.10570000000
+0,heat,R2,2034,15,all-year,all-week,night,heatpump,2030,0.27490000000
+0,heat,R2,2034,16,all-year,all-week,night,heatpump,2032,0.12690000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2036,13,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,14,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,15,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,16,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,17,all-year,all-week,night,heatpump,2034,0.12760000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R1,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R1,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R1,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2024,0.12080000000
+1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2026,0.12080000000
+1,heat,R2,2034,14,all-year,all-week,morning,heatpump,2028,0.15100000000
+1,heat,R2,2034,15,all-year,all-week,morning,heatpump,2030,0.39270000000
+1,heat,R2,2034,16,all-year,all-week,morning,heatpump,2032,0.18120000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2034,0.18240000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R1,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R1,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R1,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2024,0.08460000000
+2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08460000000
+2,heat,R2,2034,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10570000000
+2,heat,R2,2034,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27490000000
+2,heat,R2,2034,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12690000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R1,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R1,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R1,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2024,0.12080000000
+3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2026,0.12080000000
+3,heat,R2,2034,14,all-year,all-week,early-peak,heatpump,2028,0.15100000000
+3,heat,R2,2034,15,all-year,all-week,early-peak,heatpump,2030,0.39270000000
+3,heat,R2,2034,16,all-year,all-week,early-peak,heatpump,2032,0.18120000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R1,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R1,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R1,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2024,0.25370000000
+4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2026,0.25370000000
+4,heat,R2,2034,14,all-year,all-week,late-peak,heatpump,2028,0.31720000000
+4,heat,R2,2034,15,all-year,all-week,late-peak,heatpump,2030,0.82470000000
+4,heat,R2,2034,16,all-year,all-week,late-peak,heatpump,2032,0.38060000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R1,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R1,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R1,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2024,0.16920000000
+5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2026,0.16920000000
+5,heat,R2,2034,14,all-year,all-week,evening,heatpump,2028,0.21150000000
+5,heat,R2,2034,15,all-year,all-week,evening,heatpump,2030,0.54980000000
+5,heat,R2,2034,16,all-year,all-week,evening,heatpump,2032,0.25370000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2034,0.25530000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R1,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R1,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R1,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2024,0.16920000000
+6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2026,0.16920000000
+6,heat,R2,2034,14,all-year,all-week,early-morning,heatpump,2028,0.21150000000
+6,heat,R2,2034,15,all-year,all-week,early-morning,heatpump,2030,0.54980000000
+6,heat,R2,2034,16,all-year,all-week,early-morning,heatpump,2032,0.25370000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R1,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R1,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R1,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2024,0.16920000000
+7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2026,0.16920000000
+7,heat,R2,2034,14,all-year,all-week,late-afternoon,heatpump,2028,0.21150000000
+7,heat,R2,2034,15,all-year,all-week,late-afternoon,heatpump,2030,0.54980000000
+7,heat,R2,2034,16,all-year,all-week,late-afternoon,heatpump,2032,0.25370000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
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 bc568fe7..e0448c28 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2026,0.08510000000
-all-year,all-week,night,heatpump,2028,0.10640000000
-all-year,all-week,night,heatpump,2030,0.27660000000
-all-year,all-week,night,heatpump,2032,0.12760000000
-all-year,all-week,night,heatpump,2034,0.12760000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2026,0.12160000000
-all-year,all-week,morning,heatpump,2028,0.15200000000
-all-year,all-week,morning,heatpump,2030,0.39510000000
-all-year,all-week,morning,heatpump,2032,0.18240000000
-all-year,all-week,morning,heatpump,2034,0.18240000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2026,0.12160000000
-all-year,all-week,early-peak,heatpump,2028,0.15200000000
-all-year,all-week,early-peak,heatpump,2030,0.39510000000
-all-year,all-week,early-peak,heatpump,2032,0.18240000000
-all-year,all-week,early-peak,heatpump,2034,0.18240000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2026,0.25530000000
-all-year,all-week,late-peak,heatpump,2028,0.31910000000
-all-year,all-week,late-peak,heatpump,2030,0.82970000000
-all-year,all-week,late-peak,heatpump,2032,0.38290000000
-all-year,all-week,late-peak,heatpump,2034,0.38290000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2026,0.17020000000
-all-year,all-week,evening,heatpump,2028,0.21270000000
-all-year,all-week,evening,heatpump,2030,0.55310000000
-all-year,all-week,evening,heatpump,2032,0.25530000000
-all-year,all-week,evening,heatpump,2034,0.25530000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2026,0.17020000000
-all-year,all-week,early-morning,heatpump,2028,0.21270000000
-all-year,all-week,early-morning,heatpump,2030,0.55310000000
-all-year,all-week,early-morning,heatpump,2032,0.25530000000
-all-year,all-week,early-morning,heatpump,2034,0.25530000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R1,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R1,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R1,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R1,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R1,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R1,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,5,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,8,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2036,14,all-year,all-week,night,heatpump,2026,0.08510000000
+0,heat,R2,2036,15,all-year,all-week,night,heatpump,2028,0.10640000000
+0,heat,R2,2036,16,all-year,all-week,night,heatpump,2030,0.27660000000
+0,heat,R2,2036,17,all-year,all-week,night,heatpump,2032,0.12760000000
+0,heat,R2,2036,18,all-year,all-week,night,heatpump,2034,0.12760000000
+0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2038,15,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,16,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,17,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,18,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,19,all-year,all-week,night,heatpump,2036,0.12830000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R1,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R1,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R1,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R1,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R1,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R1,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2036,14,all-year,all-week,morning,heatpump,2026,0.12160000000
+1,heat,R2,2036,15,all-year,all-week,morning,heatpump,2028,0.15200000000
+1,heat,R2,2036,16,all-year,all-week,morning,heatpump,2030,0.39510000000
+1,heat,R2,2036,17,all-year,all-week,morning,heatpump,2032,0.18240000000
+1,heat,R2,2036,18,all-year,all-week,morning,heatpump,2034,0.18240000000
+1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2038,15,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2036,0.18330000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R1,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R1,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R1,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R1,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R1,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R1,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2036,14,all-year,all-week,mid-afternoon,heatpump,2026,0.08510000000
+2,heat,R2,2036,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10640000000
+2,heat,R2,2036,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27660000000
+2,heat,R2,2036,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12760000000
+2,heat,R2,2036,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12760000000
+2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2038,15,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R1,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R1,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R1,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R1,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R1,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R1,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2036,14,all-year,all-week,early-peak,heatpump,2026,0.12160000000
+3,heat,R2,2036,15,all-year,all-week,early-peak,heatpump,2028,0.15200000000
+3,heat,R2,2036,16,all-year,all-week,early-peak,heatpump,2030,0.39510000000
+3,heat,R2,2036,17,all-year,all-week,early-peak,heatpump,2032,0.18240000000
+3,heat,R2,2036,18,all-year,all-week,early-peak,heatpump,2034,0.18240000000
+3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2038,15,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R1,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R1,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R1,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R1,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R1,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R1,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2036,14,all-year,all-week,late-peak,heatpump,2026,0.25530000000
+4,heat,R2,2036,15,all-year,all-week,late-peak,heatpump,2028,0.31910000000
+4,heat,R2,2036,16,all-year,all-week,late-peak,heatpump,2030,0.82970000000
+4,heat,R2,2036,17,all-year,all-week,late-peak,heatpump,2032,0.38290000000
+4,heat,R2,2036,18,all-year,all-week,late-peak,heatpump,2034,0.38290000000
+4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2038,15,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R1,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R1,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R1,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R1,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R1,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R1,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2036,14,all-year,all-week,evening,heatpump,2026,0.17020000000
+5,heat,R2,2036,15,all-year,all-week,evening,heatpump,2028,0.21270000000
+5,heat,R2,2036,16,all-year,all-week,evening,heatpump,2030,0.55310000000
+5,heat,R2,2036,17,all-year,all-week,evening,heatpump,2032,0.25530000000
+5,heat,R2,2036,18,all-year,all-week,evening,heatpump,2034,0.25530000000
+5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2038,15,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2036,0.25670000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R1,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R1,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R1,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R1,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R1,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R1,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2036,14,all-year,all-week,early-morning,heatpump,2026,0.17020000000
+6,heat,R2,2036,15,all-year,all-week,early-morning,heatpump,2028,0.21270000000
+6,heat,R2,2036,16,all-year,all-week,early-morning,heatpump,2030,0.55310000000
+6,heat,R2,2036,17,all-year,all-week,early-morning,heatpump,2032,0.25530000000
+6,heat,R2,2036,18,all-year,all-week,early-morning,heatpump,2034,0.25530000000
+6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2038,15,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R1,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R1,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R1,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R1,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R1,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R1,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2036,14,all-year,all-week,late-afternoon,heatpump,2026,0.17020000000
+7,heat,R2,2036,15,all-year,all-week,late-afternoon,heatpump,2028,0.21270000000
+7,heat,R2,2036,16,all-year,all-week,late-afternoon,heatpump,2030,0.55310000000
+7,heat,R2,2036,17,all-year,all-week,late-afternoon,heatpump,2032,0.25530000000
+7,heat,R2,2036,18,all-year,all-week,late-afternoon,heatpump,2034,0.25530000000
+7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2038,15,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
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 2ab26445..f78f5302 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2028,0.10690000000
-all-year,all-week,night,heatpump,2030,0.27810000000
-all-year,all-week,night,heatpump,2032,0.12830000000
-all-year,all-week,night,heatpump,2034,0.12830000000
-all-year,all-week,night,heatpump,2036,0.12830000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2028,0.15280000000
-all-year,all-week,morning,heatpump,2030,0.39720000000
-all-year,all-week,morning,heatpump,2032,0.18330000000
-all-year,all-week,morning,heatpump,2034,0.18330000000
-all-year,all-week,morning,heatpump,2036,0.18330000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2028,0.15280000000
-all-year,all-week,early-peak,heatpump,2030,0.39720000000
-all-year,all-week,early-peak,heatpump,2032,0.18330000000
-all-year,all-week,early-peak,heatpump,2034,0.18330000000
-all-year,all-week,early-peak,heatpump,2036,0.18330000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2028,0.32080000000
-all-year,all-week,late-peak,heatpump,2030,0.83420000000
-all-year,all-week,late-peak,heatpump,2032,0.38500000000
-all-year,all-week,late-peak,heatpump,2034,0.38500000000
-all-year,all-week,late-peak,heatpump,2036,0.38500000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2028,0.21390000000
-all-year,all-week,evening,heatpump,2030,0.55610000000
-all-year,all-week,evening,heatpump,2032,0.25670000000
-all-year,all-week,evening,heatpump,2034,0.25670000000
-all-year,all-week,evening,heatpump,2036,0.25670000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2028,0.21390000000
-all-year,all-week,early-morning,heatpump,2030,0.55610000000
-all-year,all-week,early-morning,heatpump,2032,0.25670000000
-all-year,all-week,early-morning,heatpump,2034,0.25670000000
-all-year,all-week,early-morning,heatpump,2036,0.25670000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
-all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R1,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R1,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R1,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R1,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R1,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R1,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2038,5,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,6,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2038,16,all-year,all-week,night,heatpump,2028,0.10690000000
+0,heat,R2,2038,17,all-year,all-week,night,heatpump,2030,0.27810000000
+0,heat,R2,2038,18,all-year,all-week,night,heatpump,2032,0.12830000000
+0,heat,R2,2038,19,all-year,all-week,night,heatpump,2034,0.12830000000
+0,heat,R2,2038,20,all-year,all-week,night,heatpump,2036,0.12830000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2040,17,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,20,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,21,all-year,all-week,night,heatpump,2038,0.16750000000
+1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R1,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R1,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R1,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R1,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R1,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R1,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2038,16,all-year,all-week,morning,heatpump,2028,0.15280000000
+1,heat,R2,2038,17,all-year,all-week,morning,heatpump,2030,0.39720000000
+1,heat,R2,2038,18,all-year,all-week,morning,heatpump,2032,0.18330000000
+1,heat,R2,2038,19,all-year,all-week,morning,heatpump,2034,0.18330000000
+1,heat,R2,2038,20,all-year,all-week,morning,heatpump,2036,0.18330000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2040,17,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2038,0.23930000000
+2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R1,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R1,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R1,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R1,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R1,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R1,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2038,16,all-year,all-week,mid-afternoon,heatpump,2028,0.10690000000
+2,heat,R2,2038,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27810000000
+2,heat,R2,2038,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12830000000
+2,heat,R2,2038,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12830000000
+2,heat,R2,2038,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12830000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2040,17,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R1,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R1,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R1,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R1,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R1,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R1,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2038,16,all-year,all-week,early-peak,heatpump,2028,0.15280000000
+3,heat,R2,2038,17,all-year,all-week,early-peak,heatpump,2030,0.39720000000
+3,heat,R2,2038,18,all-year,all-week,early-peak,heatpump,2032,0.18330000000
+3,heat,R2,2038,19,all-year,all-week,early-peak,heatpump,2034,0.18330000000
+3,heat,R2,2038,20,all-year,all-week,early-peak,heatpump,2036,0.18330000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2040,17,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R1,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R1,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R1,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R1,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R1,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R1,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2038,16,all-year,all-week,late-peak,heatpump,2028,0.32080000000
+4,heat,R2,2038,17,all-year,all-week,late-peak,heatpump,2030,0.83420000000
+4,heat,R2,2038,18,all-year,all-week,late-peak,heatpump,2032,0.38500000000
+4,heat,R2,2038,19,all-year,all-week,late-peak,heatpump,2034,0.38500000000
+4,heat,R2,2038,20,all-year,all-week,late-peak,heatpump,2036,0.38500000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2040,17,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R1,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R1,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R1,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R1,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R1,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R1,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2038,16,all-year,all-week,evening,heatpump,2028,0.21390000000
+5,heat,R2,2038,17,all-year,all-week,evening,heatpump,2030,0.55610000000
+5,heat,R2,2038,18,all-year,all-week,evening,heatpump,2032,0.25670000000
+5,heat,R2,2038,19,all-year,all-week,evening,heatpump,2034,0.25670000000
+5,heat,R2,2038,20,all-year,all-week,evening,heatpump,2036,0.25670000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2040,17,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2038,0.33500000000
+6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R1,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R1,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R1,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R1,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R1,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R1,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2038,16,all-year,all-week,early-morning,heatpump,2028,0.21390000000
+6,heat,R2,2038,17,all-year,all-week,early-morning,heatpump,2030,0.55610000000
+6,heat,R2,2038,18,all-year,all-week,early-morning,heatpump,2032,0.25670000000
+6,heat,R2,2038,19,all-year,all-week,early-morning,heatpump,2034,0.25670000000
+6,heat,R2,2038,20,all-year,all-week,early-morning,heatpump,2036,0.25670000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2040,17,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R1,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R1,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R1,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R1,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R1,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R1,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2038,16,all-year,all-week,late-afternoon,heatpump,2028,0.21390000000
+7,heat,R2,2038,17,all-year,all-week,late-afternoon,heatpump,2030,0.55610000000
+7,heat,R2,2038,18,all-year,all-week,late-afternoon,heatpump,2032,0.25670000000
+7,heat,R2,2038,19,all-year,all-week,late-afternoon,heatpump,2034,0.25670000000
+7,heat,R2,2038,20,all-year,all-week,late-afternoon,heatpump,2036,0.25670000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2040,17,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
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 f79163ce..a196c0ff 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 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2032,0.12630000000
-all-year,all-week,night,heatpump,2034,0.12630000000
-all-year,all-week,night,heatpump,2036,0.12630000000
-all-year,all-week,night,heatpump,2038,0.16850000000
-all-year,all-week,night,heatpump,2040,0.31590000000
-all-year,all-week,night,heatpump,2032,0.12630000000
-all-year,all-week,night,heatpump,2034,0.12630000000
-all-year,all-week,night,heatpump,2036,0.12630000000
-all-year,all-week,night,heatpump,2038,0.16850000000
-all-year,all-week,night,heatpump,2040,0.31590000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2030,0.27220000000
-all-year,all-week,night,heatpump,2032,0.12560000000
-all-year,all-week,night,heatpump,2034,0.12560000000
-all-year,all-week,night,heatpump,2036,0.12560000000
-all-year,all-week,night,heatpump,2038,0.16750000000
-all-year,all-week,night,heatpump,2032,0.12630000000
-all-year,all-week,night,heatpump,2034,0.12630000000
-all-year,all-week,night,heatpump,2036,0.12630000000
-all-year,all-week,night,heatpump,2038,0.16850000000
-all-year,all-week,night,heatpump,2040,0.31590000000
-all-year,all-week,night,heatpump,2032,0.12630000000
-all-year,all-week,night,heatpump,2034,0.12630000000
-all-year,all-week,night,heatpump,2036,0.12630000000
-all-year,all-week,night,heatpump,2038,0.16850000000
-all-year,all-week,night,heatpump,2040,0.31590000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2032,0.18050000000
-all-year,all-week,morning,heatpump,2034,0.18050000000
-all-year,all-week,morning,heatpump,2036,0.18050000000
-all-year,all-week,morning,heatpump,2038,0.24070000000
-all-year,all-week,morning,heatpump,2040,0.45120000000
-all-year,all-week,morning,heatpump,2032,0.18050000000
-all-year,all-week,morning,heatpump,2034,0.18050000000
-all-year,all-week,morning,heatpump,2036,0.18050000000
-all-year,all-week,morning,heatpump,2038,0.24070000000
-all-year,all-week,morning,heatpump,2040,0.45120000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2030,0.38890000000
-all-year,all-week,morning,heatpump,2032,0.17950000000
-all-year,all-week,morning,heatpump,2034,0.17950000000
-all-year,all-week,morning,heatpump,2036,0.17950000000
-all-year,all-week,morning,heatpump,2038,0.23930000000
-all-year,all-week,morning,heatpump,2032,0.18050000000
-all-year,all-week,morning,heatpump,2034,0.18050000000
-all-year,all-week,morning,heatpump,2036,0.18050000000
-all-year,all-week,morning,heatpump,2038,0.24070000000
-all-year,all-week,morning,heatpump,2040,0.45120000000
-all-year,all-week,morning,heatpump,2032,0.18050000000
-all-year,all-week,morning,heatpump,2034,0.18050000000
-all-year,all-week,morning,heatpump,2036,0.18050000000
-all-year,all-week,morning,heatpump,2038,0.24070000000
-all-year,all-week,morning,heatpump,2040,0.45120000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
-all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2032,0.18050000000
-all-year,all-week,early-peak,heatpump,2034,0.18050000000
-all-year,all-week,early-peak,heatpump,2036,0.18050000000
-all-year,all-week,early-peak,heatpump,2038,0.24070000000
-all-year,all-week,early-peak,heatpump,2040,0.45120000000
-all-year,all-week,early-peak,heatpump,2032,0.18050000000
-all-year,all-week,early-peak,heatpump,2034,0.18050000000
-all-year,all-week,early-peak,heatpump,2036,0.18050000000
-all-year,all-week,early-peak,heatpump,2038,0.24070000000
-all-year,all-week,early-peak,heatpump,2040,0.45120000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2030,0.38890000000
-all-year,all-week,early-peak,heatpump,2032,0.17950000000
-all-year,all-week,early-peak,heatpump,2034,0.17950000000
-all-year,all-week,early-peak,heatpump,2036,0.17950000000
-all-year,all-week,early-peak,heatpump,2038,0.23930000000
-all-year,all-week,early-peak,heatpump,2032,0.18050000000
-all-year,all-week,early-peak,heatpump,2034,0.18050000000
-all-year,all-week,early-peak,heatpump,2036,0.18050000000
-all-year,all-week,early-peak,heatpump,2038,0.24070000000
-all-year,all-week,early-peak,heatpump,2040,0.45120000000
-all-year,all-week,early-peak,heatpump,2032,0.18050000000
-all-year,all-week,early-peak,heatpump,2034,0.18050000000
-all-year,all-week,early-peak,heatpump,2036,0.18050000000
-all-year,all-week,early-peak,heatpump,2038,0.24070000000
-all-year,all-week,early-peak,heatpump,2040,0.45120000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2032,0.37900000000
-all-year,all-week,late-peak,heatpump,2034,0.37900000000
-all-year,all-week,late-peak,heatpump,2036,0.37900000000
-all-year,all-week,late-peak,heatpump,2038,0.50540000000
-all-year,all-week,late-peak,heatpump,2040,0.94760000000
-all-year,all-week,late-peak,heatpump,2032,0.37900000000
-all-year,all-week,late-peak,heatpump,2034,0.37900000000
-all-year,all-week,late-peak,heatpump,2036,0.37900000000
-all-year,all-week,late-peak,heatpump,2038,0.50540000000
-all-year,all-week,late-peak,heatpump,2040,0.94760000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2030,0.81670000000
-all-year,all-week,late-peak,heatpump,2032,0.37690000000
-all-year,all-week,late-peak,heatpump,2034,0.37690000000
-all-year,all-week,late-peak,heatpump,2036,0.37690000000
-all-year,all-week,late-peak,heatpump,2038,0.50260000000
-all-year,all-week,late-peak,heatpump,2032,0.37900000000
-all-year,all-week,late-peak,heatpump,2034,0.37900000000
-all-year,all-week,late-peak,heatpump,2036,0.37900000000
-all-year,all-week,late-peak,heatpump,2038,0.50540000000
-all-year,all-week,late-peak,heatpump,2040,0.94760000000
-all-year,all-week,late-peak,heatpump,2032,0.37900000000
-all-year,all-week,late-peak,heatpump,2034,0.37900000000
-all-year,all-week,late-peak,heatpump,2036,0.37900000000
-all-year,all-week,late-peak,heatpump,2038,0.50540000000
-all-year,all-week,late-peak,heatpump,2040,0.94760000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2032,0.25270000000
-all-year,all-week,evening,heatpump,2034,0.25270000000
-all-year,all-week,evening,heatpump,2036,0.25270000000
-all-year,all-week,evening,heatpump,2038,0.33690000000
-all-year,all-week,evening,heatpump,2040,0.63170000000
-all-year,all-week,evening,heatpump,2032,0.25270000000
-all-year,all-week,evening,heatpump,2034,0.25270000000
-all-year,all-week,evening,heatpump,2036,0.25270000000
-all-year,all-week,evening,heatpump,2038,0.33690000000
-all-year,all-week,evening,heatpump,2040,0.63170000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2030,0.54440000000
-all-year,all-week,evening,heatpump,2032,0.25130000000
-all-year,all-week,evening,heatpump,2034,0.25130000000
-all-year,all-week,evening,heatpump,2036,0.25130000000
-all-year,all-week,evening,heatpump,2038,0.33500000000
-all-year,all-week,evening,heatpump,2032,0.25270000000
-all-year,all-week,evening,heatpump,2034,0.25270000000
-all-year,all-week,evening,heatpump,2036,0.25270000000
-all-year,all-week,evening,heatpump,2038,0.33690000000
-all-year,all-week,evening,heatpump,2040,0.63170000000
-all-year,all-week,evening,heatpump,2032,0.25270000000
-all-year,all-week,evening,heatpump,2034,0.25270000000
-all-year,all-week,evening,heatpump,2036,0.25270000000
-all-year,all-week,evening,heatpump,2038,0.33690000000
-all-year,all-week,evening,heatpump,2040,0.63170000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2032,0.25270000000
-all-year,all-week,early-morning,heatpump,2034,0.25270000000
-all-year,all-week,early-morning,heatpump,2036,0.25270000000
-all-year,all-week,early-morning,heatpump,2038,0.33690000000
-all-year,all-week,early-morning,heatpump,2040,0.63170000000
-all-year,all-week,early-morning,heatpump,2032,0.25270000000
-all-year,all-week,early-morning,heatpump,2034,0.25270000000
-all-year,all-week,early-morning,heatpump,2036,0.25270000000
-all-year,all-week,early-morning,heatpump,2038,0.33690000000
-all-year,all-week,early-morning,heatpump,2040,0.63170000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2030,0.54440000000
-all-year,all-week,early-morning,heatpump,2032,0.25130000000
-all-year,all-week,early-morning,heatpump,2034,0.25130000000
-all-year,all-week,early-morning,heatpump,2036,0.25130000000
-all-year,all-week,early-morning,heatpump,2038,0.33500000000
-all-year,all-week,early-morning,heatpump,2032,0.25270000000
-all-year,all-week,early-morning,heatpump,2034,0.25270000000
-all-year,all-week,early-morning,heatpump,2036,0.25270000000
-all-year,all-week,early-morning,heatpump,2038,0.33690000000
-all-year,all-week,early-morning,heatpump,2040,0.63170000000
-all-year,all-week,early-morning,heatpump,2032,0.25270000000
-all-year,all-week,early-morning,heatpump,2034,0.25270000000
-all-year,all-week,early-morning,heatpump,2036,0.25270000000
-all-year,all-week,early-morning,heatpump,2038,0.33690000000
-all-year,all-week,early-morning,heatpump,2040,0.63170000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
-all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
-all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
-all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R1,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R1,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R1,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
+0,heat,R1,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R1,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R1,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R1,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R1,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.27220000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2032,0.12560000000
+0,heat,R2,2040,20,all-year,all-week,night,heatpump,2034,0.12560000000
+0,heat,R2,2040,21,all-year,all-week,night,heatpump,2036,0.12560000000
+0,heat,R2,2040,22,all-year,all-week,night,heatpump,2038,0.16750000000
+0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.31590000000
+0,heat,R2,2042,19,all-year,all-week,night,heatpump,2032,0.12630000000
+0,heat,R2,2042,20,all-year,all-week,night,heatpump,2034,0.12630000000
+0,heat,R2,2042,21,all-year,all-week,night,heatpump,2036,0.12630000000
+0,heat,R2,2042,22,all-year,all-week,night,heatpump,2038,0.16850000000
+0,heat,R2,2042,23,all-year,all-week,night,heatpump,2040,0.31590000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R1,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
+1,heat,R1,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R1,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R1,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R1,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R1,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.38890000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2032,0.17950000000
+1,heat,R2,2040,20,all-year,all-week,morning,heatpump,2034,0.17950000000
+1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2036,0.17950000000
+1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2038,0.23930000000
+1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.45120000000
+1,heat,R2,2042,19,all-year,all-week,morning,heatpump,2032,0.18050000000
+1,heat,R2,2042,20,all-year,all-week,morning,heatpump,2034,0.18050000000
+1,heat,R2,2042,21,all-year,all-week,morning,heatpump,2036,0.18050000000
+1,heat,R2,2042,22,all-year,all-week,morning,heatpump,2038,0.24070000000
+1,heat,R2,2042,23,all-year,all-week,morning,heatpump,2040,0.45120000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R1,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+2,heat,R1,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R1,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R1,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R1,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R1,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.27220000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12560000000
+2,heat,R2,2040,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12560000000
+2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12560000000
+2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16750000000
+2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+2,heat,R2,2042,19,all-year,all-week,mid-afternoon,heatpump,2032,0.12630000000
+2,heat,R2,2042,20,all-year,all-week,mid-afternoon,heatpump,2034,0.12630000000
+2,heat,R2,2042,21,all-year,all-week,mid-afternoon,heatpump,2036,0.12630000000
+2,heat,R2,2042,22,all-year,all-week,mid-afternoon,heatpump,2038,0.16850000000
+2,heat,R2,2042,23,all-year,all-week,mid-afternoon,heatpump,2040,0.31590000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R1,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+3,heat,R1,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R1,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R1,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R1,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R1,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.38890000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2032,0.17950000000
+3,heat,R2,2040,20,all-year,all-week,early-peak,heatpump,2034,0.17950000000
+3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2036,0.17950000000
+3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2038,0.23930000000
+3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+3,heat,R2,2042,19,all-year,all-week,early-peak,heatpump,2032,0.18050000000
+3,heat,R2,2042,20,all-year,all-week,early-peak,heatpump,2034,0.18050000000
+3,heat,R2,2042,21,all-year,all-week,early-peak,heatpump,2036,0.18050000000
+3,heat,R2,2042,22,all-year,all-week,early-peak,heatpump,2038,0.24070000000
+3,heat,R2,2042,23,all-year,all-week,early-peak,heatpump,2040,0.45120000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R1,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+4,heat,R1,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R1,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R1,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R1,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R1,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,0.81670000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2032,0.37690000000
+4,heat,R2,2040,20,all-year,all-week,late-peak,heatpump,2034,0.37690000000
+4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2036,0.37690000000
+4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2038,0.50260000000
+4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+4,heat,R2,2042,19,all-year,all-week,late-peak,heatpump,2032,0.37900000000
+4,heat,R2,2042,20,all-year,all-week,late-peak,heatpump,2034,0.37900000000
+4,heat,R2,2042,21,all-year,all-week,late-peak,heatpump,2036,0.37900000000
+4,heat,R2,2042,22,all-year,all-week,late-peak,heatpump,2038,0.50540000000
+4,heat,R2,2042,23,all-year,all-week,late-peak,heatpump,2040,0.94760000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R1,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
+5,heat,R1,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R1,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R1,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R1,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R1,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.54440000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2032,0.25130000000
+5,heat,R2,2040,20,all-year,all-week,evening,heatpump,2034,0.25130000000
+5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2036,0.25130000000
+5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2038,0.33500000000
+5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.63170000000
+5,heat,R2,2042,19,all-year,all-week,evening,heatpump,2032,0.25270000000
+5,heat,R2,2042,20,all-year,all-week,evening,heatpump,2034,0.25270000000
+5,heat,R2,2042,21,all-year,all-week,evening,heatpump,2036,0.25270000000
+5,heat,R2,2042,22,all-year,all-week,evening,heatpump,2038,0.33690000000
+5,heat,R2,2042,23,all-year,all-week,evening,heatpump,2040,0.63170000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R1,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+6,heat,R1,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R1,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R1,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R1,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R1,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.54440000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2032,0.25130000000
+6,heat,R2,2040,20,all-year,all-week,early-morning,heatpump,2034,0.25130000000
+6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2036,0.25130000000
+6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2038,0.33500000000
+6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+6,heat,R2,2042,19,all-year,all-week,early-morning,heatpump,2032,0.25270000000
+6,heat,R2,2042,20,all-year,all-week,early-morning,heatpump,2034,0.25270000000
+6,heat,R2,2042,21,all-year,all-week,early-morning,heatpump,2036,0.25270000000
+6,heat,R2,2042,22,all-year,all-week,early-morning,heatpump,2038,0.33690000000
+6,heat,R2,2042,23,all-year,all-week,early-morning,heatpump,2040,0.63170000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R1,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+7,heat,R1,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R1,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R1,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R1,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R1,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.54440000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2032,0.25130000000
+7,heat,R2,2040,20,all-year,all-week,late-afternoon,heatpump,2034,0.25130000000
+7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2036,0.25130000000
+7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2038,0.33500000000
+7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
+7,heat,R2,2042,19,all-year,all-week,late-afternoon,heatpump,2032,0.25270000000
+7,heat,R2,2042,20,all-year,all-week,late-afternoon,heatpump,2034,0.25270000000
+7,heat,R2,2042,21,all-year,all-week,late-afternoon,heatpump,2036,0.25270000000
+7,heat,R2,2042,22,all-year,all-week,late-afternoon,heatpump,2038,0.33690000000
+7,heat,R2,2042,23,all-year,all-week,late-afternoon,heatpump,2040,0.63170000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
index 0f2da1f1..429eef7e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2020.csv
@@ -1,321 +1,321 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.35000000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,17.50000000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gas_stove,2020,17.50000000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,17.50000000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gas_stove,2020,17.50000000000
-all-year,all-week,night,gasboiler,2020,22.64850000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,0.35000000000
-all-year,all-week,night,gas_stove,2020,0.35000000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,gas_stove,2020,0.35000000000
-all-year,all-week,night,gas_stove,2020,0.35000000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.50000000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,25.00000000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gas_stove,2020,25.00000000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,25.00000000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gas_stove,2020,25.00000000000
-all-year,all-week,morning,gasboiler,2020,32.35500000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,0.50000000000
-all-year,all-week,morning,gas_stove,2020,0.50000000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,gas_stove,2020,0.50000000000
-all-year,all-week,morning,gas_stove,2020,0.50000000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
-all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.50000000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gas_stove,2020,25.00000000000
-all-year,all-week,early-peak,gasboiler,2020,32.35500000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-all-year,all-week,early-peak,gas_stove,2020,0.50000000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,1.05000000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gas_stove,2020,52.50000000000
-all-year,all-week,late-peak,gasboiler,2020,67.94550000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-all-year,all-week,late-peak,gas_stove,2020,1.05000000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.70000000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,35.00000000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gas_stove,2020,35.00000000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,35.00000000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gas_stove,2020,35.00000000000
-all-year,all-week,evening,gasboiler,2020,45.29700000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,0.70000000000
-all-year,all-week,evening,gas_stove,2020,0.70000000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,gas_stove,2020,0.70000000000
-all-year,all-week,evening,gas_stove,2020,0.70000000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.70000000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gas_stove,2020,35.00000000000
-all-year,all-week,early-morning,gasboiler,2020,45.29700000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-all-year,all-week,early-morning,gas_stove,2020,0.70000000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
-all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2020,2,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2020,6,all-year,all-week,night,gasboiler,2020,0.35000000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,6,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.36060000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R1,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R1,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2020,5,all-year,all-week,night,gas_stove,2020,17.50000000000
+0,CO2f,R2,2020,6,all-year,all-week,night,gasboiler,2020,22.64850000000
+0,CO2f,R2,2025,1,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,5,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,6,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,cook,R1,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R1,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R1,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2020,1,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R2,2020,5,all-year,all-week,night,gas_stove,2020,0.35000000000
+0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,1,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2025,4,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,5,all-year,all-week,night,gas_stove,2020,0.10610000000
+1,heat,R1,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2020,2,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2020,6,all-year,all-week,morning,gasboiler,2020,0.50000000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,6,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R1,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R1,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2020,5,all-year,all-week,morning,gas_stove,2020,25.00000000000
+1,CO2f,R2,2020,6,all-year,all-week,morning,gasboiler,2020,32.35500000000
+1,CO2f,R2,2025,1,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,5,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,6,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,cook,R1,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R1,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R1,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2020,1,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R2,2020,5,all-year,all-week,morning,gas_stove,2020,0.50000000000
+1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,1,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2025,4,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,5,all-year,all-week,morning,gas_stove,2020,0.15150000000
+2,heat,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.35000000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R1,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,17.50000000000
+2,CO2f,R2,2020,6,all-year,all-week,mid-afternoon,gasboiler,2020,22.64850000000
+2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,cook,R1,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R1,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R1,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2020,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R2,2020,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.35000000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,1,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2025,4,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,5,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+3,heat,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,0.50000000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R1,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,25.00000000000
+3,CO2f,R2,2020,6,all-year,all-week,early-peak,gasboiler,2020,32.35500000000
+3,CO2f,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,6,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,cook,R1,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R1,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R1,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2020,1,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R2,2020,5,all-year,all-week,early-peak,gas_stove,2020,0.50000000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,1,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2025,4,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,5,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+4,heat,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,1.05000000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R1,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R1,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,52.50000000000
+4,CO2f,R2,2020,6,all-year,all-week,late-peak,gasboiler,2020,67.94550000000
+4,CO2f,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,6,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,cook,R1,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R1,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R1,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2020,1,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R2,2020,5,all-year,all-week,late-peak,gas_stove,2020,1.05000000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,1,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2025,4,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,5,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+5,heat,R1,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2020,2,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2020,6,all-year,all-week,evening,gasboiler,2020,0.70000000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,6,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R1,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R1,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2020,5,all-year,all-week,evening,gas_stove,2020,35.00000000000
+5,CO2f,R2,2020,6,all-year,all-week,evening,gasboiler,2020,45.29700000000
+5,CO2f,R2,2025,1,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,5,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,6,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,cook,R1,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R1,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R1,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2020,1,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R2,2020,5,all-year,all-week,evening,gas_stove,2020,0.70000000000
+5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,1,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2025,4,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,5,all-year,all-week,evening,gas_stove,2020,0.21210000000
+6,heat,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,0.70000000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,CO2f,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R1,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,35.00000000000
+6,CO2f,R2,2020,6,all-year,all-week,early-morning,gasboiler,2020,45.29700000000
+6,CO2f,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,6,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,cook,R1,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R1,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R1,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2020,1,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R2,2020,5,all-year,all-week,early-morning,gas_stove,2020,0.70000000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,1,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2025,4,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,5,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+7,heat,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,0.70000000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R1,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,35.00000000000
+7,CO2f,R2,2020,6,all-year,all-week,late-afternoon,gasboiler,2020,45.29700000000
+7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,cook,R1,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R1,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R1,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2020,1,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R2,2020,5,all-year,all-week,late-afternoon,gas_stove,2020,0.70000000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,1,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2025,4,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,5,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
index d1d88a58..c58d9cfa 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2025.csv
@@ -1,321 +1,321 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,gasboiler,2020,0.10610000000
-all-year,all-week,night,heatpump,2020,0.36060000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,gas_stove,2020,5.30300000000
-all-year,all-week,night,gasboiler,2020,6.86320000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,electric_stove,2020,0.36060000000
-all-year,all-week,night,gas_stove,2020,0.10610000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,gasboiler,2020,0.15150000000
-all-year,all-week,morning,heatpump,2020,0.51520000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,gas_stove,2020,7.57580000000
-all-year,all-week,morning,gasboiler,2020,9.80450000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,electric_stove,2020,0.51520000000
-all-year,all-week,morning,gas_stove,2020,0.15150000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
-all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
-all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,gasboiler,2020,0.15150000000
-all-year,all-week,early-peak,heatpump,2020,0.51520000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,gas_stove,2020,7.57580000000
-all-year,all-week,early-peak,gasboiler,2020,9.80450000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,electric_stove,2020,0.51520000000
-all-year,all-week,early-peak,gas_stove,2020,0.15150000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,gasboiler,2020,0.31820000000
-all-year,all-week,late-peak,heatpump,2020,1.08180000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,gas_stove,2020,15.90910000000
-all-year,all-week,late-peak,gasboiler,2020,20.58950000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,electric_stove,2020,1.08180000000
-all-year,all-week,late-peak,gas_stove,2020,0.31820000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,gasboiler,2020,0.21210000000
-all-year,all-week,evening,heatpump,2020,0.72120000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,gas_stove,2020,10.60610000000
-all-year,all-week,evening,gasboiler,2020,13.72640000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,electric_stove,2020,0.72120000000
-all-year,all-week,evening,gas_stove,2020,0.21210000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,gasboiler,2020,0.21210000000
-all-year,all-week,early-morning,heatpump,2020,0.72120000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,gas_stove,2020,10.60610000000
-all-year,all-week,early-morning,gasboiler,2020,13.72640000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,electric_stove,2020,0.72120000000
-all-year,all-week,early-morning,gas_stove,2020,0.21210000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
-all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
-all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
-all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R1,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2025,3,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2025,9,all-year,all-week,night,gasboiler,2020,0.10610000000
+0,heat,R2,2025,10,all-year,all-week,night,heatpump,2020,0.36060000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.22920000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R1,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R1,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,CO2f,R2,2025,8,all-year,all-week,night,gas_stove,2020,5.30300000000
+0,CO2f,R2,2025,9,all-year,all-week,night,gasboiler,2020,6.86320000000
+0,cook,R1,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R1,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R1,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R1,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2025,0,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2025,6,all-year,all-week,night,electric_stove,2020,0.36060000000
+0,cook,R2,2025,8,all-year,all-week,night,gas_stove,2020,0.10610000000
+0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2030,6,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,7,all-year,all-week,night,electric_stove,2025,0.22920000000
+1,heat,R1,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R1,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2025,3,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2025,9,all-year,all-week,morning,gasboiler,2020,0.15150000000
+1,heat,R2,2025,10,all-year,all-week,morning,heatpump,2020,0.51520000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R1,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R1,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,CO2f,R2,2025,8,all-year,all-week,morning,gas_stove,2020,7.57580000000
+1,CO2f,R2,2025,9,all-year,all-week,morning,gasboiler,2020,9.80450000000
+1,cook,R1,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R1,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R1,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R1,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2025,0,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2025,6,all-year,all-week,morning,electric_stove,2020,0.51520000000
+1,cook,R2,2025,8,all-year,all-week,morning,gas_stove,2020,0.15150000000
+1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2030,6,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,7,all-year,all-week,morning,electric_stove,2025,0.32740000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R1,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,0.10610000000
+2,heat,R2,2025,10,all-year,all-week,mid-afternoon,heatpump,2020,0.36060000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R1,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,5.30300000000
+2,CO2f,R2,2025,9,all-year,all-week,mid-afternoon,gasboiler,2020,6.86320000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R1,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R1,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R1,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2025,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.36060000000
+2,cook,R2,2025,8,all-year,all-week,mid-afternoon,gas_stove,2020,0.10610000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2030,6,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,7,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R1,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,0.15150000000
+3,heat,R2,2025,10,all-year,all-week,early-peak,heatpump,2020,0.51520000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R1,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,CO2f,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,7.57580000000
+3,CO2f,R2,2025,9,all-year,all-week,early-peak,gasboiler,2020,9.80450000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R1,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R1,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R1,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2025,6,all-year,all-week,early-peak,electric_stove,2020,0.51520000000
+3,cook,R2,2025,8,all-year,all-week,early-peak,gas_stove,2020,0.15150000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2030,6,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,7,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R1,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,0.31820000000
+4,heat,R2,2025,10,all-year,all-week,late-peak,heatpump,2020,1.08180000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R1,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,CO2f,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,15.90910000000
+4,CO2f,R2,2025,9,all-year,all-week,late-peak,gasboiler,2020,20.58950000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R1,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R1,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R1,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2025,6,all-year,all-week,late-peak,electric_stove,2020,1.08180000000
+4,cook,R2,2025,8,all-year,all-week,late-peak,gas_stove,2020,0.31820000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2030,6,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,7,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+5,heat,R1,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R1,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2025,3,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2025,9,all-year,all-week,evening,gasboiler,2020,0.21210000000
+5,heat,R2,2025,10,all-year,all-week,evening,heatpump,2020,0.72120000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R1,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R1,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,CO2f,R2,2025,8,all-year,all-week,evening,gas_stove,2020,10.60610000000
+5,CO2f,R2,2025,9,all-year,all-week,evening,gasboiler,2020,13.72640000000
+5,cook,R1,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R1,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R1,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R1,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2025,0,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2025,6,all-year,all-week,evening,electric_stove,2020,0.72120000000
+5,cook,R2,2025,8,all-year,all-week,evening,gas_stove,2020,0.21210000000
+5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2030,6,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,7,all-year,all-week,evening,electric_stove,2025,0.45830000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R1,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,0.21210000000
+6,heat,R2,2025,10,all-year,all-week,early-morning,heatpump,2020,0.72120000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R1,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,3,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,CO2f,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,10.60610000000
+6,CO2f,R2,2025,9,all-year,all-week,early-morning,gasboiler,2020,13.72640000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R1,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R1,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R1,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2025,6,all-year,all-week,early-morning,electric_stove,2020,0.72120000000
+6,cook,R2,2025,8,all-year,all-week,early-morning,gas_stove,2020,0.21210000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2030,6,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,7,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R1,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,0.21210000000
+7,heat,R2,2025,10,all-year,all-week,late-afternoon,heatpump,2020,0.72120000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R1,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,10.60610000000
+7,CO2f,R2,2025,9,all-year,all-week,late-afternoon,gasboiler,2020,13.72640000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R1,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R1,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R1,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2025,6,all-year,all-week,late-afternoon,electric_stove,2020,0.72120000000
+7,cook,R2,2025,8,all-year,all-week,late-afternoon,gas_stove,2020,0.21210000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2030,6,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,7,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
index 43b44cf2..06e46f15 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2030.csv
@@ -1,257 +1,257 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2020,0.35420000000
-all-year,all-week,night,heatpump,2025,0.22920000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2020,0.35420000000
-all-year,all-week,night,electric_stove,2025,0.22920000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2020,0.50600000000
-all-year,all-week,morning,heatpump,2025,0.32740000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2020,0.50600000000
-all-year,all-week,morning,electric_stove,2025,0.32740000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2020,0.50600000000
-all-year,all-week,early-peak,heatpump,2025,0.32740000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2020,0.50600000000
-all-year,all-week,early-peak,electric_stove,2025,0.32740000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2020,1.06250000000
-all-year,all-week,late-peak,heatpump,2025,0.68750000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2020,1.06250000000
-all-year,all-week,late-peak,electric_stove,2025,0.68750000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2020,0.70830000000
-all-year,all-week,evening,heatpump,2025,0.45830000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2020,0.70830000000
-all-year,all-week,evening,electric_stove,2025,0.45830000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2020,0.70830000000
-all-year,all-week,early-morning,heatpump,2025,0.45830000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2020,0.70830000000
-all-year,all-week,early-morning,electric_stove,2025,0.45830000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.35420000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.22920000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.46670000000
+0,cook,R1,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R1,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R1,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R1,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2030,0,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,1,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2030,8,all-year,all-week,night,electric_stove,2020,0.35420000000
+0,cook,R2,2030,9,all-year,all-week,night,electric_stove,2025,0.22920000000
+0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2035,9,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,10,all-year,all-week,night,electric_stove,2030,0.46670000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.50600000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.32740000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,cook,R1,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R1,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R1,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R1,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2030,0,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,1,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2030,8,all-year,all-week,morning,electric_stove,2020,0.50600000000
+1,cook,R2,2030,9,all-year,all-week,morning,electric_stove,2025,0.32740000000
+1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2035,9,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,10,all-year,all-week,morning,electric_stove,2030,0.66670000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.35420000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.22920000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R1,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R1,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R1,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2030,8,all-year,all-week,mid-afternoon,electric_stove,2020,0.35420000000
+2,cook,R2,2030,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.22920000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2035,9,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,10,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.50600000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.32740000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R1,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R1,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R1,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2030,8,all-year,all-week,early-peak,electric_stove,2020,0.50600000000
+3,cook,R2,2030,9,all-year,all-week,early-peak,electric_stove,2025,0.32740000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2035,9,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,10,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.06250000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.68750000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R1,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R1,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R1,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2030,8,all-year,all-week,late-peak,electric_stove,2020,1.06250000000
+4,cook,R2,2030,9,all-year,all-week,late-peak,electric_stove,2025,0.68750000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2035,9,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,10,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.70830000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.45830000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,cook,R1,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R1,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R1,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R1,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2030,0,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,1,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2030,8,all-year,all-week,evening,electric_stove,2020,0.70830000000
+5,cook,R2,2030,9,all-year,all-week,evening,electric_stove,2025,0.45830000000
+5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2035,9,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,10,all-year,all-week,evening,electric_stove,2030,0.93330000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.70830000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.45830000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R1,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R1,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R1,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2030,8,all-year,all-week,early-morning,electric_stove,2020,0.70830000000
+6,cook,R2,2030,9,all-year,all-week,early-morning,electric_stove,2025,0.45830000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2035,9,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,10,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.70830000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.45830000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R1,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R1,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R1,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2030,8,all-year,all-week,late-afternoon,electric_stove,2020,0.70830000000
+7,cook,R2,2030,9,all-year,all-week,late-afternoon,electric_stove,2025,0.45830000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2035,9,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,10,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
index 1d38bee6..777ad44d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2035.csv
@@ -1,257 +1,257 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2025,0.23330000000
-all-year,all-week,night,heatpump,2030,0.46670000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2025,0.23330000000
-all-year,all-week,night,electric_stove,2030,0.46670000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2025,0.33330000000
-all-year,all-week,morning,heatpump,2030,0.66670000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2025,0.33330000000
-all-year,all-week,morning,electric_stove,2030,0.66670000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2025,0.33330000000
-all-year,all-week,early-peak,heatpump,2030,0.66670000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2025,0.33330000000
-all-year,all-week,early-peak,electric_stove,2030,0.66670000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2025,0.70000000000
-all-year,all-week,late-peak,heatpump,2030,1.40000000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2025,0.70000000000
-all-year,all-week,late-peak,electric_stove,2030,1.40000000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2025,0.46670000000
-all-year,all-week,evening,heatpump,2030,0.93330000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2025,0.46670000000
-all-year,all-week,evening,electric_stove,2030,0.93330000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2025,0.46670000000
-all-year,all-week,early-morning,heatpump,2030,0.93330000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2025,0.46670000000
-all-year,all-week,early-morning,electric_stove,2030,0.93330000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
-all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R1,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2035,17,all-year,all-week,night,heatpump,2025,0.23330000000
+0,heat,R2,2035,18,all-year,all-week,night,heatpump,2030,0.46670000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,18,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,19,all-year,all-week,night,heatpump,2035,0.35600000000
+0,cook,R1,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R1,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R1,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R1,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2035,1,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,2,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2035,11,all-year,all-week,night,electric_stove,2025,0.23330000000
+0,cook,R2,2035,12,all-year,all-week,night,electric_stove,2030,0.46670000000
+0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2040,12,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,13,all-year,all-week,night,electric_stove,2035,0.35600000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R1,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2035,17,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,R2,2035,18,all-year,all-week,morning,heatpump,2030,0.66670000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,18,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,19,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,cook,R1,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R1,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R1,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R1,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2035,1,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,2,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2035,11,all-year,all-week,morning,electric_stove,2025,0.33330000000
+1,cook,R2,2035,12,all-year,all-week,morning,electric_stove,2030,0.66670000000
+1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2040,12,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,13,all-year,all-week,morning,electric_stove,2035,0.50850000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R1,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2035,17,all-year,all-week,mid-afternoon,heatpump,2025,0.23330000000
+2,heat,R2,2035,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46670000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,18,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,19,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R1,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R1,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R1,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2035,11,all-year,all-week,mid-afternoon,electric_stove,2025,0.23330000000
+2,cook,R2,2035,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46670000000
+2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2040,12,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,13,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R1,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2035,17,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,R2,2035,18,all-year,all-week,early-peak,heatpump,2030,0.66670000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,18,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,19,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R1,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R1,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R1,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,2,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2035,11,all-year,all-week,early-peak,electric_stove,2025,0.33330000000
+3,cook,R2,2035,12,all-year,all-week,early-peak,electric_stove,2030,0.66670000000
+3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2040,12,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,13,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R1,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2035,17,all-year,all-week,late-peak,heatpump,2025,0.70000000000
+4,heat,R2,2035,18,all-year,all-week,late-peak,heatpump,2030,1.40000000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,18,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,19,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R1,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R1,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R1,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,2,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2035,11,all-year,all-week,late-peak,electric_stove,2025,0.70000000000
+4,cook,R2,2035,12,all-year,all-week,late-peak,electric_stove,2030,1.40000000000
+4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2040,12,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,13,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R1,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2035,17,all-year,all-week,evening,heatpump,2025,0.46670000000
+5,heat,R2,2035,18,all-year,all-week,evening,heatpump,2030,0.93330000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,18,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,19,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,cook,R1,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R1,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R1,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R1,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2035,1,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,2,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2035,11,all-year,all-week,evening,electric_stove,2025,0.46670000000
+5,cook,R2,2035,12,all-year,all-week,evening,electric_stove,2030,0.93330000000
+5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2040,12,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,13,all-year,all-week,evening,electric_stove,2035,0.71200000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R1,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2035,17,all-year,all-week,early-morning,heatpump,2025,0.46670000000
+6,heat,R2,2035,18,all-year,all-week,early-morning,heatpump,2030,0.93330000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,18,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,19,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R1,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R1,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R1,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,2,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2035,11,all-year,all-week,early-morning,electric_stove,2025,0.46670000000
+6,cook,R2,2035,12,all-year,all-week,early-morning,electric_stove,2030,0.93330000000
+6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2040,12,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,13,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R1,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2035,17,all-year,all-week,late-afternoon,heatpump,2025,0.46670000000
+7,heat,R2,2035,18,all-year,all-week,late-afternoon,heatpump,2030,0.93330000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,18,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,19,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R1,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R1,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R1,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,2,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2035,11,all-year,all-week,late-afternoon,electric_stove,2025,0.46670000000
+7,cook,R2,2035,12,all-year,all-week,late-afternoon,electric_stove,2030,0.93330000000
+7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2040,12,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,13,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
index 5e093971..65c91ff4 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2040.csv
@@ -1,257 +1,257 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2030,0.46070000000
-all-year,all-week,night,heatpump,2035,0.35600000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2030,0.46070000000
-all-year,all-week,night,electric_stove,2035,0.35600000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2030,0.65810000000
-all-year,all-week,morning,heatpump,2035,0.50850000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2030,0.65810000000
-all-year,all-week,morning,electric_stove,2035,0.50850000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2030,0.65810000000
-all-year,all-week,early-peak,heatpump,2035,0.50850000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2030,0.65810000000
-all-year,all-week,early-peak,electric_stove,2035,0.50850000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2030,1.38210000000
-all-year,all-week,late-peak,heatpump,2035,1.06790000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2030,1.38210000000
-all-year,all-week,late-peak,electric_stove,2035,1.06790000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2030,0.92140000000
-all-year,all-week,evening,heatpump,2035,0.71200000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2030,0.92140000000
-all-year,all-week,evening,electric_stove,2035,0.71200000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2030,0.92140000000
-all-year,all-week,early-morning,heatpump,2035,0.71200000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2030,0.92140000000
-all-year,all-week,early-morning,electric_stove,2035,0.71200000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
-all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R1,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2040,21,all-year,all-week,night,heatpump,2030,0.46070000000
+0,heat,R2,2040,22,all-year,all-week,night,heatpump,2035,0.35600000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,22,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,23,all-year,all-week,night,heatpump,2040,0.57270000000
+0,cook,R1,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R1,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R1,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R1,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2040,2,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,3,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2040,14,all-year,all-week,night,electric_stove,2030,0.46070000000
+0,cook,R2,2040,15,all-year,all-week,night,electric_stove,2035,0.35600000000
+0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2045,15,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,16,all-year,all-week,night,electric_stove,2040,0.57270000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R1,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2040,21,all-year,all-week,morning,heatpump,2030,0.65810000000
+1,heat,R2,2040,22,all-year,all-week,morning,heatpump,2035,0.50850000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,22,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,23,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,cook,R1,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R1,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R1,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R1,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2040,2,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,3,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2040,14,all-year,all-week,morning,electric_stove,2030,0.65810000000
+1,cook,R2,2040,15,all-year,all-week,morning,electric_stove,2035,0.50850000000
+1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2045,15,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,16,all-year,all-week,morning,electric_stove,2040,0.81820000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R1,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2040,21,all-year,all-week,mid-afternoon,heatpump,2030,0.46070000000
+2,heat,R2,2040,22,all-year,all-week,mid-afternoon,heatpump,2035,0.35600000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,22,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,23,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,cook,R1,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R1,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R1,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R1,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2040,2,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2040,14,all-year,all-week,mid-afternoon,electric_stove,2030,0.46070000000
+2,cook,R2,2040,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.35600000000
+2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2045,15,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,16,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R1,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2040,21,all-year,all-week,early-peak,heatpump,2030,0.65810000000
+3,heat,R2,2040,22,all-year,all-week,early-peak,heatpump,2035,0.50850000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,22,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,23,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,cook,R1,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R1,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R1,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R1,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2040,2,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,3,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2040,14,all-year,all-week,early-peak,electric_stove,2030,0.65810000000
+3,cook,R2,2040,15,all-year,all-week,early-peak,electric_stove,2035,0.50850000000
+3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2045,15,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,16,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R1,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2040,21,all-year,all-week,late-peak,heatpump,2030,1.38210000000
+4,heat,R2,2040,22,all-year,all-week,late-peak,heatpump,2035,1.06790000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,22,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,23,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,cook,R1,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R1,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R1,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R1,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2040,2,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,3,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2040,14,all-year,all-week,late-peak,electric_stove,2030,1.38210000000
+4,cook,R2,2040,15,all-year,all-week,late-peak,electric_stove,2035,1.06790000000
+4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2045,15,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,16,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R1,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2040,21,all-year,all-week,evening,heatpump,2030,0.92140000000
+5,heat,R2,2040,22,all-year,all-week,evening,heatpump,2035,0.71200000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,22,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,23,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,cook,R1,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R1,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R1,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R1,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2040,2,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,3,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2040,14,all-year,all-week,evening,electric_stove,2030,0.92140000000
+5,cook,R2,2040,15,all-year,all-week,evening,electric_stove,2035,0.71200000000
+5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2045,15,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,16,all-year,all-week,evening,electric_stove,2040,1.14550000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R1,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2040,21,all-year,all-week,early-morning,heatpump,2030,0.92140000000
+6,heat,R2,2040,22,all-year,all-week,early-morning,heatpump,2035,0.71200000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,22,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,23,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,cook,R1,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R1,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R1,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R1,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2040,2,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,3,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2040,14,all-year,all-week,early-morning,electric_stove,2030,0.92140000000
+6,cook,R2,2040,15,all-year,all-week,early-morning,electric_stove,2035,0.71200000000
+6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2045,15,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,16,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R1,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2040,21,all-year,all-week,late-afternoon,heatpump,2030,0.92140000000
+7,heat,R2,2040,22,all-year,all-week,late-afternoon,heatpump,2035,0.71200000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,22,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,23,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,cook,R1,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R1,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R1,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R1,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2040,2,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,3,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2040,14,all-year,all-week,late-afternoon,electric_stove,2030,0.92140000000
+7,cook,R2,2040,15,all-year,all-week,late-afternoon,electric_stove,2035,0.71200000000
+7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2045,15,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,16,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
index 7a4fb79e..870f9f86 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2045.csv
@@ -1,257 +1,257 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2035,0.36060000000
-all-year,all-week,night,heatpump,2040,0.57270000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2035,0.36060000000
-all-year,all-week,night,electric_stove,2040,0.57270000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2035,0.51520000000
-all-year,all-week,morning,heatpump,2040,0.81820000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2035,0.51520000000
-all-year,all-week,morning,electric_stove,2040,0.81820000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2035,0.51520000000
-all-year,all-week,early-peak,heatpump,2040,0.81820000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2035,0.51520000000
-all-year,all-week,early-peak,electric_stove,2040,0.81820000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2035,1.08180000000
-all-year,all-week,late-peak,heatpump,2040,1.71820000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2035,1.08180000000
-all-year,all-week,late-peak,electric_stove,2040,1.71820000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2035,0.72120000000
-all-year,all-week,evening,heatpump,2040,1.14550000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2035,0.72120000000
-all-year,all-week,evening,electric_stove,2040,1.14550000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2035,0.72120000000
-all-year,all-week,early-morning,heatpump,2040,1.14550000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2035,0.72120000000
-all-year,all-week,early-morning,electric_stove,2040,1.14550000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
-all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R1,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R1,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,12,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2045,25,all-year,all-week,night,heatpump,2035,0.36060000000
+0,heat,R2,2045,26,all-year,all-week,night,heatpump,2040,0.57270000000
+0,heat,R2,2050,12,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,26,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,27,all-year,all-week,night,heatpump,2045,0.48300000000
+0,cook,R1,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R1,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R1,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2045,3,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,4,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2045,17,all-year,all-week,night,electric_stove,2035,0.36060000000
+0,cook,R2,2045,18,all-year,all-week,night,electric_stove,2040,0.57270000000
+0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2050,18,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,19,all-year,all-week,night,electric_stove,2045,0.48300000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R1,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R1,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,12,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2045,25,all-year,all-week,morning,heatpump,2035,0.51520000000
+1,heat,R2,2045,26,all-year,all-week,morning,heatpump,2040,0.81820000000
+1,heat,R2,2050,12,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,26,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,27,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,cook,R1,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R1,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R1,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2045,3,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,4,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2045,17,all-year,all-week,morning,electric_stove,2035,0.51520000000
+1,cook,R2,2045,18,all-year,all-week,morning,electric_stove,2040,0.81820000000
+1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2050,18,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,19,all-year,all-week,morning,electric_stove,2045,0.69000000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R1,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R1,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,12,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2045,25,all-year,all-week,mid-afternoon,heatpump,2035,0.36060000000
+2,heat,R2,2045,26,all-year,all-week,mid-afternoon,heatpump,2040,0.57270000000
+2,heat,R2,2050,12,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,26,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,27,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,cook,R1,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R1,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R1,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2045,3,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2045,17,all-year,all-week,mid-afternoon,electric_stove,2035,0.36060000000
+2,cook,R2,2045,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.57270000000
+2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2050,18,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,19,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R1,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R1,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,12,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2045,25,all-year,all-week,early-peak,heatpump,2035,0.51520000000
+3,heat,R2,2045,26,all-year,all-week,early-peak,heatpump,2040,0.81820000000
+3,heat,R2,2050,12,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,26,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,27,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,cook,R1,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R1,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R1,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2045,3,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2045,17,all-year,all-week,early-peak,electric_stove,2035,0.51520000000
+3,cook,R2,2045,18,all-year,all-week,early-peak,electric_stove,2040,0.81820000000
+3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2050,18,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,19,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R1,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R1,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,12,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2045,25,all-year,all-week,late-peak,heatpump,2035,1.08180000000
+4,heat,R2,2045,26,all-year,all-week,late-peak,heatpump,2040,1.71820000000
+4,heat,R2,2050,12,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,26,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,27,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,cook,R1,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R1,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R1,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2045,3,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2045,17,all-year,all-week,late-peak,electric_stove,2035,1.08180000000
+4,cook,R2,2045,18,all-year,all-week,late-peak,electric_stove,2040,1.71820000000
+4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2050,18,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,19,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R1,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R1,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,12,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2045,25,all-year,all-week,evening,heatpump,2035,0.72120000000
+5,heat,R2,2045,26,all-year,all-week,evening,heatpump,2040,1.14550000000
+5,heat,R2,2050,12,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,26,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,27,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,cook,R1,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R1,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R1,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2045,3,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,4,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2045,17,all-year,all-week,evening,electric_stove,2035,0.72120000000
+5,cook,R2,2045,18,all-year,all-week,evening,electric_stove,2040,1.14550000000
+5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2050,18,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,19,all-year,all-week,evening,electric_stove,2045,0.96600000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R1,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R1,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,12,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2045,25,all-year,all-week,early-morning,heatpump,2035,0.72120000000
+6,heat,R2,2045,26,all-year,all-week,early-morning,heatpump,2040,1.14550000000
+6,heat,R2,2050,12,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,26,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,27,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,cook,R1,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R1,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R1,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2045,3,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2045,17,all-year,all-week,early-morning,electric_stove,2035,0.72120000000
+6,cook,R2,2045,18,all-year,all-week,early-morning,electric_stove,2040,1.14550000000
+6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2050,18,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,19,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R1,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R1,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,12,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2045,25,all-year,all-week,late-afternoon,heatpump,2035,0.72120000000
+7,heat,R2,2045,26,all-year,all-week,late-afternoon,heatpump,2040,1.14550000000
+7,heat,R2,2050,12,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,26,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,27,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,cook,R1,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R1,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R1,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2045,3,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2045,17,all-year,all-week,late-afternoon,electric_stove,2035,0.72120000000
+7,cook,R2,2045,18,all-year,all-week,late-afternoon,electric_stove,2040,1.14550000000
+7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2050,18,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,19,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
index afb661c9..ab377708 100644
--- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/Results/Residential/Supply/2050.csv
@@ -1,257 +1,257 @@
-month,day,hour,technology,installed,supply
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2040,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,heatpump,2045,0.48300000000
-all-year,all-week,night,heatpump,2050,0.56700000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2050,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2050,0.56700000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2040,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2050,0.56700000000
-all-year,all-week,night,electric_stove,2045,0.48300000000
-all-year,all-week,night,electric_stove,2050,0.56700000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2040,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,heatpump,2045,0.69000000000
-all-year,all-week,morning,heatpump,2050,0.81000000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2050,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2050,0.81000000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2040,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2050,0.81000000000
-all-year,all-week,morning,electric_stove,2045,0.69000000000
-all-year,all-week,morning,electric_stove,2050,0.81000000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
-all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
-all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2040,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,heatpump,2045,0.69000000000
-all-year,all-week,early-peak,heatpump,2050,0.81000000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2040,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-all-year,all-week,early-peak,electric_stove,2045,0.69000000000
-all-year,all-week,early-peak,electric_stove,2050,0.81000000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2040,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,heatpump,2045,1.44900000000
-all-year,all-week,late-peak,heatpump,2050,1.70100000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2040,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-all-year,all-week,late-peak,electric_stove,2045,1.44900000000
-all-year,all-week,late-peak,electric_stove,2050,1.70100000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2040,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,heatpump,2045,0.96600000000
-all-year,all-week,evening,heatpump,2050,1.13400000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2050,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2050,1.13400000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2040,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2050,1.13400000000
-all-year,all-week,evening,electric_stove,2045,0.96600000000
-all-year,all-week,evening,electric_stove,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2040,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,heatpump,2045,0.96600000000
-all-year,all-week,early-morning,heatpump,2050,1.13400000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2040,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-all-year,all-week,early-morning,electric_stove,2045,0.96600000000
-all-year,all-week,early-morning,electric_stove,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
-all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
-all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
-all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R1,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R1,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R1,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2050,29,all-year,all-week,night,heatpump,2040,0.56700000000
+0,heat,R2,2050,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.56700000000
+0,heat,R2,2055,30,all-year,all-week,night,heatpump,2045,0.48300000000
+0,heat,R2,2055,31,all-year,all-week,night,heatpump,2050,0.56700000000
+0,cook,R1,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R1,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
+0,cook,R1,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R1,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
+0,cook,R2,2050,4,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2050,20,all-year,all-week,night,electric_stove,2040,0.56700000000
+0,cook,R2,2050,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2055,5,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2055,6,all-year,all-week,night,electric_stove,2050,0.56700000000
+0,cook,R2,2055,21,all-year,all-week,night,electric_stove,2045,0.48300000000
+0,cook,R2,2055,22,all-year,all-week,night,electric_stove,2050,0.56700000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R1,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R1,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R1,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2050,29,all-year,all-week,morning,heatpump,2040,0.81000000000
+1,heat,R2,2050,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,heat,R2,2055,30,all-year,all-week,morning,heatpump,2045,0.69000000000
+1,heat,R2,2055,31,all-year,all-week,morning,heatpump,2050,0.81000000000
+1,cook,R1,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R1,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
+1,cook,R1,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R1,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
+1,cook,R2,2050,4,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2050,20,all-year,all-week,morning,electric_stove,2040,0.81000000000
+1,cook,R2,2050,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2055,5,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2055,6,all-year,all-week,morning,electric_stove,2050,0.81000000000
+1,cook,R2,2055,21,all-year,all-week,morning,electric_stove,2045,0.69000000000
+1,cook,R2,2055,22,all-year,all-week,morning,electric_stove,2050,0.81000000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R1,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R1,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R1,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2050,29,all-year,all-week,mid-afternoon,heatpump,2040,0.56700000000
+2,heat,R2,2050,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,heat,R2,2055,30,all-year,all-week,mid-afternoon,heatpump,2045,0.48300000000
+2,heat,R2,2055,31,all-year,all-week,mid-afternoon,heatpump,2050,0.56700000000
+2,cook,R1,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R1,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+2,cook,R1,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R1,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+2,cook,R2,2050,4,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2050,20,all-year,all-week,mid-afternoon,electric_stove,2040,0.56700000000
+2,cook,R2,2050,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2055,5,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2055,6,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+2,cook,R2,2055,21,all-year,all-week,mid-afternoon,electric_stove,2045,0.48300000000
+2,cook,R2,2055,22,all-year,all-week,mid-afternoon,electric_stove,2050,0.56700000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R1,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R1,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R1,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2050,29,all-year,all-week,early-peak,heatpump,2040,0.81000000000
+3,heat,R2,2050,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,heat,R2,2055,30,all-year,all-week,early-peak,heatpump,2045,0.69000000000
+3,heat,R2,2055,31,all-year,all-week,early-peak,heatpump,2050,0.81000000000
+3,cook,R1,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R1,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+3,cook,R1,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R1,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+3,cook,R2,2050,4,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2050,20,all-year,all-week,early-peak,electric_stove,2040,0.81000000000
+3,cook,R2,2050,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2055,5,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2055,6,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+3,cook,R2,2055,21,all-year,all-week,early-peak,electric_stove,2045,0.69000000000
+3,cook,R2,2055,22,all-year,all-week,early-peak,electric_stove,2050,0.81000000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R1,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R1,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R1,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2050,29,all-year,all-week,late-peak,heatpump,2040,1.70100000000
+4,heat,R2,2050,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,heat,R2,2055,30,all-year,all-week,late-peak,heatpump,2045,1.44900000000
+4,heat,R2,2055,31,all-year,all-week,late-peak,heatpump,2050,1.70100000000
+4,cook,R1,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R1,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+4,cook,R1,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R1,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+4,cook,R2,2050,4,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2050,20,all-year,all-week,late-peak,electric_stove,2040,1.70100000000
+4,cook,R2,2050,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2055,5,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2055,6,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+4,cook,R2,2055,21,all-year,all-week,late-peak,electric_stove,2045,1.44900000000
+4,cook,R2,2055,22,all-year,all-week,late-peak,electric_stove,2050,1.70100000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R1,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R1,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R1,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2050,29,all-year,all-week,evening,heatpump,2040,1.13400000000
+5,heat,R2,2050,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,heat,R2,2055,30,all-year,all-week,evening,heatpump,2045,0.96600000000
+5,heat,R2,2055,31,all-year,all-week,evening,heatpump,2050,1.13400000000
+5,cook,R1,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R1,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
+5,cook,R1,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R1,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
+5,cook,R2,2050,4,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2050,20,all-year,all-week,evening,electric_stove,2040,1.13400000000
+5,cook,R2,2050,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2055,5,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2055,6,all-year,all-week,evening,electric_stove,2050,1.13400000000
+5,cook,R2,2055,21,all-year,all-week,evening,electric_stove,2045,0.96600000000
+5,cook,R2,2055,22,all-year,all-week,evening,electric_stove,2050,1.13400000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R1,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R1,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R1,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2050,29,all-year,all-week,early-morning,heatpump,2040,1.13400000000
+6,heat,R2,2050,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,heat,R2,2055,30,all-year,all-week,early-morning,heatpump,2045,0.96600000000
+6,heat,R2,2055,31,all-year,all-week,early-morning,heatpump,2050,1.13400000000
+6,cook,R1,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R1,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+6,cook,R1,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R1,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+6,cook,R2,2050,4,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2050,20,all-year,all-week,early-morning,electric_stove,2040,1.13400000000
+6,cook,R2,2050,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2055,5,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2055,6,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+6,cook,R2,2055,21,all-year,all-week,early-morning,electric_stove,2045,0.96600000000
+6,cook,R2,2055,22,all-year,all-week,early-morning,electric_stove,2050,1.13400000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R1,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R1,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R1,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2050,29,all-year,all-week,late-afternoon,heatpump,2040,1.13400000000
+7,heat,R2,2050,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,heat,R2,2055,30,all-year,all-week,late-afternoon,heatpump,2045,0.96600000000
+7,heat,R2,2055,31,all-year,all-week,late-afternoon,heatpump,2050,1.13400000000
+7,cook,R1,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R1,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+7,cook,R1,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R1,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+7,cook,R2,2050,4,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2050,20,all-year,all-week,late-afternoon,electric_stove,2040,1.13400000000
+7,cook,R2,2050,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2055,5,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2055,6,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
+7,cook,R2,2055,21,all-year,all-week,late-afternoon,electric_stove,2045,0.96600000000
+7,cook,R2,2055,22,all-year,all-week,late-afternoon,electric_stove,2050,1.13400000000
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 b19e188b..64722c81 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.89580000000
-R1,all-year,all-week,night,gasboiler,2020,0.29140000000
-R1,all-year,all-week,night,heatpump,2020,0.64110000000
-R1,all-year,all-week,night,gasboiler,2020,57.96670000000
-R1,all-year,all-week,night,gasboiler,2020,18.85620000000
-R1,all-year,all-week,morning,gasboiler,2020,1.35000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
-R1,all-year,all-week,morning,heatpump,2020,0.96610000000
-R1,all-year,all-week,morning,gasboiler,2020,87.35830000000
-R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.89580000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
-R1,all-year,all-week,afternoon,gasboiler,2020,57.96670000000
-R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.35000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
-R1,all-year,all-week,early-peak,gasboiler,2020,87.35830000000
-R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
-R1,all-year,all-week,late-peak,gasboiler,2020,2.70000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
-R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
-R1,all-year,all-week,late-peak,gasboiler,2020,174.71660000000
-R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
-R1,all-year,all-week,evening,gasboiler,2020,1.80420000000
-R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
-R1,all-year,all-week,evening,heatpump,2020,1.29120000000
-R1,all-year,all-week,evening,gasboiler,2020,116.74990000000
-R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
+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.29140000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
+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,18.85620000000
+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.43910000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
+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,28.41710000000
+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.29140000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
+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,18.85620000000
+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.43910000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
+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,28.41710000000
+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.87830000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
+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,56.83430000000
+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.58690000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
+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,37.97810000000
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 b8cdff62..0a3b0552 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,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.29140000000
-R1,all-year,all-week,night,heatpump,2020,0.64110000000
-R1,all-year,all-week,night,heatpump,2020,0.62700000000
-R1,all-year,all-week,night,heatpump,2025,0.34200000000
-R1,all-year,all-week,night,gasboiler,2020,18.85620000000
-R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
-R1,all-year,all-week,morning,heatpump,2020,0.96610000000
-R1,all-year,all-week,morning,heatpump,2020,0.94490000000
-R1,all-year,all-week,morning,heatpump,2025,0.51540000000
-R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
-R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
-R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
-R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
-R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
-R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
-R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
-R1,all-year,all-week,evening,heatpump,2020,1.29120000000
-R1,all-year,all-week,evening,heatpump,2020,1.26280000000
-R1,all-year,all-week,evening,heatpump,2025,0.68880000000
-R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.29140000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.64110000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,18.85620000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.43910000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.96610000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,28.41710000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.29140000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.64110000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,18.85620000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.43910000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.96610000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,28.41710000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.87830000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.93220000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,56.83430000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.58690000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.29120000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,37.97810000000
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 ab763d52..c2562772 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,0.62700000000
-R1,all-year,all-week,night,heatpump,2025,0.34200000000
-R1,all-year,all-week,night,heatpump,2025,0.33210000000
-R1,all-year,all-week,night,heatpump,2030,0.66420000000
-R1,all-year,all-week,morning,heatpump,2020,0.94490000000
-R1,all-year,all-week,morning,heatpump,2025,0.51540000000
-R1,all-year,all-week,morning,heatpump,2025,0.50050000000
-R1,all-year,all-week,morning,heatpump,2030,1.00100000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
-R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
-R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
-R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
-R1,all-year,all-week,evening,heatpump,2020,1.26280000000
-R1,all-year,all-week,evening,heatpump,2025,0.68880000000
-R1,all-year,all-week,evening,heatpump,2025,0.66890000000
-R1,all-year,all-week,evening,heatpump,2030,1.33780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.62700000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.34200000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.94490000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.51540000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.62700000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.34200000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.94490000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.51540000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.88980000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.03080000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.26280000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.68880000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
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 df35bfe1..7198819b 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.33210000000
-R1,all-year,all-week,night,heatpump,2030,0.66420000000
-R1,all-year,all-week,night,heatpump,2030,0.68230000000
-R1,all-year,all-week,night,heatpump,2035,0.34120000000
-R1,all-year,all-week,morning,heatpump,2025,0.50050000000
-R1,all-year,all-week,morning,heatpump,2030,1.00100000000
-R1,all-year,all-week,morning,heatpump,2030,1.02830000000
-R1,all-year,all-week,morning,heatpump,2035,0.51420000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
-R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
-R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
-R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
-R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
-R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
-R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
-R1,all-year,all-week,evening,heatpump,2025,0.66890000000
-R1,all-year,all-week,evening,heatpump,2030,1.33780000000
-R1,all-year,all-week,evening,heatpump,2030,1.37430000000
-R1,all-year,all-week,evening,heatpump,2035,0.68710000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.33210000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.66420000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.50050000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.00100000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.33210000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.66420000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.50050000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.00100000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.00100000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.00190000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.66890000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.33780000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
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 5110dedb..4e6318ce 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,0.68230000000
-R1,all-year,all-week,night,heatpump,2035,0.34120000000
-R1,all-year,all-week,night,heatpump,2035,0.34700000000
-R1,all-year,all-week,night,heatpump,2040,0.69400000000
-R1,all-year,all-week,morning,heatpump,2030,1.02830000000
-R1,all-year,all-week,morning,heatpump,2035,0.51420000000
-R1,all-year,all-week,morning,heatpump,2035,0.52300000000
-R1,all-year,all-week,morning,heatpump,2040,1.04590000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
-R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
-R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
-R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
-R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
-R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
-R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
-R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
-R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
-R1,all-year,all-week,evening,heatpump,2030,1.37430000000
-R1,all-year,all-week,evening,heatpump,2035,0.68710000000
-R1,all-year,all-week,evening,heatpump,2035,0.69890000000
-R1,all-year,all-week,evening,heatpump,2040,1.39780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68230000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.34120000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02830000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.51420000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68230000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34120000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02830000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.51420000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05660000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,1.02830000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37430000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.68710000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
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 4f4789a9..07f99b3c 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.34700000000
-R1,all-year,all-week,night,heatpump,2040,0.69400000000
-R1,all-year,all-week,night,heatpump,2040,0.66850000000
-R1,all-year,all-week,night,heatpump,2045,0.39000000000
-R1,all-year,all-week,morning,heatpump,2035,0.52300000000
-R1,all-year,all-week,morning,heatpump,2040,1.04590000000
-R1,all-year,all-week,morning,heatpump,2040,1.00750000000
-R1,all-year,all-week,morning,heatpump,2045,0.58770000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
-R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
-R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
-R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
-R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
-R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
-R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
-R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
-R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
-R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
-R1,all-year,all-week,evening,heatpump,2035,0.69890000000
-R1,all-year,all-week,evening,heatpump,2040,1.39780000000
-R1,all-year,all-week,evening,heatpump,2040,1.34650000000
-R1,all-year,all-week,evening,heatpump,2045,0.78540000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.34700000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,0.69400000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,0.52300000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,1.04590000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.34700000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,0.69400000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,0.52300000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,1.04590000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,1.04590000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,2.09180000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,0.69890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,1.39780000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
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 4ba63417..c4b1a75d 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,0.66850000000
-R1,all-year,all-week,night,heatpump,2045,0.39000000000
-R1,all-year,all-week,night,heatpump,2045,0.39260000000
-R1,all-year,all-week,night,heatpump,2050,0.67300000000
-R1,all-year,all-week,morning,heatpump,2040,1.00750000000
-R1,all-year,all-week,morning,heatpump,2045,0.58770000000
-R1,all-year,all-week,morning,heatpump,2045,0.59160000000
-R1,all-year,all-week,morning,heatpump,2050,1.01420000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
-R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
-R1,all-year,all-week,afternoon,heatpump,2045,0.39260000000
-R1,all-year,all-week,afternoon,heatpump,2050,0.67300000000
-R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
-R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
-R1,all-year,all-week,early-peak,heatpump,2045,0.59160000000
-R1,all-year,all-week,early-peak,heatpump,2050,1.01420000000
-R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
-R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
-R1,all-year,all-week,late-peak,heatpump,2045,1.18330000000
-R1,all-year,all-week,late-peak,heatpump,2050,2.02850000000
-R1,all-year,all-week,evening,heatpump,2040,1.34650000000
-R1,all-year,all-week,evening,heatpump,2045,0.78540000000
-R1,all-year,all-week,evening,heatpump,2045,0.79070000000
-R1,all-year,all-week,evening,heatpump,2050,1.35550000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,0.66850000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,0.39000000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,0.39260000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,0.67300000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,1.00750000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,0.58770000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,0.59160000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,1.01420000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,0.66850000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39000000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,0.39260000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,0.67300000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,1.00750000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,0.58770000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,0.59160000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,1.01420000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,2.01500000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,1.17540000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,1.18330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,2.02850000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,1.34650000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,0.78540000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,0.79070000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,1.35550000000
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 2d5b5fd8..aa3821f8 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,29 +1,29 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-all-year,all-week,night,R1,windturbine,2020,0.22220000000
-all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,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/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 51334117..03bd216b 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,29 +1,29 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-all-year,all-week,night,R1,windturbine,2020,0.22220000000
-all-year,all-week,night,R1,windturbine,2020,0.33330000000
-all-year,all-week,night,R1,windturbine,2025,0.33330000000
-all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+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.33330000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+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.50000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+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.33330000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+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.50000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+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,1.00000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+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.66670000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
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 7a89277e..4a52d7f1 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.33330000000
-all-year,all-week,night,R1,windturbine,2020,0.20000000000
-all-year,all-week,night,R1,windturbine,2025,0.33330000000
-all-year,all-week,night,R1,windturbine,2025,0.20000000000
-all-year,all-week,night,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-all-year,all-week,evening,R1,windturbine,2025,0.66670000000
-all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
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 fc6b4ce3..def4be3b 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.20000000000
-all-year,all-week,night,R1,windturbine,2020,0.15560000000
-all-year,all-week,night,R1,windturbine,2025,0.20000000000
-all-year,all-week,night,R1,windturbine,2025,0.15560000000
-all-year,all-week,night,R1,windturbine,2030,0.40000000000
-all-year,all-week,night,R1,windturbine,2030,0.31110000000
-all-year,all-week,night,R1,windturbine,2035,0.31110000000
-all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
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 6b28d88f..f5d07646 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.15560000000
-all-year,all-week,night,R1,windturbine,2020,0.13330000000
-all-year,all-week,night,R1,windturbine,2025,0.15560000000
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2030,0.31110000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.31110000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
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 44b4ffca..dce17b90 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.13330000000
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,night,R1,windturbine,2045,0.26670000000
-all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
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 41aba6e7..df173a2f 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2030,0.24000000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.24000000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.24000000000
-all-year,all-week,night,R1,windturbine,2045,0.26670000000
-all-year,all-week,night,R1,windturbine,2045,0.24000000000
-all-year,all-week,night,R1,windturbine,2050,0.24000000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-all-year,all-week,evening,R1,windturbine,2045,0.53330000000
-all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-all-year,all-week,evening,R1,windturbine,2050,0.48000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
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 68e3e122..7b8c4061 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 0fcfe541..729d406d 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,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
index 780086c6..afe86e12 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 4d84e893..83daf7f1 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 2e6ddf59..7bda2463 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 8211320c..c535c679 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 b621e872..9abfcded 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2050,1.77780000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
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 197e2957..ce642a34 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,25 +1,25 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
-all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
-all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
-all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
-all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
-all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
-all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,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.42220000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
+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.63330000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
+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.63330000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
+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,1.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
+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 c226f06e..eb7cf766 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,19 +1,19 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
-all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
-all-year,all-week,night,R1,windturbine,2025,0.66670000000
-all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
-all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
-all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
-all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
-all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
-all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
-all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.42220000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,38.70510000000
+0,3,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.63330000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,58.05770000000
+1,3,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+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,3,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.63330000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,58.05770000000
+3,3,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,116.11530000000
+4,3,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+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,3,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
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 31e7544d..3b5b32fb 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,19 +1,19 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.66670000000
-all-year,all-week,night,R1,windturbine,2025,0.40000000000
-all-year,all-week,night,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,morning,R1,windturbine,2030,0.50000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
-all-year,all-week,evening,R1,windturbine,2025,1.00000000000
-all-year,all-week,evening,R1,windturbine,2025,0.80000000000
-all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,4,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.66670000000
+0,4,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
+0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+1,4,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,4,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
+2,4,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.50000000000
+2,4,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
+2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+3,4,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000
+3,4,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
+3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+4,4,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,4,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
+5,4,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000
+5,4,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
+5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
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 7f5807bd..eca7c9eb 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,31 +1,31 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.40000000000
-all-year,all-week,night,R1,windturbine,2025,0.31110000000
-all-year,all-week,night,R1,windturbine,2030,0.40000000000
-all-year,all-week,night,R1,windturbine,2030,0.31110000000
-all-year,all-week,night,R1,windturbine,2035,0.31110000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,morning,R1,windturbine,2025,0.46670000000
-all-year,all-week,morning,R1,windturbine,2030,0.50000000000
-all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-all-year,all-week,evening,R1,windturbine,2025,0.80000000000
-all-year,all-week,evening,R1,windturbine,2025,0.62220000000
-all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,5,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.40000000000
+0,5,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
+0,6,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+1,5,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,5,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
+1,6,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.50000000000
+1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+2,5,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.40000000000
+2,5,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
+2,6,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+3,5,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.60000000000
+3,5,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
+3,6,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+4,5,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,5,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
+4,6,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.00000000000
+4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+5,5,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.80000000000
+5,5,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
+5,6,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
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 9eede19b..b71f068d 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,43 +1,43 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.31110000000
-all-year,all-week,night,R1,windturbine,2025,0.21330000000
-all-year,all-week,night,R1,windturbine,2030,0.31110000000
-all-year,all-week,night,R1,windturbine,2030,0.21330000000
-all-year,all-week,night,R1,windturbine,2035,0.31110000000
-all-year,all-week,night,R1,windturbine,2035,0.21330000000
-all-year,all-week,night,R1,windturbine,2040,0.42670000000
-all-year,all-week,morning,R1,windturbine,2025,0.46670000000
-all-year,all-week,morning,R1,windturbine,2025,0.32000000000
-all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-all-year,all-week,morning,R1,windturbine,2030,0.32000000000
-all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-all-year,all-week,morning,R1,windturbine,2035,0.32000000000
-all-year,all-week,morning,R1,windturbine,2040,0.64000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
-all-year,all-week,evening,R1,windturbine,2025,0.62220000000
-all-year,all-week,evening,R1,windturbine,2025,0.42670000000
-all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-all-year,all-week,evening,R1,windturbine,2030,0.42670000000
-all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-all-year,all-week,evening,R1,windturbine,2035,0.42670000000
-all-year,all-week,evening,R1,windturbine,2040,0.85330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,6,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.31110000000
+0,6,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
+0,7,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
+0,8,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
+0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
+1,6,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.46670000000
+1,6,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
+1,7,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
+1,8,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
+1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
+2,6,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.31110000000
+2,6,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
+2,7,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
+2,8,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
+2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
+3,6,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.46670000000
+3,6,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
+3,7,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
+3,8,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
+3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
+4,6,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.93330000000
+4,6,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
+4,7,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
+4,8,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
+4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
+5,6,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.62220000000
+5,6,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
+5,7,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
+5,8,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
+5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
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 81ed1006..bbbec449 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,55 +1,55 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.21330000000
-all-year,all-week,night,R1,windturbine,2025,0.17140000000
-all-year,all-week,night,R1,windturbine,2030,0.21330000000
-all-year,all-week,night,R1,windturbine,2030,0.17140000000
-all-year,all-week,night,R1,windturbine,2035,0.21330000000
-all-year,all-week,night,R1,windturbine,2035,0.17140000000
-all-year,all-week,night,R1,windturbine,2040,0.42670000000
-all-year,all-week,night,R1,windturbine,2040,0.34290000000
-all-year,all-week,night,R1,windturbine,2045,0.34290000000
-all-year,all-week,morning,R1,windturbine,2025,0.32000000000
-all-year,all-week,morning,R1,windturbine,2025,0.25710000000
-all-year,all-week,morning,R1,windturbine,2030,0.32000000000
-all-year,all-week,morning,R1,windturbine,2030,0.25710000000
-all-year,all-week,morning,R1,windturbine,2035,0.32000000000
-all-year,all-week,morning,R1,windturbine,2035,0.25710000000
-all-year,all-week,morning,R1,windturbine,2040,0.64000000000
-all-year,all-week,morning,R1,windturbine,2040,0.51430000000
-all-year,all-week,morning,R1,windturbine,2045,0.51430000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
-all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
-all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
-all-year,all-week,evening,R1,windturbine,2025,0.42670000000
-all-year,all-week,evening,R1,windturbine,2025,0.34290000000
-all-year,all-week,evening,R1,windturbine,2030,0.42670000000
-all-year,all-week,evening,R1,windturbine,2030,0.34290000000
-all-year,all-week,evening,R1,windturbine,2035,0.42670000000
-all-year,all-week,evening,R1,windturbine,2035,0.34290000000
-all-year,all-week,evening,R1,windturbine,2040,0.85330000000
-all-year,all-week,evening,R1,windturbine,2040,0.68570000000
-all-year,all-week,evening,R1,windturbine,2045,0.68570000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,7,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21330000000
+0,7,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
+0,8,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.21330000000
+0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
+0,9,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.21330000000
+0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
+0,10,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.42670000000
+0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
+0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
+1,7,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32000000000
+1,7,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
+1,8,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.32000000000
+1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
+1,9,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.32000000000
+1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
+1,10,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.64000000000
+1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
+1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
+2,7,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21330000000
+2,7,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
+2,8,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.21330000000
+2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
+2,9,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.21330000000
+2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
+2,10,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.42670000000
+2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
+2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
+3,7,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32000000000
+3,7,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
+3,8,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.32000000000
+3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
+3,9,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.32000000000
+3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
+3,10,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.64000000000
+3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
+3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
+4,7,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64000000000
+4,7,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
+4,8,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.64000000000
+4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
+4,9,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.64000000000
+4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
+4,10,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.28000000000
+4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
+4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
+5,7,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42670000000
+5,7,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
+5,8,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.42670000000
+5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
+5,9,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.42670000000
+5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
+5,10,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.85330000000
+5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
+5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
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 d7fad5a3..ceb22ad2 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.17140000000
-all-year,all-week,night,R1,windturbine,2030,0.17140000000
-all-year,all-week,night,R1,windturbine,2030,0.15000000000
-all-year,all-week,night,R1,windturbine,2035,0.17140000000
-all-year,all-week,night,R1,windturbine,2035,0.15000000000
-all-year,all-week,night,R1,windturbine,2040,0.34290000000
-all-year,all-week,night,R1,windturbine,2040,0.30000000000
-all-year,all-week,night,R1,windturbine,2045,0.34290000000
-all-year,all-week,night,R1,windturbine,2045,0.30000000000
-all-year,all-week,night,R1,windturbine,2050,0.30000000000
-all-year,all-week,morning,R1,windturbine,2025,0.25710000000
-all-year,all-week,morning,R1,windturbine,2030,0.25710000000
-all-year,all-week,morning,R1,windturbine,2030,0.22500000000
-all-year,all-week,morning,R1,windturbine,2035,0.25710000000
-all-year,all-week,morning,R1,windturbine,2035,0.22500000000
-all-year,all-week,morning,R1,windturbine,2040,0.51430000000
-all-year,all-week,morning,R1,windturbine,2040,0.45000000000
-all-year,all-week,morning,R1,windturbine,2045,0.51430000000
-all-year,all-week,morning,R1,windturbine,2045,0.45000000000
-all-year,all-week,morning,R1,windturbine,2050,0.45000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.15000000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.15000000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.30000000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.30000000000
-all-year,all-week,afternoon,R1,windturbine,2050,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.22500000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.22500000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.45000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.45000000000
-all-year,all-week,early-peak,R1,windturbine,2050,0.45000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.45000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.45000000000
-all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.90000000000
-all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.90000000000
-all-year,all-week,late-peak,R1,windturbine,2050,0.90000000000
-all-year,all-week,evening,R1,windturbine,2025,0.34290000000
-all-year,all-week,evening,R1,windturbine,2030,0.34290000000
-all-year,all-week,evening,R1,windturbine,2030,0.30000000000
-all-year,all-week,evening,R1,windturbine,2035,0.34290000000
-all-year,all-week,evening,R1,windturbine,2035,0.30000000000
-all-year,all-week,evening,R1,windturbine,2040,0.68570000000
-all-year,all-week,evening,R1,windturbine,2040,0.60000000000
-all-year,all-week,evening,R1,windturbine,2045,0.68570000000
-all-year,all-week,evening,R1,windturbine,2045,0.60000000000
-all-year,all-week,evening,R1,windturbine,2050,0.60000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,8,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.17140000000
+0,9,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.17140000000
+0,9,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.15000000000
+0,10,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.17140000000
+0,10,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.15000000000
+0,11,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.34290000000
+0,11,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.30000000000
+0,12,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.34290000000
+0,12,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.30000000000
+0,13,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.30000000000
+1,8,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.25710000000
+1,9,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.25710000000
+1,9,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.22500000000
+1,10,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.25710000000
+1,10,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.22500000000
+1,11,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.51430000000
+1,11,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.45000000000
+1,12,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.51430000000
+1,12,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.45000000000
+1,13,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.45000000000
+2,8,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.17140000000
+2,9,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.17140000000
+2,9,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.15000000000
+2,10,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.17140000000
+2,10,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.15000000000
+2,11,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.34290000000
+2,11,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.30000000000
+2,12,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.34290000000
+2,12,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.30000000000
+2,13,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.30000000000
+3,8,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.25710000000
+3,9,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.25710000000
+3,9,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.22500000000
+3,10,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.25710000000
+3,10,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.22500000000
+3,11,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.51430000000
+3,11,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.45000000000
+3,12,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.51430000000
+3,12,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.45000000000
+3,13,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.45000000000
+4,8,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.51430000000
+4,9,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.51430000000
+4,9,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.45000000000
+4,10,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.51430000000
+4,10,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.45000000000
+4,11,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,1.02860000000
+4,11,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.90000000000
+4,12,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,1.02860000000
+4,12,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.90000000000
+4,13,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.90000000000
+5,8,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.34290000000
+5,9,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.34290000000
+5,9,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.30000000000
+5,10,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.34290000000
+5,10,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.30000000000
+5,11,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.68570000000
+5,11,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.60000000000
+5,12,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.68570000000
+5,12,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.60000000000
+5,13,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.60000000000
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 68e3e122..7b8c4061 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 0fcfe541..729d406d 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,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+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/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
index 780086c6..afe86e12 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
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 4d84e893..83daf7f1 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
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 2e6ddf59..7bda2463 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
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 8211320c..c535c679 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,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
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 b621e872..9abfcded 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2050,1.77780000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py
index 9eb6c59a..9ef2e3a3 100644
--- a/src/muse/outputs/sector.py
+++ b/src/muse/outputs/sector.py
@@ -190,6 +190,7 @@ def consumption(
         market_quantity(moutput.consumption, sum_over=sum_over, drop=drop)
         .rename("consumption")
         .to_dataframe()
+        .reset_index()
         .round(rounding)
     )
     return result[result.consumption != 0]
@@ -210,6 +211,7 @@ def supply(
         market_quantity(moutput.supply, sum_over=sum_over, drop=drop)
         .rename("supply")
         .to_dataframe()
+        .reset_index()
         .round(rounding)
     )
     return result[result.supply != 0]
@@ -235,6 +237,7 @@ def costs(
         )
         .rename("costs")
         .to_dataframe()
+        .reset_index()
         .round(rounding)
     )
     return result[result.costs != 0]
diff --git a/tests/example_outputs/default/Residential/Supply/2020.csv b/tests/example_outputs/default/Residential/Supply/2020.csv
index 68e3e122..7b8c4061 100644
--- a/tests/example_outputs/default/Residential/Supply/2020.csv
+++ b/tests/example_outputs/default/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 0fcfe541..729d406d 100644
--- a/tests/example_outputs/default/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default/Residential/Supply/2030.csv b/tests/example_outputs/default/Residential/Supply/2030.csv
index 780086c6..afe86e12 100644
--- a/tests/example_outputs/default/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default/Residential/Supply/2035.csv b/tests/example_outputs/default/Residential/Supply/2035.csv
index 4d84e893..83daf7f1 100644
--- a/tests/example_outputs/default/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default/Residential/Supply/2040.csv b/tests/example_outputs/default/Residential/Supply/2040.csv
index 2e6ddf59..7bda2463 100644
--- a/tests/example_outputs/default/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default/Residential/Supply/2045.csv b/tests/example_outputs/default/Residential/Supply/2045.csv
index 8211320c..c535c679 100644
--- a/tests/example_outputs/default/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default/Residential/Supply/2050.csv b/tests/example_outputs/default/Residential/Supply/2050.csv
index b621e872..9abfcded 100644
--- a/tests/example_outputs/default/Residential/Supply/2050.csv
+++ b/tests/example_outputs/default/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2050,1.77780000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/default_retro/Residential/Supply/2020.csv b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
index 68e3e122..7b8c4061 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2020.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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_retro/Residential/Supply/2025.csv b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
index 40364479..bfe116d0 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.38330000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
-R1,all-year,all-week,evening,gasboiler,2025,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_retro/Residential/Supply/2030.csv b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
index 551b805a..82873caa 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.38330000000
-R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-R1,all-year,all-week,night,heatpump,2025,0.38330000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
-R1,all-year,all-week,evening,gasboiler,2025,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_retro/Residential/Supply/2035.csv b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
index 74cd3805..741ea3c6 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2025,0.22780000000
-R1,all-year,all-week,night,heatpump,2025,0.38330000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.89390000000
-R1,all-year,all-week,night,gasboiler,2025,14.73950000000
-R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
-R1,all-year,all-week,morning,heatpump,2025,0.57500000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
-R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
-R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
-R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
-R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
-R1,all-year,all-week,evening,heatpump,2025,0.76670000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
-R1,all-year,all-week,evening,gasboiler,2035,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_retro/Residential/Supply/2040.csv b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
index b70d3cbe..c802f340 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.89390000000
-R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-R1,all-year,all-week,night,heatpump,2035,0.89390000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
-R1,all-year,all-week,evening,gasboiler,2035,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_retro/Residential/Supply/2045.csv b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
index 14af8770..c7be86b2 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2035,0.05060000000
-R1,all-year,all-week,night,heatpump,2035,0.89390000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,gasboiler,2035,3.27140000000
-R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
-R1,all-year,all-week,morning,heatpump,2035,1.34080000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
-R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
-R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
-R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
-R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
-R1,all-year,all-week,evening,heatpump,2035,1.78780000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,gasboiler,2035,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_retro/Residential/Supply/2050.csv b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
index 711521d3..8c187153 100644
--- a/tests/example_outputs/default_retro/Residential/Supply/2050.csv
+++ b/tests/example_outputs/default_retro/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2050,1.72220000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2050,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/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
index d84c7cd6..00b3f810 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
@@ -1,9 +1,9 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.42220000000
-all-year,all-week,morning,R1,windturbine,2020,0.63330000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
-all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-all-year,all-week,evening,R1,windturbine,2020,0.84440000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
index 69a8e9e9..51182e94 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
@@ -1,21 +1,21 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.42220000000
-all-year,all-week,night,R1,windturbine,2020,0.33330000000
-all-year,all-week,night,R1,windturbine,2025,0.33330000000
-all-year,all-week,morning,R1,windturbine,2020,0.63330000000
-all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
-all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
-all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,evening,R1,windturbine,2020,0.84440000000
-all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
index 7a89277e..4a52d7f1 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.33330000000
-all-year,all-week,night,R1,windturbine,2020,0.20000000000
-all-year,all-week,night,R1,windturbine,2025,0.33330000000
-all-year,all-week,night,R1,windturbine,2025,0.20000000000
-all-year,all-week,night,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2020,0.50000000000
-all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-all-year,all-week,morning,R1,windturbine,2025,0.50000000000
-all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-all-year,all-week,evening,R1,windturbine,2020,0.66670000000
-all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-all-year,all-week,evening,R1,windturbine,2025,0.66670000000
-all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
index fc6b4ce3..def4be3b 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.20000000000
-all-year,all-week,night,R1,windturbine,2020,0.15560000000
-all-year,all-week,night,R1,windturbine,2025,0.20000000000
-all-year,all-week,night,R1,windturbine,2025,0.15560000000
-all-year,all-week,night,R1,windturbine,2030,0.40000000000
-all-year,all-week,night,R1,windturbine,2030,0.31110000000
-all-year,all-week,night,R1,windturbine,2035,0.31110000000
-all-year,all-week,morning,R1,windturbine,2020,0.30000000000
-all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-all-year,all-week,morning,R1,windturbine,2025,0.30000000000
-all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-all-year,all-week,morning,R1,windturbine,2030,0.60000000000
-all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-all-year,all-week,evening,R1,windturbine,2020,0.40000000000
-all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-all-year,all-week,evening,R1,windturbine,2025,0.40000000000
-all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-all-year,all-week,evening,R1,windturbine,2030,0.80000000000
-all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
index 6b28d88f..f5d07646 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.15560000000
-all-year,all-week,night,R1,windturbine,2020,0.13330000000
-all-year,all-week,night,R1,windturbine,2025,0.15560000000
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2030,0.31110000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.31110000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,morning,R1,windturbine,2020,0.23330000000
-all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-all-year,all-week,morning,R1,windturbine,2025,0.23330000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2030,0.46670000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.46670000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,evening,R1,windturbine,2020,0.31110000000
-all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-all-year,all-week,evening,R1,windturbine,2025,0.31110000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2030,0.62220000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.62220000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
index 44b4ffca..dce17b90 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2020,0.13330000000
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,night,R1,windturbine,2045,0.26670000000
-all-year,all-week,morning,R1,windturbine,2020,0.20000000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-all-year,all-week,evening,R1,windturbine,2020,0.26670000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
index 41aba6e7..df173a2f 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 @@
-month,day,hour,region,technology,installed,supply
-all-year,all-week,night,R1,windturbine,2025,0.13330000000
-all-year,all-week,night,R1,windturbine,2030,0.26670000000
-all-year,all-week,night,R1,windturbine,2030,0.24000000000
-all-year,all-week,night,R1,windturbine,2035,0.26670000000
-all-year,all-week,night,R1,windturbine,2035,0.24000000000
-all-year,all-week,night,R1,windturbine,2040,0.26670000000
-all-year,all-week,night,R1,windturbine,2040,0.24000000000
-all-year,all-week,night,R1,windturbine,2045,0.26670000000
-all-year,all-week,night,R1,windturbine,2045,0.24000000000
-all-year,all-week,night,R1,windturbine,2050,0.24000000000
-all-year,all-week,morning,R1,windturbine,2025,0.20000000000
-all-year,all-week,morning,R1,windturbine,2030,0.40000000000
-all-year,all-week,morning,R1,windturbine,2030,0.36000000000
-all-year,all-week,morning,R1,windturbine,2035,0.40000000000
-all-year,all-week,morning,R1,windturbine,2035,0.36000000000
-all-year,all-week,morning,R1,windturbine,2040,0.40000000000
-all-year,all-week,morning,R1,windturbine,2040,0.36000000000
-all-year,all-week,morning,R1,windturbine,2045,0.40000000000
-all-year,all-week,morning,R1,windturbine,2045,0.36000000000
-all-year,all-week,morning,R1,windturbine,2050,0.36000000000
-all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
-all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
-all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
-all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
-all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
-all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
-all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
-all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
-all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
-all-year,all-week,evening,R1,windturbine,2025,0.26670000000
-all-year,all-week,evening,R1,windturbine,2030,0.53330000000
-all-year,all-week,evening,R1,windturbine,2030,0.48000000000
-all-year,all-week,evening,R1,windturbine,2035,0.53330000000
-all-year,all-week,evening,R1,windturbine,2035,0.48000000000
-all-year,all-week,evening,R1,windturbine,2040,0.53330000000
-all-year,all-week,evening,R1,windturbine,2040,0.48000000000
-all-year,all-week,evening,R1,windturbine,2045,0.53330000000
-all-year,all-week,evening,R1,windturbine,2045,0.48000000000
-all-year,all-week,evening,R1,windturbine,2050,0.48000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000
+0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000
+0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000
+1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000
+1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000
+2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000
+2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000
+3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000
+3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000
+4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000
+4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000
+5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000
+5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
index 68e3e122..7b8c4061 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 0fcfe541..729d406d 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
index 780086c6..afe86e12 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.09200000000
-R1,all-year,all-week,night,heatpump,2025,0.57470000000
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,morning,heatpump,2020,1.63790000000
-R1,all-year,all-week,morning,heatpump,2025,0.86210000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,evening,heatpump,2020,2.18390000000
-R1,all-year,all-week,evening,heatpump,2025,1.14940000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.09200000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.57470000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.63790000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.86210000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.09200000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.57470000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.63790000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.86210000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.27590000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.72410000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.18390000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,1.14940000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
index 4d84e893..83daf7f1 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,morning,heatpump,2025,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,evening,heatpump,2025,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.55560000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.83330000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.55560000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.83330000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.66670000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.11110000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
index 2e6ddf59..7bda2463 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.44440000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,morning,heatpump,2030,2.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,evening,heatpump,2030,2.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.44440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.16670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.44440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.16670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.33330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.88890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
index 8211320c..c535c679 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.88890000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,morning,heatpump,2035,1.33330000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,evening,heatpump,2035,1.77780000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.88890000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.33330000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.88890000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.33330000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.66670000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.77780000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
index b621e872..9abfcded 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.77780000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2045,1.22220000000
-R1,all-year,all-week,night,heatpump,2050,1.77780000000
-R1,all-year,all-week,morning,heatpump,2040,2.66670000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.83330000000
-R1,all-year,all-week,morning,heatpump,2050,2.66670000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
-R1,all-year,all-week,evening,heatpump,2040,3.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.44440000000
-R1,all-year,all-week,evening,heatpump,2050,3.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.77780000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.22220000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.77780000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.66670000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.83330000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.66670000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.77780000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.22220000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.77780000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.66670000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.83330000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.66670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.33330000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.66670000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.33330000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.55560000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.44440000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.55560000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2020.csv b/tests/example_outputs/medium/Residential/Supply/2020.csv
index 31421f44..c5696bda 100644
--- a/tests/example_outputs/medium/Residential/Supply/2020.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2020.csv
@@ -1,43 +1,43 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,32.35290000000
-R1,all-year,all-week,night,gasboiler,2020,28.75820000000
-R1,all-year,all-week,night,gasstove,2020,0.50000000000
-R1,all-year,all-week,night,gasstove,2020,0.66670000000
-R1,all-year,all-week,night,gasboiler,2020,0.50000000000
-R1,all-year,all-week,night,gasboiler,2020,0.44440000000
-R1,all-year,all-week,night,heatpump,2020,0.22220000000
-R1,all-year,all-week,morning,gasboiler,2020,48.52940000000
-R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
-R1,all-year,all-week,morning,gasstove,2020,0.75000000000
-R1,all-year,all-week,morning,gasstove,2020,1.00000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.75000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
-R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-R1,all-year,all-week,afternoon,gasboiler,2020,32.35290000000
-R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
-R1,all-year,all-week,afternoon,gasstove,2020,0.50000000000
-R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-R1,all-year,all-week,early-peak,gasboiler,2020,48.52940000000
-R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
-R1,all-year,all-week,early-peak,gasstove,2020,0.75000000000
-R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-R1,all-year,all-week,late-peak,gasboiler,2020,97.05880000000
-R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
-R1,all-year,all-week,late-peak,gasstove,2020,1.50000000000
-R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-R1,all-year,all-week,evening,gasboiler,2020,64.70590000000
-R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
-R1,all-year,all-week,evening,gasstove,2020,1.00000000000
-R1,all-year,all-week,evening,gasstove,2020,1.33330000000
-R1,all-year,all-week,evening,gasboiler,2020,1.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
-R1,all-year,all-week,evening,heatpump,2020,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 7b5df47e..6c0a8f6b 100644
--- a/tests/example_outputs/medium/Residential/Supply/2025.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2025.csv
@@ -1,61 +1,61 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,28.75820000000
-R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-R1,all-year,all-week,night,gasstove,2020,0.66670000000
-R1,all-year,all-week,night,gasstove,2020,0.22220000000
-R1,all-year,all-week,night,gasstove,2025,0.61110000000
-R1,all-year,all-week,night,gasboiler,2020,0.44440000000
-R1,all-year,all-week,night,heatpump,2020,0.22220000000
-R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-R1,all-year,all-week,night,heatpump,2020,0.22220000000
-R1,all-year,all-week,night,heatpump,2025,0.22220000000
-R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
-R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-R1,all-year,all-week,morning,gasstove,2020,1.00000000000
-R1,all-year,all-week,morning,gasstove,2020,0.33330000000
-R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
-R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
-R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
-R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
-R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
-R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
-R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
-R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
-R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
-R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
-R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
-R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
-R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-R1,all-year,all-week,evening,gasstove,2020,1.33330000000
-R1,all-year,all-week,evening,gasstove,2020,0.44440000000
-R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
-R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+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,25.16340000000
+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.38890000000
+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.22220000000
+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,37.74510000000
+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.58330000000
+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.33330000000
+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,25.16340000000
+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.38890000000
+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.22220000000
+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,37.74510000000
+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.58330000000
+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.33330000000
+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,75.49020000000
+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.16670000000
+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.66670000000
+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,50.32680000000
+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.77780000000
+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.44440000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2030.csv b/tests/example_outputs/medium/Residential/Supply/2030.csv
index 21de9db1..434eea1a 100644
--- a/tests/example_outputs/medium/Residential/Supply/2030.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2030.csv
@@ -1,73 +1,73 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-R1,all-year,all-week,night,gasstove,2020,0.22220000000
-R1,all-year,all-week,night,gasstove,2025,0.61110000000
-R1,all-year,all-week,night,gasstove,2025,0.61110000000
-R1,all-year,all-week,night,gasstove,2030,0.38890000000
-R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-R1,all-year,all-week,night,heatpump,2020,0.22220000000
-R1,all-year,all-week,night,heatpump,2025,0.22220000000
-R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-R1,all-year,all-week,night,heatpump,2025,0.22220000000
-R1,all-year,all-week,night,heatpump,2030,0.38890000000
-R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-R1,all-year,all-week,morning,gasstove,2020,0.33330000000
-R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-R1,all-year,all-week,morning,heatpump,2020,0.33330000000
-R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
-R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
-R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
-R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
-R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-R1,all-year,all-week,evening,gasstove,2020,0.44440000000
-R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-R1,all-year,all-week,evening,heatpump,2020,0.44440000000
-R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+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,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+0,heat,2030,5,R1,all-year,all-week,night,heatpump,2020,0.22220000000
+0,heat,2030,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
+0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+0,heat,2035,6,R1,all-year,all-week,night,heatpump,2025,0.22220000000
+0,heat,2035,7,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+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,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+1,heat,2030,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+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,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+2,heat,2030,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+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,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+3,heat,2030,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+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,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+4,heat,2030,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+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,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+5,heat,2030,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+5,heat,2035,7,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 9d36866f..152438f8 100644
--- a/tests/example_outputs/medium/Residential/Supply/2035.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2035.csv
@@ -1,61 +1,61 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2025,25.16340000000
-R1,all-year,all-week,night,gasstove,2025,0.61110000000
-R1,all-year,all-week,night,gasstove,2030,0.38890000000
-R1,all-year,all-week,night,gasstove,2030,0.38890000000
-R1,all-year,all-week,night,gasstove,2035,0.77780000000
-R1,all-year,all-week,night,gasboiler,2025,0.38890000000
-R1,all-year,all-week,night,heatpump,2025,0.22220000000
-R1,all-year,all-week,night,heatpump,2030,0.38890000000
-R1,all-year,all-week,night,heatpump,2030,0.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.77780000000
-R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
-R1,all-year,all-week,morning,gasstove,2025,0.91670000000
-R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.33330000000
-R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
-R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
-R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
-R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
-R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
-R1,all-year,all-week,evening,gasstove,2025,1.22220000000
-R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
-R1,all-year,all-week,evening,heatpump,2025,0.44440000000
-R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2035,1,R1,all-year,all-week,night,gasboiler,2025,25.16340000000
+0,cook,2035,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,heat,2035,1,R1,all-year,all-week,night,gasboiler,2025,0.38890000000
+0,heat,2035,7,R1,all-year,all-week,night,heatpump,2025,0.22220000000
+0,heat,2035,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,8,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,9,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+1,CO2f,2035,1,R1,all-year,all-week,morning,gasboiler,2025,37.74510000000
+1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,heat,2035,1,R1,all-year,all-week,morning,gasboiler,2025,0.58330000000
+1,heat,2035,7,R1,all-year,all-week,morning,heatpump,2025,0.33330000000
+1,heat,2035,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,8,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+2,CO2f,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,25.16340000000
+2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,heat,2035,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.38890000000
+2,heat,2035,7,R1,all-year,all-week,afternoon,heatpump,2025,0.22220000000
+2,heat,2035,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,8,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+3,CO2f,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,37.74510000000
+3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,heat,2035,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.58330000000
+3,heat,2035,7,R1,all-year,all-week,early-peak,heatpump,2025,0.33330000000
+3,heat,2035,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,8,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+4,CO2f,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,75.49020000000
+4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,heat,2035,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.16670000000
+4,heat,2035,7,R1,all-year,all-week,late-peak,heatpump,2025,0.66670000000
+4,heat,2035,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,8,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+5,CO2f,2035,1,R1,all-year,all-week,evening,gasboiler,2025,50.32680000000
+5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,heat,2035,1,R1,all-year,all-week,evening,gasboiler,2025,0.77780000000
+5,heat,2035,7,R1,all-year,all-week,evening,heatpump,2025,0.44440000000
+5,heat,2035,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,8,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2040.csv b/tests/example_outputs/medium/Residential/Supply/2040.csv
index d08665af..a92754ee 100644
--- a/tests/example_outputs/medium/Residential/Supply/2040.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasstove,2030,0.38890000000
-R1,all-year,all-week,night,gasstove,2035,0.77780000000
-R1,all-year,all-week,night,gasstove,2035,0.77780000000
-R1,all-year,all-week,night,gasstove,2040,0.55560000000
-R1,all-year,all-week,night,heatpump,2030,0.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.77780000000
-R1,all-year,all-week,night,heatpump,2035,0.77780000000
-R1,all-year,all-week,night,heatpump,2040,0.55560000000
-R1,all-year,all-week,morning,gasstove,2030,0.58330000000
-R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-R1,all-year,all-week,morning,heatpump,2030,0.58330000000
-R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
-R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
-R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
-R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-R1,all-year,all-week,evening,gasstove,2030,0.77780000000
-R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-R1,all-year,all-week,evening,heatpump,2030,0.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,cook,2040,4,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,heat,2040,9,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+0,heat,2045,10,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+0,heat,2045,11,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,heat,2040,9,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+1,heat,2045,10,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,heat,2040,9,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+2,heat,2045,10,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,heat,2040,9,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+3,heat,2045,10,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,heat,2040,9,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+4,heat,2045,10,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,heat,2040,9,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+5,heat,2045,10,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+5,heat,2045,11,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 8e927908..58e9df29 100644
--- a/tests/example_outputs/medium/Residential/Supply/2045.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2045.csv
@@ -1,49 +1,49 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasstove,2035,0.77780000000
-R1,all-year,all-week,night,gasstove,2040,0.55560000000
-R1,all-year,all-week,night,gasstove,2040,0.55560000000
-R1,all-year,all-week,night,gasstove,2045,0.94440000000
-R1,all-year,all-week,night,heatpump,2035,0.77780000000
-R1,all-year,all-week,night,heatpump,2040,0.55560000000
-R1,all-year,all-week,night,heatpump,2040,0.55560000000
-R1,all-year,all-week,night,heatpump,2045,0.94440000000
-R1,all-year,all-week,morning,gasstove,2035,1.16670000000
-R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-R1,all-year,all-week,morning,heatpump,2035,1.16670000000
-R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
-R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
-R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
-R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
-R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
-R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-R1,all-year,all-week,evening,gasstove,2035,1.55560000000
-R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.55560000000
-R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,cook,2045,5,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,heat,2045,11,R1,all-year,all-week,night,heatpump,2035,0.77780000000
+0,heat,2045,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,12,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,13,R1,all-year,all-week,night,heatpump,2045,0.94440000000
+1,cook,2045,5,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,heat,2045,11,R1,all-year,all-week,morning,heatpump,2035,1.16670000000
+1,heat,2045,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,12,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+2,cook,2045,5,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,heat,2045,11,R1,all-year,all-week,afternoon,heatpump,2035,0.77780000000
+2,heat,2045,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,12,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+3,cook,2045,5,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,heat,2045,11,R1,all-year,all-week,early-peak,heatpump,2035,1.16670000000
+3,heat,2045,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,12,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+4,cook,2045,5,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,heat,2045,11,R1,all-year,all-week,late-peak,heatpump,2035,2.33330000000
+4,heat,2045,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,12,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+5,cook,2045,5,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,heat,2045,11,R1,all-year,all-week,evening,heatpump,2035,1.55560000000
+5,heat,2045,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,12,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2050.csv b/tests/example_outputs/medium/Residential/Supply/2050.csv
index 0a2f1542..ea9a8628 100644
--- a/tests/example_outputs/medium/Residential/Supply/2050.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2050.csv
@@ -1,49 +1,49 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasstove,2040,0.55560000000
-R1,all-year,all-week,night,gasstove,2045,0.94440000000
-R1,all-year,all-week,night,gasstove,2045,0.94440000000
-R1,all-year,all-week,night,gasstove,2050,0.55560000000
-R1,all-year,all-week,night,heatpump,2040,0.55560000000
-R1,all-year,all-week,night,heatpump,2045,0.94440000000
-R1,all-year,all-week,night,heatpump,2045,0.94440000000
-R1,all-year,all-week,night,heatpump,2050,0.55560000000
-R1,all-year,all-week,morning,gasstove,2040,0.83330000000
-R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-R1,all-year,all-week,morning,gasstove,2045,1.41670000000
-R1,all-year,all-week,morning,gasstove,2050,0.83330000000
-R1,all-year,all-week,morning,heatpump,2040,0.83330000000
-R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-R1,all-year,all-week,morning,heatpump,2045,1.41670000000
-R1,all-year,all-week,morning,heatpump,2050,0.83330000000
-R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
-R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
-R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
-R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
-R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
-R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
-R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
-R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
-R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
-R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
-R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
-R1,all-year,all-week,evening,gasstove,2040,1.11110000000
-R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-R1,all-year,all-week,evening,gasstove,2045,1.88890000000
-R1,all-year,all-week,evening,gasstove,2050,1.11110000000
-R1,all-year,all-week,evening,heatpump,2040,1.11110000000
-R1,all-year,all-week,evening,heatpump,2045,1.88890000000
-R1,all-year,all-week,evening,heatpump,2045,1.88890000000
-R1,all-year,all-week,evening,heatpump,2050,1.11110000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,cook,2050,6,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,cook,2055,7,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,cook,2055,8,R1,all-year,all-week,night,gasstove,2050,0.55560000000
+0,heat,2050,13,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
+0,heat,2055,14,R1,all-year,all-week,night,heatpump,2045,0.94440000000
+0,heat,2055,15,R1,all-year,all-week,night,heatpump,2050,0.55560000000
+1,cook,2050,6,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,cook,2055,7,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,cook,2055,8,R1,all-year,all-week,morning,gasstove,2050,0.83330000000
+1,heat,2050,13,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+1,heat,2055,14,R1,all-year,all-week,morning,heatpump,2045,1.41670000000
+1,heat,2055,15,R1,all-year,all-week,morning,heatpump,2050,0.83330000000
+2,cook,2050,6,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,cook,2055,7,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,cook,2055,8,R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
+2,heat,2050,13,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+2,heat,2055,14,R1,all-year,all-week,afternoon,heatpump,2045,0.94440000000
+2,heat,2055,15,R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
+3,cook,2050,6,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,cook,2055,7,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,cook,2055,8,R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
+3,heat,2050,13,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+3,heat,2055,14,R1,all-year,all-week,early-peak,heatpump,2045,1.41670000000
+3,heat,2055,15,R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
+4,cook,2050,6,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,cook,2055,7,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,cook,2055,8,R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
+4,heat,2050,13,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+4,heat,2055,14,R1,all-year,all-week,late-peak,heatpump,2045,2.83330000000
+4,heat,2055,15,R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
+5,cook,2050,6,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,cook,2055,7,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,cook,2055,8,R1,all-year,all-week,evening,gasstove,2050,1.11110000000
+5,heat,2050,13,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+5,heat,2055,14,R1,all-year,all-week,evening,heatpump,2045,1.88890000000
+5,heat,2055,15,R1,all-year,all-week,evening,heatpump,2050,1.11110000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2010.csv b/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
index 33831e4a..d0e14abf 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2010,30397.66160000000
-R1,winter,all-week,all-day,procammonia_2,2010,22694.61780000000
-R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
-R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
-R1,winter,all-week,all-day,procammonia_1,2010,7.29300000000
-R1,winter,all-week,all-day,procammonia_2,2010,7.29300000000
-R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
-R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
-R1,summer,all-week,all-day,procammonia_1,2010,31318.80280000000
-R1,summer,all-week,all-day,procammonia_2,2010,23382.33350000000
-R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
-R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
-R1,summer,all-week,all-day,procammonia_1,2010,7.51400000000
-R1,summer,all-week,all-day,procammonia_2,2010,7.51400000000
-R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
-R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,30397.66160000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,22694.61780000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.29300000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,7.29300000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,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 45778e79..b7ce66c2 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
-R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
-R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
-R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
-R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
-R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
-R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
-R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
-R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
-R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
-R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
-R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,6.69750000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
+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 cb0c9603..bc309292 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
-R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
-R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
-R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
-R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
-R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
-R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
-R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,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 f7e21cbe..618f9819 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
-R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
-R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
-R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
-R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
-R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
-R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
-R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,4.31420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,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 8c25e6cf..971a1bc6 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
-R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
-R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
-R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
-R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
-R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
-R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
-R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,3.12250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
+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 8607cb3c..68b96dd6 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
-R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
-R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
-R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
-R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,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 c9901561..21e8b0e5 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,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 24f07608..91510f36 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
-R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
-R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
-R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2045,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 bba49293..5c1490c8 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 @@
-region,month,day,hour,technology,installed,supply
-R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
-R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
-R1,winter,all-week,all-day,procammonia_1,2050,20214.22470000000
-R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
-R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
-R1,winter,all-week,all-day,procammonia_1,2050,5.16890000000
-R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
-R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
-R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
-R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
-R1,summer,all-week,all-day,procammonia_1,2050,20826.77700000000
-R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
-R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
-R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
-R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
-R1,summer,all-week,all-day,procammonia_1,2050,5.32550000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2050,20214.22470000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
-R1,spring-autumn,all-week,all-day,procammonia_1,2050,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/multiple_agents/Residential/Supply/2020.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
index 68e3e122..7b8c4061 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,1.00000000000
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,gasboiler,2020,64.71000000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
-R1,all-year,all-week,evening,gasboiler,2020,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 5fb53d24..b07adde6 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
@@ -1,31 +1,31 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,gasboiler,2020,0.27780000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,gasboiler,2020,17.97500000000
-R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
-R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
-R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
-R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
-R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+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,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+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.61110000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+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,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.91670000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+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,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.61110000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+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,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.91670000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+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,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.83330000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+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,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,1.22220000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
index 0c048387..33951ce2 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2020,1.05560000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,morning,heatpump,2020,1.58330000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,evening,heatpump,2020,2.11110000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+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.61110000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.91670000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.61110000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.91670000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.83330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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,1.22220000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
index 3c78922e..c606a299 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2025,0.61110000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,morning,heatpump,2025,0.91670000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,evening,heatpump,2025,1.22220000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.61110000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+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.94440000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.91670000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+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.41670000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.61110000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+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.94440000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.91670000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+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.41670000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.83330000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+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.83330000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,1.22220000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+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.88890000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
index 103b89e5..d66038bc 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2030,1.38890000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,morning,heatpump,2030,2.08330000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,evening,heatpump,2030,2.77780000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+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.94440000000
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+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.41670000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+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.94440000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+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.41670000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+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.83330000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+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.88890000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
index d7563a22..2f0389d3 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
@@ -1,25 +1,25 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2035,0.94440000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,morning,heatpump,2035,1.41670000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,evening,heatpump,2035,1.88890000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,4,R1,all-year,all-week,night,heatpump,2035,0.94440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+1,heat,2045,4,R1,all-year,all-week,morning,heatpump,2035,1.41670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+2,heat,2045,4,R1,all-year,all-week,afternoon,heatpump,2035,0.94440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+3,heat,2045,4,R1,all-year,all-week,early-peak,heatpump,2035,1.41670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+4,heat,2045,4,R1,all-year,all-week,late-peak,heatpump,2035,2.83330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+5,heat,2045,4,R1,all-year,all-week,evening,heatpump,2035,1.88890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
index 711521d3..3b6658d8 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 @@
-region,month,day,hour,technology,installed,supply
-R1,all-year,all-week,night,heatpump,2040,1.72220000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2045,1.27780000000
-R1,all-year,all-week,night,heatpump,2050,1.72220000000
-R1,all-year,all-week,morning,heatpump,2040,2.58330000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2045,1.91670000000
-R1,all-year,all-week,morning,heatpump,2050,2.58330000000
-R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
-R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
-R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
-R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
-R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
-R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
-R1,all-year,all-week,evening,heatpump,2040,3.44440000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2045,2.55560000000
-R1,all-year,all-week,evening,heatpump,2050,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,5,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,6,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,7,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,5,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,6,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,7,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,5,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,6,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,7,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,5,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,6,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,7,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,5,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,6,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,7,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,5,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,6,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,7,R1,all-year,all-week,evening,heatpump,2050,3.44440000000

From 3a71143962f6d065052d92931dc4e630a0499112 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Wed, 24 Jul 2024 02:57:07 +0100
Subject: [PATCH 411/419] debugging the numpy 2 related error in `pytest
 tests/test_carbon_budget.py::test_refine_new_price`.

---
 tests/test_carbon_budget.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_carbon_budget.py b/tests/test_carbon_budget.py
index 8b1f9cff..6472d764 100644
--- a/tests/test_carbon_budget.py
+++ b/tests/test_carbon_budget.py
@@ -155,7 +155,10 @@ def test_refine_new_price(market):
     price = market.prices.sel(year=future, commodity=commodities).mean(
         ["region", "commodity"]
     )
-    sample = np.linspace(price, 4 * price, 4)
+
+    # ensure price is a scalar before using it in np.linspace
+    price_value = price.item() if isinstance(price, xr.DataArray) else price
+    sample = np.linspace(price_value, 4 * price_value, 4)
 
     carbon_price = market.prices.sel(
         year=market.year < future, commodity=commodities

From 464ef695c5b3b5a4e85a3cf2c963376034847ff6 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Wed, 24 Jul 2024 03:06:02 +0100
Subject: [PATCH 412/419] =?UTF-8?q?Try=20to=20fix=20error=20related=20to?=
 =?UTF-8?q?=20```=20@pre-commit-ci=20pre-commit.ci=20-=20pr=20=E2=80=94=20?=
 =?UTF-8?q?error=20during=20mergeable=20check=20```?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualise-min-service.ipynb                   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
index fb9ead46..688e71b9 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
@@ -83,26 +83,11 @@
    "outputs": [],
    "source": [
     "grouped_by = frame.groupby([\"year\", \"technology\", \"region\"]).sum().reset_index()\n",
-    "grouped_by\n",
     "\n",
     "g = sns.FacetGrid(data=grouped_by, row=\"region\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

From 1ceadc15d2da6847f5fe6e291c203f4f3862ec43 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Thu, 25 Jul 2024 13:00:01 +0100
Subject: [PATCH 413/419] Pin bottleneck dependency

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6502b79c..a45f1447 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,7 +28,7 @@ dependencies = [
     "scipy>=1.13",
     "pandas>=2.2",
     "xarray>=2024.6",
-    "bottleneck",
+    "bottleneck>=1.4",
     "coloredlogs",
     "toml",
     "xlrd",

From 8b40631040f7bf0c69f92d708a77675ef35811ec Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Jul 2024 16:44:25 +0100
Subject: [PATCH 414/419] Brush up documentation

---
 docs/inputs/toml.rst                          | 21 +++++++++----------
 .../data/example/trade/technodata/Agents.csv  |  4 ++--
 src/muse/demand_share.py                      | 12 +++++------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index e018f830..7503eab2 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -518,18 +518,17 @@ to define the timeslice simply by referring to the slices it will use at each le
 
     *demand_share*
         A method used to split the MCA demand into separate parts to be serviced by
-        specific agents. A basic distinction is between *new* and *retrofit* agents: the
-        former asked to respond to an increase of commodity demand investing in new
-        assets; the latter asked to invest in new asset to balance the decommissined
-        assets.
-
-        There are currently two options:
+        specific agents. The appropriate choice depends on the type of agents being used
+        in the simulation. There are currently two options:
 
-        - :py:func:`~muse.demand_share.new_and_retro`: the demand is split into a
-          retrofit demand corresponding to demand that used to be serviced by
-          decommisioned assets, and the *new* demand.
-        - :py:func:`~muse.demand_share.market_demand`: simply the consumption for the
-          forecast year.
+        - :py:func:`~muse.demand_share.standard_demand` (default): The input demand is
+        split amongst *new* agents. *New* agents get a share of the increase in demand
+        for the forecast years, as well as the demand that occurs from decommissioned
+        assets.
+        - :py:func:`~muse.demand_share.new_and_retro`: The input demand is split amongst
+        both *new* and *retrofit* agents. *New* agents get a share of the increase in
+        demand for the forecast year, whereas *retrofit* agents are assigned a share of
+        the demand that occurs from decommissioned assets.
 
     *constraints*
         The list of constraints to apply to the LP problem solved by the sector. By
diff --git a/src/muse/data/example/trade/technodata/Agents.csv b/src/muse/data/example/trade/technodata/Agents.csv
index 42fd21d1..02be4796 100644
--- a/src/muse/data/example/trade/technodata/Agents.csv
+++ b/src/muse/data/example/trade/technodata/Agents.csv
@@ -1,3 +1,3 @@
 AgentShare,Name,RegionName,Objective,ObjData,Objsort,SearchRule,DecisionMethod,MaturityThreshold,SpendLimit,Type
-agent_share,A1,R1,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
-agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
+agent_share,A1,R1,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,Retrofit
+agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,Retrofit
diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py
index be2b2f57..27e3eba5 100644
--- a/src/muse/demand_share.py
+++ b/src/muse/demand_share.py
@@ -107,7 +107,7 @@ def demand_share(
     return cast(DEMAND_SHARE_SIGNATURE, demand_share)
 
 
-@register_demand_share(name="default")
+@register_demand_share(name="new_and_retro")
 def new_and_retro(
     agents: Sequence[AbstractAgent],
     market: xr.Dataset,
@@ -118,9 +118,9 @@ def new_and_retro(
 ) -> xr.DataArray:
     r"""Splits demand across new and retro agents.
 
-    The input demand is split amongst both *new* and *retro* agents. *New* agents get a
-    share of the increase in demand for the forecast year, whereas *retrofi* agents are
-    assigned a share of the demand that occurs from decommissioned assets.
+    The input demand is split amongst both *new* and *retrofit* agents. *New* agents get
+    a share of the increase in demand for the forecast year, whereas *retrofit* agents
+    are assigned a share of the demand that occurs from decommissioned assets.
 
     Args:
         agents: a list of all agents. This list should mainly be used to determine the
@@ -318,7 +318,7 @@ def decommissioning(capacity):
     return result
 
 
-@register_demand_share(name="standard_demand")
+@register_demand_share(name="default")
 def standard_demand(
     agents: Sequence[AbstractAgent],
     market: xr.Dataset,
@@ -330,7 +330,7 @@ def standard_demand(
     r"""Splits demand across new agents.
 
     The input demand is split amongst *new* agents. *New* agents get a
-    share of the increase in demand for the forecast years well as the demand that
+    share of the increase in demand for the forecast years, as well as the demand that
     occurs from decommissioned assets.
 
     Args:

From 5939cd5b466a5cd93888e9a995932e8595cb67a0 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Jul 2024 16:49:05 +0100
Subject: [PATCH 415/419] Update constraints for example models

---
 .../data/example/default_retro/settings.toml     |  4 +++-
 .../data/example/minimum_service/settings.toml   |  3 ++-
 src/muse/data/example/trade/settings.toml        | 16 ++++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
index d888b70c..1b8c9eb6 100644
--- a/src/muse/data/example/default_retro/settings.toml
+++ b/src/muse/data/example/default_retro/settings.toml
@@ -48,7 +48,9 @@ constraints = [
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service",
+    "demand_limiting_capacity"
 ]
 demand_share = "new_and_retro"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
index 11c3d7b3..2f4a35eb 100644
--- a/src/muse/data/example/minimum_service/settings.toml
+++ b/src/muse/data/example/minimum_service/settings.toml
@@ -49,7 +49,8 @@ constraints = [
     "max_capacity_expansion",
     "demand",
     "search_space",
-    "minimum_service"
+    "minimum_service",
+    "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
 forecast = 5  # Optional, defaults to 5
diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
index e5a6770e..2d046bd5 100644
--- a/src/muse/data/example/trade/settings.toml
+++ b/src/muse/data/example/trade/settings.toml
@@ -50,11 +50,13 @@ agents = '{path}/technodata/residential/Agents.csv'
 existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv'
 lpsolver = "scipy"
 constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
-    "minimum_service",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service",
+    "demand_limiting_capacity"
 ]
 demand_share = "new_and_retro"
 forecast = 5
@@ -87,10 +89,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingTrade.csv'
 lpsolver = "scipy"
 constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service",
+    "demand_limiting_capacity"
 ]
 demand_share = "unmet_forecasted_demand"
 forecast = 5
@@ -127,10 +132,13 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingTrade.csv'
 lpsolver = "scipy"
 constraints = [
+    # Optional, defaults to the constraints below
     "max_production",
     "max_capacity_expansion",
     "demand",
-    "search_space"
+    "search_space",
+    "minimum_service",
+    "demand_limiting_capacity"
 ]
 demand_share = "unmet_forecasted_demand"
 forecast = 5

From e1a3ef7f18c9d1e94eaee9aa8155b0a2d12910a9 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Jul 2024 16:52:22 +0100
Subject: [PATCH 416/419] Update results

---
 tests/example_outputs/trade/Gas/Capacity/2020.csv   |  8 ++++----
 tests/example_outputs/trade/Gas/Capacity/2025.csv   |  6 +++---
 tests/example_outputs/trade/Gas/Capacity/2030.csv   |  6 +++---
 tests/example_outputs/trade/Gas/Capacity/2035.csv   |  4 ++--
 tests/example_outputs/trade/Power/Capacity/2020.csv | 12 ++++++------
 tests/example_outputs/trade/Power/Capacity/2025.csv | 10 +++++-----
 tests/example_outputs/trade/Power/Capacity/2030.csv |  8 ++++----
 tests/example_outputs/trade/Power/Capacity/2035.csv |  6 +++---
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity/2020.csv
index a8ff7994..a35c2ed5 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -1,11 +1,11 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2020,0,R1,gassupply1,2010,3000.00000000000
-R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 0389a29d..9777d794 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2025,0,R1,gassupply1,2010,2100.00000000000
-R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 52525599..023078ee 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2030,0,R1,gassupply1,2010,2100.00000000000
-R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 10517be7..c232f077 100644
--- a/tests/example_outputs/trade/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -1,7 +1,7 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2035,0,R1,gassupply1,2010,1470.00000000000
-R1,2040,0,R1,gassupply1,2010,1470.00000000000
-R1,2050,0,R1,gassupply1,2010,1029.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
index 29c0c8bd..66b1b173 100644
--- a/tests/example_outputs/trade/Power/Capacity/2020.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -1,15 +1,15 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2020,0,R1,gasCCGT,2010,240.00000000000
-R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 16c86de5..2e29060b 100644
--- a/tests/example_outputs/trade/Power/Capacity/2025.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -1,13 +1,13 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2025,0,R1,gasCCGT,2010,192.00000000000
-R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 3325b247..bb6eddda 100644
--- a/tests/example_outputs/trade/Power/Capacity/2030.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -1,11 +1,11 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2030,0,R1,gasCCGT,2010,153.60000000000
-R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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
index 4d46864b..768699fc 100644
--- a/tests/example_outputs/trade/Power/Capacity/2035.csv
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -1,9 +1,9 @@
 dst_region,year,asset,region,technology,installed,capacity
 R1,2035,0,R1,gasCCGT,2010,122.88000000000
-R1,2040,0,R1,gasCCGT,2010,98.30400000000
-R1,2045,0,R1,gasCCGT,2010,78.64320000000
-R1,2050,0,R1,gasCCGT,2010,62.91460000000
 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

From 2ec091224f8b4c283e6176c2f420ddba5e4e3142 Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Jul 2024 17:15:06 +0100
Subject: [PATCH 417/419] Fix alignment

---
 docs/inputs/toml.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
index 7503eab2..740cfb3b 100644
--- a/docs/inputs/toml.rst
+++ b/docs/inputs/toml.rst
@@ -522,13 +522,13 @@ to define the timeslice simply by referring to the slices it will use at each le
         in the simulation. There are currently two options:
 
         - :py:func:`~muse.demand_share.standard_demand` (default): The input demand is
-        split amongst *new* agents. *New* agents get a share of the increase in demand
-        for the forecast years, as well as the demand that occurs from decommissioned
-        assets.
+          split amongst *new* agents. *New* agents get a share of the increase in demand
+          for the forecast years, as well as the demand that occurs from decommissioned
+          assets.
         - :py:func:`~muse.demand_share.new_and_retro`: The input demand is split amongst
-        both *new* and *retrofit* agents. *New* agents get a share of the increase in
-        demand for the forecast year, whereas *retrofit* agents are assigned a share of
-        the demand that occurs from decommissioned assets.
+          both *new* and *retrofit* agents. *New* agents get a share of the increase in
+          demand for the forecast year, whereas *retrofit* agents are assigned a share
+          of the demand that occurs from decommissioned assets.
 
     *constraints*
         The list of constraints to apply to the LP problem solved by the sector. By

From d01ed8b38c9931724cc93e5498d027b56fa4966e Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Fri, 26 Jul 2024 17:17:37 +0100
Subject: [PATCH 418/419] Revert change to trade model

---
 src/muse/data/example/trade/technodata/Agents.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/muse/data/example/trade/technodata/Agents.csv b/src/muse/data/example/trade/technodata/Agents.csv
index 02be4796..42fd21d1 100644
--- a/src/muse/data/example/trade/technodata/Agents.csv
+++ b/src/muse/data/example/trade/technodata/Agents.csv
@@ -1,3 +1,3 @@
 AgentShare,Name,RegionName,Objective,ObjData,Objsort,SearchRule,DecisionMethod,MaturityThreshold,SpendLimit,Type
-agent_share,A1,R1,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,Retrofit
-agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,Retrofit
+agent_share,A1,R1,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default
+agent_share,A1,R2,ALCOE,1,TRUE,from_assets->compress->reduce_assets,singleObj,-1,inf,default

From 6b7643c836b39ce9c794a3f07362c80d8a5fdc5e Mon Sep 17 00:00:00 2001
From: Alex Dewar <a.dewar@imperial.ac.uk>
Date: Mon, 29 Jul 2024 16:53:42 +0100
Subject: [PATCH 419/419] Bump version to v1.2.0rc1

---
 .bumpversion.cfg     | 2 +-
 CITATION.cff         | 4 ++--
 docs/conf.py         | 2 +-
 src/muse/__init__.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index db8d4f25..026487be 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.2.0rc1
 commit = True
 tag = True
 
diff --git a/CITATION.cff b/CITATION.cff
index 36f78d16..c37674c8 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -9,5 +9,5 @@ authors:
       given-names: Adam
 
 title: MUSE_OS
-version: v1.0.1
-date-released: 2022-03-25
+version: v1.2.0rc1
+date-released: 2024-07-29
diff --git a/docs/conf.py b/docs/conf.py
index e3babe0f..bd76d8a8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -8,7 +8,7 @@
 project = "MUSE"
 copyright = "2024, Imperial College London"
 author = "Imperial College London"
-release = "1.1.0"
+release = "1.2.0rc1"
 version = ".".join(release.split(".")[:2])
 
 # -- General configuration ---------------------------------------------------
diff --git a/src/muse/__init__.py b/src/muse/__init__.py
index a84270d4..3caeb875 100644
--- a/src/muse/__init__.py
+++ b/src/muse/__init__.py
@@ -2,7 +2,7 @@
 
 import os
 
-VERSION = "1.1.0"
+VERSION = "1.2.0rc1"
 
 
 def _create_logger(color: bool = True):